gentoo resync : 09.06.2018

10678 files changed, 56686 insertions, 108378 deletions

diff --git a/Manifest b/Manifest
index 4f71bd44629c..96d9bce64d81 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28971 BLAKE2B bbcdf2d05e59e0b7f195e8e2b7afdde3f93a233cb164cb04ebafa97360518e8d22f4b2abde4657fb610c9ccbb35ace8cdc9f110503ef102aca50b081f7a52bca SHA512 2a3adc25fe3899ba003ad5c38870439f5e1e99df197a7ed64899fcd4ad4bd9db9f4f38a2ce0aeacf5492ca67bcb839b0a6eb03bdb78ed90000ee7b23781262fa
-TIMESTAMP 2018-06-02T15:08:34Z
+MANIFEST Manifest.files.gz 29016 BLAKE2B 8a60d340b5149be8f2943e2a8e745bdfda75835b453cdaf2ba32333656ce9c78af27c35b9b057fdf5189034a2354d2d5e730ab45046d7eb6c0a53d5222a29cc4 SHA512 b5bd4e85f542c9672d170dde7ea1ad6419df585ce0d5d540d57903c4e999f4ce7db81188e079d7cf5a38e8253e1f337ff23c7d19804319fe31508bc234ebde05
+TIMESTAMP 2018-06-09T07:38:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsSsvJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsbhAFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD6VA/9Ep34RkXNkmNuo9jk3LPwA0V5Gz3+g5t0XCBXbQMtcCW317FeJ/0FuaJK
-CbQ/e82r0+lWGJoVIAEJAnwHgssaY49wQmRuUR/lNzNhKNfTCqdyQMZPNaK/8Apu
-BL8WkjnEoliCyGmSveTIFbKm6qFwDglHSFmDfK8r5SSe+m1Lf8D1hyp8PHWIB18z
-sKEdVWXpf4dYmFlDXPGlyGV/sS/HNrxw5nlT+moGZK+iHFSSmbb3Fk4N/AA8V4tn
-WVRqFoRLYrUawuJndV38Dgjh8jh/zmWKTpQVrjDHZdeQzsTwRlJX3AYbpGZ93ytb
-jBoIaAQdscoAv17BXJoBG3uhKRNq0EPIAnBQ1n877ZYqSlcpJdfih8V+vWbAlg7x
-hqCmiIzNM0k6HofrXBk58RtLOu8ZEQW4ErkO7zOqRCQ8F/Kh+dutcSGifVM7DV1/
-w78kunlt14KAcR/CC0y5hqsfFPyUtMphMAd/MtMiLlN/gU4mNdBT3cugIv5/0/TT
-RpX1vZ9wbNUkilPCCoPv3LXsCMHoBGZAtND2+TwSsESfffLEXEDz1jLqEcskXweP
-ECukI15nndbwiMqmJKZcCcLzEVVXaala78lsfRHdi0vy6AqHrZzU0+6LJSSXQ1nQ
-n706+j6GjnXeIqL4xD3+hNSW5ZOtc2gA/6LEzOqVd2EphDcdiBI=
-=nv5C
+klD8oQ//aE71/QBAgJ13vNMhXNNB4k5sUglg709BnW3mVnKYfiZkSl9mOUi4B6yq
+As1/BLVKETLr3lpBGHWfMWkU3SJL1xztzp76NsDRWj6drJw1apR3JHCH41L20dL5
+BdlvzsshN83ke1sjnL9oXeDq83SCvxPIkjo1ccxcF0iPW6hY6GQfISbEXqWFEc4T
+8rXWljrhlInqYR3rTHwLMPVwCZeGukCfYfWM8DXoqZMM7SwdVp7dtfbj2KXslg1S
+vEELrxxaGhNEhrKV3+MV3ZMjrFUw6Fs3Fo//GRw1xAqC0HX1lTqF6hoZKH8b8/MJ
+SSjFJ09GknZ4u3pHC7zKFkMC3G4T9qc56Bji8DwdDMfB1sgYfcamg2nmIvkYvwOr
+R+wbeAjkw9FU8qBTV7kO1n9djIDBSpIRqoY2a1UWOz4qpY2ivrJeQtHg26owbBKL
+Grje8pdsND9eJVQ1o626Q9Rw8dTWQz85ek2Dpcq+XIqWhKenAg4igIiy06LvXdQl
+l/06S8PQWeVLf8yakilwcjwDw6iKppqoA03cd5KfMPJDv33dEQdF1O0LsMHEe/UM
+PQ4M0DRiVeG9404PCyvxK16wuZzSDl95F5wDpWY0MZaq9QkVcZ3335n5gmXQd7Im
+AAk4jY30UgCciqXT4cCoUbAT+TGDrhGrCmJBS2CVeGVVHHhRnqg=
+=OZIU
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7dd4accf505d..528016b3ea50 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index db70d96a3b57..dcd2e2e4bf4b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index 54eead6536c3..1dacf8721f73 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,11 +1,8 @@
 AUX amc.init 562 BLAKE2B f4aed655b924f345905aa8d3f149799ad299086cca1555e4902e09b376a47e2da8a34445446b00f7508cf4b6ef1d7eb83df93ae6af7c89d9b6e23d027ea5ce45 SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094
-AUX amc.init.3 422 BLAKE2B d7ad7a2a2e610da62542728da59d581f3bd69fdd5a7bf077f42cf2057e6c6bed05c298c73aee7ae9dee8ef93c3d684fc467619d202f2dd7a371b566b4e8cdf7c SHA512 71109e0779408e0cad3b4073a680ff40500daab6f2efe9af7d69286939437de0bc2b6e3a406ac65355f11b56d84077a04d98a2a6e06aac1147e1e516fe4e5181
+AUX amc.init.4 401 BLAKE2B a649832bdbc6dc33de0f87ac0037b1c38212b97abdec16d25d714db6c183fcaed0eb8374d7fecccaf8c8cdeff2c125007b4a924e208721e9d6a8e83befb93dc6 SHA512 00cca21719821efff950d272bfe1c35bbedaf5597507d2b19ecdf6f6c2e7ac7c1c1bdd42474177551e55b9751060ec396add7f4cc94f693537c105f5cbe1bac6
 AUX amc.init2 583 BLAKE2B 0745a48ecfdc060ac9995c0634761d9b16d7d190df9d6a3d8fd7ec415fda486157e22f6f7ff03b2d4a3afe93632a67e7ad07214831007101bd9ebc71557f6003 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317
 DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 BLAKE2B cd823dd1c546fe69948ef3f77fa8bf0a68a8d95ed3ee778272b84c39b1b1bc4e5afef803931ce859fd957421f4816358590a3c1e0845fdc524a0f029b52ce828 SHA512 8077f8c51aab39ca701eb1ada633a3a378e02fed39ef2e565fed57fa57cf12da6c69a2b3d93e179110c29043a0a5a114512d30752eab6356e1b819ae490d23bb
-DIST aerospike-amc-community-4.0.17.tar.gz 7868123 BLAKE2B 86ada2e5af69b9306dc10b5386d21bd4459fff8a05672f289511f1b4efc27b1bd114cdd7bf9e5d6656fa3911ca111c8eabaa178a564f2ff9e6ab64c4a88a0145 SHA512 3dce8e8d435f70685498083d50818c1655faa61125391424c0ff99ea50618df4f9f3c3ddc7be5c64aba7118e75c5c3f24f7c5bfe834ba7fb504fa7d72bd00db3
 DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B 69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf SHA512 821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
 EBUILD aerospike-amc-community-3.6.13-r1.ebuild 1404 BLAKE2B 8b278cd44569c009fb9801ebded251e7dbbb074056a94ff07f9634660150171219e73af4638990bb660676a1e6d127015eef515b46026e97ba30a6eaed360baf SHA512 b359adddaf57972b90436bf09edac8081ee5113636f427f69e94e57eae15da8ad1a93c0e1c97ee2ddd590a98ff22290a360fe2ff54da292a16d4ed009fbbf77d
-EBUILD aerospike-amc-community-3.6.13.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
-EBUILD aerospike-amc-community-4.0.17.ebuild 539 BLAKE2B f1b3f5551986370c16c24fae02ecc0c733fe52057bb0e47d770267a7103313421c54e2292381e04475cb4c2dbd2e538ee34546249f051b06f2e5abc6317b2089 SHA512 ae0703242bc3706586d021d58738cab5ab7babf9427e63d0a421fda4f5c25b75d103d9f40489f219058710919425c6ab3e2ce1c07277893e372dcac0a047a0d0
-EBUILD aerospike-amc-community-4.0.19.ebuild 539 BLAKE2B f1b3f5551986370c16c24fae02ecc0c733fe52057bb0e47d770267a7103313421c54e2292381e04475cb4c2dbd2e538ee34546249f051b06f2e5abc6317b2089 SHA512 ae0703242bc3706586d021d58738cab5ab7babf9427e63d0a421fda4f5c25b75d103d9f40489f219058710919425c6ab3e2ce1c07277893e372dcac0a047a0d0
+EBUILD aerospike-amc-community-4.0.19-r1.ebuild 539 BLAKE2B f68e4bdeed829f5340c2ce1dd15773da038a1755e7682aa4cc02236e7654ff956f87582be75bcea950c1aafd9f8b26848039990354ac780a9574425ae93b3a55 SHA512 89c275ed1d9706a4cd9bf068f0ab6d7931f6a7b346248b5ced94163e98434461b2c22226c0c83a75cec4f5f13a0efec63ab3a09c8537d513fe6bc1dcdd4681f4
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
deleted file mode 100644
index 5e04b68567fe..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild
deleted file mode 100644
index ee583da80e5f..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.17.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S=$WORKDIR
-
-src_install() {
-	cp -r "$S/"* "$D"
-	rm "${D}/etc/init.d/*"
-	newinitd "${FILESDIR}/amc.init.3" amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
new file mode 100644
index 000000000000..d1d21c1ab7be
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S=$WORKDIR
+
+src_install() {
+	cp -r "$S/"* "$D"
+	rm "${D}/etc/init.d/*"
+	newinitd "${FILESDIR}/amc.init.4" amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
deleted file mode 100644
index ee583da80e5f..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S=$WORKDIR
-
-src_install() {
-	cp -r "$S/"* "$D"
-	rm "${D}/etc/init.d/*"
-	newinitd "${FILESDIR}/amc.init.3" amc
-}
diff --git a/app-admin/aerospike-amc-community/files/amc.init.3 b/app-admin/aerospike-amc-community/files/amc.init.3
deleted file mode 100644
index 6fd8097b18f1..000000000000
--- a/app-admin/aerospike-amc-community/files/amc.init.3
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-run_dir=${run_dir:-/run}
-
-command="/opt/amc/amc"
-command_progress="true"
-retry='TERM/30/KILL/5'
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-root}
-group=${group:-root}
-start_stop_daemon_args="--user ${user} --group ${group}"
-
-depend() {
-	use net
-}
-
-start_post() {
-	ewaitfile 60 "${pidfile}"
-}
diff --git a/app-admin/aerospike-amc-community/files/amc.init.4 b/app-admin/aerospike-amc-community/files/amc.init.4
new file mode 100644
index 000000000000..87405a83c709
--- /dev/null
+++ b/app-admin/aerospike-amc-community/files/amc.init.4
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+run_dir=${run_dir:-/run}
+
+command="/opt/amc/amc"
+command_progress="true"
+retry='TERM/30/KILL/5'
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-root}
+group=${group:-root}
+start_stop_daemon_args="--user ${user} --group ${group}"
+command_args="--daemon"
+
+depend() {
+	use net
+}
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index b91689a982d2..0af395a96aa5 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,7 +1,5 @@
-DIST dxf-7.0.1.tar.gz 292883 BLAKE2B 9723866611ea93b86196d13250eb0a435c8a92541f7ad95a432724a056153af8f9bff5498d6a564c7e98f3cffee0ef6dc605b90c3d4e9ddcc2f8d12ff9276cf7 SHA512 01b5b9d77fc59cf552c94b778700af219302d795ce07399d45fb51d98e72ba6d03cc473ac6f6641a9562d6a196d4d72f44b963ac9e210863f76b3a6ab7a9628e
-DIST dxf-7.1.0.tar.gz 293437 BLAKE2B 24bc00f0d94c86c3a2cd053aac34c8828bd32bf3eaf17c0479d67849ee20ade4ed48e5cf48e6f64a39d82ab286ba69d9e89cc9f0ff1f1c1b46bc213a8eed9f3a SHA512 628d9aac2621e6502c2aa705e59947f95481b7bc447deaae1e538f8b6737e83d6139eeafe518e45d912a5dca07561622d6e8f320fde32f09edea45e04640fcfe
 DIST dxf-7.1.1.tar.gz 293629 BLAKE2B b6657e2b3b402e07a1f22dc5f8ece033fc8c7492e18a1654e7354420862c042ece359cdbb377dd9daefec606aaab865a22d26247d463097469c322d2877f4ea7 SHA512 9e9be7a69d885bfaf4f062ec601f33c7de2123c4c2910f046fc4b3f199608d08626e76ff47e2c9691149e6f3e0c6fb05e2264b83b3d74c06fe907f5bb7de5254
-EBUILD dxf-7.0.1.ebuild 728 BLAKE2B f4a9e0e40e2f37576a11c48348419ce9aa242d231051c97b9fc44b53d09a3ee5b71f371395242ece1464b2e92da62fcc26be4f744da091814ed80a488458f14b SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867
-EBUILD dxf-7.1.0.ebuild 729 BLAKE2B e4bea4196f4824ba6039da210c6e4fa646fd1e1b491225a9fae16a528af4e841c869ae9a2d94b5c5962d715f5bacd4c0747156ff2de64a25806c862d96d35159 SHA512 3c3d5dae32400ec4133268c3ad5be14ff04c53a5d6eadddcda8effe488a21b5af79481c8b772e00cbd711c5312cb85ca7fd8d1ac9c531c74d93e042d99a474c5
+DIST dxf-7.2.0.tar.gz 298396 BLAKE2B 2566f61ab4f621492b3f2c243a78bb02e25bc7278438c7698be4704724172605a5e1111a9f380e1de064c6d6ce35a95fee06ac4865e3c8f1318af4a6242ff1b9 SHA512 49f6a29d6d653f444d2f53b84a73b1282052c7ff7a87f65b59a87b5c2796ca37897b36b17d2252398d087377755ff9f474c6b271af80d955d79b6a971a2e124d
 EBUILD dxf-7.1.1.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
+EBUILD dxf-7.2.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
 MISC metadata.xml 373 BLAKE2B e00f8cf7bc138cba4b3a9db1da273f85a90612578a89a8943bad5fd2bfe5f36d233b6b26764a2fff0c261890cafe34243845d12f6e9ed952daeab86c2e3aa70a SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c
diff --git a/app-admin/dxf/dxf-7.0.1.ebuild b/app-admin/dxf/dxf-7.0.1.ebuild
deleted file mode 100644
index 4c3842e34cc1..000000000000
--- a/app-admin/dxf/dxf-7.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Docker registry v2 client in Python"
-HOMEPAGE="https://github.com/davedoesdev/dxf"
-SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.10.0[${PYTHON_USEDEP}]
-	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Require dockerd running
-
-python_test() {
-	emake test
-}
diff --git a/app-admin/dxf/dxf-7.1.0.ebuild b/app-admin/dxf/dxf-7.1.0.ebuild
deleted file mode 100644
index 93a76a336e99..000000000000
--- a/app-admin/dxf/dxf-7.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Docker registry v2 client in Python"
-HOMEPAGE="https://github.com/davedoesdev/dxf"
-SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
-	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Require dockerd running
-
-python_test() {
-	emake test
-}
diff --git a/app-admin/dxf/dxf-7.2.0.ebuild b/app-admin/dxf/dxf-7.2.0.ebuild
new file mode 100644
index 000000000000..f6e0099fdfe3
--- /dev/null
+++ b/app-admin/dxf/dxf-7.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/graylog2/Manifest b/app-admin/graylog2/Manifest
index a37b85c9c448..b332dad8ce74 100644
--- a/app-admin/graylog2/Manifest
+++ b/app-admin/graylog2/Manifest
@@ -5,7 +5,9 @@ AUX initd-r1 1580 BLAKE2B 23b234ddc3bb2ab1e0f23795ab79fb82abda2b695c1f6fd2f19779
 DIST graylog-2.1.2.tgz 94284738 BLAKE2B d4971bb6fb073f575d20204b49e7edf24773f42e4c9b84f0e1d2a5834bf8d95120ef1fa6391b22714923fa1f62e623f02a6788c82b1f48fc86f4953d484de36f SHA512 df636143ff90b0aedcb6db78e20125c10da2428b6e474e925d6fc011fdc3a0b88414ec914981a71a0e08c4916cb5cd18a8eeda28e01d9edf3b3ae4a8fb0a90dc
 DIST graylog-2.2.2.tgz 99956086 BLAKE2B 55499d11d9f9a81df8670521f62a45323941f7acac1b87a4df96dfbe0f14a63640cd536ab1c8affa69fe1c774d37b75ca8d0d4bc6194622267a6f5640cf05cc7 SHA512 341548b5d48e3a2008a1264128a604320b566b8f0e8da4d2fca54a69e1412a69839d09698e13d97dd399652611a3e24dd54dc81f56bc4ca00278afbd61ba9c2c
 DIST graylog-2.2.3.tgz 99971278 BLAKE2B 981568151fa22b3b180a451075c9c66c1e9148d737e4683fdbeb505fccb54729619fce554ee3efd423f971081005e73e481f69d9b81676e80f1276b4a982cd6e SHA512 19ad14bdee733b4ceed526af7f446fc74a4ac5bc6a0b4784618edd84a84aa00378c203d4051a3232c17caaf47f3ffe684cb8b17ce88c8d98e7b29bc22c0058e8
+DIST graylog-2.4.5.tgz 122974260 BLAKE2B 0f04713fcee112f1018a78bea7c39b456ae167ec46c29b1b3c60326563d405a92a4d4d341860b0341a3ce2c7ad105a8ebf5068cae5b29b312d01a4fd036f277f SHA512 bfcf879ab01142894ada2639f9d191aef640fa17e7c0a5935347291e99109fa677ae9caacada6cd3b94295a290eb710c20710621376c04222d6012492331b9af
 EBUILD graylog2-2.1.2.ebuild 1862 BLAKE2B a029af6558cb63476c97d6eebdc796145bdbc99dcbfbf428396bcb2d53a66cb04c01e890f47f7ee84c2ede0b5b04d77cdfb7cdda8e9f107baa0c6e5695381b99 SHA512 43efdd7b105a59ce897beda8d49c4797ccee133929df87903a47c4d22faea1e5bec8ba2e80519ea5d635afdd2f8933fc35dda022078ddc2c251c6db43f45f157
 EBUILD graylog2-2.2.2.ebuild 2199 BLAKE2B b923e54efdc27566bdb33115e97a924976022eb7c7d15420c599a0f2705cae5079dcaab64f339a6af3ced35a15bc3efe211b66da82a199ad1c067659c3211a49 SHA512 d8fc5fbd3a09adb4dc0904e501103e9e6da18f1ab80a19908190a91cf271fcf997f73fbfdecd6a28acafa763643335c76c653a2759fde581025e1af5ff77255f
 EBUILD graylog2-2.2.3.ebuild 2206 BLAKE2B 5cc4fd2c40d7f0548b47931e013d99650d2fdf33931c95e2132721bba7393f817f7f2ba0d58d1f5f9a752667ea2dcbcb632fa5d1309c3c3113b8d4ca2c75917f SHA512 a7e6ddf34c75c835cc85fc6b5b58aed0005f88b4e0488d35832930db11d57d7c7896ccf495e3b04dad9d9330f4c98da906916c0e0cdab96956b04f3b941a9016
+EBUILD graylog2-2.4.5.ebuild 2117 BLAKE2B 0b90692a5852a5970f8e91658e5aa214fe3a7db7b85b11c85f184fa861c1791efa36783c56c6e1fce34ca3db8efe0b9ac5b58a6817ea54f466fb04c7a3db0147 SHA512 934e417d8bafe1fca2ff5e45bb7f4795af23e4abd1dea8d224e0b206575d5a468f05185ef57fef56cff85e69357d5c854656389287386cbd693f3dde072ccfac
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/app-admin/graylog2/graylog2-2.4.5.ebuild b/app-admin/graylog2/graylog2-2.4.5.ebuild
new file mode 100644
index 000000000000..3e0e21b963fc
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.4.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+MY_PN="graylog"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+INSTALL_DIR="/usr/share/graylog2"
+DATA_DIR="/var/lib/graylog2"
+
+QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
+RESTRICT="strip"
+
+RDEPEND="virtual/jdk:1.8"
+
+pkg_setup() {
+	enewgroup graylog
+	enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+	default
+
+	# graylogctl is replaced by our own initd
+	rm -r bin || die
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
+		s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
+		graylog.conf.example || die
+}
+
+src_compile() {
+	einfo "Nothing to compile; upstream supplies JAR only"
+}
+
+src_install() {
+	insinto /etc/graylog2
+	doins graylog.conf.example
+
+	insinto ${DATA_DIR}/data/contentpacks
+	doins data/contentpacks/grok-patterns.json
+
+	insinto "${INSTALL_DIR}"
+	doins *
+
+	doins -r lib plugin
+
+	newinitd "${FILESDIR}/initd-r1" graylog2
+	newconfd "${FILESDIR}/confd-r1" graylog2
+}
diff --git a/app-admin/killproc/Manifest b/app-admin/killproc/Manifest
index 35c2d8983f63..0cad9917483b 100644
--- a/app-admin/killproc/Manifest
+++ b/app-admin/killproc/Manifest
@@ -1,5 +1,5 @@
 AUX killproc-2.13-argz.patch 195 BLAKE2B c4d91eba1d2d2a5638384fff6d103babad55061b833ed980a0d36a7f7ebf52d5334a1e344b6b574a5e2191b9d8eec75e0dea6ab8a7226af6b4b3a27fda2d8922 SHA512 a6f4c0fc6b211af04f6e9137f52c4f911f989dffcb20d3c5069ea3716469ed23f08774f8dfe1aa2ce4f1ac2ef828b440fdcddfd8c77fe2891574145af0a02340
 AUX killproc-2.13-makefile.patch 1212 BLAKE2B 3a7d96e7e96b33b19493c68163119c01bbe104d9328c4aba5663d837d7b5c65b31a87178ccdc6a56c6d47b4b71bba03541e9ce07ed4e5734d3bd8484bcb71190 SHA512 c471361ca0fb4e4cb3d2e74c29115cf441b6129c2cbf54540ee7af40e818f1b6df169344c5f44ae8d9a1769aa0bf26bc00d5c6348546e9e37dff5e505b767e68
 DIST killproc-2.13.tar.gz 37953 BLAKE2B 57ee8eab39810a1cc9a0d7a4e53d4912e6288b7b4c41d05fd3b6a241e90dbb2b220792d7bd07691d11cc4ceb264d682ed3c59dda2eb751f777e9caec6c82fd6f SHA512 2ba8daa10d78c7e6df80f6fc5bff24807571bd8bcecf4674c1dac180da5c462b326c1fd45e31b4974937d47871b48c9e5b215a7b323e65d98fe0a66b171e9d2d
-EBUILD killproc-2.13-r1.ebuild 672 BLAKE2B 15e1af8ae86a387be305b226db95547b947d55d35357f443e14e9e8e9f70c0a2202de0fd4ff2765e77bee92bfe11235b6b5d662fa2e811f126d07dd2fe3f39b8 SHA512 b98fb958aa481ae0ab548f8578ca0ff1644b119cba6f56837903ea3b2380199eaaeca8083d9bc3b31515f3f22f6188a0fa816bddd3acd91b4596f25ea4dfd18b
+EBUILD killproc-2.13-r1.ebuild 677 BLAKE2B 57c22c7d40e4df66da47d5297591fe80989a152955ead479b5a40e08f71097eb88e3174f39695345819148472559868315d1d78a43170a25b72471eda9192543 SHA512 494ca6278bab48389c5d0a5610637289b911de9ef824561eabe6814a779a63056af6430bf190f1f6ac26a410f26d6af2f10de4eaf726f2ec324d9d753d40356f
 MISC metadata.xml 237 BLAKE2B 43fdb41b8b9fc4c7870059f296014f77cf77fe08cef7092da23a2a7a2e09c8cc2fb5476e73a0b9781f3b7b108a11aeb1fd88ba22bea203523aa3ea0f769412ee SHA512 ec2a39c9baa1516733bfbe39044a2fb2b9742b0ddb1b1eebab2ce7cd1027f92ef9c2c48a3e0f7362ea897160818f214542f82bdf8ba7b2a5034c0c5090f137e8
diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
index 4674fcb3e7e3..9b0d6572dcd3 100644
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ b/app-admin/killproc/killproc-2.13-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
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 
 src_prepare() {
 	epatch \
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index a453dbff7912..4967a98d0382 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -21,5 +21,7 @@ DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
 DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
 DIST kube-bench-0.0.16.tar.gz 196341 BLAKE2B c0cf32f99401729c8c064a6d48e41908c75904099a5f3bd500815502c1b9361a58546cb0751e554a0f89cddb9b25d7362b39b3a0b2000b4ab65ed2e52b98e496 SHA512 4cb0a1c5d6bd9991acbfe12d367db3d552e273cef472c11f81065be6fba93631d6c3859c247f6af7defc90e5aa716e1888a7501e5f5b024041ad81072a53c878
+DIST kube-bench-0.0.17.tar.gz 197158 BLAKE2B 458a7ee61cde654359002060ca05ef376c0f0cd43c48b6faa5faee307c367bce1ecbd827ab9634d07f805c706e1ed68968b1b73c3bb3952b52d15074c019acd8 SHA512 c07a7c58551ebe4633fb6a8cf08b8b81c63579a1406ac8b2cb889b2b6e06015fc22c205b873c79b40c228b7bd104fe427766271a1d3bd840386249c84f48e857
 EBUILD kube-bench-0.0.16.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
+EBUILD kube-bench-0.0.17.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.17.ebuild b/app-admin/kube-bench/kube-bench-0.0.17.ebuild
new file mode 100644
index 000000000000..01b95b2a0ede
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.0.17.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
+	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
+	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
+	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
+	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
+	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
+	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
+	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/kube-bench
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index f81686594c78..a16006889192 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -17,14 +17,21 @@ AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f4
 AUX patches/syslog-ng-3.12.1-json-c-0.13+.patch 862 BLAKE2B aeab5c994f0c9e5c3909300f5f8b56ed22194746f95b6cc2f6e600dbe04c9f4016b3f1d085c222f0d7d6922765f71c56d1bd3ac1757b1ca07d11c9d15a6fc1b4 SHA512 ded991eeee706e4d51f48e803db75d39e907f83aaf9cb9994eef146ba8d7cc784e5d3890eb18acdb4ff2702dcf8291686c6975ba3b0c4f0d3817a301ae81a641
 AUX patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch 929 BLAKE2B d3d0b94c30364e9663b2c7d672f24c03643a0fe0e5954df3a4b90f7108321858e529b22fc596ea85caf34ff5fd78b01cd6e4f2233fe282816e844b6194040948 SHA512 744c4b16df09ae14a09211d7e7a19e02723be2464a81d16586273e88973e7dbe0e2803326b7171a043889f127a8bb976fc0266d826e5632bd498f736e4d5acca
 AUX patches/syslog-ng-3.14.1-fix-tls-client.patch 6248 BLAKE2B 8671b724886a62bbd9e61987a6e7e95ed5773278b6fd8cb1c2ba3285ba4c6589190484386da9d8865326f3588937b825a738462e7a935363d103942982c68dd4 SHA512 1999cc1107d8b22a58f5919a8bc0f8930d0c60170bb9f23a20e25f49f84f8d10ceecd6903de9cd7cc738dbc8cdec690880be400f5dafc3b06ae88681d4848694
+AUX syslog-ng.conf.gentoo.fbsd.in 591 BLAKE2B 47cdf8975a0cb083d6f6633e812fcb872155cb126bceac2d17be3b9f4cf0ff692e32905ddbcc72d80168bda1fc9b3c3691cc416d7570cdf675b3b35d3824e98c SHA512 8e4cddbcf08b91f3ffef69c0766ee59191ecff33d9e6ad4810f7f383a83f0fed7e2975b82868b80ee4aafae2cc95ee3e4ee9b212ac701dc5b6f0dcecdd7ad088
+AUX syslog-ng.conf.gentoo.hardened.in 4512 BLAKE2B ed6b3fdfc8cdc68899bb9b89998c01190d0d0839726df0953e8a92e21d6311ecd1c53fa5854ce7dc542fe3660dce2879f2a93a22ac8b6114a1a9f1a6616b1be6 SHA512 3fd24e1483552c3c5c142dc87cacf3efc7a6286d71bd7d894b8587e15e7993cb88a9a08c0b67ecaa7f015fcbf96f9022946c5770ff2b653728e0f213dd08e284
+AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
+AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
 AUX syslog-ng.logrotate 231 BLAKE2B ede8c2e3bd6fa67b2740bca74fa45e799a88dcb9aac456df4fbad5db919f0ac8671b7e073efa1d7fdf1f2c119521d6fe8d5e6d4209b0fb09062e8499bd3377be SHA512 f8dfdbc4ea59c4cbb500b9ac0d4f8c7e33d0510049c7945ee1ae50039dc011b1ca2835c18ee145bf3d9ca306aca0d0de879735c3298b8a0f944db6ba4747ab1b
 AUX syslog-ng.logrotate.hardened 1614 BLAKE2B c9845bb43bd09a210f06912131dd2ba88164f0dc58f9d81455c13bba0ee923d1b9a6025f6b8e5fd066254bf6d0c81588b8d515aa055da157c29aaa0aa63fd700 SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760
 AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c8f77d2ffa8508cd7b8c32d13a22ff63bc883ac7a79f21287681b906430ecb05bae7665c064adbe161e4e1647e3ace9c29 SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620
 AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
+AUX syslog-ng.rc 1894 BLAKE2B 589c512657b46c19a3c407249382bfac951725aa2a389390f8ee911ceca363768618fd5cb6010f9294c6b977ce40e08ad0f4c085b293e6eac7bc094e95befda5 SHA512 4af1a8352c11280e17206ec60f12d85a882d11adcc60c88c86fbf45b786e71a1a3004b657a69c5f17692679a161d79e02197dc03a41f1e79b080a9a419f5b2cc
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
 DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
+DIST syslog-ng-3.15.1.tar.gz 9147238 BLAKE2B 86c51a51569efed2c2127a6102a10224a0599d40af0d34f28b5b52e314687851753f979a8d9edabdba02d347407b1b2856bce11991eeda53cbe10ad135934534 SHA512 79b4f2eff92bcbfe8a875bc72eb98bb43d86ef3c63deaf4acefcdad4f3a98df9de4e7935fc2ebbe017fd5eb22aa0743f1ff428d0ccf3790a1767f4e25c6a7b13
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4689 BLAKE2B 4383f97ca7f901ea7837d911409092fb45ca1d09e98c4d584755f3b91d68f1b53b19d08df77912b05edc3d25023873e2e192ffc9c6a856057b306759ff2571c9 SHA512 a71b12aa827d7538503344e2ae6bc8712ba9469bcf18e224a32a55948ef1ff0d2de6f43408b391ff06bbcc1ea1884c0f839cf0de6cec8d1af4d61d66299c3660
 EBUILD syslog-ng-3.14.1.ebuild 4800 BLAKE2B 827277cd46a8484ab39656177f1bdbe4ee1e4e8715257289aa4642835f6bf5030c006b4147d9faf07888526e5dfc724967dd95efbb102867e2c2d5d3db03029c SHA512 5e36a93088045183cb8c2dc55809cef3412c1872f3eea356dd96569553d12d3fc3df624870d9b5a66558087781efd0769a880c35253485fdf6697e2371092563
+EBUILD syslog-ng-3.15.1.ebuild 4767 BLAKE2B c15f68a8d083a878ce7b12cb53a4d6515c0ba90b313a465a5e01b32d730a17070a57dc9a8b93a29ef02119b5a25090e013f89c378daa89c1d22330971442eb4f SHA512 18f5ee084f6494103b3046cd1aabfdd9f0039933d689acc154ef032e551798fa2c8abb1cbb91663a4bf9627687930e2cb3ada9d0db0b60ce49048699a69f5e47
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in
new file mode 100644
index 000000000000..d9df76c7fbc2
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in
@@ -0,0 +1,24 @@
+@version: @SYSLOGNG_VERSION@
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in
new file mode 100644
index 000000000000..845267390992
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in
@@ -0,0 +1,115 @@
+@version: @SYSLOGNG_VERSION@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    system();
+    internal();
+};
+
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in
new file mode 100644
index 000000000000..d889102f955f
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.in
@@ -0,0 +1,36 @@
+@version: @SYSLOGNG_VERSION@
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+	threaded(yes);
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200);
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.confd b/app-admin/syslog-ng/files/syslog-ng.confd
new file mode 100644
index 000000000000..9ddeda7e0987
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.confd
@@ -0,0 +1,43 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_CONTROLFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.ctl
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc b/app-admin/syslog-ng/files/syslog-ng.rc
new file mode 100644
index 000000000000..c13e4b1d46f9
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.rc
@@ -0,0 +1,59 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
+: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/${RC_SVCNAME}}
+: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/${RC_SVCNAME}.persist}
+: ${SYSLOG_NG_PIDFILE_DIR:=/run}
+: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+: ${SYSLOG_NG_CONTROLFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.ctl}
+
+: ${SYSLOG_NG_GROUP:=root}
+: ${SYSLOG_NG_USER:=root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --control \"${SYSLOG_NG_CONTROLFILE}\" --persist-file \"${SYSLOG_NG_STATEFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+command_user="${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+	use clock
+	need hostname localmount
+	after bootmisc
+	provide logger
+}
+
+checkconfig() {
+	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkpath \
+		-d \
+		--mode 0700 \
+		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+		"${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+	[ "${RC_CMD}" = "restart" ] && sleep 1
+	return 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
new file mode 100644
index 000000000000..6a1c1b82936f
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit autotools eapi7-ver python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# unit tests require https://github.com/Snaipe/Criterion with additional deps
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.36.1
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.fbsd.in \
+			syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 78c4820d037b..44535c0a3bbc 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,17 +3,13 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
-DIST sysstat-11.6.1.tar.xz 470584 BLAKE2B e9f85567743e6f0f2958afed40919c8bea7fc52f053fdd9bc7480e942e9a4a5620287f72cf26feedf4b74fc698331da2c305864b0037cf11e0617af2bc0da63b SHA512 55b3c361f7cda3d5efc0a42bef26d154c159a465ef45b56d2567f38aeec8c935c4e3b65a92eaf996abbf2d6a2604b2b8bba95741d707e8f387c9fadc05fafa93
-DIST sysstat-11.6.2.tar.xz 471452 BLAKE2B da0647f25e9f4ec4d320f664d2124bd2bd3cc42a78201f2c86480afeb6525b20c158e1577321a0316134fca7e77c04b303829104ae59b0d790ab29bff09889ed SHA512 8f117601272d3d9b887c454d610d06f014b76902cdc68f6a11e693bdc58bb7ad1cac1006681774b3e6173f3cadd9b1f36e126d1d7501f0910b092d125d1c68ce
 DIST sysstat-11.6.3.tar.xz 527828 BLAKE2B 4221252589652d949541d8ec8d7057abe90cafaae7b2222538d4fcb95aaa45f3da542539eb0742a910456c8ee134203207fc5e9485b0948a6c581f33eb949c2c SHA512 37a770b4ff26abdb94c8d97fa49b094702e9f5fb12549fd012b9767c7f42ede50ce209085c7ad3b7cd2e208ba1e5bfe9425893f7bb0bbc517aed688300bf9712
-DIST sysstat-11.7.1.tar.xz 476916 BLAKE2B 016c5b6e2759af440ecd3bfc9b66f2b01988ef2e889090ab9156a7fdea02d9a3e6e47f6852ea699cf865d2ccf79d3152c70f0e23daf199edb936cb55a9a28fa7 SHA512 c0a8ce7a412e16d7d471cc0421a0f5586143ef8253f9a38872a63687bba50f98eebab5d501f92c4d085da51af56343628c8154cbd2d260b314153a17e23ff2e8
-DIST sysstat-11.7.2.tar.xz 485264 BLAKE2B 2915bf3eeb33d499517872acd9101e4b27e8f095b36cc106eeb8e6fc55806f9d1fa969d8c200ce4cb2bd7f0ed25b1a312e362bdc16ff7717f088c0f62780d025 SHA512 0e51c1e08cca4bb8489910d334d5f30c1854687a935f6734228d422b21827f035533f91d30d52c9a48c8be7fa15af66cd41d379a51e5a935b89eb6578e066d01
+DIST sysstat-11.6.4.tar.xz 528028 BLAKE2B 931a172ce399133a0827f7dc7090719e778e7c89a1383adf93a99c386cd11343de26649355dd3a382deceeffe6c2f1890d3424aae6ae441aaa4a47f046b520f7 SHA512 36affc6749d0eef5760e542dde060c257eea323196f9b83b52cc931825dfa796b48cad37060b9ca20d58fb3909c07b8bd67bc8d09c9c6285c08c4e2e9ca1d308
 DIST sysstat-11.7.3.tar.xz 543556 BLAKE2B f6042021a7c5047727ddbcd38cf6e9f88ca44adaf9f8a9e56cf84c9d9b4d61bef7e07ef910c54fdcc0342c8f9b28e9b114778f57f3ed70d8b950263086426387 SHA512 c752ebba4d25a30147e68d0cb44d93020bb9b44823812c99550f6b34b42fc6f015c28ef0e6609a1e33ae6e4de566ae2d0e8a4711e412a4298baf5721dd15d27f
+DIST sysstat-11.7.4.tar.xz 545176 BLAKE2B 08dec13040fe1df87902dfc67bda0ae7281768a4f426906b94d925f302892857091f279d976020924de665a41c4d73f3b64b48394436639804aab0b28bffce94 SHA512 4dcb05799e82410f2a13b44c2de1f6c7d31f20410e8a9528ac365a059591c04f918ad51c42b73fd06489bbed48a181b290897a91e9837b685cfc51c006aa8a05
 EBUILD sysstat-11.4.0.ebuild 1945 BLAKE2B 60e245699e621770f3f8aac3d622063b8e6bdad5135e3408dce587eae8d3b32c6884dc4db78a397b2a7ca0b58a7277fb652b21fad8a6e3c0e008f70eea0c8503 SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c
-EBUILD sysstat-11.6.1.ebuild 1833 BLAKE2B 6eb80ec1213c377bbe549ec4553740fa7af7686029270c288545ca0ffa892fc4adea2e083de4d1327cb00434282a19f4012578062f60ffd7c6485653055eab75 SHA512 643e2d9abd82818c04ae64858afd3682b61ec60f5a74f61f945319563eac525c95cfbac2a9d5143456214f48c4b5936b8138db2ac4ec04604fa6011c4549838b
-EBUILD sysstat-11.6.2.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
 EBUILD sysstat-11.6.3.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
-EBUILD sysstat-11.7.1.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
-EBUILD sysstat-11.7.2.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
+EBUILD sysstat-11.6.4.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
 EBUILD sysstat-11.7.3.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
+EBUILD sysstat-11.7.4.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-11.6.1.ebuild b/app-admin/sysstat/sysstat-11.6.1.ebuild
deleted file mode 100644
index aa17b2d17f98..000000000000
--- a/app-admin/sysstat/sysstat-11.6.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-11.6.2.ebuild b/app-admin/sysstat/sysstat-11.6.4.ebuild
index b9b3e8d42883..b9b3e8d42883 100644
--- a/app-admin/sysstat/sysstat-11.6.2.ebuild
+++ b/app-admin/sysstat/sysstat-11.6.4.ebuild
diff --git a/app-admin/sysstat/sysstat-11.7.1.ebuild b/app-admin/sysstat/sysstat-11.7.1.ebuild
deleted file mode 100644
index b9b3e8d42883..000000000000
--- a/app-admin/sysstat/sysstat-11.7.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-11.7.2.ebuild b/app-admin/sysstat/sysstat-11.7.2.ebuild
deleted file mode 100644
index b9b3e8d42883..000000000000
--- a/app-admin/sysstat/sysstat-11.7.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-11.7.4.ebuild b/app-admin/sysstat/sysstat-11.7.4.ebuild
new file mode 100644
index 000000000000..0a51edcf4022
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.7.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index d862f9199e5f..ef564ba8f0c1 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,12 +3,8 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 542 BLAKE2B 5e28a00356c010d34458c6f64d2bdb0736673ae552bec809cc5e23a1613e44cd847b4df99bee652a99cb6fb84443d5f9c5c1fba1c165d946f1c93cd8ca31ffa3 SHA512 ac13c688e006799b607c44e94fbdf922befc62131014b714a93ca4bb0205f5f012bb3e4814eeeb47b31034f5c35b187fc8ebaeca02bd02430c5842bc9821f29a
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
-DIST vault-0.10.0.tar.gz 12533158 BLAKE2B a2341a9a13719d1a68c363b83e1e09f5ba7a6bd2cd7c2cd274a26f2cff9f3dd851498eed361d7bb84cee3242dc8d841d89002dab64fb726343e8364077f891d1 SHA512 204f6f7b36802befc6749a064f217817cdd1bbe634517dc6146a9a4a32bf70ea341634a7a4399f901bb2a63a1b096982f258e365244b01ab4ace833a799fa5bd
 DIST vault-0.10.1.tar.gz 13001413 BLAKE2B d4dd663062062c55d110b165c1369a8a6f44c91002d564680ed008fcea2ce1e26ac24773deb951a46a7d9bcce2234e3b1dc250a957605f3ec82c781ac2e46b4a SHA512 dfa2d81e0e51cf41694ad40ad9bcc6847a9261ee06b2787d59915b941a63bfe58e649271e1ff5a963b892af5c13043057f29a1a8412efe51b3cf54157c54a060
-DIST vault-0.9.3.tar.gz 8694430 BLAKE2B 2ac99f5723b9ecf65382f10b795e51d29659b2d218732c6e9d8cc5a3a788a5dfbdc58926399a98ef27bae05454c74dec028a4ed631417788843c7ca7102263e8 SHA512 3939c952c12497f5fb9d4ba0fa4ca94acfd8ee8bb2f3636364dad680a54be4256d52018521573a0c1499a3cf573ff9daa27a52dee3ff7216181436b9aadea574
-DIST vault-0.9.6.tar.gz 10464094 BLAKE2B 6e776b000ba6e0e209fd6c89dceedc7925cf41a151816c08a3d96627dd3f2d747be10da70c9c87fcda7870dc1540887fe194c101b275f9cdf12073ad70191f3d SHA512 31c6a39f2a5ebce79660f9ba7b673f95042ab283681de016a9540da17b6a938a45762cf4b4625cf35545fe80716e212a9ee362abe5c6fca52eafd5322b6b0de4
-EBUILD vault-0.10.0.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+DIST vault-0.10.2.tar.gz 15861571 BLAKE2B c1129c6f87fcd00aaf8fecaf472e33c6872663cbac1e778e3d1af9ca7978501fe9ca400cc6d79224f9f0df5912909218dfc2ff1547144b3a94fa9f10aed89534 SHA512 ce24d0c3c126bd8f265542c97dea4f0a1c56c5003e74b0aeb16aa462c326aa360f169e0bd08a4187480dbfcf1a052249f4dcf5a5bf356c4c901676d1b55c67b0
 EBUILD vault-0.10.1.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
-EBUILD vault-0.9.3.ebuild 1496 BLAKE2B 4d46543b6efca5db609be21267274ad67a99c0761c407b7baf88ad17ed154759b462264f5f66047573ac3e503474ce56703f4dd150d677853a8ec5d252b7cdbe SHA512 2c0aa6df6b4c3d675eb177c8837befd10cc6bda97a5470441173fc5150edc20ff536efcaad0012df8684e50850514b512f958808881a1fe6ee4d25af374634de
-EBUILD vault-0.9.6.ebuild 1496 BLAKE2B 4d46543b6efca5db609be21267274ad67a99c0761c407b7baf88ad17ed154759b462264f5f66047573ac3e503474ce56703f4dd150d677853a8ec5d252b7cdbe SHA512 2c0aa6df6b4c3d675eb177c8837befd10cc6bda97a5470441173fc5150edc20ff536efcaad0012df8684e50850514b512f958808881a1fe6ee4d25af374634de
+EBUILD vault-0.10.2.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
 MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
diff --git a/app-admin/vault/vault-0.10.0.ebuild b/app-admin/vault/vault-0.10.2.ebuild
index 2e6d92497501..2e6d92497501 100644
--- a/app-admin/vault/vault-0.10.0.ebuild
+++ b/app-admin/vault/vault-0.10.2.ebuild
diff --git a/app-admin/vault/vault-0.9.3.ebuild b/app-admin/vault/vault-0.9.3.ebuild
deleted file mode 100644
index 81830bee313e..000000000000
--- a/app-admin/vault/vault-0.9.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.9:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-0.9.6.ebuild b/app-admin/vault/vault-0.9.6.ebuild
deleted file mode 100644
index 81830bee313e..000000000000
--- a/app-admin/vault/vault-0.9.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.9:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index cfcbe903a115..5b1cd1e52edc 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 545b937c8ac7..0f58b65fe9e1 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -5,7 +5,7 @@ DIST lz4-1.8.2.tar.gz 320742 BLAKE2B cd97b6a31a1f45d410d598af0b0b696b3ccc3ffdc4f
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
-EBUILD lz4-1.8.0.ebuild 1058 BLAKE2B 3a3c63fd72df58c8e69c4e9981fe7e06f6dbdefd939b4638536898a407bb508ca7873ffa9d8b34bdea23523b52af3bd14571f4ae1b48e3c115f92465e4674f9b SHA512 ae91981fc93118aa57d261292412aac4141d04974e5358819b27dbeaca8902bb995e4439373d35b625e5c19b5f3cf50073e4c22c2293ab8c2390ad7ddaf3ccf7
+EBUILD lz4-1.8.0.ebuild 1057 BLAKE2B e6b3016fe489b1d4fabad368d8aa41fe86950d35a741b0cfd4a0a04c29351a5bd49257afd8f52f50c75f2b41d194e71552435390f4d0c3582bdaece90732164d SHA512 0760e2cfa0aa04b9141728d1361f27bd82f55bb5814c9c3f92adbe763bf64fda6a0f36f965766263f49d36861ab6ff5a02e37cd597840550208543d2ab51f70f
 EBUILD lz4-1.8.1.2.ebuild 1068 BLAKE2B c29f13447c24f824d19816f9c8bd97e5be475a39ca4fc94c3dbabcf476779d1ce7177ebdf3cf97ec7ff899b7bb27b6867793ec5852b95b57093bafbad07d9a56 SHA512 e300a60ac5575a1fc16577efec351f886d98e7ecfa389098e72f4ec393fecf6b675caea554647eddf91edae1c0e01f2784602f4e94ac7fed5285a28801ef7cb6
 EBUILD lz4-1.8.2.ebuild 847 BLAKE2B d74ec14097136bb3e244bba53c6e0f60e9f0a261ff646ee0e47c6633f81238cb1f879db36fa482e8368580bceb35958a3337f96d12af9659601d737cdd20f4f6 SHA512 9a333c5d7d56e5f9d598ae04fabd812d703749b04d7e4b9f5fb247ade28099e82823e2bd85bea065af66820e6f42186ac49f4966ef279890b372111fc5abaf10
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
diff --git a/app-arch/lz4/lz4-1.8.0.ebuild b/app-arch/lz4/lz4-1.8.0.ebuild
index f7df4f35bfad..80f2cb6525f0 100644
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 3cd35adbc42e..e160290c99d5 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,13 @@
 DIST rarlinux-5.5.0_p20170811.tar.gz 546839 BLAKE2B d90bda3092fb636fee1db4f222632cf3d45c99f330298521b2a0957cd7bd4845f4518cf394e03a4e302d45cf73a37f5da5ac0cd7eba08a4859fd221697656c20 SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb
 DIST rarlinux-5.6.0_beta4_p20180513.tar.gz 551835 BLAKE2B cc6161b784d2191d4036e755a74b9706bbf021568926281380e75612310f8e6c3c31554809a4efb4e75dd2790b0a2eea2c467f76666a0c0dd7ec067225d57718 SHA512 36a80de1178b2409a46b81cb8c852931c9cb400dcc7c67c8322072947617a805f7bf721585200d1d22588c109d3109da478a6a9c9530aa7c23420c8960336f32
+DIST rarlinux-5.6.0_beta5_p20180604.tar.gz 552421 BLAKE2B 3c298e432a54efd61569a21fb4c430eac927846f95ed14bf7caa3b893e328ce175e1ba8a5908a0058380fea9a7cfd8b40c959ce87f3a831fcce717cbc3cd80b0 SHA512 9d2b4ed0b904e60ff744f3c5b0fbacb35fa879be8029f7aacecd0b1eb4499b9b7ed9fb0511fe756d90c46f7c288ceb348330f5d8d5f0843c9aae3bfdf76b472d
 DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 BLAKE2B be453cab6720abc4b01f5aef6c5874b0ff328656f8452b2a671b1b5305427dbb0de2af4084e25e972c69fe4ca4072b10f21d66f7fee23a3e205b0b4f533c8b7f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66
 DIST rarlinux-x64-5.6.0_beta4_p20180513.tar.gz 541066 BLAKE2B 7026b8650b85bd8df8b6a1fd7511305fbfceb21fa705e7bb81b0a7b60074464754a8d00cc6a6efc207ed4741547e11459b6a03e74bec9bdfcfa410f216fb753b SHA512 72a027d8cd7c05e1627772a91744883fe43968e9a0ceb627c2f16f7ac62a4e0a11e67a40247e064d16445b18bf1f666acac2111cb63ae3192ed9cbe71a552b85
+DIST rarlinux-x64-5.6.0_beta5_p20180604.tar.gz 541805 BLAKE2B 8296d17fbdd2216fd65787ae561d4a10443fb2d838faeea7a7fbe272787a5cec259581d71cab06cc59c3e147f7fb07e4e0839620c78313da74b7cbdec29afae1 SHA512 3869f9cdb7f458c26e2f54c76b4ddb6d9bc4bc1bc74b54481787a4de2656d033231257c1f9b6e010787fcd3a6dd39de6e162ceeaf890708d3c9d725f5b933609
 DIST winrar-x64-5.5.0_p20170811.exe 2220872 BLAKE2B a37783f427440a5166021475f024ca6e281b4f0d39926e55c00588e51d371bdd1bd16bd04ed65c363f7aeef6d7e2b0ba796325f7f290e45cfd8c09048ae25489 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66
 DIST winrar-x64-5.6.0_beta4_p20180513.exe 3184768 BLAKE2B cc1ed21de598ac696ecf14bceeb4bb3050d83042c226f8ccd1c5195fbb43bbbb8dea614ccffda23297bafccd767b9eb64a71b1449cb8449347134137e2f3a199 SHA512 a405ef876f5385f28fcbb6964d7fbb5efb4f35686e27fe67574dd36a3e043e492757c0bc274b8b419e0b519fba175c191c536e2b1fb9caac11843b893ea6f642
+DIST winrar-x64-5.6.0_beta5_p20180604.exe 3183568 BLAKE2B 39c9fa431acc093c416c9bd980d0555ea77bf5f0412fd5a988c941a667538e7d4c76049dfe1793e9106a8a07189075461b48a0a8e5c6b90ca2a83a4642e5d1fb SHA512 7ec9bd69e027a9d5510932cbd79898c67a1484f040c334760bc160f4bd275390439a5ec00a224fc472fd85014b2c6417e45a817c65cf03c774be83c7cdf99d17
 EBUILD rar-5.5.0_p20170811.ebuild 2281 BLAKE2B 936018068fa7ea883561da7ce0a3919b54c6ee8ab3d67522cf072be3627baa01bd2872b84f3a8b25100a4e76a165270e81281cc93730969d9688d61b97f64347 SHA512 aa68c6bc07bca69dc599dfd7553bdcd23f884fcf353ea6ceecd1c0822f799016d2958eb75bcbe937c10352bf1aab7d60bd8b6f6934244fd842d01da749f6dd28
 EBUILD rar-5.6.0_beta4_p20180513.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
+EBUILD rar-5.6.0_beta5_p20180604.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.6.0_beta5_p20180604.ebuild b/app-arch/rar/rar-5.6.0_beta5_p20180604.ebuild
new file mode 100644
index 000000000000..182140ef84a4
--- /dev/null
+++ b/app-arch/rar/rar-5.6.0_beta5_p20180604.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="http://www.rarsoft.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar || die
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar || die
+	dosym ../rar/unrar /opt/bin/unrar || die
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+	else
+		doins default.sfx || die
+	fi
+	doins rarfiles.lst || die
+	dodoc *.txt
+}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 58e75e7aa05e..fed7994a7c75 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -3,6 +3,8 @@ AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
 DIST rpm-4.11.0.1.tar.bz2 3670158 BLAKE2B 8190cd760ce86275a27a64aca7622340a2894f4f7aad0171425c7f5d3cfcf58e82c2a792f7d4687fff9270fe3f9c861027b6eea43f3602be8b12098dbccf408f SHA512 72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535
 DIST rpm-4.12.0.1.tar.bz2 4129093 BLAKE2B 85addde70d031f179566771350f5907311cf61a077b647b5dbb75e1e157141e541cb7a236e5a1d4fce881d98eb7c0331a0eadd0ca1dd09e53d9d28dd954203bf SHA512 ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f
+DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218
 EBUILD rpm-4.11.0.1.ebuild 2739 BLAKE2B 80664cf24466365a81eb4774a49a146327367b20c26fabc11c872ad8c4c22079235ae9dc0ece0956478668fcf47caca1215fe77674f7f06e778eea7003502ef6 SHA512 ecade45798b73e1a573edac06b60dbe0d0e2d4915a13beb41bbdfdc2596e208899bf6b7a36ad1144d65ebf1c186889c6f9928575ff7f5f14516deb5687b2d83a
 EBUILD rpm-4.12.0.1.ebuild 2894 BLAKE2B cf3ba401cf5c1b327c9911416926e849e52841bbc1ab937eaea44949a68ce91bc609ad2c6cf241d57f93b948ded48753cd888cadb3ff21a78fcc5b8586e9c355 SHA512 cf4c78083f32a3f54d732261d284e6a8ea4b7f5d6ff5150ff398627929b8329913a188e629fb930c7c042e4391725ce83546ec030a8d47095eb8065bc202d9f2
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+EBUILD rpm-4.14.1.ebuild 3194 BLAKE2B e548dca2d3f6349d6b401017a7e2080a2c31316abbfb2a38761e2f0c78677d7c0ee5d6c8818fec3d6a344eefb644e78a139458ca3c0cebcedd1cf5b750b5429b SHA512 4ec2a0fa996aeeb7ef1ae60ad5dfbdef63062a73de3ee8f434e91de2ce3d5a1df30bb5af9275c0edfc583a7e6f4609b4be65d2867859480c545e78de4b795dcc
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index 097975e3adc2..7a38bb900964 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
new file mode 100644
index 000000000000..13ab11f0928a
--- /dev/null
+++ b/app-arch/rpm/rpm-4.14.1.ebuild
@@ -0,0 +1,128 @@
+# 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 autotools flag-o-matic perl-module python-single-r1 eapi7-ver
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="acl caps doc lua nls python selinux test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="!app-arch/rpm5
+	app-arch/libarchive
+	>=sys-libs/db-4.5:*
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch
+	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	eapply "${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# fix #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	eapply_user
+
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	econf \
+		--without-selinux \
+		--with-external-db \
+		--with-crypto=nss \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary} || die
+	done
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/man/?? || die
+	fi
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CREDITS README*
+	if use doc; then
+		for docname in hacking librpm; do
+			docinto "html/${docname}"
+			dodoc -r "doc/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #657500):
+	if has usersandbox $FEATURES ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	emake check
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}" || die
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}" || die
+	fi
+}
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index d039cd25e104..f2041b45b3dc 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,5 +5,5 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212
-EBUILD unzip-6.0_p21-r2.ebuild 2603 BLAKE2B 3048169f536561dbefb24bdf58a6d6bd9cd765debea8a96d29af7583313a73d20de06c18301df70205bec6c4829aa6dc54340413a758a5aeb249b4ee5f567f9f SHA512 66197722dae7909378d5b7f66c81924ca1a6d04947549460708bf63aaf19e833fb958b0d5b0e90e07900c25cdb14530983fc98132f8509f779a254e0434d2e61
+EBUILD unzip-6.0_p21-r2.ebuild 2600 BLAKE2B cac4f2b6cdf5b50cfa84601e2644f0cd76210127f49da752755def5c468beabd6ec9f4856cc4a04214f4a3600367ee805fca0ca24b50154a485e56223f6a566f SHA512 2bb257106ef4f6c7ff0cfd4c0305565974ca89f127126b7abad9feb52745779e544950b524faead36e63437e311b4b09f50abfa0ed2ebb6997b6b02cc5f7cbe7
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
index 18b5f0bae4c1..475c481ec075 100644
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index b5233fe51a77..602a6da2941e 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 9999f4462bb2..3464e6fd3f35 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,9 +1,7 @@
-DIST restic-0.7.3.tar.gz 37062625 BLAKE2B 0a50c1c6c1ffc8f5d5c0698341bfd1715faee0ab3392ddb065b75143babb45dcfee355f2a369771b4c256cafcb839dc401ad827e194b52d27a1c7582b9c3a1c3 SHA512 2d44b4fc363c7f6389c1f06469cf30ebeff4d6ade0bd4fcae1d7d9def3922936b45043b04f4072284b773df2c6487c58db6aea41c7de5c8184ca33ca3c44d44a
-DIST restic-0.8.0.tar.gz 37309494 BLAKE2B 0c50ccbdabca2057a5d1f8a7326a3e143101daed7cf9eabf0deb2d4452bbd63fd57c3edc8be106c0123f3c4e01195e8042a8f70477c999b00069ffe3d4fcb1d5 SHA512 5f2205ac5caf91f119f1705dc1f8340c481fd27d809cdadbd8ff39ebbc910d98452626c2a9564300935746550a2604ed59aa095f3137788bd0dce87c0dcb14f9
 DIST restic-0.8.1.tar.gz 40330154 BLAKE2B 6758ae4cd7b3caf1bb58b9b95ddd9b99422f2a5997f37317381ec2714a4bc369331e1ba5accb791a2733eddcebdb056256a25b837cad6926f86ec61265d95324 SHA512 02d45b70b94514d3491297dcd34f26db854b6153a1aa297aaa9c938e09d65429fbe0dedb3c028ad38c769049f814c7a923481adfe9962a35dc39a7477a80fdab
 DIST restic-0.8.3.tar.gz 48746281 BLAKE2B 4161326068165b5ba19e9ee0e6386aa1df29a961a42509a2cb7924958100b9412abd1dd27d299d1eef76fdd4731d4a56f0a68e796a46071229a3e6767d3a6bb7 SHA512 758b2c69af8aad6bb62dc750141d5f5a1954ca2b51350ef59c35fd10afefaddc4d8d0cdd5914f249594946db6138124a48fba531b8a24353f022ccea773a240c
-EBUILD restic-0.7.3.ebuild 1276 BLAKE2B 13a79b91735acd188bee1f60303d3237b69fa85af4f37de021b60ca942b0fe2ae06a695720e268f2076eb3c860336a163cb9279d037fbe6a597b621028866531 SHA512 d7bfd4df6620cba9400e6b6c484864a0a5fae4953744cef7e1979f234a3c7d40a53e8750a572d414c98090f99734bc8243aac6353493c845b710190915f52cfe
-EBUILD restic-0.8.0.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
+DIST restic-0.9.0.tar.gz 51049118 BLAKE2B 4089a0eafe0f3778d540ffb87d5d773f1bb4296c3cb7a085a38cc1ac54742392790ccf61145ed3ff19a7e35b358e0b40c7f3edf6ee661e22ffd00efafa2bdee1 SHA512 c01e8450c7afbea59d86a53a5491e562ba5d1ab7fe3e96e0e5b53d96f4df2cf051d7abaef742ff2ecce759e2cd97386566e1c19260f0d74ae678edbe200aa885
 EBUILD restic-0.8.1.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
 EBUILD restic-0.8.3.ebuild 1190 BLAKE2B b67c12c01ad4f69c281ffeeee90eff0dc1eaba5341ff18c519b2183ef1460843a50d7adb9ec518f8affbe3546328f9f488d274ae99071799e7e3d1ef5415fd3a SHA512 980f1040b4f6b2c46598dd6ba70bd3e9bff8d89274002dad12e497f82ff2c0eb362a43e91473da05f982c1b4aad3e19e1124c8fd753fc371eb5f73f7a43f7b17
+EBUILD restic-0.9.0.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.7.3.ebuild b/app-backup/restic/restic-0.7.3.ebuild
deleted file mode 100644
index 8d2fe07c31c1..000000000000
--- a/app-backup/restic/restic-0.7.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="A backup program that is fast, efficient and secure"
-HOMEPAGE="https://restic.github.io/"
-SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGO_PN="github.com/restic/restic"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-DOCS=(
-	README.rst CONTRIBUTING.md doc/design.rst
-	doc/faq.rst doc/index.rst doc/manual.rst
-	doc/rest_backend.rst doc/development.rst
-	doc/talks.rst doc/tutorial_aws_s3.rst doc/installation.rst
-)
-
-DEPEND="
-	dev-lang/go
-	test? ( sys-fs/fuse:0 )"
-
-RDEPEND="sys-fs/fuse:0"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	local mygoargs=(
-		-v
-		-work
-		-x
-		-tags release
-		-ldflags "-s -w -X main.version=${PV}"
-		-asmflags "-trimpath=${S}"
-		-gcflags "-trimpath=${S}"
-		-o restic ${EGO_PN}/cmd/restic
-	)
-
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go build "${mygoargs[@]}" || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
-}
-
-src_install() {
-	dobin restic
-	einstalldocs
-
-	local i
-	for i in doc/man/*; do
-		doman "$i"
-	done
-}
diff --git a/app-backup/restic/restic-0.8.0.ebuild b/app-backup/restic/restic-0.8.0.ebuild
deleted file mode 100644
index 3cd921c0f6dc..000000000000
--- a/app-backup/restic/restic-0.8.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot bash-completion-r1
-
-DESCRIPTION="A backup program that is fast, efficient and secure"
-HOMEPAGE="https://restic.github.io/"
-SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGO_PN="github.com/restic/restic"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-DOCS=(
-	README.rst CONTRIBUTING.md doc/010_introduction.rst doc/020_installation.rst
-	doc/030_preparing_a_new_repo.rst doc/040_backup.rst doc/045_working_with_repos.rst
-	doc/050_restore.rst doc/060_forget.rst doc/070_encryption.rst doc/080_examples.rst
-	doc/090_participating.rst doc/100_references.rst doc/cache.rst doc/faq.rst
-	doc/index.rst doc/manual_rest.rst
-)
-
-DEPEND="
-	dev-lang/go
-	test? ( sys-fs/fuse:0 )"
-
-RDEPEND="sys-fs/fuse:0"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	local mygoargs=(
-		-v
-		-work
-		-x
-		-tags release
-		-ldflags "-s -w -X main.version=${PV}"
-		-asmflags "-trimpath=${S}"
-		-gcflags "-trimpath=${S}"
-		-o restic ${EGO_PN}/cmd/restic
-	)
-
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go build "${mygoargs[@]}" || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
-}
-
-src_install() {
-	dobin restic
-	einstalldocs
-
-	newbashcomp doc/bash-completion.sh "${PN}"
-
-	insinto /usr/share/zsh/site-functions
-	newins doc/zsh-completion.zsh _restic
-
-	local i
-	for i in doc/man/*; do
-		doman "$i"
-	done
-}
diff --git a/app-backup/restic/restic-0.9.0.ebuild b/app-backup/restic/restic-0.9.0.ebuild
new file mode 100644
index 000000000000..89515ce18d02
--- /dev/null
+++ b/app-backup/restic/restic-0.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 golang-vcs-snapshot
+
+DESCRIPTION="A backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGO_PN="github.com/restic/restic"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-X main.version=${PV}"
+		-asmflags "-trimpath=${S}"
+		-gcflags "-trimpath=${S}"
+		-o restic ${EGO_PN}/cmd/restic
+	)
+
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go build "${mygoargs[@]}" || die
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
+}
+
+src_install() {
+	dobin restic
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index a14c888589e7..e8cb51e597a1 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
index 05459a60e549..d80546c1e1f2 100644
--- a/app-benchmarks/cpuburn/Manifest
+++ b/app-benchmarks/cpuburn/Manifest
@@ -2,4 +2,5 @@ AUX 01-variables.patch 879 BLAKE2B b1ede6e0c0086caf3b87bd13753a120b47079339aa8d8
 AUX cpuburn-1.4a-flags.patch 250 BLAKE2B 68e402e16d1b1ce3f278ee580175ddf459993f908e2d8ad1a823b5df619cd0f52b20d2ec56966141ebbd422013b180e4d5602742b3bdb8fec00e87e554dd512e SHA512 6e786ae47148385003529984da314b56918653d36002dcfa10f995a0568703bb269ddb0b4623693e35659415c12ab2ffc641b799389377863b2df0edcc8fe668
 DIST cpuburn-1.4a.tar.gz 9277 BLAKE2B f362380d0f57fd888ee5e5cf8fdf1809ffbc44fc3c3935b64adbd2c29ad0b3f93e5c032fdc265355574625417e7f5f9e9012e6f637c87fe0ae5e2043258f0822 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce
 EBUILD cpuburn-1.4a-r1.ebuild 719 BLAKE2B 7c9565035030ed64abfba774264d371652b7e43358baef7dcfcfaf2f56ffc2828ccf5d84c28499d3be1f489637fe2883e4649c6b7a6bdafc55bbded0c7601ba6 SHA512 0516ac5c4b275e6a62269827271d321c259894540e558c9f4e15615d7b63496b8e3a75b36d69aeb2bf8558c5903e86381a3b7af64e2c17812e176b35a4fc726a
-MISC metadata.xml 403 BLAKE2B 1cd2a687108ef755fab028d21c510b74eda1a0ceeb08e742b773bf808ef986f53d1e6c81e648397a671146bca201e9338becbef9a58299c21cb42e2526fe824d SHA512 4fcbe8e89fe0f456d08ed31c79fe88d35a21681cfdd15f8bb68ee7688cf59df01291ecbfd6d95315c347f2b4096797adb3e63df759c5a25fe10f681153162510
+EBUILD cpuburn-1.4a-r2.ebuild 1373 BLAKE2B 17b046c45cefc55b3083d4c16776ee68017376f38a9a066104bcc74959744cd490c069f072c10423fc5a29d48f369cbabb1e405b2700523b0868fdacd5b5e299 SHA512 2f98f322e6b5f68ed2212ddc8c92e0976b67c6660d47b48efae1175b6e14a46a75982a1ba3c5bd8874f32451e0d142c31b288d43b3793493b37197c6a8c1275f
+MISC metadata.xml 602 BLAKE2B eda46ae4cc60f92470dc83b419169c6daa3703f32f20a56b5c3764b7eef525a733898322f734739ca3cff379c568ffaa4754f996f5a7fe4637f7c7a3fcd23bf8 SHA512 2c6c59071ca30a6159222e37991b6b3367ba4ac6bc30e583b0ebbf537b9fac007df830fad046bc7904b0aa8e95c6e147fd983c219f97a921e5fd1d40dd593b12
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
new file mode 100644
index 000000000000..db1f520822b5
--- /dev/null
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/./_}"
+
+DESCRIPTION="CPU testing utilities in optimized assembler for maximum loading"
+HOMEPAGE="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/"
+SRC_URI="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/${PN}_${MY_PV}_tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="-* ~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/01-variables.patch" )
+
+QA_FLAGS_IGNORED="usr/bin/burnBX
+	usr/bin/burnK6
+	usr/bin/burnK7
+	usr/bin/burnMMX
+	usr/bin/burnP5
+	usr/bin/burnP6"
+
+QA_TEXTRELS="${QA_FLAGS_IGNORED}"
+
+src_prepare() {
+	default
+
+	# Respect users compiler and users CFLAGS and LDFLAGS on x86/amd64
+	# Must be always compiled in 32-bit on amd64 arch
+	# See https://bugs.gentoo.org/65719
+	sed -i -e 's/gcc -s/$(CC) $(CFLAGS) -m32 $(LDFLAGS)/' Makefile || die
+
+	# Respect users compiler and users CFLAGS and LDFLAGS on arm
+	sed -i -e '/CC :=/d' -e 's/^.*-mfloat-abi=softfp/	$(CC) $(CFLAGS) -nostdlib $(LDFLAGS)/' ARM/Makefile || die
+}
+
+src_compile() {
+	if use arm; then
+		cd "${S}"/ARM || die
+	fi
+
+	default
+}
+
+src_install() {
+	if use arm; then
+		dobin ARM/burnCortexA8 ARM/burnCortexA9
+		local DOCS=( "ARM/Design" "README" )
+	else
+		dobin burnBX burnK6 burnK7 burnMMX burnP5 burnP6
+		local DOCS=( "Design" "README" )
+	fi
+
+	einstalldocs
+}
diff --git a/app-benchmarks/cpuburn/metadata.xml b/app-benchmarks/cpuburn/metadata.xml
index 5aa5eacd8883..140c5aa589a6 100644
--- a/app-benchmarks/cpuburn/metadata.xml
+++ b/app-benchmarks/cpuburn/metadata.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
-		CPUBurn is the ultimate stability testing tool for overclockers. The
-		program heats up any x86 CPU to the maximum possible operating
-		temperature that is achievable by using ordinary software.
+		CPU testing utilities in optimized assembler for maximum loading
+		P6 (Intel Pentium Pro/II/III and Celeron TM),
+		AMD K7 (Athlon/Duron/Thunderbird TM),
+		AMD K6, and Intel P5 Pentium chips. 
 	</longdescription>
 </pkgmetadata>
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index a38584ddad5b..1b2556b2fd50 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -2,8 +2,10 @@ DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b33203
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.2.2-Linux.tar.gz 71028908 BLAKE2B 640df8bb207ea1a0a8b5c7fc4725b517406826b5d9045eb2970515c4d175be1e9972582544f7088c113e725c067ec119d390c2cef183108dd592005e60740e8a SHA512 616b8eed266407154a3dcf09af5c4047cf0be8f852d6aae663f26a29d4a9df3bcc2b4c233b21614071ee0be3ca7316c5f09bccd4769b6db78a4e6187e281920c
+DIST Geekbench-4.2.3-Linux.tar.gz 71032570 BLAKE2B 9589c355561acffdfe6b68fcb7a73a7d3c87376db10b70d471d7970491c9ce29cd66e9d5f48968cb2b34fad6440a8667ebf061976e5b838295fb002442de101a SHA512 eaeb1657a1eff0dd8fac4b9a89e5a7d0da22e396e35ba6a1255c2a5c4434ad1a23cda54f28f4271a9a5450e57b3601c344964ddd96dcdef1144f17b7fd20aa4b
 EBUILD geekbench-2.4.2.ebuild 1101 BLAKE2B 93dd1eba6ddae5b402cb07268107eaef71270119c0d83206b9951f7ddc4bf68dabb0e332eee312fd7134c14b0b190f77efe629e5e8a51c92c032c85fc1ec9241 SHA512 522b4330990ef4b965769ee4b72edbf8ab2998bfa7d01be159fa6c95cb811d7af2c99e43497f5576102b7041192dab9ce45a91d39bc5fba0eb640052f7e58c63
 EBUILD geekbench-2.4.3.ebuild 1163 BLAKE2B 1613632c4943e554ba9d01fe4b026f713395eba64d9f373ea631f6d24462dfbf889e269d6fe2f254137f0c2c6eab8b1f963955fbd155d65adf25081d34f74762 SHA512 69f90a561f0201d7209e87842f075e9da17a78655490eb801937b0d82e22a5a3a4d4534e1d9a3504516b9da3063093f22016f3b4609040b7fe6d7832edb90d03
 EBUILD geekbench-3.4.2.ebuild 1163 BLAKE2B 638365642db8db662ae19c3ef439a4076a60c7356b3142d850d2570ac55778d8837d46981be1c0ee4d2ea342ee271d95455fa8691baad99c5a52815f818be02a SHA512 b11dde6666585fa1e7471fdbc14749413468808c228e520d235466f0398d998b4118b8dd26cc30c6bdcd7a1beabbf4e4a2db72247bc67516ac07e488b4043258
 EBUILD geekbench-4.2.2.ebuild 1152 BLAKE2B 6b9bfcb5f3fac533eba78c60ad18b80630d70b4c1f54a91be0f93b08918f707006578a277933adb23de6244de6c9244e3fd796c2c1333d2885013ea805f92b90 SHA512 e7b1e6145ae6a82008d2c3d39729f7f621dfc6a1b9c1805aa24ce658ae3c0e901a370676cd600fe7de2aacdd9ad3588ec8bf053ec2648002074d6b037bdc66e7
+EBUILD geekbench-4.2.3.ebuild 1154 BLAKE2B 9c3f97e3bf4caca67d83ae270e84628e82c564df545bba505398bc1429b0bb39b9501a8f98a9a712c3a2472fed992ed5b30266dee7ea1b07c3f59e1c6ad5afd7 SHA512 4cd55ab8b46a8317a56bd7a723c462acc29de7181ff809e03b772528fa7f9130f18c4fc10032f04642960606eed137971c58406d2a91fc2415ec81e164b34fcc
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-4.2.3.ebuild b/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
new file mode 100644
index 000000000000..f3269b8df107
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="geekbench"
+SLOT="4"
+
+RDEPEND="sys-devel/gcc
+	sys-libs/glibc"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="opt/geekbench4/geekbench4 opt/geekbench4/geekbench_x86_32 opt/geekbench4/geekbench_x86_64"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto "/opt/geekbench4"
+	doexe "geekbench4" "geekbench_x86_32" "geekbench_x86_64"
+
+	insinto "/opt/geekbench4"
+	doins "geekbench.plar"
+
+	dodir "/opt/bin"
+	dosym "../geekbench4/geekbench4" "/opt/bin/geekbench4"
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench4 -r <email address> <license key>"
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 5195e52b40a5..91e2add12fe7 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/burn-cd/Manifest b/app-cdr/burn-cd/Manifest
index 63ff0d0543e5..ec2d80287b45 100644
--- a/app-cdr/burn-cd/Manifest
+++ b/app-cdr/burn-cd/Manifest
@@ -1,7 +1,5 @@
-DIST burn-cd-1.7.4.gz 14618 BLAKE2B 0cea9207472a61e6e631890073f8fa9dda64fb6d7630b7bb2d91aec754607a637e0568ac4b210b4ba2e14d0a66b666ebff5da571619cd985a060c6f30f3c9bfd SHA512 21009659342b284654cec17ac597a5d8f7421a3c0112937db1b70563a42f00a781a7156eeb3877d9c23d6338cffa525cf2f25e4191d9444cca72c4821c9690d6
 DIST burn-cd-1.8.0.gz 14977 BLAKE2B 3cc72d908f86affd8c6fef1144ece00ea00ef4cf63858c5a3a01ff83640bd9b513feddf590c774538de6621611bfc842077ef60f28bde6db906aefd0eaa46ccb SHA512 d052d6bd909af3f3c96cee727e222e179d913aa42c2d2afe8104c57b5263b06f318d6ec870ad2862779d757c4d522b7d82892eb0725255261a28243c919b82cf
 DIST burn-cd-1.8.1.tar.gz 153586 BLAKE2B 7762bfe7bb497752c0f78ddc2dba2a00423db2e3ef3dcd02ecb36a60eb6a4ecab69d04bc85971531443b8820cb8320e22349817540d95c694b9861261e6e821f SHA512 2da40c703351e97d164eeef7c5662cad66292b71a97f47ae4ddcbcf11a09fb298c6c9e8160da53b0908434e64048c2397beaa988b1cbc1513660f73d8f2fe1fe
-EBUILD burn-cd-1.7.4.ebuild 473 BLAKE2B e05012ce4589a4dd9d14f53692f5b9bcb7f31d7d815292d14f864eac2c11e2015c5b5ea33098ba73dcd2f7d2c2b7b3806e6f2e00643e4b16f2f87b5ed59b47de SHA512 158198d10e089827df5e12b9976988adb8a112fcc6f05a0d67daebb468ac5104c5779bd38c245d733b2ececaf96d3d77b08188fb61287ca0f5f84c14b83ac475
 EBUILD burn-cd-1.8.0-r1.ebuild 581 BLAKE2B eb577476b615782cd97e9ac12cb412d0e38c6469c28d0b2b1b31ab487422716d6160a340afe9faa900adaa64a0629631650b9d2754f58a2d09829d76d3ddaa2d SHA512 316c9c623639f89c7a0cf59ef9bd31acd48f0d2c1bb63356e44137a4271263088031854b6b7bd735a74087da6c952c6641365688d3a8dfa8b53cc6c9e5068d90
 EBUILD burn-cd-1.8.1.ebuild 625 BLAKE2B 9c94dd42b9cc8e076665a6309a4fa297b7b37b588607185bd55bb6d9afea3998a8b83f2ef420802af9c1db4abfafeb715bec69398005c9439dab0331d093cbba SHA512 ea01a64d3859c2a707ea6c84e580a73ac09bbbb924c41ecea644facb289fe56a2e244013de05853b894d38b1ffbbff0aff2eca35f99e49dd3b0e71269c4067ab
 MISC metadata.xml 591 BLAKE2B 9b54a0ade9fd72fbee30ea4250fb72588580d5515efcba62862b1096b3fe98cbdbb3eec58ac245b92e798b12b22e265d9ffea34fb35562f6bdd576e2a902b654 SHA512 faa26f95c90f49757434682dbe3a309123a67e3bb95b11408a99849dd7935ed0037d5c6de022ede67fa2056cde3ead181c3d6797864f6842a4bb8c980b631eae
diff --git a/app-cdr/burn-cd/burn-cd-1.7.4.ebuild b/app-cdr/burn-cd/burn-cd-1.7.4.ebuild
deleted file mode 100644
index f4a475b8eccc..000000000000
--- a/app-cdr/burn-cd/burn-cd-1.7.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Smart console frontend for virtual/cdrtools and dvd+rw-tools"
-HOMEPAGE="http://burn-cd.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/python
-	virtual/cdrtools
-	app-cdr/dvd+rw-tools"
-DEPEND=""
-
-src_install() {
-	newbin ${P} ${PN} || die "newbin failed."
-}
diff --git a/app-cdr/cuetools/Manifest b/app-cdr/cuetools/Manifest
index aee83eade031..b73e63391d7f 100644
--- a/app-cdr/cuetools/Manifest
+++ b/app-cdr/cuetools/Manifest
@@ -1,8 +1,4 @@
 AUX cuetools-1.3.1-flac.patch 457 BLAKE2B 81ce8f5dcbcad013a032680b5c6321159eb38cb727daabf42afc5bb4bf9effa78a878cd17e7515ae33d962fb4659faaceb35eac692b6650ab184f74758433b01 SHA512 e860a60f0e71b92dac00c8bc84d856cfb6158c91eb48de74cef5cec27eb8ff1b2ebcb0d4b36b36293d9f0f7767d320caa3de06ac60eeed9cc1625e094670287f
-DIST cuetools-1.3.1-debian.patch.bz2 7622 BLAKE2B 86cc5fbf212f560e981bfa5cd7081e09d12c96276aef3045874c26a05db6af779e00af98052acbf39a142178278da20b9488be3743063d780c279c155cc049cf SHA512 a79b7e05452e1b5c8aa385ba831abc1a0db2493f8a5a8ddcc1435f224e81f5a060d2e6152f707360501c284d0e1ef4840a2c6cca200eecf3b741d99f5c285ced
-DIST cuetools-1.3.1.tar.gz 161483 BLAKE2B 7c93db5bfe7ac799ad71d9db27d49b7a687fcfdfdc9c11c85ef10742b26f3c86b104cb83cc4447ab3f143450de523862a6d889ebdc88f93cc1bb9f067a5819d5 SHA512 b1c3f782ea07743f765af5c03f6fbaaad1baa9fc93de1020406afa2b2a14ef5ab67db6647af5c855590102caab6061189744d4fb15eee92ecafd4b69fad338a2
 DIST cuetools-1.4.1.tar.gz 32720 BLAKE2B 108b78f079e0065d1003bf09ee0a14b0ccf615e73cb5749ca92c0ef9a6580b023011d3aed83cea49256bdc743d13c6da5e394de019a120e7f8dc592e086bac50 SHA512 dc81e6ec756f9d040dd913e8f340be136d68619caa24bdec21364f94b4fc0ffcbcf21325c7fd53c9230d6d70a2856b45a32c5ca7f41ec76fa47298bf226d959e
-EBUILD cuetools-1.3.1-r2.ebuild 855 BLAKE2B a8f30c7c469491110b374f41e5cec3247f3663b6ab527a7f7bad89c364065cd010b06be3ba9b291f20e5da7f16911032cc7c4fc8756b0cd3282e525dae4a2461 SHA512 a5ab5803a40530898326e5ce0a8d1ef3166b2a655eff84f6ce652595074f2a9bff977e29d220db35359040ec8898b7cd16f663b37f10f515eadc546964cd52c9
-EBUILD cuetools-1.3.1.ebuild 751 BLAKE2B ccba38e8134b43680953c97e7cadda8b5a2b24e03810c072fcfb18ebb51f4b843a41d7120a6b9fb2c3d6904971dd8a27d6dbb4f7f4bc626f43e8b38db7e23708 SHA512 8fabc961039c98adcfd4b93cd427c9ba31c65bebbeec48099aa9470f509ed6698cd7433ea07b7d866fe32c626d6129904b016a4f9c5bff8444777246ebd28680
-EBUILD cuetools-1.4.1.ebuild 716 BLAKE2B 4098cef5e4d848c99e2d43349fead065538d2730076285c0f9f3856097733ea4c343b239f47bcea1ca197857a1dbe61ee730a756e8036777e1102d930ed44143 SHA512 504fabbb38827aa1474f7294aa5f96964a55a1c8876a6a321954d05ec21861228dae4653e7cf3d83b9e3feb47caa06c59c0bc7135539ae3628b7b279d2e8b948
-MISC metadata.xml 772 BLAKE2B 6a2c3e00838ab9ddba1fc82e2bd18d896f212a1af55429abfb83032c52a954d06236ce2eeb153e24ff7b1b91cd9c16a89f7a4a72660e1034c2eec37214417a0d SHA512 ecc3959a6b771c5924d689406707c05ef22ae816973c54a34071184fa54c5dc3eec83bdd025f238095492f057dcc8f760536cd67e8fe3af30be6e73c444f7079
+EBUILD cuetools-1.4.1.ebuild 714 BLAKE2B 7cd330b1bc284fc98776ef15374cfeb7cae01436c1a7e4c14ad9bfca0712bd17de0ad5076286a0f60c08d625a323ee1fd5b17a28b594c6dd92f6478a8b0a7120 SHA512 3d4fb8ae5b49eb121c4357a736657ebd55769dc393fd2c58506d41c2eb456d6a6782e6509c931f6d64d3d562d09422f1b7b1eb015140c9ca17d5ec38cff2d3ae
+MISC metadata.xml 653 BLAKE2B 826bad3ba9b8cf6ef515fadddacb4d511591fee47614716d1577cdb0fd7fe72b1054186ba94368ba60590c9b118c86a461beda7e3803b8ba34fd6f6d75d7b47e SHA512 475e736ca7ced23d61d721308f0d409f23798dfaed53b4ea35a96307683b21883ddac8ed528a198163b280481fde0204bf875477a883bd7be5984eabbdb64e6f
diff --git a/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild b/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild
deleted file mode 100644
index d95f2f9ee6f3..000000000000
--- a/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Utilities to manipulate and convert cue and toc files"
-HOMEPAGE="https://github.com/svend/cuetools"
-SRC_URI="https://github.com/svend/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	mirror://gentoo/${P}-debian.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="extras"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND="extras? (
-		media-sound/vorbis-tools
-		media-libs/flac
-		media-sound/mp3info
-	)"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-debian.patch \
-		"${FILESDIR}"/${P}-flac.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README TODO
-	use extras && dobin extras/cuetag.sh
-	docinto extras
-	dodoc extras/{cueconvert.cgi,*.txt}
-}
diff --git a/app-cdr/cuetools/cuetools-1.3.1.ebuild b/app-cdr/cuetools/cuetools-1.3.1.ebuild
deleted file mode 100644
index 49d7fae13215..000000000000
--- a/app-cdr/cuetools/cuetools-1.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Utilities to manipulate and convert cue and toc files"
-HOMEPAGE="http://developer.berlios.de/projects/cuetools/"
-#SRC_URI="mirror://berlios/${PN}/${P}.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/${P}-debian.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use ppc && epatch "${WORKDIR}/${P}-debian.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS NEWS README TODO
-	insinto /usr/share/doc/${PF}/extras
-	doins extras/cue{convert.cgi,tag.sh}
-	docinto extras
-	dodoc extras/*.txt
-}
diff --git a/app-cdr/cuetools/cuetools-1.4.1.ebuild b/app-cdr/cuetools/cuetools-1.4.1.ebuild
index 8bc9dc5aacae..2f34d2525069 100644
--- a/app-cdr/cuetools/cuetools-1.4.1.ebuild
+++ b/app-cdr/cuetools/cuetools-1.4.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/svend/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="flac mp3 vorbis"
 
 RDEPEND="
diff --git a/app-cdr/cuetools/metadata.xml b/app-cdr/cuetools/metadata.xml
index f6e5dfbea474..f5c10e8bce60 100644
--- a/app-cdr/cuetools/metadata.xml
+++ b/app-cdr/cuetools/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="extras">Install additional script that tag files based on cue/toc file information</flag>
-	</use>
 	<longdescription lang="en">
 		cuetools is a set of utilities for working with Cue Sheet (cue) and Table of Contents (toc) files.
 		It includes:
diff --git a/app-cdr/mkcdtoc/Manifest b/app-cdr/mkcdtoc/Manifest
index 5e5cf7b2be77..461979ad3ef3 100644
--- a/app-cdr/mkcdtoc/Manifest
+++ b/app-cdr/mkcdtoc/Manifest
@@ -1,3 +1,3 @@
 DIST mkcdtoc-1.0.tar.bz2 18255 BLAKE2B 305a218343c09d77968c93a19ebfc95d4b1fc5fd85792323caca1d7d3254fbb731cf5ca510747d7d35a620269ed59e64d0b15abd7173390b6a17c4817155090d SHA512 1eb06913118f9c300f528ded9b733eb9842f5b781bad68493b2f938b2f2a876d3d9d19000d1e4a1f15974049464db09047ebab1570251241220315f80070d32f
-EBUILD mkcdtoc-1.0.ebuild 612 BLAKE2B ba9d36e2f2e37ee1cc16fb65941ae81fe3981d0b71f90767a28398b2b2b898a9004ae85f96e371e3bb9dfb215dc529afac1330f473e64f0b4a524ff02c4ddbe4 SHA512 737a7168b12b6abbe6f32824a8106e999737d42130f6428ef3c96c144dd9516ede36d12acce34de4b54ec366e6615ad484f202a1c0804506d1cf923465707127
+EBUILD mkcdtoc-1.0.ebuild 396 BLAKE2B b4af39555ca634ebc702770cc898e19eed32f136c3ab78dff2bcf068b11a25bf3079ee834dc1f0ade6aa83a76af573c1dcd35469181cd64acf3a3ff308c4c970 SHA512 dca57c11b19d7c9dd4783afd89607d41a95099b896336a91be11ef6c22d53ad2372d28b980918b03df01ebc6dbb96d0696db2db0b3bbf1cbe63cd615f6772603
 MISC metadata.xml 544 BLAKE2B 061e8b65e8d8b663ab92f9cd9551b8e90fa065253776041a8b7ea526c3a46b621b8a6d6a0020321dc046131fc368b9a9ebaa059e16889e2a5c1b7aa2785ce592 SHA512 ca257347d43ee33420003ec202aeca6fe2a04fb2bc3d1e68a9e07b3239525e4c04a9822223e03e87e4c0df288f83b1df5973f31b69f31c9761e30d10448de2c7
diff --git a/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild b/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild
index ac39595d809c..c49089a56cab 100644
--- a/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild
+++ b/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="command-line utility to create toc-files for cdrdao"
 HOMEPAGE="https://sourceforge.net/projects/mkcdtoc/"
@@ -14,12 +14,3 @@ IUSE=""
 
 DEPEND=">=dev-lang/perl-5.8.0"
 RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake PREFIX="/usr" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="/usr" MANDIR="/usr/share/man" DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-cdr/multicd/Manifest b/app-cdr/multicd/Manifest
index 0309b267054e..dd4bb0070bae 100644
--- a/app-cdr/multicd/Manifest
+++ b/app-cdr/multicd/Manifest
@@ -1,3 +1,3 @@
 DIST multicd-1.7.5.tar.gz 22437 BLAKE2B 7b355fb6a7a99322fa4c3502da7f3949ca372fdebff786ca239260129432596a8556c68d62184ec22ca1c4b1f31b1ab3940793f8656c88f6e1fadd75c96c18d0 SHA512 c17be38d36e0c81a5a230729bbf78c26bfc4e1288f959f6a176951b142772727b58e976e30d12beb05b835aa4126b5410f6f2f8a5aca4bbb89794d336c072b85
-EBUILD multicd-1.7.5-r1.ebuild 520 BLAKE2B 9b5d0b47844f1176c368525340258849338ea3194f3294ab0da8b51cb3765ef82b57f0c9cadfe606eabb46be003b25b112b4f2a2f15b3317e8fe68cc4f781ccb SHA512 7c71f94368d59db4535f52bc3012a09358d17fa67a36e94f03b04f99540d6f69a6584f966b99ba213216c65036cbf9f7d72859fd6e09fbf956c79c1a925585e2
+EBUILD multicd-1.7.5-r1.ebuild 473 BLAKE2B d6079aebd43092ac316711947e140f55141a77729fae1234638bcf8b6da5e5baa61e213834b98f9931e11d217626178d134b194a519494dc8ff3a55aff1e6dd7 SHA512 ae46e61d90dff98ee5b3122dd64a88d6f7df04e04c7cb1f3ebfbdf3750c60fd0ad403d996bfbaeb10b3ae57309b712b09cbd706feabe05fb925939ea5048c407
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
index cdfc6a6c33a5..a0811c55ef76 100644
--- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild
+++ b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="Tool for making direct copies of your files to multiple cd's"
 HOMEPAGE="http://danborn.net/multicd/"
@@ -16,7 +16,7 @@ RDEPEND=">=dev-lang/perl-5.8.6
 	virtual/cdrtools"
 
 src_install() {
-	dobin multicd || die "dobin failed."
+	dobin multicd
 	insinto /etc
-	newins sample_multicdrc multicdrc || die "newins failed."
+	newins sample_multicdrc multicdrc
 }
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index abd2318dd8e3..3a204f5e03b5 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index f672e875681e..a09ae0a77334 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
-EBUILD acme-0.21.1.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 EBUILD acme-0.23.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
-EBUILD acme-0.24.0.ebuild 1205 BLAKE2B 59bf7d798bdd550ae5981ed9bb9df3d4c8d64e93a4b7157a170cfff19f95ae8d98d257f664cb043bb9ea26e508e0831d3bbb3ad52050917fc91e356af7b2879e SHA512 eb44ba59c75ea4068fdde0ba3944a5c3b906fc225713da4dc96ae3b74167242ac974d3f753df2adef9c11e8ce99ac4837ae6fd469fb57d7152c8fe4fb5b9a964
-EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767
+EBUILD acme-0.24.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
+EBUILD acme-0.25.0.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
+EBUILD acme-9999.ebuild 1261 BLAKE2B fd84623bd4510a088e0d27017f4e30a9b5214d1983298905163a4d944fb63bb1240b650a0ae1079398ccdd3c232fa58672b80f260deff64da0d62ef72c9d6a6f SHA512 0da048ccbf900d3dbde6b3d175a435e1337316d29bb900127c0429c434585a0f864aea1ba8af8262c1878ce77203d52d032614ca9722c063d7bf73607ea41cc0
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.21.1.ebuild b/app-crypt/acme/acme-0.21.1.ebuild
deleted file mode 100644
index 1011932ad110..000000000000
--- a/app-crypt/acme/acme-0.21.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.24.0.ebuild b/app-crypt/acme/acme-0.24.0.ebuild
index 610350856377..1011932ad110 100644
--- a/app-crypt/acme/acme-0.24.0.ebuild
+++ b/app-crypt/acme/acme-0.24.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.25.0.ebuild b/app-crypt/acme/acme-0.25.0.ebuild
new file mode 100644
index 000000000000..7c82dc6d67c0
--- /dev/null
+++ b/app-crypt/acme/acme-0.25.0.ebuild
@@ -0,0 +1,48 @@
+# 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})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 3a1dd1461249..d408adeca31b 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 9bb7e2f5869d..aeb6640be81c 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
-EBUILD certbot-apache-0.21.1.ebuild 1070 BLAKE2B 19111adc28465df1a887eb5d6215cae16aa6910f84343e10e400de534ed1c65347be43f4a0dc4a2ab63f28dd1cfe3b39bc21717fc234b3123796db48461738ec SHA512 28d7f90580a2efa136bd246b01833017be2f02c3a5634f06170825dff037ec9f352bffadfd46e059f70fb91d51171a6b71f8d5342341edaae3a1632ad064f5db
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 EBUILD certbot-apache-0.23.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
-EBUILD certbot-apache-0.24.0.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
+EBUILD certbot-apache-0.24.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
+EBUILD certbot-apache-0.25.0.ebuild 1075 BLAKE2B 9348daf5bb723ad14a97eabb5cfb751a141a705164efc7926998388b43eb66c8c69355aa189b4813d4aff5b995bafe34c69fe8d4d6002401ef5634ea4a719351 SHA512 3eb9691a553afa71ccbcfa0878710a04925c9f9cbed44b414548206668793731a10179b931081e590cbcbe209de9786aa75f03075b995736a32c7da71b25c561
 EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild
deleted file mode 100644
index d49cea753975..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.21.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
index 2f2c9cd3e8a5..600149c82dd4 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.25.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.25.0.ebuild
new file mode 100644
index 000000000000..243b9c52b64b
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.25.0.ebuild
@@ -0,0 +1,38 @@
+# 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})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
+	>app-crypt/acme-0.24.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 80471d9e013c..f7a219eabedd 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
-EBUILD certbot-nginx-0.21.1.ebuild 1010 BLAKE2B 31d97f3e848c653447dcdb925a45f5d2d503e367a78f352d1d8bcd7afa84a2ddf8f86238c2ad861bcfcc9ae9f5af951f5a6ed19a2066889eda390b0eb11d29a1 SHA512 6b40179511b4132810140b47b92b728ec3e186682569e9eddf64d35aa1b6150b6e92d1eb4ca19cc8e503304ee5497f9a264c3b478b5c759e7d94ba3a49cb36ba
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 EBUILD certbot-nginx-0.23.0.ebuild 1006 BLAKE2B fa6f8d964f53d9c2e27f7d7392ed5694d0828f7820518a4505902842a41b69afd30345c33d439a412b9ccc501c3524f5478b2f6ed5cda733ebbc2aa10fade0de SHA512 92201d17d53635f1978dceb67bca39abaa529da052fd4d49480041496b6511cebfa3e1d56e242b0cfe294caa154997126c0fbb705e0cb50ae9ec4758f5b828b8
-EBUILD certbot-nginx-0.24.0.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
+EBUILD certbot-nginx-0.24.0.ebuild 1008 BLAKE2B ac4f94a0747dd797fb853dda9bb1a48791e030c027776cd65bc2f0bc491c5753b19392d77454c12fd216e6eb7ad087fa1ef03323e7cdcbb334684ef8e20b91d3 SHA512 319deb49333190fe536ec3ac8b97ecb78c10f9987fe6f725188b0a357e2eedc7ea83a84e1c80efb3c1deed328b97feed049b461a198fbd87327dd46695b3fda6
+EBUILD certbot-nginx-0.25.0.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
 EBUILD certbot-nginx-9999.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.21.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.21.1.ebuild
deleted file mode 100644
index d8d4c6b6a24f..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.21.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild
index dd9e6e8b4372..57e3232d555f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.25.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.25.0.ebuild
new file mode 100644
index 000000000000..dd9e6e8b4372
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.25.0.ebuild
@@ -0,0 +1,34 @@
+# 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})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index a26f3beadd9b..10f33a31ca8c 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
-EBUILD certbot-0.21.1.ebuild 1519 BLAKE2B ea147ef2b73b71a49bec0d1704dde1d16effd9f932fe3efc01b17cbb7d5053adc852be4eb0d6d1f287640a8f434ff3c680766ed009f4dbf5575f64b2f3289f0c SHA512 ab4972592fe9359bda29822033de9547429ff2dd093882123f8befdb3f3d046bda39ec6cd3b6ab7b567375f24fdae1554e383f3e7d471ee8f28cea77abd8b8cb
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 EBUILD certbot-0.23.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
-EBUILD certbot-0.24.0.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
+EBUILD certbot-0.24.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
+EBUILD certbot-0.25.0.ebuild 1553 BLAKE2B 5ebfd6bbb0a4f13b9b81742322af2e71907039a63168dc6dcc46f97e00840beba308e113bf4188c7df03c18212339ca508f32cdc6408822683233983a1316117 SHA512 c5541ddcfb5b4e018a78b9f5184dc0cd05041b46b7eedd96d761478822e3e8a7251877790b35d641c692705512d22dfcd6d24dff2914b9893648f400cd8d6a16
 EBUILD certbot-9999.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.21.1.ebuild b/app-crypt/certbot/certbot-0.21.1.ebuild
deleted file mode 100644
index fe734acd2c25..000000000000
--- a/app-crypt/certbot/certbot-0.21.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.24.0.ebuild b/app-crypt/certbot/certbot-0.24.0.ebuild
index f21b72555c81..ba4271ffa17c 100644
--- a/app-crypt/certbot/certbot-0.24.0.ebuild
+++ b/app-crypt/certbot/certbot-0.24.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.25.0.ebuild b/app-crypt/certbot/certbot-0.25.0.ebuild
new file mode 100644
index 000000000000..cf9f45f6fe8d
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.25.0.ebuild
@@ -0,0 +1,53 @@
+# 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})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>app-crypt/acme-0.24.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/josepy[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v ${PN} || die
+}
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 79e23c2a56b5..ee728fdb267e 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,5 +1,3 @@
-DIST cfssl-1.3.1.tar.gz 6865684 BLAKE2B e7ecf0f8e2f489e4e0bd9064523a90255bf2c85d0edd62f346f90aa27cd5c68bf80432fd77bb8fc64954b75c7add26b8f3230a43c3f82265632079ef699542c4 SHA512 1c33527d1d0c08cac39647e7c6237e655569c474a872b144b962af3e7c39c420d002e719875bbea1f5b502fa640483e63d9a7061bed7875c64565d3f6c15cf47
 DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
-EBUILD cfssl-1.3.1.ebuild 754 BLAKE2B b7e10271d0901f3caf57b8549aa6f1d8c9ab5dec8061552f1dc51fa60d671ea8b309db06717dfc74867e61560e7243850e36b4d7ef13515ef78c72b84ec3b087 SHA512 878de06fbe027df328ec2af15bbf0b7a526ef03acd4e754028403b6d338d182d7711da861d4336a028d7192f744d176e5ee14b236a773efa9e0b69f5a4bdc916
 EBUILD cfssl-1.3.2.ebuild 754 BLAKE2B b7e10271d0901f3caf57b8549aa6f1d8c9ab5dec8061552f1dc51fa60d671ea8b309db06717dfc74867e61560e7243850e36b4d7ef13515ef78c72b84ec3b087 SHA512 878de06fbe027df328ec2af15bbf0b7a526ef03acd4e754028403b6d338d182d7711da861d4336a028d7192f744d176e5ee14b236a773efa9e0b69f5a4bdc916
 MISC metadata.xml 326 BLAKE2B 519dd19dc05c50ee2b35580a1ca47b6be4438fcd5737775b098f2bf7cebd7ec3ff88a3d5c9c27a256cedaaddac4b6eeb20f1dfb442d651a7ec31453c309c7c52 SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa
diff --git a/app-crypt/cfssl/cfssl-1.3.1.ebuild b/app-crypt/cfssl/cfssl-1.3.1.ebuild
deleted file mode 100644
index 6b1f640b3abc..000000000000
--- a/app-crypt/cfssl/cfssl-1.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc CHANGELOG README.md
-	popd || die
-}
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 1ec70041d790..8ad74531f11e 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -3,5 +3,5 @@ AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 EBUILD efitools-1.7.0.ebuild 786 BLAKE2B 8a842f23c5e7ec1afa535dfd7448503a1313cd026eaab72961a517ca223d04ac521cd6ce7c98c920de079c33549b164aa544b44fdfe73c76bd46e7444da2fb28 SHA512 40132fc48114b2baebb590e1b6ac4a32961c1ab6d7393ecf80223fab6bffb6cccc8da1123c67f967602982a23ecc82a1f106856d39ba73862ce5ddf2162d3e18
-EBUILD efitools-1.8.1.ebuild 1030 BLAKE2B 869a7a8a299dac60eeedd0ccb990f96cb151cab36ca68cec602f5f5424609be59fc5c4bfb4b90e42a045bc552ae47f0a0ac8cab326ba5d15fed0460ebe1fb2a5 SHA512 0df50584ba254e4f8f18f852b7c43c461ea10f0dc4be8d597979a657011c3485a0410e2bc746ec46dc9449578adccd692d8530c76d66267e3f3c55d7ed213a45
+EBUILD efitools-1.8.1.ebuild 1348 BLAKE2B fedfa56aa7e7397104b0ad32484e145a2cf1a1cf9caa7cec8e8d84d6c861a2c4f705d6b43998b27eebbce28de04a47c73c8dfc9dd7653079ea07c58ef02ab51c SHA512 9edd70850f64534bcd8c48d7d87ae5dba074f8bae0b884208ed888055853832e2452550e302963e509c89185f10010b5d22081b07ddd92ca7db73951292e1216
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index f18e8b8ea271..6ede95860eb5 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -3,31 +3,43 @@
 
 EAPI=6
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.8.1.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl"
+IUSE="libressl static"
 
-RDEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	sys-apps/util-linux"
 
 DEPEND="${RDEPEND}
 	app-crypt/sbsigntool
 	dev-perl/File-Slurp
+	static? ( ${LIB_DEPEND} )
 	sys-apps/help2man
 	sys-boot/gnu-efi
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
+PATCHES=(
+	"${FILESDIR}/1.7.0-Make.rules.patch"
+	"${FILESDIR}/${P}-libressl-compatibility.patch"
+)
 
 src_prepare() {
+	if use static; then
+		append-ldflags -static
+		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
+			Makefile || die
+	fi
+
 	# Respect users CFLAGS
 	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 888bf9332ed1..640bf43f9f11 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -8,11 +8,13 @@ DIST gnupg-2.1.20.tar.bz2 6456128 BLAKE2B 009a8b8163701f5f5e269caea315a81f4c90c3
 DIST gnupg-2.2.4.tar.bz2 6571487 BLAKE2B ec678470e574fdc9f057cc727cbb902ce525f76adae740722731e318032707d0f72873628024c2070a72c21321f2b8da16153edeafcb4ddeba72de59ff5c73bd SHA512 3d5c93b7662433103e9549d066a6b1a0c09d595851fab712d2ee844a55157e952a8a2dd5deff70fa8dd6817481f81c3fe5135603bca03206857310d04c1067a8
 DIST gnupg-2.2.6.tar.bz2 6605028 BLAKE2B 2de6f8d32e551a8af5c41b7e6220a43645472b3b7f25b168a54343c4279f412d5d8f7a5142451504192259b3fe4a3e3242d12520dadc385f466dd701a803073a SHA512 ad0861c86c1886f701ae05e7cd439449cf0684a7bf461ca2b729c5e93833ee36f8438cd4d7f73a4c60e57060f3d8f4890a809b2bbc31b083f9f61d2f66ccacc4
 DIST gnupg-2.2.7.tar.bz2 6631100 BLAKE2B 81a66a8f738fc2b42d923ccda7d6cbfffc8e938970c04fe02c0146202f2e97fa88d5263aee2f3051e141169f4f02f72ccc53ac831bb57d42740130e3122fa454 SHA512 f858b275876d38b9d3a60e5428574f1008a73a948f67a2fa43bcf1970a5dbb60ec3f0e2b2271243229465eb9b22124e216894f0b3d72004acf3ed0c3481da33d
+DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
 EBUILD gnupg-2.1.15.ebuild 4570 BLAKE2B c88be887786ba1823e7950828039432d08c51053886ac187b3e0d86470e67fd9731b940ae54f25f46c7484d0fcf52db485f1368b56ccc9aa66baa99f0510a3f0 SHA512 385f5c40a42559e3b686d16dedc2ca442dd0a075514184e67eef97624cc419bd0bfc7f7ca6fdd3dc549cb4e3beafce656b725adcf201d27b151dab6456346875
 EBUILD gnupg-2.1.20-r1.ebuild 3102 BLAKE2B 7e63763d5989d876aec29eec09fe9bda9a83a26a0bdda97bb1c2a2bf95b7e7c2d6a727b068b8e6dedc7b07c747486c1f00badf603c03a5ec97cee6747b4138ec SHA512 68eafca6339bab0f118c5ff9119a984ee2b7432942929d429a430c053da568ed7729d13a507d073bebc8a273e74eb40f66585ef84cc9b83181f2ea5d6990d615
-EBUILD gnupg-2.2.4-r2.ebuild 3271 BLAKE2B 1437957efa7c625fc0a4c2eab776645043dfc80651424cd6f72dc1eab7cd530d30313a89baa1bba546ec5addad19c30aea1ceb2afc7252418ce0bbc2fe15e101 SHA512 b39114f09d04fd2fe3657171e703fad10f18687ac70315f15fd3e125a7979324533849fd743c8404e5fcc4d2b1ede9d2749d054c287757afaebf9a0891da8fbc
+EBUILD gnupg-2.2.4-r2.ebuild 3270 BLAKE2B fe28baa02fab59b834d43a932539aef99319438ac841454a95bcf0bebc867aecd514ea7f65b7fbdc0a3c87961852bff6628cef93128faf78332620e110db1d4e SHA512 dfe66cad026daba6b56096e99da472ead7aabcc8e1bfaed76e8891a860fbf9d6ca1560f32eaa02ca3f0dc687aa1826718cd2823ccf10da6f1ff0bc30fd003045
 EBUILD gnupg-2.2.4.ebuild 3202 BLAKE2B 15937df613d5f8c91cf186643983659f431c8f25dbcf0d69db6dc4f02145d587c81cd6a1a62053d492fbe59f2efa921147e72e588f3da52c0a94d7b8e27cc95e SHA512 180a4dec88ac9b800db26cca8a98dba57f8624d08c2167221e90b16ad873f2c113385b98a1abe716ac3eb752d159f8f5cd95a2c69d4150ffa03cf34b7534ee79
 EBUILD gnupg-2.2.6.ebuild 3219 BLAKE2B 1f481af4f31c3298ea6aa3a233c6ca183698957636490bf92737558b936798ae0c06110bc1e9d37f7975fe1a69974a6d06cdfc9e2d9e2c378e5ab644bee9ce2d SHA512 8a8320f58a40f6dd2504346d91474568c40c6527d018e48dacfec81723697dc204d399fa1e7caaef598528132d8d0d8e268590fcb859ba4aeeae72c7b35ef119
 EBUILD gnupg-2.2.7.ebuild 3219 BLAKE2B 1f481af4f31c3298ea6aa3a233c6ca183698957636490bf92737558b936798ae0c06110bc1e9d37f7975fe1a69974a6d06cdfc9e2d9e2c378e5ab644bee9ce2d SHA512 8a8320f58a40f6dd2504346d91474568c40c6527d018e48dacfec81723697dc204d399fa1e7caaef598528132d8d0d8e268590fcb859ba4aeeae72c7b35ef119
+EBUILD gnupg-2.2.8.ebuild 3219 BLAKE2B 2dd09e94733c03b6ee8e1bd2fcb949bc1a5b861698dff5f2176628fb360a14d40318fc678b16d8ace0fd403f6c96b334bb3ad1c4399a4c5d8a7b89855dcbd7cf SHA512 01f76f52f46977ded9ef667d372b30ae53d51e53c5572ab126c84db0e074acd8174538eb68e17c43238d898e8d7f7fb36d677147b3dbe0de3cf04f59375353ae
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
index 2f16527b85cb..7cb0b0782823 100644
--- a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.2.8.ebuild b/app-crypt/gnupg/gnupg-2.2.8.ebuild
new file mode 100644
index 000000000000..d53de1b71258
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.8.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.28
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	virtual/mta
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable ssl gnutls) \
+		$(use_enable nls) \
+		$(use_enable tofu) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--enable-all-tests \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 774899d1c20a..4943dfec004f 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -3,6 +3,6 @@ DIST keybase-1.0.44.tar.gz 31729876 BLAKE2B 945700824e630591f7b79dd5e8253156ee8e
 EBUILD keybase-1.0.41-r1.ebuild 1406 BLAKE2B 98696edcda23f847bbae3bafba3746cab2ca20b63b097b9609fbe89f563d23273039cc0851314d28df3367f002392cfd27dbb0a47a6fb2770e6f3618f1761924 SHA512 8b2c29ff8ebc3c942c1d9bcf0a14b45381853ad72593a18f0c92123e2d915c62ab4b92ed61f121c9c23f0397d966423eb2b2fa2636f591f6cf73a5b490b2c1ce
 EBUILD keybase-1.0.41-r2.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
 EBUILD keybase-1.0.41.ebuild 959 BLAKE2B f94747768552a47f9ca7f9d786d6933caa3fb8df52e183cea08f953cc5e611e94e16bcf107d086a0c625ae888e907d583cd43af1147da5ab0d46eaafd148fb75 SHA512 6c8f0f09c879583bda20b6a693fee84d7ac8434d01c2e60131bf85ceec27eea91874870543b5c1b26e133ef7afd0e7f185ed582b4d49ff669cfa2cc1e0f76db7
-EBUILD keybase-1.0.44.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
-EBUILD keybase-9999.ebuild 1386 BLAKE2B 4809768de299ee735c36c3f0dee89b7f76d9a9492b767793561b98bd92b54f834dfc8c9cec2cb35c99d3aa75772bea47b274db08ba7f88053b0518e1869979cd SHA512 d809d8020947746f1a48f37cf6b3f96a4e3dce60c8f21eba4daaea992ee468eda019bfebfa75fec06be914c78337036317cd852051a6c9ae3edfaa6ae23d8bbf
+EBUILD keybase-1.0.44.ebuild 1594 BLAKE2B 45c65cd0f7b749d8d07a06426b6ab9d7fe16acadeb7b0616b87edc4ebc490f66c6cfe0155ac4d409dc782273a063d144de19fdece9498f9723e03873cc2b95f3 SHA512 b6d0c8ea90998229f934b02b3822565f2368b72f828b6428528fb41649bbd62256e5396171568eadbf2ff9e2887e9322424afa6767889bde316850144b0eaaa3
+EBUILD keybase-9999.ebuild 1570 BLAKE2B 4c8878853bee91128b71b4d37f7e4d3853a9117f9945e15b60405d99efb0e4abbd10d200170ad96d5d6df4a0c61e1ba59119dead1b62dd5ef25472cb0e5743ff SHA512 d7b401bfa1fbb0eeb65b829bc8c7df2d68c3d3e35513f74685e59d8246b59cbf168e55aa91ce6646c2d78254770e19edc0b0bbc58e036119024a3176c11fe3dd
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-1.0.44.ebuild b/app-crypt/keybase/keybase-1.0.44.ebuild
index afb357189ce5..505b2ca3eb20 100644
--- a/app-crypt/keybase/keybase-1.0.44.ebuild
+++ b/app-crypt/keybase/keybase-1.0.44.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+suid"
 
 DEPEND="
 	>=dev-lang/go-1.6:0
@@ -49,8 +49,12 @@ src_compile() {
 
 src_install() {
 	dobin "${T}/keybase"
+	dodir "/var/lib/keybase"
+	fowners keybasehelper:keybasehelper "/var/lib/keybase"
+	dosym "/tmp/keybase" "/var/lib/keybase/mount1"
 	dobin "${T}/keybase-mount-helper"
-	fowners keybasehelper:keybasehelper "${EROOT}/usr/bin/keybase-mount-helper"
+	fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper"
+	use suid && fperms 4755 "/usr/bin/keybase-mount-helper"
 	dobin "${S}/packaging/linux/run_keybase"
 	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
 }
diff --git a/app-crypt/keybase/keybase-9999.ebuild b/app-crypt/keybase/keybase-9999.ebuild
index 05206f40c35b..181e16cb154b 100644
--- a/app-crypt/keybase/keybase-9999.ebuild
+++ b/app-crypt/keybase/keybase-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/keybase/client.git"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+suid"
 
 DEPEND="
 	>=dev-lang/go-1.6:0
@@ -49,8 +49,12 @@ src_compile() {
 
 src_install() {
 	dobin "${T}/keybase"
+	dodir "/var/lib/keybase"
+	fowners keybasehelper:keybasehelper "/var/lib/keybase"
+	dosym "/tmp/keybase" "/var/lib/keybase/mount1"
 	dobin "${T}/keybase-mount-helper"
-	fowners keybasehelper:keybasehelper "${EROOT}/usr/bin/keybase-mount-helper"
+	fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper"
+	use suid && fperms 4755 "/usr/bin/keybase-mount-helper"
 	dobin "${S}/packaging/linux/run_keybase"
 	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
 }
diff --git a/app-crypt/keylookup/Manifest b/app-crypt/keylookup/Manifest
index 751c1490ab6c..48f637596a77 100644
--- a/app-crypt/keylookup/Manifest
+++ b/app-crypt/keylookup/Manifest
@@ -1,4 +1,4 @@
 DIST keylookup-2.2.tar.gz 13188 BLAKE2B 63d1c218fe5fc6a69baa73d58f1cd491125e5718745fc932d802e378c9b0038da12d5f9edac73598e3ecd94b0ed057273c813c3723446d045e4719621d735c3e SHA512 e9aa931bdf33a720b1262449d63e7e9592b375526eb33832ff966968a20dac1a0362e0db0e4444dba868ee4ad8c3e553e9cc3f3c60376d95b8a303e05d722abb
 EBUILD keylookup-2.2-r9999.ebuild 372 BLAKE2B 8d6a21ea93d9883f6747c07eb86d2b3270fc62771773d5daff03f9a73743bdbb0c5c023da682140f4a5f869578a9d3d9a4a344fd13f0e87aaa099cf8f55c8cef SHA512 885d14d1a10e7ddf7d326d2e507fd4d4557fb75e0f854c7348f84a9b97d86c777c7897f15395b609097df0506b4310c2b6a1d4af5e0696a5f83bd978f2e240b2
-EBUILD keylookup-2.2.ebuild 496 BLAKE2B 5288bc57117371c6a6da9f754b332b4188ade1da1df1f0039787daa7b27fe1f2524e3f5ec44e9b933770628e8b55f9ed4e48afb9db1f83f73827832b19c24657 SHA512 874b838d000652793c0f9151daf1a6de46dbdc694fac708a06004653e83d0fc7a7f9d0bc88f100f76949674625416185bf7c582b61ec80e4a7a3b0c33d40eb08
+EBUILD keylookup-2.2.ebuild 486 BLAKE2B 69dc89735a4986f4aa483f9dcc5aab7a894da84af3535b3bee3a0dc07bac436d42c8863ca84b3375dcbe906ca591602c60151cd49a579e3979f7d29c03f12dcc SHA512 7a58431179b681bc02e54965f60004d95ce412363c872d303c717c99d78b973d72e32e986def388184c03ec1e2a693577552454b44f156d932cc81a456bf703a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/keylookup/keylookup-2.2.ebuild b/app-crypt/keylookup/keylookup-2.2.ebuild
index fbb475b11fca..4f441c7cff56 100644
--- a/app-crypt/keylookup/keylookup-2.2.ebuild
+++ b/app-crypt/keylookup/keylookup-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="A tool to fetch PGP keys from keyservers"
 HOMEPAGE="http://www.palfrader.org/keylookup/"
@@ -16,7 +16,7 @@ RDEPEND="dev-lang/perl
 	app-crypt/gnupg"
 
 src_install() {
-	dobin keylookup || die
+	dobin keylookup
 	doman keylookup.1
-	dodoc NEWS TODO
+	einstalldocs
 }
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index b3d8c05cf34f..3e2f8c2b743b 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -16,6 +16,6 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.16.1.tar.gz 9477480 BLAKE2B 16bdd7d6d03ddbd4b070663c3a7a3d2331d54e8590b24f1dc162be2531bfbbbd65878d426a160c65ffc1ba4751f16bbbd177a8a91c01002fde0e886cc1bd91b9 SHA512 fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84
 DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
-EBUILD mit-krb5-1.16-r2.ebuild 4215 BLAKE2B 5b8d1df734687258802cdc5d170cb99cfa27897ebc74deb7af55da09c23a2f3e644f602711f9e48d6af268fe51bc11a6c008440224bb2978ba20bdf3afafe0c3 SHA512 9987324870011391499c4d6d35c6df258172ec423095388b66f097fafe5718c74f8eaf2975919624456b574fbc155d6cf19ec42ebc14ce301e6d92113ab5f4dd
+EBUILD mit-krb5-1.16-r2.ebuild 4214 BLAKE2B ac413ca0883587250f12f17d52eeea4a4f3721abbd2199356418ec04d3e7b4fe30afc23f2a4f50d925bd4021fce47987fe9ea7885292575ed0f50a384a5b2c11 SHA512 ef882f5e38656f9c88f5413ce54475f4dbfbc0bf68de2e3763aaa58bd85d6e156ed6973f29ae6c82fe3a3442d20e3baaf674c0ab3377e263bd19011ae00dcb78
 EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
index 063a8ccbc126..2940175e9edf 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 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="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
 
 # Test suite require network access
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 29a4ab32821c..8b99dd4504bc 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -5,7 +5,7 @@ AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.0.0-r2.ebuild 2886 BLAKE2B 27f6057b0d5d0d474397660d755c90ab8dc025a80d5573e44c71093839efee3c0a126fb5dc10fb53083946c46989cdb63aa1baf6e75f40c2e3aef6bae558bfef SHA512 32cc1cc04357afe5f0b84f1bd75af877e1b849d3a4fc70d194e627a32da883a05037d36d15b25cea67d2963563402c13d125a928278f9326fda8463b5951eb3a
+EBUILD pinentry-1.0.0-r2.ebuild 2885 BLAKE2B 2338a3aaff93a76c8a2e6d621cfd011447f81eb21a5d957468504f4d4c2e77a7acf71c6c80ed8babb9f20879e603a87ffd3e3b88ef706cd06f70a9ec204cb38e SHA512 252e068bd96c9a9c406ba358a69e7f6b9ef6875072236a3cf13995a27524903f2bae1860c65ced27d2ffd532e8797a3ed8cbb180a76e80f2442d56f02010929a
 EBUILD pinentry-1.0.0-r3.ebuild 2958 BLAKE2B 350c3f20934857f72ce46dad5d8a047f5b04c10dbf4f398e346a5b1339a81fa1263296859a240fe717970840ed81b2f271a902d3e26b5d93f108bbdf3117cc20 SHA512 10c088dd6cd0efab43430856615cd795986c127765fbb47c0d324085aac9474da85bd317a8ec23aecc05fafba19f14392ccbf59b1820590223be0eb57855a2a6
 EBUILD pinentry-1.1.0-r1.ebuild 2809 BLAKE2B b67fe9e2549179f6a035e7b47a2a5041e97e2924c381a66f889d656176c1ee464ab023297801f7f0442390565f5697f2e5fb67a54d7a4c3cfb8f5a4aeae23288 SHA512 e27748277d88402c8c46251ab95f7852fc6ff0499b00823cc1a980ebc222568acf6c31d6ebe92a29b414aba0a6f1796679b43ec279e36bd423183a1a25431411
 EBUILD pinentry-1.1.0-r2.ebuild 2876 BLAKE2B 00a80e0c23694d45c5ac529e086934f1ce28be2c46594171d6de17a2eeb7904df1ab031f4ba4c76d00e61944d229feabf204643ceb5a806b98c56566e262096c SHA512 9eccbd9d41ebf030ad823fa66f25509b6f68b29c5ea85a772453dd81a86c35d0734fbdb4b1d24970a7d0e3851dedd9357bf0c804d3f3987f7f34eab86674f923
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index f1444b26ed32..84e0c01de1e3 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 534da53660ad..be83e6fa0f12 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,5 +1,6 @@
 AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb425d83bebf78bc0141411bd447223562c920aea80765811084360fbc964afb7841291081f80cc94060070b2 SHA512 605a602d184c86426d6d875954ad2cb3bee19252ce56e6581df7574a3e324f97ccfcb919fef32f6ff8a393683b8375d97586ed886ae01d87fbe015f2f83f0e3b
+AUX qca-2.1.3-deps.patch 1040 BLAKE2B 4bf0179bf2383328dd97f365c433ee40a87e465b8c0b5396d4cfde07f27a4aedfa2d229900e630606fc43e5a5a35042ffce999f59401c34439e656b0b6f1bf0e SHA512 e20a3a06fef8415287d8837ea5fa2acf3ef60f8a1da6aec7c994987f63336e52ac2460fa76694b82b59f30aa1d59cd22decac246423adbef8ae1658a7f7db78f
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.1.3.tar.xz 686340 BLAKE2B 60ebf9add907632ed17426ee53c6c35a9aed279a4492012f1c174608cbe9579d366feb7ff7bff551d2e9e4ef2f271e8f340fcb4c9e1f67f209657d388567d44f SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
-EBUILD qca-2.1.3-r2.ebuild 2145 BLAKE2B 2e9e467c1028b5eb4ea9b60e48491adbf28c62beee2f22a7af4fbc47672fe17395b4cb659dd2cf7223826880eab0c6b2b6b1829ebb60e84dbd9c30bbd30ce465 SHA512 20cf442c8a8ed86177c940be5e284c29444f4db8ac960b68f4cf2c32b579c8454cab1b5d1b6c9bdcb1c282bd737461853556b5de0c0cf2e4e11fbca07b3b0cea
+EBUILD qca-2.1.3-r2.ebuild 2180 BLAKE2B a74a2d7378bad48e8ad20c30ae91416b79e6f79393566e499a7821cf6fc904f6966c36751b285da4320da5a541fefadaf35df6df192ec4338dfc363323e20469 SHA512 ebca007f517945d9f26ca4fba9536418371013764c95f668774da8f23c1dce722ae1954e2e5505ea5b87446576ac757e2248f829ca515db7249c97d28e0d83b1
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/files/qca-2.1.3-deps.patch b/app-crypt/qca/files/qca-2.1.3-deps.patch
new file mode 100644
index 000000000000..e1ef2e5c0e7e
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.3-deps.patch
@@ -0,0 +1,38 @@
+From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 12 Apr 2018 00:45:50 +0200
+Subject: [PATCH] Make Qt5Network conditional on BUILD_TESTS
+
+Summary: I did not find it in use somewhere else.
+
+Reviewers: iromanov, sitter, rjvbb
+
+Reviewed By: rjvbb
+
+Subscribers: fvogt
+
+Differential Revision: https://phabricator.kde.org/D12129
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28b0169..65b95f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,11 @@ if (Qt5Core_FOUND)
+   message(STATUS "Building with Qt5 support")
+   # Got from ECM
+   # Distros have no ECM. So I just copied required cmake modules.
+-  find_package(Qt5Transitional REQUIRED Core Network)
++  if(BUILD_TESTS)
++    find_package(Qt5Transitional REQUIRED Core Network)
++  else()
++    find_package(Qt5Transitional REQUIRED Core)
++  endif()
+   include(ECMQt4To5Porting)
+ 
+   include(GNUInstallDirs)
+-- 
+2.17.1
+
diff --git a/app-crypt/qca/qca-2.1.3-r2.ebuild b/app-crypt/qca/qca-2.1.3-r2.ebuild
index fc3445a32dde..a1d5bbb0df5f 100644
--- a/app-crypt/qca/qca-2.1.3-r2.ebuild
+++ b/app-crypt/qca/qca-2.1.3-r2.ebuild
@@ -33,9 +33,11 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	dev-qt/qtnetwork:5
 	doc? ( app-doc/doxygen )
-	test? ( dev-qt/qttest:5 )
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	!app-crypt/qca-cyrus-sasl
@@ -48,6 +50,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-disable-pgp-test.patch"
 	"${FILESDIR}/${P}-c++11.patch"
+	"${FILESDIR}/${P}-deps.patch"
 )
 
 qca_plugin_use() {
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 1688536a5697..45bccad62707 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -2,6 +2,6 @@ AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc45198
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-EBUILD rhash-1.3.5.ebuild 2691 BLAKE2B 55cc1850b0f7d66510c349fdfda73fd9729f261ac00d6835e80cbfd56eb7c99ff891b1afb4cf86f8b28a518e95362b28dcec7cf7129084938c58b40b8d515371 SHA512 173c9ec7b77b7f6f39abcf00349a45d92d32463f1482c97f0cf8493e804246427b93e5b3eba34891e46936298e8240db036c1351b7045dba0b92413feca12f86
+EBUILD rhash-1.3.5.ebuild 2696 BLAKE2B bcaedcbbf9641101617be2014b44a0ab0155f856f6382090e7195154e5a15a0709478eaf14ab1e79962da2ae2d9b5fbad7e9ceeee3f344293b678c6a032d7a05 SHA512 2c0553f10b23946c4edc61ef9db1b1f9fc99eed8dff2bbfaca85cf85929aec4c31df308cbafa94dd2c91f86a380933d79ffb5a4b46901dcdc4399272639f759f
 EBUILD rhash-1.3.6-r1.ebuild 1813 BLAKE2B e8093c62235027d5083b7af10c63138d5e39928637c98568d08057292a7fa52474fff68fd6431079b7289fe327320fb44e23af7bea8c7114ccd595412bb6e891 SHA512 04290c4db196edeca5b88a994d83af7e519ffc97a6faad31dea34e233f410f528325d6b1637b83e49789d45937da8331eebb126ad62fd8b537915ff95f664f30
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index dd34f36efb70..b086054c04a1 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index d2888b49c57a..fa6f4d13689e 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/aspell-en/Manifest b/app-dicts/aspell-en/Manifest
index aa8580c9bda8..d86457c27261 100644
--- a/app-dicts/aspell-en/Manifest
+++ b/app-dicts/aspell-en/Manifest
@@ -1,5 +1,5 @@
 DIST aspell6-en-2016.11.20-0.tar.bz2 184650 BLAKE2B 2ece9532bb14243a1470048a16f29df2e90fa6f9399c9c66831f7f4a743be8d6c257a3cd36e5b506ccf8968f03cdd0dd785302e135007e9dd23f8c58767f1d39 SHA512 acf4c0bac9dba5b001481da159768ee65decea480c6c601ca0733091558406a84a7d8efb47c1806b032d8e22e96927787a29f8e4e93563a01361e4cfaf3a3519
 DIST aspell6-en-2017.01.22-0.tar.bz2 184409 BLAKE2B 8a2e214996f412943581a2ac31c315e585ba234484b44d7563b27338dfbbc2947d19854fcb5417736a1c32b7fd8d6b033efc86d2a6dd81256218a72df09eab86 SHA512 2721ffdc7f2823b9104a0d7cfa10d1ba9581432dcbb2584b9519e56a621520177eef55ea5bf9803503c429201141ce0ed4001e75c6b9385bca2fbf8986617a66
-EBUILD aspell-en-2016.11.20.0.ebuild 619 BLAKE2B bbfa3904504f481ac4b91a975ef362b37e150ee9c322279f5cf34164feb1cbc1dd85901df3cb53cc02f70152cecead50221417cd259667517ae3cbbdf54e4120 SHA512 b01e5c39dfd3ceaa6e4f9c3bdd50befb65045d22aefd65aac848aba1abd9d4aec7b126792fab417c831c94ddefe3013c5b22f7f0657294be9260e6d157583f35
+EBUILD aspell-en-2016.11.20.0.ebuild 618 BLAKE2B b92d6905d092d844450bd5bda9a6c7677a80d234035c2883a9e93d0c4f201b39f7e4b526bb252f098cce4d0759c19caaa1210a56b210020feb95aae9623ef2c3 SHA512 ff683fd05294622b8999eeec2524f64c2ca070ce501426e08fe1b1d5ad508bdcbcb9a86d722eafa8383b8c7e121a81b2f95a4bdcffe06d18ccaf8f380139a9a0
 EBUILD aspell-en-2017.01.22.0.ebuild 628 BLAKE2B f3fd0e118d12fd561ebb8aa9380f95106a5db2a5b67ded343c390e7dc97553cc9e0bf9449168e80bc1ef5192e412655677e6f4496af47b6a8a8d3677f9af8512 SHA512 1acc4bbb00700bcf2e555e742c419caface629647409263782f9ee0669499bca3822fa3913fea935998bf2f2df74bcda6d2cb38efe3b07669cce197c5b215836
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild b/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
index de8c3268a4fe..766666647da7 100644
--- a/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
@@ -11,5 +11,5 @@ inherit aspell-dict-r1 versionator
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
 
 LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-dicts/aspell-hu/Manifest b/app-dicts/aspell-hu/Manifest
index f094e32c6705..348cfc9350b3 100644
--- a/app-dicts/aspell-hu/Manifest
+++ b/app-dicts/aspell-hu/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-hu-0.99.4.2-0.tar.bz2 375949 BLAKE2B 933844253b8280d01e4f37f141e566548b3eecfdb16a2fcfeb026698d64667faedeae512d582b7ceb900753c5e2b1fba6b474bb4d85e598c432d0ac0010a9d31 SHA512 95922401f2a8aeac61b117c464b4b83b8101fbe1e0ee758b3284a67c188348db55d900c2898eaa8639ee2db99c3b27e85f9677fc6a4d54caae57dd72101cb320
-EBUILD aspell-hu-0.99.4.2.ebuild 413 BLAKE2B 0ec0153cfd235ba1a0131674e94f364632d650745420ebf0316693bd2bd97013a7a3d46d8a39b2ea7b7eccb96279b17aeb50b728106ab22e069ebe1ab63c2e71 SHA512 e68be386f2a731d54aa6345ca777598c28eb732031954b720f788bff028bcae205d4775d6423cddf942d0efe4b74d1f9c65547b9e3d209584293e786ac7274ff
+EBUILD aspell-hu-0.99.4.2.ebuild 418 BLAKE2B 8c3dce6b682509d52b74e7a502c5d4b961bca1e9d2c20e5c8e73cdd4633db9d2f86667096ae097a3e6a8735d1831311dcac6a46f58736fa9e22ba4829cce482f SHA512 02a34f1699a8f7d2ee465651dcc517b4b58b1e066eea13061acddebc0b33d43b0325b74565b734002cbc494db80bce11b6ae8ab56882e40b8dae53f739c3f309
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
index 4c11f4b34414..2149a4ff7785 100644
--- a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
+++ b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-hu-0.99.4.2-0"
 SRC_URI="mirror://gnu/aspell/dict/hu/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-hy/Manifest b/app-dicts/aspell-hy/Manifest
index a2d61fbe3a63..48768082053a 100644
--- a/app-dicts/aspell-hy/Manifest
+++ b/app-dicts/aspell-hy/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-hy-0.10.0-0.tar.bz2 191872 BLAKE2B bb74a82446b35a487bf61c27349e9c8c047bf9f9e12cb48b884b7aeb19eee4df7c7e4efb86292338540ae23d4081caf88b63409f06617e6a6da82e9bf7648957 SHA512 b2157c1d04e4d4726851fe4cda91fcc3cf0dba8d5cfaaea74deed77d9c5f94473e13784526f884ba483789a098dd3efee936c456606913a731a165ec3eb145a3
-EBUILD aspell-hy-0.10.0.ebuild 408 BLAKE2B f7fcf4a26670cf5978915122a290702d8f83a1f6d9cf62149c0888298a8650fc51b4062864894689fb29b3d4ae1353c64d4c61294428c9712302741d650cfa5e SHA512 8270ad448fc705f9e6e98467c9c3d746f0a4550fa2e0f194ef4f7d182559222519f0e9f12a720dd13e5e13e31ad991d2d5dd95e5766b3eaa5e3da01e5e69f2ab
+EBUILD aspell-hy-0.10.0.ebuild 413 BLAKE2B 8498c907e8d75c59e744c85cca87fe690127bd1fd6ce2b11fa8f9c145941793234df7bbc17e79b92bc2076f512d32d82c247f545beb093a865298e9f92632c52 SHA512 ffc3cb5c5ed74cd8a36b2557a860d00a5d12ec4bee4b2dac0085866ae91869f203e60358c81f8f581f8249b2289995c2547b974d3c2810bee7bf611b01d2fafe
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild b/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
index 87ec14d60c22..92865ec5448f 100644
--- a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
+++ b/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
@@ -13,7 +13,7 @@ MY_P=aspell6-hy-0.10.0-0
 SRC_URI="mirror://gnu/aspell/dict/hy/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/myspell-cy/Manifest b/app-dicts/myspell-cy/Manifest
index be9ffd7b4978..10a191f270ae 100644
--- a/app-dicts/myspell-cy/Manifest
+++ b/app-dicts/myspell-cy/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-cy-20130708.oxt 691468 BLAKE2B 09476ee1d5c945563957e9115613b4fd8e04018127ec4b1dadb776b23674a87ecaededb2ea3d420ff3ff10639d381bb97fe287ab3fd0474c9c5b505a1eb599d5 SHA512 3faa794d0fb62a3f9545afb9740d217b24357be1769082beb8d3fec54fcf5eee9e7ec5b54a316b10e48135db48406d814bdfa3f0448e3c527772fb4e69f17edd
 DIST myspell-cy_GB-20060316.zip 690204 BLAKE2B 59c789b69d77a84ecff54fd9aabe0c876334b3af7ef543885743e6070199d64e693c0c65a91127bf75a1a6a5790f9f98e8d78d41b24f28a51b3ff33db57e45dd SHA512 f573a1f151c64eade7c2901ed56bec58c4f74a0cd409d2ee27e11a37191c98e0df1d889085110ce7d0c3cb1d8e8244f1915101d17a8ec77a4121411b9fb80870
 EBUILD myspell-cy-20060316.ebuild 535 BLAKE2B e6c6081eca6289e7bba16157846ec448223a7124f7e851661f436735c78e0e2a9aa92bf5163ae3114291521b5c44278c10781850e51aefa47dcb4133d2e55d03 SHA512 6cbc6c9bcd20d2f0a6528a73f8d0d9edf27e6133e2cd7fa7ad5aaa419c46e073a16fff9e2cbc301299e366dde7106b3bb5889cdc98394797773492ec08923085
-EBUILD myspell-cy-20130708.ebuild 687 BLAKE2B d0ba4ad5ca49dc26ff723e25da40f499351bb751583b0824701f9a3e84101db3aed79e18bd29212791f7b2d75dcc3105c284e3f21f6788e4f784de43a7fed04f SHA512 0f8f8f81cb555f509bb6a3a7382efb83a88274790800ec819910c2941557458a7fea15720a348759a6b3f478dd684e705a36bb71244d874c4e404a44054b5826
+EBUILD myspell-cy-20130708.ebuild 683 BLAKE2B 776b36b1371dda0f5f8903a5dc3cb4041716805122ba0f53d2d87270252f9f6bed576a382e7ba5d30726a2e0a90eb9d3b4e1c22b0987bfa28f44d674c1209320 SHA512 5308c8762095b3144582d07ca24b652d923dd6ea837b195fca1245eba95775d6043ec96b00ea22816a94c255e99405d4b83d7673516e212f8d7ecb5a39381a89
 MISC metadata.xml 251 BLAKE2B 928eca9aec48183d696373da08b57694ab299774b0be0d2f98fdff84edb3485e9d50ea98695fcdff577b9b72a87e4c47f0d169cafe64f7a84d2962ad0b68b266 SHA512 b89fc6e0fc9b26b3f92f879713d50a150a05549e97ca8125e54e19b00910b5c54269fb59cb822db6a48ec3bbe028f837b34b3fa29e53b11cdd0fdb7a336f8ba6
diff --git a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild b/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
index fcc5f17b2ad7..c4706251f1ca 100644
--- a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
+++ b/app-dicts/myspell-cy/myspell-cy-20130708.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
@@ -22,5 +22,5 @@ SRC_URI="mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> ${P}.oxt"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-dicts/sword-ab/Manifest b/app-dicts/sword-ab/Manifest
index c6f50c70fb36..94c1ad6215f1 100644
--- a/app-dicts/sword-ab/Manifest
+++ b/app-dicts/sword-ab/Manifest
@@ -1,3 +1,3 @@
 DIST AB-1.3.zip 1203602 BLAKE2B 632fcb2ebd5385ad1f6b5c172d209c02ad50fbc2b9416bf663adeaf05638cd7a3701221c279b3a9d372dcf9924d6a1c7fdaab5a3c006c6fae2fe93cf5b74c5b9 SHA512 3c8c3485c4648f8c46f264d5e28ee1bbecf7654a1c1f146518ae82051ded56928eabc0578f8ab9cd45becfd89e5d4497be545187a00b6dac6de5eb45e8b540ab
-EBUILD sword-ab-1.3.ebuild 317 BLAKE2B fa9e752764f38e8a21f119d68807675a9dd2dad69b8446f9fd10bfb678479798ce4fd499a13346875d3d9a7cc77d0ee7ed027bde1ea105a23c401c967f22657a SHA512 65f5a723b583557d54a17a1a673443b88f6c27cb89b52091ea23a5ffdf6c7a1e2ae63d2239101caf1f03becbe3437d4f46e61712c691714ced59586ecd3271fd
+EBUILD sword-ab-1.3.ebuild 317 BLAKE2B 6fe0a5a03e032a2e4fc51578aa1f49d8e10dbfc74fd5291f2f6785ff64aa7b6b63f36a2c7487fa1d3f20042d65513e3b6f72ca8048b13668af118e89641c9d26 SHA512 413b9c23f4ef74104aa9435eba80f0e99f961825fb1f5332a466c25fbd195ccc86a956eb200a790d53bf6f413c13730b8fd30e3a94fd099a5ad2557c26b7c11d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ab/sword-ab-1.3.ebuild b/app-dicts/sword-ab/sword-ab-1.3.ebuild
index 2e694dc9e014..9e3721d96e9d 100644
--- a/app-dicts/sword-ab/sword-ab-1.3.ebuild
+++ b/app-dicts/sword-ab/sword-ab-1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 SWORD_MODULE="AB"
 
diff --git a/app-dicts/sword-abbott/Manifest b/app-dicts/sword-abbott/Manifest
index 885fa6361a23..74d757953ede 100644
--- a/app-dicts/sword-abbott/Manifest
+++ b/app-dicts/sword-abbott/Manifest
@@ -1,3 +1,3 @@
 DIST Abbott-1.1.zip 435868 BLAKE2B 905e0a08b27a28f2de227738a3c2b48818c39cc4b5115c48ffaacdd817435ebd003cd71c0e011d18437a8a87277c2d352a4e344474b5b66de1d19133b975b9a4 SHA512 999fa69c552296140c6bb4309848b61c53e7cd96543b07d13b43bdf7250b55f33363961105058378fb4979a52e928fe2c1e0e6ff7655839fda0cd1fbc2a12fae
-EBUILD sword-abbott-1.1.ebuild 336 BLAKE2B d0a58c9ed89205828d1ec72d1088fd6b381ad978bead2024549d9a813f7995e25030537b95a5f8b4ef92388aa6cdadfab22f690708c862699ff3615e2b369a73 SHA512 5f7c8660035b8b3f0f59aa0f93ceb6e305e55d1a1115bdaa2026e54cef07f595bf8bfe2675cd03a9fa1888cef86fa1b723d6d88d27cb4292fe111be2a0d32de2
+EBUILD sword-abbott-1.1.ebuild 336 BLAKE2B 8abdbb4f11012a980ea10aa9df37c8cd036ea3c592e0a84da901c739072f31fa9cdac8d7117ad9d936b2aaa6a55df99821ef3336b459c4f03a99baf4f81e86b9 SHA512 f3e03c3b4a970a6546586be6115b0f37050c73e610fd8218c55f1a76f6f48113a4d3067548be0098b48a08dbcf5fa30fe5df316dcefa9073a70311eded5a7df3
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-abbott/sword-abbott-1.1.ebuild b/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
index c942fe22fcba..2cf857b5b306 100644
--- a/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
+++ b/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 SWORD_MODULE="Abbott"
 
diff --git a/app-dicts/sword-klviklingon_en/Manifest b/app-dicts/sword-klviklingon_en/Manifest
index 0913e07c8363..4578ce7a2d21 100644
--- a/app-dicts/sword-klviklingon_en/Manifest
+++ b/app-dicts/sword-klviklingon_en/Manifest
@@ -1,3 +1,3 @@
 DIST KLViklingon_en-2.1.zip 9892 BLAKE2B a38c7eb5cf290761d8ccfca9719af60d7a8dd955817bfa47d8a423f39ae4d9edb22fa3b486ba1cc506ada15031cb998434f2cb754712922eb570a6a681fe9ff8 SHA512 4e45c5f0e3b2c7b7dadf08141e65e1bc8130ce9c75c56752b9d3216d2dbfaf249e774565d617473754acf4ecd20bacbea4d0789366cbbff15e3c688b18b2d795
-EBUILD sword-klviklingon_en-2.1.ebuild 393 BLAKE2B 0a15132a4e63be261a19d0c4fbc2497867097734bf198aa316bb4c188b5cfcb0833e324bd7f650333ea67c1f7be163b4850a2064083d1f6b0491a24a4fa6a452 SHA512 8e588df42aab3a2cf3f2dc51e324257b152c2773ea461f3e2cc4eeb09c768dcb3825fc795093a5788648753505cecdff399ad90ac8f5ff50379b58e694ab8db4
+EBUILD sword-klviklingon_en-2.1.ebuild 386 BLAKE2B 834b153b5e418c21fa68c322be375a82023ce35048451304217ea8282da54fd532a235b20afa353544f69ca13e5094ed6477281b4553a195907b5684b44cb8fa SHA512 6ae20b1d562238ab7e3711705a8ee8639d54b8e904941641bfe65883fb760a8655787c6ed64be0191ae8f229cd37c3983e62afb92a925eb274cad3c750043041
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild b/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild
index 585f0be77339..70cf8f3b2939 100644
--- a/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild
+++ b/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
-EAPi=5
 SWORD_MODULE="KLViklingon_en"
 
 inherit sword-module
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 17b847394789..f55b8ca89ce6 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index c92a98bc1c7e..28bf70c622c2 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -4,8 +4,7 @@ AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc6079
 DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
 DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
-EBUILD doxygen-1.8.13-r1.ebuild 3744 BLAKE2B 30d92ffb3614533e52c0ad3944ffc214eaad5d68a04de15b25355db91433ac86e2af6d7237d3819513d9a21971944d0c216d6b0977426baa57fbc7d4ee52e727 SHA512 3e9289cc32c5beef3c5c1eef9be2bb18fa43748eeccf821d42514bfd5bff64e5a56c03ab8b91134e697a9091c83332ece3aa16153a401dbaaaab38d0d5fc5043
-EBUILD doxygen-1.8.13-r2.ebuild 3094 BLAKE2B 4e77532c8bf21831d310af27e1d0025ac6b6530fc4da374a36fa1d7cc061326b36c73805454dd8b2389acea09446a534ad8eae891adcae81c0cefb671241c114 SHA512 ee8eb067c38f8fa24ff5bd4b2fd6da04e4d5b60779ae2eb44d96333e35e18e594b17d81fee700bed68fbb3b125d5d59e8449600c023b3abefc8de9e01ea133f0
-EBUILD doxygen-1.8.14.ebuild 3051 BLAKE2B 1ae3e1b7519fbb144437162c57acef7e8dfa7a1de494ec79f35642316f4952e9e22ad1f708ea9acb17201f6e922abb496b85cb1e2e52affb05e4c72edf273298 SHA512 e8ccf14e86847880252d6384160a5f52fc2acde041daf2da116ec94c2b7a1828c25f2ed312976fd4df6a46a177842d11efaf4a60f35db0de6db5df6c6d255995
-EBUILD doxygen-9999.ebuild 3072 BLAKE2B 3c1ee0ed71e60b85f1f754c61adb91c013edfed7d66a1f45993003df30d4c6073feb540d4c78cc988bd7517583b22ffc773870baf1f108a107c372edea077bbf SHA512 5a046846eb2f7cc163f33b350c6bb1b26c8bf81109d015d9fb9deb32717f6e1ab94ca73488a99d0075f130bc4f91ea66e9b9ae82f6ecd8cccb505a0ad0b27be3
+EBUILD doxygen-1.8.13-r1.ebuild 3743 BLAKE2B 27ff1130731c6205ba3332a00a5b2d5175e3f5980ffffdb8dec65ae8ff1ad2893f48dca1ca77d07eb7be1b8d03509e17b752b02b44fce10601705af6b6c93f38 SHA512 aa8d218d2044b769787a82482a0483b219e17c656c3e8ad806fdda2026430bd63654113676caee8572bfeb1bc82aae6f54b55f0dee9e7b0ca723f1fb773352d2
+EBUILD doxygen-1.8.14-r1.ebuild 3071 BLAKE2B 0b4be122b9e14bad66be6bbc2e4e1b929359d088b053bc5eade4f0559c639da1ec8b7065d8adf150b3d49a708a9f01fa412ae81235a3e4ccd8874347d5df2510 SHA512 b080f4a0a85993f705a8bc0e7f56d39f16837e0c754e32be7170cec92ae03558c45e3937cd083eba9ec3e48477d34afde3ecf68250e4c8ed85081997ee40d24a
+EBUILD doxygen-9999.ebuild 3097 BLAKE2B 6bd1e6c6fd59342bd060f4b4dcfe19997ade7cd570401d8306c67b49eabc9487af84ddb768682d749d2ac045072cbc33f28ccce3fdffbca8e971f1be733c9c05 SHA512 84a7175f62eac4cc2af66cf24e395e53779c2e0ed776aab3d6a0dcba0efc97ef20f8bb2c7b1c64fc7341f0ab333c0a0d6872a82e52dc5b4ee26b00065eada392
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
index 035383b82d28..980992918892 100644
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	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 ~x86-solaris"
+	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 ~x86-solaris"
 fi
 SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
diff --git a/app-doc/doxygen/doxygen-1.8.13-r2.ebuild b/app-doc/doxygen/doxygen-1.8.13-r2.ebuild
deleted file mode 100644
index 85605062e13c..000000000000
--- a/app-doc/doxygen/doxygen-1.8.13-r2.ebuild
+++ /dev/null
@@ -1,131 +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 cmake-utils eutils python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	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 ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( sys-devel/clang:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doxysearch? ( =dev-libs/xapian-1.2* )
-	latex? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.13-NULL-dereference.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
new file mode 100644
index 000000000000..dfb84cd13d56
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
@@ -0,0 +1,132 @@
+# 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 cmake-utils eutils python-any-r1
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+	SRC_URI=""
+else
+	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+	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 ~x86-solaris"
+fi
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
+
+RDEPEND="app-text/ghostscript-gpl
+	dev-lang/perl
+	media-libs/libpng:0=
+	virtual/libiconv
+	clang? ( >=sys-devel/clang-4.0.0:= )
+	dot? (
+		media-gfx/graphviz
+		media-libs/freetype
+	)
+	doxysearch? ( dev-libs/xapian )
+	latex? (
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	"
+
+REQUIRED_USE="doc? ( latex )"
+
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	doc? ( ${PYTHON_DEPS} )
+	${RDEPEND}"
+
+# src_test() defaults to make -C testing but there is no such directory (bug #504448)
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
+	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Ensure we link to -liconv
+	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
+		local pro
+		for pro in */*.pro.in */*/*.pro.in; do
+			echo "unix:LIBS += -liconv" >> "${pro}" || die
+		done
+	fi
+
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+	# fix pdf doc
+	sed -i.orig -e "s:g_kowal:g kowal:" \
+		doc/maintainers.txt || die
+
+	if is-flagq "-O3" ; then
+		ewarn
+		ewarn "Compiling with -O3 is known to produce incorrectly"
+		ewarn "optimized code which breaks doxygen."
+		ewarn
+		elog
+		elog "Continuing with -O2 instead ..."
+		elog
+		replace-flags "-O3" "-O2"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Duse_libclang=$(usex clang)
+		-Dbuild_doc=$(usex doc)
+		-Dbuild_search=$(usex doxysearch)
+		-Dbuild_wizard=$(usex qt5)
+		-Duse_sqlite3=$(usex sqlite)
+		)
+	use doc && mycmakeargs+=(
+		-DDOC_INSTALL_DIR="share/doc/${P}"
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts" # bug #564944
+
+		if ! use dot; then
+			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+				{Doxyfile,doc/Doxyfile} \
+				|| die "disabling dot failed"
+		fi
+		cmake-utils_src_make -C "${BUILD_DIR}" docs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/app-doc/doxygen/doxygen-1.8.14.ebuild b/app-doc/doxygen/doxygen-1.8.14.ebuild
deleted file mode 100644
index 502086e771c6..000000000000
--- a/app-doc/doxygen/doxygen-1.8.14.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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 cmake-utils eutils python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	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 ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-4.0.0:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doxysearch? ( =dev-libs/xapian-1.2* )
-	latex? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 9f082f097a2a..0f8cc61578a8 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="app-text/ghostscript-gpl
 		media-gfx/graphviz
 		media-libs/freetype
 	)
-	doxysearch? ( =dev-libs/xapian-1.2* )
+	doxysearch? ( dev-libs/xapian )
 	latex? (
 		dev-texlive/texlive-bibtexextra
 		dev-texlive/texlive-fontsextra
@@ -97,13 +97,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
 		-Duse_libclang=$(usex clang)
 		-Dbuild_doc=$(usex doc)
 		-Dbuild_search=$(usex doxysearch)
 		-Dbuild_wizard=$(usex qt5)
 		-Duse_sqlite3=$(usex sqlite)
 		)
+	use doc && mycmakeargs+=(
+		-DDOC_INSTALL_DIR="share/doc/${P}"
+		)
 
 	cmake-utils_src_configure
 }
diff --git a/app-doc/linux-device-drivers/Manifest b/app-doc/linux-device-drivers/Manifest
index fde19c236a71..030b4c269792 100644
--- a/app-doc/linux-device-drivers/Manifest
+++ b/app-doc/linux-device-drivers/Manifest
@@ -2,6 +2,6 @@ DIST LDD3-examples.tar.gz 77780 BLAKE2B 76774a4c6ce91b7332b4b5fa92b8e2309a24c83d
 DIST ldd2-samples-1.0.1.tar.gz 123791 BLAKE2B 5cbfe4925af42688e10af86d341be6d8cba2c4093f2ce293705f9e72f5b2b65f4ffd5809cea00e1065351aea8314a38b3d2c0eec3c41ac3a55903a9c8b6f8c34 SHA512 c6d1c72f0b71806cc719f758b62f3ee2a5bc1c66b63399f2765c0b4edfb2f89945e1248607faae1a88c9278d74c1edfa42f4c4408d926883b1c82a650ebbdd6f
 DIST ldd3_pdf.tar.bz2 11553208 BLAKE2B 539903963d62cbbf15399726a6dbf795cefc0909d10f0383183dd3ee4408c6616c4548331f3cc9cff2b1c6ded6a84d378278bc4e2774df18bd50980ebc406c0f SHA512 46e9f9c2c4e5ce5d325e071f4638ebee772fb55c7c3c0f4a303a35e7ca3576dfccf655bbbe6ef8cf6be0558a1c84addf6a4b59b6c50b621c495f3b75184653a4
 DIST ldd_book_pdf.zip 6971754 BLAKE2B 161ec5b96bedba16958521b7b8605a515d7152eb75c661b2a66d27adeda6235de30fec437016c4f9fef559c27dfac4a9c4d0bee8b6eef89da3af30a9c745a158 SHA512 f30675ff5279df6c689cf4f936aa6bd50f6aab8254e557a6a3be87217efb2c6bc30de8efd489ea5c86f86ebebe2b3ac119b0965fd567caf757e9d6d67d02676c
-EBUILD linux-device-drivers-2.ebuild 667 BLAKE2B f0a76bce2364f3f349607115344be545f6fd175c5f786b9fe6d22130ca906c1df391e7f056db68a36bd4ad051a61eb610729a9f7eed4403ce8a11cffdfb060bd SHA512 c163c236c95765d4e594cf702ca854bd5c530f5aef029338353681b3d92939bc1638d6237cefc95acfca5309f4c8d213bf08a4f253ad91be78b27ebd44e1191d
-EBUILD linux-device-drivers-3.ebuild 783 BLAKE2B 348ecb2b4f9abd58b97f3cc7a3a5267713f828454ef587037776c2f51ffb8bba0bb5b5b1a0c37f3898f1e82fcb08919a4e7f63e8f67e6af38bb498ad2f7871ee SHA512 be5796bec0971a0f0a705ac086979ff8219332c3a3a839a78d41a2e1fa2bc760e3029ab86fc2e06c6f9ad7deaf056a85fa6247aac02e079f9f37bd90a822321f
+EBUILD linux-device-drivers-2.ebuild 636 BLAKE2B 82c129a5161575248b0856b1ad69ae41bd4dae2259d1a62332429484e87b71fb9155717b4e57854d43c4a00b9a0389f94bfc59bd6563fedc33b594437c52209f SHA512 877e8996a5b9b1653c4d1dd9fd0534425fda86b0eccc484255895656eca617d795b62ec6279e15559d0c3bc47daca1eb9ea784737774cf0c7cd4912fea5bfc01
+EBUILD linux-device-drivers-3.ebuild 751 BLAKE2B 8214f902c45f53c4605a8882da84bf7a7999651641ef8f401c164aefc113659e9f84f7893243155034d4e0a3d13e3d2c066d8f83cc5bfd9e88b543de7706e64a SHA512 b994578148bfde514248327bcf95bef1744adfdabbdfd4228d0351353512ca1688756519c5d3a41e3c7683727c18ce481907ce189b78d060ff2f593d64d6b739
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
index bfd14f38cc43..54900698a637 100644
--- a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
+++ b/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="howto write linux device drivers (updated for Linux 2.4)"
 HOMEPAGE="http://www.oreilly.com/catalog/linuxdrive2/"
@@ -20,7 +20,7 @@ S=${WORKDIR}
 
 src_install() {
 	insinto /usr/share/doc/${PF}
-	doins *.pdf || die "pdfs"
+	doins *.pdf
 	insinto /usr/share/doc/${PF}/samples
-	doins -r ldd2-samples-*/* || die "samples"
+	doins -r ldd2-samples-*/*
 }
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
index 60920ab46d5d..bb2198f12426 100644
--- a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
+++ b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="howto write linux device drivers (updated for Linux 2.6)"
 HOMEPAGE="http://www.oreilly.com/catalog/linuxdrive3/ http://lwn.net/Kernel/LDD3/"
@@ -23,7 +23,7 @@ S=${WORKDIR}
 
 src_install() {
 	insinto /usr/share/doc/${PF}
-	doins ldd3_pdf/*.pdf || die "pdfs"
+	doins ldd3_pdf/*.pdf
 	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/* || die "examples"
+	doins -r examples/*
 }
diff --git a/app-doc/mkdoxy/Manifest b/app-doc/mkdoxy/Manifest
index 3b7b26394e97..97aedb724dfc 100644
--- a/app-doc/mkdoxy/Manifest
+++ b/app-doc/mkdoxy/Manifest
@@ -1,4 +1,3 @@
 DIST mkdoxy-1.0.0.tar.gz 11109 BLAKE2B 348d62a189d2f79432eafb65824b90bf0a3f82fab3621edcdc9fc04859b1a901cb71fd05773aee57431559bbc7a1055668fe710e719a6a8fa86a987b2c8d64e2 SHA512 0d40282da6b15cdbfe10e41549acc48241e6732519025e93f38d5d76c93ff180b41cc458fc8dbad4ab81bc28a96e4801c15577d39496392a05e743e581d19241
-EBUILD mkdoxy-1.0.0-r1.ebuild 549 BLAKE2B ab2dd5578b9c850bdc8c06a1f6589aed41d880157bfc6a0c0e00b1be24ad434198cc2893d013d5afca53882c8642f7d741ca947803187027ca5f4c25fdc41910 SHA512 8b6d233f691770e2f21bd3ca1c9a75b8d8348923a8b06c0683394854a240f6570c1ca48f0ea10c6618ef9b540453dfc13f6b1125344b76bb8640c98f369c70e6
-EBUILD mkdoxy-1.0.0.ebuild 525 BLAKE2B 82b77033e710ddbb73efdb56946c39bef726e2cf70657c0962b58ca3ad1c230c5af134aa4d3e6ab5cd7aceccddf18b1b4a3204a482756bbbd7eb15d46da476d9 SHA512 972310d237b60e7ed38277a7d8614b423248a3f0e75d9214466ee85b31459390ac8babdb1938f395128bded2170402b55ef5a185294b14ccea0cdfc0655f7184
+EBUILD mkdoxy-1.0.0-r1.ebuild 548 BLAKE2B 5d7ce5187b32d8adf7f536f5f8b6cdffb929e8cc8386f2987260889dae888515accb0f7d85a949d1825158437133f5ab9f3541781e7e152eda3d12b6cf8b6595 SHA512 47d6c11736d53fe33e62412dbca79a5b7d5a865a4a394987a265ab3d9ef82ae49fe36f6d2a73cc36bb4de89dc54f1abb91f38db7f9e5e23a14c31c7ece4da71d
 MISC metadata.xml 353 BLAKE2B 0433be5fd165f3af420f9f1fe357b7ea3edb785662dfcf3c4a47fbfdf7134ad82b733bd6d54ca5c9bb9640fcdd35e0a0b94634071dfe6ffc50018e0f05477d38 SHA512 aaf9f25dbd03b04756347b66753434800e575c2c9e63ebbbd58602c7a67929498db6b9ff4c3b50ff1031f49438c48cdf88d61169e00bd09b2b6510a68666ae83
diff --git a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
index 1aaec08132b0..7241ac00ff6b 100644
--- a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
+++ b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-doc/mkdoxy/mkdoxy-1.0.0.ebuild b/app-doc/mkdoxy/mkdoxy-1.0.0.ebuild
deleted file mode 100644
index e0d729e51c22..000000000000
--- a/app-doc/mkdoxy/mkdoxy-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="mkDoxy generates Doxygen-compatible HTML documentation for makefiles"
-HOMEPAGE="https://sourceforge.net/projects/mkdoxy/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="app-doc/doxygen
-	>=dev-lang/perl-5"
-
-src_install() {
-	dobin mkdoxy
-	dodoc AUTHORS ChangeLog INSTALL INSTALL.gentoo README TODO VERSION
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 7acf6c98d5c2..04682c4d03e9 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 0790e8e991ca..616e4cad3f74 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -6,10 +6,12 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
 DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
+DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
 EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c
 EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-8.0.1645.ebuild 10502 BLAKE2B 47db270abf2ea71b92173df98377634c0b59d04383059ac557c0c8fcd8aeeb11ff8aaa1a7cb4b40819f386b040952ca356457e500d9b0a9a553e1bea60379a16 SHA512 da4f6c564a06f5f8eb50a56836235eddadd20515afe66a74efd0fce24a3a048db52a0cc0ae8d7e5fbf5fd57f0861e0a50e966a4a31f106059f0952ceccb7b589
 EBUILD gvim-8.0.1699-r1.ebuild 10448 BLAKE2B c8002b9f8669abd503875a20cc9064210201c6dd88525290264395f8ac3f94bd9bbe25b2af0a6cd22105e380eada731c524c7cc53aca1a3943dd2de6345134ea SHA512 e5918d554625e921f081a536646075100ffceaefc67c610c6948f154f3a3e69a37cdee9bd87acdb9774df58ecdaa4213ab0ecdc09756d9a15f7bce523a672ad0
 EBUILD gvim-8.0.1699.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35
-EBUILD gvim-9999.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35
+EBUILD gvim-8.1.0034.ebuild 10447 BLAKE2B 52bf51193fadf512feccc8691d923cf7ca9e62faf037db5bced7a43cdcfe3b2bbd0b487cec1aa8f93674760cf5a9212c4b5a64bb68ebeb0e497ea50526e32839 SHA512 dc9f1fe1479fa607f376762abc8525118db403450e86547545f0aa05b7d53f0eb8fe7ac190ea65e08137501f3e4bb41b739ab580797f98ff707a4ab290f442c4
+EBUILD gvim-9999.ebuild 10447 BLAKE2B 52bf51193fadf512feccc8691d923cf7ca9e62faf037db5bced7a43cdcfe3b2bbd0b487cec1aa8f93674760cf5a9212c4b5a64bb68ebeb0e497ea50526e32839 SHA512 dc9f1fe1479fa607f376762abc8525118db403450e86547545f0aa05b7d53f0eb8fe7ac190ea65e08137501f3e4bb41b739ab580797f98ff707a4ab290f442c4
 MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126
diff --git a/app-editors/gvim/gvim-8.1.0034.ebuild b/app-editors/gvim/gvim-8.1.0034.ebuild
new file mode 100644
index 000000000000..57cb962fe0ba
--- /dev/null
+++ b/app-editors/gvim/gvim-8.1.0034.ebuild
@@ -0,0 +1,372 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+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 ~arm64 ~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"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=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
+			)
+			!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_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk3                    GTK3
+	# -aqua -gtk3 gnome             GNOME2
+	# -aqua -gtk3 -gnome gtk        GTK2
+	# -aqua -gtk -gtk3 motif        MOTIF
+	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
+	# -aqua -gtk -gtk3 -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk3; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index bb0c86ef868e..57cb962fe0ba 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -48,7 +48,6 @@ RDEPEND="
 			gtk? (
 				>=x11-libs/gtk+-2.6:2
 				x11-libs/libXft
-				gnome? ( >=gnome-base/libgnomeui-2.6 )
 			)
 			!gtk? (
 				motif? ( >=x11-libs/motif-2.3:0 )
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 4c54636f4990..373e1a3d6588 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -2,6 +2,6 @@ AUX jedit-5.2.0-build-xml.patch 530 BLAKE2B c42c1a9f5350e66dc6e4160cb2b02d1e16ee
 AUX jedit-5.4.0-build-xml.patch 332 BLAKE2B 47bf100efa8d99ebebe9765df2c59f4bb4dfbed1922bab1dd7e5802c69c9ef3a124b065385df693159382b876a52fcfb3433c10177adf2c15653dd5fd314fb0b SHA512 6ea6e327f48a677063f0eb282baa1fff289b18b8f6e4106b7336ec2906a0652c24198f702cdaff283f48600e287a6e6525f562e5247af110a0ee60f3340e029c
 DIST jedit5.2.0source.tar.bz2 2456541 BLAKE2B 82723b5e5670324fe3acff6d6958a83331bf67ab5453eaa1109de192586e4bcce3832456fdfd493e233f30ccbbf256e48b60398f256d9cf4c0cc366816d8b23f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126
 DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112
-EBUILD jedit-5.2.0-r1.ebuild 2328 BLAKE2B e31a3a0d7b862d0b954865f4614e3b52c70f072d41eb56b6b36fabc6b35672e0f2b97cafb0378f4b9880b85d69bccfc8d8e63116b6f559d3d42dcdb5637bf4b4 SHA512 98063344be850a63477267a1dd34735a277b964acfe82b931e1e8b0490bbeda37c2dcaaa4be941725fa2648a087aabf362cb42ab958f6eaba72a5dff7dfbde2e
-EBUILD jedit-5.4.0.ebuild 2442 BLAKE2B a22b05b40609326e042d609197e6d8d7d47061cfc3c7447ca8ceead704bd9c6351157d5b65d6f2f1af0e3a2b9bc2a28038fa0d5421f01ad80f104635ff954a55 SHA512 aeafe324da3648a884904f4678ffb6d0f19ab034b318881baa5fb4da7302bd6d965f6ac932cb9f6e454d56f9190ce19f27821256496d0229d20168246af363d6
+EBUILD jedit-5.2.0-r1.ebuild 2319 BLAKE2B 9edd505a076720624cc91df6c0a7fcfe34694aefae6021326d7b8d9624ca64cf156d9cb1d8992d073aac6b7aa455284f39c100c4e94f0bb889e21697b85c9db6 SHA512 7c333cee0b47c11267391206995b9e8190b624776905b541d035cf54965ce6bbb70fd5ddff48a796a25a19f1945c9dd099ae1e96bf21c01af369f241a6ec2f68
+EBUILD jedit-5.4.0.ebuild 2433 BLAKE2B 776a39e94ade38b7cc1012700428fe787d0fd6282c5f7eda915d429b6781ce967a0f3133c5fc873786cab989afa760b1b93549d1df0132c03b4457bb112462bd SHA512 8231c892e1f59d674296070c6c8eda9add12b098b3392623d8d38c2f802ef9398309e03f65962282bdd8bd98d837dd0845148d2d3dec6397f6532f51c08b241b
 MISC metadata.xml 311 BLAKE2B 7363e29fccf6d99776fe1e6ae7cdff121272dde68207519df05b765e52ffeb4d0c4a3184847aa1ca10291c30ac1438da5e393c6b23cc9a2bed46b7be06afff41 SHA512 86e21988f7f67ca938bfad13389991533b89202be6b7e721bd3cac1a8e4a2316e62444a81de56848d016273795f4c166216f9a7b599ebb3aa43c7657a7d4f182
diff --git a/app-editors/jedit/jedit-5.2.0-r1.ebuild b/app-editors/jedit/jedit-5.2.0-r1.ebuild
index 945eb8180648..956701724a06 100644
--- a/app-editors/jedit/jedit-5.2.0-r1.ebuild
+++ b/app-editors/jedit/jedit-5.2.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc test"
 
-inherit java-pkg-2 java-ant-2 eutils fdo-mime
+inherit eutils java-pkg-2 java-ant-2 xdg-utils
 
 DESCRIPTION="Programmer's editor written in Java"
 HOMEPAGE="http://www.jedit.org"
@@ -83,7 +83,7 @@ src_install () {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	elog "The system directory for jEdit plugins is"
 	elog "${JEDIT_HOME}/jars"
 	elog "If you get plugin related errors on startup, first try updating them."
@@ -91,7 +91,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		fdo-mime_desktop_database_update
+		xdg_desktop_database_update
 		elog "jEdit plugins installed into /usr/share/jedit/jars"
 		elog "(after installation of jEdit itself) haven't been"
 		elog "removed. To get rid of jEdit completely, you may"
diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0.ebuild
index b91e0863229f..e38548dd3afe 100644
--- a/app-editors/jedit/jedit-5.4.0.ebuild
+++ b/app-editors/jedit/jedit-5.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 JAVA_PKG_IUSE="doc test"
 
-inherit java-pkg-2 java-ant-2 eutils fdo-mime
+inherit eutils java-pkg-2 java-ant-2 xdg-utils
 
 DESCRIPTION="Programmer's editor written in Java"
 HOMEPAGE="http://www.jedit.org"
@@ -87,7 +87,7 @@ src_install () {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	elog "The system directory for jEdit plugins is"
 	elog "${JEDIT_HOME}/jars"
 	elog "If you get plugin related errors on startup, first try updating them."
@@ -95,7 +95,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		fdo-mime_desktop_database_update
+		xdg_desktop_database_update
 		elog "jEdit plugins installed into /usr/share/jedit/jars"
 		elog "(after installation of jEdit itself) haven't been"
 		elog "removed. To get rid of jEdit completely, you may"
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 1dbcea2ad7e6..419501e76d41 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,5 +1,3 @@
-DIST kile-2.9.91_p20171209.tar.gz 3624273 BLAKE2B d6e4798869b8f5be7a2a6b00b1b067957245373f560a7485334ce1f3f932670a0cb8ef0b551fde2eea1d54a6114e8405025dbd3daea587a2d30b74fe614d332e SHA512 b7e4a6e434057cf04e8712f543cdd74a40659843b1e2777d0a031b5a665e1de34e36ec9b3f5d9bd3bf9202f9dca8595fcee9a81ab4875bc4b6da3a2fb449b2c6
 DIST kile-2.9.92.tar.bz2 8556142 BLAKE2B dd18ece7394439de3c0037fbea7c66316c5ee457bd4ad8c35f8519713f917e1c1641c806290303c26dd9e31e2f39346bc35091b211ca23a2d342332388d18c3f SHA512 e3af0c2cb1a0970428e2d772ef5025ead67aee94cdc03b6ec173de5628e8d4619f74296a1734eac8241939d40a05b805b8bd33bb4c27a1c19ad47fb35087cf7d
-EBUILD kile-2.9.91_p20171209.ebuild 1706 BLAKE2B ec74f5a929c6175221729fe36f1510134f2b08a66c9cc189a6f318d1f53b514028597b52ba049f8086a34cb503cba44a87489eee7311f6136314ee1c7b0ff2d4 SHA512 82aed7dc966deb239c17ddcd4b4b62a5a8f5e50c36d6fb544f4cec206732be514f69d59852fc8b0cdee3290ea22a981c1a7466a56a8954738d969096e176520a
-EBUILD kile-2.9.92.ebuild 1642 BLAKE2B 0a4920d264d23a9d679a203680a42aa3e93b1a4c9185c74b942c2c5dbfaff26481c7ca572d72331ca8e928fbf9a8e94322806a2efef4aaf32cbfebf75fa41576 SHA512 a169c8f46ef23fbce8786f338a6c663112036a6c377e6974ab24620e2fe0d85983a9e11b2ac58777294b87ec240f7028cf4f9a3a9aec4a4c7dbaca7259e47686
+EBUILD kile-2.9.92.ebuild 1641 BLAKE2B 0befdeaff3e43df7ce23a97d8fc6b4f0ead7792fd9c3df8b370d6264edc4856ab52307bbfcaabb95d69f8ee69242431d6cb296a04520fe5081de43359e372fe0 SHA512 65994d27678afa75af8d66acc8ffac5e1a1fa887839fff251f5dfc70634a432a785125b45058f610bc8f4bf78f5e6f9d2903dd6da39f90bdabc90ad3019d33e0
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/kile-2.9.91_p20171209.ebuild b/app-editors/kile/kile-2.9.91_p20171209.ebuild
deleted file mode 100644
index a8e9ffad166f..000000000000
--- a/app-editors/kile/kile-2.9.91_p20171209.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=dab0507f1df74ee66f88bdb4b294179605df60f4
-KDE_HANDBOOK="forceoptional"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://kile.sourceforge.io/"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+pdf +png"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep okular)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	pdf? ( app-text/poppler[qt5] )
-"
-RDEPEND="${DEPEND}
-	!app-editors/kile:4
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep okular 'pdf?')
-	virtual/latex-base
-	virtual/tex-base
-	pdf? (
-		>=app-text/texlive-core-2014
-		app-text/ghostscript-gpl
-	)
-	png? (
-		app-text/dvipng
-		virtual/imagemagick-tools[png?]
-	)
-"
-
-DOCS=( kile-remote-control.txt )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# I know upstream wants to help us but it doesn't work..
-	sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package pdf Poppler)
-	)
-
-	kde5_src_configure
-}
diff --git a/app-editors/kile/kile-2.9.92.ebuild b/app-editors/kile/kile-2.9.92.ebuild
index 8ee6374d8efa..30c5495c7917 100644
--- a/app-editors/kile/kile-2.9.92.ebuild
+++ b/app-editors/kile/kile-2.9.92.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://kile.sourceforge.io/"
 [[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+pdf +png"
 
 DEPEND="
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 0796fd228efc..7731188b7d04 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
-DIST mg-20170828.tar.gz 141028 BLAKE2B a0243ee05f86161f1a9448ec92c8cf14362a60dd3643ad49f79fdd6c2ffe56f51415321eb6f3d7b78c1ca6eab9cb91380cdb63f699359080011d6801feaedd04 SHA512 1ea16b1dd5e9e08abf9fcf0889130b4f39d36872bb64df85470a9ced1db87c0eecb18cc6e8c3c5a04f9049d58ef4492d5a88cf3502ec3351abccb7bddfb90c14
 DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
-EBUILD mg-20170828.ebuild 1047 BLAKE2B ee8886aaabefaeb4005d711eb0520c4508407ff0d44c1b1a0094b025764242c9ff35df8808288b7b9df3a48120d0f00de880b454d1fb7176c0c570e5a3781e07 SHA512 e2f54dbdccc36ed6055b96c69246507c085fd88bb5bd136a05e8d2c364c0c887dc866405116fe1f28d63a03392c82da2abb2bee34db1075490cb3cbce24e92b0
+DIST mg-20180408.tar.gz 141988 BLAKE2B db7da46fb0160acf8695f05234ed0c8e9a45e4239dc3abd433ddfb8b66e2b1aa550ffc4b409486a8990881d791ed73269a8ab78f6846cd4f0bee67761c11d281 SHA512 25fceb18fcbe63010e7a2e107aa5c30356938be2e04ff48869a12b5018dbb83bcf4dc70b03674713516616037247952a51454a28ca418cdc7b020d1f415f8701
 EBUILD mg-20171014.ebuild 1047 BLAKE2B ee8886aaabefaeb4005d711eb0520c4508407ff0d44c1b1a0094b025764242c9ff35df8808288b7b9df3a48120d0f00de880b454d1fb7176c0c570e5a3781e07 SHA512 e2f54dbdccc36ed6055b96c69246507c085fd88bb5bd136a05e8d2c364c0c887dc866405116fe1f28d63a03392c82da2abb2bee34db1075490cb3cbce24e92b0
+EBUILD mg-20180408.ebuild 1070 BLAKE2B 4d0afad8d8fccbfea1a7190ff904973e494d58cc06b6852f32b56c3565f58e66ded72ec455f8ab0dd0e272cfc3af7cfdba23ca2ea45a9d5be4543cd18c9c750c SHA512 20bf79e1914ab48fd09589c3122c47aee16a040567dd0cfccdd96f92d2c17f1687bd8d60138e88f3fbca96aa8a2e39fae60e25e7830c697a02c4ecb0b8892dc5
 MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/mg-20170828.ebuild b/app-editors/mg/mg-20170828.ebuild
deleted file mode 100644
index 232a6b42a429..000000000000
--- a/app-editors/mg/mg-20170828.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/"
-SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses:0
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install()  {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20180408.ebuild
new file mode 100644
index 000000000000..963154791f8c
--- /dev/null
+++ b/app-editors/mg/mg-20180408.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
+HOMEPAGE="https://homepage.boetes.org/software/mg/"
+SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="livecd"
+
+RDEPEND="sys-libs/ncurses:0
+	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# fix path to tutorial in man page
+	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install()  {
+	dobin mg
+	doman mg.1
+	dodoc README tutorial
+	# don't compress the tutorial, otherwise mg cannot open it
+	docompress -x /usr/share/doc/${PF}/tutorial
+}
+
+pkg_postinst() {
+	if use livecd; then
+		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
+	fi
+}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index a6f332e6604a..ccc13e70931e 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,9 @@
 AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3
 DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
-DIST nano-2.9.6.tar.gz 2892819 BLAKE2B 572fcd30b3640e1819d2d573c6aa755141b3990ab05fdf4928a8ade4dedd77ee4d8b81644a75d2c698fbc5512b1bffb7e7d449beac57700a77a1f7687ece4d58 SHA512 360802c3d772e8159e729803d5307575b348f779623e49401752984201b6b874df1582fe79ed6552a524db64ae6d8a1bfb449b525f7354cbd5cd9941432a2dff
 DIST nano-2.9.7.tar.gz 2913055 BLAKE2B 87e04c50a6485c961dddeb7e4fe4b3defda874eb91f373ae1357afdcafd4c207cdf789d72563fdfecb22eabb8dca29559d8fe8abdb0bd36ba1cae7fdf14b1447 SHA512 b62eda79d5d65e4d2020b22624aca06a891747e0e7eeb7b0698bfd9f90d7d1163240d123b7f727868aac09d815e9835f146f7f16e9cbdd5acd7f55311d4acbb7
+DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
 EBUILD nano-2.8.7.ebuild 2307 BLAKE2B b7ab4e20fcb2dcec5b6f2a198fbcb2a2619f9f29081521d1ce7a555be8bf44ef060ad9b8f3f229bf272bd5cf6c5f066e10d08f2596b5d3954279be71a4d09ad6 SHA512 693683af78bc48911cb50813cd8e02ded2546ce8efc79c5897c804c64479d889518d88f1cbcfa79e11409fd0f26543be270f2da451618d4b3756dd7d2bc7b4bc
-EBUILD nano-2.9.6.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
 EBUILD nano-2.9.7.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
+EBUILD nano-2.9.8.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
 EBUILD nano-9999.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/nano-2.9.6.ebuild b/app-editors/nano/nano-2.9.8.ebuild
index a0bec925c03d..a0bec925c03d 100644
--- a/app-editors/nano/nano-2.9.6.ebuild
+++ b/app-editors/nano/nano-2.9.8.ebuild
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index f7609e7e709d..85ec54463e23 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -5,9 +5,11 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
 DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
-EBUILD vim-core-8.0.1298.ebuild 6638 BLAKE2B b57e18cf8bfb21288bba91782e5c0f61e361a62ad8a1a66fb3a278a6f2126dfc0944ee115bf44fabe80d98c79f0f7f75a533a7823dc01f579addec429d0dfa02 SHA512 46cde1a42d98f0459ea66a64657a6f88aa2e0a64ec2492ddbf0964938b566d3f7d9a4b03b640a21d9d1b364c6a0a3db53b1bf2c667ce9b18e5fcc4fd42147781
+DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
+EBUILD vim-core-8.0.1298.ebuild 6637 BLAKE2B 929e33024cfd7e70410c4cd4602b6b6360b6bb5fc0cb55de5a037952a900830c5350e86ff14f136c1e79c16c89cb792f8d20f0dec8830de1ee60ebe6b47ae744 SHA512 93e032f7cf32131090f25850e44ed5c519d7a586133086102c8ab8e5163dbf49d196817129ab3ff8ac103f1de85a603b0823f6ebe970ec1402fbe5ba7f414350
 EBUILD vim-core-8.0.1428.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 EBUILD vim-core-8.0.1645.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 EBUILD vim-core-8.0.1699.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
-EBUILD vim-core-9999.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
+EBUILD vim-core-8.1.0034.ebuild 6648 BLAKE2B 2ac8f5d559cd74e720dacacc8b609d1646882f8efa98fc8320d7c0296095718ca3ed9846cbf04212ee99fa36dd8de610ffa0a757cb36d9f5c879653d01fb42d4 SHA512 02dfb22e3bc4044270d1828b6df5f772b42fd06f8af0ddaac07ca34068651da5718cb13e2c97322d7ad9f2099e34bae7f5a18ca50a1c79a9cc577d6a3eb835de
+EBUILD vim-core-9999.ebuild 6648 BLAKE2B 2ac8f5d559cd74e720dacacc8b609d1646882f8efa98fc8320d7c0296095718ca3ed9846cbf04212ee99fa36dd8de610ffa0a757cb36d9f5c879653d01fb42d4 SHA512 02dfb22e3bc4044270d1828b6df5f772b42fd06f8af0ddaac07ca34068651da5718cb13e2c97322d7ad9f2099e34bae7f5a18ca50a1c79a9cc577d6a3eb835de
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.0.1298.ebuild b/app-editors/vim-core/vim-core-8.0.1298.ebuild
index fee41423502b..dfe364e6cab2 100644
--- a/app-editors/vim-core/vim-core-8.0.1298.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1298.ebuild
@@ -12,7 +12,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 arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.1.0034.ebuild b/app-editors/vim-core/vim-core-8.1.0034.ebuild
new file mode 100644
index 000000000000..d753611af14d
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.1.0034.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.1"
+inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir -p failed"
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 004a0a1c69e6..d753611af14d 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-VIM_VERSION="8.0"
+VIM_VERSION="8.1"
 inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
 
 if [[ ${PV} == 9999* ]] ; then
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 059dfb9fdae0..b7f8e7b56371 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -4,9 +4,11 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085
 DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7
-EBUILD vim-8.0.1298.ebuild 8772 BLAKE2B 53c2fcb911fc27374cd00f4a1c5df9c30245540da78e4e3468d020fcd3149d0a0c57273eb1f4d38bd3f416604c1d29e08e49e8cf5a820f99bc28e82d1e999b6a SHA512 f200661012bc5505b0261aed18d360cfada37e93f84a30b74696c26175d7b369be9f0380c9b2db28324b4a8e0ae5fc888a328ae94a58e18d5112fc15b1d8cc5f
+DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
+EBUILD vim-8.0.1298.ebuild 8771 BLAKE2B 8a54e01107594a2caa36617ee05ad02085a9a35e958b0194b25b5ed5f8cc25ae4fd61029354a5cac4dda4152dbc5affee7c73b71388d3135a647cd2ae1e45810 SHA512 d1baab794dd39eca9bacc268ad445c7638d7711045389b62fb6c434574a313216263002a8a865d2f2595d508375abefb6eaa0898bb023664156d882392563162
 EBUILD vim-8.0.1428.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065
 EBUILD vim-8.0.1645.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83
 EBUILD vim-8.0.1699.ebuild 8788 BLAKE2B 6f30fc561bc164d54c8b45d56f6589e4bd88bbaa87c419120ed5ae08a0821d4415062eb3e8002352f97faca2901048ff0ad9368485df95f0f41f6ee7bc55ebc2 SHA512 afa9c34b8bee7f3e5c066c48a70b61ef991e8ba56082254eb4796a62aef0bb01a250d813660d699c3814da1b343f97e69373474c9b0bb44064e1c841ca0de9a0
+EBUILD vim-8.1.0034.ebuild 8788 BLAKE2B 88526e07cc126b669a4665f8287541fdd5b80cfb02d942074aa5b6354c8e3971bbb21b1b83964f522a1c1521d6522789a24c63da3e56b8e00fa5dbfd3f8f2d5f SHA512 45f841ab68ca9180af8b6a555dfa1cf5a65ab49a12d1feb60d9d40102b3ca0a127e7445bc4b6edd60b44786c1f5f696f2f91a97c298acbcc3927b25078e7dd48
 EBUILD vim-9999.ebuild 8788 BLAKE2B 6f30fc561bc164d54c8b45d56f6589e4bd88bbaa87c419120ed5ae08a0821d4415062eb3e8002352f97faca2901048ff0ad9368485df95f0f41f6ee7bc55ebc2 SHA512 afa9c34b8bee7f3e5c066c48a70b61ef991e8ba56082254eb4796a62aef0bb01a250d813660d699c3814da1b343f97e69373474c9b0bb44064e1c841ca0de9a0
 MISC metadata.xml 752 BLAKE2B 91fa465837da7fef20719826bbee3592d1d0f72f0015accaf425dad3999ee5f6d6f1ff6cdaa539dc1621d9735e1e97156824fb2e74e8707bae9c213719b20d4e SHA512 e49f531537dc14352cfd1550f77e830599addc6cfc9bc9f4a3a20449b0bab2ec5bfeb8923eab15a0585ff156c4b61cfcb5795caf0b9f6fcf14054559a1cd5476
diff --git a/app-editors/vim/vim-8.0.1298.ebuild b/app-editors/vim/vim-8.0.1298.ebuild
index 3b1ca5011155..ceca9c50c1cc 100644
--- a/app-editors/vim/vim-8.0.1298.ebuild
+++ b/app-editors/vim/vim-8.0.1298.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.1.0034.ebuild b/app-editors/vim/vim-8.1.0034.ebuild
new file mode 100644
index 000000000000..bd6149fa03b0
--- /dev/null
+++ b/app-editors/vim/vim-8.1.0034.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.1"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 15c2ecdbe628..695d0693ceaa 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -5,5 +5,5 @@ DIST zile-2.4.11.tar.gz 1293707 BLAKE2B 30317856303cd093e767f7c057fab74cddcd49e9
 DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a639f78e736c7fe6220c972ce600a8db557dd592065bb27e1d35a5d3a42b6a4a8d5d76eefc4274a8ce27b1d9c2 SHA512 0dea56fd13a82015ec73de3139a4b2c27ad4c001ed535f1bae557ee49f9d8a188610a08160998d0a36b95fec42b46a019fd43634ef6502ebd27e162164de98cc
 EBUILD zile-2.3.24-r2.ebuild 1364 BLAKE2B 40fa024bc57b7c62136001d4885943d670f6c2f8f7f49ae283c846648ec58c863dc24d2509c08d6288093e74f1d6af6bdb4eaeabf0e959ce0afbfa796a1fb2d9 SHA512 6eb6bcb7a5364d2615a957da3c6ceaba32f646b7ba263e749a49937b054d6d409c178e8b78b17ae820e0e81aa3d6f0d8fb888a95185df690a9e666bb37558fa3
 EBUILD zile-2.4.11.ebuild 901 BLAKE2B e0ec9fa51062e9438d35aef6c8ccd18d5bb506719166c2a8198b331a8f0c94c034923e09a1becd65dcd8f09380e98cd061fcdf645dcc48883a13fffbe7e4ec03 SHA512 c0229948c5c9d813ae8a5530ce3de60a0eab82de587d985975a77933207e3034432dedb73f37b86fc824a1cbee747cb6b39b67e7c6571dfb04c6e240d31a58ad
-EBUILD zile-2.4.14.ebuild 1414 BLAKE2B 58877639a95bb2069cd4c62a98a5e970748c19891db3536f0a0cbf074bfaa51c520d6f4ecfde6486bbdc3e852c11d0c6fd02285d23063c4d9a93eaa9bee64d64 SHA512 421171734b26201e48a1b686023002ae34ea7fe498ffa1bf866f7b68ab9517ffe96ac6d827e68d2a51e768509422e62da57bb042af1504d76d243c8f7c30209d
+EBUILD zile-2.4.14.ebuild 1421 BLAKE2B 775403d85dfe22abad45ffb15395389ac49d2e1e608ce5554de7247f86e46fb69e4f08b03c9b9dc214bd4418da856412e1ba2c165c0f3223a984887476568430 SHA512 75e4e901ab09940a233d8251d62facb101e4011b4eb9f0b00e5a6190af8b91a7038b3bb89765f7caafe2ce633b69c18a62e62a2309a8ebbef28313418cb0860c
 MISC metadata.xml 638 BLAKE2B 4830ef65d641a21c208c6e856daf949d8b931c1beef92f93e5428fae095e0c81e39ca93b9d9ec4cdafc74b689b1469e86d73f8a31fd3f775d728f1f973b1b743 SHA512 f2214ca22b8c80124f264991e70ad97047a5705dda78bc59573f1c80d3ee144343502bd7f610117af263611c11cb1c7c0b732fe44b6274272a50b7cf5d595ad1
diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
index 6b6774de68e1..42fcd64fc45d 100644
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"
 
 RDEPEND=">=dev-libs/boehm-gc-7.2:=
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b40bafa874e6..8d0d6a08fbe4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index 7afda73b57a4..5088fdf0262d 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761adec91465201259b03080a7303a1c5e6fe2767ffabfad1b156f4d362e1f025fef9ab131d89799912e0328090a9 SHA512 e917a5c7e7216da4624ac9463aa575569402383fd77d11b510c4752d1dfb54aa93c3cd29f3e3b198693c4f9ee9452611f5f342ecf57bf2c5f72b5e10ffab2d9f
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-mode-2.69.ebuild 554 BLAKE2B fa3a4ede29844a297d7bef4685922073d32ca727574764d24d903ede381545b63c20633c567962ba3ccd682f9251c16461ab59ecdc3c239aa96351388ed2a553 SHA512 11f7a68fe829fb5a87b05f1a6c23d5f698aef3c7c302d5e74e73bf19d6242e73f128fbe2b3f3be45f31a8833931f02c7d85d88a557822d4574a89f435f87f8b1
+EBUILD autoconf-mode-2.69.ebuild 553 BLAKE2B 23eac6cc14d85b900c3aa3cd0dfada99e7b39d76d2d97a57bdd296c1026263b3820e26caf604899d90b095bae25ca6a08ee4280686743b98ae190989f81efe38 SHA512 82c68336825df0021f0452d9c071cefe932668c7c866761835dd876e4e6bb72e17f5ab0bdfb249681277cf18696addaf4d7eac4cf4fb5d0d37fa88128d639d4f
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
index ba5dec445115..5ebadce64015 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69.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=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 SITEFILE="50${PN}-gentoo.el"
 S="${WORKDIR}/autoconf-${PV}/lib/emacs"
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 64c2acf233e0..4e2e6a71d938 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -1,4 +1,6 @@
 AUX 50dash-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST dash-2.13.0.tar.gz 146280 BLAKE2B e9552a19b1f84db0e16fba07fe5bcfc0eb8a6871aabf395fa7ca527b77ba23616fdaa29e67d73e6cf11260bd23807be17de1e52f4abd23b0f9562cb26e6a5feb SHA512 59969e3df1b258a1bae76904e5abaf64c5143de9b8994a04799dad3a317c6ccc1dcd19b99a337a23bce0e46cfb6bc90bf8c6b0e6a532946b4f0ec188d331b559
+DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
 EBUILD dash-2.13.0.ebuild 545 BLAKE2B 083977c9bcd22b3c3e86c7f1e78f54b40ea3483b5873bdda957b9ea290a8ead2807178e1b2948001e32bad26b855f24215d87ea2a5cfcae847d2625a9144b307 SHA512 0179b3c93d4fdf86889bc649599cd27684c037e07efda724069ea5618e41c1f8c52a63d680266b703f743c0c9e322cfaf354634822523dfeff56a55519257d57
+EBUILD dash-2.14.1.ebuild 547 BLAKE2B 5c2a534c0635c33eaec2d55e65292e7cd52509ea4a06156dc80f11fe8216f8a3b8d63bd273bac818cbf19d1f0b467a5c60c7e32bf7e69f5035a8310816c67889 SHA512 82efe262885da628b70bc2656b0dfad8f26d59084f026830a15af9b1b62906474d7f7e7618c77f785253e65cf6fc5eb80ed412a47b8927ae91fd3547fd0e70cb
 MISC metadata.xml 337 BLAKE2B 2097c9b128e3518750e976825d18c46da6ef5126299637288d0f1239ddbf37864420aae2d859bc6a199001b7693a235004a5bd35f47d770b60edc2a305e3dc2f SHA512 1f6a16c99a4b7d7129f82a855bc133e15c75190e6dc9c70971fd2588044dbb010101ff14c0cbb8504153ff4d1936260acd96d5b80eabf451462082bd6a6ca9e8
diff --git a/app-emacs/dash/dash-2.14.1.ebuild b/app-emacs/dash/dash-2.14.1.ebuild
new file mode 100644
index 000000000000..da2a16d87b0b
--- /dev/null
+++ b/app-emacs/dash/dash-2.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="A modern list library for Emacs"
+HOMEPAGE="https://github.com/magnars/dash.el"
+SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="dash.texi"
+DOCS="README.md"
+
+src_test() {
+	./run-tests.sh || die
+}
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index cad9ca62ebb8..28ed7f648ba2 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -2,5 +2,5 @@ AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f92
 DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
 DIST ebuild-mode-1.43.tar.xz 34688 BLAKE2B 577900e2fa7ccb2362ec7f9046affb58e92bdfde44f2ea48274ba61d65f35fa6a1852bda6d9c64bd3f63aba99df244b4cb3378de079259508b149cdacf7caf28 SHA512 91f9a06de6feeeadb27d765a6ca6f2fa17e01938a6c953efe3586646f1bf48da87fe269ee9b07b2e16199d3ba4a76f42b8be9143218b808fac2971fc6f64f36d
 EBUILD ebuild-mode-1.42.ebuild 732 BLAKE2B d80092df36e90cc356b7b0c3ae66405a08c5aab836f046ab9ddc268abb79766ed011ea390d0356f56555026af132d0b8d9be6f14c0eb82d3c09bd4835168e57f SHA512 fa0f2767f3eb6a4a5c94b9f633f4b3f778cd956f3995e5452b4c7548b6a79d9068f3d89e916aea696b34cf763c8754a193a546f35d7f7c9710b2eecb43853e2c
-EBUILD ebuild-mode-1.43.ebuild 741 BLAKE2B b6e42cfad3813fb04b76e8c372178e01f8af7e26b2718b8ef99a043466340aaffe7f52e35459fb10740f2b45e0cf2fbb4c917caa6b6d5658c5225e223b4c9502 SHA512 23250c905bdb39036d70c7b4e1f15609077268469b7a370be9ca1d4169f4b9af1db68b010124753fb60ef0560f2e8b58a9cd5dc943bed8d8c61f2018970dc326
+EBUILD ebuild-mode-1.43.ebuild 748 BLAKE2B bfa78ba46b43271570ec44f42ab4dc506f93608b5237e884f6aba76458d7ea1bf58019a74c5c82ac0e0a48d71cce1f1073c86fe2b1f036d62ca4284db323b285 SHA512 9daa72324659b956e08565fae7953da567ef67c77c91a6b06b4f6228a2bf2714db3bb1e267ddbcf2b82998c87cee0bc37cfc6c88fc360a4c73febabbd95a801f
 MISC metadata.xml 403 BLAKE2B b3996463afa7f1471fafe74467cc3b2bfac32c9ed6f8cbab1390ac1b974be057982f8f3ec7d796f7eb45b023d702b668f979e962d6c33c525f1e644de2703007 SHA512 b6c2ed67a0eac9b03f15bc00374f925eb8ba28000f8d1ebbe03f75e26c953ef799fe73c0bc1658089e5ab687cb07e97ff8d74123b6a67cd5dd8246e81051c239
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
index eb98435ed6c5..f36b2533c5f9 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index 889551609ccc..27bfb3206962 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,4 +1,6 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
 DIST ghub-2.0.0.tar.gz 48150 BLAKE2B b9142f33f92dc08a1d5f3f3467361866b41d0d2c943465e803987a41a7bbba1bc4c7e30c058e6e3899110a57d3e1d49545df01efbceb67711186e6411ebc9a58 SHA512 39e1ac1760e1a8532ee5d6fd29386ccc24d7f0278f6c900d565a709f86ac6acf01ae49a3462b54054d5b0040102db82ea048157a12663c46b0c45fe11f2e86d6
-EBUILD ghub-2.0.0.ebuild 491 BLAKE2B c80d78142751618b9ca62759099663feae8c8ee73f7aa2ced2cae9e9e9840a04a17b6406ae392df2a2fe53b458aa1d04fda0f23f395c0c816d2e455de28fc131 SHA512 4506d4292a0ac7d0fb3a5ac8bf133e0e5b598305b5edff4a8f30746481e5581beb59fbfe475a97453c3dca9f4be95e1c181e0cc75634c76cf2813f9a8d11cca8
+DIST ghub-2.0.1.tar.gz 50014 BLAKE2B 449c12b4a75b8de75249fa8f3fd624551d36ae745325fe62b20d8a68a6bad565a308e8c9be6d742c24fff5238fe2cd56fda9d8353465dec28e0f42b2ee10dc77 SHA512 d27b3f150b1b871dd31746ee7396b7bea544a6209f73039fa0ac6b670e3fcdbddc2f888cfa3dfe89b64325d208f5fe18ad90869e012758dea54878d0dcc82528
+EBUILD ghub-2.0.0.ebuild 489 BLAKE2B e3889ff149dc2f09ba8af3e685fa91d32afb9b3522e4efab84cd8bca82258818a2fb2c322c796c719fcd5020d47f0df327917fe7c10bc887c0ccb55eee999f4b SHA512 a97f25b7c8eb7be16b10494ad540db5f4337cb5cb86527eb90993fe4daf41e12ea4013591b159415d1d117b1652bcaf0e11e8dc00d54ec16ea678a8c01b79146
+EBUILD ghub-2.0.1.ebuild 491 BLAKE2B 05a95bdb2094248383afa5eaa75d681dbac6e8c2f4e553a75cce9f6e66506e3db60332fe53071566ee3d709852c05b02d91f542568ff6f7043bf980df8de7250 SHA512 d46a2d66289098737c75d393a42cd1e22a0d4741e5c223a310a41d1159f0a6ff0d88c15e88144682703dd65e46942a28039f35e41f3a247b8d40b4bfaf0bba5e
 MISC metadata.xml 1273 BLAKE2B d1248c9061827cfb587b5d4a54ba5aeaba5be8302bc1a2f11252b9fe0946d96ce292f01983a2e82b23008649ee44af169d570a3226887fc22852edb022d1608a SHA512 e8161b23fd2310b303508c80c6af7b428c77ce2eb594bc3bd52b71eab874350d8f8920fa7e348fe48b5f6302fe6242665724dfbe83e308ee5e9d0e8813f2dbf1
diff --git a/app-emacs/ghub/ghub-2.0.0.ebuild b/app-emacs/ghub/ghub-2.0.0.ebuild
index 86b8b246a84b..b81e58b6400b 100644
--- a/app-emacs/ghub/ghub-2.0.0.ebuild
+++ b/app-emacs/ghub/ghub-2.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-NEED_EMACS=24
+NEED_EMACS=25
 
 inherit elisp
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/ghub/ghub-2.0.1.ebuild b/app-emacs/ghub/ghub-2.0.1.ebuild
new file mode 100644
index 000000000000..e5be353be611
--- /dev/null
+++ b/app-emacs/ghub/ghub-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="minuscule client library for the Github API"
+HOMEPAGE="https://magit.vc/manual/ghub"
+SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+DEPEND="sys-apps/texinfo"
diff --git a/app-emacs/icicles/Manifest b/app-emacs/icicles/Manifest
index e489a65c4284..bed0dbe1664e 100644
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@@ -1,4 +1,6 @@
 AUX 50icicles-gentoo.el 112 BLAKE2B c4d0e44325f27cb725bce0aff0ac8186807295c9b20642f42fabfa956703836c65a23b3a71221e736d95aefa1e4e188834df53c9a275ddc0ec7389a810bd405f SHA512 dee9b1945ea378792e71efa674bdeae5ec82eaa8f8ea07fd7859ff3e48d812fc50c8a4809a2a66c99ffe08c4b2b71a107245970ec2cddbe0505b63999b62320e
 DIST icicles-2013.04.23.23400.tar.gz 886525 BLAKE2B 92325f9486f3008b45d336828025e828b83bdeb91ea7fef3a72f8093b9800ca1303cebcc3cc6c7c4bfadb9b66a26371f55a98498a34d23dc3511d1e2f6de4b36 SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5
+DIST icicles-2018.02.13.23733.tar.xz 697112 BLAKE2B 63b60a74cfcc5b855e9ffbf7a91d0cb561c46ef1a93fb1baca00a0a5462326da983c734bef1943c0f17583aeb065d8fd5d88769eec2dc35f36a59ea4ff86609b SHA512 6c5d2270c735fafa8e2180134fbe7175e1c99cb6ae904a70dbdf1144293bd1ffa84d9e81b1c1b03296348a6b31ebab62ea7981a4b7f5be8bb5238bd143ccb3c0
 EBUILD icicles-2013.04.23.23400.ebuild 401 BLAKE2B deae89002a1509b6087b034c18b9f4ec560e5cc39308948d5f92123410ca287cc9d1effc7e479e6194009affed126a1fc6d98581c6e1d20b169f568e7b970409 SHA512 3d697cbed9b5e35db6bc370eea722a8d5c5ada439bcfddc14498740a02ff81bc4065628dd11e5002b3c2e796877e1fd079638f2468551083ac893ba16091cfd8
+EBUILD icicles-2018.02.13.23733.ebuild 488 BLAKE2B 0aba0b0c414bd4eae4ff6387374fe4db7cf7c5f74338ce512d1b7ccd64ec3b7492d6f3418116e07ef75d39f61ebfb0adca0424bf21d3066272524fc0e89eb18a SHA512 de723e4123003f1fba99840c9dcdc7c99e329294b96a5650c518bf9cb559abecc2231ec373d76ba121b289e37a8961a3baa4968da25b1e653c4b4e805351488f
 MISC metadata.xml 341 BLAKE2B f358671ac8ca5a8aac6a6fb365c67c02b4cd65ead725be504866bb47ff2e2e792a3787985a1d672623fce4fea302f316482270a7ce7141db4695956113d18b13 SHA512 6ae47225ce001e28b8f49fbab8be2949aa74b6e7a4daa99330ce1b24c3dcb7519cc886516f34f38b49e50a188068b63e426ef116a63956344e8723bfc9524a10
diff --git a/app-emacs/icicles/icicles-2018.02.13.23733.ebuild b/app-emacs/icicles/icicles-2018.02.13.23733.ebuild
new file mode 100644
index 000000000000..e8cd70e63cc3
--- /dev/null
+++ b/app-emacs/icicles/icicles-2018.02.13.23733.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Minibuffer input completion and cycling"
+HOMEPAGE="https://www.emacswiki.org/emacs/Icicles"
+# Snapshot of https://github.com/emacsmirror/icicles.git
+# PV is <Version>.<Update #> from header of icicles.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
index 6dad27224087..c4f14320792b 100644
--- a/app-emacs/magit-popup/Manifest
+++ b/app-emacs/magit-popup/Manifest
@@ -1,4 +1,4 @@
 AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST magit-popup-2.12.3.tar.gz 40195 BLAKE2B a351e949207b674c734f66b0431fa4c137293ccff880e3f457dfb825d7a36afd37f59197170a86d52606d371c181cd8a23be54d74aeee192a2d1a56588a55b3d SHA512 50620ce1d364ae28f30658dedd8f235bb1055be5cf4320142b7648e2ff6137f84cf865ea8f41e34ad7fb42612ff5d36fc0c4f6caa0aa0d2071bf775c15be5833
-EBUILD magit-popup-2.12.3.ebuild 596 BLAKE2B 39e54e5f14d5648c2e8d1c30f2da09cfb7345d1cf80650a4fd226dc7dbbdb0560ca24761ed46a4910a47bc46bd6a5a403edab90afc051b7ea60c5af813106191 SHA512 60cf12225cf6a27a5ecbe0afe7ff6d3e6c20b351aae312518a150bd8bfbb485e7310b2a17ab4743f413f3cb7da35aef5ccc00d3a99fa23ee675eeb11e181a204
+EBUILD magit-popup-2.12.3.ebuild 594 BLAKE2B 4e1f7e95d6581b55aac702d4d4aed048f0ab0f9815b1d9a8dfb3688c541eadd13e39e9f9f40cb7ab931e6841f9cc9c86205d40dfff0560b8417a9764c7d12e15 SHA512 750cd4a10d07188fc9113e2e71604c3742f6d9ed02179f7cceef982fa1d4c037ef88eb4faf9ead8cc46d798cba9044c5f83cb183ceda69c110dccbd9a1d66e4a
 MISC metadata.xml 1147 BLAKE2B 68fe5e7240434621fe4d1148e8f05d162771f8c90123790d757fec03d3c54dd686630860eec299371bf2f5356e0b8880a8ec46e1c7bff3d697d477fc095f58e1 SHA512 1e1aac2080140c50012bb3e35cb62c53fb782f9ac3041df3b7d1f8c86822bd7eba2f773c65205a58c65c791a095fc82bd39265dd05cdff52ace51e38a58666e0
diff --git a/app-emacs/magit-popup/magit-popup-2.12.3.ebuild b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
index 10997ff1cf60..84e13cac60d7 100644
--- a/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
+++ b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 363db8dc722f..1f990589a76e 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,10 +1,8 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
-DIST magit-2.10.3.tar.gz 430343 BLAKE2B 61afda0c50ca315d1d601ddaa2b6df2425a83d6dd3f501f5499df446c8498db0846d2ec58c7f1760933c0d05aec89d4b39d2ea19297f1302a156a97e29f3bd0c SHA512 54cd4c54548583972111ffb18c3b4e0834e061d84d071d5b559fe4b800872eadc214d01c8efc4452ed725184ec5bb1954e897d94fdb82397c9e953aa7236532b
 DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c695738246a87c46adc00a13e94438bb18d5f33e796c798cfec7dc438632cac6e4a452cff7d6e899a67f33575 SHA512 d32abdc9e89e77f65f05cc3dbec720320bc93d9ae827604c4f90acd115e76f8d05e445a96a141fbfbe88cdacca8383615fb73bddf01e776eeb3f63a459e973b6
 DIST magit-2.12.1.tar.gz 505873 BLAKE2B 076d9c08d3cb80274f5a6259ea5593ed419a0e140cda26bc65dc0c843373dcac1627d6bf098c5bdd9f0efb6b40ff3d7b823ed328b713390ea8916303b77ffd27 SHA512 7755aea8e7d9f0b82099143a76334be4c468536bdc0becad71acc097d9cef123394144b321f30093e079fef89e30ed1e5037fc92052ba9742112a30c6d3d586e
-DIST magit-2.9.0.tar.gz 421074 BLAKE2B 6fb8305ccf3933c2ee7962da897484b0d5860b656aa84f8e95a6950ca1c7491deb535f52418d9156ca8a71f5a08fc8e10fd4af9143d6fe26f77d724d799ed24a SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed
-EBUILD magit-2.10.3.ebuild 781 BLAKE2B eed9d6c038a6a6cc69819a665487d39d13198b507bdfb0a1487928c2c4731b289885034e5eb536aad8ec3bcf6538802374bdae32ff3578904e44a793a60170e8 SHA512 500e8eacb213c63566d3f1b300199443ed5f88a5526b617d39d394165117cad082b3249ad7ee086b3c0b2648aebc970c454be885cc8c566ca617f3b67f6d1a42
+DIST magit-2.13.0.tar.gz 519614 BLAKE2B 4bf1eeb8db563acd69ed65ec462f9436601c042e5ecceb2c899a920dc5710f544a9218c647fddc76ca265401f0027cd67f4de0155c3f79792f8e2f46d6fb4371 SHA512 4b840e2cf4b0fd2c5bb43c70766c6675c7e0adfc9cc7eac9f35bb9632e1eb03242dbe55870bd40436b49e9f333f00dfd361bcc63fc70c3a3a2a6b3e3e64f33a7
 EBUILD magit-2.11.0.ebuild 778 BLAKE2B 97d42aab39c4f55fa9bdf9a10d385c9fb3ac29aad78972d340200aa077176287a532310ef14f7716c2f42b6cab13cee760bb83ea13edfc4743f8d7b4ff31de62 SHA512 2c3944d01b6b0689b935aaef0ff0551e8a9e304fd8d236d65747c6167e98b97eea37970be402c3880019ac72ad4895e9195955384313d07cdefe14855b8f65fa
-EBUILD magit-2.12.1.ebuild 840 BLAKE2B dc663e17d4a680a69ba19999eb730ef270381baf8b9da2db9733c9817d85e63aaca916ba5d67666fec738e79921f04400a8772096bb490690ab051efaec20b8b SHA512 4c0b3fdff23aa8e09eec41f722ee83ff0aa0d99a24f5bbdf97747e5c4829276bd525fbeb2f71f7229c4a1676b436df241f0bc80a971325e546e6012504448e4d
-EBUILD magit-2.9.0.ebuild 778 BLAKE2B 7063541fafed02cade386a4bd478ce701cde7a81ef05a8b754d5505a17f499e64e2eb5d22ead97cfa4ef034aff548b066492688a8cf692bda39cef66409cb415 SHA512 fe3858a40518be189a482b9ee146cb3154c98ab053379c38aa00528a4908a25a4e48a182af22b8c604497fcbd6fa1e508e05826c55e596686a1a1f2bbe6f262c
+EBUILD magit-2.12.1.ebuild 838 BLAKE2B 6f331d506d79e6eaf72af0e7356ebef236fab9e53951f3c7bfb3ede44891d0717f622262b6e4096208d5dd45ebd3d44b2881d18de5d7cacc6100e0a8f863733a SHA512 10a3f964ad9c9c689eebc2cede09e092db9037879aa904714f0a18ea94983c76de52d8a7085110ac4a20859c5eeaf80ae30e37cd94eb9d8d9dd9cea284d412b3
+EBUILD magit-2.13.0.ebuild 840 BLAKE2B fb57094e6f463dcce9b2b0186fe0464e2c81240cbec1cb2bbb98b96a932620924a23f5701508c5cf2903c79c5ad629e8b2694c3d2c23854966e3eb8499c3e4b2 SHA512 52061b11b59b8c9427a9b29fb3818faa99e2196b7dac9a760d9055286133106ef56e7704af8e6fb84f00b67476e173ab0b0baac7b48b2a10d35ae05181c9b0c9
 MISC metadata.xml 788 BLAKE2B 32b9faec3bea7c347dae0d2da1246c43ac234b865fa26738a64736fea6a8e3107fbd7d1615b5ab28985cf1b78ee3d008c3cbbc461cf251dd4a3da5e893e81277 SHA512 ae77f9b917a135d4b9d39f7c0428a6e0a616cccce613cc17a6672e7bb0515709deef76889982640efca7fd9014801d7b951ddc5fde4eeb0134b3e568ea076396
diff --git a/app-emacs/magit/magit-2.10.3.ebuild b/app-emacs/magit/magit-2.10.3.ebuild
deleted file mode 100644
index 490d7199ec45..000000000000
--- a/app-emacs/magit/magit-2.10.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
-
-DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.10"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/magit/magit-2.12.1.ebuild b/app-emacs/magit/magit-2.12.1.ebuild
index 8290bab91243..8008ee12420b 100644
--- a/app-emacs/magit/magit-2.12.1.ebuild
+++ b/app-emacs/magit/magit-2.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${P}/lisp"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/magit/magit-2.13.0.ebuild b/app-emacs/magit/magit-2.13.0.ebuild
new file mode 100644
index 000000000000..2bb11ae04844
--- /dev/null
+++ b/app-emacs/magit/magit-2.13.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/"
+SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
+
+DEPEND="
+	>=app-emacs/dash-2.14.1
+	>=app-emacs/ghub-2.0.1
+	>=app-emacs/magit-popup-2.12.3
+	>=app-emacs/with-editor-2.7.3
+"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
+DEPEND="${DEPEND} sys-apps/texinfo"
+
+src_prepare() {
+	default
+	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+}
diff --git a/app-emacs/magit/magit-2.9.0.ebuild b/app-emacs/magit/magit-2.9.0.ebuild
deleted file mode 100644
index e14b89b7735f..000000000000
--- a/app-emacs/magit/magit-2.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
-
-DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.8"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index 05d44deb1e25..5301283b44db 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -2,7 +2,7 @@ AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad858
 DIST gettext-0.19.3.tar.gz 17414357 BLAKE2B b2b2085e8ee7339c6b6509807a9601163498edd9265f2ec899337943bd2c1394a905b01e8a9f44e7a57985cb11f4fdfe302ff9320dacf1da78fdc4fdb5e30fd9 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8
 DIST gettext-0.19.4.tar.gz 17717034 BLAKE2B 2022ed7963ff01c842c345f13c33ea7cc7221629c6beaa73cee7af68f709c6b8824d1e93ef919318b5d0a63286821efe2fdffbbdd709edf25a1f25be8909222d SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-EBUILD po-mode-0.19.3.ebuild 538 BLAKE2B c18f56f15495ce1c04f76c4a97a421718d9d272a435f6de7d56d1ae040a01a54933ee9fdf30f40f9054377f3fb7e914b047277357435a31c0f242d590c3232af SHA512 f4bfd73baf5a0b8fa76828bda9155dcf72d690b4025049ad312a1bfcc750a99a0ac5f7b55dcb69336151113d8cc49019f24442dae4f014ba5d99a94d237dc31c
+EBUILD po-mode-0.19.3.ebuild 537 BLAKE2B 3d25b14bf751bd076c8564b023f95f5359029c59c1886664f2701eec59cd88d713743521881a02a6810940aa104416f0aa77675dbdef7e569d6fb325a5f4e452 SHA512 8c68235c48f5732bead7688739cc00588a9d49c57f800f935cdd3b3a0ef51ee135ce541f7a57cc22d2e0c1f9ffccf7957e04f9dd56da933340c3e21b2eccf48c
 EBUILD po-mode-0.19.4.ebuild 547 BLAKE2B 4ee75a670d6036faaf684669926db9a8b33cc939d7ae93bc24068ea1a7d0b9098978407d204cd56dcd43e9ea06c961ffd8b390a712a5bfccce18f729eb4b8f3f SHA512 45220bc03bab40288510bb6e33d29f75ea6da1263176d64381651f3c1aef24c584b0eda00a3bd248e756157efddaa05c7de5ebec164e2093303bce2546628bf2
 EBUILD po-mode-0.19.8.1.ebuild 553 BLAKE2B 5799809a62002f314e805c63c47d7b1ee608de724534ed2b06b1866d6f7df4207dd9fd00259cc3e6fd6b7b60529aab11a2232a4f3d1f16d93eeb2d939ae36aed SHA512 1dc5864fb2dc0df0c008d90a9362fed05ce1b8c6ca84da32350e8eb6e1b83e8ce7c125d52927fd5331fdb0d68641585ad927df848c5533322b14da071b8b385a
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/po-mode/po-mode-0.19.3.ebuild b/app-emacs/po-mode/po-mode-0.19.3.ebuild
index dee68ca726b3..c8911054c996 100644
--- a/app-emacs/po-mode/po-mode-0.19.3.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/websocket/Manifest b/app-emacs/websocket/Manifest
index b05271ff98f4..75d9f9aa8634 100644
--- a/app-emacs/websocket/Manifest
+++ b/app-emacs/websocket/Manifest
@@ -1,3 +1,6 @@
+AUX 50websocket-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST websocket-1.10.tar.gz 27108 BLAKE2B b164b3ca47e0705322d9bcd0d9535c8e84777487e8783bf599f5391c88ee6193a1ef1750ec4b3cbd4fac2968c449c4f3a140255a434f3de38e66ad7364c192ba SHA512 ef1a34eccd173eb206cd9eeb4ea988a5b076f178bd4ca903e03b2f2301a34c2cbd08e43a13c8d24a64d10da28b3a77c15b2321978460db7a6b23c601abe31197
 DIST websocket-1.9.tar.gz 27029 BLAKE2B 9a492beda1b7f7211d1a72b5af0cab445f0fa78439797f05b565a0421a798a4fe0c6fb0e24aac0454f5b48f8f536762d0fcc5d92c216bd6b83b6ac34a1e024a4 SHA512 bcd98e7edcbe95cae2f196cea05fd6cfa9083ed1ab2392530ca00cb05b87d6fa95b5f5319981fd94244b74989850c171e4c31c8758a8b7fe95d49299103a4410
+EBUILD websocket-1.10.ebuild 755 BLAKE2B a8976dea9543cc526657f5dbf8f03cc75a66286ff55668f0ff5836b0674aa875271db94f98f06a6fa0d7ddaee2f254a793b610f7922122857ecf160b46021225 SHA512 0f1989593f39be725bdb12292fdf4b51713bf8c36b11d42f04a9d73b8aa19f68cee101b054d4c5b15686778acdea4a9f32ee4e7f772ffe02724a9febc78d9e5a
 EBUILD websocket-1.9.ebuild 675 BLAKE2B 0ff94c4f36f3f470afc00e7aad5fb34f7cabfc5c6b0eafd9b58779142f7c101d4230524a8b0b23ff94e58061e54777972adfb5e89123bed0df4e198794bb16c3 SHA512 09e2563f1b81dd015213a5583d242b4740c6aaae8ef361e6a2b29aac54c3d443cceab424703620bed2cf12c63bb083836c53ac270db7db715fa50a9a0d9ab41b
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/websocket/files/50websocket-gentoo.el b/app-emacs/websocket/files/50websocket-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/websocket/files/50websocket-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/websocket/websocket-1.10.ebuild b/app-emacs/websocket/websocket-1.10.ebuild
new file mode 100644
index 000000000000..2211d645c5a3
--- /dev/null
+++ b/app-emacs/websocket/websocket-1.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A websocket implementation in elisp"
+HOMEPAGE="https://github.com/ahyatt/emacs-websocket"
+SRC_URI="https://github.com/ahyatt/emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/emacs-${P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile websocket.el
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l websocket-test \
+		-f ert-run-tests-batch-and-exit
+}
+
+src_install() {
+	elisp-install ${PN} websocket.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org websocket-functional-test.el testserver.py
+}
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index dd7da0838aee..18c1b8c9de68 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1,10 +1,8 @@
 AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST with-editor-2.5.10.tar.gz 28081 BLAKE2B 6e5b0478509022669ecada46a26dc74d4277b0221f8a1691690e60c56a4e24a1c47526c1b75e0b283d2651749069c2a9e0f277ab3805f42c98d2b3d271076b98 SHA512 797c7d905eeb4d7398dfba10e4a9b7e7729098a87e48dd75c14fd80f1dd9c5a9693033367a0a9788c4b6c6cc3aa8d2a6ef66ac8bddd24457a61c830887e66a59
-DIST with-editor-2.5.8.tar.gz 27978 BLAKE2B a14db76077ec2254f79856c018ea4aed277997b3b35d0cdd1992ded2a5715a13dc2fd909041eafb69150e5bfbc7441e6d5b1549a20e0937aac2a59413cbcd01f SHA512 abd42a096e3318cc25576b240df1ed670de327afabe675d3df12780c392779f33b88e7a76d125f31cf37e3b22eda88391329c73d21ccc834e611893e759ea3e0
 DIST with-editor-2.6.0.tar.gz 28124 BLAKE2B b727fc645cba8c85e0ff688ffbb7fd165feeb3e2fe5033475d9f9b333435cdbb4bc6e0c05f862021c1cd32dcdf1c813a0d3a8fb6221a757c7cf4ee4853d40272 SHA512 454af6222f54b6695aedb085b6f9a4e60d4ebd9dd6047d67cba13087d3966670aa63358dff45633f3492152f6a15c4c1e92efbaaa787867fef9edcf8b14f690c
 DIST with-editor-2.7.2.tar.gz 30121 BLAKE2B a610348a3a2b26059bf58b4b26fdb4e2edddcf70604db7c9d69d2050f4ed1ac745cf94638656339a915ac11a2abe0e8eee5fcb73c768747a8d14078931106332 SHA512 9d412928ce5234d3541d717b5b800312c82495f937088cb8308ff64ab92d2639ce078cdc8eb86d34b775a0e6567409249d58d94eb61183b82b5c19e2465905a7
-EBUILD with-editor-2.5.10.ebuild 673 BLAKE2B 28e76191273b926fa2ff32e8a2649081a6f1fe825c3b544b7fdbf2d32d24a731db60d0233c84effd5cb488ed1b3d81bc1cee7cfda5535eaef4a52b8a10b8230f SHA512 de1f447911eab432ea9efc4c6a0dfd6e669bada47c797160592aa446ab26240a303bb887a605e282b5864e32e5f272006713d331bf644367fb0d2bae2fd88c5f
-EBUILD with-editor-2.5.8.ebuild 672 BLAKE2B c4975e572dd90ba5f559c4f055b5761428fe1d1948e35328f26c0c33b4e1bc89078888ecf42fcd8d4bc35816279c377b22d2de0d9ae624a4a9fde5264524faf2 SHA512 b05314fa3013b5e0772dfce3755b97dafeb89549faf91768367b3581506b1c760edec1b9244aa6bd2845ffb62d6bcc054bf648f08fac3901bc28cba3ad88c9d5
+DIST with-editor-2.7.3.tar.gz 30133 BLAKE2B af4455f06f5aa867fa7b57222b62a060dd325bea8ef4b408177666914cb97a4f614f13daaf281fe9ca65b90e94dbda33fcb845e822e025ed8b415c4d0d01d3a9 SHA512 1c613e49bfe4a9812e69ec62d6518b29e59bfde84c83097323dfa3274da7fe4ff6431c0ebcbbc889c2237bc535d7cdb2ab7ab1dd171b26e553f03dcf71efd09c
 EBUILD with-editor-2.6.0.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
-EBUILD with-editor-2.7.2.ebuild 650 BLAKE2B ee112b0810c2887cff5b32f8d908e554418047ae5e1a849e22f52c7c86cd4c91df74ace9abf52e0aabe1940fac4646a2329fc6575953ba3a5e6706f739c5880f SHA512 71ea9ef54e63f64f229e64119475368156b8858f1ab20d9af1755bb61ceae632075af6287ad42546f0b9eb441fdd8d1ede739d0fc9129d4c022892f947b39613
+EBUILD with-editor-2.7.2.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
+EBUILD with-editor-2.7.3.ebuild 650 BLAKE2B ee112b0810c2887cff5b32f8d908e554418047ae5e1a849e22f52c7c86cd4c91df74ace9abf52e0aabe1940fac4646a2329fc6575953ba3a5e6706f739c5880f SHA512 71ea9ef54e63f64f229e64119475368156b8858f1ab20d9af1755bb61ceae632075af6287ad42546f0b9eb441fdd8d1ede739d0fc9129d4c022892f947b39613
 MISC metadata.xml 684 BLAKE2B 8deeae00b1046056120a352a462a4c93039275356dd5731edbb0975883f745b0a2b49f4109c89ef0535f97d29a095b803b8e91834ef95a67b479a0baaf518de8 SHA512 9c5cc636acec025b66df91e9a2500a9f5beeefeab3be42f2eb291d3a221151ca1748e80709b3bfac68a800c34cfd954339f1edbb2c9247ac85b4efe47c29621a
diff --git a/app-emacs/with-editor/with-editor-2.5.10.ebuild b/app-emacs/with-editor/with-editor-2.5.10.ebuild
deleted file mode 100644
index 5ee7f41db32f..000000000000
--- a/app-emacs/with-editor/with-editor-2.5.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
-HOMEPAGE="https://magit.vc/manual/with-editor"
-SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="*.texi"
-DOCS="README.md with-editor.org"
-
-DEPEND=">=app-emacs/dash-2.13.0"
-# Versions of magit before 2.5.0 bundled with-editor
-RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
-DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/with-editor/with-editor-2.5.8.ebuild b/app-emacs/with-editor/with-editor-2.5.8.ebuild
deleted file mode 100644
index 667dac00cbf7..000000000000
--- a/app-emacs/with-editor/with-editor-2.5.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
-HOMEPAGE="https://magit.vc/manual/with-editor/"
-SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="*.texi"
-DOCS="README.md with-editor.org"
-
-DEPEND=">=app-emacs/dash-2.13.0"
-# Versions of magit before 2.5.0 bundled with-editor
-RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
-DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/with-editor/with-editor-2.7.2.ebuild b/app-emacs/with-editor/with-editor-2.7.2.ebuild
index e967a12c4df8..075601caf822 100644
--- a/app-emacs/with-editor/with-editor-2.7.2.ebuild
+++ b/app-emacs/with-editor/with-editor-2.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/with-editor/with-editor-2.7.3.ebuild b/app-emacs/with-editor/with-editor-2.7.3.ebuild
new file mode 100644
index 000000000000..e967a12c4df8
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.7.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/yasnippet-snippets/Manifest b/app-emacs/yasnippet-snippets/Manifest
new file mode 100644
index 000000000000..5d3ac481b174
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/Manifest
@@ -0,0 +1,4 @@
+AUX 50yasnippet-snippets-gentoo.el 161 BLAKE2B af28f32bcf248a9557c25e4afd50110b6fdeb8f376b41ba645da1ee3c39429cf6b967bc77ce60f29a28d7dc01903a620997cb9a6bf7a62628bd3ff7495f8a015 SHA512 f675ccdd153f0c386d384df2db90598c08f2d49cadc434d1bba7707a7681b0d1dfa410bf188250b05003544c17bba11b132d9d8f3741865cf64ccce5b117c4d4
+DIST yasnippet-snippets-0.3.tar.gz 97229 BLAKE2B 26fe83c35be1b20b6a1e414144149cf1feaf4463833634bbd0a3db6f56b1da46d8e379c3dd19217cfd36f12cb9dc796eac4efef5c2ba472ce79f8c8b8d816969 SHA512 4aaac9d7c880642a1e802abb98bd6d6c94557fe0e609db5ce5b4ce2af921235d3e6bb2488c052adbe2940d41e85297520081ae0847b52642bc97610e6614727f
+EBUILD yasnippet-snippets-0.3.ebuild 614 BLAKE2B 73559131e05601b6a1f80ee513e8a2eef5f718d9b037476adfe2dfdb9d15162ee0dc6e2b249851aa1e3aef2ebf0b9363eab6f9e2996adf1d5c19496d75b3012c SHA512 d9d3d0044e4a527ce6b8b0e93f9ec4e63ac0a331d2834c9d283d9cd5f00c0627ece69b5ae17e346401cd345ec32a2daf97f7c86e1833980de2689b85bf0bb89b
+MISC metadata.xml 353 BLAKE2B ff3ba75ade80daba29d9f23bc25aeed1a284e15b56fdfe8b352f74a9e64a5ba9c3f5e927383b66461d5dba70e9d3c1ca45b107748d8164e15b1d12a767512876 SHA512 d3c7d0b96ba6306a6af696e57a933e0cfbd3a6386c167a3885e4b4d7be5af156a840f625833bda5e8732a4a12d202699bc24136cf1b71a3e13340ee4904e4a91
diff --git a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
new file mode 100644
index 000000000000..2db51796990b
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
@@ -0,0 +1,4 @@
+(eval-after-load "yasnippet"
+  '(let ((snippets-dir "@SITEETC@"))
+     (add-to-list 'yas-snippet-dirs snippets-dir t)
+     (yas-load-directory snippets-dir t)))
diff --git a/app-emacs/yasnippet-snippets/metadata.xml b/app-emacs/yasnippet-snippets/metadata.xml
new file mode 100644
index 000000000000..c95e9b9f3b90
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/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="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+  <remote-id type="github">AndreaCrotti/yasnippet-snippets</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild
new file mode 100644
index 000000000000..693935e3fecf
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A collection of yasnippet snippets for many languages"
+HOMEPAGE="https://github.com/AndreaCrotti/yasnippet-snippets"
+SRC_URI="https://github.com/AndreaCrotti/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/yasnippet"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	insinto "${SITEETC}/${PN}"
+	doins -r snippets/.
+	dodoc README.md
+}
diff --git a/app-emacs/yasnippet/Manifest b/app-emacs/yasnippet/Manifest
index 789ed0ff8b85..949e095386ca 100644
--- a/app-emacs/yasnippet/Manifest
+++ b/app-emacs/yasnippet/Manifest
@@ -1,11 +1,8 @@
+AUX 50yasnippet-gentoo-0.13.0.el 221 BLAKE2B 51f86d04a825b5e1cb60019bddac2b0e2d91d735ffafdae497c87413eb0ad88efd969575edfe139ba250d2e2115f1c5a242de61f54031b684f35437e6e868989 SHA512 ace64b43229ee327add5d6ac056b86f7468ffb79569ca55d3692c93fd4b9e847d83fa731c8e54ad2aced5d64ed73c9cfa1fc6d6f9a883356dbb6a39142d9a2fb
 AUX 50yasnippet-gentoo.el 209 BLAKE2B 0acf1e2d1d05f5abd807bfd97fded3f1fa40a0289f76f4c4668b1b545b4dc71042d59387d8b58b0fcda4bdcfefbf438a6cf6cc6ab134f40e5f19f4c5d5080012 SHA512 5c2f65e97cece730eed4d34ab3520214b5b6cf63ffdfa82f5252b03122e26fe7d78a0748dbbd95886526fc47e39d3a5675b5df48f50d0ea97f1efe306e3f733d
-DIST yasnippet-0.5.10.tar.bz2 30583 BLAKE2B 28f9d3eaffe8f98fac55fdb0dc9021fe50be77ac2c980fbceb2d4be331e3135530d0e09a31f820a460f3b1c9ae0154b47504361cc13dfd8357e8f72e820e8c7b SHA512 2533ca3c9a3f9210d43cbf871ad82fe7c6ad7d850b1c4c9ef36b299c72190cf535706e434f39b54a70611871ad6329f3386527d77c7bb14b709d7594c75ae4a5
-DIST yasnippet-0.6.0c.tar.bz2 39844 BLAKE2B e49d1bbbe6f44270fc7d1e76532e3666dba35d69105a4ce902cbd53e5b6ab36b4534f389504b06ec7ec5b5b8a4b87c7adac2dbf10c55dcfd0023f3c14cf32ce2 SHA512 ab60149f867ccda7a9b4f8f97b280c22d1130addb811291459df8b32b8a3ec65b4eaea7b36e1b0ffa80c6338b5094430fc9c2812bd03bc46e582321caafee375
+DIST yasnippet-0.13.0.tar.gz 577330 BLAKE2B 21830c0a2e99d7669093c16f527debb4921e96aad006887ec1c7e35da58745721658417f1aec96ea78ba4dc5f3951c857848fce67e6d2ff7f255d4aea5687ab9 SHA512 73b111f72e98c4183764cef08ddfaa861dba49f171f96026b074bf62a7aa5e2d8529f616805ba386dd4157b675da953784d5bcd832d6015ce1b72e9c240988c5
 DIST yasnippet-0.6.1c.tar.bz2 47493 BLAKE2B d3bb0d1c343c05f9bc212a0fc114d3c816c02d8de685c55c0f3407a02ee6d1c1e6c24681872dc66e67af773e0e98a78a0366bbfe72ebfd543c5174d2e2f994b0 SHA512 ea4c5850ae80e4db9a188788654a099eddc43e29371ef0cb6367e1a39d3ee9f3e9dab7201178955ae47c92bcecbb5120e0b817e47e9c88c5bcef9e561636a603
-DIST yasnippet-doc-0.5.10.tar.bz2 182436 BLAKE2B a258088d26acd494d848b4cf8723d88d1787ed1812dc0427b6c8be689a9e8be266f1a2c1833a540faeabccdae6f8090407b1396f3d82b08139af7afaf7ea8a82 SHA512 2abdea253a23291089e34366f3cc95dbad6904ec8cf9f603e1fce0d9995ee32fd1b8b69f98f27ddd3fd33318514cb6e269f2418c8575df98240e6a3c3e19a0ed
-DIST yasnippet-doc-0.6.0c.tar.bz2 246554 BLAKE2B 1ee5aacb33b5f058791c81332ec5a60cd1854a50327c00680e1782f322706175cef2d73faccc390285e9ffb95163eed699fd0c81ac47c3566993d089253b3e3b SHA512 3e32936e1fed8ab5ac963e9cbb68a61d80f22acde910e4a700cc4005463f0aae0fb5ce6f6f5cbdf2e8dd9bd7e39e912cac8ea05f8efca08d58a07fd35ff26160
 DIST yasnippet-doc-0.6.1c.tar.bz2 490738 BLAKE2B e312481c7693094d62eb0aec465412ea1c894ca5132df9c2beba49c3c78daaec90ca80d17fc9404edbdd8cea1fce63804a102cbe9b7d3d7b23f0761b8a0ea552 SHA512 c96955cac11f319107e0ea907c92860049598cbfd47b6a2e3211dc2b030face77b03aa9495d7e9d78171be87083f77268e90c6c86b0cc467a96a5bd724daf8f1
-EBUILD yasnippet-0.5.10.ebuild 1144 BLAKE2B 4ce2ed8a4f10858eac1127585ecebb23b614004efeea4957a8fd3b0179e311113a383a17e6cdbf907d2bac3e818feccf798d7a36ae339bfdf01a1d2105995c35 SHA512 b6c57f947bf7cdd1f5a61131cd7a4457e60be9db08abbfc13a2a995e28a3bb9168b87edc4cd218a9308b73fd84026c21efeff8848abd79dc3e4a022facd0f76f
-EBUILD yasnippet-0.6.0c.ebuild 1093 BLAKE2B a0c53dfdfe77b80116aec9cb388b9e395fa7e47a83c87509e233c91ce90a0d9e3987de76e1940272e54757f471cf7eedbdac8685fcdb7ea1deee11350ff8be55 SHA512 cdb88233be17383d6ff5244aaf1997e2315ac6e35d792e32110748197c9c4abe4cf60a4e12a4def47a5d2787c94e9cc2ca40963ec172f760246ad2f30799676b
+EBUILD yasnippet-0.13.0.ebuild 1014 BLAKE2B 37db6268c4d6d08820e368c26fc6e488f50da201740e03acdb1aab3885de6163dd0d827dbb70d55ff8baf77ec030ca318f44db111ef862a66d1e5555c01174bb SHA512 64122bd778495c2c8114dffba65a1f556e18594679270996759c6edaff19662711e2482152b0cb8c4d658046aa601fb93115b32b884dc2931e1becb0e23da244
 EBUILD yasnippet-0.6.1c.ebuild 1093 BLAKE2B a0c53dfdfe77b80116aec9cb388b9e395fa7e47a83c87509e233c91ce90a0d9e3987de76e1940272e54757f471cf7eedbdac8685fcdb7ea1deee11350ff8be55 SHA512 cdb88233be17383d6ff5244aaf1997e2315ac6e35d792e32110748197c9c4abe4cf60a4e12a4def47a5d2787c94e9cc2ca40963ec172f760246ad2f30799676b
-MISC metadata.xml 552 BLAKE2B 640774f8c51ac6af70498e88be5a9bb7873036376a13f869388f57e1babff0188b2f390fb52b6bf88e73331618e89ccb3dc8056a22976bc8f76066433fba62b8 SHA512 da85f0d9d20ac134af0bc33a3e0b0d72de57c9b5f27635cc1477bf83b96b51a8b98c2227196f44628c0337f9204873a085da5f8d9030f974933cf9da158a609d
+MISC metadata.xml 496 BLAKE2B 9478af00a630e80eee4c50ad20f8337fd090c4268bb57122619ffad5607d5f814ca98159677bb0835f5ee741cd0ae7582bc8732fa8df528c9e1d2e3eefabc433 SHA512 9110ef599f3ca052c5eaa1208729b5ad4b6975e30b15f011a75c7b2dc0fd0a1662e01352ece980ace994f021eaeb7758668930ca5cf561aa7e7430a8780ba90b
diff --git a/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el b/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el
new file mode 100644
index 000000000000..e58ee2b29cf3
--- /dev/null
+++ b/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'yas-minor-mode "yasnippet" "Toggle YASnippet mode." t)
+(autoload 'yas-global-mode "yasnippet" nil t)
+(autoload 'snippet-mode "yasnippet" "A mode for editing yasnippets" t)
diff --git a/app-emacs/yasnippet/metadata.xml b/app-emacs/yasnippet/metadata.xml
index 3ae6c22024b9..1f59a55f0dcf 100644
--- a/app-emacs/yasnippet/metadata.xml
+++ b/app-emacs/yasnippet/metadata.xml
@@ -10,7 +10,6 @@
   cleaner and more powerful than smart-snippet.
 </longdescription>
 <upstream>
-  <remote-id type="google-code">yasnippet</remote-id>
-  <remote-id type="github">capitaomorte/yasnippet</remote-id>
+  <remote-id type="github">joaotavora/yasnippet</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/yasnippet/yasnippet-0.13.0.ebuild b/app-emacs/yasnippet/yasnippet-0.13.0.ebuild
new file mode 100644
index 000000000000..e6ba47b23dc4
--- /dev/null
+++ b/app-emacs/yasnippet/yasnippet-0.13.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Yet another snippet extension for Emacs"
+HOMEPAGE="http://joaotavora.github.com/yasnippet/"
+SRC_URI="https://github.com/joaotavora/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l yasnippet-tests \
+		-f ert-run-tests-batch-and-exit
+}
+
+src_install() {
+	elisp-install ${PN} yasnippet.el{,c} yasnippet-debug.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc CONTRIBUTING.md NEWS README.mdown
+	use doc && dodoc -r doc/*
+
+	DOC_CONTENTS="Add the following to your ~/.emacs to use YASnippet:
+		\n\t(require 'yasnippet)
+		\n\t(yas-global-mode 1)
+		\n\nYASnippet no longer bundles snippets directly. Install the package
+		app-emacs/yasnippet-snippets for a collection of snippets."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/yasnippet/yasnippet-0.5.10.ebuild b/app-emacs/yasnippet/yasnippet-0.5.10.ebuild
deleted file mode 100644
index a01cc65c4718..000000000000
--- a/app-emacs/yasnippet/yasnippet-0.5.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit elisp
-
-DESCRIPTION="Yet another snippet extension for Emacs"
-HOMEPAGE="https://github.com/capitaomorte/yasnippet"
-SRC_URI="https://yasnippet.googlecode.com/files/${P}.tar.bz2
-	doc? ( https://yasnippet.googlecode.com/files/${PN}-doc-${PV}.tar.bz2 )"
-
-# Homepage says MIT licence, source contains GPL-2 copyright notice
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-emacs/dropdown-list-20080316"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	elisp_src_unpack
-
-	cd "${S}"
-	# remove inlined copy of dropdown-list
-	sed -i -e '/^;;/N;/Contents of dropdown-list\.el/,$d' yasnippet.el || die
-}
-
-src_install() {
-	elisp_src_install
-
-	insinto "${SITEETC}/${PN}"
-	doins -r snippets || die "doins failed"
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/doc/* || die "dohtml failed"
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	elog "Please add the following code into your .emacs to use yasnippet:"
-	elog "(yas/initialize)"
-	elog "(yas/load-directory \"${SITEETC}/${PN}/snippets\")"
-}
diff --git a/app-emacs/yasnippet/yasnippet-0.6.0c.ebuild b/app-emacs/yasnippet/yasnippet-0.6.0c.ebuild
deleted file mode 100644
index 831ffed191b4..000000000000
--- a/app-emacs/yasnippet/yasnippet-0.6.0c.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit elisp
-
-DESCRIPTION="Yet another snippet extension for Emacs"
-HOMEPAGE="https://github.com/capitaomorte/yasnippet"
-SRC_URI="https://yasnippet.googlecode.com/files/${P}.tar.bz2
-	doc? ( https://yasnippet.googlecode.com/files/${PN}-doc-${PV}.tar.bz2 )"
-
-# Homepage says MIT licence, source contains GPL-2 copyright notice
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-emacs/dropdown-list-20080316"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	elisp_src_unpack
-
-	# remove bundled copy of dropdown-list
-	rm "${S}/dropdown-list.el" || die
-}
-
-src_install() {
-	elisp_src_install
-
-	insinto "${SITEETC}/${PN}"
-	doins -r snippets || die "doins failed"
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/doc/* || die "dohtml failed"
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	elog "Please add the following code into your .emacs to use yasnippet:"
-	elog "(yas/initialize)"
-	elog "(yas/load-directory \"${SITEETC}/${PN}/snippets\")"
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 25aa16824fbc..9396239f30fa 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 587a70ebbfa0..e25c798da2f5 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -5,8 +5,8 @@ DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B bd3f74ad70c7de9a73397e401
 DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d SHA512 34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42
 EBUILD containerd-1.0.1.ebuild 1238 BLAKE2B 58cebf0f2ec0958892599bbbe2f518e42cf6d98a91880c1393bbff38d51958b918ccd838d92e7a39bda493b1b4c52d1ecfa02ffb2dbb9ba46b165acf47abe1a7 SHA512 3e3013ed0bec752ddff0bc524cb6c003b8c41db036201f9212bff1a298abf4486c64b7d65e3fd1e9d972e53b2c18d1d87f5f9db12d28ef9bca7f4c4981b6ce3d
 EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc
-EBUILD containerd-1.0.3_p20180223-r1.ebuild 1368 BLAKE2B 472563a4205f83ba1eb3ecf504a13d3cb345b2ea49e8771d6b7ff0922b9ebcd97c158ce2561118f2a1aa7fcd52cba4a0e8930accaaa04d9f279a923278fffa74 SHA512 cf767de8374244aa29e11d62103e4ea291363f09f8f1418c072c54bd454f6885bd3bc3fb5e9e8474e52d6312dba056ed0a87875b1a12d87f7cce49679bf9b231
-EBUILD containerd-1.0.3_p20180223.ebuild 1295 BLAKE2B a28e68ae6ecf614e04e2fdb2c0f820cd68af14bfd05fe8598b41c2a3797adfaaaafd265e2b20fe55c2956235637fd967888f5caee503266a5e494821edc4e993 SHA512 19fb14d614a3ad49ac1b41fc81e3b03c3fa7fddf0f4a8c27ec5d960c62e049d4d8abaf7bd085a90168993e6de55567615e30ae9a5f5960ee6c559111e0f6657b
+EBUILD containerd-1.0.3_p20180223-r1.ebuild 1375 BLAKE2B 13216281e1705042ca721693a9c77174243e83b2384ad4272d03f460688da50e55b45eeb4f7d23d5eac4c57b6434e5c7f2675ffb1eecf244f9fa4ceed7638244 SHA512 a9d25044e4aed1c35cc4cf5e51c825405ed2549a2e48decdb3ae30abf54ed43385e4049809bc5d1a8f7e3c966e1ed980ab325d339c6ad882dfac4ba05b86f9b9
+EBUILD containerd-1.0.3_p20180223.ebuild 1302 BLAKE2B b6d58ed568a7e402b1417c8fcfd9bb6d07ad57017859a50f178abc65b776eb6100c9067c8c7ce36a275368c0ceb84d72e81e0beada64a82d4caf88a01025dbeb SHA512 73f29cb43c6f819e859a758513fedd8ac67816ea6ef18435b34aafe1e1e564169927a2d7c54b0bde6816f64e3f840f0c75cb09b0742ccf17f46602e6a7e89c7a
 EBUILD containerd-1.1.0.ebuild 1289 BLAKE2B af1f7b19a91f90ece5ffa24f9282d0b7ebda179590b949c30d3d172b0c7829fb3e4d0a615a6d3fa94d548cdb1735ec0e38c8bd28d040dec272b9bc51cfffa733 SHA512 823c1d1dbf754d94f6143a173b893f837ac643eeae9510105699af3725a2b5d529cb9c98e5d1afdaab7c456e72a4d10440b9ccedea9537c21069bfefec3a2094
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 985 BLAKE2B fbef8e091234b75e89ef860f1b43114cfefa79ab65b434592bf4f8699ef1c95b6e126e7f848e401b9c1bb1d9c0ed67a86f0147169aaa3727bc26029d9f92d869 SHA512 d6ef315f79b599a8d47fda31e6e6a8c82e6dd52c3ca8339984ea72b43d6dd255d1b46fb7c566771231eba208796d3438b39cac22e0823430d9f59fafdef96147
diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
index a25ff621428d..a37f908adc0d 100644
--- a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
+++ b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
@@ -13,7 +13,7 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	CONTAINERD_COMMIT="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac"
 	SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
index 9a8002153e05..3c7eee7d07d2 100644
--- a/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
+++ b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
@@ -13,7 +13,7 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	CONTAINERD_COMMIT="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac"
 	SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
new file mode 100644
index 000000000000..1c075cab940f
--- /dev/null
+++ b/app-emulation/cri-o/Manifest
@@ -0,0 +1,5 @@
+AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1f09585284c5b7930c185d5cd0ef6c2f7de5db2a6af80355518628a050c1cb0639ccf3b53c6c338da SHA512 1115228546a696eeebeb6d4b3e5c3152af0c99a2559097fc5829d8b416d979c457b4b1789e0120054babf57f585d3f63cbe49949d40417ae7aab613184bf4516
+AUX crio.initd 838 BLAKE2B 8e27bb563e897d28f29e2c61501aee92a0d271b1352e382e9003c9a95dc8752d2d3b35aaab5fc523c659628e8eaa33853d187d865975c47b9ff4d5bea3b8ef5c SHA512 d21a7af17b1a2e763d3ad847089b9596866e23db29a78df0aea4c326ab83a95045e1892bdda802f421396a245cbaa5da841ee3bd280b139f199fbf0c8715773c
+DIST cri-o-1.10.1.tar.gz 5159128 BLAKE2B bd6727bedb1f1ca99771995817897721b340331a28dc00646fe6b13765328bbba363aeba4490c12c8d38f9e204e6c744c38f43b4fbbd39d2b44c95be0681475b SHA512 dc85a94cf980ba11a2213e7cec73eeb78460a6a14c50f02f8772ac0d0fe179374d88de01c72f24506a9f1a61db6bf6738114c8944631f76906f6e42f9cf35bde
+EBUILD cri-o-1.10.1.ebuild 2849 BLAKE2B 63e902a0a6aac1225b0c2f3554aa8f10694f679ca30a45594033e9e559cf4ec96da65c2a92de12904e2d86a2b5b1fb8a5b561deb6ac2653ed3325b8b68e2fabe SHA512 2f0f0b218e2e8fcbeeda327af2a371cc70710a507d521b9ca836db3d9c42d4ea6700c10aa2eb3e531b8e8ef7ba5660a9b868dc4270768fe6162a50cab169434b
+MISC metadata.xml 1010 BLAKE2B 1866fa273d85787041dbe44053fa0482d89b069f11399a0b3a044f91213dea2c2349bb7c935132cb5dc06f99bd74b9f857d17e5922a5287ca900397cbe9669d8 SHA512 df0a358c7623058d3484c4313a29c4fd1ae78ebda96f882cdf4c6108cddb41be10e19068172776dc9b23ed1c3aa5173c285b5aeb267a82e64ce1524eb580bb13
diff --git a/app-emulation/cri-o/cri-o-1.10.1.ebuild b/app-emulation/cri-o/cri-o-1.10.1.ebuild
new file mode 100644
index 000000000000..d0e7f55b7bba
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.10.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="728df92d3e4b77c5a1d3b8e2a5c3c8f3c5bc4f00"
+EGO_PN="github.com/kubernetes-incubator/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="http://cri-o.io/"
+SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	net-misc/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	ostree? ( dev-util/ostree )
+	seccomp? ( sys-libs/libseccomp:= )
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	sed -e '/^GIT_.*/d' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-i Makefile || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		hack/ostree_tag.sh || die; }
+
+	[[ -f hack/seccomp_tag.sh ]] || die
+	use seccomp || { echo -e "#!/bin/sh\ntrue" > \
+		hack/seccomp_tag.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake binaries docs
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+
+	keepdir /etc/crio
+	insinto /etc/crio
+	use seccomp && doins seccomp.json
+
+	"${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
+	doins   "${T}/crio.conf.example"
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conf
+
+	systemd_dounit contrib/systemd/*
+}
diff --git a/app-emulation/cri-o/files/cri-o.logrotated b/app-emulation/cri-o/files/cri-o.logrotated
new file mode 100644
index 000000000000..fb0b8b14a8a1
--- /dev/null
+++ b/app-emulation/cri-o/files/cri-o.logrotated
@@ -0,0 +1,7 @@
+/var/log/crio/crio.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/app-emulation/cri-o/files/crio.initd b/app-emulation/cri-o/files/crio.initd
new file mode 100644
index 000000000000..723773033f76
--- /dev/null
+++ b/app-emulation/cri-o/files/crio.initd
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 2015-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="OCI Kubernetes Container Runtime daemon"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+extra_started_commands="reload"
+command="/usr/bin/${RC_SVCNAME}"
+command_args="${command_args}"
+command_background="true"
+start_stop_daemon_args=" \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	checkpath --directory --owner root:root --mode 0775 \
+		/var/log/${RC_SVCNAME}
+	checkpath --file --owner root:root --mode 0644 \
+		/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+}
+
+start_pre() {
+	checkconfig
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-emulation/cri-o/metadata.xml b/app-emulation/cri-o/metadata.xml
new file mode 100644
index 000000000000..a18ec9b7d291
--- /dev/null
+++ b/app-emulation/cri-o/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<longdescription lang="en">
+		CRI-O is meant to provide an integration path between
+		OCI conformant runtimes and the kubelet. Specifically, it
+		implements the Kubelet Container Runtime Interface (CRI)
+		using OCI conformant runtimes. The scope of CRI-O is tied to
+		the scope of the CRI.
+	</longdescription>
+	<use>
+		<flag name="btrfs">
+			Enables dependencies for the "btrfs" graph driver, including
+			necessary kernel flags.
+		</flag>
+		<flag name="device-mapper">
+			Enables dependencies for the "devicemapper" graph driver, including
+			necessary kernel flags.
+		</flag>
+		<flag name="ostree">
+			Enables dependencies for handling of OSTree images.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">kubernetes-incubator/cri-o</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 17d27cd1af3b..2df5186fd07a 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,5 +1,5 @@
 DIST diskimage-builder-2.14.1.tar.gz 348188 BLAKE2B 3d751fc3f05578a7b5296c8b7ebde1b8dd0a38e40dc378fded93faa34c623db2abeac53c72048ce7ebd5747eb50a4f9e5525baba800adc4b2c1925f31a1dce0b SHA512 d056c89e78b3f42ccc5ced2dfdd9ac1c50ecdcb6861f81bdb3cd3c9d624fbba89c2a2b9ed08850dd79ff9fdf47fcaa3d3519b32f909bd1b0b12bbacf4d9ab758
-DIST diskimage-builder-2.15.0.tar.gz 350322 BLAKE2B 6eca37edbf556bf8aece189117510946dcc687af17060add95a1efd1a9136f16597b2f9ef3b0beead0079566c83e19683eb0019ea290fa3b5cc5b132aa97eca8 SHA512 ffc0a1938c02140144d3e057f24c051a620f66ca400cc65c7d1743adcb94d1e1f3c99811addac0a9fb47fc81a73713c2edc2d26f7526098e69b05fb9144176ea
+DIST diskimage-builder-2.15.1.tar.gz 359802 BLAKE2B bfcd43ae76350f72d368bbb6eadf61d72de3ca26963399004921df721213d8aeb1c980085d414b227674d2b147ee06531381b59e78e7b11f949dfc4d63f43f5b SHA512 7ab18f4d950c7578fc5f16f0aabfb469a74b38b0aa9d3209550019e3ea585a451a69be0a46901df2ae1ecfdc0dabcbd5554edae4ea71ae2921f5a8e99d4cb0b9
 EBUILD diskimage-builder-2.14.1.ebuild 1136 BLAKE2B f83045e466b1684160ded8c1f473ca9f505a1a29deafa1ed6991bd4037361ce7f5b9a4c8f9973d457e487d657907b4e49235c018342f51b27b95839be0ad7b80 SHA512 b0e481a9d23db7fd0fced29e514106e6fe0367e0ebcdba22322908bd80eb5d8d17cd6c27925eaae3586fa25fd7a344053ce27da8d64adb3539563fcaead2ef60
-EBUILD diskimage-builder-2.15.0.ebuild 1138 BLAKE2B 5c90ef6e4eaff62dd734d18ae03b18329477e8c4757c631854e038d0aa189f46d96a38e4dc2297c98418e68986aa99f3dc01b97bd3b93ba44f9b4421aeee5dae SHA512 b908a4c30c9e5b5d7adb6ddcff9a539fec366e940a62ef8870f274353e2ba747da9e29d72139794769c7db943b5291a0f0feefeb59e08e65010edd0f1867abc0
+EBUILD diskimage-builder-2.15.1.ebuild 1138 BLAKE2B 5c90ef6e4eaff62dd734d18ae03b18329477e8c4757c631854e038d0aa189f46d96a38e4dc2297c98418e68986aa99f3dc01b97bd3b93ba44f9b4421aeee5dae SHA512 b908a4c30c9e5b5d7adb6ddcff9a539fec366e940a62ef8870f274353e2ba747da9e29d72139794769c7db943b5291a0f0feefeb59e08e65010edd0f1867abc0
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.15.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.15.1.ebuild
index 1495264437fd..1495264437fd 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.15.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.15.1.ebuild
diff --git a/app-emulation/dlx/Manifest b/app-emulation/dlx/Manifest
index 6ed8eb749641..933425a1066a 100644
--- a/app-emulation/dlx/Manifest
+++ b/app-emulation/dlx/Manifest
@@ -1,4 +1,3 @@
 DIST dlx.tar.gz 112589 BLAKE2B 307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8 SHA512 99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
-EBUILD dlx-1.0.0-r1.ebuild 702 BLAKE2B 26c6899c4fdc69367f1fd6afe52228e52a131eb362b5cbcd76e51fe6ac7f2b03dfdb08503a3cda50392be4335b9ad5e7d3dca476c8d9537363cdea052a3fbcab SHA512 b19030790147a46f0a7464e4c2a058497af5edd8426b5101f8e79169a68951567379712cc596bec0e772e5b70af26ca14c9b00f1598bb0797412c7a87ceb8957
-EBUILD dlx-1.0.0.ebuild 422 BLAKE2B 71218adb4ef35dd15de46e91adaec797907913d458754f4c705a8638e6f4c6405d8f67142f706643267e9568cd4c7c80dfdb36e946612e9649cb3fc47914af4c SHA512 50f207d15b7d9bb80120ea342a78656f00ca853c0e7a5c4c4043ad5fd493233696c521ebf83921a4a0d61b44b5396bf97fafcd81108b55dd4edd8415c34a1f12
+EBUILD dlx-1.0.0.ebuild 380 BLAKE2B de9df2062bd3cc2d8b565035eece1f91b7c59a29ba85bbba44227474f31a8d6de327a860267175603b38b03ad93dea13a6094291d2f8589fcefdfd5f9d4c20cd SHA512 383e27a07b78e9fce0a067b8574fb0d154f33dec6f54a4e73426b0d9f79dfa8f60f5f5b1c8cf7d76201c3cc7155cd6c01c26abe3fcb1fc1c894148347afb6439
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-emulation/dlx/dlx-1.0.0-r1.ebuild b/app-emulation/dlx/dlx-1.0.0-r1.ebuild
deleted file mode 100644
index 6b10ef9f7809..000000000000
--- a/app-emulation/dlx/dlx-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="DLX Simulator"
-HOMEPAGE="http://www.davidviner.com/dlx.php"
-SRC_URI="http://www.davidviner.com/${PN}/${PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		LINK="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dodir /usr/include/dlx /usr/share/dlx/examples
-	dobin masm mon dasm
-	insinto /usr/include/dlx
-	doins *.i auto.a
-	insinto /usr/share/dlx/examples
-	doins *.a hp.m
-	dodoc README.txt MANUAL.TXT
-}
diff --git a/app-emulation/dlx/dlx-1.0.0.ebuild b/app-emulation/dlx/dlx-1.0.0.ebuild
index 60dd853d23b9..cea941115c4e 100644
--- a/app-emulation/dlx/dlx-1.0.0.ebuild
+++ b/app-emulation/dlx/dlx-1.0.0.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 S=${WORKDIR}/dlx
+
 DESCRIPTION="DLX Simulator"
 HOMEPAGE="http://www.davidviner.com/dlx.php"
 SRC_URI="http://www.davidviner.com/dlx/dlx.tar.gz"
@@ -12,11 +13,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
-DEPEND=""
-
-src_compile() {
-	emake || die
-}
 
 src_install() {
 	dobin masm mon dasm
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index d51945cef578..2a631ffae35f 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,9 +1,5 @@
-DIST docker-compose-1.18.0.tar.gz 231256 BLAKE2B be9b57dd89a81734b850f61622a924a3ace5ace907c4d1365a18315ddfbe3f1a9a56b222766980d16d5eddbe6818caf94a5833c5cddac082fa230bf290977ee3 SHA512 9cf29d892f6419e9ef639e1b9edddecb47ddb5ba7f97830f732e463ee510ac5464d6d81f58a2bf4ae5e7aee78b3d2d4afd59e6e1b53974899edb3e090bcb991f
 DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
-DIST docker-compose-1.20.1.tar.gz 246159 BLAKE2B 32836f06239d6f1506ecebac48c8b56c58620d0ba309b8469c073ec3b048bf3743afb1ff6f63d2031df4bb316191d9cd32d5cf85a2cb86544254c6054a7dd502 SHA512 faba24ea501c4e4aaf04bddf1d498eaa7702385458ac7a41f6054e9153f9e03e1e6f50aebc5156d6a814d567aedea1d16ff532872a1765bbabbd3c8da47e36e0
-DIST docker-compose-1.21.0.tar.gz 250262 BLAKE2B e27c6a24d9f02a6746e53d42845424d3c2eef0a816106a988a1eb7dfdc7ea39b1025afb6a4bc361bc97af501af554cb4b34ab62c150e500620c3256074d69a44 SHA512 1926abbb67508216312880f3f0ad7a752760f324a0d17548ecefa924f571896a55a7fc5d174f6ef3ede314c488dec8a7edbccdc399eea6d34459cb812cf103ac
-EBUILD docker-compose-1.18.0.ebuild 2421 BLAKE2B 070e116b0354b3965202ea93698a8846c032b774b2a16154d1be5ced36e963780675cad11fdb43b01baf6997b35b85b87907f32fc56ee5daa1191c1c7265eca0 SHA512 988e42951a910fbd70f9605483240ee7fca1c003adde6b1cb7aeb21cd70ef074b5a919db8bd4a8bd89c6dd158041ece024fcc8dc46e1e2c5d69e1de56d27acc7
-EBUILD docker-compose-1.19.0.ebuild 2422 BLAKE2B e1ae8b4b44640361fdc8fca0cdda1ce95340b3cfa564b2d6cf3e0785bf65057ea53e14b773204d1d7c93c142394b3800e78364eaa6cd0ce9372d24135ab73bff SHA512 1b283b87382f6cd0402dfdc4c97cbb16e1c2eb7da645b50bdcadd048054c769ddcf742b7067b686ab1d8288256e713f277d1e97b32c27821bd3c9ce507e4b7ee
-EBUILD docker-compose-1.20.1.ebuild 2422 BLAKE2B 5f465712c50acb6a47baa4ed2c306a418084f3bd761d5f48e085587610769c15b2c61190693c7ac9e50bef6e3aff7a1cbbfc0311c6090fe50992fc4cb7922a82 SHA512 f6a848ea0ea2cb4ef7d9c1715d6d2b4e4f9fe81af1ea79d3f151d00b00b9d3166f55720257c75138d9f80ea27e6a35fa49c6f26e09461c7c5861fcb2d1f9c52c
-EBUILD docker-compose-1.21.0.ebuild 2422 BLAKE2B d63ab5a26c436f3d25d04fd35a94c492392be0a5339197c11c7f163fb1cecea8da010491de89a0902365afdae76160e9a39c37849c0aa38eb29eb8365cc82588 SHA512 ab2fd63ceaf81a4e507bbe6e3552d97bdda89428d3212d915ecd829e10dbe4723a8d2f85954000f48f8a32e2e05e43c4cfeef8688e6b3ae3bbd47ed9f96ec40d
+DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539 SHA512 6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
+EBUILD docker-compose-1.19.0.ebuild 2421 BLAKE2B a65d845d78d53347d4c863d522f87a29b2e26bd8309c2f5e10d4e1c119aba85e92a63dfd3340183509046822d28e70c45e0e2d7f284fd4e9d12ba89847f7284a SHA512 5e993e855076b450709e1c30958b2cb7710624b880e6b0d86d38c5de14a216cf9960f883c6c1ccab7c892d503b2ee9fac58a1c17e754e4ee55e167f8efb76771
+EBUILD docker-compose-1.21.2.ebuild 2425 BLAKE2B 2e2de9361b045256109f654352aa57ef894aff5525341e2f014ac517d036d0c5b1525cc65fb6dc151aee9e791535a9261fef67ad5806df2c5cae8e97078c0695 SHA512 c2b463b2dedd822c04ca93b5463b66342f8676cc59a9a55bb9d685ed67408574a0bf691549a9106218aa4a5f429a5b1af47eb3b85465f0cb475d37e59047494f
 MISC metadata.xml 322 BLAKE2B 4d738cf090acd0f720b7805c8dd1a2288a1779dcf4af21ab5aeb4cf81b609d0bd2a18cbe79c165f9c9e60b993a8b864e1e5c61cfa773c57b08aef468d93a0391 SHA512 6ecf808eb20a0f475101524b1f4b29db49d4fce9bc3408b3e806e225e4de7b5f0c7af019809c329969f25dd050ba164a09effccefea0d2ada8e8bcf9790d39f2
diff --git a/app-emulation/docker-compose/docker-compose-1.18.0.ebuild b/app-emulation/docker-compose/docker-compose-1.18.0.ebuild
deleted file mode 100644
index d2e564ff337a..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.18.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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 bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.6.1[${PYTHON_USEDEP}]
-	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.19.0.ebuild b/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
index c457bb00d6d2..a5225f60246c 100644
--- a/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 CDEPEND="
diff --git a/app-emulation/docker-compose/docker-compose-1.20.1.ebuild b/app-emulation/docker-compose/docker-compose-1.20.1.ebuild
deleted file mode 100644
index 9e085b82c016..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.20.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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 bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.1.4[${PYTHON_USEDEP}]
-	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.21.0.ebuild b/app-emulation/docker-compose/docker-compose-1.21.0.ebuild
deleted file mode 100644
index 5b03868dc924..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.21.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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 bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.2.1[${PYTHON_USEDEP}]
-	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.21.2.ebuild b/app-emulation/docker-compose/docker-compose-1.21.2.ebuild
new file mode 100644
index 000000000000..2e64dd53e966
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.21.2.ebuild
@@ -0,0 +1,71 @@
+# 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 bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/cached-property-2[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.2.1[${PYTHON_USEDEP}]
+	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	<dev-python/requests-2.19[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 68802b2f0f4e..dc4943a785f6 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,6 +1,6 @@
 DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 BLAKE2B 0fed1328e8216ab83b23e8e1fe1793da6e874eced7ad18d101b0b7757f1de4fa7d321fb78620a349a4ed492abb4d85c3ecbf49311698b6af156a6255dec5740e SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd
 DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 BLAKE2B 5205d5700ad116bb457dc7a57f2624f9efa46f1dbf3f5fe9215077655cddba8e1e1301bc555fb43a22cba4d74423123953a67994bf8974b114350e64be601299 SHA512 300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600
 EBUILD docker-proxy-0.8.0_p20170917.ebuild 844 BLAKE2B d9bb516d405a741229ffacefab421d80a44c9524d11ec17d0e5f67fb7560587791d90144b6822e189da137b8ddf77dfc0e91490318b04cface43813bd8554c43 SHA512 ac2d561d877731632d839d728a8b02021e6a80cd97274914abdd25c4b35f42e2ee23b3dfbcc15e96b411dfa20cdf6838b354f0da8eb495a3b0783069a246aa79
-EBUILD docker-proxy-0.8.0_p20180411.ebuild 821 BLAKE2B 490184d3358b1f85027632e073593f5d903bcdcdd8dcf72b553e34d93aa0b66ce38fa7b5acdb69e265c8c1a16e34b0221e9230536123ebe190d9e4cffb667f3f SHA512 4b0e08eb305dd5a2faf36bc0da09d7f2df7d4aad20c0ba525fca3da24015f2f74b6cb0170c4b9d52e7c61335b73bf5d3ba1cc5791cb83b1982c8ee907e694aa0
+EBUILD docker-proxy-0.8.0_p20180411.ebuild 828 BLAKE2B 40c072624b54c218816132f4d3b71f29e2c4d1afbb20d6be0fc518cd729b3453ea12839143d3ee32e3ce810b8650316fe718ded9c5a950b0ee9ef372f4c2ec20 SHA512 4a018ca6462c3aa371d7e02717f805d1ea5424629892d9e69c7843fb4572da68f2d23eef0bc094487ccb3212a34799541b805c00a0cf941c114140ca44ab8cc3
 EBUILD docker-proxy-9999.ebuild 782 BLAKE2B 9d12852020716c9fda7e8da2dac1efd32f929b4d1afdfedf186e80e8f2d1351a626833a24e01e81d0c30a9099b286051099e5065e4b0dd55f5a0b5037dbd2d36 SHA512 3b972b6ef5af055046171a6ea8c8aa8f6ec51576d0b871ccff3080d9b99a5e8762c25d3226cb24fd3db66a8f0140a38506fcc6691f0c75ddf8b2646c785d83e6
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
index a17618652228..a6ad01507cac 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	EGIT_COMMIT="c15b372ef22125880d378167dde44f4b134e1a77"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index f20745229696..90ccb7b2ae49 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -4,6 +4,6 @@ DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 98213af07b945fda536e321ef5cc9e272848
 DIST docker-18.05.0.tar.gz 12822443 BLAKE2B 16f96ddbbb2b9d06724d659dba71990fd1aae1a568fb2d1bc7f6ae2bf2133524f6e0c1192deb045021342d3a8cc273f67b7228c51c032e75ee75c00a47f76bf8 SHA512 81997f32a45bf9cf7e79c936728999dac84e6c51e7ec04c7dd4f0fc1fbc837aaddd2ce4fa5e4e3eb2ee99599b005f06104b81b0fa858e59692c17398a341bfd1
 EBUILD docker-17.12.1-r1.ebuild 8355 BLAKE2B 2635bafbdc6be0840a83717e862b45045c0c30748c8633b76d2913b6497fbf921a24e85580208055ed22eb92c6fd990e1642cac56e41a7149d614d328b65c670 SHA512 e78bbe39f140d48ca9c49ff7efda41f5d531327ec9be528238aa2929636cc59704dadaa7d689c7c34abcab2c869430f118763878a74cecc0bcf73748cfa2cc69
 EBUILD docker-18.03.1.ebuild 8337 BLAKE2B f0b13adc75d2a334eaf91938b2774a5216fa4ef7905032f59e313d87367c7de07a6868e443f65db881bbeaabc8aeaf008aec8836827513b546ddd3bfeab599d7 SHA512 09645b50f569e37e94c7f8e36503ce949fe709ff22d579b9e2e2183a573196ae3bdf0a991c71af56a37e2e8fa7e3341289154dee4e1a336ea1b212cd63079bc9
-EBUILD docker-18.05.0.ebuild 8348 BLAKE2B c918ed55ca83b5a42174a1b1c2fcd8efc196da6c835cbb01ee4aad2e33c18b55e2c0894f6c8e6cf1e41c249801de96230a31123490cfbd8ae131099350e0d6de SHA512 0d03f0c76b3ad5fcefc998e9821a22254b2ebc316e309967a79450bd66c4548a253e932e36d63f261b13b0b7fd7a0227e4aa85392fb7b410060e0f3a50492b8f
+EBUILD docker-18.05.0.ebuild 8355 BLAKE2B 20456aafd21ee6a408bc07a43933ed1ec43210b2ee3651891a132a3c3b2731ded5af129a50e4f8ed9da3b8c38951678183164d9004f1ddc788375a78122e7a99 SHA512 8d5d01b4a270368de798558de44423aefe5cab17590882a9e57c74c41ebc73368ad28b10824bde845747f942035b036c483c71b556d28498a3d6524a946255f3
 EBUILD docker-9999.ebuild 8077 BLAKE2B 8b65d3c59a41acd2020f1a43cf79bea2871fb7b911170741eb3c217e9acd4a5a24b2c2e204e3635cac3e392c72bdafc332b25fe0613991e37cb3d7c55700d399 SHA512 1fb9025bd12796909a623a3ebc9da52e4e8fd73d11f60e25907530fcb62039d7dcf580e4e6f22f103cf1a07aee8bfd6975fa11bd0829952d23613d4ae7ade9c4
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-18.05.0.ebuild b/app-emulation/docker/docker-18.05.0.ebuild
index 1780bfcec93a..2aa4b4c2a972 100644
--- a/app-emulation/docker/docker-18.05.0.ebuild
+++ b/app-emulation/docker/docker-18.05.0.ebuild
@@ -20,7 +20,7 @@ else
 	DOCKER_GITCOMMIT="f150324"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="~amd64 ~arm ~arm64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 0fbacac230af..487b7f21ef83 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,5 +1,3 @@
-DIST img-0.3.9.tar.gz 6153717 BLAKE2B b561ed349c2b08f0e3448886b6c979d86fd6d4f47af0f03d7dd479a12f078b99f39e10d6a6b3ba9caffe2a9966102e3f3069fa6eacb70bb36f9842314e8a8e7b SHA512 23bf1e85cb9238742ffef44408bece52b5b0fefbeae9541a7740a4d798d1dc2c0f8efd02d8342842753925135dee843c4a7a20abe3a87ce1c475178461c9b8da
-DIST img-0.4.2.tar.gz 5622223 BLAKE2B 0a97a169111c359ec784c2f2a1acc5c67a2495003819403ba71d2462ee373f36540b03b6a581481e659fec51c84aaf17f9b0129481d060239e0d09c08777c646 SHA512 c9bd8cdfbc18515d64cbd36a3b9259381f582eff02c22a437960f098c139c9be784d4fcc225f66540e4c243b05e568250dc5fd3c1fdb09cbbcb9227db18e47c6
-EBUILD img-0.3.9.ebuild 911 BLAKE2B 556f2aacaabc9fd4c32e887c46a05e9759a405877fefd40294002fb2136d32329b62302abe1f7994f2112ab81b3bdffdbfceddc478b4bee3771eb5068be826fc SHA512 7a038c3c6f1742fa2f765310e5c0547d0d970b9db3fd7fc38e771fa6e016dfd2bd273cb5ff8e858e63b4daeb776cf4b2f594cd7e61da493b54c4a550f60e784b
-EBUILD img-0.4.2.ebuild 921 BLAKE2B daae503157d627655995772d9cb4dccd96930b34415710d8e7186412913d7c2b30bf7b683360fb4c557af57a7d6cefbe725aa22f1d04a7b3eecad18a3128b44e SHA512 e6f84116dc5bcb70328dfe594212f9ba43a9d08f9148072078201e8d943a0931d49801b68404369884342a909351168c6b69fc60aea6c37ac52d74356fcbec4c
+DIST img-0.4.4.tar.gz 5626989 BLAKE2B ba67acb795cb4e1da412773fe37be5c64fe0743d527e2565fe03fabad0cf45cbb3c2abba24da9346b5aa25842be69150d9d195e4ceb737a6ac5a47f372da9816 SHA512 718ced82f7df555c8c3f35c7e466842129190d422fc36a82feae4837045d65f86ba2e162c590369dcc758f3f3ddab21f758b03131796f41daab186df06e96697
+EBUILD img-0.4.4.ebuild 921 BLAKE2B 1a49162a327da1989e62907945ba3d43f7dacedf11bb7a3236ecd2c5ce639aa333aa4a51f12b7bb7fd827d172b15ed9c8e33dc2eee4795a81f5a97f280c62d55 SHA512 a5ada1debbba53e8796cb267c5f24d72484eda56cf71bce57d16d0a1a93cf7a8647cf6c89a2dedc16ea556ec5a6720f159becddc4813692a4e1b265e7cd998fa
 MISC metadata.xml 326 BLAKE2B bade1307a8d5bd0a9945fbb417b8506b7aaa4b66d5a502e18af1f7b008e325b5514e0fc018932396aba1116b5a3c11b12b89c43d925f7e97c8a75efcd9ef4f3d SHA512 a75050de970991e19edf7b7560ca46d27c959b9a91dcf87d40d31532c85c7af24ab29743d7295c731a3153774d33b03afa5c92470ca0c0c572d50c6ec65e5692
diff --git a/app-emulation/img/img-0.3.9.ebuild b/app-emulation/img/img-0.3.9.ebuild
deleted file mode 100644
index 661f99352151..000000000000
--- a/app-emulation/img/img-0.3.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/genuinetools/img"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="e4a43d044778e3df56e0de3c6ca00706fcca8b50"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
-	local TAGS=$(usex seccomp 'seccomp' '')
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags ${TAGS} -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/img/img-0.4.2.ebuild b/app-emulation/img/img-0.4.2.ebuild
deleted file mode 100644
index f0841cd49afb..000000000000
--- a/app-emulation/img/img-0.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/genuinetools/img"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="83e14d354393b360a4b21d6bb57510d17ffefa9e"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
-	local TAGS=$(usex seccomp 'seccomp' '')
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/img/img-0.4.4.ebuild b/app-emulation/img/img-0.4.4.ebuild
new file mode 100644
index 000000000000..1850a5472769
--- /dev/null
+++ b/app-emulation/img/img-0.4.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/genuinetools/img"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="3e14a5ba47c580651b08fa2d63d5f4af42ebb180"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
+HOMEPAGE="https://github.com/genuinetools/img"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE="seccomp"
+
+RESTRICT="test"
+
+src_compile() {
+	local TAGS=$(usex seccomp 'seccomp' '')
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/README.md
+}
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 2e570bf2807f..7d6bc72789aa 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,5 +1,5 @@
-DIST kompose-1.12.0.tar.gz 5234150 BLAKE2B 0b046cc2fb9420a69bb8a2d82a7c4f8a62db74acfaa9cdc5dc16b3710cda7c03fb43651bdd1e43281502f4aa181b50168120375a7f0e298a1ba018ddb94cd43a SHA512 5467b8fa54fe9368f1f1627c04e4edab597822b7b2c3c101510379cceac8ca92e24540b81b82e947244b1b4056e2b1a5806220b38bbe5db5965c3f7aeff908ef
 DIST kompose-1.13.0.tar.gz 5238799 BLAKE2B 8f51d9c4b162104636578b5b6b044060997d7c8fbd8a58fdf42d8db1e5fbce51cbfd2e010e84e80707462edc29603da3a6ac729f95873f2c84b7a43baeac8284 SHA512 6ec870f03762bde138e2c22e9b8a85a1e974897f3857f096e1fcd56bd402d1f3379936752b075ee57497e5d4f1c7c7d0c82b09d6c4e90860cc04aee434123419
-EBUILD kompose-1.12.0.ebuild 881 BLAKE2B 3f99cc757fdb901949f80216fca45c9de83fa3b54f0637055bc7d1670541cd85ed1e25244f9325e017470cf0f82edafc28ef4e2e9e3e9365c5eb5b6284768d0a SHA512 01e2b22e197dd52e7e3ad8c240150782d6de59d41da8cfb7d98aba2698a62c127a2fe837115cdb2ff5cea92f25b8e6e386bc5dfce1d6e95cb3d651887cddd73a
+DIST kompose-1.14.0.tar.gz 5238716 BLAKE2B 27c054b58d2804fcb37627652d2d48ff377504203f9319c4321fcba08e9c8dd9c41f307ff599de3b65ae9a177370322d63314b70e5cb80edf1ce071eeaf15e24 SHA512 f356f2f38c99f0ca9d8f58a4dfa171ba0c41b3127b66ab887484c3bbc76b66470fbe8f52ca3eeba700b57a86e0ff264066ee92645f71a93bfe77077655f81e97
 EBUILD kompose-1.13.0.ebuild 914 BLAKE2B 3d7a24dac2a68fda2454e96b829dd4b8bfb330939cf136283fa52fe2ee5f9636077c08cc86d1aec9495faf18a99df4659435eaa2a473833858093ee727a7ad33 SHA512 4b245704d29c8ad0fda59264a777133b92b75bdc84813280afff3740cea4f1b53bcea556f0f55548f6cef3e81f0133d9faaed35392ceaec8994450bb96abfb89
+EBUILD kompose-1.14.0.ebuild 914 BLAKE2B 0136b088d67eb8856ed41190273942f699d8a1fa5867d763b40e3ad6070dde0ffd5a266bd730dd456ffabfcc335f334f1c0549696aadfefff71326f0c0615dee SHA512 709f2ea7683c4aa2011a1f618f0425eaf96eb99c7f5cd8f7c0ac5bf9451e1f1bae56d6a32fd4f3344c7fc7412b0fe75702494e9c3a2ed542aa6dc273ad88a251
 MISC metadata.xml 328 BLAKE2B ad1e8cb1083ed13de1f3f341fdbe9bba7ba3ab4364c8c36c9e3b63f63688da6926fc6bebc9f72aada52dfac1a4834b11cb27eee04aaaae484192b8ed74214aa6 SHA512 e2091ec84a909ad6c2453bd832817461e39b7c355c28bd99c19d9e85dc4a621606c34066f596a68585c3762b6b156455ca012495c5c336b9ba929d163b923042
diff --git a/app-emulation/kompose/kompose-1.12.0.ebuild b/app-emulation/kompose/kompose-1.12.0.ebuild
deleted file mode 100644
index b2b9a62edf3b..000000000000
--- a/app-emulation/kompose/kompose-1.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="0ab07be"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.14.0.ebuild b/app-emulation/kompose/kompose-1.14.0.ebuild
new file mode 100644
index 000000000000..e0d3bde8bce1
--- /dev/null
+++ b/app-emulation/kompose/kompose-1.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/kubernetes/kompose"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="fa706f2f1c715889cbfffdf7e4a65da4c58584cd"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Tool to move from docker-compose to Kubernetes"
+HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+RESTRICT="test"
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 52b3e97b9aa8..f1b8586a3dbd 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -18,6 +18,6 @@ DIST libvirt-4.2.0.tar.xz 15180120 BLAKE2B 0df6caef7f377e627a7ca1d169e1c8032d02f
 DIST libvirt-4.3.0.tar.xz 14667860 BLAKE2B bd4dfbcfba3b11036be979caf938ec7ca4fc04cc4bd6dfd5eec05c054ba4ebf953c0e86a080e65ab8a880f2bcc2f4d018283e870afcb64bd0b750247f3c96357 SHA512 cc61497121931019a8cc3fa8234d7cf95b0f0e1d77ab6fcd089db92759617b099eb83c57aa91768ae6ccf92c345cf72e1d9b202acb5132a159476fb86f1a6999
 EBUILD libvirt-4.1.0-r3.ebuild 9688 BLAKE2B 7990f26444badc344ffc9faab1d55c2accc06709d02e8318d37b9975035494b0e971e272ee0482b0c756a2cfed92699bbdc323e2f13dcd24041c3d15949b1a25 SHA512 5dcfa2c9118eb07f0732ea3ecb6af40fb4517300efd1cc2e1f36efc682469a7b97eb08dfae552e34cc93e58a297c5ed652f0eb99b7047ae3b3976490e929c045
 EBUILD libvirt-4.2.0.ebuild 9628 BLAKE2B 74587b56782f61502d0bb78e1517417bdc90951d6591e6b59e55cf1f346e8d903a2efc089094d51ba7585afeb44094b3c32fde19cb869c6be240717d870e2b52 SHA512 5329a60f625950e012d1f60a29b2f3b82757f023bd375639e54c87065e07fc47c6e8ff14e8afd4be978c25aa8905aae6f5a6e850c86bc4c2f03f4fa9adea7856
-EBUILD libvirt-4.3.0.ebuild 9628 BLAKE2B 74587b56782f61502d0bb78e1517417bdc90951d6591e6b59e55cf1f346e8d903a2efc089094d51ba7585afeb44094b3c32fde19cb869c6be240717d870e2b52 SHA512 5329a60f625950e012d1f60a29b2f3b82757f023bd375639e54c87065e07fc47c6e8ff14e8afd4be978c25aa8905aae6f5a6e850c86bc4c2f03f4fa9adea7856
+EBUILD libvirt-4.3.0.ebuild 9635 BLAKE2B a9818c549ff4df48ec3284151d9e25efaf676789a1fa0980620116fcec2bcf44b5f208f864bd5a04bbd110d03fa16ed70b06d803c2e81abb7c5654665f8313b1 SHA512 c6b9a313917e0dba1530e6d0f9ebb2c3268465fc95cb39e77cdea225987aec6e228039b5c570b709c54c572d41665a4b777e15e3d85d75eb7a454249e40b1954
 EBUILD libvirt-9999.ebuild 9845 BLAKE2B 6088d0682f657ce4b8137c7dbe28f325eb3814519383958cc558db8a0e8433d4f3c73a688174d6c9bf02d67d5f1e23f8951093d67288d24e89ce13a7d907cec7 SHA512 a895edde185daea93df3e1ffcd193724c796b72ee7eb6a8f4054c894ae8b14a91b45018eb0b0ee2b039d74a47be31ee95188fc0766552605d8bcdec6bc04b568
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/libvirt-4.3.0.ebuild b/app-emulation/libvirt/libvirt-4.3.0.ebuild
index d93ae1d82cad..7c7d4531c3ec 100644
--- a/app-emulation/libvirt/libvirt-4.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.3.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	SLOT="0"
 else
 	# Versions with 4 numbers are stable updates:
@@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	SLOT="0/${PV}"
 fi
 
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index 3a1579a68546..2843736a8be5 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -1,3 +1,5 @@
 DIST reg-0.13.0.tar.gz 14958008 BLAKE2B 7afdb3f00732ad3fe4e8581d0773ba3d8ed4e9d41704e5aec7e45f16e407d19cc30cf8d4461d32719200b0253d26b609ff641c760b220685edb98bfb49f9b6b6 SHA512 7b9c23de23b798e9da4902a00d965c62452997240f53980eda478c8fa59ade985ca2f25fbe902597bcb32440dfcd41bd72c4631b4f4be956a48b75875e134018
+DIST reg-0.13.1.tar.gz 2931156 BLAKE2B 56245364c348f800e77b25d4c7326a721bd041ac865aa4ac55eefa60a6d1746176e109247967f42bc48727c56fd91c47f2d76aa245f208aff64a26b77b4394f8 SHA512 c64b5a21cb5f2e3d64d9a80309a2eab3e1002b6aba1a59b87d873326e9c2c722ccbfa0778aa14a2cc1fca86dcd3ad1bf7eeef3e7293c835fef00e11e413decfb
 EBUILD reg-0.13.0.ebuild 806 BLAKE2B 739a613983e38fd102fb77b3bf4fd67a38cd9647920b1865d2614d5349aedc9cc91863a7e4796657b439265a4eef0685cae0aee7b0c986f4c9964e748ab816a8 SHA512 f9a9ac85074b42de05d5cc916f011903bc7088568b2d89beedfb3a65e323a7d50d31b3af9a7c574174f9fdcf520a450c1a5678259d874a4191f9e13c58fa67e1
+EBUILD reg-0.13.1.ebuild 806 BLAKE2B 5cf64dc7709c85ec41a785fc1ad978cc75f8c10db3fa281090c087b239d0a9d7748f2565b831cdf63d365d32642ecaa8852731abdf3a2d57e5bb5187419eb1d7 SHA512 a7abfb95b593c858bbd2092b5fb3aaee9d4321772d9ca89b8db22ec00736cb1335d65ad0812b24783833a42ac7e780d317b9661d837d2c55ff7400460acc5a44
 MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
diff --git a/app-emulation/reg/reg-0.13.1.ebuild b/app-emulation/reg/reg-0.13.1.ebuild
new file mode 100644
index 000000000000..aa8ebef21cf9
--- /dev/null
+++ b/app-emulation/reg/reg-0.13.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/genuinetools/reg"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="fc4797acd474fe66e617f491ced48c83f7aa355e"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker registry v2 command line client"
+HOMEPAGE="https://github.com/genuinetools/reg"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 3c15b85418a3..5fa18cabbc9e 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,6 +1,6 @@
 DIST runc-1.0.0_rc4.tar.gz 1090513 BLAKE2B 276303e2085eddd549290e3af1a3af4570d0aef43f66f956267451810b0f0fb77f13ed12fe13b76efcd820fc7e0b46eac370a062f43c8600091a807cb12cf733 SHA512 cc2ae38b96f3f3355d9ba26f7af15c57975276aeaf58dcfe7fe5f0f0411ece8584a7cb51ae7fdd2f4109366f55ac8dfb86f225e26377fe07b685bbc56a2518ed
 DIST runc-1.0.0_rc5.tar.gz 1183902 BLAKE2B 46d0ffd9aa79a6f74b3194fa9e1932390115a43c903ae553acb7749d6be41220874a1ff9bae9706b5fecb9495dd6686c38ee1e9baf6118a14990f142baf6f64d SHA512 714230887ff9706c29b0656c5cdb253698bde6252a23e7f48aa690747fb57abd7884c2da1c4d0e314f9f301c5962417351557d15d986e45fcc336e98069aeac6
 EBUILD runc-1.0.0_rc4.ebuild 1256 BLAKE2B 7f7b657ae6f25116fbb7945a4c1e4c3690b736965152be821491ea4fdf4cd5ed5e0b3d7dd1a95607f40706e78f1aadab95b2b5d93324adf0ac7ce94c2cb7b463 SHA512 5236b7ffc8c95960f1590d59bb1dccedb4755aea162c9c5c2cce6239fffbf8a2d951bac4c19bcd513335aa9bff24865f1cb0a1ef2909cdea416d8c18684f96ec
-EBUILD runc-1.0.0_rc5-r1.ebuild 1289 BLAKE2B b96841a72a3827b61be0f73d1de2482d15550b4bea6209c830a77eb7fb1794d4f373ed906755f90231d6e1b4acfa6bccb67b6d742d95b2f7710a6f38c16c59f7 SHA512 56ac68b0852446c429028ac76b220679d4b1f523165048c3635b3bf4bddb7c0759531637a1aa87576173ab963acde5b7dce06dd3050968b56771c09e427f23c1
+EBUILD runc-1.0.0_rc5-r1.ebuild 1296 BLAKE2B 837b2acae2f5b76fea1e49c4a49b8149e9f6fe5ac06555f1ec23720ab947d5586f00d333165a2fc200a22caa7a3616976f856bf45db6769db4b991c7d27ec0f5 SHA512 746a2751e39deebac58542a5a4687fd53523046e2b12f5f543a7ef7d891adc145bd4deaaf2e42535651eb608d2b58e5ee2f9c7db64c8c32bd5805934cc8c4c39
 EBUILD runc-9999.ebuild 1080 BLAKE2B 09034744e5842eb2a340b3095ee3098c58b0853d81ee899b2b8e84c15ffe59638bfc6fb89d158edd4271f1e630c97dafdb4cbe7fb9286049dfe2bbf5eef213ed SHA512 b026b5cbfd44e110a2c2cd72125c757c6b957137fe9491b85e1f25014b564226a3e76c23ea463fd4d7ad742228b2b7bc533aa6b2539b43ca5c37aa2dd07218e3
 MISC metadata.xml 803 BLAKE2B ece04099f6ebb1afd33a01859d10dbb33f9f3606f262c0741406d3611da2f5841ab2e82e3852bdf8b38b8327920218eaeb43925c873a07a5c3a9ed368d408fd5 SHA512 4d628b6c0b34c18b6853d85a83725036a10b65b5266cf4f8a4df69c79882b03ae2a3c9c9ca1fe209998869e222f64efc6a89a8edc9ff3eec45bc9cb4391efd4e
diff --git a/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
index 745b05d7a61b..77b4011db44f 100644
--- a/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
@@ -11,7 +11,7 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	RUNC_COMMIT="4fc53a81fb7c994640722ac585fa9ca548971871" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-build golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index bd02b406870e..0296a4f3277f 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1,4 +1,4 @@
 DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
-EBUILD vkd3d-1.0.ebuild 1006 BLAKE2B b015cc5986bd035c7cac40394067c4134186c0fd36fa1887bf316849d413c9d44921ec05cf8807f15521a0568baf6ffacf8868db2e36487193bfb8b1ea8a3109 SHA512 8dee8c46ffd20d441d8aea5905cb15da366d491e7fbc9f1d26ef33b9a656dfc6eb6d9018fd094eed62fb9281a1c463c9403fa201d6d21a524b5ebfb9c58f98b2
-EBUILD vkd3d-9999.ebuild 1006 BLAKE2B b015cc5986bd035c7cac40394067c4134186c0fd36fa1887bf316849d413c9d44921ec05cf8807f15521a0568baf6ffacf8868db2e36487193bfb8b1ea8a3109 SHA512 8dee8c46ffd20d441d8aea5905cb15da366d491e7fbc9f1d26ef33b9a656dfc6eb6d9018fd094eed62fb9281a1c463c9403fa201d6d21a524b5ebfb9c58f98b2
+EBUILD vkd3d-1.0.ebuild 1008 BLAKE2B cd9d65a6a8b0bf9d8d78fdac4f4a1c92f65f4492b88f0f05552c6e2244c495a4a3cb68a620173844bfa9aae3ebc05eb9efc28d8429a617fb226d37dae390b3fc SHA512 330c7dd9e298c11575929f8d9c6db51ab509ba87505af0317ab5cf08ce5ca9061262e3f677f0cafa195212e91b93a925c753028dd15a83147c810d64dd07ce84
+EBUILD vkd3d-9999.ebuild 1008 BLAKE2B cd9d65a6a8b0bf9d8d78fdac4f4a1c92f65f4492b88f0f05552c6e2244c495a4a3cb68a620173844bfa9aae3ebc05eb9efc28d8429a617fb226d37dae390b3fc SHA512 330c7dd9e298c11575929f8d9c6db51ab509ba87505af0317ab5cf08ce5ca9061262e3f677f0cafa195212e91b93a925c753028dd15a83147c810d64dd07ce84
 MISC metadata.xml 562 BLAKE2B 2409531d0bc65f547844ae83bfd7aaea4d996f2cdf11ebbf7e95775465d4bed916a39a38a0aae0c6df91a417df484ecaf63b29ea4286fdcfd11b07c8177e3496 SHA512 2150c80fd4315d922521b43c650012008864b3ed1ff7d80e43622ad916e52411c6ef855b46693f96165e9d89fd6a6f18cdc88baab13bec9f7053c0c1795bcd71
diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild b/app-emulation/vkd3d/vkd3d-1.0.ebuild
index 6158c8e04d3e..2adf5f15608b 100644
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
@@ -15,7 +15,7 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+		media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
 		x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"
diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild
index 6158c8e04d3e..2adf5f15608b 100644
--- a/app-emulation/vkd3d/vkd3d-9999.ebuild
+++ b/app-emulation/vkd3d/vkd3d-9999.ebuild
@@ -15,7 +15,7 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+		media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
 		x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 8baa40d19371..8e7a032767f1 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,9 +1,11 @@
 DIST winetricks-20170823.tar.gz 639027 BLAKE2B ce0de22ff3363bd6fd675d07ea235ed5fb03ea7a84b3242329c094d6a9190c61813a1f360e74ece49d43d2dbf48dbbb1e94c4febc6e1a0d84cf1df895b0be6f9 SHA512 edc805be1a1c4fa64ae16b14fdd46786e259b88a0cde7afdf24bf934fa79f4acf3d9e599727fa589f155ec265569953b9e419cda79d54057157cbb1510261e3a
 DIST winetricks-20180217.tar.gz 646726 BLAKE2B 3cde3ca1cd7c74946732c530a49ca532975e037bc2907e88239b4697b3828dfcde3ce250d95e6c03ca36cc36b4e00cd545b0f6b63f984722a737674aff808e27 SHA512 3f90ef3381d89c0dac8c4b7acea04d71fe898207c534d4fe00c3db4e5c2e18db90602b78672e8ecf6f754206a999465ba5d8f1f5962e0291386badfc8202cd73
 DIST winetricks-20180513.tar.gz 652299 BLAKE2B fb4c55e534e368d5d7e94247feed031d0f6f98a2f3604f6187e32d25659f1cfa7f5589806e429ee054b4a94c00ebd6ac63cb99012fd94a99622891132a477001 SHA512 49fc022fc3db068145baf3a51444dc937deb092aceac8e31259888fea21ffe86f747a0d4dbd5ff10f253a94b15de090c01f20dacbe838c8444bdb00b98cbf5c6
+DIST winetricks-20180603.tar.gz 651678 BLAKE2B a70ae685bd49e429199619176e130681ab2d28ba8659f68bdba298d82e610c77df86c3d998273e60bb53d9da24bddcfe80f6d89e044007c1477a92bbc0e6043f SHA512 e88b0d4375331c94d3e2d995985b6c28fd208f1e32b1e4d84f33997a8a69fc9f8a4173325a571f5d10f233bcf40fe4cde644401c1563c8cfe7915748448a08cd
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
 EBUILD winetricks-20170823.ebuild 1844 BLAKE2B c6781f586fc1ed47ac10e44e46c5d45cdec3af746ee58b091138a309a296c61b0f57985031b4543416e359e34b0cf87c014fa5130c6b63f08845b24ed2536f82 SHA512 49ba07ab2db89109ba4a444827849c1aa96cdfa3485cb013f1a92967a9923943225784c34427aa160a476c31b3b55aac30b28a95959a6f6d5f98c59ef5d41c94
 EBUILD winetricks-20180217.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 EBUILD winetricks-20180513.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
+EBUILD winetricks-20180603.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 EBUILD winetricks-99999999.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20180603.ebuild b/app-emulation/winetricks/winetricks-20180603.ebuild
new file mode 100644
index 000000000000..58d2e71829ba
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-20180603.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils eutils
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+wtg=winetricks-gentoo-2012.11.24
+
+SRC_URI="${SRC_URI}
+	gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
+	kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )"
+
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk kde rar test"
+
+DEPEND="test? (
+		dev-python/bashate
+		dev-util/checkbashisms
+		dev-util/shellcheck
+	)"
+
+RDEPEND="app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	net-misc/wget
+	virtual/wine
+	x11-misc/xdg-utils
+	gtk? ( gnome-extra/zenity )
+	kde? ( kde-apps/kdialog )
+	rar? ( app-arch/unrar )"
+
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
+
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]] ; then
+		git-r3_src_unpack
+		if use gtk || use kde; then
+			unpack ${wtg}.tar.bz2
+		fi
+	else
+		default
+	fi
+}
+
+src_test() {
+	./tests/shell-checks || die "Test(s) failed."
+}
+
+src_install() {
+	default
+	if use gtk || use kde; then
+		cd "${WORKDIR}/${wtg}" || die
+		domenu winetricks.desktop
+		insinto /usr/share/icons/hicolor/scalable/apps
+		doins wine-winetricks.svg
+	fi
+}
+
+pkg_preinst() {
+	if use gtk || use kde; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use kde; then
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk || use kde; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 80279ec8371c..bfe07efbd16c 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-ctags/Manifest b/app-eselect/eselect-ctags/Manifest
index a84a498781da..cc362c90988c 100644
--- a/app-eselect/eselect-ctags/Manifest
+++ b/app-eselect/eselect-ctags/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-emacs-1.18.tar.xz 8964 BLAKE2B 218a9cb043bb00b853e3c51230632f9cdd28a0d2f0ca96bfb9f6840615059993edadd1ea3447d3c6b6411a6a4edda6c1ff34428659f3fa09ab306e53b5501885 SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa
-EBUILD eselect-ctags-1.18.ebuild 791 BLAKE2B d68fa628e9e94c4f5f23264668716ffe5a45b8b033f74bfc345b8bbadf98ba768101a7dc4433e4c3b5feaf0fe6f50dd888e5e643c2f341b0de4d6eac5dcd39c3 SHA512 519fe42c3e459a03b31fe212f48f6140a6cf71da34d13edd1f26c921fe46d79802f809face96699f655ad2f44d39039895aaedacf704449715a8ccbb32c035c3
+EBUILD eselect-ctags-1.18.ebuild 790 BLAKE2B b2966459ed74bcfd8cf4915aaed932fc0541358d31704a213da9f6be69252ae613b8e05aa911278b19dc22c32015697c21caa3f7425e9c6da099cea438ca7474 SHA512 004669fe2984e355f45c9806ca0b380299b82479fa2df6c571c297277f447014eabe5d582b72042168a93e64780a35fad13ad84f437d1c468a3b645497727c86
 MISC metadata.xml 251 BLAKE2B bb5fdd6fc58b43ac34ba535ab822795cb5579f40ff49cf5f5a8f3e3f248e101c4a9c97b608f6496d9cf48a4bbfcf93d665c8ca6b8bde9e41623238ea084a379b SHA512 65b7ed1e032f046e0afbc0d0d9da9fcfc4df47d68cd3076cc1f1f645ba0d9a9bce16265dc9b26e666190cd574ee4ac6203b4d7e01a55c5d79081377a52f2860d
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
index 89c2655d67ec..f5ec6ede5256 100644
--- a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.18.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
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="!<app-eselect/eselect-emacs-1.18
 	>=app-admin/eselect-1.2.3"
diff --git a/app-eselect/eselect-oodict/Manifest b/app-eselect/eselect-oodict/Manifest
index 2005af1899d9..3ef8d0702b67 100644
--- a/app-eselect/eselect-oodict/Manifest
+++ b/app-eselect/eselect-oodict/Manifest
@@ -1,3 +1,3 @@
 DIST oodict.eselect-20100228.bz2 3802 BLAKE2B d545d42ae99a25a5d66d573a1434df84cdb56cdf61c155db5017a180ab8beef806c38cb4061cbde872455e029cdd9f65f131eaf7920c138dbbda168dd3344e0f SHA512 7aa1e3081b9629ea5932dc679bed7956887cc7f3dcb7e6399d42f8d3ed30b565a1487eef15293f4046b38b6bf8a7844e6d7050e01337550044977366a795f753
-EBUILD eselect-oodict-20100228.ebuild 555 BLAKE2B 58c48bf7891662f5ddba2475fc35837483ce381dd4aefb7ac317c42012a08482c10ee78425614abf2d34f73aa2de99da229272441b9c32661611f6c9b306ce1a SHA512 e770b42d3f12efc920a1116f0514d6a021c6f8751a164a28eeb67554ee0b11a2da5b5d3c9848f46c08fcc70fb9fa07556f5806c682850ed786fa8703d65fc131
+EBUILD eselect-oodict-20100228.ebuild 532 BLAKE2B feec0b2fa25068111030d08fa9ba773d4b55c178602a76a8d60d62f70f0634ef952d1e2bb31af74f5deab3d307dcf6a472d5003a810882e263cd4f45af978559 SHA512 24a2dab59744b5edf16437a38c1d4bb73c79b8fa739420f30d37e4f484fdc61d942ec2cdeba015c79bee6f6f935e573b68373236f232604c51d2e1d65206ae68
 MISC metadata.xml 354 BLAKE2B 1523bc23bf9b7f945abaa4b568fdddb1561af94ed0d70f5abe1bb4428b3d34287ffca5805f7a9e5487b7ead890bf9c377d2f71d04280baff0e894b88b3c8cc87 SHA512 0b5d112a649f59f7e9fd15e91d67e6b7f837bf34c9870d96e963508a56218c2498aac001f9d5ccc4af9328be9ea4de2a2dd6e042c347dc7c3d69697e2ea6fbb1
diff --git a/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild b/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
index 26c2b0418b1b..099c65f597af 100644
--- a/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
+++ b/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org"
 HOMEPAGE="https://www.gentoo.org/"
@@ -17,5 +17,5 @@ RDEPEND=">=app-admin/eselect-1.2"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}"/oodict.eselect-${PVR} oodict.eselect || die "newins failed"
+	newins "${WORKDIR}"/oodict.eselect-${PVR} oodict.eselect
 }
diff --git a/app-eselect/eselect-pinentry/Manifest b/app-eselect/eselect-pinentry/Manifest
index 645b10fb716f..d07e6317be56 100644
--- a/app-eselect/eselect-pinentry/Manifest
+++ b/app-eselect/eselect-pinentry/Manifest
@@ -1,3 +1,3 @@
 AUX pinentry.eselect-0.7 406 BLAKE2B 99f9d0d0dabe57f863d2d814ee0b27956b0f14827a6ba0aa5d06c6580e6e55e359f7ad3fdf56e9d8ee087e79d46f2d9c8c874064b2dc6947d0f4b2f7a0c80533 SHA512 752be6cc5612799fdfaf765e9476e69d845065834a3a471838a94f1955d645473ac56db6e51b6f45b9a251b32c36ba0b149cd72145665972243abbbfe4a5941d
-EBUILD eselect-pinentry-0.7.ebuild 691 BLAKE2B 7c72bb0a5036c250df7338c65a63af357d433af66acb582be9ffe6691d44bf64877d64ab9b108cf1c02a3ef229730f03ce0a64d096870e3cea34c4c2866d3deb SHA512 68ba1ca68066a93ea29d8f6620a1e9dc6c62d2c47ea0b1f524075582c1eec36a000e191edad3a7703240446102a0bd82d3f95281630ab141d0f853a6369f649b
+EBUILD eselect-pinentry-0.7.ebuild 690 BLAKE2B b5099433ec629b94754791d729b0a765552b8942ebc5a88d33975f161d11f4d5a9c31c5873df3df288bfe69c3e4f1d74718ddd8fd6b05c2977f503c429f95049 SHA512 eef0626a8598a5c0096bcea7cffd7de58b4c9760a86178151daf30d53fbad3ab1b327f03c153abcc5a88ebd5cecf389d4425d47d92eb1509f68b9622d599784e
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
index 54d6eac5a489..3ac7fc482efd 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.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=6
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 36eea079a3a7..dce91aa28b35 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,4 +1,6 @@
 DIST eselect-repository-3.tar.gz 5448 BLAKE2B 36a079f2a876709a2cc045e0c113f44f9feaa491c49d3773eb3e123ee7e7a7ffa2ad05060ffa62ac39ff8091a64ff995ea948f3c784ffbb7d8ddca5e468364d3 SHA512 ac3396a6d14fcc7d4df1f9b058bc3025875707f3febdf4d1e03122445d0e6273759b8a66443525c94daaf19f91b411c469aabc0e0082cd53980886a91f38a062
+DIST eselect-repository-4.tar.gz 5535 BLAKE2B 4dce6c0136ec9394c9bf4128ec26ab67260d4b96a165825ae7b15b8476d10d23fcc5190946fc54013d6eb8e4f18988b07df4c849ba50844571986a6823511547 SHA512 0d3c204d73bb4314bc24fdf6cd837f2a56ac00d1d11fbec7f072af874bc468777676bba40e0cc17553f6dec7a907f10865f9c356a6390372e0734173465ac483
 EBUILD eselect-repository-3.ebuild 906 BLAKE2B 0823c79e3eece3ff4faa02e68d7af7aad48f65c7008c555e401bf4ae904799641133c59b4ded810dca973a931fd48cbd0a86902e58cecff41c79cab3d85fc3e7 SHA512 8e0160a730c6538ed4d2dd2857d50f2de7286914b3ae132b0748540b151bf01a75c72da21aff390b5364122489ceef940a5eb3261d6dbc9c3d0c76f1f71d8e38
+EBUILD eselect-repository-4.ebuild 909 BLAKE2B 45ef0c881971775d33d8a208af55005f6cba842e06f8bd5cb4ead9e08c27403cc4450643accdec6dd25ccbe5027a3254be5c5b7cf4a96e3f029c5dc59184c87f SHA512 05a99c022ac39f66e6844607ffa4faf3581b1474ddc5285db9954998f6c5a9efa47875f6b395277b70c269722c7eab90c2541682014e2cb992fdd3f81d8e934a
 EBUILD eselect-repository-9999.ebuild 884 BLAKE2B ef691a37c5b3e0180e5ccb56e0417bbfee46edeb78d652247e30db0162bbf77cd90ce438abb09d0060eee17ea7620b24f4789ddc6e6761f96e810668a99809a6 SHA512 1f97605e8a8f2762b83b28266f2b40a0db3a253e135ae829178d5abac6158406a97e40f459d6477870372ff350a1e620dac353d96deb342f7aa3ce8db97512ec
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-4.ebuild b/app-eselect/eselect-repository/eselect-repository-4.ebuild
new file mode 100644
index 000000000000..8b88032d1ad9
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit python-single-r1
+
+DESCRIPTION="Manage repos.conf via eselect"
+HOMEPAGE="https://github.com/mgorny/eselect-repository"
+SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	app-admin/eselect
+	dev-python/lxml[${PYTHON_USEDEP}]
+	net-misc/wget"
+
+src_compile() {
+	MAKEARGS=(
+		PREFIX="${EPREFIX}/usr"
+		SYSCONFDIR="${EPREFIX}/etc"
+		SHAREDSTATEDIR="${EPREFIX}/var"
+		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
+	)
+
+	emake "${MAKEARGS[@]}"
+	python_fix_shebang eselect-repo-helper
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	keepdir /var/db/repos
+	einstalldocs
+}
diff --git a/app-eselect/eselect-sndpeek/Manifest b/app-eselect/eselect-sndpeek/Manifest
index d4bcf8e2d017..c43ee1ce5fc2 100644
--- a/app-eselect/eselect-sndpeek/Manifest
+++ b/app-eselect/eselect-sndpeek/Manifest
@@ -1,3 +1,3 @@
 DIST sndpeek.eselect-1.0.1.bz2 1263 BLAKE2B ab2ed4019fd3bd991803375dd6219e4ca8bcade739c435beaf034d701324db52d12b0967821716351455f39d181657d6153d889cc313c2a3761994afbd79194d SHA512 39cc065d4fbe408db9c406d84a0ebf4a69a9c50f440f26b714b5f154bf7b5de497df4226434d60c0b1e4e073bbe3a0ca96c3bd574148772a4912e2fc9c9c6b5b
-EBUILD eselect-sndpeek-1.0.1.ebuild 471 BLAKE2B 76cd51e671276c20e6247ddc6c3ff0321c1f1f2f7e0485eb54a1f793b44766d1078e3c33a6822e4e64d6cc4987c6af250ae4056e15d0fa86dbbc9d7bbd7f84b3 SHA512 f670a85e1e28fe421ce2a84d5c7febbca3fefb9886b632d1ee2be8843b30a87cde23c5e7f0ba1ce93cd4293f9e998f0e04fe85c9417201a0f842464eca043c0a
+EBUILD eselect-sndpeek-1.0.1.ebuild 464 BLAKE2B 328b9ce17d67a3b5fc3c49950536b9faa34b2c6379b439c2db960e81bd3297ebc80b29a6fd80958353452b74eea7f1492e87c64119b60f615ea059a7d49b3a87 SHA512 111b150c661eb3c57cc4a2d2ead56c052d0da1858fec90b91cb69b7f141136e6fda93a0056802d7aae962e22ab5c817d1380acb2c63ae479658564b75a189898
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
index ba2876a31f64..784d3f282216 100644
--- a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
+++ b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="Manages the /usr/bin/sndpeek symlink"
 HOMEPAGE="https://www.gentoo.org/"
@@ -16,5 +16,5 @@ RDEPEND=">=app-admin/eselect-1.2.3"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/sndpeek.eselect-${PVR}" sndpeek.eselect || die
+	newins "${WORKDIR}/sndpeek.eselect-${PVR}" sndpeek.eselect
 }
diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest
index af6c1e4deb0b..da44b59fd00d 100644
--- a/app-eselect/eselect-timidity/Manifest
+++ b/app-eselect/eselect-timidity/Manifest
@@ -1,3 +1,3 @@
 DIST timidity.eselect-20110513.bz2 1689 BLAKE2B 80d99984f3407a8130969626e12212f4c62f1587ef3ed4a0b953d480286f87fa32c57cf84a5794d8effef4690bdfc1d8b7c9c0031919b61ba4e123544bd2df5f SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe
-EBUILD eselect-timidity-20110513.ebuild 529 BLAKE2B 63dfffafdcda54ac6de20ef4ec4f4261ea72294f7496b303f6ad432882f81010b85fc4bc00368f86a2406c27b29f63a7d8b7f19d18538151596330617cc0f480 SHA512 6a552bd77c0d985b004581ccdb63eb0ca8308ea959e403758db87eb2d258018742f8f72c9659ff053f14bb6042eda904547002fe09340ad5e0d2abe433915c13
+EBUILD eselect-timidity-20110513.ebuild 529 BLAKE2B 1abe0a50e471a19add8986fd633dc5c218a31f68c51cf8f40489f90d0083668e3feed7e8b8e70c41598f01cb626f9d59e52ef55eb1e21f4548fbf0a3b1ac64aa SHA512 3dc17f82dde049a967633a13a1226788b130a15ca8b6341bcd13a95d8d47baa038dc3ec62b86dd8f09ab275e9e98dfdfa3c91ab8c021a3e1bc93c9e69f3a0c3a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
index d4af518fcf60..8ff781184fe7 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="Manages configuration of TiMidity++ patchsets"
 HOMEPAGE="https://www.gentoo.org/"
@@ -10,11 +10,11 @@ SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3"
+S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect || die
+	newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect
 }
diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest
index 545c6187be38..ec228b8caec0 100644
--- a/app-eselect/eselect-vi/Manifest
+++ b/app-eselect/eselect-vi/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-vi-1.1.9.tar.xz 6236 BLAKE2B 09853ac48d1f904de5602244306ab35cb0597d14ddfbb1865ee54adf53bf190df6574cb5d8c27e3e41b12768c79f10ed1482b7ffb66015375b0214d32d17dbe3 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f
-EBUILD eselect-vi-1.1.9.ebuild 640 BLAKE2B e601b38de3e7d8c39b33d2b4a49f2b3fa5182b8857a5d6077e92851d65778705a2d8786cdb36ee7c145c79ec598067231b5202b6bc8007b3c3348b5702ea827c SHA512 883f4f64a47dc5ddbf3cf691f679a63cea92bc8581ad4466c9c3e1b22c16142f7aaef361cfbcfd52e2aff702f82084e09252418ae684708a78c75d62c75d1f81
+EBUILD eselect-vi-1.1.9.ebuild 639 BLAKE2B 1d8c212ef6da44f36c5e43485f13743141b32a8ff30a595ba404be5ecef8acece5d098f0c328a73c65015d0e58062d2f94aa95de60b46b4a54a949576c70632f SHA512 95e703b9f5fd0a5e68d706f4ab9794014b579adf886a7ba017525d93dfa6d8aade98664eba2d51fcc219f708ce51836eef5a37a4c5d42e0ab550647419bd6379
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
index 84c843b00658..a9de862b0ca9 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.6"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 944faa21a3b3..0f5b0ef68726 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/foremost/Manifest b/app-forensics/foremost/Manifest
index 978ea337c5a5..3910c1f808aa 100644
--- a/app-forensics/foremost/Manifest
+++ b/app-forensics/foremost/Manifest
@@ -1,8 +1,6 @@
 AUX foremost-1.4-config-location.patch 462 BLAKE2B 7dadc7fd049b09992e9e3019aaaa27d53268a6b6cea03146d965bdd3f0ec3165fbde33c2ecd41a949758ff4b8d36259d048869d17b828e2f600ea9418e3d0bce SHA512 7b6dcc18cba4676ef4d54b87c9c31747754ecbebd9424340b2dd059495c9c6cec11513307fff802a336a99bc07c4bcd2ffcfad1c77ccdc49277ef7e40e30029e
 AUX foremost-1.5.7-format-security.patch 680 BLAKE2B 5565dc9d255ccbb4b721cdb0b41fef4f86369c4965000e35678e6ece00acec5ead0b15d90bd71a2456b812ab74fa9283bdf70c2fc36003a3d659105bb04a139d SHA512 1c28ed1fceedec728a5060b195214fd3ec3b0fa529e87f7421ee72d73f71ecc0d48a69a5b5ff4c6179dd65781552fbd272437134498ec865bd5c620375b6f85b
-DIST foremost-0.69.tar.gz 27719 BLAKE2B c4e4837e0c97b8ca90cd5b67b2731a801947b40a089c24083b4695905ac39556d4bb2aa2970d7b4d7f4567c4c500785403256fc031ab3460b99ce94018070136 SHA512 3d25e62995f7da0e47ffbd9b90ac2d1a6a870ae0e310eb46b8332e914372008c44abe6ef504f875de60d22cfdfac439e53ec65d7cae255d4a989ee9cfa1020b6
 DIST foremost-1.5.7.tar.gz 52352 BLAKE2B 5642c1afd86aab0a2f90986c3b030d37b37700c5d0e4b04e4f4a2004d69745280fabd4086a72c33b9eab05b57d125d6b11105c9e11b0112e30077f101eeab7ac SHA512 8827c29d52496783be26374f3943eb26a154d842f34e50fb489f87b3a5045bf85f1e44d7d8d8b12b2355ba3fe4b06a0db979cc22c0f431593c5976001eb931ab
-EBUILD foremost-0.69.ebuild 596 BLAKE2B 5d2174ae6576f4eecc9330298c784990d63a8835fb49cb1077b9c415a6968339ce27294bfab7b0c36dba988950aaf47d4be556c525f2d28985bdeaa66cc63dd9 SHA512 202c6896617257e650e20dfef7bcc23ee79929fda994f2dc5926af76f595ede6b69a856e4405a0630cb0f9064b513130315eb93a26cdf756a9cc876182d117ea
 EBUILD foremost-1.5.7-r2.ebuild 847 BLAKE2B cecf175a8a7a4162d98dfa15d83f59e918274530193b7caaa6b97ec3390c1264fc988259a3909256e16f3a398903a8ee67d50c38f25b0503660c90eed3384706 SHA512 470fc501414f9a6144910af890f9d7f6aa5f948e16b2a3dc3328c54d85490e82a94416f747b7b6c12ab6a00951405938e90a242fc52912fb5d766b071a76b28f
 EBUILD foremost-1.5.7-r3.ebuild 890 BLAKE2B d7d8c238ec0ebfde11f0bb6f2be6bd8518c5c3309791e3abba7994f77bf8fee7c147e00ba4c9f78a460c4b234f6ef9bf79cbf181264f7fb5b87956c6fa9a1f73 SHA512 78967f04824c614d2830bbd0f3eef392ddc59e6cc0c634011bcfa9a12116f47f8a6b04b3b1586122572a89682ae739ff124fde07731b1dd4eb279a070effb496
 MISC metadata.xml 303 BLAKE2B 14bc09979926d326ccb75438d8e32f9a60b1df8078e6344f4dc2e32a33c0994bf2740a4b29d7c1a479bb514815f037d2d9a9ac9c8387fbc01b7795e2a37fea86 SHA512 165c108232c3a65d3fbeb0fb2f612c7c4c4c16a57e4b3e280c4ef40d6a586b56df437454283ff5b52fa3a0880d9643682493b3d75cac01170edab53bb5f1ce52
diff --git a/app-forensics/foremost/foremost-0.69.ebuild b/app-forensics/foremost/foremost-0.69.ebuild
deleted file mode 100644
index 79f9c3240c62..000000000000
--- a/app-forensics/foremost/foremost-0.69.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="A console program to recover files based on their headers and footers"
-HOMEPAGE="http://foremost.sourceforge.net/"
-SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
-
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-LICENSE="public-domain"
-SLOT="0"
-
-src_compile() {
-	emake CC_OPTS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin foremost || die "dobin failed"
-	doman foremost.1
-	dodoc foremost.conf README CHANGES TODO
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 95bc5dab4545..c453657d49ab 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 9777607f15f8..9d60cf325bdb 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-1.5.36.tar.gz 6413145 BLAKE2B e0948e81cc7002ee4eae8cb94da765dfba701e6b0872db85c5f847895be640292f78840ef19b9daf452c73a0b7d5c8385d6095f244d060d2cd0b8e1a7edd796a SHA512 f9aa7b226b31732e1bdb78172a60ac8de3b86a86669a6aea017469001cb509bc8c1c3799764ed265befdc058f920bf7022c70d431503ad4ef27cc20eb9fa0537
 DIST ibus-typing-booster-1.5.38.tar.gz 6408096 BLAKE2B a4559044a4cd06c5dcf69d77d5ec3d8163d564702ff88d3ed11b8c073f5272e2cfab446de548a29887b74767f4318db98fb898dc4d15488fd4c9963cea151009 SHA512 67b81a47501ae4e885d2a79b122799b78dcdd044ad8e36a140d4c6587a23072d08e3e025f755c191cee82c3ab81ea1a974a5a0f6438e7203ba2d63d7e1cd4eff
-EBUILD ibus-typing-booster-1.5.36.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
+DIST ibus-typing-booster-2.0.0.tar.gz 5689495 BLAKE2B a3ee39faf206c4681d10989d4e438cffc0b78d9339973523af61310482b3ec13c7935e9e49403a3359e0f32d087b72afb27ae7975dcd3abd427b9a0f5f0ba581 SHA512 140044be13b47590a0835bb4b8da7311cdb92e8134a88a7b999ea6f530298950c4f8ce9ff3462394e4b52de0c56e3072671da85c99b448a91f442fdc460c608b
 EBUILD ibus-typing-booster-1.5.38.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
+EBUILD ibus-typing-booster-2.0.0.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.36.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.0.0.ebuild
index b4bb8048b30d..b4bb8048b30d 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.36.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.0.0.ebuild
diff --git a/app-i18n/kanjipad/Manifest b/app-i18n/kanjipad/Manifest
index 5079f86916af..e9463a954026 100644
--- a/app-i18n/kanjipad/Manifest
+++ b/app-i18n/kanjipad/Manifest
@@ -1,5 +1,5 @@
 AUX kanjipad-2.0.0-cflags.patch 613 BLAKE2B bae1e330b7256a81b0ed3bf79fd3a778e55ce8c21fe6a63bed07ed90d33383ff0c4b8edb5eb0f11e930d498ee302886fe8127162de5c4d9f4f9f7c1868c92aa0 SHA512 2164e5ff2202cd4314ee2d8dcc98f6d428748c3c62251c89daae83466a4a4b59bb08655d1bd98a5725569e680f1cfc25f3cd971919d3ffa20c78d38dd895b402
 AUX kanjipad-2.0.0-underlinking.patch 449 BLAKE2B 2ff743dc0bf407a499b181295e747c1327361dcf5f0ab63f91544ddce5aa73bbe16b1acfe85c1b4aa28ae88268f32d5b52e87947686bca10301c21b30413852e SHA512 78c510337dfe2ed1bff81bbdd6195b6e76e97aac4b1a634b8cf29590eac9d70ddf7b720ad9fe6cfcb9c01e3697d3c6def382d8693902369a2be9531440daf95c
 DIST kanjipad-2.0.0.tar.gz 75930 BLAKE2B 032031a30ed294d2e1951e0cc123b599db2f34fe7ad7714200107644167e69b57e292ec1fd0af30bb354516a9eb27bbff5aeb4055319c98a690ed53ee002cc96 SHA512 66a38597358f97a9b43c3d1f4a9d6cf583b6158350131bae3b4d47edb167877def8eff4dde666c41549accb54c7256e08403985bb06d56758050a46d5b471ef6
-EBUILD kanjipad-2.0.0.ebuild 858 BLAKE2B 8db5da39cd54aea0e0c640dda32059a08f0f7986f493260f7c429f929d8eef10abcb93bc7fece244fb0bd174cea147a4008542bd2af491c614c8b3cc29d33fcb SHA512 4fdcbd5a683c0d5ff89546714afaf49de648baa9b779767cd66c036ba5055208e113cfdaf00f852c8610070b37913ce5f26ad9c3d7c7b199a20c999453bd571d
+EBUILD kanjipad-2.0.0.ebuild 878 BLAKE2B cddc79498081d19e7b086ee4be2f6d3aafc41511d6395a4dd18f103bdd58f0b4dfc6bebe4a8fc5644e037d0fadef56dd6b2eb0aa33dae94c64ea6acc5e86691f SHA512 3a25a5ed9e2cfc17701fc58ae4ac9c8d51bf2804635c7bb045d585bd6d385c12d51ee34ad06bcb1a73b555c24d8b5eec60e133d18a23b7eebd4e312476c0a1c1
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/kanjipad/kanjipad-2.0.0.ebuild b/app-i18n/kanjipad/kanjipad-2.0.0.ebuild
index 790545ce7d57..82d47a93e351 100644
--- a/app-i18n/kanjipad/kanjipad-2.0.0.ebuild
+++ b/app-i18n/kanjipad/kanjipad-2.0.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Japanese handwriting recognition tool"
-HOMEPAGE="http://fishsoup.net/software/kanjipad/"
-SRC_URI="http://fishsoup.net/software/kanjipad/${P}.tar.gz"
+HOMEPAGE="https://fishsoup.net/software/kanjipad/"
+SRC_URI="https://fishsoup.net/software/kanjipad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc64"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
@@ -19,22 +19,26 @@ RDEPEND="x11-libs/gtk+:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+DOCS=( ChangeLog README TODO jstroke/README-kanjipad )
+
+PATCHES=(
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
+	default
+	perl -i -pe "s|PREFIX=/usr/local|PREFIX=/usr|;
+		s|-DG.*DISABLE_DEPRECATED||g" Makefile || die "Fixing Makefile failed"
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	perl -i -pe "s|PREFIX=/usr/local|PREFIX=/usr|;
-		s|-DG.*DISABLE_DEPRECATED||g" Makefile || die
-
-	emake || die
 }
 
 src_install() {
-	dobin kanjipad kpengine || die
+	dobin kanjipad kpengine
 	insinto /usr/share/kanjipad
-	doins jdata.dat || die
-	dodoc ChangeLog README TODO jstroke/README-kanjipad
+	doins jdata.dat
+	einstalldocs
 }
diff --git a/app-i18n/pology/Manifest b/app-i18n/pology/Manifest
index f967e8abfa4a..23c4b1abc77e 100644
--- a/app-i18n/pology/Manifest
+++ b/app-i18n/pology/Manifest
@@ -1,6 +1,4 @@
-DIST pology-0.11.tar.bz2 2064780 BLAKE2B 9453d8b10414c8f50695322de25207fefff4fc5359fcc5e89d639a9cfa0553aadc2bb9953ec3a64daed6235ef7c0b93663983c8605c56a7f83113ab1566dee89 SHA512 bc0193fd4d61390eb9fc5f0ae8eba87e4ef4a3f82f0c1cb937bc24e54cb304d208b5f57c2310291601600f97635e759e700346198637f8d155746c0baaa02b22
 DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
-EBUILD pology-0.11-r1.ebuild 1595 BLAKE2B 3f21e68eae9e7f57d278d8a729e7074564df5a36636f0a038a0a6f46a8d1ae07b78167970ceea5964eb3842edb87f24ed73fead54d1270f34a94c181d85b07b0 SHA512 6a0fef9e0f5ff397a3ff3bc31a6ad7281c39fa37c5dba19897453f650e62dcc4c4ea6c13d381d83c430fda9a6c63e0af1d60897cc13e5731cd5e69fa8e550ddf
-EBUILD pology-0.12.ebuild 1520 BLAKE2B 4b65348856b650505b9b5e2b1486081ec9bb456706ce75ac6b9c08f8f1178686d6571bd66534fa5f5f31cd66b1123c0caf69a244c54e47bedd81beb3b39fd8ad SHA512 9aa8313e6789c36d4b6faa1280adfc658f5ba1e86523defa5cda1e7b4aef657ebdea15544943ee81390d7c154867cb65a4d18bfa7d28a2f31dcd3066e21f9bc3
-EBUILD pology-9999.ebuild 1520 BLAKE2B 4b65348856b650505b9b5e2b1486081ec9bb456706ce75ac6b9c08f8f1178686d6571bd66534fa5f5f31cd66b1123c0caf69a244c54e47bedd81beb3b39fd8ad SHA512 9aa8313e6789c36d4b6faa1280adfc658f5ba1e86523defa5cda1e7b4aef657ebdea15544943ee81390d7c154867cb65a4d18bfa7d28a2f31dcd3066e21f9bc3
+EBUILD pology-0.12.ebuild 1518 BLAKE2B 3a06c328587ff66ea3b6de85296e3545c2c51c1fd4fd2487bd0984da799661053b631acfef42e2dcaf40b97313cc96871c8152ecfc265c8d9e234383078c58e0 SHA512 6b2a457f20c3e4fb8300af4b0aff6f502abe0cc405c5faec1111fe62183d9e75d489a9f9467061c8d553ed5777e10b719332a6da5d751b5c993249a525ec37ea
+EBUILD pology-9999.ebuild 1520 BLAKE2B 363e87934d6b2664dcc076611232df108638601ecd925c9df580d30009cc9954b37b41cabcc49ac2a5656eb0c1f42b949fd5c0adcd59b519cd666301739ad8d9 SHA512 17b869529d4dda2adb335a4e1be4999ffcc173c7eed73e88d4889b479a31fe53ca389176114b7f3bc538a9e501c91170f3fca7afceb5724acf1f854ccba186b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-i18n/pology/pology-0.11-r1.ebuild b/app-i18n/pology/pology-0.11-r1.ebuild
deleted file mode 100644
index 5f9de51f8063..000000000000
--- a/app-i18n/pology/pology-0.11-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
-PYTHON_COMPAT=( python2_7 )
-
-[[ ${PV} == 9999 ]] && VCS_ECLASS="subversion"
-
-inherit python-single-r1 cmake-utils bash-completion-r1 ${VCS_ECLASS}
-unset VCS_ECLASS
-
-DESCRIPTION="A framework for custom processing of PO files"
-HOMEPAGE="http://pology.nedohodnik.net"
-[[ ${PV} == 9999 ]] || SRC_URI="http://pology.nedohodnik.net//release/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/libxslt
-	dev-libs/libxml2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.5
-	dev-python/epydoc[${PYTHON_USEDEP}]
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Magic on python parsing makes it impossible to make it parallel safe
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
-
-	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
-	bashcomp_alias {posieve,poediff}{,.py}
-
-	einfo "You should also consider following packages to install:"
-	einfo "    app-text/aspell"
-	einfo "    app-text/hunspell"
-	einfo "    dev-vcs/git"
-	einfo "    dev-vcs/subversion"
-	einfo "    sci-misc/apertium"
-}
diff --git a/app-i18n/pology/pology-0.12.ebuild b/app-i18n/pology/pology-0.12.ebuild
index 3fe9a9b0038e..f30202d5f5e6 100644
--- a/app-i18n/pology/pology-0.12.ebuild
+++ b/app-i18n/pology/pology-0.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
 PYTHON_COMPAT=( python2_7 )
@@ -18,7 +18,7 @@ HOMEPAGE="http://pology.nedohodnik.net"
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
index 3fe9a9b0038e..a1c06c9a1711 100644
--- a/app-i18n/pology/pology-9999.ebuild
+++ b/app-i18n/pology/pology-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
 PYTHON_COMPAT=( python2_7 )
diff --git a/app-i18n/scim-m17n/Manifest b/app-i18n/scim-m17n/Manifest
index cbc388b41947..38cc186bbe4b 100644
--- a/app-i18n/scim-m17n/Manifest
+++ b/app-i18n/scim-m17n/Manifest
@@ -1,3 +1,3 @@
 DIST scim-m17n-0.2.3.tar.gz 355801 BLAKE2B e6dbfd74ffdac4af4a1dea335a41eded6a499637e772dcb33295c4e5e25e2b04ba420b04ec7029bd6638ea22f74fc9a06f63a48114df7683486581686a733dd3 SHA512 c54be4c8c331d5621dcfa6c0c6f302231071dbbaf3ef7aee4117fe2c2616d58e184d3bae720dce27d5cb6567064add6979630090c72f9350391ca9c3e9c404f3
-EBUILD scim-m17n-0.2.3.ebuild 879 BLAKE2B 16ad8cdd202f871f5d8aae4f01387a8369f0ff1c38645263a7de0eb4974d55108abe276bb2eb9fe7237ad323c2980af302b598896235720d9b6d4e489ecc53b4 SHA512 be97116f4603de79ca9993d69e6d2d293e9f327d08b6643bad675e3ed82d0e22813ee49a4f2f6ff3508bfb1bc1935295cb3b19717a80b5ed1ba1d7e00b2a44bb
+EBUILD scim-m17n-0.2.3.ebuild 761 BLAKE2B 976228f44e64bc4e0bab402e472787959303c458233cb5d820d232e43b907a01223311942719ee92705dd8542bb9f3829a0a377b1aaf4c53523719f4d7f04e81 SHA512 181b4e6b73fd032478c38f461b1ed782f23712eacea793313411bb66b182eafa7d69ec87822d449a46a70e023accea8095c168ae0aed62466b58c30fae4a9c84
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
index e870b0ecb280..87039f7d14aa 100644
--- a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
+++ b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses m17n as backend"
 HOMEPAGE="http://www.scim-im.org/projects/imengines"
@@ -17,12 +17,6 @@ RDEPEND=">=app-i18n/scim-1.4
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog THANKS README
-}
-
 pkg_postinst() {
 	elog
 	elog "To use SCIM with both GTK2 and XIM, you should use the following"
diff --git a/app-i18n/scim-pinyin/Manifest b/app-i18n/scim-pinyin/Manifest
index bbf5c541ec2c..98d6b8f3dfd3 100644
--- a/app-i18n/scim-pinyin/Manifest
+++ b/app-i18n/scim-pinyin/Manifest
@@ -2,8 +2,6 @@ AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 BLAKE2B 6ab4742b4c857064d07402411
 AUX scim-pinyin-0.5.91-gbk.patch 2501 BLAKE2B 5a352313b0a779049e5a74f94fab1ffe23336b2fa979d35961ff0db8e86214d51f4ef3e08a6b65261306fd049fad639dabf767ebc3c5e1d863b8249975b0c819 SHA512 77dc428913f0fdfa8c9c9ac056eaa84d9b60e3b285ce510aa9528be087f5757f3f8055ef0930c4ce1c3776e0ca0e3a3fd725ca5d790ade030a8893e5fc8bca17
 AUX scim-pinyin-0.5.91-gcc43.patch 1737 BLAKE2B 09c72b35e238cb0df6a9d3ca9dc08087257bfdd21dfef3d3a0a1de71984a5f840f8b18207183beae794d8284849adeaba9d3ce122dd65e8290aa4c810febe84b SHA512 3b9d10c2ee4ada9a3d8e6c2c292f745efbe034b8eda30932aeea24c1fbaf54a9ce5e6b9e1dad3c43b33b6b14b009406770a55c23821bbe4d9e421d674d1b34fd
 AUX scim-pinyin-qt335.patch 1122 BLAKE2B 693bfb38d5acf47da482603442c28f5fdd2bb1fb9a9f158fd033321f4d28f092fa049e554bb0281178c47013c8888abc44085b10042702d95a2aea349cf1d450 SHA512 d9cafc0f058f7da5fd2c7b70f7b2eeea249044a1aa886e414d5fad78ceaad168d8cd260e7077c03aad6fe622b637bba5312403b15b61b935157f6258020c1c55
-DIST scim-pinyin-0.5.91.tar.gz 5492055 BLAKE2B 8eb01602f4421c397d6c408c1513c0691a98f10d3f47ed54eed9a39303d9a0eb804d4de2f744e25808c83b8aa9be232482caaaa829b8becc8ee10e4cf67373f2 SHA512 ec4498c68cc7ef913b890eb881c73ffd790a5d8d8d48a0a2c32ceda942a7f359fc4bd181199b5333156119484d53d17396b48026fc7913105cfa10c92dd4548b
 DIST scim-pinyin-0.5.92.tar.gz 4769203 BLAKE2B 413a196d175536a044bdf4922bf1f3de6051f7e3cb61131153cab6c15e2301e373bfdd037d3e70c2893f66c29f955696e94bb9c75d1e686ca549d26716de0c47 SHA512 6af20b925c45ca355e12eeb59285e3327c2195038078a0e1741870395dc5a8f7dae60b8c9cd77919fbad94c27e123b9e58439f7011277439f9914d1a543a805f
-EBUILD scim-pinyin-0.5.91-r3.ebuild 1105 BLAKE2B 0e7c0adacf238b269ebc727e5a559d816d7c519bcaa14f43b63021bf481fbd610b99805af48189ac2b31f6afa1030b42244376db4e0bf843d574d7c9bd5c2dfc SHA512 62dd23c089be06357902c34ea90be0684760bbbf397ec3d24806f6a3a2bb039eb43985c32e3c3a42b3f075e3ef44a95de9f244a68482cfdd76bba06aea45a38b
 EBUILD scim-pinyin-0.5.92.ebuild 845 BLAKE2B 8b9ea8806e578c7a66ef65001d192233d8c1150508f7de7d027b32082c4955d2945eb81174a361f48c835a8ead8d16fc47dd8b57f9956705fef409602efe16c8 SHA512 d5a80f917eb810b87e31894404170eec5f87788c831cd6c8c80d369e7558ee9b44d4f4b0095c1eb378bb4848fb0288c9b2b138a4949bcabc35b9446cc22c6762
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild
deleted file mode 100644
index 3b1c1c0eb32b..000000000000
--- a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) Smart Pinyin Input Method"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libXt
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fixconfigure.patch"
-	epatch "${FILESDIR}/${PN}-qt335.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-gbk.patch"
-
-	AT_M4DIR=m4 AT_NO_RECURSIVE=yes eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		--disable-skim-support \
-		--without-arts \
-		--disable-static \
-		--disable-depedency-tracking \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS NEWS README ChangeLog
-}
diff --git a/app-i18n/scim-tomoe/Manifest b/app-i18n/scim-tomoe/Manifest
index df1b23f2e767..7b5945ce5bd1 100644
--- a/app-i18n/scim-tomoe/Manifest
+++ b/app-i18n/scim-tomoe/Manifest
@@ -1,5 +1,4 @@
 AUX scim-tomoe-0.6.0-gcc43.patch 445 BLAKE2B 7a6f48120398dd661a647914e9097dc69807a2c0d18ba9c56517c48df2a67dd7406cb13dea283ff5b9b8c64a19dcff4548453f0c47cb37f890cef0cf7a1794a8 SHA512 a27202fdf5be0d77d473674475ee99d2b0d1a6eba51ccc45c4c7dc6c3a9c3d1042ed3b25ae15a04fcff885aad7b84c42cac7462fcc739bf12076e675b413fafa
 DIST scim-tomoe-0.6.0.tar.gz 385126 BLAKE2B e211c97caab5221d80541cbc795d3559b9843df4fb03bc559a20dc34b510288aefde87251c35c0a123501192d8f4ffb9209fa3c6c74acbbba75ae3321dd58fe9 SHA512 d70a8838f8c82c76a8e3592ad712997189873cbc4ec7ebeba5d43d6583e24acf318299433c9342ee004c4ae4741cca7e0b88e4642cf46c43f967a47ec5ac9d4f
 EBUILD scim-tomoe-0.6.0-r3.ebuild 644 BLAKE2B adb72e7b638641c3b01236f3cab93340b356bfec4cd0fd32f1db8fb21d59fb39f599e9843bc2ccc1b68fb03f32772282ac142284a26c1185231348df8fb51bf2 SHA512 99f9c7a8c24cce85a0236115dd9d85a03046440c2f0d062d15e93d6358532e16e0cec50e37819e8487d3c79f6bf6ba136f1f12bdd6dccff11c96da88729cd11e
-EBUILD scim-tomoe-0.6.0.ebuild 556 BLAKE2B 27532b7f4078e41e3b1201d32b1db16edfbfe370dc9475c17551e8c28c121f612c0a46d1fd55c35ad1cb32d9da73b4112305f08d959236d30c067a76f65816b6 SHA512 e57bfd2120bd0561753e0b0b01e24d314c69e44b8efbbed1ba8dec5edb30d0da102e3b9408717da28004b3229fb35ed3bcb9ea59de684e43f03fe4abf0b97b34
 MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0.ebuild
deleted file mode 100644
index 15c689f259f0..000000000000
--- a/app-i18n/scim-tomoe/scim-tomoe-0.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
-HOMEPAGE="http://tomoe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 )
-	>=app-i18n/tomoe-gtk-0.6.0"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index f2a46bb66c16..6b103c21f985 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,5 +1,5 @@
 AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf425385d333488c7eeb37c37f3ec6a224e0a96d2c1bbcaded770c8ab6b5bd8277808fbce2bbc960cb3838e0e9de8d889ef9fe2af2e3b44ec4a81031d43f1 SHA512 fb684a362095810bb462609859018dd22987704ab9def0d0ea9ab6afc076fddcf338c622b9f587649d6f561a216b8bc234d3499c499ce3d4589113e908037972
 DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
-EBUILD uchardet-0.0.6-r2.ebuild 816 BLAKE2B 4610a2ac3c7c4daafcf54e3126cdca29f283c31b9542966052517aaa24743b6c5ee58c7e7843ab4391d968f6468ac8f3254c359dc04baf632e5c0841f17d4942 SHA512 ffc5e635caf09aca430640d77af203d3a31eb2ce946fe919784267edd6d04b7a3c184a290db8a0ad1caf69f92c592402be7f0a5710f32c09fa857e027bd66618
+EBUILD uchardet-0.0.6-r2.ebuild 823 BLAKE2B d3a291c1dc983135f549fff78942472ef409dcad3db18f7e602ea555ffa1efea5472b4bc70de98822c61ea70aa4a671495eb95de1d06a6dbe15ce462d6dd2231 SHA512 17b2dab20ed3dc8176e435689d0d9624b70f68719a9f253af93209e6414a0bcc62cc6508b337006f99b55b463d6b980e00b02a380eee708291b7635c80a9a475
 EBUILD uchardet-9999.ebuild 709 BLAKE2B ee0157c9893a0f32f9a1ae4239ca45ffa55bd8f2ec65a3733b95374d32c242ad4da69979a31927942ca2eb1d75dc6be23e8acbe38645b82878a1204ea2c9d6d5 SHA512 78900bf42f2d6050df74789fac4bd03259dbf76adad2f0310e285dfc0a58bd66eff606e6f66455d688e93430544e11553130a679b7bf1ca0cab4575057ff3e46
 MISC metadata.xml 472 BLAKE2B d9ef3c52d66ba665481312bd5f99c8be7ada8ea593c851d103451b388c3d37972762a33c9f7d2552ace1dfcaed4bf907145985c081eef0ffd29ffdb6d1c26108 SHA512 3cc702714648db5605638ba28364caa1e0ad0be1b9fb519b434f34fa993f76ba29a9ccdef0e8dea8f4b0fd89514c7196328a1f77efbb9aece30adce5063f7536
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
index 74dc6719ee3f..5c0b29761a4b 100644
--- a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_sse2 static-libs test"
 
 PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
diff --git a/app-i18n/uim-tomoe-gtk/Manifest b/app-i18n/uim-tomoe-gtk/Manifest
index 7a47005d1698..1685c5c27fda 100644
--- a/app-i18n/uim-tomoe-gtk/Manifest
+++ b/app-i18n/uim-tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST uim-tomoe-gtk-0.6.0.tar.gz 372357 BLAKE2B 4624dcaa209dd1f89bbcff6232b72673b9a9e22609c326104e1fbef9e007c33e8711cd435ef5239d43e0104a65fc652ff74eb9b8787b1e0123e10f71bb07b241 SHA512 201c6a755feaef22b11f88a27b0d004d22ab13e806684ad839f7491ca17626eaf0f866a026c3fcf3b981c41c9c6a880d7f9f7a5156d3dad70d8edb78568b1d5d
-EBUILD uim-tomoe-gtk-0.6.0.ebuild 556 BLAKE2B db17d588d7354da55f53bc7b7d660ee90d63ea999e456e1cf4a66b772f7da1c3d706419ec9a725f2a2e0c72786fdd107d73cfc1f5f27683c53f4ab6c0262a685 SHA512 9a8b514357e6d1c17173255d6cacce979219b6f84d497c598c980a97b8df5db4b086e22ffe0351fb569d27a2b551e6e212d1d24cdb8bf5c1e2c4b87d4a3cc81b
+EBUILD uim-tomoe-gtk-0.6.0.ebuild 477 BLAKE2B 1f99c0f6dab6d649c31042f7767b8ddfd90490f8e610a2604524548f08aada432be2b8738495aa7c31831a683a031d94be37b7fdccbf8ac4ccd43a33e3d3ca0c SHA512 473e6b8e6f76d8ed127d4e88c051b7c33c5b9c75fe44818f4f7f8a687727d26cbe5480c1dcd8938b3574b44b69c999ca4079bf09164751ae873fb67dc0e5ef50
 MISC metadata.xml 309 BLAKE2B f8126911d309ca51f6e56437d2c219026c2e50d854b62c44afc5e211cff957d1776b0fef17a64da072033c5df308c6015786feb49344be3c8c4c57074d028d36 SHA512 7d9c17a3c4279406d23064447a7370658c494bbc5eab2a05f048f58ac3e136804ad65dc2fafbfc132b1f82ca6a651f6fe34beb68ea370b5a0eb1a3f6c98d3c2d
diff --git a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
index 371521d94a71..6d00f5ece70d 100644
--- a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
+++ b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI="6"
+
+inherit autotools
 
 DESCRIPTION="Japanese input method Tomoe IMEngine for uim"
 HOMEPAGE="http://tomoe.sourceforge.net/"
@@ -12,13 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="|| ( app-i18n/uim app-i18n/uim-svn )
-	>=app-i18n/tomoe-gtk-0.6.0"
+RDEPEND="app-i18n/uim
+	~app-i18n/tomoe-gtk-0.6.0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
+src_prepare() {
+	default
+	eautoreconf
 }
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 21ecdcaca6f7..eeb5d4e68437 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,6 +1,7 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
 AUX uim-1.8.6-gentoo.patch 618 BLAKE2B 339602558ab7f8d09ef49f9be948f735c6f262961e82d74d22f83a47b9a4072c64d1d197147a168caaa9fbe3fd4b9b1cbc2364576130d400d06cc77551544a75 SHA512 b48d80d26d15956ece6457df32ea35c8ccb2b37cd222699bd35a1cbf40cd6fec14ae424cac17ee91db159a9369a37cc7b8af29c2613d55eb1e82be4e06324d86
 AUX uim-1.8.6-libressl.patch 2041 BLAKE2B d13fc555ce0351b46a08f6fd258a5f222ac104e5107281548a97d2251cfcec89ece8addc2bd5be51f192a854b72701bb9abdc1f97e2c717cd2ae907a088579c1 SHA512 a1af2af13b26b631064165c8f6d6dafaba09d236b489e0e8fd84a7ab6d9c0720a8a91cd9f8baabcc1e640157559fd77f68e18d5e85aaf0c335e25b69e0ef120a
+AUX uim-1.8.6-qt.patch 755 BLAKE2B dccef1b392e331b230f99f34c3dfc2829a49d5c5a15ac7c41eef201f06e5e6bd5c78ea7a3253b7bbcbbccb77feee7bfae677368cdccc1090c4dd8df26a38a5eb SHA512 ba3b80fe5951e2d508c8fc280038f17523a2de5a0bb136179a486c076aa3dd343112dcc976b2d2e4ae157aaa81682ea85031fcb51682776ecdcdb929f6aceb65
 AUX uim-1.8.6-tinfo.patch 2646 BLAKE2B edb4fde474b7264ed8a4a4db329ac06068ddb68e4b0bb6bd33e011018b5450de8ecc2b94716ca486a8a3b965867ee62eb0b3be2b2e939155a0cc34a02264a7a6 SHA512 34c2df710f0053c40b858369036d2e4bbac6a5da6f81794c3d97f6c58713d14c4bffffda555d9fc10ce2d70406578b2a50c9397b23c008ec4b106aa0a4582338
 AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
 AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
@@ -8,7 +9,7 @@ AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
-EBUILD uim-1.8.6-r1.ebuild 4976 BLAKE2B e819e53f6112104dcb1d07f56c531ea0bd089e79c976a16dabce298f1655cddc8b95cee460d835e3f9d081012a5603943b25928ae4079dc19f58332f6a696f90 SHA512 384f14cbf35c6f791f16e6d462f032731a9a86c41b82d3aa958bb439e6922ec33af21b7054d56f72843627f47f2958334dfbd2d988c44a0ff61da43af170e1b7
-EBUILD uim-1.8.6-r2.ebuild 5081 BLAKE2B b2e2e6122b8b3ba52444b65e7262fb4d1e44a632295e85575ae38419412a67b0cba40d9933b7b0dd1fb9d4f3d9b6fd2b26a386ea5e5a6ddef5b96ef180c1b49d SHA512 c897f747f5126e59ebc52658d839b6ee5e2136ecdc89f20fbf3fc4d9e55c4868ee04068a57453078801d28ae3c2b6b23c92fa0d4971a85a95c33cad0b069de59
-EBUILD uim-1.8.8.ebuild 5210 BLAKE2B d21cd6233b3d415a7dc4abea701d509deea009672ca51ca14f6fb1772f96f91337beb9929d6442ae03e440311d99bbb8ef00d2525e5bc9c0bf06584e267382f4 SHA512 d8ff76a51500a3a91755c0b6c94047397c04f6f690d57872ffc87cc41c5472fcf130bdfe0803a02e0b4cd8bcdac7e99f5e42bb07766d01fba1eb027b51d6ff6d
+EBUILD uim-1.8.6-r1.ebuild 5052 BLAKE2B 67f7e600a86a2f74ee49def7684bed41182946a6f0591892ef3b79609a5ae0002514ea941eeae6dca13ce93627fce28efbf1c9fb84f3fec805d301a347309edc SHA512 521d6bb0c8e40cf4a8b2a8c7ecbf650bbb24d6143ecfb4fa2e6ab3b0aa1df2d6e243345bb6bee9412c3fd5af8cfe20b88a05fb4ab3e048406ac3f674ac587aab
+EBUILD uim-1.8.6-r2.ebuild 5157 BLAKE2B 87909b8657beb68f9148b937ccdbaf97cc515d556fd7bbd97b9c5e08a202d7e3f1b835a0d1394dba7d98236642cf3eb94199ae764f45435cb769961d0b537672 SHA512 405dc2308abd24708c3b4fb68e866b83300a48909d5b60c1c21127235e2a7d69e984fda7e4131774de3c86da1c442cac36010569bf9d573ea89a79ee298522b0
+EBUILD uim-1.8.8.ebuild 5300 BLAKE2B c778627e7f1868b6c8c54133965c24619f8450a5ebcae0f58cc093d6b23f3176fa7e67ac7b1622434a10fa96d1202a1693c81c554514a28f8a4d6221ba0bf36b SHA512 ab7edd45870830ae7a5149a4f69903624dc8ec323cc9274384b50076da2c7375284368690dbd64b1b05cc4f051a25a30760fdda0fcabef0d7980fe28312258e5
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch
new file mode 100644
index 000000000000..6c0cb7eee667
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-qt.patch
@@ -0,0 +1,16 @@
+--- a/m4/ax_path_qmake4.m4
++++ b/m4/ax_path_qmake4.m4
+@@ -23,10 +23,10 @@
+ #   the copyright notice and this notice are preserved.
+ 
+ AC_DEFUN([AX_PATH_QMAKE4], [
+-  ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
++  ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
+   AC_PROG_EGREP
+-  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"])
+-  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
++  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"])
++  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
+ 
+   AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
+     ax_cv_path_QMAKE4=no
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 84c5fa527ebd..af634f34baf1 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common gnome2-utils qmake-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim"
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-qt.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
 )
@@ -144,6 +145,7 @@ src_configure() {
 		myconf+=( --disable-pref )
 	fi
 
+	export QT4DIR="$(qt4_get_libdir)"
 	econf "${myconf[@]}"
 }
 
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index ccec49f28693..8ecd96c02155 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common gnome2-utils qmake-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim"
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-qt.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
 )
@@ -148,6 +149,7 @@ src_configure() {
 		myconf+=( --disable-pref )
 	fi
 
+	export QT4DIR="$(qt4_get_libdir)"
 	econf "${myconf[@]}"
 }
 
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index b77ac271174f..96c19d017d73 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -92,6 +92,8 @@ SITEFILE="50${PN}-gentoo.el"
 src_prepare() {
 	default
 	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+	# fix build with >=dev-scheme/chicken-4, bug #656852
+	touch scm/json-parser-expanded.scm
 
 	eautoreconf
 }
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index eedba32f7352..77fc28512422 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
index 7b03de1348c0..40c4e80e03e9 100644
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -7,9 +7,6 @@ AUX pbbuttonsd-0.8.1-lz.patch 920 BLAKE2B ab9a5cdf4b9ac2b1dd55229ab7dcfcf65bf4ff
 AUX pbbuttonsd-0.8.1-pmcs.patch 692 BLAKE2B 79f3fb25cd7bc552afda0c0eeeaa94b89c10e066ab2ab9dabf151d26efac784a52da5deff5d70b3cbfd78f4274aa4d1a6c1c2f42effbe455d3ae72d43f1dfd8b SHA512 ae8e9c695d80fa775c07b64968f13b3092858e14b37b1ce725e10ea06b897304e9f5079339633163b02e565d9dbb96db321d628394fcfefe528c7a1d36c66b31
 AUX pbbuttonsd.rc6 355 BLAKE2B 41e646f547b684930949669760ffd7e09c6ef4591e6183b12d555dba45d100414cc5daa54ef26e2bba491841553961955cb0a29c9c5d6b37d4e13f9a3117a9fb SHA512 93165ce1d1c757e58b407656bf86084bb3fcfe0c55897fbb382f107ff9b3d69559255a11ac3017cf5741eb2923d753f5cc3f1b495e31e16b18b16757accfbdfb
 AUX wireless 235 BLAKE2B 1fdc5401c1bcc927cad521bb7e6d502fd072c6aae119e59d92c19431985cccaecad5ba55a27af888e63881d0305ee732dce9b1e777e4b2322a98efaad13de310 SHA512 58cbfb80ec32ba6868fea500bcf58bf649a0f468a017ec8c200fe0edd0fd7f1fe17efaafca3e67c20df9fc5a6c80b2941237a375f6e73349a83593dcfacf2816
-DIST pbbuttonsd-0.8.1.tar.gz 589630 BLAKE2B 6cc9e8cfdbb3878be38d3e06f84af08f1c0dcdca23868c2b04c3812bb8d69780dbe86911b6c58a2a7345b39a19fffb2536ca7f0230ec8159710505b86c2b3ebe SHA512 856f8533c1f6489986c232baa8b8002a01d009ed3728ee35bc723aece91ba626ce961119c0d424f40c2f9289827f317c56d70fe8f0e035cbd9f08d7701316ac3
 DIST pbbuttonsd-0.8.1a.tar.gz 589747 BLAKE2B a0410b7f165e8a0f5b6efa8fa86cc32a84e62da08141d285442d48f0e541d4d6d063e61a7e48aa7901135c4fc9640a7968be821619b3741ce30ba1497015aad4 SHA512 4aaf674872982925f7aa8e06a363f50830f13d9491f4a3b850c1852a8a6d4b2c72164f839c482eed059703dd25d900fe3bb774f78e7039ac2464ea7a1837bf99
-EBUILD pbbuttonsd-0.8.1-r3.ebuild 3432 BLAKE2B a2d4122bbf7e1905b06404d4ee8397f200cd058872893acaf9fe668319fb63a1518b50df7c157816917ecde706ddaf16f7511ef0cd5dcbfa0b82063bfd5afe62 SHA512 acafb1e6ef90783d8458d0a59ed7c9966c56ebf7c5f6067f3c4676b54df0ba92f28456bf0d8dc3fd20ff24322807ba27eb616b646d09b3a1e20aa5cef83f6408
-EBUILD pbbuttonsd-0.8.1-r4.ebuild 3580 BLAKE2B 9cc3fbc88819f64a241d1a885af90dd5488a455e3d3479bf6b4370399df91e45e509f6007d01dd54a0ca788fea4be13304c53597e42dd7d7da0254153fa96c71 SHA512 7270d78a161fd253f5918bb9dce281c4b3ac087780421ad39537a23baa67ee29229fd8f7374ca7adb701da5f5d91d7a4ec447c636ddb50e573801d4d6c5de42e
 EBUILD pbbuttonsd-0.8.1a.ebuild 3251 BLAKE2B f671bdbfde56131bd0fe73cb8fa6398c6479c7fa2697815ed0c116945f96aec4f0274e251781efee8c8c692505f85d55ae3b414d2d547fb1c64b25a5e20559d0 SHA512 05df1091b4f54a8797a756d87549a4a88075993a5f8f4027127041209b3f65956f457fa9e682b914b6565c47ba19994af1adb81a76ca8f5944e7317cfe161cb1
 MISC metadata.xml 511 BLAKE2B 74e7a1939ef37f6fb312232b3df04de1ba6b0bb2e8bd476c0ebdeb2d7efcda0015204e4c003388194ac481f3fcb551949b4dba5515b770cd2d6ab78dd43ab72b SHA512 5a56b1fe175cd76fa23d90e4499f0a6bacfacdb9cb2fd647dbabec42030021c0b4f27eb04b523b9ae7bc44706ee9404abdf5ff16aa92655fab5d00ac187eca5b
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r3.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r3.ebuild
deleted file mode 100644
index 6b240e0d85b8..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Handles power management and special keys on laptops"
-HOMEPAGE="http://pbbuttons.berlios.de"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
-IUSE="acpi alsa debug doc ibam macbook oss"
-
-DEPEND="macbook? (
-			sys-libs/libsmbios
-			sys-apps/pciutils
-		)
-		>=dev-libs/glib-2.6
-		doc? ( app-doc/doxygen )"
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
-		 >=dev-libs/glib-2.6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.8.1-pmcs.patch"
-	### Don't link with g++ if we don't use ibam
-	if ! use ibam; then
-		epatch "${FILESDIR}/${PN}-0.8.1-g++.patch"
-	fi
-	### Fix macbook -lz issue
-	epatch "${FILESDIR}/${PN}-0.8.1-lz.patch"
-	epatch "${FILESDIR}/${PN}-0.8.1-lm.patch"
-	### Fix new apple hid fnmode issue
-	epatch "${FILESDIR}/${PN}-0.8.1-fnmode.patch"
-	eautoconf
-}
-
-src_compile() {
-	# Fix crash bug on some systems
-	replace-flags -O? -O1
-
-	if use macbook; then
-		laptop=macbook
-	elif use x86 || use amd64; then
-		if use acpi; then
-			laptop=acpi
-		else
-			laptop=i386
-		fi
-	# Default to PowerBook
-	else
-		laptop=powerbook
-	fi
-
-	econf laptop=$laptop \
-		$(use_enable debug) \
-		$(use_with doc doxygen_docs) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with ibam) \
-		|| die "Sorry, failed to configure pbbuttonsd"
-
-	# Thanks to Stefan Bruda for this workaround
-	# Using -j1 fixes a parallel build issue with the docs
-	if use doc; then
-		emake -j1 || die "Sorry, failed to compile pbbuttonsd"
-	else
-		emake || die "Sorry, failed to compile pbbuttonsd"
-	fi
-}
-
-src_install() {
-	dodir /etc/power
-	use ibam && dodir /var/lib/ibam
-	make DESTDIR="${D}" install || die "failed to install"
-	newinitd "${FILESDIR}/pbbuttonsd.rc6" pbbuttonsd
-	dodoc README
-	use doc && dohtml -r doc/*
-
-	dodir /etc/power/resume.d
-	dodir /etc/power/suspend.d
-	dodir /etc/power/scripts.d
-	exeinto "/etc/power/scripts.d"
-	doexe "${FILESDIR}/wireless"
-	ln -s "${D}/etc/power/scripts.d/wireless" "${D}/etc/power/resume.d/wireless"
-}
-
-pkg_postinst() {
-	if [ -e /etc/pbbuttonsd.conf ]; then
-		ewarn "The pbbuttonsd.cnf file replaces /etc/pbuttonsd.conf with a new"
-		ewarn "file (/etc/pbbuttonsd.conf) and a new format.  Please check the"
-		ewarn "manual page with 'man pbbuttonsd.cnf' for details."
-		ewarn
-	fi
-
-	if use macbook; then
-		ewarn "Macbook and Macbook Pro users should make sure to have applesmc"
-		ewarn "loaded before starting pbbuttonsdm otherwise auto-adjustments"
-		ewarn "will not work and pbbuttonsd may segfault."
-	fi
-
-	ewarn "Ensure that the evdev kernel module is loaded otherwise"
-	ewarn "pbbuttonsd won't work.  SysV IPC is also required."
-	ewarn
-	ewarn "If you need extra security, you can tell pbbuttonsd to only accept"
-	ewarn "input from one user.  You can set the userallowed option in"
-	ewarn "/etc/pbbuttonsd.cnf to limit access."
-	ewarn
-
-	if use ibam; then
-		elog "To properly initialize the IBaM battery database, you will"
-		elog "need to perform a full discharge/charge cycle.  For more"
-		elog "details, please see the pbbuttonsd man page."
-		elog
-	fi
-
-	elog "A script is now available to reset your wirless connection on resume."
-	elog "Simply uncomment the commented command and set the correct device to"
-	elog "use it.  You can find the script in /etc/power/resume.d/wireless"
-
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r4.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r4.ebuild
deleted file mode 100644
index a1941b1e7b41..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Handles power management and special keys on laptops"
-HOMEPAGE="http://pbbuttons.berlios.de"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="acpi alsa debug doc ibam macbook oss"
-
-DEPEND="macbook? (
-			sys-libs/libsmbios
-			sys-apps/pciutils
-		)
-		>=dev-libs/glib-2.6
-		doc? ( app-doc/doxygen )"
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
-		 >=dev-libs/glib-2.6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.8.1-pmcs.patch"
-	### Don't link with g++ if we don't use ibam
-	if ! use ibam; then
-		epatch "${FILESDIR}/${PN}-0.8.1-g++.patch"
-	fi
-	### Fix macbook -lz issue
-	epatch "${FILESDIR}/${PN}-0.8.1-lz.patch"
-	epatch "${FILESDIR}/${PN}-0.8.1-lm.patch"
-	### Fix new apple hid fnmode issue
-	epatch "${FILESDIR}/${PN}-0.8.1-fnmode.patch"
-	### Add kernel 2.6.x stuff for 3.x as well
-	epatch "${FILESDIR}/${PN}-0.8.1-laptopmode.sh.patch"
-	epatch "${FILESDIR}/${PN}-0.8.1-cpufreq.patch"
-
-	eautoconf
-}
-
-src_compile() {
-	# Fix crash bug on some systems
-	replace-flags -O? -O1
-
-	if use macbook; then
-		laptop=macbook
-	elif use x86 || use amd64; then
-		if use acpi; then
-			laptop=acpi
-		else
-			laptop=i386
-		fi
-	# Default to PowerBook
-	else
-		laptop=powerbook
-	fi
-
-	econf laptop=$laptop \
-		$(use_enable debug) \
-		$(use_with doc doxygen_docs) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with ibam) \
-		|| die "Sorry, failed to configure pbbuttonsd"
-
-	# Thanks to Stefan Bruda for this workaround
-	# Using -j1 fixes a parallel build issue with the docs
-	if use doc; then
-		emake -j1 || die "Sorry, failed to compile pbbuttonsd"
-	else
-		emake || die "Sorry, failed to compile pbbuttonsd"
-	fi
-}
-
-src_install() {
-	dodir /etc/power
-	use ibam && dodir /var/lib/ibam
-	make DESTDIR="${D}" install || die "failed to install"
-	newinitd "${FILESDIR}/pbbuttonsd.rc6" pbbuttonsd
-	dodoc README
-	use doc && dohtml -r doc/*
-
-	dodir /etc/power/resume.d
-	dodir /etc/power/suspend.d
-	dodir /etc/power/scripts.d
-	exeinto "/etc/power/scripts.d"
-	doexe "${FILESDIR}/wireless"
-	ln -s "${D}/etc/power/scripts.d/wireless" "${D}/etc/power/resume.d/wireless"
-}
-
-pkg_postinst() {
-	if [ -e /etc/pbbuttonsd.conf ]; then
-		ewarn "The pbbuttonsd.cnf file replaces /etc/pbuttonsd.conf with a new"
-		ewarn "file (/etc/pbbuttonsd.conf) and a new format.  Please check the"
-		ewarn "manual page with 'man pbbuttonsd.cnf' for details."
-		ewarn
-	fi
-
-	if use macbook; then
-		ewarn "Macbook and Macbook Pro users should make sure to have applesmc"
-		ewarn "loaded before starting pbbuttonsdm otherwise auto-adjustments"
-		ewarn "will not work and pbbuttonsd may segfault."
-	fi
-
-	ewarn "Ensure that the evdev kernel module is loaded otherwise"
-	ewarn "pbbuttonsd won't work.  SysV IPC is also required."
-	ewarn
-	ewarn "If you need extra security, you can tell pbbuttonsd to only accept"
-	ewarn "input from one user.  You can set the userallowed option in"
-	ewarn "/etc/pbbuttonsd.cnf to limit access."
-	ewarn
-
-	if use ibam; then
-		elog "To properly initialize the IBaM battery database, you will"
-		elog "need to perform a full discharge/charge cycle.  For more"
-		elog "details, please see the pbbuttonsd man page."
-		elog
-	fi
-
-	elog "A script is now available to reset your wirless connection on resume."
-	elog "Simply uncomment the commented command and set the correct device to"
-	elog "use it.  You can find the script in /etc/power/resume.d/wireless"
-
-}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 9f419a4280f5..237358e57aed 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index be914f90617c..0c896b409e6a 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,5 +1,7 @@
 AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 DIST prometheus-2.2.1.tar.gz 5629500 BLAKE2B 7645267a2c5ed1c4138a5dd3929a48cb9dfa27789db38e98addbb06c37c6b482abfcf296ef1a5836bebd971d8224136c24a4ccd3093175882bb0beda1673deff SHA512 a94cf867de2b3be65b0a07307f89ebfa9c0a319820a72b3b6691edcd2e2b56b5268d27fb52bdaefea0e7084906d69b818e5292a39ccd5991e04e56d594f56ea7
+DIST prometheus-2.3.0.tar.gz 6171790 BLAKE2B bf08aaa124925a6fa1f610117919b5d4d15f4f4a71ff1bed1edca588b7cd4a14483a7ecbf3b3aaf5bfabe968290732b9fe3da522f726b673e0b910d2be3ead3e SHA512 2ab2bc2cc7c9bd9cafa16f54e24845b2e5c4b923bbc200ad9efae985b56587752892a364f08673e34278e6f8ad0b477482eec56632b281212af13a9110940aca
 EBUILD prometheus-2.2.1.ebuild 2022 BLAKE2B 35b2eb824625cac8505bcc933130dd2810fd19855f73d975ef1e665baf98a60b95d4f3afcac1edc4b9cb2d6a030e7aeecff9926a460fddd9ea4ad8fa9f34cd6b SHA512 e378cbd27a7e2d033bf2ab6203955207d27f879f8c040cc54e873db8e64b225bf7aa6e977238d0203e00fe688c6328fef611516aea6d8e4afc4a5ea4649df127
+EBUILD prometheus-2.3.0.ebuild 2022 BLAKE2B 894d843ed2df1d5c9f6aaf084d1d1f4f726d2e01d6eb6dad44b435f72f79ea8ddcc3d84e617cba5a9b1aeb2fc48428440251260b7d10a1160d0f6437ce3d6ea4 SHA512 d0cbb12ac9da43f2e27aabaf0a0b7b534b297aca132dfeafcd5e2cd4528a2ad048c324e561f7ccb6874126c370ff0f44c2bcfb65d0fc70b6da6320dd5609dd9f
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.3.0.ebuild b/app-metrics/prometheus/prometheus-2.3.0.ebuild
new file mode 100644
index 000000000000..f437abf471ab
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=${PV/_rc/-rc.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="290d717"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.10
+	dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bada187faf7f..e2ea30091476 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bfm/Manifest b/app-misc/bfm/Manifest
index 5b0495fecea7..d61382222818 100644
--- a/app-misc/bfm/Manifest
+++ b/app-misc/bfm/Manifest
@@ -2,6 +2,5 @@ AUX 1.2-build.xml 2000 BLAKE2B 03d37467cab3b1c5810ed3d06abe593f4bd8213eb359cd4f3
 AUX 1.2-r2-build.xml 2020 BLAKE2B 7432c22c7d0ba7b4297455724d365e95ebbc1f0470c06b83539c93275e1cbe281ada6be7cf3578a783782be4911be2bc094a5d36d1343c1e355d4d5e024964bf SHA512 422208eb70459b94b6d5eb831c5796cfe178b2042dd6aee4fc0c1ed15949b46eac5e817460ba3391fbaad7f287e6260f6ed436e49d84ab41fac2453518aae6a4
 AUX 1.2-r2-package.patch 10235 BLAKE2B f767f00a81b8ffe5c831604f2ecc7b6c0b7f3bb86ff22925c4a8e5c2fc2010947c1f5775cb5da857fd66f5d6bd70f5a9c031c1ae59ddfe89ebdd9b9eb2ca5919 SHA512 9b754c0dac3f7f8763acc80ae9fe618dca32df319dc2b928ec856debc4f539f6f39fa6dde92eb871dcccb9197f7aecbac6b65b7705d476c0b73e6611e979dbce
 DIST bfm-1.2.tar.gz 193924 BLAKE2B 8d398188333519b581a8eb4e38fc123672ba0a68077347f4049e5f0ec9dc06010b5e6003500452dad71deb67fe97e5ea896ec9ab425eca82022a12e03320b3ec SHA512 39a9a250a8f3cf3b148c31a9fa5a89ac9a5873884dc1a98840b2f21879b30bd7cc6cc5dd9c5f7e657090a56276dbef2a72594e095aec8c05f3e003f89e91daee
-EBUILD bfm-1.2-r1.ebuild 1515 BLAKE2B bc9d29590212fe8c051c7a3992c143a66203b5abcad0848c4d067a5dc0d16d5d0f4ac2400fed87264157cb5d4b71ecc13cd227ae45695dae9535c56c8ef87c5f SHA512 4797af9a94a5e4be0827442d27a5a3064b609a515f7f0b2e4003956e72de915064cd93d10d7353003e48a83e311bb7aadf8c9fb8b906e5e2b76afc4f8ae093fc
 EBUILD bfm-1.2-r2.ebuild 1342 BLAKE2B ba316b23f2aa3d0885c791decef0ceadbf15e56933a6ab4f0cd2a322b946576fb9bae58eda0a34798f44a0abcf49452ce0e1d7d23070adda6490a944a1320a18 SHA512 847c1da49ca1d39301a46fc522f8c1c2143cff3ba613413a3aba8c624908aef2401931285b1a003be73bcd7610f6b94bd9a84351fd1fbb74718e952167f5d677
 MISC metadata.xml 550 BLAKE2B df05e7ad2cc4aca624ad2a377fd7e555cb6c5c600b2860558628746ae6361649b0dcdb4e76a4740a4b37e3bfa91b2debbd8019db1a87caa804bee552461e9283 SHA512 755c28c22ed330af89b04ee96ed3912016dc473813b8730bca2eea7548c4e9f4953a7f645512e46627b4e9a6bddb243fe8e41a4a489325a4bd13209b4d83cfdd
diff --git a/app-misc/bfm/bfm-1.2-r1.ebuild b/app-misc/bfm/bfm-1.2-r1.ebuild
deleted file mode 100644
index 82b1a274fd54..000000000000
--- a/app-misc/bfm/bfm-1.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="File manager and first person shooter written in Java3D, shoot to remove files"
-HOMEPAGE="http://bfm.webhop.net"
-SRC_URI="http://bfm.webhop.net/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/sun-java3d-bin-1.3"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	cp "${FILESDIR}/${PV}-build.xml" ./build.xml
-
-	mkdir "${S}/lib" && cd "${S}/lib"
-	if has_version dev-java/sun-java3d-bin; then
-		java-pkg_jar-from sun-java3d-bin
-	elif has_version dev-java/blackdown-java3d-bin; then
-		java-pkg_jar-from blackdown-java3d-bin
-	fi
-}
-
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	local java3d=""
-	if has_version dev-java/blackdown-java3d-bin; then
-		java3d="blackdown-java3d-bin"
-	elif has_version dev-java/sun-java3d-bin; then
-		java3d="sun-java3d-bin"
-	fi
-
-	java-pkg_dolauncher ${PN} --main Bfm
-
-	insinto /etc/bfm
-	doins "${S}/bfm.conf"
-
-	if use doc; then
-		dodoc README ChangeLog bindings NEWS || die
-		java-pkg_dohtml -r docs/*
-	fi
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	elog "A system wide config file has been installed to /etc/bfm/bfm.conf"
-	elog "Copy the file to ~/.bfm/bfm.conf to set local settings"
-	echo
-	ewarn "Be sure to run bfm in safe mode if you don't want to delete files"
-}
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
index 0e5d573dca36..6997b8d6508c 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -1,5 +1,5 @@
 DIST digitemp-3.5.0.tar.gz 267947 BLAKE2B bdd5cd84160d4826205ac74676897b9caa296c203fcde738c99f89baaeb7637f3995afeb7741e1d1d3e6cb64776de2479fe7d54d1b499a400cbf7b59f8d46349 SHA512 59055a97ae35cdc86bb893a755975b688d3be9185e717f5da0024d664e6c93dd5a7f10f1230772c3bc1bc76a088392da083ba63d28e054727b9f68ce31de64d3
 DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
-EBUILD digitemp-3.5.0-r2.ebuild 1823 BLAKE2B 556ca583bb67c0edbadf30340f1d0c247899b8385d5936d3aa871e1a0574a4d1368fef7ad3f435291926dcf760e4f18750901997a52fe1eab07d073612e43736 SHA512 bc45b25d1e34dbc2a822c5bc2e16dbbdab79935a5c6e37c0b629e3f62a834f0a17c7840468a2eed2ab9956f274b3cf3e8b1527ebc59c8722826d70d4a8cc50c3
-EBUILD digitemp-3.7.1.ebuild 1843 BLAKE2B 8dd13cfdaa899c22cabc3526e1ccb8549a956a4135c7314ac6e96c996b6823e0755a271ea5c341154ccf2ec41c180b7976e69a655225891fa7baab15848d8a9a SHA512 1393cfc7cf65a4d694ec351e532e1414a0b58b71df6dda398a8abbb626735dfdc5575b36a2cfe09d3e21127e2809e9ea0d917872a842fd3cf9b71d6b6c0553c8
+EBUILD digitemp-3.5.0-r2.ebuild 1826 BLAKE2B a9cfe9ca027e64237c2e46a8e1f216e0824eccec720c84e9e17fcae440c058ef4cc49e366259e075de879c0fe9014dbffc1a088b1a91a2674efe84872e06a5ee SHA512 2dc36c29e0c64c9f87372493d0aefb26105af1cee219c51ed6c4d224a378cec9a793fdcbfccbfa3bc1f94733ce286f8562fede0bfa1626faee3995aefa0f63f6
+EBUILD digitemp-3.7.1.ebuild 1845 BLAKE2B 8a2fd58c5505e05edf1982b14dc89e589e498b948d15647ab9ff8061ae25b088715a2b701878e938cbf8e483222283d810dd546aecb4464d95ad239678587f4b SHA512 7d6d89ef1d5f3d8bd154073f8dcf05d40847ec9d202b3c03b3ca42d22fdcb78560f11c090a26bdae07cc5ee9def88c3de98fe8e05f12427ea4ec2ef90605acca
 MISC metadata.xml 1064 BLAKE2B c846f4eb15942de9272d16fed022f75f1b1f50e4e67d507daa6714338a90c16d42cc623c99fc4540490519fc96b9ddfaa8541b54c7ba55e28ed1bb0b4af244e1 SHA512 bca72be4a38c9cdbc2a6dfbda09f2be34aa81c66738c2646c5542389a6291b20ac1439f741a0036f9a85d9dcccba52c786a6bf77ab91546c23ea0df3b428b4fc
diff --git a/app-misc/digitemp/digitemp-3.5.0-r2.ebuild b/app-misc/digitemp/digitemp-3.5.0-r2.ebuild
index b53b52df73d2..cd0f7c008a75 100644
--- a/app-misc/digitemp/digitemp-3.5.0-r2.ebuild
+++ b/app-misc/digitemp/digitemp-3.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=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"
-HOMEPAGE="http://www.digitemp.com/ http://www.ibutton.com/"
-SRC_URI="http://www.digitemp.com/software/linux/${P}.tar.gz"
+HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/"
+SRC_URI="https://www.digitemp.com/software/linux/${P}.tar.gz"
 
 IUSE="ds9097 ds9097u ds2490"
 SLOT="0"
diff --git a/app-misc/digitemp/digitemp-3.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild
index 477651f361f4..718f8d20bbf8 100644
--- a/app-misc/digitemp/digitemp-3.7.1.ebuild
+++ b/app-misc/digitemp/digitemp-3.7.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=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"
-HOMEPAGE="http://www.digitemp.com/ http://www.ibutton.com/"
+HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/"
 SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 IUSE="ds9097 ds9097u ds2490"
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index eab6b4a8bf5c..6c574490b687 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 459 BLAKE2B bac53b6fa06b94f3eb96ad7bd1e021d0eeb2c9a5e724d590b686abdee561bf154f47dd4dadb2e8a050bb6c9a01941f81e54de6d1d83b74eddea98a0d434e06b9 SHA512 eb74120ba5fe2edd04c209ceafe34be6965fca765c7e36b4de50b6de8c6622a1db2fab7504f273c031df505d4821237ffaf7804e2a642bfb348b6273e896b01a
+EBUILD dtach-0.9.ebuild 464 BLAKE2B 05f6f7540c4859d50d54bb2b12b215c75393d0f3e15c91e7a47abcf9d835c9d5b84bf373fab0200e2ae81f0fa610f89441a5555514c9f4bf5d0bde5130e2444b SHA512 934755b47e1835affcbd1d5f92545b42ea6f315ed810d397ae069fa69aef9f4a5abd99e4a1ef92528db86ebcd2aad7c04462093813b4af5fcd940b38020c1759
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 018464cbc478..9f494f43e668 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index a44329b102e0..9d46166b4bb9 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -6,4 +6,4 @@ DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba0
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
 EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8
 EBUILD geoclue-2.4.8.ebuild 1577 BLAKE2B 2a1c4e4dbc825798a172a90cc1ed1ecea0b92b130bf03587a3b24564cb514df2289516420d9924def46322041849ef7fc1e6a28f7df3813cf88d7550d9b5f873 SHA512 3ac7765ba17df00d3864eb0c8fab5d21c43a9974d85e238789c461a7f267a2e65757d5469c59cb3f593aaacc6ab4907c92e60d63765e4b73237832d09d990658
-MISC metadata.xml 1252 BLAKE2B 19af081815ecc62a145bd3839b4822498c5f689665adf6cc46b7ff7e1615d5d22ce54d2bc551a2f619f9d7ebc020400e795ec5962295a88288546a7ed24af492 SHA512 809d9b3afe58bf9e00bc826dbc7e2253461426084f8290d2b53ff0785666ec7b3626997b453a36a8eefcbae220f2f273008c3c51a7071a13da54e4e897d5c5ae
+MISC metadata.xml 1062 BLAKE2B 11f3d019f7c014387f5b3faece7dd7f165e106dd27132cf56bf59b35be2fe2ac0dd02751eb87e4e8bfa77fdecf076217eb76e6e5b37acb33c26d2f26cf1ca942 SHA512 3747063a944f72bed17f4948a0c8041746cf61fe85f2b4886cf6b8f88c01dd4cbab37a94447c3a900416bf1a374d88deb812f89789e74f4465654b26fe18899d
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index 7bf3bd754bec..bd2c408ce28f 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <use>
-    <flag name="geonames">Install geonames.org provider</flag>
-    <flag name="gsmloc">Install GSM location provider</flag>
-    <flag name="gtk">Install gtk-based geoclue-test-gui</flag>
-    <flag name="hostip">Install hostip.info provder</flag>
-    <flag name="manual">Install manual provider</flag>
-    <flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg>.</flag>
-    <flag name="nominatim">Install openstreetmap.org provider</flag>
-    <flag name="plazes">Install plazes.com provider</flag>
-    <flag name="skyhook">Install skyhookwireless.com provider</flag>
-    <flag name="yahoo-geo">Install Yahoo geolocation provider</flag>
-    <flag name="zeroconf">Enable retrieval of GPS location from Android devices with https://wiki.gnome.org/Apps/GeoclueShare</flag>
-  </use>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="geonames">Install geonames.org provider</flag>
+	<flag name="gsmloc">Install GSM location provider</flag>
+	<flag name="gtk">Install gtk-based geoclue-test-gui</flag>
+	<flag name="hostip">Install hostip.info provder</flag>
+	<flag name="manual">Install manual provider</flag>
+	<flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg>.</flag>
+	<flag name="nominatim">Install openstreetmap.org provider</flag>
+	<flag name="plazes">Install plazes.com provider</flag>
+	<flag name="skyhook">Install skyhookwireless.com provider</flag>
+	<flag name="yahoo-geo">Install Yahoo geolocation provider</flag>
+	<flag name="zeroconf">Enable retrieval of GPS location from Android devices with https://wiki.gnome.org/Apps/GeoclueShare</flag>
+</use>
 </pkgmetadata>
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index d7cba559f88a..5360e15458da 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,7 +1,3 @@
-DIST go-jira-1.0.15.tar.gz 1381623 BLAKE2B 430451fc6f86c72421619433427694f4a7a756c24cbd239c38ddcfb8b35a83215377bb239af43ceff90da1a9122d312190b8185dc5e04032a50491c8f61d9c2f SHA512 e4ceae1577ad8f512a9375775308687e78a50131faa298ba1cddc8397a8a04feca55f132c022d942458e8cab68f28e5610bf4b3334fe2c16f71e924e290ee955
-DIST go-jira-1.0.16.tar.gz 1381917 BLAKE2B 0f46b97b3146c5e04921827278bdcf67736ff015731dac7a2481e0243b7fac081fe368eed5bc696e9ff8973291502c2087655ca518c5dc2f23e96fa63a288f46 SHA512 c5fd28fa33f11a9dca030ee28141e5b09e59cf8777011bc8c02ed4c7604efef1dcd9ac1215351a4d292a4b524998f9b1dcc61df457a05462ca78a8dffa9ad608
 DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
-EBUILD go-jira-1.0.15.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
-EBUILD go-jira-1.0.16.ebuild 705 BLAKE2B 3084d97fbb21bb6b9d02d2111ebd0c4b691b8603a372ac8f64e75da24a43eeb0bdc3492412d6c77c3bf3ad8322c0868dd1488411af368e219146753eeec2ca33 SHA512 b304de839b8e81b6d02ff7113417130c9b7e65d1110dbe52b6d5f262fbe150292635205a8afc78d81cffe457f35f5e32aa2a0b57242d7db4298a98029ebba2eb
-EBUILD go-jira-1.0.17.ebuild 705 BLAKE2B 3084d97fbb21bb6b9d02d2111ebd0c4b691b8603a372ac8f64e75da24a43eeb0bdc3492412d6c77c3bf3ad8322c0868dd1488411af368e219146753eeec2ca33 SHA512 b304de839b8e81b6d02ff7113417130c9b7e65d1110dbe52b6d5f262fbe150292635205a8afc78d81cffe457f35f5e32aa2a0b57242d7db4298a98029ebba2eb
+EBUILD go-jira-1.0.17.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
 MISC metadata.xml 336 BLAKE2B e4bdd5129c1bc5e5a26f4ae70fa1528c9a5ee2811fa5df2e5876ea3f1044afa3327a3b9897b199b2f18b451bae57da965371f8184196b299a036843bce3ed494 SHA512 37e0c43ce89345c1e0136e8e1f162abd77def9f295ddd8abc3b49f638847a1c08c41cb1055415aeb5a3ce5d1eab37b9ca2654764255ea6ccf9d76adc0a5f8009
diff --git a/app-misc/go-jira/go-jira-1.0.15.ebuild b/app-misc/go-jira/go-jira-1.0.15.ebuild
deleted file mode 100644
index 6092975389c0..000000000000
--- a/app-misc/go-jira/go-jira-1.0.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="amd64"
-
-DESCRIPTION="A simple JIRA commandline client in Go"
-HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
-SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${WORKDIR}/${P}" go build -v -o jira  cmd/jira/main.go || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/jira
-	dodoc src/${EGO_PN}/{CHANGELOG,README}.md
-}
diff --git a/app-misc/go-jira/go-jira-1.0.16.ebuild b/app-misc/go-jira/go-jira-1.0.16.ebuild
deleted file mode 100644
index 80c476f47f72..000000000000
--- a/app-misc/go-jira/go-jira-1.0.16.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A simple JIRA commandline client in Go"
-HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
-SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${WORKDIR}/${P}" go build -v -o jira  cmd/jira/main.go || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/jira
-	dodoc src/${EGO_PN}/{CHANGELOG,README}.md
-}
diff --git a/app-misc/go-jira/go-jira-1.0.17.ebuild b/app-misc/go-jira/go-jira-1.0.17.ebuild
index 80c476f47f72..6092975389c0 100644
--- a/app-misc/go-jira/go-jira-1.0.17.ebuild
+++ b/app-misc/go-jira/go-jira-1.0.17.ebuild
@@ -7,7 +7,7 @@ EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
 
 inherit golang-build golang-vcs-snapshot
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="A simple JIRA commandline client in Go"
 HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index b942bd8922b5..15f1b486ac75 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -2,8 +2,6 @@ AUX inputlircd-linux-4.4-fix.patch 343 BLAKE2B 21cf1bb829de88c63993d712335038fb3
 AUX inputlircd.conf 75 BLAKE2B 5de0021457cc642073bd3491344ed404c59d8cedd80c6a4517845f42f8e39175c2833d4654d9715c98ae74716d5027f76f9aca8afd694bdef0ac918fcda2258e SHA512 92fcc5d61e1f7061820791d9024dfebfcfd25cc96c1790cc7a719784314587b8e9de9674d9b73a103efe8b405aa453e5dee1759680639aa4297a237003a1f1bb
 AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d1272428c874d0d7daad69b93e3206b271e75f98f1fcf1d57d5a5a44bcd39969d44bafd5c88bc575f SHA512 0d6299a2b1ffd2b6161013888e06a59b531769ce2723b00c1ba55e9420ed4a6055023b1d892e372d1d9c438eabe446a6341adfb2dd9b19371727d1c92b5c27b1
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
-DIST inputlircd-0.0.1_pre11.tar.bz2 4370 BLAKE2B 9fd957a2558d1d81cefc6f40dfe0c9a8939be0a2ebb1c04e6d13759fc94a28f0c958947e36c4cacd05e0e1c8b995a6877730381d1ee06a75fdeb5142a55af5f9 SHA512 e09546340843f4df01f22c2e5347bcbae7078c521c7e4d5216d061beb93f7ae660e96d1942e6e931e0f72c930b8383cf6f83c70f1f242587da82edc4a04b6d76
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
-EBUILD inputlircd-0.0.1_pre11.ebuild 594 BLAKE2B dd2d13199c9e1c4c1586e60bf86706b0b382aebee10ca1cb0b2399b72b4b0c89a355606b7c76c7e401e30766f16a8ccfa7ea155e85a06069d0ae5df440d910f7 SHA512 6e630e3b402c2607182730baba43c203582b1d68c0589d54bbaea2af283f6b90d6e556e8ff6a8ce1451ed43846703b7d20dd2be15e77dac8ceec3a4c483eaf2a
 EBUILD inputlircd-0.0.1_pre15-r2.ebuild 907 BLAKE2B 70f9697226ba3a58e6ed1de74bf034dd29814f13fd569524f8e7a5983d1c632446f624e9a4807e5ff6882fcfa0a0305f12b572e64d50a92f8d0bdd91db8801aa SHA512 393bb7e94cfdfab9b037f94476d1f62ee3c1cb38bedf09c22049558f4eb068bcb14d39c9233344091ebfe9d6a1188e60815416d9f95f8433252849007a3cc4e8
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild
deleted file mode 100644
index fc912181ccaf..000000000000
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
-HOMEPAGE="https://github.com/ferdinandhuebner/inputlirc"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/inputlircd.init  inputlircd
-	newconfd "${FILESDIR}"/inputlircd.conf  inputlircd
-}
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 2616413a3081..9cc3934007f5 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -3,5 +3,5 @@ DIST khal-0.9.8.tar.gz 173717 BLAKE2B d17a355bd4eddaaf3cf838bac6e66f6a4a72170d6e
 DIST khal-0.9.9.tar.gz 171830 BLAKE2B 924df2bc8cfa8373ded88e9173e57a6017fd0c0d7ff507d79cd8ef8845d81e3962130d1def3a0070c6a68a00bf27a80d5b851bf79c23087f8513d1ae81222566 SHA512 cc38d8852e5bd47e266e23d48fbafa66aa1f84d67022780b7b0c8c8d4f54860be06a4d2675c49a48b4551fbdce1ec99762fd3b12a2ada69a0768d200697ef03e
 EBUILD khal-0.9.7.ebuild 1207 BLAKE2B d7cfe30f0bc7bddab804832f705d4e71ad800886a98a9dc0fc2b6db98bbda40cd49a150cce0081d40ff69ad270eafd9ffe29e4c9f1a3858c92baa2e6187dbf21 SHA512 d7ca15a1a4003b4da7ae77e8917c5746b55c35c4286bdf82dbd8acf14ed0c468151466d5f279d4a4b5b066a48d9f6b48ec5f53bc7f109bf825184e9e53b62166
 EBUILD khal-0.9.8.ebuild 1206 BLAKE2B e27a03775b1c98238e145746743ccb8fe3c8d28633816dc6f8da37becc4b9933c21a354cc459c0276f65bf7369dd4e625954bdd65428f1726145d4aa1aea4b3c SHA512 0f73cd31b3d77d8e5b224ad310abff1ce32ea8fe05ee4a8302fffc601e98ef29debf89f9921cea5c2c0c97bdc066388ea558cfe32854f1b588cd02cd840b5fa3
-EBUILD khal-0.9.9.ebuild 1223 BLAKE2B 87650902f5e68ac5c19e7a575f9289d0f2da74af100f4755978fc968cc476f394c5ecc2ae10142f72ba3ab5417420b31973019750eb617fc16404f5ca1392a82 SHA512 ba060d86b40f1110438be1d3ba91cb81eca1ec6ba5b8410b0ff0cd6912f6216e3f042edb3b23ccea1730946840e68471dfab145d62f182cce91803ed93275029
+EBUILD khal-0.9.9-r1.ebuild 1223 BLAKE2B 6b1f1622bad85c13e3b4dfee66a212257f52b0a98d7c280d28e224bc32d84355f5488b34d1d523e5002dbb7068f255bed25a43e323d91a88c5c89a6dd1bd6f78 SHA512 ab12da121c47f73282a3e3ecc2cb1c051ffba1ec2dae2f1f3ced207495e87a2de04706bc3d94349719cf83d8d08b75b6e87627fc1d41da319134f9c333a44209
 MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
diff --git a/app-misc/khal/khal-0.9.9-r1.ebuild b/app-misc/khal/khal-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..327d1777de15
--- /dev/null
+++ b/app-misc/khal/khal-0.9.9-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-3.11.7[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	<=dev-python/python-dateutil-2.6.1[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	zsh-completion? ( app-shells/zsh )"
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+	dev-python/freezegun"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+	distutils-r1_src_install
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/__khal
+	fi
+}
diff --git a/app-misc/khal/khal-0.9.9.ebuild b/app-misc/khal/khal-0.9.9.ebuild
deleted file mode 100644
index 0046e13543fe..000000000000
--- a/app-misc/khal/khal-0.9.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/icalendar-3.11.7[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.1[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b0f8a05c2ee8..35b1e498df4b 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,15 +1,9 @@
 AUX mc-4.8.13-tinfo.patch 1742 BLAKE2B d9428200e62bbffd0cf056bd25b3cec9a3c4b83638f4e72379f8756e62376c61ef3375c9ede50deb52619ead78a39d49280f9a654e0d8877158b6ef4b8117556 SHA512 7714d42ece73fe6f044f5cc0f59ab5c23bedb820122291d1af581f5f7dd94d4410072868205e94419be459ed9769c8ed75dfb8ad5b945c8df820901f756e7c3c
-AUX mc-4.8.16-makedev.patch 901 BLAKE2B 5980e0bc05ce34c6e33ade84bd0dd32816298d34c108cb6b603cb84c5a458f7d50f05c61a584bdda3991a4ae9274068f954ec4ea5a768f51600a32c0e9123f3f SHA512 dcc77b50bb6a23ca7c1ef3f4fd0dec4defd3b46b120d38cbb9737e9a1464cda4e7c972b6d74a50ae41fc6df845feaad6b865f3aecfc1195f6413baff157504a5
-AUX mc-4.8.18-html.patch 969 BLAKE2B dca7823453e5c85471ca2e2f7020920b4da2bc992f5fe238a0f86dd51d7a6486b368ba7cd28da866107631f8e542a70d1ac4dba53ceca836335c328fac638bcd SHA512 d3e97e0d5e5260cf1dfce8700aaf44c2f6998bbc37defe38f4fd18b5a28160d61b51fa8185e5cde257655d088b7b474604e4a7cd570c6982b3e7af5ef95f8cde
 AUX mc-4.8.19-selected-size.patch 988 BLAKE2B de407c64d1d7e2460f165ace967f6b83c50e45c6842a1d174928c872d4f6a9aff31939942f2896bb2f3d34f656fb2c1e262c35a7c72f1cb58256472d5cac7c19 SHA512 f7740ec01e38857b1e365737cc4e1cd41397e41aea9ef5aa121c6db2f11955980df949a440cce7bbf810b7b8a6f0c1c5e5090de3c5008dd6390ecee4c659d80c
-DIST mc-4.8.15.tar.xz 2304812 BLAKE2B 33d8055316b4ae9d8b2385c3a439339fa635e3f145c9599ce937c596c6ae18225451568a2387074af8d9afc702a0ec8528e07b00b7805dd86af459612d7fd187 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760
-DIST mc-4.8.18.tar.xz 2462080 BLAKE2B 10cd93cea439290922c0dc19e85b6c9456ce4266f35eeecbf2f40d99e3aae64465d9c427fa01d7d2c542e8bae9d2926e8ce42766c4c1656373905c3d871d71c0 SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8
-DIST mc-4.8.19.tar.xz 2521808 BLAKE2B b4712d833e8562b0f760b4558533ac338cf8875dc9034cbec2160444bbe3e9f4dc7fcec16835cabdd5cde6b02a7020162b3cd1693863775ee3494c9b4659a7aa SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531
 DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
-EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c2009e149136ecda8b03cd1d9433ea8dcd1a3194e61e5380c81b905072f7c3e1688920e4dc57ceb3c270d41f SHA512 906e1842f664cff03939a0fed27aaa447abf92553916bedcdbe7c23aa65f704c2538ca5be666086dbe2ce3204bbdfc87854346f3894293ccef8ef5d8a2ae6e7f
-EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505
-EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353
+DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf
 EBUILD mc-4.8.20-r1.ebuild 2482 BLAKE2B 1bf8934ae7f8d5478804017453efc0a8d16e1f6b2f8bedd8d878202df154fa01138e5284f18a4a5e3a7ca11b70785fcf250275b45941e4b411a045142a3e0705 SHA512 6345f42e21960543ccd50ee95790c017667f73a293386ad28a6107e4575e649902b8e26970185f3ef59d8ef23f4a45b02596d0f99156c704083ab15f54f87384
 EBUILD mc-4.8.20-r2.ebuild 2619 BLAKE2B 818c6c1ab7b190d80566935453e3467479733e266683e17f02c397d6d55bc2ad3a9aeacad91e4c2ad7dd6e26e9a6319b1392726a097415d5302dc49a9daf7843 SHA512 50e29ca64ea1e6172653960220e8bee6b7a298792e7774971a7c3db6a3187646ae84a88291ba0deb898ca6294fd752b827b0213ea7d770a078edd9f506abd0cc
+EBUILD mc-4.8.21.ebuild 2425 BLAKE2B c1fd699e82c24ac68898dbb3a67eb61c9a5bcc27f2c31a6cb2c76adaba25651f18f24eafc9434b36144cbec1fc4451d306cb8661cf433217f973ce5b24077317 SHA512 806b4dc06c0afcfecbd5a00469e85fbfb115b2645df2c504c79f8788fd6e0248155b0c8e728580b8b12ee74e091f8f8ade41bd57e5c2c8eb86abdb9318b1d928
 EBUILD mc-9999.ebuild 2710 BLAKE2B acbcdaf95260df5b4f34ac03e19b2b674f65d3c95083e79eaf916cd62f99ea0d9008c94bb2c0e030bcd8face202c00a646eca1521461058ae009da1f17a4499e SHA512 0388200a8134818d797d79849bc618a222377c33fb1802dcbf2fdafcbc22d85888171fee546ff5a484aeb4d97074afa1fea23ea5ee2078182bf72277658b65bb
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/files/mc-4.8.16-makedev.patch b/app-misc/mc/files/mc-4.8.16-makedev.patch
deleted file mode 100644
index 8e7fd0e0f1cb..000000000000
--- a/app-misc/mc/files/mc-4.8.16-makedev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4ba3a1a92a59658bc9f5f9d0745db8bb829778cb Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 13 Apr 2016 23:38:47 +0100
-Subject: [PATCH] filemanager/mountlist.c: add makedev() declaration
-
-On glibc-2.23 link fails as
-
-    $ mc-9999/src/filemanager/mountlist.c:750: undefined reference to `makedev'
-
-Reported-by: Thomas D.
-Bug: https://bugs.gentoo.org/579858
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c
-index 166b246..7d6e178 100644
---- a/src/filemanager/mountlist.c
-+++ b/src/filemanager/mountlist.c
-@@ -186,6 +186,7 @@
- 
- #include "lib/global.h"
- #include "lib/strutil.h"        /* str_verscmp() */
-+#include "lib/unixcompat.h"     /* makedev */
- #include "mountlist.h"
- 
- /*** global variables ****************************************************************************/
--- 
-2.8.1
-
diff --git a/app-misc/mc/files/mc-4.8.18-html.patch b/app-misc/mc/files/mc-4.8.18-html.patch
deleted file mode 100644
index d8483446bfcd..000000000000
--- a/app-misc/mc/files/mc-4.8.18-html.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 6b656100ac907636f0b54b12921408260a9fd583
-Author: Raymond Jennings <shentino@gmail.com>
-Date:   Fri Oct 7 22:38:07 2016 +0200
-
-    mcedit: syntax: fix mismatched highlighting for <{o,u}l> HTML tags
-    
-    Signed-off-by: Raymond Jennings <shentino@gmail.com>
-    Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
-
-diff --git a/misc/syntax/html.syntax b/misc/syntax/html.syntax
-index 2b3afd30e..3adbe4d0b 100644
---- a/misc/syntax/html.syntax
-+++ b/misc/syntax/html.syntax
-@@ -52,6 +52,7 @@ context default
-     keyword </SMALL> brightcyan/17
-     keyword </SCRIPT> brightcyan/17
-     keyword </META> brightcyan/17
-+    keyword </OL> brightcyan/17
-     keyword </P> brightcyan/17
-     keyword </TABLE> brightcyan/17
-     keyword </TD> brightcyan/17
-@@ -59,6 +60,7 @@ context default
-     keyword </TR> brightcyan/17
-     keyword </TT> brightcyan/17
-     keyword </U> brightcyan/17
-+    keyword </UL> brightcyan/17
- 
- 
- context <A >                    brightcyan/17
diff --git a/app-misc/mc/mc-4.8.15.ebuild b/app-misc/mc/mc-4.8.15.ebuild
deleted file mode 100644
index c01cae5c6123..000000000000
--- a/app-misc/mc/mc-4.8.15.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
-	epatch "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
-	epatch "${FILESDIR}"/${PN}-4.8.16-makedev.patch
-	epatch_user
-	eautoreconf
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit internal-edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.18-r1.ebuild b/app-misc/mc/mc-4.8.18-r1.ebuild
deleted file mode 100644
index 024c7dcdd497..000000000000
--- a/app-misc/mc/mc-4.8.18-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
-	"${FILESDIR}"/${P}-html.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit internal-edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.19.ebuild b/app-misc/mc/mc-4.8.19.ebuild
deleted file mode 100644
index a494288fc52e..000000000000
--- a/app-misc/mc/mc-4.8.19.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
-	default
-
-	# These tests fail, so disable them instead of disabling the entire
-	# test suite. Please check on each bump if this is still necessary.
-	# Next release will fix them: http://midnight-commander.org/ticket/3781
-	rm tests/src/vfs/extfs/helpers-list/data/{rpm,u7z,urar}.* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit internal-edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.21.ebuild b/app-misc/mc/mc-4.8.21.ebuild
new file mode 100644
index 000000000000..a7b19052bb2f
--- /dev/null
+++ b/app-misc/mc/mc-4.8.21.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		$(use_enable mclib)
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 4d9eb4e23f0a..302a4e16023e 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,7 +1,3 @@
-DIST pdfpc-3.1.1.tgz 199004 BLAKE2B 4efaf84e13dd4b90e66365429e3f2aed498e8fab039660acb377b4b0331da9f43d446827d204fa64143af566e072666878dc3a3d3787aa6480cd658feff7eeec SHA512 554203094b18fe11fd085414961de6644df3c258ad52d46ad171cfd6c2199028bcbaa9560bdaba63d83f858b467407cc276972b34f341cc25260db1d1358e88d
-DIST pdfpc-4.0.8.tar.gz 91138 BLAKE2B 1160590fddff914ddfc8c5a25d83b9e680cd6ec9ebef8f3809c1de31629da2879dbddd766a65d31d86b8fd0ebc735f10a51eabb7c18e5d62e96f656810d8730d SHA512 f077f08f2ee997d55b4e4ced31ec6f21791353871104fff9ece264455a18e30ba365933b15b6b596817f3e6f3f0a181f4fecf19180b8a4337f3752d3aebec7d7
 DIST pdfpc-4.1.1.tar.gz 96995 BLAKE2B f032cf0207cfb116ef98a171376d1cc80ae20f70eb7a63cf29dbd93e73c7bc1b0ef7638f9086d9908470d988830c4b420d9b96e7764af6219267d9ca6aad557a SHA512 51fa8e7743e02ba7e119dc86505f4513c174842a22d5755154775bd9abd945e7bcb9ba3c205cb27de25c38271762307136cb5370443131ea80cc0b9187e531bf
-EBUILD pdfpc-3.1.1.ebuild 588 BLAKE2B 60160b1ffd47acf79330a45e3b3d522133ae87b0162bd2f93bdaf9699a49184dcf4afc6d511e6cf8baa5a5a36efd7f66b1f8acf7e86520271ab0e6ed960a0011 SHA512 a746c935c20d8202cab981eeb017951ce028eeebfcc4ebe7cbd0e2b65c677fe7d5c7bd5ad70e093d79c26040783ff8fb28b72cb847ec368869517fb1b51e3773
-EBUILD pdfpc-4.0.8.ebuild 1049 BLAKE2B 78020955d238e1070cc4bf91604eb0e719d211d156cfea9264b8523676feb4f3c97366bcdb5ada827f42901079ea6648487ab93d710b5548a07cc68775564513 SHA512 c8600cf0cc9635ed7664177bf9e15b02bbf1c57b6a52ba704d1ccb3ff729b2a23197bf4e6f35ffb96a807585290c44e7de037c1d05c793565c03573ef8455835
-EBUILD pdfpc-4.1.1.ebuild 1049 BLAKE2B 78020955d238e1070cc4bf91604eb0e719d211d156cfea9264b8523676feb4f3c97366bcdb5ada827f42901079ea6648487ab93d710b5548a07cc68775564513 SHA512 c8600cf0cc9635ed7664177bf9e15b02bbf1c57b6a52ba704d1ccb3ff729b2a23197bf4e6f35ffb96a807585290c44e7de037c1d05c793565c03573ef8455835
+EBUILD pdfpc-4.1.1.ebuild 1047 BLAKE2B 71e94a6c2e63ffaea3046a1426036ff859b2243f7b539a9239585de10a15d60810a1c7537e2f382ee763da14a0b58632a5f70d2bafb46fca772b838e0410891e SHA512 72167e26b6c82d643fb791bc19033d41df196d8f8ce3d5bb03ab5488785c0e3aec8f16c6d5d9e85fa23289bdd60d37e0fa59bf0060ee3c692c8b275c7b8b0002
 MISC metadata.xml 248 BLAKE2B 654fec0fee7061d757492fb099eaead728da33a2ae9cd4d062f8777b7a154898a212f16ba8432e0e2ebb5578ce57fdd536e715501972db07e906a866f65691f4 SHA512 55030b20a7a78b1738b2421cdb749e17c0704fa5b90109d83a4f81f09c177d2b27686e524935a63c8f1e7bd8f011a3a966d6ce336d335c2361fdd208763c28ef
diff --git a/app-misc/pdfpc/pdfpc-3.1.1.ebuild b/app-misc/pdfpc/pdfpc-3.1.1.ebuild
deleted file mode 100644
index b84136261d30..000000000000
--- a/app-misc/pdfpc/pdfpc-3.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="https://davvil.github.com/pdfpc/"
-SRC_URI="mirror://github/davvil/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[cairo]
-	dev-libs/glib:2
-	dev-libs/libgee:0
-	gnome-base/librsvg
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-src_configure(){
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/pdfpc/pdfpc-4.0.8.ebuild b/app-misc/pdfpc/pdfpc-4.0.8.ebuild
deleted file mode 100644
index dae4ac40e486..000000000000
--- a/app-misc/pdfpc/pdfpc-4.0.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
-
-inherit vala cmake-utils
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="http://pdfpc.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-
-RDEPEND="app-text/poppler[cairo]
-	dev-libs/glib:2
-	dev-libs/libgee:0.8
-	gnome-base/librsvg
-	gstreamer? ( media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0 )
-	sys-apps/dbus
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e "s/valac-0.20/valac-0.36 valac-0.34 valac-0.32 valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
-	vala_src_prepare
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		-DMOVIES=$(usex gstreamer on off)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/pdfpc/pdfpc-4.1.1.ebuild b/app-misc/pdfpc/pdfpc-4.1.1.ebuild
index dae4ac40e486..23b43ab32420 100644
--- a/app-misc/pdfpc/pdfpc-4.1.1.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gstreamer"
 
 RDEPEND="app-text/poppler[cairo]
diff --git a/app-misc/ps3pf_utils/Manifest b/app-misc/ps3pf_utils/Manifest
index 06586f9f8d56..062d49ba4778 100644
--- a/app-misc/ps3pf_utils/Manifest
+++ b/app-misc/ps3pf_utils/Manifest
@@ -1,7 +1,3 @@
-DIST ps3-utils-2.2.0.tar.bz2 361144 BLAKE2B f862ecde260873e8b2e6c79d20e3ae833c65b77e92ef02957c319de166bb9ebd7a1b68c61201f1fb0bd378291e418b5aeaf8283fa03faa26f356989050ab32c9 SHA512 278b4430e307493481ccbe5f1c92968921d5af9b2d09a80a9356ccce984318356183be4983ae5c13bd5e79c2e28c839df0402382d8be5d342a8605236cc060f1
 DIST ps3-utils-2.3.tar.bz2 351066 BLAKE2B 2168e6f2d0eb2543ee8efdf6092d9dd21d2bad38ad8459b19b9a2b4bbcc05874cb99768b6d2f090a5866b904c4a0fd5c590eb6ebc431f87fd3686d8a6fcc4adf SHA512 523e8c28325dc77478cc910a62249bfcd29b35b50e9b01d0d6dec600af302a4a3eff532b313d82fb23c4ff5436955629d8a72f1afb03b76f2b1b9cbd534e8396
-DIST ps3pf_utils-2.1.1.tar.bz2 980229 BLAKE2B b0c0081f6938b472285cbf6a0fb03db06447cbde3ade34b1ad5067fde48102f2fc6402e7b0a8a73d03c99e6f9392fb00756347f1d2dabab90a2a4dc06ea8a124 SHA512 5ac971659d946aff3bbaa5090f65018c67bf42309bb855742f1e21d226d619d9f16495396527fe7121d8a5599f5f7496127cb06b011d80b780de19bb73ce668d
-EBUILD ps3pf_utils-2.1.1.ebuild 562 BLAKE2B d33eedbac8bd62dd753bbf784bcba3e1e59196ec45771c7ec2fdd3ded2d60fdebac72fcecee27e23b8437fd372d9555c291dec05f5e298adaf98d41774ca2a5e SHA512 707674204fe04250854e1c9ce1b624699ca6bb26e95854dc7e888e9def2fa00e54c17056a9a4391d3d4aa227d0f4d653a234b908271f94b0bc1b5a02f50f2e0e
-EBUILD ps3pf_utils-2.2.0.ebuild 530 BLAKE2B a2ecc630716580f24eb832071c510bb070175c0eccb186f03054869d423a079fedc86016ca0a9729e0240e463fe9d75339f566987700cf68dac00f514f51f60b SHA512 719e25183766914b53cf20ef630c3d962d20730b5d3bc41e1a3f1144f4c42fa7d3092be9df00c101a663af5802be33f9c9c1d130065ace2a712766b874f8d313
 EBUILD ps3pf_utils-2.3.ebuild 571 BLAKE2B 5cac13fc988e7fe1f3476a77a0055e7592b54cfe80d04d438e08436d8d1bcdb454529bcb73c31f6427b1b3219db98a08bb9662a48a882e4827a3499320afd760 SHA512 c4718000f4b3a8174279d79746ea0c269de6867e962c0824ec5901c6686213496f6528df407be0cd7d6c3b193c823389e5d66128c899cf30a63c7f22cc532e31
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/app-misc/ps3pf_utils/ps3pf_utils-2.1.1.ebuild b/app-misc/ps3pf_utils/ps3pf_utils-2.1.1.ebuild
deleted file mode 100644
index 1df332c4519a..000000000000
--- a/app-misc/ps3pf_utils/ps3pf_utils-2.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic
-
-DESCRIPTION="Utilities to set the ps3 specific features"
-HOMEPAGE="http://www.playstation.com/ps3-openplatform/index.html"
-#SRC_URI="http://www.powerdeveloper.org/files/Cell/SourceCD/${P}.tar.bz2
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~ppc64"
-IUSE=""
-
-# fixme: depend on a version of sys-kernel/linux-headers that supports ps3
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/app-misc/ps3pf_utils/ps3pf_utils-2.2.0.ebuild b/app-misc/ps3pf_utils/ps3pf_utils-2.2.0.ebuild
deleted file mode 100644
index a7ff984ad3d9..000000000000
--- a/app-misc/ps3pf_utils/ps3pf_utils-2.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic
-
-DESCRIPTION="Utilities to set the ps3 specific features"
-HOMEPAGE="http://www.playstation.com/ps3-openplatform/index.html"
-SRC_URI="mirror://gentoo/ps3-utils-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-ppc -ppc64"
-IUSE=""
-
-# fixme: depend on a version of sys-kernel/linux-headers that supports ps3
-
-S=${WORKDIR}/ps3-utils-${PV}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/app-misc/tmux-mem-cpu-load/Manifest b/app-misc/tmux-mem-cpu-load/Manifest
index 3d5e018c238e..767a517465f5 100644
--- a/app-misc/tmux-mem-cpu-load/Manifest
+++ b/app-misc/tmux-mem-cpu-load/Manifest
@@ -1,6 +1,4 @@
-DIST tmux-mem-cpu-load-2.2.1.tar.gz 9893 BLAKE2B 12776c3a7612a193418a16a1a8bba9720df9296f7ae35183de80031d62c6559fe9b1385e95762e265b2de1f1df17e02f0215801f203c3a7a9c32be321bacae85 SHA512 44d677bbe9eb457b8857c603f469c46767878b2b8af8f169f2b01393ce65fc8da3c33288bc0743b3c2846b77de798437130a7676ca95c5cab52cd4166d9ded73
 DIST tmux-mem-cpu-load-3.4.0.tar.gz 19483 BLAKE2B eeaabcd4447b326dbf77d3e5844971d2b466c93169993d4a16912bc4d0f777b07db1b0c2973dfaef9e0cd5b4f0dfd132043aed20170a1a7856d7a3c1f6a96ba8 SHA512 f963683faa86ff7b20a658787978ce3c4c36c41fabe297e18e4b1483e680d71a3b10c220dbae5c29bc7f7cb65e79839041b53c9aaee75a17bdc78bf0b76e8dc1
-EBUILD tmux-mem-cpu-load-2.2.1-r1.ebuild 627 BLAKE2B 6ecc9a16bd9ba3eb4d3ffde164a190c4d8da3c0f39e191b44f7adb2954334905e7c21d8e3a99796fbb36202b308f77429359c8788e5e9413d369f6a317a6ab16 SHA512 3d66b62af62ec70c543d7dfca1d6fe09404daa3ccaaec915bd55b7c59b15dde8a2455c94040b1a745a4255ff7963a5a89ca581617d8738b7cd20c564f6c7e0fc
-EBUILD tmux-mem-cpu-load-3.4.0.ebuild 596 BLAKE2B aeed1f26d88315743f481699c88f963f7e7e89f5e9c7443e6df258d2e4e2b1b3948be56a8dcd281cdd9c9d5a08a0e5032f1afa076a12930d36b89d787b8068e2 SHA512 cda20eca54f75e3facb84ec5ed06ecee1799e83a8dd92d5c84b4672d2cdd82db38802c3aec849b0420c7b53e3f72443430bf1b2aa455fd780c8b281da7302a9f
-EBUILD tmux-mem-cpu-load-9999.ebuild 588 BLAKE2B 41c7f8754f4ccb8040cb502a905c96f9e3bdf6c207a040f18f2297af8de8b6bdd10b23a1a22173cd3a44d10b4ec6c5bd5a20a279ee8fa6bbdb2d00669acf5e28 SHA512 fd86b3f4890c292e4ff399ea07814bd5a53d39b7c8c9288957435ecde7455b7f510142b63a6c5d9db8176db489926975c6722dcc2d9a75128a71ec26248871e2
+EBUILD tmux-mem-cpu-load-3.4.0.ebuild 581 BLAKE2B 5572059462a46e64382b32562d9a33e603da0e68f9f42e8e6efd23b3d2fe6c4dde69538ed6e2a251c28f0bcbd5cf267b94afc2fa6315b020dc7cca6848eee750 SHA512 b31936ddf8d4af35aee77db6d533ea3da35756a32b44422c0cd387650eca952493462c35eb3905998429e564dc635ecfbc1b893341b42787c84cf256d88207ad
+EBUILD tmux-mem-cpu-load-9999.ebuild 572 BLAKE2B fb51d056e2ed67a413dcfe13a875d50f897722f204ff0a7502a21e982c6622554c4ca9daffd566c3369ec9d8eabfafffb5c95cb88ff960be4d2e35bf677bae94 SHA512 a1aad3db36b9dcf00bb35ed13c270bb4b168505c1ffbd7455217879e5de5052cb257ed5d9510725f6281f58f16f8c6a91bdafdc110246318aee34d6521876f44
 MISC metadata.xml 233 BLAKE2B e05b8f920dfe21c6d9317562a4a2254dd8064cdaf0ea234443cc2867d417d87ea06817f234423ad58b507204af8e7222e3930f379b9957db62123dc23e0c1b86 SHA512 51ddf069656109f26ff5d12f93672537e90f70a3df00f5ffc18f4b365bc41847e441dd7aad0c50e46fe84cdac5ca6dceca1bb96de365d508cfeef1dacbaa5a0e
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
deleted file mode 100644
index c7b3a3a921d7..000000000000
--- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-IUSE=""
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
-HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.rst
-}
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild
index d70c36f8ee97..f54b4e254c51 100644
--- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild
+++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.4.0.ebuild
@@ -9,10 +9,9 @@ IUSE=""
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
-	KEYWORDS=""
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild
index 7b933a09dcc4..a93c22ace65b 100644
--- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild
+++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
@@ -9,10 +9,9 @@ IUSE=""
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
-	KEYWORDS=""
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS=""
 	SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -22,4 +21,4 @@ HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DOCS=( README.rst )
+DOCS=( AUTHORS README.rst )
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d8b3ed8c6c7c..1e57ca46bfef 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index c06600dcefe9..ce52cf0d509a 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -2,7 +2,7 @@ AUX calcurse-4.2.1-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a
 DIST calcurse-4.2.1.tar.gz 612593 BLAKE2B 7c8fb995ea16abcdd5ae768cda09298e4bdeb64d8476657b3d1320394a269add3b1c4279e8a6b7a089f27404d43ec3acfbab6222cfce74dc422042247109fb00 SHA512 77f7fd23fe28e34ace29239530948c7576196339e4c603952dd5d48a201fa2e52bfcfaf411edf3f299c9d8b30d659febade68679fc65a2b87afb305bbf5db8df
 DIST calcurse-4.2.2.tar.gz 612456 BLAKE2B b73e876f671b75d362bf32bfc341fd985796a6be6b5c4164464bdef1f35d26fbecec3bb7f5dcd54a1ab9e3405186ea2d791484902643362738db38d647d786b3 SHA512 d54d5a1ca457499ff82fe0b6a945f5f54c0f93f84b34d5a69579dd42d4d44edda0b81a165d29b4f3d77ef7219b2e815b5858eaa744eb418e9549abf58eb2f958
 DIST calcurse-4.3.0.tar.gz 597490 BLAKE2B 7fe31fc09cae12438173d4846a1e4b0a55f9e9416ab23ffc8b78e9d0f621072d8aca96b4161d5659db088e1007f685228e9669aae2d5606939c6564252826e1d SHA512 d948354b512d406f4915ce37107d3f529031e7698d7b38465913ff37120a93283e01f09f5267ebb19bf39ea133d6fac579b218d6dfd6056003b6222f9038f4b3
-EBUILD calcurse-4.2.1.ebuild 753 BLAKE2B 887f074217c25fecdb8371f3f39ab385e4bb1a00669006579bae4cbc82de2bd2d17bcb9a17e23484a4991662a955c54477fc9560c9bd973daa44f1d500033516 SHA512 bbb022efef48be9a1b5af2cf507f3f27fbcad4d92e6aff2ee7a81da8b0db6df2470ef2fa2edbd93bca57b85591729cc43bc817f1352e63140ae87861185c6b2f
-EBUILD calcurse-4.2.2.ebuild 757 BLAKE2B 022c02f259d9aaaca16af2828ceaabc74ad018dbc331197b2e654d053cd4bce7f9fca42626304c557d32863f0cfff571c6ed51cf5ef82a2ecbc18da65f608894 SHA512 f5feb455b786a468278a3787c6be46939a401ac87c53ac539441cfd574dffe8f7a8dad2ad811c368e8441fb5161b13e1451314684cf0146a2805522e6b4136b4
-EBUILD calcurse-4.3.0.ebuild 595 BLAKE2B 5fda7c84ae551dff89ed88b6c425114f72ad6dcd74b8f513bb8d7ced6ee1cbaa3dbb62feb4cf7b0cb15fda6891af03b4d005a151cb67215396e60ab779317965 SHA512 21ec3c14523bc61f7b37404ca5aa9894e6516eb338350cc445db6fb0a76a921adeb3672217eb5460d4ffa923da9cab1319c73488281f2c6ed011bc9e1eefc970
+EBUILD calcurse-4.2.1.ebuild 755 BLAKE2B 777a0304803bac5ce78e5c63f65b9543020cd8f6af345c2e8a68faedc35225d0cb8b69ff93364c42a712332add8fff3be8c22d6248d58e7cdade2414e55f3b52 SHA512 5bec3709ae73bb6ce5d8ecd55b286664056a15a104d9e86b24be81f27fc3e693bb22e32255f998a4114af73e5f6b79ca616eb9c1296cd7317228dea66a12d984
+EBUILD calcurse-4.2.2.ebuild 759 BLAKE2B 8c5df80a4bcfc6bf940edbe929f99ce62ced7e2020586ce70d0f9b4d63379b757e4aaf9341e1d2a86bfb964df4489680c30700c7a41759bb6156e8fb3771ae97 SHA512 1d04f100080fa5b77ac3044185d6da3f7d54104e3313c4cacd373906aef8465624d01f7e1f7e616a2914ec8bb72871f5730ec97d268368df1c49057d84fb756e
+EBUILD calcurse-4.3.0.ebuild 597 BLAKE2B eea77ab7b4e2adb02d4da09421e9d0d3850ff92222a153e4bd742db71b4643c2509bf2aa97dbab0be4cdc513b7c1db75008a188e0d9251cc5f4ff18f67f03a2d SHA512 ca182b770abe8b937d8dd254d151996888d2c731eb6ea7200ecd01a6c16e86389350a66267b4e3b3ed27e5b009949b39ab9d12982fb03055856e671d754ae155
 MISC metadata.xml 593 BLAKE2B 313dee286f4f73406dc3a9a00c8bb59df524df4ac3ced089fea16522d22d99580972c1e52822df1d4c7b527b3c48dce3b825d662458e6194343ec66f2024f73b SHA512 41f0c2a630723427fb5f4033b928c1dc0e4c7bd08f301240458129b08e9baab02141e214b73a393a8c7af58ef1b6f785f701407e111a49b825e5006078caa9a8
diff --git a/app-office/calcurse/calcurse-4.2.1.ebuild b/app-office/calcurse/calcurse-4.2.1.ebuild
index 47cddd1eb692..27a9fb9d46a4 100644
--- a/app-office/calcurse/calcurse-4.2.1.ebuild
+++ b/app-office/calcurse/calcurse-4.2.1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils autotools multilib-minimal
 
 DESCRIPTION="a text-based calendar and scheduling application"
-HOMEPAGE="http://calcurse.org/"
-SRC_URI="http://calcurse.org/files/${P}.tar.gz"
+HOMEPAGE="https://calcurse.org/"
+SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-office/calcurse/calcurse-4.2.2.ebuild b/app-office/calcurse/calcurse-4.2.2.ebuild
index 109005b664a8..29a53449ca58 100644
--- a/app-office/calcurse/calcurse-4.2.2.ebuild
+++ b/app-office/calcurse/calcurse-4.2.2.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils autotools multilib-minimal
 
 DESCRIPTION="a text-based calendar and scheduling application"
-HOMEPAGE="http://calcurse.org/"
-SRC_URI="http://calcurse.org/files/${P}.tar.gz"
+HOMEPAGE="https://calcurse.org/"
+SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-office/calcurse/calcurse-4.3.0.ebuild b/app-office/calcurse/calcurse-4.3.0.ebuild
index 2ae42b684376..4b4729db868c 100644
--- a/app-office/calcurse/calcurse-4.3.0.ebuild
+++ b/app-office/calcurse/calcurse-4.3.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
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils multilib-minimal
 
 DESCRIPTION="a text-based calendar and scheduling application"
-HOMEPAGE="http://calcurse.org/"
-SRC_URI="http://calcurse.org/files/${P}.tar.gz"
+HOMEPAGE="https://calcurse.org/"
+SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9a9adf8da700..62c37690c586 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,8 +22,8 @@ DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3a
 DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
 EBUILD libreoffice-5.4.7.2.ebuild 16222 BLAKE2B a118f9d518c571927f24dcfd5db2373984a0e2be9caacf50af6005677706e3bc8ae57f8771a89a57e748b2221f8b8eaa19b0901218e6ce181bb28d25d7e6af24 SHA512 21e37083c7facb66bfaf3403bf2935430f1a581b61ab4d56b7d689a1762f5d14b8178f50c3e33a0d81f33f9e0ea062241f2d3e3296dd327d53ef33f431b92047
 EBUILD libreoffice-6.0.3.2.ebuild 16881 BLAKE2B e4ccafaa0c47aaceae3be045b9f7c64406c59fbcd7b2052025222352c89540270b5ffa349ce74f9bc9dcf0475f176e1b08d8b72e393e592f4f0bbca459e4e17c SHA512 1b179f51a8e3c3b26d465550407262847f754a498431e5fa6b468d7d162067c62670f72289a242b41fc89b4369d0a9f4427043c4513241111d3a1d3a2f6bb7fa
-EBUILD libreoffice-6.0.4.2.ebuild 16819 BLAKE2B 2804ea8fc6b4cb60811ba18798a4d315259627ae5b64ff624e1210fc14403b7d61618e54503e5c2a9b235ed3f7fa6d50f7ab99632aa2abfcccbd77324ad5a238 SHA512 af1001dd66825e3ea600452f9e97feccf5e64305a4bdf8ef535c7f3b0d7f313097b8eb2d57809365fcd6a9d7f214f7c10fb19ebbe9b2044aad61b715dbadffb9
-EBUILD libreoffice-6.0.9999.ebuild 16819 BLAKE2B 2804ea8fc6b4cb60811ba18798a4d315259627ae5b64ff624e1210fc14403b7d61618e54503e5c2a9b235ed3f7fa6d50f7ab99632aa2abfcccbd77324ad5a238 SHA512 af1001dd66825e3ea600452f9e97feccf5e64305a4bdf8ef535c7f3b0d7f313097b8eb2d57809365fcd6a9d7f214f7c10fb19ebbe9b2044aad61b715dbadffb9
-EBUILD libreoffice-6.1.9999.ebuild 16600 BLAKE2B e497c832f22797d839d084195dc70d37dc3091b3d9d88f4688a7e1ab53e624e073f7f72baa7800fa0dc09da913242ce8f4c565df694911cd2fc0d2df363195c5 SHA512 c062f2a1b2b35285266b56039579d37b347edcd7b274ee825a28b008bf2cd3ac1be2bf7a73ed4d499803ac7901d1284f776de12b666c20630791e6f1e9711e88
+EBUILD libreoffice-6.0.4.2.ebuild 16824 BLAKE2B 1df7a85923f8dff14d2b5bddc351daa2b8511065c2c542cdd81b1241df430b0c2f9257514c8a5709078f8d4201c2ec5c751c9554b6ad5ab4fe9d82dceb5aee95 SHA512 0a8bd8f5d33499e1bd314dc12bb6542d14de9e8f66a0215bfcd82e4a876feff1ae0875c3949d7ffb8ceb61caf5d9d359dd803a3a7c68423420fd78598024f232
+EBUILD libreoffice-6.0.9999.ebuild 16824 BLAKE2B 1df7a85923f8dff14d2b5bddc351daa2b8511065c2c542cdd81b1241df430b0c2f9257514c8a5709078f8d4201c2ec5c751c9554b6ad5ab4fe9d82dceb5aee95 SHA512 0a8bd8f5d33499e1bd314dc12bb6542d14de9e8f66a0215bfcd82e4a876feff1ae0875c3949d7ffb8ceb61caf5d9d359dd803a3a7c68423420fd78598024f232
+EBUILD libreoffice-6.1.9999.ebuild 16605 BLAKE2B 61df63788a3b0e5d8010b8589a365b3be0fb7a78e6bbac25438c39f022f8a391e27249cf6d39aaddd2e5918f251796887cc64f6c939161374b615fb77ebf65e0 SHA512 38489e5873c89a39cf3c3c09e888eccbeaf3bfbe7d90dde996415647c20609a374775aea9efd21591ec0d963888095c50b11fb4b82c958805462e492c5e34d69
 EBUILD libreoffice-9999.ebuild 16600 BLAKE2B e497c832f22797d839d084195dc70d37dc3091b3d9d88f4688a7e1ab53e624e073f7f72baa7800fa0dc09da913242ce8f4c565df694911cd2fc0d2df363195c5 SHA512 c062f2a1b2b35285266b56039579d37b347edcd7b274ee825a28b008bf2cd3ac1be2bf7a73ed4d499803ac7901d1284f776de12b666c20630791e6f1e9711e88
 MISC metadata.xml 1153 BLAKE2B 831243a115825974190637c2c9615e41e44d50227ba6b8e4c7f9683d8d510e422b573ee18f886673df2a3bf30feb5fcdfc7f1e90ec215d39bcccd9a11098d57a SHA512 50b686f39b0113d96b8a2b14f36581be68c2384d13a963ea3c20973b3af874bb9d50c4b7d5d2f11b2e0ffaf9deb351b5314fe30f954f17351ba0c8c850680c1d
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index a7f087f49e26..b1c28905c338 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index a7f087f49e26..b1c28905c338 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index cc4c2bc8ce11..ae37700e0e39 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index bea6a2639732..5c58dc4404af 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,6 +1,3 @@
-AUX skrooge-2.12.0-qt-5.11.patch 1280 BLAKE2B cae8b90183fefa70f062355184f40e8767d357e78e4eed1901a32dae3e1b444251c37917e69201e23873d91ccb47b19268b85906cf45f36b0414751770c0e2fd SHA512 625947c334c06ed9bfd0c7cf0a7a6b0ddcf491572532d9e73e529cd4a1ef2e53939b6570df9442817269db897dc2d3c5155d318e6738ddcd4787470a8ffc85ad
-DIST skrooge-2.12.0.tar.xz 20289828 BLAKE2B 999f100fffca3b8fff5e343b1137fc51e337428cdbd89f7e5eb72811e3e5e1522cc257e6be83aad57cf4ec66fefd061b685d94caaadcc27182f32da13d57014f SHA512 348262a7e86f6b3f9fa028fea324eeb73c96e03a77d16774ae9f4b554c1893aca7a002bcf3160d4055cfe8aaceeb76a364e71e7f605382cfe1a801eca1ca874f
 DIST skrooge-2.13.0.tar.xz 20432856 BLAKE2B 5e5ace28f0a3d0f60decb8bcb63fde3d9ed5dc79103ce8d2f4bad2be33b3e4896f19aac4954668bee194362b3b860f0e585e902ed54563b0a82ee36ab41263a7 SHA512 7c5543a4c26953c89a1a67b653bdf5fa7f4baa14d96e763d868f27b288a0f9d7d4bc2994436a4e749d4fd7db999c16b6fcee69817be0774c6e171e49d69e30ba
-EBUILD skrooge-2.12.0.ebuild 2411 BLAKE2B a8146472badf1889d4cbd6d1191e9308ab061e6ceaa70f37d2635a86fb4b300e70dc7bef507844eb1f1a6e8367177bd8c1371e418894445355d5250dd4934977 SHA512 cba8d0a3106bffe5a1a833838c89b20315c0c35ce843be20038f634a8d0b69b1ebb5699aac99e34abba74eff70640fcc7f4d95f3e8fab0f0d69b722aee81b5ff
-EBUILD skrooge-2.13.0.ebuild 2367 BLAKE2B e4045cba2290bad7f903e9ff81615f7f5f443a0c3dd42ec82a6e1e43e7e9ef421737fa06a799d76c63e1801ea2ce43cfb74fb5b1dc959ae6cf1cc96125ec2773 SHA512 9e2ceacaa2ae8e16864cf3fe4de6dea5d261ad24f42af0e6499b7f1be88afabc3c40ee178de0ff12eb8c70ac1d1d58d73d912d55ea785d2f4739dab35e1bce5c
+EBUILD skrooge-2.13.0.ebuild 2365 BLAKE2B aeaf4ffdc815569d4c124bff99bc47acd7b49b576e761e981073a86e0c2e24275696dfcbc4ca2105e3c6fa0b52149130d0a21d9910750ed15e50f9a1b99bb2c6 SHA512 fd9c100ebf80952bb209597e369ca03f88e0a122ec4fb7271ed551c72016e360e49f87f5abff85018eed0a42cf03b39806d1ecb5b973526e95e9443c255b44e8
 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
diff --git a/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch b/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch
deleted file mode 100644
index e1a9bbbd3282..000000000000
--- a/app-office/skrooge/files/skrooge-2.12.0-qt-5.11.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 38e61d2cd8a4a4b863801f8a5097b8b51b0c8e93 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 23:49:52 +0200
-Subject: [PATCH] Fix build with Qt 5.11 (missing QHeaderView)
-
-Reviewers: #skrooge
-
-Differential Revision: https://phabricator.kde.org/D12297
----
- plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp | 1 +
- skgbasegui/skggraphicsview.cpp                              | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp b/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp
-index aa171913c..930c4ea3e 100644
---- a/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp
-+++ b/plugins/skrooge/skrooge_operation/skgsplittabledelegate.cpp
-@@ -24,6 +24,7 @@
- #include <ksqueezedtextlabel.h>
- #include <kformat.h>
- 
-+#include <QHeaderView>
- #include <qpainter.h>
- 
- #include "skgbasegui_settings.h"
-diff --git a/skgbasegui/skggraphicsview.cpp b/skgbasegui/skggraphicsview.cpp
-index 4c4557880..7143ade3b 100644
---- a/skgbasegui/skggraphicsview.cpp
-+++ b/skgbasegui/skggraphicsview.cpp
-@@ -21,6 +21,7 @@
-  */
- #include "skggraphicsview.h"
- 
-+#include <QHeaderView>
- #include <qmenu.h>
- #include <qdesktopservices.h>
- #include <qprinter.h>
--- 
-2.17.0
-
diff --git a/app-office/skrooge/skrooge-2.12.0.ebuild b/app-office/skrooge/skrooge-2.12.0.ebuild
deleted file mode 100644
index 122a2459f9f7..000000000000
--- a/app-office/skrooge/skrooge-2.12.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities designer kde ofx"
-
-COMMON_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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( dev-libs/libofx )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libxslt
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-REQUIRED_USE="test? ( designer )"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}
diff --git a/app-office/skrooge/skrooge-2.13.0.ebuild b/app-office/skrooge/skrooge-2.13.0.ebuild
index f5110fcfb096..d2d42126152c 100644
--- a/app-office/skrooge/skrooge-2.13.0.ebuild
+++ b/app-office/skrooge/skrooge-2.13.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities designer kde ofx"
 
 COMMON_DEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b9d80f89ac88..62aaf32d3636 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest
index 9ad8e259ec46..fba9a773d098 100644
--- a/app-portage/eclass-manpages/Manifest
+++ b/app-portage/eclass-manpages/Manifest
@@ -1,6 +1,8 @@
 AUX eclass-to-manpage.awk 10909 BLAKE2B e41b792f8316c612609da17c16ba41f01a4fc27c847bc380a26a570abef030d6e11a74673d703da77e17bb3db796ed3207d95cd9d8e7604551a6d0b10c6a3e07 SHA512 c37d502f66c31b2e5be8c27071ade6bfe7617d84bbca57ab3ac9d0f2d3403281d50fd8c6bada2c3dbe29041bcef4c0dafc76506a1ddca82fc26aa83d4785bae2
 AUX eclass-to-manpage.sh 780 BLAKE2B 74c9580dd603e036f8209107794d39eb6705333312a98f1c1fba86feb807792ba8ae52420b3ab4b5296c6dbd42af597e591ce928c19b26c5fc80be09202973c3 SHA512 266f15ac5d2efc42ce792d9e0c1d91e99502a5cd93ee1b915fe952cdd894bc4e773014c3f6731d2a11a2d82466676035cff21a1d88070fe85f1dca915dca203c
 DIST eclass-manpages-20180302.tar.xz 454568 BLAKE2B 2d09a44e33efe0a302d4bdfaa3189e6ca0d373c84518e58bfb62824c00f83e865660c42cb0df597902d253241d9cbdac468add16ad19f94edd925460701c9f4f SHA512 17878001c9d70c69b9260541ac87cf642da0f0c5adbb77b3df2f614331e29af6af90b64950c9d95a2bc76d4b24180b46575d02a602956b721e3b03b93ee251e0
+DIST eclass-manpages-20180607.tar.xz 435652 BLAKE2B 42070a7b09681c0337a223684a2d1993aa79f7ecf02fa06597780ea1cdfc00b591191d583e3f948a7b962a63b31841287c2a8078e045074ab6d7e1af9f999569 SHA512 4a002e7dfb0436efb661d929291ada0c0802f595637fd3b77d99a1d803cc24329a3793eaf13e74dc470c67168cdc5452316bea8f78a95c1a3ee608aa5eb8b0cf
 EBUILD eclass-manpages-20180302.ebuild 1094 BLAKE2B ebb62e20bab310089379baa86b0ba73af6286669917115817faa4f96269b37ec8a1052417686e5648c1667b429bf89d6cdc3089d63d6f327ec9e1585d28971fb SHA512 074e5e6c5111c14e6f7c86fcaae0f22bd3718e19a229d4978b03341cc9050c9e48cfc566cc0b7dbef6330f1566cdbee14320aac03d395786195d725eb07ec557
+EBUILD eclass-manpages-20180607.ebuild 1087 BLAKE2B f8e430423d389e06cfec6689539e28dbdcf61be418786df4aafd63314397c5b62383781fa8c2cfbd0b4bbeecf34ae401ecb092c8fd503f53e1513319abca6b4b SHA512 25b0db417330fb5c5caed47d9bafb7c0b4cc15c8c6d813db72ddd7264f201e246617305609e992f4d67dd130bd5f081cfdcb51438fc4370a9fec78a570e2b24d
 EBUILD eclass-manpages-99999999.ebuild 954 BLAKE2B 654df18ee7a23338c3d87fbe1e545858aa8ef64bec0cc54e5795f7431e513776d1d40d136ffbd0061aedd63f956bb49e118f1f82de38acfdb80f3abc77125612 SHA512 ac8ecd64716f06e3130345e45b5d5ee2c5c339dac5429d0d765bfac0c50dcab433a6d210c5b425fd52c516ee2af8fb9cc47888b0a398da8fe0f85adb09409be9
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild
new file mode 100644
index 000000000000..db10d2aba060
--- /dev/null
+++ b/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stabled. No need to change to ~arch.
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+
+DEPEND="app-arch/xz-utils"
+
+# How to create a snapshot and upload it to your dev-space:
+#
+# mkdir eclass-manpages-$(date +%Y%m%d)
+# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
+# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
+# xz -e eclass-manpages-$(date +%Y%m%d).tar
+# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
+#
+# Then copy the ebuild and update your name in SRC_URI ;-).
+
+src_compile() {
+	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_install() {
+	doman *.5
+}
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 906b6b534ed7..fa5782237662 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,6 +1,5 @@
 DIST elogviewer-2.7.tar.gz 19936 BLAKE2B 530c3324666089af93712a17f01cc9b6284b2639b4e768a41461da35d615ee1a75870a4138587d85d4eff4925945dee45dbc1af848b7fc500165c8e96d3c7d01 SHA512 81cf20e8e5509d83634d601f0920bd369e1974c843b600b54faa433dc9927a0df6c9820d2b1f35b241bcd86ea891945f16ec2b0d1b65d08c085a3b245c8b038d
 DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
-EBUILD elogviewer-2.7-r1.ebuild 1903 BLAKE2B ba1d44a2d319b8c1286e94d521e6a15da9a56e74acdb4f7fab110c63085d79708c82f0fa77ba262a48ffc62f6908167f43b019141d47be1af593195f6912096c SHA512 884642f815e018d5eb0fc5c323ff0fd7d71ab7f2f00670694cc71661f38147ca0f88bc793326ccf0c5f86a8f7a3c459fdb2c5f6340015cc113c540e9760862fa
-EBUILD elogviewer-2.7-r2.ebuild 1756 BLAKE2B 1fbea8d206ac31e9a056ed564982f02ffc3384a451a1046c05ca5d2f24184cf436e9e2deb3e71215dc8d3603bc393c1e18d11b090f613826be4f9987b5d29e4e SHA512 c4eef83e6bb2c089d286319ec77f658d8dc4d53950119b6f78b30035c44a3cdb34e6891f09663ee0e5a9ee7605378d8fe8f13650a91bd2597976e03a07afc280
-EBUILD elogviewer-2.9.ebuild 1758 BLAKE2B d60c2b09aeb6e0e9183c7b8832f106db1fc27b133b1c4c1e8a00301dd137eb82dd51b6a8785281452ec2c2413c256753146aafad792ccfcdca8c779e51975770 SHA512 a70da5046befbc695344d61f3173fcc28284e45592deb2a027bb93b798d630a06c6e762f028efc35f2d233022ea2758c3ca31fdf4801b7247054925e6c86d87c
+EBUILD elogviewer-2.7-r2.ebuild 1761 BLAKE2B 24b9e45586dd521da1b84e60eaee1e8d921ed0af3aa15daa1c4edaaf5e870606ffea71fcf0ec0542fdf670e89d1708125b0a6a3d67bb2fa75b976a737a2c0276 SHA512 0da80252b934601cbc96e17ee918ad15ed853d9f1155451473ef3cd3da0e733ddf7293e83974be2ce6a0ffd502269c570a0f7ff5e917a0a8eef9b77385eeb153
+EBUILD elogviewer-2.9.ebuild 1763 BLAKE2B 5461a19ac423e1b6e447ce459d3f297a41bb952a01b67460dbb436dbe1475f3e874067de03e29c7bc7466c648d48fd4616f28e4391d41910f30c8c67865b2c18 SHA512 35f52adc56e870fde2dc739f0082445c535390745c624d4ef878bcc9e4aa79d0e47d0ec6010faf750ab3f0058c4e8a14423b7a3315bf71d6ffa982ed76334762
 MISC metadata.xml 508 BLAKE2B 4414a5567ae33626032ceec6a059d7547bf8f2b69bc561b08e7ce60817194cd646813e0d3d0debc88ca10b85933ecbbdf954cbfe4d6b4194499e866ce54d7271 SHA512 bcea5d31473ddfb682d52f604f8eec6ec26938a30a62f7388e9b3be36d17a8f189ea97c418708b88949a6d48e10f6652feabbd247eeb9ef9132ce20916c41ec8
diff --git a/app-portage/elogviewer/elogviewer-2.7-r1.ebuild b/app-portage/elogviewer/elogviewer-2.7-r1.ebuild
deleted file mode 100644
index 34dca2224b62..000000000000
--- a/app-portage/elogviewer/elogviewer-2.7-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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} )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit python-single-r1 eutils readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP},X]
-		dev-python/pyside[${PYTHON_USEDEP},X]
-	)
-	|| (
-		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	!dev-python/PyQt5[-gui]
-	!dev-python/PyQt5[-widgets]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/elogviewer-2.7-r2.ebuild b/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
index cad621a1469e..c2a6997e1742 100644
--- a/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9.ebuild
index e007e8820641..234b72e591de 100644
--- a/app-portage/elogviewer/elogviewer-2.9.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 8fd86e9a92cd..257ef82871ab 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,6 +1,6 @@
 DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0984ad51af3b9d22c0926138eda0c7b02e1d70e200eb8c93cf4003e61f901e0fd5fd28861217b02a1e3ab64 SHA512 10ba7da5de3b90722b0bdcf9d3766a7c83c68d29d23e49744a31b0c8ad80eaa4917dff2fbd9f12ef2fa4fde03244e79f6fe5e9c108db7fb64fd6ea68fa0eb81c
 DIST gemato-13.0.tar.gz 66899 BLAKE2B e75a16d6a26f010801df072154897a485e9aee6434cf60962d59d11fda70b790284a734d9137ccc7910b0a95278d922640aece45e42ca497d1118e01992c2a15 SHA512 0ca17f1df8606e09a88411d75d144094bd13e440b04721175c8d9a3ea92fc616b34de0c80c817898ee94a1d82e37e4de50319634a351a52bccaec9653ad2f166
 EBUILD gemato-12.2.ebuild 1209 BLAKE2B bdf78ce5cddb0d78e20048fbbef5eb9011900e00b7b9d91e21eb86d0b81fb315f7fbc4831b17759dacfc5e168957a6d6d07b49a5e50a77160dee02063544bd36 SHA512 321077315648ca61ef1ff4083c8ea0d651cf919e1008a2a0f74f94d9032e255b513b2e0bb68577c2fa0f5c5dad441a9cc67853538d99823412576c59afbad5c8
-EBUILD gemato-13.0.ebuild 1346 BLAKE2B 9f57fdbebfdb5be105a94caba7fbd29b25c00b626061194179fd8e89460b98f1b932d688c325b59163a95435214a7996f8815e67f3171fd3e8a42770b130f8db SHA512 48b0784e7cb99a1d1bf2b3a3670dc71cf2f88bc58ed14312bc4d1a4ea8f614bea162b9500c0f6d96b125dc0df297ec98172f5895fd4ac2cc55be7bf0a82fb7c2
-EBUILD gemato-9999.ebuild 1282 BLAKE2B eb42663100c60b402d2e0287889cd9f7f396c0259e2e973a8a47f9f5ea3c615b8f05b51cb55df72d88b972d58b710b7ab00cd68e2f406f6849e0303a95a0c3e8 SHA512 f7a0c933583f47205a08527d50c009c98a41721de150ca6d913819a021240890b24d42a0bac988330f815331f3e1e1769f512c758d412af2eb24f050e1047f06
+EBUILD gemato-13.0-r1.ebuild 1350 BLAKE2B c103c444e7bb1ef73dfcff0e6db2f4f59a9dcbe47b504882d5d479d516d03268d44d70da8f1d67fa50910462cdc71c00e9306cd74ed278af926793aca881c87f SHA512 2a3b636f4bd43dd7d107d53da3f093260459ce7f40e32acd7cb3a54dcf93192fd6f7bc38bb94d43628abec53988b82d47837ec0391081195f0f24368bd6860e3
+EBUILD gemato-9999.ebuild 1282 BLAKE2B 75d4ba974bfdc4f2834d4c2cdce2f0847335d77c63ed8ea1291ee2b5760730db550d713f3c57d914a8e7cafb327f93239605d2ba8a84305dc56fd16c3e185073 SHA512 0f0de3082c4ba6cea4f36b906cf71ec1365feec8f4c360909f7c9415f766e5c078e8f33a1ae6ddc28453ad34d768b2d261855a3643490d03c394082ded2b75b1
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-13.0-r1.ebuild b/app-portage/gemato/gemato-13.0-r1.ebuild
new file mode 100644
index 000000000000..d4fc71a6337c
--- /dev/null
+++ b/app-portage/gemato/gemato-13.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
diff --git a/app-portage/gemato/gemato-13.0.ebuild b/app-portage/gemato/gemato-13.0.ebuild
deleted file mode 100644
index c47ad1f06cc7..000000000000
--- a/app-portage/gemato/gemato-13.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		insinto /usr/share/gemato
-		doins utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 2a955da4d7dc..d58dc34eb2e5 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -38,7 +38,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	if use tools; then
-		insinto /usr/share/gemato
-		doins utils/*.{bash,py}
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
 	fi
 }
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index a02ea6934f33..cedfbd94fdc1 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -2,9 +2,9 @@ DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B c2a45971f1f25e3008422b63b59042ca0f2
 DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56
 DIST gentoolkit-0.4.1.tar.gz 3214527 BLAKE2B 1c6be826a099ba4d18ac8fa0bb38808cbf30ee1d93d26c26965d7fa332e6a87f8eee475126f56d68e2a1c0ff04f258f79f5684551b2fe5947d8ac6f6ff3e7079 SHA512 52b665e19dd8b871f4238d05d40a071d69ef114f36b589c29f46686b1439997e72f58896bb4f330ab256af6000a9559426c78cae08640e54b74db343b3b22945
 DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
-EBUILD gentoolkit-0.3.3.ebuild 2190 BLAKE2B 14e659c8159365d4d1317952cff7241f5629571b7264018b082dd4aee393a4414b3d97b101f26a252a3dfd8f372e2711c9857033e5e0c68f675cf33996104b0b SHA512 6f95f1af8e2ae139ef6058b3798f75e331890bc05efb8abb4cc3c0e4014176424a424e9663f748f3cbae510186d8a7dce1b9d11e0813aa5e65ac9e4ee6d3aaa8
+EBUILD gentoolkit-0.3.3.ebuild 2187 BLAKE2B 21cfa614cef616b3f6326cde3fb52d1cf0a21a0b1e1201d27ac358c3fda79d08cfa4857ecfcf0b5f70c3d152855cab59f131a14d1e6327299d74b23f3085819e SHA512 76d206fb0c32e075cd4fef87ff8c4497f1f566b8ee5de07bbc5608f32c42777308619d13fb179081726920a59480010e9b53c4bf178f4e335017bcbe0cd35885
 EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca
 EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726
-EBUILD gentoolkit-0.4.2-r1.ebuild 2211 BLAKE2B 7b0980db11f7911a9706cd3d9863922d02155d2d6cb03c8059e1c32c36e164aa123af00bf78869c422c63a53eed762fbb448f40b4de8c26a588b041e2b006fd2 SHA512 3cbdd9ca5f0874bb2f8c6baf8561e57f9785314e3ca458965499c64f8d5ea4a77e3355e536f63dbc5b87679365a86742b41b4bafc98715055f068cbac5758814
+EBUILD gentoolkit-0.4.2-r1.ebuild 2206 BLAKE2B 7bf64e1730af382efcd97bcc36fe182c166ed706f773f0470bc2dff4f73eaffa39a5ab932ec78421dd4c3ce45bc8669ea8bc4fbb6d27938dad43654353f7b517 SHA512 32e06caad05b2b9c257e162478380f578bb94b1653f992b21bdf63a0ed0ec9630d48ff58a59902e7336a93aaa2f3449a049537fc39a40d84373898dfedf067e8
 EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
index c57b96514b09..9ab493835d3f 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-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"
 
 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index 216bc958bd03..4d29aa18c6b4 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-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"
 
 DEPEND="
 	|| (
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 850b3a8fb807..44630ad4f2d3 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -5,7 +5,7 @@ DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bf
 DIST portage-utils-0.70.tar.xz 551192 BLAKE2B ca15637ee6532eebd3a064559bb933aad3042c19994e5dcb8234249312dac139288e4ed38f9c2b46ce1921d97398485bb7276ccf285b2f97df3889a2c91f4d9f SHA512 de3d0813a2e71ca93722828b9b8ee8211e7d5383b81a8ae343624e98618522c0d56945422ae6fadbe0694c4b0f381aa0047eb28bfa7e63e0d95c468e3e2934ab
 DIST portage-utils-0.71.tar.xz 555156 BLAKE2B 504973b242f54824ae1f4b135dc1e1021ed0ca6a59d04ef39161255dbebdb7f8870455954ba02987c04c50f6963e7f6c460c4440b2c5ce456b9c489296979e48 SHA512 b9bf4156a1060fec56f9b6348d2d8e83b507a8bff2c507e07bc1c84075082b184d270ca0f89e0f4abf738ce9e8cb8b1f45a211d2dc52cadbdb0ee5d658bf678f
 EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
-EBUILD portage-utils-0.64.ebuild 1308 BLAKE2B cd497cc22dbda169a006b1a14e5264eacd5594ae35d48511e8d605d48d96135f5a3dab037955bbc8b634ac68982d29b31398d7302d8989cab365150400d72fb2 SHA512 f99299e75aa903edcf4e556671ad2653f5d430b1b84e6d8404a4bcd889731c0c180ab8451295f4da62f51a36459e83b993072e54753fbb619be124955bce3cf5
+EBUILD portage-utils-0.64.ebuild 1307 BLAKE2B 19f158c23ac15aa0a9138d8f93d3c1bb6bd48ad9b89031f7e5faa4f643a026e87534857d8463db4aeda445566a1434092b0dbbf97ce96cea51d254f57b0c7549 SHA512 b5ec8a9d06cd50db047d5b758a328c7dbb31690de8f1b7368358bb700bca94f6b22bd32fa79a9f52d76f4a62182cd0cb148fa02418277f398e362b44e50ba7f1
 EBUILD portage-utils-0.70.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
 EBUILD portage-utils-0.71.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index ac15d58a075a..c717ab078c5e 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 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="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/prefix-chain-setup/Manifest b/app-portage/prefix-chain-setup/Manifest
index 1001c4e6bde0..3f43c3d7242c 100644
--- a/app-portage/prefix-chain-setup/Manifest
+++ b/app-portage/prefix-chain-setup/Manifest
@@ -1,4 +1,3 @@
-EBUILD prefix-chain-setup-0.5.ebuild 6100 BLAKE2B 510539b5ece6329716c9a5c71fb0e03ad62577c75102e4354eaf88da839e6c0cbc24300241345a5a4635fceba56551011843c1c4fe01860af3034e28e1ef5909 SHA512 3e9251e974ccddfbeb4f4bb4fd408fff566fdb02b3a48fc61d60c745eba80324500d113c685fcf072e496ac871b4d2b8d89c8d99e80d0d27e752e3ab73e1ab07
 EBUILD prefix-chain-setup-0.6.ebuild 6123 BLAKE2B 57a80f622d81f428304a4c2f06aaf719042eca5269dea2f806219bb8fadbfc25fa00d3f8ab4c6fbfe0096e4290313c1a38b6278874ed6acd87d016402038ecc0 SHA512 300c8ad213b746d5c62d07bbb918c6a3370184221d57b5dd3b19ea475c00aa22a7e0acf75cf40b8eab04e71e1fb58562c073964e7c77b747860c947cba15d602
 EBUILD prefix-chain-setup-0.7.ebuild 6610 BLAKE2B e5b50102a64ec9e70ba8c9a3f3ac63e94738aaffd9390978a4d2def8446a52cea5fb9367109a8fbfbb1a95c5f7390447907ebdbc856714cf81f8d2ab79df00b8 SHA512 ee6013082cf657586aeac0261f7cab46bfff1b66190f70cc0b3cc842d7803ae246d25b41c18a0f94954c48d8da6ba51bf04174418b81ad43567c4f9ee1e200ba
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-portage/prefix-chain-setup/prefix-chain-setup-0.5.ebuild b/app-portage/prefix-chain-setup/prefix-chain-setup-0.5.ebuild
deleted file mode 100644
index a078612d6aad..000000000000
--- a/app-portage/prefix-chain-setup/prefix-chain-setup-0.5.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit prefix
-
-DESCRIPTION="Chained EPREFIX bootstrapping utility"
-HOMEPAGE="https://dev.gentoo.org/~mduft"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	eprefixify ${PN}
-	sed -e "s,@GENTOO_PORTAGE_CHOST@,${CHOST}," -i ${PN}
-	dobin ${PN}
-}
-
-src_unpack() {
-	{ cat > "${PN}" || die; } <<'EOF'
-#!/usr/bin/env bash
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-DO_MINIMAL=no
-DO_SOURCES=no
-PORT_TMPDIR=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]]; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]]; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
-	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
-	--sources)		DO_SOURCES=yes						;;
-	--portage-tmpdir=*)	PORT_TMPDIR="${arg#--portage-tmpdir=}" ;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create chained to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		einfo "  --sources              inherit 'source' statements from the parent make.conf"
-		einfo "  --portage-tmpdir=DIR   use DIR as portage temporary directory."
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-if test -n "${PORT_TMPDIR}"; then
-	if ! test -d "${PORT_TMPDIR}"; then
-		einfo "creating temporary directory ${PORT_TMPDIR}"
-		mkdir -p "${PORT_TMPDIR}"
-	fi
-fi
-
-einfo "creating chained prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage
-	mkdir -p "${CHILD_EPREFIX}"/var/log
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
-	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo "USE=\"prefix-chaining\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "#"
-	echo "# Below comes the chained-prefix setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "# by default, only DEPEND is inherited from the parent in"
-	echo "# the chain. if you want more, make it a comma seperated"
-	echo "# list - like this: DEPEND,RDEPEND,PDEPEN - which would the"
-	echo "# all that is possible"
-	echo "#"
-	echo "PORTDIR=\"$(portageq envvar PORTDIR)\""
-	echo "SYNC=\"$(portageq envvar SYNC || true)\""
-	if test -z "${PORT_TMPDIR}"; then
-		case "${CHILD_PROFILE}" in
-		*winnt*)	echo "PORTAGE_TMPDIR=/var/tmp" ;;
-		*)			echo "PORTAGE_TMPDIR=\"${CHILD_EPREFIX}/var/tmp\"" ;;
-		esac
-	else
-		echo "PORTAGE_TMPDIR=\"${PORT_TMPDIR}\""
-	fi
-	echo "READONLY_EPREFIX=\"${PARENT_EPREFIX}:DEPEND\""
-
-	if test "${DO_SOURCES}" == "yes"; then
-		# don't fail if nothing found
-		for f in /etc/portage/make.conf /etc/make.conf; do
-			if [[ -r ${PARENT_EPREFIX}${f} ]]; then
-				egrep "^source .*" "${PARENT_EPREFIX}${f}" 2>/dev/null || true
-				break;
-			fi
-		done
-	fi
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	# this -pv is there to avoid the global update output, which is
-	# there on the first emerge run. (thus, just cosmetics).
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -p1qO baselayout-prefix > /dev/null 2>&1
-
-	set -e
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO gentoo-functions baselayout-prefix prefix-chain-utils
-
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss that
-	# ability, but interix binaries don't.
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" CHOST="${PARENT_CHOST}" emerge -1qO gcc-config
-
-	# select the chain wrapper profile from gcc-config
-	env -i "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-
-	# do this _AFTER_ selecting the correct compiler!
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO libtool
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOF
-}
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index c41b00b8cab2..be9884f0c6d7 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,16 +1,10 @@
 AUX repoman-2.3.0-bug-586864.patch 1034 BLAKE2B a2641d1c47907ec6069c490de30aabdcb654fefbff36665899463f2bd4fab343f254ab54038b5756c32b8df9058f270e9ef17c743898bdfec6b65847dae2f443 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e
 DIST repoman-2.3.0-bug-586864.patch 1074 BLAKE2B f29ed4b9b66540bf765cd9bdf46ed10d99845ca141df4ad9701d94d8283343bb2e9101cf44e10ed2dc2dd11d02c5dea68e113f624db82d420dac5e846dd44c59 SHA512 b48112a623a4844e5783f229ee0208f729b99ab46128d19735a76633efee17deb81342b5dc8fa67f4f4f5a851509c04c8d2f2ba2cbd992a9d26e61da4ed5f7e8
 DIST repoman-2.3.0.tar.bz2 75285 BLAKE2B 980fadf2247869358f76f6708117b8a9591763e9cae8fdeed8fe4cbc6915d0fd4473381a0eed99c16fc67394fda996c12b9784b7511ebe07267496e39d683258 SHA512 960c63caed12f7c89d374ecceb39677b62d588bf75cc8da1857641c60310061188f4c2fd7177c93a4e8f20cf00a423426f2a70666320f263158531a618a7ff9c
-DIST repoman-2.3.3.tar.bz2 78045 BLAKE2B 5c2e770af3ba0c93ce24c710fb32e8b9d937ad8dcb75cdd6461721163d012937c14745f248543bd2dafe154b649100aba1cb626c0de3bb47294d053bb19bd3a8 SHA512 17212c19b14817a8a004619dd56ad557457d45919da45edfb27538304e68187fe1104f0b6ccc2b29fa1709645a7a82c75676b118b20d79dc790b0eb2ebf5a2ce
-DIST repoman-2.3.4.tar.bz2 78764 BLAKE2B 0fb6bd75463fe10dd41ab1fcdfd0857341dbe973e796f2f97e636df2c29dd633d7199eb22b4605b34d6e56624ac5a75f4783ff7119c421e2303aacf7adae4877 SHA512 1a434eea6361cc06ba3c27ccd31aa02875af1a577860490f8de666b0160370f09d1c46cea95d577163845e12c5672486b176c0009c32e735e16752d67bf4d96c
 DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3acfd1842854b33fa8c0a64fa636a0b278b4fd3010b7070a7e2f00ae841ea331925ca20175e7c7e571082195d3d1 SHA512 490078d4621073e448d037373617911093bc4c3262961c4da00f201f880069c0b70c019abd86c15954ff0c547b0ea49434ee97cd972c2baff82f7cfed1a987b3
-DIST repoman-2.3.7.tar.bz2 80514 BLAKE2B 9342b5be35523f1eb597c94ad33425fd9f1bc81cf7b48c0194d96d2afc2cc27962e9cfbea14492c5e16856c79ab6429988201b269ef0444c17c6d91c9c11feaa SHA512 9caeb06cfe55e38566154923b785c1e3053722b50d7423241950b73c810781d111848e64815001abe218e6073a96ca462debdc99acc05123987cf4d4be0a0420
 DIST repoman-2.3.9.tar.bz2 86432 BLAKE2B 8b60e9ee2705e8fe5d6ab569120f96ca452327c70b95a3b2fff291d4e5c6e446a5bbfa9256b5b0ed18a4e54662bb1b60f4a1e80a8a0c07d276a42fe756ec30e2 SHA512 7b492db9b46f8ebb681ec7dec6dee4a40ce5f95809d505e8b74058c391d16dacdb0171befad64f0281c0168316fcc9d7ec09c7b37742b87b890593ac610329a7
 EBUILD repoman-2.3.0-r1.ebuild 2512 BLAKE2B b46e14ed46d556e731a348c8dc212ca42d20b0703edfe6322bb9475c1e46cd69ced238b9a567f9b441433a2a2a3ad9c04dddce646427f5ea71d80dcbb8865c1c SHA512 a80325ec9455f6210eaf2af3fee60035dc2dfab7f153fc345e1c034b67238b6de94754493768336ed0b9126ad32dec7ca711ca1200f879dad726e64aa9237da0
-EBUILD repoman-2.3.3.ebuild 2308 BLAKE2B 3137f513fa55c654bc92dd7aedb363ce6e40f1c873923df80a836113fb60ffc387c73605fd5367246634c01e14fe63a52f88949c1949164c3e91fcd8434f449a SHA512 e69402b9ab7776b06b872f3ddfa9a8c62411119ed656bebc572494c964a973ce3906b738e307e3d200e053e7f8b8c7e21ff928457b24623031b4e8b3e156b9c4
-EBUILD repoman-2.3.4.ebuild 1899 BLAKE2B 1dd1adc861a1c22dc4adb3e9fdb4020bbc6f7fb5f6d4d3d325290033bb355afd3bbb4658d6211dd947bb54fdcef3e72677fa35075f8b2338d9042723de289183 SHA512 7ee0da85857483d03cc4ae36539e04d812a40ea771624ac64102217aef868ef4a73ed704ddfe7066a029b03f6cb9c577d3fb458fecc2c5b89cd2fafab0b9bce3
 EBUILD repoman-2.3.6.ebuild 1852 BLAKE2B 778490890dd38fa7ff51d7de8e3ab122a9e58a02515bea423a097d883706bfdbd3bef081c6091e6a671d7e0a26f2ee8cd9b4f2a0f226329cc164fb02f7bb5f96 SHA512 e4df9e66171dcc2ab07a9f3cecaa26a8d8185e0ff4e2291bd134ae83a797c66698804b7c0f1a3557571835b540b2c174133efa12bc2cfc4451130ac29b3dd617
-EBUILD repoman-2.3.7.ebuild 1862 BLAKE2B bd0c4f613dbbeb84cf3a1c569a2c74c305ffb36405fe8bd41c1fa4a5e40405b9bff1a229cdd9b37f49038e665dbda30703eecc0921515c127d453fe3824abf24 SHA512 5de4e00951885ec5817b650bbe073907cf553e82b4f681df68e237f387a941203807a2a9ca36ebf4d3dd15aa45afbaf1583dd8039ac7b09164e627f263f3f1b0
-EBUILD repoman-2.3.9.ebuild 2116 BLAKE2B 437b2ccbcef4e74de5cc2949a0c2f8d06e3988f7036dcc36b6bdf61793ac69ee8f530bd2f8c0a2f7ea2fb15cdb95c750f1cd40cb4c71f8f34840e21473af3cb0 SHA512 788e5790c3fec83c8a49fae11d544132c004862a3db67f640c891f13a0f8f531b4d94b23a0d9e13edf958eaf69297bec920a8108aeb60c9b51d3175323f709ef
+EBUILD repoman-2.3.9.ebuild 2118 BLAKE2B 1ca69517003e05e9d95754bc0e826325e5d8cb8d951b0e82d28a5e3d9bf537ab4be7d982600ddbda266d26edcf167e767a60d83215cc7cf8a42fecf5a3fe28f7 SHA512 b651efc57c66491dfcaba232beacf20b741e522f3ad344cbf3aa1ba49141b4e42abc8a011718cb91c4c26ffe60fce1a5dbe3648f52677364931293e70a4d81f1
 EBUILD repoman-9999.ebuild 1936 BLAKE2B ff54893cab6ea28fb8f394d75ca95a4662cfb83efe3b8d9596b039a0cbd433f24d53df89475959d6ede55f091e73f82768daa8de03473820bc386d997d4793f0 SHA512 9de9e9c7541e6b9f97ff58b90165f77211b82df8b4bc5d477e0337d4996573b0a839c3af867e5524b885739d5e9f9635a886436d1cac201fe59fd14550b2a321
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.3.ebuild b/app-portage/repoman/repoman-2.3.3.ebuild
deleted file mode 100644
index 48a87eaab631..000000000000
--- a/app-portage/repoman/repoman-2.3.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.4.ebuild b/app-portage/repoman/repoman-2.3.4.ebuild
deleted file mode 100644
index fe4db4aac408..000000000000
--- a/app-portage/repoman/repoman-2.3.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.7.ebuild b/app-portage/repoman/repoman-2.3.7.ebuild
deleted file mode 100644
index 51f20a852af7..000000000000
--- a/app-portage/repoman/repoman-2.3.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.25[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.9.ebuild b/app-portage/repoman/repoman-2.3.9.ebuild
index 4e4e2bd93b41..12fd300f088c 100644
--- a/app-portage/repoman/repoman-2.3.9.ebuild
+++ b/app-portage/repoman/repoman-2.3.9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index e90173a37dce..90d9a1b2952c 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 832aaec73930..88549d4123fa 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -357,6 +357,10 @@ DIST bash44-016 2069 BLAKE2B 5ac613c450d018edff4f82740655ed0e460e49b57ce1a817f0b
 DIST bash44-017 1143 BLAKE2B 64da515637109cd87b95e5f55857f25c2758b4a5c2620cd21250287e00767d5ca7a14fe331603cdef1ba02f622d97ee120bc0bfba463bccb113f16ebee56159f SHA512 c1d50aee953427ba0b95e48c10d2324e7413f3354ff65b9c3c1dfd14eedec55e619fcd12353e7b99b6e280f510e04d1c971b309c1a4efb97d48ddb30d69f14ac
 DIST bash44-018 1319 BLAKE2B abfd87f2cb5e9aeb0352bb0efbfd3ad95cbb26445e09edaa762cf1ea1fa01a00ab57c96d912ae5eaf653b66169bc54bba39fdf1d62ad45301c6599d21979ff14 SHA512 008ff44dbf916414d691c29cee29e7f636bbe79170463d76ef16ca63ecdc24a84ff4476078c28fb8788d9b1fb0572612a7e8cb30fceb55ad650f293db8361ad1
 DIST bash44-019 1671 BLAKE2B 3d917b1c2618b92d7a79d64a8282cda84098d7d83b8ab3e62c49ab259d6976ef953ab1bde98b9d2cd925cfbdff94b5fd5910876e8de85d40466cf5f3ceb377c4 SHA512 59984e221a7a6dbf72bf893b1b7c4a63fea34d6af1208a19f0e9e6cd59a09e4cf51890cb2d31c1502e2a2f644f584417bb59cf02c308d3250d2a98d41b63e893
+DIST bash44-020 5156 BLAKE2B 6f2bba1fe03eb49401af3925420ff5c090d0e7d83010c34e086f5da48fc2078ef649d775b45e3368e73fc1ebdd6f1860b33bf7021898cae158d478aa1dd18bca SHA512 e200fddd717fa33d2c56eb6713031d34891e5ebcd489a65a43ccfebf9728c1609b758ca3dffb1eed4abd3c62c6d7163ce88d8a1bb73b6d07bee99e0409365978
+DIST bash44-021 1810 BLAKE2B ce3f98e31aaa7db402cf2a2e571a72b9b91fad4571b35a5e8f59678485a631acf3885a19ee09ebdc6f79b39dbdafe72cc2cd91bf3c3b31ad7d3a65b5bc4bd9b3 SHA512 43a82d06a17bc30c2579a0944cb68f60bd9e3cddb9fff4a760fbf1f2f5104a99bb69c400cf63231b242c03a4684701455e603d96c9b588f2c69da02570042fec
+DIST bash44-022 1818 BLAKE2B 66c6e5fd33f0649ff886d1fd944cb10a06de06f0724c0cb7343c3afd50034821f1a4eeccbe9bc5c6815ce9bcdfacf5e6a83098fbd3712efc15e870928b3aa80e SHA512 385a0d1bbdff0dffec2a08021a84a5ac3695e44e1a90b0080b82737fc4a9ea924ee59b47fd5e288b69a540f4c976bf9da0db08ee2d20e170c868f802f75785fb
+DIST bash44-023 1557 BLAKE2B 95a21ade7e4be68d66f3862f26b574c5897055822471c8d2801b8e1f866d1d11ddd4000e967b567c3ef7949af8a88ca918ea066d52a67fc5fd4b266135f0dbbb SHA512 442efa78d365a728555ade77cc2f8501aed09f37ae10e1ac647d35299829b63caefbc5c30436d622bfef9300e9d929d7f4fafe85a59df15089881bc987fa12fd
 EBUILD bash-2.05b_p13.ebuild 4613 BLAKE2B c9eae8a532057dab41ca20640f7b85e9f0d8b11eacd84c91b0dc478dcc906cd14976e02b086e2fbc1786661f27ddfce0b8631211461ed77cced2037058e99338 SHA512 f933883acba8f96a5f0390b11650981291c8048211e832a6d3bcc6f41cafe9372380051f804e22958934803c4d8cac83d1bdb604689c313bddeb67446106bff8
 EBUILD bash-3.0_p22.ebuild 4746 BLAKE2B f8840c82f5cfbcf224d1504d3cbadc3eabe015d991a8c41de978562cc0c806b6baed999d085774594deb620dd714fb8d020ccc89d65c3e622745875528b61b57 SHA512 c39a3f5b22a8b462e6b2abf63a13454559b358002e0efb16640fb9caa04cbd9b416640cf25df98b9fdcaaca465bbf083c0687dc08e122c8b965e2761b01b37f6
 EBUILD bash-3.1_p23.ebuild 4427 BLAKE2B baf534ac2cf5a872673b355532b0b9ea8d4836df331f7e50425733815862435ffa44eb9cd95b1dbdd53a29010638b516deb16c8e72a44d5fa135eaea23c34bf5 SHA512 40e91cad8af0682565d4eed7ad2f6184e1624746a8f6ea1ce21bed459e45bcdc8157aa45cc7f89d1ce5c7f1f827707a839bc89a513956b827a50a5e3bc877959
@@ -369,4 +373,5 @@ EBUILD bash-4.4_p12-r1.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59
 EBUILD bash-4.4_p12.ebuild 7161 BLAKE2B a91c473aed8cc403559edb09eecb315ea1cc72d408411190c64f9ccf76b6c841ab4a41d317534bc9cecd13f85a881afe9880b1e83e1ccb28ea82c2e63faa160a SHA512 fbbe64caa19d373008b9bbced1d2b3578e4d3515f5e4e8b05e43ffa167470544af3dd11076876a7dbee299e9948c8a956565cd0e6f38dcdf42bbd5b56fbd1c13
 EBUILD bash-4.4_p18.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
 EBUILD bash-4.4_p19.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
+EBUILD bash-4.4_p23.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p23.ebuild b/app-shells/bash/bash-4.4_p23.ebuild
new file mode 100644
index 000000000000..c11c5b32237a
--- /dev/null
+++ b/app-shells/bash/bash-4.4_p23.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="7.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+	nls? ( virtual/libintl )
+"
+RDEPEND="
+	${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+	!<sys-apps/paludis-0.26.0_alpha5
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-curses
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED%/}"/etc/skel/.bashrc \
+		"${ED%/}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index e49699840b90..f1844491d53c 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,5 @@
 DIST fish-2.6.0.tar.gz 3575346 BLAKE2B 8697dc6e50836d93d0ed22663e86016fec8e567cd4e129ea92008f52da6dd629bf11b70719beabe5c08bd3d7ba43d8017441f103d49a82c0faec3bc749e83764 SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 EBUILD fish-2.6.0.ebuild 2089 BLAKE2B 93e47993b0fbf6efad4f3a3e8bd961e9975285c7fe4b46d54d9d65646f92a3f3079cb220150b930675863a334bcb0c096c5a860d45d7de7e1d0a4ef95a9f31f8 SHA512 f4aa8a54f89a8d5bb0a41dba319f75a713ce52681ca1631b06d96e39f4b52f5f5c441ea7420a3e3ea4049e82aef7dc562bfe45955d51644b8abc6c668633fd88
-EBUILD fish-2.7.1.ebuild 2156 BLAKE2B 56438cf7613d8ce7a12d1388874c8ff5885017006e3e7224d9113b6c570ec3870e641e058e4f47514bb07f03d10b2b87e3a6fe1cf1427cf3915d1b5fa89b5fe5 SHA512 8796b05552790f937a9b62beb436bf59fd587e9f70138bba72f2fc7fb1d9890f5acf62a86c57274910e0edc1749df70c141a8b94cc5c32ed1c9902f7c8570028
+EBUILD fish-2.7.1.ebuild 2163 BLAKE2B 4dd296054fa3fd0830a94906d881fd57ae735951b089b340b25b4347cf5ac8e2c8989e10bd3bb7dd0ab1a838319d53beeab85fd46a5a7b2aca54635b2be09e5f SHA512 2f646f6a7ed16b33a474c99227d55dd7035fe97a9cb944570af2eca8d1a4041d2b64fbbaa633609d91a6c92f4cecf5e31edb8ee23785228eb1eacda86ab1a4c1
 MISC metadata.xml 733 BLAKE2B 5397b2e1714a6089ff4c263025499d5231a179946a913db582309b52aff118a3a853399107da99f2469ad3fa80b1b9129a4eeaa5293b4430b0f08abbe1f48f75 SHA512 92cba131da5b8684008868f6fcecc62b91ede3ea2271ae2af5e501728b90c63a0227743d59e255ba16dc0d4ef2d8ac70b702be184db6f91ba4b335ce04be3be6
diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index d69c93f70246..657ee7b3e84c 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/$
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_* ]] || \
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="nls test"
 
 RDEPEND="
diff --git a/app-shells/mpv-bash-completion/Manifest b/app-shells/mpv-bash-completion/Manifest
index 2ecbe5dd891b..871a40d76257 100644
--- a/app-shells/mpv-bash-completion/Manifest
+++ b/app-shells/mpv-bash-completion/Manifest
@@ -1,3 +1,5 @@
 DIST mpv-bash-completion-3.3.16.tar.gz 20125 BLAKE2B 1350445ea05474e553ade334c1f11e97828df11143021920a25787a295d6e870595e35dda6ccd048ed4e01e0e85443a5902893fed1aa1525e875649a93ef632d SHA512 d962cc911d571b0345ddee22ecae6faef307f2da44642d6db5223fb0e51d2b2087b038e1964cf8f1ed683bb95a3268a8ffc1fff2759561100b23921406a0e31f
+DIST mpv-bash-completion-3.3.17.tar.gz 20873 BLAKE2B 5e44b315a4f148c27768a3b0c29d609b679e3d489dd79803795a75a9289816ed13797cc04c748410ba3302a2619dedad21772f2d914b2c3ff5c73189e4e348df SHA512 a0b1ae4b07bd3e5fc95fea135aa5391d0efb0d2c1e4ccbb712cf0911b9e07b23a7bfb27d43b615988610f545f1bc62226998295573480ab657e3b18966d48991
 EBUILD mpv-bash-completion-3.3.16.ebuild 1120 BLAKE2B d0f980a20b970ba099c0d06ded70aab17730eb127a65649f603a66a45bd17381299bfcf2c21effd2eeb5a318245400a54dc0fa9719782164e23ae1b700870c68 SHA512 f57a73c90eb63618b9690ef7a79346db3f1ffc8778a2fa4040470567073ed7ab38622e21201c188dac57ec646a722ae64b30555c8e66f7e6de856e6047c0bb57
+EBUILD mpv-bash-completion-3.3.17.ebuild 1122 BLAKE2B c0d40d8b06256e52105994764f91e2ad852e4ab0df58e6942bbe067d44c79d8b2bec4df093b40e4afa7f314a896722f9e089f6c611c4d4eaa2646b9ace819c8b SHA512 8a0cf0749c3cb61bf9e5ac3bbc67e9036dfbb400455d3a3ea0e55a07b1c66ec3f68a2331ede97e41ec5f900db68aa2a9d7434ef48cd3ce0d9c0e8ea330395eed
 MISC metadata.xml 533 BLAKE2B f2896156a0988c66549245ff93ebb7599d006b41cb1731d0e7bc720a62680575feb02cfd8b0d1eb35a9472308a31711f9731a9dd41c7d5da673050c7a8994f8d SHA512 6ecdf8effd7f09950473e954cb401c848f46a93ae8b7f0c9ba601fa9e11bfb75114f32fa13e1a77d4dc2d19377ae35a61493cf4cedcb359ea319e02df8538ebc
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild
new file mode 100644
index 000000000000..2aca0b8cc661
--- /dev/null
+++ b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Bash completion for the mpv video player"
+HOMEPAGE="https://2ion.github.io/mpv-bash-completion/"
+SRC_URI="https://github.com/2ion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit"
+
+COMMON_DEPEND=">=media-video/mpv-0.25.0[cli]"
+RDEPEND="${COMMON_DEPEND}
+	>=app-shells/bash-completion-2.3-r1
+"
+DEPEND="${COMMON_DEPEND}
+	!luajit? ( dev-lang/lua:* )
+	luajit? ( dev-lang/luajit:2 )
+"
+
+src_prepare() {
+	default_src_prepare
+	# Avoid 'mpv' make target that supports lua only.
+	sed -i -e 's|check: mpv|check:|' Makefile || die
+}
+
+src_compile() {
+	# Prevent access violations from completion generation.
+	# See Gentoo bug 656086.
+	addpredict /dev/dri
+
+	$(usex luajit 'luajit' 'lua') gen.lua > mpv || die
+}
+
+src_install() {
+	dobashcomp mpv
+	einstalldocs
+}
+
+pkg_postinst() {
+	if ! has_version 'x11-apps/xrandr'; then
+		elog
+		elog "If you want completion of window sizes, please install 'x11-apps/xrandr'."
+		elog
+	fi
+}
diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index 50c066fb8046..407dc48281bf 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,6 +1,4 @@
 AUX pdsh-2.18-unbundle-libtool.patch 1738 BLAKE2B dff39459032013b770cfab19407475c06b246369092aac77c071f0654f89f9874f1883068542a606b88cc83fd735ec4091c4f9b6b0ce6c1df677b1ec6fe346ba SHA512 e36e284cc9fde9cedc9d2daac31dd1c272c306b1b84d2ee6a55430ad755ced23d6bd5e5a50bf4f6621fcebe96cb105cf49e70c6d4c5cf5913deb66ba0d86491f
-DIST pdsh-2.18.tar.bz2 453729 BLAKE2B 1907bd8a368d062a356b513ac50696f5f9fbe52253470005f9690d886ae3b93e76cb66f517a40a4c5f1aa01190624da078d132a82a5285b66b3e9bc8f528b5f4 SHA512 20cd9be5fc38add69f61620f528dd952296615ef099d6288be2ce908ab04cc7a9585387d93936462a1fb577aa6495789ae201f838131623d8f4f01bf904f7b5a
 DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
-EBUILD pdsh-2.18-r1.ebuild 1609 BLAKE2B 5c5f0b9c57bae957a771330b3012e8e274ee7039ed8c691cefc197c81cf2318bee27813da5d71e769dc2774259a533fd0ff193689337500762c68be2db431501 SHA512 0c114901331e290ce61c60a7519672d62a572ee804573b702c2869a3972ad57842fbd5ac2ce12113aec1f8555346b21a8ae953f55cc3ae45ef58e9cbad64204c
-EBUILD pdsh-2.26-r1.ebuild 1289 BLAKE2B da484e8208f7f5ff2846f796e4594fc5080d46bef9b8acad5a044a173bc9cd0df98cc68a224baa2efdf28260f3631fe6d0d30dd6a931b2c3ba0e22edaa67091d SHA512 8bd15e08c9839a647311db418fbc2cdd47551bac3527fb42e7a63cb1ff8f681c45885c98f5c47341bf10c10bd6778c2e5877e51f1671b7c81e5c4eae7c264bc5
+EBUILD pdsh-2.26-r1.ebuild 1287 BLAKE2B 4acd78fedf0a8ec33a223502d0c93d0038d912ddea66fa0513a018f2e8ca3a437c17566feee8c63f3cd527a50c2b1968354c7940764bb3c1e49366f5411c266e SHA512 5af633bc908bb1176ffbe79c8ca69689807315aac079a0ba80cfedd08bce905ec7dbb2c97e2aab564db47db9a7139459fbfab995624e6b9780388407514ca20a
 MISC metadata.xml 1204 BLAKE2B db664f8622eaf0976ab1899583abab0268758d2edcdf0dd038ef59f54f1cf86c30956aa9cac35fa1a28a6760196050da01cfdbfcb56742aa233075aaa77a4eed SHA512 abaa972d578e11c47d16497fecbf7d72a07915b0b57c7f6458f82b0a36b55575b2d94a43f6f6a71a925a0e4ed56346056f9bc1d939a4190f2c899fcf58c9c752
diff --git a/app-shells/pdsh/pdsh-2.18-r1.ebuild b/app-shells/pdsh/pdsh-2.18-r1.ebuild
deleted file mode 100644
index 3ac352ca84ae..000000000000
--- a/app-shells/pdsh/pdsh-2.18-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A high-performance, parallel remote shell utility"
-HOMEPAGE="https://computing.llnl.gov/linux/pdsh.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="crypt readline rsh"
-RDEPEND="crypt? ( net-misc/openssh )
-	rsh? ( net-misc/netkit-rsh )
-	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}"
-
-# Feel free to debug the test suite.  Running the tests
-# by hand instead of using pdsh.exp seems to print out
-# what is expected, so the error is most likely in the
-# testsuite itself.
-# You'll also need dev-util/dejagnu
-RESTRICT="test"
-
-pkg_setup() {
-	local m
-	local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:"
-
-	PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}"
-	MODULE_CONFIG=""
-	for m in ${PDSH_MODULE_LIST}; do
-		if [[ "${valid_modules}" == *:${m}:* ]]; then
-			MODULE_CONFIG="${MODULE_CONFIG} --with-${m}"
-		fi
-	done
-
-	elog "Building ${PF} with the following modules:"
-	elog "  ${PDSH_MODULE_LIST}"
-	elog "This list can be changed in /etc/portage/make.conf by setting"
-	elog "PDSH_MODULE_LIST=\"module1 module2...\""
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/pdsh-2.18-unbundle-libtool.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf ${MODULE_CONFIG} \
-		--with-machines \
-		$(use_with crypt ssh) \
-		$(use_with rsh) \
-		$(use_with readline) \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-shells/pdsh/pdsh-2.26-r1.ebuild b/app-shells/pdsh/pdsh-2.26-r1.ebuild
index f9e973342634..cd2b214c3640 100644
--- a/app-shells/pdsh/pdsh-2.26-r1.ebuild
+++ b/app-shells/pdsh/pdsh-2.26-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="crypt readline rsh static-libs test"
 
 RDEPEND="
diff --git a/app-shells/yash/Manifest b/app-shells/yash/Manifest
index da5634261398..00594b1d0787 100644
--- a/app-shells/yash/Manifest
+++ b/app-shells/yash/Manifest
@@ -1,3 +1,3 @@
 DIST yash-2.47.tar.gz 1161675 BLAKE2B 8491d5f977b9e23071098016443e8384bc584b8b1160e84b725a2965d032d8b8f5a7ac8b16b1a1e62d808b0543650e0bc42ddc52806c5475a7ca9e26640e84aa SHA512 c9607990a1cf947f9cf294f818d9c6de314dca92a9f106dc65e8d0fdeb6ac91b21a394c711c4b8aabae33b60fc70b72dc9483b6ac48d4e3be3019501ebc26332
-EBUILD yash-2.47.ebuild 733 BLAKE2B 30f2b1de177c23ab1804dc10949bf4c1b7445ff972e372d41658e573dd6645bbebe0b79ff72ce31df924d657f49b9a96b133a10bbc5f5e8e13afa7ac1cb3f2a7 SHA512 b54d6071533e2c378b9799e0d110d434adccdfca735c05d75152654afb72705e577d4380ddf424f25283d9397de2cf54c644b65d8347b0dfc636d934a2fa1feb
+EBUILD yash-2.47.ebuild 733 BLAKE2B 688783dea182e8cb56cd1aa110f83bbab06bf6c7904d73b3a679404a499bce145f62d691b826ab7974ac8f5fa1fba4c76b28821f67ce4dfdc104f9ca6df3cbf5 SHA512 d08d976a08aabe64e96daf90c7e75aea0fb89dab160aa3d2a1922a260e1d91e7a7f672da508abe56c4a02be2bd16707065d41bcf8f3a1bcd426c875439ba5312
 MISC metadata.xml 1043 BLAKE2B a83b4a65aace09de65f4c1f44b99711171ffe1d5abc453f0c616fc02d0dfb63828ca7dc7ca431641c6c87d4aab15c5160802ee534de055e0f53bc0350a4110d5 SHA512 004f1faa56032de6e2f37af8199f165c4394a4f7a3c2e2eebd79254a5155bf429e0e0d1e97e7b025037d7a3fbcf91d14b67e37dbe0313fe1ca38a2a7d56ec9f4
diff --git a/app-shells/yash/yash-2.47.ebuild b/app-shells/yash/yash-2.47.ebuild
index 475398b44422..ae2eee4bca5b 100644
--- a/app-shells/yash/yash-2.47.ebuild
+++ b/app-shells/yash/yash-2.47.ebuild
@@ -7,7 +7,7 @@ PLOCALES="en ja"
 inherit flag-o-matic l10n toolchain-funcs
 
 DESCRIPTION="Yash is a POSIX-compliant command line shell"
-HOMEPAGE="https://yash.osnd.jp/"
+HOMEPAGE="https://yash.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/${PN}/69353/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index e27167392f53..ee50fbfaee94 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,6 +2,7 @@ AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0
 AUX zprofile-1 1663 BLAKE2B aef86216bd8436fc550e4b440cf23fb1367d1ebb158695cb0b9fdd39af89a920995750a65199e8ff327ccd9f7e2efedf8dc42c624c3030617a2f0fec6ee17003 SHA512 d0baf1d4ed78a1d2f4e2bfcf5f038fbf6fe39d61e4ae3bfda0f6c073bf43260143a9b674935e4cf1436006450f641e22823ce853cfef774cd89f1912691c853f
 AUX zprofile-2 1555 BLAKE2B bcbc98b7d40f3578ae9596b65dea00de029e310a1f85fcaf42ebd751e909cc3b794b992a1e60e995a5676c7df943dcaff9f9d76d4d2e6d02c1f99304ab47a7dd SHA512 cfc0a9a8b0c01a9c87d02216800b7245bfd98ea5f43cefdd30c902d4bd2318c9b6f7f1ad299672b693734e7014514fce0fb9c4b1321508305a6d0137ee02d966
 AUX zprofile-3 1130 BLAKE2B cfd0f5bcc9409cb2bd133ad1511356602c110b8f1d106ac16cf3812ea57c818902a7eacb061dabd08fdc8040d6deed088c13304b2176c2488fb886c8d2a2c8bf SHA512 d1059e427450e03d3e638e96ff4f43548cee5a385c4d4f00701023570ef6490b15cd01d738bd97e0e8d003aa7e375c51a80a2b841066c22d0910966a54c2cc2f
+AUX zprofile-4 1297 BLAKE2B 2e4252a7ecbfe8a193bc916f0a5a3337e2de33856fa974e78479a30df6cc29bc86d75d5dca67cb0970642348e32a70e38ffcc55222ea64061aa7bdd08194c61a SHA512 f610937e8fccc88d0ea09e8ffddd365ee3015f04b50f56c2e4f20648e77784e80e4efc2969768b5ed41640acf290ea319306cf57a52aabc3b6917543ff94fd5e
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
 DIST zsh-5.3.1-doc.tar.xz 3161408 BLAKE2B dc14f7b6136b73d5cfe8462fe67e20b92ee04741ad8f8a0f8d40bd1f8658261569722b156a075d7b723f2d38d41fc725e227c995eefebde433ea172399b90210 SHA512 27f9d50094c21a77b36fe3309a9ab81a2ccf6570139b11038bbebe9fff2d0701f0bccf9163f5bf47d51ce7b978df621a4cb9089c33e9179a61636fcc94a9fb9c
 DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B b561629f8641dac70a5b35e12333fb3b214c83ebd90d432c302e8b8e6fb1baa288ec4d32fdb7f917c2f1a845b96a6c676ab4e15a014a8b9474792cb77e2afea0 SHA512 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
@@ -13,7 +14,7 @@ DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b
 DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f
 EBUILD zsh-5.3.1.ebuild 5981 BLAKE2B 7bb0e3b81104e115c0ffc9ac593440b9ab61cf89cc33842a3df467ace612573c1f069a9032a8cc1d58f92f47b64900ce042b23a4273a435ab96cf0cc3ad46c1d SHA512 b1173c76320d9c615793c65fa214320f6ef02cac834233e69d242e01834012ab1b32a886666955bc49720874557cdaf14ac5734bd29c04578bc74e87526e2afa
 EBUILD zsh-5.4.2-r1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58
-EBUILD zsh-5.5.1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58
+EBUILD zsh-5.5.1-r1.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b
 EBUILD zsh-5.5.ebuild 5809 BLAKE2B bc7175e593de89a97c11d613881fe269417b5f2ef9a0cb131292dc3299c45041a87e03572620156723194bb24fbe77245b0fc64bedf6a9c9cea98dfbfb33a0e5 SHA512 5fe29eeafee8b5de30e8a606aa8b6b7950740cd0b1f6852955ff4f4cca30f9cf1be28a74adf760189f9a010334408ab3eddec1243a6faee335296efb39e08ed3
-EBUILD zsh-9999.ebuild 5998 BLAKE2B 265d73cf7284891a347f6ad353d6b1f71fd95b74e0b3234562dc713bbb759efb81862abc68b448338cac6ae76cb3bcfe1d9a2bf16392841f24fd63b617245204 SHA512 8476d8741eae45dd02cb03d6c633d5025aa05ebbf342d2650b21664d23447cf7ff18d15e3dca666553f0e885c33108718cc3859195e5a67bd22087a2e40b25f2
+EBUILD zsh-9999.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4
new file mode 100644
index 000000000000..6402ca718d38
--- /dev/null
+++ b/app-shells/zsh/files/zprofile-4
@@ -0,0 +1,42 @@
+# /etc/zsh/zprofile
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [ -e /etc/profile.env ] ; then
+	. /etc/profile.env
+fi
+
+# You should override these in your ~/.zprofile (or equivalent) for per-user
+# settings.  For system defaults, you can add a new file in /etc/profile.d/.
+export EDITOR=${EDITOR:-/bin/nano}
+export PAGER=${PAGER:-/usr/bin/less}
+
+# 077 would be more secure, but 022 is generally quite realistic
+umask 022
+
+# Set up PATH depending on whether we're root or a normal user.
+# There's no real reason to exclude sbin paths from the normal user,
+# but it can make tab-completion easier when they aren't in the
+# user's PATH to pollute the executable namespace.
+#
+# It is intentional in the following line to use || instead of -o.
+# This way the evaluation can be short-circuited and calling whoami is
+# avoided.
+if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+	# Check to make sure ROOTPATH is sane before we use it.
+	# https://bugs.gentoo.org/656400
+	if [[ :${ROOTPATH}: == *:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:* ]]; then
+		PATH="${ROOTPATH}"
+	fi
+fi
+export PATH
+unset ROOTPATH
+
+shopts=$-
+setopt nullglob
+for sh in /etc/profile.d/*.sh ; do
+	[ -r "$sh" ] && . "$sh"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/zsh-5.5.1-r1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild
new file mode 100644
index 000000000000..9f6dc303d882
--- /dev/null
+++ b/app-shells/zsh/zsh-5.5.1-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
+		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0=
+	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	!<sys-apps/baselayout-2.4.1
+"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+if [[ ${PV} == 9999* ]] ; then
+	DEPEND+=" app-text/yodl
+		doc? (
+			sys-apps/texinfo
+			app-text/texi2html
+			virtual/latex-base
+		)"
+fi
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# fix zshall problem with soelim
+		ln -s Doc man1 || die
+		mv Doc/zshall.1 Doc/zshall.1.soelim || die
+		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+
+		# add openrc specific options for init.d completion
+		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+	fi
+
+	eapply_user
+
+	if [[ ${PV} == 9999* ]] ; then
+		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-etcdir="${EPREFIX}"/etc/zsh
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+		--enable-function-subdirs
+		--with-tcsetpgrp
+		$(use_enable maildir maildir-support)
+		$(use_enable pcre)
+		$(use_enable caps cap)
+		$(use_enable unicode multibyte)
+		$(use_enable gdbm )
+	)
+
+	if use static ; then
+		myconf+=( --disable-dynamic )
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=(
+			--enable-zsh-debug
+			--enable-zsh-mem-debug
+			--enable-zsh-mem-warning
+			--enable-zsh-secure-free
+			--enable-zsh-hash-debug
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --enable-libs=-liconv )
+		append-ldflags -Wl,-x
+	fi
+
+	econf "${myconf[@]}"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			-i "${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_compile() {
+	default
+
+	if [[ ${PV} == 9999* ]] && use doc ; then
+		emake -C Doc everything
+	fi
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install $(usex doc "install.info" "")
+
+	insinto /etc/zsh
+	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
+	newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	local i
+
+	# install miscellaneous scripts (bug #54520)
+	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+		-i {Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/${PV%_*}/${i}
+		doins ${i}/*
+	done
+
+	# install header files (bug #538684)
+	insinto /usr/include/zsh
+	doins config.h Src/*.epro
+	for i in Src/{zsh.mdh,*.h} ; do
+		sed -e 's@\.\./config\.h@config.h@' \
+			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+			-i "${i}"
+		doins "${i}"
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		docinto html
+		dodoc Doc/*.html
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you want to enable Portage completions and Gentoo prompt,"
+		elog "emerge app-shells/gentoo-zsh-completions and add"
+		elog "	autoload -U compinit promptinit"
+		elog "	compinit"
+		elog "	promptinit; prompt gentoo"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Also, if you want to enable cache for the completions, add"
+		elog "	zstyle ':completion::complete:*' use-cache 1"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Note that a system zprofile startup file is installed. This will override"
+		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
+		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
+		elog "or other user startup files that are sourced after the system zprofile."
+		echo
+		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
+		elog "one method is to use a separate path-setting file that is conditionally sourced"
+		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
+		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
+		echo
+		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
+		echo
+	fi
+}
diff --git a/app-shells/zsh/zsh-5.5.1.ebuild b/app-shells/zsh/zsh-5.5.1.ebuild
deleted file mode 100644
index 4c17da09db4a..000000000000
--- a/app-shells/zsh/zsh-5.5.1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
-		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
-fi
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="https://www.zsh.org/"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:0=
-	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
-	caps? ( sys-libs/libcap )
-	pcre? (
-		>=dev-libs/libpcre-3.9
-		static? ( >=dev-libs/libpcre-3.9[static-libs] )
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	!<sys-apps/baselayout-2.4.1
-"
-DEPEND="sys-apps/groff
-	${RDEPEND}"
-PDEPEND="
-	examples? ( app-doc/zsh-lovers )
-"
-if [[ ${PV} == 9999* ]] ; then
-	DEPEND+=" app-text/yodl
-		doc? (
-			sys-apps/texinfo
-			app-text/texi2html
-			virtual/latex-base
-		)"
-fi
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# fix zshall problem with soelim
-		ln -s Doc man1 || die
-		mv Doc/zshall.1 Doc/zshall.1.soelim || die
-		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
-
-		# add openrc specific options for init.d completion
-		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
-	fi
-
-	eapply_user
-
-	if [[ ${PV} == 9999* ]] ; then
-		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-etcdir="${EPREFIX}"/etc/zsh
-		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
-		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
-		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
-		--enable-function-subdirs
-		--with-tcsetpgrp
-		$(use_enable maildir maildir-support)
-		$(use_enable pcre)
-		$(use_enable caps cap)
-		$(use_enable unicode multibyte)
-		$(use_enable gdbm )
-	)
-
-	if use static ; then
-		myconf+=( --disable-dynamic )
-		append-ldflags -static
-	fi
-	if use debug ; then
-		myconf+=(
-			--enable-zsh-debug
-			--enable-zsh-mem-debug
-			--enable-zsh-mem-warning
-			--enable-zsh-secure-free
-			--enable-zsh-hash-debug
-		)
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --enable-libs=-liconv )
-		append-ldflags -Wl,-x
-	fi
-
-	econf "${myconf[@]}"
-
-	if use static ; then
-		# compile all modules statically, see Bug #27392
-		# removed cap and curses because linking failes
-		sed -e "s,link=no,link=static,g" \
-			-e "/^name=zsh\/cap/s,link=static,link=no," \
-			-e "/^name=zsh\/curses/s,link=static,link=no," \
-			-i "${S}"/config.modules || die
-		if ! use gdbm ; then
-			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
-				"${S}"/config.modules || die
-		fi
-	fi
-}
-
-src_compile() {
-	default
-
-	if [[ ${PV} == 9999* ]] && use doc ; then
-		emake -C Doc everything
-	fi
-}
-
-src_test() {
-	addpredict /dev/ptmx
-	local i
-	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
-		rm "${S}"/Test/${i} || die
-	done
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install $(usex doc "install.info" "")
-
-	insinto /etc/zsh
-	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
-	newins "$(prefixify_ro "${FILESDIR}"/zprofile-3)" zprofile
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
-
-	local i
-
-	# install miscellaneous scripts (bug #54520)
-	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
-		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
-		-i {Util,Misc}/* || die
-	for i in Util Misc ; do
-		insinto /usr/share/zsh/${PV%_*}/${i}
-		doins ${i}/*
-	done
-
-	# install header files (bug #538684)
-	insinto /usr/include/zsh
-	doins config.h Src/*.epro
-	for i in Src/{zsh.mdh,*.h} ; do
-		sed -e 's@\.\./config\.h@config.h@' \
-			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
-			-i "${i}"
-		doins "${i}"
-	done
-
-	dodoc ChangeLog* META-FAQ NEWS README config.modules
-
-	if use doc ; then
-		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
-		docinto html
-		dodoc Doc/*.html
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh.{dvi,pdf}
-		popd >/dev/null
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you want to enable Portage completions and Gentoo prompt,"
-		elog "emerge app-shells/gentoo-zsh-completions and add"
-		elog "	autoload -U compinit promptinit"
-		elog "	compinit"
-		elog "	promptinit; prompt gentoo"
-		elog "to your ~/.zshrc"
-		echo
-		elog "Also, if you want to enable cache for the completions, add"
-		elog "	zstyle ':completion::complete:*' use-cache 1"
-		elog "to your ~/.zshrc"
-		echo
-		elog "Note that a system zprofile startup file is installed. This will override"
-		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
-		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
-		elog "or other user startup files that are sourced after the system zprofile."
-		echo
-		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
-		elog "one method is to use a separate path-setting file that is conditionally sourced"
-		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
-		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
-		echo
-		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
-		echo
-	fi
-}
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index f53a6be7a4d6..9f6dc303d882 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -57,14 +57,6 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
 	fi
 
-	cp "${FILESDIR}"/zprofile-2 "${T}"/zprofile || die
-	eprefixify "${T}"/zprofile || die
-	if use prefix ; then
-		sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
-	else
-		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
-	fi
-
 	eapply_user
 
 	if [[ ${PV} == 9999* ]] ; then
@@ -146,7 +138,8 @@ src_install() {
 	emake DESTDIR="${D}" install $(usex doc "install.info" "")
 
 	insinto /etc/zsh
-	doins "${T}"/zprofile
+	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
+	newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
 
 	keepdir /usr/share/zsh/site-functions
 	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 04ebb3a65cc6..b2a6e6297f7c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 125139e60797..b57c3ea7e4c2 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,5 +4,5 @@ AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbd
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-EBUILD aspell-0.60.7_rc1.ebuild 2691 BLAKE2B a55a61b5cffba91ec4092cc24d06d52393eaa7eaf6bcf613c227cb290ff756f82b064eeb8a2b968b5b69249edb74e39b00151016b4dba6114cf6e706cf9883fb SHA512 8b8333ac2337dacaf27b4c4757c74f4e0216287aed64f50c0d41401e342c861db1e7c04ea5e42baf46b41084b44fdbece376b2a277a8386716edd47c036ebae8
+EBUILD aspell-0.60.7_rc1.ebuild 2690 BLAKE2B 950e49305ac09a4552c73031d7b280282e0c34f89a210e4f6d43d47a5b3ad362285e80089178b60aee2b8567c71735da26cd01b6ba7156fbddedd58c594b787a SHA512 2a7ee108fb975808dd9c4514c021a87cb40e5fc084f50653ea9acc7bdcdc28b95c38d73a3ce5f44b5a5f35ca77a28ac0c1edbe5abc5bfdc106d9dacffbf1eb07
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
index 47dd47b852f8..eecfee4dcba2 100644
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index d800bbc8021d..d7d10571e22b 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,3 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.21.ebuild 1090 BLAKE2B 353dde30a03468cae9cda862842a51a2a6033f49af44ae071676a218cf95ed3f9fdd805c782ee39225c858ea989d91b2de939ae95a6bf2986ee27a6635e2a22e SHA512 a0e597a8b6cb90257d2820ffa21c42df559fb40270d82be3c1f7b0653692c5cebb9a54bdebd47ddc8e7aa8c2b743812a53f9f8a3d837166e0561af76c13783ed
+EBUILD build-docbook-catalog-1.21.ebuild 1089 BLAKE2B b987992b70a158e6c339de604d65365e1e9f98397c3a84d5222c94412ed9ade8829509791ff42c7150720df96958c3d764494f778a3dabb5dc94d85efc676635 SHA512 b84b885a7e21d66d9f24874e13fbb439e61cde2c705e702af77e1fd52bfc69f4604db8e2c3bc783aead874994348fdbdb1f50d8e53f4c2cb694a7ee865be2de7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index 68f0e171cef7..7b232a82be1c 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 94f661c91796..523f7d578f1d 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,10 +5,6 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 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.8.0.tar.xz 37922608 BLAKE2B 6ae465da15a50f45621753b4f8fdcb978fa3b3cf170575cca0a9e4ae3cd324fbb4b194861180961539f8057ce3650066d7113368dee404d899ed8ca1a58f80e6 SHA512 db7ff5cb0ee82b3237090cbf6a13d13bfa5e27139dd067290ed59d407d2dbbae2ecd3dab338a0beed845079387a051b092233350091ef6ec82623d3a16b1d48d
-EBUILD calibre-2.78.0.ebuild 8462 BLAKE2B c003b08ecf1a556c5e397cd29d1057f4e160ccb87c7e41c4b6b5ed65b4e90f7166c74c7ac2d3b32e19936028a4d9e92684e8100a8a694a8b3056aefe44dde1ea SHA512 ae96524bf61a2b4484229c7b9a04799c904506fa6e2d9160eeae03be80e9840116d6438e0730cde5ed9135822b83abbb32b9f7d07fc4e5e29cf60866cf60a7b7
 EBUILD calibre-3.15.0.ebuild 9288 BLAKE2B cf28b1c8127288117bfaf3454a61a3485c1636cec5c2ab8dd07df47a9b5d3665e0c5a86768e6752ee57d88d24d7eb6cc2c1f78fb46ab53a71db695aec4cfd4da SHA512 fc2c83770465ad21f358b5592da05838527956b9e491ad3f1adead3a575936e5bba5fe1e1153200171ad9aaa3c10e313bd3f5c678614d6e6784651c2d9af33c1
-EBUILD calibre-3.8.0.ebuild 9253 BLAKE2B f95bbd5d45cf38953a903e954533e890ca0d96950d83191c68d6b3adbf999a9b9919b076211305737f4284d54df08eaab3989d3708286c38ebc5fc7735ec702a SHA512 8e29b98ab341e9b3ff5d068364eb46f2a2e6df4af031578df384963bdde16532044a43b9d0c93ad24570abdec80e29354ca498f72afa791c865bb0f25b1c8d6a
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild
deleted file mode 100644
index cfab16f44cea..000000000000
--- a/app-text/calibre/calibre-2.78.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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 bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://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="+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-4.4:=
-	>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.5:=
-	>=media-libs/libwmf-0.2.8
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.8.2
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-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" \
-		"${FILESDIR}/${PN}-2.83.0-lzxd-bounds-error-bug-540596.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(qmc + \\[.*\\.pro'\\])$/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.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.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() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-3.8.0.ebuild b/app-text/calibre/calibre-3.8.0.ebuild
deleted file mode 100644
index 18095fd34d29..000000000000
--- a/app-text/calibre/calibre-3.8.0.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# 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 bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://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-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/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	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/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-misc/shared-mime-info
-	>=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"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-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() {
-	gnome2_icon_savelist
-	# 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
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index 5dd4ee06cd3c..d976735ca438 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -3,6 +3,5 @@ AUX convertlit-1.8-respectflags.patch 840 BLAKE2B cb61c62e453d3bea6287cfa372d52f
 AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f462f6757a4ec04e41360469eacb03badb3b8271a595692f055d10162e591600994be7e4676800e0f8a8feadbbabccbaeb21a SHA512 6f8798a8b54951c15da4f28d4c8103811c4d77ba96eb12a4e19bc35876c148c1247d19ea5b3d60028b156d50d5dbd67ec5254e47a556d195ca8c084bbc571e4d
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
-EBUILD convertlit-1.8-r1.ebuild 890 BLAKE2B ac2ce2273bbf2a05fbc2499ddf6a2216e8e2810dfa212f93a7e5f0796c107eb6ff259ad05e08d300eb3d7054c569615c3abfe5d17f0cd5a7cb84761da689e33d SHA512 61059c578fa28ddd7b3ecbac807f36f7ca2b58d662a233fa80c4645ec81c928011b8c1a4a7a4d53598cf1d76bef42da06d6eb901b713eb70ca04d0632cfefc9b
 EBUILD convertlit-1.8-r3.ebuild 951 BLAKE2B 710d2cea0762a47128c8ab78b49ff4d7d3000d986d83f8a14fc5bd9b7aaf2fc029017f5ee7c546cd9100230a2cade1dc4a885af41af85983747bbe601d892a9b SHA512 b95136ce98aeb00b1bcd455984bcc1f2605afac35364e6b7c17558aac169f99eceee28ac1bf1c755ccde14057a42dbdade005fd8a77e26c876baf0fb00e9c196
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r1.ebuild b/app-text/convertlit/convertlit-1.8-r1.ebuild
deleted file mode 100644
index 30171f29362a..000000000000
--- a/app-text/convertlit/convertlit-1.8-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-MY_P="clit${PV//./}"
-
-DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)"
-HOMEPAGE="http://www.convertlit.com/"
-SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/libtommath-0.36-r1"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-RDEPEND="${RDEPEND}
-	!app-text/open_c-lit"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-respectflags.patch"
-}
-
-src_compile() {
-	tc-export CC
-
-	cd "${S}"/lib
-	emake || die "make lib failed"
-	cd "${S}"/${MY_P}
-	emake || die "make ${MY_P} failed"
-}
-
-src_install() {
-	dobin ${MY_P}/clit || die
-	dodoc README
-}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index ab54894504a0..aef2b66dc99e 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,4 @@
 DIST ghostscript-9.21.tar.xz 29164532 BLAKE2B 275e81e44585e186cdfd9f517d1ac77ec840c62ef01f107f6ec0131546c4a2b526000cbc4ba6a91b55eedb8f3783fbf831059d791ea441a484ce29dd5dd6af0e SHA512 cfea089b92fb01e3f7c18a9ce05e7165fc8b356e2914bf53b7f2fd9de672279c8b97ced07e983e619f0d4334ce16018b100cfbf0cc872c215a8cf2aff4c78731
 DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 BLAKE2B d2bccba582873d29c1724469af66a5aa72755d6ff73bbdadbf33e5eb4a2027c2cf14415319c3c3c6d03a9fbd9bad43e3bf7ef57eb7a3361305f6efb7fa550675 SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355
-EBUILD ghostscript-gpl-9.21.ebuild 5550 BLAKE2B f7af81cc6a38408faeccb9dd87321708d09639c05725ea97beda1da43b9c4847bc8d2131582fd2eff6d4e9fc30b9b3ca535d7fc07a27dc9be603f53bab6ced02 SHA512 2108fdfa94749954f86eb0e303c2da07f6feca991c2e13d95b90ad90e5172b84de6ed9ffe6a722b67f2da5f801e51ebdd4a4e31cb44a8cb2293392ce75056861
+EBUILD ghostscript-gpl-9.21.ebuild 5551 BLAKE2B 99f5358fba87a426588f826555eeb4d025b973cfc902c6353b0c9d8f176db1d9a20e7c704abcd030246d4477a6a58e76081458c2dc71630be88892c040984e81 SHA512 aa490d083fdfc94dbadbf2ed488ee66a0601d57a35d2b6bfc18bfbafa13392fec131b07fa964aadef7296e3d709ec29ad47aa71d5a9fb4d719e6b79fced2d1d4
 MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
index b0391f26d812..d3dfd6871f21 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools multilib versionator flag-o-matic toolchain-funcs
 
 DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
+HOMEPAGE="https://ghostscript.com/"
 
 MY_P=${P/-gpl}
 PVM=$(get_version_component_range 1-2)
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index c0ea49729dae..37bfbb757692 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,5 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
+DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
 EBUILD libepubgen-0.1.0.ebuild 725 BLAKE2B df6c45b50db98bc979374adead89de3e2cb5d7a055b298d6538ce2dea44790b201cef4b437e1af86755ea3bae0c7cd6f8eb4de27f3c610e6db78df4ebf497f4d SHA512 8de1cf0aa61451aa11703e3dadb1fb00a03e3945f4ed2dfb8b4e7fa96f28fd0da2d14124f45e71b5868c72bf62e7488cd63785a4f68c652df618b15f25d43691
+EBUILD libepubgen-0.1.1.ebuild 706 BLAKE2B 00fadb6d869bf4866b3aaaceee60c70284af1ad92e487ec9d382bb329e7ff17e053b5acf22a3aed2494b05bf38498b1037a0e8cd7d0198fecc478e124519dd2c SHA512 b01ef9bedb52c698aa18d64378b41a72f72738cb3f64d1ce8040dc28d193864a1374a92db39f6c85a279eecd271999d163058fb4efc0cb91309628a4214f43e8
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
new file mode 100644
index 000000000000..2fe034fa1608
--- /dev/null
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="EPUB generator for librevenge"
+HOMEPAGE="https://sourceforge.net/projects/libepubgen/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug doc test"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-util/cppunit
+		dev-libs/libxml2:2
+	)
+"
+
+src_configure() {
+	econf \
+		--disable-weffc \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index f2ff03b6122f..789fb821d54d 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,5 +1,7 @@
 DIST master-pdf-editor-4.3.61_qt5.amd64.tar.gz 14950654 BLAKE2B a9dabeecde4a4f8657d29bca61f9ffbc1cb3f4e5f5002afba965a9a444572791a27316257768f3f2b793215f49d538b4ac68b4ae5271e5c1500557ab5cd9a192 SHA512 0c416df191a2796fdafa6014c258166d47037039fcc9205398138a46d59b1f771d9ffe38eb16f22f4300c3e965435300037d7413a86efb997395e6e974baecb5
 DIST master-pdf-editor-4.3.82_qt5.amd64.tar.gz 14934502 BLAKE2B f93c756f9270b2857af02047c6ebd242d35ddaf23b70118d440c21cc7a0718937aa9945bb24adad6544e984f9390e9f49bfce5298bb8bc54f3c705372aff0fd4 SHA512 9bc6b056bdc8ce349dbab139f64c90948f3e0498918f07df6249fee2fad98a35b133aa7913e375366d062e134878feed0fadd097ab1d5504e97884ffa2c37b24
+DIST master-pdf-editor-5.0.15_qt5.amd64.tar.gz 16008649 BLAKE2B ef8fb3a583eb13c0b3c1ecb125e90fc520f6b707cd9d54871eb16ee32b7dea961612e4e0fbb004791edf549dffa18b25e85e61f58024ceeb356b7f968cfd6c6b SHA512 b3f0d3b269b49680bba05c669ad14375710fbb19396c8242caaa564c961660af25c5654f6df2b477272b0a0966c7f46a0221d1792596cccaaf738effbdc369d9
 EBUILD master-pdf-editor-4.3.61.ebuild 1629 BLAKE2B c88f6d22a43d73855583732a4b7c409b2db9af4153e67180b08f7f614458dba1afaef55dbae7f4f0e82f789d7947b801982b36f63f879850c199649934d250b5 SHA512 8c5ac33caf8c69d9a606da47152c84aae104d4b566653003c5e437e5f018a09201a65ffd954f779404bd51cbdce43591e73a6a56867ff1eb3cd1ce6546aa2a9a
 EBUILD master-pdf-editor-4.3.82.ebuild 1457 BLAKE2B 6c12bbe6de844440a5924d0c8b8a417a5ab06c82163316e495da75b97345963d9ff5912b1f8eee42129c631079bd5fa8500a6a935beba441e31d45a4e9f2d287 SHA512 8af3a7995a69b851d0b0e0874d65460fe1e4fa203c7b39db676ed07ec8968a7dd84eeed00e0872216246b893cb6e64f4dce8268cdba022fc7262a25aa684d48b
+EBUILD master-pdf-editor-5.0.15.ebuild 1206 BLAKE2B 6c96819062e25858e9d9ab0edb4d4db7699c22b79b44b7ce47a102467bae4c0c3babfa88eed75355a7faca205f7501ad9aef1dc1a053a0ec74b43a3c1b896b0c SHA512 fcd6190b22638d71ae28b51d5c1247dc114f12ac61228ebb8d8191c68bd37f43b66dcd17bde29ae0fcc8949b2e8087a7f8b491958a2fc81db5005d1ae6c2c62f
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild
new file mode 100644
index 000000000000..6ef28a8e6ba9
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils desktop
+
+DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	>=media-gfx/sane-backends-1.0
+	>=dev-qt/qtsvg-5.4.1:5
+	>=dev-qt/qtnetwork-5.4.1:5
+	>=dev-qt/qtgui-5.4.1:5
+	>=dev-qt/qtprintsupport-5.4.1:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index e84c35915fc6..59cfd3f7d1db 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -9,5 +9,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 492 BLAKE2B f08e967feb9944285d0eb7b257841432ef4a462386c4609908e1fc8678e18fcde72d99d49c7f527f7b4e200c16ce834aa2781f8881f424b1e2b029cb7647d395 SHA512 5485e8bf2a781f87b14cef2e1b054604a1bca554a682d6f064c940df0b2eadaa1103085e56d57ec6b5bf816792be6ef954095c90349d30d1dd0e37faf766fc0d
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r7.ebuild 3681 BLAKE2B 55b6180e1382199f63eedbd24b378b1f95aa7ed6ba30f42e494a5686c7e418688ca0e5ceb0bfb7b2ec494e0a85966b5ed087514be5929aa53aad6f50e7fddd63 SHA512 7120e658a97872fc5d2f486a8d32473d527d1a828a914ce2c66b03ee1f0eff380b8f4c9caba33b79f73cd083e52557ec8da33d0687157b59e2fb461a0136c351
+EBUILD openjade-1.3.2-r7.ebuild 3678 BLAKE2B 477ff1defb0270a6e61b449c896d22b519acbf77f128b53fc45b09a07624cdbec1629e0e79844b9ee732d291323ed2faa772ab66d4e883a63aa5409a6a4e12bd SHA512 5e3678fa85225737b6880bcab51dd64160431cfc6603722a0112735a7cc2220cd98e5c10d05bd1fa9c3967fd8a3a5eb255f0ae20f4671e1b3ac7244f08fc4a34
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
index f82ff6a2224e..15297e079041 100644
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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="static-libs"
 
 RDEPEND="app-text/sgml-common
diff --git a/app-text/pdf2htmlEX/Manifest b/app-text/pdf2htmlEX/Manifest
index 5dabb174a324..edd4586f5f50 100644
--- a/app-text/pdf2htmlEX/Manifest
+++ b/app-text/pdf2htmlEX/Manifest
@@ -1,4 +1,4 @@
 DIST pdf2htmlEX-0.14.6.2.tgz 9066685 BLAKE2B b139f72c806e432facce5472e55a23567e74204829956d06bd9ead0426cbadad4ce36c581fb1d39c96eeef27fb416b2c6387dff7b0ca08b10479de24b8ffdc9b SHA512 03d04437386b2eb83530551ff15ce9d21b7990127fa659d204a269405f0d49912c622687eb6920cc4e88be8e94ab41024b378663effb61d1eda905eeb98093d3
 EBUILD pdf2htmlEX-0.14.6.2.ebuild 1017 BLAKE2B a9dda802e28273f531e35b0cea8b7f23602f48f8dd024d6367841d745edb31c39cd9d284ddae57a0cd101f694cd4fb1f2c82571386cffb5749ce9d01d828e890 SHA512 4a2003bd64ad816714b3df3065ebee4158c6ea885ac997cc2f5de19f55f79f4c10f99c97aabdb1d313a9a95f459876b40a9685a7398bba383813cb7bd2707965
-EBUILD pdf2htmlEX-9999.ebuild 1091 BLAKE2B 717cc446930f6dab311fa32f6fa6667134b283d422e6a2329006155d04e11e00c85bcfffcac1b2d8f08117c9d83184344f3ebe11feaacbc15a5eb98b000d8fc7 SHA512 b23b0dbafe433b2d1edc969d6dc6808b2244919f8e59708d92ebc5d2aa4b0bbc66d8c43ec568a84f788450d6802866ab068c6a57cb5ad10f733afde5946b6365
+EBUILD pdf2htmlEX-9999.ebuild 1065 BLAKE2B f34a94bdfa9bdbd7b9e1aa64c408c95907d7b4c3cc9df64381ae481a4d0473299b43a1dbe8e06b9daef03fb6124a3923ec19f1eb820601e0f052264510e043a6 SHA512 8b0459124a1eeb825e60b22c04b433d7c265b2e592ad303b7279c074060742c9974871771f2a4663b40f17367c285156b917d088dda73d8eda136a036194d853
 MISC metadata.xml 355 BLAKE2B da386c9bf8cf6684e23a3bf7638d341b7f8872ecc7d733b946ae697e9e13096df65398f6d4b2d4594b47eba7ec1e482dc8ab14a69395ed1a32c00cdc7d91c2b5 SHA512 c416fe8d4c3edf1055170e0c4cd84fa9da19437c6eab58fde5198561048018ae6b9387d52017dfbc38db717ef370fc70a1dcc0eb37c8843b4e65cfa7e80314ff
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
index 327250408f93..4bba2c9ce1e4 100644
--- a/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
@@ -22,7 +22,6 @@ IUSE=""
 
 CDEPEND="
 	>=app-text/poppler-0.61.1:=[jpeg,png]
-	<app-text/poppler-0.64.0
 	app-text/poppler-data
 	~media-gfx/fontforge-20170731
 	media-libs/freetype
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index ba5680c3f962..c7a8a4b4fc11 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,4 +1,3 @@
 DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5 SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
-EBUILD sdcv-0.5.0_beta2-r1.ebuild 1428 BLAKE2B 62563018b8dc46595e76fa29f1e3740c540fa1e303b352a469affd3762a8b27123baf71c520325c3ad0e431f7e344ace54e47264b1cc26b4b77610dc0b696c6e SHA512 f988b97d6d318c3919c309c933a3ef39f276a2e22f040a8ab968ea5c6e12706ddef367e47fd0331a5d10a1a61a2cf27bc00a29b99332c10582fb194799d689c3
-EBUILD sdcv-0.5.0_beta2.ebuild 784 BLAKE2B e4e06b91eeda040259b6a6815b7d2ba929798073cd8601d33fdbfb249a7f80031217d576389d09d5d77870449a05b0055ebeb421fbde8e115a99517cb65f2ee9 SHA512 3421819e4a02b4e62be853a371439040a2ead97b1de3f3f85b725b926212e755ce8047dace4d0bcd528726d391afc5a7ea4ff9982f342a2bfaa12dfe1477bc28
+EBUILD sdcv-0.5.0_beta2-r1.ebuild 1426 BLAKE2B 6711cb854f6f010a06bf7e016de9739d719a3429e400005009847ee53087c4c1c2b49bd64e342b365cbe70d1fd9efbf333bf3287470537585ef29da1f7fe8023 SHA512 c721c50436f5f3224412f6229ca2796ab685bec580702025a341656b1d3b62400e5cbddbeea13ef0178e7635b55ee7616db6ac39c06ce4640ac464d837423d00
 MISC metadata.xml 523 BLAKE2B a3ccbb4d5965978e7eeeda8acc971d81d6ce65f04e4ab0342c1da8d3de0dc5512c8f172a7642b5d1c6f201717f52f6a850f459dfcf61e10fa041a35998c9f0a2 SHA512 d1c4be3dea4d7cf435bb98f6a02cce92925c113fc17c505377659095b53c1857b2730fa2363910630e51dda847f6d85f9dd6dd80abece74b844995ca7a09c8c8
diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
index 7eeabd07deb2..f521e22ff60e 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="darkterm nls"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
deleted file mode 100644
index 84bd106223f1..000000000000
--- a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="http://sdcv.sourceforge.net"
-MY_PV="${PV/_beta/-beta}-Source"
-MY_PF="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_PF}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="sys-libs/zlib
-	sys-libs/readline:=
-	>=dev-libs/glib-2.6.1"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.14.1 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with nls)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cmake-utils_src_compile lang
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS NEWS
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index e9db6a424fd8..2c857f074f97 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,11 +1,4 @@
-AUX sigil-0.9.4-proper-gumbo-install.patch 1582 BLAKE2B 8ee3adb3a3a97e9a499f771ece023c8a9f3e9cfac046db8d6d3cf6780c653272218e016f83b652ca107ca668bd1a0fadf2f63bbbed7113971e695d7d4cbb45be SHA512 880a34ffddee86e5e66fe6d0ca12798e29af0a3e554fcde69872f9c6cd9e731e8cc02e6a88acafd0e3d418883c6e9346cefcfd7e0c7aae6f05758b2a667fccb6
 AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
-DIST Sigil-0.9.5-Code.zip 19224845 BLAKE2B 181ed1cf18ad72df71b4d3a1e42770eb9de98631dbddffbcbd0e279aa6c30624b75d5e03385ea295ec6ec6ebcebfa593c5e48b89fb71e7742bccbf9be1c49946 SHA512 f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625
-DIST Sigil-0.9.6-Code.zip 19307454 BLAKE2B 109577f7ba65a07872b84ba4c8adfe93a647da5944b59090fbda4e504d224f12be85cfaebe0045e9106d088c87faeb824cdc27cd6872961aa410ddb1b959543a SHA512 8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417
 DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
-DIST sigil-0.8.7.tar.gz 19394061 BLAKE2B 9d93c7cacf5e3f10a416f0726c7a11b8e8cfb9b8d8c1310af742bd838ccaf44e33bd36dbd833837268d77d2d34e17ea2c79e93906781316a85b58761c59109d0 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652
-EBUILD sigil-0.8.7-r1.ebuild 1277 BLAKE2B 0622505aa25df4368314ea8f179d206fcd3b595f7c0aa5e55a0259b3467963622c4e82d360b3257eb441d4e31da9619e241c18ccc6449237a5fcace2e09aa1f8 SHA512 97fb05e2a1763ea865fc34a6b4277640a43810c02b2bd10d803345ced35badc3c517afa06f50f3cf4d01548f6557681eceba4f453722e609059beefe9308a395
-EBUILD sigil-0.9.5-r2.ebuild 2243 BLAKE2B 7451df7209863e172b66b03cb7ed6c93615bae1c5ce4d1fe952df4f45a2ebee95247f340db100e25980804487186348f7fbdb585b0b3d1e5a463afd684f1dd08 SHA512 42f52a39fdb392464b74c3cfc7cf2a2452214acd6f10a2ec8ed169f191489284fc2436347e5c3df8ee71f3ac8cbd891319edf7adab7d9bfd1f4c7e040ce2a070
-EBUILD sigil-0.9.6.ebuild 2243 BLAKE2B 7451df7209863e172b66b03cb7ed6c93615bae1c5ce4d1fe952df4f45a2ebee95247f340db100e25980804487186348f7fbdb585b0b3d1e5a463afd684f1dd08 SHA512 42f52a39fdb392464b74c3cfc7cf2a2452214acd6f10a2ec8ed169f191489284fc2436347e5c3df8ee71f3ac8cbd891319edf7adab7d9bfd1f4c7e040ce2a070
 EBUILD sigil-0.9.8.ebuild 2243 BLAKE2B 15162b1409146781c53ba3270486745192d0b99173137b2725fbc4d8109ee34ec572828e3978a7104eea91228a725008fdf77e3911d97fce928bfba81a39d8c7 SHA512 602fdbcb111823fdd2f3447567d3cb02d1e3f089410c0c15453958f77775a56ca7282480b1c916a2499dca2a9665f7229f1edd471732ae7914aae50374efbbdf
 MISC metadata.xml 389 BLAKE2B 8f9988168470e8545fa0fa47e520d7019cb9cf1ba8af0c502fa0b66a8a6a4567feea882d0ddc44864aac2193b411010eee2bd7d5905c68b34a32550ba4f6e223 SHA512 0728fc5f14cceb331ea75a6231d176ecbd22defa77b6d90a6859ec6e001feb3cd1f9c57c779bdcf83f81a4f7dca06e120964d6c93e372e39584293addacb5929
diff --git a/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
deleted file mode 100644
index 6e7db28fe99a..000000000000
--- a/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur Sigil-0.9.4/internal/gumbo/CMakeLists.txt Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt
---- Sigil-0.9.4/internal/gumbo/CMakeLists.txt	2016-03-13 20:20:52.000000000 +0100
-+++ Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt	2016-03-22 14:50:26.026558216 +0100
-@@ -40,4 +40,5 @@
- 
- if( UNIX AND NOT APPLE )
- 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
-+  install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
- endif()
-diff -Naur Sigil-0.9.4/src/CMakeLists.txt Sigil-0.9.4.b/src/CMakeLists.txt
---- Sigil-0.9.4/src/CMakeLists.txt	2016-03-13 20:20:52.000000000 +0100
-+++ Sigil-0.9.4.b/src/CMakeLists.txt	2016-03-22 14:49:49.628556236 +0100
-@@ -1015,12 +1015,10 @@
-     endif()
- 
-     # Standard Linux 'make install'
--    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-+    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
-     install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
-     if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
--        install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-     endif()
--    install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-     install( FILES ${LINUX_DESKTOP_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/applications/ )
-     install( FILES ${LINUX_DESKTOP_ICON_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/pixmaps RENAME sigil.png )
-     install( FILES ${QM_FILES} DESTINATION ${SIGIL_SHARE_ROOT}/translations/ )
diff --git a/app-text/sigil/sigil-0.8.7-r1.ebuild b/app-text/sigil/sigil-0.8.7-r1.ebuild
deleted file mode 100644
index 1fa96bf64425..000000000000
--- a/app-text/sigil/sigil-0.8.7-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# This ebuild could use some python checks, as sigil contains python plugin architecture.
-
-inherit cmake-utils
-
-MY_PN="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-text/hunspell-1.3.2
-	>=dev-libs/boost-1.49[threads]
-	>=dev-libs/libpcre-8.31[pcre16]
-	>=dev-libs/xerces-c-3.1.1[icu]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtnetwork-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtsvg-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxml-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	>=sys-libs/zlib-1.2.7[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( README.md )
-
-src_prepare() {
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die "sed failed"
-
-	cmake-utils_src_prepare
-}
diff --git a/app-text/sigil/sigil-0.9.5-r2.ebuild b/app-text/sigil/sigil-0.9.5-r2.ebuild
deleted file mode 100644
index 6418c4507528..000000000000
--- a/app-text/sigil/sigil-0.9.5-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit cmake-utils python-single-r1
-
-my_pn="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell
-	dev-libs/boost[threads]
-	dev-libs/libpcre[pcre16]
-	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	"${FILESDIR}"/${PN}-0.9.4-proper-gumbo-install.patch
-)
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DLIBDIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "From Sigil's release notes:"
-	elog "When you fire up Sigil for the very first time:"
-	elog "navigate to the new General Preferences and select the default"
-	elog "epub version you plan to work with (epub 2 or epub3) so that new"
-	elog "empty ebooks start with the correct code."
-	elog "if you plan to work with epub3 epubs, you should change your"
-	elog "PreserveEntities setting to use ONLY NUMERIC entities."
-	elog ""
-	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
-	elog ""
-	elog "We strongly recommend enabling Mend On Open in your settings"
-	elog "for best performance with Sigil."
-}
diff --git a/app-text/sigil/sigil-0.9.6.ebuild b/app-text/sigil/sigil-0.9.6.ebuild
deleted file mode 100644
index 6418c4507528..000000000000
--- a/app-text/sigil/sigil-0.9.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit cmake-utils python-single-r1
-
-my_pn="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell
-	dev-libs/boost[threads]
-	dev-libs/libpcre[pcre16]
-	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	"${FILESDIR}"/${PN}-0.9.4-proper-gumbo-install.patch
-)
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DLIBDIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "From Sigil's release notes:"
-	elog "When you fire up Sigil for the very first time:"
-	elog "navigate to the new General Preferences and select the default"
-	elog "epub version you plan to work with (epub 2 or epub3) so that new"
-	elog "empty ebooks start with the correct code."
-	elog "if you plan to work with epub3 epubs, you should change your"
-	elog "PreserveEntities setting to use ONLY NUMERIC entities."
-	elog ""
-	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
-	elog ""
-	elog "We strongly recommend enabling Mend On Open in your settings"
-	elog "for best performance with Sigil."
-}
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index e115fea380f8..a38c7d215d72 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,9 +1,7 @@
 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 644 BLAKE2B 9c15a7a5374adb05e68cd58074357208f53aa1d8e77aefc156577442879097696f939aebf22f745917c3cda777859e35eed43f2d646dfe65d6f64ab5ba5ada9b SHA512 b3a01745789d41b50a4ae48bfc020cc8d85da4c4b72e43976b45ff8b6cd8a542cc461afedac3452d7b39f23417d59acecc886a4c87e3ee3515693f63c9230e2d
-EBUILD t1utils-1.40.ebuild 653 BLAKE2B 0ee9782426adf8898907e8c13a322e2ce810033b9b982ce72470f93989306a1545108d73a0ceb49dc1936292bfd604adef502a9b2a54310c1fafd92ec022d8f3 SHA512 78a5fd5ed3596e25b8d37ab9dee52c143f08b8a87aa77c65988d3f66f689164e3f93f52facdb8c6bc039f1d8eab4f483629e0e8bb3524e6f64c4f2a898c0ec19
 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/t1utils-1.40.ebuild b/app-text/t1utils/t1utils-1.40.ebuild
deleted file mode 100644
index 1fefc90782cf..000000000000
--- a/app-text/t1utils/t1utils-1.40.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-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"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<media-libs/freetype-1.4_pre20080316"
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS README
-}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index ec1a0f0a45d5..02c2a975e754 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -319,6 +319,6 @@ DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f3522
 DIST texlive-module-web.doc-2016.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 EBUILD texlive-core-2016-r6.ebuild 11521 BLAKE2B 0ee71aaf90d8803d9f125ea694268fe9e4ff50e5affdeaa3d7b2a9e2b014028eee543c3fcf0131e5ac86c36328d983023304118813e7244ff353ad2bef7b182e SHA512 1d78173f44f67d97f389256573aad38cb43eb87e4f202480bbe2aa30f9a27b626056aaa50b791e939f09652d031d2a23406597f96cef55ad928c37ed973e49b7
-EBUILD texlive-core-2017-r3.ebuild 11617 BLAKE2B bf43718d6880773265bf2a92fe7917e454eac57f971cedb9834567823248383c06e57728a911cff591ab5afde636a26b110ff42d762373d4cef395c1b79217b3 SHA512 c2bf5307f56da0e6fc81bedc2708e2c5e81216fd990bea46273ca013d87a5667dd6e94c85c98f1b0a77b428144c657fc1ede61ae3aecac9f83d7a8e1418232eb
-EBUILD texlive-core-2017-r4.ebuild 11821 BLAKE2B 62559c2b3c51c9bac7208e1021773307120c4edfc1b9a5c7d962b744807fadabe9054b1f2442d389fa5e0ada4e88bf62011f1878139293606831e3cdb6c310cd SHA512 e675228dc4887beb96649daed4cf3f11f193f4f2d617226949a417532bc7db21d158ae700136155ea579d106830cf7415dab2566dd75115c8a73fcadbc35c736
+EBUILD texlive-core-2017-r3.ebuild 11616 BLAKE2B 1285fa47a8f24b7f055728e71e83208e21687491063b3edba33fbc254f92f5d5c20e899ded68ec8b4fd9200025bb4c88ab3c24e3e3c5a3bfc68dcdb33fc42af2 SHA512 0f2f0d97ff0933bb680a5a591d34b63b9c898dda27e908e7404ab0ffe7190d620b70a9900945c556cd5269944f46986681bdb94ebef8ece7dede2679651eae73
+EBUILD texlive-core-2017-r4.ebuild 11820 BLAKE2B 45c785077cb15ae9f771deaad2d9139ac24447e4692c11c0af7083d1bded2c15583c0ba7ae5f22536ca6d75e9c7d5ea9d2215c7f5d179e269956b7740ab1a4e3 SHA512 21618e4f6243b34c0cc88b87084fcd09f35227697d89580d3fbf7c1885d35e76ad0ff659a143a74ee6f713c42b8d36ab24a260e4e4bc2a1b322b3b90ed837278
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index adf3b9b004ec..29ea8dc071dd 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 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"
+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
@@ -118,7 +118,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
 
 DEPEND="${COMMON_DEPEND}
-	<media-libs/freetype-2.9.1-r2
+	<media-libs/freetype-2.9.1-r3
 	virtual/pkgconfig
 	sys-apps/ed
 	sys-devel/flex
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 44ef1da83724..53455753c23f 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -76,7 +76,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 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"
+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
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 445d200d7d50..0016f14d7969 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/ctrlp/Manifest b/app-vim/ctrlp/Manifest
index e92a01ea8e2c..510f5254b0c5 100644
--- a/app-vim/ctrlp/Manifest
+++ b/app-vim/ctrlp/Manifest
@@ -1,3 +1,5 @@
 DIST ctrlp-1.80.tar.gz 75269 BLAKE2B 38b70168d5b220dca220b2f1bfddcae1234fabf01348083fd9db4e1ca0396b56eb3f88f1cda84c22884c3946b731de06a710ca89f51a916f4758345afa748b19 SHA512 40175e64bb9c4ccdc202bc31b8956b96ede5761a3a4f17706c4d915f8083991cb7729e33c79d021bf6faff00f381fe9272145f852981e487b279f0471b86cadd
+DIST ctrlp-1.80_p20180418.tar.gz 76376 BLAKE2B 2ae3e85eac29bb07bfafcc60b879b506b57b7874ee9798d4fc0e420e06283ceca4cfe4d282fb9552c1971db48de25dc8df03d3e20d85ae1bbfc72f1162cc1fba SHA512 08a566087e0be0496c3dd1d60e24d65421b7fc758c95d3959181293502dd1e3581066bebea58cc1ef85f2a7cba76b45eee2e5ff2c522e27523ea31bebe4a36d5
 EBUILD ctrlp-1.80.ebuild 456 BLAKE2B b7f36c26f668cbff5c3be99395e1555a51f28f083efeefd05aac83cc9bef07abcdc25e0f8f69ef2b44aecf1dcc8993906f80c2971ba02838fc782399eb018a5c SHA512 9f8a52fd5d00138b7619b7d8c0ff2d166f48375e02ca4ca872d7ed655a2bcaf80282bd71bd4c122d479ad33c395cb57bee6421497d4da34e857663c9dfc283ab
+EBUILD ctrlp-1.80_p20180418.ebuild 521 BLAKE2B 6131d17541c56e2a41eca6fc11eee8e4f2149756dcc04d73f0e094f47ffa08420d345f1685b131599e20b35f9d171bc103b3ec47ec956b04a702975758d73b43 SHA512 ea8499bf3114e73df549efcc324c2779a61dce182109541d3c401d51a077f47f0856cd39391fa733fce86388d6b72e7b950d5e957e60fa802fed7672be20b743
 MISC metadata.xml 338 BLAKE2B 41c758d6fb547d7d7baabc1dd88431b320430d5549861120d9667082474c6ce45dd17983f2be9dd8f7b7044d3e8ba707b8baffc05d59430b9435ae3e0bc4138a SHA512 5167190c5206fc93a419c088f08ff5fd89ff0f12198824576f652973baa99c16ed8b8856e7afb2ba8c7e1bf9c90d4c94b83ff38dfd1ee63c06d9a69d57b07d45
diff --git a/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild b/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild
new file mode 100644
index 000000000000..cf9b207e7672
--- /dev/null
+++ b/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+# Commit Date: 18 Apr 2018
+COMMIT="4b9e7cac612902a25498cca49f13475fe1a821a4"
+
+DESCRIPTION="vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support"
+HOMEPAGE="https://github.com/ctrlpvim/ctrlp.vim"
+SRC_URI="https://github.com/${PN}vim/${PN}.vim/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/genutils/Manifest b/app-vim/genutils/Manifest
index 8a587a13cb29..52263a6a7f37 100644
--- a/app-vim/genutils/Manifest
+++ b/app-vim/genutils/Manifest
@@ -1,3 +1,4 @@
 DIST genutils-2.5.zip 30510 BLAKE2B 4e9466844efc0cc607b22ed6aca4cb49f1b65ce569e631a2a0c7f4534e433ac70a3b57b18b8de930eb2604169f71e35c4fbca26b4a521a2ee34a48471a6c6240 SHA512 80a751038f629d58ce962a6be7d806cf2b7c35ad28f9d90e58cad32e1e462083629f2069ac23281683db026510d7e3d96d6883027d424fae3de63352b80fc5db
+EBUILD genutils-2.5-r1.ebuild 575 BLAKE2B 4d6b2df7ccb4507a477277da8f274d56770fbfbfe06edcaecb5d30b5dfd8ef5789e089a02e94d8d2ea92b0b699bc38b4950f0203831c5eae2e999de3c0dee31f SHA512 7e62d6852e6deec0b15e0fe34b7fc763f29f1862c6c0d35bc78eadd5187dc742b6062693907da5a58e2a67eb2cf1e581439a75e17933a1e46431c2290bcb7268
 EBUILD genutils-2.5.ebuild 567 BLAKE2B 542af48484cad7edba2febb8aa6694f3e4c508f48ee2cf0b03d81dccf54b200ae384df18fabf19547e75bcf3f8562acad96c814105e98b3673602636e59b5dff SHA512 76d043c8fc73223ae91309490f8834d9c5db03e3ad74457ca4b1985f670caaf5e278fe3fe76b831a7e398483dab7cc8dfff4543ff44f748eb6c2334bf7ac44e8
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genutils/genutils-2.5-r1.ebuild b/app-vim/genutils/genutils-2.5-r1.ebuild
new file mode 100644
index 000000000000..57fc9d0c385a
--- /dev/null
+++ b/app-vim/genutils/genutils-2.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library with various useful functions"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/app-vim/indentpython/Manifest b/app-vim/indentpython/Manifest
index 5bf88dc6bee5..444220dd7ad7 100644
--- a/app-vim/indentpython/Manifest
+++ b/app-vim/indentpython/Manifest
@@ -1,3 +1,3 @@
-DIST indentpython-0.3.zip 2682 BLAKE2B 0c803921ce23796dc48792a2e55ab721edd86d690e75df35e646cb71c53d32e3aa37870e2840b2363bb1ae277d4e35631a1b6d0d1735a62374b4fbc6e14154d9 SHA512 d358579357d5197dc035816b02557b8e84d5f0c85fb6433d171b9880e211dee75ef6f5fd7a37651677591c6c31a570c39094d6bbd5052a29ef344ec18b0e13c5
-EBUILD indentpython-0.3.ebuild 450 BLAKE2B 20ff5fd3e6ed5af3832fb3eb13360155e373d545332982131effb344e8ff9a23984f7a790f78e22ac081d65899fa9db4756dc5638e07417099ffa645b905bc20 SHA512 d28ec498ac1ae50d043df161b8f053d7443ccf649c2606600d00b7927e2a13c1d2309b7f6c9fcaafdbb5d0168843c3864fb4c7af62e6b2c75dfdefa7fe8afdd3
+DIST indentpython-0.3.tar.gz 2305 BLAKE2B 080224b87a10d1a7cd87523b37257b099efc873a954a5af63d8046351ad67fa6a58c6d84405ca50416b735f52835029e2fe653a24cd80d66dfb851f050b2421c SHA512 a3750ad7f935be914821cdff6b55b9bca1fe4d076d6c364be3854679c8c3466f14a4df486258fbee5a24d58373bc6258080e598992b22a0897e18a170555ebd6
+EBUILD indentpython-0.3.ebuild 431 BLAKE2B 50793b88fb7e1d5e03782ad8383cc02da2199048cabd15799f21ba805d3f034adcf871244d6f356249dfc020ccb9b5380e949c810af0bfb6d47fc4d0a8d31925 SHA512 80710b0d87c4e1ca973be6c8c00274d9e23b0346662201f54c6e9aa443f65cbfa0fed107c8a1df63a7b46ab8d47d6bfaff2771d5722807aab131b340fb45de5c
 MISC metadata.xml 437 BLAKE2B 302eee78ee54aea1ade2aa9206518258d8d4d8d2382ff7f5ce786c404561aa049f0e9a1b50330fe54d3c3432d688a7ddda193161d38dc43559278f802c378d3f SHA512 a6dc546a8b543e5e568f0dace43860187d1ea909b614ade44ecf3eb6cc03507b77fd4f62da85284c191b7007376ac31ca9933171983df84b5da04bfdb8424ac7
diff --git a/app-vim/indentpython/indentpython-0.3.ebuild b/app-vim/indentpython/indentpython-0.3.ebuild
index 2f897aa847fc..d2abc1777cf7 100644
--- a/app-vim/indentpython/indentpython-0.3.ebuild
+++ b/app-vim/indentpython/indentpython-0.3.ebuild
@@ -7,10 +7,8 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: Indent Python code according to PEP8"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=974"
-SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-DEPEND="app-arch/unzip"
-
 S="${WORKDIR}/${PN}.vim-${PV}"
diff --git a/app-vim/vim-commentary/Manifest b/app-vim/vim-commentary/Manifest
new file mode 100644
index 000000000000..5c7ed952dfd6
--- /dev/null
+++ b/app-vim/vim-commentary/Manifest
@@ -0,0 +1,3 @@
+DIST vim-commentary-1.3_p20180530.tar.gz 3062 BLAKE2B 72018b6e84313a5c7f44b994f1892724155bcecb14f3142d83a5b10ba8e8b813859bf3af660ebea840c196a6c9bd40c6daccfcdbfef47967be83a19201b65ce0 SHA512 a2aa9db16f12006842aaa61b69c1279bca046f840de9342cb0a3d0af7fc7a5bf0905ea87762f7519e858d4e04d4fea8b0e4efca7d4bc346ce2c5b76fa78d321f
+EBUILD vim-commentary-1.3_p20180530.ebuild 441 BLAKE2B 41fc32d94bcd6f499ddac3f730f845fedeb5cd6ae7525c679b6d7adf4151a5761a05e01c66c79b466f216f6f2111c1da9df9a86dc7ee53ddea2b3ab170a4cfde SHA512 eecdbab7ab1cbe5d36a9a4515da0566cef11ad273c570a51f425fad8d3b513ad12dc55f414c5ab8c5e1304ebe3673476d4e250cdb0241473e4d9b9332cee73d7
+MISC metadata.xml 334 BLAKE2B 4aa8711aba5240ff427b6b09abe504aabb86d128f3574a7c3c43d0b552300b0f89e6725f0d738c1659d65b6399c29d4cf7e658be8240442735c7fcc2fb7a032d SHA512 31d1c930133ebac9def519a58e99d4e7dc1c7c303cc2ed3866731eaf357e23ceac6b6cf4b37ca67599c743442d353f6bc640ed2a7e8278c7cfaf10b34d50238b
diff --git a/app-vim/vim-commentary/metadata.xml b/app-vim/vim-commentary/metadata.xml
new file mode 100644
index 000000000000..0f541f75ae23
--- /dev/null
+++ b/app-vim/vim-commentary/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="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tpope/vim-commentary</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild b/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
new file mode 100644
index 000000000000..a717143cd472
--- /dev/null
+++ b/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+# Commit Date: 30 May 2018
+COMMIT="7f2127b1dfc57811112785985b46ff2289d72334"
+
+DESCRIPTION="vim plugin: comment stuff out"
+HOMEPAGE="https://github.com/tpope/vim-commentary"
+SRC_URI="https://github.com/tpope/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vim-flake8/Manifest b/app-vim/vim-flake8/Manifest
index 34f965b779fe..ed011b53e30b 100644
--- a/app-vim/vim-flake8/Manifest
+++ b/app-vim/vim-flake8/Manifest
@@ -1,3 +1,3 @@
-DIST vim-flake8-1.6.zip 6499 BLAKE2B 2e07dce7d53ce96f02c4d2fdb1ddbc55a9ae8c877ce1ca6ec59046fef6dce1311e9a182960646b732690599ca66add6fecdc0a6d0c2ac6b1092b87dc3ae52789 SHA512 2cd6427d946d3ab310c9d04441355545065f501d9176b11e90a2df5b8c0fad679f56b77e934f9cf4078a947f8f35d0200411add0da34f33e6cfef4b9b4089c98
-EBUILD vim-flake8-1.6.ebuild 420 BLAKE2B 161cc4bc4b154b92969054c777b88d956134522420fed83547c30d8743a5d472ecda42643f5664b51ad34a2579ae8440adf36f1cfd274c1fbf9f4c75bd04a663 SHA512 ca6beb32316cff12923f5ad2978a77970ee7e6ccc4d563b1adf0f118ce90dc1e8ae38baa75ef68ebd8386b0ac7f2928ddb4837e9f26a97305d30fc0c1af58b49
+DIST vim-flake8-1.6.tar.gz 5345 BLAKE2B dd726798a49231841f9fcb915999cf965a42b8b5f593a66f97268bc6d7993584d5f9ed0cfc50508bc57d60c5dcd19c8476e86ae26fb8be9c1dcf7007db2d0323 SHA512 a4208478f9754ef2d188a51e3262c449ef16b48fc0208425795d71c304118c129ae20a723fff96863291bae66237f1479a591cc23e5ec90222e0614d2dcccce9
+EBUILD vim-flake8-1.6.ebuild 402 BLAKE2B eb5c93251f30ef79ce9d76954d24f739e7dc4465ffdf9d6fae92747b065e058b5bb0e89961d77d526039f0bc023d47d19e8bfb50b3c7d07a02877c7c6b5e825e SHA512 e597905db4f37dc796bdd01cb6d2e5e5c121c6483347a7189dcfd16e36445636bbd8cadb3182fb3be9e14493bb9a44a8cf1569d9587e6a8806412698b76d8c6f
 MISC metadata.xml 424 BLAKE2B 3229e40038f1b81d9e30930a93fd292caacefb1425f4fe070348ccfacc377fd52a972735eff894cbbc01f838c2ba1d0f5a1f1fd84d3a9a2b76cf952a185914a5 SHA512 eaa032b9c9f247340b0eceffea35d85c14259024eac52195f3aab1d7916ea028b44a4ee4e1a8d1b95cf002972a82f0bf36b8425248da684ef794c8afbe632ac5
diff --git a/app-vim/vim-flake8/vim-flake8-1.6.ebuild b/app-vim/vim-flake8/vim-flake8-1.6.ebuild
index 513786e2a7a9..8ff3e0444938 100644
--- a/app-vim/vim-flake8/vim-flake8-1.6.ebuild
+++ b/app-vim/vim-flake8/vim-flake8-1.6.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
@@ -7,9 +7,8 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: runs the currently open file through flake8"
 HOMEPAGE="https://github.com/nvie/vim-flake8"
-SRC_URI="https://github.com/nvie/${PN}/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/nvie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-DEPEND="app-arch/unzip"
 RDEPEND="dev-python/flake8"
diff --git a/app-vim/vim-go/Manifest b/app-vim/vim-go/Manifest
index 9597635e893c..d24ed6b18398 100644
--- a/app-vim/vim-go/Manifest
+++ b/app-vim/vim-go/Manifest
@@ -1,3 +1,3 @@
-DIST vim-go-1.13.zip 900566 BLAKE2B 31867c47ce7ab11a4948ad52775793586f51ebbfdcdb49ae934ee26842e1d25156ac606b44dcaee56787bd4ea761705f1730f092ff59a3ab6cfffd8c9acfef9c SHA512 3a1818c126c6ab01cd6993336c9e87f88357375b5252e0aeed434dccd0514cbcb1b7c96dce2aaf8f8c2e21909a17bf4bbb39a386ee1f7049b50a85ed9c635817
-EBUILD vim-go-1.13.ebuild 581 BLAKE2B 2596dc163c37365108359bf1c3049760fe172e04c48b7e7d42b7007ee6c4aceaa24223db14dc78d53cf2e66242898e36c7ffbc5ba9af325185e4aca2943a43a1 SHA512 39be06222c2466c2fee043542a471fd2e75b237c276c9126a63024fe2ac94f29f5ee0b08fe4afcfde4902aa6b3f5f74aacf89cdcda6449d67e5789c5fb3c8349
+DIST vim-go-1.13.tar.gz 870173 BLAKE2B a2f67cef249191cf91caf45c120e471301a89ee365ba9add839edea17990ff3aba7238965dac1c71a89d2004dfcfd486319fc4f1474c7ee94d3845724cd9b289 SHA512 c2aa31104168f3a8e1f96b0ad2c51dc1c2e5a1de3db76f0009edfb38bf60ebfcd9bd8a86fedb6ff6d6d789973a557d6ed03e38e67159bc43c5231449b0253c25
+EBUILD vim-go-1.13.ebuild 585 BLAKE2B a46b8e468163abddf2ec305b76e24fe82ab82f631dbf773bf927c0962f55303b21e2eeba36e44a0c2d172160c65fa6ec02cde729260783b0ae9c7a5e0f199fe5 SHA512 4d7b8ba229f5c1318993517923701078909ac0fda31c34ea296b62e5e16395a7bb926ea9811b6fbfc8df4e660435bdc1407da209dc4dbb56cb7f887854e31e73
 MISC metadata.xml 326 BLAKE2B 2c1d1ecf6dc417d2646fbeeebbd2bf1191c93f6439df663e863cebe0b33cfea5040bbe3f1b85107f5370395d9472c4f903379c3a5cf925a997789c492ac0cc66 SHA512 0075500c50b5ad7cf5610fbc4bb71e3ee3d655bc089916371ee0d66731387a2268df98ed6d7fcad6e70db28d6852b48c2e6742e131b7c5d50fc7a9656807fc60
diff --git a/app-vim/vim-go/vim-go-1.13.ebuild b/app-vim/vim-go/vim-go-1.13.ebuild
index 2cffe300bf04..39d68cf0d91e 100644
--- a/app-vim/vim-go/vim-go-1.13.ebuild
+++ b/app-vim/vim-go/vim-go-1.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
@@ -7,9 +7,9 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: Go development plugin for Vim"
 HOMEPAGE="https://github.com/fatih/vim-go"
-SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="$PN"
 
diff --git a/app-vim/vim-spell-da/Manifest b/app-vim/vim-spell-da/Manifest
index 9e1438dba521..df5f56efff4e 100644
--- a/app-vim/vim-spell-da/Manifest
+++ b/app-vim/vim-spell-da/Manifest
@@ -1,4 +1,3 @@
 DIST vim-spell-da-20060116.tar.bz2 629196 BLAKE2B fd8829e2920514ddd2e6c224521d6337b3e18d0cec1bfbfa89ff93aac35fa22d9a908ea353b969c0cd3e6c86bbee8bca58fa5e80c01141aa74c6a54dd016214c SHA512 0d055972b15acdd2ea7166711e344b1718975f7de6a49653240fb2e1bb31a82a8174e46de83f38d93d226782b97e2c58aff50cc0efab95dcde3d53b80205f444
 EBUILD vim-spell-da-20060116-r1.ebuild 276 BLAKE2B e3e21ed341a4c999d68ac4c3e0e047001189df6f12d065e7622abb14a8adae1f00eadfd254bcbc952c86ef05be4911ef8fea97ac0d97cc800d7bf7c51858bbf6 SHA512 50ca2086b9f15a81705fb8f4005befea20f14b3a4b6fd8356b94418db89bb8c7508cd3ef3383d6efc37da1d147be2408f0691fcf7f87e4678e9abca75fb3b7e9
-EBUILD vim-spell-da-20060116.ebuild 233 BLAKE2B 1374cee4d055426118cc20f0457ceec0c2393940a95f5c80c572b4929426c744e027d53483e133df11c909d1e185f99244d05275683a6bc4148ba44861a2156c SHA512 6c7f41332b603427079b48200e77929d2afa485b047fee0afa7a21efd1740abb66f5d759f6c5b27fcefe19e20d5871d4eef0496e8a36a62f7b8346e0e11cf52f
 MISC metadata.xml 380 BLAKE2B 9663ddc26c4b2e454365796824d351e6b35410e8eccd8bdec574e17d6fa4b3b6207e24cc4867324b6a0fbe18d2dc1626a0c565f25703bb1a8337d3ffb3ec879d SHA512 0e165d32c9cc2878b696b33ab8a9d1cac4e41ae0e45a019075be7ea8057acff4a40ec947a74c5edb42e31fb0357f284260efcb30914bfd1fe27aed1f5ff54f9a
diff --git a/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild b/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild
deleted file mode 100644
index 61033b4f9f2e..000000000000
--- a/app-vim/vim-spell-da/vim-spell-da-20060116.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-VIM_SPELL_LANGUAGE="Danish"
-
-inherit vim-spell
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc x86"
-IUSE=""
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
index 48f75a388341..807453de4b7d 100644
--- a/app-vim/vim-tmux/Manifest
+++ b/app-vim/vim-tmux/Manifest
@@ -1,3 +1,3 @@
-DIST vim-tmux-3.0.0.zip 12713 BLAKE2B 11b2aa2a3a2da98d1977023b42063dd66ffc330894e76284699a0988d94d373116606decc4505b739ecf9454261bec43f9f88ada1196a1050320788709aebc99 SHA512 d6bc94c34ab32608610fdfffc3a3522b6056b3b61dd3cb9c63a71cb20d1597954aec65a06c5ce22352731d4e70b6a239ca5f303427182cce93324042b7f10c8c
-EBUILD vim-tmux-3.0.0.ebuild 550 BLAKE2B 4bb9e8bae67b1efb7436f47b4e03a12e443c3fe9ef37d6401c02c1bba22ce0d971df5c2eaeecf24573c5d94ab6c5f1e627177385645c9f7f9a5aee12d5479e1c SHA512 02a20074f86728ae0e47b79649562158385fc3fa5aeb0dadb4efdda5ffc6901a3044b4cc1e568d8ac142b196bc4a67b0936545d3e62ff204f8d200ac5965a027
+DIST vim-tmux-3.0.0.tar.gz 9658 BLAKE2B 188485b4c74e60292aa153693246c9e612cbc4736accb7aafad3ee901084023b3f40374212afe2139c634b8457c2ec871f0cf5e6d02beb69fc3c433f26b8610d SHA512 d251ff07b0702e4f9969d02a9c32924db62f77b71250fda175053883abc35c18932f9869ea0514df1b7acb9cc65f6b39e2b8c640ad77ff36a19ceaa74d13d77b
+EBUILD vim-tmux-3.0.0.ebuild 556 BLAKE2B 4b7af70822955d4135f9d6745b3b4d5210335ff143d6bfe3f6407373e6b9ceb1562fb672ed83fa8051074205c6a4f12daa8ae1ddd5ebb388509ca3a44dca97b4 SHA512 2ca554af0c52d9af4e9f57d47d2d05b1848350b6fca2e580190dc2d7b0a485094735de2be99d6a942881363ae6178529a6f9356be7b49b4aa7f934ed14522cff
 MISC metadata.xml 556 BLAKE2B e9419237fa1f3b2b3c15d1adf7ca5afdc0da4a1fd051a4b46d839a67079170487c85e05e121c64b4ec4cc82064e217898831db1ed0a2018c345b227c44554ebe SHA512 181979dee06b24a1d4f1b3b325558c628fcdb0ee4d628c7002777f7e460e8a35026f021bb21c79db243fd067d16168c7db804a33c10be0c59f6bb22d46cbf9a9
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
index 3694ce4b6ad6..ab382fc6fe5a 100644
--- a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
@@ -7,7 +7,7 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: tmux support for vim"
 HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
-SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 
diff --git a/app-vim/vimclojure/Manifest b/app-vim/vimclojure/Manifest
index 5575312eed80..361f6f1302de 100644
--- a/app-vim/vimclojure/Manifest
+++ b/app-vim/vimclojure/Manifest
@@ -1,4 +1,3 @@
-DIST vimclojure-2.3.6.zip 44737 BLAKE2B a2eb0beafa54413d5557f8353c84274068df82a716890d2f1511d27c599d301c2ff2f7363e14e2f3132b52ede59ee4cd2eb091d94034aebc7f6a4aec398b8371 SHA512 daf4f691500c3b901a57849c6f07b500c49f7086e0733921f589e362a53a0d07b99eab7d6ea42f1828822942b294f51a684eec93ebab1797438da4b81199ca9d
-EBUILD vimclojure-2.3.6-r2.ebuild 1088 BLAKE2B beef293d5d6831b68b6750aae9c6e900672ac410e72ce8145d763c61f2a81f0f3e1891b65c06ac361d4b23bdc55fc0fcd26e03fc14d310b95323bff6076ed667 SHA512 5b2a640e1452d780cf0f3383426835f588dccd277c7980008051324c46af08b3345c1b6ca6e6f5dadb8553b2c3d2533ecdfe89d2a7d9d77eb875925837374ad4
-EBUILD vimclojure-2.3.6-r3.ebuild 1108 BLAKE2B 821bc08acf632a6c5aca9b45deecc564a90665c6c6e8dc656071f169a556bc76d875dcc00e69c70f02541809a800349d2e9437743a9856622d2a821364864e2e SHA512 eadf16aa54a26904f6b5518e85143ffe91cef9c19249cde504d9f4086c2e03367efd4094f28892e33de41564b61abf9249e7fab1e819c91f96fae0139d2b6d09
+DIST vimclojure-2.3.6.tar.gz 32456 BLAKE2B 7c80611516cf7e1d46400c8cc8c9f9f8146ce8f1ce2fc7458ad9e5a7c778f54496f3a1b2fe47a6cc9cb28cb8f6f0e0e67ace77a09c7258f1585cb76758d6e908 SHA512 186fd5607ccaa4b4344aed4d165d257d0518b3fe19d7b9d858b11a672f68c601bbd453fde7189dd61c3fc2f0b8517c3481579355bf5405ab90517dc48900fd51
+EBUILD vimclojure-2.3.6-r3.ebuild 1112 BLAKE2B f09d2572c902d2c2532e12a5ed56077958a19c09c814d00ccc441427c9444b06e09fdcab793f2fd2df75e2675aa12f7c27acd2b7a5fa63a4b065815670e0a4e6 SHA512 f37b8683a73d2db3b273c97cc6ef43889779b05a34b4748f64d95b83de715ade037b495f85ab378a6b00c0ca37eaaa1569470ede434bd337e2e02bf006fc85fd
 MISC metadata.xml 404 BLAKE2B 3a8d975056ed280081818051d51dd60de3d8d8da257b9be8ad8855e5ac9356ad78a9748dc307bc0c7b63ab7f5143abec09c24317d73e699fdb04e90e9f669888 SHA512 492984271208a8c95a7ea91cfe48d11c7f6c9052ac3e062e53667173e77c70e2c20fadc6dd15a953196e131a4bb810127335272595a183b84163435928561832
diff --git a/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild b/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
deleted file mode 100644
index 70458eaecd0f..000000000000
--- a/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-MY_PN="VimClojure"
-
-DESCRIPTION="vim plugin: Clojure syntax highlighting, filetype and indent settings"
-HOMEPAGE="https://github.com/vim-scripts/VimClojure"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/clojure"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Files with similar names are already installed by app-vim/slimv.
-DUPLICATE_FILES=(
-	indent/clojure.vim
-	ftdetect/clojure.vim
-)
-
-src_prepare() {
-	find . -type f -name \*.bat -exec rm -v {} \; || die
-
-	# Let's simply rename them.
-	for file in "${DUPLICATE_FILES[@]}"; do
-		[[ -f "${file}" ]] || die "Couldn't find: ${file}"
-		bname="${file##*/}"
-		path="${file%/*}"
-		noext="${bname%%.*}"
-		newname="${path}/${PN}_${noext}.vim"
-		mv "${file}" "${newname}" || die
-	done
-}
-
-src_install() {
-	local my_license="doc/LICENSE.txt"
-	dodoc "${my_license}"
-	rm -v "${my_license}" || die
-	vim-plugin_src_install
-}
diff --git a/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild b/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild
index 2bf1249e8565..6d3c5d62b0e7 100644
--- a/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild
+++ b/app-vim/vimclojure/vimclojure-2.3.6-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
@@ -9,9 +9,9 @@ MY_PN="VimClojure"
 
 DESCRIPTION="vim plugin: Clojure syntax highlighting, filetype and indent settings"
 HOMEPAGE="https://github.com/vim-scripts/VimClojure"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/app-vim/webapi/Manifest b/app-vim/webapi/Manifest
index 8e2f50be3e04..f042d0b4bcf4 100644
--- a/app-vim/webapi/Manifest
+++ b/app-vim/webapi/Manifest
@@ -1,3 +1,5 @@
 DIST webapi-0.2.tar.bz2 20690 BLAKE2B 5438a88c94f77cbe5ce2a79b11c4da31199cc071b35a22fc78b01c9f4c1195d830353639ca05d3c95182fe3ae5c177cddec9d6acd0b2de198a3f77de5e1ad92f SHA512 ca513053c361041bfaeeea11a0bb70c8e6e011985dc5ba801c654f919dd7d94304b6ff475ce49525909b575e7cc0d9233b56cab2326adc6a689e05c5faf4a3da
+DIST webapi-0.3.tar.gz 26388 BLAKE2B 878e9f760f9940b81647359fb8779d6386b4bd2d2190c77f2ef886a12a6d293f6f0e5829e05fe98e0c842cb927186f9e4a02dcddcdfe99d5e13d52ae43e7f775 SHA512 215516872a32f8d967a9bff6d13916d6571399184728c422babf486152fc4c3f57aa4a7fa7591d7205d4b2dd99138c36796d1f2d186d494d74cf5dd2fa7cdec8
 EBUILD webapi-0.2.ebuild 328 BLAKE2B 1dbcbbb4a1ae8fa48871f527564061c5c1b8a4ba3ccb846ff82e4496af55bdb2f2834a7b79f6c4795517af4e0dfb8be3fa9f8cfcb1a59ed92fa38f4ac8935330 SHA512 3621693275ed6aa6b0b9ab14c79648b8d5cabf609e7ff2ef5df3d45b85de5d58c6560df7103dfc4b2a2ba67dbbaefcaf19f8651ad045ba0af6f76d726e7814e6
+EBUILD webapi-0.3.ebuild 468 BLAKE2B 81ad741b8522f2557471e33fca8e53184b1150a1ef54f61bebf5687cfb5eab502b3d1d2976c0568a0ee34d5d1a7c24f1372256faa579a1b58f5e8215b5af6ad6 SHA512 9c92be9f70769f76b709f8e8fc73de3db05bec9299434dab5644941617f95cc619ddeac137d13c998f4ba5daaacaa68a982fa6e001b43dc0a7d9d2d345970a30
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/webapi/webapi-0.3.ebuild b/app-vim/webapi/webapi-0.3.ebuild
new file mode 100644
index 000000000000..7a9673e4e753
--- /dev/null
+++ b/app-vim/webapi/webapi-0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface to Web APIs"
+HOMEPAGE="https://github.com/mattn/webapi-vim"
+SRC_URI="https://github.com/mattn/${PN}-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND="net-misc/curl"
+
+S="${WORKDIR}/${PN}-vim-${PV}"
+
+src_prepare() {
+	default
+	rm -v Makefile || die
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 13e31d1b3069..783a2fcdc70a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 38336aa70ea0..86896d0044a4 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -7,7 +7,7 @@ AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd
 DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gtest-1.7.0-r1.ebuild 1249 BLAKE2B e3b607997c3a936ed65ffd668d543e512b3aaab230499d3a209950c0ec753c4778ede5c8c67dfb77ba7bba35550813830daa60e602e19ede1b5b95aa98ff8213 SHA512 8e82ff1bcd3e53edfd9823e90ae13484ace2a649a5ab775998e05b98d7fc7246af2bd11a8bbf74aab8e4cc6b9913c34f019befaeee34778262cf88aa7b9cd2ef
-EBUILD gtest-1.8.0-r1.ebuild 1675 BLAKE2B 336faa5f69d97eaf129e61ddcc5079b19703c54f257b4c2409dc456f104f7d002095ee4f150107b57b5cd4a8198d8f9e8821c10121b07b796f909fab21d6b3c6 SHA512 29b44d2fe5bb89aeb4891b0743a4905c4ff61a8cad86724ded982323e3b60d62a8f763c478bbd61174b7fc8377eff25f656e274e4d4591212bbd6934bb8d4ca2
+EBUILD gtest-1.8.0-r1.ebuild 1674 BLAKE2B 0d4cd7279a96426f013fd96c43d7c8613c458585c9e576b19cab9c5ed43572e33ed9190f667f164195a4d4b192924dcb26b97f7365578d6c1e70d6f342c281d3 SHA512 f827c28e93ed16c55cf0e3e8087373170e1d848f163a45e0530580c40780997629a49e534e5f0a399bf6888a92f506bf9730994e774b77a0bcaaa123d215df3a
 EBUILD gtest-1.8.0.ebuild 1637 BLAKE2B 15153bf61b468799c48c25b300794eb3cf93d9751ead2d50d2dda59f09a4c5ea1c6a319083290cb3a93a983ee2552a3162a9c770e724907427533cfd8e7aafd9 SHA512 ac3680806d6e30e926ef29ab24042d419cd4c872b6a7d4d11b75bb50ccf64c6f029b8c59800dd92f3c5e2a8a72b4840277b4750eae8bc46021e44fc95845670b
 EBUILD gtest-9999.ebuild 1826 BLAKE2B 8751e8332d63e36f30d1bc10782c2103e7a40b0f9a454bf29cb92ec92502221cb74aee2158f54b2fb634aa119c6fd1d7faf496fac4569e7ce461205f805123b7 SHA512 9a31a176bba34993a6bbc56dd0cbc0a3b78b293c4d850a0471968c8759fd58a3ebaa1922b2eb293810a697b85894c1daee5d125a42013b6356b9a04596d21114
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index 0b4f5c979906..96cb8b936bfb 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 394be2036121..5942c29be0e2 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,9 +1,5 @@
-AUX yaml-cpp-0.5.3-gcc6.patch 1768 BLAKE2B 979b0ce92ceb0305f3b063b926c2d01e06507adcca2ea8dfabc656678f8fcfe8a66a839cef5adaece8a1b9b8cc2dfc97f97b80b073594f25e80fcc1810c98ef7 SHA512 be0d4cab18312329e37c114cf739fe143a6f635669a741f149fd32cf54bc0307f80a5383025dc04700a8c1ae33de68185f85d516ceb32e364317db06563a8b39
 AUX yaml-cpp-0.6.2-CVE-2017-5950.patch 1697 BLAKE2B 7b13c947e471aa08ec718cecfd43666689cbf0137ed6328ab550f722c409f19ec6437a5458180a3c334ebfe899ef67cbee04237fd230ac06fde863c3adc231f3 SHA512 0ba8bb8d81a98b77cde3dd386fe237dd11aae53011419042ff0b72b643ac2c1fdb7753ff524d0c5d319f7d601b417d1c6ab2419c728c4015197f83ce3eaa34b2
 AUX yaml-cpp-0.6.2-unbundle-gtest.patch 2204 BLAKE2B 733b6eed366ca33085251c3c6f3655060d3cc02a77f5f53a21c9163b894400c7418c3d9f032c8f6d460d58b35594f6ba1cd8eea0a667fbe1849a8eb866074ce5 SHA512 8cb227c2e156bd642be29b15ae7a7de9e4839d6f4b5e0132982659eaab442347d3ef3eedd1bfb8f936a5a1dc98b6d41be915f7da53fd6764f8b6becbaf6cff98
-DIST yaml-cpp-0.5.3.tar.gz 2016737 BLAKE2B 6c10d44fe04fdd81cd61c909acdb576834f5358dd44353723b04d8a42bf8a1312cfa752e445c84f93c6ce76358b2d42dee5263f6fbd47a1f928d1cd28aedef07 SHA512 5ed15fee3c6455c08e6bd8f74256b230f274ef18f8e144491e940640e41626517c7eaaf4a1f380c4179066a2a757c8a0f61878df9dc3caa15e37c4954be47fe0
 DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B be342c212c980cdb03349dbafbe1db0bb581123b4dd6909393d3cdc86145b997a9d2f9b57a5e9d7c8cc60cdfd03f1c37e9db610d8784f2d29fdeada5ab322894 SHA512 fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4
-EBUILD yaml-cpp-0.5.3-r1.ebuild 798 BLAKE2B 7934aba0c61b222341b99a64d4aba8853ab7a4aa985feaafb5f3e64e94b851d86c50cb40652cc062b995277fb6d6a78fcccfb0f04a829c4100ca5473f37b06c9 SHA512 f1bb48e5ea79c1ec1ab1a53e2947bbaf6d0d857dd66c8216e2d31048b0b0a8e1d2decd0e8bd943cbdbf6628b8db812bf598900cb19d29aa6a5720a5a3ca638f2
-EBUILD yaml-cpp-0.5.3.ebuild 797 BLAKE2B 8bbe93179b538d9752b8a0a850b4eb23c423b65df19bf8f6344f343142b9e9dc0b88bf652f952537a9432dadf74e45cad2c24ce63908a329be67bc9d2da56dde SHA512 7ba8c623a04d5ca58e4f0398a08f35f93828b309d73f03d150f6345134544efccb4ba1ca87ded44744025f4c320576976cc8ba52d86604d7cbd0caa5a796376c
 EBUILD yaml-cpp-0.6.2.ebuild 901 BLAKE2B 1048d5123d5f034625e0caac09bfd90b36f67052a42557e05d8a445b662a295920cb5f9448414c0158b3f273ff60c7c5e46620b7a814c4e975c38e2dceab57b2 SHA512 562ffa3c2fe1f5aff2f7e3058f1280457e6f1480c6f97c1d7fb1d576327fd42390321cd4984c377d3736492fc808fdedafed8cac374d2422d4f8bcc4643b5c33
 MISC metadata.xml 325 BLAKE2B 8e094a75d87d80e86efaf6ee191225ad0772dac343ae12ec84e73faffc17464c8431ee78018602127fd52441a6b18d09b58127b7d7ea1ee02163f58d327f0f3f SHA512 a4a5de1911c7bfeb37a3ca5aca8b3c044d51230164ac7d14566a9a4064e5202fac0e613089191ea959d0bb3df157049932d394d167e32fc8a432ab35e4cf24ae
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch
deleted file mode 100644
index 88ee25fa0acb..000000000000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bug: https://bugs.gentoo.org/609176
-Upstream PR: https://github.com/jbeder/yaml-cpp/pull/514
-
-From a83a1b3a7bd0a5a4eb458d898b057f6a8d409b7e Mon Sep 17 00:00:00 2001
-From: Peter-Levine <plevine457@gmail.com>
-Date: Mon, 24 Jul 2017 02:00:24 -0400
-Subject: [PATCH] Fix segfault in gmock when running tests
-
-Taken from https://github.com/google/googletest/issues/705#issuecomment-235067917
----
- test/gmock-1.7.0/include/gmock/gmock-spec-builders.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-index 312fbe87..2dd733b6 100644
---- a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-+++ b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-@@ -1370,6 +1370,8 @@ class ActionResultHolder : public UntypedActionResultHolderBase {
- template <>
- class ActionResultHolder<void> : public UntypedActionResultHolderBase {
-  public:
-+  explicit ActionResultHolder() {}
-+
-   void GetValueAndDelete() const { delete this; }
- 
-   virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
-@@ -1381,7 +1383,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
-       const typename Function<F>::ArgumentTuple& args,
-       const string& call_description) {
-     func_mocker->PerformDefaultAction(args, call_description);
--    return NULL;
-+    return new ActionResultHolder();
-   }
- 
-   // Performs the given action and returns NULL.
-@@ -1390,7 +1392,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
-       const Action<F>& action,
-       const typename Function<F>::ArgumentTuple& args) {
-     action.Perform(args);
--    return NULL;
-+    return new ActionResultHolder();
-   }
- };
- 
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild
deleted file mode 100644
index 6bf29f127ca7..000000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp"
-SRC_URI="https://github.com/jbeder/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.49.0-r2:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
-	sed -i \
-		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
-		yaml-cpp.pc.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild
deleted file mode 100644
index f889e29358c1..000000000000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp"
-SRC_URI="https://github.com/jbeder/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.49.0-r2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
-	sed -i \
-		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
-		yaml-cpp.pc.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ae116e1445ac..da696d0d3f46 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index d19f60112f0c..1b0004a01cc1 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -4,14 +4,12 @@ AUX etcd.initd 813 BLAKE2B 3d63e753f2a04b1cba20ddfdbc7d67acd2be14caff08de74d498e
 AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12cb0ff7fb877527df33a91dedcaa4bbbffa190b4f9c2f53868aeca093b93e9cad50718a23eb5fdd46 SHA512 64d3181a936f8bab635a17f90679041c2d70a712307928feae03a517ad02252fc37e25738979bc1ccd0657ef70439e65cb0306759bec3939e940ec382a02d94f
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
-DIST etcd-3.2.20.tar.gz 3239546 BLAKE2B e999a4cd0a39a5cffcf948039f8e9c802eba9216c1a065b58e68ee9b7a3b09676ce3c228cc4719c87ec78b671512ec5bd6f54b0769e2f1dbce9cb02840cd1c84 SHA512 5d5b7e5d398785a4354a018c0636ba86bf45cd5360d84c096155f1e3f47616b6b85cddb68b9401228190962e9d9efc78b9d4e66c67022b9e729489422cbf892c
-DIST etcd-3.2.21.tar.gz 3239819 BLAKE2B bbf571a1efc6d4519a29e257f52b104ad5502c503db3516f7ff5cd90a7769fe5d2a890c4fa6fa0be55a0c2125b22e0cbb4973bacc56eb41243f8c0d22cf4af7a SHA512 bc10250be6a373f5096d9f4f7964faea6e94d2a8d8f8545b6400ca49d3ab504896212ac68579af577c027cc4682ba6441d52668b976e656a08933ca3db50ffaf
+DIST etcd-3.2.22.tar.gz 3243190 BLAKE2B 165eff928f5f5419d02ef07aebb5160ac5473721a1e27ee1eb2a6b1e5ff775f2f7254ddfc20dec14c28cd2de68966e7b8521fb29c7242a420fa61d226e16b3ba SHA512 7a32dce894ca643f0c51267edc0fba2524c197f0ac3185c6acd22879cd58236f6bcc9c3825d9b8f196255c8bf6aed1b893e1a62124c946f95b4832b409a6b4c0
 DIST etcd-3.3.4.tar.gz 3513132 BLAKE2B 92902c260150259ce5627dbf517c81bdb914c857a901a5f7d8d878a2daad8db931c2d1958a562a612ed62b5ac3080ce54661cb70eabff3430ab9ff65c258544d SHA512 971c47545059dda65d40c2db0928a01b97cf8b1e1b60a6e631e797e3cf1619245430f938f637bea3ab0d01cc2a8974586988727bc9c652b8802e184ad5ad8487
 DIST etcd-3.3.5.tar.gz 3514955 BLAKE2B 394b6563f27a1a73aa553dc4db440d803721d001ab3d53c045df826c527c87232a6c1b83aed5fc9e4011f2480b456f0ae2a7a34bc173df90478d1704fd5c392d SHA512 e4495a02f1e2a08cc70a055528edbc118f50e4fe68b51afeb82908a7c2387de1e457adfb8078befec6829daeace61b95501da9f8b3fa49e0aecc9710ece470a4
-DIST etcd-3.3.6.tar.gz 3515934 BLAKE2B 71cd401e3de2f022bd091b0e68e60a4864ec56a7e076dc510ce0e344a2b48243c18b51d432f6c6abdc1f5aaa42b69b4b843c0671f263095c5930f164c82b5e62 SHA512 00ee750499d487eeeb171f738c6cfe4ebc5d7ffc0f01343c56f712232046161091b23301818593ac14cbd36870d9bba407fad26d863dd41ea257ad21e1a3d93f
-EBUILD etcd-3.2.20.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
-EBUILD etcd-3.2.21.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
+DIST etcd-3.3.7.tar.gz 3517632 BLAKE2B 4fcec3e90e819961e1bfc53a45d71a95ad87f82a3a974f14fc940ff216f8314339f3522ac4992567543a99afbef722f75f4b8ab98604aeca38d1bb697a207d0f SHA512 12ea79aca94f2ad68baf4d324176d4cb2e27d11e3b7c018b69a1c2a1028d9e42d734bd3a814618eb41d7b0b07716d5df9bd9161bf52b061445ca7727579ee276
+EBUILD etcd-3.2.22.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 EBUILD etcd-3.3.4.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
 EBUILD etcd-3.3.5.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
-EBUILD etcd-3.3.6.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
+EBUILD etcd-3.3.7.ebuild 1603 BLAKE2B ecc2eb8cd86fb1ca37d6fd7eecde005fcc3c633bc7569ce54acc5daf947b4be2cc88e596ada2c1e8a7b3d40d44273a143f80b26a2cbb8e851ad8d36b6fcb4beb SHA512 83a23179d8381a126fde6d9e9c521170b3148b78773421893175a81fb48d8b980e93309cc5c40d8993b9039fadc7d75a2ecc03fdc5186d5ba84ac71826dfe68d
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.2.21.ebuild b/dev-db/etcd/etcd-3.2.21.ebuild
deleted file mode 100644
index 34692b679e18..000000000000
--- a/dev-db/etcd/etcd-3.2.21.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.8:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
-		-i "${S}"/src/${EGO_PN}/build || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_compile() {
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 0700 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	./test || die
-	popd || die
-}
diff --git a/dev-db/etcd/etcd-3.2.20.ebuild b/dev-db/etcd/etcd-3.2.22.ebuild
index 34692b679e18..34692b679e18 100644
--- a/dev-db/etcd/etcd-3.2.20.ebuild
+++ b/dev-db/etcd/etcd-3.2.22.ebuild
diff --git a/dev-db/etcd/etcd-3.3.6.ebuild b/dev-db/etcd/etcd-3.3.7.ebuild
index 88b1e478fe0a..88b1e478fe0a 100644
--- a/dev-db/etcd/etcd-3.3.6.ebuild
+++ b/dev-db/etcd/etcd-3.3.7.ebuild
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 398c86863d44..0cc60d261e3d 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,7 +1,7 @@
 DIST LMDB_0.9.18.tar.gz 139156 BLAKE2B 6a8d32c6f203272a212d5e298f7d1af290c12a87680c3177521d1b10d0c42691dbdfdb3b49d467c97cf4c621ddef8e00bca0bbaa352203eeca66e8e294c0fa8b SHA512 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6
 DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191
 DIST LMDB_0.9.21.tar.gz 143352 BLAKE2B de206eb03ebd0ed329127380a2aeac693280d9c1d7b61a4a36c42889169b28adab30ecfeff37487b9e36f4e953bc6587e54b7a49dfd0969f2dec99e45bd09654 SHA512 e0f998507da654ccac02aa199367e8363c37f47e06ee0984085aae60fb086e49087824915bf8896f90187f1cc96e5c9caf5e5f72fa3911415151ca1e56f0309f
-EBUILD lmdb-0.9.18.ebuild 1235 BLAKE2B f3f7a963ae8c0dbba7f14068ead2871a3c4507a3da73799f4f0246fff7bda61a248891ab78fdb94ee224ada9627ce0aab41e73bfc335bd7f47897cb020605da6 SHA512 17de880cc785a743202d95eb22c1e41addb418d86c8650a53d632542545917c93adbb7664a6c724f2474e61151e594174dc78b71cff9c14f3c90cc17af98485c
+EBUILD lmdb-0.9.18.ebuild 1240 BLAKE2B aae6c699c43144b64199e09b34f3595ec80702a77f5b16376ac74fae53bdfc79017194ed5defb442dedf3e5da7d751859eec24c303417a912bf374bfe984ec77 SHA512 bb0a08d277a3667d4d1fd658f21077fd7b803526940e5ea559a8e12d772af62575abb7b546813d8c2aaa4c6db8834127b127c9b56c38d27e8711c4431ae3a803
 EBUILD lmdb-0.9.19.ebuild 1849 BLAKE2B d9e235c2aa7ff06d2b6cdf6b6e29544a02d1aaa7ae7248afdf661c3ba4ea0ddbb0e7ed9ec7796e73b1865a430a2a8380236a3206e54a8eca054ba95ff9e1d820 SHA512 791cca180d0d429d64f197a627dd8d94c48e8502d38011be358fc901e521cdb3996653b2cc0c519b9e1e5a58815134e99e64f09d50bcc72444eb2990ac2879ad
 EBUILD lmdb-0.9.21.ebuild 1849 BLAKE2B d9e235c2aa7ff06d2b6cdf6b6e29544a02d1aaa7ae7248afdf661c3ba4ea0ddbb0e7ed9ec7796e73b1865a430a2a8380236a3206e54a8eca054ba95ff9e1d820 SHA512 791cca180d0d429d64f197a627dd8d94c48e8502d38011be358fc901e521cdb3996653b2cc0c519b9e1e5a58815134e99e64f09d50bcc72444eb2990ac2879ad
 MISC metadata.xml 540 BLAKE2B b064697aa562165a627cb1be8cce847c8046d10cf184a4563a632c43ebd1916ad866e843efd49ae5659e379f3695514005b9d601117719c9f48652dab48dcea8 SHA512 7ff1fddaca73c5d7b4a6a9ada9a7aad60e16c8c7063ad5cd9cf57301f504f6e0fe53bf568dec83abf522c2c099d2b3b2463619df17077ebaa3b39bd67bd738c4
diff --git a/dev-db/lmdb/lmdb-0.9.18.ebuild b/dev-db/lmdb/lmdb-0.9.18.ebuild
index 3752e4ce51ca..95346b1baed8 100644
--- a/dev-db/lmdb/lmdb-0.9.18.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 1eee0d7c4b45..7e86317e9e1d 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -8,9 +8,9 @@ DIST mysql-connector-c++-1.1.6.tar.gz 522236 BLAKE2B 5f728b418fa7d395a83679fbda5
 DIST mysql-connector-c++-1.1.8.tar.gz 528954 BLAKE2B fc2a606364426834335142375b99546e2ff1251e97add8ee4ecc370feccd7b9dd09f0abc3e1e9084b824141bde2a44d55ff9baddc093f8ec17b2b91060057148 SHA512 c3ab5c1e805598d557a449c44f77ce44cc110e5b529075e38b4f775d3726ebd16a2155f61e47a378a375a9d9362d1520334ea25376636151ddd087291aafd85d
 DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
 DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f SHA512 5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148
-EBUILD mysql-connector-c++-1.1.3.ebuild 1411 BLAKE2B 5d053c8611a0af0de62850c86e4cc34114984f1a0551d8c4486e03003df316b2ad4a970a527324b6c4f2138a66c334fcd342c418a13a984ab336b2f421bb7817 SHA512 ecffb736efeadcce8c93290821f1323c7e37a8f45ad606d0e8f1a6440af75ee6b9b1863affdd0c91a56255e566d534ed9175400cc56c5071b8af2430b2b0af5e
-EBUILD mysql-connector-c++-1.1.6.ebuild 1541 BLAKE2B d4f72d78703a32b04f043efa58a694760c6654733e6f65623325146b77ea37a846652dd58ea165f88a2f6223430782d81421fe84f3f1d4736a076ca77eaf07f3 SHA512 b8f5eb48edb0c8baade552ef9126badaa72abba78f1b7e9cd875b4f71bbd58c2619ed2cb2c37edb47ef90699ba942b0e02e310e7ed908f90b891a1807ea05a5f
-EBUILD mysql-connector-c++-1.1.8.ebuild 1569 BLAKE2B 5fa39e2dd02ccd14bd986fb23c8df342b2e9740cdd17d3010b3ab99abe77ff1169ce7f9d1be6f87d70e48440c55dac6554633ffd33f65db1ee772bf68ed66ccd SHA512 ab305ddc37dae3d8d32b894c1a100e2eab029362eb9a14806279df6426098a53764cdaa40b82f9f17b54b2f087ff29b29e479a775ff9a1a0cb4e1438032e8621
-EBUILD mysql-connector-c++-1.1.9.ebuild 1576 BLAKE2B 8719ab48a01b83979ad89d6ec777373c6d0eab5c1ef0c6d51d46afc35a01beb5317f55622e1156c4d37fe229abec3b4ae24925c76dc0a05977702d3e5ca76888 SHA512 ed01ef8f9b63c63e4ef148cb9945d75df4da111e2689a0d04b20eed62af0395868b9fb2429d6f4b692811c7358830f0ca224c16837ba18d4e0091f14d269171e
-EBUILD mysql-connector-c++-8.0.11.ebuild 830 BLAKE2B 8b98298ff1de8b207eec94e3462a24a644bec7620798ddc332c4c3ce30447f067f73d6a4bc8e4bd7277fbe42a6f9375a88b83c1a40cf1503c18788c67aa0c217 SHA512 f0ed218ec6aa66767314966837dc9d15233c90e4a113ed797c3e5bf421fde1f5734a073f4c90f8bdbc82b765a49499a9942796cbaddeaf6b4e647ee745b0e6d5
+EBUILD mysql-connector-c++-1.1.3.ebuild 1412 BLAKE2B f03aaff8472d3383204b1007ec65bb2d149c3e7d66c2d85c24d211dcd353ec0ebc03b9fcdb974f93fb5415d28a67676c82e6b458925619666bcf7096b43189a3 SHA512 e0e929f2d987da18c9a70a22e6bba0c7913c26b4f875cd0327ab9d85fa6f760c16b8dbbc3933bff080c2e0e863dd8e455a0f4d78ca68fad5298ec0a71594649d
+EBUILD mysql-connector-c++-1.1.6.ebuild 1542 BLAKE2B 56240c2cee4a328814d804034873bc46032194b636c7b2d49f40d6fca0db683a8a95632f4084e1d3028e281dc0a4b50fb7880946375b734a3b8d8c4658f535a9 SHA512 ab41d0675ef75135be6d5948e01af4d443cab5b9784dd738037c13da65c3c5d331dc70bb4e581f67c9f72e017ab7e977e5ed729ed3c8bccbfbf54c7f57c744e0
+EBUILD mysql-connector-c++-1.1.8.ebuild 1570 BLAKE2B 2fdce62496284a0e17b4bd5dd6aa92c424debb3d5ef6e42a7962e439c1cb4878c4f7cffa2dcfb6c7ab664f2c59f31b1e09e7ae71965f851f4ab3bfdc075284ed SHA512 44b999b586e476efdaa014fa3419413c0e323b1fd33ea78ff16fa2fce16ac02afc5c898358a854a341fb0518a1b3cb012c7720416292f15a86e1eef74402ccd8
+EBUILD mysql-connector-c++-1.1.9.ebuild 1577 BLAKE2B 15e5b5cbb400f48587fb9ad63ecf54cf30233cb8224dabc0adcd300c741337442c6ad67f6270b4ddfae9b167bfa1fd9bda8b2fc4a2351ea726371c1d258389d7 SHA512 10b0ac65eead1fd5acb751088b8cbf249197c22b722b8a2818dd7791b28c3ff6cd47358fa3bd545cdfb1681da8c876cd5abcedd57372a256398741c0ca0c494d
+EBUILD mysql-connector-c++-8.0.11.ebuild 831 BLAKE2B cd00b3ef8d70e64c8fa7d4852a45d58f060fa443dfb90ebffdb3fa11310d4afabf0396eb05ec4af04b2d3fb3115f38b10eb76a1a302d9d7a1cbb5b4f7e61fda0 SHA512 8de6feaa69664b8faea224769777b7050470fd0b60c0d317e00049bc0e29471bac94274ae0da4239ff211651bf3775df0526d29a02d39d88b1d107bddbb44ee0
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
index 57d25d9de98d..ecc91680b59b 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.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=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils cmake-utils flag-o-matic multilib
 
 DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
 URI_DIR="Connector-C++"
 SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
index e5de51d1a0fe..da199d2a86e5 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.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
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils cmake-utils flag-o-matic multilib
 
 DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
 URI_DIR="Connector-C++"
 SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild
index 1120d852cbed..9601a542da48 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.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=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils flag-o-matic
 
 DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
 URI_DIR="Connector-C++"
 SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
index 2f1872df3f0b..268aa288fc07 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.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=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils flag-o-matic
 
 DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
 URI_DIR="Connector-C++"
 SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.11.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.11.ebuild
index d4dc993c7760..ddae008cc97a 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.11.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.11.ebuild
@@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils
 
 DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
 URI_DIR="Connector-C++"
 SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 7e9e1891dfde..b58b693aef4b 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -3,22 +3,12 @@ AUX oracle-instantclient-basic-10.2.0.3-makefile.patch 356 BLAKE2B 911f029b446e4
 AUX tnsnames.ora.sample 2939 BLAKE2B d02d4be5eae8c8da346f8b0ddd2b6808e59f8e77f805b22154a77d22db325d415ecaf811323de3c7a6764a9167fb7f9a9708d1cf2de891858bc43bd5e050954d SHA512 25bb734bf4b7ea1d2ce2bddfd241204e796cad0d1d49036e567237d7ca92d158ab7bf69ff3abe210050c8ee0a0630f9217ced22dc31770814d822f93b2af5845
 DIST instantclient-basic-linux-11.2.0.3.0.zip 58502865 BLAKE2B da0f428447a4300dc64b9845d6f55c3dbeff38af06b1cb38b083f661a575a5c1749737ab389b7222f7be2a05ccdf367830642b1656505b078c0c3ca523159ae8 SHA512 c790f593e67bcc7c114a6287e1f064c03f292472e0a1a5e617a9f19017f06442f31502f66af8e6cfdf2235a18546104dc9aac164a3aa641db5728b66685c9302
 DIST instantclient-basic-linux-11.2.0.4.0.zip 58793148 BLAKE2B e0f92f119a5e8890a4507160179cd49af15ed14bd7c48480d3f685a3e4918a96e6444e75c6ea11d34681a6c66ff0e8011f44840de5f080e2dc3c03079361e4a1 SHA512 b333c9334e960617ac7cc68ad1c7b45f990d5c24c7a5bc8e51b3bc8ff6476acfb6a032521f75ba39327c71ee9676d1163b252066d52e97c1dfe9c092a92a62a0
-DIST instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 BLAKE2B ca6ea55aa4f8ec6add250c6b27944a15662fa78b6f2f821bf6486ba774f9fa9f8dad8c458aab93d160bd3421aa21f80bce81cd87d67154e6dcdf334df06f54a3 SHA512 6fee52e3e9c4c234a6fd437643d7c5da7bcb5bcf8f4c4dc937c1b5894226a1288f3ec2a857ac5c6affed87157dadf9fb88d7f2228503227a10375f6ec902a5d2
-DIST instantclient-basic-linux-x86-64-11.2.0.2.0.zip 59090676 BLAKE2B a6626faaab99d63d96fb67f8d6d0dea7d6ff2fb83d16ccb030e8f23de420d21939efbcb74d487a191cec9eee15927da9d920111ebec1aca6500ed0483062112a SHA512 27cc6e6b70b0f924f03d5ecb84a9cb9c8ac0adf9bd7b5a5b800e84a941732413621b8673216d135ff4fc69107223e31914afd5a04cdeb9c594a0a0314d2a28d9
 DIST instantclient-basic-linux.x64-11.2.0.3.0.zip 60331694 BLAKE2B 8d3e4946c04edd515f0d2495e8ce25b152ded0d903d58244d0d2a2b8bbaf263b0de67829a932f637193c08e96f4a532c131f50b6594009ca4ee1dc228d6a06d1 SHA512 708940b5ca5bc4e0617da2c4da61d0a85834e3e0731ac328a201954558a624162f71d342d674b08ec2cf076e8f639c230f88a73f6d9bfe8908b0e76805e617b7
 DIST instantclient-basic-linux.x64-11.2.0.4.0.zip 60704657 BLAKE2B 77735e81a0acf88221fefff38447536a81a32a6f5cb09dcd4526d43315be1fabb6882bb9e7a5703a4188ac9e112fba611f3e2c064a128eb66512935a1af62b33 SHA512 01ed32f1771bfa2f8ef1b81314843fb2b7b81582f33c07d86670c959bbb08355dc7cc8da586852bb353a3a914658d1e7828d6b5df884215de8d76881c956a989
-DIST instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 BLAKE2B 5b6628e234de93506d28d408f14bc800db2407e2ea58ce2e6be175f1be4dc31ed0e962fc1a5324f26ded7a7d6f4a9ba532705f54631adf361cf559c5c0487518 SHA512 7ebea6e7c4b2316affa6f5fd7ab821596d5ed236b10dbe6f42b8e8afed018e45dc9726b13a4f7a3c1fb9b699a03891355f538ee2848b3dfaada997d6cab71e1a
-DIST instantclient-basic-linux32-11.2.0.2.0.zip 57278802 BLAKE2B c180fbb3aac567e3cc72510f221a5d559ee19d3b330ece66bda037ae2ec1b584aa749326fdc27dda6af768dd7d46e9a07f0c674b6a1f298ddb86f39110fd63c9 SHA512 f854797b9baf2130a347a0e6a05707b1e959aa31db3817176641c5c2044f7c46c9e2e9968b4dc4856c8d16f75a4286f53103b8f8b81b3bf1ef7ce81233d94f57
 DIST instantclient-sdk-linux-11.2.0.3.0.zip 639306 BLAKE2B 80d0cac2061156fd4cfe0792a7bebcaca77ce855335c651472d0ee74cf87350ae4925d92ecd12407b285605fb0d533dcf2a6dfc46d8a0eaa6172461e9c96dc2f SHA512 fa0f98d4b2002982fab4438f734904e0ebfab777d601321423b454f9188c3b863e853fc5486c9958771f7ff8c9a544ce73e80750d745c3142872927ed1777ee1
 DIST instantclient-sdk-linux-11.2.0.4.0.zip 643080 BLAKE2B 9ea15b227d260f7e24b572be1238074dc3a3033a2ab6313d95b750ae48468bda018c52ac604664caa128396024c0ff4bcbc0d401b7900ae27f5f3877a4b44123 SHA512 09e14a0ed88182b685a00b6370da4379710c4179fcf2d5ebdb43684b7099484122f7f5181a80352464f03ae9d0150f5c2ee5f20ede98faa9073294324b9faec8
-DIST instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip 603137 BLAKE2B a97a188280d8a9537707b5d9791ae43d67b4e98cea0af8e8348f2cc1b9699181ac649cbcc6f006fee3ac9b76a1bf8d730f438e60d28341b1db25504aa164b9b5 SHA512 25b00c407d4ed04287cc8473cf156c7c987e2c36787cf1bac229b902adc2781554f10f1a50b17bae96e2704b217ff60c4eb9f8c79ecdb3d44b13c9a84784a766
-DIST instantclient-sdk-linux-x86-64-11.2.0.2.0.zip 638214 BLAKE2B 67d7f3efa0ba1999b08db435f6a806f54d74e579592171d3a8d5abb9bcdaed6f02f1d7591dd012b5ed73c33971e3009f2ae2e1869aed6c04ed8bf232ff5c0349 SHA512 5656da9e09fb35c16bed959d8746d5e4dfd4c6da2582a10a182442d83759739c3e71093cde63da1236bea04e92a8e15bda1b2e1468fed32d87f4f223ec65c495
 DIST instantclient-sdk-linux.x64-11.2.0.3.0.zip 641586 BLAKE2B b3a3fa4c362031aa9d9e926f852e2bccc41dd12c8dac0a18b707f22130a8bfc1b04e12c13b7f94a845439d922884d9f83c149ac0d59af498a73f4c74730be715 SHA512 08b3fdc68e09f262549e2505867943aff5c3927d158569ea7e0bca4f958af725a46143d325dcf80a6d48d09f9240f147470439ac55ea848a27df3eeedd28f732
 DIST instantclient-sdk-linux.x64-11.2.0.4.0.zip 643089 BLAKE2B 710f0a2a81dde6cabdfb2e1472f40cb715d1e060377bec1d05d8b1c794ec05b023f4feca30603202487b52527723ed9d60f73371443ce76ad2781da9c1ed5412 SHA512 7198ddc7d8804353900e45b36de79659d75dee0197c4dd58bd4d69408e7131c95025223bbd1f39ef208269bff379daa6e05f4371af83a82b83997cafadc1d642
-DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 BLAKE2B e7c447c012503324a7dc0a8790a32939a0739add7b18edfe025a2204c13de8c57348754cd20da71ec45543748f670935f6cf1096ef8bd1f0e4cfb06526f8d6a9 SHA512 89fb0a1f58a46149ddcccc5205cb6b61988142d01df7de7c5dd76c4ef7a2c880a19d611efb8ae03e26d361d1f9a767bf58e2d113a20cd1b9e51a29f500be4cba
-DIST instantclient-sdk-linux32-11.2.0.2.0.zip 638200 BLAKE2B 5847c7dbbd9e4328cbe5a0dc33bf0793362c7a375ffbdaff7a22ad03577d732ff1d685021d33f9f0c7bc40df2640bdaa278298f7e1e55910007391fed7b9c9ef SHA512 41d0f6e327a548c6ba152853a706d1630052f3710ad94015a1fad44cf149a260c389eb973ba49f9239e453a51ceace2c0d3b86ace764f2651dd45ad546084abe
-EBUILD oracle-instantclient-basic-10.2.0.3-r1.ebuild 3782 BLAKE2B 707dd1e9e4216596799ae2388fab9bcea6f238a611ad76c78f283dde52b4c70b6dc57880008461510e38c19d59bbcbbda7ec04ea400c50f76d5f5f1827b75f7b SHA512 6f5967d4b74ddf33779a85c343b52e4d40b7208b3a0cff23956e4e15ea677681c988ba0078adecb5d22712d26e69f19132d62bea58451bdf0f81032a6c2d605f
-EBUILD oracle-instantclient-basic-11.2.0.2.ebuild 3747 BLAKE2B 236c91fd2dac7c23c081e4c959c0da0655e5bda60510f9ee87573ba0033fbcdbae2bf5e99778b05f22bc56f88c9f1efb43285ff9d9ce1b260fc079f383c660c4 SHA512 3d2c90de9a909632b4de81e71a470f2d800fe9d5efa662fe3508d4648f2691908871e86da5b7dc6e9ec5d1f0a7d07c1cfb5fa256a071534f78c5fc2b0693dcf4
 EBUILD oracle-instantclient-basic-11.2.0.3.ebuild 5382 BLAKE2B fcd3cecc4c386c1b4f3f1e9de11c5a93747711faa0eb4b83f49ed06262f04b18d542431212d9d5353291c9a3f6e66264f6ddb17b6eaa972d50dccd516abf1952 SHA512 c64cd1bff11ed6a11251bc3aca214b7b8a4d9a75d01702eb29ce935f9f02fb72bb9128247d2e32d87fbc1e042b0b19a72dfb6009f940bb69b455adc4f38128fe
 EBUILD oracle-instantclient-basic-11.2.0.4.ebuild 5545 BLAKE2B 787d424a25ba6407ac3e0576929a93912ec5d56edcef22fe464bfd30aefb04848a43417124e5540b7d4e8d9e7376a12fcee6fb86b8fa53d29236871592d9d87f SHA512 f7f97eca82b62f43dd17170d5c9ee492f029f8e99b746511712b56cdc4cd45a96a68757101350ab05aab6e7ed5cfe2fd70154c8b28fa4e3c07bc6f961e1fec2b
 EBUILD oracle-instantclient-basic-12.ebuild 402 BLAKE2B e28e2e4f9eac3eb342bb4e2eba6595db3ae6ce88019c2b46ee291ddab39aab08426ffb560e3180d5e14fd5e0e8344258d8e8d3cfa79d850d1da092ab86846da1 SHA512 374a6cf7a0aa7f2942a86dffcfdfa2ae52c637986f5920a295820e8ab13446962eff19653f347274c20b68c4466400fd2467da935bc0633fe12ba2fb3f1cf414
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild
deleted file mode 100644
index 78e7bdd82af3..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
-MY_PSDK_x86="${MY_P_x86/basic/sdk}"
-
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
-MY_PSDK_amd64="${MY_P_amd64/basic/sdk}"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )
-		 x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="~virtual/libstdc++-3.3"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-	MY_PSDK=MY_PSDK_${ARCH}
-	export MY_PSDK=${!MY_PSDK}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.zip"
-	eerror "  ${MY_PSDK}.zip"
-	eerror "Then after downloading put them in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-	unzip "${DISTDIR}"/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip"
-}
-
-src_install() {
-	# Patch the SDK makefile
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	# SDK makefile
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	cd "${S}"/instantclient_10_2/sdk/demo
-	mv demo.mk demo_xe.mk
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	doins demo_xe.mk
-
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_10_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.10.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/include /usr/$(get_libdir)/oracle/${PV}/client/rdbms/public
-
-	# includes
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/include
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/include
-	cd "${S}"/instantclient_10_2/sdk/include
-	doins *.h
-	# link to original location
-	dodir /usr/include/oracle/${PV}/
-	ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client
-
-	# share info
-	cd "${S}"/instantclient_10_2/sdk/demo
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "TNS_ADMIN=/etc/oracle/" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-
-	# create path for tnsnames.ora
-	dodir /etc/oracle
-}
-
-pkg_postinst() {
-	elog "The Basic client page for Oracle 10g has been installed."
-	elog "You may also wish to install the oracle-instantclient-jdbc (for"
-	elog "supplemental JDBC functionality with Oracle) and the"
-	elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	elog "packages as well."
-	elog
-	elog "Examples are located in /usr/share/doc/${PF}/"
-	elog
-	elog "oracle-instantclient-* packages aren't installed in different"
-	elog "SLOTs any longer. You may want to uninstall older versions."
-	elog
-	elog "TNS_ADMIN has been set to "${ROOT}"etc/oracle by default, put your"
-	elog "tnsnames.ora there or configure TNS_ADMIN to point to"
-	elog "your user specific configuration."
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
deleted file mode 100644
index dce75a0bcb66..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
-MY_PSDK_x86="${MY_P_x86/basic/sdk}"
-
-MY_PBASE_amd64="${PN/oracle-instantclient-basic/instantclient-basic-linux}-x86-64-${PV}.0"
-MY_P_amd64="${PN/oracle-instantclient-basic/instantclient-basic-linux}-x86-64-${PV}.0"
-MY_PSDK_amd64="${MY_PBASE_amd64/basic/sdk}"
-
-DESCRIPTION="Oracle 11g client installation for Linux with SDK"
-HOMEPAGE="http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )
-		 amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libaio"
-
-S="${WORKDIR}"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-	MY_PSDK=MY_PSDK_${ARCH}
-	export MY_PSDK=${!MY_PSDK}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.zip"
-	eerror "  ${MY_PSDK}.zip"
-	eerror "Then after downloading put them in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-	unzip "${DISTDIR}"/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip"
-}
-
-src_install() {
-	# SDK makefile
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	cd "${S}"/instantclient_11_2/sdk/demo
-	mv demo.mk demo_xe.mk
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	doins demo_xe.mk
-
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.11.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/include /usr/$(get_libdir)/oracle/${PV}/client/rdbms/public
-
-	# includes
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/include
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/include
-	cd "${S}"/instantclient_11_2/sdk/include
-	# Remove ldap.h, #299562
-	rm ldap.h || die "rm failed"
-	doins *.h
-	# link to original location
-	dodir /usr/include/oracle/${PV}/
-	ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client
-
-	# share info
-	cd "${S}"/instantclient_11_2/sdk/demo
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "TNS_ADMIN=/etc/oracle/" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-
-	# create path for tnsnames.ora
-	dodir /etc/oracle
-}
-
-pkg_postinst() {
-	elog "The Basic client package for Oracle 11g has been installed."
-	elog "You may also wish to install the oracle-instantclient-jdbc (for"
-	elog "supplemental JDBC functionality with Oracle) and the"
-	elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	elog "packages as well."
-	elog
-	elog "Examples are located in /usr/share/doc/${PF}/"
-	elog
-	elog "TNS_ADMIN has been set to "${ROOT}"etc/oracle by default, put your"
-	elog "tnsnames.ora there or configure TNS_ADMIN to point to"
-	elog "your user specific configuration."
-}
diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
index 4039dacf6cd5..0c90bb578df5 100644
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -1,13 +1,7 @@
 DIST instantclient-jdbc-linux-11.2.0.3.0.zip 1562543 BLAKE2B 7f32c39cb7c4fbdd54db0015e081bc8d913e9570c4651d2e41f17155f2a77772826ec823adaf36b44d1264ff686c3735835a483f3cd1551a1f5274c028692fd3 SHA512 f78991e57eed2b095e8659825723bfc107d3c4519d1864769a0190f22e3d5667a1a4213a067470a8fb07c1f0562ec950c9fbe37f70e9475811dd1edfaf3f17f0
 DIST instantclient-jdbc-linux-11.2.0.4.0.zip 1562440 BLAKE2B e3f377802958b22aede4d91c9bc16a85f5c0ff2cec3066a4a49f5c71ab90c17f9b7c6f29da146304327569cb3d5d533a3807941e4061254e0cf57a8387a55b04 SHA512 0a92a6529642203d48846d3f22f3756ada22942ea5e7c36d779d220dc7195301d4016edd8ee5124f9e51429bb77d9890602c1a18884eec58ff40c2aed24e55f9
-DIST instantclient-jdbc-linux-x86-64-10.2.0.3-20070103.zip 1493549 BLAKE2B d043e7738cbb532b65b4279a54a52560ab508dc5ab7dc2a80d07e39beee6ac42fb13f06e160051433e23c5abd9251ec0e5b7703d39b2d136cc4020bbb758d52e SHA512 061c9b74f419d77dc5ef53ce7dfa784fd49724ea6de508b85c81f3c92fd6f97941cfccaa50c13f811dc8e0fed62bd00caa1b7015177327a3f483e75f77a36e8d
-DIST instantclient-jdbc-linux-x86-64-11.2.0.2.0.zip 1563157 BLAKE2B 99f3b47ee4122550a1b941bcd46ed04abeb8c5b762b33a10f1458ed38b58af1e87418564e1b88127ddad7b260557274171e504a85254ae716de4216e5ae41b04 SHA512 f59a856263fbf60787b0014b52995616f2231f4da7b848d0732f870366963ac188e843c5d5fd254f1627e7db5f94a8df7d7e58de2ebbc2d205fda70ed8f86f1c
 DIST instantclient-jdbc-linux.x64-11.2.0.3.0.zip 1562504 BLAKE2B 07f0753ff2add12924d05c6a4b4d07356726c7ca7d8a3118e0d65bf30db04eb89aeb0255591583714cd168782313eb083764d6ca9ed64b2081dc119c46222114 SHA512 afb824786e01f316dfa244e304fae7d9a34f4175de8ff6622bed116a9810bfca9ec5eceda6a1de95d46f7170fb63f1345dc1886efd168f1daa8c8498d2b3c8d7
 DIST instantclient-jdbc-linux.x64-11.2.0.4.0.zip 1562474 BLAKE2B f93a05ad324bb364ddab83b0bc75f6c0bc8d7224f53cf337c9887f99e07c98a8752e7d4581b19ca38c70bbe3fcf1b492d753f715bed7ba8144f37c03cc9524c0 SHA512 289a08bddc81687b73a42fb35ae6ea294dd8f536ae9d3e95142ab78ad72eeebf66947fa6f5585e48e35b7f92e65fe6a295fb564b8353d389e76bfecf35c48c18
-DIST instantclient-jdbc-linux32-10.2.0.3-20061115.zip 1482939 BLAKE2B 755e0c216a779ba45461c24e7128e259e720150905ce9f3a209ddae2e7cd64b954afe449d951684bc0f62507555445c58d128cbc8f233624fd2da07c86be706b SHA512 b43f9606abbd25f9acc9089d4ab8a2ce8da9b983f9f4577d23ee777a83de5debcf1e5dfd3a7ed0774a89a2fb1444d753e9ba554483fbbf397af21510b40d064d
-DIST instantclient-jdbc-linux32-11.2.0.2.0.zip 1562555 BLAKE2B 493b51e8647b4dae35db0d91c149d26a988a5b8a4ddcd372f852a0e2857049c6765cab1fc2a69af886b495b80e3cccbc2ac86e4ba095d037fcacaedc96048d54 SHA512 0383eb44db329cc3dad9cebf8b84d7fe9b7e01271afb5aece34397184a89fc42b9c3cabe6319f0ac639c7883d3eb8cabe92aebcd3383a908a4aa9807a943bd3a
-EBUILD oracle-instantclient-jdbc-10.2.0.3.ebuild 1487 BLAKE2B 448db8a1d4f7442ec24969d7dc7f0a206bdc6bfab204c46525c68bee9ff59ddf118844a4301e228ef271e1503a2fa6bf325fe4390ab24bda64d5576ed481de3d SHA512 38bb2ee71266d40390bdcc977fe26975c4735001a5a95ba505c0ad1fcf010282bf99e09dcae43cc8e2752cd28195d3074c4eccaef68b74b26abc45dc5f4e90aa
-EBUILD oracle-instantclient-jdbc-11.2.0.2.ebuild 1359 BLAKE2B b03ead0ac6c968a1aeab751de61e200596185614da97b5dbe045b6cee3ec0d8c018431d8a7f47a368e73429c1453b98b0eb2beea97d6b28944cc4ed515407d61 SHA512 7549464a8343716e5e8b3a03f658f5d4c429689b412b1962c98629cad934a010b36b7209049f71956657233d79bd8fde2a3be37cfec748025085aa5f0960b049
 EBUILD oracle-instantclient-jdbc-11.2.0.3.ebuild 2156 BLAKE2B a3d41f3326b3241c08b0237fb368016b2150b5d9c92f09b1e46c557cbab7a8f6409e86caf396adf65823cc0c941d4019057aeb319780c9767f2a7f6e9c9f4076 SHA512 ab75d9b8d07156987e55c734a2e4ae1f73f5ff8261f944481b3ad49885f15d9c3ed6c20cadf48081efde9b70f3b9bf3a6bb2546f172c02ab1955ed36fcfa137f
 EBUILD oracle-instantclient-jdbc-11.2.0.4.ebuild 1940 BLAKE2B 82d646597b770e00aba5ba209e201bda7712e4907cc1e8ad657f9fa017b5fb88e9e6127ca383c7b307abedcab2b3c184c43b17d6071912f8c1aa4956cddeaab0 SHA512 02c6e4f6e355c47ca49f179ed5ba429e9129f7a23dbaa544f8e63c65e76d3aa9e9ce5e3d5ec72bda68eacfa7b368e7b00ef79daf0ed7e02ff9c125e47807f453
 EBUILD oracle-instantclient-jdbc-12.ebuild 446 BLAKE2B 4c4ac2052431b4860dcce08f0a62983b678714cf5ac3886e961947cc8c1ef889ab3c9a68ac80a0aff20fda54ac8760b70822eb844d2a3be3433f2ae2fe5a625f SHA512 cf45109d2f12847fee0eb95f9de3b72607669dde197e3b1859847b1934568b29b0059c1eb2fb83e08e5ace86078d357df26ee0e8b3dbe44a6372ea9387ea720d
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild
deleted file mode 100644
index 9de17c080547..000000000000
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux: JDBC supplement"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip )
-		 x86? ( ${MY_P_x86}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="fetch"
-IUSE=""
-
-RDEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-pkg_setup() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-}
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the JDBC supplemental package.  Put it in:"
-	eerror "  ${DISTDIR}"
-	eerror "after downloading it."
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_10_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins libheteroxa10.so orai18n.jar
-}
-
-pkg_postinst() {
-	elog "The JDBC supplement package for Oracle 10g has been installed."
-	elog "You may wish to install the oracle-instantclient-sqlplus (for "
-	elog "running the SQL*Plus application) package as well."
-	elog
-	elog "oracle-instantclient-* packages aren't installed in different"
-	elog "SLOTs any longer. You may want to uninstall older versions."
-}
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild
deleted file mode 100644
index f04f41b083ee..000000000000
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
-MY_P_amd64="${PN/oracle-instantclient-/instantclient-}-linux-x86-64-${PV}.0"
-
-S="${WORKDIR}"
-DESCRIPTION="Oracle 11g client installation for Linux: JDBC supplement"
-HOMEPAGE="http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip )
-		amd64? ( ${MY_P_amd64}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="fetch"
-IUSE=""
-
-RDEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-pkg_setup() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-}
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the JDBC supplemental package.  Put it in:"
-	eerror "  ${DISTDIR}"
-	eerror "after downloading it."
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins libheteroxa11.so orai18n.jar
-}
-
-pkg_postinst() {
-	elog "The JDBC supplement package for Oracle 11g has been installed."
-	elog "You may wish to install the oracle-instantclient-sqlplus (for "
-	elog "running the SQL*Plus application) package as well."
-}
diff --git a/dev-db/oracle-instantclient-odbc/Manifest b/dev-db/oracle-instantclient-odbc/Manifest
index 4f340e83a17b..841f8b911643 100644
--- a/dev-db/oracle-instantclient-odbc/Manifest
+++ b/dev-db/oracle-instantclient-odbc/Manifest
@@ -1,10 +1,7 @@
 DIST instantclient-odbc-linux-11.2.0.3.0.zip 273840 BLAKE2B 54fd920bb69a12f2df387e89907c6c2a64f05fd611cb53737d6773752c3a08fbe4cb36cc43017a62e7861cd6245b4d92cbf635fabc921c0aeeaa8d00f9e012d5 SHA512 4d928e9eb3deb26db7a95a0e5417bd9355e97956d9394dc2792752fd45002b0abc3463fbb7f337f4731084aa6006d1ff635443c5503f94c6bd97d1bae7245885
 DIST instantclient-odbc-linux-11.2.0.4.0.zip 274999 BLAKE2B 33855608fcd61a7f4ebcab3f969b028069d636d5a709676c07733aeb20dcb4335f485844ec72cb0816307e36c7f0b6748c08ea6e5c67c853999ddc1b0c23eae8 SHA512 64d75c6f9aa4e5b74da12a2a293e6ee7017017a12a724596d51606d3a8d7a9d9653c158d389a5faeb02893ca6a6a93650605d71f885f9439427847583f5cc820
-DIST instantclient-odbc-linux-x86-64-11.2.0.2.0.zip 308445 BLAKE2B 30760e99cc361cdecd74d176d173aec2a64df99c06c3b89e2edd91be3e01119f3bb02c53a1aadfcddb42d1302ac1a371bff9e4574fadd52986f3ba329ebb0ebb SHA512 05d38d08dca3a1ec3dab8cddfb3914c330fd0f737221005bd3c90aecda10117df08a592a8113feb397d9ea7ebb2cab05d427e278d5009b54ad25da7aed9c95b8
 DIST instantclient-odbc-linux.x64-11.2.0.3.0.zip 309061 BLAKE2B 9ddd2569364a383f525052d4c795c423ed4b44a588ec4e11e5f5130604b6d74b4ede2afdb326023d8a0167b1522669c9acc6f9e74928423f62d08c93404cd98d SHA512 a18c040fc780f893ea22fd6c79b3299d9327975a768a6518622a8ff522dd29a7019494ca7a1227483098f13afe1af1655611a32e06806bab94ab2fce2dc55e3a
 DIST instantclient-odbc-linux.x64-11.2.0.4.0.zip 310560 BLAKE2B dc97373ac00f07b4d02beb45ed053d5aa8909fc380990426c118e3fb42b08e8e5e699a518aa137b3fe159107c73929e61d59c997e741a343803f5c26036adf9b SHA512 19f999207e5ea2b5db18b40c0eb40c6ec1ea8a3117915a723338e5c423122b747c5e371446d631c00a5c01005453f85da1d2e680a2c1771a495dc0b68812df69
-DIST instantclient-odbc-linux32-11.2.0.2.0.zip 273410 BLAKE2B c7084ad8d048c979a24191bc995f095e6cf75853cfadf3fa1ae7d6285b52b0519e2a50bd217908c32babc1aa67451c512c15d8fe7322b100f67f72ea5d663826 SHA512 eae68ebdd94f579761b0510fcac5e33b441833c0bdf957a9324e9d1c8146d7cea35419b18f72bb16730e95ad9e45a1c4c2d8085e252331e545f93657876a558f
-EBUILD oracle-instantclient-odbc-11.2.0.2-r1.ebuild 1554 BLAKE2B 9cda04029e8d8e7b2871ed36db7e68943550960713c1eda607f3205adf9a2dd298b1f0017bafddaa566984c5edfc8e7b2c4c9210949eb5984f1ac4ad2ea7a13c SHA512 e0d18f4a88b4d853618ffe74141f1560a8bbe7689aba4e051d84c6ed140d10a6a9514d909bf0f4564eedf1ae742bbcd303c53fab223285a304b1e915443cc9f0
 EBUILD oracle-instantclient-odbc-11.2.0.3.ebuild 2353 BLAKE2B c0d060beb5acf0c3220cb4ee2bb4726f56c2b3e89de34b1025f6301ecc3f4bb1f920f8877831acdeadc9a5d0288b6171f78adb6572995540987506d73962f1d6 SHA512 598894987ea0d942faf418f1041e0cd71929c748cb12e4f0039195cb06dff3de6a058ee59665b9981944c1565d0c4bb3face220f5f9c552804033053deac9f8f
 EBUILD oracle-instantclient-odbc-11.2.0.4.ebuild 2083 BLAKE2B 07ff5ed964d5fa8b0d71bc98ec0cac68fba5baab2eeb20aa1e8f8d6512ddce221aa38ca512e57176a2530375bc32495c13bbb9ef830f580c316c0fbfad93ec83 SHA512 41b13fd6d264e51176e54496cbd149893649e6ffde2cf38098ee71adfb07b50eb20e00b840ec1f263910df0341d2ba33bd420ae51203102b93a2b3f1e1be3741
 EBUILD oracle-instantclient-odbc-12.ebuild 446 BLAKE2B 9c962da89fa2a005b07f71c926e5d07d86c4f04fc630e240e94496bc1f4ee15bba490588832cc2de0a9992a2efa528539deea58ac48d5895a640a340b01bc356 SHA512 093eea8b2f3c0873ca091a2a353132d35eb73ee707cca22b6b59ccbf3bcca72617b4a9f2f7d08db3a86f034b6f9a849aba9c09bb966f6f96a3ef9c92aaccfcac
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild
deleted file mode 100644
index 0692b2a03547..000000000000
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}.0"
-
-DESCRIPTION="Oracle 11g client installation ODBC supplement"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip )
-		 amd64? ( ${MY_P_amd64}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-db/oracle-instantclient-basic"
-
-S="${WORKDIR}"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "ODBC supplement, which is:"
-	eerror "  ${MY_P}.zip"
-	eerror "Then after downloading put it in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-}
-
-src_install() {
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.so.11.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libsqora.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libsqora.so
-
-	# odbc_update_ini.sh
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
-	cd "${S}"/instantclient_11_2
-	exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
-	doexe odbc_update_ini.sh
-
-	# documentation
-	dodoc *htm*
-}
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index 8ef9326a15c5..fbdfa87041c2 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -1,13 +1,7 @@
 DIST instantclient-sqlplus-linux-11.2.0.3.0.zip 796570 BLAKE2B 0492185103d5fb36f3acb8f52e937fca35bb8b7308eb9317d43f25f4fbde39f15b8b6de0fc9065d04c809a94731c7c011dcac1daf4e734405d065d9959cf215f SHA512 241d812b3955b11efba7764f463417e79dd973ce7ad0624144e661403b71b1c4fb091c6e42d05759eaf74355dfe432970375064d4018cae9ae67cd1401095460
 DIST instantclient-sqlplus-linux-11.2.0.4.0.zip 792608 BLAKE2B c3e8f0843700df9f95428b01520400d95076df5e19169f2a79982293e54ce6cc74321de0f34a0e7865d5d29535e38b60bcca127be06343c979a40985bf349012 SHA512 8f5ff27043a036eab038080bbdc056325cc2c197e12de34e74a8da17bf69b44e4fd4200b638881d86fdf1dc1450d8e1d033daaa56386bd2c8784d556ba0093ce
-DIST instantclient-sqlplus-linux-x86-64-10.2.0.3-20070103.zip 789884 BLAKE2B 534d42a3f4a549a46bfe2c7bd4b13509e559fdb1c53b5e449652ebd8a1f71133ad564ab0c5ae5e6a2bbf1300c97cd68305ddf0d3037e49581556a89c66489f5a SHA512 5800c0f1c39a0ec4a2da1bc09a9102d62d4efb42618dfb5a2494da81c9268c1e29af5576dee72917019b12d1ed6c55ec0f80b96017a6812f6c20c660180c324b
-DIST instantclient-sqlplus-linux-x86-64-11.2.0.2.0.zip 837382 BLAKE2B 9218cfddc5e7526c7ce70c5370c67c91f0f3372f45c40c9ebaea412e8e3e725188a39f43977e6e183a75b09f7d988b8026d6edfb3867b1acf434f62e2a73b683 SHA512 cf68f1280ef5094083c2b0f0e0f255b0b6e037f4e5a3e28e29b2cdf84a5561aaf23462eddbe46066f3f5015d95d79879637dd54b4a16bda2c9b56372de886aea
 DIST instantclient-sqlplus-linux.x64-11.2.0.3.0.zip 837574 BLAKE2B c1f123b68b60f211843af954e33922e46d05ff89ce68e8357a8839e7fce83cccc31ab3f16b87204343376657839fd582fb2c80be3148cc34f2340191ed261526 SHA512 55bbac5e8267a4de2c7f9f6750f0e38dcf7c775bccc2e1e05df7fda9e6ffa7d394776e605980d8b67176acf52ba88f2dcaa959934740a1ca6f91d10b12d14024
 DIST instantclient-sqlplus-linux.x64-11.2.0.4.0.zip 834491 BLAKE2B 487091d97c0f2ec383018c39a957c8a27b030c4c8754a6c2714237dc875b89b250b47dbd28ca228a98c6199323ddd031452e1cc90c60824fbcca536aa38bff1f SHA512 b7180b5667e604564cf379b9eb55a2fc8994b87cfb993e728b4c1bdd297cab134a55580018429bdbb2b101ebdf8a350bacc1ddf5a30e1cc419092054c79a108b
-DIST instantclient-sqlplus-linux32-10.2.0.3-20061115.zip 741699 BLAKE2B ed97e2e52a06e4fcb682a6e8a8f40c73a15148cc75e5c864f13fd77a68c07c4bbd56585e50520e7111727813ee4d6155745ceb513076ae47833eb793c203f303 SHA512 7508ef2edef5a214d9c5ab12c282f57550167233d5b26256d6e1e054eb9c3993891191e69691f20064332fb41e6ffafcdd0b2423db44e4094660832a2796e0d3
-DIST instantclient-sqlplus-linux32-11.2.0.2.0.zip 795691 BLAKE2B b29794135cf5b03df86340e7d6010ba931a92870ec6fc00435e787ed09a8518589ebe800bd091fcc9ac96011e0c82167ff4360999873deb70a43f68a275265f4 SHA512 c2be8bd4cd463c0463674b2665f9b5f55cf2a9dd396a99902d1a8e25424f6ac0d39ff45cf5b9c6c65e36cfaf77fb89acd786ee44b8092db7c1934cd51ad0099a
-EBUILD oracle-instantclient-sqlplus-10.2.0.3.ebuild 1890 BLAKE2B 0f5eb32ab68d0438d43dd06571d139bb4633a46b1657ea2605d7c2666d8ed5624942054a0ba31441dcddbb4c15269c00b8056e002ef849aa1732e2424e6063a7 SHA512 6225928fcf11639adbeb09a71ac8901f712cd8f1c2f04e609a120a32d385c621666fb54730f77824717c56df4014d755686846d0d965558b517bdba69c10187e
-EBUILD oracle-instantclient-sqlplus-11.2.0.2.ebuild 1829 BLAKE2B d0027e7eccc6367cf632d5cd006a0022a90aed3bdc9a15a390bb80e3294163818ce9f4b8b00bf9bb3153c78d6768c61e886ead6481f00c845f59577b027465e2 SHA512 14ec96c77345421299b577471cb43e68a583a244191e9bdc54c94b1dcf3a8e906aa25c01ea1368a6972c6700492a2a289759115250454da8d0d0dcddcdfec0e3
 EBUILD oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild 1550 BLAKE2B 28d750f61c9f3665fb3c0083adc4c6c5adf18ed22d2d6ae2e0272b434554535ecc55c7351a75822139ae225caca1b4cb5cd0f3ec317f10af25db9f2426e63c8c SHA512 09b716cbfa86620541cd8b9840c80e73b4b0de080421367fba7cade2ffd43426b63985ec9085fb7711bd257f65dcb34396f594ce5e6c3992f276a77836469dc7
 EBUILD oracle-instantclient-sqlplus-11.2.0.3.ebuild 1483 BLAKE2B 5c7b206bb6e6d906b360d51124ef2c764a60c6e1c0e2f107ab09eadcf629f6a52c5994113c1fc75ec9f149cb1a28b92f30bb6c323bb4d3a85f61003faa14a2c6 SHA512 c64c6d2e3f059bfeb0b4dfaf974952599327ff9af7045a51a4109a2b2505df441872effe01b4c4dfbe5a01e8ee58d65fa69e84c4b6943092fd3e6b377e35bd92
 EBUILD oracle-instantclient-sqlplus-11.2.0.4.ebuild 1552 BLAKE2B d48c484eea73e4aa3348b27f0a20938e8af78df16fd6d449462b113411c3d64cdb1b20561bf39bc7c0f3c86009e63ff8526055bcf0de25df33077845fd9d13bf SHA512 dc5a6ea8f004fd66ea4e4a1cbe5c96ba9f1ccc573c208735c78eacd6b678b2b4cd3bb8c3da57f6fb0f45e3fe402cca0d4c4eaa4431e08dbeb973426134c1bfa8
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild
deleted file mode 100644
index 90a30547bff1..000000000000
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux: SQL*Plus"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip )
-		 x86? ( ${MY_P_x86}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="fetch"
-IUSE=""
-
-RDEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-pkg_setup() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-}
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "SQL*Plus package.  Put it in:"
-	eerror "  ${DISTDIR}"
-	eerror "after downloading it."
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_10_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins glogin.sql libsqlplus.so libsqlplusic.so
-
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
-	cd "${S}"/instantclient_10_2
-	exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
-	doexe sqlplus
-
-	dodir /usr/bin
-	dosym "${D}"/usr/$(get_libdir)/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
-}
-
-pkg_postinst() {
-	elog "The SQL*Plus package for Oracle 10g has been installed."
-	elog "You may wish to install the oracle-instantclient-jdbc (for"
-	elog "the supplemental JDBC functionality) package as well."
-	elog
-	elog "If you have any questions, be sure to read the README:"
-	elog "http://otn.oracle.com/docs/tech/sql_plus/10102/readme_ic.htm"
-	elog
-	elog "oracle-instantclient-* packages aren't installed in different"
-	elog "SLOTs any longer. You may want to uninstall older versions."
-}
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild
deleted file mode 100644
index 51544359f41f..000000000000
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
-MY_P_amd64="${PN/oracle-instantclient-/instantclient-}-linux-x86-64-${PV}.0"
-
-S="${WORKDIR}"
-DESCRIPTION="Oracle 11g client installation for Linux: SQL*Plus"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip )
-	amd64? ( ${MY_P_amd64}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="fetch"
-IUSE=""
-
-RDEPEND=">=dev-db/oracle-instantclient-basic-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-pkg_setup() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-}
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "SQL*Plus package.  Put it in:"
-	eerror "  ${DISTDIR}"
-	eerror "after downloading it."
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins libsqlplus.so libsqlplusic.so
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/sqlplus/admin/
-	doins glogin.sql
-
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
-	cd "${S}"/instantclient_11_2
-	exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
-	doexe sqlplus
-
-	dodir /usr/bin
-	dosym "${D}"/usr/$(get_libdir)/oracle/${PV}/client/bin/sqlplus /usr/bin/sqlplus
-}
-
-pkg_postinst() {
-	elog "The SQL*Plus package for Oracle 11g has been installed."
-	elog "You may wish to install the oracle-instantclient-jdbc (for"
-	elog "the supplemental JDBC functionality) package as well."
-	elog
-	elog "If you have any questions, be sure to read the README:"
-	elog "http://otn.oracle.com/docs/tech/sql_plus/10102/readme_ic.htm"
-}
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 98397804065b..2f1984a49376 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,5 +1,5 @@
 AUX pgadmin3-desktop-r1.patch 512 BLAKE2B feba83e9311785f2bd47f76328d5ec25fb8dbd6686207ecf22cbcf22bb863850ed6ee87f051ae8c709901b4d06e99742b8fa9a5d74a0758632eb29a89f8c9a7f SHA512 8a3253318ad6b98136b8fd4539dffc030d9625a256d7f802a399e972b9a5cf3440a3c602bde8ee21091eed4aae8c736643b9a15246dfd3bae56c8dbd80847ae6
 AUX pgadmin3-gcc6-null-pointer.patch 421 BLAKE2B 8e3c27ce3c80a01e4536253086eb2e6d4bb41e487db3084052acf5ba96a185ad186373d5ca9d5fe3a864cfdfa728350be8a44b66e04c3565e1bb0995f0b6e6a0 SHA512 c0fe3d3cc5c1c29f69f3b81b0c78fbe2cf6e484e3ace9e35a3352d93246fc8227047c7c59a168bedfdc7b4f67d3db800c8b1d7cd962d7952436e080a2ea1e083
 DIST pgadmin3-1.22.2.tar.gz 14788481 BLAKE2B fd38ae523bfc554138f56a99ee5fe0aaf2446d3b77416552861d4c3d3d939e553ee160264720af3095f91d270b6c719e078ec29b998c2f4a13739ed34c4c0312 SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd
-EBUILD pgadmin3-1.22.2.ebuild 982 BLAKE2B 5751d698310aafd745c8678a8e409b77ee6eb0f1e3bb298c89d503191612c10a4e8950726ad42d534a93bfd2f9d78c9f00ad2151b7f2988aa85c47751b3e816c SHA512 da97cc8230205221db85badf2508e778e40099464c76494699e1b90453b440372fca112f406b01f08db1128132134a10df0718ca794bd848226fad08db5f4f3e
+EBUILD pgadmin3-1.22.2.ebuild 983 BLAKE2B 5ac3559d8547070ae9c6dc6018549406880dcbef8bf733a77637dd63a56d6a20f8a7c0708770c97364344928ef0c1c5f6296abadd039fdaa84b28032564f659e SHA512 e7e039b7ee56e62ff07e3326cc8338fda848b58936afeeda80238a826f9a13bf06c9da13c1fcc3b3b7f6465c889460fc66f6fbcdf3356caaca990a729167c317
 MISC metadata.xml 368 BLAKE2B ea267a284f54ca0becf05f4a7579a167ee591178e17e3922d1c493bdb24fcd63400f2146625108a0d42f7816c75bdd7b1c836c8c354f2058c4fad15c8a0f2a6b SHA512 435f2da400e35d133390ec90860cfe1dd135281156ae1ed6c28e32b4e9f67d93cdb5e7e9ffa183244984e689a131838e6301a50d5366216bccc2df5cd97b54ea
diff --git a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
index c4ced109cba1..5498f4be6fd3 100644
--- a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit eutils multilib versionator wxwidgets
 
 DESCRIPTION="wxWidgets GUI for PostgreSQL"
-HOMEPAGE="http://www.pgadmin.org/"
+HOMEPAGE="https://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin/pgadmin3/v${PV}/src/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index b0cd89cd1dd7..590b6b7edc73 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,7 +1,7 @@
 DIST pgadmin4-2.0.tar.gz 24988176 BLAKE2B 96e942d5001b1d590fb1b642933c665a13bca5429d3a3e74eefe4a8090c76515cc08b656ebfea3a170b4fa6077d7086fbffdd5fddfcb517be08fd4ecc20052ab SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67
 DIST pgadmin4-2.1.tar.gz 27842212 BLAKE2B 26c12dff8e2e5e37dd2911f6eb582a0f706d73490c8d93e83b07b7537fc201547d095d4f34181d2502bbc29b2741614adabf876b7e6ea3ef5f555eab94caa240 SHA512 02bc122ae53db595a1fd395e634fc4d0891f024a2e5e341c81b306a8c1d07bc18e5673cda440c7ba56754be4902ae4441010db0140132352e12b8986c8c0f47c
 DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
-EBUILD pgadmin4-2.0-r1.ebuild 3428 BLAKE2B f113a801d23cc94c8b3f56c52489e0d7725d3337f46dd24515ccb9a74e4c9320c1c508fc49410b27a53caf356c7d9b82bf98f1f0df8ac0618b89e9e9eaa05d02 SHA512 41c09ba0a15af4ce615deb72f9e944ddbf89515900c02a026f9ee4c42e21c2e409f2940842343441067864fad0d735db1e1993d5770a66501afa045879c14d64
-EBUILD pgadmin4-2.1.ebuild 3432 BLAKE2B 150010a6b6abbd2dae6a362883a24c1b2a13a62301489ef4a6073801de25e7c6b9792beb542306393c8fe1b598dcb2125bef88e03020de0a61688edb76a78578 SHA512 493c026a3bc156a92f5253ac96aa30891d8c644463196ab603daed5cfa9536fdb99e786dd07cfaafa31b1eb782040e6711d9e8a541211aa905e57227309843fa
-EBUILD pgadmin4-3.0.ebuild 3480 BLAKE2B 7f46411f73af5af0e32047943ff6fc384615614bdbf2d80c289b4ee4cc4ad9854a0d827c710fca89c5394f1857883b4af13914ffb2c316ff0b8b741d10f3e38e SHA512 9d82b57a2d3a24d317838d9806c38aa9c6c09b4d35b6bca16275f6fc971fa2c2f6ea2f73eff0fc9db68d5a670865a70a338fe9293ffa87326ef6408654e2143f
+EBUILD pgadmin4-2.0-r1.ebuild 3429 BLAKE2B d252add75134ec26117e9ff39c1c25922d077b47ae48b4c9fe9a447bd7b08d7b6329d92773fc96567b0ff0801427f21ed02262bab80265e9df7f63ca651c6af1 SHA512 81e3244cf422995ef773b916a4e25e0ea492dac0d2c9a19b5e9eb0f2cec89ad820f4488d531eb82bff794fc43d72a27f9ef817db911d73f634404f26d53150e4
+EBUILD pgadmin4-2.1.ebuild 3433 BLAKE2B 21e4f8e594915801087b5f248b5c7f3c2b4f58eb38bbcbfe9702f2edb5afd7527ee048f8175adde257d4782358f3d201808094059fc417e834feaaeb7b8bba14 SHA512 0cabdc6a6d02180e43ea68ba3547272d6974d5de7b1b6f2064840bcdf93cf0046085db634632d8fecfcf47c2aab8f8c912bd3a70684b544cbacff0b7b555de0d
+EBUILD pgadmin4-3.0.ebuild 3481 BLAKE2B 4fd4a6867360d4d0f1b70e8031d2fb70055a8fda1ee06aa376e034409babc42493fe020612c4d456bf6ce20e4fa6acc81d277d9b4201fa91d2480ba18be4ecdb SHA512 b7fd8bb01640be79a51260c89af35c46565a4e4c9b4e8c168f19c521eb223ac5ac437722735952c5f2df573f0626a4d0d867c0dbcee7eb72e5c68f822f0061b2
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
index 33fd96d382df..f06a6e951ffc 100644
--- a/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 qmake-utils
 
 DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="http://www.pgadmin.org/"
+HOMEPAGE="https://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
diff --git a/dev-db/pgadmin4/pgadmin4-2.1.ebuild b/dev-db/pgadmin4/pgadmin4-2.1.ebuild
index 6f3816804830..2170883f8a21 100644
--- a/dev-db/pgadmin4/pgadmin4-2.1.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-2.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 qmake-utils
 
 DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="http://www.pgadmin.org/"
+HOMEPAGE="https://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
diff --git a/dev-db/pgadmin4/pgadmin4-3.0.ebuild b/dev-db/pgadmin4/pgadmin4-3.0.ebuild
index 6b633695be96..b2c30c39216c 100644
--- a/dev-db/pgadmin4/pgadmin4-3.0.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-3.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 qmake-utils
 
 DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="http://www.pgadmin.org/"
+HOMEPAGE="https://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 53f8702ff6e8..d9d363d2ed42 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,3 +1,3 @@
 DIST pgrouting-2.5.2.tar.gz 7221479 BLAKE2B afbf29b7cbd52df526203198fb76d9e9e37e88a4b92d2139975238a14fe5a30c8102449d157e391913e690129a1ca8ac718763d9242193cac4080bc7347e1553 SHA512 9d9d9ebbcbc003f62bf1f0d548363e756012cdce55a9c3ef56ae9a5a510f25337898becf42f3e04bf10e8d3672ebf698def03833bba33410b65e0d2bdd42aecd
-EBUILD pgrouting-2.5.2.ebuild 1387 BLAKE2B 0efdb96f64544c4fcf251515ab1119faa0d613983ae66d4cb3c9f0bcd64eed46044079c831c4bbd1d930300326ddbff85a60219a1a44d8dac6fa468599c08209 SHA512 11d388428235fc68da299adcc02547608c9967c8c5fe1356139742eb070ae59f51ce6207b797a68281e675abeaa2826a6acef17eeb79cb649a20c2bb337b0272
+EBUILD pgrouting-2.5.2.ebuild 1388 BLAKE2B 5b87b2a0af8aa23f1ba34980b3bfa5520aed9f6a35d21c05334bc8bdc43c233efeb3c396e7f7179babf7eb8083c84510d6a6b7f389aabe45b399badad54f2134 SHA512 4c9aa0761df88209b8d3b0c5cc8bbede6dba141f502463778102d0ee6b3d1112ae4de2da1202f4656dedbdcf2b47a96317426195abaa623c94ee5bc0bf57f189
 MISC metadata.xml 534 BLAKE2B 3bc33ee8118ea199f4261665ffd62fd7cde78928ed64556ed0ea84346da4405b6f5b4765b9a11c02a9f3e719eac3ff9d8392accd11361372437eea26ac0b6e3c SHA512 2892a64cf6e8e34e1ede87ddbcbaabd7e66bc5a45c5a8e21b33103af83e1a6a92c665fbfc02af6ae8fa6aec9df6ba340a40d3332d2da557789c95a312439a55f
diff --git a/dev-db/pgrouting/pgrouting-2.5.2.ebuild b/dev-db/pgrouting/pgrouting-2.5.2.ebuild
index fa48f5a3fb69..7a0afdc63eac 100644
--- a/dev-db/pgrouting/pgrouting-2.5.2.ebuild
+++ b/dev-db/pgrouting/pgrouting-2.5.2.ebuild
@@ -9,7 +9,7 @@ POSTGRES_USEDEP="server"
 inherit  postgres cmake-utils
 
 DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
-HOMEPAGE="http://pgrouting.org/"
+HOMEPAGE="https://pgrouting.org/"
 LICENSE="GPL-2 MIT Boost-1.0"
 
 SLOT="0"
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index f2e76d1a2770..d850f2262d85 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,3 +1,3 @@
 DIST pgtap-0.98.0.zip 270583 BLAKE2B 25d409f5fc63bc7059e8a4ffd3cb460885648f8569cd10ca05d4c5fbe09af323ecc719d663f81389d45f4a4910ca77beef968e264a0d3f4fabf63fa30b8b98ac SHA512 478841aa9cf378120713b90f33dc16d40fdd030ee1856edd4bfa288a7803cabad09661cf5219925335d9220e12b6202a1fcd8cc0fc55d1974d1e98dc0f6ddac0
-EBUILD pgtap-0.98.0.ebuild 469 BLAKE2B 5ac58712ebcf8c5a50c8bef77e45e2fbe3ed94d4c8718dd303fbf2a6c6fca545cfa325955bbe58ad93cd57ace6d9f34709e0c5604100b5a7f3e2d51c9334df14 SHA512 72458b75dab29b560befe827c590f1cb160b014909bdbe5f747a5bbf980c1988d8ce897a564b9f6232178eae49b8e41be01a73b542a06dd695a0e1bca209c824
+EBUILD pgtap-0.98.0.ebuild 471 BLAKE2B 9814d061fa70ee6635834202f36698bf99c263ecf39fd5a2c90cc8b4e46f1950905a5d3acf64f11244af0a3b700cb8155d430f60aca9dc266ebeee2741c9c921 SHA512 9de14401971029d2ff8e0ed123eca7f0539aa8d46fd86b90a8c82cff1dbcb21d29baaaf42ee915640b49c3586dd5512e876e0850227630e2760817a4e6bc5aee
 MISC metadata.xml 628 BLAKE2B 8a671273bb0de6f11d5ea56a3bf38e9eee05c0a70ff8cefe183f0eb798afbead29e96d5a45f764e2afc437cc97d91590e648c6716a8dd8fa7a6cc9f072332e0c SHA512 1c06c14ea5af9248950e6c10ab877b0725c4885082211db94b8a195fdf0dd115dc584a325655b7155895ec4382008e03511aa238d43179310fbe3dc835f5270a
diff --git a/dev-db/pgtap/pgtap-0.98.0.ebuild b/dev-db/pgtap/pgtap-0.98.0.ebuild
index 7f2af4e66364..c741599fa92e 100644
--- a/dev-db/pgtap/pgtap-0.98.0.ebuild
+++ b/dev-db/pgtap/pgtap-0.98.0.ebuild
@@ -8,8 +8,8 @@ POSTGRES_COMPAT=( 9.{3..6} 10 )
 inherit postgres-multi
 
 DESCRIPTION="Unit testing for PostgreSQL"
-HOMEPAGE="http://pgtap.org/"
-SRC_URI="http://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
+HOMEPAGE="https://pgtap.org/"
+SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 73daa97b9165..1ec616d9beb6 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -19,15 +19,15 @@ DIST postgresql-9.5.12.tar.bz2 18589538 BLAKE2B 4246eb2bf5fe2e3bb48bdc411ebd3c87
 DIST postgresql-9.5.13.tar.bz2 18600185 BLAKE2B 7560f08648ec1417d304aa8c53c3220d7a4b2fdaf2cb4920a0196273466d1dbab4c12dbceb3dc9a136458c0089dd5f5dc595c95353584d49da0d2ab6e7903bba SHA512 807b22aabee38326934213de04b782a6b22cd8fe5c5bfd8b6cfa44281924527a715dcd78adbee276746446a7b05036b4714b00a16c650027543dcbafe1888082
 DIST postgresql-9.6.8.tar.bz2 19528927 BLAKE2B 6aab5dbe4b13e1624befc33c2fa5241804dff71879e2d60c166db19c2fe015cd19cfc35054e6aede82bfe6b83a7146b6d2eedaabb94111c163da732526ff1723 SHA512 6b7595c0046308c725d77360b156e979d6bc469b78ac6500f631112f19b2607ca2d816781f8c5fd3bd835c48e079e79ada7af687fbd306a8fec5e160f20dd211
 DIST postgresql-9.6.9.tar.bz2 19566222 BLAKE2B e92a5ffaa8f4400364a174fc21ab11bb18c96dce9be721e6073ff7ad21b828859c2ac5fe8da81cad6a3d2a63a62d8fcb067d4bb02a9d23903525ad1f78955470 SHA512 3ce2a8f3a017d9c0bd0f1b475a9ee02bcb6a4119b0d436757911f444f49f5024bb1a1be07ce16a79e71af77799de1bf952b32279b4566bae075f23a50b8545c6
-EBUILD postgresql-10.3.ebuild 13690 BLAKE2B 6433c38ca585762c053219e48665a9783d83f1b13efb28570a16e4070d73fbf90d139c8defa2a7991540c6c02113f67cdfe76cd932cb69d9d1a67c1a8fa0d156 SHA512 8a06670e3251b0f1409e88a4d1dff78ce39c32ccab6d5d374162d42ac792b20b902d8c8fcd4452d16ee555f50aff18e8140379eb897de69486dfeed6afbe7a34
-EBUILD postgresql-10.4.ebuild 13698 BLAKE2B 1a836945073f8d6bbb1edec840a188e322765567463df31dbee81c18e1fdcf1f4d0a9165f7a9666efc94bd82cee4cdc5d17f87256a9867647908c1865ab60d7c SHA512 b6596e599263774973f38a5158d2e679e82b5081e685e60d186c36ecf564e1328d123e5f0b6e6849e66a9ba8dee810d8073482d86acc321117e3f9602e619a0b
-EBUILD postgresql-9.3.22.ebuild 13743 BLAKE2B 0091b6d68f03e3cbc612d2f1f2a9973a27e0870b63247656ee14dc9d615a328a599c26c36d4915ee6334a22ffef68d5b8bfbfd0a684652335aee73746415ac40 SHA512 535b320d112f93d4d4c803befa0b2664088e124e354fbfa387a833abe012d114503d7f085cedfcfcfd084d8c74117797012a8d701ddd6bd7e1b80f4b4776cdfb
-EBUILD postgresql-9.3.23.ebuild 13751 BLAKE2B 1730adadd67e5b93b7d3e3dd8db055e5c7e3f7e91db5069dc29075c6ab2dd96fa70df8b1c579e66425deb6dff8c19edc11b29c9634b4b5d2480a12d68bdd283f SHA512 bf08d33c60165edc38490d72c3694f1cbef6410ba5ad15dd3688dc809a6f944c01deaef2e6b78028771997ff627868c115f37bd229f46a3d89f064702ae2e187
-EBUILD postgresql-9.4.17.ebuild 14553 BLAKE2B 91424a71edd45af2655f7b76195cae89758bfb415474593231528cdfa69256302b3d9459a158a98629c97b96d25666f2fdc063a24e3807886939b331adf5695b SHA512 916a5b114d607b39c94c277af28034f57cb497c70ee5e5b092e9b8780d490ef9acd138deb61accae8931c96f3924264723fcdfbbd5a90c114f3f08e943ff58b7
-EBUILD postgresql-9.4.18.ebuild 14561 BLAKE2B 5256dc5e253fc837649426959ba6a710ef3b2a234b4088b46db08a35b2bacf5d45fba2357bd66c5c6e11a9e138d71d5495806d544fa4b60aca0a554656df1a61 SHA512 40d3a1aed466df25a5c855c420bced8741bd0d7cde03693ab7325c3d24fa64fda20db15c49e5f5b84b84468990f07ce1fd233d3e52e9b1ab9d8f28a3dffac0e4
-EBUILD postgresql-9.5.12.ebuild 14781 BLAKE2B 7b3162668bafc31a6c706364ae2c0aed726525750f84b369948326c65222c5320c2637bf1fdba560eacbe95be1509947997f2512031ec8164034baae95bc1893 SHA512 074ab261c34d6e738015a9b0be1b2c1d9f4258ee3bf7c32d8189189cf040f7af744453d6e0e72f7020ff3cafa69bb103cca571327a9e41ace225abcf63085e1b
-EBUILD postgresql-9.5.13.ebuild 14789 BLAKE2B d58a0098ea848973501beaa11e1842ca3cb9b1a0885c13966b51c12d6631f7060fd078219472402f55068cbcc64028d021687d7251540da618b1fb5693951924 SHA512 42bb6d13163d4cbd9ccbbd6dd1089fe8174a84df3d37d6d2ffbc3c2d65036ffbf75a3c7e022419b2cba7de7b4d9226fa77fb3d7985f8a9c9bc4ff5ff94d3d795
-EBUILD postgresql-9.6.8.ebuild 14923 BLAKE2B 2ef343d5496d89bd8bd797945b922631b385f8241c76bbad5c5b07ae64aa971a2f72fa7c2cf3c5e62d6f71071b5ae2388e18162c3bc5e7b11ae0b6639fda3cb2 SHA512 a8872ec0d2012ea69dc3109d1a6648b8879125e78bb9f4c09f4eb7f9ed48e684c0e51450dd63ed29b5f62caa6b04a350e9d90140e25b797ee5fb87737b2d72df
-EBUILD postgresql-9.6.9.ebuild 14931 BLAKE2B 4987e4eed2a0eda2fb2a6a997648e60dffcf80b3b3ed0e06ae9f20bcc4257b460fa4add991c3baf8785c0abe9a5cda6b5a50f668b94aed951be6c19e80d577cb SHA512 6b8a5982697a8b4dbf6722330829f260af5715925d68ab0a6190b0a16b7669eb947b81fe35f332c70122bb820bc8342bcdc92a7c3420e4a88da3122e27542824
-EBUILD postgresql-9999.ebuild 13544 BLAKE2B 2a1f9c50e21e7b9981adb38d18d4814903578a461d81f8a250fccc73b5680232f9d53d3c56486e65007b90a954f31939775ce5e4bcc621672e8b29e0ee332b0d SHA512 7c579c0a60b1e10e2d0c254fc9f60f2908db3634371d359c88ebf0acf581eaadf24ba5e8d3ee0ebd4aa05d840a97d0df74385578c0d792ee7ba87402b6931813
+EBUILD postgresql-10.3.ebuild 13694 BLAKE2B cbc3b1250d2b50dd7a9c318a9c610506db4b2593b013b2d89a573276ab8604cff741a1a3ca03a97e3c9a6bd7392762f821caf90d642c9a05cc9ca0b411340bbf SHA512 4b6fb894e8d5196139a56b897d3a06169c35def0d7e472ac8332987445f7c7ce72568b3b7a45bd7e8dac651108731761c413296864b0c9be4a617217d49ef3ec
+EBUILD postgresql-10.4.ebuild 13702 BLAKE2B 3b49b819926f1270075bcfac90497ffec28133761f1bec0d1dbca1e8cb3474567948183bb47d4c17fff93dcb0d12815a288e1b40e0cf8df34455374118748969 SHA512 135b2f0a4e2c5302961d3dba64fb2072568204a0205de91d20b14a6a2fc8ad7a14d90e96bc82708c2d8b63148d6e3220ac6b1971279ec52da40da4bad88969e8
+EBUILD postgresql-9.3.22.ebuild 13747 BLAKE2B 12e74f2f7bc2b18507b5c4e07d093cebd96406c6d981fbcaa6c2851004183acfac3e3fb882e1eea662e8cf1d35c10a1bcd6ad2820a5770874f04ad9cf508c387 SHA512 c89150f9b09e18b196d267dbec2c6539d3eb1ed6326193681249770c5d1ad42e48cffcad160121497dc8dbdd692994bd2704f581d52d029ba4dff5178a773746
+EBUILD postgresql-9.3.23.ebuild 13755 BLAKE2B 32748b48a489b9a51a19365e1159638e6de06e487db1eda5932c13e469766664bbb4ae924188b4e054a1d00048c18e7944a114bb15a172be55474dd11deb5a62 SHA512 0971a967aee606d52778ed168217c7d28ddffca984fd7821db8b4271add46868ab1f1dab6ffb1d5801c1a661f4f3a1637e9c99afa487383089cee2df90565129
+EBUILD postgresql-9.4.17.ebuild 14557 BLAKE2B 57446276df8b11ebe12ef5a4b3e95dfc2892cdf93cb1a40117f0e7ae5774e0ba1a4a08b2306d971625636d4f0bddb4d0395bc6671397ef291c0251a31bc37256 SHA512 05b6604f17b63442a1eda4673a702eab7bb0ac4af87dce7c9f56085573768aec408aa441873317cf610e379972221f68d49c19f47f7be48b1e6a74809d13c407
+EBUILD postgresql-9.4.18.ebuild 14565 BLAKE2B 954d05aff7332bd53be29cb163b71deae09040a7ce602c28230e5dd4c9a4239e6fbc75245e10c8d4bd842db011e31303e0e924829c71a5cd5bee13ab62b03c47 SHA512 b95abd882026c4d66132d5c0ded7657f8275e22376122410962f70d382d128362480a65d9ae9e2dfa303df94bda884b919b599301395a68fd3b29ae7d71a1efe
+EBUILD postgresql-9.5.12.ebuild 14785 BLAKE2B bbd02c18eb7e6b6c9bb2f3e4b4010bc1aadc0aaabe158accac75b1f692c8905d565647bac95c46b69003f70ce6608017a877e74e37e915a2827f5a6f35a732a5 SHA512 2ae77b20602445192062ab5930cc518c3524aa8c57c4aaa4923ec15b924f3b166dcd51dca32a19618d3055214bfed7977c4630dd40b6967aaf491f1688aaf717
+EBUILD postgresql-9.5.13.ebuild 14793 BLAKE2B 5dac00696cdcdb3801ed7cfaeee54ec0a728938aecfe590ae82a86c70b3a5e476df6fcb247b0ccfd0b1f08409638caa473449b8600a346c089a70b27c24ce46f SHA512 778a3e5b71f06edbb92b9e46591a775136df671be23c8f4404a037e3757e45382202854d74a32223926f88f315f8af8902d8ff00a404858cedb6546649903338
+EBUILD postgresql-9.6.8.ebuild 14927 BLAKE2B 36ba33cfc700526cd716243a838a9b52a3823feabf53fe7045aca86e54c048a0c1e5c7c4950e33d131e29a96e7f00eebe2a366e46912a942c871b799c5df8a29 SHA512 0e547e8a39b0c96ff4d100d42ba1113aa87f537f14ccd242436270a6972db3c09690a9925d869c0256342e89687421b26e18fd210313dce3b23dd4062c1ad1c6
+EBUILD postgresql-9.6.9.ebuild 14935 BLAKE2B 72aae9d0851e921ebc3f4245cb145966db204ec7f2aa1ac6e7a5da64035d2582b5f9fbf25fa48a3de970c52afb16891f05e3ddbc40b7cb6dba1d423197446541 SHA512 336a96594bc5feb9fee37b8bde109013f48c5ac84d5cf0b17565ebe19e5418bf6069df52ceff87e9a586bef56fbfa186b898d9de64bd9d6633a6ecf510265aa0
+EBUILD postgresql-9999.ebuild 13547 BLAKE2B 0602dca6e40c01378cf8be4134cf039c378668c6bac02b3097d7ff896377cbe44a200ef58b699fbfd7bde284e1134078574705433f417f5df35cf34a43439bec SHA512 14d0beaa3b12cb68a554bd6e1bdfe75805abab117c2cee9564c7232171f2ff2762e084887c5a787588a86411e60dc2da092694982fc861473ff1835dcabdca0f
 MISC metadata.xml 751 BLAKE2B 4628a6d379a41b4646be34dfcfca2be58bc93b883ccd6f4d21a426aacb34dd7d5347c5f9d61f9211f4f91bff67d2d5935b203959ab0790c74031944a9ab799f6 SHA512 726f30ec991194427b2dbcdf650778dbe0f169cb305d569918404d403deef397aef7ec3f1a5269c15f7ec7fc5506dc534203323379f1d0acc475eeb8d75d0cf1
diff --git a/dev-db/postgresql/postgresql-10.3.ebuild b/dev-db/postgresql/postgresql-10.3.ebuild
index 73c9fb3fe9a2..7170883aee52 100644
--- a/dev-db/postgresql/postgresql-10.3.ebuild
+++ b/dev-db/postgresql/postgresql-10.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl python +readline
 	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -291,7 +291,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -356,8 +356,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-10.4.ebuild b/dev-db/postgresql/postgresql-10.4.ebuild
index aeb8a7a0850f..50f0472a5668 100644
--- a/dev-db/postgresql/postgresql-10.4.ebuild
+++ b/dev-db/postgresql/postgresql-10.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl python +readline
 	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -291,7 +291,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -356,8 +356,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9.3.22.ebuild b/dev-db/postgresql/postgresql-9.3.22.ebuild
index 7d174a469778..e1ed1641a5fc 100644
--- a/dev-db/postgresql/postgresql-9.3.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.22.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -286,7 +286,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -351,8 +351,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9.3.23.ebuild b/dev-db/postgresql/postgresql-9.3.23.ebuild
index 9bd6eb22b922..b102a6c5fabb 100644
--- a/dev-db/postgresql/postgresql-9.3.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.23.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -286,7 +286,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -351,8 +351,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9.4.17.ebuild b/dev-db/postgresql/postgresql-9.4.17.ebuild
index f40cb53ae05e..6e9dd5d11fe6 100644
--- a/dev-db/postgresql/postgresql-9.4.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -318,7 +318,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -383,8 +383,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9.4.18.ebuild b/dev-db/postgresql/postgresql-9.4.18.ebuild
index 2f448ba1c0c0..7243cdb0dd49 100644
--- a/dev-db/postgresql/postgresql-9.4.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.18.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -318,7 +318,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -383,8 +383,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9.5.12.ebuild b/dev-db/postgresql/postgresql-9.5.12.ebuild
index af7b5fab1067..003f5398f4ef 100644
--- a/dev-db/postgresql/postgresql-9.5.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -324,7 +324,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -389,8 +389,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9.5.13.ebuild b/dev-db/postgresql/postgresql-9.5.13.ebuild
index 4e1148a89f37..fd41b7ff3302 100644
--- a/dev-db/postgresql/postgresql-9.5.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -324,7 +324,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -389,8 +389,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9.6.8.ebuild b/dev-db/postgresql/postgresql-9.6.8.ebuild
index 136a3759b716..c5669d4179fc 100644
--- a/dev-db/postgresql/postgresql-9.6.8.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -324,7 +324,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -389,8 +389,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9.6.9.ebuild b/dev-db/postgresql/postgresql-9.6.9.ebuild
index 1d5a335c5909..1297819d3de9 100644
--- a/dev-db/postgresql/postgresql-9.6.9.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -324,7 +324,7 @@ pkg_postinst() {
 		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 		elog
 		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
 		elog "    ${EROOT%/}/run/postgresql/"
@@ -389,8 +389,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 151af8e7d574..c63f1facc0ed 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="https://git.postgresql.org/git/postgresql.git"
 
 LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
@@ -338,8 +338,8 @@ pkg_config() {
 	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
 	einfo
 	einfo "PG_INITDB_OPTS is currently set to:"
 	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index e3b1df857151..f911540ff459 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,3 +1,3 @@
 DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
-EBUILD psqlodbc-10.01.0000.ebuild 682 BLAKE2B 24cb9dea014d5864ee30c06fd731b5375526f61beb2833e4a2d399eb1ec8add1acc6e5f347cd7207066bfded78d0ad99e5ea81cd38ac42ac5aaca82d7ac826f5 SHA512 d19554f16da5540d8925062536aa3ed2598cd66a0b21d93bfad2fc07fb00531477a5d53660b266f4bd3181fb7fd5c311a749d5e101eafa5a696349d61206dc89
+EBUILD psqlodbc-10.01.0000.ebuild 683 BLAKE2B 76d3476a6e36f014af7c3db05aa468e98574997572b33f7f70d3ed3fe10aa3bd87028b2a9ba9509991b9050278fb66683b3f75d86d6b260cbaf0900cf33c8390 SHA512 cbd689bc332a0e43e4779286ee82ee4538ad6bb707b15acc0ae86b4c03b5a3a331c22b9115864b97ee5a825f6a09899709119d11e9c3c1e5d0d5f6de3c9f134c
 MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
index 2f5a480ab1fb..075039ab2e17 100644
--- a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 
 DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
 SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 2c73c5ef2bed..db88f413c08a 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/cardpics/Manifest b/dev-games/cardpics/Manifest
index d7cc6284dc5d..e814f141f1bb 100644
--- a/dev-games/cardpics/Manifest
+++ b/dev-games/cardpics/Manifest
@@ -1,4 +1,4 @@
 DIST cardpics-0.4.tar.bz2 151425 BLAKE2B 6288352ad22dcb38610791ed44be955c473c9ebfb1e31c2b290e41e062866b4843ffdff074ebeb1e485fadb4917381b09492566dd761bb578d88f515711a4061 SHA512 7451112f5b7954326e381563a3730c677b261481de79ede3def451591ce081e651a86a4c24ff3259ab979ac109446588bb1cacd0beed6892a5a288f190bf6382
-EBUILD cardpics-0.4-r1.ebuild 330 BLAKE2B a0dde8696f504b54d1848a7c658854666c98bf7983c98392fe54a9d99332915c5cea10e77a0ed2624c8feb9aa3f013cd2a92cc81688b79212523e7b33b541a67 SHA512 3aa5fadfc27518538a50189de976b665e37f0dd2d55fa366d940039c58a8e9817d8a470a173c336d3b91ddea83e2340d764aff7088152a3f68b3db4273277824
+EBUILD cardpics-0.4-r1.ebuild 328 BLAKE2B dc039060052afcd7520f8260d12bd87c4036fab07acca92f8f219fca1cf811c6e08c958312b62301426f6667fabd0938e158e59c80116a8b3063d5cb3947855b SHA512 9332a64344e91edf52fa5dbfc7485ec36b3841fc1e67d69f8a7006320f6d904d4b9bb9b3989af8ce05a5b0ff3dfa145a90cff3277d85328710a5930665542ddb
 EBUILD cardpics-0.4.ebuild 384 BLAKE2B b1f4253af23a2256df9b2dac3f2d6d0db51162dd17c4af198e1bcfe77c04a224b9ea0f35e78f2afc8a80b6ad6093f906063ffabedc73dc5c20a2e53ce919e4d6 SHA512 7b9ad606eba08dea69d59c233bedad164a0dc3971ce818a4faae4c0a277ce82f6e0a4a3117cd6de720f3c94907ad4a71eb8b09a8629ca5379ecd5ddaeb0e9726
 MISC metadata.xml 507 BLAKE2B 3c6055891c277cc7bcdb49bf0cdd1609ad86d87dd94cd7f06219aacb43f35de14a63a0b839c7714f7cf62e02468b88f9698356eb5dd23c77b33bdbb6d1b9c2bc SHA512 d460c3bb0906231f2dc1bcd65287aea962a9d88aa676ec87e313fa8057334976330b295cc9495cbd346af0b2f78c41454c9ef611be7aa815421ed037677644fc
diff --git a/dev-games/cardpics/cardpics-0.4-r1.ebuild b/dev-games/cardpics/cardpics-0.4-r1.ebuild
index 25e82735245b..dd4bc0b82cc6 100644
--- a/dev-games/cardpics/cardpics-0.4-r1.ebuild
+++ b/dev-games/cardpics/cardpics-0.4-r1.ebuild
@@ -9,5 +9,5 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE=""
diff --git a/dev-games/quake4-sdk/Manifest b/dev-games/quake4-sdk/Manifest
index 19b3c4dff215..7a5273315b1c 100644
--- a/dev-games/quake4-sdk/Manifest
+++ b/dev-games/quake4-sdk/Manifest
@@ -1,4 +1,4 @@
 DIST quake4-linux-1.4.2-sdk.x86.run 65799543 BLAKE2B c4911b63842d4c5226f41bc6bc1137a993ace9644600dad68b328c2c1c4c69c1cc93cbe65f677ea4f092a82e6c5bc41fec49287f25007a34c7d951e421d99624 SHA512 21f09f71f040e22d9d4cfa09aa3d5d276d71716ed4eab5098682f8060eb0159d460f6f02b35d110689570f8c251141bf5d0eb1e4af8f68fcaa66b9e7bcb3855f
-EBUILD quake4-sdk-1.4.2-r1.ebuild 495 BLAKE2B 38fdf01b936defea4589527e4b1ce640d690c38381b2ac9c994885c9732dda4527b6237e3468ccf8cad9993a6482c1b43eaaab1339277b2d3b15834b6889b009 SHA512 1dcd226b5adceb078644ed103f075a2cdee13bc5b2401c690109a37647122b6a43f9ab45724ab87d390553c2e51d5a6f6a5dc21ce3b359b3017c4a81733d53cc
+EBUILD quake4-sdk-1.4.2-r1.ebuild 494 BLAKE2B b16bc771b83b2c7a8f9a6250ba0b9606c570469faba476bb8b314e8b6bae69d1eb34d2bcaeb46f2f97b295b109ef756e4ddf99d1dd3622f4674de24dc01d989d SHA512 d7dcfe6f79c8c05973a970cc41e8666094b0dd57c34df757bc0041b5a2f44604e66a58d62faf7982e8c18aa987fe34e49f3ce02d39847cd3063585deeff8a1d0
 EBUILD quake4-sdk-1.4.2.ebuild 528 BLAKE2B 559b32c073130322e2e7df8056dfe6d7a8c1f0f80882a8e575166f08483ce7c46c901771100b2be3db409984e38f5bfc3b89aea554aea0e310ca2967fd501ddc SHA512 98beacbc4d3315b2a23683f10f5f4a72698e5ba5c67c0e2633b0819361c756325b45048edc49ce51ce16e461f6774f7082cead595d9c3b56f91dc3597889daa8
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild b/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
index bb1679e7da87..5b5976f8d6c0 100644
--- a/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
+++ b/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://idsoftware/quake4/source/linux/quake4-linux-${PV}-sdk.x86.run"
 
 LICENSE="QUAKE4"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index cfeccd8a20f2..b45a1f7614c7 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,4 +1,6 @@
 DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B 44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3 SHA512 3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563
+DIST simgear-2018.2.1.tar.bz2 1314943 BLAKE2B 60e44896d466085014020874a1be6ab3f6f87e472f985237404dffb5dfbd5c25f0d330701276e0b8d075830695872eb7521bb4eb5b0107edac5977c3aab85bf7 SHA512 6756994e0688a1f3699c33548ea90b19e99a439ea2f2002cf524629370cd1161a1556ee966fc3a781141fc7a08e7574adc0ecbe6dec67e72d631c6c4d744e4dd
 EBUILD simgear-2018.1.1.ebuild 1289 BLAKE2B 6b645fd5621acc09b4a0a9862e5e5238334c8d5b6cc1a9f6b8c7d1c08154e84b04a9be2e827cf12383a805027858d7ef9bc2ca9841251b01ab28da4ad39ede61 SHA512 4deaa97b485983475f5c9a72dbe7e3b1ac4c5a0166d3c5a541ac38cc0504211289dbfa8721139fbc8da01cd6171ed99414aec13d924a5ff0c37f379c6a1cf7ed
+EBUILD simgear-2018.2.1.ebuild 1289 BLAKE2B 7765dabb2e05d3c4f948ddb60b877c3bfee627c7c72f59df5c5020a5eb4b3022b53cf098d4a57b197b4e1a5384954fc734859c2b9998ed2c81d47dc1f45be57c SHA512 d6ba94beeea257a0e19435c1d9fdc0aaa31ee4e1d7dd14c0f40e61ce07fd16ff7b37d9e957478afb1b5c88df176b437cd407a272ed69626add981924d0b85432
 EBUILD simgear-9999.ebuild 1351 BLAKE2B 69fd6d6034053e9d026e9f91376bbb716be4c687007a031ca580f844a7ae0c3d035abbfb01d3e39eb3ed5fbc9502d0f3ef123e7c7f4566a52eb88eb23077bce4 SHA512 3735c556acf625e06391dd2c51b329cc8367449ed67d72dd0e4345a102b98b334595634ac1de1e61c05094075616a48887785f3b3f368d06181413add49a2f91
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/simgear-2018.2.1.ebuild b/dev-games/simgear/simgear-2018.2.1.ebuild
new file mode 100644
index 000000000000..c8c3453c3016
--- /dev/null
+++ b/dev-games/simgear/simgear-2018.2.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 toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dns debug gdal openmp subversion test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	media-libs/openal
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	dns? ( net-libs/udns )
+	gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=ON
+		-DENABLE_SOUND=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
+		-DSYSTEM_UDNS=ON
+		-DUSE_AEONWAVE=OFF
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 6dc85fe6d0e3..4fe85c46250d 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/goversion/Manifest b/dev-go/goversion/Manifest
index f24387c3beee..9a545b3a41a0 100644
--- a/dev-go/goversion/Manifest
+++ b/dev-go/goversion/Manifest
@@ -1,7 +1,3 @@
-DIST goversion-1.0.0_p20180403.tar.gz 8562 BLAKE2B 937d5531ef0f4cf8d72c1fded8ae0e1c6230f87a6ebadd3444aa87875c6712ff82d12b17ce78fcd41c6e6c2e51944a3dd824dbd0ffc3d768316c0b7b4b96edb9 SHA512 d446ca4d7b512b6fd5e510b3a7c2c11a7c72f6e915f4dd0ad9c61f8f93359ef08ff5256133245138798df3b0a3ab6d19157ddf76ea935858ba3230653cfde7ad
-DIST goversion-1.0.0_p20180404.tar.gz 8580 BLAKE2B 3a9f80194d022c44836bfe5e12f9ff0bc3204be236047bbb9b00147374ae65ead37087376a60509653299d46bfdbb92dc7abec547e47bbfd0855eda134f8b301 SHA512 a8b99d9f01ea72ebbd4dad2ea73d1d08b75b3806821cbea3fe70828d748e50f34452c980acdd48a2b5bf4bf1399a28904e80b284f465fda356f46bb9895d6c52
 DIST goversion-1.2.0.tar.gz 8586 BLAKE2B 76001c1ebbf55bf742a20f7434d7b28da3aaa8e24e2cb6d14c182192735d16184aabbfc47aedb5872ed2610c81c4e6d637f425597cebaacbbd7095f18cd715f4 SHA512 27a8ebe71679c9161556c8aa49356c2da54c7e7b3bf580aa18518e49bb919ea836a9958ae9fc8fdc86c3750afc900d6e1c17d87dea406366467a6ea9c8ed8931
-EBUILD goversion-1.0.0_p20180403.ebuild 732 BLAKE2B 369d0b06e513442d3879dd969ef7f016db4fe314ffc63fdcb0a7fec4a00614f6ad7941797228e3d03f1ec83db90179bc609b82a552fc693bbef694b4c7fff8cb SHA512 d7b92c06e557064b2e3da8dc2c3bdd1fb16977eb88f75c127091764b177a47b1fed4bd3822e3d7ac2cf814ddbdce82779e3aa0b66d207bf8cc0f0281d70a9628
-EBUILD goversion-1.0.0_p20180404.ebuild 732 BLAKE2B d59a9d9c92c274590bd37491b0752e20cf6286cb3524d4c51bb7864613c1710242e5ca1bcd0538845f600869a4f044a4c4ac8aedd676f00407ac2eb46dfc9d53 SHA512 37f5c7b6884555802fbe9a7030b7ac3c64a9a8ca9d8bfa6608f08048d267b4496ad3ce572cde744adeb27dea968d72a21f29810321429f18e89187e09ae25afc
 EBUILD goversion-1.2.0.ebuild 668 BLAKE2B add958badbe000255239501c3d772742b4de8eac1f0ae855becd01c37f2621ffa011b4c763072813855a84101a40bb8087cbc10e41212128d8593229daa332df SHA512 5e29999f85b32534e8cee9a0bd439e1ec37a745826f4e603c177470b2f36a1419b19aa349e630eccfd8c694a644edc9c6a9d5d9fc162f3b4ea693dec062d66ea
 MISC metadata.xml 323 BLAKE2B 9a51452937358bf5286291301e1400dc0dab1010c14e412e21cf6d9a8d09241e848e4da3294e119b8c07802332a9f55336520c5f3469d29c6d77caafdbb85d56 SHA512 892eefa27510dcdf800040cecf45163b91bc77e37dc152ba4756b682efc240a6ac062fd36569a9a0542390dc32776e400607533174077fc1597f139a37b84d11
diff --git a/dev-go/goversion/goversion-1.0.0_p20180403.ebuild b/dev-go/goversion/goversion-1.0.0_p20180403.ebuild
deleted file mode 100644
index 4045bf9cc6b6..000000000000
--- a/dev-go/goversion/goversion-1.0.0_p20180403.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="rsc.io/goversion"
-
-EGIT_COMMIT="38f6ce479a8bd51821a711abdc8343164d820be4"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-ARCHIVE_URI="https://github.com/rsc/goversion/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Print version used to build Go executables"
-HOMEPAGE="https://github.com/rsc/goversion https://rsc.io/goversion"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-go/goversion/goversion-1.0.0_p20180404.ebuild b/dev-go/goversion/goversion-1.0.0_p20180404.ebuild
deleted file mode 100644
index 399b7e556a27..000000000000
--- a/dev-go/goversion/goversion-1.0.0_p20180404.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="rsc.io/goversion"
-
-EGIT_COMMIT="597212e462da05a7902d6cea0ec895a0d9b8b218"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-ARCHIVE_URI="https://github.com/rsc/goversion/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Print version used to build Go executables"
-HOMEPAGE="https://github.com/rsc/goversion https://rsc.io/goversion"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index d3859c7dff02..60a063777b94 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index d1129be5cd09..f330570667d0 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1,11 +1,9 @@
 AUX hscolour-1.19-ghc-7.5.patch 1701 BLAKE2B 70c2628e3adaab9c7ec06dbf054c55d9e4f7709c09ddfe39fa578194c870e17afd2c9d78743cf929b1edd94f0948458ae8b64e6dfa68f4b774b3c3b3e1ea42e5 SHA512 302fe056e61d58537c2010c2d286ff6abf1b4eea25beb9b2069492000b1edc257830892369bd16576675d00fb376c04f83f17508b9491140ee92d062b9736c29
-DIST hscolour-1.17.tar.gz 20801 BLAKE2B 6588e04bd9da3712c74b829fb232d6896173b072d746e7ca63ec43f4a47f0229b8e463bb76ea24f6f30f506410d346d396859a71a1aa0124c6b3988570ce72e3 SHA512 16cbe462c91fd32b474f0b6346ba24ffc8eaa344498413c1071a65bd8d97488de9f77af7918899efc9145112923a9f2b06722f8584f403dfec21a029c181a2a0
 DIST hscolour-1.19.tar.gz 25466 BLAKE2B 852fa5e8d08cabc16c930f32951043f92c8f564773da07de0eeda931caef0197b09d307fffcb9c0c1e86ef139238d46261d355f3b54889bf61d49692b6d8a2e4 SHA512 8f2a9f16cf82fbe41513600c210a0d3af58f1b06ab1ed14a2493203cfce20a8ac959b3a34966273277ac3ceaf3b4916e82892880dd7685f8de12b2636bf53ae1
 DIST hscolour-1.20.3.tar.gz 25810 BLAKE2B 28a394ab9f90ac4a7d311e1aa7e4f41c55b26e51e02a72ed3d869d1d9dae566c7a70f3e15c136cbb538f56c303c0a5083d4f725ce2fc6f9cadf27d21b1b563a6 SHA512 759f0a3c3c36b48db7932477468f1c5de8fddec654010dbbd0d136e0f8a8f4e3c34bc9349467766a1cb90ffb56b950ee6b7926f4f62dcb68f8e048e2c212d853
 DIST hscolour-1.22.tar.gz 25979 BLAKE2B 42d974c9ffe439010df53d88c0b71397869eef64765eb60554e5bce060492a780d4bea8eeb805f271ac2b62ad4060bf5dee96f69ebe90caa9f62a572d8266207 SHA512 9762599fb4eef8f68a0a40ddfc8e7f50eb8592b1b3d7e4c8177f23f08300264c80a73dbedbe954fbcb9ff3fe1b80497b131e3f8d9adb8c1697d7195d48ef69a0
 DIST hscolour-1.23.tar.gz 26027 BLAKE2B 4dba77d61aff026f515d47c0cf84bd747b28f5d00739986f8a877171860835610812b8e1827879f8bad118bb7234ccfddccc8651c819696841a35ee3229f1b48 SHA512 a1525e0827bc399c0747898c814ad4b7947620c610e6ec579afa120ddb5f1d012f7f10547f09dd10e0bba9cd89cd220ab204ee0e40c37f0048c7222db04de23f
 DIST hscolour-1.24.tar.gz 26057 BLAKE2B b11a4b8506ee49e845519cc44ee19b5fbc196fd07132cb6999f361870a58991c0f22e288696cbfdcfbaee95dba9e2580e8f878fda3122a5bfe0f1b46c7818fa9 SHA512 c191375ccbda80d6f7271cff69648151fe6142e72d9a47cfba71176ab89cb9740a008020e1a48a106d5f10516eec03ed68ca7610736f6ab6fba84f85fedb0fb7
-EBUILD hscolour-1.17.ebuild 514 BLAKE2B af521cce9e0db8ba77a98d1a6951b196d610cf47d15825b3caae1f720da8dd44f071ce5d77ab99f0a4bb0fb86534f01333aa5db7dc2150112137ada2bb141b8e SHA512 e35c168897674c9c01a0d0e0611b3ed1f5a9b5b7368fce80449e93398cf44df093863f901a09bf0d6a1822741c514c5d7bdad9f5b9b1e9ffd675f2f7a06a48db
 EBUILD hscolour-1.19.ebuild 646 BLAKE2B 6b9eaf28e6b85446b4735f32f2a9be74e19d8a1c4f05cd93093d85ccdce4a9dae52b3da3b161bd75548b60d1163c416c5f56d198a38d084c092704a04c02b672 SHA512 577c856e3859a4e8ab416de4e70fbf7a2dbe0463fe6d44426d572d35e9ad5e04ee3391e945614433910a848d1c36d3fda55dd7733795d7057702a1bc61d1c85e
 EBUILD hscolour-1.20.3-r1.ebuild 786 BLAKE2B 5b91f73ea053e07a835f88bfa2a46992c4e74bc60bdabf70ec3a7b17f4c5ef2e2a7707249d140677cd014641c52e27da19396d86aa7da528fb11cf74fbca3686 SHA512 2796862e8bed140443d4f31a78b2d2c3579b346c828b8be3bd1acabdb2445f083b13ba48de26ca905b9e9c483558b58c5f379183076d39c22230b5d88620c617
 EBUILD hscolour-1.22.ebuild 793 BLAKE2B ef585c18a9b146931f79da001e2238f378a081d8802bbfdfc4d3394ef02d10ff209fc06d7b676d5bee595e425d7ad5a1b123cb175fc569f0f958172b96c53268 SHA512 75eb4da6727f94f70aa25d91c75cd104043cd5e05833d080304fd833944e8bcd8d792391540b588517ab97a74e606eafeea9279468c6ed2e99df30f58f1a4b1d
diff --git a/dev-haskell/hscolour/hscolour-1.17.ebuild b/dev-haskell/hscolour/hscolour-1.17.ebuild
deleted file mode 100644
index 20745d061b33..000000000000
--- a/dev-haskell/hscolour/hscolour-1.17.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CABAL_FEATURES="bin lib profile haddock"
-inherit base haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://www.cs.york.ac.uk/fp/darcs/hscolour/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/language-docker/Manifest b/dev-haskell/language-docker/Manifest
index a5f45e939996..29e64b9a473a 100644
--- a/dev-haskell/language-docker/Manifest
+++ b/dev-haskell/language-docker/Manifest
@@ -2,8 +2,10 @@ DIST language-docker-2.0.1.tar.gz 31658 BLAKE2B d2f4ed51db1f6367ccb53aafc25e7473
 DIST language-docker-4.0.1.tar.gz 32259 BLAKE2B a222009b1beecd515f6b5b769f665c688c166fac3c15a9ebc156e3f0308699f5d615a4146d3f0de0be2ec7e08891bffbffffc813905db8bf59f43b0e0f93b982 SHA512 39732c7e8055abf27d22d2ca9d838b97b85d5d3df715a9f28e2550083f5f60e61b98c0cbbe00be46e0bcdf2289a5aa7a02f1ae2adb404ee6589ba903a4424639
 DIST language-docker-5.0.0.tar.gz 32384 BLAKE2B e572cb64c417a98feb9de8ff2309a5eed244f8cdafaedb6bf53c4856b1fb64c852757761d145e66efe60e2ecb8659641faefd62a662df7389ff504c87c6444a3 SHA512 8fee31112aadd67fb483b76e0290c33185feca8e1252290e1a949af8390dd9886a3559a2fcde44e97fb95cca90fba015ba19ef6ba3811f820151fc27f2ea7bf5
 DIST language-docker-5.0.1.tar.gz 32493 BLAKE2B e25e2112c83bbb55c046d576e40589a937c910958e12a1e8c1d9dd2374173f8702539154d3a8b28e5b98561139fa69546fa9f991a5602212070733d78f067515 SHA512 c7c36fc7da95119ae8cb24befe564077c3f1ff530e8645b956571a67e0e7f42ed4195891591e1dfec627dbe422c0f72d6eab1d5e35f73e9d3fb3ed2043820e54
+DIST language-docker-6.0.1.tar.gz 33814 BLAKE2B eea7d16895774435ed4b6dee3df48acaf032a289b70d9ac00efa057cb3d947c6de64df5b8e60cb4ae4f876e26091d40df78469dcbb2e3e9d54969aa7280c3ef7 SHA512 a50675309b177d2e2ba305046ba60cb0f9a071cc27c1483d9d244ab89c747be5a7ba022579cca94689e623210e2f518df0e59c05ffca3a386a18e981f4971cf8
 EBUILD language-docker-2.0.1.ebuild 1079 BLAKE2B fff9d69117ae6912eebdb2b97fa6f6648f8201f2db6cfbe6dfc2d3193a5b477440eab803550f33f82e9ef7407e78f14b81e55ce8f72d4d3e94b8009aac780c66 SHA512 9f99dbb7fcc63e888294c001475161b56c94359953a7c3ec014a838b8814706855f1f1d7dac3c51c7e989fac184f39f367e552f264f955676673dc82efb6c986
 EBUILD language-docker-4.0.1.ebuild 882 BLAKE2B 8929988eb776419e4afd088dd981ca91c8d4f48742e652a1cd3b990a52decf95ea1c8a54b34017f6bae2c9dffd84e37cce9b9587cb460543967149d3d2c4d426 SHA512 5435d355110244f12285c29184b406b7f48030369a3f541cc855275c4faa6fe0fc700400bbe672f59e3fc2963fbf8f9036e6dd001f0348e2f8b9fa8dff6d05a5
 EBUILD language-docker-5.0.0.ebuild 882 BLAKE2B 8929988eb776419e4afd088dd981ca91c8d4f48742e652a1cd3b990a52decf95ea1c8a54b34017f6bae2c9dffd84e37cce9b9587cb460543967149d3d2c4d426 SHA512 5435d355110244f12285c29184b406b7f48030369a3f541cc855275c4faa6fe0fc700400bbe672f59e3fc2963fbf8f9036e6dd001f0348e2f8b9fa8dff6d05a5
 EBUILD language-docker-5.0.1.ebuild 882 BLAKE2B 8929988eb776419e4afd088dd981ca91c8d4f48742e652a1cd3b990a52decf95ea1c8a54b34017f6bae2c9dffd84e37cce9b9587cb460543967149d3d2c4d426 SHA512 5435d355110244f12285c29184b406b7f48030369a3f541cc855275c4faa6fe0fc700400bbe672f59e3fc2963fbf8f9036e6dd001f0348e2f8b9fa8dff6d05a5
+EBUILD language-docker-6.0.1.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64ea63a3e41ad9b97613175ba3385958da82c34ba26074ebb85e097946479f698aa76b8c6ec8a234d704ebd0a1dc3d7e771 SHA512 5e63984863f76640f96d332448c6b58c324d58d86fbc81f687e0fc4c3d8de63471331b99851abfe753a607df4d693e78f9587f9e4e21c62759c0e4b5ff4fe273
 MISC metadata.xml 589 BLAKE2B a6e7a2c01fe4fa9b0c1b0b18e612e7a1b39459bafea5ff32139ef28e09079c22845de6123df9d1977942fa7d0e791807b118f8f7be4b763372c289370f8cd668 SHA512 e9062624fda6b6ee56e3343948ad43d54e3c294c78e6421a1ffb1761f9254234a7189520247f0e3a4875ddc7492307902f27adcc5f0686911b6d4698bd41330a
diff --git a/dev-haskell/language-docker/language-docker-6.0.1.ebuild b/dev-haskell/language-docker/language-docker-6.0.1.ebuild
new file mode 100644
index 000000000000..2692f0261474
--- /dev/null
+++ b/dev-haskell/language-docker/language-docker-6.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
+HOMEPAGE="https://github.com/hadolint/language-docker#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/free:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/prettyprinter:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/th-lift:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/glob
+		dev-haskell/hspec
+		>=dev-haskell/hunit-1.2
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/megaparsec/Manifest b/dev-haskell/megaparsec/Manifest
new file mode 100644
index 000000000000..faa64e83978e
--- /dev/null
+++ b/dev-haskell/megaparsec/Manifest
@@ -0,0 +1,3 @@
+DIST megaparsec-6.5.0.tar.gz 91498 BLAKE2B 339e68e211e871d77236770ab789523879a1a44286d5ff5567b75f32278826f79ee6a76a80309b07771703a415c252e92d8327e6a34b86f0670b1ac89c742d6c SHA512 4a8194909f2779bd82226a1f8fb6cce089820fa960249fdd723a4f54aa0c0d52436b4835431327be1164a7698d59059e866b694477407fae4d93c1ae42664011
+EBUILD megaparsec-6.5.0.ebuild 1399 BLAKE2B c4ef5941ea4ed4b6efa703d936b2d67fe6f7cd7e29d7fef1776829c8f628d5b272722d3d9a2891d0af3e863fd00fbe90456bd5c17a74d5fac5f9233e4ab08a0d SHA512 ec15353586e152e4df4afcfba501336557c26195ef726e1217204e6401e53f27fc2ebe175fcd19b031753c7c4e68b50fa4ced8dfc2d1555b159f4a84add386fa
+MISC metadata.xml 425 BLAKE2B 9565191b02eae87e2d0c4eeefd7abc1ddf701523b1913e4c2fc2d22ff49117a1944337d8b9609748ffd837967ebe2f3771b2ed20ffd7453bd2f2f91a7c9431a8 SHA512 7b50749b687df410805434c6c958e48da6d39d67f44371b2ab34ec429c2d7b8cdd9dfe1c5a96e8b309398993119ec81ac656851a181b617fe309ad3a678bb01a
diff --git a/dev-haskell/megaparsec/megaparsec-6.5.0.ebuild b/dev-haskell/megaparsec/megaparsec-6.5.0.ebuild
new file mode 100644
index 000000000000..7435ecb97203
--- /dev/null
+++ b/dev-haskell/megaparsec/megaparsec-6.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/megaparsec"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
+	>=dev-haskell/parser-combinators-0.4:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
+	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
+		>=dev-haskell/hspec-expectations-0.5 <dev-haskell/hspec-expectations-0.9
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.12 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/megaparsec/metadata.xml b/dev-haskell/megaparsec/metadata.xml
new file mode 100644
index 000000000000..a06cc1e826a9
--- /dev/null
+++ b/dev-haskell/megaparsec/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<longdescription>
+		This is industrial-strength monadic parser combinator library. Megaparsec is
+		a fork of Parsec library originally written by Daan Leijen.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
new file mode 100644
index 000000000000..d03b1e63f602
--- /dev/null
+++ b/dev-haskell/parser-combinators/Manifest
@@ -0,0 +1,5 @@
+DIST parser-combinators-0.4.0.tar.gz 9130 BLAKE2B 368482bd968a4476366ac04162efe1d8ac502dbb964b21e4090bf48ee9f3e81879bce69a0cb8e72d3b51b4f278be23c3c6bb4f4fd434938682c680214b0a95dd SHA512 9748a8a23bef1cb386970722e148a4cc4e36e8f4100ac34794e2a2223b4bfe0f1e6e0f58d82b500e535cc42a0066be0c5bb5676892e4b607d8d6eac4c4f93a28
+DIST parser-combinators-1.0.0.tar.gz 10349 BLAKE2B c8b21ab8c1afd8fdc931f60258245596a70adb404366f5926743b61b6c7b802558436e7869d012dabaaa8d36097028269cec3c99f647958d0b15d14402c05c6b SHA512 308b38faca865801c2356b9eb0128824956f00a31d98de075166018b34d53a04bad0dc7f1afabafa9946b307ef3fb77df303db78ac7bd6ff476c9b96a3020e9c
+EBUILD parser-combinators-0.4.0.ebuild 749 BLAKE2B f23ea4ee1d77ab09b1c4f1e7911de7b51f0397844ca5d6daa7dd23887de05c0ca9a153e8fb210baed43c63d3f5e5dd33a2103e473d3af385ad20a761a4033098 SHA512 c9b3830008f94fbdce2fec3c1b590253bb331e5f4d57ba5e93a16450bd1a735d8648d8716dbbe8e7747cbd392df6ae4697fe4d5caf6182ffb1fa38dee650c2dd
+EBUILD parser-combinators-1.0.0.ebuild 754 BLAKE2B 8887376129c5c1a47890aa9d1038cd3f94260174d9b1d05e0da4fc46fb7299bc817d0c90f8eeca0e2344aff15d3a10948845a39b5bb3edac5d328ddc78c13b8e SHA512 36c03376d2630c1dbe78b76840aa79acb423a5ded2bd71e02068c63280da1fdbc2195db5098501e9a42d83b4dbaa4279b541c56430b96e75cb39f8a77d12cc2e
+MISC metadata.xml 352 BLAKE2B 304ec72090e63b1c82bdedb67a3c68e0dfa4d88de0aa7c0e2a6be019877df5967459789c4e31da7960b9ea37d91e106ada8797e868cf8cd6868c272ba300e227 SHA512 66c62ea225ca7681d29390b0359a4662160644b60615c0c38270b7e376c981ba1945dc9686d7a79170324f02dd40056a884916f606408b0661c3558d3f98c16a
diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
new file mode 100644
index 000000000000..b54bf609fcdc
--- /dev/null
+++ b/dev-haskell/parser-combinators/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>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<longdescription>
+		Lightweight package providing commonly useful parser combinators.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
new file mode 100644
index 000000000000..3f37e4341125
--- /dev/null
+++ b/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lightweight package providing commonly useful parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
new file mode 100644
index 000000000000..34b5f48f1428
--- /dev/null
+++ b/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lightweight package providing commonly useful parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/pgp-wordlist/Manifest b/dev-haskell/pgp-wordlist/Manifest
new file mode 100644
index 000000000000..f80d16432353
--- /dev/null
+++ b/dev-haskell/pgp-wordlist/Manifest
@@ -0,0 +1,3 @@
+DIST pgp-wordlist-0.1.0.2.tar.gz 10142 BLAKE2B 6a4efe0e495a3755b19a8bf49f5fd0e44853a77bec5c9731a4fb0ba9ea2da524d737b7580baebb1aa1bd6e8df40c4584f8e5aca57b95d67e5a4936a66a8a761e SHA512 c34d565b043d6ffb3fee10258fb30596ae08e5c4d57bf8d129f49b4794daf13ae55fae7f648f218821133a824f2abb66a8b5f02b10a9e11f4529007b1a4620b3
+EBUILD pgp-wordlist-0.1.0.2.ebuild 811 BLAKE2B 0935772e4c23c9f66a4b6a764a3994cac9beb165525eb43e8b7f5003d47daf530497ef427db1033509ce55632343338769ee547a056934457fa2005c2068ed00 SHA512 8f20035ff324b1144d50f13b7ed19699bc7eca5806c8dc293285efa5acf2f89f82ca269c3a04bdecf8910a1b01613702a1da9d0844279b8e9be27bf7b6c928f5
+MISC metadata.xml 789 BLAKE2B 29c94fa80f4c64fe1b097a2d73f8ee03cda49ce6cdbfe77191520399d499472243925cd6303f7af868b38808203cf910ad5b1ee4e17215b969567f23a26aecbb SHA512 5804f06d1ba70ae699fe5ce3c4a3bcc183dee5d10cb6607f931f87a2eba95c1b67c640da6aeab50294807aabdff1ed795b8f9aee7955d28cb8c809dd54f4802a
diff --git a/dev-haskell/pgp-wordlist/metadata.xml b/dev-haskell/pgp-wordlist/metadata.xml
new file mode 100644
index 000000000000..76274aa36600
--- /dev/null
+++ b/dev-haskell/pgp-wordlist/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<longdescription>
+		Translate between binary data and a human-readable
+		collection of words.
+		
+		The PGP Word List consists of two phonetic alphabets, each
+		with one word per possible byte value. A string of bytes
+		is translated with these alphabets, alternating between
+		them at each byte.
+		
+		The PGP words corresponding to the bytes @5B 1D CA 6E@
+		are &quot;erase breakaway spellbind headwaters&quot;, for example.
+		
+		For further information, see
+		&lt;http://en.wikipedia.org/wiki/PGP_word_list Wikipedia&gt;.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild
new file mode 100644
index 000000000000..e077f223462a
--- /dev/null
+++ b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Translate between binary data and a human-readable collection of words"
+HOMEPAGE="https://github.com/quchen/pgp-wordlist"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/vector-0.5:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/doctest-0.10
+		dev-haskell/hunit
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/prettyprinter/Manifest b/dev-haskell/prettyprinter/Manifest
new file mode 100644
index 000000000000..2f5218511f8b
--- /dev/null
+++ b/dev-haskell/prettyprinter/Manifest
@@ -0,0 +1,3 @@
+DIST prettyprinter-1.2.0.1.tar.gz 46373 BLAKE2B 8d71f9dceffd40a228e2911397ecd8cce1ed141f16fbca287b3005693f448c4fb43a974b5ddb7e60d2f33ceed58d69ccd3c6fb4490bff477e3598f414cdc46c6 SHA512 f51e546915d799a07f7b7a60c53f1cd1491535bcad6199341c14aeb96250da85f5527b94ad19e2c297fcf4b02d4561c2eaad1458c4b9c870fb0dcfeb142d9771
+EBUILD prettyprinter-1.2.0.1.ebuild 980 BLAKE2B 6e9859c396a9e9588d0a5a2520a524a90968d6118308335606b3ab9ef919cf2f09e23febb214c6232cc1947d74141c6bc28a2f85cb8d96b4cc15e0b62056717a SHA512 e21a710568ad712b9444ece864e1510b5b7a99552163254927ec935bbc8ea90a51ef7894d7be9d91179b11baa75580afab6991c2b9a0e9873561763a7043be1f
+MISC metadata.xml 464 BLAKE2B 5f60a24b20deedbdaa739d57a028baebc3ae5a995aaabc00a2de11cf5f5fe88e6e745294e1b335ce38d221955170297a0e813a41296e3ba9542a9fdaf6b197ee SHA512 4179889136ccb7cb288aaa47687291ec46e9ca82ea9e0997a5836913961ffdbf9a735eeaf77a6069d668cdd00dd2e5a2d1981184aa70715f8bb0c3b6615d42bd
diff --git a/dev-haskell/prettyprinter/metadata.xml b/dev-haskell/prettyprinter/metadata.xml
new file mode 100644
index 000000000000..030200004841
--- /dev/null
+++ b/dev-haskell/prettyprinter/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>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<longdescription>
+		A prettyprinter/text rendering engine. Easy to use, well-documented, ANSI terminal backend exists, HTML backend is trivial to implement, no name clashes, Text-based, extensible.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild
new file mode 100644
index 000000000000..214b9a0cde08
--- /dev/null
+++ b/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern, easy to use, well-documented, extensible prettyprinter"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-haskell/semigroups-0.1:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	dev-haskell/void:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/doctest-0.9
+		>=dev-haskell/pgp-wordlist-0.1
+		>=dev-haskell/semigroups-0.6
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag doc buildreadme)
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d05dda7e2525..ca3417f43fd0 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index dc1c3441096e..b3fba3b598b8 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -2,9 +2,7 @@ AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908
 AUX ivy-1.3.1-noresolve.patch 371 BLAKE2B aa9cead35ea3bf8b4dd9ad0009a5794dc16598f2a3428cc41e2a46c0b6a946be78263f56390f4da5e5dc2940abdaa217489271c6effb07de7d3ee7445f900f3f SHA512 fa520c8bf17813c3aa9c6b41b50bf844c86b959b2046b64241bddc16675a7a2583151813b6ad3dd7369ab1ee453909fe84a34d8e4c81ee5729e9c929d9690b02
 AUX ivy-1.3.1-tasks.patch 593 BLAKE2B 7d6b478ced62f35619490248b3f62a32869695fdef67c0a5fe19cb52de565c5c20f1a3e903406aef6835559d84ba668c0dfa5e2ce8d78c9b86c645b89fc9fcf4 SHA512 399f5fd76af888d4aacac83ce0a1311e26e49f3101dc1577615b576057197518348917a7670d916e502ac4caa2620d9824470e72acd9708a35463d044e733278
 DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
-DIST ivy-1.3.1-src.zip 1302693 BLAKE2B fbf6da871fdb629810bfa15ec977da4e998a987bd509e80c462d6ebfc113f88ea0c609526795bc414cb0d17fb424c345e40d2fc1a6d17ac8a8bcd25cd9c9bcef SHA512 35c425ea8adc714496dbc2bc0d5a6037fe295967bea9014a16850e54ab3925192e42579ca1e23d68d776326e81e1e195ce85f1a7791a6b0b20ed179c09a22f82
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
-EBUILD ant-ivy-1.3.1-r1.ebuild 1505 BLAKE2B 4b39326155e46486d72641665bd26ac75b4a102a9739c819845a2e6ae901e445034276df9a1d71f925f0ecd054597220cee9e2b78fb3d02be5dac187372f8530 SHA512 1494f051c1ff8cb7ed72b764b12bf0c519f6060947ee04b5fa0464e54487f2e03a7d5760ae1f319141a2218f5fbe94dd343d6111d9566d822279d1470286ab01
 EBUILD ant-ivy-1.4.1-r1.ebuild 1759 BLAKE2B 30c437cccd0d86ca2a8b162569602ab2571ff570e6e373dd17f47d60df5c06c6ae8726caf67290d2a0d2b250de63f9638f17aa84cbf8ff9f479d66b161c503ca SHA512 21028c7fe5712daf3680fec1137261b9bde21fb46f0633abbbd98fab4e41d2cdd63d5364d6de4275f667f778a9c8b2ebfeed56b8ffc0d4b25cb8ae039f802a20
 EBUILD ant-ivy-2.3.0-r2.ebuild 2216 BLAKE2B dcc9f39656185a5a0e56c30bc75231e12a8fca7f50ca1b6687795855c774c8ce39177fd0128887f2c9b87d028e3321cd6577aba5036fb8576330ba370639fcbe SHA512 7c7f55b44592a7cf60e82202d4d882867758936304a93a11c3677c39c486b1c28a2df4891a87c7e8d408ebf4ad70926959e05a5d4a9ac6ac03ca7de6f40d3b87
 MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
deleted file mode 100644
index 58853eef8a6c..000000000000
--- a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN=${PN##*-}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="http://jayasoft.org/downloads/ivy/1.3.1/${MY_P}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/ant-core
-	=dev-java/commons-cli-1*
-	=dev-java/commons-httpclient-3*
-	dev-java/commons-logging
-	=dev-java/jakarta-oro-2.0*"
-DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_P}
-
-# Rewrites examples... bad
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${MY_P}-noresolve.patch"
-	epatch "${FILESDIR}/${MY_P}-tasks.patch"
-
-	mkdir "${S}/lib"
-	java-pkg_jar-from --into lib commons-cli-1,commons-httpclient-3,commons-logging,ant-core,jakarta-oro-2.0
-
-	java-ant_bsfix_one build.xml
-}
-
-src_install() {
-	java-pkg_dojar build/artifact/${MY_PN}.jar
-	dodir /usr/share/ant-core/lib
-	dosym /usr/share/${PN}/lib/${MY_PN}.jar /usr/share/ant-core/lib/${PN}.jar
-	use doc && java-pkg_dojavadoc doc/build/api
-	use source && java-pkg_dosrc src/java/*
-}
-
-RESTRICT="test" # fail because of a missing file
-
-src_test() {
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant test || die "Junit tests failed"
-}
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index ff621e0bf670..cccd22fbe07b 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,3 +1,4 @@
 DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
 EBUILD commons-jxpath-1.3-r3.ebuild 1418 BLAKE2B c79ac6ce0e52a8e9d7742ff1dfb270a500ad79329c8cbbf64d7b6c8c4be773f8b64dcd36520fa1241c92e4151c8b9aa73bbe2853fa5260e73307e3be08824780 SHA512 ce9597f2e492e2d7d346d8ef74f50395c5a40bf0b143a06544f49c2aa3f40832aa5425925b864b425584df7070401ec6777ca05bce4409c94346d93c0960ce37
+EBUILD commons-jxpath-1.3-r4.ebuild 1427 BLAKE2B 080e1600ea5b3733a56b4b455b87892713a81fbf2b5a9d910526ee16cd275259ec81ebeb90bf4888c9033228c32fef719331d01b0977c8bfdb401969a1b6ba48 SHA512 ffc15c19ad39277d0f2d2977985762e4d77dfc92d210eb7fe2cd64215a5e4f3ef4986af21b001cabff21a4e4c97e8648f5a658a3eb12abf5b8514438185bb65a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
new file mode 100644
index 000000000000..bc77ab2d8ed2
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
+HOMEPAGE="https://commons.apache.org/jxpath/"
+SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+S="${WORKDIR}/${P}-src"
+
+CDEPEND="
+	dev-java/jdom:0
+	java-virtuals/servlet-api:3.0
+	dev-java/commons-beanutils:1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/commons-logging:0
+		dev-java/commons-collections:0
+	)
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
+ANT_TASKS="ant-junit"
+EANT_TEST_TARGET="test"
+
+src_prepare() {
+	default
+
+	# Don't automatically run tests.
+	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
+
+	# This one needs mockrunner. See #259027.
+	rm -v src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index ce3f9a756c03..00285e885c33 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,7 +2,6 @@ AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc94
 DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.0.tar.gz 3571788 BLAKE2B f411941b333cb0876a2a88828a8938a346d1a008764638f58723634f24c48a843b71db1c8ddbbc62bc07bba825d5d3f24ae438668ce99389d10415ac5d1a64a8 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
-EBUILD jdom-1.0-r2.ebuild 1636 BLAKE2B e416e898cb0b46320526cc0d452c34943421ff24ceb6b8c47cd0c6051267b8afeec955257553d1047380173f8a3876d8cabc1f2bfae9fa0a2b59ee7bdf822b1f SHA512 9513e4798ceffde02b8767e79d08a535ff35150a5a1971c04ef8cfee14eafef751404de9221dd4527d71fe97949046f2d08306c9d10109534dc80966b2e5f648
 EBUILD jdom-1.0-r4.ebuild 1365 BLAKE2B 362d41c64040b187d6245444f30e73e06b7a0f959fe5d9aaa6cf2a44bf443a3ea1a32a29b0d73e332dfdf924a551232d3bd587968d4c0166ba3f15fca5e407c9 SHA512 abcf550b34518e4c4873b4ef5a90682a7ecece474ffe5cdd02c14176169e27a913b43171eb606c9f25ceaf107e165d0987341664beca4da5443e40516ab68bc5
 EBUILD jdom-1.1.3.ebuild 1257 BLAKE2B 9d7d93ab036539abbe0d945e7b7f0767b0e7d0a3f39ec68f7bb20047ad5182bb283160e9fe3484d5cad853b17479947ae3e1edfb1113c76483b8c4da4d70fa84 SHA512 91cbb5345d46dcd100384da0f249749dc840aaddc90f4d525ae14dc22e2dcff06d8649713d343e81de1c5d9cb99c5559adcd23156a7be33e6be5ac428ab6be41
 EBUILD jdom-2.0.6-r4.ebuild 1358 BLAKE2B a55b3a295f11d855d15cd2ab4f91a0fc8805aa8881cf2f374d970c4b43ef829add955b283ba410202d370c0eb53777f87e943d54868d2ff0c0e327c6160cdf11 SHA512 32aaaca3059544b6aaae40545f3350799efd730cf790d5acb101886b3534f6b21d75df5bfc9e2addb0964cf5466a5f527a0ea127eeab2045b70ebbda9d488b01
diff --git a/dev-java/jdom/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
deleted file mode 100644
index 2e92729fbb79..000000000000
--- a/dev-java/jdom/jdom-1.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/${P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc64 x86"
-COMMON_DEP="dev-java/saxpath
-		>=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v build/*.jar lib/*.jar || die
-	rm -rf build/{apidocs,samples} || die
-
-	cd "${S}/lib"
-	java-pkg_jar-from saxpath,xerces-2
-
-	if has_version '=dev-java/jaxen-1.1*'; then
-		elog "jaxen detected - building jaxen support."
-		elog "you can ignore the warnings below"
-		elog "one day there will be better solution"
-		JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
-	fi
-}
-
-src_compile() {
-	# to prevent a newer jdom from going into cp
-	# (EANT_ANT_TASKS doesn't work with none)
-	ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
-	use doc && java-pkg_dojavadoc build/apidocs
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/java/org
-}
-
-pkg_postinst() {
-	if ! has_version '=dev-java/jaxen-1.1*'; then
-		elog ""
-		elog "If you want jaxen support for jdom then"
-		elog "please emerge =dev-java/jaxen-1.1* first and"
-		elog "re-emerge jdom.  Sorry for the"
-		elog "inconvenience, this is to break out of the"
-		elog "circular dependencies."
-		elog ""
-	fi
-}
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
index e08583570715..5a927406145e 100644
--- a/dev-java/jgoodies-binding/Manifest
+++ b/dev-java/jgoodies-binding/Manifest
@@ -1,6 +1,3 @@
-DIST binding-1_1_2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
 DIST jgoodies-binding-1.1.2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
-EBUILD jgoodies-binding-1.1.2-r1.ebuild 939 BLAKE2B fcbef0baeee3151064fcb88c194dd5e4f537992f9be5c135497e312077d358ac7282d79c89af3c17043471321fcc80795a70d10953ec1ca8547dd99e0c4b2231 SHA512 1dcf0acc99204a24da3979d2dc6cd5bd4d6127fc9ee976520a51d4ffb1ab58b70c079d81cd4036f510f46f0f5012afd92bd9d9d037f4804e13d881f67670dfd6
 EBUILD jgoodies-binding-1.1.2-r2.ebuild 727 BLAKE2B 7da37b4d1b8afcf534fc20d79aaf6da594da83eb48381f23157dc903d1640b9287b6f153d632428226c4e868360f85dfa8df2547e343ad7e6e8c2c277e9d0047 SHA512 d095b153caed39783f705f34a3e9d5729950e651704559d54850d67be6d080c1cea93fc265c05752548b2f5393ae430650a07571319172f0292066145c13e9a9
-EBUILD jgoodies-binding-1.1.2.ebuild 1303 BLAKE2B 85ff0957e054c36f97b90cc1a9456195808de692330cb267c5d59eeef4dbae0c9829083d3ecc03827234497ac0bed7ab4f9678028b039382994c785047f91659 SHA512 148d6a737eb859c12ca5a170cc9f4637d6453575eacaf8b7fdfee9847e9404b518d018df5d74eeb8e3c7516e55382ef0cd5e9243145cd3321042857ec68c7429
 MISC metadata.xml 341 BLAKE2B df75f028a7f38b32d21a20cd1cf3d17f298bf92e99187d95f525d30be00e7a02ca1d0f04dc4e6dcefd028be89b83069e6db326bdc4d1e8eefdd84aa523e4fb5e SHA512 ca7c045eb07e88e8cdb6c6639ec651b038159d824df55dcb5f0819dae264edb8873e4dadf94fd6bf71879ddd64a75e44820fe2b6cf485df18ca743b264c9f267
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
deleted file mode 100644
index eb59c57ac80c..000000000000
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_V=${PV//./_}
-DESCRIPTION="A Java library to bind object properties with UI components"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
-
-LICENSE="BSD"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4.2
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4.2
-		examples? ( >=dev-java/jgoodies-looks-1.0.5 )"
-
-S=${WORKDIR}/binding-${PV}
-
-RESTRICT="test"
-
-EANT_FILTER_COMPILER="jikes"
-
-java_prepare() {
-	find -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar build/binding.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml README.html || die
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/core/com
-	use examples && java-pkg_doexamples src/tutorial
-}
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
deleted file mode 100644
index 4b7c688b3f1c..000000000000
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_V=${PV//./_}
-DESCRIPTION="A Java library to bind object properties with UI components"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
-
-LICENSE="BSD"
-SLOT="1.0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4.2
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4.2
-		examples? ( >=dev-java/jgoodies-looks-1.0.5 )"
-
-S=${WORKDIR}/binding-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Clean up the directory structure
-	rm -rvf *.jar lib
-
-	# Copy the Gentoo'ized build.xml
-	# cp ${FILESDIR}/build-${PV}.xml ${S}
-	java-ant_xml-rewrite -f build.xml -d -e javac -a bootclasspath
-	#	|| die "Failed to fix bootclasspath"
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	eant jar # precompile javadocs
-}
-
-RESTRICT="test"
-# Needs X
-#src_test() {
-#	eant test -D\
-#		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
-#}
-
-src_install() {
-	java-pkg_dojar build/binding.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml README.html || die
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/core/*
-	use examples && java-pkg_doexamples src/tutorial
-}
diff --git a/dev-java/spice-jndikit/Manifest b/dev-java/spice-jndikit/Manifest
index 45e1114c12d6..76e689ded088 100644
--- a/dev-java/spice-jndikit/Manifest
+++ b/dev-java/spice-jndikit/Manifest
@@ -1,5 +1,3 @@
-DIST spice-jndikit-1.2-src.tar.gz 23084 BLAKE2B 66a00c3c155a006193c87ab2271def35c50cf722c29b4acbf9c2af0aaf19dbfda8be0bfe0ae44dfdecb8a5383334e542833284cd9212436cb837adca049afefe SHA512 bdb508eac32c8dac05be45553a6877e214dce4135c9ae96b95764254df4c0e57f2a7be3905301b096f140014e04e4fe6b517b7757553de26d73a513f7ff06244
 DIST spice-jndikit-1.4.zip 55185 BLAKE2B 4d5068a3f2e12d287ecd657e2092a2e73e6637f2285dcea58b6d8c820508f21f1ceb508514813b34cf9c1a7536cbc530aba1edf0ca80603b3008e3afa240582a SHA512 798a1671cf79a9ecf7777a2b5b6caa0074dcca97cecb445c8dad9a44144cc71fed312f7a13d4b7e12f09eb23b0525b38bca62d67866db76f03ceb5a7a0501501
-EBUILD spice-jndikit-1.2.ebuild 1113 BLAKE2B 657d971ee55dc34cf34eac82de3ed5eeda20ded456e9369d9124f0adff797d36a72b8e119b5bffa63ad1ef5d87f689ab1361e02d3d51abd8864fdf0f4de91b9a SHA512 e377846b164b51263d71ba19d2e16864d11d3877a1c2e5313f20645dfcdee7f44c5c9445ff6dfb12137e5ded6a3dc746e1883fbffb55a33831cd913eb22c49d3
 EBUILD spice-jndikit-1.4.ebuild 868 BLAKE2B 2ba91fedd394e87c0fe49c7366a7759a4c1095b03fcb50765e99d03ab55aed61b9529ec299df4971d1045a68885dc04e6f73fd332e344c335ecae99ef7b137da SHA512 c42bbb64c7e51c2f34aaf7d09c3f9a958f75acb85364f6b5e3e9f316f2aa4c57ac7feb70388fd3a6992d362b112fc57c8f4d1d01c873997cb756329e89c9011a
 MISC metadata.xml 553 BLAKE2B d097fce9e744f8edd8d86284f5fc71cd4a987af0db70a475bca9db42c18127fe2bda1e04fb6bfb564483858e4aaf737d917a6deff7917643123996db89119f46 SHA512 53926ae768029abd0e9bc1a4bd55c641c0a6547e0db60e0538bef4f020ac018ab2617cd925f1c81852e1b92d6da5f97ee792f3f400329dc750da77e533517976
diff --git a/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
deleted file mode 100644
index 26737e6041ff..000000000000
--- a/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JNDI Kit is a toolkit designed to help with the construction of JNDI providers"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="http://dist.codehaus.org/spice/distributions/${P}-src.tar.gz"
-LICENSE="Spice-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND="
-	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_ignore-system-classes
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd target/classes
-	rmic org.codehaus.spice.jndikit.rmi.server.RMINamingProviderImpl \
-		|| die "rmic failed"
-}
-
-src_test() {
-	einfo "Tests need a network connection so they will fail without it"
-	ANT_TASKS="ant-junit" eant test -DJunit.present=true \
-		-Dgentoo.classpath="$(java-pkg_getjars --build-only junit)"
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index c4f0cbe10543..12da6cef96c0 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,7 +1,5 @@
 DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
-DIST xml-commons-external-1.4.01.tar.bz2 683486 BLAKE2B 4740516a09f64811a134b7de8309fe0ae803f7867b0cdf3391211297bb9d0dada6010f03f2cb5d0800f971bf1e47356ee163eeb300e49d5db1c6b7adc96f45fb SHA512 fe22afb25e17b69a5416025ea812348af83474c26dcf88613ebc7b5f1288af9a73428b3f70544907afae4ba9dacb2aa7b8e5e2375d0aa712fe9d4e672d2e02db
 EBUILD xml-commons-external-1.3.04.ebuild 1152 BLAKE2B 250f12e24a07b9de4d2f8df29d9542b6db382f1553695fa32c9256031f783a841441bfafbb375aa4118c6a9f94828ebed5aa8d8ca9e3bf7b7c2cf169ae9b7289 SHA512 95847f06f31c8b3647e4651b42f1a15d4f93c682b7febc4d3277fc70f2611556a0692a7160ff77edf40503e958b98971d786203c0f419185534ec654094e1c0a
 EBUILD xml-commons-external-1.4.01-r1.ebuild 764 BLAKE2B 0575c2815534cf378e89545687c78f2a7487b2d16b9cd991ff8e8f50a8166a8b7524b9b25dfa3d1dc649d501b0971798a62b1d085cb9a2ea57ade1150e7ea351 SHA512 3e355a0090ef8ee0206e423042674215678b5aa959d6018c1aa979cb5eb50dcc72218f45395c3502173ee1c1459f07920b1213af05ba1fd07b4994ecb3f54a68
-EBUILD xml-commons-external-1.4.01.ebuild 1178 BLAKE2B 08a88f7f4dbcf15923c6d60dd353d1d85b1de862f5bd76923c0aab2387005ce1df4c6ba0e59bd8f6e931c64329f6686c150419ca46974e7fe0bc9d41b24a638d SHA512 7bc375cb06aa265abdc1e41a7f66e0a027eef4d30c1b73e5aed8dcf6471e02f2c600c137251b05be63cd2eb80e2a384fd9bd9fd219d0d0fd86ca585bad99059a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
deleted file mode 100644
index 9e500334ce00..000000000000
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
-HOMEPAGE="http://xml.apache.org/commons/"
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
-# upstream source tar.gz is missing build.xml and other stuff, so we get it like this
-# svn export
-# http://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-external-1_4_01/java/external xml-commons-external-1.4.01
-# tar cjf xml-commons-external-1.4.01.tar.bz2 xml-commons-external-1.4.01
-
-LICENSE="Apache-2.0"
-SLOT="1.4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3"
-
-src_install() {
-	java-pkg_dojar build/xml-apis.jar build/xml-apis-ext.jar
-
-	dodoc NOTICE README.*
-
-	if use doc; then
-		java-pkg_dojavadoc build/docs/javadoc
-		java-pkg_dohtml -r build/docs/dom
-	fi
-	use source && java-pkg_dosrc src/javax src/org
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 50a58056f9ba..c8edf79c70f9 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f799c473b75d..495c7aa1bc9f 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -12,12 +12,16 @@ DIST php-7.0.29.tar.xz 12400192 BLAKE2B 0bd1bd9450b87437e539ec5131cb4f7e4dbf76d5
 DIST php-7.0.30.tar.xz 12030228 BLAKE2B cc4c50d108fca68ee98b70a3007893d912d2343dd255faf52e41c1de04f590f427d9edad7b637177ccf1d9c62212ee6060baca13931c0aa14532df548ef159aa SHA512 1f0914ebda79247aa65ace63f6c8c4fcd850b21a82704f7b6482760259239cc5fee4cfd5aa2ed590b56822b4d69330ac472f46537e7f25d59e73ba63a48827c5
 DIST php-7.1.16.tar.xz 12211512 BLAKE2B bf242e2438b2dc363368a9ef4478349a291f483477ccedf988abd0fbb78a6f1b31e3b86dcb39ed9a9a8151674a8373ae77d8420e77efd6a2e05d5cfc778ed40f SHA512 98e96f06a4912cfa6926be2f292ce7120ca893c9b779b2efef4120c1df3580fa427cd58f5e4977edb01a0ae3b85660d6ca79b2bd79b6cd830cd77f6c6588b5ea
 DIST php-7.1.17.tar.xz 12213536 BLAKE2B bf358bc4920d38f74e4bdbc53f4744274071b4cea057452bfafbbc5760eb1ae0878f8cc92cf5337b883e17769cc6a490d0e64d3969aa1769cec92bf14f9101ea SHA512 2ac81b5ec898d366dc60f2dae4b07094457c6b8b110615e0fcc3af1e680708ed0e9c89728b95e453110eec41198cb8a0416b4aeadc017d4a2b6bf25ce624cac1
+DIST php-7.1.18.tar.xz 12213396 BLAKE2B f851c6eb261b8b532e84e73e6f173deb6ac00cd5168a02db9811843540aeadc390a4c5416eb17749cc950bbb1eda1045f538e2b80e4734ea2c0c4e264776bffb SHA512 7eacbc3b98d8b668c90d5c93030263f47ba2e0d4d7820594662590b8b68670f734a2274ae476e3aeac7e030c4ef10411a80da3523383e87a6757e87597caee90
 DIST php-7.2.5.tar.xz 12034928 BLAKE2B 36c9ec413b5332a1ef138a5724fd1718f5a8ffa8873dbe27ae7b6ca9a55ecfa0de7f7504a20581edb48605c2afcc799784eb3d94e08236222f6de2094d1921d0 SHA512 1d49fc6e47d2e86d4fd62396e558965502f44cc8f72459bb0d406e157298cac67703b219837952da11122722d9fa8cb4cda8ef66ddf063cb063859db34110f58
+DIST php-7.2.6.tar.xz 12113028 BLAKE2B 8b46ea6153cd12e7aa977978892c0842e5fa096bdead9ad6c6358d37d446e2f61fe09213a4de6864707ce0935823eb8b514be9e79f2095dda44fa22a51cb0c45 SHA512 da86b1ff2df3b9e2d46e59a80296b940d81132975b621bdec9602f8b4c8d91a3fdcd4ffd7cb982d63d3ec974b3a12a7854e42a73b7f2cc8eefade14335aa7c71
 EBUILD php-5.6.35-r1.ebuild 22709 BLAKE2B a8c2c5fe84d4849f2ad5cf96ae1896185e905f93c6c5fa1ae75c169d8ec3c267741931f59eef2fc6add4562a4a6bceed33181a315d949181c0e0df26c7635642 SHA512 f5b2a64129a4a8bab850ab0278bbf45829cf5fca35ad989715c5aceefac2bb27d69bf4de10498a1e04eb46273628e1830b689a06fac67e97a81fb40923c33e5a
 EBUILD php-5.6.36.ebuild 22765 BLAKE2B 7a46ae434144bf9619edaa08ff18ae14ac856d3a2923ddfd63aad2c6a43d38282cb54795b59326f5a1325d02321d19eea0abab7daac9844ab08c6fd3d0dd521a SHA512 0375de2cb65ca24bfdd84d35e5ac937462156fc733d47d9b77bc95b01351fa55206608390e406781ad66936643b488a7737177aeb3ac42905d0647a0bf681326
 EBUILD php-7.0.29.ebuild 21967 BLAKE2B e0339d5bba0ff95a5d9222fb09cd06876a3f646e221f1447f28ad822c8e2e101e18b2af1da2164459988fc980a8e8aa1da8ac77220512cfb512c4ed6243213d6 SHA512 a03cdfcd12f54d87ac75d9a2b103c0ce875389854bde66a709852ef5f43c0bd6a04096e7d779e721abb8d1209b3394c7c0a016433a2519d53132cd89200ba9b9
 EBUILD php-7.0.30.ebuild 21975 BLAKE2B 413e3c9d6cd4d43a5d74a2c064352b39d45b2a006f92a5f88749a0a189778748ad1ae4b4e28bdc9b2d5dcddc3cf8e94fbd20b74659dba3ae39396f76a2143740 SHA512 aa5eb136a50b7522d7157cd9e1b3a100ef114e6bcab42a854a15a549e1426b655f6bf52d84929bf3619b604bbcdf4d21a16ead62581762a9c9b6af19442a4016
 EBUILD php-7.1.16.ebuild 21855 BLAKE2B a5ea02c60695ae4085da75888102418f511922d2a9360bd466ce31248d30f1131fdd1eb5e30229ab1566a7fde2c659b434639181c03764cc57c290391971fc31 SHA512 b147467417ef28bc7a4845897c1aa891e13dfa69d1fdc0cbebccc9206e86b1fe2e57ee4af18bc5c3ed744c5579137fae4a6a6323209e58eb25ce15f93069bcc5
 EBUILD php-7.1.17.ebuild 21818 BLAKE2B ce339e941dadb1672c866a94e611fa8c329c95c7fafbbd4f135e4ea734f77120c6b06e6b204b59b46c930e440aac1308d209749576024265b04ced1fac7ad451 SHA512 0dbb7ddac39a1d02532edda4fd5caccc42cf9a25c1bf7b33e795f86b7bd8a2020a4c8f911d6881989b7aa11eba2c0d638be2aa94c519405e54decdf30abd41fa
+EBUILD php-7.1.18.ebuild 21818 BLAKE2B ce339e941dadb1672c866a94e611fa8c329c95c7fafbbd4f135e4ea734f77120c6b06e6b204b59b46c930e440aac1308d209749576024265b04ced1fac7ad451 SHA512 0dbb7ddac39a1d02532edda4fd5caccc42cf9a25c1bf7b33e795f86b7bd8a2020a4c8f911d6881989b7aa11eba2c0d638be2aa94c519405e54decdf30abd41fa
 EBUILD php-7.2.5.ebuild 22349 BLAKE2B ade2a77aa0ebdb57085266b89f2b1e3f893acaf8f738944e5b1cc55512e6d27eb517ec7d01da359a1f84848ec6d014e14d8155861ea71b0d0397374e946ad63c SHA512 e3c62327d81ce1e40c7a790243b7549cf0d3881fa8b25e2fa1af8d21bc1912553adffa7b5f35e0ab84b77e531bd0879fff4fb14f931fc695d21cc014ad672c7a
+EBUILD php-7.2.6.ebuild 22349 BLAKE2B ade2a77aa0ebdb57085266b89f2b1e3f893acaf8f738944e5b1cc55512e6d27eb517ec7d01da359a1f84848ec6d014e14d8155861ea71b0d0397374e946ad63c SHA512 e3c62327d81ce1e40c7a790243b7549cf0d3881fa8b25e2fa1af8d21bc1912553adffa7b5f35e0ab84b77e531bd0879fff4fb14f931fc695d21cc014ad672c7a
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.18.ebuild
new file mode 100644
index 000000000000..39336570acbd
--- /dev/null
+++ b/dev-lang/php/php-7.1.18.ebuild
@@ -0,0 +1,731 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} 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 session-mm 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"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( 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 )
+	session-mm? ( 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= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+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 )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+"
+PATCHES=(
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.2.6.ebuild b/dev-lang/php/php-7.2.6.ebuild
new file mode 100644
index 000000000000..f781eb4d8033
--- /dev/null
+++ b/dev-lang/php/php-7.2.6.ebuild
@@ -0,0 +1,743 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +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 lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	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 )
+	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 ) )
+	lmdb? ( dev-db/lmdb:= )
+	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 )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	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 ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	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= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+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 )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index 33a845361718..e06e56ff40c5 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -14,9 +14,9 @@ DIST polyml.5.4.1.tar.gz 6107319 BLAKE2B 1fdff3b26fa7554a0f3d31cca0dc4a4e013fb93
 DIST polyml.5.5.1.tar.gz 5465794 BLAKE2B 0ae6973c866cdf33e0eeb26475c95f26f11eca13458ab52c2c6fd3f4b3034cd5e71a7e4dbff5574070a11833479bff2723066bfc71367d71cd6e4f9f17a5cba1 SHA512 283954c8bf5599d83ea69916b827b1acae7137fe4add67537026092da2e6f1a89d71d3a394dbba599bbe9e967ded1446f39f4d81afb90301532db6be949f7a6f
 DIST polyml.5.5.2.tar.gz 5599140 BLAKE2B 08b7c4be7c52bd8f57c53f6caa24be7ab457c7419459192f33369bf3c7024002ffd98dfd7af4db53c3a2484f9c966010a635f4e09e9edf8a62b5d5230f9a04bf SHA512 248c2a38c4691898bc1243a041f4683bf227d9c8a98c6c3545af2a8a3249ed5ed96f33f90cb2dede8809b42f33c0557650147302cfe046a5fba965ccd93cbc5b
 DIST polyml.5.5.tar.gz 5504389 BLAKE2B 8ad51504e4bc4a3f6090052d641389b7378aa56295ebe8503ea09082a0bb85ee157c04ac19ca66ab8b8c8b49b0d645339d499ea7d4eba18eae6f90be8afcc907 SHA512 4725c2e4a786b8c63bc6fc1cadad0de818ed935014d51040af43defa07b03ba7bedb2185bfb2e39a0db7284479e79e698b31ec7fe8463c306b668de1eda69b89
-EBUILD polyml-5.4.1.ebuild 881 BLAKE2B 8bd4d3f269dcb822ac22c585fc163510eafa7e3b9e9cec4d5b6e618adb28f1dd636686ae1d0f5b7581374e82d64e457ea283f56c2d3f1ee9699d8642693c3527 SHA512 ba04f994d7650f1c95a11efae7d6c1462996359c8eaaeed87514ad4e330a0805db8e3f045458e8478bda8de335aaf1e09ddbaf711598e8ae7b371788312631c1
-EBUILD polyml-5.5.0.ebuild 1120 BLAKE2B c03cc39ed2ae362e251b2659d652cab65fbdf114b636609436c7c24457020cb16e689e8ed7ea681c532938030123c66052bee66a0df62bfe6b595e8604ed5fb7 SHA512 28331b4280dc7e46a61b83f51f4abf12e9302247f7c38ff122b68f31b53be4b7c93c0ce2f9e0b850a1baf919124b3762f48604e42e437526ba421f5fe7251946
-EBUILD polyml-5.5.1.ebuild 1805 BLAKE2B 09b450e7ab8b6198a851bf37c6402e54f242a01583ae110b09caf82a33960830404d9287e30819d1b94e8648bd05342da82fa715ef52e813c14915fe099f2165 SHA512 da0057b1a59f8ae20be68e6ee4735b8ee5d737e3b7a6ba5ca0ac414a04bb7f869a95b5149dee00f9a1b1989d1cd3f6f444f9ba6db2bf77cf2ddcc2cbcd7ae088
-EBUILD polyml-5.5.2.ebuild 1962 BLAKE2B 11ce53be86601a7b7ffa094d21e9b7ddad1e4d3880aeb368d6902f2f26b597f373fdd653bc943c90a68d86edb77d79d7976305eb79296d3cc9816e9a2383650d SHA512 49ac070096e8401b028ebb2b66141d85520349192f74666050941d0be984974c5797c93ebd9410e233cbb6a9fe700f454f0ea86688250c9f1de6015f8c00dead
-EBUILD polyml-5.6.ebuild 1102 BLAKE2B c34618aabdbb731f98ca08430615a3f264b02c2f123eecfb0252d7f2c25a0c836acfe0e6ef8eeb83e577c45c9d7e104e6559b65b076e7365de9de965ded6f6d1 SHA512 90a5a0083b803d9c8c353d5609c7274ae736d203d3515e506dfb5ca68c5237135807de4527d83528ed81d55bcb734a0dab2a262b0de00ad354d60772ef9eb424
+EBUILD polyml-5.4.1.ebuild 882 BLAKE2B 33f67a532e3df08bdeba0daf156a89e04e8dd43b3d8968e62b0523fc9a6124f9b5d0ce942189ef3fb7c14f9c768868a1964cfbb99875951a5814aa941ce2e9aa SHA512 02f154c766878c6df26d0b49260a8410e1c4d1faefa02d41d84ea01ac0e3ae95de9b12c80f085bda3492dc3dae0b39dc94f5e891a8a5bec736ecd3dd3f3ffbd4
+EBUILD polyml-5.5.0.ebuild 1121 BLAKE2B c32bffc9837edaa9dbe300f448006f06ae19bf55e29285859476f52de198df6997093d310a24ac9541ef5c372c9159db3c875a9abaef34bee7389448aa331fed SHA512 2b0462751288f026c6770639aaaaff37546bea6d363f016412b2909cc9738d98c2b059aab24f6198cfc7051cf06ef2ba89c76d48a037f95f442befc05be5a005
+EBUILD polyml-5.5.1.ebuild 1806 BLAKE2B 1ecd752ae24a16765064f85dc6aa380b1762b839c8d065c679e2bceab3946d918d574162b5a495dfcc75bed91ddc45862f15795407d24b55604ff68688ecb3d6 SHA512 95d7210500e6135b9b1858ccecdd734339083f2ffca5237c4a61d77b7afe4fe140f335bfd5e5702defe21a8c9987f1f81dd446a9a90b261d4588c48509e89538
+EBUILD polyml-5.5.2.ebuild 1963 BLAKE2B 0afb1711c472cccedc5be5fd0ae16a0334ca86339e29d7b34a027dbde181543b0fc76e9419dc2733cf99bd1bd9a153ba716bc9436c562a339e4c3112dea35f8b SHA512 1f090742acbe4b175a3d26fd785ae5958f8dec0bda6d7fd6a3feeec43bee3606f6b877da4f3dc1401edf67e5ef0bb5bf21e3609beebaf1b651669ef44482cda7
+EBUILD polyml-5.6.ebuild 1103 BLAKE2B eb24c91df3f50e129ef150aacd7d72d921ca70c35533684427c26bd6fa49fe201e43dd740aa5f4ee3739feb14965104acf7b93230f3fbfb61a6af7748dc18be4 SHA512 79af51e535496ad4af010f5d915c83da35b2a4adcded6eded435f452cecc9b79d0a6c711faac3e7a0ca345f853f6de962bc45fdfaf8568b2cdd5d21bce1433ad
 MISC metadata.xml 562 BLAKE2B d0e0542c0805b1d57891bb765ac23cb32f2b37b07ba3986730adc7dc1b720203065483c090fdc8919a1ee2dce965a26d0f570af29f54e0ec7c0acd8ff43e4441 SHA512 be1481ffb11ab311905e734a6eb02883ff25f08d4698ed6dcab4ab76a380ff4eec19eed4db76f77f7ec9a0dc635887e3b7c89a8a153160fd91ab2a8cdec2dbe9
diff --git a/dev-lang/polyml/polyml-5.4.1.ebuild b/dev-lang/polyml/polyml-5.4.1.ebuild
index 291dc04c0507..34eabcdb7de5 100644
--- a/dev-lang/polyml/polyml-5.4.1.ebuild
+++ b/dev-lang/polyml/polyml-5.4.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="5"
@@ -8,7 +8,7 @@ inherit base autotools
 MY_P=${PN}.${PV}
 
 DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="http://www.polyml.org"
+HOMEPAGE="https://www.polyml.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-lang/polyml/polyml-5.5.0.ebuild b/dev-lang/polyml/polyml-5.5.0.ebuild
index c8799c914844..44b3faff1569 100644
--- a/dev-lang/polyml/polyml-5.5.0.ebuild
+++ b/dev-lang/polyml/polyml-5.5.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"
@@ -11,7 +11,7 @@ MY_PV=$(get_version_component_range "1-2" "${PV}")
 MY_P="${PN}.${MY_PV}"
 
 DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="http://www.polyml.org"
+HOMEPAGE="https://www.polyml.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-lang/polyml/polyml-5.5.1.ebuild b/dev-lang/polyml/polyml-5.5.1.ebuild
index 675e79082702..ce4a090ed6cc 100644
--- a/dev-lang/polyml/polyml-5.5.1.ebuild
+++ b/dev-lang/polyml/polyml-5.5.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="5"
@@ -8,7 +8,7 @@ inherit base autotools pax-utils
 MY_P="${PN}.${PV}"
 
 DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="http://www.polyml.org"
+HOMEPAGE="https://www.polyml.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-lang/polyml/polyml-5.5.2.ebuild b/dev-lang/polyml/polyml-5.5.2.ebuild
index 85e846f17afc..f54f6675ccf8 100644
--- a/dev-lang/polyml/polyml-5.5.2.ebuild
+++ b/dev-lang/polyml/polyml-5.5.2.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 @@ inherit base autotools pax-utils
 MY_P="${PN}.${PV}"
 
 DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="http://www.polyml.org"
+HOMEPAGE="https://www.polyml.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-lang/polyml/polyml-5.6.ebuild b/dev-lang/polyml/polyml-5.6.ebuild
index 96e7f5c91558..6cdf4fdd6fb5 100644
--- a/dev-lang/polyml/polyml-5.6.ebuild
+++ b/dev-lang/polyml/polyml-5.6.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"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit autotools pax-utils
 
 DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="http://www.polyml.org"
+HOMEPAGE="https://www.polyml.org"
 SRC_URI="https://codeload.github.com/polyml/polyml/tar.gz/v${PV} -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index cab25a5b4fb2..0e26dc641a67 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -37,12 +37,12 @@ EBUILD python-2.7.14-r2.ebuild 11055 BLAKE2B 7baa5627be730ee74b2de5f055988115446
 EBUILD python-3.4.5-r1.ebuild 10658 BLAKE2B 46398a90c4f67b4923d9c65476f0eceb42135084b0f71f456162557a2c7adf2cf0c6f07e2d9b65d49eb92ee75233c249bfac32a9e5fb1fcdcd67988f19e4033a SHA512 7a2e1312afcfa032aa16579868f2c7efe04eb38904db2b66f11f87e174533c9df89abeb16a28e3f6372651e2a733f885ae5bb78b07cacd150c9ffe8c66f9c2aa
 EBUILD python-3.4.6-r1.ebuild 10588 BLAKE2B f2c2081a1bb9000121854e607f310a52f1c083c840a5a10d4cfaa54d0aba66de8cd994c1cc6df702b4688875ab3327344b1ef86125602dbde353675168b7fb8d SHA512 72c0262b0c4061a97b1098373802d574591d9ae53785494fadd8b8e403d358b5ca7de478a5380b3452c5778f0ad6e186c19c41fb6a28149069096b4b69e9ce28
 EBUILD python-3.4.8-r1.ebuild 10845 BLAKE2B 58fa9357893af72ed60edf615ae02c8522e5deaaf2a0ccf8e849e0601704e3e4cf69ab9567018d5aecf75161012f3dcde71cfb5362a8efa40ff3bf73c86bf579 SHA512 d5e830065f67021b33427dae063df5ce40ddd7ece6c1b21849ec6de6ab7140d4a24a0bcd728afb234495cfe4ce4db24e75235aef9efdd95df7a4b4f0e6e4639f
-EBUILD python-3.4.8.ebuild 10639 BLAKE2B c3e067b9969f391ecebb44b5fd468ada99adaf71f23f523f6f9c1f2d65cdf013605df18d756a6f3e2445e80d8c223da20e32953904865d53a2bf3f6cc897d719 SHA512 56655558df17a57b652bbd846786c394bff374a0f05c70a4183d82e4a10b2298863e60a4f46d603659c6310f83d32f1507840652264ebecf71eab8db89c119ae
+EBUILD python-3.4.8.ebuild 10638 BLAKE2B af12c201fff95b6890e726000c06193501a362db5638099678b354ae83584b0c7ced791c2e705879691ff1319e3ba87db52188a951a76f0744decb1b3700a816 SHA512 556da51c43f08ea33c91c860dad3aec63d50ea3521073666345c16655c0e544b8b8872b18bdbbfa4e3e6b14a5ad74fed72a1d31c5feb15bc6d8fd2f4205b49ba
 EBUILD python-3.5.4-r1.ebuild 10719 BLAKE2B da7ece23e2f6333066b9f5d74f40e21326ec785715a818c95627818ae3c1c8c55aedd88323e5203aa90e69290871daa1baae9802ed6dd1a2a20b7ffbd02eec76 SHA512 ec0248c551531623f02430182c299c0f19ed002c195ae020e8f5b815e9978bf7c10e0a4d85aea312e99472f117cf94089c8644a25e5a8a142f88a62daf9ad332
 EBUILD python-3.5.5-r1.ebuild 10999 BLAKE2B 80e8e0c4f0c09b4deb2f91ddae0536b5f1c8b0e3d14cdb36684a775acad7d2326ba828a8ad5a8b1560c9837ceb6eee592ea16b3c128125d95649aca44757c064 SHA512 01ddee5c0d7a792be45eabbe842ec6bf2fb608ba4d02abc5868559c6bc52e15c4b52e571e01b45557307dccb86a89dc7dcbbbc4dfe7cf96ce99c6e8cc205042f
-EBUILD python-3.5.5.ebuild 10840 BLAKE2B bdc7f68f19ec8bb0adbee7b3c45e302b642ebdd302505c93690d3f02d56218769b6c14f9ca6c426d9d8a12c55bd1ee729e98f614814ecd114508213def0bc87e SHA512 02229a75e9ad576228c3ffa4e1652ddc8296548b492c582c3b2270800ef0c78aec7bc9dd9b1a71423c7b668dddb34839543ede1982f6a8f236d5c1675a8f08c2
+EBUILD python-3.5.5.ebuild 10839 BLAKE2B c2d414894a7109453066a218fb861417d4a4c96e1bad69cc7fec827df69f76852b276a910805807702020cf1fd932253c97e60b796b0c88ab148c9a39e081164 SHA512 6aef9ae4fda1f738aeaf98c7f4f139371cf0826543432d769d2f89ec84f6d0e4d860abd377654ea739cfe962cf7cd76d9af6e0292f040525daf086543862ad09
 EBUILD python-3.6.3-r1.ebuild 10151 BLAKE2B 9ec6af3cb9b012f3869cf28c5a59f6c3b36ffe403f91b0af02f2892fd083c36190e2d50ce2c81e7f9347b4a08847d1591debaa5d126734dc2d24ee349a897ec5 SHA512 67d93b9c93ee37fc46cf193730550636487b189c57fb47f1fcfc1a3bf2cf12e464df1614ee9b871f0c385c243d9fd2a167be8635a524ca322d0964c04df77f17
 EBUILD python-3.6.4.ebuild 10083 BLAKE2B 7d04d19bbc1163fd3425f666dff268ca58657ea4e6548bbe3320e9c2cec26feefcf66762d709680ad790fdd44e846fd587301b586a6f8f28a0806d7b47e29a1a SHA512 23e3d170b5f28fce900ba35108d8ffdfe654347e3af4c1fdc5920d49264f1976c16eb9393a811b4883c1a5ce94140700411bc8c2e5087a2d3a06abb164749a43
 EBUILD python-3.6.5-r1.ebuild 10387 BLAKE2B eb8fea85856a47017c639189b27cd0ab40da87f7651c51fe745e07813a74416e5e26aec55eb70638b5439fa6a08a92bcb5cb77c121f6bca3f253f1841b71f88e SHA512 2af8033d26fcca0544027c4d60a3b50b14c3e116bf1c97dcfc4c7bb62e63ff4998df75f381300ecef8ed9253e6f65fa7e99ed8f077641acf2204f92724b4274b
-EBUILD python-3.6.5.ebuild 10181 BLAKE2B e5be6fd1579316ac404871c3a9d5f39e4ecb776634516687111c49d568639d6d6f60c3e8fc389a245d0b1ad1723c420811543a024c09b2e7cef6cc78fea05d51 SHA512 881c7e0d43a82286c0b094964a57ce4307b11ae2e9bef5e47d8087595e0c6e0c8dfa2fe93800ae6f2b512b815ba9b121f48dd2a916f3e9e1e5e2404b23168d95
+EBUILD python-3.6.5.ebuild 10180 BLAKE2B d4876167eda2b03b1fb9a183447abc134ad806603db524f692a5c91fd32243103061e33ff8e8136db6d838ffe1454be1a70a4526b71626ab43eaa6407579a6ec SHA512 42ab305d129d7a5ccad4dc8cbaece4afa432c4168515da6a9784a16738cf703b110f547177e57cf6b385a9643e2278287ed9b26ef1a1e3b1a981962f52ca13e1
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-3.4.8.ebuild b/dev-lang/python/python-3.4.8.ebuild
index 9f3c20ed1e8a..dc6875883582 100644
--- a/dev-lang/python/python-3.4.8.ebuild
+++ b/dev-lang/python/python-3.4.8.ebuild
@@ -16,7 +16,7 @@ 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.5.5.ebuild b/dev-lang/python/python-3.5.5.ebuild
index 069d54f1f8af..344952d35ebf 100644
--- a/dev-lang/python/python-3.5.5.ebuild
+++ b/dev-lang/python/python-3.5.5.ebuild
@@ -16,7 +16,7 @@ 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.6.5.ebuild b/dev-lang/python/python-3.6.5.ebuild
index b72ba6cf4358..a88bf7b584b6 100644
--- a/dev-lang/python/python-3.6.5.ebuild
+++ b/dev-lang/python/python-3.6.5.ebuild
@@ -16,7 +16,7 @@ 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 3838108d9bea..6821a66c4f69 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -8,6 +8,12 @@ DIST rust-1.26.0-arm-unknown-linux-gnueabihf.tar.xz 98490960 BLAKE2B ad4210bc39d
 DIST rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz 98788032 BLAKE2B 3727effee1eaf89d979e27f339901ac938acc22d9dd8e664c20941e46db8250f349493f65598243d5234539bb2037e9dabd38f1a047dd8f9bbe20ae2c8270747 SHA512 5766dbba6f4faae3e8dfd1d98ea948e3835d5b1c28b8daf6c734afd7f27301aa857147eb28762462f77c9da539aae2a81319f194154245abd5cdae7067f24d6c
 DIST rust-1.26.0-i686-unknown-linux-gnu.tar.xz 143003764 BLAKE2B 4c0b1872196c21bf9bc9d927455b4c8eb379e40281ef9fdd8a440b702b919628a00bf2e7b392084e8f41f30119c93bfa6e57ba47ee1adecb1d5cdda43778f821 SHA512 1257f9edefc49ee1742c3acd666d15f077c4d999a82dfe0d574df5c41981c3f716adf86b23d96cf9a6757508aea92abcbe06ad9e3bec2cb4ac19512d60ebba31
 DIST rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz 139246408 BLAKE2B dc386c7b9e016bdcb8b2475d789b100922defc0bcd400476e4e618f51c338338edfc463428c9fa0fdcf8f051465a126d1c61030c5881d5c21888e80b8068bad8 SHA512 457503fea324251a92f25d0d45f1e2ac7d342a6a8f52d1abe93a579c7ae9b7f453a707d353e82614b37790747e8551f9762188ee25ff883495598cbf17b3f97e
+DIST rust-1.26.2-arm-unknown-linux-gnueabi.tar.xz 98267104 BLAKE2B ae44fcead124e5e3993240be0c8a46e545df5d045d39184cfada86d9a820fa30a771396a2ced86c2454aef224951e85cf0b6965c13ed98a3024e07d4ca1ec6a9 SHA512 a96295ef2d0eca5a682e3b3bcfe3b3ffeb5bbe45bc949f467cfd1e7ac7252d74e86d2d8f25e5722e75e7f537afeb3b0ae9054bd3908916ea461623f8c13ba5bf
+DIST rust-1.26.2-arm-unknown-linux-gnueabihf.tar.xz 98502692 BLAKE2B 124040a31e93923f66319244dbeba2be5836fb05ea3c1b8d833bdfac796ab1818139651a798ff398c7448958835ea238e9a111899493b992cc25c026a096ae89 SHA512 e23aa8e1167990a61413cdc0c0f336eafee02c90763120a08fdd7fcd7fbf04bbdbe38c59017cfa43ef622cac1b03f0850d5ace15046d384311a9f8af3cbe8b40
+DIST rust-1.26.2-armv7-unknown-linux-gnueabihf.tar.xz 98828932 BLAKE2B 2f60e65128bd32d97422d82d99f5c5447d1c1e77582028089d52208e3ede4af5e72c278a3fb5001348c864087f3e85af05604a0b6078891c5ed812d745840d93 SHA512 7b8e3f39a62b7b5fdaa6d53e5638de26968799d97b5d53e09bf49456b02f968495cff4757f25d38bc3393ca33dc1b9da353ec290ba9416770e082548aa5079ac
+DIST rust-1.26.2-i686-unknown-linux-gnu.tar.xz 143090096 BLAKE2B 7871fa4e4d0f320ff949cd31cefa116bc7b741927626958e1d10197f05fc9a662b8d6c21ddd4d2910700e6f7273e4fc18738e6ff58cd85b9af4ed25eceea31d9 SHA512 859b5b72c78cca8cd473012599ca12539ef9a5ee38d1aaaad024019fd84220e344e1cd0efd2b027ef333555b158b23529f35ceb5d59d76c35e7946b5fe4a8a52
+DIST rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz 138609432 BLAKE2B 54507a8ce3ab2676e6e66852b6d3f1a47ca07ad4b56383f6247149309a0f60f67fbf0a6ba27d968c24340c07d7d5074942c6eaccbc1207c5e75fd9a6f47b2481 SHA512 29e474b0eab4dd2ffa0b964d83f52ffce530e75c4193e307410ef6d20ef9ad2b300a4f467bdf06b3311157340e9295cb9b1efdcf08dafee66979b076c2afba7e
 EBUILD rust-bin-1.25.0.ebuild 3450 BLAKE2B 473a4e4bbe1c84ed84641810a1231a53f10845bb598cd44a9de5db6b050aa843ba875ab5dc1859697d006d535bdc2cad671ff0bc5d16d54090e26bb147ba8117 SHA512 ce0b76d6efc5e875a959a2980d74d95297563c25071db915a8fc3e71dec2ab14fdf299189dee65856e04df5d4a987f046ee38f7724411ac0fd8edb1192167b95
 EBUILD rust-bin-1.26.0.ebuild 3585 BLAKE2B 3ae5644e7ccd922d703aa37813889ef8397354e47125cc5a8742384243208964d5c3be812d99393c1e63419ab3fadd235e24eb66dbb9a7d3bd1b97f41dc2c701 SHA512 a13c65f5c5f7ae9d9139234a5d7eefc9fc31f38b6bf6f201cbd7b33a7b7d4c6bfd4c3c4999609a0b3744189e389bf7a187f3b557b2d6fbb4a09efa9a825e0b3b
+EBUILD rust-bin-1.26.2.ebuild 3578 BLAKE2B 4467db057c59d0bca799c130efb0cb4c5229b75c16206ae87bef06355ebab46554b9a7688835a34532487b0dfedb85c5f10014441f2b3fdb2e44bae479da6d4c SHA512 f3666946299db6b52d7ed292dd53e77d22cb9bd00be6e6287f6fcc03571f6b0687d6d3dd9592f22cb1ac8a9ce4e6a2b4420134b7ff1fc955bab60785ee70f1d9
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/dev-lang/rust-bin/rust-bin-1.26.2.ebuild b/dev-lang/rust-bin/rust-bin-1.26.2.ebuild
new file mode 100644
index 000000000000..17ed96d4b1f3
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.26.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1 versionator toolchain-funcs
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
+	arm? (
+		http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
+		http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
+		http://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
+		)
+	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	!dev-lang/rust:0
+"
+RDEPEND="${DEPEND}"
+PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}"
+
+QA_PREBUILT="
+	opt/${P}/bin/rustc-bin-${PV}
+	opt/${P}/bin/rustdoc-bin-${PV}
+	opt/${P}/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend () {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	default
+
+	local postfix
+	use amd64 && postfix=x86_64-unknown-linux-gnu
+
+	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+		postfix=arm-unknown-linux-gnueabi
+	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
+		postfix=arm-unknown-linux-gnueabihf
+	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
+		postfix=armv7-unknown-linux-gnueabihf
+	fi
+
+	use x86 && postfix=i686-unknown-linux-gnu
+	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+}
+
+src_install() {
+	local std=$(grep 'std' ./components)
+	local components="rustc,${std}"
+	use doc && components="${components},rust-docs"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${D}/opt/${P}" \
+		--mandir="${D}/usr/share/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	local rustc=rustc-bin-${PV}
+	local rustdoc=rustdoc-bin-${PV}
+	local rustgdb=rust-gdb-bin-${PV}
+
+	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
+	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
+	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
+
+	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/opt/${P}/lib"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 4a327480c3b4..2bd164becbdc 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -7,8 +7,10 @@ DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz 111059260 BLAKE2B ae982976a735c
 DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
 DIST rustc-1.26.0-src.tar.xz 54613664 BLAKE2B 798985e4060c28828066118f39fc296e52b3796ae02f3917912680154047eb6f91806b3d45f3a0e9afcef55d95cea3079debae12d2ddf2d9c46f992e12519094 SHA512 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
 DIST rustc-1.26.1-src.tar.xz 54604108 BLAKE2B 73e14d835812a42f32342732db448294c98e5cfdcb76b4a5d11085bef6302ae340abadba564c38319882b558df6dbe826ed73347229599f2f8718085a6cdbe10 SHA512 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
+DIST rustc-1.26.2-src.tar.xz 54613640 BLAKE2B f361b7a0ed40ccb026750b4a70b99931f1abf52024e907b588e339902de2fbbd15501d237ac048d0537005834b0a2f49935f654a8c75d40ed95c65894f611481 SHA512 a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
 EBUILD rust-1.25.0.ebuild 4601 BLAKE2B fd0f6cfd9c480b1a6ce19cc02a66233a5acbca045d66955fe4263b66456145f5602de2878b739d99fb42d09c92ec99e7311402cea863e415fe2bdcd6ee0d88e3 SHA512 8928dbf17abbdd5b484dccc6d2fee12e1f653b0e37d2b4a2750cee0c64dea749102baa2ef13c46aa46a40d88fcea364730ad35f1ca72a017f00e60943f9470e4
 EBUILD rust-1.26.0-r3.ebuild 6165 BLAKE2B fea4c2b3ce27edd6a0d024421c8adf719d6d8985cd4f980387068cf69407f08881629cb1f78029543dfbcc42da4158c31ea7a482cd1d9c10409b5c1b7c805216 SHA512 884bdb757420bd0e822db94e47cf53858b63ff9c488013683804f3dedf4c7235358101db9cecdc838c00b2d3d8ad86e35942a4e571365e2e8fb59490bff44186
 EBUILD rust-1.26.0.ebuild 4927 BLAKE2B 7e78c4897053f80fb47c91ab83aaac3fcb772ab75796112aa035781663a962d052ff7486c4baafb2b809e6b22ed10f18ec495aa063a76065d3f45d69b603b80c SHA512 62197eb7b7e0be13f547b49b15491a71689c9076d8805fc53771e9b57e7aac3fbc0197ba6a087958e6be788c57885fa4b5cdc22767f57f318235c91ac40a4c3e
 EBUILD rust-1.26.1.ebuild 6165 BLAKE2B fea4c2b3ce27edd6a0d024421c8adf719d6d8985cd4f980387068cf69407f08881629cb1f78029543dfbcc42da4158c31ea7a482cd1d9c10409b5c1b7c805216 SHA512 884bdb757420bd0e822db94e47cf53858b63ff9c488013683804f3dedf4c7235358101db9cecdc838c00b2d3d8ad86e35942a4e571365e2e8fb59490bff44186
-MISC metadata.xml 482 BLAKE2B c75f5749d7c3b17c9ea4c811809448dbaea4723e74da9e0a9ba4e492c3275875c95ae4d209a0129c24f3e692c00c77e36f16b23e2b3d6ea22c05f50b0de7d054 SHA512 5e9ea6d3db22676701c132298ea8b03453a53aa3b79f564f2cc021735b60329f1201c871541dde362315e938543e89afc6f0c3629218744ddca75d95deeb4a88
+EBUILD rust-1.26.2.ebuild 6404 BLAKE2B a85008ed787f9a7de925ebe104ad982743075d2d27a098f575a61bfc0b61fb3f051eaa6246d086bd67448d56badf079d919609019270a2b511f194bd2d08e82a SHA512 c2637e3ac9d52d71d0475bd19976c875142c26a88c3e4f5f1e851f56e0dd15c0298b7db39112117130c44534324a827d3b709d747b2bc65f82dd93b31dceab95
+MISC metadata.xml 567 BLAKE2B ba37cc554e05535739292d3c69155bb53bf0c99260dd60b4e7cab0eae13edee8c7e66204e3aaf9d917153714651486370db64bcda5200d6302bd8bee8eff989c SHA512 57384c3ef2f103b20d64854e5c3e50237be7f1af57687abae6a067d452b10a16ead4534b8302beb782273a8bf353adb3da90c5c140bd5394eac2ce0d3dbcc1e3
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 78ed62129557..c03ce153031e 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -10,5 +10,7 @@
     alongside the compiler and stdlib</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> as the
     standard memory allocator</flag>
+    <flag name="wasm">Build support for the wasm32-unknown-unknown
+    target</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/rust/rust-1.26.2.ebuild b/dev-lang/rust/rust-1.26.2.ebuild
new file mode 100644
index 000000000000..0d7482f8a0d6
--- /dev/null
+++ b/dev-lang/rust/rust-1.26.2.ebuild
@@ -0,0 +1,232 @@
+# 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} pypy )
+
+inherit multiprocessing multilib-build python-any-r1 versionator toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+CHOST_amd64=x86_64-unknown-linux-gnu
+CHOST_x86=i686-unknown-linux-gnu
+CHOST_arm64=aarch64-unknown-linux-gnu
+
+RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
+RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
+RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
+	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
+"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="debug doc extended +jemalloc wasm ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+		jemalloc? ( dev-libs/jemalloc )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	dev-util/cmake
+"
+PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_stage0_name="RUST_STAGE0_${ARCH}"
+	local rust_stage0="${!rust_stage0_name}"
+
+	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" rust_target_name arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target_name="CHOST_${v##*.}"
+		rust_targets="${rust_targets},\"${!rust_target_name}\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	rust_target_name="CHOST_${ARCH}"
+	rust_target="${!rust_target_name}"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		targets = "${LLVM_TARGETS// /;}"
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		docs = $(toml_usex doc)
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		verbose = 2
+		extended = $(toml_usex extended)
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)"
+		docdir = "share/doc/${P}"
+		mandir = "share/${P}/man"
+		[rust]
+		optimize = $(toml_usex !debug)
+		debuginfo = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		use-jemalloc = $(toml_usex jemalloc)
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		lld = $(toml_usex wasm)
+	EOF
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(get_abi_CHOST ${v##*.})
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- EOF >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		EOF
+
+		cat <<- EOF >> "${S}"/config.toml
+			[target.${rust_target}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		EOF
+	done
+
+	if use wasm; then
+		cat <<- EOF >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "lld"
+		EOF
+	fi
+}
+
+src_compile() {
+	env $(cat "${S}"/config.env)\
+		./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	local rust_target abi_libdir
+
+	env DESTDIR="${D}" ./x.py install || die
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+
+	# Copy shared library versions of standard libraries for all targets
+	# into the system's abi-dependent lib directories because the rust
+	# installer only does so for the native ABI.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
+			continue
+		fi
+		abi_libdir=$(get_abi_LIBDIR ${v##*.})
+		rust_target=$(get_abi_CHOST ${v##*.})
+		mkdir -p "${D}/usr/${abi_libdir}"
+		cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
+		   "${D}/usr/${abi_libdir}" || die
+	done
+
+	dodoc COPYRIGHT
+
+	# FIXME:
+	# Really not sure if that env is needed, specailly LDPATH
+	cat <<-EOF > "${T}"/50${P}
+		LDPATH="/usr/$(get_libdir)/${P}"
+		MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-lldb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB and LLDB,"
+	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/snobol/Manifest b/dev-lang/snobol/Manifest
index 5dfca8ba60f7..bd0263fe3968 100644
--- a/dev-lang/snobol/Manifest
+++ b/dev-lang/snobol/Manifest
@@ -1,9 +1,5 @@
-DIST snobol-0.99.4.tar.gz 388020 BLAKE2B 18c649923ca907b657e638a3c45e390044a462c3ef88fa69b3688436af94288ba98556d9bf9e0cb26ebcf4941ecf18f015848f17b29ac54bc4e83cc98c25ee9d SHA512 4333c83302363ed47dd98318add93b584b67b8b38bdf01f9dd38981b7711978b5dbec71e9e4aa964e82a35700a927650d3abd3e3074651ab02a7021973af1a6c
-DIST snobol4-0.99.44.tar.gz 528205 BLAKE2B 09e967db4348d84d1227b02832ddcaf0e5ef3dd2230d4635d680f85fa8fdb9b6f8c9897a883612baac934909523bc880034e1d85001e79eb099c8538b0377839 SHA512 46ffd03e4f392c7e7cb2a532b0ab6536750c57c78284bb02fa15a0a3a0166adb60779e068c3baf542d81cb01b7cd881d952ad4ecb9cf50a9c109e3b68e292720
 DIST snobol4-1.1.tar.gz 677333 BLAKE2B a6ccecaa66657438b2c05dfca9f7db95270b4d1a3502ad06c8d217d50d54ac33b0195eb8b2e045ac0b6c49c19a5bf3ee46e4a35b45555d67fc669317c7a5db2b SHA512 ae8482bc64f3d9020dc4d7e390296114e7498ef2764ebb69b6c4960d0c1b01daf4d77dff1aa583231a7f50d4c54f7f72cedc3e4744b03f4b2370fa6de837a3cc
 DIST snobol4-1.4.1.tar.gz 736837 BLAKE2B bb86d2cd3788ad66b7246d86ebd9f289189f5bd059238d2df3fb621aa4a1e910a8ad029f482077eb78916a84c3a28d868e8ac6eef83b48d7f09a8964c57a855d SHA512 5413af10018141e93f05c9ea637711bb3981f2b67557691d05dde8911178d90900f0fdef6c1d2416ebdda6afeeabd21b9e371b6711b2d093df629cc865fc61f9
-EBUILD snobol-0.99.4.ebuild 1111 BLAKE2B 1ef7d360e7f2eb2c98ece67f5781eedd2465ec130b74c98dbe4994a6c711c7bc934e8c4ed06204a9124fec22726aee3023934e2a9e3f5c666aa465e07e1b8cc3 SHA512 f682185fb9a90e6e62a4bcacb69f9dbd4a5dbf2f44c27a1d71b7fd8d82813c52e4e24aedff626f7265d5b7b5c050e344aaea35c6a111255f65ef1eb568616820
-EBUILD snobol-0.99.44.ebuild 1322 BLAKE2B e133957c74db7fb4d1dfd05fdae8fa54da658e25a0b1a7d91a4d735c8532d01a6cf88da802062270cb1e41044ab9986e7a8c342bb283bb701b32b2d04c63bae3 SHA512 1d1ab0ebbcabda8a983cb15d4f0e757074c09b7f8c5f64629eee37bde6085f2cc6601cddf64f38bf6e618ec663ecd37cd5546b93b1653559afeb5fa682bfca9f
 EBUILD snobol-1.1.ebuild 1418 BLAKE2B 23431276ddfcb476dafca64bfe424f1be1d5571467e022bc1a7071e6178e60479f083d6377070e4c0b4bde181615d435d71c2ad843b34926879476b3fb947e8a SHA512 f0ca27dd442231cb15fa95ea8d43ac0937afa8715defd4f6506de072b9a3a0ae74ffa3af8ddac7beebb6612775479a90f80fc045824a273e8b011ec57df8ca54
 EBUILD snobol-1.4.1.ebuild 1286 BLAKE2B 7476a992fb502c100f60ee90b1842223dc789e98ae8b2b30ba02f84b94e79b9f61325ec1f90ca5dc3aaca669e153a02f154029ea6d66a8a6952f39025ef4dd25 SHA512 f7da5f8ada4660b6d746cae936d959d26a0170d01a7791ffc68b3522ebd410eaa22aec5d20fee457726ffc4b11bba391d25ffb447558c0f5dbaa11708f632bac
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-lang/snobol/snobol-0.99.4.ebuild b/dev-lang/snobol/snobol-0.99.4.ebuild
deleted file mode 100644
index 33400a069211..000000000000
--- a/dev-lang/snobol/snobol-0.99.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
-HOMEPAGE="http://www.snobol4.org/csnobol4/"
-SRC_URI="mirror://snobol4/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc
-		sys-devel/m4"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	sed '/autoconf/s:autoconf:./autoconf:g' -i ${S}/configure
-	echo "OPT=${CFLAGS}" >${S}/local-config
-	echo "ADD_CPPFLAGS(-DUSE_STDARG_H)" >>${S}/local-config
-	echo "BINDEST=/usr/bin/snobol4" >>${S}/local-config
-	echo "MANDEST=/usr/share/man/man4/snobol4.1" >>${S}/local-config
-	echo "SNOLIB_DIR=/usr/lib/snobol4" >>${S}/local-config
-}
-
-src_compile() {
-	# WARNING
-	# The configure script is NOT what you expect
-	emake || die "emake failed"
-	emake doc/snobol4.1 || die "emake doc/snobol4.1 failed"
-}
-
-src_install() {
-	into /usr
-	newbin xsnobol4 snobol4
-	dodir /usr/lib/snobol4
-	insinto /usr/lib/snobol4
-	doins snolib.a snolib/bq.sno
-
-	doman doc/*.1
-	dohtml doc/*.html
-	rm doc/*.html
-	dodoc doc/*.ps doc/*.doc
-}
diff --git a/dev-lang/snobol/snobol-0.99.44.ebuild b/dev-lang/snobol/snobol-0.99.44.ebuild
deleted file mode 100644
index 62344ab43a16..000000000000
--- a/dev-lang/snobol/snobol-0.99.44.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
-HOMEPAGE="http://www.snobol4.org/csnobol4/"
-#SRC_URI="mirror://snobol4/${P}.tar.gz"
-MY_PN="snobol4"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="ftp://ftp.snobol4.org/snobol4/beta/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc
-		sys-devel/m4"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	sed '/autoconf/s:autoconf:./autoconf:g' -i ${S}/configure
-	echo "ADD_OPT([${CFLAGS}])" >>${S}/local-config
-	echo "ADD_CPPFLAGS([-DUSE_STDARG_H])" >>${S}/local-config
-	echo "ADD_CPPFLAGS([-DHAVE_STDARG_H])" >>${S}/local-config
-	echo "BINDEST=/usr/bin/snobol4" >>${S}/local-config
-	echo "MANDEST=/usr/share/man/man4/snobol4.1" >>${S}/local-config
-	echo "SNOLIB_DIR=/usr/lib/snobol4" >>${S}/local-config
-}
-
-src_compile() {
-	# WARNING
-	# The configure script is NOT what you expect
-	emake || die "emake failed"
-	emake doc/snobol4.1 || die "emake doc/snobol4.1 failed"
-}
-
-src_install() {
-	into /usr
-	newbin xsnobol4 snobol4
-	dodir /usr/lib/snobol4
-	insinto /usr/lib/snobol4
-	doins snolib.a snolib/bq.sno
-
-	doman doc/*.1
-	dohtml doc/*.html
-	rm doc/*.html
-	dodoc doc/*.ps doc/*.doc doc/*.txt doc/*.pdf
-}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 150c50b6f84c..51e919c677fb 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -6,17 +6,13 @@ DIST swipl-7.2.3.tar.gz 16192142 BLAKE2B 680047a4cbb7d113e7c232f58dcd45c8739dd82
 DIST swipl-7.4.2.tar.gz 16496738 BLAKE2B a8f45c4277e48c0aa38f8b278b466dcb9e0a776325a9ed9e08c252660671d3ee0ee441978394682276b3fb9b0eca73ad10e02aba4671630bef0a1e8f813dd3c5 SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3
 DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9afd62d0b62c315e3620a3943809f58698a23f279454e00299f7b7f7b91e8d9694a139e8c424cb2f83a4efc7a52 SHA512 d84af1a565935af9934c6b75192bb2dd87388ee8fe793ade35d5549a95ec5eb83da6b10508766e795f88393fededea4ec7a3a0c2f0f685d96ab615e171d7d1f4
 DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
-DIST swipl-7.7.10.tar.gz 16800970 BLAKE2B c9d8904734bb5a6d20adad8203cec6682e9bd97a343d887d1c03dfb735f32e5794ab0631a76e69fe5f0c7d2e76cd21be06471c7df6e4bc585882b7de1308ec70 SHA512 55e0b129424c2ba0f7a8151b85eaf3de6ce7e16ed01626fae245eb0ee754dcfa7bfbd3a30d00da7e2df72b8d2899e5354900e27b47ffe0401bc26a0b594f9d30
-DIST swipl-7.7.11.tar.gz 16935711 BLAKE2B 5ccac7b91ef35d132451b101a53b9977067e28d4239ecf25185e4140d728a711a8fd9dfe73bf51c47a2935c51637c0ad61780997e0b9fa13e6298d815c46071a SHA512 28bffdc7d7c431aa59a996faddac941024d3923c22793b890938475f041e2d40d9218b10779e5ad01c91093234dfd21ea3339756950dd8401adeb5783c3e3aa3
-DIST swipl-7.7.12.tar.gz 16935097 BLAKE2B 774bbb34325ed03eb55c71f7f98063ea44012a7069aabe9d77f16252f9f2a1c398a86c16eb47604f271110f63d249f77fdbeeed307ff22f427a61f7beb871df6 SHA512 4c1e6b13f37c16977f6ff384cba119d0fecfe48a20b7cd37b26154587d2abf46ac1619e96f5fdfa85549b72e9077bf73fd2f74b84d9d3f4c37184f0669b0e432
 DIST swipl-7.7.13.tar.gz 17057506 BLAKE2B 4eb1f94511d1784f2df93100e646921541db67d09469f34f58ac9884935d1917feb4ce76f1e6284fd9e6f707b13bb8d77110c61300a78aa4c68bf4b4afd908a9 SHA512 b838b6c441542fbca3f635cb62dd844f09d0549f4da1f4ea9f9201d9e917f08e4a8917357f83e1c6704354f095f9212df92b19cbc631e91d891599eba23ef6ed
+DIST swipl-7.7.14.tar.gz 17058567 BLAKE2B ad73035dfb6f731de7a6463ee1a2162f8fe54154969310f837df2367547243790c18df6cf96f16757b6e9760713123cae87c331efbb029c7b48354da24b148fa SHA512 b94b4c3f5dd55d5e90b7b005a03607eb31bb7e6aced5616b819491287b650f819a95853ad5df179c9db5b3646773c458e6d1ae65d30687d4e45e22555a4301f8
 EBUILD swi-prolog-6.6.6.ebuild 2802 BLAKE2B d84dbba5c1ed23020e067ffd9a0c616dcf0c07a7b1df12d5838b4692813527f328a735463d5f142ce7d7fa8583b62c8a3a5bffbd01a381f85dce1b3e35d8f821 SHA512 f750a9baf473a2e0913613b5e3feabd8fac1b7afb6cab926868154d9089cc57dc9815dcfbd001d929085df585b256903c7df7fbf602c5e0b021fa340973038bd
 EBUILD swi-prolog-7.2.3-r1.ebuild 3173 BLAKE2B 9624fab340ad2ef4ffeb7d91a9ddc4404cbe3e38c1d561d5adc6501041a306519388e9ced37f1c146e923eb2f649643ef2d2d50da2c8e82a31c960d4d4b48d74 SHA512 1b76ecfac0eb5c03d61e25575fea8ea1a58ee511291274dc865c033cac7a796a632057063332e7621be01df7ee550e6f5957386c70a07081a46d9a87ce34b062
 EBUILD swi-prolog-7.4.2.ebuild 3398 BLAKE2B 368ef93ceb17042a28699f9aa469e6b5c39aa29154b810e43fd050ab3bc1079f83680cfac8f4108c7c297a51e9bdd28357a0b6241c08faef3ea5f81ab1605558 SHA512 76d094f62e442ac86d32eaf467179fdcf4d4edf6034f711104e91f8a01b7e343208ef0b6e492ed18c8c0605b96a48f1adef8f3903f861c716e882cb9695b0dd2
 EBUILD swi-prolog-7.6.3.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
 EBUILD swi-prolog-7.6.4.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
-EBUILD swi-prolog-7.7.10.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
-EBUILD swi-prolog-7.7.11.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
-EBUILD swi-prolog-7.7.12.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
 EBUILD swi-prolog-7.7.13.ebuild 3419 BLAKE2B cdddb2edae9aa893d13387d22e4b40b6d98dea32d227b078465f52952bc92d5a1b12bac23a6308a4e2185a74399155d5f338b46733bb75502a7fd4051b2e3194 SHA512 a3821b60339d2543cd9449e0e597642c838b9293555a8e2f72be1d79087c88b51b7a2525e444f8a12f57ba6f4c499c6d81ab9f3d3cbf9ac91df26c0e54962130
+EBUILD swi-prolog-7.7.14.ebuild 3419 BLAKE2B cdddb2edae9aa893d13387d22e4b40b6d98dea32d227b078465f52952bc92d5a1b12bac23a6308a4e2185a74399155d5f338b46733bb75502a7fd4051b2e3194 SHA512 a3821b60339d2543cd9449e0e597642c838b9293555a8e2f72be1d79087c88b51b7a2525e444f8a12f57ba6f4c499c6d81ab9f3d3cbf9ac91df26c0e54962130
 MISC metadata.xml 367 BLAKE2B 07c7ff161f07b547325566650cd882c90dbe98ac5afc0015d68bc0338cebd678ac82c3a45edd3e4f7e613d5d493324899dc8e3b4ca448f447744f439e60458fd SHA512 bacbb17fc3518d3bf845d097d17dba772a745fd7343ab6e8c751a417a540c8c003f29b86c66374bee538d7a5d96ab95e67b1c619d47f80d0e332482daabee74a
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
deleted file mode 100644
index 420bd6d9fb12..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild
deleted file mode 100644
index 420bd6d9fb12..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild
deleted file mode 100644
index 420bd6d9fb12..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.14.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.14.ebuild
new file mode 100644
index 000000000000..38db2fe7a5aa
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.14.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+
+	eapply_user
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS} -DOF=_Z_OF"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with libedit) \
+			$(use_with pcre) \
+			$(use_with odbc) \
+			$(use_with readline) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 129fa3b72cf3..2d89a1dedb94 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -7,6 +7,6 @@ DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40
 EBUILD tcl-8.5.17-r100.ebuild 2790 BLAKE2B d8de982d4d2f103bd5a1271101bc997cd1920c7274078f9004e6983d30326fa0379588d529c3e459f4e93e9e723548aa37fc5e074df768d046bafc3decb4297e SHA512 b09ac13d74992c34c333fba336e07e6baefbe8ee6a94e8c59b17ac40a508bab4146f7a6d00f712ef70b9d5d8d168d259dbbed77d4e5e2e65c2b45ff2769586d7
 EBUILD tcl-8.5.17.ebuild 3706 BLAKE2B 4f5b6c6fb9c25a7d31a1adc45fad8fa432478056d5a0895298ba79f2a5904bcd977a73d60f34355ed5290bf5077f5d74ba050583ebf0e99a119f9d4b14dbfe0b SHA512 11816e9baefbf29264fd844ddeb38fa94686b0b8ca667e7046713860a97945caf122f831d7778b7ac78ab392bd4ac9bc10578c70d74b21c83c5da1b479d9c800
 EBUILD tcl-8.6.5.ebuild 3962 BLAKE2B 3fadd59589caa0bc22a7970c6bb52dd662e36e93f6a2ddf9f73c1f276afc36a2f4dc75e1ffb3b2b3be46b1e9686a8a41c722863a0d8daa116d8e61c40db5b279 SHA512 96f7b910afdd515558dd0f9778ca5cac8e1d9a25fd7e615f8c43adad29ec5237e6a5edf9f702792fdc7eee147b015472a3febc4da98cf07d8c9aa3d5c80851c3
-EBUILD tcl-8.6.6.ebuild 4052 BLAKE2B 8a7f179399498a724248560f5d097f3bd55576dd59e7b89eff778010e7b20d79587e78dd31f213bf49f4000f9067793a9b3621415b0558f5e96cdefdad786aef SHA512 4bc69a1465c801af3d02ba5e1968d4def97e724ae40a43af009aa2281c7999c26e0b4fbd843a6b8cb87515cd6516decef35c85c37fd91232dfebe3f915b6f260
+EBUILD tcl-8.6.6.ebuild 4049 BLAKE2B 117d52024c043b1bcb0c1a64964b7987dc9bff5570c4a02f9ff277fe7505f8cc22c047888fd5f7b29ac364a826725dee215fece983407aa6c69f47e0f2b36032 SHA512 695147bf0e6d1bec4d20bf06c3f494764005ac9738019c4663ad2daa48088797300cee6e2168a9e0529a6508576e2a264537668decda80bb3d064c96526a79e7
 EBUILD tcl-8.6.7.ebuild 3975 BLAKE2B f634d8ca712b39080fd7949361849e7c33f94c4abae673faf306cd750523ceefcd19aef75700759225a32850ac51d0e59bfcce7cffdf630ddc25852efc0579fe SHA512 a8160b7d89b82d3f66946a33b710aaf570132623d4b9a7ba7c180133c199b4f82ef4cc75508e7e83226a37921c31e38d9d2e9f37b13602bac73b706047e9ca31
 MISC metadata.xml 318 BLAKE2B 7ea8e51656c255c3aea3bee8849423604a164efff556974f6032de44d33e38bb0378b69c18821cc76f0284064bc84a1a56e79f522f8d7fb0adc50e2e191b5fca SHA512 61f3feb8311f1babb8a4df8c9fcddaab009ffc6d69248f18cb9e001a1659dfcf47f2699008ab83fb563b3417f6ead8113af20db7e3893f488e8d75bb2a3483cf
diff --git a/dev-lang/tcl/tcl-8.6.6.ebuild b/dev-lang/tcl/tcl-8.6.6.ebuild
index 013773c8fd85..99b1b285a3bd 100644
--- a/dev-lang/tcl/tcl-8.6.6.ebuild
+++ b/dev-lang/tcl/tcl-8.6.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2f9f94af89b9..abff4052fc33 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index d07748fd080c..f12c0452215b 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,14 +1,10 @@
 AUX boehm-gc-6.5-gentoo.patch 2815 BLAKE2B f8d853bcd7f7aff56ae246653feecea291451ab82c946f6ba4d7e981ee1252fddb6455231ff0aca0f7342b93c1b5bbc133b954394b6d0bde766c1b3c39a9f12a SHA512 ba006dda2d3ab295cb14e80f8b7e0908acbde89dbdae46b12b91b111ee1ebc1340ac0b91db8eec18a130a59fe27eda2f7d48f9ea35280c1e9ce3513d3a72779b
 AUX boehm-gc-7.2e-automake-1.13.patch 372 BLAKE2B 5e385b21e4868cee8928d5137c7eb6a5f9acfd20883ea116bc2fe974a35ea4d62866573dc414beec72439d8a1e128b9a4d3e9d9b358c79ebab7ed0f0ec3c3f2b SHA512 19efd52b91b985b31e190b77e5370fb510ad582a54868bb1a7fe54ae57e0625df113ad059a6d636a10f314624137704af8e193460b55c8ba422b9255aadae020
 AUX gc6.6-builtin-backtrace-uclibc.patch 425 BLAKE2B 24bc5443353681d3aa5b4ba592535d5905bc6feded1e8e80927d9aaf8928411e37529cf0cfea5e7a22fff630bda26540ee55ccf68d787018f34024049f1acfb5 SHA512 614dbce788a8e559c25966f9c82343d7ff2b26069f6f77bfa6d91abb755a8d4a46958e9b95f14d1e7e20349dc4df5b32a9e5bdd3eee9e5009a30003214e5f87f
-DIST gc-7.1.tar.gz 1077714 BLAKE2B e3171e16b3451d61baefb6c005681abb3bdf6d29cfd595dc9b8672795a127a8dae0d03ee333ad23344adf8b0bcf2f0a4597ab39d5be2d3a56c5d92c0c717acb8 SHA512 10faa0062c7df2ac7e2e29ac369167daad526c9de477e9af2298e6e5ad0bb1de5d32203e048892b16c34b398657a1a338e2e122c3137eeb8143b184f9b5e7ea0
 DIST gc-7.2e.tar.gz 1291186 BLAKE2B 8c320aac2d9deb8fcca2e93622aa122f96c4152d2b18bd284be32d5a041f357beaf8f3142548685fe167642070471862d04c0e6c3ba1c99bc9c05e63d6854005 SHA512 80d1d50e38714b4f198743cd8cd5ab80a35cfbb7f5f9d66c89f40319604e989125870f010d4499876978594a5823d7b61213224a68da8664b9e4f8e14076c999
 DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72
 DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e
-DIST gc6.8.tar.gz 756879 BLAKE2B 8a56c4f7b23e79862aaa6fc505a56ea9a8ed53b9f3aedc8cbb57c37f0fabe040abe22096a8893b7f7b1ff1267bff37101e3dfbbcedab380afe0abff02b98fe14 SHA512 69a9554d2d213392512d4ce41ec8c4993557e65c2b3dc4f568ac18695421cc08b7677c25f9a0ce03e94fb5e68a298fcac7ed09fb90007a2c998ff6ef78d3c651
-EBUILD boehm-gc-6.8.ebuild 1098 BLAKE2B f47d09deee86abd05454a21c8160f697bae01416af50188608cef1155eb3fe0bbd5c1762f31508148aba0acf4c8b8115b9273982006511313f1bdf9b83d66e5e SHA512 6a1c6872295404b57c997bfe7253305ddde4287e8979c380ac257d0c807ed2e245ae6e8dfd1192c8ec97c3e589252f94ef60d5e75e599d010b36ed1e9434d076
-EBUILD boehm-gc-7.1-r1.ebuild 1156 BLAKE2B 4636e7b84de6bb64d759b9ce49d6a64ed8687314ba286db785b6a9ecb5906b696ba21adfd3717ea721da357974d2c4a85d20830ff6e8c65a901f8a2c4b3c06c3 SHA512 7b44b81e665c9722b34ffda4eb08082eedb4af10074894537421eaf2b6238f3234b661107ccee05d8564e102bc6c21a1db78f9e7cfd31c46f66387ad32871d10
 EBUILD boehm-gc-7.2e.ebuild 1333 BLAKE2B 398be6ccb9df21a385df0bc45f0502db6e2f09849543d8b91c76451fc59ceaa0d6e7c430689163b9696bf2fa92aef1eae2c555083d5cfa76f0824a428a71b315 SHA512 e0fee4afc7b0f8b00df366d2856c3355e4832ebd1952f3ad3e23231dc7f34dc5471ced41624593690edc39b47a06274ca82c5dc90efc6181b50fa6a2e94b11b3
 EBUILD boehm-gc-7.4.2.ebuild 1248 BLAKE2B dfc41bb8278e4dc25ce02f6ee6c48d741119043762409acfe37ca3a3475bf0d38f88b3cbdb58143d7f8a7036c4e3cd591b83fbfdf107d14dc5fbad6dd47d0b4b SHA512 68df71e5393048b52929dd73a60cf8cb5b980dfddf854aaa842c78d2d8a077f6c8fb235ab507f38c0f1c8045342492834433dd77264450114d7439b4457cc806
-EBUILD boehm-gc-7.6.4.ebuild 1352 BLAKE2B badbef45f696b46de6055a3ce9c7003d087ac8ffa9acab128e1804e57f8b669af37fe0d21976f29aa1b1e1b5e66f224332b58cb599d440bca01347598bd275e0 SHA512 f8fd3f51aba41267251e664237ae0a33e70eea62b020f29e27e4c600a0e1de572882c49c1539f4b673cce33561441e4eb161b888d4393d963c37081e98e837ed
+EBUILD boehm-gc-7.6.4.ebuild 1357 BLAKE2B 2c4e4b525c0e605ef820de03a0d6573d85418d5a8f6389ee339aba6d2a4a3157c9946a8f7ed8fcae12848649fe15d58a8442afc5cccba130e7f86c263de51047 SHA512 2bf643e5ed3997df33856c675f1f1d46bde865f0ea619e53f302bd793a69186e23f7eef5ede390a7a849ae2c6f640a17e083ca8e8d84d5921cf30c2bc42d5399
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-6.8.ebuild b/dev-libs/boehm-gc/boehm-gc-6.8.ebuild
deleted file mode 100644
index 46e760138356..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-6.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="gc${PV/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/"
-SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="cxx threads"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^SUBDIRS/s/doc//' Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-6.5-gentoo.patch
-	epatch "${FILESDIR}"/gc6.6-builtin-backtrace-uclibc.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable cxx cplusplus) \
-		$(use threads || echo --disable-threads)
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/share/gc || die
-
-	# dist_noinst_HEADERS
-	insinto /usr/include/gc
-	doins include/{cord.h,ec.h,javaxfc.h}
-	insinto /usr/include/gc/private
-	doins include/private/*.h
-
-	dodoc README.QUICK doc/README* doc/barrett_diagram
-	dohtml doc/*.html
-	newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.1-r1.ebuild b/dev-libs/boehm-gc/boehm-gc-7.1-r1.ebuild
deleted file mode 100644
index cf5927c9f57d..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-7.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="gc-${PV/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/"
-SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="cxx threads"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^SUBDIRS/s/doc//' Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-6.5-gentoo.patch
-	epatch "${FILESDIR}"/gc6.6-builtin-backtrace-uclibc.patch
-	sed '/Cflags/s:$:/gc:g' -i bdw-gc.pc.in || die
-}
-
-src_compile() {
-	econf \
-		$(use_enable cxx cplusplus) \
-		$(use threads || echo --disable-threads)
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/share/gc || die
-
-	# dist_noinst_HEADERS
-	insinto /usr/include/gc
-	doins include/{cord.h,ec.h,javaxfc.h}
-	insinto /usr/include/gc/private
-	doins include/private/*.h
-
-	dodoc README.QUICK doc/README* doc/barrett_diagram
-	dohtml doc/*.html
-	newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
index bb46d18df236..f55d67781196 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 DEPEND="
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
new file mode 100644
index 000000000000..0910e655df13
--- /dev/null
+++ b/dev-libs/ell/Manifest
@@ -0,0 +1,3 @@
+DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
+EBUILD ell-0.5.ebuild 686 BLAKE2B fd09b1e95e2fae190112eb2c52c7861928294bc3b4267f937ff2ea817ed038e2a9c3f8febdd5ec9c821819ba7a8d097ff2784af65762c8136c2e7d0d4e058835 SHA512 17b7be3b37170301a283fc2c2cb8e9ce7dad0a490f05d87542e7fa7229a64a9959f754c1095b821a29b3fcf53596ac0d2aed8ea68b53e7d68e37006e3d2184a8
+MISC metadata.xml 332 BLAKE2B 39fefa1e4461eb745bdedd0e34f72a17e8836bbf6017363cb7192153478076bf64aec9b6654bed84d04009a15b67b10d558cd3ad153598e5af15497e919f2108 SHA512 f81cefe69856b8779f19bfe1b96cce97d51d35a1c233b783f2ee5af67d21f793c2aa054576ad62adf98535dc6068899c46171b5363b9ba95c38fea3286b39f77
diff --git a/dev-libs/ell/ell-0.5.ebuild b/dev-libs/ell/ell-0.5.ebuild
new file mode 100644
index 000000000000..1eb5d54cc958
--- /dev/null
+++ b/dev-libs/ell/ell-0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/ell/metadata.xml b/dev-libs/ell/metadata.xml
new file mode 100644
index 000000000000..75355cad9cc3
--- /dev/null
+++ b/dev-libs/ell/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>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <use>
+    <flag name="glib">Enable dev-libs/glib support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 7462e94f140a..d56c2dbda1be 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,4 +1,4 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
-EBUILD hiredis-0.13.3.ebuild 1852 BLAKE2B 25f5711451a8361609f5b6316e8539181d4849bf00dacf563040a2c1799eb52b5e013750b558a249fe62e482b53220651405223fd4299b6bef375cd5ce08b717 SHA512 b7036423b9c68e5e76b9c3dc8a8e131c9ed2beff3ccf79cfd352346e561fa98511b029cc3440c49025e92fae51c237c180ba8fbaa96ecc50ab8863d97413cfb1
+EBUILD hiredis-0.13.3.ebuild 1857 BLAKE2B 9217947c72f5744bf2d01ba12e647672417d8ee16379320cc9c1edbf3a8840478ef09bb14f132b4d42a381271c3a2a5b39bd4ba047b44cf3cd0335d65c5e9f7c SHA512 9bfb698ebfe74a1b9400b7ac25c0b9ec4b04efa2751f4a1f7b646a1d536cc15cfb57e9017a86e5661f74da66ec7521834a9fca7a00474363429a29877756a881
 MISC metadata.xml 297 BLAKE2B ba20b03da98e6f0ffb782592b6985c7ee18af0b4415302304e23af4886f32fc6c0228086dca3a5162d68da95ea617d919f3d838a2c27b1f396d1c60b1e1e1c62 SHA512 066533b525b755fc03d453dbec7c7af33a1f550d493e12fd96d773cb9b1b754ff02f689019277840bc29e3b1f9efc8226729637ed3c50b4b4cba1a64d3afaee9
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index 5ba57f6d832b..f9c5caf202ac 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/0.13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~x64-solaris"
 IUSE="examples static-libs test"
 
 DEPEND="test? ( dev-db/redis )"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 2acf30d8d8a9..3a25de4b50ec 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.4.ebuild 1365 BLAKE2B 64663b49ddeb617ea057021963abaa45eff276039f704b4bc85742e05567362cc70762947c8aa469a5be56d16e053e82112ffa342d88433bcd03180679f59177 SHA512 22944e3f49a2456a4fe10c1d48c26d465200da847b207fe28d24056202f6c20d5a2b4c5f8c16a8e7f04b4fb74273cb241403bb85bc6be93666bfb87e7ab753eb
+EBUILD jsoncpp-1.8.4.ebuild 1370 BLAKE2B a84a5ca2b32fdaf245dea03c51304e026c11428eafe2ad4a1ae36d9d394a968a6f10aee504d08b590dd2ac9d8e060e96bcae182a2178e35c7aa9d5ae40f4e0fe SHA512 b942c9e5cda3e95b10e89c88179ea279fbd7f860364eaec5ad92210c9700c916af7ac5e04925552c0599291a4ea60e4a46a451d6c6bc9b882e66f95a7f24beed
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
index 61d305dd279f..caab49d63485 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 7c7364868884..a479ad04daf3 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,5 @@
 DIST libassuan-2.4.3.tar.bz2 559867 BLAKE2B b80f73573449aa1705ac3b4f12f89cac6a19bf4b2ed8f46d5576164196300baeaeb782c997078ac252a564b9f6067df87a340b46c68058d4a28c8291bbecf96b SHA512 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 EBUILD libassuan-2.4.3-r1.ebuild 1099 BLAKE2B b2df568fcd4c2e50fde71a384e85a829753915a74164582f01a0be20f30d5a8a4dfa61d645b6f90ede321cf7bcffc674cb7872c6ef313cc06bb0689f3facea45 SHA512 a3cab0a03de279a18d49db4bc521dbfd04340f66edddb1cb05ac1dfdf6ab4096d1f082c3115e8cfa281873f2d25f810fdbe514aa083313e66a2c470e0e752db8
-EBUILD libassuan-2.5.1.ebuild 1100 BLAKE2B c3cb3a73ace126b194bb97efb775c461b8c3b4e3aef116e170712e3def84b2426c2bfe549dd546d68e345d562b6e41bb0eb0747dbf1f2e5f877d7e54ba4fea30 SHA512 ca6f054bd3e22598e6922617f04ad8f5cc9a4efb9c4607ac3b2392a1f2231598cc732e15308d6636d7f6da19e753a4e618e1c51fbb599466b5740c2f4dac2da9
+EBUILD libassuan-2.5.1.ebuild 1099 BLAKE2B a4d4abf85c3f77fa87d82cab807296d88796b917fb28f5ff7ea1c0c59d4db26d834b3714e89c46124c8c8b536a1a552c7b41d42b6f3d274df9686bb9823acad6 SHA512 437a8d4fc3c708dc0d3fcfc83bfa6539c15ae895ff23017f1cc057c943a14b3cdd0baa0d89c0a5e7a45c3cd1e3e962a9712487b485f9da369c89c29abbffa60d
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
index a95566fbe4ff..00a754425af0 100644
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 1a2862a20629..124865670d61 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -10,8 +10,6 @@ AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd
 DIST gc-7.2alpha4.tar.gz 1091329 BLAKE2B fb55adfcd122ec5e695a0ab198a4a9ea816cc036bab297e38270d8f673ec6b5cca49de2b383b0fc9c05bc41a417bbed11bdf19370bfa92ba87f63ac34f119a2d SHA512 79c4439989c181add9b80467b1c19d2b61a5e7c510a84a61ee27017220ef56a2b0f4945a4e850019a6c0fe7a9cb3a982ef656b97d988d8e6f3c3fb8270a3e783
 DIST gc-7.2alpha6.tar.gz 1241386 BLAKE2B 0bb3ce73ebfb91ee5ca3222c1b466d77c37d34466dafff2f16462c567fe89f17a27155ce4c5ffa7caa8eb01bc32b7a93a67e547f0adbe509c42533717ecaadcd SHA512 19e8cbb5d4698998a07725dedc204fd707ef3d47a0184129b418e4da44814f0016a834b6ac3766f754e76376441dfbad4b86e8e1b6ada8446f54e70f590628e4
 DIST gc-7.2d.tar.gz 1263064 BLAKE2B dfc90b7a40418216cac31df790a8868d271b7a363ef55ecd62170983a8926f19af716af57777d94ab0a50f20b1f08b37bbb863d42a63b1f6e8aa49c97b1d29e2 SHA512 5b342754a1efeef0cf78983b7a0e48a36495beac04fc881ab356b26dc153b343e940ec7af070f4fc875be44adc559f7be995919fe9229f68d2e0237cdbeaabcc
-DIST libatomic_ops-1.1.tar.gz 178581 BLAKE2B 9dfb37788a9a360ff56ab16a69ffd6dc77d9ad9aada7475717809ea3bb654c702559257a53f02682d5367d2294c0ac0a9e0be7bf7a456d5f69788905b025783f SHA512 888efe425ee5e6a8008eb047dcb6db6577af73705a172010f1ef413510dfe8127977b37fe18a54be528ed3a0f0b1a7edc5e2ecc147fd6d9d3a7fe5ecaa9a1253
-DIST libatomic_ops-1.2.tar.gz 183780 BLAKE2B bdd1a8e6195f50336b6680841d403f4c1810fa8b559ce664e92c005508754283878c95ea905f5b21b877911f9bd2f9bde1cd7861087e5ea5607584b7fd53e9a9 SHA512 b3eb524b900f3da46730b4b158e73897f0443269b78ea429812d91f1468d17cccbf15dfd522301724049fe73aced38bf1567aff7b680795da392760890ed83bf
 DIST libatomic_ops-7.4.0.tar.gz 455143 BLAKE2B b13cd06bdc0715097ca1759594f24435f8e80b707fe77d1f8be1824b3be7bc992c98df222450dea1facba4da8877a0ac0752a6e82881781d68779492f8b273ac SHA512 3a2f6eac7c5f0fe0abaf8650047b8ec1c9c5abe732982a294a2afa920b588e17d64cb9f05a44be31b8cca9e52cc5ac79a26e1779bf60169c228344df4bbe86a9
 DIST libatomic_ops-7.4.6.tar.gz 479437 BLAKE2B fe3199df827a170f328997bc24cc2b717d5df8704aa90e4db5b82add5861b2a08f5d60e6b35491cfb656f086d489749a73dbff6507b30aa5c5d350cf07b03649 SHA512 29c6f937aa5d21343741aa0661aaf33ec9196b7784b7165d40dd87ce7bf8a7691f5ba94040663f078465ded1935ca01bb829a4b56b190f9db63cc141515d9819
 DIST libatomic_ops-7.6.0.tar.gz 493177 BLAKE2B e1f8ce79de18192a5dbb2dd5834928fb8a385cb1d2174186049a269e1329ed32adb975bf461e7d29a75332916719d4f3197a30a1839221c6ab71249f17e9be98 SHA512 58f1f1df94ff33bda5833af2e3a6a4af120ccfc0cec0fb15e2db24341e2ffd5a6436169cb4e7dbd96a6cb0431c1295dc4b5270d4b01806e470bacadc902720fc
@@ -19,9 +17,6 @@ DIST libatomic_ops-7.6.2.tar.gz 496917 BLAKE2B a59ecc1053df8a5ae2fe9aab5c8e18c09
 DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
 DIST libatomic_ops-7_4_2.tar.gz 115132 BLAKE2B e08622dddc3baab17576a893f893898ad4d09bb994b680641b98edc3da7eb2cbab4ccd45a02c4e7f6d4d500c3866f1e7c0354bb692eeaf4784321356cfeacfbf SHA512 3d06d5de930a369dd2af4413d8f573993eb927b45941ae8eba14ada91abd34a6baf31e1030d1ef6aa02bd6a2d8d59f9f306dd8dda6a68cf552a2745041111b2e
 DIST libatomic_ops-7_4_4.tar.gz 115469 BLAKE2B a76fc56937f2c6ae129ee249214f7bdb3277a90c349f2713d14b1f11c7dcede9e6a76390ca329969e585f3ce105ed3883c1d37a3f12795abbe62e58ca5387e7c SHA512 2c1a773c61b5fecab467746e872f7eb1541c1f6770d2055d0440dac461294e896ff73460097a73c932ad07d6c44eb820ebfd039e5d87f1699d518498da6fa25f
-EBUILD libatomic_ops-1.1.ebuild 506 BLAKE2B ec905cdeb62f6ac03f1d9334abcbcd23be3d70cd5e5d8dbaa700a31554ebfe3c49014b6670d418d3af9828c2755acff719703bc15529722b002df9b4efc91c26 SHA512 bed71c0e86169104dccfbd928d78a1a5dc744f8dd576a3af6d5355bac487f08b189a5a9b39f4aa0a7858cbcf134a7cabd544b114ba4ad328bce4a265a9e543ca
-EBUILD libatomic_ops-1.2-r1.ebuild 946 BLAKE2B 542e211e460c49fd7ab80a51e7f97b24d49f0d410fe9431a83a87582e3f1ab96b379b011b5a55583e6c08c023645008f89ff86750a78581b9f7556a52eb70254 SHA512 870522cef4ee6e26e3a2fec1b5ed185287bbf8bce11eebc27e2a42ff677ba652415db0ea614f50d404a38991f8cea307eb642be5eb746d0a8fe5fc57b95cecd6
-EBUILD libatomic_ops-1.2.ebuild 669 BLAKE2B 477f657987fc196a9422b844ae6f9197bef9bb036c53a2e5083798533aaa0f9ea2455b1f21f52ac2ad5f8d0db27e297e8e61f2d592a8fb27c47aea4a558abd76 SHA512 3956cf5ac321ed2a924bf5222b01d53f7e3ca1da5405cee63f5b1e615afc65dc452147c3dff08c18bde435059714181f2d986655aeaefb141e5c9aa4d4a14957
 EBUILD libatomic_ops-7.2_alpha4.ebuild 952 BLAKE2B 7d5a33f4b7765cc663b536b6d89d35db26ce62d769237d10ebc553c03cb3048cceee4e4ad8f4aa0cc9c683c8c1bab72dbe2e6995343ef9e7c1469eeebb816b5a SHA512 ccbb482eacd7283f9cf157604d66acc76f33914f4a7d21007640c60d8950a16e6f5abd1cd9b346e0fdba2f0d97d6e385c3d4efa8ef9801a4a96c03d33a51eef0
 EBUILD libatomic_ops-7.2_alpha6.ebuild 938 BLAKE2B 45d31774261ff308970555e6d6a2a3c5bf14d4075457bb5acf27c63c2cc953a98fdf3c96884a3ea08373839528005f794b4c8582b97d57d008fa6804be48b54c SHA512 fc233651c4f7220ea5d38951fc703ef461fa1da9a9f33f852d1154ef7aeecf17285287c42a00611f5bc7cdd186edfe96e6212fc6cc1604442209efe894c6776f
 EBUILD libatomic_ops-7.2d.ebuild 907 BLAKE2B fd40ad7f81cb14888d41723452104775775178929d2d4696b8f0eca4119967e7a3327acd062c220da7bdad6f08a86190ae6f3570480b74def331f757fddccab2 SHA512 e7345dddf64686f2c72d8313bb494618307ecff639201ebd6c0cd6f0f753a31cec284e1e11a89fe5224d700ff5d68059f01d9b819c446db1d5ade19f5894b905
@@ -31,5 +26,5 @@ EBUILD libatomic_ops-7.4.4.ebuild 789 BLAKE2B 6a39dacf0c431116607949e9b60db9a390
 EBUILD libatomic_ops-7.4.6.ebuild 652 BLAKE2B 8eefa79a0bda76b93d752abe2cb40f39f700d32e78fd987a8ced8fab9fa1f96b589ceca06748d4264b24e89eafd7a8bb04af694722bfc509567850640c942b0b SHA512 73263d13bdee63c73d4ca7551ec2d9c2172de4d3daf1d62ca2ab18282173e444baa4430d046ca5bea085223009e11a05feff2a11e89756f7ec05f4fb90749f4d
 EBUILD libatomic_ops-7.6.0.ebuild 643 BLAKE2B 5fd655911133c08b02288e8d6c194e2fe73c23e8577e3e36e79da77c94fe985905d53769586becc3b69cf07ac3d12bf6a9c077713ea0df1a1ef7916f35a29617 SHA512 e15b8c149dba4db082f88dabcbba339d90d9264dd418e0a9e72359f546fc6555786ab4e335daa94df5bf2161709075a6697190a57c776001b82e07fda103f02f
 EBUILD libatomic_ops-7.6.2.ebuild 661 BLAKE2B 1f61944836bc735e327f9086ecc10621ed8e60d2426c086d774db56abcef07cdbf98a4d88aac485bd0ec7aaad585081422a7810a84cb4fb9078159aab82ce26d SHA512 ac75f27f0324f245873d7395fb119242a0d677ce32b5aa9d0b7824305cffd6b5f986a8b5addb7ee6098ae9f795aeb4765157a3a815b810b7d9817a9f348205ad
-EBUILD libatomic_ops-7.6.4.ebuild 772 BLAKE2B dbe5f5698a3f7f876ac01e8d00eb52ae18c5188318114f95418971fce9c7bb1b37028aba5f0f7cdc986d1f2bf5d33cc0abf2b46fd4186d4bb9e2e1d6dad959b8 SHA512 0025c6bf668a50e233ad295548164784d4b158f34a6e9695eb53fc3d244a1de42c89073a4e27d6d2aefc30f78e79e99450d2dba5cbe40d53805f457f102a59f3
+EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B 0f1a533dd9fe6603a0b8b4b02263d67830c3751aa31e4b12fcee2eb9c0f93af9f0cad132d2ae7705ccee3645c333ee893f9763aa6f949dbcc3a3a14c0c4b4c26 SHA512 a5ce9721e64aaeb642587edcb6219f0f4ef64448bd995c96b90bd69e75ef390b462ae58f773fc808068797416693ec81bc0e758fd36b79006ef4d6ae15c9c0be
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.1.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.1.ebuild
deleted file mode 100644
index 168624a97fd1..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 -x86 -x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake pkgdatadir="/usr/share/doc/${PF}" DESTDIR="${D}" install
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
deleted file mode 100644
index 60802f76211c..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch
-	epatch "${FILESDIR}"/${P}-ppc-asm.patch
-	epatch "${FILESDIR}"/${P}-sh4.patch
-	epatch "${FILESDIR}"/${P}-fix-makefile-am-generic.patch
-	epatch "${FILESDIR}"/${P}-x32.patch
-	eautoreconf
-}
-
-src_install() {
-	emake pkgdatadir="${EPREFIX}/usr/share/doc/${PF}" DESTDIR="${D}" install || die
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild
deleted file mode 100644
index 9cc5578eeb9d..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch
-}
-
-src_install() {
-	emake pkgdatadir="/usr/share/doc/${PF}" DESTDIR="${D}" install || die
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
index f706c9127fb4..7dba50603caf 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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}-gcc7.patch )
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index fd428873e983..734b3ca72ae0 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -5,5 +5,5 @@ DIST libclc-0.2.0_pre20180319.tar.gz 161608 BLAKE2B b8e4f2d475c0425cbe5b41a5ba3b
 EBUILD libclc-0.2.0_pre20160921.ebuild 988 BLAKE2B 206c8e5c6b19d0e0b6a18c4ebc2a5ba8d102492366650900f9ee725e888c3c39175238eb1c37f23152f4d932a4325b9b39c77fe672848a907727e22a2c04f127 SHA512 eb5a022ca76cd80bacacd7c538326df3b25cb5f29fdd5d9d5774e223c69ba1b087f7704d1ad660eef6ac3c6a4b32fac29c4ae64040da43eeebfdb01514f34907
 EBUILD libclc-0.2.0_pre20170118.ebuild 1207 BLAKE2B 9fea7ead38a05076b4d93813f9bcdbd9069ccc55e5932a01499f17eeeef2304fd1da2718cc85a785d348d81f9c5bd29bfcf9defddf8c067bce0ca6c5949b9610 SHA512 f0d7c5c773b6fd9ed2fe5e703f2270612a68aa3f5c868825de241396c64f444b7673dcff8540733f2cc2256e310579f392333b155adc35a8d9e41c586e3ec5f3
 EBUILD libclc-0.2.0_pre20170929.ebuild 1391 BLAKE2B 45569e8b40dee2c80bf035bc719becde88dfdf3dac19eec45563c35d0edcf565bfe2ececece4285b0cb20c0f45fbbd424c7526c9eb376443f645c92f9ca04aed SHA512 d97c5ad240eacb62d73fa079c48b30ef2af61fce5e06a833f1e857605e6ff02f7a9e7cf90ae6f4386151a044df16077bd0e98346af87c410b1df88cfb0ffba27
-EBUILD libclc-0.2.0_pre20180319.ebuild 1413 BLAKE2B 02e15202a649d4ba2561d08514f6798fbfe341e9d90db5da56c4e682ba4f8d1fa0368074cea4687c7a532f21e4279a3e7600f462d4bcc4c1c62394a2a4d5a108 SHA512 ce24da1a6499919398a7479ea4c32a0289ec7e962c18e3babc54b30c0aafe2d5320f0c2f45f02ef0c6e88798088a6fb5aad3a33ba35b311a504643a9b04c974e
+EBUILD libclc-0.2.0_pre20180319.ebuild 1433 BLAKE2B 3fa277010d42c6398ffa618c06397df166d2e37c38d9d9932813a979ec8a57ba57893dc67cbbacefa2fd47fad5aeac2799eefceadfbfa20a7096d53a571e3715 SHA512 ce2cdc8905a750c428a4a706cc2e4eeccabb27b800c37997414586fc3c43588b37b15b05f5e8c81a87199c9727c8f8de1b2af4bc37629f88f129aaeea54f3fdf
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20180319.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20180319.ebuild
index 8f8f1a0ec232..b754b5694bd5 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20180319.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20180319.ebuild
@@ -34,6 +34,7 @@ IUSE=""
 
 RDEPEND="
 	|| (
+		sys-devel/clang:7
 		sys-devel/clang:6
 		sys-devel/clang:5
 		sys-devel/clang:4
@@ -42,7 +43,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
-LLVM_MAX_SLOT=6
+LLVM_MAX_SLOT=7
 
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
diff --git a/dev-libs/libdshconfig/Manifest b/dev-libs/libdshconfig/Manifest
index 90f6de9f7ec9..0768d7433719 100644
--- a/dev-libs/libdshconfig/Manifest
+++ b/dev-libs/libdshconfig/Manifest
@@ -1,5 +1,3 @@
-DIST libdshconfig-0.20.12.tar.gz 316955 BLAKE2B d19a59e46ad625d671a3a0166e4fb1f2810e00a5289353ffce87a50f32bde8d56c53e1a03969242b7f578b69c087938851d8b0a0897c16e96d6b9b8ea7d7c765 SHA512 6ee7e813599715c2217f05212e0efb94d9588f71db3f3f470e50e9fbde93be3fd3ce3b8164251ea647e76ba9fd0db502985b5fc1e3afffdf9074a00ee9900b64
 DIST libdshconfig-0.20.13.tar.gz 323720 BLAKE2B d470f71930e9c2b909d99fc177a0d867dca459c7831a2752b39573729a3b875bd65fd6cc68da3966912987b07f956afebe84d6f5329437eed391ac92c2ebb296 SHA512 04f3580bf1e1dbac130d350eb4c6e86a980f2ae8636a206821813ed0e14db07dc7ea720ebb3816455a4a939294caa2f2247b7348ecea72769a6f05bee0dbf19a
-EBUILD libdshconfig-0.20.12.ebuild 542 BLAKE2B 0a5892413752603e6ed63aa70fb2843c8a09430d22c3c630d5eecef69882725349414ac557f19b3ebf0294a73c8557f145785c9406625d7ca4d6004f1c8c690d SHA512 0badd6a7cf9f74ee04666901e2b3c0db26cf16edfd9c1afc49fb7f6729821a1092dd5558d689c4ad25131fcf4470d61fd7b379f7a136cc825ce3eef7ffb8c360
 EBUILD libdshconfig-0.20.13.ebuild 593 BLAKE2B fed5618e440bff8d1afa4092931dbc3b1e8d356eeef0ce4a9da96fadeef1a529f688e9d664238735581a68aea40afd075a96319615553518ba4cbc57ea687fc1 SHA512 4598946e89e374431741e49d41f5112e25d9fa206e33447fa2d7240592ca864de8abe9a42648af6e790ae3adac58a276b52d5e2217bbb30eb559829ebc6814f7
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild b/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild
deleted file mode 100644
index ac29de24cd63..000000000000
--- a/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Library for parsing dsh.style configuration files"
-HOMEPAGE="http://www.netfort.gr.jp/~dancer/software/downloads/"
-SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/ssh"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog
-}
diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest
index 1111fa2482f9..a8dfba295838 100644
--- a/dev-libs/libdynd/Manifest
+++ b/dev-libs/libdynd/Manifest
@@ -1,8 +1,3 @@
-AUX libdynd-0.6.0-dont-install-test.patch 494 BLAKE2B fa954add858c3a7f62c6285d9db67739850a7ac9a6d05bcf3073e9297ff79cbf6166bbb7ba887e4937180055745b68bf05c30ac8394f07482426b6ea15784c9b SHA512 345c2315e04775d2a2169f910b521a3e781b602a2495256d3ca022b47e0a49be621b4c2d11b8ef1f21d6c7f8055d5ebc4bf82f3b2581b6fe7f0eca1624a668f7
-DIST libdynd-0.6.5.tar.gz 1238404 BLAKE2B be3b1c921c1d8b4d8cdc7d70ef908fea5d38f97743db9db8f4b8716ee58d633f3040c727eb0b9287701d751ea8929b78f1e5f07e7d3b9900630594ec3d81444e SHA512 ebf64b94b38300e4e471f975a51e4b014879937e855af5d72a3f759af4445fa9024e42962ab1284ebe7b2ae2ddf51ea418d106c9894e1841f0984622afbef115
-DIST libdynd-0.6.6.tar.gz 1261349 BLAKE2B 73c9eba440dfa71cd8403ecfe4c77bb1ec19530333bea8689e9d8cd8863da6a37718af878f4ab5ca278631e0acf67035df4bc00ec4e3360c4558c0184e1f33e9 SHA512 efeb52a5b5dd3154ca293f388d5b967ff983450253435572b919f7c4a1445ad3cb416def4c736f908fdb3b06cddebae881a58420e528f1ca145973a997af7a28
 DIST libdynd-0.7.2.tar.gz 1342364 BLAKE2B 28617a6b01c09dd8030d376f73c6dc6ddb4cd031aaa59348283fbb1226bb401e2d7ab48385263b8abc4ca95ffd75d2ce9f3b52a417fe04c6597886f8626cdd3f SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f
-EBUILD libdynd-0.6.5.ebuild 1515 BLAKE2B c634814be991c522dfed0071cb918d097404e2470a597f505b49249b2fdb43e5edd2d7d3fe14f2de285e948ce024b2faba598d6afe1889eaca615bcd789321c5 SHA512 958d032424ed96725dfa6f11bb0eeab768859232515f4c4be3c0b491dc399fce7248784b4d5be794b771e100c76e9e0a346ed01476f44611c9fa2fa8d4d78af6
-EBUILD libdynd-0.6.6.ebuild 1517 BLAKE2B aec8487062966fb8da845fcd62c4d8ebfbab5523baf959efe8eeb881cb14925acc243d959c7a5400bd44df9f31336b76c5e94d6915a8206429b68ce7e458ed65 SHA512 81d8ca00eeb40ae5f55c18a4a9a4309c4bd111ddab1eb26324532be21ba37fa42089ec7517a14ab3a82f08b10e06064bbf505e3c74727f1440e6c1a7eb2e76c4
 EBUILD libdynd-0.7.2.ebuild 2070 BLAKE2B 23a9f3d75e6ffb109a2e52cbc2d6aac26bc6e900b8996b6b0812f99f95ccfb81d385f9b8f40652e4cda8e5891672da0ec5d51570921cc3a86b17cec91a428621 SHA512 0f327413a749969c9bcc9823b6677119d0ab7be52d6516ea6ef046131085877ffe744f08e1b7db4da7bf431271480415f3ff4181fe06cd9db419a24f16aec0dc
 MISC metadata.xml 1120 BLAKE2B 9b42962d156122337c1e142a67a984aa8a2537a3e14b8273d18e749a2e4887e8694623eaf2d74b8beb463ac9070c73d5d0f0bd34e6f800b735e3151e1fd8616a SHA512 ac2eb8493d3e23ec7bdac5d3d5dc2d22358e51e468456de99b5bc48326924c1db31ea4d9474300a2579203d25ebb863ac84226529b36b6b1402e1351c03b1b68
diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch b/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch
deleted file mode 100644
index 9659372b05ea..000000000000
--- a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- tests/CMakeLists.txt.orig	2014-02-10 14:25:18.041841087 -0800
-+++ tests/CMakeLists.txt	2014-02-10 14:25:40.224975614 -0800
-@@ -105,12 +105,6 @@
-         )
- endif()
- 
--# If installation is requested, install the program
--if (DYND_INSTALL_LIB)
--    install(TARGETS test_libdynd
--        RUNTIME DESTINATION bin)
--endif()
--
- # Compile-time tests: test code that is supposed to produce compile errors
- # I couldn't find a properly specified way to do this, so hacked together
- # this function.
diff --git a/dev-libs/libdynd/libdynd-0.6.5.ebuild b/dev-libs/libdynd/libdynd-0.6.5.ebuild
deleted file mode 100644
index 9eb37ce666ac..000000000000
--- a/dev-libs/libdynd/libdynd-0.6.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib cuda
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=2e140844d4a21c436ca0fc46996bf8606ffc21d5
-
-DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
-HOMEPAGE="https://github.com/ContinuumIO/libdynd"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc fftw test"
-
-RDEPEND="
-	dev-libs/c-blosc:0=
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	fftw? ( sci-libs/fftw:3.0 )
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# each relase comes with a different set...
-	# remove forced strong flags
-	sed -i \
-		-e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
-		-e "s|@DYND_VERSION@|${PV}|" \
-		-e 's|-fomit-frame-pointer||' \
-		-e 's|-Werror||g' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	sed -i \
-		-e '/add_subdirectory(examples)/d' \
-		CMakeLists.txt || die
-	local mycmakeargs=(
-		-DDYND_SHARED_LIB=ON
-		-DDYND_INSTALL_LIB=ON
-		$(cmake-utils_use cuda DYND_CUDA)
-		$(cmake-utils_use test DYND_BUILD_TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./tests/test_libdynd || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc documents/*
-}
diff --git a/dev-libs/libdynd/libdynd-0.6.6.ebuild b/dev-libs/libdynd/libdynd-0.6.6.ebuild
deleted file mode 100644
index a122f6f30306..000000000000
--- a/dev-libs/libdynd/libdynd-0.6.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib cuda
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=09fb7e5eccadbe1ec49ff4b05fec724939331e6d
-
-DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
-HOMEPAGE="https://github.com/ContinuumIO/libdynd"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc fftw test"
-
-RDEPEND="
-	dev-libs/c-blosc:0=
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	fftw? ( sci-libs/fftw:3.0 )
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# each relase comes with a different set...
-	# remove forced strong flags
-	sed -i \
-		-e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
-		-e "s|@DYND_VERSION@|${PV}|" \
-		-e 's|-fomit-frame-pointer||' \
-		-e 's|-Werror||g' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	sed -i \
-		-e '/add_subdirectory(examples)/d' \
-		CMakeLists.txt || die
-	local mycmakeargs=(
-		-DDYND_SHARED_LIB=ON
-		-DDYND_INSTALL_LIB=ON
-		$(cmake-utils_use cuda DYND_CUDA)
-		$(cmake-utils_use test DYND_BUILD_TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./tests/test_libdynd || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc documents/*
-}
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index c6cdecbbbe5e..466d016450b9 100644
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -1,6 +1,4 @@
 AUX libgaminggear-0.10.0-doc.patch 484 BLAKE2B 9a63685991e322157ba941ae167ce6dea78a20bffb85662c5a7c2cb6879950dd9e085be83a53d4d13294f73e23cf7e1661c357e1140e5c0903942531a5676f7f SHA512 c5fbfb231f075f34eb4237edf3de6e335ff735513b72a41fd602422dc9f0fd511f66b4c087bfd0dfc68ebda8d1bc0b70a6eb35e5e3158c50b7a5d641e78ada01
-DIST libgaminggear-0.13.0.tar.bz2 105106 BLAKE2B 21ccb8fca1f3419e5e06d28d4a0e0af59b5e6f3f1c93be33b0a2de7ece9f9c9335c2f48a2d34049b3496077afef75cc1a9653354916a4e300f2a9aef9941501b SHA512 93d0c4b1f136a413444c32cf5c13ad570ef5a89db1d5637a15f0c49ff4d9a159f8ade252734ed711c1efeab6b9f3a55503ea2cc5486cdd0bc9af50b340eefbe3
 DIST libgaminggear-0.15.1.tar.bz2 111959 BLAKE2B 6a8d5cd01adcee1d870aada9f20b229e95975a013bfb8076c8135a7b4cbd5f2043b68ad481d0df1b369f560c2ea2172ff2a542ca61ce30317deeeb66a5aa2588 SHA512 a6635a74557f276ab65eda4610ba8a053fedf10f9d898a1dc875082a36b2822544f61fc7a274691673670b12d4de968aa4921d102a588f3d0777397730082990
-EBUILD libgaminggear-0.13.0.ebuild 956 BLAKE2B 06847fbfc4f1e218f78aac6351ac5aacc445c7b6d1d5eeddadc36c102e3c87378036893049b09811843355e3f5a405f7b19458eff561fb750d69e3518fb2cdb6 SHA512 e7c5b202f746f470cb5a6d9d477a10f9399ebb5482b56defe9ea5a344813b8e9b51970d4a7fedb0b975a5afc08b5693aa572729d2af3e1be0ecbe00e5266af51
 EBUILD libgaminggear-0.15.1.ebuild 992 BLAKE2B 8ea6fc514da1aeab0243704dd6b4c80ce86fca006d6847a261e143b284daeec2ad7d199ea613198dd05a75773cdbd875e55fc0e099be7e459d6e0815f75cbc61 SHA512 975e54a942edafd9db1c9e610c6756ef68e849121fa4e1fb4eb73dbbe97750750d7a9b44a969209036b7baaa6ed5cc9ddd06568d4fcf8b477bde8cf9a9f97041
 MISC metadata.xml 448 BLAKE2B daa492aafc9fe5b44e1951ac7b7a46b56dbd38103671d3f0f74d8b74938e43495f31aa856dbb8bb2838028b39cda962217a6780f4c7ce809fa2c5243e8c95ca9 SHA512 d73a2c71eef405f17bad3267005143f023d0d988f3c25532cf2c672314b5f9500976235768f9d17362479533ff1d6c78bef7a89483c8e842d496b8031a69aec1
diff --git a/dev-libs/libgaminggear/libgaminggear-0.13.0.ebuild b/dev-libs/libgaminggear/libgaminggear-0.13.0.ebuild
deleted file mode 100644
index d3c0bd3ad36a..000000000000
--- a/dev-libs/libgaminggear/libgaminggear-0.13.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Provides functionality for gaming input devices"
-
-HOMEPAGE="https://sourceforge.net/projects/libgaminggear/"
-SRC_URI="mirror://sourceforge/libgaminggear/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	media-libs/libcanberra
-	virtual/libusb:1
-	dev-libs/dbus-glib
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10.0-doc.patch
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DDOCDIR=share/doc/${PF}
-		$(cmake-utils_use_with doc DOC)
-	)
-	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/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index f99ab9dd5738..5fec0324d775 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,9 @@
 DIST libgit2-0.26.3.tar.gz 4728289 BLAKE2B b437732cb30d85487a7a1a16efd41d19fe7677635ae07393094cd2931a0fb6673f41b14122793a31dd317e27936df9844fcb2444ba916469e4673f42e9db04f6 SHA512 abcd3a904bed05c1f200be2ffbc2c44cebd1b548459ee834d5635c5eaf7bcd551a4993bcc1cb9fbeae9ea990c5ebc07655007ff4e623fa7c697f326c0ce12c3e
+DIST libgit2-0.26.4.tar.gz 4733342 BLAKE2B 76dfacbf6df9128625e52f4c554814a971f446a44c9706a915200976f5a873a2add1869c0534360ccad821df11246faacfff43765f311162bcb6afca46088a77 SHA512 c65a0ef8e7ef2dc60d07bced36b8cfd26ce9c40f99978058fc67b30e5bbda8d6b15e26aec7b1277bb277123685e763d106bab175540fceb449bb5b50f776473a
 DIST libgit2-0.27.0.tar.gz 4761312 BLAKE2B 4b39ab7609b8031751cff826523a6989872d2a8508b3928461680f03e5e5e2db0782f396e03c69d6d484568958d4eb018a41ebdd4502555c41bf5b7b9756cd82 SHA512 1304f0b6182e1e6e7fccbec1a568aefb662e144a1aea4fff5901f3c012ff0f3d28720f17d19b9a1bc6c892c32fe602766fe98a15538a94a468d65d3e4a1680ca
 DIST libgit2-0.27.1.tar.gz 4765926 BLAKE2B 2eb34a621d61b1fb3b770081e27b92d662fd235750fc6ea580ddabeac5cfd20e40a70ce830d45144531c333239d173a322d0de343bb98cc02ce9bfb7822432bf SHA512 4cdee4aec0f0c7b36226ee29276b8802d6b59817f95b1357f35225c23a8d6de70242b2dd9a5fb3b765c3242f4ed1848933e20fc24899071d8b443d46c43ce99d
 EBUILD libgit2-0.26.3.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
+EBUILD libgit2-0.26.4.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
 EBUILD libgit2-0.27.0.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 EBUILD libgit2-0.27.1.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 EBUILD libgit2-9999.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
diff --git a/dev-libs/libgit2/libgit2-0.26.4.ebuild b/dev-libs/libgit2/libgit2-0.26.4.ebuild
new file mode 100644
index 000000000000..c94b6bca4718
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.26.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/26"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+	# skip online tests
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index ac81d0460a94..5b46aeb508c4 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,7 @@
 DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
+DIST libinput-1.11.0.tar.xz 485976 BLAKE2B f0bd88463b6aba7bfcf80d3354e53fe86e367a29055e295621d84175720544af035cc6303a2777d6ac4535d4706c41fa435a3a5a3abd20eb9ad33366dad4eae8 SHA512 382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857
 EBUILD libinput-1.10.6.ebuild 1441 BLAKE2B 3310fc527a72be6d0561091a4fd20cf637b66651e6668bb12357feb3f92f52c570db613bbcb45398ea9e38bbb685a82faeaf6a0299acdf156d3f7db01e80bfd1 SHA512 2281dfa10a76434333a54fa69c444a6a54b89b797344646ca4316e86b7292ccfa9047136f3f62dc631988ce1a4d92f35514915c8829fe469f1a35f454a772002
 EBUILD libinput-1.10.7.ebuild 1441 BLAKE2B 3310fc527a72be6d0561091a4fd20cf637b66651e6668bb12357feb3f92f52c570db613bbcb45398ea9e38bbb685a82faeaf6a0299acdf156d3f7db01e80bfd1 SHA512 2281dfa10a76434333a54fa69c444a6a54b89b797344646ca4316e86b7292ccfa9047136f3f62dc631988ce1a4d92f35514915c8829fe469f1a35f454a772002
+EBUILD libinput-1.11.0.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.11.0.ebuild b/dev-libs/libinput/libinput-1.11.0.ebuild
new file mode 100644
index 000000000000..0635ed1b8faf
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.11.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index efbfb4d939c2..f788a57b9b3f 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,3 +1,3 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
-EBUILD libksba-1.3.5-r1.ebuild 815 BLAKE2B c561eb28ba8b937697b1535d710d1582e5dbf17700653a0de0717a26e804ac4203a7cacd9cbd0b81407e6c1baad725d7be167740609744031c8118dfb9723c13 SHA512 43f6456c136c4f59ae77b72342adfe8cbf8c538e72af5f3a3bc37508fbad89562b7720252324383d17ce815f816fccf462977b267f41e17559e9faac821761a7
+EBUILD libksba-1.3.5-r1.ebuild 814 BLAKE2B 8877db269b3de8a198464bf638d2d00fdfee573e5d188f5639188cb5ce68c5a4abaa28fd1ec7853a9497d8749e0ebbe09d7c99269ea08a5cea957d090bf275d4 SHA512 c3f360077ee98f9b088907248cd37d342d8ae6c121c5c1c9fca6094a936ca06c5dde9612d36d1d01c47b1e2711df24bda77721c5b4f706e1fe09ce59b2ebc9d8
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
index 548687ea3640..6d7d07110393 100644
--- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild
+++ b/dev-libs/libksba/libksba-1.3.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="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index 0408a22b448b..cdb5bb952813 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,6 +1,6 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
 DIST libnatspec-0.2.6.tar.bz2 500525 BLAKE2B 30cf13f89a60c86c9ff56c2c2890d1fe169b2d503a87effec805fec49674b439f7311b358f2dad06b335e27b45e775f204092d3ae0b9933f516af3292ff351b2 SHA512 6bed3c8b2937ee27666a7deedcdebd7b24a8f495be63008fd70c467de4ab532e6448e6b682ed3be04a3a60ed64acaa0074d87231a421f6c73d6a7ee1d17bc66b
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.2.6-r1.ebuild 1076 BLAKE2B a2e52c6948233c2dc6e4483f49dfe02dc28cd86135bf24e7c8390943cd874fce66c48a9cb6bb10d1ca3df8bba5ef2d55da3abfce09984fea162396205d3202d4 SHA512 b94da0e45e6bf8bd08dec0be6ef609be194b9c579a60eba62628b54f20ef52fcdbc09e6aeaec968531a3f267f8476eacafdee34edd262c90ad09eb8a9de4ed58
+EBUILD libnatspec-0.2.6-r1.ebuild 1073 BLAKE2B 66ff76a44d2b6ef35ac8f37bf4be15ff9f56f54873c8771501ea903d4d0e57c517ab77269606e265e6909c5c5ad6b8afa2a63fa4b73626649a37ce6e4263574a SHA512 bf47ca1aa71973d9c1e0fe57687b734320a1734c585c52c556bf6f1bac01248d1744f8228113bb6e04c5681c51fcc811dd2ed21c211bab33be18f30a3a1eacb9
 EBUILD libnatspec-0.3.0.ebuild 1101 BLAKE2B 23feb2af436f5ab0956052fb4b2fd5edb6952204380631b7d931c0d3a3420c7eb762a6b2127747f233dfbff0a94caa70722ebb46c5f43fbcb3d816be468b5797 SHA512 7911cb04124c0a777154d3296d89ed39938db224760483616e95316dbba4c5764d9995334ca732857900e6a1d7ab52123f15cb73d1d37c3f3a15b28f1105bca6
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
index 65bb4b698659..8fc1912e0cb5 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index af0159bc674f..206932103959 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,5 +1,5 @@
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
 DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
-EBUILD libpcre2-10.30.ebuild 2338 BLAKE2B cf736b87f282baafefdaa694b4b2cadabb9af2e7fd3422175303d8bb135a7c7331b397227cefab447b26315e017c89586db8518b0182e26851a94ab9ca77e18a SHA512 085e7194c56c10a23cd78e74e9b92034d2d8f1e1096f813fc2be249040edfba9c5f6e4bee01c59d3868e077bf0304c609e616932fafafad1de334c127305cba9
+EBUILD libpcre2-10.30.ebuild 2335 BLAKE2B ffabdb786539182e475225186a21b27e1ef059e728af83696bcbf361d37cc98d13e124f4c51e89efbb9004e5a28fa9d0d995f5e21e469107adbf9ce1af6ca1f6 SHA512 89e37f6decc384fa5c499c3978a3eeae03144cf4340d94ec3e4f41fa507b57ad2f8ec2eb6a5dc37718e5eeaa37fad400077fe1d05c61f33606cc389b75dc79cf
 EBUILD libpcre2-10.31.ebuild 2348 BLAKE2B 501e61f76820a596b4975bd0654981ac89be8da15c44cfab69abea1b1489eae80079855577d89200ecd96714b7d6a2307c0662cca4ec12cefc6ac67e6cf89f0b SHA512 3f6d74efd53d8466b67c6743801d73d2bb80e78e6dbf47d916d23be086245750d0a778cc81f146fe4d5e24fad9bbed28a5690da29fb12c4cc28d555052a293eb
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/libpcre2-10.30.ebuild b/dev-libs/libpcre2/libpcre2-10.30.ebuild
index a122a1d8672f..197ccb92f7ff 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.30.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 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 ~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 ~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="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 9c1aba1e37e3..e6e6aafdc70c 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -4,6 +4,6 @@ DIST libpipeline-1.4.0.tar.gz 805155 BLAKE2B c0e1c774a0e165b6eb7639246324a2945b0
 DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7aced24e60fd0eff984cc6ae7acde880f71ec998946a7fd925167b5c05360ccb47439bb68eaeeb3fa7df1d320bf889d SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02
 DIST libpipeline-1.5.0.tar.gz 828765 BLAKE2B e3a0012b7e916a313eb29c5c995755d345777b86b6d5b595814591c38490179a4dc80c375412f6489dc27ac16883bcd75dda418cbe429e7f4f8f70cffdb7a1ab SHA512 4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117
 EBUILD libpipeline-1.4.0.ebuild 507 BLAKE2B 0a893ebbf6cbb052ba0d6e91f4b09ead966e5814f52f47a6e1160abc282fd575d0a5e2d92c61d31223c9bbc0f869fa5f0ee45e452e38201d345722d02473d7bd SHA512 f6cb1cb95a5cbe04c2d1c3b8caf7cb01d25330550c647a542601d7b8bdbfd0c2618ce51a5f276bd3bc4d5234c9af309f1e7ef2660933a5d748d68d906cf499d5
-EBUILD libpipeline-1.4.2.ebuild 674 BLAKE2B 108e91b99cacef70b73193fe9c1e9fbd565d6fdcc839ddfb2e46ad4e90aafeed20e65b6a01e8788d075f0299966d94680474cf23bf2129121bd084f86d171739 SHA512 28eaac7b4475587360f9122d862e442d34342452eea54f1f4154ab9a9bc05722463bf9e69354983f18ef4d2f066374958f667ce7a01b7885d4e59c98acc2fed9
+EBUILD libpipeline-1.4.2.ebuild 670 BLAKE2B 2f6114f69b8dbbb675f4609d3b0a0ddd0ad31baf8df0f4aa5ce68402df145aa60434015c2109ff57c3c87a862c7a24c8990008a37aeee1b1acc5c110d07b3db6 SHA512 74a98b07a06fb576610069b54a0690abe2a642ce440f9e2698cb8c15b00c5724d9942896532e2befbaf7fb330f87eb293c02eab28bb24abd75222eb125753f83
 EBUILD libpipeline-1.5.0.ebuild 785 BLAKE2B e65b17fa1e305e51d0cd87e8e0e4d45d9e36deb4d59c8d7865a6faa6611d620e3d6a050bf11a8b3e855c1c98afb8186ec5bc6ab5928dcdeaef1266ed64ffee80 SHA512 22a844d139bbcb2bc729fcd7c9e75450d5ae2444d99b2a2a7177ab66dc1a49ac89da6a900baedb576d9edc78c639086086491e47bffae6830e5d8cb77c7a5f64
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
index a1bb7872f5a4..dc3b38a2de25 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 3beccc2f5596..53fc31c1c2b6 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,5 +1,6 @@
+AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
-EBUILD libressl-2.6.4.ebuild 1373 BLAKE2B 3cc04437cab6d3550d82a345b71f4f2019459392dd88f7f5948ca5a9fca99fb5747ee9b09de06357a955517c67296152503c3274d9c7e9042c474d9dd6e0ac8d SHA512 3c5db45ed3bdb9df4220ba773889c95c04a741f8761e677df7a067caa322594af1b90120b4945fb03c9387fd291b81aef0e8c545ab37dc63123ca47800503ade
+EBUILD libressl-2.6.4.ebuild 1431 BLAKE2B 84f8669b2e544e7f226969999abedadf72879296a07b736b080aa9e103ebd49a52c5ea1fcc6bb7008ab3870ee74ca7a3b9ae40bafb4b2a9cf8de314e62303eba SHA512 b15cc16115a1b8e46159c9b1e384df4d97107ab634fcdfd6fb048ace13eb0527a79763239892c36116bc3872f74dd5149df5e21ff071c4a43b409beb759abcca
 EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch b/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch
new file mode 100644
index 000000000000..a0922af09612
--- /dev/null
+++ b/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch
@@ -0,0 +1,62 @@
+From 787d8d240bbeaa812bcf37deeedb3c467be468a3 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 19 May 2018 17:31:42 +0100
+Subject: [PATCH] __warn_references: tweak assembly for "gnu.warning" section
+
+On some targets ';' (like hppa) is treated as a comment
+in assembly files. This occasionally causes the following
+assembly failures:
+
+```
+Error: can't resolve `.gnu.warning.EVP_DecryptFinal'
+{.gnu.warning.EVP_DecryptFinal section} - `.Ltext0' {.text section}
+```
+
+Note how branch (or other reference) attempts to cross the
+boundary across two section types: '.text' and '.gnu.warning'.
+
+Tobias Ulmer notes that openbsd already uses newlines
+for similar macro:
+
+https://github.com/openbsd/src/blob/master/sys/arch/hppa/include/cdefs.h
+
+This change switches from ';' to newline as well.
+Tested on hppa2.0 and x86_64.
+
+Reported-by: Jeroen Roovers
+Bug: https://bugs.gentoo.org/656104
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac               | 2 +-
+ include/compat/sys/types.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b74b8a1..16ed825 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,7 +91,7 @@ AM_CONDITIONAL([HOST_CPU_IS_INTEL], [test "x$HOSTARCH" = "xintel"])
+ AC_MSG_CHECKING([if .gnu.warning accepts long strings])
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ extern void SSLv3_method();
+-__asm__(".section .gnu.warning.SSLv3_method; .ascii \"SSLv3_method is insecure\" ; .text");
++__asm__(".section .gnu.warning.SSLv3_method\n\t.ascii \"SSLv3_method is insecure\"\n\t.text");
+ int main() {return 0;}
+ ]])], [
+     AC_DEFINE(HAS_GNU_WARNING_LONG, 1, [Define if .gnu.warning accepts long strings.])
+diff --git a/include/compat/sys/types.h b/include/compat/sys/types.h
+index 2107119..dec09e3 100644
+--- a/include/compat/sys/types.h
++++ b/include/compat/sys/types.h
+@@ -62,7 +62,7 @@ typedef SSIZE_T ssize_t;
+ #if defined(__GNUC__)  && defined (HAS_GNU_WARNING_LONG)
+ #define __warn_references(sym,msg)          \
+   __asm__(".section .gnu.warning." __STRING(sym)  \
+-         " ; .ascii \"" msg "\" ; .text");
++         "\n\t.ascii \"" msg "\"\n\t.text");
+ #else
+ #define __warn_references(sym,msg)
+ #endif
+-- 
+2.17.0
+
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.6.4.ebuild
index 9aaf4681a71e..5f32a09d4194 100644
--- a/dev-libs/libressl/libressl-2.6.4.ebuild
+++ b/dev-libs/libressl/libressl-2.6.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/44"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
@@ -22,6 +22,8 @@ RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"
 PDEPEND="app-misc/ca-certificates"
 
+PATCHES=( "${FILESDIR}/libressl-2.6.4-hppa-asm.patch" )
+
 src_prepare() {
 	touch crypto/Makefile.in
 
@@ -34,7 +36,7 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
 
-	eapply_user
+	default
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 72c01138a0e5..5c985829a284 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -2,6 +2,6 @@ AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
-EBUILD libsigsegv-2.12-r1.ebuild 785 BLAKE2B 416f8283d883011129322ff7a5ae6e8a4c439db4a919cb39e5303228bf4fbc18ebc3145905ea25d03ad3c2d6f9e0a3dec0d4d245abd8287017cb25d645d4fbfe SHA512 9738ac3adf8778723e2482430f3452e71fd925ad0c69ae81ffe2f9110ce630d9a419ee4511e86dd8d79934e8a799382d9f03efa91ab6f8bab02430eca80a3fd0
+EBUILD libsigsegv-2.12-r1.ebuild 781 BLAKE2B e1f0c87a985e7a7ec432d1eeeaf8b7e201cdfa6c8ff0acc8294890e346e22430929582dc36bce40f8f2431acc093b066b1ec225223d3ae5472711666d8338f1b SHA512 6f4685cc5900bdd14b66121c2ecde758f69118f50c2ea434d717ddc1dca322c7de66d0c18cf9027b07a10a068c52460d2e823d61a716f1d949577165a8f5b81a
 EBUILD libsigsegv-2.12.ebuild 789 BLAKE2B 71fee301710353c326e2903a7209de5d3b5642ea2683584ee46e301f5504757360ef84e7c3d798bb81803a03c5dcafc974db1e564ba827ab08afc6184abdeee0 SHA512 b7ba322748ebc4b9b7a5dcd678fa53fcfb3da531d30a881f51b1bc106b61cf00619b7f7c4dbc28bc9b86c0253d80c336c74e2527b1aa8deefbd98d86081cf632
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
index 9306a3b2b2f8..ce8dd71479c7 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 704c5954b210..627c829ff521 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -3,7 +3,7 @@ DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f
 DIST libuv-1.20.2.tar.gz 1180957 BLAKE2B bbf29ea1ee989a5197daef92fee12aa83687002e14e8a4311b61c743cfbf6e4e8e9f0045b38fa5301afcc9981a5fcd59d12e0649515b2e1695ede62795929d4b SHA512 449dfd15e2953d2a8b9c6160ab39728a87799b3e8595f9e3013467daf69d3561e2c5602172a0596e7c884237cf0d52d3b0f00edde03a7b037dc90b61bce2057c
 DIST libuv-1.20.3.tar.gz 1181741 BLAKE2B ee68f975c9f150034b02772b297a05692305155449dac75f35ca32761ffa2803385b22cce5c0fe1b2ad73a52144e6218e2c62d73c92e098017bee74a99e16062 SHA512 60ebc0059ec9fdd022aa9d60b2a0340f29e037bf79fa08707f6f2ecca9ec263c7a6466bdc1f94e0875a6a627ee749efa86117dedb22119676a7bafed8b5d77a0
 EBUILD libuv-1.10.2.ebuild 1140 BLAKE2B a8dd07a2cb5bb9959099d681d9d711bb78afed0decff1f997735749c185540592212137735165989050ea59d6bc1795cf2e1fa82898bdd81fb7d55011ca63d4f SHA512 65f5e4e77ef871f8e40657981432a3bd51d54671b056cac25a2a268509f6f005df3ea73894ea29da3a4f1e1076c9e9c7f177e0e2a968df1d6df498ca14381be7
-EBUILD libuv-1.20.0.ebuild 1164 BLAKE2B bda76a39e2e728025af067484853141ba0a5c6a6c64d1eb5847d67d0042d18664ced8d3cf2f85b9091ba0566ba75b809513edadfe8c96af17d17b039270afaf0 SHA512 3c53767c5115f2b0b1ff8406d30601f1cdd265d2d2186fd245cf93ddf9dffbf344bd1c54565d277152d0249dddc46e49d1e57e97c7904950b1188f6fff2fd31d
+EBUILD libuv-1.20.0.ebuild 1169 BLAKE2B 5d67aefdba1f643f93da9ac8bc93c6c5319d10b294bbd61ad0d55ed3a6e8762daab2b943224d223cd9e1822ac1ac50ef75d292625f70957451a026f2cba7d383 SHA512 c64fd8b1cf556c31233abd12a44f1972b66e8b08892d9bab151bd19c2f24820e100a13393b31aacc0b0f4fd28a78f9ed05421942161aefac64a3e6ea787740fe
 EBUILD libuv-1.20.2.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.20.0.ebuild b/dev-libs/libuv/libuv-1.20.0.ebuild
index f920d93c650a..e4d496fd500d 100644
--- a/dev-libs/libuv/libuv-1.20.0.ebuild
+++ b/dev-libs/libuv/libuv-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 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="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libvolume_id/Manifest b/dev-libs/libvolume_id/Manifest
index 7c766ebfd042..8652c1bf1444 100644
--- a/dev-libs/libvolume_id/Manifest
+++ b/dev-libs/libvolume_id/Manifest
@@ -1,5 +1,3 @@
-DIST libvolume_id-0.81.0.tar.bz2 23274 BLAKE2B cda0bb7525121b318ba145c8a2f5c88e80907ea88a02cb3fae5b348bd7ec04adc8687c963c086b20bf691f72d53b96e6e597ede96a4b756613d648b05a267a5c SHA512 46f51bd130d1240518c6ffd97dc45017ebf623ea1ca4d5e518c19a040b1537d8a721a40e147277df0a530ac9d2d045dd399c037b08943c4b96e35ad025e94d85
 DIST libvolume_id-0.81.1.tar.bz2 23399 BLAKE2B ba586630200eea63fae41b464c74e15151708888fac4f5ab49b3156c53520ca248b68e5812ebac157fda1c74b1ef70828d48584cba9e9adac043b6f835d97abc SHA512 a30c08fcdb020e8b7d0e5350d996d7007040d72e3c1caf3244cf7c6e08cc7d5eee9b94edbc04a073519243884be8b27e61c33a3f61c25e7bfb42eb96785d992f
-EBUILD libvolume_id-0.81.0.ebuild 681 BLAKE2B 4acbaed919f79df429fb7e92d2837c74577a0e85661a70c167d6caae9ea13bbe816b280a201cd2fe3eeed9982694aab4db34aeb7c5939438f53c7440cacc48ae SHA512 dbed89c235d0324dcdcc517084f668dfce0d2c36871801878f1b057edd5b599f0853cd5eaa21861159027416b8e208605074992d134af46c91bb1c647aeec6b6
 EBUILD libvolume_id-0.81.1.ebuild 681 BLAKE2B 4acbaed919f79df429fb7e92d2837c74577a0e85661a70c167d6caae9ea13bbe816b280a201cd2fe3eeed9982694aab4db34aeb7c5939438f53c7440cacc48ae SHA512 dbed89c235d0324dcdcc517084f668dfce0d2c36871801878f1b057edd5b599f0853cd5eaa21861159027416b8e208605074992d134af46c91bb1c647aeec6b6
 MISC metadata.xml 365 BLAKE2B 43c77501d8bd51ecd0cf3f904eca81b2db24fdbe6c053baf071ba1dcafd9606816047e05c40b144063b4033f62c7681b3ef75c3cd5c350df2a629a41f2bb5aa8 SHA512 0a7813ca50da7ee0c17399d54f12ca4038617afe550c22997f6b209cb800873a9ecc4badbe8b53f727980934a7568ed7c5824cb1a71eb18546ba1e92cd935671
diff --git a/dev-libs/libvolume_id/libvolume_id-0.81.0.ebuild b/dev-libs/libvolume_id/libvolume_id-0.81.0.ebuild
deleted file mode 100644
index 8702793a0e2c..000000000000
--- a/dev-libs/libvolume_id/libvolume_id-0.81.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Library to provide file system information"
-HOMEPAGE="http://www.marcuscom.com"
-SRC_URI="http://www.marcuscom.com/downloads/${PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-IUSE="static"
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	make E="@echo" RANLIB=ranlib AR=ar Q=@
-}
-
-src_install() {
-	dodir /usr/share/pkgconfig
-	insinto /usr/share/pkgconfig
-	doins libvolume_id.pc
-
-	insinto /usr/include
-	doins libvolume_id.h
-
-	insinto /usr
-	dolib libvolume_id.so.0
-	dosym libvolume_id.so.0 /usr/lib/libvolume_id.so
-	use static && dolib libvolume_id.a
-}
diff --git a/dev-libs/log4shib/Manifest b/dev-libs/log4shib/Manifest
index ba17495b56e5..d2ff3b1b28e3 100644
--- a/dev-libs/log4shib/Manifest
+++ b/dev-libs/log4shib/Manifest
@@ -1,6 +1,4 @@
 AUX log4shib-doc.patch 366 BLAKE2B b5c3221816d6fdffdca807a056f64eeae414321695ef362000dab7e0dd08c3a7d575d49aa3ffb1144535a88d1e928c73bf8a968a8726075b3be024db915f642c SHA512 4327359e95f0d1be02524313fe8818d299bd3bf6d7143215c6f550efac1a03a26da8210292c92cebdef8dc4844afe52e0d43242975fa8ef4ced7ddd3338ab0c3
-DIST log4shib-1.0.1.tar.gz 498381 BLAKE2B b5f849f7f6bd7cd224ec135a3f4308ac4d56f8f51d45d4561ac76bc7ff903afbbc70c21790ee26f9449153384116dcb8d40bbfb9f07194ed22e9d80488cbe882 SHA512 ed64dca5f20c8135944abdfe7e7b66702cd1ae712ba362508759194c8f53c2a9a878142619a4befd3c4180de366fd2c9a6af7af1873b170d45e91b8bf527b836
 DIST log4shib-1.0.4.tar.gz 487529 BLAKE2B 8ba4dd17e2f35c6566ba4736b5450c41fab1c5506ab6e994136b97ccab4d399281afb32fcf13935c25acd7ba063d2ed6595bab564614ffbb0d944074b68a5bba SHA512 af31bb436393e1a6a2674c0f4804148dea4f4081bb07b78f158f4109157bef4ed40647a3e4da7ec5eef0ed38b6286aee6d8b8a3320572c2b55df2998850d5245
-EBUILD log4shib-1.0.1.ebuild 875 BLAKE2B 69241840e249ead6c5a641363e6b0687f63a4c54bf1da4076f8f8fd601c5cb47292f6cff71f93c3772998b290cdd70ee6180bd323c71269fefa90b39f9dcd88a SHA512 1e34e9efb7529c72698187c8c4a8f8f2fd847daaef0c920c717a40ccd58a0563f7aea48819c124b45db06dd0221b06726f940cd6e7ab11107a58c949c92b121f
 EBUILD log4shib-1.0.4.ebuild 699 BLAKE2B f35f4578fdf625bd2d743ffe732c09a6f22e0f9bb8660d08bd6183a86dd7fa3655de908fc395409604b787038b25c1dd08d1d85e3059aa888807a7a83e0e1f47 SHA512 7b4a9b2a52c72161c281f9b78b4ccca40f9919af31aa2c9429d3ff861affd2dcab690e2181e2d74c7a8c35bfadd973dce237c5c9a5cf86499293b3854ddb9745
 MISC metadata.xml 396 BLAKE2B d9c3e97cacd4d4d4e9b26f9e78a9a56293ab4569232c63e599c89376723af4b8dd250c9a8642d835d1bc4eb7b53eb5a6b78a80eba1c95fec7f5edc11f8b0efbe SHA512 4232880b47191b4e89f07dc4987e8f24833a0f42a21355f943b03f88487f50f2401e1a51aa7a150ad27659e7ebf9d61509fb232191dc4836d8ee4a9c7345df70
diff --git a/dev-libs/log4shib/log4shib-1.0.1.ebuild b/dev-libs/log4shib/log4shib-1.0.1.ebuild
deleted file mode 100644
index c1554df5afff..000000000000
--- a/dev-libs/log4shib/log4shib-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Internet2 version for OpenSAML of log4cpp logging framework"
-HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib"
-SRC_URI="http://shibboleth.internet2.edu/downloads/${PN}/${PV}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# fix sandbox violation by doc installation
-	epatch "${FILESDIR}/${PN}-doc.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	econf --without-idsa \
-		$(use_enable doc doxygen)
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die "dodoc failed"
-}
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 298d7529b717..5359b94711b0 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 1042 BLAKE2B 66b6e1df31bcd0ceaab6118d323c2bdfe5782865a76ef54237c33a110ddc57b9536382cf416477468d72d4aaaf9d81345cb97480dc9f69eb241b22c3373e0465 SHA512 f07bf31f1e20613756085b8cac47a63d35cb2d0e5199715273ba244a72d8601317bdf6cad02266a12d0bbb0b5dd74cddf04bb34c0ef28fa0c1e24f5e2f3e34a0
+EBUILD lzo-2.10.ebuild 1041 BLAKE2B dbfeadcfb8660622b324012587bed2db8f4dbe70aaa7cfc0f1e651fb2a6d072f9c5292d018a6fdd9a2c4287bb5881a1153f3e6ffb0f0bbcc487713439578ee31 SHA512 b354b5edee1e3587c65a0734145cdf0322bd574f35fcfbcb5dcb9cfcc2036789523982b26dd19b81c7297c0982a4d59c12837c22f2ab6b92b6517242d61e6905
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 603b4648d986..e12c63e23914 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~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="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 7fd07c93649f..1aec75c86b68 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,7 +1,7 @@
 DIST npth-1.3.tar.bz2 295998 BLAKE2B 25c0176439a5be3766df15526b06dd07f318dca8b729eb5ec461a40b912132ebbf7bf6ddb2b57a064bfba73f3fe0ab59c00daf6138324f53f5e9e6df91941bf8 SHA512 97b0278cc9448adb42c4a83b8e7bafeed939acaf3dd3a201a1b103df4e48f24224d4bdaeb97903ad1884914ce363cbceffe948a7c1db4f19abf87ca5964f5699
 DIST npth-1.4.tar.bz2 299106 BLAKE2B ba5186de1371d08137e86ef1f6ad12a610a26b7ae3ca50d6fc49f685083380803b245acf01110a28ab25427208bab82de73f16d6f21011b1a0590d16c7c85cf7 SHA512 649009b4fbd2bbbb8fce2911c2f9070a758d037be0d147a63754e3c1f5a9ffb73b907cd09c79314fe60c25084ca7a7b3b387139dd83cc0e11a7e7ba64630ae1f
 DIST npth-1.5.tar.bz2 299308 BLAKE2B 1a3cef4475ad5440487151026889ef321626b372d1c6970c7482df92a702d02860589f7f1f541b1fccf0e8f39b194476ef91507e33a35e05ba3713465f9f11d1 SHA512 20f0ec59d304c68081e42535870af8e76c18e30aa7b04ccdafe60fe5261ad7275c2c0e3ea3a767d6145258a3a39fa641032cd97205318266dd727a5fe7ee331a
-EBUILD npth-1.3.ebuild 676 BLAKE2B bc2b381655e197320231be429caa05a637d7774b51d174ec3681a629e3c44fc558637794c1e825acfd19ad5d8ff51724dbb1048a9afa3938785ed10f79b75c7f SHA512 11aa4890d7e405f5248c6ead71a0ebafbba52093c1ab8ad0ce70393db52301c4ec58a70609955163342a399f7acdac4c920dbbd892ac86e7b992623c8195c5cd
+EBUILD npth-1.3.ebuild 675 BLAKE2B 101174fbc1293b04ee1b227560213654c2dbe7488dbdbaeb8de89fed9ab4462e22aaa7885f296f7188a7215f599adb82b73ff23e1af88576fbd44f5d93c4be30 SHA512 3a699b2874058b7fe4614d9d6853b10178565092f68aed700f12a79ea7ec7ba28e7e30e97f5e0c766066223d224c58cf14275986edf6eef1b521ff1c270504c8
 EBUILD npth-1.4.ebuild 690 BLAKE2B ebfdb4fa6dd18b1ba10b0eb7cb87b9506151db6906e10ecfa7b3930e9b11dede9212f46109bee83baba3afce807105abaae322f4bb825197d7466b5dc60b51a0 SHA512 c46dca3ea141e43649d01408d668ab3619fb06c1ca2d66eaf8c44d250f983886844e20ec79aedf3731c257118c3bee96d2f3003de55559cf5db399adb0697006
 EBUILD npth-1.5.ebuild 759 BLAKE2B 8fab769d848c8f18dc3b3ed6304e994ef75a218aa194b7aae52abb4bececd80696824164dd9cf7e1677b9ec078d2327104b298e9fba49a9c6a2647aad2a1e6d4 SHA512 76f6420df7ea25fc796356765cfc2f1512948c0b089e3fb1335c8ae1e32c380701a581c4bb1eb6c9f46dc63be056314a341156b973c138af59e7a47d93b34043
 MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/dev-libs/npth/npth-1.3.ebuild b/dev-libs/npth/npth-1.3.ebuild
index 7aecae616554..1b6b254ae4ca 100644
--- a/dev-libs/npth/npth-1.3.ebuild
+++ b/dev-libs/npth/npth-1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 71aba33c95ae..4ee6844b8f6b 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,15 +3,12 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.28-gentoo-fixups.patch 5310 BLAKE2B 5f173bc4bba374c8233945293e8e944c5fc9068c71d1242bcfbac37d0c020a09cb6a0ef3f54994003fc58364285f86f08017762c0c196aa6ab03fca91ea6c631 SHA512 22fe711d4e59c41f8208b4e85eb101eb6cdd4ad43d83438841b94a57219eeb182c527be1a97bf58df25672fe027aaebeab7458da2bebafef7254c68b94c7b98c
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
-AUX nss-3.37-fix-fstar-missing-symbols.patch 1156 BLAKE2B aedabb564c11b99bf4ee48e9cba0c2f29c3a7cd716828e12ada032ace08f507574b2b68f1a08db9a2575df031067e7e262196df1836db1c4a93058b673434200 SHA512 89c858fb6a7575b79170c0567b6bbde7c857c1dd803dc4a0a19d8c3ede77b8eff3ce41f473b8e292202d4b0b3e9c9687a2c503ae9b3dca7ba3700e91e50a3e43
 DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
 DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
-DIST nss-3.37.1.tar.gz 23034142 BLAKE2B dd196606bf922a58c2d1f7443c6b8c570d5c5c5437f51b8c6c4ddfe84aad7d576cff46f2eba23e4d32f41984fb6ea8aaa29a63b2f010b6807df74ee71144b11d SHA512 61b8186f45afa5fade6f45737d60a86f519c8b5535963f4cc6f13fa6694be0723cdd8b0ed48bbc2eae621dfbfd80ccc249998eeb89ed565797ac4553895a01a1
-DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
+DIST nss-3.37.3.tar.gz 23034239 BLAKE2B 3e30b0fe14501ca0e6b9d14322af73f191164989e6857b9ba46572b7363cdc65c88b672285982f2764ed44fcaf615cb249eea2f45b98050dfc6675003dc74a3b SHA512 11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.29.5.ebuild 9188 BLAKE2B 75e8a0508e7355b4ed624f5b003ebbe99d8b170055aa1f2de2564762a35ca2afe836bf9313a8ad35e26b793c786cf4b98c3e49bed77385c2b35547e4c45d03d9 SHA512 fc184b2babae5168d02cbd78bf81298d616c149a5870f320ac36c8e4973851b943de7a6641bbcfee1f1153bfafa6a4832c0dcd7d47ee2a6b13facf118ce9e0e3
 EBUILD nss-3.36.1.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
-EBUILD nss-3.37.1.ebuild 9488 BLAKE2B 6222e5f2098ff7d8ad074207689ed97874918fce4b8d22a10f25afb187227238a7984e0ea4c73eeb4227b8baf1e47abd178b1ae1c96df8d5af1dd087f4bc29ec SHA512 1c170e22e1792687ff48fbaf5c840ed9f0e318bf8a69e474ab107abfa2e071f43b9691c2270cfeca46dd015840f0a2d90b22049f4398bfb47f92824cd782c231
-EBUILD nss-3.37.ebuild 9482 BLAKE2B 0660abfa6e53798f357a560e96aa23251ca3898d9f3ceb60d8ea536014c00601b90d85b97b3ef0d3be369c31c2e68d582ca8bec51261b5392033c00475437e5d SHA512 5bb3a418e77e69f77c006c1b562746be250606002f4362140aa214794f0f3b6bf9b56120e274b4c842a0512c47c823bba2097108ac3ab77e99815300be8bcabf
+EBUILD nss-3.37.3.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch b/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch
deleted file mode 100644
index 4a6be4e90cd8..000000000000
--- a/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Jan Beich <jbeich@FreeBSD.org>
-# Date 1525728934 0
-# Node ID 259444458a1a7f2ce1813ebe88d924173d5daf0c
-# Parent  5db9e969c74a2a02c4b1d918792827014d1a9d5e
-Bug 1459739 - Build FStar.o on 32-bit ARM even with make. r=fkiefer
-
-
-diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
---- a/lib/freebl/Makefile
-+++ b/lib/freebl/Makefile
-@@ -534,16 +534,19 @@ endif # NSS_DISABLE_CHACHAPOLY
- ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
-     # All intel architectures get the 64 bit version
-     # With custom uint128 if necessary (faster than generic 32 bit version).
-     ECL_SRCS += curve25519_64.c
-     VERIFIED_SRCS += Hacl_Curve25519.c FStar.c
- else
-     # All non intel architectures get the generic 32 bit implementation (slow!)
-     ECL_SRCS += curve25519_32.c
-+ifndef NSS_DISABLE_CHACHAPOLY
-+        VERIFIED_SRCS += FStar.c
-+endif
- endif
- 
- #######################################################################
- # (5) Execute "global" rules. (OPTIONAL)                              #
- #######################################################################
- 
- include $(CORE_DEPTH)/coreconf/rules.mk
- 
-
-
-
diff --git a/dev-libs/nss/nss-3.37.1.ebuild b/dev-libs/nss/nss-3.37.1.ebuild
deleted file mode 100644
index 15bc70a21c92..000000000000
--- a/dev-libs/nss/nss-3.37.1.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.16"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
-	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${PN}-3.37-fix-fstar-missing-symbols.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	if use nss-pem ; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
-		)
-	fi
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.37.3.ebuild b/dev-libs/nss/nss-3.37.3.ebuild
new file mode 100644
index 000000000000..3a343d29931e
--- /dev/null
+++ b/dev-libs/nss/nss-3.37.3.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.16"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert +nss-pem utils"
+CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	if use nss-pem ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
+		)
+	fi
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED%/}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/nss/nss-3.37.ebuild b/dev-libs/nss/nss-3.37.ebuild
deleted file mode 100644
index 0a8ca3ede492..000000000000
--- a/dev-libs/nss/nss-3.37.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.16"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
-	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${P}-fix-fstar-missing-symbols.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	if use nss-pem ; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
-		)
-	fi
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index ba328173553a..2e025b9eb4d0 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -6,7 +6,7 @@ DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
 EBUILD oniguruma-6.6.1.ebuild 1112 BLAKE2B 4bf1ae4b3f3b0b4f1202ab94498ccfd27bf5fb761547c84cfb132502ace2b47d709b3fb023d0bdb86dc9c7de15e55587402ec51a0f7235ba6019429c8c56cb3b SHA512 93e21e61a4d46e321088809332b560748adebf2db65f8b690b8945928c09e6199495b2a8b9ecafcb383938debb8ee279e724b5e5c08227e9cebdb43a971dbfd5
 EBUILD oniguruma-6.7.0.ebuild 1025 BLAKE2B 0dda1e53ecdea21e89f9d4045eab988da0217a24d0b55076644eecf913365a75a1345501a7ff9d88d097e44856d9779760fe19658f4fbab6175f6dc24b80b8dc SHA512 4597d01dfb2a8cba6dd36846be059bed3ab8c0867263e693806fe2ec11dbf416a5a3e838da7474375457bcc895db22ee6102dd94bd9ed26ef4cad51a236df5d9
-EBUILD oniguruma-6.7.1.ebuild 1015 BLAKE2B b392a1ca3c06773b360749de1eabd82376aceecd35f2584e3914862b7950dc40b43dbe09ea7415d6cccd1aebfa7aca012ce1af656a78d6c698c334605de6255b SHA512 e0e4aef8e7efd0c7096b2fe2ae4ed7ae0f8c4a571b29c7ab8b85ae247ea6351639d02ca0f22997c50db992ef8255bee82bfbabec290da5610b2f594b66a4206c
+EBUILD oniguruma-6.7.1.ebuild 1014 BLAKE2B 7d7ffa3f662ddd4f5e9a13c7869c03e1a924ffc3ea7ea97e57b701405c73bff9e46c0f1645dd80da07d51d1c2529f8540b226e8dc6d5519dd01568895433208b SHA512 e88607585975fe4afaa432e92f8319d2e63691ebbbba61ab3ac41af2796e37df5d369ac6c6152230fd723113999c9f060ff02708a11cc3a231e9312b5bbe94a9
 EBUILD oniguruma-6.8.1.ebuild 968 BLAKE2B a83d76cf686f58abf1adc1e5c210dc84ec82d5b6f85789a72ad5f5314a4df8166e6c6e98348a107dcd732ec1dc755026db0b887a27fb0c567fd655c06c77a5da SHA512 9d12c6b3e6e41e69f0658ebe45fd09c4f075ced52023080e76c76e38fcca32f2704ec5aaee48d151a64bff4cb4dce8a812f5136699bf927b9237fdb150f94f91
 EBUILD oniguruma-6.8.2.ebuild 981 BLAKE2B eb7e8614e362b145ab843d73d2cdeb7a57fd6f6f5a093f1a8768bcff61cc88e676964bbb460996755c55143f5e4ff531452716c3a061c2dd0345b73687d96292 SHA512 cd0148a53c4aaf4b6e27fea5aaf9aa4cdae3912b764b88f3500f53d8ec3b1864cfdd4c39e4f486c60909f94f87503722754fb29142186f3fc1b362e98e6fded5
 MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
diff --git a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
index 932c36ec0630..3fc38a5bd562 100644
--- a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-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 ~x86-solaris"
+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 ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 6335d3052ab6..3c14bfb05af4 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,8 +7,7 @@ AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.1.0h-CVE-2018-0737.patch 996 BLAKE2B 4b4d6e619a508f36f4fdc00c0066d1160ff7f6cd301cd799405d37b3236ebb69b11a4ccf9baa9ea3a69f21c6fe8550b440c1a3503ec27a5a9c5d1e4d472e2b57 SHA512 833712f0ae355aed6547ccf49447d50bdb7be1ea3c3b3b51f182f6e0eb17692c78ca90341a151985b35b86800cf6229926f3e3af936741d437ab9ac5444987c0
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
-DIST openssl-1.0.2-patches-1.2.tar.xz 12208 BLAKE2B 99b7a3538aeeecf8e1939fb08d26e2ce6aa4140488f0f6fc382a4f0dbdd67a0204c4689809e9d170148ad6686d4dbf0c8fc95802712270b0ea5720bc06c8fbbf SHA512 5e5739ab7132e986abe9704739dab2ccd16df9696318ed29762d4ee0245fd2645f9435f7340ba36edd5531a83e48489fc659ad78c09ded0e0d021dd5a3906ea6
-DIST openssl-1.0.2-patches-1.3.tar.xz 12592 BLAKE2B bce0c289ae689091fe62e9c0d7d631cd915fd17beb81b0879931e0414f25c8a08425a08514e28ea7e81c1be23cf162f3bcad7cc3933f2378f53decabd3a7903d SHA512 3ad3efa45eddb733e3db9c406f9f651dbf939bbb13debbcab12b49ecf72490a4868b1563de60ee106483c1b23bd2092fc58c8fc911fe62a019cb97d738163723
+DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d
 DIST openssl-1.0.2o.tar.gz 5329472 BLAKE2B 30226db49be04317da3a76cce68d5aa401decd198f92505bddb0c72a7ef6a79f3c9c06d4a816db734e2a0991ebcab8b207feced26d83639e50c821d9e76ddc45 SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
 DIST openssl-1.0.2o_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2o_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
@@ -22,9 +21,8 @@ DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131e
 DIST openssl-1.1.1-pre7.tar.gz 8308876 BLAKE2B 621cc6c541d81c2fa62e12eb75b62f1444af2bc1fcf001620515810700eacc3b36975a5b0c4764fed78c37ad1c9ad78b94f5115794b929626b085ccab15d9ab0 SHA512 38efa67b26e83a4dcb6da2d61d92b6be890535c61cec23d781d49efe66173fd9b9185b89ba50d591fed65f440417e16ba0738ffba58a684e48e8b82032ea36ff
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-0.9.8z_p8.ebuild 4860 BLAKE2B 8c78442920df3443d9601c3e9246caa838e0acbe9541b5c250a6a96253b2d28fca65878cf9cddaae62f6fab6fd6d264997b168888cfcd1e53ea90b34a804e3e2 SHA512 60bcce7807ee7d0a68df11cdb2ab76560ef23b6e3df43a506263fcbdf54d0571dcfe0d16188159d13a268425b16798eb28c3c1ed985123ae095c8ea146c1e4d6
-EBUILD openssl-1.0.2o-r1.ebuild 8042 BLAKE2B 8e8f266dad8dac9192f3484d3334a2253c23858e9fadc7cb20e3c1d9742c65e9b1f072cc65ba82f329c94b45d8bdaf33576cfba90ff13bdaf65535910f867a03 SHA512 af301ed141db94a1a3095458219ac1daf1b9d0fb9d9bb0dddfb01249fe436d64f9e0adba83f3ef818952397d39755dd413bd2d8e8c4f9dd31024107d5c1e40b4
-EBUILD openssl-1.0.2o-r2.ebuild 9625 BLAKE2B fcabeb6b7119b8b5a55ac37b36b16463d3d01e3b338246761eabad5653580996955da883f453d7096ea2ac9db7cbde1a8f0bdb94b71ce84a39cb8af85c0f7104 SHA512 2826b3e3b1e2c8478ace451519270e07272104328374bcd287e701eb337012681dea5a9da037f9005b45b2a8788ead5aafa55e30fc07e7dbb2d23c204f322df9
-EBUILD openssl-1.0.2o.ebuild 8029 BLAKE2B 3f4fc348feaffd30b504a19b204cff81491ad2439869d0d913d23b1cf20238e4f6b4ee4c926e2c73ce64cb74567b0e3af5b0c5fb6ec59b19e943ca7e5d30bc54 SHA512 db357c88840fe101d51a80e536d38fa9a08742912d9e70f473eefc55cc9f94a3616be5eb9402e27836dd7db302ec27d82b0347d6c0e239655ecf13e82810c6bf
+EBUILD openssl-1.0.2o-r3.ebuild 8092 BLAKE2B 66f9d07e6757aeffde65bd525f3a6bd66c0da6b6f503778de37a8172cb37656baf0c5a501699d426b18d63d0dac5bb1e7df9ea9f7d30dc19021c15985e8f2114 SHA512 f6aa3f6a4b89aa947d78ea28b8de2c9d3efd3eae2dac98de742784542d71700b5fb68b79392523d41a06dc9784522206637ee525e9fd1635f3907af172dab7a8
+EBUILD openssl-1.0.2o-r4.ebuild 9688 BLAKE2B b26ba5064dfcfa26556f2f9fd01a5b33b23f7b6b193ae6e7c7b680db6a0ebbd184ee4555c93d98718ed02f49cbd78d048f8bc867ec26b629e826d27bcca83bac SHA512 2357e22ede357e7326bf24f13b68e55f56521863df058297cef9123286ebf112fd2bd735a1a58658b2922131c8c5e57b991eedc326d001d7fd305824663de8de
 EBUILD openssl-1.1.0h-r1.ebuild 9158 BLAKE2B c0c4257218e9ef0a2460d5b19a9d43741d3c67a4cbed2714f352951c6d051973a6851bb9a33733e539ad98f0f5be6051b4da157adb421fb79704f995b119f894 SHA512 b1e6dec42afd6c9ca00697cc7942c6b192aebf6ef914c45949c8e3592a11162ce3954b07b484166331035ce421a4dd0a6d463652ab21c25fb3bcfc14239a4cac
 EBUILD openssl-1.1.1_pre7.ebuild 7587 BLAKE2B 34eb743824c977e7b5f793a1837251dd29621ea5949497023a2254f5fad1e49fcf8b91b0962f0405f298e10e6a1b86326c0d0409cb9b4d75a795efa4f1978e52 SHA512 ab71eff89c32dea33dfe95bc52dbee60be75c837730b0324a20d13922aff380c9615576c6712971cbeba86bf2c70366e25fafaaaac20188f471eca9e7684a288
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2o-r1.ebuild b/dev-libs/openssl/openssl-1.0.2o-r1.ebuild
deleted file mode 100644
index 256e230d7cfb..000000000000
--- a/dev-libs/openssl/openssl-1.0.2o-r1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-PATCH_SET="openssl-1.0.2-patches-1.3"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	mirror://gentoo/${PATCH_SET}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2o-r2.ebuild b/dev-libs/openssl/openssl-1.0.2o-r2.ebuild
deleted file mode 100644
index 8959ecc12131..000000000000
--- a/dev-libs/openssl/openssl-1.0.2o-r2.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-PATCH_SET="openssl-1.0.2-patches-1.3"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	mirror://gentoo/${PATCH_SET}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
-		done
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2o-r3.ebuild b/dev-libs/openssl/openssl-1.0.2o-r3.ebuild
new file mode 100644
index 000000000000..f54edbbadc2d
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2o-r3.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+PATCH_SET="openssl-1.0.2-patches-1.4"
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	mirror://gentoo/${PATCH_SET}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.0.2o-r4.ebuild b/dev-libs/openssl/openssl-1.0.2o-r4.ebuild
new file mode 100644
index 000000000000..335dce5ded3c
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2o-r4.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+PATCH_SET="openssl-1.0.2-patches-1.4"
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	mirror://gentoo/${PATCH_SET}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f25'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.0.2o.ebuild b/dev-libs/openssl/openssl-1.0.2o.ebuild
deleted file mode 100644
index b8a3ec6ee43c..000000000000
--- a/dev-libs/openssl/openssl-1.0.2o.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-PATCH_SET="openssl-1.0.2-patches-1.2"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	mirror://gentoo/${PATCH_SET}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 50260d6d14ca..3bb81d8fbbfe 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,3 +1,5 @@
 DIST pkcs11-helper-1.21.tar.bz2 417527 BLAKE2B 39b2b405ada79e0077c810b3537853051bbaf1cb4d79bedaedf04156066b573c9186ee587c869ed49053a0b471fa239447edef71184d421fb6ac2e65e3a58830 SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572
+DIST pkcs11-helper-1.23.tar.bz2 425238 BLAKE2B d67c6d299dbb5e23330ab44dd4f3b3133843a0018503e8d9c53ab18343dd3206ea7a1110db8cb0c8c5c1a6569b876a2b81ca7496302cc073691abd3693fd00ea SHA512 d2116e602edf98ec409163d7e1d4eed7b849dd9680fcb7b46e37022a49581a2e88605f3420dbc0936133084715bdf431b34ae96b7dedadcb13ffeb4798f92c54
 EBUILD pkcs11-helper-1.21-r1.ebuild 993 BLAKE2B ab38240b1b8872fc624526b86b28efe4b947f586f36bbac74468e3e06b9bc640f2a5f82d7e419a2f27f74bb4595043a11f20c3bb3a78972ef76bcb45bf53218d SHA512 6c1b9cfc5ce449010a0c7fee9d7fcdfd45821b582aa68bbcb70aa0ed211528aafd6ae434388b16078663911069b014f6fe7cd2df79f71a93489410226b4e8272
+EBUILD pkcs11-helper-1.23.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild
new file mode 100644
index 000000000000..02e44a3a603b
--- /dev/null
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ltprune
+
+DESCRIPTION="PKCS#11 helper library"
+HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnutls libressl nss static-libs"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.7:= )
+	libressl? ( dev-libs/libressl )
+	gnutls? ( >=net-libs/gnutls-1.4.4 )
+	nss? ( dev-libs/nss )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.4.7 )"
+
+src_configure() {
+	econf \
+		--disable-crypto-engine-polarssl \
+		--disable-crypto-engine-mbedtls \
+		$(use_enable doc) \
+		$(use_enable gnutls crypto-engine-gnutls) \
+		$(use_enable nss crypto-engine-nss) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4a5075c78f50..92e52fc6fcf2 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -2,7 +2,9 @@ AUX 0.2016.05.01-pkgconfig.patch 1890 BLAKE2B 3fc4c7f0d6a847bbfe8b137a0140b6805c
 DIST re2-2016-05-01.tar.gz 399509 BLAKE2B ec7676da99493bb2be56bd661f8f3bd57b123bbdc1f6cc5ccd294a17d819b75f9f505b247e86368735a454417f5df8aa4027c20f0fce129625c14caa166a97ad SHA512 6d37ab1eae51a73f60d3c8280ea1162c420638363f0eb1313d7c2d5cee65a5abd4c2927da1a53572afbcb7d07fac2993a7e54c6cbc85e24aaae93c46dab19b14
 DIST re2-2016-11-01.tar.gz 379816 BLAKE2B 251c45684fa4f3f85e0138c6f788f7a35fbc2ad8766f6a9bc0daf7305ac2140a1102602cf8843242f7a311ec09bf4fe516b605e39e8c857aa2f475783085c231 SHA512 1be7d2551737cb9dc1031dac9335f82dfb58f3612bdb745bf6c5121334bf8689bb0564b751c23e4c002478cc46cc237ce4da294090adb983b0c1db25a9fac0a7
 DIST re2-2017-03-01.tar.gz 382241 BLAKE2B 0a034267f435386b1bfc1680c98aabf4d18dac40cbce3c5a5705cb6a383d54f81b90e22fdd0f16220434eca2eb1c6a5d28ae7e903cdca2397bbc6c10c11ac703 SHA512 566a3ff6598fc9b26dcabe175efa48becd38459185d6bb86b3abb1856a3e7b0f9b5e302594b1ac4817dcb5968920df43d23279a6cff2a74b6b0c174dc9379f88
+DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba6309e5a2605a6f1fde20cae7e7cbb7bef6703abc12161891cb14e7308db3d18b25e575d3ffd8bbdd5cfba6f067983 SHA512 862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
 EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c5384e0a1f38481fcbdcdf4cb3073484dc660a22f7adfdc977bf1a200cb24f27120b94e87f4319178e196b57ccb59fda SHA512 1bc1f823a2927bb76e2793933d6048ddb93f829464ba8d9d9c0850dc08889026c8e27250e5922b5aa7bdcfe74d7bd0a4be1f59433065141dd7cfaacc6c6c25ac
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
+EBUILD re2-0.2018.04.01.ebuild 1305 BLAKE2B 27e7d0f8b457025bff2cf52b913c27510b1297e82656b8dd9ab479d723dfbf162d9c79b91dcfa6db9df71328a5891305910bdf345d6f679e0d28fe02041160eb SHA512 d72ddc4c55c49f9f338d83dcf9fc806072e672bd819e7662bae5580f063c982c802a4b210f68a1cf268ebba763d797d2a66ba01a47fcb59f6132d22329274333
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.04.01.ebuild b/dev-libs/re2/re2-0.2018.04.01.ebuild
new file mode 100644
index 000000000000..4aca3dcc7871
--- /dev/null
+++ b/dev-libs/re2/re2-0.2018.04.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficent, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="gentoo-2017-03-01"
+SLOT="0/${SONAME}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	icu? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX NM
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}"
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
+}
diff --git a/dev-libs/sni-qt/Manifest b/dev-libs/sni-qt/Manifest
deleted file mode 100644
index 3b6cc404be0f..000000000000
--- a/dev-libs/sni-qt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sni-qt-0.2.6.tar.bz2 34082 BLAKE2B 6b84204240ef1980ddea430cb7dd0347bfb9391d20eb5d50071f2bc88a031d8eb0d134ea358d8eae59ed283e72db7f44ee2cff5c517529604d3e4c9d396be91b SHA512 aa4cffeb3a5a70d65bd5ff42dcdd1c8efd107ade32a104b9a91696aecfb39a7a15d151f7491030ac0d7df796f2c7e4e6c3c0b7e32ee07a7cdc949da757147621
-EBUILD sni-qt-0.2.6-r1.ebuild 923 BLAKE2B f213652befc307acda6cdb677a0acef950d2c76c4c89cf646ae8850baa895c95af352444d50a3194d369e1eac9ec3438c6fc12abac94716e791c34fa71c51987 SHA512 0cad548a3bf4327e4460d9a452f439dc0d861d28f144356f5481f53725f2a6a6b9f46cd72ccdef74d8e4afd9bfd5c208cf9c1d1bb7f00e60b5faa70bf4570e60
-MISC metadata.xml 323 BLAKE2B f4a875279c7a8cbd194b289df8b50a1a7aaacf32c235677dcc4eb3d65a56bf025ebcb4f655a250f17300a8c183a625dd4ca4746051eb9b6f90c35471e6ae5798 SHA512 20f1a920336e199e1c2faac9895687d2c65eea1f33bdb9852138f30e15bdb8bc37de9de408793d56b492af3fcf12540528e61177ddf5a54b24322a98b89d5f16
diff --git a/dev-libs/sni-qt/metadata.xml b/dev-libs/sni-qt/metadata.xml
deleted file mode 100644
index 2d654473c3cc..000000000000
--- a/dev-libs/sni-qt/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">sni-qt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild b/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild
deleted file mode 100644
index 81d5e574ac06..000000000000
--- a/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A Qt plugin which turns all QSystemTrayIcon into StatusNotifierItems"
-HOMEPAGE="https://launchpad.net/sni-qt"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/libdbusmenu-qt[qt4,${MULTILIB_USEDEP}]
-	>=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
-	>=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
-	>=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
-"
-
-src_prepare() {
-	if ! use test ; then
-		comment_add_subdirectory tests/auto
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt4/bin/qmake"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 1a5c02c9ef3d..a58a37748e80 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -3,6 +3,6 @@ AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
-EBUILD tinyxml-2.6.2-r2.ebuild 1267 BLAKE2B 7e59ba9d1424815a07c4c8827c0a6c06143c574957c667d9f8f8d29fbb19a595086876f0ce246fc3dac8fdf36172de52ff2a12ad8ab6576e437ad19a0c0ab6b6 SHA512 515396ca0b136a79786eca7620cfaa912a9cfb60a582837c695bdee8868bdd85825000fca0a6d087b9f3f7f8cbbd4d7b84e69779ac6baf36f85723749deb98c6
-EBUILD tinyxml-2.6.2-r3.ebuild 1505 BLAKE2B b2359f773ed5bbb2e0dac14404f36af326db8b74a5042ede4ad0e68c2738f7b3a5ba3db54c5505955218f3a75c67807279fac4887c34d77ef6b3df33ea5a99bd SHA512 c3dce5fd38d775ea8aa30ed28a18f5c894b3bdff6d123a046660fe95f4b3ffc855587ace4b814cccb9eb4e6c75f1e015689c863f67c09bbb5dc029af102a305f
+EBUILD tinyxml-2.6.2-r2.ebuild 1272 BLAKE2B 52eb49192dbc1f2fb465aab5c49e43b90fda4ae8c4bfd9ece8ab49231d9fdaa3097003b21f065332c0b15dfed89befd2c3d6be3b6ee0425fe51a68331734776b SHA512 d01c6c429d6c1fcc0361a3da80de019e329b55492bee5b769a8717016529f3f7e5443341babd3b9431610cd5b7a11fdcedcfffe03a38372333a907a8ebd26f54
+EBUILD tinyxml-2.6.2-r3.ebuild 1511 BLAKE2B 4dc93c2cfddd1603fe48d1ea908883877637ff93858fbf862e59b9633874d5ad52d337fdacc54bcdd43802bef356e5edc433ee27d71ed8f040416d458faf8dc1 SHA512 fbc56b50f7835135a19fb01ad4c518a93ca57a6b2a64374517731a241ab093a899987e26408a984353a7f139d83d4c83c3bfcba27302edbdad12b9913d85c441
 MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
index e74e7a8c9c78..52ba8c0050dd 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
index b355cbf7af3b..1a6e115660f5 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 267ac0452ba0..9b6ed0671e97 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.14.0.tar.xz 413960 BLAKE2B b6d6bb35d3b664ef4cb91cbb9fc9687475730466306d9d2722991ce912be26fd4b3440fd0b94aba2b707911fe43a7c91e053b379261a17197c414ebc08818f83 SHA512 bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5
+DIST wayland-1.15.0.tar.xz 432932 BLAKE2B d86e5ba52c16664926e4688317db3fad4f9629c3903239dde46ee238ef7874f28e39daa6bbda96519dfda4ff83a1f540522f21fbabe9b71aa263523481d4eb5b SHA512 f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8
 EBUILD wayland-1.14.0.ebuild 1716 BLAKE2B 7da42f2763831e108e5b13cf648da2bf72a7e113ef4e7aeca149f225a0a2127f10bcd2df3e1a8f191d814345f7aafe3b75c92152db970561279ed86e7b81b416 SHA512 33aae7d701a910cfb9cec52d861c81d232d21a2802054d434944656fb0e8f103944e35606b7e522766d9cc5e2d8207baa6b893add6a6f93d16f22a6d5a88c303
-EBUILD wayland-9999.ebuild 1725 BLAKE2B b9e860e75f9686150b1b4d4d1f964f22e518a9c1be8d27e08c5679c18a2b3438e45d65f7cbe8adbe4695149e47de8b8df8a5fcf5a54c0629e9c3dfbece81db14 SHA512 f8c784d554c90056456c419359a91fdb957bbd7a51723253b0f120e956329daa02dbb99fb70565fb0e73e7766e769fd55aad4b7d1f6563701eb894204694515b
+EBUILD wayland-1.15.0.ebuild 1754 BLAKE2B 50866a6550a519455d7ecf23aa60d8ae9b6097bd8c9be01de66c677b82fc5e13f948df5ee7c1af912889ae9e56382766180f2ce351cbd04d21f235563c25e415 SHA512 854feab61f9939344d34a7a69dcb0eb97bbd4d8135628c885bd36de3a81058750e5ed0587c355e5400afb675cbe249c6c42f7256b88f16a1faf81c884df0a022
+EBUILD wayland-9999.ebuild 1755 BLAKE2B 43f897b83819708141c70c1b8d678509101c5497a21d4ded684901c43295ada64934f95693a2458597a1bcfa7bb508a638a8447789ed511769219fb7d271bf0e SHA512 24b4b3d664e4cdd331d78f8f22ea3670513411577849c8f980b5b9f7c7687b692bce959dd25970055b940aa835fac1d22766dc40bba23d989b0300d29fd6474b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.15.0.ebuild b/dev-libs/wayland/wayland-1.15.0.ebuild
new file mode 100644
index 000000000000..f61983c572e6
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.15.0.ebuild
@@ -0,0 +1,73 @@
+# 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/wayland/wayland.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit autotools libtool ltprune multilib-minimal toolchain-funcs $GIT_ECLASS
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	!<media-libs/mesa-18.1.1-r1"
+DEPEND="${RDEPEND}
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+		sys-apps/grep[pcre]
+	)
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
+}
+
+multilib_src_configure() {
+	local myconf
+	if tc-is-cross-compiler ; then
+		myconf+=' --with-host-scanner '
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(multilib_native_use_enable doc documentation) \
+		$(multilib_native_enable dtd-validation) \
+		${myconf}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+}
+
+src_test() {
+	# We set it on purpose to only a short subdir name, as socket paths are
+	# created in there, which are 108 byte limited. With this it hopefully
+	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
+	export XDG_RUNTIME_DIR="${T}"/xdr
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	multilib-minimal_src_test
+}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index 4e25ea990ff3..62aa7b2393bb 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-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
@@ -27,7 +27,8 @@ IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:="
+	dev-libs/libxml2:=
+	!!<media-libs/mesa-18.1.1-r1"
 DEPEND="${RDEPEND}
 	doc? (
 		>=app-doc/doxygen-1.6[dot]
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 8b3191ebc7c8..5dd9a61d732e 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,10 +1,5 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
-AUX weston-1.11.0-sysmacros.patch 399 BLAKE2B 6117a352cf3cf3cbdc19be4b2ad4e8101205ea64b01fc54316b82ecc6e2e01c4a20fa5e425dace78f839624b185e40c2e51a47b1fd978f5b7ec718b06dd34192 SHA512 15bae4a20ed0ccef697823214a341b3ca5885b1922730f39b2fbea89b7df8a1d0357f8b3160bc2877289d9c75866baf3bbd69cadba750b12d95c80d1ce47fec3
-DIST weston-1.11.0.tar.xz 1242244 BLAKE2B 065d2ca010a73eaccf6ddb1d803ca2c2e9fe7725b8c802ad0ad8af668efa4f194e2dc46d98d6138909d49f2b6c435bad070ded036413632acc2f1731b1a392e0 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5
-DIST weston-1.9.0.tar.xz 1238240 BLAKE2B a52e6868527f0487f972578c8953e0d35009ab90cd27f09f67044528df962b042f6344846c15b887f228e459d10700578c80367910f65dab1279581bb9bdadc2 SHA512 9bcbb5971b8a55d9e10aacf0aae868ff03750a98daee5233dcbff5698ed84e41c4b147fa1fdb1e2be916e3b1e13f259e0eec62354517d6e2a7e1d301a8522f66
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
-EBUILD weston-1.11.0.ebuild 3579 BLAKE2B 189f3178ec49671a7623676eb060dae38e56b834cd1ca016b25eb0b87d4f36287b7e8b30fa5d5e9db2be261fc7f8fff19202e2387ca59d2fd231df9492b8fc33 SHA512 a3b6ded22f8103fd387b768c9779360d5f64187057b790f9ad7d1694c85a40e921e226bc9ca8876ff197a6ab4ca9574818f0d5b56217e3fc7b7e421cecbd5d8c
-EBUILD weston-1.9.0.ebuild 3150 BLAKE2B a5c8867231671a3f3838dffbe75bc359ef72c6c78cf8f2dbe4cd83e0dddf9d88db5e96e1469aa4ebbbc4bea1dea45cb0591958931f15734fda31e2fca7df8187 SHA512 43089ab78543c75b52f046b4fe37b7244aeedb4a6f6efb6d4892a59cd1b5108eaa807135b4ceebf845c03b76edadacb3eabac7c5852b0b8225ee52059464ec9e
 EBUILD weston-3.0.0.ebuild 3471 BLAKE2B fe1bf52314d12e30c3ae4ee664c156a83a817b3150e27ed60286d06bb115169a459c8a934d89faeb1deb30bba2b6965ca1a30d8ba16d8e9b244f29c8267e2c03 SHA512 fd281abc3d24c558d996670fac22106501d8d94ef394b23112023d95d4987bcbc4f0208796d5132cdd1ae3033073da2cc3f8067afefdc7b55fc9100a70ca39b2
 EBUILD weston-9999.ebuild 3461 BLAKE2B 9e0e7004d2f0f70228cd396a98d926a66a250978fabdc2ef1e09e2981a0a610df03c56e3b552f3e3fb9534e42a99718144b9c8208ec29834ac89f0f2fa478822 SHA512 420518c195308a359df897e377c3bd71c0e17a000cf8c0c25831332031ca1704cfbd598c10e9b475054f52407a9021e581db6b4dcc13dba2605dad2912e3f7ca
-MISC metadata.xml 1346 BLAKE2B d3f6039350c2de5081b3fa3caff08bec83fe8f18c03d22bfdcf11d7b7457a1dbd4f55ab352e215a9fc588788f01ecff334e66f3299367d124730f75331217b99 SHA512 27e5e3fde5db5d9e04138b1abdeb77a09a3a0c726c28b1ba63db4aec44c1be8804cfc171893573ac2b4365dc94c725129843267cb0ab938bc5599aa186f26094
+MISC metadata.xml 1296 BLAKE2B 7fe16b9e7e0a23f8ebc5361f3649031ec0897871964e00031a399462042d228e957344383a7c49509cb37703af54ecaf06526a83dea92b3eee2d1f6858715956 SHA512 e73e72586bd57e83c1a2d6de04982054029f65bfbb78b904f9eff049bf044c795fa6641d109eeae334b51a12a5240f185617e18f3a81150c03fa20f674349bbd
diff --git a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
deleted file mode 100644
index 6f54bfc11cd5..000000000000
--- a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN weston-1.11.0.orig/src/weston-launch.c weston-1.11.0/src/weston-launch.c
---- weston-1.11.0.orig/src/weston-launch.c	2015-10-24 02:02:43.000000000 +0200
-+++ weston-1.11.0/src/weston-launch.c	2018-04-30 00:02:42.528120347 +0200
-@@ -37,6 +37,7 @@
- #include <getopt.h>
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 54c40413ede5..661f699a5e5a 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -16,7 +16,6 @@
 	<flag name="launch">Install weston-launch utility</flag>
 	<flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
 	<flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
-	<flag name="rpi">Raspberry Pi GPU support</flag>
 	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
 	<flag name="wayland-compositor">Enable Wayland compositor support</flag>
diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
deleted file mode 100644
index 81098bc0289f..000000000000
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-
-inherit autotools readme.gentoo-r1 toolchain-funcs virtualx epatch $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="amd64 arm x86"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~arm-linux"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	systemd? ( dbus )
-	test? ( X )
-	wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.10.0
-	>=dev-libs/wayland-protocols-1.2
-	lcms? ( media-libs/lcms:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.30
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( sys-apps/dbus )
-	drm? (
-		media-libs/mesa[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? (
-		>=net-misc/freerdp-1.1.0_beta1_p20130710
-		<net-misc/freerdp-2.0.0_pre20161219
-	)
-	rpi? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		sys-apps/systemd[pam]
-	)
-	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
-	X? (
-		x11-libs/libxcb
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-sysmacros.patch"
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use examples || use test; then
-		myconf="--enable-simple-clients"
-	else
-		myconf="--disable-simple-clients"
-	fi
-
-	myconf+=" --with-cairo=image --disable-simple-egl-clients"
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable lcms) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable rpi rpi-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable gles2 egl) \
-		$(use_enable unwind libunwind) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable systemd systemd-login) \
-		$(use_enable systemd systemd-notify) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		$(use_with jpeg) \
-		$(use_with webp) \
-		--disable-simple-dmabuf-intel-client \
-		--disable-simple-dmabuf-v4l-client \
-		${myconf}
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-1.9.0.ebuild b/dev-libs/weston/weston-1.9.0.ebuild
deleted file mode 100644
index 9a3663c34e72..000000000000
--- a/dev-libs/weston/weston-1.9.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-
-inherit autotools readme.gentoo toolchain-funcs virtualx $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="arm"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~arm-linux"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	test? ( X )
-	wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.9.0
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/libwebp:0=
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.30
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( sys-apps/dbus )
-	drm? (
-		media-libs/mesa[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
-	rpi? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		sys-apps/systemd[pam]
-	)
-	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
-	X? (
-		x11-libs/libxcb
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use examples || use test; then
-		myconf="--enable-simple-clients"
-	else
-		myconf="--disable-simple-clients"
-	fi
-
-	myconf+=" --with-cairo=image --disable-simple-egl-clients"
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable rpi rpi-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable gles2 egl) \
-		$(use_enable unwind libunwind) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		${myconf}
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_src_install
-}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 8dadc4a669d8..efa0fde914c4 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/flexi-streams/Manifest b/dev-lisp/flexi-streams/Manifest
index b38491b55436..cd1a0458bc86 100644
--- a/dev-lisp/flexi-streams/Manifest
+++ b/dev-lisp/flexi-streams/Manifest
@@ -1,3 +1,5 @@
 DIST flexi-streams-1.0.16.tar.gz 135698 BLAKE2B 9d6d5b064f10d27ce60d5a8a6792b7c36e63d393f64c98148bfd9addd36483e1e4d9e2b699c0ae151c55d88e01bd86fea3197e082b001face2c44206229c3e21 SHA512 66b7c5231616c7a6095a52d6c679717795c9308e33487536a5e1b7f0d25f26aacd2579a76c351f8e16a967a0611456cbc97b3824f4d9cf4875b8e48b0c4f7c78
+DIST flexi-streams-1.0.17.tar.gz 135883 BLAKE2B 96670bffc8b53196d2138bff6bdcaaae74d3a9318bb637cb52914de0905be86d3d5ce40ed3f5f87deec75cbad609d339fc0656f8542ee05edae5c9c342430a90 SHA512 58a19214f74e00948dd5c15453cb68a65ad600a78fd7b637018914446a3953f68efa5e229b3d27e93464d8f273e82aa71d0fafe9b2ace77e40d23c5aea756d49
 EBUILD flexi-streams-1.0.16.ebuild 596 BLAKE2B e6ff52d7856210b52fb6abf3c18fd3f2616d8984a01aef603407564e8f19e59a1d1ae877bcade69eccbb611b883ac52de2b712f4eb33c59debe8e9c5e50ad1a6 SHA512 d77a4fb7ee26b503719c7cfbb17c56174d7a1942379546f9103136e5a5519b16e958dda0c67535d2bdbb01b13da3ac44ad6d8053cc331d1e1b7454f8b5f34028
+EBUILD flexi-streams-1.0.17.ebuild 599 BLAKE2B 94d59969b6a2015dc32ac437b56f316791d2c12949a71e23154338a475fedacd027c7521e95798302cd58bcb643262d2e0748e2210a3be8a9beca2496bb7ec82 SHA512 fc284a2ab2aa79b46d01db0cf6bf126cc639b1b89c9f175daf480b27dc027860b9a626a8c38a6115e6512e3b5370c60ef165ee8e3ce4a730a65d5de116838b6e
 MISC metadata.xml 1203 BLAKE2B b3e8f3eda7beb04db32d4ce77c18e7f1704a653ddf7b89a02417e09ba30556eff28dd06d9f9a9c215191abe6d5e79bf4318b4212c1b1f6f208a62fbb011ba572 SHA512 37681d2d10934500886ea68894e0fc7b7aa0f5082338cb7844250cc39ad9fc83b66e71d40fedc91e7d675af7fba043bf4bcd40ea85adbdb4ba8348787926504b
diff --git a/dev-lisp/flexi-streams/flexi-streams-1.0.17.ebuild b/dev-lisp/flexi-streams/flexi-streams-1.0.17.ebuild
new file mode 100644
index 000000000000..672410b9b419
--- /dev/null
+++ b/dev-lisp/flexi-streams/flexi-streams-1.0.17.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3
+
+DESCRIPTION="Flexible bivalent streams for Common Lisp"
+HOMEPAGE="http://weitz.de/flexi-streams/
+		http://www.cliki.net/flexi-streams/"
+SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!dev-lisp/cl-${PN}
+		>=dev-lisp/trivial-gray-streams-20060925"
+
+src_install() {
+	common-lisp-install-sources *.lisp
+	common-lisp-install-asdf
+	dodoc docs/index.html
+}
diff --git a/dev-perl/Ace/Ace-1.920.0-r1.ebuild b/dev-perl/Ace/Ace-1.920.0-r1.ebuild
deleted file mode 100644
index 1f3f631aa1c5..000000000000
--- a/dev-perl/Ace/Ace-1.920.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=AcePerl
-MODULE_AUTHOR=LDS
-MODULE_VERSION=1.92
-inherit perl-module
-
-DESCRIPTION="Object-Oriented Access to ACEDB Databases"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/perl-Digest-MD5
-	dev-perl/Cache-Cache"
-RDEPEND="${DEPEND}"
-
-# online tests
-RESTRICT=test
diff --git a/dev-perl/Ace/Ace-1.920.0-r2.ebuild b/dev-perl/Ace/Ace-1.920.0-r2.ebuild
deleted file mode 100644
index d08d72d1c779..000000000000
--- a/dev-perl/Ace/Ace-1.920.0-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=AcePerl
-DIST_AUTHOR=LDS
-DIST_VERSION=1.92
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Object-Oriented Access to ACEDB Databases"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="virtual/perl-Digest-MD5
-	dev-perl/Cache-Cache
-	dev-perl/GD
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i 's/", "1")/", "3")/' "${S}/Makefile.PL" || die "Can't patch config"
-	perl-module_src_prepare
-}
-src_test() {
-	local MODULES=(
-		"Ace ${DIST_VERSION}"
-		"Ace::Freesubs 1.00"
-		"Ace::Graphics::Fk" # NO VERSION
-		"Ace::Graphics::Glyph"
-		"Ace::Graphics::Glyph::anchored_arrow"
-		"Ace::Graphics::Glyph::arrow"
-		"Ace::Graphics::Glyph::box"
-		"Ace::Graphics::Glyph::crossbox"
-		"Ace::Graphics::Glyph::dot"
-		"Ace::Graphics::Glyph::ex"
-		"Ace::Graphics::Glyph::graded_segments"
-		"Ace::Graphics::Glyph::group"
-		"Ace::Graphics::Glyph::line"
-		"Ace::Graphics::Glyph::primers"
-		"Ace::Graphics::Glyph::segments"
-		"Ace::Graphics::Glyph::span"
-		"Ace::Graphics::Glyph::toomany"
-		"Ace::Graphics::Glyph::transcript"
-		"Ace::Graphics::Glyph::triangle"
-		"Ace::Graphics::GlyphFactory"
-		"Ace::Graphics::Panel"
-		"Ace::Graphics::Track"
-		"Ace::Iterator 1.51"
-		"Ace::Local 1.05"
-		"Ace::Model 1.51"
-		"Ace::Object 1.66"
-		"Ace::Object::Wormbase"
-		"Ace::RPC 1.00"
-		"Ace::Sequence 1.51"
-		"Ace::Sequence::Feature"
-		"Ace::Sequence::FeatureList"
-		"Ace::Sequence::GappedAlignment 1.20"
-		"Ace::Sequence::Gene"
-		"Ace::Sequence::Homol"
-		"Ace::Sequence::Multi"
-		"Ace::Sequence::Transcript"
-		"Ace::SocketServer 1.01"
-		"GFF::Filehandle"
-# Need Ace::Browser
-# 		"Ace::Browser::AceSubs ${DIST_VERSION}"
-#		"Ace::Browser::GeneSubs ${DIST_VERSION}"
-#		"Ace::Browser::SearchSubs ${DIST_VERSION}"
-#		"Ace::Browser::SiteDefs ${DIST_VERSION}"
-#		"Ace::Browser::TreeSubs ${DIST_VERSION}"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	if ! has "network" "${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}"; then
-		ewarn "This package needs network access to run its full test suite"
-		ewarn "For details, see:"
-		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-nodes/dev-perl/Ace"
-	else
-		perl-module_src_test
-	fi
-}
diff --git a/dev-perl/Ace/Manifest b/dev-perl/Ace/Manifest
index a60e6a45f31d..681bb24e002a 100644
--- a/dev-perl/Ace/Manifest
+++ b/dev-perl/Ace/Manifest
@@ -2,7 +2,5 @@ AUX Ace-1.92-gcc-nonvoid.patch 729 BLAKE2B d98d4d2925f8f10f55f64c945ff61509c3ba9
 AUX Ace-1.92-glibc26.patch 749 BLAKE2B 261d699ab79bb625cf8590c900913ee35363b7cd7a70d3ec82a3866c9e06c33e70f760610b65e2591b1becbff5b58264c61917628cddbd8a2d490ea6c4911e0d SHA512 a383275a27abaf533174395040513dc47355a1c56d660d7221e4142ea90a1ca97957f8fd981476ec62744df7a65037b44ad957467962ce5aa730f2fba916f7d1
 AUX Ace-1.92-rpcxs.patch 819 BLAKE2B 2eb978b7bbced6b67976685d8102724f6357983459e90a14fdab1cb696a8e8c033093d3427cf7aec820aa27eb0f71c9d505962dc2aa62ca67455562b869a5179 SHA512 ae26f67a5a0b91652c90dbb4beea7553e3affc40a15db52247ba28e4171f150c4ffa70ce15b69ce3735176c810b36105b00fb5675f4320340354a929568b49d9
 DIST AcePerl-1.92.tar.gz 300163 BLAKE2B 4fac4d7f56d31f179a1a310688cde078371a1e6605b229016a5a2f3a32de01bf3421c459eeefcdfdd12df3baf34d6495c8e7998e1c66a47215ea2abd741303b6 SHA512 0db8392336dd48c58bdaf8d8d9ac6d1106124259f27fa95951aa8d496014e1e8b89ed87f6df276473e3bcb44a8d323f864178a9b84dd1e787d614bd0b8e93be9
-EBUILD Ace-1.920.0-r1.ebuild 390 BLAKE2B 0ebada0a7083cfeaf609a6fc94b1fefb274fd6907d6f41b8286d91714364c3c5bb51e1429ddc9b4fb3b75624367085caed1708a60444c0b6c48d2b17b5543394 SHA512 3ad41c3cc828bdc55beddf2852b5a7b98236416fded8b10367f7bfc0192fcd14b0ffd1f476792fd0c33571a394a80461fa6ceadeaf0bc1dc3520dc0f115db9bc
-EBUILD Ace-1.920.0-r2.ebuild 2549 BLAKE2B ddefb1e0b5efc25a98a9364497fd39475f0cb71796ffe7045a219095dc3c75711db6e2e746c2be4c565b9934660f39d5534fcde092a2844ec7bb1589a30801b7 SHA512 ba43b8facb594c8043c915e794130092f540b472b0df565b648e11fa809c73bf83aefb52a4723edb0f79c64109090447b07e1a4481ee9b3229af99c028d7c8c8
 EBUILD Ace-1.920.0-r3.ebuild 2926 BLAKE2B c6ee969eaea5761d58588914b259bffa66f25380c5cc6448020ccd8d07328f7a604e7ec3050c6879007edafe14c7fbe412a8bd24de60b8ea9e6c85a5c7754ae2 SHA512 3c6dd7ec9f2c1caf39a8d0aa408b4ecb684d13874246399a22138c07645613ccb519eb2166674bcad59d0b80e2c4b886cfb0e3fbc28ff25edc2895fd37fcae4b
 MISC metadata.xml 3416 BLAKE2B 4385d220ac60f2e41750bb1afeff4f9a9055526710db08c2688f1e3787a17f2d9943af22825c8ec554c832f2a428410578baf25044348cbc984114890adcc770 SHA512 aa3443c187165f3cf97e7110238cb039242345071f9e3f74ed40e39a9ce0720062706dd78539eff1553703ed5e8cf55d42b924ebae3cc992366358d300ec544d
diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.670.0-r1.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.670.0-r1.ebuild
deleted file mode 100644
index 4f9cf80bc7a2..000000000000
--- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.670.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER=3.0
-MODULE_AUTHOR=MDOOTSON
-MODULE_VERSION=0.67
-inherit wxwidgets perl-module
-
-DESCRIPTION="Building, finding and using wxWidgets binaries"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE="gstreamer opengl test"
-
-RDEPEND="
-	>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X]
-	>=dev-perl/Module-Pluggable-2.600.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-CBuilder-0.24
-	>=virtual/perl-File-Spec-1.500.0
-	>=dev-perl/Module-Build-0.280.0
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do"
-
-src_configure() {
-	myconf=( --wxWidgets-build=0 )
-	perl-module_src_configure
-}
-
-src_test() {
-	perl_rm_files t/zz_pod.t t/zy_pod_coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.680.0.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.680.0.ebuild
deleted file mode 100644
index 70ba0b3838dd..000000000000
--- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.680.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=6
-
-WX_GTK_VER=3.0
-DIST_AUTHOR=MDOOTSON
-DIST_VERSION=0.68
-inherit wxwidgets perl-module
-
-DESCRIPTION="Building, finding and using wxWidgets binaries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="gstreamer opengl test"
-
-RDEPEND="
-	>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X]
-	>=dev-perl/Module-Pluggable-2.600.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-CBuilder-0.24
-	>=virtual/perl-File-Spec-1.500.0
-	>=dev-perl/Module-Build-0.280.0
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_configure() {
-	myconf=( --wxWidgets-build=0 )
-	perl-module_src_configure
-}
-
-src_test() {
-	perl_rm_files t/zz_pod.t t/zy_pod_coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.0.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.0.ebuild
deleted file mode 100644
index 43c5483d6495..000000000000
--- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.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=6
-
-WX_GTK_VER=3.0
-DIST_AUTHOR=MDOOTSON
-DIST_VERSION=0.69
-inherit wxwidgets perl-module
-
-DESCRIPTION="Building, finding and using wxWidgets binaries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="gstreamer opengl test"
-
-RDEPEND="
-	>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X]
-	>=dev-perl/Module-Pluggable-2.600.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-CBuilder-0.24
-	>=virtual/perl-File-Spec-1.500.0
-	>=dev-perl/Module-Build-0.280.0
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_configure() {
-	myconf=( --wxWidgets-build=0 )
-	perl-module_src_configure
-}
-
-src_test() {
-	perl_rm_files t/zz_pod.t t/zy_pod_coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Alien-wxWidgets/Manifest b/dev-perl/Alien-wxWidgets/Manifest
index 98d423180a31..c79b1eb8d5a8 100644
--- a/dev-perl/Alien-wxWidgets/Manifest
+++ b/dev-perl/Alien-wxWidgets/Manifest
@@ -1,8 +1,3 @@
-DIST Alien-wxWidgets-0.67.tar.gz 671487 BLAKE2B b424d44f3c9646486658b467c70f14bd0b120379e168d651c39aca4b7fb0745cb652c576f79dc25652f7a10e025d9067b26e286fd0ad22dcf39ad8a99f2df2fd SHA512 633547a4417a42e96621a9409a83e736ba94c8692b7791a1887cf8497aaade9bc827a1279db169f737e834c5070c6f0d485c005133708bbf76a279acf1684092
-DIST Alien-wxWidgets-0.68.tar.gz 671730 BLAKE2B fa9178dcda47db251f0de3b109a7ea5754dcfa9fbafe552661d2aa28acbfcc203fca672cabadc260c65ac6fb69896c8ae087288def341613e01e8de9812bbf0f SHA512 8d9422bb22876dacbd89b1974ca4ded3473ee7fe2e833870a50cf472f2ddbd9f62b749819e6b265a0564b6dc64b4bd87fcd7f7faf346d803c81296d8b6921e1e
 DIST Alien-wxWidgets-0.69.tar.gz 671819 BLAKE2B 304dd5664fd9e628eb45c5c67cd9ca8250129c8c0eaba1a0d5e1d2ad6afe6cb7acf0eccfe954d2f35714942970613fd1cdcc466104d776119dcaea3a8b1ddff1 SHA512 028eae7fd7f44612b6a56814a38a81681d66a95db5d9e21ffb7ef763ff6c9f68fece8eea4bef0b232546b6e2dd6d7a5c32389b96dd62968c4cb110e6508cd534
-EBUILD Alien-wxWidgets-0.670.0-r1.ebuild 775 BLAKE2B b3802e50197af22f07f3b9607e41c71bd4b065d3170f46a7eee5e536f119eb27382485019872ad3eed1f163b5cd3357c3b16ad0e1e2c5f10d74affbee0b3d42f SHA512 bd95cc8414e46254470e2d8edde7b13d4525ad10d99a3cf334429afdb435b6f16b75211e1f71e8cbb5e689daa56350b47997f735c36f174d26d32640085b5c80
-EBUILD Alien-wxWidgets-0.680.0.ebuild 758 BLAKE2B 504717a0dabb0915fe34f96221af2079b29b27eac3e1ab4f28eee48bfe41f8b88c3a750c0923be28eb6ac4de3802d7b6a606a6f83f67f9fd9c7b6302dbd9d620 SHA512 6027b49746f646724d24bcc5421bfbf8f87c0f6ae3aed72dac20850069bc2e0ee9ddfa99d0fe7ff1d314d020fb303d59d3b58b60f818cd27646975c602a2b2ad
 EBUILD Alien-wxWidgets-0.690.0-r1.ebuild 773 BLAKE2B 41949d916154addbea59fee4dde46fd144884a1194477ad924435cc82e9674ebb64c210d2c4df7ea593495a91b284a04211605242a8e4e326ca2a6876a05b199 SHA512 eb70579ceaff48dde0f21c061dc60063fcd29cc8427ffdb489ac7323aa5f32e4bab65d49c569497ef975fbc8cd649400f6caa47d79a662c8c25c2fba4eddd333
-EBUILD Alien-wxWidgets-0.690.0.ebuild 758 BLAKE2B ee7c93084ab6e0f2c1321dbac2789a017d57099d0e54924f245f4d8616ae6c88d5033e863367d43b59d1b371abd4e86dbae9d7271b08a37204a78c5a631b5e56 SHA512 31b9716769ddd7d6d2e4a7ba615a9355877f036cd353c00d277bff1592f5e7a76198451b2cdbc3d8644f642d978bfc45975a1004a0082914125433ba5f64383c
 MISC metadata.xml 474 BLAKE2B 7600751c8fa34a04b12f371b15189d75eb51e13a8b1243ac87cd84d562a6118055cceb9940631a47850ea47cf09111154c966bec9d48b51358e43bd2f2ec9a19 SHA512 e75a44d2bb44e4aa1321ca361a73999252ea6a3687efd321d15fbfe69e9e70131146a7f18f2026e22972caccc49357c6c9524054e94f8201eead9c96b66789dd
diff --git a/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild b/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
index 8f396da9e5bb..bddc03efb659 100644
--- a/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
+++ b/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Get, unpack, build and install modules from CPAN"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/App-cpanminus/Manifest b/dev-perl/App-cpanminus/Manifest
index f2db6f8ef98d..5a6d001c9ecb 100644
--- a/dev-perl/App-cpanminus/Manifest
+++ b/dev-perl/App-cpanminus/Manifest
@@ -1,5 +1,5 @@
 DIST App-cpanminus-1.7043.tar.gz 317984 BLAKE2B 002f4ea6dd11d2672c8415fad80790bbaf097be39eb6d4cca2c5785c7ccb0298df9fb026e00b597888fe2e2db734a32266d84ad548539277eba1fe87f5e9c4f2 SHA512 a885ec78d5fea49434fbc8b71a503f2f4dc3a60905d54abe330a0a6233b7901e5b4364d0297752973efe6a57cae134d55b0a14781dbfb66e1fcbf4e001be389d
 DIST App-cpanminus-1.7044.tar.gz 316368 BLAKE2B 093f48282349be882afbdb2480e42ea73ece061fe01919c8d7bbf8890ccb83a699be0a54126556620e03b1cf9da195a9c266186c9b84427d4bba57ebd11b62a9 SHA512 85e88de8fbefabdfd84fe8aeaa8294d58d63e27276cd6d8b8dfc5dc4cd6c30c12f5859f30e4930842d6d06af50c88d71358dee49c93821234c811aa39de822d7
 EBUILD App-cpanminus-1.704.300.ebuild 385 BLAKE2B 0c3c2a3ee5ad861c50cf5f20ea8f4844c876a92ac898cadb8add5fa90e0b1ead41f7d285d06a5e9b208766123e6fcba461bfad1bdde05e902e5123efc7d8f4e3 SHA512 37831f9e5b66bd3d7c4c4731b712f83dd1ea843571621b4a9a0bbd8f3d89d2988bb9e71bdd3c9efd5772371237e12d447d617540678c682851e57e664d8a2686
-EBUILD App-cpanminus-1.704.400.ebuild 387 BLAKE2B 630b177cab2c685d03420d0d4c06352c1b57d93a9936795d99c54774fe735d101282f90e44477508feede70c61e7205ff2d66a9447e9a77ec994ab0b31b77709 SHA512 774937535702814036fd2b068003825b81422e11a700700d465c5f11e7bd8d2f8dd74ae1c23970c69af6cc7710631a6314e15cd1ecf1d4bd75715b8014260b4a
+EBUILD App-cpanminus-1.704.400.ebuild 385 BLAKE2B 0ea65b1bd25de719751b821b657b77d94cf6395c560ab88577b92e88590023c13ae9457e20289091ae6c1a1dd4c2ef03942505cbfb0998fcaf3f64c38b6bf4f2 SHA512 4ebb093c8461409d1257a75dac232b262bbdf2b7a59a2e90504490df732d82b273daf0523c3ca78722613a9046279c8a5b63a487d24558ad9790cfad6ddcb35e
 MISC metadata.xml 422 BLAKE2B 93640a71db70d4e732c859d97d59f06550c053d4d964f90d99870bc4f8147e2c54a765e4a48fe71af6aa56906486e8e424fdb454d52db821edbc682d1c9af471 SHA512 a425a03857673eeb031ecbff9012a7d6f9d3fac567f39409f80df3891247cf820313a4499630b676b765a657d8f8bca0059cf776b7ed9e3761145b40da2fabb0
diff --git a/dev-perl/Array-Compare/Array-Compare-3.0.1.ebuild b/dev-perl/Array-Compare/Array-Compare-3.0.1.ebuild
index b47bc6ef4bc0..9fa44bbd25db 100644
--- a/dev-perl/Array-Compare/Array-Compare-3.0.1.ebuild
+++ b/dev-perl/Array-Compare/Array-Compare-3.0.1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for comparing arrays"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Array-Compare/Manifest b/dev-perl/Array-Compare/Manifest
index 4e6981d7621b..6ec1c1074ec0 100644
--- a/dev-perl/Array-Compare/Manifest
+++ b/dev-perl/Array-Compare/Manifest
@@ -1,5 +1,5 @@
 DIST Array-Compare-v3.0.0.tar.gz 9437 BLAKE2B 3ace6ab6678d710dec33d6b923fe0f96bcfc35db606a50c140755ce76fe259d4700ace6419cb70b2501669ea730b57ee1057e525d08a19b62baf1218e36db7bc SHA512 6515aa249b49a04f70f39974e1d1c3f802a1b5d76e3e050aeb47a30cf8a4ac0089378822eb0c0aa15697bef09e49227a13c55d4914489f944c3d2f5cc2b4a692
 DIST Array-Compare-v3.0.1.tar.gz 9481 BLAKE2B e97b69dae2deed13e2963b009706754ada64546834a81b0a383b50fcf293d30d243d4e148d454a5fbe962e8b54e1dfa3ab03f7d59948ccb0a58a475496fda132 SHA512 33d433448d3a0cf30ca0761bd36f4087b0c596d950c8e6bc107ec3ed6a645fb79ceb6ac12f9fdec981dc4a441bd1030b41a66bc0f2fd1bbf6471946107ac2f5d
 EBUILD Array-Compare-3.0.0.ebuild 560 BLAKE2B 51ff37f0ba4b106d469aa2f52533971b97993d2a97aab2f0e4acd56de144efc449b88742de15bda5e8cc7126880de65a6d34e551ffc29f197f90ef4c1066232d SHA512 b31eb1c8e06c5bb487cc92cb4160ff670ffd9b9c8b536d15fc896e99a31ffe9664f1c47c324fd5bf9f0d3d7c2773f2ce64d704d7d53b25934ee4ec084a2987d1
-EBUILD Array-Compare-3.0.1.ebuild 530 BLAKE2B 5856623ff56da11ad8f35d22fe083becee4cf4984ef952b6e0e869ca781a623ab7add06aaf322e1f695dd628ecf85b5cf933a7fceb050f9634509da1c6bed52e SHA512 1e049884b41396f12f8d76270cb4201176d5e381a37576141464f5cb49becea50a48829460e0351d27687275fb0ffdebdf909703da6b952470f65714436e997c
+EBUILD Array-Compare-3.0.1.ebuild 528 BLAKE2B cd8fac0fc9e3a456b6ff761637ad8241a3dc2d49e53eda31dbcc4486b5ad57a9026e3bc9b756b5b3793d00794e10c812dbe2477754ba1d62db6e74c8ef71d0fb SHA512 0eee7ed75ff6b4809e30e16e8023bdbf08e9e0da33d2d0ffd5e3ce6947af05ed1b0ff6532f81676694570e5c0ae2f7e7e42cfb74155540fb19e55c07c6fc3726
 MISC metadata.xml 398 BLAKE2B 85cb87dc087cbebd9574646c7150148d694e937bc508a2b7f402811401537c5bd1688c957414dedf47a6c103683c3de5bfec4dc620aa23ff341bd4eaf29c9e2c SHA512 72ed7b8e8ecef772f37fa18b6938b1fe4b8cefbb7c13de073b40610a14034d9771b93608239e0050d9eee2f16d452872083049c38b9505b02434544504f90128
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
index abec1dddf43e..ffc2c0b3bdfa 100644
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Execute code after a scope finished compilation"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/B-Hooks-EndOfScope/Manifest b/dev-perl/B-Hooks-EndOfScope/Manifest
index 2c19053ab769..73ada8e689e8 100644
--- a/dev-perl/B-Hooks-EndOfScope/Manifest
+++ b/dev-perl/B-Hooks-EndOfScope/Manifest
@@ -1,5 +1,5 @@
 DIST B-Hooks-EndOfScope-0.21.tar.gz 33336 BLAKE2B edd3c9428dbe689e1528b76a0383ec6c85ccd35059abbfdc0a6de613ca5648010e89a9f7fa34c627130ac81a6c247da6fcc7552dd6bd12ce676fed73de26ba8d SHA512 6c34b5e6bd9b355703339b5ec7625e8ecc94a4d38bbc1a94fb561c8832234a80a1d5f0b389e4479fe75a85afb15d9e56092c2c1ceca0c995b39fc5ba0e4a563b
 DIST B-Hooks-EndOfScope-0.24.tar.gz 37859 BLAKE2B b5e4f0061949af112b9bcb89c1352e1385222c291624df330e8e60d3faf48f78a669650b074b1659f8287f14d46bdb488da0c943a0d22adb5a50dc37aebf7754 SHA512 5c061a81a3fed88ad868a14a1f817f7952b2f0c9512408174354e0ecf7e3caa5d646054cf75efa8b8c558e6241a8dfebf9400e8826021bdb5cbdf3a00065b147
 EBUILD B-Hooks-EndOfScope-0.210.0.ebuild 719 BLAKE2B 864df5433f3db7d43286361faef852c6c9937af2248ae295b2072a47e6dbe86396d465e3640967f37adfeab662e99f520a65ff2adb45af1d38456f15100419a3 SHA512 afbc3f3ec6853df628b4107eac2f5c799d9ef80f8b078bf0f05589b48b00f2c9c44f9bcffe81c1f0571bef42acb5b290d35d709fe53a8947dcab8332792ac61e
-EBUILD B-Hooks-EndOfScope-0.240.0.ebuild 725 BLAKE2B 4fbfa9ed82d29d2ffd4b92592407834cabd3be32b0ff89d6b3fda9375d2a02be68c55e1fde0ec68e56b551514be4725455c9a339f56b71798d810074afc823fd SHA512 aa3929c7f6a78a38342cb2d34c02bb38d0c57daa0849c82c3c0c82f1339c4d1649be54b20aee521d4ce823a02356235dae37e4147df21b51f796945db7eddb17
+EBUILD B-Hooks-EndOfScope-0.240.0.ebuild 723 BLAKE2B 6a4e7559577d2567ba3374a3a9f58f04138e06f20421cae26b47bb25a4e53c322824f890fdc3fe5931cd409ae8f87679832af063afafc0ec176ad714939d5a73 SHA512 6c1f4e67147f508fe40e36b855b25298526435cdf10e7de07d943ef40ab552d2c3993d9ccc301a22de134aa467b826d24705ad1c740769a5c1bbf8172df8081e
 MISC metadata.xml 551 BLAKE2B 1f029ceea8b1946ac24943bfc3071524b2e5c245d8c9806383fa46d6e761f4d7ac84868acd65936bde6f98746d4df45d7af2b089bdc29c3593319194bf755cf5 SHA512 3624449a7844dfe649ebc7dc90e197a496e92a678d8d08009e164914198a1722b4cb3af43590dab725281d45c70c0414b3bbe888bffc0702e774f0e066e1806e
diff --git a/dev-perl/B-Keywords/B-Keywords-1.180.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.180.0.ebuild
index b386190ecd58..a93e900716e4 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.180.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.180.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
 # GPL-2 - no later clause
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/B-Keywords/Manifest b/dev-perl/B-Keywords/Manifest
index 2fa8019dba75..c2af93993078 100644
--- a/dev-perl/B-Keywords/Manifest
+++ b/dev-perl/B-Keywords/Manifest
@@ -1,5 +1,5 @@
 DIST B-Keywords-1.15.tar.gz 10140 BLAKE2B 76cb82b4ec6742bcbb45ee41027b44f2da686560a515f1de7144b9daf89b05f942253f941195a0fb7718fbd5d8d35380c9f643c802bed84cd24817f74c696f5a SHA512 41d06de68d010095efd643153db10fb6c3cf33e320d576f76b9b60b2a96d1f0ad9da41741b4e57a3c78c8516197b81a5a6110cc6a49ee4ddf1b33085d7bcd913
 DIST B-Keywords-1.18.tar.gz 10512 BLAKE2B 8fccd092b446d7ca2ade317a25d0d0b77a310dfabaa3b3b4d06a7fcf6b00246f99afffd6fc0c2cbe16c1afa1660f5dc4a882bfbebbc13a0b0f363e0d0ba41cb4 SHA512 b1a6b4f8d1a557168257c4b8648e5f0e98e91dde7ba9122ba9a99cfb8b399a6857a2ee005ff26c4908d7f01e1e2ffb1dafae3aa6fe5acd3773588911ef159ff4
 EBUILD B-Keywords-1.150.0.ebuild 455 BLAKE2B 24da3c162757c1307e2f08c630da68cb019355d1d133ca6e56073593400371f3b51ec89afd4e712de086fda12845ec6a10a94162ef4792382873ad0d2cc939e2 SHA512 057f6ed2104bfd6809c5b0d748d70d7a33f834e2f358fca43fc30c7ab67032d44b15b2ce138a5107c05823578bd676965de4ebe0dfa790fa2944736759ac8383
-EBUILD B-Keywords-1.180.0.ebuild 574 BLAKE2B 6c8d4d7ad0942e2d9f8b1d76abbdcdf93af7201fedc032d8f3b4d99565705904097ac808d2805e8d1b24a8edfc56e2f4df3883a3a76264977ab0041cd45026ff SHA512 9e92464aac98bec870cc28e3492303028ce41e4a8360ac648014809ebebca017ca782c95521b8a77a221c96495b2c9b847a1b351d6552a1a9b83b1b1b1dddb58
+EBUILD B-Keywords-1.180.0.ebuild 572 BLAKE2B 362f5304693cc826940acd92abad01cbd4a5ab67e54cffce7cdcd48aa693122626bbe460725b1e8a3d1ee9cd4298ed1f25fab925cbefb0d92114d6b71cc16073 SHA512 aad93767a1946b1bee10a4f9424ecbdd732f705793b938fc8b9bbab54c1c1b555fc0c28e9cb201de05a7cf19ff8a0c716eb62a6e88efdba9ab55efa8c35d83af
 MISC metadata.xml 392 BLAKE2B b8d12e7f59af5510b05368c9873c7c3390cd634c859d68e48ece440aa0dcfd953767a20c94b8f6a8223163a68adef750196d1f11dd8761f6341664a727c893b8 SHA512 db120b73badeb1b6de7f1a4d4a7b70a5d4d1f763c784e04a548fd49ccc84620283cd4ecc4d6a0b3a258de07d76dfc264e40234e1e93fe79e10449669ade41073
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
index 4d4018c57315..92b1194dd6a4 100644
--- a/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="CGI Interface for Fast CGI"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CGI-Fast/Manifest b/dev-perl/CGI-Fast/Manifest
index 630356e548bd..b5c714efd3ed 100644
--- a/dev-perl/CGI-Fast/Manifest
+++ b/dev-perl/CGI-Fast/Manifest
@@ -5,5 +5,5 @@ DIST CGI-Fast-2.13.tar.gz 8844 BLAKE2B ece86a8ead5a83c0407f6c2713bf0848bfc895d90
 EBUILD CGI-Fast-2.100.0.ebuild 578 BLAKE2B 7c79c9f94ec968d920ded78ab3706cb172a01daf6c5752222607ede2e40936ba66e6c25f9ea609f232d4dc44786db5e3d971322d8bcc45d0d2a882c83bde3f96 SHA512 45ab65b6a135b10ffb5458fdc2a45ef382622d42cb93f45a223124ed036a6eae58d357f0410a7f33f1811cbf644a681a3be0d067e4b6e29287d60bdcefd879af
 EBUILD CGI-Fast-2.110.0.ebuild 600 BLAKE2B 6597e716cdc90414219244baa23fb011b1d7af88ca929d67e658d6fa1993068fc7f6db4d548be0552c46b83acc2f7b10b502e2e880ca5654f4f9e9b65caa9b87 SHA512 d3067abb78b0c633983f117928510e730a2cbb40847d357b1fd12e0921d80ea29c738d7ee3d86a1dd13b01154cc6a710d5fd70442b2a6ef9db511854eab616a6
 EBUILD CGI-Fast-2.120.0.ebuild 637 BLAKE2B 369af185b175ef0d9b1f7c4434a044be66b0f11d2b466d6ace60fafd2ae89c125bcf056d548a1da00a662519afd166f03e3cb0fe4501c65bd857d0bd6beee065 SHA512 d4575345e397a0fd3fc20eb77c0769ce05d1ba4f70b96eafc37ae0a560bbe8cb86850201564723dbbc5ad0175475e1233e8929ff2589faf09acfc8bc5a8dd6af
-EBUILD CGI-Fast-2.130.0.ebuild 641 BLAKE2B de6341a1f9a99fc4b206b35a5b2126cfd1d14210dc97e19e51731dcd0c704f14500dd88ee8e3628d2be5f8d67e16c5f93e9ab9173fff3568a01f3d8c37bbf206 SHA512 e00416e610f012511d647a589b9dec707a3b9af3560a1a976c5376b2788277ae9e28547754db937b97bed0b21ce8f8aa84ebc2dc821e676817220e3116983052
+EBUILD CGI-Fast-2.130.0.ebuild 639 BLAKE2B 7010bd459fd2e8096905ac8bf457280e6f7d7771fe70ede4339f735fdac89cbf9e6173da8220e9694bbdc0609576570a8dddc1761f4a790e5881582c672932fa SHA512 2e67d86015843e9f3c29a574febb82b54d7ff0ecabd86b07a8bc11e06131e269c82ce51816327c3600cc38fd72308e8c5f5c3712f9364e442f9f64f1f5b4b64a
 MISC metadata.xml 388 BLAKE2B eae3b4d4c39119e174a7ba3675bae1fc2f284c6e36739cbe42f886ce5aa927c57df46afd0ec8fe9cfd0904807f0e41dcb07514baa23c6f3e930d8a3f9a03f10b SHA512 9381464ca55695107f53c7ded8490e9bfe24f3ffe77a4587a84624786c2125f28eb0b3141711bc27f934954c8816c72e7e6ef453918bcd16b832b7d370c76f1d
diff --git a/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild b/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild
index 5eb5e881bce2..e9ab02ce4e8f 100644
--- a/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.ebuild
+++ b/dev-perl/CGI-Session/CGI-Session-4.480.0-r1.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
@@ -7,7 +7,7 @@ MODULE_AUTHOR=MARKSTOS
 MODULE_VERSION=4.48
 inherit perl-module
 
-DESCRIPTION="persistent session data in CGI applications "
+DESCRIPTION="persistent session data in CGI applications"
 
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc x86"
diff --git a/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild b/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild
new file mode 100644
index 000000000000..4614a2b2b0ad
--- /dev/null
+++ b/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MARKSTOS
+DIST_VERSION=4.48
+inherit perl-module
+
+DESCRIPTION="persistent session data in CGI applications"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/CGI-3.26
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/CGI-Simple
+	)
+"
diff --git a/dev-perl/CGI-Session/Manifest b/dev-perl/CGI-Session/Manifest
index fa2bd3a8ee57..5bd9f231ce9b 100644
--- a/dev-perl/CGI-Session/Manifest
+++ b/dev-perl/CGI-Session/Manifest
@@ -1,3 +1,4 @@
 DIST CGI-Session-4.48.tar.gz 95291 BLAKE2B d1d915c85e230ec73575d56cc92589c45a5f6d35f52737b5cefa61704cfc42aeb6682e3e56e1b8cb015ff2d55b141dcfe01ad4fe376e70ff17014edd3951a531 SHA512 82d6a498035b91474df712fdae2c9ce7290157ddec36095757f16b5cbce593d3b5115077c722350d1c890c299230f7489a41328ed64b85a0f4c3cfff8aceef54
-EBUILD CGI-Session-4.480.0-r1.ebuild 514 BLAKE2B 0348d2ea28b8f6c6954924602f861c413d45706eb1be15eb292e4283919e39df57dbb2690b3cc4c3a21f34f2ec9459e0356ba8f319ed4dcb3b1acaf26f7551e5 SHA512 aed59ddf098aaeb290c8e50dd59c06d29dd1e4b7ea73cd40056f3877d8de1f21bc6ceb02e7ac6fd6d203c082b78a6cf9d443b2add267344d5b34649322249056
-MISC metadata.xml 1721 BLAKE2B 40faed24613f6a20a61b2c7ebba7d7e2bf924663679f055e4f3c5787f89be7a970de31ada575bff326f751e997c8de47d80c10ac52ff295c430c289179a63cd8 SHA512 6ea6ca3c7fde2642c9dbefd6e26e98bb9179788d9a4c6956ab8f339b7f069860cd519c64d2db182bbc318ee488a402474ba1110959b13bb2e0bb86a19a87d818
+EBUILD CGI-Session-4.480.0-r1.ebuild 513 BLAKE2B 1875700b7c9297f8aab0332e2de9f747740aac2ba60880fd4d4dc34dbf3890acbd16166c5ba41ccb9134deb8ef65a6aa472f8a7b86d00ca99eae818849ea27b7 SHA512 6f9f82f6e5703a87a9518abac9f020377d01be90c40051a63323451a00304f441b092a3635e5a39f06c3eedd20bdd60c2d5901784f002c1f7691edeb0ec009ec
+EBUILD CGI-Session-4.480.0-r2.ebuild 496 BLAKE2B 3b4b1597edd148ddbd2f66860dab5d465a12e622724d8720cdd7676516f8eff483cdad19897921402377e6f6801cd328aff65c0ada59d7723850cc13a45b5354 SHA512 cbbbdb4c490ca570591714506c3d74e2bb2778ad398c083511285b0efc6d1169cd2a2fedda309cc031d80315197c026afc661d6e32238c2369abea7c4e7a55d9
+MISC metadata.xml 1637 BLAKE2B 27d43c41f9acb206c4d50b34971d917c412aba3fde8cce4c1a08dd7250f154440f49d025533f67370f59206ccea949e2e8ca9a0092c3c58cfc422f11e4df9ffc SHA512 00f923a38d667b785fffd9543d724f0eb8d016562bdbba08b24b567128972461ee8816eeea66e9b14c77bdc8ba0317d36fa7217986088fbb642db9781524e2f1
diff --git a/dev-perl/CGI-Session/metadata.xml b/dev-perl/CGI-Session/metadata.xml
index ac5cd06c60ea..648b4fdd2d86 100644
--- a/dev-perl/CGI-Session/metadata.xml
+++ b/dev-perl/CGI-Session/metadata.xml
@@ -23,7 +23,6 @@
     <remote-id type="cpan-module">CGI::Session::Serialize::freezethaw</remote-id>
     <remote-id type="cpan-module">CGI::Session::Serialize::storable</remote-id>
     <remote-id type="cpan-module">CGI::Session::Test::Default</remote-id>
-    <remote-id type="cpan-module">CGI::Session::Test::SimpleObjectClass</remote-id>
     <remote-id type="cpan-module">CGI::Session::Tutorial</remote-id>
     <remote-id type="cpan-module">OverloadedClass</remote-id>
   </upstream>
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.560.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.560.0.ebuild
index 7dbc3ff32cc5..19f385b5257a 100644
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.560.0.ebuild
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.560.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index f49379206bdb..a32c0390c393 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -1,5 +1,5 @@
 DIST CPAN-Perl-Releases-3.38.tar.gz 25059 BLAKE2B a3438c1a9f67c0e66fc4abd079d4e79c750dadbfb48cd2582ab6e6644baa9ac1cc33ea969ca592c8b8515ed6c355570c2e4830d83d2dbcf40cb185a1ba1f356d SHA512 3021696caf7cd22f42a57fbd21c13696487d99f222de6e07e41cd9fe5d5de35a103beba873c7ab2be9feb00237d9ebd38d5906300170203d28d03391d7fd0e5d
 DIST CPAN-Perl-Releases-3.56.tar.gz 24719 BLAKE2B b7042dd10971ec048f1483816b7e7b262e20a16dfc608aca621bbe4c8688fa313a772b562d64f24522e63e351a717cbd726049c4e99c03cdd32c58855fde62de SHA512 3411613b7939c9c0a53828b1612a687663f5386cf497c607a44017a7083677395d94d6d85ed91c64c48405063500e7ed725b6f5308f1cca01186b7ca82324482
 EBUILD CPAN-Perl-Releases-3.380.0.ebuild 548 BLAKE2B 54c51f3fa75cdf1d64cc76ec52e4c584bcafeabbc1de05e69ef34e7212c01a4ad6f32253ba7f44829d9421469bb285d99071ddaa1bb861fee4d663a2547faec7 SHA512 1ba095a8b31ccaa9100e49784c0c56f9fcb1d7ac36ccc1dd37120151368f119e21c3c9e2ec466258de973b233cc20bdb0f3db61ae164aeb590faef34ad7df014
-EBUILD CPAN-Perl-Releases-3.560.0.ebuild 520 BLAKE2B d8492de3341db68916b54d4fff186454277d30280d0c231dd8de9624c58a946e6348643121ed5e38169e2ed28279680f14199d1cd38e7ef26c0c8c5a4ae20f46 SHA512 dfb29c7b6bb3d577d81a0caeb27c0fc9e7421b4d470613ddd07f958e260ff4ba33974342a8b609c62bb943bd18360697952d06090e422e93710e45177e020e14
+EBUILD CPAN-Perl-Releases-3.560.0.ebuild 518 BLAKE2B fbc62f4d45c3945cb22e40e83dac2d1583ff6f01327edbdccd545eb669075338956352c332bdd1d5792234b826c852a620da83b0a99f84bbb81ba37358b69955 SHA512 efb4b63d8ce1de0dd3d973087d61c7e09ef64417df10ed57103a8098e94d13b5634c7bffdc1f695da707a8b1259e0a9d9a103e5f2e981a1888284a9ffbe0a6c5
 MISC metadata.xml 433 BLAKE2B a0b86cd3b77e9a90dffecb2d6b828713c337200098e616d348afcacc7871299a7f11d30b44b1211440f083d60eb81f28b8c6d92f6ed573bffa695b6bfb4bf217 SHA512 b890be772a432a55a6ff50c91180c9684754f167dadaf64ac05f638865e76960a36274207d7e816bcd85a53f6fc5f2b263fcf7adc3bfd609e64551aa23529363
diff --git a/dev-perl/CSS-Packer/CSS-Packer-2.30.0.ebuild b/dev-perl/CSS-Packer/CSS-Packer-2.30.0.ebuild
deleted file mode 100644
index d814fe655bfc..000000000000
--- a/dev-perl/CSS-Packer/CSS-Packer-2.30.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=LEEJO
-DIST_VERSION=2.03
-inherit perl-module
-
-DESCRIPTION="Another CSS minifier"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Regexp-RegGrp-1.1.1_rc
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/CSS-Packer/Manifest b/dev-perl/CSS-Packer/Manifest
index faeaf4bfada8..be9c31f802dc 100644
--- a/dev-perl/CSS-Packer/Manifest
+++ b/dev-perl/CSS-Packer/Manifest
@@ -1,5 +1,3 @@
-DIST CSS-Packer-2.03.tar.gz 9551 BLAKE2B af24d7ca38b9173a565f5b672868a2e1e1ec427e3a1a978d3b33fd55f80dcaba7faa4fd39020688d667fc6e0879da27f9307de034a0f0fa760061b4c3ae5a40a SHA512 fc41a6608c3427aefc5f0ba1d150df9e066277f9ca586c57d9c505be1a42f0e0f6fb8098a73f7d25923f1929b521e3967507a78ee46899a2f29aefc7e9065827
 DIST CSS-Packer-2.05.tar.gz 9666 BLAKE2B 9367cb025ecfc1781b213f2c002d9a51c8a5c843830cc6ad41b44ce9c51214c52e82c9eda43b0cfb9c8d3a990631f88aacf3ca989e3f2081808a3050a8a4729c SHA512 332c6d73ba23eb399df8052d318851eb5d7ce0f1f5a2972e3dd48f0da754b846e0d0e095306087393ed282ade701343c11007915f6215b3244cf8c5d456c3228
-EBUILD CSS-Packer-2.30.0.ebuild 449 BLAKE2B f7ab69cbc99a79874c10f9f8d1c5d10ba596e47fbc519525675779ce62a684cbc8a892ddbd172aee8064d0df729ff498cc30ae20a3d9f8cc48173a86ab0cc8e1 SHA512 7a9a72e609086af4607559cc9406fdd9a86a6dc93d605ceabef5c1e3bf7b210549d8cde59f0ffbc111391ee1c6211a00788ed38e6ebeef0abafc6d8d601a802e
 EBUILD CSS-Packer-2.50.0.ebuild 450 BLAKE2B 0960856052eb2773be879eac3902f384471dff360cbf5fa924dd6bacf007821318afcd579f617b27cfd32cd85517118138ac023f522f4c5eb1140c69c3ea6105 SHA512 51f837438923d8bf287bb217962bd5392e053cebad419dc3af7edef5c07ef1cfde6a249d484b42a8a84ec2e26d84cec4f6ac9db754fa5c37a4877ea83ce2d6dc
 MISC metadata.xml 464 BLAKE2B 75654725fc81921cb7bcec5acbe5c6d059e717b0fed66125c8e937127fe3e7c71c01c7c9d6b40d4f47ee4a87040f97506173c743844563987e3c27d54cc7c904 SHA512 f09a4bfa9ac6e912f70e8653d8bca8064e33c2cb6531657e4884a65d39468c173f09440d4a2d1afbc5597b25bcf1739fdaa5e81855b49d5f1012f55d2b50637f
diff --git a/dev-perl/Cache-FastMmap/Cache-FastMmap-1.460.0.ebuild b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.460.0.ebuild
deleted file mode 100644
index 6de8659a8511..000000000000
--- a/dev-perl/Cache-FastMmap/Cache-FastMmap-1.460.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=ROBM
-DIST_VERSION=1.46
-inherit perl-module
-
-DESCRIPTION="Uses an mmaped file to act as a shared memory interprocess cache"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-Storable
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Cache-FastMmap/Manifest b/dev-perl/Cache-FastMmap/Manifest
index 4d925c633fc1..2bb1daf7fe3c 100644
--- a/dev-perl/Cache-FastMmap/Manifest
+++ b/dev-perl/Cache-FastMmap/Manifest
@@ -1,5 +1,3 @@
-DIST Cache-FastMmap-1.46.tar.gz 51820 BLAKE2B 45e583b082aa0479b0454caddd96f95aba32d97ece227e20df71110ccc7f45f09c03ed914456e0759ed7a571ff56ab69c17d67c05f04307eb5b0ea3fa827d21d SHA512 155c55dcbb05b83a7bf35ef70d4436b54ad0dc8684871c03048ac7dc364c5ce408152409fdc88d7c53f38ff7d767ec2c181da8c1e6118826ba0120ef20b77f59
 DIST Cache-FastMmap-1.47.tar.gz 52311 BLAKE2B dc522da53f332ea8fd4130d4dcb3dcc60a82028ab7daf99b7bc5863bc1ffb83c9bac41ebec3f568a58ad66addac1a613db9bc7f817efbcdedfd842833a3d9855 SHA512 20d839ac10578387465a0d5e6d6d4018073eb644460b4e079bb7b774a6c7be453a7f2bd8d499be962d60bd51657bc49a651684e773efb02a5d5fcf6c341640b2
-EBUILD Cache-FastMmap-1.460.0.ebuild 380 BLAKE2B 52a4a66fdbbf87378a1ca5bad6b1929bd426ecc96619369aaddb1cb6a384a0d8b8639c026af88cd469387c02742eaf8ca7ad5a2a73ba6f6e874431e31b993f14 SHA512 5e621b50fd016c2f8b9d963423fdca808a556ffd6924c3214b47c63a5a0f61298981ec3b592de8aa68215958d9b1a5049a6d4a06701587a78eeb3bd2f00fe80a
 EBUILD Cache-FastMmap-1.470.0.ebuild 380 BLAKE2B 99d7d903a3d33089d0092e50168dd1e5a1d788ccede0c6c08f1a85837e5ee67e15f00320ca8f3f7cb4cedac59fc2ab36a1a05911ab7706135832112383613ff1 SHA512 3888927cbb4982acc9d92dd7542bde3a357285a34a30d359dc063e6ca76586b12e29b9870a132e85fc941fd8ec509a660fe1d6ff07d06dcdd231bf37488b6456
 MISC metadata.xml 471 BLAKE2B 8b1676ee93b088376b8b5a8a7f7aa6523d0f96a128d9965b2f4e527948ea3e308ede057eec5b0c7b5e965815b1956f5b21c47aeb9bb3682b4f889b55cbbcd4cd SHA512 ab7daab0e0f1715e4fd96f9535d4e693880d24fa216c8959523d7fd1ee07f0e0690c1018b44eb9d1dd78e08145664a772391a194f3c57c703fdabf0fc43c9f4e
diff --git a/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild b/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild
index 96ccf2c17042..ea487f15287f 100644
--- a/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild
+++ b/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to create simple calendars"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Calendar-Simple/Manifest b/dev-perl/Calendar-Simple/Manifest
index 10f82cd23ede..1a246f5143b1 100644
--- a/dev-perl/Calendar-Simple/Manifest
+++ b/dev-perl/Calendar-Simple/Manifest
@@ -1,5 +1,5 @@
 DIST Calendar-Simple-1.21.tar.gz 7007 BLAKE2B e6e4f0528245dcff92b8c378418e47c719a954929f7b547a128099f13a1551be52c27e4ed5e3e9cec98b9599f87998c06965ee1c59a478d3f5e263a9745e439a SHA512 29ec836e774c5d3879c309eb58fdedddb12b146b382ed3c3cf014b602dd31edc7f4eff8929bd485968fa328931a589b4bde5cd87c3456b5665480ed51466252b
 DIST Calendar-Simple-1.23.tar.gz 7989 BLAKE2B 24c25e60021e6210e06645a51fd068c7e0887b5273c83b3fc2cf632deef2530e548d6c3282807c8564d4999ce2f133303a9bb2e6a40ae0aaa77cfb11f205bb5e SHA512 3d024e3de896a20b837adfc4fbac2bcd1dce969ac426445573ae0975e189ffde906e7c25d3c6f0595a7e49d47a09cd3e9bdfb6810ca7c9e20f9e01a4ecb7ec49
 EBUILD Calendar-Simple-1.210.0-r1.ebuild 490 BLAKE2B a5a4ee031dc636b4ed80ab953859ff93829ecf2e760c78f7ba811c711b51ede4b90226ed3960d8036002d16fd2867566a6dc7924ae0e6d93f92720e129667900 SHA512 cceabb72859d8ccb8090839e1ebfc11ce1f94453f2a8d2dcfe29d9842d77a5277a4949eb5674a4447909dce042b56a0a6f2f16b3849bd1af5e71bb1431473327
-EBUILD Calendar-Simple-1.230.0.ebuild 490 BLAKE2B a87df75ace1dde120a592bfbfb3066ace6fb4c560c0d0e186e48fbd282cbe212f273b1fd6b74cc142a39a95b51cb3c597c190305634561c6b111e77675a8e38f SHA512 f1a36c5e60f42ac7c11344325a0c854969927afeda749c44c127aa00aa91c4893ac7568c794fb7ca4fe151a20bc1a408fc79b5a3e2e0aabb59bea6a27664bac9
+EBUILD Calendar-Simple-1.230.0.ebuild 488 BLAKE2B c50914fc023ba82916b2a6fbfca964b9f6a91c04b0da6b21ba1781e13f9b995b182105d6b360743f7b29aa99a6816e97553fae268e7562d14c674dac5e619b3f SHA512 85403068850f2029470d9bc574ca7bc34a7c947b3141f26a73b13b0760e4390dc30c1fa61545a51ea6da6790be0fd327abaedadd09a10fa0bf9a768ec82b1ce7
 MISC metadata.xml 402 BLAKE2B e465130f7fe7cb9d112ee98993aef5e231358cb81da41b3b69f0d32f06be9d7789d92322f8c3d42d6f4da3254b3aaac502aade47bc5c3da28754bf07ae803ab8 SHA512 d35e03eecd4213fc034e86a4d8786aeeadfce4e58bc210cdc50e39b89aad8cd407481ee44cc7bd96e510279087b782d5470eb8fcd4f653236c717bcea01e18cd
diff --git a/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r1.ebuild b/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r1.ebuild
index deee5e680634..bde11d523f67 100644
--- a/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r1.ebuild
+++ b/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-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
@@ -7,7 +7,7 @@ MODULE_AUTHOR=CLACO
 MODULE_VERSION=0.04004
 inherit perl-module
 
-DESCRIPTION="Inheritable, overridable class and instance data accessor creation "
+DESCRIPTION="Inheritable, overridable class and instance data accessor creation"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r2.ebuild b/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r2.ebuild
new file mode 100644
index 000000000000..b2a38b125873
--- /dev/null
+++ b/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CLACO
+DIST_VERSION=0.04004
+inherit perl-module
+
+DESCRIPTION="Inheritable, overridable class and instance data accessor creation"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+PATCHES=( "${FILESDIR}/${PN}-0.04004-no-dot-inc.patch" )
+
+RDEPEND="virtual/perl-Carp"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+PERL_RM_FILES=(
+	t/manifest.t
+	t/pod_coverage.t
+	t/pod_spelling.t
+	t/pod_syntax.t
+	t/strict.t
+	t/style_no_tabs.t
+	t/warnings.t
+)
diff --git a/dev-perl/Class-Data-Accessor/Manifest b/dev-perl/Class-Data-Accessor/Manifest
index 09caa4957cbc..d80e87379519 100644
--- a/dev-perl/Class-Data-Accessor/Manifest
+++ b/dev-perl/Class-Data-Accessor/Manifest
@@ -1,3 +1,5 @@
+AUX Class-Data-Accessor-0.04004-no-dot-inc.patch 628 BLAKE2B ae8243ad76c9e837af264aaa090eafe48eb95c4a1f05241dc48d7f2d8285235e6c73ab4aed6f8ab85d5c4ccf323e618d451064b833d276502beaafaef08e27b4 SHA512 d830f45ee56c7cef247284dd02a9b153d877494ac18eeff2ed8a8219aa2d37aea81839228d6466e03f122f95860ed489bd774500ee52a07890073992ab1c29d0
 DIST Class-Data-Accessor-0.04004.tar.gz 24131 BLAKE2B 2452a67f5b8ee2a7d78ff6b80f65cd0295af12dc95d3c3f6d1f19e1d89241059a4e7f791fbd1e7beed62a9c7c657ca69090e85e86142943b145c2a499f5b5305 SHA512 2e36a4227f14baab9514ca299d5d6e44b69c049d4d166b4c1a12373205ccbf6ec39c35697425b9ede07657effd283cbce2dc8a92d1d12f3ae237cfd556e26169
-EBUILD Class-Data-Accessor-0.40.40-r1.ebuild 507 BLAKE2B b669317701d52c0fce8a640ef09cd85fbacf17176d9322b8ef0723a48191bcb2da7988c4fcbf9633c46cbd80a17c167038defe4c460cf82fdb00c2a1baef2085 SHA512 3ee496f43b5bc7a5172b8f1c2e42802eeb8f1c777acd9f0ac17ed86c75de9026896724495a4f045b69129f0d394067b9c9b120e37dcc0d6c57c464b00eefce3d
+EBUILD Class-Data-Accessor-0.40.40-r1.ebuild 506 BLAKE2B 201336f6118d05ed96ed8bd18ddf7a2a17876e07c2bf3737aa61dc0e3d2e4b62cb204822e4728b64c17056c0e71e6528c098f467d7d2467b141bc3eed418e29f SHA512 5298b309d563f2a2160f9f814d3a44e20cdf8f35ae4332ddbc1edaf49b87220ec299070064891114191736719212d8560e6a3053fb09c89332ea17cd6f6af347
+EBUILD Class-Data-Accessor-0.40.40-r2.ebuild 607 BLAKE2B 8c390e646e2b212e6cb148cb87625df1c05f76167e96caf3dc845015adbcc315494e34f195eacc79f45a7295f52a2dea3c29e895d317b212d389965059843e9a SHA512 9c16c00a90345c261ab44a01d9e37acbca7cb9ae7a40243a9bbe2caf99e296a450e0d17259c49efb287066c03e901738d6d086e120495748b5cbd4a6d80b84a3
 MISC metadata.xml 411 BLAKE2B 5c3330bdf026bcf0a33104cfff15022a95b4bc5406a542e3693bfd3d98bb9aae37d859e2dd8b85016121e4eecd62960e04d02ff713b99c9f9993c5f085d5f64b SHA512 bf7f8a50cac4fab72be7e55ee0ef51836090af71303160fc1dbb023460681c18d93b071ecd9da2821642c59328139e7078024fb781b8a34d414cef1f03560474
diff --git a/dev-perl/Class-Data-Accessor/files/Class-Data-Accessor-0.04004-no-dot-inc.patch b/dev-perl/Class-Data-Accessor/files/Class-Data-Accessor-0.04004-no-dot-inc.patch
new file mode 100644
index 000000000000..86d3ec05c081
--- /dev/null
+++ b/dev-perl/Class-Data-Accessor/files/Class-Data-Accessor-0.04004-no-dot-inc.patch
@@ -0,0 +1,26 @@
+From e7ac2a52384a77ddcfea148903f252e740a056b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 17 Jun 2017 00:49:14 +0200
+Subject: Add fix for Perl 5.26 no-dot-in-inc
+
+Bug: https://bugs.gentoo.org/615512
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index f7a745a..8f16089 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,7 +1,7 @@
+ # $Id$
+ use strict;
+ use warnings;
+-use inc::Module::Install 0.65;
++use lib q[.]; use inc::Module::Install 0.65;
+ 
+ name 'Class-Data-Accessor';
+ license 'perl';
+-- 
+2.17.0
+
diff --git a/dev-perl/Class-Mix/Class-Mix-0.6.0.ebuild b/dev-perl/Class-Mix/Class-Mix-0.6.0.ebuild
index 8f091ee4c59d..90251d52d281 100644
--- a/dev-perl/Class-Mix/Class-Mix-0.6.0.ebuild
+++ b/dev-perl/Class-Mix/Class-Mix-0.6.0.ebuild
@@ -7,7 +7,7 @@ DIST_VERSION=0.006
 inherit perl-module
 
 DESCRIPTION="dynamic class mixing"
-LICENSE=" || ( Artistic GPL-2 )"
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="test"
diff --git a/dev-perl/Class-Mix/Manifest b/dev-perl/Class-Mix/Manifest
index 302ee26c8ab6..ddf58380af73 100644
--- a/dev-perl/Class-Mix/Manifest
+++ b/dev-perl/Class-Mix/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Mix-0.006.tar.gz 8328 BLAKE2B 30585b59e3957b95974b1da5a30934dd8511d0eb6395789bfc871e84de9202a2f4f92f75b2e4c7d3216f59ca9b142c5554a45c05210ee63ea30aacca9abad5ef SHA512 f1e52d189a57b4a6e4b7b093cd561881bcccec03dcf7286d69b592865343ab413ab35e42c14dd92ceb0089df1df33df4ff2a502026fde060ef246e77c8d21af1
-EBUILD Class-Mix-0.6.0.ebuild 558 BLAKE2B 524b8d8e02ca4debb5fe1a2d89226d8f97b1c612120a75ccd623384ae2c2bdb4dc303013dc2bdf30d43407353eeefda0836c690ac6718da97f820f514ad7d6f2 SHA512 d91ca59f3b546c5e1cd3c41b6426992c83ab59be0d98a5e135392982c11d5d5c0686f4c332beeea319179b6b6169283f09fd6955977d04a119e5e2b309be4b6e
+EBUILD Class-Mix-0.6.0.ebuild 557 BLAKE2B b4e704b073b751eb5050707daff8421555d9c2e44b9c132b1a409ae3ee04f034d5cd2c0b2f74406918a54add7b0ebe362148034765f7dfdb3581fe0db0932004 SHA512 56907d0e185537b5ea227489a125f746c084983faeffa2ccd2488c262f4d8f9195c5ef5c5e4f1973a0295dfde608ed86397d4911d7239e21b78c8796226a4336
 MISC metadata.xml 502 BLAKE2B 008895322e4372da722b54dd62bc1f2cd3db4efbb901dd4724a66b6e5f6259ba56943b899299ed4f33f2ad5056aca0fbf124f28e8a35e395243356773f8bdeef SHA512 070204256c663948e5442de55462e21c727757ba2fc772912ad76b9bbf1f832640bbea211c7764d0f2a18378949954bf643b6ed6114a4a8d25dd8cf5bbb9c53e
diff --git a/dev-perl/Class-Virtual/Class-Virtual-0.60.0-r1.ebuild b/dev-perl/Class-Virtual/Class-Virtual-0.60.0-r1.ebuild
deleted file mode 100644
index c639ce84c52b..000000000000
--- a/dev-perl/Class-Virtual/Class-Virtual-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MSCHWERN
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Base class for virtual base classes"
-
-SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc sparc x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Class-Data-Inheritable
-	dev-perl/Carp-Assert
-	dev-perl/Class-ISA"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Class-Virtual/Class-Virtual-0.70.0.ebuild b/dev-perl/Class-Virtual/Class-Virtual-0.70.0.ebuild
deleted file mode 100644
index 8a271ebd5b9d..000000000000
--- a/dev-perl/Class-Virtual/Class-Virtual-0.70.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSCHWERN
-DIST_VERSION=0.07
-inherit perl-module
-
-DESCRIPTION="Base class for virtual base classes"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Class-Data-Inheritable-0.20.0
-	>=dev-perl/Carp-Assert-0.100.0
-	>=dev-perl/Class-ISA-0.31"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Class-Virtual/Manifest b/dev-perl/Class-Virtual/Manifest
index e512fa2ddde9..c653a0cdfe20 100644
--- a/dev-perl/Class-Virtual/Manifest
+++ b/dev-perl/Class-Virtual/Manifest
@@ -1,7 +1,3 @@
-DIST Class-Virtual-0.06.tar.gz 5770 BLAKE2B c3ab47664d91cef2f5b7a762e9970d0769412473667df867f1f810416a70872d7f4d4117cd4579f566f4a66fbfc17232098e883b6c6b32ee4ca44f3600a2f7cd SHA512 b90255f3e98c48480ece0826acd9d204e0bb4b7ba742ddd3cac6d8113dcbeb5a35c4f2a32a69088cdc889c2551ffbf2bd35fc75a3f67906de329ee33290accaf
-DIST Class-Virtual-0.07.tar.gz 6357 BLAKE2B 542170f05ff5a385d1ff8de82c1d4b6d603b43f537f2b672217e554b5be1a8d2da24c00f40a6c41d5a196ecfe62e91ad35d031775dba651c67af0f3cc03b7fa2 SHA512 7d71b2d293bb765120dd1a2718ffb83de9cf078b311e24012994c1a7d7ca44bc3f8c8ce83a61fe059c2dc6b5b6fdbe865b0187780393400aa37b92c87d1bb062
 DIST Class-Virtual-0.08.tar.gz 6864 BLAKE2B 7b74d55a38bf1122f336d3a32d352ba04d24552f0b9fd58f0537edd895b2bc6c39fbec45dda96f87084907a5cf3e5502f6d509a90a3939ab39f4f546ed7368ec SHA512 43a95d1339724b9b6392ab7c13eba502938cfee9ad29eaeaae0dc84549f29ecc700af38a7f04bbd357fc76c30b878532c919edc69bc986d791556eea46ef4439
-EBUILD Class-Virtual-0.60.0-r1.ebuild 418 BLAKE2B 0d6609ade27684747561ff0441055b024d51e24bc702fc195c3f0cb03b70e0ec1b38d3c509b6f3eab9f44bea2a568c9fe2959b5dea4bae920099db7e0a4e28a7 SHA512 007c6b84f8a0798f172792dbb50e9b0b83e74e7a253b3c8ad19cdddb71f0bfe07f2018ed4e09aba7453b619dbb5672cbf6e575bce810e48447360ad9cf06100f
-EBUILD Class-Virtual-0.70.0.ebuild 503 BLAKE2B 97f9fcedc0efe84e6bd5c8b396478f06741722cd4c6393158ec0ecebf9f068e3e2bb37c4d8f3bb738c7075e42025077f5e1cee67f43f2bb9e5b0d72b06ce3ab9 SHA512 05c1006544edfa68ebdb23d308a200971ffe92b73c4a12039fec75b351b66139eb2c9334a6c2a3b39cc78c6dd34b9abeeaddeff525a375c0fb46add40b4d319e
 EBUILD Class-Virtual-0.80.0.ebuild 499 BLAKE2B 5175e9bbde4fd4173fd50fbfbdb0df08b6950f6f2583851c36e60bcddc2793b463dcaa38fa28ae10df420392ef12c82d9e5e21b94fbdb172bd4ffa573b1cd96b SHA512 3c5e0443eadbe43b32b007eb5a63e7c429d1e83f818e8b317409caa7737ddd9b35f689fbff51001ee0799260ca8040667e8648b9fbc7759b301698f9f56d780c
 MISC metadata.xml 471 BLAKE2B 58ceb3010610e3abe3297d665c96b2222c347271dc13ab598a6dd928a8952959601f04c5cd0446c61f614284128abacbfc4f9b4f8d19a0384c58ed94f7deef69 SHA512 3838f4b709138dc3d40c63b2f07238debcfc1be681b358f957a78e5ae98a3788c58e7b88e3dea93044f129f150e9ecd7911bb8db8bd9218e0a512f0e23a43bb9
diff --git a/dev-perl/Config-Any/Config-Any-0.290.0.ebuild b/dev-perl/Config-Any/Config-Any-0.290.0.ebuild
deleted file mode 100644
index d74648decb5a..000000000000
--- a/dev-perl/Config-Any/Config-Any-0.290.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=HAARG
-DIST_VERSION=0.29
-inherit perl-module
-
-DESCRIPTION="Load configuration from different file formats, transparently"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~ppc-aix"
-IUSE="test minimal +json"
-
-# json should pull Cpanel-JSON-XS
-RDEPEND="
-	>=dev-perl/Module-Pluggable-3.600.0
-	!minimal? (
-		>=dev-perl/Config-General-2.470.0
-	)
-	minimal? (
-		!<dev-perl/config-general-2.470.0
-		!<dev-perl/Config-General-2.470.0
-	)
-	json? (
-		|| (
-			dev-perl/JSON-MaybeXS
-			dev-perl/JSON-XS
-			>=virtual/perl-JSON-PP-2
-			dev-perl/JSON
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-src_test() {
-	perl_rm_files t/pod.t t/pod-coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Config-Any/Config-Any-0.300.0.ebuild b/dev-perl/Config-Any/Config-Any-0.300.0.ebuild
deleted file mode 100644
index e593df04588c..000000000000
--- a/dev-perl/Config-Any/Config-Any-0.300.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=HAARG
-DIST_VERSION=0.30
-inherit perl-module
-
-DESCRIPTION="Load configuration from different file formats, transparently"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix"
-IUSE="test minimal +json"
-
-# json should pull Cpanel-JSON-XS
-RDEPEND="
-	>=dev-perl/Module-Pluggable-3.600.0
-	!minimal? (
-		>=dev-perl/Config-General-2.470.0
-	)
-	minimal? (
-		!<dev-perl/config-general-2.470.0
-		!<dev-perl/Config-General-2.470.0
-	)
-	json? (
-		|| (
-			dev-perl/Cpanel-JSON-XS
-			dev-perl/JSON-MaybeXS
-			dev-perl/JSON-XS
-			>=virtual/perl-JSON-PP-2
-			dev-perl/JSON
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-src_test() {
-	perl_rm_files t/pod.t t/pod-coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Config-Any/Manifest b/dev-perl/Config-Any/Manifest
index 436c8c60bcbb..31bfd9fb90de 100644
--- a/dev-perl/Config-Any/Manifest
+++ b/dev-perl/Config-Any/Manifest
@@ -1,7 +1,3 @@
-DIST Config-Any-0.29.tar.gz 22124 BLAKE2B 41f1d7b6b0a1a22132ec3248518c8779e9c60a5b3363c3cb9b6c35030b98d9751b8fd435bb3df622d5244a85ceb43115a38b46393cba9e796082082676bf6099 SHA512 4c9e9aeca0e21ab50a26ed319298430f95783e5f93577cac59da1d791334c9bcc8d4c19194080697fad2be99b0b426a538196a8a9de2f6eec5a5a015d00f9cbb
-DIST Config-Any-0.30.tar.gz 20026 BLAKE2B e43a98fdf15f81b250282eb065ce541b04414bde81cec1de069fb2baa801cb6bc3c188f9efa9e8a64f59e1894803f6eba1d1b97f0db9f63ad4d6630ec8c3afa7 SHA512 798165360ff5dd0af2d7720f6b4372dc4fc7eba464fbb8635606aa9d16a86e88f91dcaf22ba3dc4aba52303b695391acb2540f7eac97223af69064b6322b600d
 DIST Config-Any-0.32.tar.gz 21045 BLAKE2B d3eb7df6ea972bdad2ff416adb3f6744ab972520bcef0b116bd29249416bd4184935d92752f4b1aec371656462db08e87ba9de78f7cf36c53d9425673f083ad0 SHA512 7c6fa9f341b1392ffd71babca688e3fb8bcd5f6330fe15aefb36ac002af83ed3674667dcddd9a500404bc4e019609f392c173653a8a792267fdb609e9323116c
-EBUILD Config-Any-0.290.0.ebuild 840 BLAKE2B c353609434ca89d1ba548b69691b505cf1ebcfede4efd401665141cd192525c0c4aebeb1fe331d4fe019203e9ebc277205b593b562ea20c267ff08d20671818b SHA512 b143e28c4dd15557e87198768bc9c55ee19ad82bd2bc7bbc11f6fe291af382b8aa142e5048ab538531e9f45cfea8a5336755f287e4698c40226269064195af84
-EBUILD Config-Any-0.300.0.ebuild 871 BLAKE2B 65769956afcce6ce02b099e3b1f442143fa37124baad30f3a061ca508bf7107152b46eb43c6f70f4c91aa60928b31627da327d4e560195fcbd86661ba61f1799 SHA512 b983f045579d3171081fa6e66970f1fab1caef1639a8ea1f89433405cc04ce583250af6b0b108092c82736b2afe351aba15916b376cd431b00898531d538578e
 EBUILD Config-Any-0.320.0.ebuild 949 BLAKE2B 778792c7245043ed974b347bf437e699c86df8c7ba1c385100eb87b0a9f74276fdae685cb2180cfd68986f808286874023aa83ee44e6591f6b773cbd819ab8d6 SHA512 d002d9797559914ead658f2fbb68d6fe650036a56fcd27997ddb5750ecb92879ed5e82bafb614f86157f00d7904b329df76a805f75858e98f06f0fe5e6a0c99e
 MISC metadata.xml 1349 BLAKE2B f46fca28d8d481ab064d59479e71fce7648365751d4ad21a299e5c85ea92249ab384032fe2c51d486fdc195a9fe88668ef4fa0ebe532f2789162366a88d37851 SHA512 92d6cb02cc9162dce60c150374dc0987aa48d2a73d53487ca9efa8fe4cdb6b80c52797ce16fb6576bd680ea059c29ace9825d7880a371ad2c0dd95e4f61fdba2
diff --git a/dev-perl/ConfigReader/ConfigReader-0.500.0-r1.ebuild b/dev-perl/ConfigReader/ConfigReader-0.500.0-r1.ebuild
deleted file mode 100644
index 7401884656d6..000000000000
--- a/dev-perl/ConfigReader/ConfigReader-0.500.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-MODULE_AUTHOR=AMW
-MODULE_VERSION=0.5
-inherit perl-module
-
-DESCRIPTION="Read directives from a configuration file"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc sparc x86"
-IUSE=""
-
-src_install() {
-	perl_set_version
-	insinto ${VENDOR_LIB}/${PN}
-	doins "${S}"/*.pm || die
-	insinto ${VENDOR_LIB}
-	doins "${S}"/*.pod || die
-	dodoc README || die
-}
diff --git a/dev-perl/ConfigReader/Manifest b/dev-perl/ConfigReader/Manifest
index 5f6d0651e208..1277435b5fec 100644
--- a/dev-perl/ConfigReader/Manifest
+++ b/dev-perl/ConfigReader/Manifest
@@ -1,5 +1,4 @@
 AUX ConfigReader-0.500.0-makefile-tests.patch 1527 BLAKE2B 2e3dba757e9143518312ddfcddb673f81827e353bfc92eb2a5489fcd0317f47ae50b671e1eb1bdb0c83176ffcc8e8c499d15437ee39dca27ee1a28f647bc7041 SHA512 f29fcf200d9134ff3f50a6f233df98a1f403bb63ccd37e4bf475196faa2d96f1e73fe9d04d032f2f04486edbde7c86ac9cbdecbc5a20d2c2ca63dd35e0000ed7
 DIST ConfigReader-0.5.tar.gz 17592 BLAKE2B 1232cb8ba6fa80f6b3ba7cc0ba477b83e57d5698b259db20482fbe39d36fab863f62ebeaf56a3196108bc873b0dd0410636962e692a2784a6fa346d93feaee3b SHA512 625c7ba506e7d501adf1fa22830b104e413f115c1e3758235d395fe2995e84abe92cfc5b13e0d23deb255e849c3a99ce56a8006c8b6a967d5d60598337aa303e
-EBUILD ConfigReader-0.500.0-r1.ebuild 496 BLAKE2B 00c75bc2e5b472833aa22cd6924cdcee274afb7fc731290903da7483391dc521a704dd6b11fdbac97907dfff5e647e938faf8c5cd02ba1bd219e3ae94ea01034 SHA512 a46786db9e8dcdc751664c9e1249e201d9771463f24ebc85b99ac32ca1cb4c6c24ea3f76e917fd69f1d3de67b1ccc27a2bd7328e12418f8129455bc5c5e79b89
 EBUILD ConfigReader-0.500.0-r2.ebuild 351 BLAKE2B 7913cea722dfdd353d8b6b52dc28e9031fe3ba10cd37d33d0ca0304a26f0fb6bff7c86bfc5436e8bf8ff6b84cf1de48f09e4f0fed2323ca6e311721ecce6db65 SHA512 52baddd9ef094bbb02dc7ee9ba8964d4d447455aa79f885c434bc28186d7c161ecdb5ae9b23829ebca976e041938a6ae2cc76d7e55e562519ef089f8a946b184
 MISC metadata.xml 543 BLAKE2B 1f6524bfeefd8abe979dbbc4879040f27457e20e4c4f2fd6f328ad9aeae81a9a3c56c7bfd7eb08ae4156aa84cc13acfda871d558c2f9ef8f1e8fb4f5ce362912 SHA512 7e55b9a266ce8ca6708febe8d9560dc174e966ba99042bfbde3b6e7bd0a36f20944ad62ccc1aa6c74e021ca3738171344309ae9a9d01443e3ed0f2cda00fce07
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
deleted file mode 100644
index e715d6389e22..000000000000
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=STEPHEN
-MODULE_VERSION=1.124
-inherit perl-module
-
-DESCRIPTION="Extract data from Macintosh BinHex files"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/File-Slurp
-		virtual/perl-File-Temp
-		virtual/perl-autodie
-		virtual/perl-Test-Simple
-		dev-perl/Test-Most
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Convert-BinHex/Manifest b/dev-perl/Convert-BinHex/Manifest
index cd84afcef0a3..81463966eb3a 100644
--- a/dev-perl/Convert-BinHex/Manifest
+++ b/dev-perl/Convert-BinHex/Manifest
@@ -1,5 +1,3 @@
-DIST Convert-BinHex-1.124.tar.gz 73095 BLAKE2B 0fcd28df06b3ee7a6e13bca44adcbd692d8603d9b30fffbed6582abfa67c32e5722e6bbcd4bd60a0e150f871d7336c9a798e01eae0f2d68bd0dd9cf09a087bde SHA512 79cc903c3c68680309ceab8312f909c32b8b90bdde3424081c1b81fac0371799f11a6d37702d14a58a5ca843706e3c4e8adf61daafd5fc2ab3922e49de8ec697
 DIST Convert-BinHex-1.125.tar.gz 73122 BLAKE2B 9f8731a3f258c747c909c3870b7738b4242f52b8181603693e99ba3680a154a185e9a694a0a762a75f96f9e5b3452798560a2c68e65155a0bc8c381d90312357 SHA512 c088feb0d9dd2c56d79e4fe21494e5957f763bfb4afbd0335ba099f4babbc7790951897730faf097d61ebca4a262f6676a9532d8861c2deca5a6d61ffdd6f115
-EBUILD Convert-BinHex-1.124.0.ebuild 573 BLAKE2B 1b39217986a908d9dfa2539d6cd56d64952f55f8999aad051b49f4f066688782d749fcf070fc939c27a124f0bdf624ede77b665dbbf2a6f706bbdc9a0b34017c SHA512 2f82d2dc1b43af5555a9e5b47dcc9656228949588abbdfbbfa93933c4b98dbfde8bf109b099cd1f97e429bdaff422a095a5a7d2f62b5ae80d5bacc80199db1fc
 EBUILD Convert-BinHex-1.125.0.ebuild 545 BLAKE2B a7391c300dda2f281c605a4b9c7d566c945b1b73be46e581accf5f40a3b8be28ebc9ae370c16e74cafd6b9c3a11cd3910d3250cb9b17ea17b7b02562856c1c5e SHA512 03a31196abab251dd46db99632c246910f97b42756aec919f0d3ada5e340465c3a31b97587080324ede2ec170d182f2c743efefd9e1240d6ed3541eabd23a209
 MISC metadata.xml 756 BLAKE2B 2a8c787bf5ce152e87afbdf482c9bdb11663663ecfff9958c40e7a052dfa39909618a660bf8f36f0ae4f04a72c582cbef418feea0653e040b99f18c318a5a61e SHA512 29a822b5f013d269a45747f91cbe1f2753f0080c6c14db68c41f0f5b5be0db3bba03d149ac1965e4dc35b1dc8dca58d8af74965c51375f826e2c9f06fd43c2fe
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.300.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.300.ebuild
deleted file mode 100644
index 451191ba6590..000000000000
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.300.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RURBAN
-DIST_VERSION=3.0233
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=virtual/perl-podlators-2.80.0
-"
-src_test() {
-	perl_rm_files t/z_*.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
index c1c383ce5c23..ba6244050a9b 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index 5a23fac6c76c..fc0747c9d846 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -1,5 +1,3 @@
-DIST Cpanel-JSON-XS-3.0233.tar.gz 217554 BLAKE2B ed56c20faa98b1dc32be7e2f544708c509ce2a0137248d025adacd787575538adf75742b4073118a78b044ecd231e32586a32b86deb59cd2676bc39aaa398ed7 SHA512 bd4148942c65a4c4bad224f5a0c6b5816b63e6ca9b6a58fc9fb727292243a3098a9fd7204b9cdd126f59d4e3f8f81202448447e74dc3b34018fc578ccb183389
 DIST Cpanel-JSON-XS-3.0239.tar.gz 219371 BLAKE2B b03ad479cc1171d0aba84f0ba221caca14a0ac560712400632d90505e4fb74c50927cd9ad6453e91687e0b4c4f1fd2b50fa32d6355c7d46518bd63adda82734c SHA512 fee7b52f2bb48a4dc6314da4c274bb3456b6af2a0d891c1125425e5a0898e3115ea486a7dc057c25aaf7fc141bfebb5ea4341b17d00373b68a7388eb75f5bdb0
-EBUILD Cpanel-JSON-XS-3.23.300.ebuild 513 BLAKE2B 5823a967d55821e7274144d898f203cbd95bb9af2e7a171019cc7bf96467a4a146cdf861e3a0ef02895d17c3736d890eb17a7e6206cbd07e8f8d44f942ec1776 SHA512 c795ada8b7e070638776509a9725313e258fbf2118ca2c4bfac7e08337dfc64ad4cc6a09888c187cff37011954940b0b0dfa36ea4b7fcfc6e96d8764089cf292
-EBUILD Cpanel-JSON-XS-3.23.900.ebuild 520 BLAKE2B d4b4faab6bebf1f024765c6cd5d89bdc563fd68fcab1e6bfd167f27bc004372bd183742194eb5fc8a4d3ed1b99a4dfa2f662996f71bf62ed91230fe5010f1dca SHA512 b47e9a052b0f658d754e650b50924e6e870caf6d0cae366e936b0dd4396142cf5b54363eb74dcad22a4593d152aef59fe92a1bdf400952f72fcc30fc2e53868d
+EBUILD Cpanel-JSON-XS-3.23.900.ebuild 525 BLAKE2B f5ed117782b3b16f69d9237070dd7090c6fad8ebc43649b121adc76d4a2beb5f1b6258416138fffcb0af467a0ad7684c7a53cd45263824b4d36d276e4e7bc19e SHA512 15e3cfcb4263a97d59ef395e12538fc71d742c508a4afe6cb5719e01dcf0a757fdb1fd4bc7c5e69aa56289934b7e56f198273359dbd137c19e675d6b032af2eb
 MISC metadata.xml 401 BLAKE2B de5ee963566e3471500d6a481445c09715483b7bc913e5a1fbd139de0d3f34e986ceb4cf9966cdaae909027250b76c85f0ea8535ca02ce558b861e055371b05a SHA512 c1ab8b9c9957f6e48f83e6aa82ae0912f3a7db57e34f844b4c9e8c004bbe303e3ab4c5cc865bd9df3b9d5b818fdd2389820ae3ca98da56ee3216fedc8b10a771
diff --git a/dev-perl/Crypt-DES/Crypt-DES-2.70.0.ebuild b/dev-perl/Crypt-DES/Crypt-DES-2.70.0.ebuild
deleted file mode 100644
index f3af60c1f0b1..000000000000
--- a/dev-perl/Crypt-DES/Crypt-DES-2.70.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DPARIS
-MODULE_VERSION=2.07
-inherit perl-module
-
-DESCRIPTION="Crypt::DES module for perl"
-
-LICENSE="DES"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-export OPTIMIZE="${CFLAGS}"
diff --git a/dev-perl/Crypt-DES/Manifest b/dev-perl/Crypt-DES/Manifest
index 19f533a8aef8..7a2dd965d70d 100644
--- a/dev-perl/Crypt-DES/Manifest
+++ b/dev-perl/Crypt-DES/Manifest
@@ -1,4 +1,3 @@
 DIST Crypt-DES-2.07.tar.gz 16720 BLAKE2B d90b919ab493a7f37cd1506b86c459d68087e0dd153e16d0343b8b90fb44d19f57686aacb1c0dd34a3bb48c2d11ae1f910e7e131a3b05b38781d54d2e4d2c05d SHA512 95d40280850290fb2f9b2f26be2f47f2241e0aeeb842bd02c56d667062d65b3b65b9a87c045cbee50604f95f8a0d0b033c92334520de19022decaf77f77c7678
 EBUILD Crypt-DES-2.70.0-r1.ebuild 473 BLAKE2B a4f2c88bec145d4295c835d7119c7fd613d7f43f7bc6b36ba437a5c0b45f93fa783d97394d9185b50d4156a0f53b7bc2849e9f8a010660bd186d9cc19dfa0f14 SHA512 a9b2125af49977a72ead368cb7db18a00c4d2edce8299ba082c1bef552c5edbe30952738c2d5d6e924c58348c71cb163c8cef20bdf93b4690a46879a45ce084b
-EBUILD Crypt-DES-2.70.0.ebuild 434 BLAKE2B 711b654034fc6c354de52610e9d2f2b46eb5d92a5b015e96c6e1eb1d269a707d27898587f53f5c82f15a9938212143cfc3417a60badd69c72dfe318d03a7c471 SHA512 1cb7c7774449f054d1a81c76ecba7e1d48ab4cfde70738878a533e20213aaec8d30896177b302348432f73ac0d555a27c8e376603ac467160a8f531e14340ca7
 MISC metadata.xml 390 BLAKE2B e0ed7568ad13c3f2d6a8cdbd8dbab2105b0f7e61c1494a81018b8ccee85aac9d308258564b133246dc0a071be9d940956d982a38723cae45e8ed7d229a05edce SHA512 3a19fdc685de7f63552843b4436bb4e0aeb722cae6dcd036a8009117883516a2ed4c506775cb15bdad9f66995e6faf88fc2fa835db846d41450f43fa8a7a80ba
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
index 903ae9af81c7..71839aeea08d 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="OpenSSL's multiprecision integer arithmetic"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/Manifest b/dev-perl/Crypt-OpenSSL-Bignum/Manifest
index 9bd9a86ce62c..acba3c90f6c9 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Manifest
@@ -7,5 +7,5 @@ EBUILD Crypt-OpenSSL-Bignum-0.40.0-r2.ebuild 530 BLAKE2B 44b5b9b7c597f908603606f
 EBUILD Crypt-OpenSSL-Bignum-0.70.0.ebuild 568 BLAKE2B 440959a04d8e34f1b07990710699413551f7ac9fe0c74a3cd552b96b27ed045a08141fba478d35dd08d7ee2b8049a9518d4821bbb5db1eb72460b76a37032f6c SHA512 1435a008b1c40a1d812269e464ec4477807b40b37d257848575e8a683a94c5c0cfcef2642ccba70504bf1e0729ad0e18b7fb342f14dab71ce16c787e9a77f19e
 EBUILD Crypt-OpenSSL-Bignum-0.80.0-r1.ebuild 616 BLAKE2B f4b5ceb97a1323c667c1c240db734edb3ba0867f30ab8c106e0b7a3af2e0f394ccc6954f9ac81215e7eddbbb5717e32e3b2f5d367c831122dc93e0cf53882392 SHA512 014b0631455689aa2be7a407f8ffe6dfea66180e99f1c3d574bc8219d7a4829697cc9362fb3b83e0c17b8682453414998bc1a28cb565c1ba441682fc952e4cc3
 EBUILD Crypt-OpenSSL-Bignum-0.80.0.ebuild 568 BLAKE2B d15dd659890355ebad6d27c685e5d5224c7ca9d286184c98009fdf5fc9707e677657badca6889c9b5416fd066d5ca092115f7a56d531dee2247f8ac0c33990b7 SHA512 8784c985432d13bb449648fed85fcc11a214feb0831ee266ad1924a70ef946f65a88188587f55b63dc6cafe10f03b348a8bd5266d2c1e200de57b355b23d6573
-EBUILD Crypt-OpenSSL-Bignum-0.90.0.ebuild 568 BLAKE2B 54b6eb3b38e749a7b119f2f6b5980a104341dab3c3ac6b941097faf6c0932dc82f56214ec32085b17c4ca994cb80f66b9fd27c84c4c2dd0efef0150500273a6f SHA512 cdab5637d02f0d24b9e23c694d970dbdb5eb75931e6ecad81f13cf231a3c28192153c5d449fbe07a5b7d74364b4905ccc75529831728aadf110f34f13b355052
+EBUILD Crypt-OpenSSL-Bignum-0.90.0.ebuild 564 BLAKE2B d1f79c3dca041b1e71473c4f79bcf592c4b7295542598a1d0e859abb14bd380acb2c6675494d66c2cac632e16db3aa9a99b65878708da14be015706c434f1cf8 SHA512 c10ed5c2fc5e0df15f369b97e848693848d60868c3679f0b2ce6e6fb8482beccf26343c8368ac76193531d656a0fe9ff9a86f09a0f29d54ee4c2f5b27d15c3a6
 MISC metadata.xml 487 BLAKE2B f989929f1ea0c37f69c27f3b0cf3466672831c28bd53d8a572e3c0cd04cb028c5fdc2e59861f6ce45d102a38e719993b43796dac1ee214d2fd3a27a2b4c613e6 SHA512 1e71784a35f318764db6f11bcbdc77aac5390288565af158ccd66cfa72c0b4e1d93973cd85bad2a39388600f6e29f0a7ab68f57832f3117626a17524b712d3a0
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.40.0-r2.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.40.0-r2.ebuild
deleted file mode 100644
index 00f33109995d..000000000000
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.40.0-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=IROBERTS
-MODULE_VERSION=0.04
-inherit perl-module
-
-DESCRIPTION="Crypt::OpenSSL::Random module for perl"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-"
-DEPEND="${RDEPEND}"
-
-export OPTIMIZE="${CFLAGS}"
-mydoc="ToDo"
diff --git a/dev-perl/Crypt-OpenSSL-Random/Manifest b/dev-perl/Crypt-OpenSSL-Random/Manifest
index 38febdf9b1a3..586b4bbf27a2 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Random/Manifest
@@ -1,5 +1,3 @@
-DIST Crypt-OpenSSL-Random-0.04.tar.gz 10679 BLAKE2B 6e8a30e72585046af00c094572af06a150c23569b4538b8d5caa7bfbc12eedcb21b83c2f5709955a49f67f726cf5a754f438288b3c61052b43ec3fc5b7247b63 SHA512 0c5121903dc16bb0ee7f0d6b9528ee43e68a47e1fd301d18fb70c02c9869a1fa7f03f5dd9cdb6ee3c005d8de123f6c1357b459c0dfecd28894874f946f885bea
 DIST Crypt-OpenSSL-Random-0.11.tar.gz 15161 BLAKE2B 33c491755f210514361f6d97715dee781a3f1b99879b2357002dc6dfc8e6c63df530cbcc1ceb8da407928aa531d0fbe85f43afab3d86995f0ade6c58f8bbd320 SHA512 c579cb2b586dbabd697a9c7c989a360ed4bd8e9b28d7c93ad99a86bd9bd680a89c3fa77f6315a1105fd41bfdfa18087ca4cd51fb320faad7a6be9b90e3e69b95
 EBUILD Crypt-OpenSSL-Random-0.110.0.ebuild 696 BLAKE2B 1ff8fae14573c8395e0a9b0acad67d3b3671d9a03e391f7bfb63b16482591f434d8de6181c374efc48b340272a275a0b00a3d105b57d75c98a546f6c0a8a6add SHA512 43fd7a0c2801d125aa87c5c7653fe593435e07b6fc8427ea353662fced027b3cf807e7bb96784eaaf62a93bbe1e78cb76a22cc86870239c70ee0f12939924c29
-EBUILD Crypt-OpenSSL-Random-0.40.0-r2.ebuild 548 BLAKE2B 733ad66e543fbad7d33faac2d920f43df3c1785563d409dedb9e9f7ab70f6397e71ed48ad908c08b2291a66e1a39b4fdf4d43044ec1f3f81ac12ec48562b5cce SHA512 a452a6805252bf8e0b8ad6103ddffca06bc731e7ed1ca76f84149c6137730954e93bd754496578794d1f696f79b7cfa404e136fe88b8fc1ba6f3fe73178a6ab7
 MISC metadata.xml 413 BLAKE2B 03a4dca7d919259dff481a02856287747167ede1794ca2a3307f653ea32c5e34c0a65d32961620ddb1a549da94b1b6a32d7db3f19651a4ff9e93fac03d34b642 SHA512 db707a5e0349fcbf52586739288ea6b95c907918897c611837baab0b8792e58c4864cf785d719af8b8a096c8bc607d2198c5e627dd4cb5a322cbe42c5bfc5e58
diff --git a/dev-perl/Curses/Curses-1.360.0.ebuild b/dev-perl/Curses/Curses-1.360.0.ebuild
index 21be24a429ac..60ca9136a60c 100644
--- a/dev-perl/Curses/Curses-1.360.0.ebuild
+++ b/dev-perl/Curses/Curses-1.360.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Curses interface modules for Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="+unicode test"
 
 RDEPEND=">=sys-libs/ncurses-5:0=[unicode?]
diff --git a/dev-perl/Curses/Manifest b/dev-perl/Curses/Manifest
index 1137aad2c80f..6768cd7aba3b 100644
--- a/dev-perl/Curses/Manifest
+++ b/dev-perl/Curses/Manifest
@@ -1,3 +1,3 @@
 DIST Curses-1.36.tar.gz 135049 BLAKE2B c63d1f8d80db33e184c6d9c49c9ee902b5e3ed2e69e4ccbdd683d7b6109f8025d63838ce20f6e57e95c9a9bcd9e14d6af448e52f1b9d219ab388ab74798d917b SHA512 40ce96bdf7ef4bbd6975363bc27c2c561a81cafbaf147f2655a2c6521e09f6e40441cee06b6f8f27e370ad59eaf6f677ffe8e475030dfa870d25eca37717c58c
-EBUILD Curses-1.360.0.ebuild 1153 BLAKE2B d1363b930ddf7e02cea473ca92c3562b8a66a29594fa82b92fa57aae170797ddc8a4cc8824907f1b62f3385b6ab113c7ba9998e8d3d79e075c3b828f9c539b8e SHA512 710d91e1e796b1b52f06495eb6e6dfbb66a3a31d2fceffbcb266ffa88a643d44f093355d208c06607cf97833dfbdafc55754d16e961e1b9bd62a1e2575316a99
+EBUILD Curses-1.360.0.ebuild 1152 BLAKE2B 5e0646bcfb41de352fc603c16588130d2670ed100bd16ad39a86964144fc95bd33aab22ef6f99a7744872e3e9082bc57c063557f41037aa16c4b7135d32f507c SHA512 b5446fd085374b0b7eca4be68c74f01db14ee83d354a36c7799f5d1183295199bcc05a58d744fd6647f509af85033c7ed9445b532cc005bd244e580f3fd3c1e9
 MISC metadata.xml 802 BLAKE2B ccae394619eedd43c6e5a522aa9f92e7d786dbb8a83e109af3261ef7d9911ee73b26427c8e5161b61f325261e39781d7bc5aa46f525811cf168f3ce4a6b7b485 SHA512 286dec4f8025e80d92d654c90ca124fa7b8c7986ca7afcd89585f7d57a4d15a76a044840d6f526a8bfde7edbc2dc9b5ba296d692183fa79a75ae3bf55ead1b83
diff --git a/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild b/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
index 596327d61b6d..8b82ef6f8d8a 100644
--- a/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
+++ b/dev-perl/CursesWidgets/CursesWidgets-1.997.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
@@ -14,7 +14,7 @@ SRC_URI+=" http://www.digitalmages.com/perl/CursesWidgets/downloads/${PN}-${DIST
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ia64 ~ppc ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5
diff --git a/dev-perl/CursesWidgets/Manifest b/dev-perl/CursesWidgets/Manifest
index 11d3f0f7ce18..d552fff93a5b 100644
--- a/dev-perl/CursesWidgets/Manifest
+++ b/dev-perl/CursesWidgets/Manifest
@@ -1,4 +1,4 @@
 DIST CursesWidgets-1.997.tar.gz 40526 BLAKE2B cd0ab66eb2669b70051eda13ace5e1426c603bc014887d721c5a3fa2b1f2ace5e63eebd13b393358823987e1b36f59e552d8221789084318de0ceba50168e8b3 SHA512 18b2e59508cf7e4411cbe7988890fd50aa51365bc5365c81cd0464a0d31f05e146c963ef852e53c7ba82562b459a18d216b114218f7caeb9832fb3c36a425f55
 EBUILD CursesWidgets-1.997.0-r1.ebuild 607 BLAKE2B 72d60e087cef3c25aba914de001efc97161095314c29a8a712a6fd48c853e40a570d9b19a01d0b1ca4956c197387bf1fc30fe4e7ab34983b6fbbacc3c805d05e SHA512 c5a9527425b6b6a5761fc8c3efe62bf8766e6cc5538a4a4650cef35ad8368a02feb7408cdfebb828ae9826f3d0ba43622662acfc5ed7cd812472f3836fc4a67c
-EBUILD CursesWidgets-1.997.0-r2.ebuild 1607 BLAKE2B 908cd05493833e624064945983ff215cb121fa167ca0812315ba8ba72dbab3398422748468869cb36eae5444eab02e69034691dc20dac21e5fac19a3a3f02d64 SHA512 9e0940c4028daefa4ebb51c4c8af5c7cebf4cd2567459b86c81452ab7a468328882ba2cddf3ec2710c33efbd46b64b957e543d451c2fd6394ee480d64b75299d
+EBUILD CursesWidgets-1.997.0-r2.ebuild 1603 BLAKE2B ff928c2c0e4c9e7046ff230a15820b3c21bf71c047b08444e8bfb7624006f6a924ec89550bf57592d8d1e94008701a90a85705e115e3c160300fd18be6e8cc53 SHA512 134a34b66a9c975c145e414e6264eb3edc8013d5548a8cfd9c52327aa2679900eb7c8dec2d1b4cfa5b9c89e8f9becce2af957781e89f8614e449745371cf0327
 MISC metadata.xml 1128 BLAKE2B 01ef8b6d5af79e2e78f3b467b18672b309196c3224430323c56d9cfdd3987577f0f09b36457f6a7743986c9fa9d68dd8b6480c8ab63fdd2698eecc4cda152761 SHA512 87224a521c8eb6887857f3b6aea904ab490e6fb36d37d6f4a389b2b849600a3d852b6a664ebd87333d7d0885ece6024f4c0ca93c597cef4b25a107a565a6c394
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
index b7338a37775d..ddc996222c7a 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.7.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
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest
index 8a67e0304b90..167d591b93aa 100644
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@@ -3,5 +3,5 @@ DIST DBD-Pg-3.6.2.tar.gz 258640 BLAKE2B 76e25905b0336eae4ead14c28cf8338412fec023
 DIST DBD-Pg-3.7.0.tar.gz 260083 BLAKE2B 73ae253e8033dab58075f6dc3c639e5d21f2df09880f59cb00fcdc201c17db1573e4902c4bfd535916775c0ef61a020a70e8f542ce28e257a903d4aabb9f6730 SHA512 edd4d3448dac1b563899c5fd4a1bad6cb810afdbbbf57b558bbe6710aa3e58530a6cf0932e35c3316c7f4f59763764d75ce1049f13c8c13deeb2e8a7c60ff73e
 EBUILD DBD-Pg-3.5.3.ebuild 1144 BLAKE2B 20d1d5fc5b14c8e596a34f09f7be7e15c16f080c4ceeff143aa7bcc1c685a49de251c7fa823983c190e8d4819af6be64c113c992e39e8eab5dfa2bd75b6f7569 SHA512 5f237cf091c9aa5eee967b6e80d004a4e1ff3e99f344bd124f28160892c72931f1615fa3a5470edd02078dd1608e6ce4efd339ea1cfb9accdf63cdaf9ce6dc3c
 EBUILD DBD-Pg-3.6.2.ebuild 1153 BLAKE2B d2618de3bb78d8192e1d0bdb1710f0f04f45028dca8ddbc05c92457d3a1f3f97c4f58ceb555cee2936a0c7d9150564846fae7434c81db8cbb2b719708b0ce188 SHA512 67933187e9e9f05347b13cb3a91d178c8c9af03cc2c2efeaadeb2ad522d9758a3c1ab4d65460b529d61eca976d177c9b52aeba16ad3513959fa27bf5a6026ed5
-EBUILD DBD-Pg-3.7.0.ebuild 2685 BLAKE2B b0535db97bd7f812eec44c6c41105dcf0a945da095b63818d2037a2fe9c65fc48ff026d47f13878e47016d1bd40ce485d9f04a34dfa0c5b357c2c6d2feb00012 SHA512 7b9018d22c4841d26b548b5cf8d3567af9d8a7958618a1c5ee5a4ae03640243c68905579bf7f0226f692dda0be328cc555294727b742078b8511e17b8635ba4a
+EBUILD DBD-Pg-3.7.0.ebuild 2682 BLAKE2B 47f3ff7beb35a6cc73873186caa58f2bab21f54f57063da2f3b8189652acd5b3207238da59426b509a196793c1bd4c12fa7cd0c9ad6a98011a2e87757d716698 SHA512 2756070bca5ee5cbb3b34cacd56e98b588589a92c73543c4e9848e98eac005f78a8d3e067d39829ed59eea4968b0509f4093bf97032b5d62b2ec17298bab4b32
 MISC metadata.xml 446 BLAKE2B 428b5b91a84ab6026f482e2e3404f7b43a1557d16f42340453d927b4ea676caa3ab422705ea99439fd6369a43af9f2dcd0d7d3ec6a42f82b9e8df17cd2642a1a SHA512 23e05469a61761595bc52b6798d152dfc82b42a4ce1ed8010cd17b6343557ef92433cd31c00102098ed698ed0fd0260e3d165c926b9ce3de91f52112c9b40684
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
new file mode 100644
index 000000000000..8e84fa9db15b
--- /dev/null
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ISHIGAKI
+DIST_VERSION=1.58
+inherit perl-module
+
+DESCRIPTION="Self Contained RDBMS in a DBI Driver"
+
+SLOT="0"
+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 ~x64-solaris ~x86-solaris"
+IUSE="test system-sqlite"
+
+# Please read https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-SQLite
+# when bumping versions re: system-sqlite interop
+RDEPEND="
+	system-sqlite? (
+		>=dev-db/sqlite-3.21.0[extensions(+)]
+	)
+	>=dev-perl/DBI-1.570.0
+	!<dev-perl/DBD-SQLite-1
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
+	test? (
+		>=virtual/perl-File-Spec-0.820.0
+		>=virtual/perl-Test-Simple-0.420.0
+	)
+"
+
+src_prepare() {
+	perl-module_src_prepare
+	if use system-sqlite; then
+		einfo "Removing bundled SQLite"
+		# Flip Makefile into system mode.
+		sed -i 's/^if ( 0 )/if ( 1 )/' "${S}"/Makefile.PL || die
+		# remove bundled sqlite (rt.cpan#61361)
+		for i in sqlite3{.c,.h,ext.h} ; do
+			rm ${i} || die
+			sed -i -e "/^${i}\$/d" MANIFEST || die
+		done
+		myconf="SQLITE_LOCATION=${EPREFIX}/usr"
+	fi
+}
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index 70a01b801436..a58a7a29fe0e 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -1,3 +1,5 @@
 DIST DBD-SQLite-1.56.tar.gz 2248699 BLAKE2B d6af8efed8149ff2ec5c68cc071355805f4a24e234e015c180d5326a4def4eab33352d168e9e41c06b2de28a0137f0d39a864749bfa972d28f8ec9221379bdc1 SHA512 1c9be3557691f76a9e543fe4bd6656a6b82f53fba4bc05261a55affa0a38b4eaa1cf876da975234c9c09985ba25b21f6f7a735f1cc47104169edf7fdd3a2e314
+DIST DBD-SQLite-1.58.tar.gz 2248800 BLAKE2B 54cb94d0c64389984290361104e723be4cc9c7352e2f1c80838efa15d8f3d9d671705117422a1076203821b24ef63e06bf95244a0bdd7b710394e655041af18e SHA512 080d1e304fb0d43926ce0345df3367132c317ba113bdc11952c0a159bc68d988a024828a28e66be267f82e07731dee225723854fb80914ba7c476b27dbdeb212
 EBUILD DBD-SQLite-1.560.0.ebuild 1290 BLAKE2B 2f9c8a34b947b4c958dd69f0d8ae682c0d1daa8e6dd29a68ef485cd4a80e885ff907c1058c2f2e35ba1d2425b67aa81c5e32e61f1dd75e0137fd58cd252f9f80 SHA512 f4f11874093f8c8947d47ab1bcccafd3c4387e528fef9bbe0195767aa34848b63dc0951577bbfc125777c90a1e5489c15091e553d83dfafb5f0653b6fe0c14b4
+EBUILD DBD-SQLite-1.580.0.ebuild 1300 BLAKE2B c1f695179b4e6df47d3410b1d8b15207813efed077c457a3394233438015a92e4a51b885c908f37d74392ded29e75de31dc6c4267977d0dbf3269fda179f0034 SHA512 24011c6588b9be3b43230e7884504e3fc09c31326e52813d57fef72933e9fb4a6d359144c189d5a61e281bbc5923553df60c14d4b75291875f8ad397f2b1e6e7
 MISC metadata.xml 1076 BLAKE2B da1e831d74cde4db051a301cce34e8a64ade0f85accb892a72f5480db33ce3672542932b455b69f8cb7c0abf792799639f8c06c572e89a0abdba64561d2aa4f9 SHA512 6dc34ac81f2eef0a16be36407d29a91f341f19706a9660d751b5d4b289b44d6595f31260a4987b2cff22c4b02440cd07dfbcef48b1422da5ca96a5dcfdea510e
diff --git a/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.670.0.ebuild b/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.670.0.ebuild
index baf04c988808..9be2396b8a2e 100644
--- a/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.670.0.ebuild
+++ b/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.670.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Encapsulate SQL queries and rows in simple Perl objects"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DBIx-SearchBuilder/Manifest b/dev-perl/DBIx-SearchBuilder/Manifest
index 3d921bf2b1cd..1fd39bf1dde5 100644
--- a/dev-perl/DBIx-SearchBuilder/Manifest
+++ b/dev-perl/DBIx-SearchBuilder/Manifest
@@ -2,5 +2,5 @@ AUX DBIx-SearchBuilder-1.66-no-dot-inc.patch 8976 BLAKE2B 6e0a20539b99f2b80040b5
 DIST DBIx-SearchBuilder-1.66.tar.gz 114777 BLAKE2B dc1684c8cfd7d29b4f2900649d4aa57a4ae873d2456d66e979f96981286c1dbc57339df91c830f58ef7d08dee567fff28d3a02643119585cd3800526c66d11bc SHA512 e27513701a0712a9d7926c8e0966ee23d60163996c40a83e8d45164af8f9008bb7cf6a567ca1cb8d0226bb8fcf7bf9f1570277fb849c55095d8532ac356d5d95
 DIST DBIx-SearchBuilder-1.67.tar.gz 115193 BLAKE2B 9ad670069826d0cc109e61834d425f5c2fc29d7709f36f73a23820636b8bed3ac45b563df115b8a5448014672a5b68db2183ca7180eee590aff6ed388715dca0 SHA512 8cade12f01da749356a3c1b167f46e0377934e01832548baebfa629e71c3199ce473a63077ee5ac5ed58f805f7cb883bd8d0886d2ecf27f4740eafbb30f91bae
 EBUILD DBIx-SearchBuilder-1.660.0-r1.ebuild 791 BLAKE2B 69e7cadc82223a9e438ab0f0b812164bcdd89de80eb421de0b6ce43afd129a70dfef2bdbf1545a07221abe8329eac0403bc389d4db527a8b55b4dbd9e970ecef SHA512 86d32344f16c8e9e3ce066a14ce04441a4b78e95d73bef70b0b815de6233a6c7b763232dc98611940917d45471447a095e0b812ce4c73202e13b1e9a324bc838
-EBUILD DBIx-SearchBuilder-1.670.0.ebuild 901 BLAKE2B a6b749e2f02b3b1805a6f3df242968b6834c336e3833ec0dc829ec315d07dd12e40376acc77799facaf294c311b582525a3337b03e081edaf507c25ae46b88fa SHA512 78d3dc5ab1279fbc994827f802a5918005e05c066d7941dc87c245ed337c32e54d7b28af74fde0013a6d086949bfac814d714edefe3598ae94531af0fa43a26f
+EBUILD DBIx-SearchBuilder-1.670.0.ebuild 899 BLAKE2B cf2e63984f971b62ab264cc6d00d53aa7e803fe1f4dd1ecd08dc350c58d82c59b9fcd31786735d42448d618444211a0052957bece8ffacd8f06fa3a209954db0 SHA512 ace118d91a85b65c434a942ec963c4f3037de65c657c41a7dddf7a4452be71ef6efbd5fb8c3f43c98e13de9c4aec8c2b948eb7da5928f11fed8d795d8ea3e695
 MISC metadata.xml 1594 BLAKE2B c56268fbc1ee494196c0763e6c0f795436d3f2104b43034969c94aacebc4c408b818283203e5b097f7cd6400657c6d5d2630dcaad5a034a0d3743506d676b766 SHA512 da30146de1b578e3362a06b951bcf72a1d4917f33aad4cc678360c62a470edda63ff4d40f6f582c22af47257a6e0e1764579ccc518352ce46465f2465f3fa8a2
diff --git a/dev-perl/Daemon-Generic/Daemon-Generic-0.840.0.ebuild b/dev-perl/Daemon-Generic/Daemon-Generic-0.840.0.ebuild
deleted file mode 100644
index 1c463722e6ee..000000000000
--- a/dev-perl/Daemon-Generic/Daemon-Generic-0.840.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MUIR
-MODULE_SECTION=modules
-MODULE_VERSION=0.84
-inherit perl-module
-
-DESCRIPTION="Framework to provide start/stop/reload for a daemon"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/File-Flock
-	dev-perl/File-Slurp
-	dev-perl/AnyEvent
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Eval-LineNumbers
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Daemon-Generic/Manifest b/dev-perl/Daemon-Generic/Manifest
index caa2990940f7..a47d4ced169f 100644
--- a/dev-perl/Daemon-Generic/Manifest
+++ b/dev-perl/Daemon-Generic/Manifest
@@ -1,5 +1,3 @@
-DIST Daemon-Generic-0.84.tar.gz 15065 BLAKE2B 6d9cb22fba12b8c0f711a4033843d3a036cf7f212885261aa5f8277841f512ab3f6374a01522e5192de4f8a86755f5d943a01e5302a6fb3ee12c319d3c1378de SHA512 eadf060653ec86b982f4388777b15bfcad55635042048d389ba7d88d2de5f778b849a2fabce3524f05e041fc76a51eae4af14e759659616b7d28fb4b657178e0
 DIST Daemon-Generic-0.85.tar.gz 15101 BLAKE2B 43c973ae1a9b601467ede6b411872f7824a0476c552b3734e45286f47b6d892d45182afce0815b11b9f555089f7d18f2943938d294f9ee67de7e0fca5e5c214d SHA512 fe23e58d08013f9b10fd741f40636b44e20e7e8278be6ee6f6eecae59f18810c5d485e85fe56ded0ef23c3318b5a994f6821829a9966398a54b70859d827b9c4
-EBUILD Daemon-Generic-0.840.0.ebuild 485 BLAKE2B 40e175c6c3e8613e24d0d9c6cd8c38058d655220f725d48d8ada36070aeb0d5dac3173160c52b464cce65721534613ac824ebab1fc0447700b1de70afcde661a SHA512 af03bdfbec990e98872d19d9bcf9c42742c7568b2efb4631e7f176ef2dee840507776873eb81d6617897f7eaedc97cb2dd72a4b7830a3d21c5c12a6c9c9e8bf6
 EBUILD Daemon-Generic-0.850.0.ebuild 632 BLAKE2B ac65cfadf357e4f71ce98133a4c2a9c75fe31ca4f7c1db38b76ac72f074615c3af131f03accb535122e89f7dc4971916c03ff809d02424b6ea65440085b9d95d SHA512 21ab8838987f704beba7b2471777f7a2454a7910ff3b35d42a50655dc9430ef9015f59b9b34573a8a6bb717c7235b681d59dd4fb037ebfd79d5cba1a738314c9
 MISC metadata.xml 611 BLAKE2B 832690f101bd7e841df692e3d728efdeb9c1bcecfc048cdf23c834add50c52abdddd0aa7dea4a148556b3b04c764fe2f27bb24426c25e22c5c884ce5b8f51713 SHA512 440e52d14fc917b933cc3d14636380e0b179a594c6f96a195d86483af30137679952af282a5ed94b58a5364a0f798a8f8e470a87c55487bf17ef045307299221
diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.860.0-r1.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.860.0-r1.ebuild
deleted file mode 100644
index 117a76780307..000000000000
--- a/dev-perl/Data-FormValidator/Data-FormValidator-4.860.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DFARRELL
-DIST_VERSION=4.86
-inherit perl-module
-
-DESCRIPTION="Validates user input (usually from an HTML form) based on input profile"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/4.86-dot-in-inc.patch" )
-RDEPEND="dev-perl/Image-Size
-	>=dev-perl/Date-Calc-5.0
-	>=dev-perl/File-MMagic-1.17
-	>=dev-perl/MIME-Types-1.005
-	>=dev-perl/Regexp-Common-0.30.0
-	dev-perl/Email-Valid
-	virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Data-FormValidator/Manifest b/dev-perl/Data-FormValidator/Manifest
index e956d3a12544..b5adf4848bf1 100644
--- a/dev-perl/Data-FormValidator/Manifest
+++ b/dev-perl/Data-FormValidator/Manifest
@@ -1,7 +1,4 @@
-AUX 4.86-dot-in-inc.patch 1730 BLAKE2B eaf7e56dc80af9c46ffa30b669381d0377bbb52edf1c9629243204cbcef42c2e987e5d6972703367fcfad37f6b039d3be0b672afb1ce43b43081df7bca86152f SHA512 667bf21b8cd3142cdb6af70c5ca0d0754752fd3f881b6789d1760a6d8fe3135f708df9a0225522d0822f90cb37a8d326f17456ead2a3751e165d101a2805a901
 AUX Data-FormValidator-4.880.0-skip-readme-pod.patch 929 BLAKE2B 7b242ff1b4edc37aae285d992506101652546a5b9a12bd14fc14659e3746a3676d2bd49245efc10f00b86c3b8b9ca79bc2d43d5f5570332bdb34fc97656f974d SHA512 379ff29c0269c4b052a2d48b4c084f1d69744a1e61dccd025d649a9d915579c3d81ced95ab2fce42f24ecc6a68e1b96a7a9a81e7583faddd5326c76dbbd897b3
-DIST Data-FormValidator-4.86.tar.gz 101409 BLAKE2B 5c5c3abf715155ccf5340c9f95aef6bea26452376618c23164f5d025cb21615a6db4d4839f306443f775883a8a90495a7a470aabdbef52d697657ee2ac5d8bb8 SHA512 ca9e178313dcc15006a0d5557494d50d9328ae4ae9b54428bfd76b3c6169767290f819c70af1928f772ce9a2cd2139eb373e69394af8f03eee0f061525bc76f4
 DIST Data-FormValidator-4.88.tar.gz 99850 BLAKE2B abb72030dd9b6155c83aa95d975643c6ebd4e4b8b15b7cc360d1a2ff81eddc9b210e8bda7408876f27bba9241541f1e3e6289ebb037a50e0a77d5850b281be76 SHA512 f4f9d813a3c9ae3cefdc1795516c955307dbaa23ca464e5a0a31eb4a9f43a3f31da8155b911433d29915d65da5b05d0843b7de45287d977a0c58ba19f3cfc736
-EBUILD Data-FormValidator-4.860.0-r1.ebuild 669 BLAKE2B 5c70710dc63dcff24fca79c75913c8c64831a0e1cef743ea92cc3cce9c8888b5fd9ff06dc2d7e8746365feee757b7421fee5da4d7a92f9a5bba231488044b2d2 SHA512 29f21b39c8d6d31cf86ea688e3c125aa1bdb7766f5f53a6005b69844f55600c377019ee0e514e65fef48cba967ed862ddb1da19a8787ce80c77e93aa0864d5eb
 EBUILD Data-FormValidator-4.880.0.ebuild 2119 BLAKE2B 36bd13c8b6686626aa6bfa5861c8d589897488b92a0b8deacb55e2599b58523c1efb3811b15899e2f9153b0796c8ee00402f89777fb7e525a5f01de5e2851dfb SHA512 e30410f07a92aa67cfc16d925b9633863522b3f05b7c719617d9662e754112771bf01094968df973e6b6917c0924cded78639368febb8b25c3c70974bedf808e
 MISC metadata.xml 989 BLAKE2B 0d66c4b6bd1f4670a0a63acef6454cca651ec6e856baa1549083c9ed357a3bb437d2dc5ee318353768adb1ebe52436dd82aad287f60553b1517aa858f117a00b SHA512 39f935d8c1a17b313a288065757f35134e7f8440737397f50abf30ceb6071372ef253ebfd92d3f9996c99cce6374f3458ef4c98f9010aba10f3e791762013de3
diff --git a/dev-perl/Data-FormValidator/files/4.86-dot-in-inc.patch b/dev-perl/Data-FormValidator/files/4.86-dot-in-inc.patch
deleted file mode 100644
index a6fdb276e42d..000000000000
--- a/dev-perl/Data-FormValidator/files/4.86-dot-in-inc.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From bfc088aa911062d987c830d5bb56aa4afd0d3735 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 4 Jun 2017 00:40:04 +1200
-Subject: [PATCH] Absolutize filenames during construction
-
-This way, any relative paths become absolute as soon as possible,
-so that if chdir happens between "new" and "load_profiles", the loaded
-file won't magically change.
-
-This also aims to turn the <do "file.pm"> into a <do "/path/to/File.pm">
-as the former no longer reads from "." since Perl 5.25.11, as paths
-with neither leading "./" or leading "/" imply @INC traversal.
-
-This aims to resolve RT#120671
-
-https://rt.cpan.org/Ticket/Display.html?id=120671
-https://bugs.gentoo.org/613378
----
- Makefile.PL               | 1 +
- lib/Data/FormValidator.pm | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index a9839a6..cef175a 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -19,6 +19,7 @@ WriteMakefile(
-     'Regexp::Common'  => 0.03, # when ::whitespace was added
-     'Scalar::Util'    => 0,
-     'Email::Valid'    => 0,
-+    'File::Spec'      => 0,
-   },
-   (eval { ExtUtils::MakeMaker->VERSION(6.46) } ? (META_MERGE => {
-       'meta-spec' => { version => 2 },
-diff --git a/lib/Data/FormValidator.pm b/lib/Data/FormValidator.pm
-index 7075dc4..bc0709e 100644
---- a/lib/Data/FormValidator.pm
-+++ b/lib/Data/FormValidator.pm
-@@ -24,6 +24,7 @@
- 
- package Data::FormValidator;
- use Exporter 'import';
-+use File::Spec qw();
- use 5.008;
- 
- use Data::FormValidator::Results;
-@@ -147,7 +148,7 @@ sub new {
-         $profiles = $profiles_or_file;
-     }
-     else {
--        $file = $profiles_or_file;
-+        $file = File::Spec->rel2abs( $profiles_or_file );
-     }
- 
- 
--- 
-2.12.2
-
diff --git a/dev-perl/Data-GUID/Data-GUID-0.49.0.ebuild b/dev-perl/Data-GUID/Data-GUID-0.49.0.ebuild
index f55d0969c2a6..bcb2735c6e41 100644
--- a/dev-perl/Data-GUID/Data-GUID-0.49.0.ebuild
+++ b/dev-perl/Data-GUID/Data-GUID-0.49.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple interface for generating and using globally unique identifiers"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-GUID/Manifest b/dev-perl/Data-GUID/Manifest
index 0bf09fe01ec8..6907790aa824 100644
--- a/dev-perl/Data-GUID/Manifest
+++ b/dev-perl/Data-GUID/Manifest
@@ -1,5 +1,5 @@
 DIST Data-GUID-0.048.tar.gz 16675 BLAKE2B b0a677ade2c125f1d2cf265feff6d07a4c7ff62be611fe908ec41cf1de027ef49954dcc6c20a4a624bb43ebfc40d9bf4b803b451548d1eafa88cda60665f5211 SHA512 42c0472f3614d342440c41aa009e906cd2874c7578cf1a197711a22ff2c02227cec84ee6e497b64e8f52843a371d10a09732c713c58a6d189aba399916581cd3
 DIST Data-GUID-0.049.tar.gz 19513 BLAKE2B a7c6039dacffa4faba05a4441012b7262de08917d850437be3efc59778e5802b73300cc90ed71ea8ef54573bb2a98d8ca075b2bb400d4dbe71a0ece85d434b1d SHA512 1404322971af93067e121052a47f796ac77d19dbeb328dc5db0e60df1c4ce24f614679198afb442cc3ff4326e76df84ff762f85b4e129f44e1441c5beb40801e
 EBUILD Data-GUID-0.48.0.ebuild 500 BLAKE2B 763bd104aea07b5d24bad06f0a54bf9f114df1ef51d741b99115cfff8b9ea7dbb7f98ad7405165b0c6187c9eaeefa8b79f127ffa50ead782104d29188311a619 SHA512 5fe8c47ea44ec0fbf8f4245fd5885ca5669fe35465c5307156e7d3c6d842860d23433e58da12e4ef8c8dfdf623f786f8e15627d385713ffa0fb2e5ac614f709e
-EBUILD Data-GUID-0.49.0.ebuild 551 BLAKE2B 94667a01291b896af97059ea4772c562fbaea5e9edfc317af721c1d762cecc5e6c4ad8ed22155ea1662f00313ec04a638fe9487e02ca7f857ae2bf2d55bae8b6 SHA512 7283a3c76043535f8952d83698e35606493df3bfbafb01799378a8120b7a90b9301ebb43173652de0177199be90b3f47e824a212661c8e0a67a30bf93ab9665c
+EBUILD Data-GUID-0.49.0.ebuild 550 BLAKE2B 387ea613508f149450de119fe758588ad5a707ed7e8bfab75fa87ac701224d7b88879da0713faffbf37a31a73e7ea42ea9d1c06d6327319b0ca3f550231b9f72 SHA512 d541ef1710a777cdc55fcb3748c78a5a838c9cd7d8a202e970e45597ce0820ef04d332ce17b5a90a855b40de71427131cc1a533926a8102c87aa67d76d91878a
 MISC metadata.xml 546 BLAKE2B 376a5b994338b88877847d8988a9301b887a3cd8c8d2e9718bf64036eb2a0e53537d93b48be54ff324be3039f736470f3fb7dc517bc2c300d82be8e273e3a79a SHA512 fb5635c357456acccfeb381411ea5becbb8af75ba9ba000cc6300a732ac183f92037e580edffa96a02126a5bc8779a1cedefda051f1dc4962ba1feb38a9b90a1
diff --git a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild b/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
index 565b8db84e83..f420fcfa6daa 100644
--- a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
+++ b/dev-perl/Data-Perl/Data-Perl-0.2.9-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 @@ inherit perl-module
 DESCRIPTION="Base classes wrapping fundamental Perl data types"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~ppc-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Perl/Manifest b/dev-perl/Data-Perl/Manifest
index 6f01dd00533e..e27c42a32ca2 100644
--- a/dev-perl/Data-Perl/Manifest
+++ b/dev-perl/Data-Perl/Manifest
@@ -1,4 +1,4 @@
 DIST Data-Perl-0.002009.tar.gz 23155 BLAKE2B 1f8c1ba4353c26736b3473be2283df1e0a247150b842333010822f7e1d25ecdddea39ac7874ba79d777e4691eeac7257e40ae366ae0a3fae0747a205166c54de SHA512 872eae53641b7ac19a8bcd4a6522475bf042463fbb8380a45481289c6792fa17cf4d52d146228acf089b9cff091413684fa5b39f67bc28f362a5d2eb85d1d01a
-EBUILD Data-Perl-0.2.9-r1.ebuild 630 BLAKE2B a0fc35b9559f6d52649541899280c6f0c5aa74bf7f0d1bbe13c785da5322c9a29b70077faa577709c2801c68f460dc80bfc4ed389143184b4cad5df62a7167ff SHA512 d8ffa52d71f25ba05aeb95c3333e50712601561c285f3d4925322970f034637b4676443a821c1b9117dc702f5e49d73e3fae1da40e78693a1583b5cdd7ced141
+EBUILD Data-Perl-0.2.9-r1.ebuild 628 BLAKE2B 59bad938c6187d915ae5a19666ef499ef2bf7f681e56738f95659aea85aeae5aed3ec4b4f07408afbcca5f96ae7bcf4ffaf68736750ba4912193486c2db38b6e SHA512 7041acd58e683865e94f9cab52a03fe8618e691726326c4f53d8a4919f4d74e6b2a209f57cc5349d5029584d9d0ec3038d7924748de062e41f6b8c52b90bdd99
 EBUILD Data-Perl-0.2.9.ebuild 645 BLAKE2B 63ce4c4376cfdb08c88a15c7290e97b6c2d5d16fe03d79c7abbc44becea8c41aa6f2a6866778922a824ed3219e004949c0fda1b30d059f357a1832d4f3614d5b SHA512 ed93c6f9fd153aa79bf7b9156f2f6b476df4e9829f07fd2bc82410a0bf0ff972cba9f5288b12e288a21136916e152916009be629013bddf599663ea0d5b7d5be
 MISC metadata.xml 1378 BLAKE2B 22e5a37a6e977ff565611a6465e7b5ba9e94e97d4d24698e304b35522d52209dcfc64494091ad4b488187fa4ecee648b16c8bc5eb5d261935cfc0bd7b8538d25 SHA512 6166dd5902561f4f12158203b8affff35835c15b9d843b1924eea23a0af70832045cbb33fc534cad128ec06cc096abeb539f4fa6f670f78f173bb8ac164e16a6
diff --git a/dev-perl/Data-Random/Data-Random-0.120.0.ebuild b/dev-perl/Data-Random/Data-Random-0.120.0.ebuild
index c54a97659bee..6ec4f49486d7 100644
--- a/dev-perl/Data-Random/Data-Random-0.120.0.ebuild
+++ b/dev-perl/Data-Random/Data-Random-0.120.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A module used to generate random data"
 
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Random/Manifest b/dev-perl/Data-Random/Manifest
index 0b35832a5b63..be064f5d5e38 100644
--- a/dev-perl/Data-Random/Manifest
+++ b/dev-perl/Data-Random/Manifest
@@ -1,5 +1,5 @@
 DIST Data-Random-0.08.tar.gz 168327 BLAKE2B 6e19dd451c821df75a3d8c1b774d909985c4ef8a1d98319a8b17921cfe3b026f0693301d77ab469dae8ab569bdf3f68bcbb7c3b0e4e7f501356eb3e9b2c97875 SHA512 a523f2cfa2031006e41efbc7a52d1f8ce08ca490d02db5f1068045019e9f07f145824843e9650fc04e5269284e9a4825f54b4e90557fec1d3e26c40164f8a591
 DIST Data-Random-0.12.tar.gz 166951 BLAKE2B 84df509577687c1de60f675b881f245c944bb81b5fb6455473f4b842c301db3bee3dc9d4bb2e5991d857e19831b4636ec72532dcad2838814087f15a61f370ce SHA512 ae898af42a44576f5b968fb44015339e6db4c8542e6198d87aa4346eba767a81bfdd35c33f10d52adddad9fe38d24475bcc7fa87e8223f1a2756ece1da84ee97
-EBUILD Data-Random-0.120.0.ebuild 831 BLAKE2B 6c5b57b1ab1d21b3956c0c184b5df340c684a0e9ea1773f36027a1ca0946f94fd676f720f055c620a9804315d329fe1343a05fddac3e7d6a2233928b9dced8fc SHA512 6a25fc4a0b6c3c11758893bde74a556c966f2369df3ff02105a20e07a5a1685be12bcee007d581ce4ba263b51092ead81dbc96c554181c4f5b771034295c4106
+EBUILD Data-Random-0.120.0.ebuild 828 BLAKE2B aaa477f47f94e587504c2a07ecc601cc506a4e805e7c0e3962a8036941d12e82cab494aa81431b7ee72a08fd847a72b07aa1402a547aeac7979fbed0185b69bf SHA512 0d8ed7548aff573bd7eeea57698e87dc06247e9b1fb2c23e3d1be60ed85c109cf6f17d987411916bb73478c62103ee9b6aa9844091b61bfeef15d46291f5868f
 EBUILD Data-Random-0.80.0.ebuild 757 BLAKE2B ad54b6c4d6a18f7c7efecb5a778ba61129e4ed47278386dc681f211dc703d0178f717ac8d4890aec79a3e5906289148db54bc5f531ab97e234cfe0bf27234c41 SHA512 403910a33276ae0634c756d29850048a79bc3866401cdfe50ac272a0195097a3046ea3b8c04fb92a0b04e275cdf50ff2f3a4eb203b4f9d1377fb126d0036b272
 MISC metadata.xml 463 BLAKE2B 6c3e87725d94e9c5f133eca35f4412718d610fd6cf73ab007ea78dd27f8526d3704f2072ee0c18d90533e4008fa6cd17946a0ec0bbdf8eb9c8d2503be789f9c1 SHA512 fa042be0e0f6c15c37fc04a3c848909a1e2d2831edfa686f063a5de7ab4362780253566b3875b45d9b7f4ffd3ab0297f60d712325b2c1b064c9c85757d7dbdc8
diff --git a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.160.0.ebuild b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.160.0.ebuild
index 7c3730641602..5d945f0ede98 100644
--- a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.160.0.ebuild
+++ b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.160.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Change nature of data within a structure"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Structure-Util/Manifest b/dev-perl/Data-Structure-Util/Manifest
index cf36edb5f010..d24f660b0607 100644
--- a/dev-perl/Data-Structure-Util/Manifest
+++ b/dev-perl/Data-Structure-Util/Manifest
@@ -1,5 +1,5 @@
 DIST Data-Structure-Util-0.15.tar.gz 23185 BLAKE2B 7644e9f5f999e33fc548025ae725283541f3d183acfcfbc71b14f91aaec4ff2f7cd70d0a2878775eaa2e49d6a1b3e024d3d4408f8990f89d53a73cfdc41273ab SHA512 0bbc654b1f1cd33fdc91562d751852ec7332efa712bde026548db7f06d5b228c7d2f33f3ec417c30736ba631c41d4f5029345ae14b4bd853aee0070dd07c124a
 DIST Data-Structure-Util-0.16.tar.gz 23936 BLAKE2B b5177f8778ec3b9d9a89b1ca16e752713ff833ce44ff34f92ef61f0e2ef36a63c24cd73e041a3c90acfa5acc17dc0a643e15aee5b23804481e231b42b7a599f7 SHA512 7dc51a4ac3617e7deaf2a1d9e25ed3b9ad94fdfd288fa3331b43b23d5e1eaa09510cb098df1fe0c7cf3f76a00012576a62741916310bedc1089b56baaac6ff74
 EBUILD Data-Structure-Util-0.150.0.ebuild 387 BLAKE2B ab182955f61db85ffb0e2c961472002c55d5537ff3b792e9dd8e0d59fb247b950fa92d55752c87d6c452784adfc28b684b9a6d72e3f3c6f523aeef0ce5867835 SHA512 af57adc233cbee35efaf3c9f2fe0e6605eeeca96185484c2bf4410c3aa68ca139503cec9cf048d9630dfccc716027dc6803244057c2901e67353e9953c1f0430
-EBUILD Data-Structure-Util-0.160.0.ebuild 576 BLAKE2B cf2b5a960079f694ae795ae8d4a37309340d2168f3ebb38f061d4cc72fba755ccf851fd2a173ef4005bf84f8902f5166bf1ec3b2f0e996bbbca3f1464659f21f SHA512 dd5bac79752f4ff65e0030dce7fb6cbe7be36fc5b5e983d424818be7831d5edd2f6953a540adf2cd3fe598433ac18031a7b24c52d807a3b88cdbbdf0ddc1b663
+EBUILD Data-Structure-Util-0.160.0.ebuild 572 BLAKE2B 33c0001ff4302b03e23e741c9230a75190e7952b7fe71509d6488a3878242ef25a6f02b367c3888e7254a50117c1a21ae76e2f668080b70caa74f267af53cbd9 SHA512 af01dac521c8704f90a7e7f84023bb991c3fff1b07b52044b62a6aef5cff15b8cadfe450495f4b871f4ce3de227034928dec04cee0c38c925f997a417474a0c6
 MISC metadata.xml 411 BLAKE2B 1ee3b2df0d548012a7c825985d50aabafa1c109961b7317a1db90f0c7f343843a91d8124b7d2fa432475978da08557fab5fdff6dcbd32cafa5808f3a28924dff SHA512 01aa62ab800902bf8e562e6e700386c0b03745b3323c00493fa27aa5d1654a2acf72057db375c84dada06ac076ce4250e1fd78c288f78927415f81712e4f13b7
diff --git a/dev-perl/Date-Extract/Date-Extract-0.60.0.ebuild b/dev-perl/Date-Extract/Date-Extract-0.60.0.ebuild
index bdd73674e481..54fd83e3477a 100644
--- a/dev-perl/Date-Extract/Date-Extract-0.60.0.ebuild
+++ b/dev-perl/Date-Extract/Date-Extract-0.60.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extract probable dates from strings"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Date-Extract/Manifest b/dev-perl/Date-Extract/Manifest
index 0b4d128c93bc..3c2a2d3a6b43 100644
--- a/dev-perl/Date-Extract/Manifest
+++ b/dev-perl/Date-Extract/Manifest
@@ -3,5 +3,5 @@ DIST Date-Extract-0.05.tar.gz 27889 BLAKE2B 0ef717b46a00b9f415819b31ae463eb8062b
 DIST Date-Extract-0.06.tar.gz 32730 BLAKE2B 9559e7c9af77bf26f6c649e90516500e5a5551eeacb4c4fc733b228ec56047f932ad98ac5335de7d3488be869164e039b6c4776f4f7de07663cfb47583fa026d SHA512 f50bb1e968eab9a5ee5bd1383af1599aabc7af9f9c375e3d366857f1cbf6a6912e8eff99eece2096b09a475c9eb671eeaeb8e4b76c0d865cb452ce8b0a85c448
 EBUILD Date-Extract-0.40.0.ebuild 669 BLAKE2B 275e8b6124a9b68b787aefa6ffc036f1ee4c199b858471e05cccc706ad39be5ad14e2ddb58c1d6180d7bf4db82ac9e2693dc57bc8f1ec4ae5643986dabd4f447 SHA512 a8088f2f18e558644b0986e72b5d5b9f0db2ca9a790ba16e059730750109564d1163bb1bbcdcc5d1b607766c6059355aa037c84f6b7530e2d4acadfba5d087a4
 EBUILD Date-Extract-0.50.0.ebuild 750 BLAKE2B 0be521c9378440e3ca7baecc9be69a8b9cd7c336e4e7170b438c04b996881cde1c80529b764b5db655e857e5c77343e323dbb2019f292d498b3d39d8b2442067 SHA512 a25c415f5994f9a33d4b167a12d499aa3024365b3d5431b10d188be2db8968a81f94e83b5ff8d9bad90c043c91f9c5f193e0adc739669ecbf52cd9e17f92e2f8
-EBUILD Date-Extract-0.60.0.ebuild 748 BLAKE2B 3dc042e31b083bb66e32f6c695559b437ffcb09d8d7ba065e6d81e41e4a0e4fd13fa238e6a7b77ca7dda9fcf73bf7ed17c2e13d3e3965983e265dfc803cdde6c SHA512 5f1b5f45915c595f361a185c8f80d1a0d53ea79943b8dce0c19db7e8e9ab5b3a02b019d2c0631ce3a40185bd662b094a6096fcca9f78b2fe96252f36165964ce
+EBUILD Date-Extract-0.60.0.ebuild 747 BLAKE2B fdd4f0cf1c7a869500acd1ad9b73e7ef0f1e1e295542c39c8467252802b62b62abc9e9353d5d9fb78d00a8cb4ac3371608b474de71e7dee3ab829dab4c7f1be7 SHA512 9ea3cfbab636162c50ceaa68d30b75231b348a6cd61228b66dd35057923fec28fce4567b8716f8ff8beac6f3115967c5b1d6a3e5372e88dec1a0d5de862c079e
 MISC metadata.xml 552 BLAKE2B 57c6da163814ff77ab5968114187ffa2e576250898742e806dcc0936237133188cee10c03c6b36b30596c2f9b8467b0c1444d52fd838fdcf91c23416fce2bd64 SHA512 64a30008b0b092831b76687c77d1bf556bfe0bbfeceed1fe76239bc488625af7cc5f98aad9159a0040230648ca41e9622bb805465b76333a492e50371429deab
diff --git a/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild
index 7c5adda50937..be858b76d2cf 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.600.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl date manipulation routines"
 
 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 ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="elibc_musl test"
 
 RDEPEND="
diff --git a/dev-perl/Date-Manip/Manifest b/dev-perl/Date-Manip/Manifest
index b2c2ac89fef2..8c0995a4bbae 100644
--- a/dev-perl/Date-Manip/Manifest
+++ b/dev-perl/Date-Manip/Manifest
@@ -12,5 +12,5 @@ EBUILD Date-Manip-6.560.0.ebuild 958 BLAKE2B 257f9a6486aac163931dc685b307097171c
 EBUILD Date-Manip-6.570.0.ebuild 899 BLAKE2B a7fc174b2a5a8b038e52eb8da9c8445016473fbf8fa881e439a4db9ca6184903f80ade4e29b228845af67e9755979dc252a64241452fa0de2716eadc764452c3 SHA512 2514c53ab01f8d292d705027f61966100cad370e43213c2e13ee80795b98c969651e6b61552c9c169189186b98a7591cece954ac48d801b0f2182c8b1fc8cb0d
 EBUILD Date-Manip-6.580.0.ebuild 899 BLAKE2B 1c6e7be0b9ff74d537af58171206b4aeb05e1ece4dda1d6ec922c81fb957171880479a7fc451b8017857fad35720b08087e93823e47e3216c899c244eec09b1e SHA512 ceabf3c142e9912fb359056284aebd15cb194bfd55a65475b94d98999234e1c8d5e2c721f7b80a9e9c271e04b2de8be3d0c19af246d2f6b8c801eb1d38fe7044
 EBUILD Date-Manip-6.590.0.ebuild 899 BLAKE2B de3200456d6edc2eb9424def183aab765115c9da55768c5eb07ba476a5121e6425e39cc3a821929417f1144acafc67be25fbd26462499f5395436e3abe3dcc49 SHA512 0ae6aec0b6d662e08ee8cf39b557d984dc96db6964d79075d41a9921ba268be1e6df57391092d9c9074a95813112f35bce0abf4ecc40538d09ff1675a8b958c9
-EBUILD Date-Manip-6.600.0.ebuild 899 BLAKE2B 15b67a776d5c8ff4d3125499f6da74892ebe2ba39c7c749bd8f1643ea366f4e0782667c2c5d1864d639e2f71a68649468519ac6572dbe4c6db2aa48ac2b1b3a5 SHA512 bfaeb0bb1caa332eb321c0b7744996ac1a3c65be99e9b0685fddbdf91630f9742658995a6b700a930517484f81838f9a3ab25cf4df3195881189079a0aa8445a
+EBUILD Date-Manip-6.600.0.ebuild 895 BLAKE2B df80db03185aaed564cad7c9bcd9bd431941f1dd8433c75fca7e09e79be4e03037485cb8b2e41899d64e678f9ae294f433a241dbe087d39960fde38418f01e2a SHA512 82b1210cb3d0753e9ae6c30c2574c98281d900bcde083d1fced0a830c31d6a9cd6fd02cdb1a74e46159ef005b6d312e773bd9f7a1e0ddf817776ae4bf2c822fd
 MISC metadata.xml 71063 BLAKE2B f7ffb9fe1d37153b8d40d8e176292bc17b65f60b26fb34df4ea21ed66d9f052be669e3eb5c3de0f233454cb35d2098d76949902163630b421ad34afe3923d777 SHA512 3e0885876687e6adb60ecbd0f538f3f754716150ad593f9c729b2ae85f98f081eb694bc5d209fe1156aee475ef14a1e42d260cb46224c462ef95e4318c387497
diff --git a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild
index 86fc1697055c..05be509f1015 100644
--- a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild
+++ b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-Format-Mail/Manifest b/dev-perl/DateTime-Format-Mail/Manifest
index 5e0389bef976..cb28082561bb 100644
--- a/dev-perl/DateTime-Format-Mail/Manifest
+++ b/dev-perl/DateTime-Format-Mail/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-Format-Mail-0.402.tar.gz 178213 BLAKE2B 16ec4de015b19c30cf2ac75ca09ad91081d5842376f30398da7b66a96068acf6c827a9b488ffb1d1fff275d7cf163f8ced0487a70d5fd6cda049bcafed390bb5 SHA512 079a4a4e3dbd8b585726b03809e42436d48a71c94f4a94a662e7955278374ff564ee0fae4a4999f84f2f35d78b0d695b917a737e262a7499940272abd66ac5c6
 DIST DateTime-Format-Mail-0.403.tar.gz 178292 BLAKE2B 931547f40cab8d135167260783c5622a748f90c4d0b3b002496ec2ca26390adc30b5e8fe1b95a9fdd81fcc65a9fa1166413e2a79d390a652b1f74b4447329b2a SHA512 b5e6f0ffdda3c52aa64b65414f399dcc06f72004c5421f8f0dbf1f9d4cda6e0deb1c3873df62531dc265a44ac66fd110dfc1d4273c97a48b0c472a67b03fd56f
 EBUILD DateTime-Format-Mail-0.402.0.ebuild 649 BLAKE2B a57ff7fb896ac9288015b2e8a8cd63ab8730fa7e09cf8acfe812dfd59d5490f049bd74c9a5e047351ab47b1c4739b420528d4a93d4643073952b4769c60345da SHA512 168b80e3b44fbde970bd1533ea82532c3852b92d6d16d4170318ce5b282cefb80278f0c0485558d9b1b4b40aec61f9e567446347b492381bcbd889aafe802aa9
-EBUILD DateTime-Format-Mail-0.403.0.ebuild 625 BLAKE2B b3ea71a5f8a4717da8bba4ed38ee908cf65893be089a1763c0c26b3aa149d8214f566a3502cae1dd24f016269add1d92ec565d430f57783ba6c3f674bfb011f3 SHA512 c30b6ff295f1fea5b84ac7025477b300824e80ea6bf5e90c0528392633f6b80fadc6a76909ef47ad9884fc86f858fc801c16f9a14a3dd35e8a35b49b564a3e82
+EBUILD DateTime-Format-Mail-0.403.0.ebuild 622 BLAKE2B 8ac7c147e47f07dd4de9dd7c59a0a2ec29da2ed300254b139ac36aebb03809844b0fb5c7185066768847a33ac08e2ec0c80ae730d56020fbfd673ac5c6a365f0 SHA512 8cd083afa62ed12c4e35b45a2e691963fda48b84b5236b8f4612ec3514266514c591356af437ccce84bb316dd782f47a99ef4824f4f37ab268eaa7200f74ac92
 MISC metadata.xml 413 BLAKE2B a0621506432e96e33421b27dfefc06731fdb3fa49d22fd6f7cb826e1aa36998ffe95326605369fa80224f1487b425129309a6aa6bb6959e83ce3de71f0f17cf5 SHA512 817090c051dff57cb4ce28ae9b3749f560bdf7ec26daa23d0c6797acb591808971907fc09cc4ff7e2fc4f10ace5f2abb9d45a39f1d9a16ad369f0f73570f2a9a
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
index ce821454224d..b96e949919c2 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.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
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index 567ddf8c3b9e..faed623449a7 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -3,5 +3,5 @@ DIST DateTime-Format-Strptime-1.73.tar.gz 108454 BLAKE2B f64e27719343278cf2d5d2c
 DIST DateTime-Format-Strptime-1.74.tar.gz 105317 BLAKE2B 997a76591b710f61e003998fc97ec26a8c5ce43dff83e42dd9cab5b13238c21e40f327afe46a0258b9f8e725abfc35d0d9957cf4e89936aa17cf79b1f7d111d9 SHA512 3b2b640f93956e82aff47f068c596018700615414c9b9ccf8d6bf68ad7b626ec86a831ec2b68807d7f137c10d4b8cfa5d2d50a6304252f3dfecbe9ff94e59617
 EBUILD DateTime-Format-Strptime-1.700.0.ebuild 817 BLAKE2B c8f1f87781b5a628591bffce85e310924d1ce2bb1d066bbf271225322f8cc33a1e86cbf88456b518c655811e6dd34e70aba990417ac093c40102852960cc3ef1 SHA512 2b5042265816c6ef7ca71ba424decf733842bf3a5741ef3e50d9b3e8ee93e2e4df288419a449993871ed31a565f491b9fdc860292f468c689cae5fc9809d9f9c
 EBUILD DateTime-Format-Strptime-1.730.0.ebuild 815 BLAKE2B 0f1d876d33cc3b835a7c1bda736aefee6f8753ff4c487937fbc0fdae9e59447432561fa175a3f53816f76d54b265a9214e78368869ac90673897cf92c4814882 SHA512 8ebc08bc1a3555accb632d5da4ec479558050ca23a3a3d11e1c709a7f6df4faffd6ad1c28fb7f4c405057f8841da1742d4cc00ee64ca802c553f94e9d76d0a2f
-EBUILD DateTime-Format-Strptime-1.740.0.ebuild 815 BLAKE2B c9089f8bee2f0ea95fbba6e5df83a8432a8d1bc1df9435c585220f4da017b3cb82f47a7b992ca16adf1e3bb71afa271c33ed8679e0734b0e09df71edb634a762 SHA512 267d83e19d96370f3c15209f4752096ededf1be03d0c3ddc70610c8adb423192d0b5032387e2c9b483d813676bb757abaa8f6eaf073d1b4f3e9132308f79adeb
+EBUILD DateTime-Format-Strptime-1.740.0.ebuild 852 BLAKE2B 390097bf37ed1874d1314fdada6e3e35f9d91949a24ebc292aadc536727cb3405c177b5aca41aa217981f4763e12993f03ca05872b8b2d36104fd56d53395a99 SHA512 d456cc4799a8bfe769db816b89b5a14ea19f8129e2ad6044ce9eb2215db327ea321b8f828d067523e7e6b9e43bc3161f4e89a87748e36bef735b9916d537014d
 MISC metadata.xml 501 BLAKE2B 0f79c43ee9cab97c8027a8bceea775c4e2579514e8e6062fb44d95cc04de45d2b60249e62c90c073ff0bd0de5e979d82aea6398e43b35fcd826ae67fe41ea93b SHA512 498bfbf685542fe1e8920f007e004338d06a0d28b88faf8a323370015a3697ba22be57b47b2d77ebcb5620e353dc8079cf6a05b03493c17e28074221895825c5
diff --git a/dev-perl/DateTime-Set/DateTime-Set-0.390.0.ebuild b/dev-perl/DateTime-Set/DateTime-Set-0.390.0.ebuild
index 958dad71fe1c..c82aed036407 100644
--- a/dev-perl/DateTime-Set/DateTime-Set-0.390.0.ebuild
+++ b/dev-perl/DateTime-Set/DateTime-Set-0.390.0.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Datetime sets and set math"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-Set/Manifest b/dev-perl/DateTime-Set/Manifest
index 4fba8c0ee440..a6e8bb06b152 100644
--- a/dev-perl/DateTime-Set/Manifest
+++ b/dev-perl/DateTime-Set/Manifest
@@ -3,5 +3,5 @@ DIST DateTime-Set-0.3600.tar.gz 45628 BLAKE2B ea1a5852c403ccd723948b9dd0c35286c7
 DIST DateTime-Set-0.3900.tar.gz 45158 BLAKE2B d8d4e3fa9cbab0196d4f71e551a2f93df9134ac21f2f348d424197cc157d9d9ae04cab1b70fdf7d3a557c28d2eb25d6c4aa53c976f7f03842dd0b80d42018a68 SHA512 cf480bc6220392567757665828541d9cd5534c28aa54e81ffde15c5fa23ce33e64dbe153cbb5add4a6a466a3debc28bd92166aeb0d107ecd9c73960d93b6442f
 EBUILD DateTime-Set-0.340.0.ebuild 504 BLAKE2B 36afa49744ed130864ec16815bddc1c8a564c18fd3c8961b8711a2873a4b05099dc5bb6445628033a2daa542b79bf5286d47cfcdd4f0b53f12e622a7a9ddd2e6 SHA512 5936400046a0624dd650430fc66d5a01c13913da61d7439e47982e8bf6ba392e0623de68372243d60ff10af4b58fbf81a26f7ff74e6fe05064592bfc763f907f
 EBUILD DateTime-Set-0.360.0.ebuild 490 BLAKE2B f6722ef243be7ec247843c2367a965c0e0effc53ca1306c1eea6bf3d134d257db41644b1a01164c4451d54848ee573517f87fd9401d18d4b1466a95a4263396c SHA512 0ae2898bce5a526ab2ad88e95c3f29333b892e460a1a7ab7de358308c67358db1e3ee29a38e4e6f553e92fffc1417b0b9de75871b4320fca194459f4b67c200c
-EBUILD DateTime-Set-0.390.0.ebuild 490 BLAKE2B 02fa02837aed1cf63fd3c7720aedc7201ed49807cfa2b1086a7947e6d3ee816061db19f3d411595486ed3597a9bc8540af6bce49eddd81626eb4255a990d413d SHA512 57998ab947cd551d79e1eebce6f6b0d5c06a0714f7b5e6e588f9b427c7ff3c6594d371e0edf3c9ef89567807b381567b440ab3e80608427f6d9e7a0e56ce2214
+EBUILD DateTime-Set-0.390.0.ebuild 488 BLAKE2B 7f27eae65006617e6014ccb7f1cb197c0730afe491c8a1d14e322d2a1bc7b8f2c5c6f99f2b11c6440f36fe6867478975be8aca285c5a3b4d5a4523323a9af649 SHA512 60d3ec82d7cb7d1a4ffd30ab37042e39fd1a97db6a991f9f6972e697b352f087723abead031568a8b151966630bae51b821b69f9bbbd30fd0b99b3bb132cd2f9
 MISC metadata.xml 594 BLAKE2B 4b424c120c760b97cf30fcb5878d90877f49b77ad9272b3d1b563f583ddcd4e26d12df297779219c706a57488798ff07745e157fce16952ef60c520a2899ba28 SHA512 6f434d23fb8d32bdb378ad05b288b57b120afbf781847f492c033e5d69566557e4c5b29149661309b3c25575dda57d8306a4ef49691b59b6810a4423bf23ad30
diff --git a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
index 46abb8a65386..97dabcdfca37 100644
--- a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
+++ b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="check that a command is available"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~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 ~mips ppc ~ppc64 s390 ~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/Devel-CheckBin/Manifest b/dev-perl/Devel-CheckBin/Manifest
index c9e86b7a4823..9e6b2f5b5ea7 100644
--- a/dev-perl/Devel-CheckBin/Manifest
+++ b/dev-perl/Devel-CheckBin/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-CheckBin-0.04.tar.gz 9866 BLAKE2B 3af73c4617ce61c5aefbbfe0c50f615db5052c6a52a1eea095105360e10e257b1a159f7a5a2fdf0f44ef8a4e4d2df1656e99a5a5cfac41fd10a03c8e2b20b62d SHA512 7b28092fa2e6309ddc09976dcfadabbad9be678352c5b97a7938bf7e73944454e5c3c198aaf1a39939f24544e436ec4323925e77fa91e8d92e3986702c840f44
-EBUILD Devel-CheckBin-0.40.0.ebuild 705 BLAKE2B 5207469677e28f3e090a317ea24fe72fde4ef3b3f2688ac38075df6adb137909dedac094675c025dd5d85f658ce71fe3175453e353bbb328e6ac5305bcac6119 SHA512 7ba5c0531668103cf609d13fbb7c74b0263dba54f38c08effa796e04fd1c86fac773dbd1c54d73d4c5dc4a6e8aaf3532c32c8baebc70ddf12b8808ab1c7f5f5c
+EBUILD Devel-CheckBin-0.40.0.ebuild 710 BLAKE2B f5a7e796b9c996e36b4bc271c6dc7357fa29d84f9b53baee4626a292e18682d5360629398d39c46f50f0e7b6e751fd0b07a2566ef0e93770d25ec1531133e92a SHA512 1f3019c54925f1935ad4ed6b08415ac1100c515bb53d72d7dd21b27fb68886533e3040a65afdba66e9ebb552a13f7a9cd9ee3f6c00ed3031365c37d49d29d54b
 MISC metadata.xml 400 BLAKE2B b85d354f848a85c94081164652dfdc5e05e01bdaa3121d3e6c97078aec870c73d76c16fa55036b33eb22115c80d36357d8035def85a66ba196585f2e46a8f864 SHA512 c26c65732866752bb7864d94223d837b8c9c21a4a2c0f96071971c9eeaa0768f2ee393194da3ef14e74dc6e37a990bb81159126bc77fb5e51fe90ff69b4695d8
diff --git a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild
index c1d9ff3803f0..bafd7a0baefa 100644
--- a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild
+++ b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check the compiler's availability"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
index 9e89f5941f6e..78ca461c7e84 100644
--- a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
+++ b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check the compiler's availability"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-CheckCompiler/Manifest b/dev-perl/Devel-CheckCompiler/Manifest
index 80e11d070fbb..622ea9a56c55 100644
--- a/dev-perl/Devel-CheckCompiler/Manifest
+++ b/dev-perl/Devel-CheckCompiler/Manifest
@@ -1,7 +1,7 @@
 DIST Devel-CheckCompiler-0.05.tar.gz 11384 BLAKE2B fc244b15a58b2f9a7624f2d1c1aafdf66cb3d8054dab890546975fd843c14c82d49f35b0ffd352dc8885659f360fe3d6b196bb3648eb38b6bb44880bed14a637 SHA512 5bf40abc7df914a9bbd5b185a40d597272f2f8fb0a94f95b1790ed247a529af8c31bc8ddfcae75ceab4d504ad8faf86ed63eefbc5081a208bcccf0902464d73e
 DIST Devel-CheckCompiler-0.06.tar.gz 11694 BLAKE2B 91782db4ed2592adcc5afeeacf48f646495d5a48cef4ee9137f76ab7f0ad2b8273d2d717a2e192628972f068162535798aac190cb22e3c02bad298c74f62f601 SHA512 f484240dd52194aa71f98001bef47d03048cc5336e10ffc6a84db750fec3fb7f5e8aaf86f9fd1bc84928a8f76cccf07ec6a105e2053a2858c4aaa3c87f655735
 DIST Devel-CheckCompiler-0.07.tar.gz 11261 BLAKE2B 14321bacc94d45133e781007d644b9d4cbe0edba36a25cf15739e09bab214fd01b0b21616517bb7070f2082a17a22b7e925fde4cea0699cb6c30ae345a498138 SHA512 147fbdab382ff40bf1402d2d6be1143fe77403cd2444e854fdf11eb02e8acdcab8cb6bbdd7f3aef01cc64fac2862efaa044c5148c7770b84b464f7360c399d7a
-EBUILD Devel-CheckCompiler-0.50.0.ebuild 584 BLAKE2B d41018871eb89904ae6b43d98af00b62e69a05fcc1ff2bfd95ced93b22303d882dd5abbf572d7af3ef8d26d8bd8fcf045261f53e2e38a1c8f5526fcaae356fa9 SHA512 db37a72acfbb0ed503d109a14db28963840e7af00f8dc1f673edbd655616cab847f95ece29f4bcd0b9225baab0629a5dae7c26481c626ff36df2c578d74cd373
+EBUILD Devel-CheckCompiler-0.50.0.ebuild 585 BLAKE2B e6fba5b12cfadbd8474a3006c83eb1d719588f8c2a48beb329fea929ad61967b82d78cec9ccbd056419aefa47dbacfeb3f21eef72226fe9ab66f28453ec6f008 SHA512 ee61a88b6671cce0b79f16faacfd6816f839d75bcccdfbf4254bdba277059e61506dbbd691d743c052d5cfa28bdf1652eebc23da5eee94d3d9aff72d7ae138dc
 EBUILD Devel-CheckCompiler-0.60.0.ebuild 496 BLAKE2B 71ce96dcfd3e98d7bd1c3b2db682dacaa18a74ac971dbbb34b172d17dbbaf063ce25c25727a1e7f6fb07bd0c13971e835592d23a8476a182db6d7838bf610e39 SHA512 defd203e24a13247c327816cf02a199f3f805a5df03f75509d0b3bd58beabf2999527a16f068d322dd2a2e74d58fc7b0b990ffb26aa8d446dda6c03c2528eede
-EBUILD Devel-CheckCompiler-0.70.0.ebuild 500 BLAKE2B c2bcd6b6d5d1520e7c9751fc370393d5e6855ae8fe9f4d0b3181a9550b30f89019fa4d7b91efa7f77b62caeaf2cbf40f93ec87831cb40f5c709b90e9a85032bf SHA512 e58345bd9631414a9653ebff671fc7199cd3de32c425c8b6dd1c0bfa2451c786494ea8139d86e4fc9d6756a686083227205def409ced7f8c23b5f23f3bf19847
+EBUILD Devel-CheckCompiler-0.70.0.ebuild 499 BLAKE2B a48d1a1875d2e0d36ea9e42fad6b578706d7e20ad2006aec1f479ba8a36e6a33b297680e5130f35e8864956925df284903d06eff16705998c797a6301dc03557 SHA512 538734e4dc662b588af87598a81c3f557b9ada8179fdd5e02f7d01add1912674e8eea5c04a3ddcc075cb5358eec88a86a3b5840415fb3f8f8e84b12808aa1165
 MISC metadata.xml 473 BLAKE2B 6a72a334871ba29f4279f17676bac22f26d393f45fb15aedf3afc1457c5f32fa83ed4606b007fdcb17b92f76f1e8827d95be4866356202eb50ce00297ed0faf3 SHA512 b3ec611f8b34ce584d67e24614695a34096923ecf2f5bea23764dc2f18881607eeb43e43ce6e24c143f3d82e7bbd963796d48e096a690a8d5eb10c6defd06335
diff --git a/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild b/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild
index e33f79a784f0..e506bbc2957a 100644
--- a/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild
+++ b/dev-perl/Digest-MD4/Digest-MD4-1.900.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
@@ -11,6 +11,6 @@ inherit perl-module
 DESCRIPTION="MD4 message digest algorithm"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 SRC_TEST="do"
diff --git a/dev-perl/Digest-MD4/Manifest b/dev-perl/Digest-MD4/Manifest
index 842b535e027e..68076d4a46ec 100644
--- a/dev-perl/Digest-MD4/Manifest
+++ b/dev-perl/Digest-MD4/Manifest
@@ -1,3 +1,3 @@
 DIST Digest-MD4-1.9.tar.gz 29304 BLAKE2B 60f11c28e50a83d9ec6f89ac1108af1caa1ed6cb0dc8b73dde15eafff92b73db7f775ff05e33026088fe842c4e7843e45abbf28b65563a60057bebfdb979f33d SHA512 618ac83de37c697e0ea1354383d755cbc4b097b2156a8ae0e83d9463822bc860733f2b064eb6b614b4ef6889460001a4aed2e1607e38d409e75dc9d1772b059b
-EBUILD Digest-MD4-1.900.0-r1.ebuild 348 BLAKE2B b9861cd1fc015cc715ce321d447ba508b40b8a6b560e7ea7c33c4d35415d66587d6daf813a27271c4604d6b99afbc487575e35052a7da33b73524559db5583f3 SHA512 061513df7b31a6c47ea1336054aecb4548aeeb820775337ed4337f4c8e47de923a5147e7991d74b701cff5663a933727b8dd0d1dfd37eb1c9f2bd211e61b07e9
+EBUILD Digest-MD4-1.900.0-r1.ebuild 347 BLAKE2B 76fd46b19c91eb5cde40f96a03bfab6cfd73319a6b29da1358d7323e8cd2f423068e96e009048f447c2ebfb37b5935591392e5fd6487376b609b5499fdbb8a2d SHA512 3cdb0a9f32aaeaa6f8ddab1bb7f2b6fd8a35e5e6fe6ac86ff7c3f18fa21574616e14b48d417011cfefdd37e6c51f85d7292e1094ba5f63a96ec637593b67cc1c
 MISC metadata.xml 392 BLAKE2B 6d5fe1b515e256dac7824d5478db2dcfb74260d010bbc781e07d1f7b9138ed7f516c4f520cebd42ed143fac9b5e8dbc18eb30e7d4c7805e774b5952b4846cff6 SHA512 30ff895ed32459ef89f3b11666ed9f373dd76dd052591fce9ba1fe1081d587353fb7a689faf82c53625340565608522bfb76600439d67cd6de81fb6b2c44bcbe
diff --git a/dev-perl/EV/EV-4.180.0.ebuild b/dev-perl/EV/EV-4.180.0.ebuild
deleted file mode 100644
index f9d245126444..000000000000
--- a/dev-perl/EV/EV-4.180.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MLEHMANN
-MODULE_VERSION=4.18
-inherit perl-module
-
-DESCRIPTION="Perl interface to libev, a high performance full-featured event loop"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/common-sense
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/EV/Manifest b/dev-perl/EV/Manifest
index 48e72519388b..fa1910030241 100644
--- a/dev-perl/EV/Manifest
+++ b/dev-perl/EV/Manifest
@@ -1,5 +1,3 @@
-DIST EV-4.18.tar.gz 190556 BLAKE2B 9caed5ab4e2528c71148fc0553458246a2142f1fbff5f957e4c7f14f8b190b839afad1e658c5686103aeaf888feae3b623b773f2fd317171c1f7b8488db3247a SHA512 623ce15d0e569a70ce6df1fab7c7545e20a1bb2ed41b36375621cdeacbf51732f662275b31d2f50ab17de4f25e37ecfbd4aff030fd4a78aefa30b26cd9d461d0
 DIST EV-4.22.tar.gz 193418 BLAKE2B ac07559dd2b35e68da0338a52cbc201ed59b0f690e2c2bf7dae0e2476356cdb5fc3d749fd98b7fdb97f16c7e318c8ac20067f89c1c43b84c4ab148c241ded399 SHA512 0d30d1388a75ed3af24c3b854d8c2a54bfc62c274591f13205c35748f3652122bae85f46aae174ce5963395233536222c8fae35e8118cbd5af2f7ed0c45b70de
-EBUILD EV-4.180.0.ebuild 418 BLAKE2B e6fa6005e3f5485f652c50720190f4652061eb57e4723c8c4a9d43c1e36e1bbfa9371f9238ef49e138095a1e96857ab99f5af3c17a506fca293734646da42975 SHA512 4bd75dc5819e0fb0abcfa2dd15ffdb84c184f346e4f336dc5414427a048e75d66b1393b05ad826189a6af0c6eef6e17921db68c6dc3d377d77005de3612def47
 EBUILD EV-4.220.0.ebuild 433 BLAKE2B d7369bcf1d77ac67f57e59893ad279bb21db103462836786ff50e6dbd6af02357af0f0c6eb5938d69ff4e9bb3537cf205ae7c71aef49b998a2d65ccbf56cdcc5 SHA512 a09bb94f7fe631cb33998f178ab5e674cb93da940fdbc7d6519a2c24b2032c6fb2c604dc3ba51c829f5780e6582a8fb5e70e17ff32d16d588b1a6636441f86fb
 MISC metadata.xml 435 BLAKE2B 8f2ed859b03c2d1196b8a62b86df3dd94cceb0ddde707d5f12104470ba052acb98cca22f23e02e095c6aba323f2f09f4b0f9d58679c11b8e5ec6388a5ead19bd SHA512 318843ea1a505f044ee5cb8695c9abba3f1c80202bf83632ccaec509df003a1d939ca423f8cb9bd8f849d9fdf8ff3159e70d9f447b8cedfc4fb9e1a11af70acf
diff --git a/dev-perl/Emacs-PDE/Emacs-PDE-0.2.16-r1.ebuild b/dev-perl/Emacs-PDE/Emacs-PDE-0.2.16-r1.ebuild
deleted file mode 100644
index 967883846fe2..000000000000
--- a/dev-perl/Emacs-PDE/Emacs-PDE-0.2.16-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="YEWENBIN"
-
-inherit perl-module elisp-common
-
-DESCRIPTION="Perl Develop Environment in Emacs"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/emacs"
-DEPEND="dev-perl/Module-Build
-		${RDEPEND}"
-myconf="--elispdir=${D}${SITELISP}/pde"
diff --git a/dev-perl/Emacs-PDE/Manifest b/dev-perl/Emacs-PDE/Manifest
index db6a4e37d0ed..3060a343f22c 100644
--- a/dev-perl/Emacs-PDE/Manifest
+++ b/dev-perl/Emacs-PDE/Manifest
@@ -1,4 +1,3 @@
 DIST Emacs-PDE-0.2.16.tar.gz 619372 BLAKE2B 7d9eb5a7e3c61424b58bab4186efbd4426ac6c94a2043ade3a5de2da060e5eca2c2fc8ab20d5b3bcd3458036bdd8db861aef1ef963e0276e1c759c151843f362 SHA512 ab104070c820a618b0ce05a2d658cca56ad9c0d537e98697a98262c4135486cba2284ee597210dfe8c30348a0fadb9f76455453e17a86a0123618ce076b5565b
-EBUILD Emacs-PDE-0.2.16-r1.ebuild 430 BLAKE2B a9ae3d4d5a4e1e45404d4ae79784929a3706c2e29f5124c4e5e819f9bace0644f61cbf069bdf217810e4674dc3749ae28ab234b2e10e5aad6ad89bcba83c6c1e SHA512 0fc20e4b2d5d76e00f244f0ebd8cf94abc01d6d00935797eccf2eda36af07d033e8af574b7ef32d8218969296eb7a215943a7449cd7354ba9ac6c325f980c17e
 EBUILD Emacs-PDE-0.2.16-r2.ebuild 885 BLAKE2B b8bac545d48beb8e482084b205dbcb316f32b9ad92690cf041480af83e7223143e79f1ada5127e22f2faf1c7d469709d7cca32ee750877e3004e7059a8196a6d SHA512 124d1a2f2b949af62b31d2e51df5cc81b18ace9a53aeebea25dad4c83f68924a4547f87e8db127aee0af5588b23d7c05b577b07bafd59e5649679af6e8c205ee
 MISC metadata.xml 453 BLAKE2B 96859e4fb5666d3c87e2c57dea284e0bad82954a11845f7a18aa3e46b19c56220a1146c547ecb97d3d025d4235401885b5fba69e82854858fad8719fa88da8b5 SHA512 d8fc866f58aab9577e417d89ef2479e34f3e0b0fbc7287522447cdfa3779d6cc26eb5a752fc4cbfe2dce064906f29421776f432ed7cd7e62a80de545d1fa2ade
diff --git a/dev-perl/Email-Filter/Email-Filter-1.32.0-r1.ebuild b/dev-perl/Email-Filter/Email-Filter-1.32.0-r1.ebuild
deleted file mode 100644
index a4e839b14f0a..000000000000
--- a/dev-perl/Email-Filter/Email-Filter-1.32.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=1.032
-inherit perl-module
-
-DESCRIPTION="Simple filtering of RFC2822 message format and headers"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Email-LocalDelivery
-	dev-perl/Class-Trigger
-	dev-perl/IPC-Run
-	dev-perl/Email-Simple"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-SRC_TEST="do"
diff --git a/dev-perl/Email-Filter/Manifest b/dev-perl/Email-Filter/Manifest
index 70bfba26ac30..482472d67cbf 100644
--- a/dev-perl/Email-Filter/Manifest
+++ b/dev-perl/Email-Filter/Manifest
@@ -1,5 +1,3 @@
-DIST Email-Filter-1.032.tar.gz 15255 BLAKE2B d10cf80e51217267d84fdd7857f7815554eac04fad541bdfb4dae5622d2daebb16ae7f5c80cc1d9740bfff9c491d02518196aa4eda9ca0aac93f35ec2fe3da07 SHA512 bfb15488473c4336d501ae0640599c4c2703fae3fb3f02a8e88f126c8b768c9af133c42f983659faa8fc4809e442ecdfaa6277c787b9ed4152bc85133882a4f3
 DIST Email-Filter-1.034.tar.gz 18133 BLAKE2B 84a254f6f475694f466b4a4d72b5ef4d71eb27e3e5d639aa1d51b1bee48f01fc667e00fbb8008159472e516febf93f47dd11fd82ff27c2a40b61ef8a7cdee2ae SHA512 8b377c3d7503f18f03c8bd97baed17a5615c41cf737886aa834aa324954531a464b2564be244c4097fb9d5fe1b612885303acbf1d7dc8b2a64a739fb81ef3af6
-EBUILD Email-Filter-1.32.0-r1.ebuild 506 BLAKE2B 01a8104691b91eb0cbc09d9d3578c26a2fe1c47131993ce40b2861d1e939ff868d10631827bfcbda0b882cc7dfc13bf96dfd884681d61984d7fd2c2d9bb2ea86 SHA512 78e39e4eee2b8afe9f56ff11bae2a9811468ddb05bde1870eba33a379ce01409a332bc1131b5c756a905cf6a79b516b3c708c84c86b44528b203325f02e7cc5c
 EBUILD Email-Filter-1.34.0.ebuild 545 BLAKE2B a22ff77d08b71cba675a5fea31754b2d7fdfc7a666d7f557d78614bea907726c93c761601863b887978e98ec904bfa102411f8a1408747327a9f884b572c254d SHA512 28711c3b7c56d23e8091fbfa3e07186d27c5e9bf7c80c62d56f58fb0b7e07c6dd77a9aac1c4edbfd3d5c7349a5809be8b45a00803c182d50763122760972179b
 MISC metadata.xml 396 BLAKE2B 1fe02e5dc157e70aedb21ac3b68b3315873f64634d84b67d05ce7cf4e4164c071cfa86d9f34f1f3217753405072787eabf2917c3287952032379fadfe41bc9c3 SHA512 77811939c642dec292a73cd4362051801022093be243152a57ba63f56b490a278994b0b70d1f992aa87717a79e027f7d4a1e701392f74523b8e73f6107ef1453
diff --git a/dev-perl/Encode-JIS2K/Encode-JIS2K-0.02.ebuild b/dev-perl/Encode-JIS2K/Encode-JIS2K-0.02.ebuild
deleted file mode 100644
index 9f700a49e286..000000000000
--- a/dev-perl/Encode-JIS2K/Encode-JIS2K-0.02.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="DANKOGAI"
-
-inherit perl-module
-
-DESCRIPTION="JIS X 0212 (aka JIS 2000) Encodings"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/perl-Encode"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Encode-JIS2K/Manifest b/dev-perl/Encode-JIS2K/Manifest
index 5a73c7252677..56e7f842e842 100644
--- a/dev-perl/Encode-JIS2K/Manifest
+++ b/dev-perl/Encode-JIS2K/Manifest
@@ -1,5 +1,3 @@
-DIST Encode-JIS2K-0.02.tar.gz 401178 BLAKE2B 20d7184c7e8c2a35e5798f6c19b9adf99c303b8d0c529413aef9eea4ff72264be333c212e73663965c6990f41db4b4ee8f67db8feea39bcac39071cfb10723a7 SHA512 a635c82a26f9ece561ad9663ea09bbd3ec18782f3682163158c8453138867394bb6beed173895d384af60d07663da845a4b4d22fb97e57611e352f6b0de04641
 DIST Encode-JIS2K-0.03.tar.gz 419693 BLAKE2B a57a016cd8254c5542bd07a24a48d3d2468feb61e5767e64cf8b15844b661cd4667c796ea32484c3724e691a32c3282908000920672bd7bcf32edaac153402c0 SHA512 93d73a84e394faf8411d158ead0bc398ff1935ba14e35c64992d9fc8c2aa4ce1a71b5f46dbb1a765d3b160b19a9216bec68d42c8be1940d271dde418a62db4ec
-EBUILD Encode-JIS2K-0.02.ebuild 315 BLAKE2B b16f4ca836a55702ffc61e90adc0e7a6a1e40f0e89855fc9b198ccae83570f3b9e1016f69eb7cff01cce3da1951880d651400e05694bd69e62eb93a441455e42 SHA512 b9d0a990f35581f564946ef47b6499eb5f26ac6de4fbb169071aae9899f1299ff7ab8d0e5257c001d16691d50261518ce1cf06dc225ecad53bd7e52fb5226b44
 EBUILD Encode-JIS2K-0.30.0.ebuild 353 BLAKE2B 31a845f2d622a8825f66680701829dd68b222a5d208cb5236a622e9fc7276a995ca04d4279f3354e8b8ba813bec728e536475d885bf84cefc586e77abf0349a6 SHA512 ece6808a2fccee1deb03c46239d7becc9dd3239e643d1cb8f956330b5ae644489d45137e1d419b905265a2879148a1d11c3cf6521a0ab1fbf9315865e43bae05
 MISC metadata.xml 467 BLAKE2B 5489dcb0301b0a1b0075afc5dbd9e6ab7fcc7df19061f4388737b559685dd60c801da82faa9392aff8a8a63f891f5f14e08d034dda35d64f24ac8feaeb5c8f8c SHA512 599b91a4f89caa045b4fb7fe543e3d6ec407f7ebc9fdbb19d9241749d6682bb7d9cc427b4a940cb313c7b9126209fdb5ecb60a8e1c9d111583dd2baea23da1b2
diff --git a/dev-perl/Exception-Base/Exception-Base-0.250.0-r2.ebuild b/dev-perl/Exception-Base/Exception-Base-0.250.0-r2.ebuild
deleted file mode 100644
index 352ab216de8a..000000000000
--- a/dev-perl/Exception-Base/Exception-Base-0.250.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DEXTER
-MODULE_VERSION=0.25
-inherit perl-module
-
-DESCRIPTION="Error handling with exception class"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( >=dev-perl/Test-Unit-Lite-0.120.0 )
-"
-
-SRC_TEST="do parallel"
-
-PATCHES=(
-	"${FILESDIR}/${P}-sprintf.patch"
-)
-
-src_install(){
-	perl-module_src_install
-	docompress -x usr/share/doc/${PF}/examples
-	insinto usr/share/doc/${PF}/
-	doins -r examples/
-}
diff --git a/dev-perl/Exception-Base/Manifest b/dev-perl/Exception-Base/Manifest
index 63010b3327b0..607fbab6e1b9 100644
--- a/dev-perl/Exception-Base/Manifest
+++ b/dev-perl/Exception-Base/Manifest
@@ -1,6 +1,3 @@
-AUX Exception-Base-0.250.0-sprintf.patch 2200 BLAKE2B 265aa54906bea0dbeeb961ea54f9129cb42c89e486c1c5459df7ea1e871c9b6c0616e3399b2401d150bac2a0fe0858ec1e4e9cb9991d9321034b2da0bc1d5bd0 SHA512 1f2d8089e24f4c0507d880f62bb32173bb5df920e5eadd66102b96c562ff9ce86081c34d23a7e53ad6c8006973b6675d54bf60a47c81d1ffe3b3da49f07ab9f1
-DIST Exception-Base-0.25.tar.gz 59534 BLAKE2B 1d5074c6566d2ecf840c323f17cef1a5b0663b5354fc8894ebe54833a1f6194ebceabbc2ce9a918c481b9ab656d44d3c455fd6125d7e9480a008afe80156192f SHA512 4bc416a8a4096b2149a205dc3129aabaa49bfa9f29746b31a09cbade01e15d53ed82649b75d69c508568a7fb12726e319360aba128102fdc1e0a7ba583473e65
 DIST Exception-Base-0.2501.tar.gz 59965 BLAKE2B 9ec7e07596cece55153cfcf40fc95097c08bc8168b90164745374a6d639f93b2b4548b3cb7240bbb28113ef5b86feccea4637782432c10b2f469fe96a3b0d734 SHA512 848993b3d72f3a8f79467c69afdff848e61aed7d24977bafe4cfea56631a5c4746f9993330a4373a1c727f440c0cdc70e4001d7841f17125cf603772a6805acd
-EBUILD Exception-Base-0.250.0-r2.ebuild 582 BLAKE2B c9268d4bdf2fb247800933f5897a375b6d71cf948cdbaa06937d80875a55d647b1a0b87fc9fce8ca0b3c77bf82600a92f13f373f52436c964adc578ebcaad41c SHA512 8d277bc43cbf6f141057ffcb22564cf6f806f1e11159ac13aace0562401d25d599ec25a343864d5a86b1c8353aeb358ac608b2620f3ed46ee5ddba74d1fe73b1
 EBUILD Exception-Base-0.250.100.ebuild 509 BLAKE2B f656070b4d7a8e8a1c7519e69f9a54a0abb69476152dc202f404e07061ccab6d41af672e1559bb941c2eac91b825f980142f8cded859327de5566a4590831df8 SHA512 b73c36ee0e21a61fac924fd5befe86168a2e90c1cfb1ca761cd1fc12e7c31136da7ebd7163252903504627d4d36581272eb08e714f9b9725c05c1fb3bdc48b81
 MISC metadata.xml 400 BLAKE2B 570607d745210c217e019a4ec030f1fd41617506db9d04284dbd9f64afede67b0dea739a5da57ec07a0b809603476634edcca0850f96bb7e61c5d3ef1c5d8dd4 SHA512 1427e9be5dea4c78e4cc5fef604c1b2a2f5f56e41a0ae9a124a719afbfab52cfb54bd3ee7c884829f9dc6a2548fe1afea80ef055a512802b971f8606a99a275d
diff --git a/dev-perl/Exception-Base/files/Exception-Base-0.250.0-sprintf.patch b/dev-perl/Exception-Base/files/Exception-Base-0.250.0-sprintf.patch
deleted file mode 100644
index 656c3eba4ee3..000000000000
--- a/dev-perl/Exception-Base/files/Exception-Base-0.250.0-sprintf.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1cb0ea6afd4bb76e5a1d759efe27ea0f18306a82 Mon Sep 17 00:00:00 2001
-From: Lee Johnson <lee@givengain.ch>
-Date: Thu, 1 Jan 2015 22:33:54 +0000
-Subject: [PATCH] resolve #1 - fix warnings new since perl 5.21.2
-
-Redundant argument in %s - this is because the various calls to the
-sprintf function offset the arrays by 1 (since the first element of
-the array is the sprintf string) but use @_ (the number of elements
-in the array) in the range: 1 .. @_
-
-since it's offset by 1 we are going beyond the end of the array and
-so sprintf consequently warns that we sent more arguments than it
-expected. fix this by using @_ -1 in the range (number of elements
-in the array minus 1)
----
- lib/Exception/Base.pm | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Exception/Base.pm b/lib/Exception/Base.pm
-index 8dce19f..096e2a5 100644
---- a/lib/Exception/Base.pm
-+++ b/lib/Exception/Base.pm
-@@ -1362,7 +1362,7 @@ sub matches {   ## no critic qw(ProhibitExcessComplexity)
-                     local $_ = ref $self->{$key} eq 'ARRAY'
-                                ? sprintf(
-                                      @{$self->{$key}}[0],
--                                     @{$self->{$key}}[1..@{$self->{$key}}]
-+                                     @{$self->{$key}}[1..@{$self->{$key}}-1]
-                                  )
-                                : $self->{$key};
-                     if (ref $arrval eq 'CODE') {
-@@ -1393,7 +1393,7 @@ sub matches {   ## no critic qw(ProhibitExcessComplexity)
-             local $_ = ref $self->{$key} eq 'ARRAY'
-                        ? sprintf(
-                              @{$self->{$key}}[0],
--                             @{$self->{$key}}[1..@{$self->{$key}}]
-+                             @{$self->{$key}}[1..@{$self->{$key}}-1]
-                          )
-                        : $self->{$key};
- 
-@@ -1613,7 +1613,7 @@ sub _string_attributes {
-     my ($self) = @_;
- 
-     return map { ref $_ eq 'ARRAY'
--                 ? sprintf(@$_[0], @$_[1..@$_])
-+                 ? sprintf(@$_[0], @$_[1..@$_-1])
-                  : $_ }
-            grep { defined $_ and (ref $_ or $_ ne '') }
-            map { $self->{$_} }
--- 
-2.4.5
-
diff --git a/dev-perl/Exception-Died/Exception-Died-0.60.0-r1.ebuild b/dev-perl/Exception-Died/Exception-Died-0.60.0-r1.ebuild
deleted file mode 100644
index 1816dfd1d5d8..000000000000
--- a/dev-perl/Exception-Died/Exception-Died-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DEXTER
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Convert simple die into real exception object"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/constant-boolean
-	>=dev-perl/Exception-Base-0.22.01"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-#	test? ( virtual/perl-parent
-#		>=dev-perl/Test-Unit-Lite-0.12
-#		>=dev-perl/Test-Assert-0.0501 )"
diff --git a/dev-perl/Exception-Died/Manifest b/dev-perl/Exception-Died/Manifest
index 6d47d14a42b1..99a5a58eecf1 100644
--- a/dev-perl/Exception-Died/Manifest
+++ b/dev-perl/Exception-Died/Manifest
@@ -1,4 +1,3 @@
 DIST Exception-Died-0.06.tar.gz 19937 BLAKE2B ad9ad431573788b9fcc017c567ca0f5d5ead7370ecc1a301f5d3242fd3d6be47cec0dd5d51f5e0f40f7b0914b72aa2582599e8af645428fb6f669b300b0f0ddc SHA512 770c123b9f1f3f5d310ba5367c5630e8d8fa0e16cfa74a3d9301fad960b02590ecdf7eb00e77a3c4d56807a3b45a4ac9eb6579158300099dd7160fafc7f2df06
-EBUILD Exception-Died-0.60.0-r1.ebuild 496 BLAKE2B 5506cc4753a4d8ea3f157737ef28e31aa1f49faba9d0b5fed1d6323ab13024f38f52028c96f74531db9f43608fe2285e0dc99e730f21b8e88ee9ee4104889387 SHA512 562e4b822a45da87e4237786d46e6ac0214bc9a22aac8b37c432e58859968b9b26b63a42bdc2a53f228ac122df03dec3c4c1dc994dba6b3599b9f64325a3b041
 EBUILD Exception-Died-0.60.0-r2.ebuild 521 BLAKE2B 33578c1edf5641a39cd34e11c5c877e1f82577e2ef0e06a8463d2d7384b8bb4013c3adda21135ee47ff181207d8013d69fd1073da03e822c11a83371853e653e SHA512 48ba43a7a403f394bc489b171a8e6d992ce7c4bedafbe056a5bbae5be2070ac6e9725816ae27a27b0ebe1f82bdb86c83856a82a545af59ace6c68e656f2d0ed3
 MISC metadata.xml 400 BLAKE2B a83e749747ae9ac28bf978ce2670072d6092f3613ce00bccef65291db7f968be4203ae6a2ce34d50e987027731efae9ccabeec0bf3d94b507670921c35bcf78f SHA512 b013264cbdf5720e33840434ebb4f515b1be20a9c2e4f456d2e5db3a26201179a9dc0ab4f0f58940b87c1b925218f09c53b24fa2bafeb032d93816721545ed7f
diff --git a/dev-perl/Expect/Expect-1.350.0.ebuild b/dev-perl/Expect/Expect-1.350.0.ebuild
index 1fa19743c275..947969a9df58 100644
--- a/dev-perl/Expect/Expect-1.350.0.ebuild
+++ b/dev-perl/Expect/Expect-1.350.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Expect for Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Expect/Manifest b/dev-perl/Expect/Manifest
index 6639617add96..cbe751d52a13 100644
--- a/dev-perl/Expect/Manifest
+++ b/dev-perl/Expect/Manifest
@@ -3,5 +3,5 @@ DIST Expect-1.33.tar.gz 62268 BLAKE2B a577e8a2d095154cab41751d76b30389a53603a2f2
 DIST Expect-1.35.tar.gz 61667 BLAKE2B 09bdbad8257276dc3a4f130f8191a7fbca7633cd019cee71b74353bf908a782cd8d79bfa1cb3837231f14309dfdc9247926cdfb784eb5a6b8b960e3d63f0fd9f SHA512 97ff1969323cf0bcdecc792199111e273e1a4c032a9cdecac1acb521a280e772256c1a8c5433b4da1f34a585d83608522e9f00cf3c5a0a30211662a5373ef0b7
 EBUILD Expect-1.320.0-r1.ebuild 630 BLAKE2B da1def3011ce6a29df5a6e245fe85bc1467d039738593f7fdc75239f0dd8977c07077bdaf276d41e041b573d66f5247e9195b129b23f692927216e3637ef1b91 SHA512 2d183d93ab829985fadea58fb7720dc22cee0961facffc77fbb1f89ea8ba3db0df23397437d296134d480a7bba1d4570854fbf3ef912c8ef7c321da2db6f8f22
 EBUILD Expect-1.330.0.ebuild 639 BLAKE2B 2f5f03a10cdaf01b4bb88869e7ae84c7f1134085a475d05e0fa2a06a7df5d5e548a86ea98c13c5a34f17ded68fa1849dcdcc5b1dc8e2620e985ce11e366983e8 SHA512 83f7391c27964274f9dbe6ab7088774e759bfb6c20a4ae3cecaeb18f40d161b4b65fa20cbc4264c361213d520a3b36ebeb6298aa1ec03be42d8cd880e48557d5
-EBUILD Expect-1.350.0.ebuild 613 BLAKE2B 32d3939c04078e0f42b86ba01a2c1551ca68acf2e6c1bf496e2b4c43e8e001181cd599180505a12268e1e648909906c83cd5c3a9070bdbaf073ed9cb0d2893bb SHA512 c864c54ea685dcddee8139f7d6eb4e03682de0f65b2f29cf759e56eb70106a8378c024eb3198be2c8b84f15778cbcac03f9e4aff85ab24fd73a3c9224f2ca615
+EBUILD Expect-1.350.0.ebuild 627 BLAKE2B 31ca3447f8a188e1ae4018250a819102cab07085ef646fcbe461bc0649589594937b473ed2455d659c31bcc9c9b993e19ebb8f47061d9ada677f013909f35af3 SHA512 67c52343ff234805c7e164eaeaf5f59a34e9b29e938246428f21cfe9b0faca7548bcdd121428d30f3b6f0cdbe2127c3a202390977d40b5c892a454957e3ad973
 MISC metadata.xml 383 BLAKE2B 7fad29322fb45dd695237211692c6c2dd6dd28537e9f13b1c64d6315712111f56a79080569972de64a448dda9da1e12633a2929f18098120f9422ef43c2d347d SHA512 6af4e95fab5ce669dce2f6cc4555081c6afbb37a041527278492531ac0ce8fb8f42cd704049aeac3a0429c46abcdb5b8fe3bd7bdacc8ea2a343beaf85d3d28e0
diff --git a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.90.0.ebuild b/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.90.0.ebuild
deleted file mode 100644
index 76c0c99df373..000000000000
--- a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.90.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_AUTHOR=PEVANS
-MODULE_VERSION=0.09
-
-inherit perl-module
-
-DESCRIPTION="Configure-time utilities for using C headers"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-perl/Module-Build
-	test? ( dev-perl/Test-Fatal
-	virtual/perl-Test-Simple )
-"
-RDEPEND="virtual/perl-ExtUtils-CBuilder"
-SRC_TEST="do"
diff --git a/dev-perl/ExtUtils-CChecker/Manifest b/dev-perl/ExtUtils-CChecker/Manifest
index c659c8c8affd..538febc96fbd 100644
--- a/dev-perl/ExtUtils-CChecker/Manifest
+++ b/dev-perl/ExtUtils-CChecker/Manifest
@@ -1,5 +1,3 @@
-DIST ExtUtils-CChecker-0.09.tar.gz 21237 BLAKE2B 6661d5f51404383a9d8ca932896675f2700c1701852c6f402b814df2a6657a2895e7d1033c57ca98605ec953b207930212d5a44952bb162544641fccccbefdec SHA512 51068985b7c62af407a600dc665031966abf45775ac1e4ce97d49474af070df86622db47a1248aaa8f89e3544f4937665287162cf3f80cbc930bf56d57d8d6b3
 DIST ExtUtils-CChecker-0.10.tar.gz 19496 BLAKE2B b561601d189533f04e5ea20379c9368cadb9fac4ae5b841b0ef8c1463360f4e7f77dba659bae84726e17d07a60bd784eae67f005747c45f89592b98a79fcf895 SHA512 8b43c559333d14d682a00a0fa956aff8b6b4209b7b442f330f9e8573b438dcd5a2d3b86582e2aad2f974c342acee3e79785b9816cb585807dba9b448a1626d4c
 EBUILD ExtUtils-CChecker-0.100.0.ebuild 482 BLAKE2B 376ab74df6fe37a61e14b7606db3c289ca123e59b67211920ddc0cfc1ed0bfc161d79ce317c56502cbe9353e6a3525df25308c8c59fd46022ee6789acfa89bac SHA512 75f8d8189a3b6d8faa04e424f5e7f0fc866a98f467a36265054d9fde197afcb79814650a719ff170bf9322e0fa63af41fb9b70e13d60f7f8fcc6e0e22688a57d
-EBUILD ExtUtils-CChecker-0.90.0.ebuild 426 BLAKE2B b6be11d02a40e2a351b356877d6c3683a987cb87c3828fe9166f69ce0759659ce6c889339da718f5a6504fd50c2523608996f29251eeb27b0a39fe038b0f9421 SHA512 63c6d403cbe14efe4211a450bdc8d2af432de834cc88496febee3c28c97afedb9f625e57ec575cba11aaf7251a18609ebb52458c72a4dda29ccb812587db8071
 MISC metadata.xml 518 BLAKE2B b447f790cd1ddda03ef1bc6157862c41841300f9470243d189e6720a3c20f48f1b8122d22eb3cbac837f4a9c32ba59264b95a899d7324b375e595bf7b57ecda7 SHA512 47f15882ce4e42ecc3344309ca30d7d9e25d48d1e552f34153bf6db3c27abd35a5b6afd071319fe6b9947fb7f22184b4859c716a099a82d672940dc6f2ef64f2
diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
index 36ba33d4d994..70b6593d2c10 100644
--- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
+++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.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
@@ -7,7 +7,7 @@ MODULE_VERSION=0.007
 inherit perl-module
 
 DESCRIPTION='A wrapper for perl'\''s configuration'
-LICENSE=" || ( Artistic GPL-2 )"
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test"
diff --git a/dev-perl/ExtUtils-Config/Manifest b/dev-perl/ExtUtils-Config/Manifest
index d1d31de7da20..a028e601fc1c 100644
--- a/dev-perl/ExtUtils-Config/Manifest
+++ b/dev-perl/ExtUtils-Config/Manifest
@@ -1,5 +1,5 @@
 DIST ExtUtils-Config-0.007.tar.gz 12135 BLAKE2B 9167fa541bd0f9a81791cbd5dda1e537d33df3e903a6856eae4877ceca6e0b6eb64603678bec048958555432a8dff79f99ff4a18b15552b236dc14320db2f74b SHA512 168facb55560ad562bf1e4ca59dd0cee119e0059a8ac7d62283b7074078f73aabd5cc8c217754492a1e0bae61456b9ed9480f9710fbddd3865e5eddaf746052f
 DIST ExtUtils-Config-0.008.tar.gz 11165 BLAKE2B 58468be3884311dea31e420511134eab122a923c445b2b489914227934ab50efba4a08253e86715385ad8aa7b6f0212e95b73f2f524a964704991e4227a68d47 SHA512 7775e2212b4605e60559c7e63604b8f2b4c56f4846e64f9f4454f3f5d0a7a21f618143e6c61eafabf5d9ee9bca8f722c04aedeaf9c51f59924de68c272b86db2
-EBUILD ExtUtils-Config-0.7.0.ebuild 530 BLAKE2B 26907d70e0e1acf38dd6c8e40cd921fe2c2f6070db1b350625377eccd03bcb6f32909656563c29f59ac680bf9c3a1df4e8f4d915b00037b41da2c5e4d308a4db SHA512 fffcb880f9f61c155a29fae2a3c0ce884b1f0170f7762218c9b68c9376e63b14a6968faba58a983952875c311ab283c706cba706ed6f2c39d37540106ddde761
+EBUILD ExtUtils-Config-0.7.0.ebuild 529 BLAKE2B 3832e9b5dd0c973880999dd7668122532896447dc426f34b38ba7b10ae289cfb9c8fc12fe51e20a86b9598c264fb7a4778d56922f262256c917e137c877a15e9 SHA512 4ca77c59e82b2f2bc3d52242a568a85e3b9b310dc3601a7a51bf83b272d58a9e3976a4f31120819f873d09caf8429709dd5989cb56743e3faaa56ef08cf2affb
 EBUILD ExtUtils-Config-0.8.0.ebuild 594 BLAKE2B 6cb13ae5a0ff3775980373bb3a3cf68874b4e90b75acb2de92138ec7d5d6fe3e05496b6f183f13b36eb80995e98473432cf9082610795777686a16089a759e30 SHA512 c0f81d1c6641917f3734ee5b32126b16814485fad626063d74b80edb460993c86f00356adc052d789d94cf315359ae603d95c721dc572bdbba51db8c56ac21ab
 MISC metadata.xml 390 BLAKE2B 59aeaba2fc188b68598514c89cb0935f577c751f1b081f6bb29b72e6a87eb1cb86df38bc578cf8662a9c4371b525afda6df35822aef264746eb800905647cbd4 SHA512 3f0dfaab3133ff6f2adb0b817b3579137e5422d3943759c8838de0ec60716f792c2b50700d7ad04cda4ba3241bc665a1cc570a10719213f4c77cf886d05efaea
diff --git a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild
new file mode 100644
index 000000000000..d50e1a9dbcbb
--- /dev/null
+++ b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.200.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CHM
+DIST_VERSION=1.20
+inherit perl-module
+
+DESCRIPTION="Facilitate use of FORTRAN from Perl/XS code"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/perl-File-Spec
+	virtual/fortran
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/ExtUtils-F77/Manifest b/dev-perl/ExtUtils-F77/Manifest
index c72eba166105..c7af6452d1e0 100644
--- a/dev-perl/ExtUtils-F77/Manifest
+++ b/dev-perl/ExtUtils-F77/Manifest
@@ -3,5 +3,6 @@ DIST ExtUtils-F77-1.19.tar.gz 12057 BLAKE2B da47f9b3e06a0be09beaf4f230c4a06aaeaf
 DIST ExtUtils-F77-1.20.tar.gz 12201 BLAKE2B 6adee5bb3cda1b37d230ca408384161777a4aee117f7acd36a2cc125f1b64ce06b3c86557e6dfaa7bb2b159c814694f2d79c3d2c2da8a6a67cb36358d5a7c89d SHA512 0d7cf351d84676d3dea2ec781b1e230ab4a737d34de4c15c5045603ac6e6e411b5d9b235e68bb9ba0552cc4de0ea67c8355c160840b3205429802ea1569f0400
 EBUILD ExtUtils-F77-1.180.0.ebuild 421 BLAKE2B 0065eb7108ce943f07a4231dde9fd63659f754a907732af37244ca303d009eddcd9fbd9c3d25382cd3c09cf3a2aacb008117e8a7e66a5173cdc6126561f346dc SHA512 5b82f8dc0cd15ddcb6d785e92d2179c2b0ed349fcd8d57a57b7f9183381eaadef235b83adbd9c3a894a894923aacbb6008851e75e80a973ec720146844d1d233
 EBUILD ExtUtils-F77-1.190.0.ebuild 402 BLAKE2B 7e9f0f65ed0467fcf12072eb8222d152332e11320cfd04c45ad9291419d0da8796cc3b8581f2bde9ac209a964a74b3ad2464f67b23054adad10297bcccb26fbb SHA512 b0570ad881fd4cf590f30aabb1d2d276a7a49f564a36d0cfb1b6db777156bc3e0453e659896ef465f680e8a3c974f9fe05ae08e7c8e4259bdcd0672bead97b01
+EBUILD ExtUtils-F77-1.200.0-r1.ebuild 465 BLAKE2B 8b558a74802080fb564948b8866ce039371d3f5e19ffbbdb35030e559b85e8a11e91f90cd6ce30733a77d4993440733033f6f7f9fe449ab19d5b972956bb3ad2 SHA512 13af63d353a9c84872b25832d0ed76ac6ba4caa1d5f390bfaf23e05d2c2c1b7c0dbc4263ee37eabe906364f55fa78d7da78b1d0eae9eae1c5eed2106159c41f7
 EBUILD ExtUtils-F77-1.200.0.ebuild 447 BLAKE2B 43316cc110c82de6c9c2f34f07e12b152ab92714ce9656c276ebd9f58185022ec30f6bbe9c91402c5e55f88c82888bc0db7c730886f90cebf21eee7ca50a7b3f SHA512 6267937e4bab29df52cd860876e87664a6e77ac77b789b0a9ce6172c4e5e26f3b53723f363c0221c1578370c74d13815165cf6a3be40fb7d73b7bb9c0ca0d240
 MISC metadata.xml 396 BLAKE2B 5df2c10b2abcbe658257e6ae1e2fcdf1ca572c9ac4832eadedefeb84bcdff057784e041d97f9972e2dbdad2e998887cd7c8d3e48318d1fc463d6c2f6039c3a92 SHA512 1810bdaff85f127dea27d10e7dc7b03424a9cbfff171f0182d877d581c973fb49d833edd337ba5a1d9ca0d756c259700077edfa21b9ae15f9c6f87e712d0c49e
diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
index e2fd04178a7c..9adb4a1791a2 100644
--- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
+++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.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
@@ -7,7 +7,7 @@ MODULE_VERSION=0.022
 inherit perl-module
 
 DESCRIPTION='Various portability utilities for module builders'
-LICENSE=" || ( Artistic GPL-2 )"
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
diff --git a/dev-perl/ExtUtils-Helpers/Manifest b/dev-perl/ExtUtils-Helpers/Manifest
index e7ab690df123..f0ebb57909bb 100644
--- a/dev-perl/ExtUtils-Helpers/Manifest
+++ b/dev-perl/ExtUtils-Helpers/Manifest
@@ -1,5 +1,5 @@
 DIST ExtUtils-Helpers-0.022.tar.gz 17078 BLAKE2B c2ad2eb45976f78cdfc4c6f6201ad2796ba1f4d06d97b88c0d5bc01b679f7d72b19dec61a2cc19da84b47097669fe951dd0035e87f6fbbea9fa49bfac011d6be SHA512 ffdec8c1cf96daadfea34860bbd72d205620dec891d617721bb8ac242ccd2ba0cd5a5f50440633e03ae5fd575add6ac539c95ed68909a64a44b97ac2bba2bb39
 DIST ExtUtils-Helpers-0.026.tar.gz 15099 BLAKE2B 7ddd2f84f970a5bc2993fb5be6be5fa42bad52049e52297b5c7d510a6168aa36ab3ff1c447e581a57f72c13d4f6389018f16aaacc0aa8244e0d2b0cbeb4bae72 SHA512 372d801f43003c571758823a84bfe418876f1b48e3d8c35f888ca41469f6771a33aa30cf893a4c4a68ea62c6e8c8c6ab2ef44ee783dbf9f25e18bc0389359399
-EBUILD ExtUtils-Helpers-0.22.0.ebuild 613 BLAKE2B 54dbe05669586597346e7ce012ac389cdea15b644e7409086db86df915cff7f5160065049b3a95a5787cae2f159c2018f3d862dbfa66942e05e89171133f8cdc SHA512 a303c8f1e63de7ec469557302f2e9b8c3e04bad151294f73d3758fb5be262af21723864b9ebe50971cf5a96833ea9343e40f41e3156ab36e81c26e79a175b3c1
+EBUILD ExtUtils-Helpers-0.22.0.ebuild 612 BLAKE2B 168152d60c050c685654d89868acd9329ceb3e6aa9dc5d1c799bc44bd71cd23bfc6b2db05710046fc12344f543e915345645480a1aa4ecbfec41edec28bcf495 SHA512 25094e22ab8f374d653d137ff55020500faa8188dd996a73b3e7d60724338a04469e4c2c731da53bf99495fd95e36c862addf3219cf3662534ae198b45b3c634
 EBUILD ExtUtils-Helpers-0.26.0.ebuild 552 BLAKE2B ebcc9d90ca448bd79bafa455cd6e3ab271f7a4c68ea11ccaa68d067b7e47401caeda28e27f14e36ba2e7756c653738d0bdd3d5878e0317daa9825aadfda9e9b4 SHA512 a1874b1e4002d8ba9fdcdb9fa11ada5ee5df0738f241461b9fd007036c1b64982e0fd44f116e57c86b175a781fae7513cb8356b484d94308f4b3c5c254127658
 MISC metadata.xml 598 BLAKE2B 722a9172cf10dee20eef1fe07389756687afd524e33657cb8008835dafaaca8dea587b9f6c89b8d0427bd22b8d803d8cb857b1bceaf930207ab02aea75bbf420 SHA512 3db09f0090683381a27f3b75791d1b07d69aba8092ef2e8b69531bc1f318c5363cf2cea3be1bcc8299a20e9a1e54c7c2d8a5ec2d7ea808f82609dad12217f05d
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
index 49b8272b5b57..8fe978ebb5b0 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.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
@@ -7,7 +7,7 @@ MODULE_VERSION=0.010
 inherit perl-module
 
 DESCRIPTION='Build.PL install path logic made easy'
-LICENSE=" || ( Artistic GPL-2 )"
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
diff --git a/dev-perl/ExtUtils-InstallPaths/Manifest b/dev-perl/ExtUtils-InstallPaths/Manifest
index f8f34c1b8bd6..77099221a191 100644
--- a/dev-perl/ExtUtils-InstallPaths/Manifest
+++ b/dev-perl/ExtUtils-InstallPaths/Manifest
@@ -1,5 +1,5 @@
 DIST ExtUtils-InstallPaths-0.010.tar.gz 18395 BLAKE2B 66e7f4128f70f1d316f3fbd9e9824533be5d49eefc509fd92706585134b85c2b9d55d59602d8e61a4548f9808b9abc9ab1586172be331b5c3c4fe74691e69ec1 SHA512 3639e8e05b2d59d1a5c4548d74e51158ce6e6b2260d2958f5500b7bb2f64470b72b8b9690e3ec917ff6db8baf0a81038178336bccbc272116e16b520cac73f0f
 DIST ExtUtils-InstallPaths-0.011.tar.gz 18588 BLAKE2B 35d10a3477837b00763ce039651d283d7a9ee047b68ab354456c2ff9f9abb9b4cdbb6b9869f0da0efa6080dc5f60ca22af7746c4e8a6f422cab24085f25702d1 SHA512 c31bfce1ba1094f1408409d9a50406d7eb974ce43195e968fae51493a7fd3c7112d41af561435233b14d2396df297604ec0c264bab910566c046f9f7b5b3beb7
-EBUILD ExtUtils-InstallPaths-0.10.0.ebuild 567 BLAKE2B 0baea9816fd3df54e0c15ebeaa0dc8bb54bea303531346afecd8ff641570a3dc82c1b9fb1b1573901415e9c63c1352dc55e9d63d2eb536ed13920fb354dbabd5 SHA512 bb5950f3926abd1ab9f538769b7b8d100c2e4e822d92bcfd6567fdc39caa6a5c60124089f2ffc268e9042a0b5fb1d6cac6fa176f92ceea99d498784fbc5db22e
+EBUILD ExtUtils-InstallPaths-0.10.0.ebuild 566 BLAKE2B 218f48e7224aeb80597aed0771a81518f7c8296db8b4dd959e5e62896c991db4ad74cfbba702c86d1b3f69eff61da50b53a9bb0dfe7abd6e75d528b19523ff13 SHA512 136237ee1965a8bb698b43ebe5ea804106368e0273e51ac9a72c99885dfada10b1a2559b86e853e8dcf0aea2b020b47534fde81019a3fc825f92ba39a59c09cd
 EBUILD ExtUtils-InstallPaths-0.11.0.ebuild 645 BLAKE2B f514291b66526ac23c364626bb9b1c227c6382d3e055e854244a20fad44f145d2d9c7d6647766757f9203f6a9a55124c24665f48dd22a35ff6046b1df29d8689 SHA512 b88b8c839ce5b007d83c3a9e63e5f319e13a277b2a50a182b575a32e54039eb0391e803fdf4544db5c2796e3ac1c4e373bcc28099994d19a6c1dba9b94b134f7
 MISC metadata.xml 402 BLAKE2B a472ac9c3aab745c81c5a097f9d033b4cfbe2895ff58ea4b2fd51ef9be3b179748bdb1463382a95d0ca2d0e0f1025965b5f3dc38e9bf30074c53a714896898fb SHA512 e54ec2e34cdb7a4825b4747b988bb2a534503dbac349d7a5e71f4e995586598a29357162197b62b4a727af8254c1f6247243edfb5420cf8b2207b915012101d3
diff --git a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild
deleted file mode 100644
index c11abdc4a88a..000000000000
--- a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SMUELLER
-MODULE_VERSION=0.1700
-inherit perl-module
-
-DESCRIPTION="XS for C++"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="
-	>=dev-perl/Module-Build-0.400.0
-	test? (
-		dev-perl/Test-Differences
-		dev-perl/Test-Base
-	)
-"
-RDEPEND="
-	>=virtual/perl-ExtUtils-ParseXS-2.22.02
-"
-PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
-SRC_TEST=do
diff --git a/dev-perl/ExtUtils-XSpp/Manifest b/dev-perl/ExtUtils-XSpp/Manifest
index b71e587a21ff..4bc366001a60 100644
--- a/dev-perl/ExtUtils-XSpp/Manifest
+++ b/dev-perl/ExtUtils-XSpp/Manifest
@@ -1,7 +1,4 @@
-AUX ExtUtils-XSpp-0.170.0-no-dot-inc.patch 7135 BLAKE2B db0ec733ae9acc0c51e2ff84ce07bd92f0640ccf17a231ac7fd5c2d61f4b861b6ac26c9007cc57cce0c2ec110a1b7c176e3b2e145c518c2378f6b4beb0703396 SHA512 0ca7aba0c5eee78265c245d0e378fe7ca2849be0acca169f45a6f8f140b731c14e0fee1145f2be476d106e792f8c2eca890b55734a0fa7870dc535fd3cb1e346
 AUX ExtUtils-XSpp-0.180.0-no-dot-inc.patch 7820 BLAKE2B 3a4418b6160b992b542a3db0fbcee598579d126273626968e2877ae6f3ffcc88fb86554f3adcf91c96034dfb6597f5f1f3eef0e4fcb7015a084d40c9e8bb3b4b SHA512 52c4fa509e7eb7d3a7320094c9818b4152ae833fe4b24a04402ede6a091a524f2f623cc12bb03a5e94a938ca5110b75ee828130eaa701334763636ace34f10b5
-DIST ExtUtils-XSpp-0.1700.tar.gz 175808 BLAKE2B 3b2dd74bb0ea78ccb975676c10b4fa0ed6a3a29dbb35137e33cdd2509da21175ece2efd7a893fda66a9b2fdcf2f4e70400c04afe24576c46b43f06ded2f61393 SHA512 12490302e98a499bbc14849a5879087d9d88feb64dedd2d9c79b047fadec2171d5029f1b2e1ffe68e16fb07b1e22dd3d443dead0a6bf1ddf504600cbde92128a
 DIST ExtUtils-XSpp-0.18.tar.gz 185431 BLAKE2B 785bc3fc8e648bc7f079df0d6b0ca68cc156d1f661b49258c32ae1d5571c2715a97f3dedd34e54c48cac85c46fcedf95ce78cc69444396502527b29b9f8e7d6e SHA512 0e075876f8a269bd0df71a37bcfe7c164fa18ffabe72deecb57d5ebefa3a78fc0c2438e75319497e0e1f99e6f9af9ae33af8ecb67e1d411356d6f3a50cd9ea1e
-EBUILD ExtUtils-XSpp-0.170.0.ebuild 469 BLAKE2B 0264eafd4f4f5cca2cd522ea8adb711399a36b5fea7465aa713816c4aa99a5a2b8abb0ca4396ce95a0851bc672044a3a4f3ad0c07b4e142fbd6412eabf2f748c SHA512 6e5a9ef026b2263e7273fa57f86194b83a59e2780b3b35986ae42d8dfccf7ad8f9fcf8f1c43c86047059fae1605eab661adb5d8493d968e1963271df1779366c
 EBUILD ExtUtils-XSpp-0.180.0.ebuild 520 BLAKE2B d870da30ab8feb81a833c40737e872f0d29954ca11dc15d9efe3f145959dfa046d3b51359e94d53805657aca1260ef1d1d3227a6a9f76ec87c4e9fd5ff9c1091 SHA512 12f42f3927ab156345f70d1d2fa6ebea6accfd7d39da7181bbba1c3252d8b48fdcae4ce190e4078512bac6c330fe28cd7762af88dbf4afa6b410e62c32e51407
 MISC metadata.xml 3043 BLAKE2B 73a8a9b2ef14dba26f5480b362136002cd010697f09fba5c3188bc604f4759e4da322c404eeb497ff3c5a7421900fe7750d2f8d1296b44c1f68ea2b8ac326099 SHA512 5a0172d4d3bfe0fe174fd690ff796f589350b2ee91f93d72a23d90f128cb48434bec712bda6c3619b205b0ba980d1207c0116ecf9a6ae50963fe09f413ce4a00
diff --git a/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch
deleted file mode 100644
index f3a5120a4efe..000000000000
--- a/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From 890c6563bca6c297500ed7ad6be7147e0222c797 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 21 Oct 2017 11:04:37 +1300
-Subject: Fix test failures without '.' in @INC on 5.26+
-
-This fixes test failures when perl is running with PERL_USE_UNSAFE_INC=0
-set in the environment.
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=121070
-Bug: https://bugs.gentoo.org/615240
-Bug: https://github.com/mbarbon/extutils-xspp/pull/3
----
- t/010_base.t            | 3 ++-
- t/011_multiple_files.t  | 3 ++-
- t/012_preprocessor.t    | 3 ++-
- t/015_reference.t       | 3 ++-
- t/020_rename.t          | 3 ++-
- t/022_static.t          | 3 ++-
- t/022_virtual.t         | 3 ++-
- t/023_base_classes.t    | 3 ++-
- t/024_enum.t            | 3 ++-
- t/030_code_blocks.t     | 3 ++-
- t/031_verbatim_blocks.t | 3 ++-
- t/035_include.t         | 3 ++-
- t/040_plugin.t          | 7 ++++---
- t/043_parser_plugins.t  | 3 ++-
- t/075_types.t           | 3 ++-
- t/080_complex_typemap.t | 3 ++-
- t/090_exceptions.t      | 3 ++-
- t/lib/XSP/Plugin.pm     | 2 +-
- t/lib/XSP/Test.pm       | 4 ++--
- 19 files changed, 39 insertions(+), 22 deletions(-)
-
-diff --git a/t/010_base.t b/t/010_base.t
-index 3d8b3c9..58cfd30 100644
---- a/t/010_base.t
-+++ b/t/010_base.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 14;
-+use lib 't/lib';
-+use XSP::Test tests => 14;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/011_multiple_files.t b/t/011_multiple_files.t
-index d52f930..d37d36b 100644
---- a/t/011_multiple_files.t
-+++ b/t/011_multiple_files.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 3;
-+use lib 't/lib';
-+use XSP::Test tests => 3;
- 
- run_diff process => 'expected';
- 
-diff --git a/t/012_preprocessor.t b/t/012_preprocessor.t
-index 953bd73..7bf64f9 100644
---- a/t/012_preprocessor.t
-+++ b/t/012_preprocessor.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 6;
-+use lib 't/lib';
-+use XSP::Test tests => 6;
- 
- # monkeypatch print methods to test conditionals are parsed correctly
- no warnings 'redefine';
-diff --git a/t/015_reference.t b/t/015_reference.t
-index e060a25..4b33887 100644
---- a/t/015_reference.t
-+++ b/t/015_reference.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 2;
-+use lib 't/lib';
-+use XSP::Test tests => 2;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/020_rename.t b/t/020_rename.t
-index df6abc3..ec1a0fd 100644
---- a/t/020_rename.t
-+++ b/t/020_rename.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 9;
-+use lib 't/lib';
-+use XSP::Test tests => 9;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/022_static.t b/t/022_static.t
-index de77672..138f02a 100644
---- a/t/022_static.t
-+++ b/t/022_static.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 1;
-+use lib 't/lib';
-+use XSP::Test tests => 1;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/022_virtual.t b/t/022_virtual.t
-index 2186690..7434d53 100644
---- a/t/022_virtual.t
-+++ b/t/022_virtual.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 3;
-+use lib 't/lib';
-+use XSP::Test tests => 3;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/023_base_classes.t b/t/023_base_classes.t
-index a53d5f8..00b2c06 100644
---- a/t/023_base_classes.t
-+++ b/t/023_base_classes.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 2;
-+use lib 't/lib';
-+use XSP::Test tests => 2;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/024_enum.t b/t/024_enum.t
-index 30a88e0..6ca1edf 100644
---- a/t/024_enum.t
-+++ b/t/024_enum.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 2;
-+use lib 't/lib';
-+use XSP::Test tests => 2;
- 
- # monkeypatch Enum/EnumValue just to test that they were parsed correctly
- no warnings 'redefine';
-diff --git a/t/030_code_blocks.t b/t/030_code_blocks.t
-index dc6df69..aca157e 100644
---- a/t/030_code_blocks.t
-+++ b/t/030_code_blocks.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 6;
-+use lib 't/lib';
-+use XSP::Test tests => 6;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/031_verbatim_blocks.t b/t/031_verbatim_blocks.t
-index d123f66..5c2d373 100644
---- a/t/031_verbatim_blocks.t
-+++ b/t/031_verbatim_blocks.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 2;
-+use lib 't/lib';
-+use XSP::Test tests => 2;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/035_include.t b/t/035_include.t
-index 4d5f4e5..306e183 100644
---- a/t/035_include.t
-+++ b/t/035_include.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 1;
-+use lib 't/lib';
-+use XSP::Test tests => 1;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/040_plugin.t b/t/040_plugin.t
-index 798ba62..f8f1ea8 100644
---- a/t/040_plugin.t
-+++ b/t/040_plugin.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 2;
-+use lib 't/lib';
-+use XSP::Test tests => 2;
- 
- run_diff xsp_stdout => 'expected';
- 
-@@ -12,8 +13,8 @@ __DATA__
- --- xsp_stdout
- %module{Foo};
- %package{Foo};
--%loadplugin{t::lib::XSP::Plugin};
--%loadplugin{t::lib::XSP::Plugin};
-+%loadplugin{XSP::Plugin};
-+%loadplugin{XSP::Plugin};
- 
- int foo(int y);
- 
-diff --git a/t/043_parser_plugins.t b/t/043_parser_plugins.t
-index e89c5cb..a84342b 100644
---- a/t/043_parser_plugins.t
-+++ b/t/043_parser_plugins.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 2;
-+use lib 't/lib';
-+use XSP::Test tests => 2;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/075_types.t b/t/075_types.t
-index 441d66b..a4db077 100644
---- a/t/075_types.t
-+++ b/t/075_types.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 5;
-+use lib 't/lib';
-+use XSP::Test tests => 5;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/080_complex_typemap.t b/t/080_complex_typemap.t
-index f86df61..44314b2 100644
---- a/t/080_complex_typemap.t
-+++ b/t/080_complex_typemap.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 6;
-+use lib 't/lib';
-+use XSP::Test tests => 6;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/090_exceptions.t b/t/090_exceptions.t
-index 0bb30fd..0e8071d 100644
---- a/t/090_exceptions.t
-+++ b/t/090_exceptions.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use warnings;
--use t::lib::XSP::Test tests => 9;
-+use lib 't/lib';
-+use XSP::Test tests => 9;
- 
- run_diff xsp_stdout => 'expected';
- 
-diff --git a/t/lib/XSP/Plugin.pm b/t/lib/XSP/Plugin.pm
-index 8f0cd2a..e4b2212 100644
---- a/t/lib/XSP/Plugin.pm
-+++ b/t/lib/XSP/Plugin.pm
-@@ -1,4 +1,4 @@
--package t::lib::XSP::Plugin;
-+package XSP::Plugin;
- 
- use strict;
- use warnings;
-diff --git a/t/lib/XSP/Test.pm b/t/lib/XSP/Test.pm
-index 719b829..081938f 100644
---- a/t/lib/XSP/Test.pm
-+++ b/t/lib/XSP/Test.pm
-@@ -1,4 +1,4 @@
--package t::lib::XSP::Test;
-+package XSP::Test;
- 
- use strict;
- use warnings;
-@@ -37,7 +37,7 @@ sub run_diff(@) {
- 
- use ExtUtils::XSpp;
- 
--package t::lib::XSP::Test::Filter;
-+package XSP::Test::Filter;
- 
- use Test::Base::Filter -base;
- 
--- 
-2.14.2
-
diff --git a/dev-perl/Fatal-Exception/Fatal-Exception-0.50.0-r1.ebuild b/dev-perl/Fatal-Exception/Fatal-Exception-0.50.0-r1.ebuild
deleted file mode 100644
index 552c7564baf6..000000000000
--- a/dev-perl/Fatal-Exception/Fatal-Exception-0.50.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DEXTER
-MODULE_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="Succeed or throw exception"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Exception-Died
-	>=dev-perl/Exception-Base-0.22.01"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-#	test? ( >=dev-perl/Test-Unit-Lite-0.12
-#		dev-perl/Test-Assert
-#		dev-perl/Exception-Warning )"
diff --git a/dev-perl/Fatal-Exception/Manifest b/dev-perl/Fatal-Exception/Manifest
index cc17175b802f..838fbd61887e 100644
--- a/dev-perl/Fatal-Exception/Manifest
+++ b/dev-perl/Fatal-Exception/Manifest
@@ -1,4 +1,3 @@
 DIST Fatal-Exception-0.05.tar.gz 11434 BLAKE2B 75a56080f2bd71a7a92aea77569687b82a342878a12d43eff70af65e2d92787112a63667c1240eced78dc4235d63e676333b74dbcb14636d3353fcc12483f8fc SHA512 9ea0574aee37bcead291abe5a70cd65b48cdd07526279a4f87915b136de522c5b27a3dd8c2539531cf97e418ddc8cfff649c6d284246ae32bc8fc827d447a447
-EBUILD Fatal-Exception-0.50.0-r1.ebuild 471 BLAKE2B 2b157ac83ee3f23d272f16607857e0a0f43a53370a43b1e5f082a132c56b5f24ecb053fa0f03db301052d6a18d504cec31eee53a4467eecde18830b2250f25ca SHA512 06379c4a959d4fc9c9cba05c7d949edeecae643144d382f8f01018a9b724d3704149a87eaf1dfb7441e5e07e4375bea8d735853096c8f489d147e5f137437c92
 EBUILD Fatal-Exception-0.50.0-r2.ebuild 467 BLAKE2B 4e5a0e8016c0a96b9dd1ea94a62fbf611dd6786ad9050230a93ecfe21b12d423e29faab6c1e196c43c13c04cc007265864b3122ba71aeff33618fc4d438dab91 SHA512 c53b1a80f65af62ad73f2ed5d7a04a5f5f44c101d9ea38fa2f45541fc4577a1dceba198fd6105ec4a04626ec8e6ca1d3c7e47cf18fc4b63825ec8503c52463b9
 MISC metadata.xml 531 BLAKE2B 88edd155e0028c29ae7d0970fa2bc6e30b83a3be4a230ca6f04e97d400500ccb32319d9f454dc4fecac70cde737a8b3360da92fa70f7fd69c0cead228326f4ac SHA512 13a98a8ffdd99e4821b0d05ac89fc4995de76a9c2f48c99b47160b8819f3c36cc4d59618ba00d9ff3e0c9348e42d8e489c1474d95d9d84360a9ceead8ba1e582
diff --git a/dev-perl/File-BOM/File-BOM-0.140.0-r1.ebuild b/dev-perl/File-BOM/File-BOM-0.140.0-r1.ebuild
deleted file mode 100644
index 962f606a3d55..000000000000
--- a/dev-perl/File-BOM/File-BOM-0.140.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MATTLAW
-MODULE_VERSION=0.14
-inherit perl-module
-
-DESCRIPTION="Utilities for handling Byte Order Marks"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
-IUSE="test"
-
-RDEPEND="dev-perl/Readonly"
-DEPEND="dev-perl/Module-Build
-	test? (
-		${RDEPEND}
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-		dev-perl/Test-Exception
-	)"
-
-SRC_TEST=do
diff --git a/dev-perl/File-BOM/Manifest b/dev-perl/File-BOM/Manifest
index 20a7ea636493..436734b6252e 100644
--- a/dev-perl/File-BOM/Manifest
+++ b/dev-perl/File-BOM/Manifest
@@ -1,5 +1,3 @@
-DIST File-BOM-0.14.tar.gz 15273 BLAKE2B bd487204b8dcd15ca1d5ac9c3c81b65f9c0125f13884081231311ee4f2688e1c007f54c8f5cdc69ef17a1c0c00070eec8231458f057621777ad625c12afaa36e SHA512 956f86ff28f351976156e847c0b1bc12b6491d842892a9493cc705cbf2598b58ab601690c0fda1cfe813c3562d2f96a28df968bad8b52a92946fe56d2c9932eb
 DIST File-BOM-0.15.tar.gz 19656 BLAKE2B 6628e5788501a066ca95300e44e18458a581f16488130da4814e7a806c686e72882eae816ca69c60ffc210a41a7b361b4595e6db4905c684d5b8c2e23be6a951 SHA512 73d9df8a8f346164613a9d99b9dd2e83b8d68f77c39a134e9f6b2b96f9c9f0dd1d8e6810a7eb897ed9bcd9b7637e11235bab6b2f68b75d0db973cbd5d11f4a81
-EBUILD File-BOM-0.140.0-r1.ebuild 464 BLAKE2B e1d1c526ffa13cfa4b77eda2e2c4baa59a84cd658d3814d28289a7235ba065d036819bfe9b2794be9c1fedd69f355c28ac4c645a300bd5d3fe0d13622bdefb82 SHA512 62d00d1c3ecddc60ab7a0f5779fd53937c6e240acc69b52868e7d11c584745b033693b6882153b03be0ad64a8a30651dde76e14c262d5b02e0b72e2745a8457b
 EBUILD File-BOM-0.150.0.ebuild 551 BLAKE2B 63c2b2489adc716e20d23c5c609f24a49f74cb117c79f610a7014db008fff395fc6ef549d0a5e953965d4e5743a066d8cad2cde19726c309492658ef046a867a SHA512 800155653b18ece6c248d81b95323217196f24d13ff04019bd78c727463e750d93b3a4d1eb599975cc0c16357b7a89f5f75858041d0cf8c19c82d7a5e552dcb2
 MISC metadata.xml 388 BLAKE2B 8a5875e6ff71b8b9af58870f89b73b7882368653599d97f079c6f499bab4cae55d32ed4ebed4bef959567421a68996590fece69a23fef14ceec0e5ab0b6c83cb SHA512 db7026f5152f90b6685bbbb659e0d2f91243e7182ea8f684ad0b82bff9cf1c27dfaf1789c6498ffabcc7164f11b5e2335e3a310185532884e90cdb4a5be94e17
diff --git a/dev-perl/File-Copy-Link/File-Copy-Link-0.113.0-r1.ebuild b/dev-perl/File-Copy-Link/File-Copy-Link-0.113.0-r1.ebuild
deleted file mode 100644
index c47d8a0e6532..000000000000
--- a/dev-perl/File-Copy-Link/File-Copy-Link-0.113.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RMBARKER
-MODULE_VERSION=0.113
-inherit perl-module
-
-DESCRIPTION="Perl extension for replacing a link by a copy of the linked file"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/perl-File-Spec"
-DEPEND="dev-perl/Module-Build
-	virtual/perl-File-Temp
-	${RDEPEND}"
-
-SRC_TEST="do"
-
-src_test() {
-	perl_rm_files t/pod-coverage.t t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/File-Copy-Link/Manifest b/dev-perl/File-Copy-Link/Manifest
index 7d5d8e407d2a..bc5583db96da 100644
--- a/dev-perl/File-Copy-Link/Manifest
+++ b/dev-perl/File-Copy-Link/Manifest
@@ -1,5 +1,3 @@
-DIST File-Copy-Link-0.113.tar.gz 10947 BLAKE2B ed01df682e1fe6e25ccd80122edd64833219a7eda81bb323c40c0bc1b3aa9d8780209bd70808d6553242e66e5f888864af1f8de46b395b2b2d2293fa15318725 SHA512 c1f51f107e81b0a88391eca66291f484600b193d5c219e44fd7f94fbabde0a9459b98cab5de9c0993374a775b729f7d228d87889c9395465c90b0295f4496f91
 DIST File-Copy-Link-0.140.tar.gz 11157 BLAKE2B 4f751ffef556ac7cedb57bf8189f4e57a1e64210327c9bd28401f52c63437a88418fc41f5c1f8624b7b3bb66496eced9a36a3ed3cc320e614a6b6cb9dfb28548 SHA512 d937d8353c4be3070591c7e28ea177e587326936cea6d84d895d0fd951e663e506c5680f0d8acad756972db7c70147b31078a2e2595bcab4bb56879b97f3c8b1
-EBUILD File-Copy-Link-0.113.0-r1.ebuild 490 BLAKE2B 5537ea91028d0eee7519ebfae93e1bcd35ed0d5bba596191c499cb25a239843a8d277aa9114bcd5a8cf00218c8950ebf5f9d0abf15a655e22fc0c3314bf594b9 SHA512 7ae6f9e98d0538bd5fdff7aa19de9f9d34a896aab6d564b37ed2843ba4b5ad3f9d9bab633db7498f3c22923d1885e83bb093bfea3313a6c9de6f10bf796e3ce4
 EBUILD File-Copy-Link-0.140.0.ebuild 543 BLAKE2B 7f3f163e4d2285e0369f8e11f6feb799345ba140550978d7cde53f831a46fbbab159df00a23affbd5e31c10871d2571154f32632b36044ee280ea5ceddc3f587 SHA512 20c35446e3ef5ac5989ea94f86819771d152ecdf6835101f360a8128d4f62a6be841d9d039c292b5e6faadbdca2f4664a3426f9dc30f5d0b5479c8a7ba1e6b93
 MISC metadata.xml 1172 BLAKE2B c22400c6068f74c08ec59ab7607acd517478c1335dd6d1e30186490ed8be88b576009250c99891bd3104b944369e6dc6ac6cbca75aa072542128815ab9359310 SHA512 b1e74608a35c3c6b511186c1ef837bc515a682fdd9ddffcf4c76f5430f16616a1943c823ce9772c988eb12c150129c29241526969085e61b92db9c1ebf39889d
diff --git a/dev-perl/File-Grep/File-Grep-0.020.0-r1.ebuild b/dev-perl/File-Grep/File-Grep-0.020.0-r1.ebuild
deleted file mode 100644
index e99f9e4b658f..000000000000
--- a/dev-perl/File-Grep/File-Grep-0.020.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_AUTHOR="MNEYLON"
-MY_PV="${PV%0.0}"
-
-inherit perl-module
-
-DESCRIPTION="Find matches to a pattern in a series of files and related functions"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-perl/File-Grep/Manifest b/dev-perl/File-Grep/Manifest
index 7bd4ac464b75..142bdaace991 100644
--- a/dev-perl/File-Grep/Manifest
+++ b/dev-perl/File-Grep/Manifest
@@ -1,4 +1,3 @@
 DIST File-Grep-0.02.tar.gz 4877 BLAKE2B e410584ab4c144fb31925afdc796150bac8f9dcd3d5ea941d349c0f6e5c3937a3d18fe4aa8de6161a2263d01ea9c073e0745b5bc83e2c86070b203b10a9c5bb9 SHA512 22c76ace58591e0f66bb0d6aea6ab983c580d31c5a61c12a2e5eb9fda2f7f3ab7a6a3bb67847d867fd46a0b9a49e502261083ba28932bdde8d43513ce6c6fc77
-EBUILD File-Grep-0.020.0-r1.ebuild 347 BLAKE2B 27549c72685b7d2b18e48c4d62d3cff432c82bcd4379217067f856cc74fb3a76aca956a46014f466ea5631bfe0a721481a1482a09fe6d6d0404b9f17f815350e SHA512 9de099ef4a797ff4301677805d6e3aea5fc73be6722593c588deb4fe0658bcb11d7ebf9ea609cf69c5c399c673a2a413415ced3cfe75bf1e19612d3de6402a7b
 EBUILD File-Grep-0.20.0-r2.ebuild 299 BLAKE2B 8a31d88c571101a86428c5fea3fa151933f19d7db894ec53de1190e872dfbe9a8480273831ef2788459595b0c237741476cffdd9825e232b5fa4d0fdd604cfad SHA512 2c17338dd5dfed49e1649f9810d6f71a95c4fd13909592a11ad253cbd7a62be1ea81f347c9429be90e987d77680ff6769ef919d53a3e583841a9234ab36e85d2
 MISC metadata.xml 390 BLAKE2B e51d228313d00b273eb384951f5f7d3b691a2491cbf91408ed1af96c6a6a2872562ca589e8e93e33448cd9ba0741aba34add8cea3dcfec13c6040c75763c892f SHA512 378827c5fd222f42a18b7f8ccc08aebf96c3f0f88846817f1612295000d75e95c625fee816197b7dfa9798283c90ac47f185eddeddb047122b2c95a7ea92b4ac
diff --git a/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild b/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild
deleted file mode 100644
index 6f4d9f46d2df..000000000000
--- a/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="RHANDOM"
-MODULE_VERSION="2.03"
-inherit perl-module
-
-DESCRIPTION="Interface to KeePass V1 and V2 database files"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Crypt-Rijndael-1
-	>=virtual/perl-Digest-SHA-1
-	>=virtual/perl-MIME-Base64-1
-	dev-perl/XML-Parser
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/File-KeePass/Manifest b/dev-perl/File-KeePass/Manifest
index be6a9c3ea594..3fd8ebd1e2c6 100644
--- a/dev-perl/File-KeePass/Manifest
+++ b/dev-perl/File-KeePass/Manifest
@@ -1,4 +1,3 @@
 DIST File-KeePass-2.03.tar.gz 37010 BLAKE2B 7dd5e8e2fc4e2988bf2158a66c74be8b9ee825f89d29e51abdaaffd18ac16851bcedf1c4f1005c743eba7e2de3e6470b3bd282dd1d1ca8bcc547a4e47c074950 SHA512 f50cdcc52e3f4eb9da17e9e823ae268547f9fafaa534bdc52db1da53564fcc28ebf975e71b9968b5cad617f2964ed3c55022063bc52f910d2478d06ce35d4ba1
 EBUILD File-KeePass-2.30.0-r1.ebuild 453 BLAKE2B 8f1570b0e07dad5cdab066a939a135c65531a90d92b5f470db41930eac417f2bd4dd7c7f55cd39fd505ee79741348de0046c2277e6526d1ed84d8a264a8542d2 SHA512 5b53400daf9380df44d70ea911175effd60595cee3cd5fb037ed589e394e24c6b9168aa193d0d62f20d219c2bda904629d7147eca04f4ea8d2d4a09acf7d8b64
-EBUILD File-KeePass-2.30.0.ebuild 474 BLAKE2B fb9d7a8107c5bb3c7d7c1cdbfbd3c67dd45de21f66ae0e05822dd7a15a7bb4b9e04f7024d91cb7a9f59cf0af1c09bbc66a6f58f216edc4d140cb88cdec2bdca7 SHA512 1dcf66d9bb2d502fbfbcfa5b797e765bb304c8236e6bafd31a0f7f090ad74b160805edc0239be8d9865f59f11720117da95875484c94089cd4ae3c1e3c946b80
 MISC metadata.xml 396 BLAKE2B 81a1e0b92e5a946486af2af93fb008dfb173c7a0a797204c7a943504de40c98cdb653c81048673056a37f632221dbf512e86c1b35017c34de838f37955955e00 SHA512 96cf0b654f2adce7d44181187cad7f3bbfa6abaf4e0ace9200bfb66c0612b7c747b4517880cf79a1d7a87bc3d7de07b72df01d3c1091f76e1180265dc5e39fe8
diff --git a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.910.0-r1.ebuild b/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.910.0-r1.ebuild
deleted file mode 100644
index 5a6442f809f7..000000000000
--- a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.910.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=JAMTUR
-MODULE_VERSION=1.91
-inherit perl-module
-
-DESCRIPTION="Connect to a local Clam Anti-Virus clamd service and send commands"
-
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-antivirus/clamav"
-RDEPEND="${DEPEND}"
diff --git a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.930.0.ebuild b/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.930.0.ebuild
deleted file mode 100644
index ef824343143d..000000000000
--- a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.930.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ESAYM
-DIST_VERSION=1.93
-inherit perl-module
-
-DESCRIPTION="Connect to a local Clam Anti-Virus clamd service and send commands"
-
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-antivirus/clamav"
-DEPEND="${DEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-DIST_TEST=skip
-# tests require clamav to be configured, which we can't guarantee here
diff --git a/dev-perl/File-Scan-ClamAV/Manifest b/dev-perl/File-Scan-ClamAV/Manifest
index caa6170c1f84..49c237dc4038 100644
--- a/dev-perl/File-Scan-ClamAV/Manifest
+++ b/dev-perl/File-Scan-ClamAV/Manifest
@@ -1,7 +1,3 @@
-DIST File-Scan-ClamAV-1.91.tar.gz 7048 BLAKE2B 22d83430404610384427fc05ce6e5c258ba6fa1c59535ebc2a0f7efeb380a85b49e78a5c892e4f87678c39f43858166b39965c9ff685f0dffdd71f17485ba611 SHA512 f47751f16095caa5faed2eaab2dc8f204bc11ab8869231a231b04655669fbd67df61a1ec96ce660ab05ef66f766742fb5c5ff00ebac425304e3daa3830679805
-DIST File-Scan-ClamAV-1.93.tar.gz 8358 BLAKE2B cd36fc1709352545ef2b6a7b9328469e1df65343aaba30abc200d65f1e9808cef9079e5ec16744f8e51b6c6fcb00798ee69f0baac6fbae7ccdac232df847cb42 SHA512 61fbd3851c5cd03ab39844ba3d5f0226ab5daa252b226427486fad0cda9f3aa6469a6638dd53e4a68075bb6133b76cabff36a132daf5dcdc1d19d8a3dafdd770
 DIST File-Scan-ClamAV-1.95.tar.gz 15010 BLAKE2B 34e9d6b923cc7c302f8ddb012d387a138ac378774d3e1a92fa409306a57a92a7a2d284b82de7f0fd9388cfadc722348438ddbc2cdb8dc6922ea5cac845a21880 SHA512 604b3e4f876be41e0963e4969b8b06d4b720092d2e5e7b4b2f6f39db502fb213b38025d3904c1528d1c3d1aaf81e43e09924618efd1b29db221ac4e8e6149b93
-EBUILD File-Scan-ClamAV-1.910.0-r1.ebuild 358 BLAKE2B f71b7ca90f424f6bd94c8437ed7eeaa0fb9ef9a1b4cc36bc263ba4e9d01aff78f27edc179b46552a97876b8a1118ee1cafbc7410768d62064859c813e65ebc2d SHA512 aeb96c03eb261a67992dfc104ed6fd8b02b85fd3de1dfdbcd8c053ce3f729809014027cda356f5dd1591aa1789d9485c339057525aea1edc4a2bfcbe518e7c15
-EBUILD File-Scan-ClamAV-1.930.0.ebuild 474 BLAKE2B 5f302efd81788b50110083b44dd4789da9b9a1db8be0a3da724fe99fa6a323e1958e30470ba6902726821ca05aed91feef3b899a1387dd9d3f4f280697319a7b SHA512 a9dd7ed65033d54fb031987164d7bd3992a753dac3a04f387cbebd08e5d7770a9d068b301b4a2f7a54c4eac4fb5db000ecfee47c66d927fca8ae02bf9e4d31b7
 EBUILD File-Scan-ClamAV-1.950.0.ebuild 887 BLAKE2B ceccaf746f97f7485b1ae306376a8d098800782f07f897aa8751979dab8dad61161f815a3847a795ec3fd079095796926e5c38c9a2fb0072c595c36b834a6500 SHA512 de421e8e07225cccd8d41454ba62ce6501587ab0436f0ceaa57568e765bdba94ebb52ab6aa7967606f1d616e67e62d27c7e719ee06c7313d90b1cec2be451db3
 MISC metadata.xml 398 BLAKE2B 5d8c0d193f51cf3f72e4084ce286f3ab2bb874b27d5b0d96bd58c89ee598081559cbaa68c715012fe89004292304b6e38f0110f2a6c57dc242279549912bd4d1 SHA512 32cbfae10c7c48ade993477f5b494883bbd55bcf148645154691d1f4d3d5a5e7e5396c4e6725199f01567b7186769738ef597988922547873de8c6e6e1091fa5
diff --git a/dev-perl/File-SearchPath/File-SearchPath-0.60.0-r1.ebuild b/dev-perl/File-SearchPath/File-SearchPath-0.60.0-r1.ebuild
deleted file mode 100644
index 1f398711ce3a..000000000000
--- a/dev-perl/File-SearchPath/File-SearchPath-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TJENNESS
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Search for a file in an environment variable path"
-
-LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-SRC_TEST=do
diff --git a/dev-perl/File-SearchPath/Manifest b/dev-perl/File-SearchPath/Manifest
index 74dd21588aa1..b2fc2a6bb371 100644
--- a/dev-perl/File-SearchPath/Manifest
+++ b/dev-perl/File-SearchPath/Manifest
@@ -1,5 +1,3 @@
-DIST File-SearchPath-0.06.tar.gz 7252 BLAKE2B 3d09f43b89bece4acc2c1e0efb1126ed13f445eece2bb3af538081d0327277056f86d9a09daee21338a2be24e12992b86b36815d75fcae26fcae4bda688a6621 SHA512 3e209def4ac4c88186a5126d8ea074f74309c91ae6b1f783e447f6841a9db49c8a4465a3471ac6668eb644251ae6ea8db3fa7f02fff0f0b58abbeaf628feed67
 DIST File-SearchPath-0.07.tar.gz 7813 BLAKE2B 846cd1afcafe945f3be220fb81aeb5fea4ff13fc849b1d706c6438f97f433fcff9a7d26cb17496bba0526e980f8378403734959d22781121ba222cfa21bcf443 SHA512 bac702296a458b4c132a51af795cc8094dcae9c9c1d3b82c43de521fd85178e3f2ac22fc043a098b1182ad3cf772039bba82e6610aeb4a5a6090bc600dcfd9a2
-EBUILD File-SearchPath-0.60.0-r1.ebuild 403 BLAKE2B a4ffcb8e0ccff3e481bf314d6384979b6ecfe14f5984d0c9b4d5ed4939d53c208d69b3a49ab6dde7cd044763d6f484b855e212feac907b6e405a6333666add93 SHA512 dde2103e5fb95a52adf755036a3c7120d289efa93bb26b108d1f90ec9ad07c9031c71422191822629cd6f24129cc9f883e9ab3fc5de0d4734dcb6093da889bbd
 EBUILD File-SearchPath-0.70.0.ebuild 386 BLAKE2B ccfaf08b0a5cc94eaaad517294fb7e64a3f0c5625ec5a09d5a0d6c742c3a8205b906cb938ad65b66b7fd8edc4b36bbef57476f0ea2b9ddac90de9f184bd1c28a SHA512 59e326012d20ccfa890038741808a7e948614a4718317ccbb41cb04a11463d9edda2ca89bf46bc57b176b5c8c7d7c7c896cc49f2f7f29368f11aabf7a93f663c
 MISC metadata.xml 402 BLAKE2B f63f623e69a6b77252a135a840110851d706179285d6d071830c561a0b46a06cdacd6db195e5e2fa14c15f55f57e260b53777f2923dc6d2804bf67d6853b04b9 SHA512 e360e94da31a58e4397a217df406465cecec283b2ac6611495baeca449355366b68783d1b1297bb325916a4089cdeacf8aadfe5e8f99509fdfa146a0ff5e7383
diff --git a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.90.0.ebuild b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.90.0.ebuild
deleted file mode 100644
index d6b54ea6512c..000000000000
--- a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.90.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=GWYN
-MODULE_VERSION=0.09
-
-inherit perl-module
-
-DESCRIPTION="Install shared files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/perl-ExtUtils-MakeMaker-6.110.0
-	virtual/perl-File-Spec
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/File-ShareDir-Install/Manifest b/dev-perl/File-ShareDir-Install/Manifest
index 0205da44b646..91afc939d723 100644
--- a/dev-perl/File-ShareDir-Install/Manifest
+++ b/dev-perl/File-ShareDir-Install/Manifest
@@ -1,5 +1,3 @@
-DIST File-ShareDir-Install-0.09.tar.gz 7501 BLAKE2B ca18447753e7d24a69e87682654d6c657343fa6fcc92d52e5a893b46aefb1f970b5c25f32dc2d13154b10f72e63f5b3122b9c5ab0607beed01c5354311b96862 SHA512 11adcce3d868da71987cb03eaef34e38bb9dfc62dcec26288f088eecc039f0c5e1f6a49fa0103359ecaf57a9d4ac51a967f0968a31cfbe3db6bdfae70bcbb626
 DIST File-ShareDir-Install-0.11.tar.gz 31187 BLAKE2B 4be6bd829fc9b2784069ba3ee8f54fadd390e3bd003d43a7754f3469fc14c01a5587044f045abe806688ed4442088256264d983ccf4080caec8b8062912e2acf SHA512 6611f6c3221ec52db7582f30b2159dba22ca8d899666526c069298b3350ced9e3b46872baaceb30f7a27e3c744c929ca4967fa820d14bbfdb41e5ed5485a9f72
 EBUILD File-ShareDir-Install-0.110.0.ebuild 723 BLAKE2B b017510ee90bb6485233465180ab7a3e72ae9fa224dd1be21e8ba25119c11bbde37822e0ccc5d6a303efd43723811f79a40bc052623a8f2b5ac245050b3fba9f SHA512 914d4e8e0328c4d5fa6465c65a86af5b463df62632434a9c34445455c716e2e6e6aa42d39b82617681b707d7fbfb691584f9c02a8c24295e0b9e0d632a4d882d
-EBUILD File-ShareDir-Install-0.90.0.ebuild 402 BLAKE2B ead782371d3c42734e3d2fe6d0cd007c49f88da2c48005162fe346d2083a8498c9336d9c745d94b6a17c37c3ed2eef23b9f8048ed7f18873bb47a8307f8f8b8e SHA512 bf9343cf198ba053742a5c65464c226be3fe47bc73e249de7b9a7b0304873605ee8566b221310d82e6aeb0132723fb8c76ac7a4d7c68054b6f8e0696c9238743
 MISC metadata.xml 415 BLAKE2B bb5f387e0912230ab8096ba0ca1542b30665647f37d0989c7dc11619978bef2ac9e64b0668f46cd70205fc20b820f879657e705a96e35e481aa98388d232db5e SHA512 0bda1e6c71c01da3c4062b9d29b71377874971cebb570d0cdc5289680c864f5ff6879b557698ef4fadf86475ae62ba6904d59bd85a6bbda3be9778f4f21eb986
diff --git a/dev-perl/Filesys-SmbClient/Filesys-SmbClient-3.200.0-r2.ebuild b/dev-perl/Filesys-SmbClient/Filesys-SmbClient-3.200.0-r2.ebuild
deleted file mode 100644
index 43884b0072de..000000000000
--- a/dev-perl/Filesys-SmbClient/Filesys-SmbClient-3.200.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ALIAN
-DIST_VERSION=3.2
-inherit perl-module autotools
-
-DESCRIPTION="Provide Perl API for libsmbclient.so"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=net-fs/samba-4.2[client]"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/pkgconfig
-"
-
-# tests are not designed to work on a non-developer system.
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${P}-pkg_config.patch"
-	"${FILESDIR}/${P}-close_fn.patch"
-)
-
-src_prepare() {
-	perl-module_src_prepare
-	eautoreconf
-}
diff --git a/dev-perl/Filesys-SmbClient/Manifest b/dev-perl/Filesys-SmbClient/Manifest
index 88ba5d9f5438..20b29279febe 100644
--- a/dev-perl/Filesys-SmbClient/Manifest
+++ b/dev-perl/Filesys-SmbClient/Manifest
@@ -1,6 +1,5 @@
 AUX Filesys-SmbClient-3.200.0-close_fn.patch 589 BLAKE2B 4de9ea459b5aea38851a72d1b2cf8e716c6ac1770cf36bdb870d5120f6efab9cbedfb5e10134d4be0324f353b050525f280166799db39db74318260d46fe125f SHA512 3e175b79d7c376305e0b6df7b81995d7618de779fa71c0e38c9f845fd7b05d996366763b894219c655aa2f10f6009b792c1dd4f3ee4bfdcd028789f7e7773ce1
 AUX Filesys-SmbClient-3.200.0-pkg_config.patch 970 BLAKE2B 1f7ecdc4ef3f4a3e8d2e8bb9d9ea50817cfb7327b9ab3071adea983c65af4fbc8fe6482ec855b77106800f82b7c7022d264f03fd013fcc6dbe6cf8793d6819b6 SHA512 69745324011b76771b5df278083f0780bf03807a1211d04544bf8969a6cd54d6a32064c211d28bbbfc9191337eb16e5634952f473c675bc2ccb9151656caf916
 DIST Filesys-SmbClient-3.2.tar.gz 52010 BLAKE2B 1c88cedf7536f62fa2d6639425036002e02359b6c07bfd959a8085c797e7c23e3fead10450c73c85eefc42001beba6e8c2d5ca9cf050f1bac91b7b4129775b04 SHA512 547ad4c94a7cd88e5ac07938d2e315acf416810596979efb40fe036614535cdb1ad7f73bb17f3b6c18b62187a09a2613bc548a9dede6c399673962d9eb837427
-EBUILD Filesys-SmbClient-3.200.0-r2.ebuild 597 BLAKE2B ff692f09c5500aceb2e1d0739e2e0f1ad9a642d284156ccb37d2b530c581db718c53235ffa7c2c523c530581c2b192f67fe97128e021a533fe876dcd7acb3a6b SHA512 50d2eda33e2768103fca986b95e1c520a027d613d128351776c098b6b1b2661050b009edf7901fdd984e3fd3033f2a126f9de865d45c5d866941351ac50eba78
 EBUILD Filesys-SmbClient-3.200.0-r3.ebuild 1025 BLAKE2B 600f4dbaf750b5b7a740ad3bec28dd5b5beb1e6c461d68f6a5b9156749a708afcc30c2d26a7a81d2045e92f1e7f1ffdfeafece716998997b468771e99305bfa8 SHA512 d341b1cc0fc206dd56c6ef6c0b893d850f637681973e2a15118c8d0707fd18e9e5be2767031115068cc995aeb6121996691fa8750a5c2069807c490ec4ab30d3
 MISC metadata.xml 406 BLAKE2B 42977daeb8c4429ec89887ed665af51aef0cf2d9f85581c1bf04484662b4c84959ee2776eb8c5309650f8c55e1cbac3b9b46e0ad0b747c4aa0dde13d47018c0a SHA512 4189f37bd1afdfc233b1a3a763f65a372286d25807753f36dbd813300ae6b8334062388edb48061fb6f81c12bd1b076b514026ab397ee3b611dbff67ac2df3df
diff --git a/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.940.0-r1.ebuild b/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.940.0-r1.ebuild
deleted file mode 100644
index b3d4c0f09af1..000000000000
--- a/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.940.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BRADFITZ
-MODULE_VERSION=0.94
-inherit perl-module
-
-DESCRIPTION="Asynchronous client module for Gearman for Danga::Socket applications"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/Gearman-1.07
-	>=dev-perl/Danga-Socket-1.57"
-
-# testsuite requires gearman server
-SRC_TEST="never"
diff --git a/dev-perl/Gearman-Client-Async/Manifest b/dev-perl/Gearman-Client-Async/Manifest
index cdabcf737d62..9efc3cc61573 100644
--- a/dev-perl/Gearman-Client-Async/Manifest
+++ b/dev-perl/Gearman-Client-Async/Manifest
@@ -1,4 +1,3 @@
 DIST Gearman-Client-Async-0.94.tar.gz 9727 BLAKE2B 0b7426c2187a3328f50b9c8d720b6fdd848fbed0421c8e00f8479e4115d666edd6ab54e366b38e10b6980a6b547c42b483fb19ec7f78df031e9c58cc410182f1 SHA512 6f87ced7f39eb1e170e528bca85a26632a12166ce62c80e37e3c735de83d18154eaf30bd39588c79d13df113776d75fd16d18e5ecd0de1f3f54be870774e45a1
-EBUILD Gearman-Client-Async-0.940.0-r1.ebuild 429 BLAKE2B 5e1993c04897b159f8a198c2210d8911ee5e42fe0af2d95fbae2b26a2c9acf5a626909034d211c70ca0a42d17e8b71dc9e9cfc7b638a57283a2a1c20e810e585 SHA512 a17a8472be6651886ac580af7fae17a38091d95ac88ba5fe6486b721bc2f9945aed744bec082120335d64b17f855f43b7da005224b3b9e30831ec85ab7a04602
 EBUILD Gearman-Client-Async-0.940.0-r2.ebuild 635 BLAKE2B a07bce454229662c7c70439fe7e30b7b8d54d9b3083ba6a0e7fc987f845ad3834b7e2a57803dc07147d43886add19fbe3b2fb69311eb360500d2620914ae08a8 SHA512 aeeba3ad9614b973f90dc6373aada910cb790b84079f5113ae13a940ae71ae182396ea1a421ffe047a4c329fd5d12c25ce00a6cbcdc65952de037ba8ac1674b7
 MISC metadata.xml 654 BLAKE2B a3984cf76278e71d0f7f63c1e8c21eccaa68afb6b83f529f05d314a0973c1b14f3fbc657eaa4cac0c57794137b0e2d1cd3f942d193c551e813baf5c5a0243434 SHA512 d02c9d8934e5e648c42605a881302a8eebd933d09b1ed52b6e46dc4829cb5cae6b69188a021794f2451341f9a1db7036409c3698e49ba0e791b3bc895ed496cc
diff --git a/dev-perl/Gearman-Server/Gearman-Server-1.120.0-r1.ebuild b/dev-perl/Gearman-Server/Gearman-Server-1.120.0-r1.ebuild
deleted file mode 100644
index 9c735ba364d6..000000000000
--- a/dev-perl/Gearman-Server/Gearman-Server-1.120.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DORMANDO
-MODULE_VERSION=1.12
-inherit perl-module
-
-DESCRIPTION="Gearman distributed job system - worker/client connector"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Danga-Socket-1.520.0
-	>=dev-perl/Gearman-1.07
-	!!sys-cluster/gearmand
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-PATCHES=( "${FILESDIR}/$PN-1.09-Use-saner-name-in-process-listing.patch" )
-
-src_install() {
-	perl-module_src_install
-	newinitd "${FILESDIR}"/gearmand-init.d-1.09 gearmand
-	newconfd "${FILESDIR}"/gearmand-conf.d-1.09 gearmand
-}
diff --git a/dev-perl/Gearman-Server/Manifest b/dev-perl/Gearman-Server/Manifest
index 54873bd96997..428d8bef4493 100644
--- a/dev-perl/Gearman-Server/Manifest
+++ b/dev-perl/Gearman-Server/Manifest
@@ -1,9 +1,6 @@
-AUX Gearman-Server-1.09-Use-saner-name-in-process-listing.patch 966 BLAKE2B 666355d3f72c854b00cf62d22bd3c76e81e4a73daa67891c0262c6796be25167a0fe5c49efde6e017c2820ccd8a4cc1bf56fc394530f3db9a6840dcbee449fce SHA512 84b0dc87510e5d4c21db8bbe95e718fcf33f6fcc87ed828a228c2a6b41144a4177746676a060a7a2c18a9f6307f0d06362d4e14c93134da9fb87f400a60c0298
 AUX Gearman-Server-1.130.1-Use-saner-name-in-process-listing.patch 973 BLAKE2B 3e6275b2cf09ee607a5fd0d5759e52aafd954907880349f95c3bf591177b79331ac0db8ff2c965f368f85623d33b026fe0d31141f05b57294880af7ceeb03fa5 SHA512 fc3a62255c9483ca507e82b185673f90e68ee549d137872cfe5b06ca3d97c3445fbea1c95e02fc3ded3769469becd1b095922580c9c45316cd95a2cbedd909e0
 AUX gearmand-conf.d-1.09 118 BLAKE2B 160839ba97ed635321ced76efb51dceca84cde51b644ef63c949f66397e4205e8b558d83032322871679074d0fe85af25f32ca49bd73833e26bbc627f9e67344 SHA512 7edfb51212727b933cf5ca46a8ac72db2fe3f49e04bc856a69eeb77874e35b160ba85844b794f944d3b308624d6c51126bbb721a53b64b1d017a57ed43f9423b
 AUX gearmand-init.d-1.09 464 BLAKE2B 73abdc2db53c8b37f1fc879f2c8711baf6cab3411bfa2b641a8a5fd8c9219efe7b1969329c2fe4c9f3bf1fa78197648aa5d5e39245ea067618ec3d5837e6de2a SHA512 336eabd6018459f6dff5d9e9fab0d4122ffde4f8d9f65d60c0eabf4dfd431fb8417fde0be58db900ad25137719dd5766e086e69247b17bc0d55e110cea9ce823
-DIST Gearman-Server-1.12.tar.gz 16399 BLAKE2B 42016375c8e1b8676fceb93503eab824584eba9a6df34fbdc218269997c85c16a5c63f1aafbe9f03e687e20720e8edc5fb8eb36a045b026bf579d1678c0036b5 SHA512 4a845db0bd981f20fe59cce26840f235379f33603d9f7e445e678fef97c20943ce237a6a8c5f3c8219a6548e24c6347f9aa1e3bfda9033d0afe8ffdaefe9f826
 DIST Gearman-Server-v1.130.1.tar.gz 17585 BLAKE2B 9160639b9ffa12f88c37b07894b77b99085bfdb29902533f2f9dd175458a63c5e01ab7cdcb26af87494461fc853860b5dcf6bb33d7b6adbea0cc3a962f4400d8 SHA512 e8ed734ab7b2afb7e173397f91c58d990bdd223518234ebed77ba46dfd475afdf5aa90f805e26f7642aa7ec1429cf8766145344777e2af8912c2e02add57d033
-EBUILD Gearman-Server-1.120.0-r1.ebuild 674 BLAKE2B c2be7808119728bfb3b190ca2688c983414714d0c147a29d36b971326164307a46bb7ebe0c5fbc6095da2bf01baab1411d6b8246f4e8ae117a3ee3d600e444a0 SHA512 f65884e8094844dc1564965e42e48c61866cfd5b6f607175489305e40e745a3d3f419d2bf2b8baa2098f293f1d7bcea6df98921df641889502c29c572688b7a4
 EBUILD Gearman-Server-1.130.1-r1.ebuild 706 BLAKE2B 596e09061f19b290972122473bc6e9bfe762f907a23433a0edc195a4a16a47dba944c4b551bdfb34cb102e2bf4111b83c32f0aa7f7f1dc147a125c7762ce8fa9 SHA512 76a6781aa2b136a42b2a0d1347b9b5b3427230d6944a61f4c2ce790a7601a0f9bd94f7a103237daa506fe9714c51c8d19ede21d3c0b48b8061cf915731919d01
 MISC metadata.xml 692 BLAKE2B 46dedec6d48f8102ffa335d4aeb5055ec09099cbe56dc8debe952f37d7694fd77488e3a8dc60cd7d7246f98715d571d0e449a4499c8b413cc721b8b332785278 SHA512 0db622f106e94d641c7c49021f738c5e570fcad9cb5e82f91bc254157251afcd5ce6e3de6f28297b9680a73ff9916034005362d453a821a62f5554021aee6f9b
diff --git a/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch b/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch
deleted file mode 100644
index f57360673ca8..000000000000
--- a/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6d8055b1d44d745f194665458674c6e03f48f322 Mon Sep 17 00:00:00 2001
-From: Robin H. Johnson <robbat2@gentoo.org>
-Date: Sat, 12 May 2007 22:16:37 -0700
-Subject: [PATCH gearman] Use saner name in process listing.
-
-Normally the binary will turn up in the process list as:
-/usr/bin/perl $SCRIPTNAME
-
-By adding a single line, we can make it be simply '$SCRIPTNAME'.
-This makes writing init.d scripts signficently easier.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
----
- server/gearmand |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/server/gearmand b/server/gearmand
-index 2d8bd6b..148b1f9 100755
---- a/server/gearmand
-+++ b/server/gearmand
-@@ -94,6 +94,9 @@ my (
-    );
- my $conf_port = 7003;
- 
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- Getopt::Long::GetOptions(
-                          'd|daemonize'    => \$daemonize,
-                          'p|port=i'       => \$conf_port,
--- 
-1.5.1.4
-
diff --git a/dev-perl/Gearman/Gearman-2.3.2.ebuild b/dev-perl/Gearman/Gearman-2.3.2.ebuild
deleted file mode 100644
index f8a56b48d6da..000000000000
--- a/dev-perl/Gearman/Gearman-2.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PALIK
-DIST_VERSION=2.003.002
-inherit perl-module
-
-DESCRIPTION="Gearman distributed job system, client and worker libraries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-IO
-	virtual/perl-IO-Socket-IP
-	dev-perl/IO-Socket-SSL
-	dev-perl/List-MoreUtils
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Socket
-	virtual/perl-Storable
-	dev-perl/String-CRC32
-	virtual/perl-Time-HiRes
-	>=virtual/perl-version-0.770.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/File-Which
-		virtual/perl-Perl-OSType
-		>=dev-perl/Proc-Guard-0.70.0
-		dev-perl/Test-Differences
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-		>=dev-perl/Test-TCP-2.170.0
-		dev-perl/Test-Timer
-	)
-"
-
-mydoc="CHANGES HACKING TODO"
diff --git a/dev-perl/Gearman/Gearman-2.4.2.ebuild b/dev-perl/Gearman/Gearman-2.4.2.ebuild
deleted file mode 100644
index 7d71b35d4997..000000000000
--- a/dev-perl/Gearman/Gearman-2.4.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PALIK
-DIST_VERSION=2.004.002
-inherit perl-module
-
-DESCRIPTION="Gearman distributed job system, client and worker libraries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-IO
-	virtual/perl-IO-Socket-IP
-	dev-perl/IO-Socket-SSL
-	dev-perl/List-MoreUtils
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Socket
-	virtual/perl-Storable
-	dev-perl/String-CRC32
-	virtual/perl-Time-HiRes
-	>=virtual/perl-version-0.770.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/File-Which
-		virtual/perl-Perl-OSType
-		>=dev-perl/Proc-Guard-0.70.0
-		dev-perl/Test-Differences
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-		>=dev-perl/Test-TCP-2.170.0
-		dev-perl/Test-Timer
-	)
-"
-
-mydoc="CHANGES HACKING TODO"
diff --git a/dev-perl/Gearman/Gearman-2.4.3.ebuild b/dev-perl/Gearman/Gearman-2.4.3.ebuild
deleted file mode 100644
index 840d489d9805..000000000000
--- a/dev-perl/Gearman/Gearman-2.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PALIK
-DIST_VERSION=2.004.003
-inherit perl-module
-
-DESCRIPTION="Gearman distributed job system, client and worker libraries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-IO
-	virtual/perl-IO-Socket-IP
-	dev-perl/IO-Socket-SSL
-	dev-perl/List-MoreUtils
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Socket
-	virtual/perl-Storable
-	dev-perl/String-CRC32
-	virtual/perl-Time-HiRes
-	>=virtual/perl-version-0.770.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/File-Which
-		virtual/perl-Perl-OSType
-		>=dev-perl/Proc-Guard-0.70.0
-		dev-perl/Test-Differences
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-		>=dev-perl/Test-TCP-2.170.0
-		dev-perl/Test-Timer
-	)
-"
-
-mydoc="CHANGES HACKING TODO"
diff --git a/dev-perl/Gearman/Gearman-2.4.6.ebuild b/dev-perl/Gearman/Gearman-2.4.6.ebuild
deleted file mode 100644
index 46ccbb99bd19..000000000000
--- a/dev-perl/Gearman/Gearman-2.4.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PALIK
-DIST_VERSION=2.004.006
-inherit perl-module
-
-DESCRIPTION="Gearman distributed job system, client and worker libraries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-IO
-	virtual/perl-IO-Socket-IP
-	dev-perl/IO-Socket-SSL
-	dev-perl/List-MoreUtils
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Socket
-	virtual/perl-Storable
-	dev-perl/String-CRC32
-	virtual/perl-Time-HiRes
-	>=virtual/perl-version-0.770.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/File-Which
-		virtual/perl-Perl-OSType
-		>=dev-perl/Proc-Guard-0.70.0
-		dev-perl/Test-Differences
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-		>=dev-perl/Test-TCP-2.170.0
-		dev-perl/Test-Timer
-	)
-"
-
-mydoc="CHANGES HACKING TODO"
diff --git a/dev-perl/Gearman/Gearman-2.4.7.ebuild b/dev-perl/Gearman/Gearman-2.4.7.ebuild
deleted file mode 100644
index 50f3afc9b0f5..000000000000
--- a/dev-perl/Gearman/Gearman-2.4.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PALIK
-DIST_VERSION=2.004.007
-inherit perl-module
-
-DESCRIPTION="Gearman distributed job system, client and worker libraries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-IO
-	virtual/perl-IO-Socket-IP
-	dev-perl/IO-Socket-SSL
-	dev-perl/List-MoreUtils
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Socket
-	virtual/perl-Storable
-	dev-perl/String-CRC32
-	virtual/perl-Time-HiRes
-	>=virtual/perl-version-0.770.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/File-Which
-		virtual/perl-Perl-OSType
-		>=dev-perl/Proc-Guard-0.70.0
-		dev-perl/Test-Differences
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-		>=dev-perl/Test-TCP-2.170.0
-		dev-perl/Test-Timer
-	)
-"
-
-mydoc="CHANGES HACKING TODO"
diff --git a/dev-perl/Gearman/Manifest b/dev-perl/Gearman/Manifest
index 94979a2914b6..c272871eb296 100644
--- a/dev-perl/Gearman/Manifest
+++ b/dev-perl/Gearman/Manifest
@@ -1,13 +1,3 @@
-DIST Gearman-2.003.002.tar.gz 45859 BLAKE2B 7d4935a9adebdc673e6f8b7a17073b78f519adae53395156863fe60c7a07dd22976d84376d1a8b55f72e1a5c0f8e16300fbbee286e75a59c66c7442973f6a404 SHA512 8314d863b5c6643761f9add16f2b3bcde6091c3596fa34d521506e4961f96fc2a4bce0613154c48f88edd21432e4d63a9617e9013a53a5e71ba69bc141ec235e
-DIST Gearman-2.004.002.tar.gz 46165 BLAKE2B 9a45317afea9caee24600dbeec00c96c68bb174bf3ee3c7682ca36055bf6224babde21dd03920082387921cb1b54bffd4d8675e466667317bbeb1024e7d05494 SHA512 9101582ffe3bc89bc842a57f5445e1dbf0f5459144c3979656768356a457a8b7d43a75057513909eb09b1590956959afc508f46734efd6cccfd701eabbec18dc
-DIST Gearman-2.004.003.tar.gz 46222 BLAKE2B 4380c605cc55826af40160019f11b98a44490b1d6700065fa1985496c00f1c1f027f152aa1d4053b69875415b56e3d296cb8434c608776b125fb288c187bc611 SHA512 6860e1795f795ab5d08098ba6b9fa96ef5ce1893041971e29757ce6d0a27e385cab5e9ea670ae6522a092a414bd108894c4f0e91f885b66341ade37c22be24a9
-DIST Gearman-2.004.006.tar.gz 46875 BLAKE2B 6810cd1f0c432ef9ce314acaeabc327a8915819d61ba2b2e8e12584b38e212d6791469d2aba54e44ed4590a76ac8f6a2efde527fc75eb9dc512b9f4ba19e185d SHA512 e2d4f1c70eeea985d7b437bfd01f7b560b576f61e6f82638cb7c93c8a0f45819ba6477d0fb4edd4f12f19d1667896b4165195c72531bf3856368aac174cb66c4
-DIST Gearman-2.004.007.tar.gz 46892 BLAKE2B 6370b429ed8cb915d4778d684bb4f0bcafbe6c78517060c396bdc2d1a465abae06366c872703ebad2813b99224fc54cf3e6ee5f621832d49077c56621d2be033 SHA512 fcfdaa9b0c7a8699639833d1d9d424a6b8784aed8c37930f8d329dae5e2ae9b5ddd1f33c7f1fa379132300fc99dcb1b2df2af56d2110fecf64a84115b3dda5bc
 DIST Gearman-2.004.009.tar.gz 47063 BLAKE2B 4917d711407231d392844cd37390e0a73dc0a85d2e08584177f0986fa7dc16122d03280baf22a1121ea8478126caa3c68af961e59d007874ba5327736e61d2cf SHA512 4c0ad8dfa8af1200f29b61954efba03fa0d629a40bfea379025b5f01b2f8305394a516680fa7564d68c0231359ed5866daff9278b4350fbdc1a0b20bdb34eeed
-EBUILD Gearman-2.3.2.ebuild 892 BLAKE2B 2ec105544ee594a448adab5d7c1b66405cafea4312f4e1e879a1afa5b04bb16c757266c6f3fd949ac162579a79f28d115023721f8dc36079192b68271a5f0110 SHA512 bf6ef8535c3a0e714f62cc5efdc3647c3b0d721ba62da48c02e9fc8e704a11e1d869918d4cfb26c733a95cc78e0fc20953e86f8061110d4164c4f222968b30e0
-EBUILD Gearman-2.4.2.ebuild 892 BLAKE2B 52d492cdeaf305b80d438dfdaf442e083f512d977deff9f9f0e99da461237d827e3e8010613d06cbf206b1c356f627c36a8feb7e398981f59d946225dd249a38 SHA512 f0c5193f9a83189dfa15d80b00f248d1193df80fe6a4cf05205d032dad3789a7d42608366e8910a3aed1fba5785148e36ba95760abac1c221bd19da7aebf54b3
-EBUILD Gearman-2.4.3.ebuild 892 BLAKE2B ace4c649e03a04f474a678a486d0dd778bacc59d58b68b2ed589fe2630f6906ddb45de2a26d292296853c4bbbc3c7ea2e68c1d938f4cca173820bf0f13d1a0f9 SHA512 2aa43f8d70bb778ae5a1189526b73aa9729ac3c64f21df1f447713a6aad71bc98725b184f0c0dc060af175ae1a6f443a2733a13919c19ecf7ad98c86cef16477
-EBUILD Gearman-2.4.6.ebuild 892 BLAKE2B 8b625b0c6bb13f7babb1dbfa90c92689f73616467c52c95af1a8c526fc498cc7d78b9596c64972c9a4172399419e1d08c35eb3cb8c79e5a99fc617e88c03199c SHA512 3725568d7b49ef7505b1ccb4d659b182c6f779bfd035e6e204cfd8edbe6255644abde1619ceae8cd7270881ace8f8ea20dd56e086ec790f34c7a045fce0dab85
-EBUILD Gearman-2.4.7.ebuild 892 BLAKE2B 16e2149e3e274443b28b53485584e00820e2ffbebeffb21eae9ed7637b304b965552790d88f1cc4fa939bb7fb1de297640dba81d775ab4b6de57a0f36f32715e SHA512 c2e74ae882934b11bb43d59af7476ba730cf7b1e1d6845eab0482a130eacd5b3b183b3d926bab93fb9696d24b48e030f661008a8058c4ad0380613cdc6e085e3
 EBUILD Gearman-2.4.9.ebuild 864 BLAKE2B e3b998bba3b7d921337fdb7206a4f59d111e25628a7dbaa94f3660b3dd118edb891ccade2713f6aa1bb461847bfe6eb95d68f7a89224e8d1ce5b2ec06f2d09ed SHA512 93c9cf019e4e23a82ffbbe962680b617bd4cb02a8616685ceba63d2468c56c4a325f8cfc506b2dff6d3afd75770c7bda2974bf136fd0988f5963454f7526f578
 MISC metadata.xml 1057 BLAKE2B 98993ea6f4d1af5edb863a219ccc5fc3960cd6887e8c42847c061b969a4c75272c9613e5498b86d8d981bd68bbb696e88f3670f1c36b48532098e2046f378774 SHA512 36394554c8e32d2e9812f19ef5597b3f36d796459380a1e61002f1b8b9850d968f61dbc13c9dfa378891122f8bc955ce34b365b98d4b5af098c27a3c0ac20dc9
diff --git a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.200.ebuild b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.200.ebuild
index a4a374c5f697..54cb03563106 100644
--- a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.200.ebuild
+++ b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.200.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Utility to merge PRs from the Gentoo Github repository"
 HOMEPAGE="https://github.com/monsieurp/Gentoo-App-Pram"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Gentoo-App-Pram/Manifest b/dev-perl/Gentoo-App-Pram/Manifest
index 34595e962346..eebe67431072 100644
--- a/dev-perl/Gentoo-App-Pram/Manifest
+++ b/dev-perl/Gentoo-App-Pram/Manifest
@@ -1,3 +1,3 @@
 DIST Gentoo-App-Pram-0.100200.tar.gz 12893 BLAKE2B e88903f941c72607d7e367231f7c4c8f4bb58cde85c43f7a8c3f3a8b4a058313b08cabdaeee972d0fca3c56839d5cc34f001d86fe5002461712faac3bfba21d8 SHA512 e2f452b187005dc4ba8d98db9cd9257e6c9a90dbaa0c83c19698b996f5cac273529f6ac98c4d1bde0a3e8401389ba6703cf8c3525b65ed7494b1a986f15cd492
-EBUILD Gentoo-App-Pram-0.100.200.ebuild 705 BLAKE2B f3d583a1f55bf4fea36233a55ad788f68dc24615dbc92b13a9b8e1826000703066312ed89c9406ffc3436d51736ff4befd7b863838e3e5f80adc12acdeb59aae SHA512 a6e2f76bdd984c4408bedbb6384169fea76b3d3b50587753c2c96a2e9bce3d80d6ed6db85919004f9649ab157f9300db258060e325c6cbe4f91527548a4e704b
+EBUILD Gentoo-App-Pram-0.100.200.ebuild 710 BLAKE2B 4f4f59b0fa973ef767c4388eb77b98593607abc2700c55283d865043f2d5967503f2a0f2ee2f84ddbb3e6eaa20628070005df69752b30af6985fe7415c4161bb SHA512 36fff47cd3220db34909c632a6a17584ab9796ed1787f5c28e56041b708945307b39edbd85fc17c2f9a89e45170d82610bd064d2cb66a9e18f0a2376ca9de24c
 MISC metadata.xml 588 BLAKE2B 35668e32b10085ab7c76e803855150f34720e3862b49be9e7945a4f83be1fa3bbd324c42fbab63d8e76f71964a86cbfad1eccbf63eeb2c37dab57f896cb8066f SHA512 025fe962b70faee06d6a09532e8ab70b7513572f57d42052c97efa0955eb8f37e944989daed5f9dbe67f7ef155033280f8f2b40cdaaa6b3a8a824383de74a26d
diff --git a/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r1.ebuild b/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r1.ebuild
deleted file mode 100644
index 08d9b39ab9ac..000000000000
--- a/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="HARDAKER"
-MODULE_VERSION=0.93
-inherit perl-module
-
-DESCRIPTION="Auto-GUI extending Getopt::Long"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="virtual/perl-File-Temp
-	virtual/perl-Getopt-Long"
diff --git a/dev-perl/Getopt-GUI-Long/Manifest b/dev-perl/Getopt-GUI-Long/Manifest
index 2b83b2381d26..1b6f29a78506 100644
--- a/dev-perl/Getopt-GUI-Long/Manifest
+++ b/dev-perl/Getopt-GUI-Long/Manifest
@@ -1,4 +1,3 @@
 DIST Getopt-GUI-Long-0.93.tar.gz 14086 BLAKE2B 88e0d7cb4f81fa47fe396883fe47bdf157e41000e414dc21093a4b15b143af1d8cc1a67f6f1dcefd679074d88fcb8b783023e352ec7ef3f10f82da3e1b505f49 SHA512 ae0880eb339ce607abe2ca16ccc5176c844531ef6dd0b09afe91f2e3501c73f4383e8f90136e46748b6c93fdd65b7c4936addf496261a2a25c0011cc555961f5
-EBUILD Getopt-GUI-Long-0.930.0-r1.ebuild 334 BLAKE2B 689f5787e6dd4f1ae8eda4e65e3a972464a69a272366ae36e3904047f4111fd9c28c3001138f18e90e61929a15ef2564d0cdc181888d1f7498b2ece7cddf0319 SHA512 348068fa1b2519aaf3b24d18eeb70025c9f151527ac6785637256efa82319d867b0a5fc27590920f1be48b89b421707ecda990c647d7c5c94e1c6d10f316f542
 EBUILD Getopt-GUI-Long-0.930.0-r2.ebuild 812 BLAKE2B ef5828ab4c04f6ad2dadfdb147d555171f77f3e247485709a29339bee24bf2599c70da9b81238794ecb91427b35f4e9f1f798ca588bf5f55b118a5168796ef92 SHA512 9f91ed55937f78d4c9abfec0c561fb2395016d94ac1602d24c77e31cb502409ef511de74be7fb232b18a71c95b18de9916e87575cc7eec330a499015dfb1118a
 MISC metadata.xml 483 BLAKE2B 145c8a6f109027736a498ebb9c8f3ebe949eeb4bdd0f395d2608f2f204a889e1a086fe761d7e5e4f8845d4bedf9c4bb17b45ba2cc385e313bd67eb120e86f39b SHA512 c3445d5e9eb0ea0898b2c92206433b260da535b33055bd36e1d7e4635b80baca8b34488d18d7801174ce22fb314584401a710f05e30f53672ca249cf2acecb10
diff --git a/dev-perl/Getopt-Tabular/Getopt-Tabular-0.3.ebuild b/dev-perl/Getopt-Tabular/Getopt-Tabular-0.3.ebuild
deleted file mode 100644
index 3ace6b55599a..000000000000
--- a/dev-perl/Getopt-Tabular/Getopt-Tabular-0.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MODULE_AUTHOR="GWARD"
-MODULE_VERSION="0.3"
-
-inherit perl-module
-
-DESCRIPTION="Table-driven argument parsing with help text"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-perl/Getopt-Tabular/Manifest b/dev-perl/Getopt-Tabular/Manifest
index 91ca2b4eb137..e48ed12a83c9 100644
--- a/dev-perl/Getopt-Tabular/Manifest
+++ b/dev-perl/Getopt-Tabular/Manifest
@@ -1,4 +1,3 @@
 DIST Getopt-Tabular-0.3.tar.gz 26453 BLAKE2B b2fdb97f43a7b3028f970ecca2c134c6490561126dee038a57291a74798a0c854b8ea2daa784898eaed377e54c399ab1922672159c16c4957fa6044fd3728cfb SHA512 a289d4861538ae542f7549364573cadd740538f73862d89dd49eaf6bed6f787ba2848246add171aed6aef4d7d36411d00bef70b76885aa948ce0e7fc8801652b
-EBUILD Getopt-Tabular-0.3.ebuild 332 BLAKE2B e7923045f0da478902d431284dc0a1825b5215b08c9a9fc0d570ec74deb5d56603e4cb0e24f480743fd93f25df547c78acc9ba708bb687f966cc93d28f558f03 SHA512 a3fe0b740ef7f38c829196e065adec5b51087c6a0f393c1b02d8ea02dc8650c90e1fa9ceafc2d43e1405970a824933bb2c54d725dc100c0901b51f821b83c19d
 EBUILD Getopt-Tabular-0.300.0-r1.ebuild 302 BLAKE2B 7e5a4ee2dcf7e63f15a8a3b997b933ec167665769fa8426fa5c268059c3b127eaecb26d502f9f99b26f3c6f6c50d2d56dd3fdeb02c075810b75552d00e2107a9 SHA512 099775178246bbf3bb30142ee6c6b5b845819d0066e257d4daed50712965992176379644b66ac53fad08e1dec944c4ea8f124c5a52536b1ff6b575d1072111b0
 MISC metadata.xml 400 BLAKE2B 0f406aa287db1139f2ef39fc431daefab11f56292d024307a3bf79da2626e7f63905d26f469cbe680b9017f7f2efffede616b22b6b2ee663311d43d88e3ac7b6 SHA512 a0e84eaaa15702cddabf9e9449c1239f16001723277358d78a86167befac4b820169c5bab58e0c4d8969ad708835b355e06b9394339488af8e0ce08931093501
diff --git a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.14.0.ebuild b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.14.0.ebuild
deleted file mode 100644
index 6e8ded53ff39..000000000000
--- a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.14.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=SUNDQUIST
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Google AdWords API Perl Client Library"
-HOMEPAGE="https://github.com/googleads/googleads-perl-lib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-PATCHES=(
-	"${FILESDIR}/4.14.0-no-dot-in-inc.patch"
-	"${FILESDIR}/4.14.0-unescaped-lbracket.patch"
-)
-RDEPEND="
-	dev-perl/Class-Load
-	>=dev-perl/Class-Std-Fast-0.0.5
-	dev-perl/Crypt-OpenSSL-RSA
-	dev-perl/File-HomeDir
-	virtual/perl-File-Spec
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-Parse
-	dev-perl/LWP-Protocol-https
-	dev-perl/libwww-perl
-	dev-perl/Log-Log4perl
-	>=dev-perl/SOAP-WSDL-2.00.10
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Template-Toolkit
-	dev-perl/URI
-	dev-perl/XML-Simple
-	dev-perl/XML-XPath
-	examples? (
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Temp
-		dev-perl/HTTP-Server-Simple
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.400.0
-	test? (
-		dev-perl/Config-Properties
-		dev-perl/Data-Uniqid
-		virtual/perl-File-Temp
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-MockObject
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Google-Ads-AdWords-Client/Manifest b/dev-perl/Google-Ads-AdWords-Client/Manifest
index cc8d0fe60bcc..4e7c5ef7700c 100644
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@@ -1,7 +1,5 @@
 AUX 4.14.0-no-dot-in-inc.patch 2576 BLAKE2B 599a34aabdea3b3995704712e26ffa0a88c545185fe205f37b3c618fd7063e0ede55895a9797aa1de1490cd0ba634653aca235892f17410b257b199ed16ce612 SHA512 1fb62aee9081303c1d1186a1fd388e698f519ea5856fdf86e65af2044945b85952c2dcd96b0a0a5ec4234fe82361b2e076143918193218f54934c93120b54ccf
 AUX 4.14.0-unescaped-lbracket.patch 1656 BLAKE2B 96bc78ecbc3a2ed7408a509184f88a9ee2c9ac2b2d0b4ad8c8567dcf57646d823bc92938097a7984678c18569b9d8ceb1c9f27ae76afef6ca906c4f5997f85b6 SHA512 8ba173dff927bf5dd7193d88fe110bdaf71b44b54e3e5a3a0d8ff161ce492a36324c5e69dfca268577ecbbf81d3b99247f7fe305bd4bd2f172e59ea52b9146c1
-DIST Google-Ads-AdWords-Client-4.14.0.tar.gz 7757731 BLAKE2B 5d57d58c210ae23e66d721344a3bdbcf729930a368c1b8a80ea4604f871c4a85794d508c1744a44fc1cecab2d72f3824cb218d5f7fbba205ca0d783d7f6d7d01 SHA512 e9a90400620a14062b97b14752f5f28df9fe16c84efd09bc6fa9968c4d97672d31bbe9737efc965a7c7321825a52bb1d8e8c4c415f51c6794f7da83bfb71f3c6
 DIST Google-Ads-AdWords-Client-4.18.0.tar.gz 8921326 BLAKE2B 6e012147b212f734b7c6910b2f59085652acf45a4971157cd6854d37316bc238edb8b1bb1358c1dac200ce43a326f104d02de9ffea9f0ac19839180936943602 SHA512 b0905c69f52909f160e563fd4e24413256d14797d7d9bf40bb1193d7bb42deb65c4030a6d117a9c6a3b1fa6bcbb20ac6a5922dcfc4ba7c67566157e4097d5391
-EBUILD Google-Ads-AdWords-Client-4.14.0.ebuild 1206 BLAKE2B 7e63526c15eaa49da2c74920322ed42534e4819634b6d834fcba6f06061b9e85f9179c034022876e43a2d6772e71c4086cad37cf438c9578842077d7b4ff44d8 SHA512 eadf3dedb6eb54fdb888f559b8e35f7d6ce393a9a25a53d0519005d2129fdd29b2012529d97fe5caee12ed20ac96af014d4237e8acceaebcf39a4212f6cb0c93
 EBUILD Google-Ads-AdWords-Client-4.18.0.ebuild 1206 BLAKE2B 7e63526c15eaa49da2c74920322ed42534e4819634b6d834fcba6f06061b9e85f9179c034022876e43a2d6772e71c4086cad37cf438c9578842077d7b4ff44d8 SHA512 eadf3dedb6eb54fdb888f559b8e35f7d6ce393a9a25a53d0519005d2129fdd29b2012529d97fe5caee12ed20ac96af014d4237e8acceaebcf39a4212f6cb0c93
 MISC metadata.xml 4424 BLAKE2B 517363b807ff8182aa3c6568f66054962e69528681a9549d4bbf6c6648414dc65e0a20f1201c2c2640820c9333f0a74eb84eb30c5c57ec57c6b041ea3b6414ce SHA512 a561f60bdeec595bd9bd11b80aca2c457aa652f01260fd49602c2568f8cbab269d7d49a71466726dedc2cbc5e789aa693c1856995c73a7239f6bf5d5cbbeff50
diff --git a/dev-perl/Growl-GNTP/Growl-GNTP-0.200.0.ebuild b/dev-perl/Growl-GNTP/Growl-GNTP-0.200.0.ebuild
deleted file mode 100644
index fe1edb81f55f..000000000000
--- a/dev-perl/Growl-GNTP/Growl-GNTP-0.200.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MATTN
-DIST_VERSION=0.20
-inherit perl-module
-
-DESCRIPTION="Perl implementation of GNTP Protocol (Client Part)"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test examples"
-
-RDEPEND="
-	examples? ( virtual/perl-Encode )
-	>=dev-perl/Crypt-CBC-2.290.0
-	>=dev-perl/Data-UUID-0.149.0
-	>=virtual/perl-Digest-MD5-2.360.0
-	>=virtual/perl-Digest-SHA-5.450.0
-	virtual/perl-IO
-	dev-perl/IO-Socket-PortState
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	virtual/perl-File-Spec
-	virtual/perl-CPAN-Meta"
-
-src_test() {
-	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
-	if ! has 'network' ${my_test_control}; then
-		einfo "Network testing disabled"
-		perl_rm_files "t/01_simple.t"
-	fi
-	perl-module_src_test
-}
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-perl/Growl-GNTP/Manifest b/dev-perl/Growl-GNTP/Manifest
index 5de07e3c2761..ba3fd496ca0b 100644
--- a/dev-perl/Growl-GNTP/Manifest
+++ b/dev-perl/Growl-GNTP/Manifest
@@ -1,5 +1,3 @@
-DIST Growl-GNTP-0.20.tar.gz 23374 BLAKE2B 87d96ce25c17311688bc1a918d45d03c46e798d8b9911db86087fc566f80a310d7504b5277d9567a612270fe447e9600312dfbd28b259e3c7000f19de7ea1b3c SHA512 a8acd7cd9a46a8c81bc34a7076f379735ca9712bedbb7c8451aea6049113c477310093ac39e5f83c9b4a0b31f0ae4df25bb5cf682e4a7f0e113edb15e84c1977
 DIST Growl-GNTP-0.21.tar.gz 15128 BLAKE2B a7af3f9d79800976c0761d8261ad038dab7b76a6753bedfe5da542001467a4cbbaa24b8eb887a303e8086cdcfb32c2e346846416b8d9bb9446bf4b473969d1d3 SHA512 1c7d8ec81bac5e3bd6e7540be92cfb0ab27c5952a898397dce6eb1e81324cff2b926c55f2bfcae0ad6d3d3043ab898acea970a5283e7fb5faf9a58ebacbfc11f
-EBUILD Growl-GNTP-0.200.0.ebuild 973 BLAKE2B 7256c4af4196360096e6e53f14cb13e953da5b6abca695149fccb286dd8a0e4689f375d80e44a37e464b7bdfe9a951d2cd125e4a11a9e4a6fe804e3963f36883 SHA512 006c4f53addb8ddb0d4da35ae6aa6ecf0c575ee17a1a378e59f7eab71fdd600168288b84f3b9f5b03832288a350ba2bd378694f24bf0c60cf1a7314ebf1c9e50
 EBUILD Growl-GNTP-0.210.0-r1.ebuild 788 BLAKE2B 40e7bd90ed6182a9652a84cff04cdc2cb91532ab09cd2db2a93383c6f3c39a0717c8cc2070db862f71abab3c6c2aa312fc5ed0a4aaf2abe7eb0477a71d876c8f SHA512 6b993a80d9e4055e104688820ff15a8b0309d72498f955dea9865990806c0affc6fdf12efbe1e3b315101046ed25504d7cf5b678c8021547ffeeb17bc5b35ec5
 MISC metadata.xml 380 BLAKE2B 9743e0644b7a85faae2959be706f917a1e518d6dcdeef77b2d245a390cd57e9ad6218ae3dd3db099cee0e88d8bf727a790bdf25e39a67c8a58e16cc61d3341bd SHA512 41765f75fd04a36f096a570d6ad39aea1a190bf974e427eea1bc5c1e6e7442c6f0797a0432c32c6c8b0ea40d18f687ff90f63101d123e602874ebc46185abdd1
diff --git a/dev-perl/Gtk2-AppIndicator/Gtk2-AppIndicator-0.150.0.ebuild b/dev-perl/Gtk2-AppIndicator/Gtk2-AppIndicator-0.150.0.ebuild
deleted file mode 100644
index 3bef901177a6..000000000000
--- a/dev-perl/Gtk2-AppIndicator/Gtk2-AppIndicator-0.150.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=OESTERHOL
-MODULE_VERSION=0.15
-inherit virtualx perl-module
-
-DESCRIPTION="Perl binding for the GTK2 AppIndicator"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-perl/Gtk2-1.200.0
-	dev-libs/libappindicator:2
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-src_test() {
-	virtx perl-module_src_test
-}
-SRC_TEST="do parallel"
diff --git a/dev-perl/Gtk2-AppIndicator/Manifest b/dev-perl/Gtk2-AppIndicator/Manifest
index cb1ca5809df7..41655559deae 100644
--- a/dev-perl/Gtk2-AppIndicator/Manifest
+++ b/dev-perl/Gtk2-AppIndicator/Manifest
@@ -1,4 +1,3 @@
 DIST Gtk2-AppIndicator-0.15.tar.gz 15662 BLAKE2B 59767f0d85bd2fce723c0739e3229e2200d5aea1c9d008d44dfe087bed70f408c7db90dbadf81ea64af29e89923e29aa578b89c145f41f2a25b1f08f58033ec8 SHA512 16aaddf520ce720969775b49697b605e0dda7ed3b62bb7edeefbc2c48a1122656469068b179acbfd595ae9b1f0328747898a54e7afdaf71ae7445792afd9c4ea
 EBUILD Gtk2-AppIndicator-0.150.0-r1.ebuild 435 BLAKE2B e60545b2bddfd7740714c7a2da5ef71dc22a56f864277e59d34c08d492e8be6bbb249c8d4617b8059d0c9ac7e1ee22d2846faa1005d45e7e3b141ac8600533e4 SHA512 a19441ceb062ec0fd36fb75be4727c7074781a515d96e289884e8982f5be8f18ae0ff09d743893d0d180b799aaf8ab57823f48346022a4257e3d8c4c02161f89
-EBUILD Gtk2-AppIndicator-0.150.0.ebuild 462 BLAKE2B de7a200b521b59bdecd438261d6b3290cf5ba144e965c5988a0eb84d40784e8eaf241088f93845b36715b6dbe4192154bf6ff00fd459ed1966c992c58565937b SHA512 f921c9da707bad9650d127080402f2d1353b7a9ddb5c9ae8943dd771fbde70574db5ad41d83a9dadbbf86976fac3a1f8bdb9942ec7608dc19469239f0ea3dc8d
 MISC metadata.xml 430 BLAKE2B 5dd4f4d50dca73dd727943c83b65ccbb285b6469ab278a9aaf9cf9939800f4579c036be561175de88c08b110e3b79d1000745ed5af57474458282653fe0d5a54 SHA512 15b16bb7e84825fee7e4219cef5c3a52eefe8e433599d49c42cdd929a69f37c31d44159387a28ff6027f3fa514ee92d6e298a4dbe1c597930a0334b138ddfd90
diff --git a/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0.ebuild b/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0.ebuild
deleted file mode 100644
index e01586108d15..000000000000
--- a/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=POTYL
-DIST_VERSION=0.10
-DIST_A_EXT=tar.gz
-inherit perl-module
-
-DESCRIPTION="Perl binding for the C library gtksourceview"
-
-SLOT="0"
-LICENSE="|| ( GPL-2+  Artistic-2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/Gtk2
-	>=dev-perl/glib-perl-1.160.0
-"
-DEPEND="${RDEPEND}
-	dev-perl/ExtUtils-Depends
-	dev-perl/ExtUtils-PkgConfig
-	virtual/perl-ExtUtils-MakeMaker
-	x11-libs/gtksourceview:2.0
-"
diff --git a/dev-perl/Gtk2-SourceView2/Manifest b/dev-perl/Gtk2-SourceView2/Manifest
index 80f986a7d543..3d6cb560ec96 100644
--- a/dev-perl/Gtk2-SourceView2/Manifest
+++ b/dev-perl/Gtk2-SourceView2/Manifest
@@ -1,4 +1,3 @@
 DIST Gtk2-SourceView2-0.10.tar.gz 23420 BLAKE2B 68a9bf701483a734a7f58abc863c0a6af454fd8aea90b5ff3c6175696028c64480dd0acfefdd51a7e2b9503f652728bbe8d4f4867932553b8142f5953b32260c SHA512 29e5ea143fb013d95638be10463f5b316dc38212481b720b15ee569a6c3a4ec432d0550128d1fcac5adc35df02e0180ff2a378bcfbab620f332fff78e078453f
 EBUILD Gtk2-SourceView2-0.100.0-r1.ebuild 575 BLAKE2B dfd06fb62ce9f485d34dbc4c3f0597a13b206e27ffc8d76afe3a9016942c06f5cc243ee14f426dbea6720c19980dab615cff3704761e4d5dacab3565ecb14658 SHA512 8eda896c1927651970893f628b5653220cafb2f3eae255d0b1442988d028014a19a60fc9f93f22d2f333165fa79710f7c8ec113f7ae40f2361743e9cf9078623
-EBUILD Gtk2-SourceView2-0.100.0.ebuild 523 BLAKE2B 9e2f08ad75b9a90714485b93cc2a6fbe72787ca2d1ce9a581a5f565d8dfe6e34c9b8838de0a706f36245021075e8f0a3a1dd04561aa130e14cf227fa181b0f1c SHA512 10892b509a295938cf2eaa4b366cebe0d0fcc1a3679479cc2e15fc0a4484e0d646f9a9d7711d511fddd213ac1691d7eca36a2f7d769993e416f533591d3b8fe7
 MISC metadata.xml 403 BLAKE2B b4cab6478e5ab76e7bf6b0421e0b60977519164c371933ca7723ba0a6399eb1166de999c6e359eaefe1c19914872a6d3f44c72951d676bd0afdc774946c0a19b SHA512 b9f3c64f7936576df43769d466b475ea7708d7276cb9c1885b9229bdbb1b0e3815a8f06a2f9227c75597b228d6a62447c4e0729b7c3d82e3246e063ac3f455ce
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0-r1.ebuild b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0-r1.ebuild
deleted file mode 100644
index e198ce232fdc..000000000000
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DALEEVANS
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Converts HTML to text with tables intact"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/HTML-Formatter
-	dev-perl/HTML-FormatText-WithLinks
-	dev-perl/HTML-Tree
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
index 8d324e7dfc07..8000868dadbf 100644
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
@@ -1,6 +1,4 @@
 AUX README-INC.patch 177 BLAKE2B 7554fabc8f41881530112f9a5de682e50f4cdd2e17154901914d61508604636250868f02fe389bc9a37b71d737280428fa985ec61d1fa97511d9ce5d40077134 SHA512 717e0b01f59e18e3656d1cd72b2482af753b57fda2f76cced6ae864d1b9126367886219ea4b8a3820b89b19ecca46021bc1a56c07626789dd3a73159384f3dc1
-DIST HTML-FormatText-WithLinks-AndTables-0.06.tar.gz 299894 BLAKE2B f436ba94d553cd5984e703290941e5a3a5454b3f5412bbbb8cb445397b88e676886a4e32d2e4eaa8e004725e48330ebc5a9d5d18def8a47b6512f5a26d98ad7a SHA512 c930fcc5919d20a67a00826aec11d1d2416a3ae145cf30acee98aa45bc64523858ba49907957c5772b4bedaa1e79ed7a0afef3101c29f913fcf983ce1dddd4c2
 DIST HTML-FormatText-WithLinks-AndTables-0.07.tar.gz 11934 BLAKE2B f9c8e087f643d0a19a246e6e72afd4b38babe69f3f030eda9ba2ef853d9a7d373ed2ea517aff0c74cfa4aa72e8e6f252bec4d6a114ad80e642f2c0efb770546e SHA512 3deea4406f7f9dd55d22d60c169d3889be7ef802a43507fb8b608c45ecdff52f743c9cb3a4703f1e44cdcf033c4c64b4c993192fe1a39efc9eae78c6fb66ff3e
-EBUILD HTML-FormatText-WithLinks-AndTables-0.60.0-r1.ebuild 484 BLAKE2B ae35c7fd290d0e42be594ec1b01fe9fa15c38dfd4455ad0633310a71bd9a662d79dc7113ccdb80ba22a6e100f6787abe8fd456bcb0a1232f0ad930e22be0c7a2 SHA512 87700b519990313521b51e880a082e9e97c3f11e7a89b3145910fadbb549862439f326f1a06a92ad847cf5d39a19116712d40bb0d8a9834c7ef2e83870567aa8
 EBUILD HTML-FormatText-WithLinks-AndTables-0.70.0-r1.ebuild 588 BLAKE2B d5a7f95fd6f7e804a4594456ec5951b0c78391b6ed4fae4bdbd33f6bc646228873ad9fe160c7df60d425c0f2b5575b638b4cde0e4d12e73f24e7c0bc4aaf414d SHA512 377c7c553acfc79d18605a06b026cdabf76cec493668333153773f81919273e01752f82b0dbd4d38a4402d0047746727290eef12f8512382d1daa2e7bbcb68a7
 MISC metadata.xml 600 BLAKE2B 9931b706386a7f349f869ec05e5b09d13b15b1f8d229d795f070f9bbf220bb0e7631a270fb032dabc9e1dd98f24feb74c89012744aca6b075f67c1b836aaed85 SHA512 202891aef6175c631c8b7b598d96e479c42d60d23366cdb02689c3fef5efac860726f706fe945cb7bec556a16f81a7038a75daa395a678eeae772b86653779e5
diff --git a/dev-perl/HTML-Packer/HTML-Packer-2.50.0.ebuild b/dev-perl/HTML-Packer/HTML-Packer-2.50.0.ebuild
deleted file mode 100644
index b6bac07c8cb1..000000000000
--- a/dev-perl/HTML-Packer/HTML-Packer-2.50.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LEEJO
-DIST_VERSION=2.05
-inherit perl-module
-
-DESCRIPTION="Another HTML code cleaner"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/CSS-Packer-2.10.0
-	>=dev-perl/JavaScript-Packer-2.10.0
-	>=dev-perl/Regexp-RegGrp-1.1.1_rc
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/HTML-Packer/Manifest b/dev-perl/HTML-Packer/Manifest
index 5ddd7e09dfa8..e8254802089f 100644
--- a/dev-perl/HTML-Packer/Manifest
+++ b/dev-perl/HTML-Packer/Manifest
@@ -1,5 +1,3 @@
-DIST HTML-Packer-2.05.tar.gz 11426 BLAKE2B 3c335ce9abdd3925785d756a7a798cb19ff19b26b874cb4e41a3682697097d6e6e8c9aae995ee3ee79c77708087dd73bbd1721fb1419c118314e02c362aba406 SHA512 b66e5c02f6a071aa8ddde58fb0e153e4c263165828545383828fea6ec1a62c38f977cdb7544a3fb9fd5ba0b46a69e5e6abbeaeea8b6f9ab8b769f38ba4669d25
 DIST HTML-Packer-2.06.tar.gz 11616 BLAKE2B ad37fd5ef6b5f73e47f203dd04823b9602d1a68a8f70e333fde531f091e2dbc826e3eae40a9f85edec34d6708a93df24ea2c27cefa38eeaeb03d15c3f87ecb2e SHA512 337cbf2206bcd85af693d04ab2bc4961b3b8780206d51709a5db849d7bdc8601b1f994096b1e6cbb77c798a2cc8b4737f5bcc208e06f062f9ca6296a31a79f5a
-EBUILD HTML-Packer-2.50.0.ebuild 522 BLAKE2B 7bac10feb899f65b7b35e4e8376a7291b2120bccccb16094ff0705e32b17c29cf8039b1d5a910770b9b6dd90bd4b5447efab565d9a0b4d3b6ec61ecc243a5ee6 SHA512 91c9208707551d0946c3c6d72825d96fa4ea86d7db415188a3a746402012e5e493d5d3757aa01cdf64039d66679f2d48d34df6edd79970a2cbc51dbacbff6bf8
 EBUILD HTML-Packer-2.60.0.ebuild 522 BLAKE2B a1d3a3c0242bc9bed744f4afcfa16602298227e6b78a2a23a15b875e979ad790fab9b8a4c37773570384703987b46ede8efc27f7a30b2576a372cd19687f7acc SHA512 a362e63f994525a790c361b1aadd9b36587e0f8367b6e5132b9e3ae2cc2250f90d042680f159dc146841ed772e0a11b0ee94e74e95e0d9ee2b998e60e6b41bb6
 MISC metadata.xml 466 BLAKE2B e4b1aee3fa4933ae454732db1e70dcdd188f7814ade17d6a57272a4750adbc3d6244f9e8f39c99d8fb556b73370eafe42ee3d5032f72ad05e50b59309ed06ef5 SHA512 7200b7dc2450308009f65a5c21de2e12c46ff8c4680b188bf5962ffe1fb56a68c119788eb5315506e9036decaf69f39b0d79c3dfcfb5ab8c2b8131ce2e8c0f8e
diff --git a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.190.0.ebuild b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.190.0.ebuild
deleted file mode 100644
index a3cdaba83b95..000000000000
--- a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.190.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KAZEBURO
-DIST_VERSION=0.19
-DIST_EXAMPLES=( "eg/*" )
-inherit perl-module
-
-DESCRIPTION="PSGI compliant HTTP Entity Parser"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test +xs"
-
-RDEPEND="
-	virtual/perl-Encode
-	virtual/perl-File-Temp
-	dev-perl/HTTP-MultiPartParser
-	dev-perl/Hash-MultiValue
-	>=dev-perl/JSON-MaybeXS-1.3.7
-	virtual/perl-Module-Load
-	dev-perl/Stream-Buffered
-	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
-	xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 )
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.35.0
-	test? (
-		virtual/perl-File-Spec
-		>=dev-perl/HTTP-Message-6
-		>=virtual/perl-Test-Simple-0.980.0
-	)
-"
diff --git a/dev-perl/HTTP-Entity-Parser/Manifest b/dev-perl/HTTP-Entity-Parser/Manifest
index dc4504cf55c1..eb60038c3375 100644
--- a/dev-perl/HTTP-Entity-Parser/Manifest
+++ b/dev-perl/HTTP-Entity-Parser/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Entity-Parser-0.19.tar.gz 23506 BLAKE2B a7fb30c4ae98680db4ad1365f82be293a8a36ff3db275bb922b3a7ecbe463beaeab3856b4b07dfcae0916756edd5ca7ca85f23c60473f8a2a20b45463ab76636 SHA512 2558706d0bbf3b5e2f3821bbf297e0d4a4ef5685c09bc952dea76f0a71af3712b7ce7cd3dacc068fc1cbb6b40be41a458db3ba2c3c89ffc6202025aac263ca0b
 DIST HTTP-Entity-Parser-0.20.tar.gz 23662 BLAKE2B d003bf695e32084b524a9e56327b5485ef2d8d4f608d55c776b960372165e2139cddd8a8db609c59f40ef84c979eb42c3af010fc36f3bd52945a6a88417396fc SHA512 c80d9058b8682c51a0fe3669249cc219142e674959237d8ae6bd435afafc16c92a38328329e9b09a25af8a79fec5bf01050145d3c63dd81b15ad9d75946fdfc6
-EBUILD HTTP-Entity-Parser-0.190.0.ebuild 764 BLAKE2B 401cb4a75178f488f8b93853a42f0c598faf0f7e1249eca3509c81eecc89a5eba247708658f519601dca6d9031fbada0f1914c1afb73a16e8d9550a1c4403680 SHA512 b51ea020ea1f4f782d75f802c5b65b9cc941093c138eeff7abed5b83a22e9be64ed42232746c4a164351f7881ab34e90e3ff2b9fdb0b9b41d8509130e3bd4412
 EBUILD HTTP-Entity-Parser-0.200.0.ebuild 777 BLAKE2B 335a4c23e6ae7ecf57573f790e7cb6bfe493b391d05f1959f6a2d8d9d6c1185b9a1287307352782b14bbe2f5f70dbd7b6274239c48dbfd4743296031baa2741d SHA512 ee938bfa61e600df8c3c93aff024ec0d0c0f1bc6ba914200a3ac2caaa3a4adf6778eb7db541edda1f29eba5b9bac695d1b7a7bc20689911954190b01a640b9c1
 MISC metadata.xml 814 BLAKE2B 9d07cd2d82956fdadba2ca2b8590c49a482ef88cc9637246960637b98518e0a453bce7e9292bcf176c1f15d605829b86ca3128b25e52703f14067cee391e16f2 SHA512 769ef47e6cfb110eef1f4e09cf49fc03a43352f48604da2466bf1793ef1a378c69cf25437ba3e26ed0a31c53f489d427504b1d71092cb8b82ab06c6672f7eab5
diff --git a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r1.ebuild b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r1.ebuild
new file mode 100644
index 000000000000..c7ab59e6bb16
--- /dev/null
+++ b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BBB
+DIST_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="Manage IO on many file handles"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/perl-IO"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0.ebuild b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0.ebuild
index 921a2d498cd8..ee1671c764b7 100644
--- a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0.ebuild
+++ b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.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
@@ -7,7 +7,7 @@ MODULE_AUTHOR=BBB
 MODULE_VERSION=1.16
 inherit perl-module
 
-DESCRIPTION="Manage IO on many file handles "
+DESCRIPTION="Manage IO on many file handles"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
diff --git a/dev-perl/IO-Multiplex/Manifest b/dev-perl/IO-Multiplex/Manifest
index f614f7f03380..e0ab4480b2ac 100644
--- a/dev-perl/IO-Multiplex/Manifest
+++ b/dev-perl/IO-Multiplex/Manifest
@@ -1,3 +1,4 @@
 DIST IO-Multiplex-1.16.tar.gz 15974 BLAKE2B 9810093876f5c91ed6c3c3b983872b4b20ef08ae3e5d73deffe1a4554599d3b46bcb74e4a4402bf5167185cf973a5134c3e9a42ce1d9f5cd4edb0202178868f2 SHA512 695462be217a107f734e214d2f0a00800962abac24cf4e30272376f5effa25584bc458377feed16b5cc7bab5858c00e547dc97d02962e57b2b8fa6e55df20fa6
-EBUILD IO-Multiplex-1.160.0.ebuild 369 BLAKE2B fa16c1c7e6b522975d5f06bffb08c28dd9ba579683f5f772c51d85c5b1413a75555f01c3a2723049f8b879aa3cdd282fdd1c0ad5f377a4eb6822777821ccedeb SHA512 dd8c9b000fbcf306ca1d546bd8c41f4c0450d48342c9262723cfacac52be33da510fc5761d3d0092aad280223286d0c0fcba419caf221614daa9a97a004d8a58
+EBUILD IO-Multiplex-1.160.0-r1.ebuild 397 BLAKE2B 40573af475cf46456faa1419e73ee3fc051781cd938f99fd671f4564bac1c75eab66d82d1b30f658f49d1464784b4e4d46fb5213e80fb145e28ba92aaaaea70b SHA512 3536238c14a326c4a531590c40282606cc259a6e285f9d43a3d8460c38fac8312009e49212f86fe68215bef7d4f7b7b81ff56c9fbced7d6b0fb926ca1a1bf8dd
+EBUILD IO-Multiplex-1.160.0.ebuild 368 BLAKE2B 1611ff95f2aa1993b9af480d87b1f945df4b783a9e920e06e2f681ba8d9a34983e05cf03a66a98768468acce3512832616fe2d857f1c5ce1277dd094b7462f03 SHA512 497027cd1c9340bb40ee22115601ee91266f15cf5105876baee45a85a3dae442c03abe745fe6eeab8d7856a1fd2a8c67f716e7f7a46533964b295b767b4f6213
 MISC metadata.xml 464 BLAKE2B a8afbef916a37948c420aa92fe2f9b3c93ede420e2d31de212b465cea8ffd5aefc4e6670d326fbb5bcf83e62a77adcabc123c763869bc7aa75f6616f5b573b40 SHA512 4b8ec44d06e6b8ede6af6ba2fe923ce75c7432a8365bba2a129da1ecf25d609cc96b3da5859cfacb57cb534f53055f54607a262f508aae7c086ab467e9fed009
diff --git a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
index 37f239de07a4..5e5d215cc349 100644
--- a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
+++ b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test +xs"
 
 # needs Scalar-Util
diff --git a/dev-perl/JSON-MaybeXS/Manifest b/dev-perl/JSON-MaybeXS/Manifest
index 070ffba5676f..2edf77846fad 100644
--- a/dev-perl/JSON-MaybeXS/Manifest
+++ b/dev-perl/JSON-MaybeXS/Manifest
@@ -1,3 +1,3 @@
 DIST JSON-MaybeXS-1.003009.tar.gz 11699 BLAKE2B e1d961451908d3872d23006f68fcf94cf01c88e1cbcbbe005cee6deac30fbad26f8121a921d815fb15f135af7f4e15bf78f323ce3c20b0ea0849b7e16ac36eb1 SHA512 a8606ccaac749650004d70bd5d6219fb18f66c4c86f720bbec3daf21a15bacd17d308c2a394fb1c9f6584be4d7c519cbc8653bdf5c7c7fa4129b75261645d8e3
-EBUILD JSON-MaybeXS-1.3.9.ebuild 753 BLAKE2B 8c609e2cec593f02b88d87134f7dfcc077f6c21d4ca995576954467c817f5a9109fe10bbc47b8fce76548c03bf45c55ad46a50bf226ca2ef4407be6da816d827 SHA512 488acfa3c67167eecb5e6dd78ff8a35d3b28e2278126393e9f2a34e867d1305e1ac829c9f14a16b2b6b39233841f3f4543b4774db281652e45abc0dc862b4c04
+EBUILD JSON-MaybeXS-1.3.9.ebuild 758 BLAKE2B 556ed35a517d430ac4e13a2e0412e036eb7b294bc68ec99cdc45a00f5de7b6bf2b7d8fb6c0d7b9ac411aafcaf7a11579a7cf1715037008a68229bdc4a6cfeb0a SHA512 3b9764dcd872c33656f80dd9f4e1ce17de78010717b11768a4430d63a73e0a418cc326be7a63823b1b816c16a097588bef076e3340c5658ad751b2eb35d5788b
 MISC metadata.xml 498 BLAKE2B c3debaa67344aa149dba4497a9ed45a96484b63cc6e9a2d029ce87fa6c880f0bba050bbcdf43cd16bd55787a56fd3fd4bc2b35d239eaab54e737219ce1ba6213 SHA512 2db10423cb5558048db54f639e62d4ab05776edb1945089d48c979979fb1e369ae4f447c963d0ceefcbe5cca9ae525f6a0c6e59d29f7d536291b8300f2639fd8
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index dfd3c1bbbbc3..a779466fd8d4 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Net-DBus/Manifest b/dev-perl/Net-DBus/Manifest
index 192b8ac60279..e5e306201e03 100644
--- a/dev-perl/Net-DBus/Manifest
+++ b/dev-perl/Net-DBus/Manifest
@@ -1,3 +1,3 @@
 DIST Net-DBus-1.1.0.tar.gz 2075154 BLAKE2B e5f75f63678b72d2d80406af76430802c715c59e535487b4dcd8bf1502a3de915035eec26fdce020f44aab27ca46993b85d3e23dd62f472bcfce923b27306a11 SHA512 96f5983ef1e33b4abea93277e39e779821c8ee4b1f2bc7a4a3aaa3612b9513a426b9f8e04094eb8449e89324c22c264df2d34b3d3e43dace85f443a57c770cc3
-EBUILD Net-DBus-1.1.0.ebuild 591 BLAKE2B edf0c803941beddc868e6c52eef0f3df2facd5afbcd92ba9210a3824c13b6c18ade9884ed371d3524ca706f07cd6642ee9fe352df34cc82eae7561c7e449264e SHA512 43c903e34f3ad0828699eb2d056c65928e099e85bfdbc6be8500468397ef28af1d40e8f1d07da92ec1401c1381de37b919122a777010d9f878abc6874941fb42
+EBUILD Net-DBus-1.1.0.ebuild 596 BLAKE2B d82a7575dfb9ca078602c0255b9a84893060f7205d47cb3c733ae31b12d63cb6e3b9cba57c653e1d82945719fccd765d37eed6783860648ae6d5f617c2be0b53 SHA512 501487cfa3bdfb2f320f4cc9afa11be00b4c87c9f61a3803ae91b85600b7ed20a436ab17e245387f310342c1856309b6f22198efe13ac3b1bc8f738606136ddf
 MISC metadata.xml 2428 BLAKE2B 0ed3b699ea865b088921855030debc8a323d80d18a656f5e7a132b18ddccf34a926e1bf081bc779bc7583715c75a58dd4e79b04aa5c557a9cb42a26874bffa45 SHA512 ec204108cdc58e7a0c59d4f8ea88e04eb29e47ac52f83600bedd2279608cccb09c60840883f477be475ccea923e7a8344196b6053aefd7d8315dd8d628560f44
diff --git a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
index b5328d0e72d4..53ad1c599d95 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the DBus message system"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Path-Class/Manifest b/dev-perl/Path-Class/Manifest
index 8336f0aaaf73..be66ba23fd72 100644
--- a/dev-perl/Path-Class/Manifest
+++ b/dev-perl/Path-Class/Manifest
@@ -1,5 +1,5 @@
 DIST Path-Class-0.36.tar.gz 37033 BLAKE2B 5ec7833a334da957e928ecbe3b2dafbc12f63c51959af3ce89208ce54f0d7c1ca9cc6c76fb391c871bab98574f4dd17fb50036c45a9c04f28cfe51d1dee0c2e6 SHA512 17ab96c897537a5964efecc3d4883fedc048145f4980d3959cf501a7646f2f7837614da9e379411f7ecb1f8de1bf23615ee57555cc437878470865b3fabc4c2d
 DIST Path-Class-0.37.tar.gz 37473 BLAKE2B 1017de1f17cf0d0f27b07b8f59dfaa4a139e573ff67e7b8c37b522a8c164156943d5281daa5b4daaea87e72fa6b2d0229ede6aafe8f7b093ad0aac1d51d8314b SHA512 044d86f85eebff96bdff8fc11e97884eb4e06d56ecd2d3bfdc045135da6f08c40e644e0e5c1a779a8ef5d6c7c04e159e47721b4e637a92fed7d298b5f798ef83
-EBUILD Path-Class-0.360.0.ebuild 887 BLAKE2B 363a23435d121cc0f09d24c7aaf09de94cdb875b737c2bdeb4221a08b6970e81dbc70fbfe7fe00f3038f698778910605bea065748a1c4e430c4b173df9525977 SHA512 abc84094b2e8218279875f66d877d19dfb95c7fdc10202eb62c9464790f4cba885702711fec71590d5782c096cb785d9847c37914b082586014d3b5193ca39f8
+EBUILD Path-Class-0.360.0.ebuild 886 BLAKE2B dd51ee485dc07dfaf916dee7c5ecc8488fff715297e57418cab38b6755d951da5513c0b56439843fce9acbb0c6512fca6974aa9693265f312c5b07dd598de7e4 SHA512 496c9730de03dc46caef550247be81d194a673fbf5ec26639b9388a34938240d91dc06ea07258f0d4d8fa935ce376357b98934006c45ce542671032833d2dbf5
 EBUILD Path-Class-0.370.0.ebuild 896 BLAKE2B 3108dce3e813f5308cf1737e6b8ecf1b05af047585981aed77382b5ddd43c0fe32374f0dd70525ad16da068c4d124d82be59c6d5068e43d8e40e3af2f12ae7c8 SHA512 279fc64842388037493f43964aeea28e0bd05ed3a4ae5129b7ff26faf4fe15855597e54b5102250588b58943bb472270a8b3f162124d05a95e89d61393acba17
 MISC metadata.xml 585 BLAKE2B bab95c7547e43f88f7600192f911af16c29bf7356a62b64d94058dd4f8d1f44de76ad65490c05db359cf2f21ce86b788e92ea88dd83fe738b0ff795c4b05e5f5 SHA512 305513019b4556f6d88bd4e6948d9def1f95bad924a3c347a9b8b9d4912cfd24dc1d9ea1cfe499e6660d45b7dbccb8cefa66d3f83526556b7f0d1b7ddc5cdb83
diff --git a/dev-perl/Path-Class/Path-Class-0.360.0.ebuild b/dev-perl/Path-Class/Path-Class-0.360.0.ebuild
index baf5a819fcde..214473c16950 100644
--- a/dev-perl/Path-Class/Path-Class-0.360.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.360.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform path specification manipulation"
 
 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 ~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 ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-LeakTrace/Manifest b/dev-perl/Test-LeakTrace/Manifest
index 0ea3a0d05211..3363c1ba55fa 100644
--- a/dev-perl/Test-LeakTrace/Manifest
+++ b/dev-perl/Test-LeakTrace/Manifest
@@ -1,5 +1,5 @@
 DIST Test-LeakTrace-0.15.tar.gz 49364 BLAKE2B 6a0585d13a58545a4a8a095b186a90052e54e192480a9b7aa056974322a44e05610851e2e5bba274dae1abc13b16c7e21bb185860c9e9977f54984856bf59921 SHA512 664d1648cc9ce229456ca0c27430bdd36ba1d9bf6907afce6c612b90d6885aa6a71caeceb266aec1f843287e6bcda35ac28eab2ad6b662019c0fcb87d7f0d6be
 DIST Test-LeakTrace-0.16.tar.gz 49435 BLAKE2B b7fcd095f7406083a7dccf21f62de4ec4a1dd8ef72395f90cc9fa4b6fae114800130bea6a9e449835871e356c420bb71cfc1dad090bf50d96f450fe3baf6ecab SHA512 6fa7a5eaae01ca5232f3f297a104553dac5f57e4c6721d7084e5d44b0133206100878c7067b228b1e01b21f7639a97a0ec48ef77198deb0598d94d8861bab049
-EBUILD Test-LeakTrace-0.150.0.ebuild 528 BLAKE2B 4ede7dc86bcc57347a6dcd79115e1d51419e778140acd1d0a977ac5c3320b0594407bcad69259484892870fef8116c0601cde1e481d7e7491bb1acc29902d6ad SHA512 b081c70c1a680bc3beb801cd1e27100050f71659d1dac4d7cfacf3605272913d5bbd75480761f1d878162a271541cb2828cc0bf3bd1c13cd48c886c5470c5c65
-EBUILD Test-LeakTrace-0.160.0.ebuild 514 BLAKE2B 023619b7437ab26d679723a26ce2e537402b6b832a54c09bac667261e7d78f05b2a7b4e29c4400bb9b07f084a03df2473c1b032c572e0f43fefcf9b0ca762372 SHA512 d2e90bda2b009f58456a1a69f81549a34a832b21ab25e442c45a6ff532be8768302285a2921fe0a486eb73f9c2a13da2c9845a9f0bd4118028a406b65a41cbbf
+EBUILD Test-LeakTrace-0.150.0.ebuild 533 BLAKE2B 1721b9450d1d293b41f2149a7e88d25ef17d0b174dcd45529b05f1db120971e3be264b6878aaca87d2386a35aabb6d06631d31409a6356c47d76b3a9a8c68bcb SHA512 3232a3c16fa77ffa8d5be43f2684c6713b5f3afdbb7476d713b2ea784619ce1384febd5709cf0bc6ffaeb9133a1ccfe28a7bb921b9a3f130a48bff47aad03de0
+EBUILD Test-LeakTrace-0.160.0.ebuild 520 BLAKE2B 482554ac2b7c04e3215d9205be27960654580d7cb8e5594a122476ef6fadbc1a6d4b948fff383cfaecd6d40be9eab7d1b35c0776a74a7027ca695ced7d491b7d SHA512 5a70861f8a8524cfc9a041d4c4acdbe40f7ba362d32fab9b09151109efd9c3d1f35d39c5a91a55baf98d96f72454d3c0b7bad7a8cd4a16ba2ee71aeb36f7d397
 MISC metadata.xml 498 BLAKE2B a7b876fa8b4fa6475109b8c325c1887dd758a9ef9c0e16c521df6940f6cf7ff98aa593535b9273a0370ad413e0750a8ab8b6324bb1f6f2cc1e2f910ef20b8051 SHA512 7cd95f62b7a941ef5f765a902dc676ee65d061f2e886a4855c2025c2126993776c2c3451842abda8b2f946916d6d5a856a0f4d984eea4cc48fb30fd79986d434
diff --git a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.150.0.ebuild b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.150.0.ebuild
index b61dbfbcf9fb..4ee8fe7b9031 100644
--- a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.150.0.ebuild
+++ b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.150.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION='Traces memory leaks'
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild
index cd9614fe23c1..9c2331b4248e 100644
--- a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild
+++ b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Traces memory leaks"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-MockObject/Manifest b/dev-perl/Test-MockObject/Manifest
index b056ccf63175..b00535dd124d 100644
--- a/dev-perl/Test-MockObject/Manifest
+++ b/dev-perl/Test-MockObject/Manifest
@@ -2,5 +2,5 @@ AUX Test-MockObject-1.20150527-INSTALL.SKIP 13 BLAKE2B 5477232d5849ecc7dc7bf4ef3
 DIST Test-MockObject-1.20150527.tar.gz 29652 BLAKE2B b8eed23744693197bdc548e1400c628e6780d90364ecf67f58d0a58392b113b37bcab8f42e105826a174297df3f3999621c00846ad2240a5905f3bad1e38d702 SHA512 4c99666d9d69f75cae2cd6af8aaca58bae778ba5d4eadd456a4e3ad251d23d4bef5240cee2d575ce9b53b509416df977a5d7bc8e8f10d9a1ddcc040ff6665cab
 DIST Test-MockObject-1.20161202.tar.gz 29020 BLAKE2B 0d6c23378e5b14586055a9afa092d30c6334b619da53efaeecc2ed9a40d988736c528e4ae3899a92084a6a116b49ea9d20df0655b2c21a2b19e3df7f75a3e7d6 SHA512 6410b33727352f9bd1db5643c45ea187a8bd224146a804e523f3adc0cec5b3cf72238ae212d7ee9500743c74574d4185fcb357ed4351995eb3b51ad158a736f6
 EBUILD Test-MockObject-1.201.505.270-r1.ebuild 803 BLAKE2B 6081408ce4eceec4faa0e138c6c65f7624757b7d77e6c8e3e346c8cca11d6e071f2e95a24c95534a4b8639dc5560fc9e98d7313391bcce0574ed30000a998413 SHA512 4c93c0de15da7fff980765bb64f41e6cdbce823362e1c82dc1ff6cdff868b6de49bf3e1e1dd263dca132be04807be2305dbda023d9af988bcff721af4aa4199d
-EBUILD Test-MockObject-1.201.612.20.ebuild 678 BLAKE2B 865baf10b04e08291a3eac3534141f61bd7b82c6321b629fa734fb567669b190c4d9dc13e3aca3fa0cc7919913117f246b7d5ef28c23591211f4d1b3d90023e1 SHA512 fe394c9103859d7d676a1d961e48875fa8aae1a69d27aa8178c8e2b438d8c10bc4e415423b1db5606e3e047661820356246c5f3cb1b8f392ca13da579507c560
+EBUILD Test-MockObject-1.201.612.20.ebuild 682 BLAKE2B b2ae26e2b77465548a4c8cf2d7963a6b6a68588270f568852c79775d9efc8cf7b17d5d54da831fee51cce749b86541d03bc22c2a77e32a434a5eb6cd91d88a4d SHA512 6d0fa26b3763cd69c75033eb54c0980e9d66f3b416331a0c73a3992222b986bf72957d3a0381c9f641f5aa44b54c6da10c2600dbceb01f7c39d93d1031cc498a
 MISC metadata.xml 474 BLAKE2B 976f81c1f9de5598da5a17401573163294541bdcd5238def9351fa91c3871a50411c1ee098ef97851825340e11b09a7c6bfbe5da2b131d64d3215e2d5315c638 SHA512 b49a132266d5df16e13621b1ed70fb51e8ba8c957913b9441e366bf20c37a14ee4e34c546832ecc14ae949040abead4167f95223282bc6cb7f222b4eb0e235a6
diff --git a/dev-perl/Test-MockObject/Test-MockObject-1.201.612.20.ebuild b/dev-perl/Test-MockObject/Test-MockObject-1.201.612.20.ebuild
index 3ca177605339..7f910f375ba7 100644
--- a/dev-perl/Test-MockObject/Test-MockObject-1.201.612.20.ebuild
+++ b/dev-perl/Test-MockObject/Test-MockObject-1.201.612.20.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for emulating troublesome interfaces"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix"
+KEYWORDS="amd64 ~arm ~ppc sparc x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Needs/Manifest b/dev-perl/Test-Needs/Manifest
index 369232a3e624..66f8e998f81e 100644
--- a/dev-perl/Test-Needs/Manifest
+++ b/dev-perl/Test-Needs/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Needs-0.002002.tar.gz 8106 BLAKE2B 76f68912fec154f78995bf940380a9b5e311e5489f1a71ad9aae5c1e7d950d924baa67c8e1eeeb4b171b613194d1419985d3dae10871bce1244ba9b01fe0bb3d SHA512 ac8e1a14e55bbce3747a6bc424216ebf2f35eb657b107492ff47afb3a1fc909bf385dcd79114a0be4b9bbbe0f3a60a56d6f9b4998f7394b6b96d80f46c63a875
 DIST Test-Needs-0.002005.tar.gz 8505 BLAKE2B 783130e726a469e850541d1569ffff614ab38defb2a41df564f41a573e641986b9825963c22b8e7979db4fabc6f547adfe95741f83546afb46bce6e5249c2fc8 SHA512 b3023067d1f8726b0ae2162d0b3722193a3b56d12d5c207cf9558f1552ae8ab554773b843d00f1c481857c259fa869b8fdaf5a4838ab0768f38726ddec4130c6
 EBUILD Test-Needs-0.2.2.ebuild 524 BLAKE2B a514bc50ced7b1540e6321aebc0039d85e4774fc985cb43bf5f6f143a14d69ee209a0008ecfcadd19cf70c53b30f9d27301f479ed9d6143257e894dedf07a06a SHA512 b322da3975adf52815b5bc8c97b260cbe3dc9c791d4e7e33ed425988d32469862d9d0550b877e12e93f613ce31f55650403e1cc2579647b79142befc7afea7c9
-EBUILD Test-Needs-0.2.5.ebuild 533 BLAKE2B 66272b18bcaec88e394114904d2ee1a263c5d4ca78826a72e7f4509943ad52e9e3fa410c37f5ccacd611c9e4e1f58808acf993f26dfbd241d3aa59735a2d681f SHA512 c19e1883479c5180bb7f2b8ce20971a20b30389a24ea1ae98c77f543eefdb518382548e01dc246cd4b3e7786c90651610ecbd4caceac485db980aeb7008eaf90
+EBUILD Test-Needs-0.2.5.ebuild 538 BLAKE2B 5ca0b771f069f282a95b8a6b6e6432fb261a5df789392aab4f89385bbc9bb1574b72115dea0c6ce67b98808421cd545397cd8a676ec7319ddd23b792cdd45221 SHA512 1aff25b3225d2711902fa3e9d6e4bd39f35d22b261aef862a4b007c4860bd64ca4fd1b16ae555bc0c9e4edf5adf9095fa6274da74d0a86c71d33c92de8f36404
 MISC metadata.xml 392 BLAKE2B ad442022b213e365a4894d39b8b49e9487e426e09f8ff1614bc17d8231932aa12077cf523305394836a36ffb0f1b1546f14e1c3d1084b8f3a2f1644a97f7dee2 SHA512 e958e6bb79542efe25d44fc5f87610d15342fc397e3be4829d137a6e6fbcbab06c558dc4034ba4de6c7a96b4f10137a57906a0278ecdcd782f60faaa6e3b4fd7
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
index f2c30f030d83..2106e5d20016 100644
--- a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Skip tests when modules not available"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Test2-Suite/Manifest b/dev-perl/Test2-Suite/Manifest
index 30b251c8c232..aa1b08fc73b6 100644
--- a/dev-perl/Test2-Suite/Manifest
+++ b/dev-perl/Test2-Suite/Manifest
@@ -1,3 +1,3 @@
 DIST Test2-Suite-0.000077.tar.gz 144835 BLAKE2B 5a3db61f48f479f8bd00639a538fada5a917ea054abb8dc22b92b5fb2a73ad2da33776f264b1fe7ec53f1a3786af286bdaada7d611772e56a9f883d91139507e SHA512 e9337fee244f572c5b0af54c78a1be47bf590caf905ef6a40928c6e914a183d3fbc5fa3312a0903f697ef5e44341c5425873ade50aeabb63de3f795902bb0f71
-EBUILD Test2-Suite-0.0.77.ebuild 595 BLAKE2B 004a80e8c26ca7a3abf8ff3e50134041e148c1f2dab982bf8a4002e98b0a17b5830f2a60c7d58b542a06abd7714d03328ddbdf39d02a1598455d32ed455f7f7d SHA512 670886e04490bccb039819bb5776f7fd6f46112c7c0f0e9ff01a2bef4b1d5d7b44f7a419da63ec025f85b80899ecd998c605fb8716c4d2c9725b4c90bbdf286c
+EBUILD Test2-Suite-0.0.77.ebuild 601 BLAKE2B 9be3b484f0bd35d8586a90065f23160a3a79a3988bca8b1507d6af05126a7d347b23fd81bf32c4602c539c914ef44b016acc785dd98cd4b325b1e50a7ba6f25e SHA512 4d5c03bd9525f71001d29ebb08fab3e5a423055ac6e2148bfebf28a6b3bc6acf390ec30a8795c45ff59f4211f4d4cd606601b44a0c87e3819124aac5bf7e6587
 MISC metadata.xml 5303 BLAKE2B 7bdfd9b31a45fedd69595fc5da50f93d52865d600c2bf7f480d507f7fece8ebadd02114cd6b000388e2bee479bcd0c243d1a176bb6bf6c911d2499737da9134f SHA512 acc269672170b9427444854bd73769c31e45a5e87ccac7441024b8db93dd1a02b09a9700b6c38f15379981cd34c490a6937cf780c544a245239ac7c1c323de16
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
index 0a561308a0d2..75de4ba4130e 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A rich set of tools built upon the Test2 framework"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Text-Diff/Manifest b/dev-perl/Text-Diff/Manifest
index 10eccd7294f9..27fa6984b11b 100644
--- a/dev-perl/Text-Diff/Manifest
+++ b/dev-perl/Text-Diff/Manifest
@@ -4,6 +4,6 @@ DIST Text-Diff-1.44.tar.gz 29535 BLAKE2B f496cdc63ae8c355ef1158b2cba8e9a08b577f5
 DIST Text-Diff-1.45.tar.gz 29599 BLAKE2B 361bc0a8fd7bcbd67df75d59e4c360f9982ce89807080150bfff535218ea9be814d41120710a4880bf777a639bf1b8ca0bd2d9f9182a1a2bec17401955fb1a36 SHA512 569370707bf30d60d12df6389594bcdba050805005916ac3a485c2226e528891b0af9ecfcc13d20e4f377d2c36a7ff67e51de5ca409c647aa8a36b7a87eab367
 EBUILD Text-Diff-1.410.0-r1.ebuild 442 BLAKE2B 89c825aa9b53ac2744652d111cefaba8d1800da27df32e35bba39ae250e0fd67dc110c63f77ae6db13fb887c8765678ab9a67c08b24040363590e01a332b6ea1 SHA512 dc485c1f364c56decc70a802ba562880383c6ccf6d9a011fc40b4d3ffbff89149bf96a5dc895325d7eba5a136bcc0963bfba55d04817dc801d00f2575f99ee88
 EBUILD Text-Diff-1.430.0.ebuild 521 BLAKE2B 2209a30824cf8491ddf3146f1da9bea7943aa35246cbe853dd7a9173875eba7fd9fcd727275ae33c09204b5d5f1dc61edfbcef2f6015f5044daa35a8b09fa329 SHA512 6ab17d33188295f130b4fc04a46b7d3b14fd3121604d44886d4d00812343f3d4e8a01941acff09be6c1b40e6c592f53a92634c506719260c65286c133cec75b2
-EBUILD Text-Diff-1.440.0.ebuild 589 BLAKE2B d0773480f9c47ba0324978100de8cda3a17a4b7cce4e6a5621cb19e6711246eb3ac397f35206458822ff2a1bd363fe2760cc882c6358ef8047f5b486365e38cf SHA512 dc751c918619ff7132f27b8f226bd2737c8e6699a99c0885d891eb6a7c816c6c1c5966010d5a0d38a02efc529ec37ed946d25d61fe43b7d528fbcc2cf0332437
-EBUILD Text-Diff-1.450.0.ebuild 577 BLAKE2B bab18178bc8367d6f8d96550b117ce70ef4d4f8e47d95714d22c4ff071d16f8e92ffce518cd0d9b75a5443bbf74acf8aee01598bcd6a681e3d75494bbe06a1ff SHA512 443264fb0adf14599ae86955f001e271c87c0594bdb784198f2e5bf04f98b9d5c44a8102424f02b5d305ccbe4d223cb33fa8f9a01b8819a7e926c9bbf918e39d
+EBUILD Text-Diff-1.440.0.ebuild 594 BLAKE2B 2752cc690fc9aef4a7ca9dab9bcfbdfce6185f1cc7cc6f91224bf3dc91abec3eac316520cc5dd6c9a7f839bed0b1b4816892ef80cd4dfdf1cc645a25d9fee6a4 SHA512 5d323a598039b578275ffab87b1290523d6219769c35397f1a6ec23b299500c8788ba92c8f88c74af12cbefcc82b2139cef37bffaa2d3e22b3202ffdf694779e
+EBUILD Text-Diff-1.450.0.ebuild 583 BLAKE2B b0af0a6d6db8df3da0e1816d409b9afe9fe846171f0296cd6eab5001706895b9dc506365110979caf1b62eb0c3d85758d4ae117f1503de28d0ab013e61100026 SHA512 6739625d7e7ef845233a14b9c8091c45024716c5d8911c346b357cdc7713f41b86978c8d5b5b0f390a959b97b61a1d8a28e3568e872225a2240c01a542d69a53
 MISC metadata.xml 582 BLAKE2B 4a8fa6081d0277188645b5f17a77428645b8f2cdbce5ae5eabeaee4bb19a1e1849135d54558adf21473367eb17ad5d65cca286f24e9f3136633329a4f2a83a7c SHA512 7cf50b652f51763448d01d91dbad6ee1792181771551cf2cd72e936210f00249c695a915b914a3ab6d743755aba06b7b79b366b09b7fc0fbb52cd0c20a7e4650
diff --git a/dev-perl/Text-Diff/Text-Diff-1.440.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.440.0.ebuild
index 0e31004e4276..9912489358bb 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.440.0.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.440.0.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perform diffs on files and record sets"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
index 85a4f69eb068..b50bf55bc675 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perform diffs on files and record sets"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/UNIVERSAL-can/Manifest b/dev-perl/UNIVERSAL-can/Manifest
index c20d3c3305ec..aef2dbffee34 100644
--- a/dev-perl/UNIVERSAL-can/Manifest
+++ b/dev-perl/UNIVERSAL-can/Manifest
@@ -1,5 +1,5 @@
 DIST UNIVERSAL-can-1.20140124.tar.gz 14556 BLAKE2B e1ba2b89c2a5018056142c3f6b3a04e4a2dffc3bbd6bc8a79cb8c76b0fef77482c118284b4612faf11e6ac6939149ff62e1066d7eb95070434a895a3e206cc75 SHA512 36b9d51d68f8cfa3eaf7ca7f2e19195dceb87925c666fc625f2818018cb7b22754f2cee7e7b56da3ee91e009d7187bd1c943bf0e0053860c51f7048ff8ff10be
 DIST UNIVERSAL-can-1.20140328.tar.gz 14654 BLAKE2B 9fb6830e745bab900228b2d3e62bb1abb03c8dfaf03e8ddf9f2ae6665be8748d8785d5629e19d80c3e53342f2f8c151f0539f9d6cfa29ef9ff7ac1f4e999a711 SHA512 6fb032b968fa87d95e6fa6897575c6374a2d43fe9d505e339e593bad398b444b9818c8214fe7ac67fa2cfa1013e5c6337c507c3ea6104c711e3ee3d5635f0bc0
 EBUILD UNIVERSAL-can-1.201.401.240.ebuild 446 BLAKE2B d2ab8cb50587d9f12071b9859ab5e00e354a59f2a0f7e05c3811c73619f4b06cf5fbb8c3654a04a8275de7264bc53a2fea10dcff25a3edc4176e5b647b302142 SHA512 31beab51a0a451187b8c8214787836056d5f54396cc17cce1c49d15b97f65d839af3f88de69a6fa67fb876ed403a04137d7eab8787327eff5af9f0f5fc1ab2ca
-EBUILD UNIVERSAL-can-1.201.403.280.ebuild 446 BLAKE2B 38c3640b6dd574ed00f9c32fce2a0dd2a912736cf2a2183f2a7d4c4c185f30997936273b1ed040a04904ca26f3f0e529fc53b71eb813ac045ddda02afab210cb SHA512 be581e2626ccdfd4dc5a5fe0209b59fc974e4c68452a8c91577bc431682583239a5e5b97c8a728b01535a01ad0abfa0ccc1d6c46b2d69f22c40a2be5d9692ae8
+EBUILD UNIVERSAL-can-1.201.403.280.ebuild 452 BLAKE2B bb551bb0dc191ba93ed61daa37838b60b1960f5d50f5c02c4ad6c277a71e4492e900a5ca368fec8fa4cc35b1521accdc992bdf991102021c4c3d1615d5b21768 SHA512 5c3946ffb279b27c5af12077144e4b7b935949201525ad090ef0caa1fd03aa7199adb81fdfebd107d6be8818ec870728695d67fe6c6dce3b2d31f23dc880cd65
 MISC metadata.xml 398 BLAKE2B 8d92d2f5d3eb39b4a4ca53816d76812313f5329916c3f3e0e02e040956fc58dffec483b611cf91059bd162e947fe98b6d9d5803b4634e4c9b5226b02add51a21 SHA512 425ede01dd3f527021d67fb8b6c1f6e03d659d27af4e05a4ae7112bea92b58ef6ed9538c4fb1ca5f6af7f52b24767e17b2361a8344ac2bd5bc8c3bdb15d7cf74
diff --git a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild
index 1f67e91751c0..2dbda65184d7 100644
--- a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild
+++ b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.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 @@ inherit perl-module
 DESCRIPTION="Hack around people calling UNIVERSAL::can() as a function"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~ppc-aix"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="virtual/perl-Scalar-List-Utils"
diff --git a/dev-perl/UNIVERSAL-isa/Manifest b/dev-perl/UNIVERSAL-isa/Manifest
index e016699b0a4f..3c7ed6a58831 100644
--- a/dev-perl/UNIVERSAL-isa/Manifest
+++ b/dev-perl/UNIVERSAL-isa/Manifest
@@ -1,5 +1,5 @@
 DIST UNIVERSAL-isa-1.20150614.tar.gz 27124 BLAKE2B 92c2e8f749dd961481e6437ea9f23f336c16d6237b626128255507f42a4b2b281010cf231ddee6ad0037b58b46dc44bf1ae94f0c4af88f38147a8ab9fd1d4352 SHA512 f35ac6dd8762702f47ff7df5276ffd8a1ccfeeb531751cd41fc08f374c6309f76ea0cf1e57e1386b39ae46003464ac1f819f987777708d191eee171474122362
 DIST UNIVERSAL-isa-1.20171012.tar.gz 29345 BLAKE2B 1e4d9b87fe2da93343dbfb8ad58f073def486e67b7f070eda08df803c3df7f296d1cfff80b5ecea6937c0b5916e648b2e45c7fcc94bf12071522b8508bd0bbec SHA512 abc2943b1706c681734cc03d995859a7d853741ab2013b530aa9f290d8625c5074ec594062c97760044cc1261a20448b9f059287a8f3dae7ba8c303397610518
 EBUILD UNIVERSAL-isa-1.201.506.140.ebuild 513 BLAKE2B a7f66a4007193183566c73e4e431d96a02e3d8987e9f4163e2fe29bcf4370548b2a334b54a6012b5a645e3674ac9868567537afcbdd9a89dbbe8c5e7ec729a9a SHA512 796ed7fc8feea6d107a2b2bf7bd50ad90fd1e2d53392855a87345c49332c8822c707a6f86d7a3dbc51e56d5d0deeff9280ce525e59140dda2323ef83e3930c7b
-EBUILD UNIVERSAL-isa-1.201.710.120.ebuild 488 BLAKE2B d8aa91f3f90830190e85d224a99b2afe2b24e7bec548c0e3d726372fd2a136e507cab65c2fd792651deb758a8a1d74c3283e2ffd6cd364e107149015d1b4e7a9 SHA512 ede173ab7b76a2b403f0ea73e1689cf2312a2e398059054b670ffcac68565fd1ec4f045857333347c8d2d6eb582745f8b0b221b1dbed378efa7baae363adc32d
+EBUILD UNIVERSAL-isa-1.201.710.120.ebuild 492 BLAKE2B c3f3bdb418979155a40f7285d74df2869f81d273a2869bcb5816189181c5b68062381d2744d9f7160ac8bd99d5e3287f0d4c40846c9dbfa9df7298130f2ab319 SHA512 f1b95ad04bd2611cb7b8df6fb456d3fdf6a84d23aeac5a12a63822989bb96125878dc8f73bcbecf4ba0d8e2e6619fe685279a3680558846a7651303fdbfded59
 MISC metadata.xml 398 BLAKE2B a99ce4172a294f483ee504236cec9418389411226f7074491fa756a1f25a37bfbc190e1e3661f145541e1e34c2ff9a12a32f1215a89288cc3d6658c8aec94980 SHA512 d02a950424c6306fc047fcf97ac736425552a989526d8cd71adad4915ce5cc05c88faacc044109ecd9a16437b80d84fb8bca418db71b71d981e1b85b6b3d547e
diff --git a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120.ebuild b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120.ebuild
index 708ef8c491f5..650f112b1d5f 100644
--- a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120.ebuild
+++ b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Attempt to recover from people calling UNIVERSAL::isa as a function"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix"
+KEYWORDS="amd64 ~arm ~ppc sparc x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/URI/Manifest b/dev-perl/URI/Manifest
index b040eefeba0e..e087250785e5 100644
--- a/dev-perl/URI/Manifest
+++ b/dev-perl/URI/Manifest
@@ -1,5 +1,5 @@
 DIST URI-1.71.tar.gz 100141 BLAKE2B 8efc84c878c96a6ddb52d6ff91df3003125db2780c295070f2012739d3154d6692326dceda8acee5078b11bca5ca65094b1567178d2a7372b3768c74b2a94e0a SHA512 db412b75054a4d315eb861060fa4641832c2428b9dfe56bbe35f530c9ba572d4de2061d9782454750293dd5a64f3375830988d8512f410e84a9d599c80458405
 DIST URI-1.73.tar.gz 106930 BLAKE2B 85adc080b463d67142c96e7ab7af13ff4a231054f28976edb8d7746cd9d788693f1cc2f1b30658530634e2693bc76bbdb47b1dfb6a6caca89117bd92aa78b910 SHA512 b72d07e9e9e284f360ad4bf42b22ddec2d1930be40ec465ca28c68484e87b01c55ab664cdec63af387bc435e9428681c64aed39b46b668d7c7c5f36be5fbeb2e
-EBUILD URI-1.710.0.ebuild 773 BLAKE2B 51478f63fb38a819f27f3e33d580210de5eb24e25eb862f0c26b9b77314c568734b289004a02b2e82a372a80e9804b2a8f3b75f89db1f4c7a6d4a5983a2926d5 SHA512 58f9450bf4908fe419d0cb06e611142f510089fedc1f6970817d5239fc4dd1da134bf8296410533dc55fe7a90dd4ce80d8a00645160a3eed00735cadfcd30aa1
-EBUILD URI-1.730.0.ebuild 852 BLAKE2B ebc762c92b0aef33b713d025a94771c954fd098408cb0283e4b406dfe75c10b4c77c7fe91a8235caec6858de3443267a591ea086484a80aad6ee3cc7ad63089f SHA512 7ce945a2601b4558ad9ff9cc18dc3e0504eb5440e64d1afc8f21f07f667ad5667c6bbff33c1b769f9403cf6ac5e22e8b55cb686d8d2fa93d5840c38b6990354c
+EBUILD URI-1.710.0.ebuild 772 BLAKE2B d26c64237de23cd90f0cec4cd863cfa831d215df174ace0a46c6a42309f8650b38ca2eb52db803fc78767c857c26e3b4aa8f93df14a20567af2d61216ed65f03 SHA512 d9136fa33ec41c073361caaa00705d6ab3a7462b44ad6be4df4d749cc1e2c1f9f3b381220f84791c2732fc36d362a5f9451cd4a63c5951dad2f25a071ae100ea
+EBUILD URI-1.730.0.ebuild 858 BLAKE2B 149483e3401f1bd1e6b5526833697110b70d607728ec00aeed806762414d3c809d88693ffc2503681862bccead24aa6e9210923e79fb896e7590246d5e5bb96f SHA512 972c0efe32a3d781ad115a069190f169b991d0bd14a9fcc8b1f0c0f4aee63b98a51be8fa709bf6f1796d036234d80c9157e403001f7169e3d2c4e6eb1a8c60ae
 MISC metadata.xml 3394 BLAKE2B 49ba41e67806f2095df0e7c7ca14b990a78f1456339073239990b4f2940b7f0dae85b9c55fae9b01bfeea1a5c22e267e97b17a6ca26a69671546dac1f7de1423 SHA512 3ef0266ecdc2518338db76759effedf7ee8ca1134159174f8b8fb2ad67e7b7523b002bcb77f30ca13efbbeef6f34eb2ef6abfe4da64668d056c5ef82dd2d32cc
diff --git a/dev-perl/URI/URI-1.710.0.ebuild b/dev-perl/URI/URI-1.710.0.ebuild
index 3d65f227f7a0..cddbec1eaa5f 100644
--- a/dev-perl/URI/URI-1.710.0.ebuild
+++ b/dev-perl/URI/URI-1.710.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
 
 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/URI/URI-1.730.0.ebuild b/dev-perl/URI/URI-1.730.0.ebuild
index 1e6233804950..2f426ce2c99c 100644
--- a/dev-perl/URI/URI-1.730.0.ebuild
+++ b/dev-perl/URI/URI-1.730.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Unicode-LineBreak/Manifest b/dev-perl/Unicode-LineBreak/Manifest
index 24c53bde2353..0c2ea36f86c5 100644
--- a/dev-perl/Unicode-LineBreak/Manifest
+++ b/dev-perl/Unicode-LineBreak/Manifest
@@ -2,6 +2,6 @@ AUX Unicode-LineBreak-2017.004-dotinc.patch 4512 BLAKE2B e86fb471d296e642aedb254
 DIST Unicode-LineBreak-2016.003.tar.gz 304042 BLAKE2B c0b3d48b0b0855757f3a1555871d52935cdd19d3617a9e10bbe82d21e47fa7bbef648e2d3d235476f9d683d3ccb7f0ea9e960060c47214486dcd968f1105f1e5 SHA512 c2296ebd87a06c55d95f198ef355566c05257a75a38876c726cebe309f5e6082a7bfd7d86f28505e183e3150313e781a6f1999e8de8b35ee772d94845cd08e2f
 DIST Unicode-LineBreak-2017.004.tar.gz 311366 BLAKE2B 7f4ff93365c0542ae1a8f9d17e0e9e20224b95949c4965e69f241ff949f625793a19bde4a81830f9f0214abe3d18fa6c52f43f9a04860ec4d13db55169d120f7 SHA512 f372174a761f87663761dc8b0f9bf387ffe289ba267fc0fb58353ac06dfa9418d4b0ac6e4e0d7833d842feacae4f8e90e521cd677ab22db1bf32e75f10f2e727
 EBUILD Unicode-LineBreak-2016.3.0.ebuild 406 BLAKE2B c674677e9d1c9452b5dabfd138c0bf8f298352d3314d90500d8dd455a120f8bc44300809a51618ae45b2bcb131c34300c38b8851655441da79f5ee7f8bdc18a6 SHA512 200118373c41717160ee3ea105cbf9972019cc445f6f07749b570993a889807fa9f7f2d594782e8e475e597677b8db65f6333ab4e9d0bf12d734c03169c95bf7
-EBUILD Unicode-LineBreak-2017.4.0-r1.ebuild 494 BLAKE2B d34a18604a19921d1ba0b70fbca3b831e3bde517a37e42c1f85aeb23840c9c7d4bb5370038a5bf8daa189320c056f841b1d5028be029c50ebc35d13f9a61596f SHA512 2fb7c033c8684453403e2138c0bcffbfaf45fd71792ca27a57f0082ce3689e7d97aa2c03cc06040f644128b4ba3437386d4858a8f9c670e31846511ce3221df8
+EBUILD Unicode-LineBreak-2017.4.0-r1.ebuild 492 BLAKE2B dedcde876c588216513d99de6867c8b92fef62ebe54fefd182a8fefaa4ffb921ccd4c0ab9617296ba3eadf9b088b2a8a93c51a363d4fb5e902a192b8ac6376e0 SHA512 409241309be38b79a477b63f7bb26d39213c4b8bc8129d80287c09876acc44e6818d31c90ad8da781d285edaac259d0caef3b127de7698fc7ffa268443c4092c
 EBUILD Unicode-LineBreak-2017.4.0.ebuild 439 BLAKE2B cabde985bc70d710dd4d0370a0e31c58a37299c772c32c0027aa5db9af2b4631e9f2ccf0d8fef6081b708eb836e3dec2b07c9eee72117780841bbe687d285d08 SHA512 73a5a55008c3939e69acf9a82409582fa0b33c3157eff12e61b918bc144b37868ff09d34612dab9cd04f4d36d0b91174dc4aa4ad989d2267d035428b2053e122
 MISC metadata.xml 531 BLAKE2B 222c5b7ac9a391d440e8d2d74525ffe988ebfaaafeacbeb725b944bb688977ac2a44f5934ccdcf719ccf516d3580308f0cddb6b1f4c7d2b3ae2e2ceadd5cb1db SHA512 831c5152759f2a9b2c549295aec94a7a9a00f261fedeca2744aa5161ba4cc9c68efd59da63b80e3b70ea83fe16491f7438580fc614bfcf57fd813654307710ed
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
index 1b10cd0a7347..0a06bf5771ce 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-perl/MIME-Charset
diff --git a/dev-perl/Unicode-Map8/Manifest b/dev-perl/Unicode-Map8/Manifest
index 2accc44a26cb..88fc8720c1b7 100644
--- a/dev-perl/Unicode-Map8/Manifest
+++ b/dev-perl/Unicode-Map8/Manifest
@@ -1,4 +1,4 @@
 DIST Unicode-Map8-0.13.tar.gz 99250 BLAKE2B 675e39d091c41c2e92e279ada53c2b18283aa5416efc931eba67534af02fab196151e55757ebc689fc26840d290fa54ed91a77c588f8534d5ebe2ed0379ce42e SHA512 1e8db5bb1e10f13da4eb2c5de36d38e1cad5eeed2aba7e6bfcfb36cde727d557902ac476f64d28937ff2a53992c67f027d1a42edb005292d1c2ec89d05e18f2a
 EBUILD Unicode-Map8-0.130.0-r1.ebuild 386 BLAKE2B c78e46e3d02bb6e8fe14fb862364be9e0dce8c7f3f986bc3f738270fc7de57a33fe51af2fb1ad26e1966dc06b01a38a48f174ba333834fb2b90e8d7fdd41967a SHA512 aa50fc4df60fc4531de43ae920baebb3e03581f1a4f06622150868791bb67e468187db38f863169ca2e2f229b4afaa76de538473192d8226a11b02731aff6cc5
-EBUILD Unicode-Map8-0.130.0.ebuild 393 BLAKE2B 7400e852d8cba47fdfddc281d5a814ab986ae6d16184580b84135014df2f4fb25e2f093c061322117d6a45862bb0a8dee30bcf4319e71562f5363e0a86ea19f5 SHA512 714ad989b666f7117a872c3092c58266b79527ab57106fd0f89877ea951898e9322db77626d933fdcf5f00c0f57b2ae2b22b3188cada7e2496bbcce07a77ee89
+EBUILD Unicode-Map8-0.130.0.ebuild 392 BLAKE2B 420e5a7ab4559480d367d92ac98c2b1eaaacc93c63b8ab50a5c0fe1f0692b1c5a716217f6abce0964f39e62325bee2182fb947d03f9a8840d107b566307c73b1 SHA512 44ac6c1341bfda0cdb417c6202d8fe8d217b819baed5787abe56b167b1e4fb3a5f97d495edcb54a33ae8bab555af6ba195d92d2cdf4dbf694a804b639cce6578
 MISC metadata.xml 396 BLAKE2B 35f021db9cfbac5ff191cbe820f80ef228b29995196a2cdb15ab5c5fc749d05b9409f84726eb2acd24c7145e2446d5686cd6e5c16908163df1e9b0aa3fa3a849 SHA512 57e9f9939b12784a74d341d55d4cb74378d4ff1c5f7b69b89c87c6bb47c86b1f91f0ed05627d9e3756a23317dca426222bc40e5d2b35c48c0f13ad08c1e9fdc3
diff --git a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
index 20730e0eeb16..c20b974ba317 100644
--- a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert between most 8bit encodings"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/Unicode-String-2.06"
diff --git a/dev-perl/Unicode-String/Manifest b/dev-perl/Unicode-String/Manifest
index 92d7dc8d3d8b..ef6ffb61b333 100644
--- a/dev-perl/Unicode-String/Manifest
+++ b/dev-perl/Unicode-String/Manifest
@@ -1,5 +1,5 @@
 DIST Unicode-String-2.09.tar.gz 122705 BLAKE2B aa51290d56eec9942650ce53019407158b182cf98e296bffc99b88accdfdefe289da530e6f33cc0b5795aa5547e4e742c6d3e421875b06354ba938965d52c4a4 SHA512 88bd5fe4a1e8ac05b7da5f75411f3e2cb17fb756ca926ace7f46d047ba7a7f22e54462efb61c2f0bf651d2c63d6fe74bffa8b7bcf49aa59847135a43b5cde759
 DIST Unicode-String-2.10.tar.gz 121287 BLAKE2B 4d7769b74fd85e197aa1bf8a22a57f3dc519b30bb1c1d47fa1f1de6faeb47e2a0351a580a2c34c158b13a37a43d9e5b7864c2333143d335f129219efb5451857 SHA512 e1fad14dcda301d1e5199c9968efe2f33408fd56ef701d7ede40262a50d4d13a3b78ed7aab5c5319e63f551d40dd48b06dfd74e49f3e434b7b2f8d2f592f0b0e
-EBUILD Unicode-String-2.100.0.ebuild 418 BLAKE2B 834b3b5bcbcf84bb43a99e8655f43523fee006bbdb744a07811bdeb4a3d32f01a21539ace95665eada1a9d685cbeea33abd73812d11e8babe5fe729a3b28c1a1 SHA512 e524073145f54d315580521c2d6d80d73940c572f25805a4a34c85d63992bea29904a1d206365cf0e68ce0628f8d122bdcc2ff19f81357ad07adfc3ab17d63fc
+EBUILD Unicode-String-2.100.0.ebuild 414 BLAKE2B f2f1654eebb54217b74cb8f355424d335f86a56ed6a013b6f69e45dd87d313b58baf1b64b7eb625ea66aee51360c6acae38ec85fbf317e8213f47427bac8144a SHA512 d0100d7c7f6d7dfa958bac2698cfaf17d0406cc94a93bace22448a72b1d8d74f17b66caa4c28605a12e32203a6994bf9e0ff91c1843ae40c75244b3dd39516da
 EBUILD Unicode-String-2.90.0-r1.ebuild 393 BLAKE2B 141c941d8931f151d5987b45d458272fdd6b05c8f60b495159b26bb971a0fedba7f1f3e5ae02fb62202d083da064ffa6b6d7e1325c5b2617419d020681c2ac4f SHA512 f3755d5c6d61e5eabd9e1b220c0c6df3ed532dca9ed009e6bf184627738f1e3508ff6e2b75e633575dee5ff8a50458af3bd8acfb89ddd3da9bace173b3c7b4a6
 MISC metadata.xml 464 BLAKE2B 22020fd1ae466d0855ae2492769090602ad5a88d2084519d46bf58f00e03e337a13738aeb0a2d934f0d9b20b1979b41711db28c5cd0fea07add1d905c905f7be SHA512 f2486ee988a2cfaa196ed080011ed24cbcaf1fb2995080417f94a137958e4ecb5811784dc6008bc51c25f55dee4aa9cf375241c4f36cabb038ad8679e6e1c4c1
diff --git a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
index 3b2713354c29..36d2db1389e5 100644
--- a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
+++ b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="String manipulation for Unicode strings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=virtual/perl-MIME-Base64-2.11"
diff --git a/dev-perl/WWW-Mechanize-FormFiller/Manifest b/dev-perl/WWW-Mechanize-FormFiller/Manifest
index 9b0e4de1234e..34de22ae764a 100644
--- a/dev-perl/WWW-Mechanize-FormFiller/Manifest
+++ b/dev-perl/WWW-Mechanize-FormFiller/Manifest
@@ -1,5 +1,5 @@
 DIST WWW-Mechanize-FormFiller-0.11.tar.gz 20157 BLAKE2B 0a8ea2faa5c06afde5049f03a5ce87a8d836d501244a8fdad7ea8f679a799f055905902a7b7ef498b387e8815bf22e9dd8a0d9d015cdd3d98085b273e750595f SHA512 60436af00f910465f5bfe60c55200c4a4301380295cf0ac39979a73c7f8efc78559ffd828fb145970838919beb2f4a99bbf134adb1976f577569a13f1c8e3b02
 DIST WWW-Mechanize-FormFiller-0.12.tar.gz 19930 BLAKE2B 878dde1ba22665c9db295a6353a685e4b6ad252785b1993ef0498b32863583d0a72bf500e58298c4a463e511bc918e476fb5f09e0d1d8ca4beea7fc8c4b7a17a SHA512 87db40c49daf6955c8d42b4bd61f4cf4b1f08782ef48789d636ca81881bd000b46d52fb293792918e457aa46845e766d3685d4c3c6d14dd1875b629d6f9f0999
 EBUILD WWW-Mechanize-FormFiller-0.110.0.ebuild 414 BLAKE2B 774090ff21b20d46669af3f89c270865950dd0804dd042520dd84aa27f61e4c1d77ec59c8c9b4e010c3d68f691318515b6bae161a635b1cf1dffa47129a9547d SHA512 46de04c7887a3be35bdb8da87501a78aa2d7eca133b329739a2b05f3872e9bc909f2f8c9f5634f6bcfd26bd2463ecf2a5a6dcd35f7aad509d6d0c8b709bb6c3b
-EBUILD WWW-Mechanize-FormFiller-0.120.0.ebuild 457 BLAKE2B e6cac9452cb016bb87b262884515ced413cd70a444238c29beb0069f8f29e43e8c609877c30eab32961f98e3a2aaf1aef34c2269e49a9bbfdb9e9b83d427f3a7 SHA512 f3990081dffdca00d2125bff0c602ef8488165cd67a184e298230b8ade989340e2f93084616256515ad42c41a17f7879c7ebddcef1d00931b23368daae852be2
+EBUILD WWW-Mechanize-FormFiller-0.120.0.ebuild 454 BLAKE2B 0d2ea71fc0a94305c4bbb8544bfc7b6134f3163f4874a100cf06699166bb9f25fba65b6185195ae4da15d475a9f596b9ca724098015a010d986eba27f8dd3f97 SHA512 2b76bf569f2e42f02ea1e241142214e1d6c7e1ce9621f11d50c7f962b0de65b21c694cdfbbf8ec4c2afc1431f544e0984b24251836766ab852cdedeeaa228384
 MISC metadata.xml 1317 BLAKE2B 4a9745410fb6c93fae3c18fc4bb161f275e4df1f1bef4c99ad4e3423bebdd95ac4a79bd2d677980957fb9857e94473404881d634e24065b03396d9a559246c5c SHA512 12ba2db26862aebb95da6fffbffd809b87be9f50f86a3a640a079098281f52af182af411593f86d9444b0969e81e369e9bf24c6be452c36713ce221708194f77
diff --git a/dev-perl/WWW-Mechanize-FormFiller/WWW-Mechanize-FormFiller-0.120.0.ebuild b/dev-perl/WWW-Mechanize-FormFiller/WWW-Mechanize-FormFiller-0.120.0.ebuild
index d3536c56d824..ca0ef92ba2da 100644
--- a/dev-perl/WWW-Mechanize-FormFiller/WWW-Mechanize-FormFiller-0.120.0.ebuild
+++ b/dev-perl/WWW-Mechanize-FormFiller/WWW-Mechanize-FormFiller-0.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Framework to automate HTML forms"
 
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Wx/Manifest b/dev-perl/Wx/Manifest
index f88bd570cc60..732a6826affc 100644
--- a/dev-perl/Wx/Manifest
+++ b/dev-perl/Wx/Manifest
@@ -1,6 +1,6 @@
 DIST Wx-0.9928.tar.gz 501439 BLAKE2B 8ea83983952660f052c123f0935f5cc9695297e0b3c74f8a3067ded758e30f1f2e8d6b3d80654e468ae91d1c789c5b2b8309b16033e980fb9de062b2ffc0efaa SHA512 9ddb946e1a6a7f670fcc27ece4227821cfa9b2fcebe078e8452e924a8786fca8c20c53262a5fa2f93ecd6586a82d42af77920ec543817a0552749caca2c552f6
 DIST Wx-0.9932.tar.gz 486326 BLAKE2B 54509a108b131973aa3c14fc895893248ddfe2807c0117a7fd56b710e79fbac257dadacb6aa39a0463447b16aa909bb2faed1a437024389afeb2b00c63562a8c SHA512 49f9a32bcd65ad4f2017f322e45ddaad741cdc0f0245489425771dda917553c354945fa949521c18730d27e78444a79d0d56374d462bcd92a96c0e76a4471c0e
 EBUILD Wx-0.992.800.ebuild 1098 BLAKE2B e2caaebdf83beb48a59efa361922ff23e4aa4c6091e9a7f4c6701d5cf1c2ecf888da38911647d65921ce1bfd594825eaf5caaef3d53646995829f2a6f2f15c00 SHA512 2e359440ac9cbd1e77828ed023f0bee2249b09266b8a43cfe47ff39c74642941dbca793468301e1c3e01155759f1e0b78d62bce676660a3d2d46a79edf5d95e1
-EBUILD Wx-0.993.200-r1.ebuild 1091 BLAKE2B bc16abddb30d7999660d8080363c56f2ade19b2195a09ba35a0cf8dc8fa5d68e41249363ac384d2267a5bea2b56b5982199fe8e8e9392032175802594c1a2d33 SHA512 fd3efbd316432f40186524a5008a8dbc49f478fd177ef02f5da774e5788430650afda315334a2ba781b3ac20e2c80cbc8a107143bb69c9639545a8416fda933e
+EBUILD Wx-0.993.200-r1.ebuild 1089 BLAKE2B 3b8bb9ebdda53cfd25461e8a9bfca11a045635cf1b1889cd0273c2f8514dc1a660c64005c436a1c7c92dd3eababe3ca784c73a8846be8225ae9c2a7b22dba858 SHA512 b9d30af1080de4d38ef8ddd16835ef531044190001f68530ade3ea49c6d90f69c82b35015d5fece361a62d6d2b499c2e0d071aec0c47c82a655f9cfc0fa5ab7f
 EBUILD Wx-0.993.200.ebuild 1100 BLAKE2B 67e736f30632106dc92341e2c4792d3ea6b81c2a8cb0f619f1bbe45c07f863af717c4f5ee60bb9f67c630ebf4999bee2e9d72c86f4456118e3f8bfa2779941dd SHA512 be02b760dbeba0a949e8ae1e07a499fd089f23b0d2c7657fe0c2ef5a390a7ceed4504cfcaaef0794e5a6aa177abe7ff9250fac90373b70aa144db3a3adabb7bc
 MISC metadata.xml 20246 BLAKE2B fd148abe46ee2d3e8c2ac838400797bc80cc75637a4f60249744fb628232f5499c035d219414fd8e7683c19844b05884ec5ac29109143f7d42d9571897ff6c98 SHA512 618e3cb991b6d5d3d72daea34be068fade6b211fedeecf43167a891cb30f4aaf10e9514b8a2d2bf8c85f6e4d1b0b0be84e8185607c332413a4e8775c5d8d003a
diff --git a/dev-perl/Wx/Wx-0.993.200-r1.ebuild b/dev-perl/Wx/Wx-0.993.200-r1.ebuild
index b1d9866a7aed..351e77d7084c 100644
--- a/dev-perl/Wx/Wx-0.993.200-r1.ebuild
+++ b/dev-perl/Wx/Wx-0.993.200-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Perl bindings for wxGTK"
 HOMEPAGE="http://wxperl.sourceforge.net/ ${HOMEPAGE}"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-Atom/Manifest b/dev-perl/XML-Atom/Manifest
index e732ee846870..5256f5fb56ad 100644
--- a/dev-perl/XML-Atom/Manifest
+++ b/dev-perl/XML-Atom/Manifest
@@ -3,5 +3,5 @@ AUX XML-Atom-0.42-testxxe.patch 937 BLAKE2B e4288229a16f078d6b64db40ba16a244dc9e
 DIST XML-Atom-0.41.tar.gz 67309 BLAKE2B c8c61dcdf1cc1a73d366fb11e54b5f78452d7ad71ad5b406f61ba17fb175e6fbb536709e12e35d514df186ac3ae3feabe93b5f2b74aa711fc1a728eaf0505392 SHA512 a26f54044ec64da309cdeca718aa74b9114818b78fc74171f0e5d8393032d0af390df2b155500bf85f51586942c694261ad134bedfc9434369ce9d974fa77aa0
 DIST XML-Atom-0.42.tar.gz 59629 BLAKE2B b28fa62523855f95b4dbcd0ba6b4805c326e78b1a6765f927c1318f53fc9ba14c43b2f539f80c89b90431923dcc699f644bc7a8d2fd593560d2a9b5bc7528b11 SHA512 5f28b3daa01e9c709c4e07935e7bd301ae368d51d19b48fbbcf46bfa96d460f1b40806e4032a83e1eacd7c6ab397175d33cdaa5fc9792081a3bbe228798889d7
 EBUILD XML-Atom-0.410.0-r1.ebuild 746 BLAKE2B 612e17080eaac90bcbfd82ffb5630ad337aadab7ec9a89741b6909b7950c930ed31f5c437988c844007b4eca114f531ce52a3cb1dc194a3a28379d5dff762922 SHA512 d90f623adbe34065236662403a4576bcb7166e8c2a4afdb43e2a937cf256a76d9845b56bcd2d96c1afe9e94449ad8c9b355e9f91f003b8d1fdcf189d0a532778
-EBUILD XML-Atom-0.420.0.ebuild 775 BLAKE2B b6940e22c160f5c1f177b05c6bf660c1f61a94506b2b2c61fa1a19ba51eda6b69191f9650c52d6a296ff434dabee37201d17a01e3af8d1a18292c40c2720f721 SHA512 6109161c85b6acaa92cd0439becd423fda86641f10dd7423da5203d1a88ad4ee25ca47ff6d935437fd10b7bfcfbe1772da583cbb87a10be0867c1feb43138ed6
+EBUILD XML-Atom-0.420.0.ebuild 773 BLAKE2B 9cd580216a12c12b90bca5e21af716e0d730a09577e73074d87682e39a31992120033da0a5e610f4b0bb35305501c34218ac4594dc27b2b86ed2818d596e36d4 SHA512 1226ebbeb7f225cca10156fc5b67e09c6a6e1ce0d2c8bd4a1829f1650d5689aaa4625ebb1a6f95290b2d85334f5da48336b8562efd6d444ba6076be929b4a6a6
 MISC metadata.xml 1295 BLAKE2B ebb6f5c3893235ef82c9d47af2e4e30d37cd919f15f2178eb8a9eceddea5c45f27fa65aac403066a6ec6538bcf504f37d2399641d1bb7c401e90075747be120a SHA512 5751e42df503744b460b5f4ada9451a40893e5110893c8ac4241591f0ccffbf6017b9f77f96e1d285bee2fe3700a6fb0014efaeff96b1870464fab7b9bf823f8
diff --git a/dev-perl/XML-Atom/XML-Atom-0.420.0.ebuild b/dev-perl/XML-Atom/XML-Atom-0.420.0.ebuild
index 653ba03ffeaa..6874047ec10b 100644
--- a/dev-perl/XML-Atom/XML-Atom-0.420.0.ebuild
+++ b/dev-perl/XML-Atom/XML-Atom-0.420.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Atom feed and API implementation"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XML-DOM-XPath/Manifest b/dev-perl/XML-DOM-XPath/Manifest
index 49e1555668d0..dc390a698e16 100644
--- a/dev-perl/XML-DOM-XPath/Manifest
+++ b/dev-perl/XML-DOM-XPath/Manifest
@@ -1,5 +1,5 @@
 AUX XML-DOM-XPath-0.14-encoding.patch 658 BLAKE2B 9a6c76e73975ce3503b9653799419d6368f1dafaf0fd4b2e4889f90920e97395e9eaf9917f083f59e4434a2c0c3ef77cfdcb0bf4e75ff4dd51db1962e5f6d8f3 SHA512 ac51bfcf68e874adaf604a6024ca774e41aa48aad7a6385b46e3d8e050941e8a2267675fdfece96b355f845476796ce0ddf57b9f5b2bded4e1bd7579f8181c63
 DIST XML-DOM-XPath-0.14.tar.gz 12410 BLAKE2B cd12e9271390d671c9e50de31084536231c9299c2e6747f5bbc458d0aa827288b7256c900bae3c525f108a8e6d2d1f45da6ce7163a5ac3b25712b410c3c2d953 SHA512 7a2abfac00b260cef3be78999fea3083a798babdd80559f8053a6517606b3b5ed1ad5ad56c8762d5b03b3cea081edf1d6adfebbe01fc7ef4b7d90967400e1a9c
 EBUILD XML-DOM-XPath-0.140.0-r1.ebuild 510 BLAKE2B d46c2ebe75380c7ba910921bf1df5fc8b681d3fe843d0ac5a017513c4ee2d183ef8a2a07798a46ed9f35c1c6c03ede5f7cd82d18fbb5caf9e4c67448b981ca8d SHA512 e0adb7dedca7a6d23f4c29d95884aaa50ad574cda42e2d361f39cfddc3f08a0a4a5ed664919c0d6b59e57759ee84290493e0e7550ab8570528a5da5e9ba78e57
-EBUILD XML-DOM-XPath-0.140.0-r2.ebuild 511 BLAKE2B 6e1cc99898b984ee25fa535f42d66f4825969824b94345b7ccbeb3f62e94e6dc913193ffb7abd8ae37baf94f62eb14959ea609a22777f50e88209b1ccffa85ff SHA512 3cf8d97d8cefca3f06548b1ec77a8194027cef167c0c690e838435510ecd793b92ea0b3307e36656a74800904b5aae163d54959e13e060dc3f9c276e033deab1
+EBUILD XML-DOM-XPath-0.140.0-r2.ebuild 509 BLAKE2B 2e199c18d86c9356c253b5cb9f86c9591f49baa8f567f8a1e9f1917aee18255263ce3ac438df8092c5f239e6e2f02bbd532a6d1c213c623da49a86fb891af97f SHA512 d6368ea9f13ad5416760035b8d2fc1733e744c8e479955cf5660b59361b56a19bd3c0aeeb863f55f407bb783c37bae9469540ae6f5924ba985140c57882ed260
 MISC metadata.xml 585 BLAKE2B 3202f817f30ec2c4b3868ad30af27e6ae42bec83ee3dd1dff7209e24fd2427da6a08648a3ca5250347d8dd99c2a907bf51363134110b9d6754e67c19dbedf909 SHA512 ffd89552971f979cfc7f84fcc30260e50e9904dec6a71396035b67ece7a03740ee7865b076383b2ccb9b5faef1e602a14cc2e1d877542bfc847a6c45502b975c
diff --git a/dev-perl/XML-DOM-XPath/XML-DOM-XPath-0.140.0-r2.ebuild b/dev-perl/XML-DOM-XPath/XML-DOM-XPath-0.140.0-r2.ebuild
index 6b3e2e977e75..68a705d46efc 100644
--- a/dev-perl/XML-DOM-XPath/XML-DOM-XPath-0.140.0-r2.ebuild
+++ b/dev-perl/XML-DOM-XPath/XML-DOM-XPath-0.140.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to add XPath support to XML::DOM, using XML::XPath engine"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-perl/XML-DOM
diff --git a/dev-perl/XML-DOM/Manifest b/dev-perl/XML-DOM/Manifest
index 3c575eb3c7e1..62f55940c2ed 100644
--- a/dev-perl/XML-DOM/Manifest
+++ b/dev-perl/XML-DOM/Manifest
@@ -2,6 +2,6 @@ AUX XML-DOM-1.46-nodotinc.patch 4213 BLAKE2B ff995ec9374859789db0283818d942b24df
 DIST XML-DOM-1.45.tar.gz 116855 BLAKE2B 5374e69925fb1afe835447655493d4292533252d5d1ee461ad8578e1651aaea9c028be2766c7617560214d0c50e38d94a9e9bee8a20fa6be66fd4f50b53eaa52 SHA512 559082f36d96dee28fd8ade7867b56abbd904e8fd6f585a4a2b348b2a6ae7e7892a2974b3d1983a296044e08ce346fdd006999aab364638d8c998dcee441fccf
 DIST XML-DOM-1.46.tar.gz 117291 BLAKE2B 5cceeb851a052289d4eec061703c6467d0500e5d231c8652e9b3763773c6468ee41fae0aa0308e7db61ba14635bea09ebe866753710c781c89d9573e64f7aaee SHA512 0fc96571996262bb0a99bd5f85e5d9e0f9c71c604c46c74129f0f560aa2749f7b945c591bfc13b9178d2b8d83826d5306f4ac71db33b51c55ce4d76398bab13d
 EBUILD XML-DOM-1.450.0.ebuild 597 BLAKE2B 85cf2177fffcfb180ee6fae58ad12d109d8b2c1fdf7c835ea856d54438ff0c30b26090db7cc1c22848bf9a7fa0f80246300d572873be03116bda49d6f5ddc8b9 SHA512 97904e157db27851cad3254492779cd5d319ae6d03153f70fea2ac6040ecf1ca188071fb69ddc3f075f1b6cecdd713bbb77a23e9d605924469be9854dd5f1ad3
-EBUILD XML-DOM-1.460.0-r1.ebuild 669 BLAKE2B ee5dfc13fb25ad616bc66ab05535881d742674d578c9912ecae7e214f443fa435635336a5f93a1512e7b0df0e23264b8cc65c6fccba3e9c929d2de48943c7e74 SHA512 c92bc10cc5391d153a7b738c59dcd1485662dc3e5f2e6fd05b8bef007258192463bf7ea919d949624eaa82df42889afa2341a7eeb0cdc5584febb662df60e003
+EBUILD XML-DOM-1.460.0-r1.ebuild 666 BLAKE2B bad06da59690863246b394dcdb32f5a527de6bd85d9ce5fb6abc11c5752322b52552daf1d7ad470ebcd8f59c680f19ed38ff244bea8a4cd258e47c8ebe696c26 SHA512 def097fc462298963b0107b6b6de3577b71c62c58b9ae7498ca5b4f5799b6ce5d0c725f44e3ef23abf46530de600f3e514c0394bdff1364e0909d5b193e09b49
 EBUILD XML-DOM-1.460.0.ebuild 619 BLAKE2B 85f5252bb017dd9b012607fe1f541c205ef9e73f114726ac54458624c4685b99074ba1d13a1f516a5bd5ff154bbf07787f66f4dbd87b8fe3bcc64dcf49ef2b3f SHA512 50bad054ef445aacadd5f21183b01c5bb696ae113207397f11518eac0a04d9b4164d21a327ca62222c05d447c7fcb1a20c3c7fcf29ee29033dea0d6d75c1b711
 MISC metadata.xml 2325 BLAKE2B 5a5fd11575ca8146cb7798ae8852a0290d29f2d33168e04de8fbdd13cd3104d21b7ab14621eff9e5d14331a6c9a3f14cc0bf4d8ee2354c853d743fdaa9a48359 SHA512 80b933f9a5569530b77d63f9e710e6fd5011dc0c9227fa574e2a41c0880c65f8a1f030efe6684a6f6b2f8b7586ab864d3311aa71724ac4fea15876a2fd3905d3
diff --git a/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild b/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
index 93154976695e..94c7f60cee67 100644
--- a/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
+++ b/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-Feed/Manifest b/dev-perl/XML-Feed/Manifest
index d24f5f7a4303..5d160896393d 100644
--- a/dev-perl/XML-Feed/Manifest
+++ b/dev-perl/XML-Feed/Manifest
@@ -1,5 +1,5 @@
 AUX XML-Feed-0.53-dotinc.patch 1394 BLAKE2B 1cbdacc101a172e1e622907ae946c79cb3778db92f28474223cab082ddae3a6cf6edb9810ab29c96eba4f3987809c861795a579b9a0a67279c072032bd22f3fc SHA512 be9f9786ab8cdf5396f124b78fa56993fd6488a38c8024be99212d2b7a479cd998a82fc745abf4d204f2ee1d8d5518f5b3a0995bf9eb39b7eacb8bf1b5f4e4f7
 DIST XML-Feed-0.53.tar.gz 54588 BLAKE2B a372e066f0cfe259a647ee8ac60177f607bf03336bb526e23a18caf2f32b06ce01a93631cc2e9eb09ee68b44fe9bb55153e9753fc940ba1166b20d4c80b75d37 SHA512 6a68939d8ff02124b86f38a2c82344e616e40732bd1e564a1bb8e15c8b406b8548d0630cf7c1a52744706c07d383b494b4876683c1ae3d43493bcf5138c582df
-EBUILD XML-Feed-0.530.0-r1.ebuild 884 BLAKE2B 80bec9e24419bc95c656fd220a47187962e756c59cb52ccb0b06401873127fa8fd63b647318cdbec5a64ac9f96b78d432006076e85ef70ccec48680d7494bf81 SHA512 75b2042bbc8ac523377f149c48dbaf8b8549dde5af0f8a91e365327ba0973989061f84b3f580a9fcc90549cb07cac9b0a8a81c1273408c36d564d289c9161bd8
+EBUILD XML-Feed-0.530.0-r1.ebuild 883 BLAKE2B e6227c219896bbf0ce03e52a54e329ff36d2c357e1aca19c97c2ce5880426779cec67e3d647b358d699a6574bb069167f0d0dda2e37668caabba61cfba88973e SHA512 4b9c6668aea5fbd5545afcde7cfd12bba370cbea8b93fc171b11d5aa297f9ae652097b20a9556e7541800e93b6e9e8dcf1f4c15f323b13570349182bcb9eebc9
 EBUILD XML-Feed-0.530.0.ebuild 862 BLAKE2B 8c20ee945f7409a422da9b9709883d51b81e4ac0f950a7ee0affc33eb31cbb58c0b38707f2d9368fc238f2c44e94f1bcbf1d8109f2aa7bbb4c01cadcce88bcd9 SHA512 6b4c2ca99bdbc1628ae162a634360f4029f51599e2a666e3bd24e64ea475d3b561dfb23c204b8fa208a37c6436bb58108c2efae8ee8ab1243393186926733bce
 MISC metadata.xml 875 BLAKE2B a68971269bd986b1a07858fcd71b6bc243ca0f4cff97daa36e718e500a35f6f896f0501e62640aba3b7bb6277625b76b6cb9cc8555292d60494ab58e0ec52170 SHA512 7c124726fb0b1a8a694c7cbb9e44b9a33c08cbebb202bf9cb2ab4f9c44b1175942df974317442c016aacf12691a3f2d45ef2ad3e65a0550d23a5452056c7c6a1
diff --git a/dev-perl/XML-Feed/XML-Feed-0.530.0-r1.ebuild b/dev-perl/XML-Feed/XML-Feed-0.530.0-r1.ebuild
index 88ddcf90ad91..6d4af4815337 100644
--- a/dev-perl/XML-Feed/XML-Feed-0.530.0-r1.ebuild
+++ b/dev-perl/XML-Feed/XML-Feed-0.530.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Syndication feed parser and auto-discovery"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index f6a4de3af047..3c61a425050b 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -4,5 +4,5 @@ DIST XML-LibXML-2.0129.tar.gz 468838 BLAKE2B dce86bff8d4fcc87d5fc1e957ec7f89586b
 DIST XML-LibXML-2.0132.tar.gz 469983 BLAKE2B 66002c35adc1156af76f16af2a1b4617ef25470cb434ee73dd9242fdc37a20d5d417ce5003ca202f69de08e053705129c083e65d483ae7e85375ae2ad6cbedc5 SHA512 3df1cb67ea955133492f2b6f8def2b28079c59e99170a31820aca69ea81686c4b67171509f1b311faab9389d200c4a24942b3950d7c0730ff1233a009b398fce
 EBUILD XML-LibXML-2.12.800-r1.ebuild 1603 BLAKE2B 4c59491438f67a965483ed4c9018473d584a8a9fc1e756ea2de910dd3e35bdbbff685ea3551e9e457f7bf0889fbb72e0b6d85739f17284487b047f00e153c19b SHA512 cfe821fb467686cd4880964f6fc7530ac67bb95e341e6de550e7a9022d0bcf95830dc5781299e58f0b01a0e35dcd972dbf9d2897e587a4b25062350da367f493
 EBUILD XML-LibXML-2.12.900.ebuild 1623 BLAKE2B d90f917ca0c514d6f1be716196ae754bd051de0714dedd141d65c7703e3f6de11d03590fbdc7cc21c5f634e3aab475b0b8e21c57d3c78b9e9b37e4aa54a737da SHA512 65328151279a6f9183d4df179dcf561ae96f9d56769723d05c955784dcc2cebb602d725eaa2a7ba85923f7f8797372cc7f974db00da851a3d65b00fae75eefc2
-EBUILD XML-LibXML-2.13.200.ebuild 1645 BLAKE2B 3efaf7e43ab36e89c42294d361ca2f3cbda52283922698f3f922b2b3a02379f2d2e80915ec65c11eff2e5ab42e4439a3ef8ee6dfc82cac071b0ea3ad9aa38ebc SHA512 98652e3f2961f5e6387ab2ff157603fe670bdfb64dce187773b3abdbc8026844c61c3ff5b057ffb47647cde973e8baeb7000c9b3a640f25235fcc475866b6011
+EBUILD XML-LibXML-2.13.200.ebuild 1641 BLAKE2B 76a635eabfd08ab77b5c04a97da4198e6d79f5a4745046ac0667a250cf475dac2c257dfa46df3628aba9a5954e85a5a1b75e652806f9654d53a7b40742ac5af0 SHA512 4273a9472be78fe8fe674bcef992adb5697796437dcf165b17c02ea352a0b3d488deb0fcf5b61afa0a3264d30765571c125fc1127924e79f56d2b0d770e0ee3f
 MISC metadata.xml 2782 BLAKE2B dd55f05f6dbaff2e8dad45ddc451309ef16896f9e4a8c60e89c8c6b8fc854654cd69363870cb4f6feabfef5c095656fab06e6ba48a9a9c31058d462e15870534 SHA512 6353b4890d24a2ab018caa0994913a4dd6b7dd753e089f9fb0570762f75517bc8ae4e8ed3a8990ae2c75957aec0791561f00a991f1e3976c225781317fdd82dc
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild
index 16f1942eb20e..1bd72d3addf2 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl binding for libxml2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/XML-LibXSLT/Manifest b/dev-perl/XML-LibXSLT/Manifest
index 97e60b27c8f2..9e2ebcd985cf 100644
--- a/dev-perl/XML-LibXSLT/Manifest
+++ b/dev-perl/XML-LibXSLT/Manifest
@@ -2,7 +2,7 @@ AUX XML-LibXSLT-1.96-entityexpandtest.patch 791 BLAKE2B 844c61b8fc33a3374de6b2f4
 DIST XML-LibXSLT-1.94.tar.gz 114015 BLAKE2B e16cebbfc5e126dc56482845af4f21b70c62ef08eb14bc79f678fca35d418858b33d69adc411836f4d81cdb7dde8fb535b9f4855a947deab60ec1d77a4edd9d5 SHA512 52b3ec6ef0556d9dde8320acbea01fe36e219bc62ed2d9e0cbe2f8f402bfc3f42ca1e28a6e047e69f501982fe4ba40d23fcfbce9399388c9f28a0d8804fc5f73
 DIST XML-LibXSLT-1.95.tar.gz 114231 BLAKE2B 792ceab8dd2e185c8c3c9a4a6981817ccb667006de588b9a8047eca8c27c63ed73e2aa5629314b723585fa2ca37f468bbacd2ff1d7596e9ca446aca56b412197 SHA512 06a1c9896a391be2588995f25520da05f086b3fa79109884131525a0d76a7b375e0c5a2febf8a79a888f3a9bd25b5eb39064de1baeffafcfe18f5576c9c54e19
 DIST XML-LibXSLT-1.96.tar.gz 114068 BLAKE2B 2225e387e9e877578be51a9a6c8c3612490e79c2cec366dd2fdc64710ce67200f5ab7109742197abcdc311f9a1bf16b42a40c7e7df4d669b638de4ee49782866 SHA512 7b6e22889c538bbd861c6420cd56893d229676d3afc1cf30e17cae48a4714139769a99a48a99f1dff52864f4989e410303007c07941625bf6bd12a24276c35e6
-EBUILD XML-LibXSLT-1.940.0.ebuild 493 BLAKE2B be7284d58ffbe092adb50c3c3683378f8df7a9495af67f83f89f4311f13c2c35f9bd507a6dccff43b40b5a9fd42a631f6a4904fb83551f7d77e62c1b9bc522fd SHA512 16b27b0945eba00ba21019fe660f36cae07b85bf8533d68b0c6c87900a9ae7ca7c499faa42c256de7f448d3f25516bf66019a37b4ef38f06d9abb1ea4b6378cf
-EBUILD XML-LibXSLT-1.950.0.ebuild 600 BLAKE2B d71e0d3e0d8c32a534fa5e01debbf77d4db8ac28e2f988c91bac6bde6ffebdab40d0cf31d2fb0adaedf705c2feae5860d2ec9a67c1a3a472e8ab727f1bfb89c2 SHA512 83c122b5d95f2028fe297d6dd77fc60a7b932006d64d93a9ebde7d133d726933f4c358c68b87d42aeae3061327fb23a5c38ad620a532a29a0aea8e7e757c3c32
-EBUILD XML-LibXSLT-1.960.0.ebuild 681 BLAKE2B 4281004500cbbd229713de0500c6dd0b4db2fb8fef32755091a9300e73f7f19ca9fe9a95493f2344dd5b5039650e031099bebc3d256330c5d274c2f42ec65c2a SHA512 cc4b4810297fc60d825beaab5567812ea2a855760690d90b2533ef9ef9604e36a7e72c8e208006e89e91fb3f0f49adcdf7987fbd609c8a0f2e9f7a54d3c093e6
+EBUILD XML-LibXSLT-1.940.0.ebuild 493 BLAKE2B 40345d1d84105d6b60d6422438a103fa8fae667c1a9a3e8a87761f599a541b9dbf600bae482f4efa443d0eeeb8badc7e45aac9398db2aff83c9703b20ef87c5c SHA512 a6b4a80e1161969508091b2ee0afea228e2b6fc7acc726d6f36906a128fbd53625be2c314252f6e7a229c382675303a630f698b7c7e1d9a7b3e049a660856dd2
+EBUILD XML-LibXSLT-1.950.0.ebuild 600 BLAKE2B fe71fc8b20ab66f3ca62e636bbe0fa7dc17a55009ae83b388a0fc0c2bb22c6833b9ecf9148763008f07cd342c9fd3c4f556280e3867f4f22d449e6a302e0c6da SHA512 73e5fdca21992d2b5c8a6b7071850806c99a9c65a94c35a0b7fe42c9b22306b66d92efa5d7a16a9e910fa1a7e6519dc75d674dcea828e5bf27f780bf29bcf04d
+EBUILD XML-LibXSLT-1.960.0.ebuild 679 BLAKE2B 4f3d97c14f52cf052288f43e9a8ab8cab41a687e956a8d56b669461ec0e8fcf92a89049263a00bb48ba64c4feb000076dae71cdc0dd0e3cadfc26817bb1e5ba3 SHA512 3f3886b76e8e1e4f89400e579553815bd896a3146d84866eb766ed3c8d172d8300c2b577afae797afd3873ef78b224fae32e0484d3073a08833ae2f06b9f3463
 MISC metadata.xml 804 BLAKE2B 52f3c7030c5a8eaa8c59cb02db4887c509285c1c1b1d22435523a27cef5627e701983dd6b7d961a3bcaad3187ac4993e91be4fe688cb6b25a7b1d1f39627f1b0 SHA512 8baa00642249d81519d3d21ff2375ac5adbc79db18a225f4bb1f9e7145b8a98b9d258248cbcae9d50cfb5440185e06942e1551ad1d28db8bb7705525d962a6d0
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.940.0.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.940.0.ebuild
index e15e23d75298..890f277c9b8c 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.940.0.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.940.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 @@ KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-maco
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/libxslt-1.1.28
+	>=dev-libs/libxslt-1.1.32
 	>=dev-perl/XML-LibXML-1.700.0
 "
 DEPEND="${RDEPEND}
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild
index da590b150cba..8f84f77ade28 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.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
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="
 	virtual/perl-Encode
 	>=dev-perl/XML-LibXML-1.700.0
-	>=dev-libs/libxslt-1.1.28
+	>=dev-libs/libxslt-1.1.32
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
index 1ff94eb294e3..cb0b3c6e85f1 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
@@ -10,13 +10,13 @@ inherit perl-module
 DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
 	virtual/perl-Encode
 	>=dev-perl/XML-LibXML-1.700.0
-	>=dev-libs/libxslt-1.1.28
+	>=dev-libs/libxslt-1.1.32
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/XML-NamespaceSupport/Manifest b/dev-perl/XML-NamespaceSupport/Manifest
index ffe610d0ed9a..b05329d0d011 100644
--- a/dev-perl/XML-NamespaceSupport/Manifest
+++ b/dev-perl/XML-NamespaceSupport/Manifest
@@ -1,3 +1,3 @@
 DIST XML-NamespaceSupport-1.12.tar.gz 18012 BLAKE2B cc0e205bf7298668fa1042bb5c69b1c4b672bfcc9b6d3e32b0ff7f3cba0800e324ebc88156e8f355b9c7c9c958ad087c0e7215d57ab55313487e0fce2f2b1749 SHA512 8a29698acc152888b3abd53b277f89209252830cc3b57d587a5b66e5019445d7c1858a08fa548d42387c1143b726da1440e36eb0c69b0b59c3770b5f528f38b2
-EBUILD XML-NamespaceSupport-1.120.0.ebuild 586 BLAKE2B bce2ceb22fb9e7eecece8417dc8d3ac1b3db5a43c416a68510b778a8861740546f9899abda07e8704fc7cea4ac0b120789407854c7039e0fbe407173b4c00464 SHA512 2b34097a3339a21ebf4f452cb8ddfb2297580f734b6cd07c32c7f18d569df20aed79b8833657879ef80cf7ca43e543b1ad9e3a9804612ada001bf26a0a1ef0df
+EBUILD XML-NamespaceSupport-1.120.0.ebuild 585 BLAKE2B b046c5458d5d51a5dc46ae0c5d551822d4bca42fe667c59bb1893d418a73aeb28139822927af3b99e52790c82e3115603c644b66acab53126236b31f96219b61 SHA512 4fca50024225cb991a1c0148b247d8cf8bd4e581a543fdcaae6ffe47d2e42fc4ece453767a875f5fce2380eb4614a1563e15c8e804792c3209491e26b69b6985
 MISC metadata.xml 412 BLAKE2B 9c0d94240b909d9df1195927b743cc4871486d9ce2987f7525ee92bbf9f1bea703a3c3fe8227e2ea41ca72173a854ed8455f6ed4d5d1356218d3d57f69a4a1e1 SHA512 53cf4c376b94db47d275fa59bdb6bdfcd993c4cc48aa87d53078baec5da1ae1a877c9d00db9812f9e6f18873e51a50b3484a02f467bf377bfc57a119f1e444b3
diff --git a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
index 483e942a438f..22a063810522 100644
--- a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
+++ b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module that offers a simple to process namespaced XML names"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/XML-Simple/Manifest b/dev-perl/XML-Simple/Manifest
index 696c73f39e6a..930dc38401df 100644
--- a/dev-perl/XML-Simple/Manifest
+++ b/dev-perl/XML-Simple/Manifest
@@ -4,5 +4,5 @@ DIST XML-Simple-2.22.tar.gz 77937 BLAKE2B aaaaccc9035584f468767e7408718e76821012
 DIST XML-Simple-2.25.tar.gz 78443 BLAKE2B 6b990c0095fd573ce92db8ca4fbeaf259b33817992bbc0f465dcf1df1f77b56d5229b94a062a59178676500f7445ddf824a8e0d05b21df9ce1a5491d328eee48 SHA512 0f1a6a1bdb8f6ac6fa4deef33d09930eb4758b4a3ed4431624004ffa2b1eb02f0d6ce14cb4942162cb76f7aa39fea4ec6a71e1eb9ebd464b710db7024bdd990c
 EBUILD XML-Simple-2.200.0-r1.ebuild 640 BLAKE2B 4eb669df5de86ad743aa367679ca472bf2cde02ff37b56c37d871db9c8353e05fad727113a69936542c4b0becbf9c5d45106de0a911167d7b2841e575618c71c SHA512 59d2b59fad7b7a920215abf46c3b4087cb5f350a5f752654e5b9425f6e088ffef89cef2a5c84d1adcbd49e19098e40608cd7014fa01f2b57af4145864d5edc10
 EBUILD XML-Simple-2.220.0.ebuild 631 BLAKE2B 7c969c939654ab725e59362d02e3c0ece5452b09ca8db49dcd64c250ea9fcb3f7070d2d07a3def5603b4ada05157bd45db2541f7f355c7b1c81d8c922cae9695 SHA512 4749b56a03084042a6aae938a5d7f697ae3e1669527ada363266be048e8df2037999f7eee7b39735d110102b77324d5ad4ee4dd9adcc2892d0d0d94eef32329a
-EBUILD XML-Simple-2.250.0.ebuild 731 BLAKE2B c531e5be10e50960994caa1d8531df69ec261f581db4663d9284e6e13633420f67d775c0882c3b69916012571e27a2dbd75351a1582f70012b9feb207478576a SHA512 9eeae3bf9ca349a0e3ed832177a04849d4214be00c366977d37aefd2c5381fcff04963b7a010253d9e7e3a11803e9e455ce9e2e36ec192389639c2b95ec3f804
+EBUILD XML-Simple-2.250.0.ebuild 728 BLAKE2B 78a6dddb8dc7580c2827389edd444a882da5b132de6eee36a37342c7e612136c8f9cf0a969adf09b12d9937e95b95ac313acd40340fe1156528c422893ce6157 SHA512 4ab04f13cfda084870c0bbd084240f5e154e261bb5ca3ac916e384ebe607d7a383872e85959b43e14543ea3342bf7cf354e9fa4f09ecb737f533924948d06fa0
 MISC metadata.xml 392 BLAKE2B 82cfdc5651e3ddf3cad0999d49e4779d495e9eb8d9075b576b20a2cb65e7177faa71208a0a3a1d489b435a032f1c82884eef6df6ebbb5358dd61a1b128c20ce2 SHA512 a78d9648fb2badc04c24c32bb62d0f03d81cd2a8404fbe1195eadd42ddba090035fe577bb15527982b7987ac91782794ed315afaf12dec121e3b3e5c29dbf9cf
diff --git a/dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild b/dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild
index 44f22539e97c..9f283aae5d48 100644
--- a/dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild
+++ b/dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An API for simple XML files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-Twig/Manifest b/dev-perl/XML-Twig/Manifest
index c20a69bd1e40..b91b0b985101 100644
--- a/dev-perl/XML-Twig/Manifest
+++ b/dev-perl/XML-Twig/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Twig-3.52.tar.gz 407769 BLAKE2B 7420f694db127bac536efc124f8735b6c285615781a8ed00d410938df25b629c15dbf0703cebfc0c7ea8ebdcf290826cf66d25052adc19a90a3eb9ad16132a52 SHA512 1594e127fb76c0e53d0bd1f0a12fe3874c9523dd2bc55675d5a6cf44d5682ddea481671f786d3a65e6b69f5307c4da1701529f318453a1f8a22685b2dae793a6
-EBUILD XML-Twig-3.520.0.ebuild 973 BLAKE2B c903d478c1121d5c461a840f6393acd942626d60e014ef027ee9f68e249f5b4771201a421e38bd69adf5b23511404b7938d892f6e9f6408ed8c9538124ccf182 SHA512 24384aafe1c3d4f5f94eae03534c6f7bdc6c72d0a6f2a5e74a55397e3fbdeb32d4e65df9433a8b9b46828062f0b6d50014f075c33739f47a05d90fff7183849e
+EBUILD XML-Twig-3.520.0.ebuild 978 BLAKE2B 0e37d5bb92327418c704dbcb9ab89ffa060c6e3ca97569f61d29a0728a58626b6e2e2d94ee4d74036d77fd0d414795c2ec0b777fcb74cabc48379469e716e510 SHA512 597f5e68e954fa9e164f4281480e66daed70ce28fd6aae6178b79e6d7d3d4b8f233a4fcce58e381ea392905a42714594772cd2df3cfecfe6028bc427d38eee21
 MISC metadata.xml 998 BLAKE2B a2f5790ed712c731447edd885f2fd8b48b608c0f621e20bca24f640f5d5b3f6c94e21e94913963c4236f327bf14c2a9fc6d709209a191da29015bf8429f4bb9f SHA512 64b1a3797be80d2246fd8214c27ae50ae9e1c5743a16532a49736d62f2dad26713cca8b66908b248934efc24b4c082b87eb024a1ce8d1616a635c57e1ab4e08b
diff --git a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
index 17365a126d8d..e424f9cf6416 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Process huge XML documents in tree mode"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="nls test"
 
 RDEPEND="
diff --git a/dev-perl/autobox/Manifest b/dev-perl/autobox/Manifest
index eb32d2a1d4c6..9f12fa995262 100644
--- a/dev-perl/autobox/Manifest
+++ b/dev-perl/autobox/Manifest
@@ -1,5 +1,5 @@
 DIST autobox-2.85.tar.gz 80443 BLAKE2B 1eff93ea1e8c80d38f597137cff128495f22744b07df4a28f510b3a8d0a3aaf20a1f550de173d8afc1a0370420b458b0eb5eef80752545a2e698d64d0659ec6b SHA512 2f9c0ef556655eb19a2e50aa2ec47769ef2fd7bb15806a7f22320be9d79178811c418dbe58cf792fdc48dc3e7b80b70c1882956559373cc6eb152c0b94d52081
 DIST autobox-2.86.tar.gz 85350 BLAKE2B fd4ef4a26efbec7542c4aa962787b032889603c789b1e892b00fa597efa8b74db6ce546710fbf02b5a497ba16c4aeb0f377b1d7baa5f2fa74b22a71f257d34b0 SHA512 ab4d41cfddb10a03e6bdb47a81cbf2a41f5c2f518dd674e9af17a3127589d8b4d84d50f4293291517fb24b9c1b022dfcecafd7acf5d0d1e693528353ccc9c186
 EBUILD autobox-2.850.0.ebuild 356 BLAKE2B 3f21a34039cc2fbdb8c8b3c74f96a40006c9e120fe2b2737dda1b149b870ebe0e16a591f5b7589740fe6134715b0835537dc334d4aeacb81f3b2308cda14d8e9 SHA512 4dc026359c0a5e6c04e9f9f38dd91d45fb51840da430d4753d6b9627107a42bd3771f3fde2e00d17bf8210d70fddb54055a54706701d86d09dafcf25229da0ea
-EBUILD autobox-2.860.0.ebuild 441 BLAKE2B 5f2185a916a458d47c83c08373cfdf0493a57f01ba9454817bab4fb8fec717d970a0914857d6b19af5018dcfbd3b09945028b3cab1a8d01c3da899f88975b886 SHA512 cc0c42c2319daf3430eaf7419e6810aa64d52cca7545e4cb1debbfa9d67f05b71a4be64680ed93f04bead7e6eccd461071eb8072c871415137e7552b1c9a0c5c
+EBUILD autobox-2.860.0.ebuild 439 BLAKE2B c8b3bca2e3ae7f034429e11ed5d416ecaac0d74b6c5eb33363a02914f4684a7d2377327963d1693a845c652ad3e4262b16bdb15493d263bce748730cb1994e0e SHA512 cfb080e7076ae6166263f25bcb3a17cfe9cc9225c6bb6bd3df78da29286aa9ee1a80083c9ab73ece5b8d600aa5ecbeed4a585138189d355ef546eadfd358b9be
 MISC metadata.xml 450 BLAKE2B 27aef631bf8d3ff524c9e660eae951ed9a5c4e84b9c69179089153383143339fd41e42a21f1721cf9c15227c4d490b758dd6a6c236711e5fb0c19e2467358a6e SHA512 9ed2d562f9190af27032d580a564f9dfcc3feb8ec6ddbbda7d0595e6d9761180637dbd5f1e065487481449d1a2e68b1b7586e1fc29c98e86ca40f48001df4d75
diff --git a/dev-perl/autobox/autobox-2.860.0.ebuild b/dev-perl/autobox/autobox-2.860.0.ebuild
index 752cf6d3499d..d4495696a059 100644
--- a/dev-perl/autobox/autobox-2.860.0.ebuild
+++ b/dev-perl/autobox/autobox-2.860.0.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="Call methods on native types"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/autovivification/Manifest b/dev-perl/autovivification/Manifest
index 3118f971d37b..f55f2b549a7b 100644
--- a/dev-perl/autovivification/Manifest
+++ b/dev-perl/autovivification/Manifest
@@ -1,5 +1,5 @@
 DIST autovivification-0.17.tar.gz 55277 BLAKE2B 2368f470fcb551273c9f2b02cdf7b0bd275fd4a83ed3cdde9be1fc6420389d8934b1bd6b898d1db7c63d1b98c222c221f86bd962b678bf9d9d9f37221453588c SHA512 44377110a2f3e9829f2dddd5df0da9cca2718bcddff550d7a948196bc7e21d6b07e9c364e0951614baeedfe1914c54bf09b7c0b614a9420a9e53d55683134f5e
 DIST autovivification-0.18.tar.gz 55854 BLAKE2B 3f429ca462b685c4b02de265b7bdc5e3ccc9a2fcfd7a182834252a1a46a8e173657613c4e1391df8c9139f9b0716c10c25767d419343275b8e64b37aaef78cad SHA512 f5058bf1672a53281d70431cbb2bdd1a37dda8dc3d4191ca3c68c469089c5a1f2a36522f2a0b5d19847d91296f43e49cf6296c87b78940e786f0d0ac106a539e
 EBUILD autovivification-0.170.0.ebuild 452 BLAKE2B 9896ac85e3ba843f99c5f6ee5a9dbd2fe4bd605ecabb96f8043c7159b5ae2983f54fe4928b83205a27778826528b5defa7d1b06f71a3cbd9356255dd3af158a8 SHA512 8b6de4bf4084398df3183ef311bf18c5e936b9ef661890ca8b8b410f3f8e5cb4c80bd8578c045a45c7ac178f1c8d32862b25460aa66b252a886db55756a6e6f6
-EBUILD autovivification-0.180.0.ebuild 454 BLAKE2B eaf3d8124258e4605043c6cbd36bd63a71fb4e8e0ffe83d3e1fa7ebb1a37c85ce59ce307106cb806c2a3ee5b69ca34eb3b0cfb81867581a4ce19408a0a540a7f SHA512 6112c5ae6b817cca66153fb65383b5e6971cc9ce1451535935ff2da9ea374db97f6d3c348f3fe719bdf2de300730eeff72df7c2fe01298495bc5b898aaa2783a
+EBUILD autovivification-0.180.0.ebuild 452 BLAKE2B 914d8bec8af9ad079aa764a40362b26179830acfdead8f9d1a4d5b003ddc4401c2c40d62c0fe8c8a3a14556f9eb8595abe65fd6c8aabf55911f887657e8322f2 SHA512 53916bbe7392e7871fd00f711ab870305c38c5e8eb1e92241a06f85e6d0af94dd91dfcc83708d49b81dc38a2e4b7fb732647e27942161ee1a4356f2ea91f03ef
 MISC metadata.xml 356 BLAKE2B 25e3f0315c9a2670f1ecb0a5e17f1e8b3dfb14a72e54dc30744153e8dbe2f893cf8e0cdbf74786023eab895f0e5bbbcb7bbe69647841f80f05bc7af41cf1fc4e SHA512 bca4923c1ddc222b8fb47aed6e8959870d58844a17c8e76fe9f656943a9f04c5df9772e937c036ad11626504453b453c2c57f2d97ee8f2efa3fbebeb15f5291c
diff --git a/dev-perl/autovivification/autovivification-0.180.0.ebuild b/dev-perl/autovivification/autovivification-0.180.0.ebuild
index f81b937fece7..b3dd7ac121d0 100644
--- a/dev-perl/autovivification/autovivification-0.180.0.ebuild
+++ b/dev-perl/autovivification/autovivification-0.180.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Lexically disable autovivification"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-XSLoader"
diff --git a/dev-perl/enum/Manifest b/dev-perl/enum/Manifest
index 7c5621b32236..2ce6e339c10e 100644
--- a/dev-perl/enum/Manifest
+++ b/dev-perl/enum/Manifest
@@ -1,5 +1,3 @@
-DIST enum-1.016.tar.gz 5847 BLAKE2B 9f07ecd54627cf1105e13909d8c56c62428f329c577c1f25d072b01e948c31eeb15f90fbc66d0eaa107e00dd2c3d41b7ec116773a004d8e07b70365657a265a6 SHA512 31e0d61a8770a82dd984b14db7b9fe5a65883b6e3d76ba237220c8d54c19d26d95d5c2e1e1099a1b4e8c64e03d464c50c837eb160300abb5d080064c2186bbc6
 DIST enum-1.11.tar.gz 7883 BLAKE2B fe3efb9bc42560f9261f7365dbbe737dfbe9c881f43bf277ba788b9b996331dbd0beff9d69b4a4546f6aadbb79057cb11dbc325591050c7e4c1ce01c60a3cd6e SHA512 53d7137f42e4845887f6067f16e68141827379c40c50299d36f4c44ba005cea52610c55a7eb09600ff36aac87d11b9c992e63007c1e4fe11a12e381d7515f733
 EBUILD enum-1.110.0.ebuild 375 BLAKE2B 1284d84533179bcf5d00a8127e03fe719a0ed5168b4006847273a3971e728bd06f423b87680c8ccd65aee14cdd570a12b057c8591b4a8e3fad6c2d1188c81220 SHA512 d90633d6ef3a088535b502689d6fe0edfb3bba0eed63739402b04d0f27ea9f3d3db8ca8023a029692ac00e0cd8365027f125a97045814740061baf2bc201c7db
-EBUILD enum-1.16.0-r1.ebuild 310 BLAKE2B e14f799e180e20a9d30624896d7613e40c94cf848dae0ff6d555bf5e70a11f5c58559762ed6f43df12a37933bcf6c04efe753a285f51aeea285f77818c85d134 SHA512 f84c5c160d58a518ced80ac83f3dd2c9e7f51d1135b8a1f6c036ffdf15ee70fbf7636d4c9ad32872507a99e8f1770458fd71b444aafc76014691be51e675870d
 MISC metadata.xml 379 BLAKE2B d6d09e04b9d146e8b58b0438f1d2cf789a0234d6ff3ae862532c2f0f3ee776827830d0a666e38507ca2a8df9cd090d70686feca67792ff87bec3f1b671f4c080 SHA512 4a90825615b91098b591bdbded75d7832bfb048f8488de58e308a5030dcd4253ebef6354e005154f2bfa8d79bb1a849dba13df9e0cd951dd199589244e12eb9d
diff --git a/dev-perl/enum/enum-1.16.0-r1.ebuild b/dev-perl/enum/enum-1.16.0-r1.ebuild
deleted file mode 100644
index 4ab831d318bd..000000000000
--- a/dev-perl/enum/enum-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ZENIN
-MODULE_VERSION=1.016
-inherit perl-module
-
-DESCRIPTION="C style enumerated types and bitmask flags in Perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/forks/Manifest b/dev-perl/forks/Manifest
index 198b48ed7a50..558f5621399f 100644
--- a/dev-perl/forks/Manifest
+++ b/dev-perl/forks/Manifest
@@ -1,4 +1,3 @@
 DIST forks-0.36.tar.gz 111143 BLAKE2B 8f3c443bb5912bd952d853f5cc291bf90f6d2503d7b467e009b267e7db1bc802b2895397439f151c7474a8c4bb1e236829bdd8acf868c4d575f648d8219df96b SHA512 d361d7fcfec925b03552bb5f8ae4eb2155b7945d0a57ff04c9ed45e7620a55fe6a1907b1aef8af3f80f8eabc158ab5886628ee1a987dc674e4c25e1042425469
 EBUILD forks-0.360.0-r1.ebuild 640 BLAKE2B d73cc91026d3f6a852741d2282a085f7cfaa33f2df2fcd354ccbf1ccf1d9076cf74ee012f6f38f3de93b871e73a4f4ee5af232f4878cb6ff2c5d7e3d70398171 SHA512 44aee3f58b6801ec590d5b4b0e4320db708f41ebacc7a5c2f7f7353f883f3adfa2e53a1f86f74e7e5e164b988f8d084ba6f474ddfccd20c67d2fa1c4c1f92b7f
-EBUILD forks-0.360.0.ebuild 668 BLAKE2B 4f8602535a703b7e4a0a2fd6f4b38d2546fa3927bb6dfd1b72368415debaf5eec2e2ca9563ffe288e1797b596872449409b1c41a3a20d3a40a1c75047c16a2d8 SHA512 f33a426bc4ff0175d046c55e06243c5725ec9d390b52e84340d4d6d36e946c1751ae458e7c6986b179f6da284817254e2d04405089a7c01b9351fa455046c826
 MISC metadata.xml 441 BLAKE2B 718e32b5a879f534e235cbb7d210594972445ad6688725a0bc94319f93a2e407e3f6f95bc3192f1d192fe0d60eee9d55cc563b49f977989f0da4227f595f32bb SHA512 e721fc4fdb30dca69a31eb949dff91a7760dcb91b0f014da59f4c4e9656c4dbae28dc3b6d63b265789d87b1f6722c03b53ab68c0d51406e3cd14802f435d0d9a
diff --git a/dev-perl/forks/forks-0.360.0.ebuild b/dev-perl/forks/forks-0.360.0.ebuild
deleted file mode 100644
index 95a6add5e6ee..000000000000
--- a/dev-perl/forks/forks-0.360.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RYBSKEJ
-MODULE_VERSION=0.36
-inherit perl-module
-
-DESCRIPTION="Emulate threads with fork"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Acme-Damn
-	virtual/perl-Attribute-Handlers
-	dev-perl/Devel-Symdump
-	virtual/perl-File-Spec
-	>=dev-perl/List-MoreUtils-0.150.0
-	>=virtual/perl-Scalar-List-Utils-1.110.0
-	virtual/perl-Storable
-	>=dev-perl/Sys-SigAction-0.110.0
-	virtual/perl-Time-HiRes
-	virtual/perl-if
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index a49aa5f35e94..7d79d35a863a 100644
--- a/dev-perl/libwww-perl/Manifest
+++ b/dev-perl/libwww-perl/Manifest
@@ -4,7 +4,7 @@ DIST libwww-perl-6.24.tar.gz 161940 BLAKE2B fdb51384ac8351abc23c26b17fd4c2835591
 DIST libwww-perl-6.25.tar.gz 161902 BLAKE2B bd675ca921dec0084ddfeb567286af1aaf46cd710de3ab8ccbf38b7f2e6e29bb4a295412da3091c24063d2f1ffefbc1d0f075d66d6b3c5439e41f69938bdbeec SHA512 e1e73db3fae08911c9b4d13e9058a7370d1bc5c8274f345fc1c0565aee4eaf97e1da7e7a1456388beaa62adb4bbb9b3226443334c04e2b8f16936225e6b9b949
 DIST libwww-perl-6.26.tar.gz 162165 BLAKE2B 8776ea0d8abfc7dc4643d4ab6c0456daac727306ff210185c903355c8a4409343ea3d3bffda7404a6d60fbc6089e337e9c6cd3c47f5547f6accd1784ff02cd99 SHA512 0af62f1c393b82b2d665f4f460990bb9a446975507cc07148e9e5eebbfbcdd8ea8190dfe1ecb72a229ffa9a5e42edd9eb6c50ac1d3de89ac4681462069a3acb5
 DIST libwww-perl-6.27.tar.gz 163020 BLAKE2B a0ad6068e5ef754dedd616b4a2904b2326b1cbdd11dee6e16db984f2e46738812e0b64b95cf1466ebeef17387dd1921472888663cbbf2644504197767c65e8c2 SHA512 ceb7df71ef2773752dfa8a46f6e48cfbe7501f543d53ddaf50ee97da2cb21025be4bb32bee62d6f6fa837a7b0726718b3b8470de0b8a9d789e40c16a42b894e7
-EBUILD libwww-perl-6.150.0.ebuild 1749 BLAKE2B e020b7bbba4562c6fcd8a523fb35cdff9258292936865d59b63b40f1bb44d8e885e91be7332b1510f12ce406637b88227def200733b48c832af35fc82df9317d SHA512 b7f516164014994e1c56665be2bcd77a40fcbe2f75422b9f32043681d3b26ec70785ccd5f626269cf2310cfe5b2e3091b5d16cf1ef73629e4bf6c35470e042c8
+EBUILD libwww-perl-6.150.0.ebuild 1748 BLAKE2B d6f047a19ab79978d7978a65a428b162852bbe16e83bd81c560ff89281ec65cd001d04a059c28f129fa4e7c1d99fee2f3a2b532caac00bd8f3aa7593abc0bf9f SHA512 d0043ed840c701237b59d90e3dc5076e1d9c2167779ad7581b89d8f5d315ad065f2b8965ba99f66697c5aa3d8472592ff25a672a554697a0fb11bef56ac68f53
 EBUILD libwww-perl-6.160.0.ebuild 1904 BLAKE2B 17dc5365f9c1ba95f3c60e28aadfa381af3cbc6c732319216ca55ce0166813bbe847e703bfb04ca18c305e3833f410f78eced4729af10ee261038a9ebe10d718 SHA512 4a959a82fa066a342cca3919d15b79bc34d00102f6b748ab0b8670e199c5f8396444e815f95b48ddc42d61506f52238123cb0af817f1ef428a076e38cb326b90
 EBUILD libwww-perl-6.240.0.ebuild 1992 BLAKE2B 064383d65aaaf35b34f403dd1dcefeaa573914362228bb543a09b8a16cf9900e3147bb1fc2b184b4d5c666a19031f8c02db656b894627a7a84187788d35661a3 SHA512 d69091cb32431b05a00bb7314ce43253a26f2c247349a32985ebe4b6178da61ef3a76d69b40b3984003e870a83a532ae61243362b933f4a1eff4d8c77928143f
 EBUILD libwww-perl-6.250.0.ebuild 1992 BLAKE2B 359b83ddec81dd460ca4d789d9786689b6c884d781ff34f2e9ee734996f63c409c8d4e8c1b40cb761c2aec1af055f33eefd7aa17d34e5ee6a0cffd91d2b9fd8d SHA512 b167f3be2fcf70bcd9f69b53169406f489d3ad88b836305b62d0405d757ee02c4cc3e5961a1106af939925caa4e9927faca0c4617697ae0f613a324e8ab01802
diff --git a/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild
index 4c6bb74ce4a4..323c95bce917 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.150.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A collection of Perl Modules for the WWW"
 
 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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl"
 
 RDEPEND="
diff --git a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
index 46a825640e34..78a56a955c63 100644
--- a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.3.4.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
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 hppa x86"
 IUSE=""
-HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+	https://phpunit.de"
 SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
 DOCS=( ChangeLog.markdown README.markdown )
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
index 1f1c3decc820..359295e3bba5 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.2.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,8 @@ EAPI=6
 MY_PN="php-file-iterator"
 
 DESCRIPTION="FilterIterator implementation that filters files based on criteria"
-HOMEPAGE="http://phpunit.de"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+	https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
index 304b65799f28..ccd2b390476d 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
@@ -6,7 +6,8 @@ EAPI=6
 MY_PN="php-file-iterator"
 
 DESCRIPTION="FilterIterator implementation that filters files based on criteria"
-HOMEPAGE="https://phpunit.de"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+	https://phpunit.de"
 SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest
index 2efe7dea2080..fdd9d1a595b4 100644
--- a/dev-php/File_Iterator/Manifest
+++ b/dev-php/File_Iterator/Manifest
@@ -3,7 +3,7 @@ AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1
 DIST File_Iterator-1.3.4.tgz 5199 BLAKE2B 75da70ad638230dd231947e3af26c2570eff367328d2e541fb1228ba531c0f249c931a9185f977dce9e17846e1e9b8b1f9f8d21219291e637b2eaf7805dcf360 SHA512 7117e0e56a9bc533d9f93556366a8026d1e5a9a3894c05551adef6c1e6cd556c1ebf6b96bd98279cb92077b3d8f8d7b7e42f446b39895850e573d0ec511392be
 DIST File_Iterator-1.4.2.tar.gz 4141 BLAKE2B 4c8d9847fa198d444571acdf777020b76e87e09506038c7d7ce732b97c149149bcf22dc25d0af36f041b7930673b05f940df8211c29829e0fed2b3dcfae0ba05 SHA512 295943681853c858e3e1c336c030338c61a74169bd2a619da6fca8c43611e587c6f626fa92799d614bcb0a1f86bbb39895b20f2a389107cedb9660a7e792a243
 DIST File_Iterator-1.4.3.tar.gz 4140 BLAKE2B 89274c6f9b561dbc732d0b81f06b7c34d267ea31d1deb5977eaa16852d87442183221ed6789fd5e09b80ef96811df2ff8ef5da5c764703f5e7a2d5289f582527 SHA512 cea906d6028d9c2dbbb5486198adbecbca87f8b4dcbe12f72b9732ac29cf8eb868a23af7a5bcf2de55e0040a077ab55b016e773d5145f987f7e3f9671ad3ea28
-EBUILD File_Iterator-1.3.4.ebuild 557 BLAKE2B c277c509ecf567cf41bd5abce4f3d560871050e9556687a4ed0cc37eb5bf3f75e9270bf0019ef04ce3b7d4959dd9c91183f6a2799198976cf5284099aabae6dc SHA512 c6ba4224d33ec69a60e59fbb5af78d3b3f675b1840e368518fe39e47924f1293ffe6c5e7d3dde425e6270bf5c3da74fdfafc4af59e49238ebaa9821272cac303
-EBUILD File_Iterator-1.4.2.ebuild 800 BLAKE2B 496eb2ba586ab0f241351770927fb6746bcd7a64b8aec73cf4d2de0ed8c0eecf09c693a72e060c5a2384c1feeac608fe7f0484e45a6d089d89a276532a588b3d SHA512 48aaecf18cfd1d75711a39e12b0c3fc4808145ffc3b6915ea6b3cf56532ad1f7056db08b54e0eadfeff20cec409d8890ed037cf57ee5f8c7b88f42c152f89783
-EBUILD File_Iterator-1.4.3.ebuild 810 BLAKE2B 83e4c6bc9c3c06d9cd3a940be376a7918ac02621c81d900252a31108be98acf5ed094be33984da136c863840eebfa4ae53f229d42750f93ea6f5a4336b859506 SHA512 3a162af76adb1fa170c234f0d06d7fcfe278307a5d1686fe1534d86572abcc44d4fe05410ccd04c9182b7465b68345ac6c3f1b83c8810fb72bb567d065edc4b7
+EBUILD File_Iterator-1.3.4.ebuild 577 BLAKE2B 0c98424026c342511d6f73c2fe4d2ccad1e14dd97f97cf1d36bec6e469093bbef5fcdf0ca89c79d3410c1957083150d121587a509ac45689273aa1b34132d848 SHA512 5b389c4cb5c4a939a330347db4281fdc2c0c3ef993cb3f5606fa1a54f7968616c2ae275fb49c810256b84774cca5aa4776bd3a139078e9e4651cb3a47d5b5b57
+EBUILD File_Iterator-1.4.2.ebuild 857 BLAKE2B 35f38333c62934f9db26e34d5c12aaa43175d6bd39907d0d519f68a5620491ad0983969e7256386578f99b9e46b7b98d156b5a71f3f97831ba47b1141085114d SHA512 9e9108633f405935b025aa4cdd957387ae152bbe943435f896fd97fb063dcd2a2cb089e7c1e1e4cfd16fd180ad754565c7709f01faf8a5fb3d1ee930ab469c24
+EBUILD File_Iterator-1.4.3.ebuild 866 BLAKE2B e5e1e0dc5ebe224bbddeab59ee7f2e0be3b06a400af818f7d0045869fdfdddbf60efc405a9aa1e30bad8a9c3310e4a71db866821fea6b4e5486d35001f92a306 SHA512 f45b221200b40f5c10c1d7240b3eb1e459c8784741cd5a0ec594ce7ba382e5383a9f8086aa9e58fbd1d739795b52a11e02ed35a9f18f6a9c4e970f7268cfb6bc
 MISC metadata.xml 349 BLAKE2B ab948322ce2cfa4e40d9b0ac17d435db9e4613000fa05c810860e281615d5b1297f826ec51ed460ba87080508578e2353729843cdd2bf1f4226890413137a911 SHA512 85e7e819b346185575934f4f356d1346534fce0fe1ddcf5e88e855ce40f64c48bf73c1f14085cf0526ee681014943f7524ea79b7d951b66c12e67e6f04c099e8
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1e9be33ad92f..24ea5d6294a8 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 73160f30d294..5d5dc71c0f43 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,4 +1,6 @@
 AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
+DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
 EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1143 BLAKE2B 9c3d6abc1c26edce890974074f198ad25c2cdc0994f15f6c1ed87535838a59c3591f1cb07b9bbbc01d52d53bb7831578e3ebeef918df949da6b3f45925994bad SHA512 39411280c81f82f849145f85f3db8752b230f3ecb44b39a1f661bfd946f6ba61b78ad55ebb42d98d15e63864a5d4f70454ff1857ae4fef3052f9e0d1e81663af
+EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1091 BLAKE2B 0df4468cfb9c0c28ae822ae30595e31c8807d7fec881e3b7faf3d6eaee0aafc55966cf6eabd6ac20c60d8999d48b00d4d3b3ab965acf78d942cdc51edf9bf789 SHA512 edc5ed49b7849fb622c11001a3b774ecbee62127aae73bde8b54b67aa3d89599ce000fe2d7a6f2732eed056c9ce29116969e523a3ff88b573c4eed3404d3ad36
 MISC metadata.xml 377 BLAKE2B d87bdb689ac2ef20b8d02bc7f9db6a3f23fa5bcaae752c4f5b1b0e5bbc67251779c0204b2943d044a1ca287bb07ddac9ef0ae960eb7f543e162ef6cabcbed65e SHA512 df55d57721b34bddab42639c469517c86139d60d4a4536b26b61cb35eb688c9d713cf90f92b2272e189e360042a2322e8f87480f4554a7c3cf9ffa314d053186
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
new file mode 100644
index 000000000000..f40428e9b276
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_PV="${PV/_/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="app-crypt/gnupg
+	dev-lang/php:*[posix,unicode]
+	dev-php/PEAR-Console_CommandLine
+	dev-php/PEAR-Exception"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
+	sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
+	sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
+}
+
+src_install() {
+	dodoc README.md
+	dobin scripts/crypt-gpg-pinentry
+
+	insinto "/usr/share/${MY_PN}"
+	doins -r data
+
+	insinto /usr/share/php
+	doins -r Crypt
+}
+
+src_test() {
+	phpunit tests/ || die "test suite failed"
+}
diff --git a/dev-php/PEAR-HTTP/Manifest b/dev-php/PEAR-HTTP/Manifest
index 3fcf85056715..101aac17ff16 100644
--- a/dev-php/PEAR-HTTP/Manifest
+++ b/dev-php/PEAR-HTTP/Manifest
@@ -1,4 +1,3 @@
 DIST HTTP-1.4.1.tgz 8635 BLAKE2B 2d834adcd5f5f2123f0d477bcb1b8189312d7fd8e2ff8e23f23a12ce762dbcda359ac61b192b58f60749c527c0545c3ef321a9610f3fbb0eacd3545e42f86e6b SHA512 60f9ef88eea358e83942213c9643ed7a635822c0963b79221eabb1000e126e5a79e4c6b3901c83c53ad1734ac6b774d355328a8d94087faee544af9bdc20f71c
-EBUILD PEAR-HTTP-1.4.1-r2.ebuild 338 BLAKE2B c984568acc2db99309ed09476a952f9f2d168e04257612f39ffc350fb9aae5eed5a8aad8e80e6da319e6ba9410c4ff1813032d92d6669499c4e6e250719fd469 SHA512 cb8a997c78b8cb26c81d0e2fc240ca614aad0b462cdfb4036fd1e05a169310569785915c83a90374f0fa2c602a2dc2e017517af626a31cfcd77ce83b49286f4b
-EBUILD PEAR-HTTP-1.4.1-r3.ebuild 456 BLAKE2B c8ab9d3d6c2a0eea7c3aefa56f2bccd93e748471cfeb340a290fc004d09e0662a14f42ae527b94fdf04ada63446f08864daa1b4a5eaf3dc8f8c653290af75221 SHA512 ed05ac3a36f79ba61dec79d50b645a86dc4694c57b47cd92f6bc32aadef6fefb52bf0c517289e883137589d2191f1a0445fc92aeb0b09e0264028712b5a966a1
+EBUILD PEAR-HTTP-1.4.1-r3.ebuild 448 BLAKE2B 98c5fbd3219712339ac07f33d32d0da1447cc549d420f67acd13e7a16f13c7a4f30412674b297d3fb1e680b633ea50f61edc8a4898cfb6ff87fbcfe27a1619d0 SHA512 aa4299d80aaa657ceb422291d8e7a254d92238d7d946bb92f02669b6cf0631366c9cc90cfa4a34c5e07339884701c7943b3aa48366645cdec53d8f27db340d44
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild
deleted file mode 100644
index 0965173e4b80..000000000000
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1 eutils
-
-DESCRIPTION="Miscellaneous HTTP utilities"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-src_prepare() {
-	# fix nasty DOS linebreaks
-	edos2unix HTTP.php
-}
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
index 93359ae15479..504e8f98f275 100644
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2 eutils
 DESCRIPTION="Miscellaneous HTTP utilities"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 
diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
index d908bf539e9b..f28674ec6937 100644
--- a/dev-php/PEAR-HTTP_Request2/Manifest
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP_Request2-2.2.1.tgz 107339 BLAKE2B fa9d997c7ea59aeb8c4133944d57af3dca79e937b271ad862f8ada26631a14992f204566dc2059cd19a0169f7d89ef1b302ec9fe2b4e370a8e715a0004b474f8 SHA512 377421f521184b3dc4f28b1d37a1f673ee2b40b8786e39c3803ed6c60f57a2aa8353018ea588598b7ef23a1345227a41481519932998dd01958df623d00dcd82
 DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b
-EBUILD PEAR-HTTP_Request2-2.2.1.ebuild 407 BLAKE2B 410311e2b925c6ad7b61ad6a7a672b961985a7a54fa4d81fc2d4b8e92e081a4c29826e65cbf29bf7b2b1f4c4816cb2857089984ec78193663e465eddf31b3fc7 SHA512 6523a40db4a3e29b0880e4ff99de81704ebc674a9dbb3658f1bd276cdb9679932c3bd8786b8a7801b00a6e7796feab6a640b7d1834980382963a1efd8ace1e4e
-EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 731 BLAKE2B 753e629af80fd656fcf083a594932d2a99c921937957d318227df261a4de3f9055b1e2edac82ea94f7655a0c440fc49a22b1f8fa72ea395719b9e415efe0d8bf SHA512 75e9477773dd68dbb333aed62ab4cc84b520765f1b87d53da0733080219a41b41230f529084d538764394405d78c67ed56cfa3febb6221ac93ef6092d031046f
+EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 725 BLAKE2B a5533442eb441637032dfdad3db8cafb609d3b83556067c2d8f93bbff6c251b84e51cab28be839cbb6f1d19a5de1ef34de85e97a2b6f4614a0ebae4fe0871e1a SHA512 811125065ccdd15b4e9b989bdece6d6429a495e968b97aa385f5883d3e2b22108556405e5f7878eb90f593752ffb07eaff68d4dd37e4ca67895aae43b5174dfb
 MISC metadata.xml 719 BLAKE2B 82195b1905bf7b954b7a62502ef524628a05a509e551bdeae9dec1d157579ca6520a8173dd5cfe2eb677f8d26b5fce9195d9312027f6a50d063f0a77acc6152f SHA512 38a38b6d73d885e7222812f54cc4bb67fae6d05c5647b123c00c7676a3feb8fc2cf33a2d308058431e00865a1dc198fd978614c652e614a1058e0319abe72704
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.2.1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.2.1.ebuild
deleted file mode 100644
index 4c76658dc5c9..000000000000
--- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides an easy way to perform HTTP requests"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
-IUSE="+curl +fileinfo +ssl +zlib"
-
-RDEPEND="dev-lang/php[curl?,fileinfo?,ssl?,zlib?]
->=dev-php/PEAR-Net_URL2-2.0.0"
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
index 99f16b6faf11..6242b76006eb 100644
--- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Provides an easy way to perform HTTP requests"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="+curl +fileinfo +ssl test +zlib"
 
 RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?]
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
index 3db6f2f6c211..769dd9a6908e 100644
--- a/dev-php/doctrine/Manifest
+++ b/dev-php/doctrine/Manifest
@@ -1,7 +1,7 @@
 DIST doctrine-1.2.5.tar.gz 659173 BLAKE2B fd703eb52d209548dd44950cdb23c2e3298e044f9387acadb2edc67bba79dd9b0a60fdf9a98d46e8078415c1e0ff21976323a6df1ab9f798ee475690ce50d4d8 SHA512 c72f4e829a92b011af0bd96d2f8a780c3106afb57a9677a21aed683473ff00aebdf7143a276c7cc70f1b142196968b5e2e5e1f744dba5c8ae1267b867b4e0310
 DIST doctrine-2.4.6.tar.gz 456426 BLAKE2B 775c14750954ced8728c220dee6ca41cbfa66a7c34b00476f6941d5681302b1f10cc8dfa5e206780bb3b4b5d0e591b0e770de182340c6e7a881d3c4ca3f5795c SHA512 d7aeb58e8c76df384a472df08618a058b70f2b8499de6a3157c36bde125ab32c7bf4f80d1e6d880502ccfed2db704f3218a6f1f1ecbf603cc828e2a757c366b5
 DIST doctrine-2.6.1.tar.gz 554462 BLAKE2B 3481a1e7c8acfb0de5c4aa64aa32d583e8f01b2175b2957ec8aa0ae29c962e7482ae1d36217aa765fc38198dc851cbecb5e8ee24829f9e335ad4d18bec3bb1f5 SHA512 f2ca1df4a1da814a0047d2da76da0df64ef704e8f5b2464f2a546e61e615d40de9508c72543ae5574188882dd2a3917d8205ec194c63d7b264257443cdfd47c8
-EBUILD doctrine-1.2.5.ebuild 554 BLAKE2B 03013de408e92ee015d63b9e822c9d0d86a35283b4a8c956e8419c1110addb5cd80a7f00b773aa94865262879fe52317c6ca5d771307b3b2ebe0729310c80963 SHA512 dcc2d0fe9989f65594acac7e6434a7283e3ee508671af784a52ca7d288b6fe3387198ae5fa9ab1e054dad99f581e865f7471fecc371426d110f80dc062e30134
-EBUILD doctrine-2.4.6.ebuild 530 BLAKE2B 90907972a6eaaecf10d395ff3949698fca3d4241baced39c7a3454f501cc996ed300a614f9acd378559d2ed7cc4a4857b6daf614f54f3a6f68076d9ef2fe9bb1 SHA512 6061717df6e2855b3001c44ca31dcc5c2071fd349aedb0f58d03ff6f93c557a0d56018201e28fbd33b70427247602a05f0604f16258bd3aebd44f95192cf3a86
-EBUILD doctrine-2.6.1.ebuild 671 BLAKE2B 83913b194988708e0cfbc021979c287514cd41ee59a4bcc0f93be3259faff7cad40c34160e6fe97058cf93a141f265644a0f7d8b2964f3e4751356632499b0f0 SHA512 85b19e202a3d3d0d8a0c5ce0a09638f0e9df03e017023b23d5505a8b86f568ba7945dd0d4fd8440e6c8b6a21b8653273c8fd6311c486ce6d7ebf82d38a4a3120
+EBUILD doctrine-1.2.5.ebuild 555 BLAKE2B 1f4aca307534c7d6d1154fc072e8a41ee7784b616454caac7f7d76002fc441a6e9214c9a51a95e6c0c4f6530b1a1fa5d8f3fdd9ec29877e4e612a2899b105c79 SHA512 2fe2c0712b7591360e004d952deea9fd9946d027cf10e00ae2f180772c505d055a7e7bc9c1e7010c6af87196ac58a7dbd1387141a9eff8fe33cd933791fabc9b
+EBUILD doctrine-2.4.6.ebuild 531 BLAKE2B 7a4b5fbe31fd84083473455ce554f4f60252b383e517428a6c268e84c2646434ea5f933e38e9c2da17edc2206331da72d933874ece96f47a6a8df98315f58a0c SHA512 7d4f306bd2978ae62ca4b0d1746ea33d3bc5f39f01e031b352fc723e2ae77180a3ad7ddf7682f546ce6e0f38d1352ecec171d4cb2c7bc451f9d297868f8cca8f
+EBUILD doctrine-2.6.1.ebuild 672 BLAKE2B 288f877b15cf75273ce1de0df0d64030ff17f5a68da6ec74808ded7b1f98e8b6c42326b0be0285e5f21413b72a6091ccfe6427ca0fbe4e92b55c131680924c0d SHA512 67ac1a18dc3e145497acb0ac6e7ad95c7806d22feac227d7111cfaa2923d761594eb57daa731e2cfdbc86195dad17d469fa9881e703d5a2d041194ffb12e14ad
 MISC metadata.xml 332 BLAKE2B 34b5c4879dbbabaf08883df45cc3fbed8c8c9e4af84defb70af64a25863914320e637f2fe0d388c21066b55921edf68cec06d0fb24de4464bb785a63d7cdcc72 SHA512 44f05e8196f20572f12f8ced92fdc76a78198ada035dd4eff11d37fea991aefd35364b07beb3abb213b63c900e7b9ed2b3e23f4d32fa0680928a342e0a5df8db
diff --git a/dev-php/doctrine/doctrine-1.2.5.ebuild b/dev-php/doctrine/doctrine-1.2.5.ebuild
index 30e0303f6c6a..bf2faae0288f 100644
--- a/dev-php/doctrine/doctrine-1.2.5.ebuild
+++ b/dev-php/doctrine/doctrine-1.2.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 MY_P="${PN}1-${PV}"
 DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="http://www.doctrine-project.org/"
+HOMEPAGE="https://www.doctrine-project.org/"
 SRC_URI="https://github.com/${PN}/${PN}1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT BSD"
diff --git a/dev-php/doctrine/doctrine-2.4.6.ebuild b/dev-php/doctrine/doctrine-2.4.6.ebuild
index c2ea8a6947ba..5184f5a1812f 100644
--- a/dev-php/doctrine/doctrine-2.4.6.ebuild
+++ b/dev-php/doctrine/doctrine-2.4.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 MY_P="${PN}2-${PV}"
 DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="http://www.doctrine-project.org/"
+HOMEPAGE="https://www.doctrine-project.org/"
 SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT BSD"
diff --git a/dev-php/doctrine/doctrine-2.6.1.ebuild b/dev-php/doctrine/doctrine-2.6.1.ebuild
index c716c1274c2c..edd7e6575055 100644
--- a/dev-php/doctrine/doctrine-2.6.1.ebuild
+++ b/dev-php/doctrine/doctrine-2.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MY_P="${PN}2-${PV}"
 DESCRIPTION="An object relational mapper for PHP"
-HOMEPAGE="http://www.doctrine-project.org/"
+HOMEPAGE="https://www.doctrine-project.org/"
 SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/phing/Manifest b/dev-php/phing/Manifest
index 0a467d51d83c..f46f095785ac 100644
--- a/dev-php/phing/Manifest
+++ b/dev-php/phing/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 418 BLAKE2B 8999ecee030a7d3eab49102bea8bf3aedff8c0e35021947279fee65ed9c0fa2f6bdc923a5e48437f314623cfed7545b3f4e30e8eb19610091c13a897c93278ca SHA512 81a22775a38d08e681e0f0a97fd6f125065be86fb491894f397cb25cc8240a7038b6cf061c77cc0c4837cc5a68aef909fe3a94ae84165a5f358050fac0164cd1
 DIST phing-2.16.1.tgz 4149013 BLAKE2B 266c124237d437361e9e18a42c9358fc18cfacfaa798a3a92a31858b7c1af847cde2cac43e0fcfe3759e8291639de9ec564f977fe00939316dbacdfd266e4e92 SHA512 e0832396dac9fbd43680f01acfa55f3ed2819726ace1db4ec9addf18c9c023c4f63143c6a63bbe1b16c2bd19dba54f503efdc77d772a3239bc8f9efe0ab375bb
-EBUILD phing-2.16.1.ebuild 1550 BLAKE2B 7a9530d3c029429b13f055a271f26e57424d12dbacf10362d44ba2f35515d0ef74339d30ff155c5d5861595c4d34404d8a34df1429ef805cedaf9ebfafd516f6 SHA512 91510f112880ede6bda907181bd21b5ba79457b9f006448e8faa6bca4fad0bd8700d0e37dbdab5df2264aed5f665f8a6e197b3ee7debaebcbe2a9ce66eaaf53b
+EBUILD phing-2.16.1.ebuild 1552 BLAKE2B 4ebbe638f537094ae2fc898f9fa9f3d1d6fa3955a4b0ba7f2da50cf03efc24e42917ccb02caed1855858ea8dea7885a0e5b7142848c42cec3cd35cfcc1842cbd SHA512 3e10a755f846b85b70e405839537c237c373b4c1a3428157077d2621ce023e4d0d59573e81d706a8cf85e505329b7511153bbc8e92292b7475db813a5ca55773
 MISC metadata.xml 471 BLAKE2B eed7a2c37fef52fce309821dbeb3dd30276d438cdd3b00b709b8fd5c5814f2e25c48465eaa1abd7aef190f3a3b1c502be1066e6b8479761001c71ffd94f91999 SHA512 a0b77b3717c96c2aa8807f967c5c5a61dbcaa543ac7467a6f36bfdb9a74897b975d543ea2515180718cd016d7ec72989e985ce45c87cec04923f9226a2c97254
diff --git a/dev-php/phing/phing-2.16.1.ebuild b/dev-php/phing/phing-2.16.1.ebuild
index 5fda22fb029e..30583fdb8fe3 100644
--- a/dev-php/phing/phing-2.16.1.ebuild
+++ b/dev-php/phing/phing-2.16.1.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="PHP project build system based on Apache Ant"
-HOMEPAGE="http://www.phing.info/"
-SRC_URI="http://www.phing.info/get/${P}.tgz"
+HOMEPAGE="https://www.phing.info/"
+SRC_URI="https://www.phing.info/get/${P}.tgz"
 
 LICENSE="FDL-1.3 LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 07d0ade03f8e..4aeea542c64d 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -2,7 +2,7 @@ DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a
 DIST smarty-3.1.30.tar.gz 255464 BLAKE2B 8378e6336f271e3c41e16b8fbb70356827ff4a9a61e3cf2a23fdbd0617155ec9dca6a5b6372327d4b35a5c6f7c3b58e807afe7403b7ed929ebacfb3c36e124d0 SHA512 6ad9a6cf10b81fecbdc4daa4acbd9724db5f1c2a014e35039b36b0bf00ba000946a2126f7da5899e587a79419f451aafcd1ee14597a32cf290bbd0bf13a877d0
 DIST smarty-3.1.31.tar.gz 244196 BLAKE2B 695bd40d337e8f2d4a44a7b30b743ab4e5b6a7b024a514de956cd513dd6639ac6f9ae464f0d3b4cfcaf7de17994837a866cdd4945780bd3a96ff32df300302a3 SHA512 807343e4229413ea0f5219a828d4e91603fb5454f4abe8aa2d41f0a6fe32fa476e791340e1e95178ded3774d1524e98489c104c6fa391e70a8225de28fdcca18
 DIST smarty-3.1.32.tar.gz 250680 BLAKE2B 92d4942f2d3d802b18082f5f6079c8b6945abadd8ef2c87ea217b106eeeedfbde7f1bd00c6fced67b73fc3cf328ec91fc1fb61c7f991b992167fa9d2fb1f2ad2 SHA512 07c95177172718158b9b562c6d8ff79566f4bd8e07ba394cc82c52dec7ec869935fd03ce523115c08472159adf68b902d1db5f8543201a35adf22027c5978080
-EBUILD smarty-3.1.30.ebuild 1329 BLAKE2B daf072ce974a2c555f63513608900b2065191cf7d95871ad09fa9b623e15fa5d21a4fc87f1ba8e8cf3dbc700632fb6fb3bca32586d5ebc7f98484da6f128a7cd SHA512 44dc07bf8992493879cfc7a343c8dc2b41d64d75121d3e8cfeeabd0b10e57bb04ba7fde15fc067dbfeb276d39c835007cca114152d7d6ba4538c59bc19203e8e
-EBUILD smarty-3.1.31.ebuild 1337 BLAKE2B 829ce42871c7a271301ba3fe16fa84db9bae6dce4ba499948074459e20f7658039770c27712f82a497dd0520957262dc8e2cc7c404cd0979af5f1bc843f2a181 SHA512 8f678139dc0899166b13c2c1a860dadddb4d79fb29cdb9e8bbb4a2feb0a417526772d5fe3a7e4db4185a0a07ffb36191116c2bfdfb780ec483b22e225acc71e0
-EBUILD smarty-3.1.32.ebuild 1337 BLAKE2B 46f304fcadd8eaceaf8f3d92a4ae4a8041ff68870fd6f21f029ec0b2b20657aea27eed71ab45f77b3da5f340f9baebd851edbfe09323bf9b0276c8d35deabb10 SHA512 85faa8feb80bfd0598bb43f53ece923563cc56ab3d733fa66f8e5147759069d69ae1ac180a9e47a30d41645c5301e7a842a363d49681a3a83e1975d7657a9ffe
+EBUILD smarty-3.1.30.ebuild 1331 BLAKE2B 59393ee7db8482c6af06ce4430e638ce02ca1ea3f9dbc1264f867bd94aa5b55a3b9321f90f6fc4a1a8c9e7c6bfdeb64342b67e2117e1b3b5586258d8b692bb22 SHA512 e79707cc1e841806d654a597c7b7c2e0e3465a5bd6354652247d6e697bf8e6b3727ff52cf441aa72abb470d0ff1c325526489e3169062ee537ca80b98685e7dd
+EBUILD smarty-3.1.31.ebuild 1339 BLAKE2B b64063186aaac934f8604f67ebe1b53cf171d024db96388eac4950508ec9278f3f85e61df1147bb395ea9d84447281860e2d9994a21d06de36ec59d26900c228 SHA512 fb0c063f295956b275023751ca12cdc7110de17430214a42020840221697892ffc5045f16fa09cbd4b19b409188e9607adcf640f824c668395e8b62d560d7b1e
+EBUILD smarty-3.1.32.ebuild 1339 BLAKE2B b64063186aaac934f8604f67ebe1b53cf171d024db96388eac4950508ec9278f3f85e61df1147bb395ea9d84447281860e2d9994a21d06de36ec59d26900c228 SHA512 fb0c063f295956b275023751ca12cdc7110de17430214a42020840221697892ffc5045f16fa09cbd4b19b409188e9607adcf640f824c668395e8b62d560d7b1e
 MISC metadata.xml 581 BLAKE2B c8e02efefe221a4cea961b32c448d3a69f2dbec795a1a012c727777dfc4a448fd0bb23816564843f0a3fe6eb67453175ee84417e7ffe0e72aa48f8f131b72aaa SHA512 1bf0fea8d62a06b1b67ee417eeb44dbb476ba590b35808f7c7bc1b40a6758b2c3f931e8290c2908a14828f8e2789eb8e2c6d5a26e106f97359f45a476fd31401
diff --git a/dev-php/smarty/smarty-3.1.30.ebuild b/dev-php/smarty/smarty-3.1.30.ebuild
index 77b161474216..8d68f8465a42 100644
--- a/dev-php/smarty/smarty-3.1.30.ebuild
+++ b/dev-php/smarty/smarty-3.1.30.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
@@ -6,9 +6,9 @@ EAPI=6
 DOC_PV="3.1.14"
 
 DESCRIPTION="A template engine for PHP"
-HOMEPAGE="http://www.smarty.net/"
+HOMEPAGE="https://www.smarty.net/"
 SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-php/smarty/smarty-3.1.31.ebuild b/dev-php/smarty/smarty-3.1.31.ebuild
index d0f0c4c87fc3..c1b265f15ead 100644
--- a/dev-php/smarty/smarty-3.1.31.ebuild
+++ b/dev-php/smarty/smarty-3.1.31.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
@@ -6,9 +6,9 @@ EAPI=6
 DOC_PV="3.1.14"
 
 DESCRIPTION="A template engine for PHP"
-HOMEPAGE="http://www.smarty.net/"
+HOMEPAGE="https://www.smarty.net/"
 SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-php/smarty/smarty-3.1.32.ebuild b/dev-php/smarty/smarty-3.1.32.ebuild
index d1a7a62bef98..c1b265f15ead 100644
--- a/dev-php/smarty/smarty-3.1.32.ebuild
+++ b/dev-php/smarty/smarty-3.1.32.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 DOC_PV="3.1.14"
 
 DESCRIPTION="A template engine for PHP"
-HOMEPAGE="http://www.smarty.net/"
+HOMEPAGE="https://www.smarty.net/"
 SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-php/suhosin/Manifest b/dev-php/suhosin/Manifest
index 2ebf3d1b9b5d..489e1ffd4a84 100644
--- a/dev-php/suhosin/Manifest
+++ b/dev-php/suhosin/Manifest
@@ -1,4 +1,4 @@
 AUX suhosin-0.9.38-libcrypt.patch 590 BLAKE2B db02346c66f348fd0be16fea1647deb1a6e44c2b10077f410ab919e7800e160439780d7b1c807f455cd3efb115765288c869cd96d719f4315150edfd73693085 SHA512 fa834f26803e2f623a269bc1cc81e305e081397717e0058315cac8087f04c33ff7f2eeee2052dada75559e5b35dc85c55499d74635dacd0f08fcc226ec3d0de3
 DIST suhosin-0.9.38.tar.gz 122800 BLAKE2B e016091e370bbcfdaad91d10858541cd730951be1032e95b4d372b5a77fce719e300cfa0638bf3ebde68e91d76b95c94ca56ce239997da69fc7ce5068b26ab49 SHA512 cc4eb38b5d6673cc3f2dc395e5a8b5461d3221019ac9849b747b6d5bae423cd5bd01a75b9432414dc7c26c78bab9f2381a5414712a6906a999f3ec9dc77ebc45
-EBUILD suhosin-0.9.38-r1.ebuild 1328 BLAKE2B 8867b930e6b24687e68351494f456e130ebc24d1bcc3a7adb66695eedb722f76c3e3716d4ecd5b40cc2c6246e52d70255dbf7a33b0fd2c9ead04a427871d68ac SHA512 1c52f907a7653564ee353c7aa942a3583208205f174bd802c54bbac5976569a6090c5c796c34ca10fef99f3f6206ff3ae4958e9d33df18840ae5d4e50c21909c
+EBUILD suhosin-0.9.38-r1.ebuild 1330 BLAKE2B bee0345e89d02138a9d79b5c91cf4c75fad99626e42a503034c2047910bf96f00941a066518633e4c84f6cede39bff9fe3414ede6c38ceb3dcec944b75e68058 SHA512 79341927c5c6351514d9ef257be38884c27beab3a91b3d873d52b2b1c34b6977296a499fc226c0b3ecbe5b7ef49d1d3f1e5f00acd834d1372babca6b7f9ef53f
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
index 226549ab6ffe..3372f3abe755 100644
--- a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
+++ b/dev-php/suhosin/suhosin-0.9.38-r1.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"
@@ -13,8 +13,8 @@ inherit php-ext-source-r3
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
-HOMEPAGE="http://www.suhosin.org/"
-SRC_URI="http://download.suhosin.org/${P}.tar.gz"
+HOMEPAGE="https://www.suhosin.org/"
+SRC_URI="https://download.suhosin.org/${P}.tar.gz"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/Kivy/Kivy-1.10.0.ebuild b/dev-python/Kivy/Kivy-1.10.0.ebuild
index 0a913ae26c12..b0602122212d 100644
--- a/dev-python/Kivy/Kivy-1.10.0.ebuild
+++ b/dev-python/Kivy/Kivy-1.10.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DISTUTILS_IN_SOURCE_BUILD=1
 
 DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="http://kivy.org/"
+HOMEPAGE="https://kivy.org/"
 SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild b/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
index e21b01c75f51..ad713c0570b2 100644
--- a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
+++ b/dev-python/Kivy/Kivy-1.9.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
@@ -10,7 +10,7 @@ inherit distutils-r1
 DISTUTILS_IN_SOURCE_BUILD=1
 
 DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="http://kivy.org/"
+HOMEPAGE="https://kivy.org/"
 SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/Kivy/Kivy-1.9.1.ebuild b/dev-python/Kivy/Kivy-1.9.1.ebuild
index e6bbc4a844ff..a71ffd4e669a 100644
--- a/dev-python/Kivy/Kivy-1.9.1.ebuild
+++ b/dev-python/Kivy/Kivy-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
@@ -10,7 +10,7 @@ inherit distutils-r1
 DISTUTILS_IN_SOURCE_BUILD=1
 
 DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="http://kivy.org/"
+HOMEPAGE="https://kivy.org/"
 SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index a321a24acff1..46460bc2d086 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,7 +1,7 @@
 AUX modplug-fix.patch 4854 BLAKE2B 7552e40f790de3385c7916820a6b6429917d7a6353da48a283239129fc45f7e6540a01b3178f7e70becb8f342107ad3f16b78a363d8e67247f67cbe6491d65de SHA512 07db881b817b951e20be355e926375b34a2e0b43942322d83550ff99b07e434871a0a15c1a0e9ac9eba76fff96ca8221f9f02ec1ba31b1ddbd10b567ac237fa7
 DIST Kivy-1.10.0.tar.gz 24266702 BLAKE2B 3f1dab7c69e322d5856d1772d0902eaf5d4598957df1573e0c617ca872afa446797266f1ecd4a99da81bc7dcc40a051294d96c11e51a7fe2c505224bf0edaa42 SHA512 8049c92407e464558ecff913ff076c1b8f125b85a35b9eba64af49b35df545402ec2bac907ee545265a368b8cdbb33e02d74429dce13c53dd6feac735ace9cb4
 DIST kivy-1.9.1.tar.gz 16363833 BLAKE2B 1f81ab0688e9ddc617da5e7d56523568e396f010587c971285996ca5544367a4f63bb6493f279ea66f6606b2808394614c25a96e97018ef0ae1e70d74eb9cd7e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989
-EBUILD Kivy-1.10.0.ebuild 1932 BLAKE2B 9799fa92373b871c89d924e94c67bc63bd1ad5f0ce7fafd73be01e237b36e3df98fdb4a694ab8825060bdaa2f835b123e63d754a9a4dfa733debbe32c3da5875 SHA512 cb99077cab4379a726cfe0bb1120c845339e6fbffe0d2eb0a41c39a5108cc6cfc2f6bb2b6a41fed883816c70f1aec2dc80bce16f1f53b9dfa33bd7cfaac54718
-EBUILD Kivy-1.9.1-r1.ebuild 1878 BLAKE2B 47e6ddeca7f90ec97efe78149981a6b804f534ca05341253e08091e9fbe882cdf454b4cb0c8ff205a92f311dc74017b4132c4c7de4c039a40a5aca85aa68cad9 SHA512 ec4a0bed0781244d0bc16730c7ceb7584a182a60b326dc1f8063963157089bf727bf2a5504f1c0bed2d265d3883c6a2d21d7f348cd9ccd05dd0195b11734fa11
-EBUILD Kivy-1.9.1.ebuild 1794 BLAKE2B 2760cf176c8aaade4b11945f42768bd5a6fd423554f168070831e10025ab78757e61ccf8dc63342aabebb622f5121368a5cf8b67ba470a37f4d99992882e6115 SHA512 7d50f1e6cf0553c2cae357a2a50881961a94a061cfaae27b60f3d7ab159f306902a23fe26ee5fe193ffb2e045cb7e88273151a0a4aff4fb16a2c0f1e3ca139a8
+EBUILD Kivy-1.10.0.ebuild 1933 BLAKE2B f12180ecb960b700626633350e524aca74ac231c0cbb7fb3dd1ee21b78008f7f9f880e504fcdd0b92def10c2558b19900744aaaf072b13669d202ade9af717bd SHA512 431f6bd4c0c77fc591baa60d9e8791554117e9c38ed8c61e31f8ab1db984157f64c54102f8a1dc7b15d90e1a83aeceab83349b9ae50961c1aba80bcc36e54811
+EBUILD Kivy-1.9.1-r1.ebuild 1879 BLAKE2B 09dbaf8d158d81a92e5427dff6f4026f4b3d71bba9f4266eb1e3b4ec6ac1d4070713b3bb5f23e82757506f9d3da3780a1b123fd795baf967312a597602363f42 SHA512 64520836ec8c7ee0cc06be36902b70474f0e4e34e57c142c0e93df9bcab6ba56fb4d5cebdd4931f8ed4c193876a81f3cb1d385a5b0acb7c95974bafcf8d15b1c
+EBUILD Kivy-1.9.1.ebuild 1795 BLAKE2B eae7c1ac0f30b798a99b0a8157625d24cfe6c0b11b2fc8f13069a9116a402bc2a8cb60a4147c365f1f7095afde91cb311ffcffe2e1c94698038fe72a5cf4cea4 SHA512 4e711555b897e2682a9ffbb047ee358689a8a2fd5584dcc82c4269699059e950adb483ce0b6c93660e8052d0f91b8cb906523ba2bd704f2df82dee335c6fa8c9
 MISC metadata.xml 490 BLAKE2B fca6a6372250ac811cf7520b98a2d26d5951030b56fa7d62ef85c3554025bb57a55371def39747d7597b42bd9dea44104892c75a2ecb58904de423ac4260c40e SHA512 a29aa0e59c1d02423643bf9bcccca5860c981a81f45b2aec030355f566b9690b8e7e8f6339acfbb5c51436e9298b99d4b53b5e3bdb410fa4f030177f9abe2ccb
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a68a1b2e3441..2225df20135b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index f880ae5caba1..88af0f870208 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,5 +1,5 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
-EBUILD PyContracts-1.7.9.ebuild 1070 BLAKE2B b5bad659d926cc0739c8fb83dd6e8a66bad1d8d4489e523316a54109638d4861536e7856eb2ae9cbc4db1d3a008a5030c542dfad0fb7f0ab2d97f7e3f3908ce1 SHA512 f8bcc235e3d0cecfcef7e08711ebf88d25efac173d47b2dbe33ef8f6efd4b09098eaca9bafbba0d51d0289dcfb09244f3e3f5808e52a120fc8100eddd347efab
+EBUILD PyContracts-1.7.9.ebuild 1069 BLAKE2B c79a442c967345de74626844dc744e024be08d4280241f570ecf09052ad0bb6febd2ca119055ef49a38657b6e8fc7cb62667aa9b1d004a5db00930521131ac2c SHA512 739d9f0be7390fcd1f656fcc9328e5da1e134b3470eb946de88d5be32e2b76d85786ad30e35453b1363c77f342f6faa5f07ebb89635827ddf63e53fa5d4d1c9d
 EBUILD PyContracts-1.8.0.ebuild 1080 BLAKE2B 77e41f43c56c5211ef3371e2a65364fd1a3337bbc1e452d818bf47aabe5609b38b103f7a30c8d1dded205238e296c64c617a0b98c3598341d93503981344bd74 SHA512 549e1a4c89447fefa094fa4b01de69db2af899efd9db6c4a89b68b75be141d19172b982fb2cda66d946908d13566993cbb9bb1e36a968eb57b34db977bccbd0b
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.7.9.ebuild b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
index ccd3c64579d0..66642dc18faa 100644
--- a/dev-python/PyContracts/PyContracts-1.7.9.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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="test"
 
 RDEPEND="
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 40a9fa549ede..31bf611279a8 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,9 @@
 DIST PyGithub-1.28.tar.gz 2662625 BLAKE2B 86d972c51be81bd1f52ea18d89d22c207b0327ad9c4cc39da3aa8996ec280a164f270256c87718676d8ed2501c9ff7819a59df1ec9c7ddb5db794d141f0ed103 SHA512 e1d9f6f473d757074220f4ec6a96f0e0a6de89af6436b8f0ab30ed22eb24b0955f0b64e6b25eae36bfe19bce580677552aedc82a7749520c5b1baac03428db7d
 DIST PyGithub-1.35.tar.gz 2677633 BLAKE2B c034ba44e203bf15c47f54087294295f302ea5deaabcaf09f8420a9b0a7fb51bfd6b2f7b64cf2c25004e146d8208cd0d90d2cb8baf2776de25f23ed15a2e7887 SHA512 d852f459e5514310ac7bbb3cd9742a7269f9ea5c3e0fdfb0f385616fa31d35b72b19f63b650c60241c5e2f29860ddc35caa907a623c661bc77a29dfe4da3613b
+DIST PyGithub-1.39.tar.gz 2662602 BLAKE2B 5e3e4ca2483e7ade968f170e7615258b4bcca0f1c6741146c38b3c7405fb1fb66351fa5686863892a6751bc4cb6ea39b6cf4ec0d8e6cc878b302c87512c9d159 SHA512 5fa6e5a1b8e7cbe2be13e7f866ce8586f6ba37bfc8f3bfb5a52497a9edc267c14512e4572f56e898c61b8c84dfc8aa8f325c5eb2563e68450b8a3b2acf8308d4
+DIST PyGithub-1.40a4.tar.gz 2668409 BLAKE2B 5638f228620fc5c6741f79e3272ba374a71b1a0a9fe3d6f0edd45a7b0468fd4ed1a6fe967d37e6169a4cfc90a3f084c948f0d72592cd225569275a3d8ae3546a SHA512 6d832e2a101a80e2b0aec45a99ec2f28d9d64d130bf23f291a643bc8450a86c4ed9296a005de000c975e28d91d52e648937abb09399554b9d17988fd58f280e7
 EBUILD PyGithub-1.28.ebuild 548 BLAKE2B 3e8eac8c0cd4d349f2c6455c83b282756d406a40015a4e1e7cdc21a53308efa355ca6d84e1276d43eb4b547f36cfe517b8d0d9d5bdf23c241786da935f0b02d2 SHA512 0e84d2ed8b517e48113443ba17054558eec90509e124de6d400c7ecdd047dcbdc1626da257d63cd31249ed7a24be7bfc71746594bb175cd6111c48b7107d83cc
 EBUILD PyGithub-1.35.ebuild 600 BLAKE2B 7c0d0d18a008afef48e8fef0703721a2ceb2ae7555c3e0b9561bd3514d6d31e41f088b49997d250631111f9f1f34b5d58b049aba394d76fb8a178ba165ab568d SHA512 2741d9e431c6271acf3aba3e7c8d1d878e7bbd3fa388e60d2bb0b40edf20ae3ff0f3fa5c5186eaa7bd9ed9142f8d97c661782870dd6734fb12c7abc5f3d2cbc6
-MISC metadata.xml 332 BLAKE2B 2d9417dd036506a31b9e128453caaa0f04f6d34a6882ea14c7511806f16255a40b1faafe6f4ae4987811c182efa92886f62097bb1625df8a8d36cc58e18629f0 SHA512 d83bdb94f8dd9715f1ed517ed5e24d3e4751e26a565ff191971a3f3d553b12a5851806301d45213481d1c6c8fa26ac76db0b3676c37b4e0f871044deb1adbd0b
+EBUILD PyGithub-1.39.ebuild 602 BLAKE2B 89204432003da588daea27b3237af0bdf5a01ad376de7737f3f93dc9aca1cb44f04fbf577f357d5a735858b530879d28ba798ddccc2479f7f1319402b8d33e24 SHA512 61e73feb94f59fffcfd5f5dab933c1e33056ae6a98a790dd14e5645875719dc2ea23c6593d8ebf88199c9505ad6079759bd5138bde0201ec46fd74c955a4a72b
+EBUILD PyGithub-1.40_alpha4.ebuild 672 BLAKE2B 1be9caff75c5aba83113161dc909d49a3518f9c84d03a9d44b4206d3f2556834c7b0c35daa8a401c1abe8ea457af0d04e54b35df458426b97353c0f6df2ed6c4 SHA512 ea115e3863b3f17562630724ae1633684e11e9a353e05d3706a65c207e601eebdb9298192970ec5eb464c65d0f0119136918b4bc78c00e3b79c0ca6580de688d
+MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.39.ebuild b/dev-python/PyGithub/PyGithub-1.39.ebuild
new file mode 100644
index 000000000000..eb109f4a9b78
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.39.ebuild
@@ -0,0 +1,24 @@
+# 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 distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pyjwt[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild b/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
new file mode 100644
index 000000000000..de37d5592fd4
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
@@ -0,0 +1,29 @@
+# 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 distutils-r1
+
+MY_PV=${PV/_alpha/a}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pyjwt[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/PyGithub/metadata.xml b/dev-python/PyGithub/metadata.xml
index 4b210b57b573..e39e603758de 100644
--- a/dev-python/PyGithub/metadata.xml
+++ b/dev-python/PyGithub/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 2d2922b9e98f..4327f10ecd1d 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,6 +1,6 @@
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
-EBUILD PyQt5-5.10.1.ebuild 5681 BLAKE2B b14acb52f6f25a74333445c589af13415749a8bc60dfa50a9fa82f597b24856d0b6dbd10c061142103b85817ad4c4980d38baaf4fe7db1d5958e17631580430e SHA512 d99e76127a3445ef4ba7865213df1191bd4c967b5a7acf8389ee7d5521c95bc498e5dcd4c31478fd3f81f07ed457f81481f4bac6e978c3c5a2e190beb8e18e09
-EBUILD PyQt5-5.9.2.ebuild 5682 BLAKE2B 93851df68078e98b065a17126c72410333e4deffe3179e8977da2879ddf8fd7a613548957ad59db669b75efee515ccfab2475c3bd23c1e825325c346ccf0ff36 SHA512 25b4c7a922723a400d3050ccfb931e3594c608bf77268fcf57f33ae94112083fa9d5ea0db92746e70c6a774f9ed644a06165ddb85135d7bfe424895423bcce8e
+EBUILD PyQt5-5.10.1.ebuild 5686 BLAKE2B ec3f132759d1e9f044916ddb9db882d5896418a3aa80602df7a92b206964bc21ecf9c9dbdf22f6f5f3703c07f842cb2d0e5cfbe2518d3acd30deb5ec0b3e4be4 SHA512 ef6dbca270d798236827c46e500347a2cb9cbb839eab09ba368a89b3cde1e2f130731df44290dac76bda286af3558c3fa81fb39217593f66468d058560693c86
+EBUILD PyQt5-5.9.2.ebuild 5687 BLAKE2B 42b0f29d9e9652571b29acfdc3ff90fe5bf1f4ff8776855df37faebb92c11c5e6c049fa10d4d8b6dcb323da379dba0a8bbf231f6751a3be715b7384847d2730c SHA512 d71ebc7f8f90b4e80566a31b8eca0a291f51aeef5cc66f8c860581e69ca70131339606f917e9a1f0e99beb5132796721bc9033667c977ca4a92023be5c5bca8c
 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.10.1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1.ebuild
index 5312e89d1ca0..c1ab53f42bf1 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 # TODO: QtNetworkAuth, QtNfc
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
diff --git a/dev-python/PyQt5/PyQt5-5.9.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
index 881db94f185d..1b83fe1a7cd3 100644
--- a/dev-python/PyQt5/PyQt5-5.9.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
new file mode 100644
index 000000000000..7fec1f646610
--- /dev/null
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -0,0 +1,3 @@
+DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
+EBUILD aiohttp-jinja2-0.15.0.ebuild 1128 BLAKE2B f0ba27b253c30de124f5e25e8371d3a1471d52998756b2f12db1caa61df0dbf0d6ac993a85f09518db84d61f75433e46fb64b13eb3c73b7b350ec7bda9f631aa SHA512 18ac2ac37ce85b95a25ac06e3cfefc8a2cd808580d49073154592f7740ca45518b3a5ec12070218535f56d0107af501ed829ab9b5b7d8558d6859683b1ca9366
+MISC metadata.xml 384 BLAKE2B 37044e46bf0ffa1925c6b50e3d2298993ecc3c8f42e18c52bfec22b620dafcabc77cb63f51f98337470f0edeb600c6b96c0b518f012bcfd3147a0f91def9d30f SHA512 fa82c2fd1f793d00baf665208c6321db03f037782c592f84d5efef68c271413ec080cd0322fc308cb4eddbb3e8667b907036eaf4cf8e00a800b9657bd9b366e1
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
new file mode 100644
index 000000000000..9e58af359e8c
--- /dev/null
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="jinja2 template renderer for aiohttp.web"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-jinja2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-3.2.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-capturelog-0.7[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.txt README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -v tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp-jinja2/metadata.xml b/dev-python/aiohttp-jinja2/metadata.xml
new file mode 100644
index 000000000000..d312e97052bd
--- /dev/null
+++ b/dev-python/aiohttp-jinja2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">aiohttp_jinja2</remote-id>
+		<remote-id type="github">aio-libs/aiohttp-jinja2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 232ed7bef9b3..ebaeb496eb13 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -5,10 +5,12 @@ DIST aiohttp-2.3.10.tar.gz 848324 BLAKE2B c32a7be3f3d9ba0bd1308c5bea779a10e177b9
 DIST aiohttp-2.3.2.tar.gz 841030 BLAKE2B a291baa1c5e915815ec80ea1cbd8434b31f4098eeff20767898fc73d75c6194df4bc2a5d21147a8e5c506f5bc377e79b6e8937ce65b9c73616366f439e542c1a SHA512 e481787fec8c9f21d49978b378fb5ef8c06d06cd7a6625fc36c5d4a035e9047f4ed0e38b25b613f1b685ca40e18c796376750f4ac0970fcd1d72ca7fbe31d13f
 DIST aiohttp-3.0.5.tar.gz 738000 BLAKE2B 742d3647a61e21ed8fc7a0a344337c5260b2bc34ffeb84660ddc031ff3872c97d7cadb66a02a4bc2531ca22b54fc1b93e8cf321d696cf4ec21a60170631d866c SHA512 650dbe3e5363c259fc5ce95baec4fd16ca2fd0836236d7d8f65597346f72fec29f803e037ffd6fc4e726a28a973aa09b0a3874a685516fbc4e843ad7f0f08b7b
 DIST aiohttp-3.0.6.tar.gz 738111 BLAKE2B 28a3560a7b351ee974db8bbdd372798e01696e66660b6330707c542253c4d8a0405e6e8c2c8ec03c3b0ea8b548516ffb2dfe14b800b5f17e908991244bfd9335 SHA512 43f1b3c2da1bc57ac6e83a01abb3568b71ed5514e9331aaba4b691ff036d2d3e72eeddadd0f2f20608fa1f622a673ce1d4489bced2096ae546a350ad5f438d0d
+DIST aiohttp-3.3.0.tar.gz 722307 BLAKE2B 3bf1906e8a518d443a2f1bfff536fe9c4024dd18d12ed791dd4a81cfa3f81260bbbf293ae093086fa45c068f3417bcc797d1ee01e64a890a9427944ac9836760 SHA512 e7dd320abb0d9baa0dd583ce034b2d2dd328aa37750197789207e80eabfaf1e998a58e9aa0a6b98ff213f8c78ca90b85698ac559c57f44ce1b643fc317735a4b
 EBUILD aiohttp-1.3.3.ebuild 1543 BLAKE2B aa4f052ab04483647ba481d2752e63b4dc5da38970a7f49e27cad581d7c43ecccc30a03898ef748a468ad643a7d3f9f7678b93874c5b0640d35908be912cd20b SHA512 f65c3ad05b300d908813812be3c3369a34b80112de84e24e4c013535e4acb08615f0015acd8b87277d0e14e9449fd70d0c28e358b657d8e575ea8e54d248a5d9
 EBUILD aiohttp-1.3.5.ebuild 1543 BLAKE2B aa4f052ab04483647ba481d2752e63b4dc5da38970a7f49e27cad581d7c43ecccc30a03898ef748a468ad643a7d3f9f7678b93874c5b0640d35908be912cd20b SHA512 f65c3ad05b300d908813812be3c3369a34b80112de84e24e4c013535e4acb08615f0015acd8b87277d0e14e9449fd70d0c28e358b657d8e575ea8e54d248a5d9
 EBUILD aiohttp-2.3.10.ebuild 1721 BLAKE2B 35bf0dd76aac5a412e713d3dec9f18ffd9c5d08453417138882b5bea5d2c4f9d05c327ea871033414a37e351e155858babdab0e24ef0686a9c80b64d5a6c3b20 SHA512 5fa41c788f78d35459f6b5e9937bb7da526e08ba07a3517ad85c2d9ca69f07f7740ecb45fca13fdd565a2b2615c468ceae810b9a4c466e1568a9db15e6600f3f
 EBUILD aiohttp-2.3.2.ebuild 1588 BLAKE2B 0d69507c4f189ff0a31350107f5cd51ff02dd52fddf8e316cabf5ae8fe3dd10b36a584ef9f1dcdcc5210791754f3cd017c313ea62f42a269a125fb0ebfaaa8fc SHA512 dd2fd8507b2049356a57d0fb813cc8bcb74965627c304eb12197b6402c2d61966b005cbade015a51774412f34a665f1bd07810294bfa98e93178b99279430c5e
 EBUILD aiohttp-3.0.5.ebuild 1826 BLAKE2B ad11d6e7e0014a6cf71407fa16a51c87f86a8ee51d6660da86897a925a321cfa93b6ab5baa60ef86297c22fced6b6c674b04dd177a84d0be1496ea7cab1d2e1a SHA512 3d03ae53b5b32950cf2fbf07aac8d6197078ad59579932910bcc34fc60a28aa16b9042cba17b146b1f15a421210145a71559e886ea67fca805b9325ea8f8a243
 EBUILD aiohttp-3.0.6.ebuild 1833 BLAKE2B c0d3a1c13ebd7699ae2d506e78de5df605cfcebcc5c25d06aa5d696e534768dea9a0439cb6dce1aec76c042a07f852e87a228f6b1b8150a8b3f3347f8d914e9f SHA512 67b964d4905c55423ed6a1ed30db93b8439a69d0ec1b3d642f4c9b79da669dcdf4cb012c750c34a616e23767df5a1094218337fc5037a29ea35b87e775755bf6
+EBUILD aiohttp-3.3.0.ebuild 1833 BLAKE2B afc0463eaac8b5bcf7317616a3dab30adb223792c64c7516a528c235e53e72e8254cccfc9c2ee8693b83e56c26ce41dfe0107736d00dfce169d587e7541fbd3e SHA512 5647745d6f7225498f8ff20a13cc050d6e6a45091f5e84b411075ea686772971ab3d82cdfa175353b50d567a01ee9002694b45e5fdf52bcba113ec116d946daf
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.3.0.ebuild b/dev-python/aiohttp/aiohttp-3.3.0.ebuild
new file mode 100644
index 000000000000..f4498aa7e38a
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	dev-python/idna-ssl[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
+PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
+
+python_prepare_all() {
+	# skip failing tests until cause is determined
+	rm tests/{test_pytest_plugin.py,test_worker.py} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	#PYTHONPATH="${PWD}:${PYTHONPATH}" py.test -v tests || die "Tests failed under ${EPYTHON}"
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
index 27b413a9502b..149341812461 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,4 +1,4 @@
 DIST ansicolor-0.2.6.tar.gz 6224 BLAKE2B 38ffd0e9a88c886ebad25c4f0072f2f8f833e028c3bc14eb89252c1c0b501f973c9b3e371b4c605a3b98df33eb7203a963797d3ee56cf87b0afb927b19096fd5 SHA512 44c7dc6f621fc3044d4a52acb96e7e497578e025090633bfc8cbf686d7461da018f64502b477a6090e60747481f320cebaad00ee0776c9f4c52d4abbb1812121
-EBUILD ansicolor-0.2.6.ebuild 499 BLAKE2B 43c403bb678298f62b99cde03b17fd6bc6931273d735282aa93383f8a45864db05febd4cd551321c4f977f974b780ca9666fe266715035d8a6aa2e652916f212 SHA512 b4fe43e7e31ae1739029305e7b9d5c2cb544a81dd7a515e2bf3996465442571f4c2ffa896ec7a7924df5925908db25540225faf3c40c1bb9d82a406a9806dff3
-EBUILD ansicolor-9999.ebuild 608 BLAKE2B 38ceccdeaf128de5fae90cef958f90a386bc92e291d384597179be4e0cb621f4e14a19fb159d36a81394de1e93339cabdd0d867e9cf73112ca4fa1641291b79e SHA512 b96325013c261d84799d051827b28903e3db57c2d1542f0033a247ba2f88122a6ba7f8dc23fb45ce5139256557cf3b4abdd03376078891c84ec66cfe36241755
+EBUILD ansicolor-0.2.6.ebuild 535 BLAKE2B 2535d178ffe05e959d87e699fdd214bf9ed5a3c04307b8ca2b5283dbc55241698575eb0a43e3fabf3793287887e8638f9993ff5178520d02e7e37f7f174ea3b4 SHA512 f889c6993b0444b58d06ee0223283391ab58320eefdfdf507f6dec26eb48bf9517a37ac55ab2ec36197e067bf0167cd80bab7ab2ef799ec61cfaed3f47325d67
+EBUILD ansicolor-9999.ebuild 644 BLAKE2B 7bd29e4fa18fe6d5bb25af09cf820e8871f7d6590b461dc2a42fb1274b47e8cf20c076306026f7b3138c8774965d3e2da039eeb402388f3c05bc5f719ebbac8c SHA512 84126d0480ab6946765fb94189d411dbf6324dc10360c4e170a000576441868d95ecde5524fb2ecfefe9159821f0485d885860e0cfb0d4cfd194cce2ffacf377
 MISC metadata.xml 497 BLAKE2B ce249e4bcd8f3e7eacfbe1ce27ee5fc2746173417a81dc51ea3234632e436c256bb5be663d9a8e0a514378c084a6beffda8b30112d82be96c1f6d1748f78d8a7 SHA512 539ed7d24279e0c9a23166e4c2a19326c6bbeeebc17b5d55b0ebf45621005c47bb6cd7f434a30d93c585b7444b327f9e87389f0a63cdf000ea8e13ae23625400
diff --git a/dev-python/ansicolor/ansicolor-0.2.6.ebuild b/dev-python/ansicolor/ansicolor-0.2.6.ebuild
index 11b50c6859ad..a3255104980f 100644
--- a/dev-python/ansicolor/ansicolor-0.2.6.ebuild
+++ b/dev-python/ansicolor/ansicolor-0.2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
-HOMEPAGE="https://github.com/numerodix/ansicolor"
+HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/ansicolor/ansicolor-9999.ebuild b/dev-python/ansicolor/ansicolor-9999.ebuild
index bbb99ff83a32..2977c375d9af 100644
--- a/dev-python/ansicolor/ansicolor-9999.ebuild
+++ b/dev-python/ansicolor/ansicolor-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
-HOMEPAGE="https://github.com/numerodix/ansicolor"
+HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/"
 EGIT_REPO_URI="https://github.com/numerodix/ansicolor.git"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 44b94cb31158..b2af888e458b 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,7 +1,9 @@
 DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
 DIST astroid-1.5.3.tar.gz 240617 BLAKE2B 06b040fa83327a38ea23e4b09c4ae978b5953ac99a7fec4b7fabb8982e8bb8da3e2f4781654159aec9989b4c99a119e1116622fa75bd4cac63d6a5c8b34bbf31 SHA512 2a224d9bf8e41059a1316d80738cdc0f1e4c4e0f987baf3969710bae7192466b708c7942cd7e4eeccea55582ce70bb687c96b9e7dece3229ae4cffc558aa2319
 DIST astroid-1.6.0.tar.gz 255715 BLAKE2B 60fa855779428fb984eb450afd1e6869a98f82fb06786194993a5f4c878f25417cb91ef2c2cdc12da62cbfa68e2742f8ac29cbc7b7ef295ed60201c72b562668 SHA512 6a384b2bd3b4ee686c2f9a69d10f4391e5950869d75808312b2715a620ba7caa706bd88a5e021ea2250cf16ff8013cf0b332faee0b07dd7b5e1baf11e65d0ac3
+DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014ae52e4e4b8f8209a000c55bbdbb1ddcd3fb90d078f99a34d4a4779adabc8ad71af40c3a4547fe3e0d814b328c SHA512 f51f275c9f04809c8993d187cb62fadc84003ddc954d371356474dbe6b719868406fd9188c560f5b658b8b44bb6a4d3ee0785e809e789ca117e2bcbdb58aec53
 EBUILD astroid-1.4.8.ebuild 1093 BLAKE2B 89692333f08a4c9b3b46086a20ef4e6cc186cfef6e9530b1ccd0eb6515fa74117fce8fbd1c55710323957a3f2eec57310b752e791d59a06a06926b8909d46140 SHA512 8e076be66daad2fae26351d89f3c61c6d41523ad7240c78a0e3c184fc1db634c708ca7348137d0eff11bfa20959084d7a97b0a9791caaf164c877984ebb90473
 EBUILD astroid-1.5.3.ebuild 1659 BLAKE2B 332bbb2ed4ae5a2f07e370f8f85c556cdf2a6cf486f6c261c7f18bda7f960d3de097e107b322344bc735f1eb4083461491b96cc7c36bc815aa2ed99ccb3ec0b7 SHA512 2076a3fefdc95b2f7362d5518fff0d749efba199409e51285131ea583d03135eea22a5c24907dba5b33940a80c58a8b2b04d79a69f950576fb08b9d227f1a80a
 EBUILD astroid-1.6.0.ebuild 1939 BLAKE2B c32202f279336b9d2ddebaba31f5469cc71bda427280c13950d554deafa2048f417cd4fe5eadb9a0885d62b5c53f6ce3ba8f26e14b067932ddf0cbf4d57adafe SHA512 b4e397cd08c2a326b47c3d18801975be3fe8b36de17ffe864c20eedfd1c986e0637295bbcbcb73b027be137ed690143b89ca353f347532487841d187ed427dcf
+EBUILD astroid-1.6.5.ebuild 2019 BLAKE2B f48097621e39f7acadac5035f0e300d94e632b85cae138dfbf4871d52cf9fb756a843d902c27e29ee196902ffb35faba251418fd4a4722bedf46512fe877605c SHA512 8e98ae42ae65549270b7347b85c09708c578766fbc982a6db09ce03db0b95e90336f3a3c835d51c0799c0da8781ab0dc002c30688e6ac4ba26c6254786048589
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-1.6.5.ebuild b/dev-python/astroid/astroid-1.6.5.ebuild
new file mode 100644
index 000000000000..83f26735416b
--- /dev/null
+++ b/dev-python/astroid/astroid-1.6.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*')
+		>=dev-python/pylint-1.6.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Disable failing tests
+	# TODO: investigate if it's our fault and how can we fix it
+	sed -i -e "s/test_from_imports/_&/" \
+		astroid/tests/unittest_brain.py || die
+	sed -i -e "s/test_namespace_package_pth_support/_&/" \
+		astroid/tests/unittest_manager.py || die
+	# we hack xml module, so it does not match what they expect...
+	sed -i -e "s/test_module_model/_&/" \
+		astroid/tests/unittest_object_model.py || die
+
+	# no idea why this test fails
+	sed -i -e "s/test_namespace_and_file_mismatch/_&/" \
+		astroid/tests/unittest_manager.py || die
+
+	# and this test works yet it shouldn't
+	sed -i -e "s#test_object_dunder_new_is_inferred_if_decorator#_&#" \
+		astroid/tests/unittest_inference.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
+}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 1f74ece112b7..28ecae133064 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,9 +1,11 @@
 DIST async-timeout-1.1.0.tar.gz 7590 BLAKE2B 855a630b1c1be6751ee416a9f394b93b25df7e3ebdadf1b34b6d992b643ee19ccaa4a895e66608ea0d84e10573bba90e02478964fc43c34c43ea02f1064a0b60 SHA512 7132b0616052623c17d7a541051f3e759f8dc87f9ff1730585a1010bc6e139c24d5b8835431749d695fde56fb465f22094ec3f98f5f95b0b7664ec9e1f990cac
 DIST async-timeout-1.2.0.tar.gz 7700 BLAKE2B a658cc80ba0b35d1f79286d8f6edac4aaf84e1bcef680b1ef096f6f9d14873800f948429d00fe09b26e20ab109c676fb1ca838931a83473f59863d490caf2c0e SHA512 81a8d3fd8a6756335ce7ea292afd0ba508ea120482dfc4526017dbf6ee809e6828818653be25dee123e8626fc89cc49cfbcff41748ec950b8797b2bb21f262db
 DIST async-timeout-1.2.1.tar.gz 7797 BLAKE2B d8f736423631a2b2c0fb748eb2857e0f9a143af9591ddfae15d42ab13af33196a6624db5b0a705265269ed28c6c15a4e8cfe56143ccedac75a555ae62a82891b SHA512 2072caeb65a74f1a24b59a4ea905ef96d70f8fb117e3dd9c95c1107b1d67ffaa4d76b68f00364049e6e29cdb0a6d247ba0c3638ccd0a8db27bd6ee0f180f9ccb
+DIST async-timeout-3.0.0.tar.gz 10803 BLAKE2B 3cee55e523a652c27f73bb3790d3c214f2744ef1ba3e0fe6fee80e5e4172cab808b08513d1beb99e71a36eda0a27d31fcf23e7a1ea0fb4569dc1310fef3557e6 SHA512 17df44da4d6038dcfa30b1394bcffbe9a31470c45fcd20c21da8dbea154fd2d508afafb19ce4da7f65422057e3a141be2bd9171d0a385556814759da0fb0496f
 DIST async_timeout-1.0.0.tar.gz 7554 BLAKE2B a069f79eb25c1b698f688cff482970c60197ac6f22e610fe487e33180644a197961f97e1afc7d6ba86f9250add9c7c72d386b5209b8d99e0518c137246106225 SHA512 b02fa2f9558d23e6e1cc076f8d144dcfee7adeaad67c023ce747c99935c2809e2a2223f72b0a12274f11bacadc9b69a6bc3a2914c305ef05d483dc29908e9c97
 EBUILD async_timeout-1.0.0.ebuild 645 BLAKE2B f316d11a6aaa1738bd5fd6103582cbe0114b94bac0908d1d249e89e6c9e6bacfceffbd256f60d9afdd57e525aad137798e1881eac64a66e658c540e6f89d55b8 SHA512 2e7baa4d0c31f481a7addd27a6bbb789aa70c302f45eb30571023694672215ba5c6fc8e1da3b81ff140479c9f698998d449860e0dc27b128d8c5c96a14045132
 EBUILD async_timeout-1.1.0.ebuild 692 BLAKE2B e9ddce00ffc17119e6e98edbaa5f14aedcecf887940b1586766dbca66ef1b4fb0dc0b2c3f1881e4a6e168e65aced9d3d562372df2783cdbd5b8bbf0248b19335 SHA512 e171d352b5fd194b83538fe4e229c6770b214674981cfcdfc9edae4c91fb4066c482416d7e19323035bde258db7e84326ce0b98b6dbc05e9475eb6e3ebe2f0c2
 EBUILD async_timeout-1.2.0.ebuild 684 BLAKE2B 611f2fdcf5e485c3dacd5a2cad8a08dd7a136969a0e1fd72eaaa3af63505db44c862efa88e5a57363b401398d96501ec567578fdf3a1abead4b9499940c74c5b SHA512 7018d92dc2d63324016b3c84508bbac0faab5a45bdf60d27273f0768dc8c8178c3fb1533bad2e9fd9cb0a66b8e8312421e158ddafc26cb7dd62b51a77aca04df
 EBUILD async_timeout-1.2.1.ebuild 774 BLAKE2B 24210a370d797643b8761a2355aec2149f0fb702ee645b55ba63d6e19784d35cc4fcbe3368d3c18e4f2925628845929d7ecd608a6f04df1e3f8bea7c2700c6fc SHA512 8ed85a92f4cb51697122dbcddc1373d47441c86ecf468338c61fe282f9760caf7e3de4828e4513edd15ef94d64fedbbb1599a558f96ff08fde6de57c490106f1
+EBUILD async_timeout-3.0.0.ebuild 868 BLAKE2B d6d9ce869e2bb8b88ef5b1b4b8c32133b6101912f3cca3a24434edbac5aaae260407801dcfdd06e550afcec2341f4898c7f0b95203840b36a8b52bdbaa14da42 SHA512 3f24a217e9fb90aa59abcaa2b94412b54de83a22419db8828e0b8fb6ae5a2d65f23268ae9904c5718f2392ef0677ccf4dacd2de84b7487308537852841ddcb83
 MISC metadata.xml 356 BLAKE2B 77e8b06ea11139e57100ce9de95f8f452a3ea036f5dd7556e0bded549639dbad3a534c37dea0a30bebb329fab4f8f8f36d637eb1aa630ca756c009492f01b0ca SHA512 efb996fac98f1e12c041fc6828732ec61f5e85f7d4762faf7387a0a0f59c60b64ffdb0b0c4d29f2f9f8c125f30b1462650be1bb13b09aca70e555c139fb6316d
diff --git a/dev-python/async_timeout/async_timeout-3.0.0.ebuild b/dev-python/async_timeout/async_timeout-3.0.0.ebuild
new file mode 100644
index 000000000000..d68d5e46bf95
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-3.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i "s:, 'pytest-runner'::" -i setup.py || die
+	# tests fail due to missing fixture when trying to load this file
+	rm tests/conftest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index cd1577d527c9..9595c3de9f5b 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -3,5 +3,5 @@ DIST atomicwrites-0.1.9.tar.gz 14475 BLAKE2B 68d69493b892e1c02a71ebaaf4a73919181
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 EBUILD atomicwrites-0.1.8.ebuild 430 BLAKE2B c6c424f1ec9a05b798a852b752a5abbcf64ff592db7fa435d18c80436adf124349760fdcbc94b5a51e380e01485aa7787e957453a1f431c95a76c3ff3f152faf SHA512 a08b5e18d5a6f1b4bb3bb2dbf75673928785374ea258e760c5e621a197d650ba7c3c84ec08eb861adaa333e3853b777f39f228184c5eaecea09e1e95211bf9cb
 EBUILD atomicwrites-0.1.9.ebuild 430 BLAKE2B 50f43c7dfa4a9daa18b13c66bdd8f74815e749fa52ae7373effbc0847f397691b16d9c8023c71684e56b6a9a6dac5a27406e145e09c813abba68729fb6f585e6 SHA512 5e3651c03d05495bf92900f4d56327ba464266bae929b8cfbfb39d5734dcd0eaa699314b26bc5e428d6e993f349509c05d5d4c109d39f11ed7cbc6dba7085445
-EBUILD atomicwrites-1.1.5-r2.ebuild 571 BLAKE2B 757553e486c6c83ac380c706ab793e1f9d6a639c72d99701106b5f00e38f2600c90a05376400bc4d85220bca3802f7c5386a54e4d34d6916a7b4c9bd4847f76e SHA512 8b464fbf29b83a168ba0e4db734c01202229fa916ca5ed3b1ebf7bb8f92572a6eb3b5cbee44e03ae7faa531b88c851cba9066da6d9e3bdfd8aadbe1550cc445d
+EBUILD atomicwrites-1.1.5-r2.ebuild 578 BLAKE2B ad9188acc6f21a3352510d2efae465d010e763f21f45d6604979b4a48da0e77817746037f8472bc86bdd034163e0c75da40a56784eb0e979e856b5dc86d8eeb0 SHA512 1af57e581631a2cda8f7ee9de709bbd2abb1475d5f25331d9fa2683e5b75892f897e68f092f96b5ffe522a5d2b1966aca0a81a37fe80c38f08b9599d63d2b715
 MISC metadata.xml 361 BLAKE2B 6da7694cc6f2418e0cc27b713e2bd0dc96c50177b3c57b9f6b1fbe3c329ced0e995406086077e9303bad0ccef4a33c4fae06b3ce82dc954f0fc2d2c303aebf83 SHA512 133ca39503eb471d6391e849430c41ab9ca2ae66c367f8843b221ea2e5535967ca4a09cf94364558f65d61f8a6ffd43a98af0f8a70f4c46a46936b83a0d18f59
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
index e965e08ed393..e8df8bc048ad 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index cf322942d39c..8d5d91a15a12 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,7 +1,7 @@
 DIST backports.lzma-0.0.10.tar.gz 37242 BLAKE2B 42ee440437379aae9a5d4708d8766300143651f932a63b54e3c4153d48e02843cfd45ce2d60baefcda1f10465f8b982b6883a6047a146d14858f32f5ab9c9485 SHA512 72814ea262ec3916e6a44a571ffa2fb3316e7238a84649232849e378f720132157f5747dbbce659e7144e53e62a84bb41e419ae6d9b8f5daf10ced372b1bf9d5
 DIST backports.lzma-0.0.6.tar.gz 34475 BLAKE2B 9249684972b2496cfc5652d4dea5d03e0cf14fbef4a6f617111210e0125d0f455db2b80cdad5640ad71d04fe23fa292ea50a2083125daae5023512e577553683 SHA512 6196e64e81c2427d07844dab984113021ae97ba9d0c136cfd20b7213cdb8cda8b9a2643c8df21c799d338031cd49d4cbfd7f9ba9c30efd6cd28e63e8772a032b
 DIST backports.lzma-0.0.8.tar.gz 36111 BLAKE2B 1acbe9628f740f067068cc07105abe2a161bd2ebc712f1967c54d814abfa432cf5394167cc7adfcde49cc54adecb792a84e91ae810ad150ef38a22b2e79f9440 SHA512 bc5e7672a0ac53b7cf97ea52a566e96d92a3dd334a8321699585225e32ad7c723b4ffd6e4b153bd2ae3ead2a2cd6a48678b915257de4952ddca8389032db48ad
-EBUILD backports-lzma-0.0.10.ebuild 1052 BLAKE2B 6c7b21fceddfc4adef4c0d049f9831805dd276d8745fb7356cd7cf1cefefc5d3a5ea95425af7368f83a33ed364a604bb515fc8446f71a6a6281a80ca8ff7d1c4 SHA512 829ce1b99d73efa43d31befa6b0c3597e19df3c52263338404cbae7c44154e754c3a5d91485f2a676df7f681f111afd3eaba20cefe05882aeec606b31181ebe6
+EBUILD backports-lzma-0.0.10.ebuild 1062 BLAKE2B ec9f1098227b03c7f5e36cf72d4c8335b49ce303fab5c2565a6d774ac39db3b8c38f175f80d8112b899cf039bc306becc697a31e8b6f4f20d84e118a31643df3 SHA512 14b20fa4cced41aff591d4e4b4a1e665e082e73c45f2aaee833817e18cd397b824886fa1cec2988f2120bfe9085c0b2205e93e552c905f0506abf0ac262cbe78
 EBUILD backports-lzma-0.0.6.ebuild 926 BLAKE2B 3c29b59fe3f659d420639fa56aa088dd7b29db6d5b2c4d9cd08ba53e461d43d89b24b3adf2122c4d597652b969ba1761f994e1cbed002e316dc35530069fec29 SHA512 4629c3a799b952fc88514e29a914646f68fab7bd769e0388f61d83ac34c431f1697693451a6a9d5005ceeae5c0f7aae90bab626a3d2b0b5decf05df64dc0f1d3
 EBUILD backports-lzma-0.0.8.ebuild 988 BLAKE2B 83ab5fa06671e50121a0e298390a6591213373c8be7b6aa2457a92369cc7ec78d682de94e57f0adebf3ddcdeebffd4c18b7301dae9553df740884cfda29b7b47 SHA512 a1cf09b544f3ea5290469183c0786050d392139533d27ef49748a724ca7494708300d6d4f98bcc7dbbe5b5ccd8b30938c9cecf7ea27b0d3c51e4241e1821795a
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index 6690146c6026..6ce2705754b4 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND="app-arch/xz-utils:0=
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 324bf9966797..73360a731a99 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -2,5 +2,5 @@ DIST backports.unittest_mock-1.2.1.tar.gz 4580 BLAKE2B c935c378bae1f39e0658f4be0
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 EBUILD backports-unittest-mock-1.2.1-r1.ebuild 1339 BLAKE2B f0a6911f9dbebcbd66a247be1cf6f5e9231967d3efb2d48b44545efe8eef3cf8b7f268785bbd3f26c9f6c3a17c4a4a6629c1424ab16a65615b831a39ee3a1096 SHA512 8359a38b4848aa8f25e12fd573964a9e924142665d160a03e65c5113b7998e99bc0d74542d3c4231f1b240dd1d88899c15a146b74b7eab89c0d5e55f48cbb4ba
 EBUILD backports-unittest-mock-1.2.1.ebuild 1227 BLAKE2B fcc6f659db7bad1f15d564693a40ec95cbff67ec8031dbe29923d62de7907fc71ccbc914f219cecb6b271750e29fcc10b3414a022e91b0d85f7d5fc55a0fa944 SHA512 682fd1d5f7ea37c91328657dd06b89e72d88fc6109b7da3b05f4c08d115389e81e67a8e988cbc7e81258d771159cc4134d44d18234c4f6d756fe09dc8a37e122
-EBUILD backports-unittest-mock-1.3.ebuild 1471 BLAKE2B 7e8f28777e621ea644c1d0933b4f9099f690accdf76971b530bed573f34c1dcb2c73f71d4af1344f046accc25e7dcbdabf5d8443eda6f47f0f2d6f6cc2d8291c SHA512 3d479c600d77c66f585b2418e873763d224a749ac308fc8129f026403a73b2169da6ffe0165716e9969d887edc98cb295ed5ce18ed5606b77ac5f2087b12a899
+EBUILD backports-unittest-mock-1.3.ebuild 1484 BLAKE2B a911092d905b3f6bab21065e8ba42ef79dc6dfc108f6a01001008c8833b2702a2293fbfcd30ee1ff5b5d26b43c9c2644f95b2f70fa09089c96faad6c66f5b416 SHA512 de31da2c1dbf0da81073e848a42045ef58d13363f000b85fce8c96a726de0c976de8d84abd54cad23f525c657813edc1d5b87d72d9cea35287353e8cb7091ec0
 MISC metadata.xml 781 BLAKE2B aff7aaa5943839e993ceef3e238e22743640f92b5b2b1f3d7d18585cb0462132b3c77c9c61c91e891ba1f07ce10fbfa5dd4a3b1448e2349f81c328ad5e382477 SHA512 39fe208234be2f84da6f615e4b49ccf1e7673c44b9bd305271764b955ee89a2543e69e557ba145e6798573ce6566235d70a7ba115bac6428d670617c25d29f49
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
index cf50959e8612..ff94ba6873a8 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index 4dbf8c71cf68..47aae2f1c2e4 100644
--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@@ -1,3 +1,3 @@
 DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
-EBUILD backports-1.0.ebuild 608 BLAKE2B 90bea6a81c57a21975147738088b9dce0bc81ad359df1f3adda5951ca1c6d1989028d6c7fa02705aa869a0324b6a5d7e11158279be0f4fb8fd09134b2224098f SHA512 c610d921068dd80768cf51bf841870195bcdc22e827a8c6dbd15a1454fb861b93960eedf39f2b1f425357287755e3c7aecb8afed01a27daf1ac38018a0f76592
+EBUILD backports-1.0.ebuild 621 BLAKE2B 12d52a0b3cf6dcf5aa7de9702723fc36c1a5c7e7198c477712448905ad365ddc469b00628cc0e01e56093b293e684553b87ea945c227dd3975cec38af81c18d0 SHA512 d41c02868ee1c8beaf20fc82787e38772f5a915805b734b4a85766be17898dcdca4d405cb17ec943e27ad9564dcfdb3cc2154603a201c4b8087819ac0e30a837
 MISC metadata.xml 335 BLAKE2B cd3125c95ede34cf51567293406cfb3b489874a7a2fd594e157c9167fa2b3d0cc5a4eea670851a648ed81100f0ccb246ea64d316b432d516219f61c02425feb2 SHA512 d0432bc56a1e591a0f699d61f2195872cb62e591027212cba00a127c89d9a2c29a54da495436233ad93c3868f98b184c73da9057be26ce9abada2516be518e30
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index f24a0fd50a3a..3859037d5e64 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
index 058ad3f8333f..c20d647c347b 100644
--- a/dev-python/beaker/Manifest
+++ b/dev-python/beaker/Manifest
@@ -1,5 +1,5 @@
 DIST Beaker-1.6.4.tar.gz 54480 BLAKE2B 809b2d23fb95a21ab442b3be20ff5372630697baaf507fd26d8aefabeed422401de890c8de165a079bde4a05230cea244a8d5bf31b8b89e60a88b840de9cdedf SHA512 5a6835d01d0b1bee57844525f1223d74edd26f07cc769df6a8cfa77f44dda4435eb96639175928a1caf7c4f927ac3a674c0fd0e7f50f1aea91da7880de3a6704
 DIST beaker-1.8.1.tar.gz 80541 BLAKE2B b60ba47a41f5f039699324dcb403d99cbf3d7e7cdbf593e275e1d41e6abc86dc829fd9a582b80e6274d6459624218585239b1b623e70636e2a1d736c584ce245 SHA512 bd9c4a4bbf21749a59c50ffff1d1dbff8bc9116394f79924efc6be637fb8c1ffef91a8363da3375bffdcb0ba291b71b57f75303f3fbe111e8670a390058e9fa5
 EBUILD beaker-1.6.4-r1.ebuild 1279 BLAKE2B 21ee7eccb3f54aa1b033b8e63168338493b605fb63760cfc0bc0f3fe6511bdd3c551cf4184f6780b3a70b0887947e6bcfc73c5fb10a2d46d5c1121b3859ba15f SHA512 08ad13c4fa1c65ce293c3dbb0d03261d5012b568d3f2bad43ac9c584b29f9f4661961074f6934468de7ca1d4015e6739f896ed912fa77d0b908f9f7020b3bd15
-EBUILD beaker-1.8.1.ebuild 1341 BLAKE2B a5f6e479cd21ecbdcaaad07ddf574b143039c18580a746dd3561631e9a9b7450b6129cd4e928d33099c029dda9edbe3b2044c1fee5887151147dce293ae22814 SHA512 ce884b58f5cba65dd63319009263640895bee34935ebdaab69dfcf4fb3197e389fc53ddc5655840d5e955d61ab272ff5f7e17fefb5443ec05c64a44f95f7a6fb
+EBUILD beaker-1.8.1.ebuild 1340 BLAKE2B 9b1f772f3071af7301ba9b3d86a4d1a6e9e5dc7921c0b0f5644a9a25f19e04ec7202c306782a9c89535d303a6e873b99f7ce293b9e0a910aa07cae2a75732933 SHA512 e2c236eca6410bbdeb8f88cb6eb6af882a2cda88c2a5985a5a9784bb5cfbe6c104d44562f2519910194718242de1ace3b1e664095e0535b1b75c25cd1bea38d2
 MISC metadata.xml 376 BLAKE2B 5cb61bb094fd8e020b5e83aedd79fa283143e9156935fbb3d6666186b81a17d544634349ff10b50bd9568895eddf54dcdb2c304a4fd6fe51bb37931cbb181074 SHA512 09586c7ae4aa5259c0776ef77713538e8b8dc730da802d95b3de5501aa6c88c96c1967740ff77a124821bbd93b13e9547879f452d46325916237aeaddf58c353
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
index cca16d99a4c6..b8f86bf2609e 100644
--- a/dev-python/beaker/beaker-1.8.1.ebuild
+++ b/dev-python/beaker/beaker-1.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="virtual/python-funcsigs[${PYTHON_USEDEP}]"
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 3cadac7bae50..be409d821329 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,3 +1,3 @@
 DIST betamax-0.8.0.tar.gz 78398 BLAKE2B cc9546eb028343621ef47a9cb7992f1d3eef4a2b6837cc8b670ff7d0313020def203ff06bf1e21c2d4ef26932df65e71562110b14bf27fc5c1a6ca3ba9023f54 SHA512 52b330747b6add52390b50dd63c05851adc01ccd238fdb5c3401efdfc26be363a3f61145dc0e1f3cc43ff520e1457e33fa47952d2929c7c3e12c3e2612621f95
-EBUILD betamax-0.8.0.ebuild 750 BLAKE2B 6b4c7c5de34b6f6ed16b92ed48381e9e494d9045483b17917c37c391a568d27128c3198fb8863f73f71474495374c9fdbba78e45ac8415173190a4ca2f4118fc SHA512 2c52ed1a4b4055ae33e2eb2741e91ea41dc680f375d2ad9730a8559b49bf2981b9ce3ec2b3a018bf7f7459e5dbce49045f20885c114a77ebc526da5f016607c4
+EBUILD betamax-0.8.0.ebuild 762 BLAKE2B 8ead9b55cfca551bcd9990d93b698904f48896f6bc17f7888199a09a6faaac679dbe4fdc9795eff4798976d370518d7c8d8304da7b3f7d671e22f4aa0e820a14 SHA512 e38f1783a7a5defd207544343f700912fe6b325aaa98ee54d608acb0032ea756b7d401787f0c27e54957eb27c1b4bc8ab1bc2e44c8cfc7d1efab02a5a3db7459
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.0.ebuild b/dev-python/betamax/betamax-0.8.0.ebuild
index f66e5666a2c2..e5be7c43646c 100644
--- a/dev-python/betamax/betamax-0.8.0.ebuild
+++ b/dev-python/betamax/betamax-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
index 807c46fa665b..d7ef7a56ba36 100644
--- a/dev-python/bz2file/Manifest
+++ b/dev-python/bz2file/Manifest
@@ -1,3 +1,3 @@
 DIST bz2file-0.98.tar.gz 11333 BLAKE2B 4ec4687f609521a637c20a512b544cd99d7c334f7cffaeff71d2a893eefe131a10bd548b9f1e829c899cdcf181f5e877e092cf08d709bb3f1ba9901d3386b3e6 SHA512 2d28e71fe71b5fea4008d65a1fa91d5c6fafcacc09f891c5deaaa985661576bd97f2e33fe9f8c5943841f09c153f2079a2511329c066e57c775fb0b089b30b20
-EBUILD bz2file-0.98.ebuild 599 BLAKE2B 52f98b7e367ae4e42a7cda14bebef8a26d8bfc8c7cf00d6811044faf3509bfd8d1acad5c9ad864020d31f4289bbd0280795b1d3fb1f70a9b2720d166e43d837f SHA512 4b0805c35377fa4b95451a6cb6977dba8333ab20d9e3784044cbac6f31bb4050d60a15e5d451e4ffe18d409c9b051e248686c462c88e3b8b7674025b7ce631cb
+EBUILD bz2file-0.98.ebuild 603 BLAKE2B fd1476b8d94e3d33b21439204d30861d0d06f5aaf53196527be2c12c16401719e000937ec4593f18bd777aa37bbf15f779e418303e12fc0eb79ec36d08f7c3e2 SHA512 e50e6f80030e6091b7e4b94019edf5fd2f092fb43b04933fa7d8f3427ed0ed1bb6ff1a6f61ef2c328d3ee56182f111f94fb8662f34781eb4ab1a674ab397d44e
 MISC metadata.xml 342 BLAKE2B 8cd4d551724a069a3668b91bb8218576e23cec6c450baab71b70868670d673d51bc11952b7f077aeb76493cdee5ba20ee4175d091e5ccb995fe3624e3772901e SHA512 e511170e43873344d2652837b823c3207a8da885487abe5bff9a90e0807ae4a7736170759e8e9772957cfb52a9d81e436f19f4327636d411f0f9d73ab31a9d2d
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index ab45b80e96a1..89d778e690e8 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 6bf98c5f9db5..35eb3efa230f 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,9 +1,5 @@
-DIST cached-property-0.1.5.tar.gz 7434 BLAKE2B 2bd21004e896335044a3d1c08840a781cca62736b45bd3e51152e4a28a546ef7e64cffd070e55b13e8b8cef5b31895840d737bd1d00ad0c991ffa9e324d0940d SHA512 f5a01e64eed78cc3377bd053b0662dc4f904db7c1ea47b155e1613e6ed413fb6693e4893916518f9e53589373ebe099724d296306a9854d8d8df66b62ed9ce1b
-DIST cached-property-1.0.0.tar.gz 8210 BLAKE2B 56dd60787b0ba0b5398142d755dd62e49935d06a6523bfa221a8d022c60838604035862e454182e093289fcc366e2f30e321a585fb07bea7a4c55b619d1d7bd9 SHA512 771615418853d3a2a24567fa3f6dc931a02d0013abd38c26a2822cc0ab3228972e7f03e51a69478defc617491f81b76040d34a0e6683719b09b485c85196d948
-DIST cached-property-1.2.0.tar.gz 9162 BLAKE2B f064573001745872b9d0a7e6bfadfc203c36328dfd1a85ba310c1da517cb45fd166c49cb809a726d663659318a3c7120bca017a6f674aef5f98ec7630429bfe0 SHA512 0d05bad187d30b4354d8fa93d181d753c6e27e43a84891bd3bcc1c1449fe6d57d7fc1eecdbdc097f8c25e4cfa331811db5a6e23f77891848edc2817162259cd6
 DIST cached-property-1.3.1.tar.gz 9648 BLAKE2B 154208108cfbec914519f2a08ecc6ad025c284726d65a001eae84701b1eb8479e127473c124b08d3b0d969f59798f9dcef473cd8209c248b1d5b016a0bc8dac6 SHA512 3349751d442ca6e7d4e792c8b076735d5308d68244af9c03044f3d72d619a5c3d7d5dbef434caa954db4b983245bfe646d4a25c99aec39f32d99751edd9e233f
-EBUILD cached-property-0.1.5.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
-EBUILD cached-property-1.0.0.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
-EBUILD cached-property-1.2.0.ebuild 591 BLAKE2B b122a31a43bae62ca9eb7fce6abdb40cd916ecb295c421a1b53cb1017cf35e9f19b9394142ebd83dcd074b46498e474a77f6ce30c983c5c6670dd7e671843bdb SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98
+DIST cached-property-1.4.2.tar.gz 11201 BLAKE2B 1fba572e8e4e06744b230994e19a93f9004c0e2584549af2b001cf780222cbd2196b09432301f1ef8b4c4ccc93f8dedf53113c541b1189bc005c79fa9d7dadc0 SHA512 27ce49c8b71f0337e34c36ef5a45cae273a62b42c8f1b690c2c4d32d9bdf7f532a12787c99257c956ac7ff15d2e7f16868e4cebdf1417ebca493e1037c1a612f
 EBUILD cached-property-1.3.1.ebuild 625 BLAKE2B d05f358db313bb62e8e6af7733fbeb9bb378db4ebe34be8d2c44da08147aed09567c8dea352c93ee3a94ca6ac52733b19c5ddfaa119795d9f515c1b9a0972093 SHA512 8b408e180af71d702e053ee0e56327eeae8843ca3b75e15b71d41997a428ce63c59f04e74e59edd93f4898e99280f39dd5f37ef1c64ae8e30d33404a22802547
+EBUILD cached-property-1.4.2.ebuild 911 BLAKE2B 252e6b963254b1e48cd328adc04bf344f2916145ff9138f15d780e8196215feabbd3ed524a2d26922fdeae5d20c1011633c11087f0096ad81c0afc45e7946361 SHA512 442dcfa206d8f8b06bdef561723ec280692f7e6cfd35dca8d36335687a7b9668b84acaa9a034d5c24cd2d2c4f7836fb64197d6ab8faad80c04fbdec8daca2416
 MISC metadata.xml 489 BLAKE2B 36f59b8764462acd2920868cc5b5c84e27cf2e86b1356a76a816ec60a5f69bda780a62a811aefe06639827bdc3257128cded2d6c2e53e8c4516af9d1b9769879 SHA512 cecc6d43fcd54d1a949a60380d91a313d0464e0858be0fd544a76232f04961eca2530ebddaf6daabc5f050bdfe12092c99028c4a9cd33a14f23c0b43befe7def
diff --git a/dev-python/cached-property/cached-property-0.1.5.ebuild b/dev-python/cached-property/cached-property-0.1.5.ebuild
deleted file mode 100644
index b8d189a859a6..000000000000
--- a/dev-python/cached-property/cached-property-0.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A cached-property for decorating methods in classes"
-HOMEPAGE="https://github.com/pydanny/cached-property"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest )"
-RDEPEND=""
-
-src_install() {
-	distutils-r1_src_install
-	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/cached-property/cached-property-1.0.0.ebuild b/dev-python/cached-property/cached-property-1.0.0.ebuild
deleted file mode 100644
index b8d189a859a6..000000000000
--- a/dev-python/cached-property/cached-property-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A cached-property for decorating methods in classes"
-HOMEPAGE="https://github.com/pydanny/cached-property"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest )"
-RDEPEND=""
-
-src_install() {
-	distutils-r1_src_install
-	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/cached-property/cached-property-1.2.0.ebuild b/dev-python/cached-property/cached-property-1.2.0.ebuild
deleted file mode 100644
index b8d189a859a6..000000000000
--- a/dev-python/cached-property/cached-property-1.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A cached-property for decorating methods in classes"
-HOMEPAGE="https://github.com/pydanny/cached-property"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest )"
-RDEPEND=""
-
-src_install() {
-	distutils-r1_src_install
-	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/cached-property/cached-property-1.4.2.ebuild b/dev-python/cached-property/cached-property-1.4.2.ebuild
new file mode 100644
index 000000000000..3b54319a6d39
--- /dev/null
+++ b/dev-python/cached-property/cached-property-1.4.2.ebuild
@@ -0,0 +1,39 @@
+# 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 distutils-r1
+
+DESCRIPTION="A cached-property for decorating methods in classes"
+HOMEPAGE="https://github.com/pydanny/cached-property"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/pytest
+		dev-python/freezegun
+		)"
+RDEPEND=""
+
+src_install() {
+	distutils-r1_src_install
+	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
+}
+
+python_test() {
+	local ignore=""
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		ignore="--ignore=tests/test_coroutine_cached_property.py \
+			--ignore=tests/test_async_cached_property.py"
+	fi
+	if [[ ${EPYTHON} == python3.4 ]]; then
+		ignore="--ignore=test_async_cached_property.py"
+	fi
+	py.test -v ${ignore} tests/ || die
+}
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 09c44199485f..740a72f99058 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -7,7 +7,7 @@ DIST certifi-2017.7.27.1.tar.gz 348217 BLAKE2B 5c3531b0537df743010c5969c88fc40eb
 DIST certifi-2018.1.18.tar.gz 151258 BLAKE2B f3d324d728dbfa46b9473340c894faae381ad8f8d1ab17cf021b9b00bb893fc44c6ccd8fa69bd4d9bb7580cf3bb16c6d9c1c31e727290bc065cf0934e7d30122 SHA512 5a419fcd6ad2dc095e126bcff40127b4549cc0556e19157b142c6f27b284448eb3124fb92a72b147d6734d9f3ff212212dcbf364e127c2691ab94a9736cee032
 DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682
 EBUILD certifi-2016.9.26.ebuild 721 BLAKE2B 391aa460016d7d1a70cfa403ee152d8e52950d38529ba55991539626adc7d93af2aca76189a8f018e7b06e71d384b076404422e678f964c2ee64fe5bfea27ca7 SHA512 4b23928489c1146904a41fd28ffa4d60675c38cfca92063d84748d1fe4359efde6998a7919ee6cacc6c00e542b5260831703247f30e0392e3eca69e69155648f
-EBUILD certifi-2017.1.23.ebuild 737 BLAKE2B 4a5ad82f9a89b0fc7ea24f05a72f8d298f33f990f53eaa4ca0e36a499873a50716fd65d507d86794358217de86c084242a1a24fe4ae4039f6068fa2fb2c0b620 SHA512 ee9a2870a6504611a518bc86b9dcdd296ef2f369a8261c82f05c3e4d47de92c2ea2db93b9331a8f4eb66c1ba379545da30a735691e58c1aa73f8fb9deab20003
+EBUILD certifi-2017.1.23.ebuild 733 BLAKE2B cf5b9f064b89763ffad166f0edc94ffa1d683eee7d22fd2a6892c770038c40eee32332b6c61ff57e5cd42a1bb842a54e49e9b434e49160a77248115e01e54c93 SHA512 51140472f336d9cef4030ed5e26badcccdec2362de0074e07da6de5ce3e6ed72c1efa8502806130060f111ca5b67d206c44e00ee248625a0275a365236744841
 EBUILD certifi-2017.11.5.ebuild 745 BLAKE2B c067c15c4e240e20d9d592bb3352aa470928d70b779d87ea37af2ef798dbaabdc8b6ba808d53d2cc7ec471b8063e0e200cb6b30c53465bef4867d0783503f789 SHA512 306df9d0c88d47f995e8858da82f541fc9015d9271fb90527fbb7a5c4f0fe5ddb9ef3c5aeb32b8cd848749c2599e828f0e6dcbd6056791d8a1391ee9b1ebe87c
 EBUILD certifi-2017.4.17.ebuild 733 BLAKE2B cf5b9f064b89763ffad166f0edc94ffa1d683eee7d22fd2a6892c770038c40eee32332b6c61ff57e5cd42a1bb842a54e49e9b434e49160a77248115e01e54c93 SHA512 51140472f336d9cef4030ed5e26badcccdec2362de0074e07da6de5ce3e6ed72c1efa8502806130060f111ca5b67d206c44e00ee248625a0275a365236744841
 EBUILD certifi-2017.7.27.1.ebuild 745 BLAKE2B c067c15c4e240e20d9d592bb3352aa470928d70b779d87ea37af2ef798dbaabdc8b6ba808d53d2cc7ec471b8063e0e200cb6b30c53465bef4867d0783503f789 SHA512 306df9d0c88d47f995e8858da82f541fc9015d9271fb90527fbb7a5c4f0fe5ddb9ef3c5aeb32b8cd848749c2599e828f0e6dcbd6056791d8a1391ee9b1ebe87c
diff --git a/dev-python/certifi/certifi-2017.1.23.ebuild b/dev-python/certifi/certifi-2017.1.23.ebuild
index 04cacf5f1bef..940c7adbb812 100644
--- a/dev-python/certifi/certifi-2017.1.23.ebuild
+++ b/dev-python/certifi/certifi-2017.1.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="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 ~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=""
 
 RDEPEND=""
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
new file mode 100644
index 000000000000..62f2a6aa269c
--- /dev/null
+++ b/dev-python/cjkwrap/Manifest
@@ -0,0 +1,3 @@
+DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
+EBUILD cjkwrap-2.2.ebuild 483 BLAKE2B 85ea8fad51f42527b8f798f4a2394d0ed78ea7dc849050b505e36e5c8a49da8b9cb7ac6abf6d5a2bf28c0d8713a113a69ec2f17710b5a950d92ce94b3aad0ca3 SHA512 becf214b7c346058133d881b6a10f55b7184b3b5de823b61af83e1a6d04f3910c84d3401aaabd8ac900d767376fae867f349c5980542ef682ea13b3f288fdb7d
+MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/dev-python/cjkwrap/cjkwrap-2.2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
new file mode 100644
index 000000000000..eb8e12a506b4
--- /dev/null
+++ b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
@@ -0,0 +1,18 @@
+# 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
+
+DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
+HOMEPAGE="https://fgallaire.github.io/cjkwrap/"
+SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cjkwrap/metadata.xml b/dev-python/cjkwrap/metadata.xml
new file mode 100644
index 000000000000..d9a6217dd22d
--- /dev/null
+++ b/dev-python/cjkwrap/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>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 980c9a6b870a..ca4a63bdfc01 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,8 +4,8 @@ DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252
 DIST cfe-6.0.0.src.tar.xz 11959224 BLAKE2B 257edbaedf72bd941b67b4aa2f152a96a37bbea72d21d22d4445152685efe40d75b9a7a39955545643e841ad6693ef12e52b207b9119098774f39e858b64bc09 SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.1.ebuild 1018 BLAKE2B 84acc3e37c530b17f6d4b21bd6ef519cb8cf960efaab0d3241736f3bc6d8c28d0e5764e76b2d7e4becd024b3ae6662c3fa125e0a2baa9a28c05b157460839e22 SHA512 adc39f63cb3b8edebd2344e35b325cc006b29f524d7e20b2cc6a44476595bc873733bc776fab50584c1b30700e2a51cbeaed13531b6032e5ff244d856a06f1ba
-EBUILD clang-python-5.0.2.ebuild 1018 BLAKE2B 84acc3e37c530b17f6d4b21bd6ef519cb8cf960efaab0d3241736f3bc6d8c28d0e5764e76b2d7e4becd024b3ae6662c3fa125e0a2baa9a28c05b157460839e22 SHA512 adc39f63cb3b8edebd2344e35b325cc006b29f524d7e20b2cc6a44476595bc873733bc776fab50584c1b30700e2a51cbeaed13531b6032e5ff244d856a06f1ba
-EBUILD clang-python-6.0.0.ebuild 1030 BLAKE2B 4834b29da99ecd2a734721c1ebc4765b43cf97f3a0309aee30c571503da3d3bac5305e63507654c8264486efab9a3088d3fe31f3482417c46bf8a53996943bca SHA512 60ded9673ce4be56726652e570616e1bb8f09b948482657794526a07fb233ec61355fb25b895226ee40e2789cdde65995a70cdfaa6f509e6f5e4ca5d2187d4b9
-EBUILD clang-python-6.0.9999.ebuild 988 BLAKE2B f83893a8d12607cac36cb8963205d7104864e4b7e644856c619d483739b530e00ac1b4de96bcf6cb312180a2e7bb47f7a0c8dcae32bb06e8ca5e55a53927fdff SHA512 eff745749f8a606b584f359ed6f68b2dd18f2192b1bc6ea0e6337dea6f35240c8f9ea2304039a638c549bf60c28470134e0fa580b3daeaee592bfc13ff3e2ed7
-EBUILD clang-python-9999.ebuild 963 BLAKE2B 1a6d55304c90f7e01c10321401490bcc88be4672d1c28e1eb1759ba42179a495b7d5a46b552af46ed310e20df48df4746b89e9b8e64269846f7131775f4c61f0 SHA512 d1e933646aa6069c5140b490c7070ddc2d41698b92052793d51339dfd622ed2e7624bd23bffded5d6cd9d72a329eaa1e3318618a55cb557c53cbe511c409e685
+EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
+EBUILD clang-python-6.0.0.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
+EBUILD clang-python-6.0.9999.ebuild 1055 BLAKE2B db471ac4f051b76629a69cebda0144090697cca1c1ddc28d9119c7f3c5e6fe11f6333c3c34f314d5c4007637b809dbf1d7414fd179b7219757f01b4c613c24d5 SHA512 47158aa7588bb0e923e1984be9ab32006f22b260e8ceba58972bf4c40b1c203c04e93507f06b174585bd5cc2a62f8bbd9c7ced9eeb8c7b1d3c7f46427d48507c
+EBUILD clang-python-9999.ebuild 1030 BLAKE2B 4152729630f6822b4a22e1ec754bf99833951c49e94eb55583ea8d3b2dedd957b435dfc3e24bd8adbd9f12a02161fcd5a16962165f9ec592469a4716820332af SHA512 5889e98300f26a540c93017e72b76232b2c9c871be3bb39c248d30a88316d44114fd1d7545acc0963ccdb4d15dc55f70fa8f30825cccfba69b33ef90e3d73401
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-5.0.2.ebuild b/dev-python/clang-python/clang-python-5.0.2.ebuild
index f60acf5217fa..4331a4a3bf5f 100644
--- a/dev-python/clang-python/clang-python-5.0.2.ebuild
+++ b/dev-python/clang-python/clang-python-5.0.2.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
@@ -34,8 +34,12 @@ src_unpack() {
 	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
 }
 
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
 src_test() {
-	python_foreach_impl nosetests -v || die
+	python_foreach_impl python_test
 }
 
 src_install() {
diff --git a/dev-python/clang-python/clang-python-6.0.0.ebuild b/dev-python/clang-python/clang-python-6.0.0.ebuild
index 6abf574e9b93..5d6eaf45c6cd 100644
--- a/dev-python/clang-python/clang-python-6.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-6.0.0.ebuild
@@ -34,8 +34,12 @@ src_unpack() {
 	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
 }
 
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
 src_test() {
-	python_foreach_impl python -m unittest discover -v || die
+	python_foreach_impl python_test
 }
 
 src_install() {
diff --git a/dev-python/clang-python/clang-python-6.0.9999.ebuild b/dev-python/clang-python/clang-python-6.0.9999.ebuild
index e0aa3318ebd9..89b1f72d475d 100644
--- a/dev-python/clang-python/clang-python-6.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-6.0.9999.ebuild
@@ -36,8 +36,12 @@ src_unpack() {
 	git-r3_checkout '' '' '' bindings/python
 }
 
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
 src_test() {
-	python_foreach_impl python -m unittest discover -v || die
+	python_foreach_impl python_test
 }
 
 src_install() {
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index 0e636d4e4c11..cf488945799b 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-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
@@ -35,8 +35,12 @@ src_unpack() {
 	git-r3_checkout '' '' '' bindings/python
 }
 
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
 src_test() {
-	python_foreach_impl python -m unittest discover -v || die
+	python_foreach_impl python_test
 }
 
 src_install() {
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index e5cd14c56663..5f5abd316330 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,3 @@
 DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
-EBUILD coverage-4.2.ebuild 1246 BLAKE2B f5c0ca2f18cf1ac68c0117148c03cb0550c1d420c674d6c08f0ae67dd1826786d4982e6ecfbf091c54a519a2fa43f4ffd3a565a29c82cf1f90af020f30324e60 SHA512 14f13faa7ff89f5a0f3305935f6b09072526bd5394ab7fbcdbd75eea290e46efe37e1a1ab7b177c90c80be15e035b67568ae1ed731edfae508654119641275bc
+EBUILD coverage-4.2.ebuild 1245 BLAKE2B 9146f844ef6f4853d6e2ec957d202dde1194dc33fcc0d1ac8de8dd97943cff87689f17e00902bca4e3b2cd0d7ad82edc2cfc45ad8db5a318f94e93cab312666d SHA512 d2833e62f9df13113d452e1aa9571d41d3583c99aabeb2e9d146abaaf6dc6e9e1bd9dbc2c2e6fa5f764300e120644b622ca5839644ae27ee8a1059c0a9dcba36
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
index 440ff89bb4f1..8a9e19b43af3 100644
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~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-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index ed0337e3577d..888f1af101c6 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,7 +1,7 @@
 DIST cssselect-0.9.1.tar.gz 32952 BLAKE2B 7f7a78e8085036bed72c2a1a0e4a97cd1988e8d6981ae830f15d5fc03f5fdd43f0caa7b94d2923181f9dc926a6a11e970b3f091178640124286aa680fa023aaf SHA512 c4cd2c8d6fbfa99b836554685dd59e1e794e1fab06fcf4419a226b0608a05d58be5af54e507003f2a233a22f03d59d3d63c0bf19b3314f15c95ab3ce5f4db6cc
 DIST cssselect-1.0.1.tar.gz 21849 BLAKE2B cfe3637746329db224a44b680cda044238fa831ed0d05cf3484be6181de13bf8660330362626ddc03c7284a80e7c4a814bba293dfdca07a529d9c0c7163c95d2 SHA512 060c4b8d427a935b851b4b20d10ef89b9d6f685692b7144afc8f848e318abaa182ed60538355ea3f25050e358f24904fa0d9c01fe77e3d2428e2ef2a825e2928
 DIST cssselect-1.0.3.tar.gz 34027 BLAKE2B fff15a50d26ce83a0480020e54d00a027a7f21ca2c4c45d5552c6b4c19f7be21c390650c4befa61b7ae2b63946de88945deb488ebd6c7f7fc470950dab233671 SHA512 08feb3a515cc75089657a508cd1a80c6aaa97d710f27e99f9e749a1519adc13c5540134c6a4e0d7f548b022b8bd23dcbe360530d2329c5da36e43aca1f9627d1
-EBUILD cssselect-0.9.1.ebuild 1126 BLAKE2B bb0d574d4a41405f1f8fbf365e943133dcbbe33911df891a3b8d6f76ce43223325f9ef814a57a1c6c5e3ee3c974727a3c367c42dec1e2ee2a76e77f2febae302 SHA512 5a8bfd3abe337eff0f804404f5f2ee20932e96fec4e67518360dd567d7fab00947f6e9479ea9f4b87199cc310ecca8aaed36c7562db3b0e7bd5e9e2777a1a1a4
+EBUILD cssselect-0.9.1.ebuild 1125 BLAKE2B 92c022259385d1eeb53ee73c149bea0bde95cdfa13e8175de8ed6bcc7e378eab4e09ff524dd74611f9849c90070396608e88df1bc6330d3d7c4feae2adc2af6f SHA512 09d5eaefd9d9ffee00ee7f1f9815f47af4afc8daf47c6a521e4686a8f92d7ed50a2e501ee7d613f9925d48db624799b3adec9fb12c6e105d253efd9fe65d4991
 EBUILD cssselect-1.0.1.ebuild 1263 BLAKE2B 0ce1bba2b3928b61caaddb79351e77b272092411686ba9b86e3c168381450122a0494b9c44cd77ca584f98841b400b7f276a84fc07dbdef1627b11aa4151dd32 SHA512 c984e52bb1980fdd88aeafd1947e043d80fe29b2e4da1847cb24faa4513e69f5117aaa79c04037668a0e907a0e3f8bde6603561cceb93b70011feee30e00f00d
 EBUILD cssselect-1.0.3.ebuild 1217 BLAKE2B d77b250c27086fa8aaace537bad033a0dcebc87df79040dd8a592ede72191f74889d0b2a3277644a37a9f3169ddcbd05ea73fbf62a2c194e12d5771c4c0723b0 SHA512 d6f33906f5eb433f1f8af7acd53fe457825399063080ec2337933426e470da40e3e5a11a576c9860bec3c68da081b0e0bee51c58a92ea5c633d2a6deb9103168
 MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
diff --git a/dev-python/cssselect/cssselect-0.9.1.ebuild b/dev-python/cssselect/cssselect-0.9.1.ebuild
index c23c008becc1..1be081ee37f6 100644
--- a/dev-python/cssselect/cssselect-0.9.1.ebuild
+++ b/dev-python/cssselect/cssselect-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index f5a250846865..95878f0e3507 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -3,7 +3,7 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd6653013698aa67ee2f71555f09813a8136ef92d6dc51ca38fe085e7bedc5e01d1a32bbd0885e62bd91c2e482bebd SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1
 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
 DIST Cython-0.28.2.tar.gz 1878797 BLAKE2B f04ae2b39ace94f33341bdc4f5e0871d34523070345340adcbfbfb1629e5bd6e2e6db6a0cf24dc392e245fd3c4ae162eae2e14af1c5dcf20896e5d2983c1ea0a SHA512 7d09d1fdc10f96eb6121657b71e059c38c479b4ca180965a8e5adb89ac0f9be50260ea46197c45e8ddc7c1339b9b88c140dac2c4a7a49e1943fb4bf24a73d082
-EBUILD cython-0.25.2.ebuild 2141 BLAKE2B 102d3e730d6e8cbcbd4b12f62d05f02d4a29f495c1f6f9c8ff279cbf80058ab0e501c22bdc5b8035521abfe8e51e99fab0dc73f20eff9246942f2aa9a0c50e9f SHA512 5c10a7b15d5ac1b725d3e973ba83242bd2c134ee1982f602da2ef878537cc0f4312f84a9ebae0c2771187baf4af911ee17cb1019b71f7dada4c6ab22101cf30f
+EBUILD cython-0.25.2.ebuild 2140 BLAKE2B 98f31b72d1c298218c5b368a430ed0acd65b69919c833340dea4182abf949dbf3733bb1cd322be2d20fd23daee19ca68db377572e73f6a35e6f1dd16b1b6c821 SHA512 2e21871838aa75a31826ccc93402199427db7681ca3f6de8c44906212e64730d3e9a16fd39fabff97b358281a28a5a743308962f0dbe492c4bc27007e0a8479d
 EBUILD cython-0.26.1.ebuild 2084 BLAKE2B 94de0e3e0c221894148cda42d5a664e4036ecb929308185ae62c2a40e03ceb34d39a738ec22f17e1fe787ef99f4b5bebf33cfc6d6a5abc1064223c90eb3c6a54 SHA512 3cd6fe405a37f5c7174d2067c231dbb3dfeb634c161a90aa3e7b7c5ce2757642c2b71a9a0491b8c2d2c13eddfff6157e7e21b3c0f8ca66d2e509793c354ab10a
 EBUILD cython-0.28.2.ebuild 1963 BLAKE2B ee1c8dce215851a3bb5d104fc500ddf4e871a81fb52cf44471e1fbfc28a0bfcb08f9334cc934c90c99e4c0339e117e5e03b05384870cc05f919aa649bd73e26d SHA512 3047c57f88f5a62e0a8fad38d1cf1a9fdac95cae38c3c2db08c27e157f010b049281a1df118e66758a7e6ac0693ede6055d878268d97a3b7fc2316bcdcbedd35
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.25.2.ebuild b/dev-python/cython/cython-0.25.2.ebuild
index c15cad675f1c..a7431480936c 100644
--- a/dev-python/cython/cython-0.25.2.ebuild
+++ b/dev-python/cython/cython-0.25.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 
 IUSE="doc emacs test"
 
diff --git a/dev-python/django-evolution/Manifest b/dev-python/django-evolution/Manifest
deleted file mode 100644
index f1314bac0338..000000000000
--- a/dev-python/django-evolution/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST django_evolution-0.7.4.tar.gz 88467 BLAKE2B dbd2ded6ae73cc7dbcb2b39d32b64b580abeb6bf9d9a1335c72527ef2e137b02a1a6128ded5c2d50bc669f940bcb28611c14e0f10cbe957f46cf6a70ccf2f827 SHA512 6a6596211da7c0df1690e969b6116ee86ef2645886aab3d2026c1eadc0663f58f8c4025ffc30bb5b11f2f7ccedc687702396244c8fb12f1ea12b026521f90803
-DIST django_evolution-0.7.5.tar.gz 89551 BLAKE2B bea82ee91a1e2d06d0e6b4b1662a274dafa1d2552db072401e1582584c0926ea6dbceafd2bec2483f4334426f97e0c6b8df9f45e698aaba62db4355b5ca67769 SHA512 f457fa53ff59bff09fa3fc3ad73ffc8f09ce306c756b022d2da097cba1f14b69dca03ff2c714ac470da7200f649c4765543a717a6ce851d1dbd4b0fc8fc84098
-EBUILD django-evolution-0.7.4.ebuild 939 BLAKE2B 8f9ab8c0bbe39a74eebd59db0884e5c77728cb450ffb77061e1c58249db2ef0ee8e41e6d7728344ea43a65f3ff3f5f1ba7c2526c8669c4d544d5668be9d3ef1f SHA512 3c705c4927404c02011012bdcbbde11c07a0bcfd0d8ada815ef871e564b561fa9621d131c79db65ac286faf47bcefd4db134c8cd48f820aa7f8b51c76e07ebe9
-EBUILD django-evolution-0.7.5.ebuild 971 BLAKE2B 496857ee96d3beda6549853e75a458fbcc80006c0aec0a6ed00896da88442d6c0a97c4a0a06ef3b0fb20c95f86c6f5d025d9a5eb43f2baa543fcd65bef1ae3d7 SHA512 f8a940508b751a72b5c6d3bba8901254bd0a57a1f98d3d0eb57cadafe02396ab7edf16e545150ac87751e06d4d2f888e7a6e9434f63b6d51304b5eb55d150ac0
-MISC metadata.xml 329 BLAKE2B 4875e156e2041904fb9ed54de4d5f9f1e4f4466cf1ed6130ac4a4363e224780e39f0b1e822e7fb35ea5ff2636978a912f41b23e1480d5ecd84f25802069ed0de SHA512 ae6479f3b337a222cb59d793152255434ffb5fa8f61c2cda7fd544a6e983d825efdd842ceb5f5d873cea9f5dd23ec2efd9316f46a6e9370fc88fbb457d6375ab
diff --git a/dev-python/django-evolution/django-evolution-0.7.4.ebuild b/dev-python/django-evolution/django-evolution-0.7.4.ebuild
deleted file mode 100644
index b3143339cde7..000000000000
--- a/dev-python/django-evolution/django-evolution-0.7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# This is now py3 compatible however is only re'd for Djblets which is py2.7 compat only
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-RELEASE="0.7"
-
-DESCRIPTION="A Django application that will run cron jobs for other django apps"
-HOMEPAGE="https://pypi.org/project/django_evolution/"
-SRC_URI="http://downloads.reviewboard.org/releases/${PN}/${RELEASE}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-DOCS=( NEWS docs/{evolution.txt,faq.txt} )
-#DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# Draws 1 trivial fail under django django-1.4.x
-	"${PYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/django-evolution/django-evolution-0.7.5.ebuild b/dev-python/django-evolution/django-evolution-0.7.5.ebuild
deleted file mode 100644
index d195984fb368..000000000000
--- a/dev-python/django-evolution/django-evolution-0.7.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# This is now py3 compatible however is only re'd for Djblets which is py2.7 compat only
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-RELEASE="0.7"
-
-DESCRIPTION="A Django application that will run cron jobs for other django apps"
-HOMEPAGE="https://pypi.org/project/django_evolution/"
-SRC_URI="http://downloads.reviewboard.org/releases/${PN}/${RELEASE}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-DOCS=( NEWS docs/{evolution.txt,faq.txt} )
-
-python_test() {
-	# Draws 1 trivial fail under django django-1.4.x
-	einfo "The testsuite is not compatible with >=django-1.7"
-	"${PYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/django-evolution/metadata.xml b/dev-python/django-evolution/metadata.xml
deleted file mode 100644
index 0508c776956f..000000000000
--- a/dev-python/django-evolution/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>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django_evolution</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-tagging/Manifest b/dev-python/django-tagging/Manifest
index bd76bd0f326b..0d6fa4fcbaf6 100644
--- a/dev-python/django-tagging/Manifest
+++ b/dev-python/django-tagging/Manifest
@@ -1,3 +1,5 @@
 DIST django-tagging-0.4.1.tar.gz 44260 BLAKE2B 44d39d44892fa86ebc4ea185fb53696be772738a60a29d121d883ed3f123914a4621701c2a1efc4b0e309cd02ad0f7d28fb468eeff15c1b147724e8f9dc36e9b SHA512 6f6899084fd5067ec2e49649bba4aad225ed738f39f999b7ea5156d38fa28c272d4a1f688d4de712db15fe8f2c2ecfd4532eb6e9c0c1de6dd530c09d7d767a26
+DIST django-tagging-0.4.6.tar.gz 45228 BLAKE2B 77ed033ad61d227f8fea9e794b888da5d3a81474330d56bbbbcb1ce457ecac27d9615decadaece3c8b8fd2864c53342b795e8a76528c42609b928624609ccabe SHA512 75abf4b57df52393c8eb1ea265344c90c48b4225151076ce874b2e43657dd6cf4fffa1149acc2e118d58e3701d18103a362f658ce5114d7f207a33e7f4903b38
 EBUILD django-tagging-0.4.1.ebuild 543 BLAKE2B 88078b97b6b8300ab2588dd081fd37f54dd5a5c8ce3a9d8687f40cd98e618f0a3337a8efd5b3428e9550f63b1dbab4cfae245a956b75f2e0c50cc032a638a238 SHA512 9c15b5511e38ceced72ac19532d9c6441ca36251538afcbff3ba1e9aa2ed398ccd823fd54ea13f6753591dbf2afcc7e5bea6aa0a542b5e86f507c8ead4af7507
-MISC metadata.xml 327 BLAKE2B af0c6260880f7b9beb6f2eeb27fb86d1e170ee2471c43ee043d7ef6fbfc67180d5839ca743c08d2c822002be76146e58c40f236e1000c9ea4401364376c945fe SHA512 6afa657b0532b75434459277723812da4210941034dac3e630b93556e90c86170a28dff6bfa279bb38123409ba252536cbe17dd2fa77c5db87684e2cf40d5097
+EBUILD django-tagging-0.4.6.ebuild 791 BLAKE2B 981005f852e9575717f6b477decc5ecd7975b654a8c2300a97351de7030d0021ac4875c54966dd6344d4a0db12b275643a17fce72cd402e72f53227a375d5868 SHA512 024808e8b591d64b4aaf6c1eb2e6964ed39fec20ddaf76022dd73b481a9fae4a3adc22e903da2a8b7adbe01268ea4154671bd4295683715181750f99feae7e2e
+MISC metadata.xml 394 BLAKE2B a5d5559d1e4c9a55fff337a585dfb731c84e470d6fed8ba651b59287090e99c1c2848c83faaa4aa720a37a1839f3ea18e4473ed8b0fbcf110fb214cae15dfe3b SHA512 b5bf9305f635c589639da4742fedb6dd1d001db05eb2849087af20466e5af151b1db55eecb5a3ac510f19c84cb64fd22a3e84e957d19e59f1729ad8cf9ecc8e6
diff --git a/dev-python/django-tagging/django-tagging-0.4.6.ebuild b/dev-python/django-tagging/django-tagging-0.4.6.ebuild
new file mode 100644
index 000000000000..fc37602ad780
--- /dev/null
+++ b/dev-python/django-tagging/django-tagging-0.4.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic tagging application for Django"
+HOMEPAGE="https://pypi.org/project/django-tagging/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-python/django-1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i "/sphinx.ext.intersphinx/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
diff --git a/dev-python/django-tagging/metadata.xml b/dev-python/django-tagging/metadata.xml
index 1410662a219f..765895e8be7d 100644
--- a/dev-python/django-tagging/metadata.xml
+++ b/dev-python/django-tagging/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">django-tagging</remote-id>
+    <remote-id type="github">Fantomas42/django-tagging</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index bd24b06fb86f..9e1ae621aebc 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,6 +1,6 @@
 DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
 EBUILD docutils-glep-0.4-r1.ebuild 1160 BLAKE2B dd01498b0945f97833ca83fe44b72be76200d08b4a76394dc0b8265de641cce0a85d094e245af02b7b1590afc211a218f52324a57683feefb17958683d21bf22 SHA512 083901d85a132393ffb1300bef09fe3f797580a41f3e74fb4dd6f6a23e621a353f262fa03b642a34f5a73b96c5be39bcaea6d531ca6881e36c7fd891078312a9
-EBUILD docutils-glep-1.1.ebuild 830 BLAKE2B 4c3e6e56d4617c65976ff1beb9ff47f33b97f92c046a6d8f8da0bc640138d92dbf7dc41f88f24f5e76195e1ba3f224c1f0966f6df9e12366652662bb7db94e8e SHA512 8654fc75234929de2e74bd22eb0f0525727176d0d831731536ca4192d599622e2c1d96156499650a032a7372edcf02ca829c74e2098aca6f89c5a3ef41e3f3bf
+EBUILD docutils-glep-1.1.ebuild 837 BLAKE2B 30df86111f7e2fd420595213d1862134166ea186d7cf2b24da6eb34e4277e1de5c7ff49597a6937e28f6dd97990aa38b45c29549a921b7d3250f1edc188a554b SHA512 faa4f4f2be9ac6e4b1ad47ace0d7796c55f59e4da23a8aa688cc02414f90c38189f6e176d497bed8848bf13e594b8e96dbbf0072aa8245e2ac8d0b10d14be56a
 EBUILD docutils-glep-9999.ebuild 573 BLAKE2B 032fc2bb940904ce0602226f004d4d8990bba9ffb35ca3e81774ab101106aaa147ead13d9e6bfbda48b7f48840fb4c0afbe5578a5c8e8070bde87afd9a7e164c SHA512 200f86c1399dda6276e98c83a649be7d1eae49fec9976f1b04234e61aeef73bb6f55a50d50b8add157e844061f7da7092e25e9136eb0acf059d1ab2f32200ce5
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/docutils-glep/docutils-glep-1.1.ebuild b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
index d38685398038..aae20e340ed5 100644
--- a/dev-python/docutils-glep/docutils-glep-1.1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index efaad1c73a87..bcd4c40bb28e 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -4,7 +4,7 @@ DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41
 DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
 DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
 EBUILD docutils-0.11.ebuild 1865 BLAKE2B ab64496926dfa4984d2c43aa079e8674288ccfe46aa177bba9526737dd87e6c0c608bc79326fab385da3e1cdc049b1afe27d4916ea832db005efcc917c3b97fe SHA512 5e2853a6ca36e893eb6df7392745091970c8a2008b39fa3ab9a5599c2100c889fe2ea1bf9e66cb28023214896c2d84403160fa0b9f4913caf80b962f07148c17
-EBUILD docutils-0.12.ebuild 1815 BLAKE2B 86067282148b63f526fcc44734c0b8faa450706d4e195b0c0ebefc36d37f4924e45188625a88acc778236fffaea99cfa229d25ab1e3f717ca08ae8db9d3ba6ed SHA512 f75cfb2b69bb4729b3783c589c71e2ecb3eec20da862d81062e22e81a399e4d27ad84e58788c488d4db4e23276122a1af9e5e6830ceb830ac12b0b1412055872
-EBUILD docutils-0.13.1.ebuild 1829 BLAKE2B b46de91f13aa6140dbf5d1b1dfbb3db0407e2859f2524904e9036853480b7157875481e0191dec081c50737d9eb389453b051f130ab1cc2718eaa8d38a48c116 SHA512 bc17caa03c983d28686dc49f41e48af5ca7ae542ebf2ce2e0ea130e6a0b965b29bedd2c84d44481c63c4d8ac5d020938d52cd5ae266d00965068819f0c65d299
+EBUILD docutils-0.12.ebuild 1812 BLAKE2B 69fbd3323beffc4f47358bed59b1cbe1047a999173c244de9e1847eb1c7d7246b75f089426fc9b05c0f7be9e7cc02f99dce8a3ef2cca7fe76f1cd5764af4d0b1 SHA512 551c27aadc5132f4d0d1d38c900b711cd5e1bec371bd0f7a588a885409f11500ce4d7386982643af2a095cccc6655311ae06cf8901e506be428049bc5ec67468
+EBUILD docutils-0.13.1.ebuild 1826 BLAKE2B 7ce8a58e17edf3ae4fba6a8adf45b7e5f407f4aff58b82d62a0fd40285f17f83cc7824268e18dc3e6640478d51c433f708482ee40f2fea469a6806577b1f7c4e SHA512 82b9ad9c28a2f9ffccbb5025eddd339d6fe2366c32a95c819e06bef6a480635ecd4fea5c1aa7857386c83c36c046bbd046535a21132e802158084c5b2dba99ea
 EBUILD docutils-0.14.ebuild 1839 BLAKE2B e5b1124946320726d3aec879fc59e0755647f1e1256c4fa2c73f722ae22af308e74d13ff1c85944aea43ebb8fd522e7930013c28ed15147f7a5b9a546fe36540 SHA512 1e66faf8e597c5b45e0d732962be8528f86cdc02031b85f05b8bff5159725be2be8ea7ced14bf75b3bd22384a0e8ee74bea706c372a31a81d733d6e49653cb1f
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index 587257ff032c..9cf03a25c2a3 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
index 447102f391c8..2b59b37293cd 100644
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ b/dev-python/docutils/docutils-0.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/dynd-python/Manifest b/dev-python/dynd-python/Manifest
index a7b9589d90bd..12ecddd7dda8 100644
--- a/dev-python/dynd-python/Manifest
+++ b/dev-python/dynd-python/Manifest
@@ -1,8 +1,3 @@
-AUX dynd-python-0.6.2-out-of-git-versioning.patch 613 BLAKE2B 12a345b5e0a8dd459dc53648b493b451ad2874333b9411ecb378d9f750add0dcf8cdfd18ba12ab9fc45a1f45c62854ccc6a0809d70a9693a3b97cae2a7031af0 SHA512 c9ec0b2bf7cdbc559dfca38b540d09360523c8162a9267cc9cb1effdb5c3ea02fd4d5252c1ac6190e0984a1d458bc40c60fa7ea92a9ae234b05f500767a2ae72
-DIST dynd-python-0.6.5.tar.gz 231313 BLAKE2B 423c78d3e634862676622dff4b5f6a999e943b9480fdf9f24da189d19dc76ed8b9b131d64da606c3751d5c25e38206e05bf223f139886fec264a74f9daf51868 SHA512 46af19bc26c8f410ac26d4e756a726a56f2d852bfa21dca03c4c47210ed9074a7e017bdd2ecb1de3d00af37815b4a20885cd7945af4c8536941e9106bcf49f12
-DIST dynd-python-0.6.6.tar.gz 233618 BLAKE2B 9aaa9c5145f3f595c5f6036fc27c80af83e141dca3444b7049b9221504a178e93e088febde6eeac74729e8e9fb30f4fafc174c6c32c9084add87670ab99dc81a SHA512 c6be9acf0a4dd2446d613cc0c251b56fcd529fac733ecd63d0450806d7f4af2191ef4e861d015177140ca997464b591562a9f478ea83638516fab8552ee88c06
 DIST dynd-python-0.7.2.tar.gz 184981 BLAKE2B 826a46c7c920533dbd64f310ce6136e37f5d3f7e2bb1190977c72e9c7b65aa9957547b02ca92f5aadc1db268ca4ceda9459036e9fe24a57e090f4312645d348b SHA512 e51df7b368b1f6869338cb12a2f093064b1e7531ef674a83dbc7b9cc1dc6143cbe12cb37273bcc01e7b1066eda541b3b15473bc01e88fd9a8d1b594f6f37eaba
-EBUILD dynd-python-0.6.5.ebuild 1829 BLAKE2B 2c265c0bc8e506ff06445646035f908ea0140feb6e5aa47c5b800b9df61512f7e61234f6d9aba60a52bdcea2c37bbc33078139388fc392dc1d936ab23ef62830 SHA512 5ddab3e99206cb62e7eb18cbfdfe86f18439e8010764e3cb99c92ae555bab8b6c5cab6c3d366c978562b634d12ca58f69f611c24666827f6b176668b595d98a8
-EBUILD dynd-python-0.6.6.ebuild 1839 BLAKE2B 0a0ac59526f3a38537068479853c71dfc460c4ee4bc0272cd82d21346f6ee9f23b876842de90fd56c25981e3fc9f9f6bccf6bc03ac9f268b0de5530d4f60db49 SHA512 115c339635361b0377f7e70670d534d37ec0451ae0285b25767367a12b2674199759f133f1c2241f6f80db175528c32fe99c72d3ef1d6f65d4fe17df110528e2
 EBUILD dynd-python-0.7.2-r1.ebuild 1543 BLAKE2B c0200371b78ca09a9437f57a05867983fb17e8014be0fe3222bf5e9371555b7d74d33f443f81bd34183bf27bfabb4b8ec69bdf14972d9a2955401b02f07ddf5e SHA512 86ed7448a9e1e56d5e1c9e6c9c0a1eaefd42cbe0fcb8690293335cbb5dc9ac43901c62e320eb20bacc360d4d59970feffb1b846cc6996cc79b1ab0b9b5354ed6
 MISC metadata.xml 529 BLAKE2B bc365c7019af30defbcddf4eb0c590666199d43acba144d4b42f21fecea7c572d6122b60bd0b767437ec4b1887e7d3bc50c50b83f88deb99e627cb67030ec95f SHA512 8500904a91a51d552ef6f0fe17486b8d935bc4f50860120376ed40a31c002bda8ca66b5c3c8b8c244dccf659cbf8574f1e031e62a0a0b870af133062055a25b9
diff --git a/dev-python/dynd-python/dynd-python-0.6.5.ebuild b/dev-python/dynd-python/dynd-python-0.6.5.ebuild
deleted file mode 100644
index 05a89c06c00d..000000000000
--- a/dev-python/dynd-python/dynd-python-0.6.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit cmake-utils python-r1
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=e5578b6b862c025dd757f77aaae69be48cde5613
-
-DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
-HOMEPAGE="https://github.com/ContinuumIO/dynd-python"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-libs/libdynd-${PV}
-	>=dev-python/numpy-1.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.19[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.6.2-out-of-git-versioning.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# each relase comes with a different set...
-	# remove forced strong flags
-	sed -i \
-		-e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
-		-e "s|@DYND_VERSION@|${PV}|" \
-		-e 's|-g -fomit-frame-pointer||' \
-		-e 's|-Werror||g' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SEPARATE_LIBDYND=ON
-		-DDYND_INSTALL_LIB=ON
-		$(cmake-utils_use test DYND_BUILD_TESTS)
-	)
-	python_foreach_impl cmake-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_make
-	use doc && emake -C doc html
-}
-
-src_test() {
-	testing() {
-		cmake-utils_src_make DESTDIR="${WORKDIR}-test-${EPYTHON}" install
-		cd "${WORKDIR}-test-${EPYTHON}"/$(python_get_sitedir) || die
-		${PYTHON} -c 'import dynd; dynd.test()' || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	python_foreach_impl cmake-utils_src_install
-	dodoc README.md
-	use doc && dohtml -r doc/build/html/*
-}
diff --git a/dev-python/dynd-python/dynd-python-0.6.6.ebuild b/dev-python/dynd-python/dynd-python-0.6.6.ebuild
deleted file mode 100644
index 2c4ec25d899f..000000000000
--- a/dev-python/dynd-python/dynd-python-0.6.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-r1
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=d7ec36c6f1beb0621d6037ab0953db7e4c1b9150
-
-DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
-HOMEPAGE="https://github.com/ContinuumIO/dynd-python"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-libs/libdynd-${PV}
-	>=dev-python/numpy-1.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.19[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.6.2-out-of-git-versioning.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# each relase comes with a different set...
-	# remove forced strong flags
-	sed -i \
-		-e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
-		-e "s|@DYND_VERSION@|${PV}|" \
-		-e 's|-g -fomit-frame-pointer||' \
-		-e 's|-Werror||g' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SEPARATE_LIBDYND=ON
-		-DDYND_INSTALL_LIB=ON
-		$(cmake-utils_use test DYND_BUILD_TESTS)
-	)
-	python_foreach_impl cmake-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_make
-	use doc && emake -C doc html
-}
-
-src_test() {
-	testing() {
-		cmake-utils_src_make DESTDIR="${WORKDIR}-test-${EPYTHON}" install
-		cd "${WORKDIR}-test-${EPYTHON}"/$(python_get_sitedir) || die
-		${PYTHON} -c 'import dynd; dynd.test()' || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	python_foreach_impl cmake-utils_src_install
-	dodoc README.md
-	use doc && dohtml -r doc/build/html/*
-}
diff --git a/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch b/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch
deleted file mode 100644
index 29c3541b3274..000000000000
--- a/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- CMakeLists.txt.orig	2014-05-12 14:00:52.000000000 +0400
-+++ CMakeLists.txt	2014-05-12 14:03:39.000000000 +0400
-@@ -86,8 +86,9 @@
- endif()
- 
- # Get the git revision
--get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_PYTHON_GIT_SHA1)
--git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_PYTHON_VERSION_STRING --dirty --always --match "v*")
-+SET(DYND_PYTHON_GIT_SHA1 "@DYND_PYTHON_GIT_SHA1@")
-+SET(DYND_PYTHON_VERSION_STRING "@DYND_PYTHON_VERSION@")
-+
- message(STATUS "DyND-Python version: ${DYND_PYTHON_VERSION_STRING}")
- configure_file(
-     "${CMAKE_CURRENT_SOURCE_DIR}/src/git_version.cpp.in"
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index 5581c43e1887..9f97618d1ef9 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,14 +1,8 @@
 AUX ebuildtester.bash-completion 501 BLAKE2B 55a6ddf54f05c2958fad5d3abc6ea1cf65de1320e5cb6aff14eac2755b1fafaff1df6ea5e813135d66f96329c806a3a3db326f3ed988c09973f20297b6dbeacf SHA512 a5fd613548258585fd6ff9905f9fd4f87517d6821f4e5da8443f1f83a666ddcb40d0e09b305505894677c3f9feb1826e8f2e0ddb8af238000e3462d0da236530
-DIST ebuildtester-0.1.2.tar.gz 5598 BLAKE2B 5ee20592858758d769106f67558ac233a4ac2577dfb2d5ea7b892d6eb03ca00728e8f77a751d942270820235909537a987459875879d5b04fe98b816a436331a SHA512 0c2ac0547fc5b318023fc4e7cc85169f93d834433538d201c25a220c936b5315132bc0e53b76defd1082678a26da959b152f6a27172cf343d6c45811e3fd15a0
-DIST ebuildtester-0.1.3.tar.gz 8969 BLAKE2B a5da5ea9bf951e6aff6ec084812c97ecc4674f81a134764f923a221a8527f8ffa84aff0dc311d25ac09e4eee56c9e956b55bf68347fd3da42f7a10cb84793100 SHA512 bb272b764f08fe282fd3b0b4e26ee359a82b0f12e5b0f6b15d8da40c70535ab0550279fdec40983eb02d1fc3457b8b432bc3ecc3cc630e8df4aa0fabdf90d8da
-DIST ebuildtester-0.1.4.tar.gz 4606 BLAKE2B 6fb02af5a6aea9a1c4c707686abe643c39e620e8be1ae99c3654a32a49908b64eb4dc85a02374a3cb96159b00814791405ca82c7e2009feb57018b820cf8bb73 SHA512 7067483eee04b63da2c716c317a44268d30f5ed28cb0b43ad76a15d49405495f54788ea5401449543e797325b16f1b70fba80f0243066b083729abc35383a7b5
-DIST ebuildtester-0.1.5.tar.gz 4602 BLAKE2B da79f568be9abdfe6758db8edbf4252730ce25786500a524559613f5c83f32d972b04887b01b9e00f24310f663e9a91a9cbbdc9a9b6d3c588dee3cf57fa13ac8 SHA512 a610bcdbcb4387fa71ed0a38cbccf117e3db4879e8cee4f307fa4f528664e35972c9d3698609c1cfe284db01795047cf13572f0cfb947cd3ca4adea291f100c3
+DIST ebuildtester-0.1.10.tar.gz 12912 BLAKE2B 8d1c28c14dbae7d67b718fd957e6d7c1e1d1c996f77d4ffaf8feb505424c533996858bd7051331111d955d772106c3924f81cc1c2490ff9ac7068d10d838d9fa SHA512 f238fac69415e3a7e0a9ca684aa16ab3a3df5da71daed49a4d6d57b76a696af9089079b995da667d1307b1d4646e7291b8e86777f0486af3b51a8be435b8fe16
 DIST ebuildtester-0.1.6.tar.gz 11350 BLAKE2B 2dbc73a080cb0e6334e1e852f67dbf04e646030714f706e2ac355aac30679bab4e8420d31072d6c6de85a6dda5c2d4d412643f15cc2692f19b1715b22350c259 SHA512 68c877d9eb5dcd0ec21781e92225b3e360ef4fce8aca18b166f1589ba57eaf26e8d9af859e325e1c7c0f80640389a6da137e1fe5920b9be4aa9d35e215d7b80d
 DIST ebuildtester-0.1.7.tar.gz 12257 BLAKE2B cfa936bed77cb9a1e7be55055d1feacbd29d10167a7a4987258d197621ee48697335bdc67e1006ea2b6524397a2ad107677aaa70d1fdf8768ec024959ac9aa08 SHA512 53bbe3c6cd502c4678cea62d3743ff61ed055d5143a5074c9ac6b136aa05692bdd082467c309ccffb63ad1ba25d88ebcaa1562333ccbd73f4191233c22ca6261
-EBUILD ebuildtester-0.1.2.ebuild 510 BLAKE2B 3c113737b936f191be833436b9574f98c1983465515d574bc2d68ae86e19428fe072353a2eca937f495c4f49ddfbf2f079d0f83f5287859f17d466fe81594b66 SHA512 829b62c014a5bc172b97f26d5144f8023ae83de0ad24062e3d0829589fd6fc8e7d101272d2f1cd0f3b7f966399377a67ce934c2045b0e9b73de182e1f08fd0ad
-EBUILD ebuildtester-0.1.3.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
-EBUILD ebuildtester-0.1.4.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
-EBUILD ebuildtester-0.1.5.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
+EBUILD ebuildtester-0.1.10.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
 EBUILD ebuildtester-0.1.6-r1.ebuild 666 BLAKE2B ab0a1d3b3f790a1ff0bdfeb5e754dcebeada2814b9099f56a345fb4def30d4f55e9c0a316d88e0b0bc7f00e5fe94e8771e5992762a4ce3f456700099d42971b7 SHA512 ad1108482b911ee746fc627ef4dc363926a404650d3c88b879abec82dce377f883e3bc4c27e96ee1caa637010d02cf18c7cf973b91d386815d994a6ce731463a
 EBUILD ebuildtester-0.1.6.ebuild 508 BLAKE2B e079d1f3db025e13346638417bf27f4f4afa870d70bac21667a918af9320038db9d32369da2b55fbef4c849dfccb172e18bd59aa7797107fe564038dc75b621b SHA512 b7afffaef484458f18db0fad6016a838b6ad0653492e3f9daa22c4d0213eeeb73c7a5bf884ed3373326f3564ae02bf619258ea5b101ef58b161198a84b026ecd
 EBUILD ebuildtester-0.1.7.ebuild 666 BLAKE2B ab0a1d3b3f790a1ff0bdfeb5e754dcebeada2814b9099f56a345fb4def30d4f55e9c0a316d88e0b0bc7f00e5fe94e8771e5992762a4ce3f456700099d42971b7 SHA512 ad1108482b911ee746fc627ef4dc363926a404650d3c88b879abec82dce377f883e3bc4c27e96ee1caa637010d02cf18c7cf973b91d386815d994a6ce731463a
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.10.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.10.ebuild
new file mode 100644
index 000000000000..3f9b13bcc09d
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="http://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	app-emulation/docker
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.2.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.2.ebuild
deleted file mode 100644
index 2714fb5b2dec..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="https://github.com/nicolasbock/ebuildtester"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild
deleted file mode 100644
index 7c7636b4b92d..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.4.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.4.ebuild
deleted file mode 100644
index 7c7636b4b92d..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.5.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.5.ebuild
deleted file mode 100644
index 7c7636b4b92d..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/fastparquet/Manifest b/dev-python/fastparquet/Manifest
index 06271514f2b8..d7195bcd95ae 100644
--- a/dev-python/fastparquet/Manifest
+++ b/dev-python/fastparquet/Manifest
@@ -1,3 +1,5 @@
 DIST fastparquet-0.1.1.tar.gz 119573 BLAKE2B 16bd05061b64768278201acbf08fe13228d058b223d2050208b73e6af6ad3bb800a6d7edc1a15abdf02d8b508a75ed52962fb4b0c44a073b80451cfbf30915b5 SHA512 f8f052202ca095596870e6a10e2ab05e3c55289cd0ef3dab0502dff26052c9970f65f6b826d4d073c6c221827f6b18ddc83c47c04e84e08491f5237358f5860a
+DIST fastparquet-0.1.5.tar.gz 136350 BLAKE2B 2719a5da55c99ff6aa71792045f6622b7a1de81b6ec33804cfd36b0907cb44e68a7a5dcdec467c2e8c45790c062ca1d130fe3dc5c95e286bc437d449fa5211b0 SHA512 2d8f5375072125f68f086f316af87acf41e65479324828f7eeea244796311604425bbe53b9e2e67cc68b1eb89e390d9fbd5e201e5165aa22dd43604ac5441f27
 EBUILD fastparquet-0.1.1.ebuild 899 BLAKE2B 86b44c2edbad6e8de874410575aafc8dc108a67a30473d579c185c7811de7751d1132afc409fe6d9df3cfd2166e9caff36a5d137a8168217f75a4cd692e494e0 SHA512 dc977589378234cf19897bb18483eb4676df014e9dc3c4dda1bf70d7998771f3b5da33c25559cec6eb14f1e3f9b587bf9a0c8fee5ab1509cbfbf5c0265c19b6b
-MISC metadata.xml 961 BLAKE2B 5a07a23e791fb1ad2810d4f0f110a4f68d96922a127b853e2fc7de6cec43fa9c2cd4e5b7b2f31a4b5b16a084a87f83e225053c1628285418d54d6395521808a8 SHA512 2634acb33c585b036fd09df504e7d2d885b287e1b30585233fa7f2d3f7dd7e8206e20adf7061623fb2e8ecb45e714290966c8ed4a27baac56c7909b116eb49be
+EBUILD fastparquet-0.1.5.ebuild 1252 BLAKE2B d8d2edb656a953d8549238580dc5532344b67138475ebc689a1dacce968d72b6df93f9b713577f4d4e23951ea307c1967c004a4b276f10d7afba84da43cc2b36 SHA512 3b896112bf283588e9099c83ff48d39aff4286cb6a3f37f88e2e0c97a3737eb42010467a4a8bf944cf6e83626ad6197715429309e518b66d8106e3452c0ed412
+MISC metadata.xml 1094 BLAKE2B a61610ef4b201980b1b5fe44750e64972e69ffd238174e7b77d810b0f240b11c8807493f39dca45930234a704077b17eb2b9e041ed02c3164377a3a88b0a6517 SHA512 8e8e77110e234894e25847804265999eb9bced86c2298259ba6cd9721f49a874ff0e611533f71d7c74b6ad9b4d5e3b6b4cddb348514d12002d47d5d2b6ee0e32
diff --git a/dev-python/fastparquet/fastparquet-0.1.5.ebuild b/dev-python/fastparquet/fastparquet-0.1.5.ebuild
new file mode 100644
index 000000000000..dbd31aefa218
--- /dev/null
+++ b/dev-python/fastparquet/fastparquet-0.1.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the parquet columnar file format"
+HOMEPAGE="https://github.com/dask/fastparquet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+IUSE="brotli lz4 lzo +snappy zstd"
+
+RDEPEND="
+	dev-python/numba[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/thrift[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	brotli? ( app-arch/brotli[python,${PYTHON_USEDEP}] )
+	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )
+	zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	# this causes setuptool's sandbox violations, Portage should have
+	# taken care of this, so disable it
+	sed -i -e 's/setup_requires/disabled_setup_requires/' setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/fastparquet/metadata.xml b/dev-python/fastparquet/metadata.xml
index 0866e1d45e83..ab497f8496e9 100644
--- a/dev-python/fastparquet/metadata.xml
+++ b/dev-python/fastparquet/metadata.xml
@@ -19,6 +19,8 @@
   </upstream>
   <use>
     <flag name="brotli">Enable support for brotli compression</flag>    
+    <flag name="lz4">Enable support for lz4 compression</flag>
     <flag name="snappy">Enable support for snappy compression</flag>
+    <flag name="zstd">Enable support for zstandard compression</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index ba2dc8ec8a40..a5c5a3000f8e 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,4 +1,6 @@
 DIST guessit-2.1.4.tar.gz 102907 BLAKE2B 3b3652f331498bbb365debf18c74f789b5c9e9c1f711481b0a392c73e9fbfa6628ec58f45ae482ee74cbd4c3d26662f2f1776d9b5fe19f35dec02e438c8b0901 SHA512 c6465c32a68d40698b75addb343d765e47b867dd7f9b8c912f70532a9e9ca54d0e40f70a393880347eea64535a65df5f79d83ea99dc996cd126ba91ca130a879
+DIST guessit-3.0.0.tar.gz 133379 BLAKE2B c9d7c2def91dc301944b951bfa32810b9efd2348fa9a016015dd75c03b407bf3e17cc5cb93baa1d4cc5b6fcb76790972f2bf7c14af2c0cad419f6a98bdda3d6c SHA512 87f19dc1c6b4f46fa1f2682f7c3bab91cf094df06904b8d9771159f346612b9d0adef4aef55315dd00d07787319d17008e936b125941abba5b869df6a91cb1c6
 EBUILD guessit-2.1.4.ebuild 1263 BLAKE2B 4e97e3a23fa354c6a1eda061752953af4a5d1b2c84175c7c2daddcea6ea17b8b29a1aec73454307afc56e02a50e8b2430ffb0f95773985223b0033ae1994d6d4 SHA512 4e8e53fd9a80e64fcf8b4ed8f3c808969528097991de33d2dc0988cbb239f98666d5173a9ccf5696009b70746124dc61c5570832e672ec3a2767c8040901658f
-EBUILD guessit-9999.ebuild 1285 BLAKE2B c507c136fe3aca565c59fa1d3ecdd51533b1322f14cd625f698e6ca4536246f6eb7b6719183c5c4a5e0bd0bc944a5a3f77b57a0c80d7c9691055812d62e9c698 SHA512 b213714907c0b5ef14b6eb617b63d587ca12a9381455568605f540882d241401180486936b62a9252cd6c6386b385cd235d82df3a276110558c8680c0c430ca6
+EBUILD guessit-3.0.0.ebuild 1214 BLAKE2B f479ea14b41b37c039a8437fbfd92b890a7362034b13cbdcae20e868a91b1c844c265e977657920b5a6193a698c160aeac5664949ed9deca9c0ad498e566ec91 SHA512 cd8257edc6278823930110618136fcf0a7e8305c0bcd6ec3bb4bb3f54decc8a8a300bd5943ff9650cfece5c82b43d52ac7e0cdfd54700b419de53e6c897cec49
+EBUILD guessit-9999.ebuild 1238 BLAKE2B 0ffee02de3f2723219230071cbd1a13b744babb33677b483f20aea408a7b16a131278a38c20e8ae692550026e942035b04c8960b96539c7f84f46e81cc2089b2 SHA512 e94962f740147db5a73136799a63ead2fc3281a90373593e1d398398e41b4e1cc0a7e09f7d1d4cc371c68a7bf5d64677c616657d33ccc283acd9fb6002a52ec7
 MISC metadata.xml 494 BLAKE2B 1263ff6357d817ed0e3fa8939860c0c2718f0f9d6d15dfcc0a7980d6040a56075c79c4e580c92a59a10a9f26fb0e0579592fb3e94272751b4f071e3d738eccbf SHA512 7a9448f171bf023c39ca5bdeb3f3c079ad64ecfb07a15d8d3708e00365ed9cb9dd547e404197fca308fab1e52f8c7f3669bb952b370c8ca707ff24d6067a1c32
diff --git a/dev-python/guessit/guessit-3.0.0.ebuild b/dev-python/guessit/guessit-3.0.0.ebuild
new file mode 100644
index 000000000000..a0c510a842eb
--- /dev/null
+++ b/dev-python/guessit/guessit-3.0.0.ebuild
@@ -0,0 +1,47 @@
+# 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 distutils-r1
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Disable benchmarks as they require unavailable pytest-benchmark.
+	rm guessit/test/test_benchmark.py || die
+	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index c4c9f2b9ce04..14675266e90c 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library for guessing information from video filenames"
 HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit/"
-EGIT_REPO_URI="https://github.com/${PN}-io/${PN}.git"
+EGIT_REPO_URI="https://github.com/guessit-io/guessit.git"
 EGIT_BRANCH="develop"
 
 LICENSE="LGPL-3"
@@ -27,8 +27,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? (
-		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/iconvcodec/Manifest b/dev-python/iconvcodec/Manifest
deleted file mode 100644
index 844e63b5bfe7..000000000000
--- a/dev-python/iconvcodec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iconvcodec-1.1.2.tar.gz 17643 BLAKE2B e1b9ce6db0284068c53caf8f39a683365c2575453ccdba513d89f67e2f5bb9681a266eb1f4bde336ad7b858b30997e710061c680722667e59d3beaa60a2a9a6c SHA512 e63af4166cc8199dab888d9bf59d666546bceb1f71d2ce8423c4d3c9b374e870e8a526ffe1254cded346f9bc7a0f23d23e6e9120224d45fa4755468dd0a995e5
-EBUILD iconvcodec-1.1.2-r1.ebuild 482 BLAKE2B 1d4771df6eba4afd3102addf3fbe5dbabfddca2c1b5eb27fa4764ff59c7e20885f292a98b800e6af25591e924cefaa131cbfa323e776c1ac9ccefe0a4da8aea9 SHA512 62ccc8c282b1160e91dbcf072aa4d3928713fb6f3d92ff8724097487dbd4bef4b2c3ea4290adbf42d8355bceaceff5530371de17d8711489d2dc601564ffb60f
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild b/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild
deleted file mode 100644
index 8907f1235ade..000000000000
--- a/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Codecs for Iconv Encodings"
-HOMEPAGE="http://cjkpython.i18n.org/"
-#SRC_URI="mirror://berlios/cjkpython/${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	distutils-r1_src_compile --with-libc
-}
diff --git a/dev-python/iconvcodec/metadata.xml b/dev-python/iconvcodec/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/iconvcodec/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 type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 5e202446cc70..bd8889f5aa1d 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,5 @@
 DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001
-EBUILD ipykernel-4.6.1-r2.ebuild 1128 BLAKE2B d0b7b990aec2cdc4052e0fb85b8f4332ff284cd1aa93144ced92820cd451053d1409e0702f0188ccd7997f8393c867cd40571540bdaea7ab81ce29cb27f20ec9 SHA512 dc3cc52339cb43a2d48a757a02012ed29567badcea8869972677c105636756e290d490b1554e0664b9eb58aaaf38b1601cff0fab12a560f567b49f640ffd5a31
+DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df
+EBUILD ipykernel-4.6.1-r2.ebuild 1131 BLAKE2B ee25175447e339c402f03caf3ab67d21b4dc5b0398d4916292a0373337bde8cca312cdfb7508488e187d5d690cad86dcf80c2fdf23e7de12b50c7b3436ea97fc SHA512 1a9fe2d39244a8e585e1cfd5ff037fb47f6cb239a3ed9d6e027c71fa7ad31d4f75e31ff835de265c32e7a880607803c18edc16b4fcd95275772c2af261718cd1
+EBUILD ipykernel-4.8.2.ebuild 1133 BLAKE2B ec80ac77a49ebd001fe29e5e77d53b0c5d8f0539a43e2bdf23ce0507bca81accad10bfcac1feefae6aa142634403c7ec4ab83e10e914807b7ebde8472990f3e0 SHA512 574fe2341da6a1e218390945037acef7d6e79b80eb99ea48feb7bf2e0bdbeeb786b8f12abb34559b6b099b3e081186981395973829e52abbac33bd200ecd5df8
 MISC metadata.xml 493 BLAKE2B 46ff719452b5145a401147fef18fd62fc55542b2edc27017f2f8729d04f304339ccf5ad63de07efbd9c5419d663a498c76f9ce312f06869b3621a17fb72b14dc SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
index 0beee570792b..0b67f85acfe5 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
@@ -36,7 +36,7 @@ python_install() {
 	distutils-r1_python_install
 
 	# bug 628222, specify python 2 or 3.
-	sed -e "s:python:${EPYTHON}:" \
+	sed -e "s:python:${EPYTHON%.*}:" \
 		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
 }
 
diff --git a/dev-python/ipykernel/ipykernel-4.8.2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
new file mode 100644
index 000000000000..98f9a7f4602e
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+	)
+"
+
+python_install() {
+	distutils-r1_python_install
+
+	# bug 628222, specify python 2 or 3.
+	sed -e "s:python:${EPYTHON%.*}:" \
+		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
+}
+
+python_test() {
+	nosetests --verbose ipykernel || die
+}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index ccff6b39593b..5776897bcf02 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,5 +1,5 @@
-DIST jaraco.logging-1.3.1.tar.gz 4589 BLAKE2B 7e0e410df62926f7f7bff9327d29d9e5ab02eb22855d07e9d3c13be655b1060eb0316cbae9018dd1fb34128308be039c05b0e9d6d6a435e5c86baca99584c6e9 SHA512 aaa2b29551a13358887e0747acb47ca2a6611ce1bfb08259bc70c7908929c4d2c45eefd7738e808b7b2404d723425efd69f9cb9601e0fb0c08f611bcf744ceae
+DIST jaraco.logging-1.5.2.tar.gz 7135 BLAKE2B 5235566df80008270f2f28101ab5df1d7fbc1446f138eb4cb851c9bb464b741c0ebb8528d3502130b5c557f30214ec27ce1ea563e09e78776e22d37811da21b5 SHA512 3299adc9c9ca6113198cddbc34147afe1bf453edee16a2d6bfcce64e63deeaff7f87beb74ff44f092435f3433a921b19167fb45778dce444512807357bce1661
 DIST jaraco.logging-1.5.tar.gz 5707 BLAKE2B 853d2747ab92754de4480871355180a33a7a6cbf69fc3d32ba489ecac27dc55ad92d94bfb84e411ee13400d82d162ea400be1027c3002f317a97e00b849484ec SHA512 18f267bd0c764f38ff5223d4fd6e08d7d9fa568691db285155d7b955c71439474fd84edd61b20d57f6eac77394d4b3ddf9b35d8e6ba08a2db5dd4b2ada6e0d68
-EBUILD jaraco-logging-1.3.1.ebuild 1049 BLAKE2B 5ba31c54343a76f46353e0f2e31c7a4c08451b2cc24bff3f36a398f2e03c52877b37cc9ab0c3ed9b4ef9e08b0736aaa088d2758b005accff136cdd30410dcaf4 SHA512 d6594e11324ddca1a0815e011b3f28fe5e4121eeac88b104ff3835d832434d4a072e6a8fa09c18e49dfa1218d3cc152a53a660b97676942c4042dc5ae28c4291
+EBUILD jaraco-logging-1.5.2.ebuild 1357 BLAKE2B 4410f834553bddfbb33251d14b01073d6d75b7c9b89aeba688b2045c5fcd22f2a5ee393a9a5855e7c7d681a5114acdc882a9944d425e95d40c8df024dddb8589 SHA512 9d07db885a3cc02496a4b2825961a5ad6ad3235296cc73c1b3db238f325fab7653bdab530b6faee7dda9eedd189c2f9582cb169c2fdb72ff8abab3f8853dd2d8
 EBUILD jaraco-logging-1.5.ebuild 858 BLAKE2B b3570b11464d1059a6e6c58ce8a0b73a59bceb2021f6f2e3011899b19ae9beaa4de057e47fb90150d21a0d085d1334863091ca8a8b988d7e619f63e60974d375 SHA512 72c358214ae4e6938551a57b808ca2b9c4f7f5c2cb184a53715882b80b5d6721765ea5ad7d0962076e0aeb66f082f61a26498f882f00de5740f21abc97663464
 MISC metadata.xml 576 BLAKE2B 54ebb6bc0dd498b193d88d7bbf58085f45b4a294c659a9736818bedc227a5770a97c7f01a185fb4bc0ea560c8761467d1815e0a45a380cc328bbb898f45c7dd4 SHA512 75626a3525ba84f6e657f2d05a442726c938baf4c1f356cabc935624bdd382b4a6c97a679464fdba11057da34f23a46037f215a781912fd66a11c37dd1d1a81c
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild
deleted file mode 100644
index 818e606076d6..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
-HOMEPAGE="https://github.com/jaraco/jaraco.logging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tempora[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	if use test && has_version "${CATEGORY}/${PN}"; then
-		die "Ensure $PN is not already installed or the test suite will fail"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
new file mode 100644
index 000000000000..8cc0be38d7f0
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index f7a8029f5312..1e2f90a15d6f 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
+DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
 EBUILD jaraco-packaging-4.1.ebuild 1197 BLAKE2B 61042c2611ad0bd9d2514468653b8bb168023c215d1ca4a19363b8b9fdb54a0fba00bf8d22ed93f791ff3c2ec45bd26f5a7aec88550ee309399dc0c315bf3b26 SHA512 d2b7932112d762cef53e6e89d91dbae5a81fb4f70f53b887082d3464eb1da86c661f774c583ebc592d306d65642e6f67019597a3a23ad7ec4031201eeb1391e5
+EBUILD jaraco-packaging-5.1.ebuild 1320 BLAKE2B bd2c1a219a54b160d813afac4a9bfa47353534d4934f0b268554ad3bf76b325712aeadfe22b2870062c6c4f5bc16599b78cc72fef73d0cf47b5a03666fdece4f SHA512 1a603e4054fc8d0ba1d5868a264c5e33d67565a16ef5d9309dbfb10930f710431aa233469dac8ec56c070b8e0712cefa5b720f9378a42990a4bf23924c81e2a9
 MISC metadata.xml 683 BLAKE2B 25b11a2a24ca06ab9adf0962d870a763588af81bbde85446779ec51735b7e11ee3cd5dfff59fdedf304cefe9fe7d1c2867e917b4a0b5a08777ab2986fccd2f00 SHA512 b6f9d4889c3591dd7e70a4945408a75ccb7eda388599cf9fbf0020ca15152ce4b585b61f8f669980b01386fd277dbe3f8f97e633a148f60726b5260d216f3071
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
new file mode 100644
index 000000000000..1abb409b1789
--- /dev/null
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Tools to supplement packaging Python releases"
+HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Skip one test which requires network access
+	PYTHONPATH=. py.test -v -k "not test_revived_distribution" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index ab447ed3ec74..e7bb0ffdd08c 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,5 @@
 DIST josepy-1.0.1.tar.gz 50251 BLAKE2B eb75e05dec890c92043357740829edf96f49f0c77b85211b9a9077ef39bfe59df2ee5952c1569559a07b6505870d796b3aa9e2b0fdba6943860b035f09a004b2 SHA512 51f0e1286a05ebc42f388d13e47e7bd2d1eb11ba1cf06f4d52d627d4a3c2d01f73f1ce9c9ff23ed7dd78ba18142af23e3de4277a63dc69b433bbc3e7aedfd6eb
 DIST josepy-1.1.0.tar.gz 51286 BLAKE2B 57da7c74308b7698e84e19307283f9c09e61ee4f99ffcc98f02f50c24a96efd485540b878d5d52248a51f81356ab406654c6016614e32a1810cc1ff46b49ba39 SHA512 eee886565b1cb92e6d7a42f1e3666a158c162fb891f90de844118ac32b24f6deccf2eee5990ba100827109203f7da99c2b55735fb7bda05fd7a447dca39d6362
 EBUILD josepy-1.0.1.ebuild 660 BLAKE2B 13e70eee5acef28b88c4feceb314f651aeedb0a6985e7f3550f39905f783ccd331ad9fed8fdc5e4a2c9c53e34d76e8d0e7dd10e822a8ca996083456396699b8e SHA512 f154c240412fc4918954d2eef909a04b94953cb51e4b6461374b91cb851375294dd17ef6f8e4fc72329237ecd26573a66f7aadbacf84a73b7fcaa5d189e273ab
-EBUILD josepy-1.1.0.ebuild 662 BLAKE2B 4077ed203e78560a2e9a95d70e87f9032e772bc9c6cf8c293ac1bca91d6c5915dcdf70dc5c8eb90861bf878a6ad6f0ca4166bdf845a176556bd517b12fb88b51 SHA512 2ca3e0629f7bca835fcad76fda576f1978bfbaa540a33274a7cd2f09bac1945e859b5ab311461bcaddc73ebb1db84839f68fabc8677fcfd224a690539a60d795
+EBUILD josepy-1.1.0.ebuild 660 BLAKE2B 13e70eee5acef28b88c4feceb314f651aeedb0a6985e7f3550f39905f783ccd331ad9fed8fdc5e4a2c9c53e34d76e8d0e7dd10e822a8ca996083456396699b8e SHA512 f154c240412fc4918954d2eef909a04b94953cb51e4b6461374b91cb851375294dd17ef6f8e4fc72329237ecd26573a66f7aadbacf84a73b7fcaa5d189e273ab
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.1.0.ebuild b/dev-python/josepy/josepy-1.1.0.ebuild
index 11712885f363..664114b42e13 100644
--- a/dev-python/josepy/josepy-1.1.0.ebuild
+++ b/dev-python/josepy/josepy-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 98c16f66a8ec..35a1c6336f0a 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -5,5 +5,5 @@ DIST jsonschema-2.6.0.tar.gz 53252 BLAKE2B 38d2d1d9f91e923e66aa44fede2597b129813
 EBUILD jsonschema-2.3.0.ebuild 674 BLAKE2B 51ab4373ccf5d384f24ab60f153751dfa2b2009a9e453a37e8bb3a78a41e1263c4430a489048a8ea3cd691e7c5381a6554f13405fed422deb273cd04d4f378a5 SHA512 095e3046f5b21461bb5f825b885ba2af2b9bcfa6d92c682d82fd64c696f331b09a5d73cd7f2d5e6e1bb60a3fff67d112ed9332e6a564d9b84524a90e4081ca9b
 EBUILD jsonschema-2.4.0.ebuild 548 BLAKE2B a2bd28b326d42cb6bf439971ecb61b78132d802c6314709bc7e50b0c8536522f316060d817862ce0b6438cde91b7b633e6222a9beba7c1afe5a2a6a8b3e70054 SHA512 dd110ba28e25694116bab2fa62c87534357a1a49b146b65b4d7b36c93bfc90511cd1ae37c652b58beaf28681b7be4beea6c8794a7e6e03de3f9af7c9bdf037e4
 EBUILD jsonschema-2.5.1-r2.ebuild 1011 BLAKE2B 4f4152510117cf23644d90efeebbd073e9002b567eefbc86074936056a57d52ba5b67d1340b5a7da020e42bc5cdecf4a59a9d4bc4e551a57f970df2a0377f283 SHA512 875f64196a720d8719cb2deb2b9321391441677bd74c9730394475bd857717af4bd3760fc5d2d320440a9d460a42be57c32cb83155a0af6e7fe4d2f6a50dc0b4
-EBUILD jsonschema-2.6.0.ebuild 1037 BLAKE2B 306e620ed51747fd431500877f020233ccb666e0fa8ece18851c92ad3d261a7ca9f4925c78330b6847bb6c3c7151142b118dd6440cfdaa683f41137023fff676 SHA512 899f0fa988a0b6f66fd1c3785aaeff14890ffd28812a9fb8428b002e3c8633186f6da35c63c770eed4e7f15169966059a46a92cb03f29d1a41c23334f03ee58d
+EBUILD jsonschema-2.6.0.ebuild 1036 BLAKE2B 4f8fd63c36714a2050d22efd1c3bd007851a67f3ccca8c7b10994bb9f89e3e103c6920e0e17a9ca3bd766299134d9f9a931276d325960c1e5d2d48ab447d08fb SHA512 a0794b36278014fe69f4314696f432a6f9da611dd566477abbc5d4b386314e1f43c4e7aa93679bdd5487981f9cef24ea451c010b940804edd73d9edc5431c064
 MISC metadata.xml 559 BLAKE2B dbfd5c0c2d3b9e3ea197db40ca1c1ea22e63e61bb540646a4b7dd711ed4e5a8a3bf5cc149a90e9911de76db8895f4a807b7ca1500d8a3937527902b0036a8360 SHA512 6824c104780402599891db143c021ecb833d2bca3dee97a6d12cc51f23856f6e9dcadd2a438ca8ad13a6e292048cb5bdbdf024665b06da547fff1c7b9f5090cc
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
index c063f0ffb11e..ad3256d658e4 100644
--- a/dev-python/jsonschema/jsonschema-2.6.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.6.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/kiwi/Manifest b/dev-python/kiwi/Manifest
deleted file mode 100644
index 1aa31e00956b..000000000000
--- a/dev-python/kiwi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST kiwi-gtk-1.9.39.2.tar.gz 678242 BLAKE2B 3bebe02af3b439fbd028bd6bef0ae5d9610df0afca4b0a2e671b152b73fb8fad37ffaf7c67eee2b228af1698a981a5e7bf35d075b534f209ec41b438dd9432de SHA512 fa54623bb95a7ebe03e87c10d3bb271bd98fa4f40f7244f399cf2f86bf9b2e257666fc58caa4cc83d91a3c7fcf06817886ef5cab1baff58c8cbfdf6cfd12a554
-DIST kiwi-gtk-1.9.40.tar.gz 675794 BLAKE2B d775bc826bcb336148dc2cae633301efccea43aa412e9e7fb1039f389bbbdb38baab6771d43f35cc3837dbed0b60d94ba70a215e6d7a55fc4b93e91f7fe50ba4 SHA512 1fa210bcf00eeb8513f1b3fde968a212ac79c286a50a09427b0e3dffc5e78d739e70101ba4a0086d2002ac6907bc40b0103604f486b72e1bec36c9912ae6f2b6
-EBUILD kiwi-1.9.39.2.ebuild 1154 BLAKE2B 92ed5dd62baafc04b4efb0afea06cfe851c6ac8a11d82d7d99891cbad3d58d2d21c88ed4a3bd1776d1ee709f29cfe08c409764a11bf9560d295b84f97fd8bb3d SHA512 74e62f89968357ca2fa4b646d7c35cba9767a76bf88c52554f047126f5bbdb64ea3ce8c942eb54fa7486d071b6acaa716a3f3222782b05b368a35e15be50fffa
-EBUILD kiwi-1.9.40.ebuild 1329 BLAKE2B 0693d004ff107fcc187e0640befa43edcca91e6c5a5d4b55337236e998cae07ad0f3d7e8cb2596a20fefa484b8acc608117a979e08bc1a4d4d1f5fb52344a28a SHA512 8a14877c725e6f5fdd3250c7e5deb5c72a3960d58604c3b2add071cf453abdcd84fa8f0e639753b280d271946d7d34ec57aff2f522dfef83498b1caf432f9fb8
-MISC metadata.xml 358 BLAKE2B d60b9270f4b4e3d5fe9643fb74d31cf4e71c0e0ee30e634a8ebef024fa042552184497a9b19e6171a5dbd59fb583c643cf21f328c332e13ee0ab3a865803d470 SHA512 26cf10d26661eba23c7b1b7e48aa5498a1534ebc67e00de3a8fd49ece5ca4a14db84a6b9bd9797957aefb21724a053bbcdccfd814684603145078beeee2e137a
diff --git a/dev-python/kiwi/kiwi-1.9.39.2.ebuild b/dev-python/kiwi/kiwi-1.9.39.2.ebuild
deleted file mode 100644
index 7ae149f76646..000000000000
--- a/dev-python/kiwi/kiwi-1.9.39.2.ebuild
+++ /dev/null
@@ -1,44 +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 distutils-r1 versionator virtualx
-
-DESCRIPTION="Kiwi is a pure Python framework and set of enhanced PyGTK widgets"
-HOMEPAGE="https://launchpad.net/kiwi
-	https://pypi.org/project/kiwi-gtk/"
-MY_PN="${PN}-gtk"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND=">=dev-python/setuptools-0.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.24[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -e "s:share/doc/kiwi:share/doc/${PF}:g" -i setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testing() {
-		"${PYTHON}" -m unittest discover || die "tests failed"
-	}
-	VIRTUALX_COMMAND=virtualmake testing
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-	rmdir "${D}"usr/share/doc/${PF}/{api,howto} || die
-}
diff --git a/dev-python/kiwi/kiwi-1.9.40.ebuild b/dev-python/kiwi/kiwi-1.9.40.ebuild
deleted file mode 100644
index d0219774e889..000000000000
--- a/dev-python/kiwi/kiwi-1.9.40.ebuild
+++ /dev/null
@@ -1,46 +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 distutils-r1 versionator virtualx
-
-DESCRIPTION="Kiwi is a pure Python framework and set of enhanced PyGTK widgets"
-HOMEPAGE="https://launchpad.net/kiwi
-	https://pypi.org/project/kiwi-gtk/"
-MY_PN="${PN}-gtk"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND=">=dev-python/setuptools-0.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.24[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -e "s:share/doc/kiwi:share/doc/${PF}:g" -i setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# There is one fail of a test repeated 3 times in tests/test_ui.py however
-	# they are shy with their bug tracker. The fail is not a failing of the package's core modules
-	testing() {
-		"${PYTHON}" -m unittest discover || die "tests failed"
-	}
-	VIRTUALX_COMMAND=virtualmake testing
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-	rmdir "${D}"usr/share/doc/${PF}/{api,howto} || die
-}
diff --git a/dev-python/kiwi/metadata.xml b/dev-python/kiwi/metadata.xml
deleted file mode 100644
index c05c28dbfd5b..000000000000
--- a/dev-python/kiwi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">kiwi-gtk</remote-id>
-		<remote-id type="launchpad">kiwi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 22475fd7e5f2..69c94aa7d27a 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -3,6 +3,6 @@ DIST libvirt-python-4.2.0.tar.gz 186496 BLAKE2B a4d556a0159c338f2a3a5fc8e6072b08
 DIST libvirt-python-4.3.0.tar.gz 187111 BLAKE2B 7266ca1b5836429e13a03dab0e2f5085521c72e2d6952d7a9de514eace286477ad7b237c5d70f86fac49ab2201c8724149af72d4c1f688ac8736257045babc6f SHA512 4b2b4a2590e968ff4401d8429319c94b1b9c08a40b089f461af5a4912acf2c504f60652c80b161c253c00e41d22c100c2e180159e45d84c352c59dca69172cfc
 EBUILD libvirt-python-4.1.0.ebuild 971 BLAKE2B caf77d87ce352223c8c169ed840374c61109b1737c1a7d670d8246bf7d74b5577a90568769d1abfa50511293d3c4f3c3edc6b4497e4df230394adc5267031c5c SHA512 15c3b85fe89d593d0e4438fdc537bde2143fea5bae099293241ff78974df6141a730d6f9e3735593ac7b8a91301efd599a42d07699b81e166fec45e89a265690
 EBUILD libvirt-python-4.2.0-r1.ebuild 968 BLAKE2B 6f483890e0a6b51128ec760760a80349dfee986cc1ef430b9d0276f14d367b0f030029149ee266fc2c2b77d98d61ba7cfd388c03937fa16a5fe69a6307532323 SHA512 ef1b0a9b32402b0fdcef793b5c4e09c3c927b1b0d0ee23d744fc511c71fa4e05dedd963fcf203c00cc4b725e82612f6fa1f7866fbf07a5420830447c6c29b2e3
-EBUILD libvirt-python-4.3.0-r1.ebuild 968 BLAKE2B 6f483890e0a6b51128ec760760a80349dfee986cc1ef430b9d0276f14d367b0f030029149ee266fc2c2b77d98d61ba7cfd388c03937fa16a5fe69a6307532323 SHA512 ef1b0a9b32402b0fdcef793b5c4e09c3c927b1b0d0ee23d744fc511c71fa4e05dedd963fcf203c00cc4b725e82612f6fa1f7866fbf07a5420830447c6c29b2e3
+EBUILD libvirt-python-4.3.0-r1.ebuild 975 BLAKE2B 9035555b41e7c9541150fe3325b9b0aa15c535dc609564ccf5332915777a6460f2f91a61c4edd25bc9f5e496b7d2a255e000eb7b265c0b3839171acad6cd5457 SHA512 8c1192b63090408a002a57558f6b77c4acb99a49dbeae4caa8c589d553f08a6cc57b73866c8e1f679553b1dd8603b50ceeb62ac8761979ef98bf929049afe820
 EBUILD libvirt-python-9999.ebuild 969 BLAKE2B 7eef27fd34c2368a8fadbae51f5e76acac23f72c66935dc2fdc0c19e3ab7dbb1b05e4a87ff90a72e4972408bfb63c15efbeb2b46d31951387eb975567bd26aa3 SHA512 4de4f941bef900a032f6d3473a868070eb087dcfaf332e53bada1adb9222cab13e388caad11c6dddf2042aa4c4e266ba12150ab4652c9ef1c4b2bf4466bf5c37
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-4.3.0-r1.ebuild b/dev-python/libvirt-python/libvirt-python-4.3.0-r1.ebuild
index d097045772d1..bd6c920a34b8 100644
--- a/dev-python/libvirt-python/libvirt-python-4.3.0-r1.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-4.3.0-r1.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 35b1e7198728..25122f6cfbb2 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -6,8 +6,8 @@ DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad
 EBUILD lit-3.9.0.ebuild 790 BLAKE2B 13015298e24920449372388bc9a0fe5b5c705b49bbc50cc6114c8b18f9861acca1d394d08de4ee87db70ee9d363309a3cf8f3ac1bbff865a0c6c6f5c14aaac6b SHA512 57854f8499794d42e9c312b006f54454bbac7679c166c603872ebffe01c47411bff083f7fce0eb817151056ecdd72562224e383de96bdd5c46487f895e33a6e2
 EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.1.ebuild 897 BLAKE2B 982501eb196f19447490abc081eb7cb1420ce800ad2bead2c2943bed5afc1edb1789f0f38d2e25f4e56f187e4afbd24f7498cc1d527a68eeeeecf17a7f29f5be SHA512 dad181576e1c8c8899c4b5929393940fb7dcfd7f5f1c6023cea39864d42ad7a4ddccac063ed7b788e350ebbf32c7f06f6718b205f036e0157aa89dfe3effb8ce
-EBUILD lit-5.0.2.ebuild 900 BLAKE2B 35e700f597bce1fa69d074369ab75bfd38cd825e0174cdf55ac0c163e25742b2ecc884367c46a00c822c800efc96db526120abf368b1e39b272c4f2a61990d25 SHA512 4c06963c2c1c9ad24b98871e61192f09696cd53c51fac4f92d7772ae09705e42e94224314da724b13771a5c9d0a7a53a696c66da968d0e72ecf36b5159ea5d00
-EBUILD lit-6.0.0.ebuild 1011 BLAKE2B 129fb224767fb8a698a1b0a270eca41fd9a7fd11266feb9859b80604dbf4049406ca5986bf83bc2264cefa6723251ab4f366207414fd3c7ebe1a41ef4e3bbba5 SHA512 ce9158117c34a94ff59b2dc74078be5015c970ba79902c89224ffaf4435e60d63ffee5e0bd61cfc28f5f076a64103570a458425111df44954ccac40e75e5d9f3
+EBUILD lit-5.0.2.ebuild 905 BLAKE2B 601fc56cd26681f9fd0c411ffba286fc58894e71b2be5ffe6efde617b9936629838300f857bbc118cd303aa0a01aad966daa94d0aedd48b05245a6ab38bcb3b4 SHA512 a59114b9c073b9d1c6079cc91057d36a22221cc82c5027f95981ccb38486f3e279797ca759484ef51762a32a65490e1df3ac8448624613a0fdff8801bb2ed471
+EBUILD lit-6.0.0.ebuild 1018 BLAKE2B e86a9a9369db88fa6537d381a1c40ecc6dfac99127e097df1921329e1d4d5fab0b97f80077ad2699cfff4cf44178998128174f991b40291ff4f32e3fb0f97032 SHA512 6aa8853254a1db5a3d191869672c9748ac7f8bd0345bc545a73e1df6c14d5ed9c89442ce648393c527efaa75568b7eccc97ba3c959988e6cd3902a1df1d27954
 EBUILD lit-6.0.9999.ebuild 961 BLAKE2B cb1a25ddf6915b528d16dbb4cc200a708f0e4906659b280d2a87f7e02a536665ad592378ad446b9149373dbd643e683200e8169703628fcfa8db9b08536a777b SHA512 44fbdfa703aa94f2f4621490321bdcc092226c842b2f41d6223fb23a703686fcd004ec843b5bbf810a358179dd3e7b86997e4dfdd6ee7e32550301478ccdc4ae
-EBUILD lit-9999.ebuild 936 BLAKE2B 2e34b2068e182c7720a3281ebdc66075cc73d0aaa8728b87ba4e4155e366ac57404e162d149230bea77856ed75e8f7eec95d9e924883f9f584314ae631389cec SHA512 1e860f314eba2e95c0242ee897fe09ef938055e3a87cb9c7df2f546e2711430feae2bd469149f668010bca3ac95c9e41c3a19a2235a44ae6ef8ea29ea575ece9
+EBUILD lit-9999.ebuild 920 BLAKE2B 3327119d4508e44c9f3a7658a38e6d6b15ec021761584764c8fb32af8469490d428fab66f20de3f75f2e72cb2f8682f0145805059b3723d8d7361b0aae18966d SHA512 95606df1e8ca840e0512b6dc6c9b06d161646fc71f41bc2e1c459cc2dc4fc1ed3883265c43f575d493f89477616b530b8e7a62414da82bb315ee175bb0dfb80a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-5.0.2.ebuild b/dev-python/lit/lit-5.0.2.ebuild
index 27ac6e84fb52..18cafea48190 100644
--- a/dev-python/lit/lit-5.0.2.ebuild
+++ b/dev-python/lit/lit-5.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd"
 IUSE="test"
 
 S=${WORKDIR}/${MY_P}/utils/lit
diff --git a/dev-python/lit/lit-6.0.0.ebuild b/dev-python/lit/lit-6.0.0.ebuild
index 40ce6568d4fe..59bae5b9a36e 100644
--- a/dev-python/lit/lit-6.0.0.ebuild
+++ b/dev-python/lit/lit-6.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-9999.ebuild b/dev-python/lit/lit-9999.ebuild
index 74471d6212c7..c4da526844d0 100644
--- a/dev-python/lit/lit-9999.ebuild
+++ b/dev-python/lit/lit-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 git-r3 multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 6db43127cbaf..76360af61fa2 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -4,6 +4,6 @@ DIST lxml-3.8.0.tar.gz 3795205 BLAKE2B 39f3edc7efe48bd569b636de89cfcd8f7e4e88e02
 DIST lxml-4.1.1.tar.gz 2380804 BLAKE2B 4d3c4ef0472c7af7bb4185142a8274b596dd55a908d41f5295d0a78031a7efb3aef8893ca739f8db0675e44d4b0c346746a2758d31a54825c06a153203599ab9 SHA512 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
 DIST lxml-4.2.0.tar.gz 4282112 BLAKE2B 5dd68d984097253fac4c35d59e7b687fa1bc0699946accb66687b94e0b3d807c7c555795486828307ccbadd87aa989b6bba2d2fc71cec27e8b8e52f2762c5548 SHA512 89c7dd5d36e8816008b22b25bb02275a008fcfe26f6fdeff139ac8394bd773035bf423b9d7c4233f19985e5a8c12f936b71096c55e28957e97da0810d88de8d3
 EBUILD lxml-3.8.0.ebuild 2250 BLAKE2B 069dac49958678893a9a82b52d414d5987e0fc75338b5e6d29fa186bc648cd6ae44ed1fa2e532e7ea2769d496597b20d756124e9d7185727cda717da3a2f4af5 SHA512 1eaa5bf3aa6a19dadd9a3f4e3729a3f83a6314950815ffd882588b560428797cf9e3415e60e4e3b6fcf4ed3af291e562c885bd05cf191a66384ce5664ba20ad2
-EBUILD lxml-4.1.1.ebuild 2255 BLAKE2B 2d73f3bfd60f16803c172b1923ec5a5c075a0c5df82f64eebd8a84b7307e3ab01462ed1f93fd3370510792bf6d9daed0607ef618126c64812e297f1d5cc461eb SHA512 f0564905f0cc8d4e8c75709cdd8b5bb5421601ac49336e4888a9b8d65d48868131a0b1320bd4e18f2ec35c80750fa4ed90135689c6662722ff800fbd37b561f1
+EBUILD lxml-4.1.1.ebuild 2254 BLAKE2B 8832a61f7bde2d488e7b0e9168e7e8c9a693a3f00fd17daeacf3427085ef0293f8c4cf379e5ad6f2b0ab99ae92319b03c6b4bc5e6c4c50e979e03762db6cc3e2 SHA512 304b39c9054070215002ffa4b130524c6e5e0efb6ea142cc4dd94dbc853419f07e6058b53e70205c06abe29f8f1014d4ca9221f0835f6f286e6347f24292ad3d
 EBUILD lxml-4.2.0.ebuild 2022 BLAKE2B 4b9d42a3cdf755ca5f379d09b62bad6f9cecfa27e0708e9c3ce22450565c412b9827a1f3aaefbf3338335251fa1be74ab8bac78f5990a9cf9f4ad34f07123fa3 SHA512 8dfcc79d3d732b29141b1e583d262dab0f50b22c0c9b3b085786d11b80a5722bba75a8371b31478a2057a3f48593b11c0043035e0a60e0cff03b8a20b34bb151
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.1.1.ebuild b/dev-python/lxml/lxml-4.1.1.ebuild
index 969f73a714a4..b85144110a0c 100644
--- a/dev-python/lxml/lxml-4.1.1.ebuild
+++ b/dev-python/lxml/lxml-4.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index daa8db1d5c69..b076460e71eb 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -2,5 +2,5 @@ AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0
 DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
 EBUILD mako-1.0.3.ebuild 1408 BLAKE2B 6ff326737561bfc128527020d21cb8ae0da47007e70d23606ffd0a8644a67b11aa6c0c7d0babc41c8b038d99fb3db28a899bcf04ab18873e7b2afeffd01e4c6c SHA512 9ffd33d5236948976f8b00f1b0d56c3904a19c90fd17d30ad965e450c6e170b5d285aaf2cc21d77564b8d19ff87a0c17010f52037d6dfb39f7d6d4691e904793
-EBUILD mako-1.0.6.ebuild 1478 BLAKE2B 3fbad8f97fb6d602c25f9848c7c04234cba0d0f85c923ae96d28bd189555da42f17ba26318c95c676c9dc73c3aa83acb70af04809047daf1a25fb1e179e51fa2 SHA512 15a1e9d172fbe56dc15ba87906ebffd08470d721ed0030fc5ddbf37a38ecdfa09e0753eb10a6150416f49b9146d59f3bb7d2e5992b586e26ed88ed3d88fc4592
+EBUILD mako-1.0.6.ebuild 1477 BLAKE2B 83d366f715e9e6c1f2147e68bf721e1f19cae024eeebd7a83d18768d823add1269552689548a800c6a7719f0cceb9a4ecb54bbfb21efc6cf3af098ca5a6d5298 SHA512 4d41e035241253556f9e1a5c731160e33ce20d759afd739f2c488d67c2cc5a4ec506643f90e58a3f7fe503837af5e631d64e5b3a0fccb400e151426b5dbd834e
 MISC metadata.xml 317 BLAKE2B 1b8ed4d3958df0960dda7060ead69fff4ea6f0c6087d99af4ceeeb8d1fae9a88657aec6eb1695ec5f990e48f167e729ce65507080ef0ea5d23617d439621921d SHA512 5df2d87e902b439727d8be3861e626ff798a546f09dbfdd19ee7384dc1ca0474d1b3ff2f638d262217f0105fc2536a3ac2440cc5b1161cb510976bd2ca6d1da8
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
index 1686c478b5de..bda8e2befec7 100644
--- a/dev-python/mako/mako-1.0.6.ebuild
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index ab0e695cf45f..6e3d2f89b4fb 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -6,6 +6,7 @@ DIST multidict-2.1.4.tar.gz 28395 BLAKE2B deb08b2d1039aebc95b5c7b63261180847ef65
 DIST multidict-2.1.5.tar.gz 28497 BLAKE2B 301248a428f3be7740dd04ccc8ae5e92d971736b04f7243949805ffcdd005c68b20340146dee690055554dee814354770269e48bda82094f35a4668b4ac7a61a SHA512 927f2e0c175e52edbf3a5385957e5988a08061160488df70f7431520ef75439011986365dfebac80e8da6e1874232c532ea96c53081c65c74c04f0e307db6729
 DIST multidict-3.3.2.tar.gz 40083 BLAKE2B 6622efd489d4f0046200b6b28a158306cff7a3e463688c512827b599500956793ac27f6ee839e076a921b84665bc932274a5ebf4c37e273fc02916dc9be1eed7 SHA512 d44c8b00ab7823b8840665aa1462ed547aea48874a408b2af8f1cb455727896cd77ef2201e8f234bcb3f2781599ffe931a5884fc55fc1f7286da29185c4d88fc
 DIST multidict-4.1.0.tar.gz 43492 BLAKE2B 4d53a12896f070fd029816742ccff11a12636164e51215bb22b368da10d555d52a9ab7d5dc4632baec9ebc628ca4f846ad7fb2ad0bb044f033fd7e567cda0da8 SHA512 8972ca48146b40fd88f5b0675ed6d45e6887c31fc1d5962203f0fa77a369ef11b0d7739593f5691ae1fd2bbef989940983ddcf0c09acfc5a65b39b6b336571f9
+DIST multidict-4.3.1.tar.gz 45342 BLAKE2B 12a0a8f0785c30e393d996c506a69d6ba03227e47040d46859e1289b47ce23b49a9bed48c3cb0b26f3bf4051cce3963d020a92ed28373038fb79b2204c13d380 SHA512 1b475836c776ddddfdc4f14882df41f9956ab06afac7b640e3f5ae3c50717f2b07267acbae2fa3e94cf8c5650273d4d7ce44329c0febea95046ee27d98db9288
 EBUILD multidict-1.3.0_alpha1.ebuild 869 BLAKE2B ef434a9ed5b6fe0d1df6c7e306a16a62484a5eec99d0da3da0f82de0de81b1a31edd36463e3862bcb50e38e5ccd1baf3c0be67844e010ffb4181dc710d53665c SHA512 b558ad47531db3d3497adaba4f0fe7b620ef481cbaf44f94d17f23118fcd9a363945c7ea7b98340d9bef387e8720fc43697b34b2c140a13c6c0c806ed252d4d4
 EBUILD multidict-2.0.1.ebuild 878 BLAKE2B 9e37896184224fe2b95daad32e7171c832630a39841207a3971abf1031166d7b68c377ea12c78b45d9f7c6a406eb6b2c3b3e0456e8bc434c20d29f7a35e12fc7 SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672
 EBUILD multidict-2.1.0.ebuild 878 BLAKE2B 9e37896184224fe2b95daad32e7171c832630a39841207a3971abf1031166d7b68c377ea12c78b45d9f7c6a406eb6b2c3b3e0456e8bc434c20d29f7a35e12fc7 SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672
@@ -14,4 +15,5 @@ EBUILD multidict-2.1.4.ebuild 874 BLAKE2B 37523db11ade9f2c65333559ac88be845ee737
 EBUILD multidict-2.1.5.ebuild 1049 BLAKE2B c4fb30f7accc1ce25b45f3cc8cfdc6d6bac799330708593773ea4ee16eb533d6e73673ae5a911ca343db04b5f205e008e446b93e5c96bbe40eef9e27d504e052 SHA512 e96c235ad7a272127d20107d5eff61cd840d35173c0b81d63202532f0e7a1e3d81b4dd880c0bbe744a2b4de3abbf8a2ea0bd15977489f3173fbc8a70f81e5a0c
 EBUILD multidict-3.3.2.ebuild 857 BLAKE2B 936db37745d3f4c12a7cfcc4c3b5da68885c52ee88d974cb14e443dd3386dceca6906a66296cfb0be9b6cb004a3cce1eb68614e188c9ffe7560afc0ebc970da0 SHA512 6fd7be5f8772ff2d1a17a25dc38dd161dfe791b36ed19fcfdcebff48960145ddc0d6b6a5d52936e9bd99803725d944d70b9ddf6073e78c46ad84486684b47dbb
 EBUILD multidict-4.1.0.ebuild 1062 BLAKE2B 6389ba660f6c1cf57efcfa8ae4fc838fae11618238d95ce9457ceacbae31ded545305793508c8fad00168b956a36dc595c33372fa5de74782afbe9c98fa57e82 SHA512 b0dbae21b6849da1db86d9175dfe2774d2340ed0561f001b20c56fed00941bb556f7a9d1d431fd7bc5991b8e9338a6c9dc4b28dc36786252509950ef17437f5d
+EBUILD multidict-4.3.1.ebuild 1062 BLAKE2B 6389ba660f6c1cf57efcfa8ae4fc838fae11618238d95ce9457ceacbae31ded545305793508c8fad00168b956a36dc595c33372fa5de74782afbe9c98fa57e82 SHA512 b0dbae21b6849da1db86d9175dfe2774d2340ed0561f001b20c56fed00941bb556f7a9d1d431fd7bc5991b8e9338a6c9dc4b28dc36786252509950ef17437f5d
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.3.1.ebuild b/dev-python/multidict/multidict-4.3.1.ebuild
new file mode 100644
index 000000000000..02df4b8087a8
--- /dev/null
+++ b/dev-python/multidict/multidict-4.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_prepare_all() {
+	# don't use pytest-runner for tests
+	sed -i "s|'pytest-runner'||" setup.py || die
+
+	# don't enable coverage or other pytest settings
+	rm pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -v tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index b1cc633d973e..7f97350b49f7 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,9 +1,10 @@
-DIST mypy-0.4.5.tar.gz 779940 BLAKE2B 5242d57a5c0baf1f32e018e671c5eb21aee3ccbc4e7abfc578562c32c2be425848dcb7cd9a7d726268527337bb11f3dae88f1d79b5db87d1db857927ebad4a45 SHA512 e0bd4cb1080f2a4c0f2c4f9ebbe22d05b8dabb374396e7d91c645724b5d67084fd005e181847fccc45c9c51f3280233185fa6bf08dc24c2d4f6e482197246fa7
 DIST mypy-0.570.tar.gz 1050041 BLAKE2B 034d49627242ad67283689a653d416e956ae0b78287f78d910aa2b3b2b07af5a07d08503259a2c26bbf37154a52b120fcad1bfbb3daccbd9b80d4c1e9fedbddf SHA512 f0822d9e757faedd9cbce5e8b47782fae02523244688a3900a9f202de9f68b5ae094da65526fba79911a42d4d0621c4e5bf1984e57201117db8f5b630314ea4c
 DIST mypy-0.590.tar.gz 1081426 BLAKE2B 396083f81a1bf6f8230abe3e3e48b9fcf0288edfa6ae2bbcb7b6bd8f50f4e8dd093cacc326d561f5f10fce0bfd213e559d98e32a35a712bd022d8d0682f239d2 SHA512 129356a4326e80e292645e3b44b673ab463b1ad9b6388396680ca15a4c9aad6da2a3734a3da5d4ab005fb0572fd08863b20ba80e71af2e87d11546abc7fd78c0
+DIST mypy-0.600.tar.gz 1097269 BLAKE2B ee3327cdd7383a93f319335017815bb3341d1b91e3620f7bdc69d1c401e3c8aaa3157cfd8d4657fe072ad90b672017fc2b948ad4ff217d5e4ab91b8946d4569e SHA512 8e89bcbb53d385bbc3bf72de123d4a99230ee5154e1af19adccff7133f86495aa366058e04092356a80036214113ac90ecddcf5e30da59ae2a7c6f3d320b07ef
 DIST mypy-typeshed-0.570.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.590.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
-EBUILD mypy-0.4.5.ebuild 937 BLAKE2B dfc6b5f748358a4686100c956bc89e98075404383db7fe14f6d96e5f5c0bbba0ee036f38f355d0fb919471896cb85f626937cf86d362139d0c6d1593c96686e0 SHA512 853cf2f741d4a25df8f7f9e06b5c84f323f45279ed80ecfd2059444af1d8a0a766406382493ac161beb21901e30d21cee51dc3cb796902237d71105f31487f8d
+DIST mypy-typeshed-0.600-2dc7d39.tar.gz 425045 BLAKE2B e2ef63f2ed988f77f52e2a01c158ff8e3fbdec118c1f613ffe6c57d025da8d5bcf6dc0e6bcbc1bb8655fbf340a0f358535d7e1ed214a5a1af8e3188f2dde5459 SHA512 9c960c2dcb2cd5ed36d77efa47a5632698e841b685386f8d5a31200c61235b68d627fc450d070955ab14962d6a70a2d538929e2dc845512e83161c0299d91807
 EBUILD mypy-0.570.ebuild 1563 BLAKE2B 63d388c767582831259a05e2f5d602d708e3a69b5a7c15ee1215298168817c1a7408b9058c573aa6a79a3e59efab4c480ec233e8d90b72df176d1db60634b2e7 SHA512 1dc8d4fcdefe9d78bb9eca659a4f7e31c48b3ef9f7ca477daf08bf0ad3a18a62db1f68f0a84f6f76a18f1fc6c493fb508ec96ac24f827f671abe285dd63412e5
 EBUILD mypy-0.590.ebuild 1563 BLAKE2B 63d388c767582831259a05e2f5d602d708e3a69b5a7c15ee1215298168817c1a7408b9058c573aa6a79a3e59efab4c480ec233e8d90b72df176d1db60634b2e7 SHA512 1dc8d4fcdefe9d78bb9eca659a4f7e31c48b3ef9f7ca477daf08bf0ad3a18a62db1f68f0a84f6f76a18f1fc6c493fb508ec96ac24f827f671abe285dd63412e5
+EBUILD mypy-0.600.ebuild 1582 BLAKE2B 0385941aaf081377960c898b49222a79048e76203de3827b4a20fd8856eadb046ff6841dba3ed7362752355a56d880d9bb208749af15848fbc3317edd890f654 SHA512 543de4441dd2efd08fc5088592ee19a7da95193c06a05cdbfcfb0732380a2be0022b17622e33b80f51f522a64435e88efb21c332722e30743d6cb9a97f8e9cbf
 MISC metadata.xml 318 BLAKE2B eabbbb1b58582001a0158157e589abcca61c0de824b24eb03c9a905037de8cd1e26427f9a76a8b4836e78701caa073a0ca1d5114600421dc38e5e0de0f0f4cab SHA512 fc38c17a1e934579acb13def5f6c4649c9c20f1141c8506d89cb7f3e560222da570e713fcc10a97c66c19da3832b7d106f5c9ea3045cc961c43b48e726a5a80e
diff --git a/dev-python/mypy/mypy-0.4.5.ebuild b/dev-python/mypy/mypy-0.4.5.ebuild
deleted file mode 100644
index d117678c0182..000000000000
--- a/dev-python/mypy/mypy-0.4.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-SRC_URI="https://github.com/JukkaL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="$(python_gen_cond_dep '!dev-python/typing[${PYTHON_USEDEP}]' 'python3_3' 'python3_4')"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	local PYTHONPATH="$(pwd)"
-
-	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mypy/mypy-0.600.ebuild b/dev-python/mypy/mypy-0.600.ebuild
new file mode 100644
index 000000000000..667a3dc20fec
--- /dev/null
+++ b/dev-python/mypy/mypy-0.600.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [ "${PV}" == "9999" ]; then
+	inherit distutils-r1 git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	inherit distutils-r1
+	TYPESHED_COMMIT="2dc7d39"
+	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			 https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
+fi
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+CDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/psutil-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.1.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.2.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+src_unpack() {
+	if [ "${PV}" == "9999" ]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		rmdir "${S}/typeshed"
+		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/typeshed"
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
new file mode 100644
index 000000000000..0eccd7d514c1
--- /dev/null
+++ b/dev-python/namespace-jaraco/Manifest
@@ -0,0 +1,2 @@
+EBUILD namespace-jaraco-1.ebuild 898 BLAKE2B d8bfd1c807cc9281a561586df4c081a8342adcc59e4c25d053b0b44d6dc7b9f49c2b343e3bdad5d9d8b9046027d864a25fca8447a587247d74df69da4a59d222 SHA512 58b68f9453663cea8c11a002eb665f62ea8751d2fec32dad696735a8b1f146bc6dbb21ca18b1e5fb7f93c6e38c0d2f1616c529dd5fcd40f89524b5405727c03a
+MISC metadata.xml 470 BLAKE2B f9fa4bf77f447430b82da286c58be4fc33315533c9cbc14ba7a095593c6e640ddde6718e520bce483b90cbda47d17d6b93f909ee4e957254f44b4ce9090a033e SHA512 f4e9dd2e2839ff31472f9f3b1c2a6fdc4d4618463bb38ecb8a092cf3ebddf5852898b945d5e5f97fa334dd9e2a8b124046e99da01a6b97402c20963182ed13da
diff --git a/dev-python/namespace-jaraco/metadata.xml b/dev-python/namespace-jaraco/metadata.xml
new file mode 100644
index 000000000000..f3390d9bc05c
--- /dev/null
+++ b/dev-python/namespace-jaraco/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
new file mode 100644
index 000000000000..438cd5a499b9
--- /dev/null
+++ b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for jaraco"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	!<dev-python/jaraco-logging-1.5.2
+	!<dev-python/jaraco-packaging-5.1
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/jaraco || die
+	cat > "${S}"/jaraco/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule jaraco
+}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 92c313fe3afd..68597432ed71 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,7 +1,3 @@
-DIST oslo.concurrency-3.21.1.tar.gz 48866 BLAKE2B b621548173e30e7a7f3683d1f5ef3821574e780d1df99c91d8bb77d4e3d3280da395066be7c9ec95b3d3e640da694aae81943e126c8c4e6cd5f18c2db99efba6 SHA512 6d165ebf952b29d96d2d1a8b938b2ef4746c77b99a62ca596ee93e6fb6d919f183eede380763b6167cb7d372e03803556715523b7a63ad1dbadff4eede7c0bcd
-DIST oslo.concurrency-3.25.0.tar.gz 48736 BLAKE2B fe8506599d175d22c44fd52bb2c4e5f238687ba7eeb926d3f042be14e6ef8cecb3c13b010c1540c835d9bc7e587560ea391ea00b99f05553d6bfd46d2bbe3d9c SHA512 0273112cdc0a1de45ec231b672f2ed8f8fe5842dea756bc062a18247036b2fdbfbce392f3edbfbb871a2bda94412f6c82f3a634fd98a77c1df5a243babcbd4de
 DIST oslo.concurrency-3.25.1.tar.gz 49218 BLAKE2B 95fccb051ef782a0b6cd01801e9b44272a8b04ca52fd0f00f91a2aa3514885c302a3f251885f59c32303708c91331f3f59ee06ebdce4751d013559a0e7d19b16 SHA512 5c306e742c652d66209a3218ccdc1d1f957ec6fde0b0bcb9411a71e470e8c0402c4cc1a40a05094ce591942ed16b8e0a7b456d60a64e0299ef32a257b37c8388
-EBUILD oslo-concurrency-3.21.1.ebuild 1949 BLAKE2B 20a0d072bbb70be623739fb50f27b9a99af0a1804510def71dd1cf4326911e260bbe597f342d8553131e58df41d9c39fa3c29e856d8093694c5e5e817787f4e0 SHA512 c02c7c184971e6fb8072529cc4b904654cb3362725aedd4da2616d80e9ab844076b77e930733f8c94d1c24d999f45de6253d8aafc1f4d0fbdd5311ace5afccd1
-EBUILD oslo-concurrency-3.25.0.ebuild 1806 BLAKE2B ee6d7879914bdb38aaa0bd7c780e5e4e673d273a64d45209ddce3414fb9dc2517b42169e69e8fd6b931b988bb7fc7d4d7a7a11239b51619a2d29369c4643b67c SHA512 4b6182948b1e1aba8710e0c1a24087d60036e4d4e193193c53837b59efe2ddc8278ec14c6d432398e78ee24074ae8e8082944305af2cb9ca57381bc92cc703c9
-EBUILD oslo-concurrency-3.25.1.ebuild 1853 BLAKE2B 2dba6b4c1f0a518c06cf3b5cfb42ece9fa80a2a0e8f8549408e67ba7c5737257b734b2932b043023254d7165b22f8e58f0a208c4240d2f55fec8d45a67571a82 SHA512 aa15bb4a96f3bc5d7459c4c53989e24131a6dff6139808484d5187f3b070edefc187845d238f997150905fe911fdaa185105acfec9076a82a185030a71a2dcdd
+EBUILD oslo-concurrency-3.25.1.ebuild 1851 BLAKE2B 82e97eaa58e8a776e95c5652d7a1c360c5bb6088eb22037ca88b502575bf54d105afbdeb2657dfd235f8ce47a726b01b931ea57ab5a3f3ec5ec895604b2797e9 SHA512 74a287f8ee7553ba191ccdec0b28bfe11e6fc319a00b260d1d6c2da9bd47cfcc9ee8e8790a206dba70f3e8360f8397aa01403810296b28e4fe51354ae93895d1
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
deleted file mode 100644
index ed5295ed6687..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^futures/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
deleted file mode 100644
index 2ad09d4f7f9c..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^futures/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
index 535a45b3c7a0..e4343f6c9327 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index e9ea842f3536..ba613ebaa3dc 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,7 +1,3 @@
-DIST oslo.db-4.25.1.tar.gz 165509 BLAKE2B ef4994857328123cfe28fb0f0e01756901c1cdb47d54ec5db40d922c8476a934511f2d387548f8da4627a4e2f8cb89f02df5f1431ff1e97a503eae4a70ae2400 SHA512 35d648466f89b14157d269d29f88ba34e51e9afacd04c27cc651e3e5fe77d94b27bc3e02ec832e0b87650ece6308f6c7a2d3ce8f7862173b545c9146eacb5b8d
-DIST oslo.db-4.33.0.tar.gz 167982 BLAKE2B a6bde0df966333048c59786971f9785c6272dae92b84877243f91945e5d72eb52e1a64b01b57fde5d7995aad7bf02075ca1dae7e4715f8d05a901535d98580fd SHA512 5886e60845afe89855ac6b990aa0bc2a3984cc860ef05c76ff751c2b4053112f89583b470765819c7cb3fb91d51110f53cbe6c9ddc5cfafb1d11dfe38a3c07ef
 DIST oslo.db-4.33.1.tar.gz 169088 BLAKE2B e386d8c71669569256d88e2ad654e017dfae5cfc0635fa7c7f9e41a11d7114f6f7d0e826a6855113f8e672d5e57ed8b645e8c6d3a54c30aa78d45e53894fe8bf SHA512 b627bef035c13aa32afded20ff1e5198bc94d5ce96384c7eff44992d7f5c7178bb5e9ae398c53a04be6f280f433c688ae28fa72d6c617fc7c9299bd7c6a02eff
-EBUILD oslo-db-4.25.1-r1.ebuild 2198 BLAKE2B 769049043547e9509fd2480485ee4c0f9caeaf8aed823dde9d1498c0efb04cbdf3cb2b2ec3148eb5cc3fd0e5472293c3964b18d89062fd20f72418197c6faaae SHA512 076ba50c4a0d0e2e5420cf84418521b0fe8892bd66edeee1dc1923097864f8c6fa410574d50743e9fec884d183c33532030d02c535cac6471b96fa8c912d4ee3
-EBUILD oslo-db-4.33.0.ebuild 2051 BLAKE2B a4495e041056b92ca29c1b6370c851f8d436fe5d4c2eb02a35e0d368ac8b76cbb6d3e519b4903ca8888bd3e39bb16799f75ac0534c9c88dacbcba7bee4519757 SHA512 60a07462719a8b08f0f8b339f5f59d33ea5970f56ff17852ce18a6004461193e91ae76c88a06b97e1fec09ab604fff7bbc2c5aac2c58f0e0f59550340e0b4466
-EBUILD oslo-db-4.33.1.ebuild 2053 BLAKE2B 05b85c303e78e1d9dd5354045769188ca9540a3c1d47d980e62d312c9935d2ccc1b92292ef5328f6ca6e860d2a55d64363aa9721cfcc63b313345460dcfe166c SHA512 78d70216bd686f5aec087916d96b9e9680ab65cc3d23394b8a9f55f6abdb2fae4910ffe26903779e47542e882493abf97775d2375bc53d5ed47ba4ac8e941c5e
+EBUILD oslo-db-4.33.1.ebuild 2051 BLAKE2B a4495e041056b92ca29c1b6370c851f8d436fe5d4c2eb02a35e0d368ac8b76cbb6d3e519b4903ca8888bd3e39bb16799f75ac0534c9c88dacbcba7bee4519757 SHA512 60a07462719a8b08f0f8b339f5f59d33ea5970f56ff17852ce18a6004461193e91ae76c88a06b97e1fec09ab604fff7bbc2c5aac2c58f0e0f59550340e0b4466
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.25.1-r1.ebuild b/dev-python/oslo-db/oslo-db-4.25.1-r1.ebuild
deleted file mode 100644
index 58f1aae1ef23..000000000000
--- a/dev-python/oslo-db/oslo-db-4.25.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5)
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		|| (
-			dev-python/pymysql[${PYTHON_USEDEP}]
-			dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
-		)
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-4.33.0.ebuild b/dev-python/oslo-db/oslo-db-4.33.0.ebuild
deleted file mode 100644
index 2c75687bc087..000000000000
--- a/dev-python/oslo-db/oslo-db-4.33.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5)
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		|| (
-			dev-python/pymysql[${PYTHON_USEDEP}]
-			dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
-		)
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-4.33.1.ebuild b/dev-python/oslo-db/oslo-db-4.33.1.ebuild
index 15fd3d5ac288..2c75687bc087 100644
--- a/dev-python/oslo-db/oslo-db-4.33.1.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.33.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.db-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite mysql postgres"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 96807dc70fd9..47f2b0d2e522 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,5 @@
-DIST oslo-utils-3.28.2.tar.gz 85818 BLAKE2B 02e3bee59576a509d5c49e6bad98eca9e099e8a12296af73d5690e6410a4e0e7bad96a0445ad19f7cbee517e7da182979c60ffbe79ad2efedcd3b057710952f8 SHA512 39b8d4c67d97c4953a980fe9c8a9ad4b64704e65831f5f34f867ae027141c644cb39d14e5297419618b4dfffa24f2d10abfe988b269063490aa8194155a19f93
 DIST oslo-utils-3.35.0.tar.gz 86107 BLAKE2B 2b4e00af5993799e43b40d63c667fb582984f8abbdd768203e0c95d2ecaf0f8ea10ba70ed520c116ed0da841dcac479d81881b4061ffe3529d8fe26917bb264f SHA512 dee75fd36b1c3fbccbb432408769c15d17b7dfdeef3b6f7056218670ca2c7e97a1e98acae3e06810f842a8e20fab1cf419b23153cde94c93e6b60e498ae2f527
-EBUILD oslo-utils-3.28.2.ebuild 2891 BLAKE2B b9f0ac7adafb648e3796f8d905e39f2478e9d05b2bde64216184c21db3679ac743b513e049f100de00e02cf2f21a4d0efad0b1456a4b3e5b6af966fd9b1ae2bf SHA512 77fb30f320d0aa2bd0cdcffef52e7fe1ebc114bddbf89b337a0b17a2c11a3cf5630e02fcb171af97a1f7d05fdaed74e085702dc3191060ad57caacf9f5b681f3
+DIST oslo-utils-3.35.1.tar.gz 85615 BLAKE2B c2eea32d6844c59425a6e8783c1285dc47f2863401e6739bd7418c23ad1446613f41cbcd2e2d85d260ff8adddb681d9f1b5547ac521c2d9b5e2050324457bf97 SHA512 069fd262cfab3f5756b1135552c19c886fdbf72885f12b2ae84c67af1f50306ccc2c5331b1774fc49fb764107ad1c3e94305cd6fb6a25888ee8fa446facd2cbc
 EBUILD oslo-utils-3.35.0.ebuild 2696 BLAKE2B 3cf672b792c84113e5ce4701ecd01694087542d15b14bfe562f6fc2dab4af33c88d61aefd86ef2f43b39b60acdaf7aa22829a4f0a179eaf3a231976e36238fdd SHA512 34633e80baf9f70afb6da25e2303afc65185a130f7d0b27d426791065a8b4301c69de86b0e95112e4526d76c1e1cb4c8b88918dce4d3b3b20ab069c5d7028722
+EBUILD oslo-utils-3.35.1.ebuild 2697 BLAKE2B 05d4bead9b7fefadb668066b3543c6a0c7ca9efba78c1117bdf9edf3602b3a4ddf1a048693ec845e545a1296ef7389c797c0288a003ffc4ce8457bafba5e2cb4 SHA512 a538b23ffadb6c153ccea96c2fa6e7816e531cdba475d9d83733f7bbce95b3fd1947da1cccf94773534c2b883fa8694c8be55e36c27c5921477297ba4ecc471d
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.28.2.ebuild b/dev-python/oslo-utils/oslo-utils-3.28.2.ebuild
deleted file mode 100644
index ef3e39395e7c..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.28.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-3.35.1.ebuild b/dev-python/oslo-utils/oslo-utils-3.35.1.ebuild
new file mode 100644
index 000000000000..5a46cabf1f35
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-3.35.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation
+#
+# Installation appears to fail due to the use of namespace packages but root
+# cause was never truly established.
+#
+# Tests fail with:
+# ImportError: No module named 'oslo.utils
+
+#RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	cd "${TEST_DIR}"/lib || die
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index ed75fdc218cc..fb566d9b441e 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,7 +1,3 @@
-DIST oslo.versionedobjects-1.26.1.tar.gz 148214 BLAKE2B fa449b57db3ae4148fa431616b49b83d6a1424cc5f1845546fc945270bfa1b470f376a52edb0426f1fd86783cfe25906f476fab3417b3944c5f3074548704c77 SHA512 13962e9cfd5c63d9691bef0e1b31aa1751a506dc7a8aa3031612220778ba887d3122eea205456809bed9cec12c8fd5debfdce827d59ad8fc991ff85de7f841a1
-DIST oslo.versionedobjects-1.31.2.tar.gz 148160 BLAKE2B cb63e0607f4a9447618d287e3f2c252359832a0f4c7b60a22669da25ab90ebcdb8a97f2e10f61c759cba135329eb75be644809bd424e67ff1c6d61e612c45364 SHA512 a9d31a138e2f1e399e51b509c52c10c64acd783389b596032457c0fa74c112f5f6f67944ce88c88c35623f8d2d6612c09d04009d9014d0e9efc8f65b916d4ff3
 DIST oslo.versionedobjects-1.31.3.tar.gz 148869 BLAKE2B 90ee5fce0dc51f4be1e9dbe2e4cab501e7fa1625591847c6a37dad34e570f9739317ec5e1d08ce5a90c6fde3d639852d1f0ed6e6da33119c8d805146b7dfab40 SHA512 2c131ca04b3967a98ada7052fe176faee18d0fb36d53c94c6c098d88e108c865e4a967c8300fd2781bb18741f280781e398ebdb9cbe3c8b8aba516ab7800217b
-EBUILD oslo-versionedobjects-1.26.1.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
-EBUILD oslo-versionedobjects-1.31.2.ebuild 1364 BLAKE2B 7c6f9355d8b58cbd5b77b46472bb249780e0364b7da43be56230e749a3346709b5a387b4f9ad4c4892bfbebf8d25900950e0c77ba236d175a94109606edf3e6c SHA512 7bdb39a118b11270b5396b505dc7d955cea9bde6763c53d439f9f1239a1cd893db2365af20908a29d6af6968f961fdd571fba7bdba9ecb262e5c8184d38abf9b
-EBUILD oslo-versionedobjects-1.31.3.ebuild 1366 BLAKE2B 74d0267ed21443433dbacd7a460cb13cb9ad67b1a4600905592a2aa1317e1b05f69c339f040320d3a2b31e0d3979a6853a880160b53d4496510fe407eab74bbd SHA512 dbffa974d59763acbd708bdd9e6502dae19b150335112813748ae8aa46c1710e595c295caa91f26daa15394906cb570e261ce06a02aa25e6997e367b16770be5
+EBUILD oslo-versionedobjects-1.31.3.ebuild 1364 BLAKE2B 2dc8a9b39324c66bf7df5e18257d3849b67ba2b4e6cc55d104be1b74a1879954661b8c1a6b008962a474f8931200a6c67eb01de6ac1303f89fb5585c09aa3f74 SHA512 e0d5ccddb9300d2e36ea2e42276f0f6af0e175a71b38202eba13261ebcaaa872b6d41b28f62801585fe6659b42a628c0f835f5932327df1de923c2011f673178
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
deleted file mode 100644
index 589284cf89bd..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.2.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.2.ebuild
deleted file mode 100644
index 5fcb916b06db..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
index dd2bcb40713e..44caf072c911 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.versionedobjects-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index c5811f0e10a8..d02ccfbc65fd 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -3,9 +3,11 @@ DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
 DIST pbr-4.0.2.tar.gz 107720 BLAKE2B 346e74414cb77da61be08eee39148991aff7eaea7bab54407ce9dc48f422c576fd2125c11acb31cdf54cecb059281cf540c4ccfa005056c5c3b276ea2161c873 SHA512 d678c933a1d1b0319358b0d067291d29467582e6abb26e21386b9d98092f561e3b76965e0b18e12e88abab790b737606ae2a37cc11cb0a4a34ff6c1ad99cfdb1
 DIST pbr-4.0.3.tar.gz 108684 BLAKE2B e3a9a695b04333a9523c8e749628773cd12f38e87cd6cc670b8ba40b800871004a5cd9d038913e5f483291d180afbeb524535c6c68833ee48adde6ff276783f4 SHA512 9e5c915bd661e3356ad1b92b3d01df3a592a6120c9dc58d3e4bfbc3040f2d69f896244ea8f6c9cffad3e774747d330cd03e928cfc160e5df980c134fe2dee801
+DIST pbr-4.0.4.tar.gz 109077 BLAKE2B efe901b074cd6747fe123b6a325cb45e010d774834a875e86647b6a9c3afbaff9e435087e757ae4276c0b18558faeea57c8dec6b2039ab7b0f70424f64d94f57 SHA512 fc849a27c3b5deb89545dd05eb102a14f2c42a0d617f474df46b3292c14ab7e0a4343cd6e1a38eef77815cca49374d58698cb0c2fdd2aa5f2f47e890939adbb3
 EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
-EBUILD pbr-3.1.1.ebuild 2823 BLAKE2B 7798e252130bb16a1ad72bd4330f2255b222c496d755f7438b30ed6ff98f5a6fe4fb6af48dd6bc345feff91276993d3fecdb995e7a20c3c4db9c0d8897f0cf37 SHA512 c890c3cdf2e68e66c6d963d6b310811b652b3d6707428650edd1d288dd7915d9874877adae7a04250279243d275219abe3909ca020333c1ab21ec2938fe2458e
-EBUILD pbr-4.0.2.ebuild 2593 BLAKE2B 04196d494aed0c87e39adbb218bec8795ebfa3cbf02139be20662d2c08b4afc1d8a424f5c21513b42171dfb68fc0cb3749aacae8792138ef0ec43a3a6e13d119 SHA512 a5cde67f259ec50090bbf7881ce333bdb7f3d7f0e450ce0ffbd1a76cdbc1fab0a9fffef1144f0bb5806a8806a396d4a4852fbfbb1d9bdab77a78921d8c7cb6bc
-EBUILD pbr-4.0.3.ebuild 2593 BLAKE2B 04196d494aed0c87e39adbb218bec8795ebfa3cbf02139be20662d2c08b4afc1d8a424f5c21513b42171dfb68fc0cb3749aacae8792138ef0ec43a3a6e13d119 SHA512 a5cde67f259ec50090bbf7881ce333bdb7f3d7f0e450ce0ffbd1a76cdbc1fab0a9fffef1144f0bb5806a8806a396d4a4852fbfbb1d9bdab77a78921d8c7cb6bc
+EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
+EBUILD pbr-4.0.2.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
+EBUILD pbr-4.0.3.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
+EBUILD pbr-4.0.4.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
index 0864e76cdcbb..5dffa6c33ad9 100644
--- a/dev-python/pbr/pbr-3.1.1.ebuild
+++ b/dev-python/pbr/pbr-3.1.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
diff --git a/dev-python/pbr/pbr-4.0.2.ebuild b/dev-python/pbr/pbr-4.0.2.ebuild
index 3d26767fc84d..229da21adf65 100644
--- a/dev-python/pbr/pbr-4.0.2.ebuild
+++ b/dev-python/pbr/pbr-4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
diff --git a/dev-python/pbr/pbr-4.0.3.ebuild b/dev-python/pbr/pbr-4.0.3.ebuild
index 3d26767fc84d..229da21adf65 100644
--- a/dev-python/pbr/pbr-4.0.3.ebuild
+++ b/dev-python/pbr/pbr-4.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
diff --git a/dev-python/pbr/pbr-4.0.4.ebuild b/dev-python/pbr/pbr-4.0.4.ebuild
new file mode 100644
index 000000000000..229da21adf65
--- /dev/null
+++ b/dev-python/pbr/pbr-4.0.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+PDEPEND=""
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# This test passes when run within the source and doesn't represent a failure, but rather
+	# a gentoo sandbox constraint
+	# Rm tests that rely upon the package being already installed and fail
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-e s':test_sdist_extra_files:_&:' \
+		-e s':test_command_hooks:_&:' \
+		-e s':test_sdist_git_extra_files:_&:' \
+		-i pbr/tests/test_core.py || die
+	sed -e s':test_command_hooks:_&:' \
+		-e s':test_global_setup_hooks:_&:' \
+		-i pbr/tests/test_hooks.py || die
+	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+	einfo "rogue tests disabled"
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index fe490ac99dd4..1f1b7bc49c0d 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -6,6 +6,6 @@ AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9
 DIST pip-7.1.2.tar.gz 1049170 BLAKE2B 1461abba4cb80a9a4e806675ca2d996dedeeb8fb38f05b618f98f400475405da018ea6e75663c21b7b7eb5091408d602a3127afeea9a4bd29f075e5eb8042ad0 SHA512 78082afe6b559bf87f91ae9b6d304cfbfce00206e09be42fdae9d449a55cd8d968df6873e834191d0b0e6baae29e72eb3eee42386ff7c5dc9c29b6c28b754449
 DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
 EBUILD pip-7.1.2.ebuild 1954 BLAKE2B 2184816bd4e57b368ff1263d76d28c9a7fd191477050482823136c64bfb17c27324ebb0ca3975c6ecc8728de2b5cdcac9379ae8d569786c2859d9aa530d1be38 SHA512 d8a43060130717e744e23c98160fad30073c381ee3c9eeaae97cd9ec09d51f28d988415648ca9fc62771d2f44671b0f33c82dfc794739c1c45d063426c2a82ce
-EBUILD pip-9.0.1-r1.ebuild 2323 BLAKE2B d1561928cd3778e0d4163c13b2f6d1aa94f9a817b45456517ec951920f7f48a79c1714b1ba60695bd073cb342fc42df253a04e2a1209a70b591e26eb6190005f SHA512 455c927922b9284adb07895caa05a1534b09fa29d43807dfa0b7d57ca25d209de975606d47bd3f71e959189c1e5109235dc909bdc8b7911ba5a7f660930e4c5f
-EBUILD pip-9.0.1-r2.ebuild 2475 BLAKE2B 6f91e024f0e788f48be091df24c04db61ede955f4bb1fd6d0d5d995817a963e61fcea913a39fe77e38c361ab5074b83dfbd64023cf22b08d3d6e26a1e78b92bd SHA512 f559b788d0916b1ca22bd127edfb7e8a02d9ead3de961384b0bd52881ef4a8368a9d0d683c9fa0d96568ab54e955c56370d700f633699849cc7255573234f7c0
+EBUILD pip-9.0.1-r1.ebuild 2336 BLAKE2B b0f124285dba096dce9151ad1818429c67c37d7e1ef919d1293c2fd1b19b85e4b56e0f4a228c8d627dda776eceaa26f0c47a7a71e71f71bd9cb8e45523e5e5ff SHA512 74934b66b094369a35ec4bde39ef12b64edc2a8256947ff418f6a01d59d248fef2fc90a7b15c804817d2ae9fcb10a3908aa41884befad5d63cc48806b75738dc
+EBUILD pip-9.0.1-r2.ebuild 2491 BLAKE2B bd84c826290e1c46b821da2126ee36c60025f60c0b2c33fc45d61cc3b7ae9e4588b90906fbffd8173fadc0a44b5ccdd1084d7ffe95919b0a01fe1af0194762a5 SHA512 adb1f526753d2a08fde8e1d89f56b5fe03928f31168a8a8e8cebc6bef9efa8378c266299ef96240b83619f78062c3ed49fcf572aa90c62ca8146fe929b282250
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/pip-9.0.1-r1.ebuild b/dev-python/pip/pip-9.0.1-r1.ebuild
index fa02fc68f6cf..3590b2dceaf2 100644
--- a/dev-python/pip/pip-9.0.1-r1.ebuild
+++ b/dev-python/pip/pip-9.0.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 # Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
index 0e8e86903001..b0fb1e4ced84 100644
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ b/dev-python/pip/pip-9.0.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 
 IUSE="-vanilla"
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 5e01d8cdecd2..d4e10441344b 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,5 +1,5 @@
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
 DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6b993d84e9ab1bdc9ce04b32df336d88df13f13a16a1f0bd4acb7b900208e98c84f007bdc3654f9a1d5f19a2 SHA512 dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812
-EBUILD pluggy-0.5.2.ebuild 740 BLAKE2B e052fdcaa16e0fe71b2a07ab9b3fb890c090854f1fa74da76d9e2b107efcddb8b197ff83afcf98bfb9563bd4bf8a6de6927b0d16011ae97648493fb01174ff08 SHA512 94b6b855f8f31affe4a036e4c84ef37651f22101a4510a6c7fe396964f023019bdc51de802958b5e4adc32b179b64f8037996d75029e5339a170027687314c3d
-EBUILD pluggy-0.6.0.ebuild 756 BLAKE2B a8e08b57fdf1e57107894600c823f34681fcb85f9fb6c8033b8a3be8f5c706d404ad2d6b98b616529509f72090a643c3e1222a091d4900c6a706f966f35bb3ee SHA512 16593ba25d0915ce286c61d525a17d63db94fd55b8fd301d592880f1d4ab1a19ed698e2ef055b9ecddc13a5b3ce21a44db0235e44a0c7be6635daa990d685fa9
+EBUILD pluggy-0.5.2.ebuild 745 BLAKE2B aa43219d6e90d1705dbdcbd11b7ee7a2a1c186ed08d4832b9f9fc041e74c5bcae34d30c83584e77c020aa50db404788eb1f36c091f24573ecc45eb47ddcff162 SHA512 bd9af6d41e67f3c15204c41b4ec9bdad66a820bd463dfb28cfd6a96d47530f8bd942e31f707b56781e2da61643a9067b3463ef347ed78a1a35f3daa6cd8af651
+EBUILD pluggy-0.6.0.ebuild 762 BLAKE2B d53e3c80c9bb12d3e2fea4118d9212cf7007c5bbe00733ee42a0abcc5eb95ed62b745d98a724bdeef0f3a76200a58c3819d31b7ac4ca91e5563ba62e41f7824d SHA512 b063a43e5262bf900ce905d7c375e5130d447a6e9d435ac087b49fe7477e9195aa5061a083ce6d26ce02e8cf7e549cdb0bb361466be30230f3a04ad427cacdf7
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
index e8b47647de2a..ed42e6d41295 100644
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ b/dev-python/pluggy/pluggy-0.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pluggy/pluggy-0.6.0.ebuild b/dev-python/pluggy/pluggy-0.6.0.ebuild
index 8a2feccd98dd..b594318c978d 100644
--- a/dev-python/pluggy/pluggy-0.6.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 3d97f56f026c..a847acf593bd 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,5 @@
 DIST prometheus_client-0.1.1.tar.gz 41513 BLAKE2B 3816b34a809c8e40da6fab221bf020bd3d4169c6d1e96a4c48631133cff4fc2839bf1ee01df67711ed4d8c4a38b6ad53c612cddbbb9a7fe45a9b3887cce900e2 SHA512 ac343f416dc4f9907e4da0de19d2005375102fb552491025d76466dee1fb1be753a8e20380c83276116a1606a32a9373db53e8a2952669d511255438d74ba217
 DIST prometheus_client-0.2.0.tar.gz 41574 BLAKE2B c8e0288f37d1d3e6548283105dd6ba1e4cae5a6f1846c776538de1a68a2eebe6387f8212631c07f2c37839204262d0f555f1a5edb624c0d7418753123c296ca4 SHA512 7336d8294ef91dfebe91f325a882105cdaf947de212bff651d1c3ebfc139d9045b7f637ea44b18e921a9f2ad9af554aee28587e57b1202b5a30c49b1a765ba4c
 EBUILD prometheus_client-0.1.1.ebuild 724 BLAKE2B 4de9631ca46dfb6f763afcef99a5734a0c9bbe40e82a16cc50b513412ef51a00c8cce7f1d6876446b9669bd70fe317242ecf7027a18ac99172207c0cdf3d6528 SHA512 a7226c94e5a27173a648d682e92bbb8573ae408bbf43aeb3b2178a137e49bba1c4c7c8f143bd54016fc193efa80bbb3c56eff87dee71d9bd15e57bb658664d3f
-EBUILD prometheus_client-0.2.0.ebuild 725 BLAKE2B 0b5fac1df62e3fa4421edc507493b7486f56691af8e4c80c34fe3e7ca0577a71a018bbbaae44f0fb94dc2fbda67175177b352c5bda5a0acab4c0034797f32daf SHA512 e9c96e827a9ce8b60d4c16727848864bae9681a4328fe6d7c409bf53ac4581e1e5d47b6c19e9e911f6943a1bc0648a38ae0a15ef40d81bbdf653a8cfc10dae84
+EBUILD prometheus_client-0.2.0.ebuild 724 BLAKE2B 4de9631ca46dfb6f763afcef99a5734a0c9bbe40e82a16cc50b513412ef51a00c8cce7f1d6876446b9669bd70fe317242ecf7027a18ac99172207c0cdf3d6528 SHA512 a7226c94e5a27173a648d682e92bbb8573ae408bbf43aeb3b2178a137e49bba1c4c7c8f143bd54016fc193efa80bbb3c56eff87dee71d9bd15e57bb658664d3f
 MISC metadata.xml 451 BLAKE2B 1596b7eb0ca176a5a00d44356c15f35268c3170f90bd13ffaceae39f56511c33f78724ab2cf3748efc1b3b10c71a1d1361ced3192c4c71a6dab5f616fea3051f SHA512 fec61f65143e869244b519455a7214884de5e72c75cf7e500e5aa156c41eb1e644ece46c402cb4722ec294e876078f9332654901b06f2a6f5ab8449f0181532f
diff --git a/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
index a86c3230d43f..23d531c51c0e 100644
--- a/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 S=${WORKDIR}/client_python-${PV}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 9a1e3bbe9011..8c4e94078298 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,5 +1,5 @@
 DIST psutil-5.4.1.tar.gz 408489 BLAKE2B 867dd9b535134ff2ef5960f774891eb4743afc5857c4e0ba7306bd4feb42f3b255a6174a092eff2814f3e2ec9d29179d23ffe495ca85dba56fc42616e67c9a8b SHA512 84d9f61cc6c51798d98ac2f727a50d85de32171645d01abf85d4f8c58bdb3b40997ab717f859de3ea21cf5b24867e1a416ee3036d6167d3fe735eca4607a110f
 DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b9cbef9e0f48b0379944e2aa06ed498adfddc30e8d9ba8e02a08f79d4867dc1e313a62040ad3550d69d62664f SHA512 f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
-EBUILD psutil-5.4.3.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
+EBUILD psutil-5.4.3.ebuild 791 BLAKE2B e47becfa829cee334f4bb4131daf8743f3cad376771de8399722e0c6471285b28edd2d4315bccb67c3810bf7f59f5db30801f4750e38a1dc2b17929adbaa9021 SHA512 13fbeb2d345b476f676fe3d1b0a9c28754ebcda3c3377d1834b0e09173b47bd2b63607539028d064340d02090381deef92779b90615076ff91ba3f76923845ea
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.3.ebuild b/dev-python/psutil/psutil-5.4.3.ebuild
index 272d780175ca..31ceed991858 100644
--- a/dev-python/psutil/psutil-5.4.3.ebuild
+++ b/dev-python/psutil/psutil-5.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 8150e11c56a2..0b226a88bd40 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,5 +1,5 @@
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
 EBUILD pyblake2-1.1.0.ebuild 800 BLAKE2B 5c3fa94d977b1579966283790a073aa038f26c07d420cd713cfcdd96a2da7c9c4cf3d4180f5d9bd8c51542852392c7cc7d2b3c5ea827943535c0337033119545 SHA512 b1ae954130ed64b5d9bf7ea3d97634a38d38cb1fb659a50bfd349f3d0265c65d3e0f1c3315b265a18530e912973a2b0bab5ed4993f535170579e0fc26ea3e16b
-EBUILD pyblake2-1.1.2.ebuild 856 BLAKE2B 7438fd71cc7db5597b9d909c7678ecc9d56e5547ef084f6892229c6e20a4d3c2c30816fbd906b3dcca7c10ad9d9ae8a48c4ad4f6fdd87ad15129b0629c8a7771 SHA512 15ec72d6632a9427f45d4d3d2fb65609f18db9d14c7dfa12f8f83a889d42a2ffff15e7098bdb3b497814b32b570c66cb8dc9d89939c14376fabb189602e84869
+EBUILD pyblake2-1.1.2.ebuild 861 BLAKE2B de009512a89eff1df6712d55ddb9d8db81caeae2b19b0ab7ca20c4e7fb52e41f0c69aa0639be9817f89285dca2716ac747b5c319c732c2bd52602c4911d11a17 SHA512 1a3419a4386d115b980b1b5e0120344fe46660dc49f33753f17c74b77844a3cf0f44a8a219526956e97092a2ed54ef4759a27a6680a932a1ec4bfa036abc24b6
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
index 97f234dbbe23..dc4adb90d2ab 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 # pyblake2 itself allows more licenses but blake2 allows the following three
 LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~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 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index 775f5388015c..caf8dac98440 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1,4 @@
 DIST pychroot-0.9.18.tar.gz 32879 BLAKE2B 769b3347bae3f7dfb47c0335015cc898ec851a3d45f774a4e21aeaf9b8d7937331bc69aa5bcbb298e76e7e51ffc2e55f049336fd90f6b08fc3bba87089f2205d SHA512 59c8750c9ba8d601eca485079c04d4153bba92531dbd30fba0104694e4435d76e65b762b76ef89a6a6f8908dd6054d1d95fe4be74825ac1c5a56e473370dfa41
 EBUILD pychroot-0.9.18.ebuild 1149 BLAKE2B 3a77de87563d777b6fb44603de847a5a8637949c10050d74e0217e76b045b59509a814df9c8585bde111a07930c92c79d2b9507ba8acc3002851689bb8f7164a SHA512 c019b5e5d73cec26a74cd363c2784a4ccb3e8bda0aa5ae472e60f6165b533ead1ad54a67740c3021c17980d11729b66460f7a0ca244eec62c576ba649ab3bd97
-EBUILD pychroot-9999.ebuild 1149 BLAKE2B 3a77de87563d777b6fb44603de847a5a8637949c10050d74e0217e76b045b59509a814df9c8585bde111a07930c92c79d2b9507ba8acc3002851689bb8f7164a SHA512 c019b5e5d73cec26a74cd363c2784a4ccb3e8bda0aa5ae472e60f6165b533ead1ad54a67740c3021c17980d11729b66460f7a0ca244eec62c576ba649ab3bd97
+EBUILD pychroot-9999.ebuild 1071 BLAKE2B 8634887e73de39ac708432b0f0a96e613325f938d68ae82a361e6f56a9eb50db4d7722f7e068379d768e92ddc5ba69e1b58008a2ce0ffa3386b827af42b0eafd SHA512 2009fd14e347b0f543b239568b7a3775bbd9fa3e1b70510cd45d43c4c687cf4c5af5c551e23a141a8bd2e716480a59937b6a050508e76a80ebb9a007a2a5f957
 MISC metadata.xml 337 BLAKE2B 3c60605dbe9296fe7f6c285123fa649b47c4997af6f715cefcb5047817ddff55f15c4813c2c33dcffa4e771ab3d0afb83bd88506d915e313b237e51ca4729c70 SHA512 4b0da70f35cd4983f6f5cd8aa02e5555b770d3bc2b7e90a8e8287c64593fadf1fe532cef6becce24de96766f94d24d8ec731ac3acff6f42a2c7b06c3e1e1e4d0
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 6cb401faea51..57a2af631a20 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -23,15 +23,12 @@ IUSE="test"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND=">=dev-python/snakeoil-0.7.4[${PYTHON_USEDEP}]"
+	RDEPEND=">=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
 fi
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 [[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
 
 python_compile_all() {
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 9056b947f648..20fef6e44c2d 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,5 +1,5 @@
 DIST pycryptodome-3.4.6.tar.gz 6968560 BLAKE2B f066199a9d05bd046303be62c43835908c90a4545caf7681d2c13db78ce345858b8565daa26ccd4a328eb944de469b943cdd0bb3f58591de4e2a09e130f7381f SHA512 40c9ea4cf7fca06bd7cd3a100e1d602e0130fbdcc75544ff1353ced2fae8925d29286200561832f2524a0f3db155a6924bb653d964408d4486aab694bf275cdc
 DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B 02368e2af0a12686cf2e635cca8e2c279f7c3b147a66f99e97cf04d829aa66eca5629f7cc8e76420970a4fa5ca5f97e7d2a04438b3a2ac5feb980fa96998b3ff SHA512 a328df1f3b2cfeccbb5984aca4c5cbd59e8a352c817e82411d2876b2494476027f63e61200b0cc87e9420e8b47e91fffe71865fb2c23a66da0276814641eaab0
 EBUILD pycryptodome-3.4.6.ebuild 824 BLAKE2B 7a3d9132f8cb32ec3779dc8976fdd68716fa532e88f09eaa43a7cbb3aa563d722ea68d006d6fd32658bc12375086f5b6fd08c4aa0c8095de499baf194aa95a0e SHA512 92013712e2cb90fbedb4229a48456c7ad08cb750c68d937673dae5a29452b4bde4f27dfcd1d38e25b9e820f95449f88475b150b1f4f7dce736b1ba7a96f46e39
-EBUILD pycryptodome-3.4.7.ebuild 880 BLAKE2B 1708a361f26ceb29897d6a6a7a9cb8702063f4e3d7fbba25250118d82837b36f7e1b2d0ecaa368e4ab8c33790a5118d035226d7d80ec78a61a99c009db585658 SHA512 804e40de765da46c988b61db04f0aa5934c5ac32cd8bda0907f367e04fc702b980267c6a22c2ae2102bc6cd93280369f06279d9afdd8b5cb0edc069690078739
+EBUILD pycryptodome-3.4.7.ebuild 886 BLAKE2B 65099191790ac9d27fe531757b744ef34fd266c2c985b2f1c041d6825443d96c426f22cbbb0235ff9e87292bd18f428f93c4edb40c3dabda7c766bd3225faab2 SHA512 3f3d2e311bfb7ba32f6b09a7d836228db5c458d01e0e218e56a433dd3f80c0e2ca71204acd3b38f7900bcbda9dad48705946a27b9cb368355961db63d40b3c1f
 MISC metadata.xml 334 BLAKE2B dd22c5da46085356e8049d290266f66f81a648683dacb4ad33faedb86b890c911047f245eb96b418cbde226b91bd91567036ab31919ae28e488c5eb993418c1b SHA512 f314a41851c5f31d68a7fb93ab304aab44007756472c9f18c746a0b0a7bbf464a9f196559f4ecf6f8b68b265b7ba9ef571398e1893d316b48a0fa435eb7a1b3a
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
index 7f0578c17ea1..b32309370f9d 100644
--- a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pyflann/Manifest b/dev-python/pyflann/Manifest
index 8a716abed92f..8e44b6455920 100644
--- a/dev-python/pyflann/Manifest
+++ b/dev-python/pyflann/Manifest
@@ -1,6 +1,3 @@
-DIST flann-1.8.4-src.zip 561057 BLAKE2B 0cd1cf7bc394501d878d848246f76919924e39dc950e49e82bd2c8dbf46d9626fc9749ba4578ce62aabd0313314969dd7f6883c42167545238bc89561ce028ce SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a
-DIST flann-1.8.4-testdata.tar.xz 26744244 BLAKE2B eb8a5066d79dedd2ff4ec48f0e0969d6486417abfb2cc5c2e3e1e0f8dfef637f2cb290e8f1868b819ff7e4d71687daf2aaeb16c8197f5642125ea50ef775441f SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
-EBUILD pyflann-1.8.4.ebuild 1241 BLAKE2B 4b4bfa99819e2a2cd95d19bd5f9acecbcfe67d1f09b35789e32ed26e1f558774688debc613d2c79f81f787a7587b76b58c90226e4717ebb2ad313157dd1574e7 SHA512 9eb93ba7cb4ccbc94f201757a546f929da0bc0eb3e86910669b8fcffdc05b4649bcf5985273e724539cf91d06b6c417099a604db862dbc598c3c1c99f8928c08
 EBUILD pyflann-1.9.1.ebuild 891 BLAKE2B 9c50a989ec4efc7d2f1ea9dd8851de0eaec60d8486e5be401928fa983a52b4dafa4ee96e3ae37225d27decd3b4693c23ca802041a0a5067ac8f5cdcc5b8820bf SHA512 6a3c8349eefbaaefcdbe806eabbc28c48af88fd71121ca135b18c5ca67bc9028844509c852fc8b9e3629355b2aecbd5c3f269aba6c0ec885cea0d91a283b1b69
 MISC metadata.xml 761 BLAKE2B 8f07995a5b919b587ce4621911d1c94072cc0fa14262417a607045033bffc6c314c18a85688b0d46e7db2a864f1348e2bb11ff205199bbe1c1e92fdad63e803a SHA512 0bc2639b02b93bfef45e8d0fcce984d9c75500f7f043ccfabd8df959c6c214f2ee67130276bc4b4cf5158fb2c3f8bfa629c8a2def6ec1c065916435da9aff142
diff --git a/dev-python/pyflann/pyflann-1.8.4.ebuild b/dev-python/pyflann/pyflann-1.8.4.ebuild
deleted file mode 100644
index 43f4060e2d8f..000000000000
--- a/dev-python/pyflann/pyflann-1.8.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for FLANN artificial neural network library"
-HOMEPAGE="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/"
-SRC_URI="http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-${PV}-src.zip
-	test? ( https://dev.gentoo.org/~bicatali/distfiles/flann-${PV}-testdata.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	~sci-libs/flann-${PV}"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/flann-${PV}-src/src/python"
-
-python_prepare_all() {
-	sed -e "s/@FLANN_VERSION@/${PV}/" \
-		-e '/package_d/d' \
-		-e "s/,.*'pyflann.lib'//" \
-		setup.py.tpl >> setup.py
-
-	use test && ln -s "${WORKDIR}"/testdata/* "${WORKDIR}"/flann-${PV}-src/test/
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${WORKDIR}"/flann-${PV}-src/test/
-	local t
-	#for t in test*.py; do
-	# test_autotune buggy
-	for t in test_{nn,nn_index,index_save,clustering}.py; do
-		einfo "Running ${t}"
-		PYTHONPATH="${BUILD_DIR}/lib" ${EPYTHON} ${t} || die
-	done
-}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index f19ab3ffbc48..23498c3e2b7d 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -3,5 +3,5 @@ DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0d
 DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 EBUILD pyftpdlib-1.5.1.ebuild 1298 BLAKE2B 2b6ff8c9de74fc7e94720c6deecc32ac2303674f80230b7b2823f43c84755153f69d6c3254264a5b1f41ead167227b71fabca1341549765b045679686d9df1f8 SHA512 5c44d3dcb62a9b72e4773bb5eef46b69576924367db85de5a73977f187d0cf5c8023c0756b913dcc238d6e3ba16f62a06355fd74463bfbe716a900aa3eb86468
 EBUILD pyftpdlib-1.5.3.ebuild 1463 BLAKE2B b133fb918b07756287a1936f7639946541f241736e494834d06898cb0c193c35e07324307f612e5b12389999477bff44f0729b94d83e15faa022429fabdcba19 SHA512 dcec60595eb0f5fb72ca7f72b657b3f275dc80974a1bd6655704fc00bce2c4c25d3c4c6d42f6c7f0ae202d70df95c4a26fc853448c4948feb3f690c452ca6f0d
-EBUILD pyftpdlib-1.5.4.ebuild 1693 BLAKE2B 8c29a8999d93fa682151fe7d5fa3b6d7f0674b1c87e67226370a54d36db7d156c7beb527e78d4359cd32212f3000873b57c9862850295f70b1cb2c6fe250583f SHA512 9af8ba7d7932286082fef24650e50416125363eff4cfd6392d8b57e7dea865c4393d7c87ed5a05ae02309216d02e1bf5c040c9556ec67cd6b1178c4ca64edb53
+EBUILD pyftpdlib-1.5.4.ebuild 1699 BLAKE2B 31d91640201f04def3faf992bc80f77954437f5ef799bee2010e46a1b33c884043483f60a22e9f59a2581c46fe0fe5f5fbf536ecd5f8383e3232172b3441ebb5 SHA512 f936d134d98ff5d020ba43e984e72d157eef1581c49217992b4df731d7a45816f0027727d1b66fdd43211223274de632dd2799f9fcd5d67aa178f030ab24cabf
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index bc5c598d7193..ba8910278352 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc examples ssl test"
 
 RDEPEND="
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index cf28ba193f90..fd2f830101ff 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,9 @@
 DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
 DIST pygit2-0.27.0.tar.gz 477427 BLAKE2B b12924a36ebbcd269e5acbba193b734cc5e6a804fc71c0b322503ecdc6628059cf0f12db867f2e335026bb0f4edd089e9a46896049027c9514b0e555f6e2a881 SHA512 e19363cc8135b3f538748f07ec937dae6668f22e5881f914e9406dcdabee65ed546caba27703d19fffb146083e492e51837fa93af414a35006cf1c81c36d9356
+DIST pygit2-0.27.1.tar.gz 477820 BLAKE2B e4db7bfa484c28130ce48a2b23a0af26a715d15a789998001182f7d5c426a7f0d432d8e6f598346ce417b2c3532eb2a3407ebcfd9d48723a1e6359a30574d46c SHA512 9d889c13ad55e6c65e24b334f114f7d23b90961ae21c5b1f7bd8d85d44686f7ee8e98c13026c612c9a5feb500a54cf77bfa1e2bd165c657b58d879511622e6f7
 EBUILD pygit2-0.26.3.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
 EBUILD pygit2-0.26.4.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
 EBUILD pygit2-0.27.0.ebuild 628 BLAKE2B dbc768de68924ff24ccf542585022bfaf5e4dcd1231d04606ce63c9dbb290b34c9b4e70ad8f774ddf2db2b7c819c0d67b08a52ea0ebca1bb1505467937624a58 SHA512 4171a4371ef61ae42ee0fab24c775193ad5761ee35f460fbcc05a5049d4801b102a8360b3bbaae033fb2fbe65102515f9c362a06881b625e1cdb0940b482ec74
+EBUILD pygit2-0.27.1.ebuild 628 BLAKE2B dbc768de68924ff24ccf542585022bfaf5e4dcd1231d04606ce63c9dbb290b34c9b4e70ad8f774ddf2db2b7c819c0d67b08a52ea0ebca1bb1505467937624a58 SHA512 4171a4371ef61ae42ee0fab24c775193ad5761ee35f460fbcc05a5049d4801b102a8360b3bbaae033fb2fbe65102515f9c362a06881b625e1cdb0940b482ec74
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.27.1.ebuild b/dev-python/pygit2/pygit2-0.27.1.ebuild
new file mode 100644
index 000000000000..aaf291a7b44b
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.27.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eapi7-ver
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-$(ver_cut 1-2)*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test --args='-v'
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 9ede9d0e20c2..1256df0d2697 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,5 @@
 DIST Pygments-2.1.1.tar.gz 2114190 BLAKE2B b0e5d5a62849c97aaac6f0edf26230d5573715fb759667ca888372666634ab68da4580b1337ec4ada013b643411c221c572651c6fca6745b976794d5c6246e5d SHA512 7eb35865074f573ef7d41a1f1ee7576a83c32855018d03570eb70fd6864ddfbbc3f93ae082c4ac7e4a274a0ef387ea4ccb0909423e01efb6bb8e4fefea8f2807
 DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29
-EBUILD pygments-2.1.1.ebuild 1673 BLAKE2B f2e938831fbae9675bcbff7ad0451b460f9fcaf2a0b2470392eaa996957f4a380703e7c03b0ed1c275d5a9b7d9ad3d50bd9a0d2ca5929576bcbc9289173cb77e SHA512 11b1b1905770a620bf97d643bd107b05308b53be963b77d121850c5796ff8a49ff6897205bac700feefdf287ebb572a5686b0c408de49d43c8942985686c5d40
-EBUILD pygments-2.2.0.ebuild 1686 BLAKE2B 74511aa12a773613aa6466b525a1e0ea05fa09811a86c317315584c60abae85fe9482a6852f4ad600cd0c5f0523822f23a931bfe5248a267831ae17966a9aa39 SHA512 98b7c603c151952ebd0a7b36d840661229ddd94345d90ff3c8ff18c63d4a46d4d5abc3c83a5fd621f9a0103af2d754cfeea35572e7f645df363009c69dd52197
+EBUILD pygments-2.1.1.ebuild 1670 BLAKE2B 646364f36a2c9b8a3a9f09d32c77d42f79f403ae6af47b88ae8254ccaf825cc8d99e77b26ff6f3262f559b08204e02772f603f8a7451e887206495ba2b167c18 SHA512 70f3d14b209d32bf5732cd1d1087ce539958a06ec1938335796208687adb1ed488c9f9a1e93c66fd346df5b51f186727b33c7ac4d24be6ffbad0d4db9dabc713
+EBUILD pygments-2.2.0.ebuild 1683 BLAKE2B 8704568573583b97ec61d5134e2c277257bc54b34cb7b16231c33bac36aeeec36c857294df72082b82df9768c008da133a3eac1a6503103d48e50ad40a462f93 SHA512 ab6aab59368528f8bdb4ab706b5dbad38b1e4d5ad997c0f39220b074dfb3dd80e096300324bc6ba1414060c4005ac17ee151cf81e2ebd6367f7b2334263f50d1
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.1.1.ebuild b/dev-python/pygments/pygments-2.1.1.ebuild
index 2f23f9db6c7e..82cfec6da8f3 100644
--- a/dev-python/pygments/pygments-2.1.1.ebuild
+++ b/dev-python/pygments/pygments-2.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index 413fa9ed07c8..856b4051e571 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~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"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index b1371ef7c5d2..01c57abaebe9 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -2,8 +2,10 @@ DIST pylint-1.6.5.tar.gz 465578 BLAKE2B 05412a528878633ef7529dd2f2d2d1989bc94066
 DIST pylint-1.7.2.tar.gz 488628 BLAKE2B 6f2902bdd18939f251515d652d2e9df43162c1b0c27c2e2ed7392ee77be9e7f81bbd62cede4f2eb1e7aa646bf47c48b01436e04cbf46a20458a1c89eff752d9d SHA512 268f141f017fa4df6024596bcf1dfb32a578e9459864e2ace8c2725c8f5e117e0b01d9d745f1632bb43102a01f7075dc3fb69b839b79371f7df47740a56fc1cb
 DIST pylint-1.7.5.tar.gz 486892 BLAKE2B 0a415045e16aeb6e8543af003cff3061756b01bcbeb9f62de7cf1a63356ff01c3a2fd079e51ee0f8b1b797dd3de29c14d9928c0b4d0214fda82fbc2dc12010c6 SHA512 9f28cc4f88b26d2299ab3ea015935fba8c96f700c7898ad8fbdecfa0902f10a4ca54ad346b18452f8a589f8b63494bc12487dab36d168f336012b259bfa6f3f8
 DIST pylint-1.8.2.tar.gz 510319 BLAKE2B fd2d28d48cc5b7690428baf3e4a4ba56a6c59dd3bae6fac12046f2c087f1f6d033f4c318f2977d3ee3cc6a463a089a02364f0e38859c2eba5a39dbe6350e19ec SHA512 3cec971314bcc9ad7aa32d6641797adb0adc440414cfe982a10777ffeecfc64588f9c1d8c6d8074131b1389fe5ecb2e6aea5c24ba3047f917a60d12808b52d8c
+DIST pylint-1.8.4.tar.gz 512582 BLAKE2B 623e224ec71756cc2528346ac62b8e58ac4d5ef55d9e31e667d5389aa5b2dad712f60c7e90df5c831f57bf28e0ccbd00ddece4ade46410c28b67adb1a041a85f SHA512 07e55ed3f09326e1973215046e3b172f6065a7ed0ae657cba7a6825a26bb103bdbf8b83126bafd99f332fe0eec3547bcd6e618d6e9f612ddcf9c504bb850dcd9
 EBUILD pylint-1.6.5-r1.ebuild 1804 BLAKE2B d88b604448f1326055a1b4b4fa3fce7723b8c49c438f771bc323ff0be1fb8bd1498e3c587eceb3274accb603ec128c27320102c2eb383b4df9bde1524f9ad18a SHA512 6b0e624b12f80af0b043e27833381cbc4164c0a20822876954946c7715cd6448e6878811e1f9a7eac32a47b2699eb7b06a1442426dd38920213636a5562052b6
 EBUILD pylint-1.7.2.ebuild 1871 BLAKE2B 0a3c637d049bff7127d7c3c6efb8dd85ab06513abcbac7e2fe392d70c5acf55347c8a40b9df6d8f0edbd920cf0e8d6642e475b89a350d61342f431e1191ef285 SHA512 1a8f0831d979ba19880a285a6d1aafde6f5c113f4baa3aa412acc877c5ddde320e82302277fc7598c0890abfeb9852725a3c17f2ae3b506f96583810f3ac149b
 EBUILD pylint-1.7.5.ebuild 1876 BLAKE2B 1709c6b955bb02763514445ede2a8787763501009ecc5e729b93584084c69ff80d4d92b02e1dd86bba8e3e619dd4af077983fc96d405bfb52f8ba41eee6a0864 SHA512 d6248aec88f1eee54d58a438cc8229c5ee0f9a677e4090b542c225ac81a31d526d58d649e4774e7a3738f89af6708706aecd661b6d5d215f5227b48bd0a7a2cb
 EBUILD pylint-1.8.2.ebuild 1876 BLAKE2B bebf7523c2b74fc44847c4da0b5632a63920e1b30f20aec6b394bf9793d7d5e06afea0a63d82f8950d95b488f5582735d1012cd45bed8b125feef83068b682f0 SHA512 b917b1dbd59e1c73aba4d941317c784e6bbc46ebcef6f57ba6665b4976732d1a4c79686cfe4cf9fb03010e4bcc1101b4b6389ba971c88f4a4d391635917ad7df
+EBUILD pylint-1.8.4.ebuild 2452 BLAKE2B dca6596cd592961eebfcca36445bc4d20b9bd84465a5b859173c937da3c26c2304715d992b20da34e504f96c35410621f7ddcf611dd9da2bd10e14f02346f18f SHA512 bdc1fde62500de419acac17bb1a4d6851aaa25207e55930c3d59e9ac3ac4119a92a61ad82c5ec66bb9b78d96815b665ff543df63385c070f50858b1422195684
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-1.8.4.ebuild b/dev-python/pylint/pylint-1.8.4.ebuild
new file mode 100644
index 000000000000..b7148eae0d7e
--- /dev/null
+++ b/dev-python/pylint/pylint-1.8.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/astroid-1.6.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+		dev-python/configparser[${PYTHON_USEDEP}]' -2)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		<dev-python/pytest-3.3[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove unused dep
+	sed -i -e '/pytest-runner/d' setup.py || die
+
+	# Disable failing tests
+	# TODO: investigate if it's our fault and how can we fix it
+	sed -i -e 's/io.StringIO()/\0 if sys.version_info.major > 2 else open(os.devnull, "w")/' \
+		-e 's/test_libmodule/_&/' \
+		pylint/test/acceptance/test_stdlib.py || die
+	sed -i -e 's/^# pylint:.*/\0, import-error/' \
+		pylint/test/functional/deprecated_module_py36.py || die
+	sed -i -e 's/^# pylint:.*/\0, wrong-import-order/' \
+		pylint/test/functional/generated_members.py || die
+	sed -i -e 's/test_good_comprehension_checks/_&/' \
+		pylint/test/functional/using_constant_test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# selection of straight html triggers a trivial annoying bug, we skirt it
+	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
+}
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 4f7c24355ad3..baa84492597c 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,5 @@
 DIST pymediainfo-2.2.0.tar.gz 421683 BLAKE2B da7145bc0ccb4dbd227ae1b28691d6b7c85bcfa604568624b233e7aa219429b1678c7247e142b72fc1bbe99eefada929f8ccc50984fab033e179f2d97bf86839 SHA512 70081c0d7f952433dd706296b4d564004b8c28af431871388d5fe2fafddbec9e2035d8bc50df170e3761bb258b113a42bf2dc13ce3b4663f724ee08cd4136cc9
 DIST pymediainfo-2.3.0.tar.gz 423912 BLAKE2B 2108627d7eb661a4329b46abdf6821c7f9af6d3817455edf884d3d96af534424ae434e28c061deca699e967913c40b609f72ffe38316811d4c7b09008de0bde2 SHA512 6ca616ac92f4e8ab71d8edcdd1208dc3dcf9a13f7c3dd2d401a4997c95222b4e559786678826f75b631c4c46913c9cb390126a5468714a7c417638d3a4468d32
 EBUILD pymediainfo-2.2.0.ebuild 965 BLAKE2B 3ca559ad788ba79d963687c62eb0ab088f2cd6a942dbc7c5a960ebf6940f6e0f6f144132bfef1d2e77d73f0638d17978e80b20355b63c1abdd01e28535bc7bcd SHA512 c0c09a5ba066fefff04598a6bcd0ac3693d83086a1521a598b7a83523e061a4bb1c9c9febc64693820ecf28c329997d0d7b4356460c7c79bf1d1e528adb20dea
-EBUILD pymediainfo-2.3.0.ebuild 1009 BLAKE2B 296bae170d3d1d786c7085d1b6e5894d6664673be91d634b507cafabd9a4072738255e7acd00820b1e5d5bbe856edb2a30130d68ae2012ad3447801d99c83a91 SHA512 eb26abe77154be4485285eeb806d5498e1099d7bba32711caabe872770066392bdcf00137c39c7905142971dd2de70dd8b951fbb03ad366eeb198a31389a4f5a
+EBUILD pymediainfo-2.3.0-r1.ebuild 1033 BLAKE2B 5d28abc28676fe3c5e847fb0c6c73b96661caac3b0026d06edd63c616a2b57dff5721522ed224c61e9212441808c88c17a4a9a42f01ff62802e2039615b27a17 SHA512 6ab97a34ff61d6b67c85d425ef17e31d5c4b074437959cacf41ee338a32e6ba808d8cc5bb4b500c7e297bcb02847d0e27b8d63bd0e1451c6078e56dae11ffe00
 MISC metadata.xml 565 BLAKE2B 625ed0ce4bf465bcbc68aed462f4aa94ea8e2c574a34b8139e8f1dff16b86f08b67efc31a3950bee5514c2a4cf14b18be16aac5833900ea8d41322de4a4691f5 SHA512 c7b5bb954173053cc9e203bf58eb1d0e6f0945a02d6e341ce8649bb6210ad595e364eec390570fc658c35e9c0850027610a99df81ffaf8d3b8627e61f9bf54f7
diff --git a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..fe9fd8e02ff8
--- /dev/null
+++ b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
@@ -0,0 +1,47 @@
+# 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,5,6}} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around the mediainfo library"
+HOMEPAGE="https://github.com/sbraz/pymediainfo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libmediainfo
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	# requires network access
+	py.test tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymediainfo/pymediainfo-2.3.0.ebuild b/dev-python/pymediainfo/pymediainfo-2.3.0.ebuild
deleted file mode 100644
index cc3c9dec3824..000000000000
--- a/dev-python/pymediainfo/pymediainfo-2.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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,5,6}} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libmediainfo
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# requires network access
-	py.test tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
new file mode 100644
index 000000000000..682562b0d908
--- /dev/null
+++ b/dev-python/pyotp/Manifest
@@ -0,0 +1,3 @@
+DIST pyotp-2.2.6.tar.gz 10602 BLAKE2B 801f48646ff15a039b9295948ed292c3c432f8b0b629d249554259802335b7430a2c82f8c3bee1f54df71b0972ec293d69a2005c35cac120a51cec1a3548b2c1 SHA512 4f962704411ceebff967cf13af5ec5b815da0f82af665a086c4e5d53acc735453d638c65aa2afa40fe546e92d04a9250f6964cb22270a67c9609f8486eb5ba90
+EBUILD pyotp-2.2.6.ebuild 592 BLAKE2B 7111307b8582cf202b0fc7bad95c5a448b62564e4260438141d9234ca3d34d3207d77a71e2e305c5d60c467a0b6bffa6a66d3d3795e4832ffb5dc439cb64953e SHA512 da6df95db63d10f6cb1b92101680f6092093520421ee75f12b3325900dd7b851b1d1a26e9a5e1fad1c9ae6e055b9ebbe2f954b3412b232a0e7faa67143a845dd
+MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/pyotp/metadata.xml b/dev-python/pyotp/metadata.xml
new file mode 100644
index 000000000000..e7214b7e32c5
--- /dev/null
+++ b/dev-python/pyotp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyotp/pyotp-2.2.6.ebuild b/dev-python/pyotp/pyotp-2.2.6.ebuild
new file mode 100644
index 000000000000..e6c97cdb6651
--- /dev/null
+++ b/dev-python/pyotp/pyotp-2.2.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords."
+HOMEPAGE="https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index 5c1487159608..790b70d37056 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,3 +1,3 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1.ebuild 536 BLAKE2B 6ae4bacc46c9fdf89623f324e04dc379526b7585ef32e5ae733125f93de9174e0919f6a464d308d303bb03263a94e0e3ef428287832197f81d14bfdd9858da50 SHA512 0c67160e870a01fe75a061330379ff978d2e0baabe075dbaa68e9fd5cb2d344910ca52b8354dea21a2c8e5ac6e6eef7fdde3b35d6c0c3e3aa45148e5cb16500b
+EBUILD pysendfile-2.0.1.ebuild 542 BLAKE2B a90653e2f262b5d963f57872a2ff8906ce9673b115e19987bc5a367cefb443fee6b86635c936d62b7ff8d3450a2399886352b6f30ed83d1ed614dcb5245bddce SHA512 4257381ae84514e29c4a114b295fb332b1027109cedefbb13d053fcd231ee24d5e269f329f8d1c566b58bd8c20ebc58718fad3727fb81873e31fee858873d708
 MISC metadata.xml 391 BLAKE2B 637dd86992ec6257c70596d2e0f3f31729f95d1c3a8f02292b9ae03b858e1b1d828efb28d382b730eadb979da34b49a0cabdcc6acf5914266982fcf628dbff24 SHA512 9f2f7252b4d4f062d63fd392634973c0ad3febc22375631afd41f53f45bce5ae9dd0350f926576bb18883b91f9d5de60881fca77d444703fcfbb706c7802067c
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index dce56df30bdc..26d0430026ed 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-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=5
@@ -10,7 +10,7 @@ DESCRIPTION="A python interface to sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index 26923b743408..e6388f6d4991 100644
--- a/dev-python/pysha3/Manifest
+++ b/dev-python/pysha3/Manifest
@@ -1,3 +1,3 @@
 DIST pysha3-1.0.2.tar.gz 829192 BLAKE2B ff0c0e1cc35f5e2efc0a7d3074022aaa1e05fa72cc151560180fe08958c8f83ec2b0f50f9e1bf772fd386647f3d44e8b4139f5593f6d0d678412eabe4829e939 SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720
-EBUILD pysha3-1.0.2-r1.ebuild 1013 BLAKE2B 046901c7f76bdbee1a8ef0aefa4e18fda2ff2423dd8096f9125f2a46c1980f7d7fdd5dad338f3d4a5e843111449d00998fd88c998a5788650688ac66d309c857 SHA512 8ef2e4aab38839416610a0f96519eaaeb05e9adcc96964448b37bc3c62db3f5c210d418ee3a0080f6478ea5a62dbe252c410e9c70955754d69a6c8a1fb5d53ce
+EBUILD pysha3-1.0.2-r1.ebuild 1017 BLAKE2B 221967bce9984841a794b3047f1febf63684340e4e94092cac476dddf3549fba6b56fdb4245351740922c2eb2c6b83f25c42bab9265c99598a508a4e9cb83db7 SHA512 1a24c4c5641d4a5d6debf446ce4ef19034cbd59109b314bd963511e81f58a5c6d07987b76f4c1207bbb30b61cdec4f5d055703f616b921fda97671b0ff798d9b
 MISC metadata.xml 447 BLAKE2B b29243faa53b7068fce5b86ff8ffeaef920340c92bee35620fb2977b02a1f543fb6cfbd5509fbe784753d9e1b123bb1ed594dfd59e2ba611b9ce0e1df6319174 SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index d3acafadeb73..fbdfbc489b2a 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyside-tools/Manifest b/dev-python/pyside-tools/Manifest
deleted file mode 100644
index 95cf4afa2c10..000000000000
--- a/dev-python/pyside-tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.2.13-fix-pysideuic-test-and-install.patch 1117 BLAKE2B 1be91a2a286490b9e921e801378df526c6cf893be6fba1c58d5f3f472b3bf630fcee190099a22909103366b5cf5520c000785d918cc18b78295d737c2220c279 SHA512 2ba8e7c00dc231ce1a92815697448c71da31e2c84c8b20339f33520428c4a91dc38cd16d861fb5ffb5896f4e91e9416f9f2e04f7ba9cbbcc3f21f12cc1350b63
-DIST pyside-tools-0.2.15.tar.gz 78989 BLAKE2B 4cb4e47b5b274d1d2b812ca6f5404a61682776f1f45930063e8c66113e30d1333b8e165918b1573011335852ea484a171d6a087d1e1a31dff1a0a0db05cfaaf9 SHA512 7cee288b733e5f83a01683d7fc8f1017c044e46dbb02489c5e763e37db4e24f319ffd593e001ee6ca5a21a34cf1a6009ab1d4c9e4102c60693992b6f2f7c8991
-EBUILD pyside-tools-0.2.15-r1.ebuild 2064 BLAKE2B 86daac485ae241bfc0d679aec4ced4054bd1e26a12787c7933a92c78b0b0c234953275a67d22577006b4b0906d6ae022e9889e3eb15242bd74b73c160ec110ef SHA512 a15c3d5d8fe6bdc08b3c06a8c4a27de9cd42a38b1938b9ae11c115543b1f290ced15c4d0b5ccc11c27be7f521b084cd9f11a22f2746b25565a8688e39a7ce67b
-MISC metadata.xml 334 BLAKE2B 1cf2bc2633c87c8b2ab023da8fac5e8e80b33842b83c4c048ffe801155b4f07e0eb3f9cddc6a5ff589adab2cce142e718baae83674d5881dea70e0d88db17a6b SHA512 47e7526ae939e698bad3572fc645bc9d22c1c7688f8bc133ac0ab3822523be8d5defd10070af38e6f851b577468b03dcb6e6b52380657032633c65be2a690fed
diff --git a/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch b/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch
deleted file mode 100644
index 768ae22a8bc2..000000000000
--- a/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur pyside-tools-0.2.13.orig/CMakeLists.txt pyside-tools-0.2.13/CMakeLists.txt
---- pyside-tools-0.2.13.orig/CMakeLists.txt	2012-03-09 00:46:56.377462594 +0100
-+++ pyside-tools-0.2.13/CMakeLists.txt	2012-03-09 00:48:08.888556082 +0100
-@@ -11,7 +11,7 @@
- set(pyside_tools_MICRO_VERSION "13")
- set(pyside_tools_VERSION "${pyside_tools_MAJOR_VERSION}.${pyside_tools_MINOR_VERSION}.${pyside_tools_MICRO_VERSION}")
- 
--configure_file("pysideuic/__init__.py.in" "__init__.py" @ONLY)
-+configure_file("pysideuic/__init__.py.in" "pysideuic/__init__.py" @ONLY)
- 
- option(BUILD_TESTS "Build tests." TRUE)
- 
-@@ -34,13 +34,10 @@
-         GROUP_EXECUTE GROUP_READ
-         WORLD_EXECUTE WORLD_READ)
- 
--install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
--        DESTINATION "${SITE_PACKAGE}/pysideuic")
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pysideuic
-         DESTINATION ${SITE_PACKAGE}
-         PATTERN "*.in" EXCLUDE
--        PATTERN "*pysideuic/__init__.py" EXCLUDE
--        PATTERN "*pysideuic\\__init__.py" EXCLUDE)
-+        PATTERN "*/pysideuic/*.1" EXCLUDE)
- 
- # Man pages for pyside-uic
- if (NOT win32)
diff --git a/dev-python/pyside-tools/metadata.xml b/dev-python/pyside-tools/metadata.xml
deleted file mode 100644
index 521a755bf028..000000000000
--- a/dev-python/pyside-tools/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="github">PySide/Tools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
deleted file mode 100644
index a69420d6ebf0..000000000000
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD="1"
-CMAKE_MAKEFILE_GENERATOR="emake" # bug 558248
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit cmake-utils python-r1 vcs-snapshot virtualx
-
-DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
-HOMEPAGE="http://wiki.qt.io/PySide"
-SRC_URI="https://github.com/PySide/Tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pyside-1.2.0:${SLOT}[X,${PYTHON_USEDEP}]
-	>=dev-python/shiboken-1.2.0:${SLOT}[${PYTHON_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}
-	test? ( virtual/pkgconfig )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_copy_sources
-
-	preparation() {
-		pushd "${BUILD_DIR}" >/dev/null || die
-
-		if python_is_python3; then
-			rm -fr pysideuic/port_v2 || die
-
-			# need to run with -py3 to generate proper python 3 interfaces
-			sed -i -e 's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \
-				tests/rcc/CMakeLists.txt || die
-		else
-			rm -fr pysideuic/port_v3 || die
-		fi
-
-		sed -i -e "/pkg-config/ s:shiboken:&-${EPYTHON}:" \
-			tests/rcc/run_test.sh || die
-
-		popd >/dev/null || die
-	}
-	python_foreach_impl preparation
-}
-
-src_configure() {
-	configuration() {
-		local mycmakeargs=(
-			-DPYTHON_BASENAME="-${EPYTHON}"
-			-DPYTHON_SUFFIX="-${EPYTHON}"
-			-DBUILD_TESTS=$(usex test)
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_make
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		CMAKE_USE_DIR="${BUILD_DIR}" virtx cmake-utils_src_test
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_install DESTDIR="${D}"
-	}
-	python_foreach_impl installation
-}
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 745a0daf71f2..2e7a12d70cc5 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-aiohttp-0.1.3.tar.gz 6192 BLAKE2B 23f4eebdefe757328fc8621e29810835fee8e8c3e8cedf45134716cff77208bcd7aa82f537ada5d567b143d342b1a9fa14a5ed1e5208548e55353de1748b270c SHA512 2271f7730b91812a619e04522c13b7e2ff76353179a4588226d0b943b67f7397b966c1d3c24016861cc3eda3a541b3f0d3b2858a6ca3586f7707e10581c34e4c
+DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
 EBUILD pytest-aiohttp-0.1.3.ebuild 567 BLAKE2B c15a0ee1a882674356eed783e6b48bbe45a04af0a2c43e4be3190f3c11aefea95496308b6431c80590998649569fbecb4bad5f9e37e515c95aa57e7b8b251cfa SHA512 5c8d342844f8db2ef4281f113904e97f07f9900189c608db57298686a61c72db6e49e9277d9c4581d74cb41692893569ee8f61269af44aecca0a7860eb44e9a6
+EBUILD pytest-aiohttp-0.3.0.ebuild 567 BLAKE2B 933065f92b863dd6b81565ecf415b00a87f1270bafa8337e9df654f71c1d9bbc2e5bc4a3f0fd067c36ea792f01c5d24365fcbaa499d46c01ea6a61d486e7a6b1 SHA512 9b3f76e6d28698cef1ce40ab4ab949d8d4aa2149d91e39086c8aef1a6cff826c342f84a2f3eab7df0d3870134ac3ec4c4b150706b10d7a7dbce096bc0fec6d23
 MISC metadata.xml 358 BLAKE2B 8d7d3a4d56967f16b3c8b5facccb0af056201daf975aeaa8cb9b651db735183cb38e35d1a86037306d6c61971690b7093ac8bf0c4197b2ce6228d0323c15ed0d SHA512 4f7db25811be35ac9976bf5707b0ee0927dae9f00d8be85f18eb165708f08ec7c4bb7ebfc4ca021a6432eab8ab25785c8b27959df8ff9dfc2a969b588de68829
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
new file mode 100644
index 000000000000..4c9076789a98
--- /dev/null
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin for aiohttp support"
+HOMEPAGE="https://github.com/aio-libs/pytest-aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-0.22.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index f40760cc31dc..56928a4b9358 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-metadata-1.3.0.tar.gz 4604 BLAKE2B 78987d2c28438b4942caae33d6c56b789d7859085074ae39549d0666cb725e0dc70c889ebce7bd7ff0b3846ba0c06e82cb85641c29bd0ee46b675813f1885492 SHA512 94af4defb1115d87fc456db80dbe16da01662d0b87325e433d4d1b30f35f210b7750bbaba091ac73d158296070c87054ce9f4c0687dfe5dfec3f02df56261d98
+DIST pytest-metadata-1.7.0.tar.gz 8254 BLAKE2B a7c5d7237ac6cf44122ff4af6f44aff8d3227a54dd340b3a5574161123319be1380410599a29920aaab41868ef89030a731a389232685e9e3885617d7dd9586f SHA512 85f86f1eb7486f19904bb513f1ba3212667e0ca2d74080621ffd2ef1cddb0ab9d6c01cc1c8eb69058d86ccad0974830bf1d6ad3b291fe0dbeb6196c06331e66f
 EBUILD pytest-metadata-1.3.0.ebuild 635 BLAKE2B 71640f456d8ab97cb933dabcee6362e8d2e220f2b45a4160eb1fda1a3747af0ae0bf051140c9d04bcc85beb01e169a3fff68b3eff2b200badb0be481c710748d SHA512 7b02194a76629f3f727bbbc2062b6f3fd849cef997c20c0105af5e2e885d7c0e462b383e180350f58027a382fcc5990580b57616a6e1f485139632304e844da6
-MISC metadata.xml 382 BLAKE2B 2acd065bcafdcbcd0438a9810cb5c3ad716bbe18f3c6e2763abd93350176108dc47212f7d8b49e14c6e65bf5aeba112299658de2d52478531cea84c123df2bfa SHA512 23e048f97fdf324b3b77a05a4245d4f8e29fcf430d029c8a1a5df002e8e447ce4bb4f422a1a401131600511c0252e4003f16236addfd97d593c27ce8c0621a05
+EBUILD pytest-metadata-1.7.0.ebuild 635 BLAKE2B 21992fc4c8af5622bb3020cf270167839542b6c6521b2db7ac488e256eda4141499a9dc51367397f92545ffef28cc211956fe32e085f7bd73f683a8046b65c41 SHA512 a52ce3288e6a10548129a50ef790bd7d0cb580448372c2720e6c3d0e06b2ea80c832ff286b4b940667e636159ee30e033e4ef069000e94e0d5b4997e24a44207
+MISC metadata.xml 384 BLAKE2B 8024f5d5853f139e54a68c100aa021a51df69091041fac8ced7d30d773b5b0fc3360e8c6b13ba988828e87580b320e8cf5dd650ab630572f209225db932ffde2 SHA512 e932dd150d0b12c6055a7842eab3b31f8c08e28392eb668e6641b1a30008e713a982eae530c1fc9d99f86ddbaa1c6f19d4044280d23908069b41ae1ccb22b790
diff --git a/dev-python/pytest-metadata/metadata.xml b/dev-python/pytest-metadata/metadata.xml
index 974ed90410c2..04c8b96bca81 100644
--- a/dev-python/pytest-metadata/metadata.xml
+++ b/dev-python/pytest-metadata/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-metadata</remote-id>
-		<remote-id type="github">davehunt/pytest-metadata</remote-id>
+		<remote-id type="github">pytest-dev/pytest-metadata</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
new file mode 100644
index 000000000000..30042a6adbdf
--- /dev/null
+++ b/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for pytest that provides access to test session metadata"
+HOMEPAGE="https://github.com/davehunt/pytest-metadata/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND=">=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index db3fece3c600..67ebdcd9de9e 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,6 +2,6 @@ DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475e
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.1.tar.gz 812928 BLAKE2B 27b25fcc5a268b1c92188c01bf16bf1eb4b8ced7d1a3c8095350ec55b1f1845a5d54bd6bd169142ca0d327f2f8d193774643174a356dd95fa07b3195bc1e8713 SHA512 75f728840cde6512619a03ce75fd0b04cb9d57a99f381366a0f9c10ffa3210448e7e85505357bfa9bfb0cca11cdedda2c0e091e5473ed82707a2597f234e659a
 EBUILD pytest-3.0.3.ebuild 1966 BLAKE2B 50b123408a85c5b283fe1653444472fd467272d99dc944bdf876556fe5e9aa1208e32efbc119cc95ca834bb66a50f195199efd4d04054cf3cc98530eccda710c SHA512 2d6713c361334f2af886827a0918f574512e885fe77cc5a4595ca47d31b37d32f5768989a6bb5447666c8850ca15bca73e7641414d724bb9512d70abb5ea0eba
-EBUILD pytest-3.2.2.ebuild 2109 BLAKE2B 3b4b48b907f8d5b93879128b9e1282e5d9ecbbb7d42122015e8e6a50c620dbe61aed5d07d67f9ba9fea1b7bc262bec3fce18d5f5a6e98fcfe2c7f56ca24f8cde SHA512 9d25dbe7275f36e2aa35a0cc06ac3cebd542a76e2309b664f144efd3ee34298b238f957d364fa1ac179148d7bcb4c0b931eecef7a5b1a887258c241d7216822a
-EBUILD pytest-3.4.1-r1.ebuild 2291 BLAKE2B 6f082ac40d5c16737a98b674bb7512e2f418a0b462c90559a12386f8336d20bd69c2a6295b1af8ed24c5c5bcf41979779b172f96352d82342db86710567090e0 SHA512 c07c8afdb8f332ca8ce98857b41cb8e284feaff88749b871a5cbbd2253af60feadbf6a232fb1ee540c42eebc897f853f9bf29b889f75d64226983ef0ba7e3720
+EBUILD pytest-3.2.2.ebuild 2114 BLAKE2B 2291928df5b0cdf25113e2a7f893bc883af7f8482ef00b37af6decd25264f33afe960a2f28bb2806197eae8ea93666d9effc83c147d0f79ab9af965ac3ecaa9e SHA512 5db4eb1fde7bea9841b8a42f340a871d8d9a9812001627527f9ff1047e79751599d66f03aafeb2925971e8102a667e9eb7ab7da4331a5d13218cee36d285980a
+EBUILD pytest-3.4.1-r1.ebuild 2297 BLAKE2B 52af333554c85fff95f0bffe2246cd7e88a6446ddbe8dc4829600d1a018da613c4aed06e039fbd54d621ca45a3dcf454d24ae9bbe302d97c6084ea37d6641945 SHA512 5c06bedcf6b6f8df4f6bba8f5aace83a72ff530f1f0368a0a5b76f0380d02c55cf64e8645362c63f7f6efef5d49eefcdfff2423734a62acb23799a9e3c567200
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.2.2.ebuild b/dev-python/pytest/pytest-3.2.2.ebuild
index ef08cc7f7fdd..b9ef109bf3a8 100644
--- a/dev-python/pytest/pytest-3.2.2.ebuild
+++ b/dev-python/pytest/pytest-3.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/pytest/pytest-3.4.1-r1.ebuild b/dev-python/pytest/pytest-3.4.1-r1.ebuild
index e57defd45638..d9b4a24f1a25 100644
--- a/dev-python/pytest/pytest-3.4.1-r1.ebuild
+++ b/dev-python/pytest/pytest-3.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/python-ntpdshm/Manifest b/dev-python/python-ntpdshm/Manifest
new file mode 100644
index 000000000000..fe627abec829
--- /dev/null
+++ b/dev-python/python-ntpdshm/Manifest
@@ -0,0 +1,3 @@
+DIST python-ntpdshm-0.2.1.tar.gz 12227 BLAKE2B 612debd1a9a1809298a690068e3872f727fa9d58496e62530ab236a9f80e020770d54f7a6b3caf797f33f22cb0b75597d79a2ed578e24b11dea787cca2c3c667 SHA512 1c03f38d3f17e3871ced238e6654c57704b3dd4ab49b8cebf1eb4af3a4263de2fb3769933ccf9ebbf2ce5ca5a0ec8875a10ca07161a7e554d6d1ce93e4a2ed4c
+EBUILD python-ntpdshm-0.2.1.ebuild 700 BLAKE2B bd124e26a7f487d45623753efa69b9ceefe6354cc423a26b2a024879d0b8a3a96262d70c667c6d065e380daab2deac219990ddf7d892703e82341d94ca2a2660 SHA512 0a6ce349d371250949f4bfa39963f34ff04ee5325cb566b9e561391427c57a32de21d1f9a1328a96a8573f9eeceab51da2098a2a46216570479d0a2eeda79f27
+MISC metadata.xml 288 BLAKE2B cf804565346328dfd23bbc04533dc8844d4a5e3debf432bacc1545780a249cc3a363efae85f6577c04bed761dbfd8f0259c3aaf05b2505528666bc6d83d4fbda SHA512 a0f7d154b6b1b48e88243ef1ede582c3cbb9056d73bc9003e4f8add773306f48c9b75f103ed85a1a18e870c31ef5eb0ec19f44a814261b3c866cdb756c2a75f5
diff --git a/dev-python/python-ntpdshm/metadata.xml b/dev-python/python-ntpdshm/metadata.xml
new file mode 100644
index 000000000000..db7cd7adb419
--- /dev/null
+++ b/dev-python/python-ntpdshm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">ntpdshm</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild b/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild
new file mode 100644
index 000000000000..fc99a46a4aea
--- /dev/null
+++ b/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to ntpd shared memory driver 28"
+HOMEPAGE="https://github.com/mjuenema/python-ntpdshm"
+SRC_URI="${HOMEPAGE}/archive/0.2.1.tar.gz -> ${P}.tar.gz"
+# Warning: pypi tarball is not the same
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-lang/swig:0"
+
+src_prepare() {
+	emake swig || die
+	distutils-r1_src_prepare
+}
+
+# tests may break running ntpd!
+RESTRICT="test"
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 03ac57b98ada..c7e8e04094ae 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,5 +1,7 @@
 DIST python-openstackclient-3.12.0.tar.gz 617159 BLAKE2B 755420f6e42c6600b04fb6899c533e8c08caa9d8e4f77d214ccd6100d558e6651ae986b0b3a131b3637dd1e9424543a6127fa4588f481fe41a29dcaf6ec3ff71 SHA512 a36c17d2ed138e984af978b436beaca3ae8efddc089ddc6b9fda9e51bdb4c8fc1cc645a68225cc08709acd368ff7d2a70f748f7be752ad8e68fe59b4eb36802d
 DIST python-openstackclient-3.14.1.tar.gz 664808 BLAKE2B 7444a33e494f8185ae604032e8082cdf1719ca51cee998e3006edd880053e81b78d07c87c1049392ed7596d9f13fbd351eb0885f4dfb570ac213b04108e6c40c SHA512 9b3e6032dbebd2be32fbd555bb50e03a435941c96337261be8a6e0478122f1f5d4094d47c9cd77e2961f7e9d2b1c35e7b812928a431c2dae9de257919df470a3
+DIST python-openstackclient-3.14.2.tar.gz 668307 BLAKE2B 32bcd033f856e29d5ce7c190025b15017427f2ffa0fd5d311ddf57567184ae7565c50f618346476afdc8802a6d50d3578338e436a28e18494351b982b5b803d9 SHA512 118053f339577832b2c7bd9e62da67ad631ce2ca514009e767538be99d14580f066e6efdac8a93ad4df8cee1d19c41ecfa5fc7b2b9ca3fe0f1d664abedf39a42
 EBUILD python-openstackclient-3.12.0.ebuild 2583 BLAKE2B 64f476aeddd3da1e98afb9ca83488c4de94f79ce37e4a240cd5c3301b4657337131d23d0fe509392a67b5def31c4baa181b59689cb8ddb0a798e930e582e4c21 SHA512 b9bec6ebe556364d05436f7b13324df99131bcfc5e105ed8fce7a3f3eff67c6b50e94a54851732e03db549fd1dc08f1b415a3da4148f2f993bd2f566f390237a
 EBUILD python-openstackclient-3.14.1.ebuild 1298 BLAKE2B 64876c5971455997995fd157118303d4f6a5b8eec4445ab7a57498424b153132c2d1e4ae75b4bf7ed59b085cc32ae97b86b38239e8fa690f6378ae9f254b111e SHA512 7639cf71b60b25c224e224702a746d41d65e65c452a5739f7bbff0c2b0c82539145d03155d0db5c5f796aefc1fc94a102469f8bffb9406af32396c9cde748756
+EBUILD python-openstackclient-3.14.2.ebuild 1300 BLAKE2B 11612bd29d2cf13febe72c13d0dd421818b58b61371f50d3f30b2ea382b6b9c9798b0044bbe4246a6a6cab9358493b071f44ddd32daa4b6f3addcedc5e272ab9 SHA512 5d173596349cd8f3a6fd0c9aefbf8bdd24582efcb87105cac4988654466019a0a19baf5b62cee386ed4bb99abaaafdeb6de38a4dd80a5d8c03aaf939939a715b
 MISC metadata.xml 632 BLAKE2B 4e989558d44ee733b380fae3f269ec9ca0c511caa1fd8259cac90dd3ded82f4137444f32801efd2440da95b98c2864509c5068432de830591ccaed2072029c91 SHA512 c37cb6d5ee55b8f7184a2db66dab3e6fbc3627b1869487e9d4e00928cdf1dbfb5d3d28a2d7f72290503b10b393a193a9849c497df6438ce230e418b68fd3ca4c
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.14.2.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.14.2.ebuild
new file mode 100644
index 000000000000..303907280d1b
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-3.14.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.19[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 1f66d924b619..76205f3626b9 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,5 +1,3 @@
-DIST python-stdnum-1.7.tar.gz 411134 BLAKE2B 22afadd03c1f9043a68f34dcebcb80f8c053deb550924ae16c8e9b121f47da5422a28578743a6aa3cf1b71bc8fb3b588352ff776a36c78161cb3fd69faab71a6 SHA512 323f5e37087e95143eb59345c4ddb5fb1529a136c234c8e9c957cf9914984e758b256facbfbc5de379000b8939460ea25e8105428d67f7052a23676c334a002a
-DIST python-stdnum-1.8.1.tar.gz 421921 BLAKE2B 814e887e15573ef09ee7a050204204474a06b9a65dad6f98a67a029ee4fdb64764dcbe43c491dcc6fdb56a88ea837bfa0b14a3c45dfef6b0aafa47ce70dc6f80 SHA512 02b0f8bc7e2245f780777b3b45db860b6332ad7fedfd6e674a8d67666693107773f5eda02bb241aef950a2409d5ac241b6de8326f80159311f2c22f0d0dc9465
-EBUILD python-stdnum-1.7.ebuild 591 BLAKE2B 9503567786ca58b102a1aa6014d57337924ba206bef2279d98a79d280381f3371e45f18a29625bff1cc9908cd4c437895cdb1a9e9890a0cb6787ea270db863cd SHA512 649fb6e858f4ef02690540b566fe82315c8f14fbeb130b843b85e7dd561e63bee98de26214e37bd78c30266c4558f9c75ff68cfbbbc45c93e89d5ac1a2c25b15
-EBUILD python-stdnum-1.8.1.ebuild 614 BLAKE2B 6d2da79e10a28c742195884381403c7c3805aaa26a8f82070d196f72f323f04d435e3cadc865862449464726075a7af30b3f8d6687525de64879395424b927d3 SHA512 9df193d3dcb63d1b5d61b0e681b77eda0dafa2bfd8f229ced1a40c3691b9716de53de7af6c772850b052ca76904d1e24663bf74c268f6b292e68b4693675055e
+DIST python-stdnum-1.9.tar.gz 466861 BLAKE2B 31656cb64ab422dd172ee1a9121cf41d18bfd85a98a38a956e499e04e20369115449ed0b4b946e1aa2ce8d41eb24ca20b296aa178151276f3ea1e37153875969 SHA512 ed236e7fa5f64bb812578f019c2286a139f75356073ec7d0b0fc9220092b5e0e5d3b4fd133661e4126ac3f78141457af1793fdbc45a22daa4d36ceaf1535901f
+EBUILD python-stdnum-1.9.ebuild 617 BLAKE2B 5d158623cb394fba9e4761f7e464f46826636d064842afbe085c48da71f03fe204bdc891680786f02303e0aead4d6c7fb1bc558535d2fb7f0637986f6383a188 SHA512 88bb49476ff4e96f9ba1498a60da8dc0eb35730ccfb1136935246998a07280f8fbde8c1278ed0a58b8d60f8d55f83077f6b01d5b648b3bf7db30cced4a411dba
 MISC metadata.xml 475 BLAKE2B 4a2fe0a8f727cfaeb086d33e384b52ada0555f7c57028470c1ab2524bf4e12cb4b501736a9e9b0d14cfc66880e2878d93cea188f035fa52b8c959dd99d034797 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e
diff --git a/dev-python/python-stdnum/python-stdnum-1.7.ebuild b/dev-python/python-stdnum/python-stdnum-1.7.ebuild
deleted file mode 100644
index db1d8fe5bd10..000000000000
--- a/dev-python/python-stdnum/python-stdnum-1.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 distutils-r1
-
-DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="https://arthurdejong.org/python-stdnum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vies test"
-
-RDEPEND="vies? ( dev-python/suds )"
-DEPEND="${DEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
-
-DOCS=( ChangeLog NEWS README )
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild b/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild
deleted file mode 100644
index 8d73d4288ed8..000000000000
--- a/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 distutils-r1
-
-DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="https://arthurdejong.org/python-stdnum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vies test"
-
-RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
-DEPEND="${DEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
-
-DOCS=( ChangeLog NEWS README )
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/python-stdnum/python-stdnum-1.9.ebuild b/dev-python/python-stdnum/python-stdnum-1.9.ebuild
new file mode 100644
index 000000000000..6cc5bf1ad672
--- /dev/null
+++ b/dev-python/python-stdnum/python-stdnum-1.9.ebuild
@@ -0,0 +1,27 @@
+# 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 distutils-r1
+
+DESCRIPTION="A module to handle standardized numbers and codes"
+HOMEPAGE="https://arthurdejong.org/python-stdnum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vies test"
+
+RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
+DEPEND="${DEPEND}
+	dev-python/setuptools
+	test? ( dev-python/nose )"
+
+DOCS=( ChangeLog NEWS README )
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 6d060426d895..2bcb1c47927c 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -6,5 +6,5 @@ DIST requests-toolbelt-0.8.0.tar.gz 196129 BLAKE2B 435059ff2879c44a274641c49adae
 EBUILD requests-toolbelt-0.5.1.ebuild 496 BLAKE2B c5bedc4e7b17cc2932e3801f98c29f8885a83e4071f08bffee3cf07af2dd78a876950949be5851f0abb9f619123a730c4e2ea265215b0189ed4698b696af0e5f SHA512 8d91f3a4637944a9b19e8abf93caaf4be208f7a52a1760351b95037485980ace11ca6be63bb1b5465fda5ea8e245e437426e46595d6d5ba1f5754fe9478df801
 EBUILD requests-toolbelt-0.7.0.ebuild 496 BLAKE2B 4be3275cb8b4140a1ebfdc1fbf74edd711154d58c180f80da133e61937267dab47af989de3955c74bfbb67f277137a39b125bdee422a8a36e9046ff8fcc0a02b SHA512 440173c9a947e5a8f591fcf7aa8c75d5ea2b78ef80db14c59e4da68fcd4d438d1be3247054a89ec17049e102457ba02b928616435ddeb5e775991da3c7cff721
 EBUILD requests-toolbelt-0.7.1.ebuild 766 BLAKE2B 3011c5a00c9c8bb2025b02bcfb626fea0e79841b2bf63760a876aaef8a757b6e64c60c2b661e88e00852e66f30d000bae6106c6e85959bb5ca68a5d99ed554cb SHA512 103507c91c951cbb1a3af1860c31634cd386d33903667b73978580854290dd47d421e313cae9105c4a4656b35eba803e73afec6628105654a5b92d973580c50d
-EBUILD requests-toolbelt-0.8.0.ebuild 1030 BLAKE2B a78905f50f187112a3290482369d33bb9751e205f16d5d05597bafac2dced7b2746699e9107282118a0fa3efc2fc79b82a821e38b0eb5cb10be9757599ea5ec5 SHA512 8e162ed4acedeb459a00f66024bc89ddbb90cd4a1f19098fdaf3881aee25f6f02526794e1dbfb194a8f86544f581dd0cb7c9250811d6861075a50457afa24bec
+EBUILD requests-toolbelt-0.8.0.ebuild 1042 BLAKE2B 87d1bd489afeb105998023c668cd99dd4a6690799d8565e779026b017cb622e869fd719ddac7da733baaf873f903dadbd1a56280a5c700755613ba00a98f6728 SHA512 11876d884aed542d23013d62e10b369889c068fa8e3ea06911f712497e6be513dc3d867eb51461f392affdd9b89c8879206553ff12fc8438b567bcce043f697f
 MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
index 5c9084d34302..7bfbf3543a2a 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 11feeae577a0..0809594992dd 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,5 +1,5 @@
 DIST requestsexceptions-1.1.3.tar.gz 6606 BLAKE2B 7dbbdc095ba1ec20b41a3c7a0dcef5f10fbcd8d9f6bfc9082bde09a23a9d75f1be96f79b74551691d038b758a7d7bd1568842be9fd139a4c4d3279e63376db9d SHA512 33a848b04db500b3481b7df2553e244e1967e5124de1606f73fb38f0b2681253ca2bd921386ce50f1144a8dc8d6f8e07be058a3d9f13c7831f77cade0a42fd38
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
 EBUILD requestsexceptions-1.1.3.ebuild 571 BLAKE2B d510b5432921c280df576dab2938c677e4e8a2cab2761ec500bd8711eb1e208cd4c6d5078e20a9dd64ca365f6c068555298dbac2f2513aa107e5e6852c8643b0 SHA512 c64495bf3a1f3f344b5d436e18b65449177db3ed08f417ac5328e4018c7b57474d981783e0ce53c509999cb98b4e0cef3607ee94f46b1aeed7f70308e2e1d164
-EBUILD requestsexceptions-1.4.0.ebuild 571 BLAKE2B 4ef6326a2f486081e9bd1132648c329e1b85d72b400782aa1b986ca798335ee0d8241782a3dfc89294784e4bc8ed0d8c76867ca304387209ff56886878f66467 SHA512 b0bbfd2bdd5be731d55795995b83607cc79880ecb1c0cacb490f5b0267c5e22c1ef5fd9ece271f04a1a433bf35f0dadd3a49cc44920e54cbecfcd2130a9e02b7
+EBUILD requestsexceptions-1.4.0.ebuild 572 BLAKE2B f68644bbc51e78bce7fdc007d3c5880cc3c3e6126d71e4e75bade33ce763ad4e49cdf1f33947b83e1d07b5b8cfd0631f2ae4c7c4d5f53161f13d326c961b5053 SHA512 ef4362f8373337c7472384e4c7e0052240f6d42975b0ce91fc1cbc83122384904a31c68ea38655f0ae1d0dff3d67e1b61bd7d57363a9f71b46e3d6763456d25a
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 48159619c789..f7744c4af4a3 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}"
 RDEPEND="${CDEPEND}"
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index ca80c57b1d66..c33e5d0fbaed 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel-std-pathlib-0.6.3.tar.gz 19520 BLAKE2B b403338cec80b38104f012c2b2626d473f12d557c2300d606462f2eb009bac72cec65b2f4e5a88192832a99dfc28573ea9ba8e7b73078ad8bac77136dd929040 SHA512 1210d8f7ae77c6358fc857c3ee447b2eb9802eaa31a210804acd74ec23dfd6ac9dec90dd7b21c79dcb4845dff4ad3614dd615c4798d3d7a39cc3a877cb9b63b0
-EBUILD ruamel-std-pathlib-0.6.3.ebuild 929 BLAKE2B af7939a2816672b180c8ae2fe7748f3106156e67a347bf47dd7741ef2f0d7ecde71226fe34588c2213d81f7e943a9fdf17548e0ae669af366eab86f383e108d7 SHA512 422b75295fdb06e37314d0b1c1994d2d76e595d5a8f5b57bc33026d033a9313cddf0511c7997d4c953208b4b76dcb1aef6bc2a555adadac31105d75ede318de3
+EBUILD ruamel-std-pathlib-0.6.3.ebuild 936 BLAKE2B bba95c0314a3a948c776fb3ce24e245c7638333eebcf790fb2f081344c406b14d893565b7492d5a0eb9ed0e34fce3f445cc24d92086f1b86dcd04861f3681f7d SHA512 272315ba4289427f158c4420db21b8f75ab7f2a176dd8d413de366cb4f58de4416aabcc05b819b2fbb39743889fdb3e1412e3acc80b51ba9a47b4ce2e16fbe24
 MISC metadata.xml 501 BLAKE2B 88f269dd28386ed5c49fa217cf58c68148fb67a8b33c630ca497e8c8ca328a3d66e9a04fc4d5a18c2ac0133ca99ca2903a22d05106f024034480dc72a2fe30b1 SHA512 cd00a071d94fa16a83e00864ceda1d2c15d6d3d0b581cac9dc3a2f35c794c1edc4d6049fc074a5ff1695555b7a398059d267df9cb0e9eab84595095eecb34d2b
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
index c55575431e4f..742c3574f6e2 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 9c7329745a0b..a92ea1662044 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,7 +4,7 @@ DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14
 DIST setuptools-38.5.1.zip 737995 BLAKE2B 9772d39928c6633ca529292d646c1c8e96a5a77ed06545af950cc249922837c13722d97de702c1e104581d56e1f808ec3d077041212517f5a51b23aa2e95e734 SHA512 bd04186a6e73cf24440e82aee10fff09889cab53e2e2fbf178bdb1360accf4f787abf8d8421d5e0fcb41005254c091f62d714e8b317ecf68911e2eed87b9fcc4
 EBUILD setuptools-34.0.2-r1.ebuild 2023 BLAKE2B fc6329ecb70fdc63c75ad6b284fd5d68f4cb20870d3eb20384c55405cd5077e6afafdc5f49e4df8049c063451c5c6866a58d57ca9333437f5cb715e6eaf67ff3 SHA512 cc258046922be1a387297b1bc2f6d57e4163be4fe6f2b7bc4e4428c5e239f5c39d52f3a35663a98835459fb63539662275572eb8816fec6326fa8c6b050ca101
 EBUILD setuptools-36.0.1.ebuild 1887 BLAKE2B 33e7e517efc5f69334e07b0c527612dc37eeb02e6292fdb4cabc0102a6d4fc52df48abcc05ad343272a34b95297e5820543088284a6a7f9308c4639598fcb57e SHA512 2c3431fc2dc71065c5492081937b911e40f1ab4cae4a2281bd68f4a65ef46c58fbbf2abebc9b3c362af4c8cba46adf372eec3c1c594a743ca72e3b54e33ceb3d
-EBUILD setuptools-36.7.2.ebuild 1856 BLAKE2B 1abe52d8c011f4093b2dcb0702fa3b6f9e62b44e0468680676288d1b4da29a341d5a602823bc7c73b6c7c4296f685354bb87bee9141fd83afd567d92afbbfe81 SHA512 9f2f04be0757df8ec13b2928b12d43e21778f7572bc22de42d4d749dc276327e2b12c3985f6708a1fd90eae88e765ffd80dfea9aa5d83060880cde39789c289b
-EBUILD setuptools-38.5.1.ebuild 1877 BLAKE2B 9f2c60e0562f063700bfe9253e43dbcdfc754357e0eef9159c66800c3b802fdb23ed4df478574b7aca3d41d3b9a5a26ba0681a3937f4f618f7927a5059065394 SHA512 92f0fec8972d661567b372eb175e5a47244252bdc4bc3467fdfb5cfd92d0c72d1326f2498288a9b254034280dc2eaa2d340f505323331ae36208848087e5c547
+EBUILD setuptools-36.7.2.ebuild 1869 BLAKE2B 1bc5842ab5f60d6efdae3b8464327250d1cd85d70c8cad2c422f5b02e5a25ae23f6eb8d4797d5afcc4661fff9282e362781e678f68a80bd825fd3bcecd5a5f25 SHA512 93bbeabb2bcb99b0378f89ffa6098ba5a49ab6d8b88d57a2727db1496bde0f1ce6e1c377702def5e90580128e3d683c0d433b406299d86fbc97a155c5bb6e99f
+EBUILD setuptools-38.5.1.ebuild 1893 BLAKE2B 18d3856d1e16abde3eb23375af872cc964bddbd3158cc665be9daca3821cf3f60b044d954a51e7268e6f83cb49b892020724e09073fb47ce2b6ac80f3874b31f SHA512 19073095b6c7b23f274a78c589403d60e768e5f72ec01217b66eb2fcae068acec6b4612ea3f079acc020f8ee0a83e9ca5d03dab781508db40d423ef0aa5e1f7f
 EBUILD setuptools-9999.ebuild 1825 BLAKE2B f7118e32909781ba818a73e51559cac9cb7ee8cbb44ddccd285718b101220bdfb9c599de9fd3d716184079b336b5ddef9b18895182921cad33ca55700fe2d356 SHA512 e558d7bfe3fb99b81d24a31c9489fcaf9dfca06327a62bd869fcdad1ff62801fec93df300580ceef6f5c172799f806c9f196bf97b89906ae44cd96c1498bcde6
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index 3ae5b3a4d8a5..41cba9de349e 100644
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-38.5.1.ebuild b/dev-python/setuptools/setuptools-38.5.1.ebuild
index ecd7810e4134..60944fe53622 100644
--- a/dev-python/setuptools/setuptools-38.5.1.ebuild
+++ b/dev-python/setuptools/setuptools-38.5.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index b44e748a1a8c..317113007e41 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,7 +1,7 @@
 DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
 DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0
 DIST setuptools_scm-1.16.1.tar.gz 28956 BLAKE2B 6721830e9ef171768afb94e6d6aacb829665658599409880e87c58e1bf2c6366d04a666ff60ed5d689bf376c258eda93367a4c52fe28ec694a3a93ac109db1fb SHA512 fd5017648c4a8af696e8528eab37061776e8495e2de3640f726e5e4347836eca5a13cbe54fc0c2223c3ae80ede1a81a6f3d9c0910a417545b9f9f206e5177a13
-EBUILD setuptools_scm-1.15.6-r1.ebuild 1362 BLAKE2B 72602211cd4dd7b0e76fa6841be14ad3e60f952a83fdc9d949d4ff65a8b1f8bcdf3f7f0886d263e185a13016cd47d195f69bd8f9663095d95663e73d5e4ee28c SHA512 4051fdbf0ff96851e2774776ecc97547ce723850b6bb72028a52367e5fad9c2b9d830914edc6409d814d6f7c1ef3011cf223729cb5792e1f9747928420c87a84
-EBUILD setuptools_scm-1.15.7.ebuild 1483 BLAKE2B 5530d8d8d2a4608686ffb909fae62c21bc07bdaff6d4fb7b16f43edd7362965b610bef69a23217aabb39a43f61c8d67d7ea1a52d3b6d97d9384f4c7357db7c57 SHA512 66be730cfe1679b12d87ab76a4f1f9de13afb762ea93f66b37f0f9e717f47b7c07317285edaffdde63d0672291dd880f5a46151d18c8ce9f326c252792998291
-EBUILD setuptools_scm-1.16.1.ebuild 1372 BLAKE2B d811896ee7fec396680efded5a16ae8b41a96b61ce70b0bfd746832d52223e117e7ab8988c2feba04ba038342b0c0f8e51d29c075bdb348ea6d516acca03ddc0 SHA512 912aa29cba7c9b16d0bbe355fbf20b60f9f831a42b284ba6b7b53c8f54574404cb10081edc344d2dd0c15a61ba538934d065863f5925b873439677f88340f360
+EBUILD setuptools_scm-1.15.6-r1.ebuild 1359 BLAKE2B 17342f793101a84d1b931b31a7e3e0a24f55efd7f19cfbe1a2eee899ee6771a729ad38f1b5c5b2c90548bd2fc9680bbc12c783553a9df629da158b41785bb937 SHA512 d68a939338f4a84bfd4638f3d48e93ec0462e996c473637e125911b512f2710f73850d69141f6c59431cbab77d51fcb6f61dc0952df81e6b08d60d21d3af4fd0
+EBUILD setuptools_scm-1.15.7.ebuild 1483 BLAKE2B f64003059ecd5ef861c7f8cec1429b877771f294daacda979cbaf42b5370a07a3453a9d59337c4656f319ee73ae090eed1bb6eafdb817d6ed0a53d7af97dff11 SHA512 8ba4dd34a36d82ebbb3ab3cbc62e35e6fbe6a7129723335d14d28aa0132101e715b4c9d07ec7f5093bfd8b8e3878e75b775ed24e963485b78b2b3011c418b69e
+EBUILD setuptools_scm-1.16.1.ebuild 1372 BLAKE2B f5503bb6c971ba9790136baa90cf49830be228a37a018f170ff92e464a65f135c76f15eeaeebe09c055b63166c2eb27bd87653de67939dd2d6a11fc487dafad1 SHA512 0943416aea652899892f6aef88ffc2db6828d41f2c647a3251960fe60126689e26f5b9b829ba50dc7a4829acb3eb929885d705fae19ac88ba8e083e7300151dc
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
index 77cabd9b84f0..d7a0c871c226 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="git mercurial test"
 
 DEPEND="
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
index 5a3751d298b8..b4db34183f99 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="git mercurial test"
 
 DEPEND="
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
index 927078b4b012..0367b5e4f012 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="git mercurial test"
 
 DEPEND="
diff --git a/dev-python/simpleparse/Manifest b/dev-python/simpleparse/Manifest
deleted file mode 100644
index ab2a3e05e821..000000000000
--- a/dev-python/simpleparse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SimpleParse-2.1.1.tar.gz 207078 BLAKE2B 282d1e502d96323c20d6e66c356fd4b2f99328bf5f734c903f86f3f227cfbbeafd16c7245f21111cb5bdaf9c7a83a44fb95b5d643b49f0260ad8eb249cb2fe38 SHA512 b0a46b8b708ba711c81f739177d7df3814dc7f0ba3a0a7e4ec9b9ade045f1ee90dfdaf76de96306c490238b901275adafbff4efdd2ab46d7a78bf9082c2da0a8
-EBUILD simpleparse-2.1.1-r1.ebuild 886 BLAKE2B 38f5fa10e369b63f8962088c6f395c7581e356f3efcc22db54db05f3ffe2792883f35deb25b449276b5c097c5d1187f3cad8499cdcd2f9e24cc57e7b1e68c779 SHA512 b7a16b66c68987a06c58d3c8c06c24b0e77f58544107e32d217499a719b5961e8ad246b1de0a9bc6b1fc8cab0f0f2ea0fa4384f0987e5972d3bec0d5e3b63702
-MISC metadata.xml 370 BLAKE2B a3437ed71901d77d2293275571002bd769169dcdc454361b5d5f5423823428254bbd8fef595e7bb6c45756210d50ee523eacea3aba571a82ce7c0f5548955291 SHA512 0877167d21e0ef79140c4bed17510462a6cf1f22bd768fe7159a8f73e520c64f55296ba0f15e9c62ceced53b3c75cfef8476e044e65f1c19b3b1e1172019c97a
diff --git a/dev-python/simpleparse/metadata.xml b/dev-python/simpleparse/metadata.xml
deleted file mode 100644
index 011e63f9fbe0..000000000000
--- a/dev-python/simpleparse/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">SimpleParse</remote-id>
-		<remote-id type="sourceforge">simpleparse</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild b/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
deleted file mode 100644
index da6b0bc495b4..000000000000
--- a/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-inherit distutils-r1
-
-MY_PN="SimpleParse"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Parser Generator for mxTextTools"
-HOMEPAGE="http://simpleparse.sourceforge.net https://pypi.org/project/SimpleParse/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="eGenixPublic-1.1 HPND"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc examples test"
-
-S="${WORKDIR}/${MY_P}"
-
-# tests segfault, bug #454680
-RESTRICT=test
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm -f {examples,tests}/__init__.py
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-python_test() {
-	PYTHONPATH=${BUILD_DIR}/lib python tests/test.py || die
-}
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 055234cf84a8..5082c0c34942 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -2,5 +2,5 @@ DIST snakeoil-0.7.4.tar.gz 301878 BLAKE2B ec40ba5921e6edd33cb9dd80a284dee0cc8940
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
 EBUILD snakeoil-0.7.4.ebuild 937 BLAKE2B a69adf1930195a590dd831129b17f20cb80584772bec618793af405bd2e7f1d13f267db3e6634846d5d88db1692e77e3bf5d4c9dba08e5845d9ce228ee501894 SHA512 f47c6e9dc49a0221c082da07d2e69e00bf1a3ddf3ad59afbe82087369bd9e3e9bb4ef0b99c5871d9af6a122ca3b7ee24b10ad8d1f31c52bdb5c356960c65c76f
 EBUILD snakeoil-0.7.5.ebuild 968 BLAKE2B 0f23a9ca7ddd281cffcdfdd09ac5e92dc6b37076520c91a54c6749683a5469212ef51517708ee13c7f79a81df8a6089b3b0aef528702b597e409d93e0134f1c3 SHA512 30a47abfd5d4261430028c92897866894de48cea1cd973190342fdc3fcc300aee24f1579c85825c1aff6ef385ecc3577c61a0e56b6db165773ec38177d872f0f
-EBUILD snakeoil-9999.ebuild 968 BLAKE2B 0f23a9ca7ddd281cffcdfdd09ac5e92dc6b37076520c91a54c6749683a5469212ef51517708ee13c7f79a81df8a6089b3b0aef528702b597e409d93e0134f1c3 SHA512 30a47abfd5d4261430028c92897866894de48cea1cd973190342fdc3fcc300aee24f1579c85825c1aff6ef385ecc3577c61a0e56b6db165773ec38177d872f0f
+EBUILD snakeoil-9999.ebuild 892 BLAKE2B 0e8f5d786e969ea26cda8eeb261af331aee3a085791fa62bca0d4fc44a4da430a754ad7e6ef6a5247f7788701152483ecbd6c18ff11e23cf2671d5b7303cb785 SHA512 e97711f75b09c5e4fce4e9549bb17256e43b5a0c7d13001d13b2b9d79218bc18b9dcd719f6b24b152115bb5668d83c1dda9ed9f02178bc74a2a93d822e806b63
 MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 38a023db443b..431ad815edf4 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.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=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
@@ -22,13 +22,11 @@ SLOT="0"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')"
-
-python_configure_all() {
-	# disable snakeoil 2to3 caching
-	unset PY2TO3_CACHEDIR
-}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
 
 python_test() {
 	esetup.py test
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 94482bb300c3..bf27b6cf2bc2 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -19,6 +19,6 @@ EBUILD sqlalchemy-1.1.17.ebuild 2181 BLAKE2B 3d34528e9252bf66f56fd162503d35d8264
 EBUILD sqlalchemy-1.1.18.ebuild 2181 BLAKE2B 3d34528e9252bf66f56fd162503d35d8264a16a5265efb2ad447da1213052b60a9921af737874bb82ac3715a1daaf8b7c2a4cdb45b3345bdd7c36cd62bbd8e15 SHA512 e60b113a69c5b058a469e43d189b6fa0effaa7ab6da594fb4d8f2b166feedce67bfa257f24edb6d5bc1388fb084bff36682a0f64eb2b10355626ae2b01e9396e
 EBUILD sqlalchemy-1.2.0.ebuild 2155 BLAKE2B c4fa48856128d226d496998ddfe18aca58a8e8d8a49ab3f7ebb8c1534b880d12e37a7bcceb97f52abf045ad77cc37082e6226d6615ce5e6cb00c278ee4562c3c SHA512 f470d206e752de77545452f0bd1f2ba5ee34d637b5d22da9dac16cafee17e248366357fe943a4a94420f4a00e7d917f572a7a3864d91a167c1f5358c0b6b444f
 EBUILD sqlalchemy-1.2.2.ebuild 2172 BLAKE2B 6c6e47e4d87e01e4a5c16671d826172c0e672d9b97e2878fe157673238c238cb2f047a441db55167841e4fb68f4dc9feace089e536b4691ab4509d051508703d SHA512 9e5bc879a87d7ed0f201c7d7747ac8d2322937880f50b176c7bbd3c78c4deb098f300a5d5e9aff971690356425abc7887897a40255deaa594d27eb89ea7a41e6
-EBUILD sqlalchemy-1.2.4.ebuild 2206 BLAKE2B 2756263d0f263abc6de4fbd65c818d7e163a64bb29998eea42d76e7c4e988e05843a30a8acc46d568427b0991f051296ec28990138e3a8260e2a2755b99b5b2f SHA512 19c1eddee6b1109da1af1b192b8537cae71ee7639abe6cb53ebf8b52334fc3ed218a37da9fe21bbed7f7cad2c9642beaa7077f1bce0c6e7436e451b703c8bb47
+EBUILD sqlalchemy-1.2.4.ebuild 2205 BLAKE2B c02b00eef5ff4289b74dd1ada0efc98a3739cb5cc0326f14c55197e7b257c3cd1f96b975ec9a94098cff01908c6d87f1acfc244bc94deaf8ccf2b8b5b20e4f8e SHA512 da638532674c839393b7c4af35a2d3bd0b5beab8ec28dd0142f64617e961ab3db6e53e82ac4bfd8e2e8db6c83f7d09f1db3dcf7084033b6be42de11e244d72c3
 EBUILD sqlalchemy-1.2.7.ebuild 2216 BLAKE2B 0992f434b8c2e895d088cc6372c44a2f407442a23fd869deb9516149414567e6451b5679f4be48bff9ecab863e80d3e2460729a0555bacbe10fce9efe198581e SHA512 9860797a30daa17dd438722cb88af5f74bac7de5bb145a2ae221d32812d8f46e62a4bab1facb43975bc9f0f04b5c2bc0780833ed70e163b37d3e70f2758f2a00
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
index ef400cab76ab..b20a99ca7d2d 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x64-solaris"
+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 ~x64-solaris"
 IUSE="doc examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/tdaemon/Manifest b/dev-python/tdaemon/Manifest
deleted file mode 100644
index cfe973decc9e..000000000000
--- a/dev-python/tdaemon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tdaemon-0.1.6.tar.gz 37206 BLAKE2B 7ae2f7edda1fe3d75d53db811288e132e0692b874ddc9bb90bf4eedbaa0e173dcd32a91f1e7bb60643b6cfcead7d0949c0104281f7f2dcaa54f66e201eef1380 SHA512 b0d49cc3ca4acef8bdb38cde4c1d17cd973215a8cedeb5716831ea129e8fc69a0c890eda7740a35a238ce39272278d8a80c3e4fc26099317bd7b86e80b36def5
-EBUILD tdaemon-0.1.6.ebuild 690 BLAKE2B 08b2cdf6dcba253fee9fa68b145ebae02659fe2be826bec1e0f6a1a6faaeb588abe78a87750e54efdeb420147f3711d827b3e4252185a1130aa6c0eba24839ef SHA512 469dee258819299cbb6c393cd4af74625238ce48d7c48e913cd1ff14fd912755aedeae284902626bcff9e8b73a66073c9f2229714f8cf08c360842a1a8b536fa
-MISC metadata.xml 411 BLAKE2B 5ae6c09e38db52ff43645a993401e1304c87ce9f6f63ef5bc8d9a171c9f30bb5aeca01a2ff902248d3c8901ee361c6096f80d117c9a82eba0560e653b23cfc6b SHA512 2efcb729b1b342944672391a96e49a7356d709911120972c4386db169173ff66da201674b3a83779a85c3962fc269f36b8403069b2ae46315db3202b67892b10
diff --git a/dev-python/tdaemon/metadata.xml b/dev-python/tdaemon/metadata.xml
deleted file mode 100644
index 2fb197446689..000000000000
--- a/dev-python/tdaemon/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 type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <use>
-    <flag name="coverage">Enable code coverage support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">tampakrap/tdaemon</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/tdaemon/tdaemon-0.1.6.ebuild b/dev-python/tdaemon/tdaemon-0.1.6.ebuild
deleted file mode 100644
index 903caa09d3d2..000000000000
--- a/dev-python/tdaemon/tdaemon-0.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Test Daemon"
-HOMEPAGE="https://github.com/brunobord/tdaemon"
-SRC_URI="https://github.com/tampakrap/tdaemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="coverage"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/notify-python[${PYTHON_USEDEP}]
-	coverage? ( dev-python/coverage[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	if "${PYTHON}" -m test; then
-		einfo "Test passed under ${EPYTHON}"
-	else
-		die "Test failed under ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 554e366eba09..8effb1557111 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,7 +1,7 @@
-DIST tempora-1.6.1.tar.gz 11423 BLAKE2B d549581d92d9205eaa9495cba251891a7c93859abf1d402b2e0b7f344f882acbe11578fd66a0f604dbff3458108f04582ce527148f0fa1b2d683872c17d32015 SHA512 9baf9162e304e59ae0a427a7a27d1fc66b0d4b98e016490317832ba2e7acec520ef2baeebeb26f7984ba7ace82413d15b96baef7dbdfcfdc94e29e7179769a01
+DIST tempora-1.11.tar.gz 14750 BLAKE2B d8e448f9cf363a49b30bc016faeaccf1e724c8887d179570b4e46e2eb8d7eaccf7837ffc43e02e956869caa22ac037507e2b17c11540fdb7e6610fd7607780b6 SHA512 cda47613cabefabb0c52e2f89f31b405a3b3f17c531a0b890a9ccfd3a3fcd5bc5bec19881ce726972ff61811654e8b5ec8048c9ebad6e87d72d7d98bfa4daeab
 DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f1fe94fffd59982431190e2807c2dc577ff83eb90ffc5fd2b2f8415965de1d77e4dca0dd02291733bfbb97c SHA512 2420e32a9b8c990609d8f09225004e0b1c445cad1fe3c3c74625cb8317b552469acf2d3b28aa56633a87260a93c77d73b02178cb662016c514bc740aa01399e5
 DIST tempora-1.9.tar.gz 12469 BLAKE2B da18fc066cb9cf7ee0fa7eefb39ea2ac941760144c7efdea66a05780ced43d574757665dfad6088f98c135e7b14874aef0c8243ab338fcbaa5a515ec27507f52 SHA512 cb049675d7196738debca3dc0ddd8c5e72d0468bd1a853f77378cc5564b100cd94d23c63d7b06c6bed2827365d904a1582cf9d497618493b795600b6d476b91f
-EBUILD tempora-1.6.1.ebuild 1192 BLAKE2B 775920937225e50b4335b4d4bb14bead8bdd8858d9f7bde262bd609e8c9b81d102c6b3035906133dee7ee6a07db8ccf53c8e90e9838eef6b31bc2e5505f4092f SHA512 80d5b81ae922cb59b9db54fbb42ec1ee939584da1b1280c269b530e5c83052a71480b311d7591e4012f22e28721d9dab2071f478c95a713a043e5a7343107785
+EBUILD tempora-1.11.ebuild 1368 BLAKE2B ba6afab7343150b4057bff73a2b70853f68ca9b6f4c57289458a47a8a7909fd502167b274f76f4175f434b7fa451c0e4920139bcf823a049a75fc9110526a809 SHA512 495a56510496da5f6aa476c0467b3dbd20f2334b9a46b1fb3c8c2d308ea636fcb07bd91d8e465f6af997837ee90eff09d6d874d21ddcfb86e2fc576ff05c24f7
 EBUILD tempora-1.7.ebuild 1274 BLAKE2B 7cf4856b2eabd47a99c6150512e678c9c436fcc3511f2e23ab848d0e96ecdd5e49c235c86a5a942b620d6893fbbde546665d9347c9296465ce19a2caf83960cb SHA512 0e4a5b8e6296894c411accbc107a8dc677bd68ac0d6b190c699200636ab853e3980de9691a316dae2f928008ca87a7137e98c7fe6c0db89a0cba04efebb9ea8d
 EBUILD tempora-1.9.ebuild 1292 BLAKE2B 121f90d5ad118232c50c4553d3fb14d97d218806744a7e57da298ff1217d75b05b5f89fed087e53a72604b46ac2487560d1ad828215828be9ed5b3d9cc105626 SHA512 72897903cab96d1dfcea6c215978dec4527c95708947b1f839ac94fcb326a51f0c0285e07ff2507d5a8e265bd29ac510e3a7ba7cc878e114ba03d3dff33ea717
 MISC metadata.xml 638 BLAKE2B c86883f938a4779097001ac26dc998a900d39599a930fd5682fca2002f93bc6f3f8b8edb0da06476751ef32fda0ded0641ba12d120919b32bebe2843abca8f4d SHA512 06c699b11df110494a9714a8784042d45834ce647286e57c58831ce036a604f415c7de511901bbff1e9d10a114a2fc6f4ce5fd71dc72ec9cdbe856a93ebd9507
diff --git a/dev-python/tempora/tempora-1.11.ebuild b/dev-python/tempora/tempora-1.11.ebuild
new file mode 100644
index 000000000000..f194bb50ce89
--- /dev/null
+++ b/dev-python/tempora/tempora-1.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# The calc-prorate binary used to be part of jaraco.utils
+DEPEND="
+	!<=dev-python/jaraco-utils-10.0.2
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/tempora/tempora-1.6.1.ebuild b/dev-python/tempora/tempora-1.6.1.ebuild
deleted file mode 100644
index 5c444ca6ad47..000000000000
--- a/dev-python/tempora/tempora-1.6.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-# The calc-prorate binary used to be part of jaraco.utils
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!<=dev-python/jaraco-utils-10.0.2
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index ad775f3c0680..431cfcfc24be 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,5 +1,7 @@
 DIST texttable-0.8.3.tar.gz 8569 BLAKE2B 83b64ba6792b4243bed042f90e643272c045f39eefdd2ea33c9ed506f1cffbb8c683809edfa2061e7f5fc8815c6bbf67de0c8da7a90c6e77fb0d89b57fc41288 SHA512 d9a50f6fd9cd2a6d55afd5e686ac8ff2b2ebcf8c8041209ffae3e3864529c54a384840a65df2b87a942528005ca864d00bb01dfaeb33308843c01db7471931c8
 DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0deb986fd398f0ba0ae30ab84020ac6f179b5314a2071592c38443f9cb86387b9ed573342533af9e825000472ebe5 SHA512 7ec37336ef4b253879d0232dcdb4500cad33ecce1067dd7ea26c221dc2c003ee56360bdbd1dd1e00133301c51c67fb2fe9b1703628804a65f2a6ab8a1e830e50
+DIST texttable-1.2.1.tar.gz 12075 BLAKE2B 050894d30c085599de6b61feaa7268f139e9d682e081f4b17eb96fc1344f35ab8ea8a740e4540511e5ac2232de0d6f2b98c740aa6e689b57b5634e2146fd2ab0 SHA512 7c6a49264b3b458ff3012e378ad5d6b1d466be6d6381e67915bfbd89ad3454c8d0bdc22684854a37901ee679bbd88a307f772ce70bd3bbf21070f5b4a1c95f94
 EBUILD texttable-0.8.3.ebuild 395 BLAKE2B 8b41b19243fd5e9d0ad75d053663e38877ef635d26a239ac13af66b9ba88c000b41bafe2f40bda3ff808dc8e50bf71ac715949f28b9254a0e8404084eaa7f612 SHA512 edf762345583fb76357793f1bbaece0203ea3ccf0e58b00fc302e805905c863f5af1f9ff79747eac03895766b4bc60b5f9e78c82b0c641b47fd34ef11c9c2adf
 EBUILD texttable-0.9.1.ebuild 433 BLAKE2B 39f373d4876fc255d750d3be892e9f8b720c9f136ca9d89c6f46a3469860b640158c836fd21af37d3853bbb004e46bece4b4a103189d9f0e94c1dda6dfbb1b9c SHA512 ee3e2d6576e9bc93fcdf81e33d0a05d772397e3f662bf6a1ac0bf25e030a844ac7278bf4e2b8873360f0ad3e1ad0c3210f1bea9ea215416d32868d5e2aa9c552
-MISC metadata.xml 211 BLAKE2B 8e45befe5fa863b3788a0e56b3bdbbb3d52eb33bec7a02146badf2f69b83dcb90164944c07b6bc32bc435038de6a054aa4a04415757d6542a8945cfb674aaf39 SHA512 a24adee1a3aa9efdd121d0c04b5e5aa4c7c030e70c2a1b2e82c98ec5bd01f7c26182b7566980ea8607fbcdc699911f019dc4d590a5ed4fa65ee28d80f39e7837
+EBUILD texttable-1.2.1.ebuild 685 BLAKE2B b395ae11fc5262877a47205d873d2be1c48c4b975cd142a98059ec25e438b1b27b16d9bfba150c0b4ac4cfef5f5a208f5aa9c710bedb6c6ef3c7285ab69d482c SHA512 54625254d9c538ccc6ecb123279046dc604eaf93ce319260f28793704ab48968879234f461038f8d79b78b32f1ff951f9838654510b5c841240595d73396a017
+MISC metadata.xml 420 BLAKE2B 8af873837a719776cd0b19be2e7dd63656a8620f65dbd81d8b2e68c35ba17fa7c4ddf95dd60e53bb42912b475f4bee9ebee02b8312fcde789922ae9f08b77b0a SHA512 4c300a07ec0a6062c79428596fb523a220376d603105f5ae25e27911967d3212c60885f7f58d11167afc02f9c63c1ee5d57d20597bafe57fbbda32ff3bcd0740
diff --git a/dev-python/texttable/metadata.xml b/dev-python/texttable/metadata.xml
index a290a89e7b39..d96bfd447119 100644
--- a/dev-python/texttable/metadata.xml
+++ b/dev-python/texttable/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">texttable</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">texttable</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/texttable/texttable-1.2.1.ebuild b/dev-python/texttable/texttable-1.2.1.ebuild
new file mode 100644
index 000000000000..33dddd685225
--- /dev/null
+++ b/dev-python/texttable/texttable-1.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for creating simple ASCII tables"
+HOMEPAGE="https://github.com/foutaise/texttable"
+SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cjk test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )
+	)
+"
+RDEPEND="
+	cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test -v tests.py || die
+}
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
new file mode 100644
index 000000000000..e88a77e1ece4
--- /dev/null
+++ b/dev-python/thrift/Manifest
@@ -0,0 +1,3 @@
+DIST thrift-0.11.0.tar.gz 52467 BLAKE2B 72dca118476dc5d618f6434614e5d72c6f496088731de9b62fcf47e76dcf707a171721df2aa4c87fdcf90670b8fd11c3a1cdb2b090b78683a3f4a204ef8121cb SHA512 cba59eef2841fa008a19cd36b322491b67d711698205d6671c76e38a3de2b330db8aa54516de8cdd4020dc795e67ed55913df53466f5dbf07d38fed2d10f9349
+EBUILD thrift-0.11.0.ebuild 453 BLAKE2B 443d6d605c6a78cbbbcaff99c3a162e40bdddaf926d73fcadaaf1d2ad18fe0ca1af7f07624779c560bfb7c8b150787578ea34affacaad63ba3524f5f5ea422cf SHA512 2f431da278e85a015765cd39eaafe78eab4259bf3d274e9f603104b7f931091617f9c78f32a0d933b956d25366b58332a124737121b995b1185a0c758ce4c994
+MISC metadata.xml 327 BLAKE2B 68fffa25c9e88a87a56110743553819ef0591f40567594c2ec966e86228bd3a0b0ef0d84f9f002c427b90d1f139d51f1af9786a4451457a7edb43adbcba10ecd SHA512 5f1f04b5bf6a52319bf4810089b26ba4ea4e4ecb0fb44b70322cca98bac1ed2851535fa8d8e6eea38e45c0a411261c5ca966b13a68cd9f3f51c4f7ff003b7291
diff --git a/dev-python/thrift/metadata.xml b/dev-python/thrift/metadata.xml
new file mode 100644
index 000000000000..78b29df5c479
--- /dev/null
+++ b/dev-python/thrift/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>grobian@gentoo.org</email>
+    <name>Fabian Groffen</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">thrift</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/thrift/thrift-0.11.0.ebuild b/dev-python/thrift/thrift-0.11.0.ebuild
new file mode 100644
index 000000000000..bbc8f37a7dd5
--- /dev/null
+++ b/dev-python/thrift/thrift-0.11.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of Thrift"
+HOMEPAGE="https://thrift.apache.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index a2c472bb4ecf..a596275093a0 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,7 +1,3 @@
-DIST tooz-1.58.0.tar.gz 81688 BLAKE2B 06e282850c549261a312d5381ac9004d13c96a90b10b3f682f2edbe3df5a1b4516a2e618d40d4625242fc18408bb38de56d1c9a58a998b843dd5c98f3d89917c SHA512 44886aed3b37e2a9cb2896fa30e22c7101f19fa766c75a2d7c82c9bcd13b47804ba6d140fe65d2b7c7f3ce3e12bf2f19fa1e92a8e147103204a608aba28f5ccd
-DIST tooz-1.60.0.tar.gz 85364 BLAKE2B 7c1f8cca02830accd5c72d09333f027a02d79944402affc80bb645c11a5a6ecbf94dc8acb62a1d1e98773458763a289134fe8603291e32b25dac507c68571a7d SHA512 610b7d30ce68954a687237c02d5529e93c1babe79bcf16de3674ae3c1d395202738a01dea91f8ffcb184717d884f777300152f54e6f971a4a42fc8bd500ad982
 DIST tooz-1.60.1.tar.gz 85330 BLAKE2B 0b75ebc5dcc3c9873fc41ce92e61be0591955b4bbbc4c7f16b87bcd27c24c8f83bd079fd9c24164563908fbb488ec4a259d65ee583146324b67acf048504817e SHA512 5dafaea570cc104b0e82eff3ec54d0969bf84c5d84e20c69957c55b2cd9e80bee2925e2ace6977fd499044df0bae02a18c17dcba9592ee3c4ccdb6b2b1dfae38
-EBUILD tooz-1.58.0-r1.ebuild 1263 BLAKE2B ca34f0ecbf42876e1a4a862abb48dd2aa7881ea64f3d3dee11a9746b17b9ace9da37001b63df9b3463ea0e1fe3d6f751d824a527d4be178d0c18f57da4798eb7 SHA512 a6f2d3710582f9de384c2e95f8dab9ad91a8233db536b32a21e94ff4e0655966048ea8394a32daf5d20b4d755ad6ddae8c0e778bb69e6c9a429c64bca0f7e1be
-EBUILD tooz-1.60.0-r1.ebuild 1262 BLAKE2B 9b4f3eef111a70bad4d4a953453f9efaab941735b0dab0dcede7bf93ab596c62adf4b338e85c0f2f5a23a46268a59f3ec615f299d01538175c24ca76edfc7b34 SHA512 fc6fe0d66d328ad283b56233f7bf2432d29b10b2123ce26e855fb0e44042c89ae3158488b8334952d395cc6018b578998a74a48ff8abe931f9b861b666720a78
-EBUILD tooz-1.60.1.ebuild 1264 BLAKE2B 3e6be13bf6fe8ca059def056bd0f6a353580b516bfd2ad218eb6d3ae0a59e0f07f9ecdabf11f4f54e78814c04be231ca50914342afb8f82fff453000e2a58577 SHA512 0e68d141b012e69de7c732f87a9da91cc06ad42e10821ed01d0cd83576396df93cd1579d39190a542e19f4593042154c5d43da24ed228624b815ccf45f44e700
+EBUILD tooz-1.60.1.ebuild 1262 BLAKE2B 9b4f3eef111a70bad4d4a953453f9efaab941735b0dab0dcede7bf93ab596c62adf4b338e85c0f2f5a23a46268a59f3ec615f299d01538175c24ca76edfc7b34 SHA512 fc6fe0d66d328ad283b56233f7bf2432d29b10b2123ce26e855fb0e44042c89ae3158488b8334952d395cc6018b578998a74a48ff8abe931f9b861b666720a78
 MISC metadata.xml 614 BLAKE2B b93f65d4b322a9cdd753886cfa8d506676fcbea6c8ab9656c310b245b42aa296667db500584fd19295fa978543834724c17358591f8450cf761907a83cd04d22 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6
diff --git a/dev-python/tooz/tooz-1.58.0-r1.ebuild b/dev-python/tooz/tooz-1.58.0-r1.ebuild
deleted file mode 100644
index f1c631a6d9ca..000000000000
--- a/dev-python/tooz/tooz-1.58.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library centralizing the most common distributed primitives"
-HOMEPAGE="http://docs.openstack.org/developer/tooz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/tooz/tooz-1.60.0-r1.ebuild b/dev-python/tooz/tooz-1.60.0-r1.ebuild
deleted file mode 100644
index 053a5c908901..000000000000
--- a/dev-python/tooz/tooz-1.60.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library centralizing the most common distributed primitives"
-HOMEPAGE="http://docs.openstack.org/developer/tooz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/tooz/tooz-1.60.1.ebuild b/dev-python/tooz/tooz-1.60.1.ebuild
index 1d97d2da6418..053a5c908901 100644
--- a/dev-python/tooz/tooz-1.60.1.ebuild
+++ b/dev-python/tooz/tooz-1.60.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
index ab6818ce982a..0ad2cbe2125e 100644
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@@ -1,5 +1,7 @@
 DIST txAMQP-0.6.2.tar.gz 20749 BLAKE2B 697271755e2f736424cbbaecd6a009b875326c0da9fe4c06f03da9c7b662ecd263c5ac4c770debc0c8c65098e2d01bf9ca74509972b5be56da8572a43260cd0a SHA512 676797a5ae4e013d3cbf42e94f2a3e0421c9db0056e2abaee7bfacbb2b31b50948b5ac51d389ba6f8c609207a294c35ee9359813f3151f37d049092bd1aed78a
 DIST txamqp-0.7.0.tar.gz 117964 BLAKE2B 0ad4c0e9606b6a333ee55f8717d8ead587e5980274d84f1c04652461fddca2f8202485c0f13cba8507ecd7049a1a414166d685326ef146f4d14d1734f0634065 SHA512 8af8dee44885fce6a8015fc3763ff1fd6a3effb8cc954b5ee2baed7c652a34440df4c6d8360b22930dc5b488e9965c3f8ad4ff8d49604ad80e31b6de70c233c5
+DIST txamqp-0.8.2.tar.gz 118560 BLAKE2B 6e60cc0785462b92d046a620cc09eda8b7783bd09186a60299eba11c8f6f5780fc38b094ea974e4f1e443d3d30ee1428f30ad25fdb43554d25db17f36d323527 SHA512 4a5e468482433e684dc690abddeba3e0a6c77630055afe44487de72feecad9c750d179c43dee4e781d09c9c21259cecd615dc9f6eaa7d9ff7ca0796248ad5a02
 EBUILD txAMQP-0.6.2.ebuild 515 BLAKE2B 9b305128a5cd4338a05a614015af3789f22a7a292f8e5da3cbf3a07f6882879e176c8f077bc35603a8eb806684cb1ef6074ef8defb74e512fe475ca4b445c270 SHA512 f1c5418b953c91d1f6ee56d51d9e07e2c013e54e5fb463e8d2b35cfdd06ae82bda5d4415273d5c11f53bae1b42b531e549097d922b20a5c5dc1a7fddc0f1036f
 EBUILD txAMQP-0.7.0.ebuild 1333 BLAKE2B c644f85fedc7edc8d3c643fb744cef4776694dffa44467223758163c6d9b2dd22bd196b15895deb52e0525c856349260d18d4a6bb3bf95a6e8e442c7714b54ce SHA512 d92469eb0a1415bc70f0d8eb3fd5116b2315bd2b0bfb392acb7e0a0f69278492157d9f6b56002a69d45f9a33ea68de78d9a2143e220402e9036669a0c678a8b0
-MISC metadata.xml 362 BLAKE2B 23fdb80065cf634abe4998a866c31f03de9079b2b291f83b8d08e341cad481f76dfc925530d0a6a04dfb4442dca8e03d5f7d8e3321d1f6dba8b89759e8bed537 SHA512 392c1ac853d4e3d1b35938fdb24e63c0cec77eee230b8ef27f4126c26c10296e7039c9c9ed519157f6be0fc086b937c23fb3588e0f831e6fad84bd8ba085c5a0
+EBUILD txAMQP-0.8.2.ebuild 1437 BLAKE2B 3b91de97dba19924595515648f13ba59c7008330eb86d64070f9680d63c50d595e463992af94748827fb550969ebafe94d937f415a36da8770f9e825d5be85d9 SHA512 294a64d1b439b9132ccef7918d2a478f8b0f5bc4a311a327ffbdb46caf083577e5f2d8e0174268462ddc26cbb20318e7e8e56a90bd8222e8f303e99655307267
+MISC metadata.xml 423 BLAKE2B 507dec1a447659fd4b519d029b63840460fcf93e9c5cc1d97e7eb0ae1278488c7f4dfaeabe53510da3c07cd079ca9e083a39586ba8e0b99a4e54e44efc27d3e5 SHA512 e80129432dd18c5d4e08d25d560a7144b6589feffe3c0bb6dae249868932fbd8290426531140bd4b0d124b1b06d198527d1a225cf454454f195a20699482a09d
diff --git a/dev-python/txAMQP/metadata.xml b/dev-python/txAMQP/metadata.xml
index 791f8b34f5de..8a4e48b4fcf9 100644
--- a/dev-python/txAMQP/metadata.xml
+++ b/dev-python/txAMQP/metadata.xml
@@ -8,5 +8,6 @@
 	<upstream>
 		<remote-id type="pypi">txAMQP</remote-id>
 		<remote-id type="github">txamqp/txamqp</remote-id>
+		<bugs-to>https://github.com/txamqp/txamqp/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
new file mode 100644
index 000000000000..2c1e1f260f11
--- /dev/null
+++ b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_P=${PN,,}-${PV}
+DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
+HOMEPAGE="https://github.com/txamqp/txamqp"
+# pypi tarball misses doc files
+# https://github.com/txamqp/txamqp/pull/10
+SRC_URI="https://github.com/txamqp/txamqp/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+# TODO: split twisted-core gives minor test failure, get rid of it
+# when we port revdeps
+RDEPEND="
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+	)
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		net-misc/rabbitmq-server
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+# Tests connect to the system rabbitmq server
+# TODO: figure out how to start an isolated instance
+RESTRICT="test"
+
+python_test() {
+	cd src || die
+	# tests look for those files relatively to modules
+	cp -r specs "${BUILD_DIR}"/lib || die
+
+	TXAMQP_BROKER=RABBITMQ trial txamqp
+	local ret=${?}
+
+	# avoid installing spec files
+	rm -r "${BUILD_DIR}"/lib/specs || die
+
+	[[ ${ret} == 0 ]] || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( doc/* )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index f9f4de66052c..3d3562fc4f2c 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -3,5 +3,5 @@ DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30
 DIST Unidecode-1.0.22.tar.gz 208877 BLAKE2B 21df38361b9b66f5e2d6822afcdf4656cfb240dc679f7469b41652b95d3a6921b9409a65891e359708f5bee09dbeff1885801ca3842c8ecd12b31e31689d69ca SHA512 f7663b320040bc750bc10ac0ed222e4feeb22c903b103c148cfa31e9d4cbae146d9668dc45c6efc82e8ed28e0db28d5de5e3ef1259c712bf317f2c6b2543772a
 EBUILD unidecode-0.04.20.ebuild 588 BLAKE2B 269f69a3dd7050665171635a56762dbe9b2f4ac3f7a3a2ee422ea5a9b8913da02265a6761b39e05402cfbfa2f08fb93fe88c6e8c64567e4019ca2b8c751273d8 SHA512 97bb012a8f2a910bb2cdf2a661145232b9c0624e382faf7bfc017579cc2c1da86bb1a6d48e8cae9cd6799923aec497baab5e61e34bd3bd7e7150158a7f009419
 EBUILD unidecode-0.04.21.ebuild 596 BLAKE2B a13ee8cb417a0a7724ae1eff0f3abca8dc247458658e80a9c6c5a3991fc5f09740926a31ce37bb4646c2d60d4d5a23f3a7c3b48a6bc07b2e4d75870c5e240669 SHA512 a8befe494a6dad7e85672d1a2ed06c1413594387aef925127e542093c275ec007ae12f0866e17e6975aa361fc539d08f45ed90cd66b65830a4caf86ea59d9add
-EBUILD unidecode-1.0.22.ebuild 596 BLAKE2B a26df8b20c99692c7cddc1624d907caec459f386fd5d72c7239364e402494e4eb6f37d4b64061eff719b4f3cb2f2fde2e212bd8983785d068d45799cc462beeb SHA512 3e2ef53710a9ecb7fb631e1359fa5bf68be4c4fa2a095117701511517f52aef25cfc59d8372a2eae4bbb6bbe3de2377e7d0a352b39bc41c745c4f5ff69aecf3a
+EBUILD unidecode-1.0.22.ebuild 603 BLAKE2B f63468824e9f2e1bfa16bca89df8c0651144871d87692db1f362d3573ca617d85a6f098e388a7c41f1c02947478bf9a0b8bfa9d4a6525e5e507dac6796dcfcd9 SHA512 ff17c308545fb5c7fc3545f25d1cc6dc1e33d8d69ee6b3d056951726e6a52c0a6ab06f8f64474a1577cb2e45e2ec12d578a6a1f9d08a250c0097ef760ff43032
 MISC metadata.xml 464 BLAKE2B 831af5def540e1b09728fa02a91039904c29da99e7b0d9ab7ef70a649d7567c854bc178af3f0e561e8090bf1087fe512e796447743a164130938c1a24e702f3f SHA512 f77532d725889de9b780bbfe06e2caa7b53e7af47edaed0fd15a07a3e5b72a17fa0a1e4d68d2c9cb7b78413acbfdf72f44de7df67db0a7bb901afa83912ea886
diff --git a/dev-python/unidecode/unidecode-1.0.22.ebuild b/dev-python/unidecode/unidecode-1.0.22.ebuild
index 3f9b667ff5a4..af46dbffb7d1 100644
--- a/dev-python/unidecode/unidecode-1.0.22.ebuild
+++ b/dev-python/unidecode/unidecode-1.0.22.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index ddeed4b5c6f7..363940af30b1 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,5 +1,5 @@
 DIST vobject-0.9.3.tar.gz 57744 BLAKE2B 01a9083faa7f2a84e2f6f09d9f9f14afb5558d86aefb1a9d5c7e3c8f0e664d6a292f79a340c1a32e510637784cdfb0f02d713e0bcdbb99d1531c50e742192063 SHA512 d77dac2e885ea752e900a2f6e3d9cf24fdd3365d1e9e2ba51c5c38b2889a62aaa61e5562799eb8063b5d4ded0bcd43108cd7e5d028cf7dbe72008b208b8e2e76
 DIST vobject-0.9.5.tar.gz 215577 BLAKE2B 0312a0c1377ce8141e32422fbf9b4dab253398ccf83bb530929ac052537213b065d7550cd0d926a52a00e27271faa942797b65899fcbe3b8b955ca15c6a114a8 SHA512 087b394ad6c48c359ee1cabb90cbc85cb305ed9e65199f33c19f386c7075b70273e5fddcf7fde5356b140ead7a581efd917594e4d493e720c4e1a632f797acc7
 EBUILD vobject-0.9.3.ebuild 781 BLAKE2B c4df5166da0942cc46e38ad18ed017089bb60befb337827adfef68890c3e2dcc84043311d6598440a87812bb2adf554054eeb71c2f97b5b3065189ccabb61293 SHA512 e668439edbe611806750a3f641e812fafa49fed311d1329395ea2e8103faa52de5b441a396f7960478045d60c880be275e26e4e027be9769d829ea2e972412ab
-EBUILD vobject-0.9.5.ebuild 787 BLAKE2B 6699dd138479f45bcd5ff424389d1e26c17447c36de45900efe90366e51fa3d9039967214a0cc1d3a55392400bdee08ffc16c29f855ba11ab396d065044b2011 SHA512 7661f8fd1032ffe6ac7c3999b5e3afb0d5114c71614f01ab4a96b1b61239260c8ad970323d0a4d9161f2b65b233f3c13b232e2a132ee82e0d7dbf91a58442f20
+EBUILD vobject-0.9.5.ebuild 794 BLAKE2B 78c62ad5726fa07d870740e20bb484b822f20158f19f4d8cfbfcfde3dd655612ba98d0b5bceb43fef1be12fe1d85306d15a1b5cec11caa0d585c1ffffd84af72 SHA512 3f3745254d52434cfd66569eb9a7757d2acc7c5ece6e5a9e1ba77c24fc548175152292605f679865afb5b8828a5634e55b15bf3db0e570a241ae1a93085d7723
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
index 99539b059e84..c12e9e5b559e 100644
--- a/dev-python/vobject/vobject-0.9.5.ebuild
+++ b/dev-python/vobject/vobject-0.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index ef7cfc72ded9..24fd331e72b9 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,5 +1,5 @@
 DIST wheel-0.29.0.tar.gz 54143 BLAKE2B 8f29c81b9b3c8ee419c26f04e09f437a2113716f5096e1b6e21f23e6a7426e58b7ee00c0846cfcd816670bee4dd908ef577e4142fae546d4ea643af2c2612049 SHA512 b72dec3cf71e3d87c611ff41f1381ed7f2c654edb50c808fb4fd0f552bab3572434495bf18c36d2ecc7cb8b355782054d3d6dedd5589ffda15027e72cff24602
 DIST wheel-0.30.0.tar.gz 43087 BLAKE2B 796a57298571a9430094be93f38c679941157679d5a75d7d5da88be4d1f970f5aeb9810bbaaa31c77b71959b3c6eadcd618314ab3fa82b959c592c72b8171c0a SHA512 d39fb683ca2937745b057464ec17f5fab0475c2b1225cc4c84f1b0e8cd61a4bb039730dafdaa687f7b054ce080c4b7acbd3196045db14e015585536fcf498f84
-EBUILD wheel-0.29.0.ebuild 1001 BLAKE2B 07c7c3c42c7b69323322159fe31b679d666950a4d8ba6f3795d275f16c1d0de47cf41b878bec0421739aac403a9c5ae1e47bc7be763f11e097612f6a6e50b3bf SHA512 2c35406be7f683b3632aa8fee1c2c0a28c8c7087073ddadbcd8a201bc21b57b4e9997b40d004d7219141673462a880d8b421291d4dc677d146e9f8ef19149ce4
+EBUILD wheel-0.29.0.ebuild 998 BLAKE2B fe9d6e9b2a16944bc754ba9d9bcfcd471bb4f4d3d5cd3db6c15e575042eba4aee12103b5af9be465396f215152ed8b147c5939d649a72c1637c6cd40577491eb SHA512 387cd792495d26346e4aea329e53ca640c0582f78af2b7a7a5e96d6ec2d7bf4c581ae6deeb12a51d869f69a8e58d764f709b76464003c17e53b1f61088249bd8
 EBUILD wheel-0.30.0.ebuild 1023 BLAKE2B 5a96e4dddb45dbc42c58b484b505683d0653668a20943debae1561faf22aa8e1d98145853e3aa68a1a06e03dda9fc758e3babc4fd7eb65be90f625ce81098377 SHA512 646b30a918659e0b0ea0a0eeb64e17082500620e1b5451618439a109e963025884abd87ea838a5bbd8d530fd4823daa8d94591aea2ff738eb020f8d8ebf59d53
 MISC metadata.xml 308 BLAKE2B 32390fb7a1a3de815d3a791850d9f96d8092be48cf2ac61f8cebdf132e7d1c5c4cba95bac3edc3f2ebd6a2d9e9437e0c9187f9668ed95c4ddb4ee6072f496d46 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
index 789635764e3b..dc9a228b0dd9 100644
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ b/dev-python/wheel/wheel-0.29.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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="doc test"
 
 RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index f49fafa455ea..3a3767dde575 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1,5 +1,7 @@
 DIST whisper-0.9.13.tar.gz 14028 BLAKE2B 38c1d006c3b6334df8c18c7e5f695359912db225b72047c0549ba6ca786a1f8f2820a18957d8f0a9bdd07ffa723b9c12b3ddd501d88a65c55d3df6db241aa94e SHA512 b4b46bb7f31ecb766495f5f592fb2f9a754f5f38f83f071b533d4302b95808b9b4046bf7769bfa0d7713633344c7c693b57dd550b52acec4617257eba68634c1
 DIST whisper-0.9.15.tar.gz 15655 BLAKE2B d2f8a1333312038fdec2ed990c4657255242da74d68fb07aa1099fce345d95c15ea98a28a2a3a582b7972c6b67df9f0e2ea2280b9ba9168d65638548d53b8555 SHA512 bdc9d299ed713a3fc6104938c347682562d5f17a7f3650d823f9814410dc934899b81bb2f42f52e9cc25313d8ed33f7b4def6d8945561d63f6237492bda2a5e6
-EBUILD whisper-0.9.13.ebuild 376 BLAKE2B 7d23a58d41ab03b2d32156f0794c5a42a2ffe0c868d0e509cc23979618042cd89201074a10ec21cffcc05cf7352afda2e67abbae413c649261f74c98238d3532 SHA512 718f2e421e60c7d1b8d20ecbf2fdd351faed124b5c418abf8e14c33300a868c98d1801631c604a3af4d9498f457bfb2bcd60fed347e7ffd7722670a78b794183
-EBUILD whisper-0.9.15.ebuild 391 BLAKE2B b7f9cce48a3bca61c2534f0e41ede623da6f5324d3d97e2f65b1bd191740688abd95bfd5892ba84ce93a4c2b4111477e3a5acdba01911ff4ee14ea56ac64b28b SHA512 79b4504895b3f19cd4eba3bd58c353a73d0c36c1abbf165b401ca93be7b72bbec281ac3e89d548deb8b4cc4373692adc4f360e18ced528214a0db59702cd23aa
-MISC metadata.xml 420 BLAKE2B 1ae39ba906c5ea24339ce4faf8ca3a1431fd7aef6a19985b64cca9c22c3b245351245d7f13a9108506113152a781edf9e97d609fe52160b401f229ac3fdb8234 SHA512 8eb72895313f060ba301166c3d978f8ac2206c18149c969235efc2a57573da425435fdd751a601bd5c3cc1c1e6a20a30dd3e2f600f40c6ec52f5f425f4215187
+DIST whisper-1.1.3.tar.gz 37716 BLAKE2B e0cad5c7ef8ca885cae2060838669d80e8b2e28d1039dce45fec601257c866d202a73279d923aff39781f71d7c9bfdc19300c991e7a5956af337d5ff18a37ede SHA512 cd2a1bece58ea4cb3f5df6adbe1966e1408c92a55b21bf7298d4b30fdd51780e236707cae1414d6c363a046a36870a6ac230ec30abe565fde9fbf17efc9e7cab
+EBUILD whisper-0.9.13.ebuild 391 BLAKE2B 8745f2a1c88c3d50acfbcde4b20c71588442bacae1b0255de0e315419052f3eb2ba79396a7c25ed17b86432b3d0e4d6217b4d65daf33ebc1cc55d754fc99588e SHA512 b7468b6c76c14690aa4981e9dd8f971afa5a155f3e52e69a72fcaa79374d48fc45881377285c08df060772eb30e5aeaffcbab4db7636d66f81a7741baf08a11d
+EBUILD whisper-0.9.15.ebuild 406 BLAKE2B 5c85028f7675f540b2ba5c10abb98e57b83963240e580e2eb3ec36caa86d6f6bdb38ed352bf8d4387cd4784e5c3854213361dd2dc43262997cd8dbb7a0efc355 SHA512 b39628ff109126f9954d3948d5c8c33ae88c728c5b914a40072d5c5b23499ea2f154a090ddafcdde3cbe054cc072a9648d2e2c4dca1bed1b67d72e6406a1abc4
+EBUILD whisper-1.1.3.ebuild 786 BLAKE2B 945346c8628b23f7347d88dc0557de7d484e472efbe4172c4c4b8535e944bf71da9dde31d3675ea2827002a726a7468c8975589e045bd68008ca39395772800c SHA512 5fb82a2fcc6d3369412e683c84383b24eb4ff59f09869ad3878ffef410a18f696a31d42a41415673f021ecad9c7504f114220a98918728b28f7ff90fbf86ab23
+MISC metadata.xml 556 BLAKE2B afcecd89f7f06cef8d991edd5476a6ec0db7753d2d58174ec5a1a955f6023a06d56f0ae933e438bc720b9cf777852df4d223a21557454ee7d6aeef7741f451ee SHA512 7f72e3305aa749df979f180e0d46efd3ce1edfd81e76f5cb8a808d433ee2b19741b756f0e2c7706fce8bf2b4ae9adc336e309d3ed902e3d122fd1617dcd26af0
diff --git a/dev-python/whisper/metadata.xml b/dev-python/whisper/metadata.xml
index 76c8a4700642..5088568e3bec 100644
--- a/dev-python/whisper/metadata.xml
+++ b/dev-python/whisper/metadata.xml
@@ -11,5 +11,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">whisper</remote-id>
+		<remote-id type="github">graphite-project/whisper</remote-id>
+		<bugs-to>https://github.com/graphite-project/whisper/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/whisper/whisper-0.9.13.ebuild b/dev-python/whisper/whisper-0.9.13.ebuild
index bc0ca2feb9c1..fa44cb14b549 100644
--- a/dev-python/whisper/whisper-0.9.13.ebuild
+++ b/dev-python/whisper/whisper-0.9.13.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 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Fixed size round-robin style database"
-HOMEPAGE="http://graphite.wikidot.com/"
+HOMEPAGE="https://github.com/graphite-project/whisper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/whisper/whisper-0.9.15.ebuild b/dev-python/whisper/whisper-0.9.15.ebuild
index 71ce065214ce..bace960c5989 100644
--- a/dev-python/whisper/whisper-0.9.15.ebuild
+++ b/dev-python/whisper/whisper-0.9.15.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 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 DESCRIPTION="Fixed size round-robin style database"
-HOMEPAGE="http://graphite.wikidot.com/"
+HOMEPAGE="https://github.com/graphite-project/whisper"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/whisper/whisper-1.1.3.ebuild b/dev-python/whisper/whisper-1.1.3.ebuild
new file mode 100644
index 000000000000..d3df70da0981
--- /dev/null
+++ b/dev-python/whisper/whisper-1.1.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{3,} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixed size round-robin style database"
+HOMEPAGE="https://github.com/graphite-project/whisper"
+# PyPI tarballs don't contain tests
+# https://github.com/graphite-project/whisper/pull/253
+SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/python-unittest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index a15f29223f21..ed3845979d4f 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -3,9 +3,11 @@ DIST yarl-0.10.3.tar.gz 127867 BLAKE2B 6e20500e51a083f20f12bb4ea95611953ea01c56b
 DIST yarl-0.14.1.tar.gz 134863 BLAKE2B 7295b746948c78f174975f2862e481fea0c11b7a292ce59552c17eccc02de7e7b8f3063dd3cea1e5d79b5bd270afa5859c9ae645c2de0fa2a66b52262748febb SHA512 d48292616058731bebb9370f23a892072afbbe8c3c720d920c7b9bb1554d91b02d2c9669662bcff0c1efdc7d519145e214a1440622c03e05c7a9b910d69d69da
 DIST yarl-0.9.8.tar.gz 125806 BLAKE2B 983ccd2516ad00e89b75cb94a2237ea85325947d8fdfd7978b08addba08566b205b5c2a2863fb9943343857b976981b0b5735fe35b2c88f77d6178faa0d814d5 SHA512 67446ca618a2539f8c1fc8a7a96d1ce50a924ece0479e01103347f73a7bd75b0fbdd0ff5c007529195c3f12aa62d185563e761557fcb95b3226eaece65c0be9f
 DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
+DIST yarl-1.2.4.tar.gz 159570 BLAKE2B 2214917d01ba8f7ba4ea66e28711bcf2549fb1016be9da49147788d61a51168bc81b209ee1466482c93a8fddb4bec87c9ee072b703a1b0094553ecfcc525c0a9 SHA512 370fafa7ca507589660cb9f025bfa154c7b351fa6f7f7cfbedf8b20b64a175bba78e7673b122443132b10e6214e503668efd98c79dd79ee45364b1f779ecd8f1
 EBUILD yarl-0.10.2.ebuild 598 BLAKE2B c4030009f1487ab1080e9685ec4755a10ff44762a689b5c3b05f55187eb9175719808db76798c06407033e4e9426094ecf00d63ed681d1e9a77cd00285570fc4 SHA512 a1fa1a4053d0d7e478fc0cce51da9e83ad41dbb1b114f2f69f0ecb2aa8b4379d765f2533f221c33216df3667f5e37331c5481b900f3c4bbba57d344f41767957
 EBUILD yarl-0.10.3.ebuild 598 BLAKE2B c4030009f1487ab1080e9685ec4755a10ff44762a689b5c3b05f55187eb9175719808db76798c06407033e4e9426094ecf00d63ed681d1e9a77cd00285570fc4 SHA512 a1fa1a4053d0d7e478fc0cce51da9e83ad41dbb1b114f2f69f0ecb2aa8b4379d765f2533f221c33216df3667f5e37331c5481b900f3c4bbba57d344f41767957
 EBUILD yarl-0.14.1.ebuild 620 BLAKE2B ff237445d53fa8a7d6951d53c8c2043f03217c4799b4532c7e895ce9366942008e6246358748872454c1ccee3df2a9617adfa1669e4d5e3036025ad22dca7902 SHA512 ef6fbb052c0497bdab78c87aea57ee81b4724c4dafb8c197f413ccf92349947c9e382a8ce362ea7d5502b0a4d5b1e4c43813526cd831ef8b9d3954b2bd04c875
 EBUILD yarl-0.9.8-r1.ebuild 580 BLAKE2B 3ede8e4c60be7440d92c1c755393198bbd07cc7b0859482a578f461af6fc798027cf940b0a1da4bee0d4ae011b46562385f4127c23aea09d9a85d78bdfada946 SHA512 a223d7ffc84d391979807702196f17435a7577bbceb6584f1455a88ca99dcddda2f70b4e8c77a83dbf6dc51cfa1c04655e6f0dc2b6ef7593d2e5889f8fce82e4
 EBUILD yarl-1.1.1.ebuild 664 BLAKE2B 1242a6dc9459f12dd061a992400b657359d7eeef0724edf6200681919922f1fcf3bf41915ad9c00f5f4086c19d78e36ba387dad91b8138bf68372b1e5d08070b SHA512 fccef3a98d33aa7f1e80c40bde1d07b58e64539f798b491c55bbf98e8f61a25795a15c25070ab4cda8e32af7350fde84923c634f151054b51079c8e6394f5d5f
+EBUILD yarl-1.2.4.ebuild 664 BLAKE2B ba8d0e46dd8517187c328abf10a25c8e95f51f6f660c026826c139c31f9e4d9d39ab67ed1d60031cd4cc0bb97be4ff89b89173d2f829c436fa3aa992bfd9f855 SHA512 4b7b03aad9f19357b671bf3a1ffbcb8e03deb962882b31c6b0578ed54689ee5538f8d38cd849a3f6e98e598bd34a205a58e9716c4e89a4df692512fa1343f845
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.2.4.ebuild b/dev-python/yarl/yarl-1.2.4.ebuild
new file mode 100644
index 000000000000..e1c3de99fca3
--- /dev/null
+++ b/dev-python/yarl/yarl-1.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index e6a7dfbe92d2..bc1aa804281e 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,3 @@
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
-EBUILD zstandard-0.8.1.ebuild 519 BLAKE2B 3dc4518573ea2a4528fa4e6a2331268bfad320b1716f20bf652703cd1e63f500d7eeb24a192866eb2c3c24602c20aec697bd5825d5c557953bf837b6bc551447 SHA512 fd07dc757bd091ea7e3269cb39b3ba6d7f169a7acd5cc138f9867aa0a868f70049ddf970e5599c3f6a828e9d03b212f0e319eb9606e669bc5b106e2c0cdecb63
+EBUILD zstandard-0.8.1.ebuild 543 BLAKE2B 8ed93e486db71a00c07b722aefa003579c4e44be9cb4e895b9a4e87fa1c7664ec166d46f5fa545e8a9bf78156f3854ff08714a0f20f1d0b266ed4922919226c2 SHA512 0c48a1ef7fb9c256c32df684e1c4a803daabc54e14b3daf121f494c2675d3ef006c43d2590221a528767919683c50d0312a6ec68d2de4c9749bacb919277574a
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 990981569c53..1ec08922ecf0 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 37ca81698028..ce5e7ad47191 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index ea3a5723c589..f2847d67f937 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,7 @@
 DIST qtlocation-everywhere-src-5.11.0-rc2.tar.xz 5536892 BLAKE2B f3d93876ce1fd412a6c251326a22c0f9c9cccca2d3a6f4b910122ac34de5adb33a5e3deb675cd224a1694bec1935463a391cc4f8353fc692e49d0eb8fd48d37f SHA512 7e9cb0ee5e3be0e96d08ae5db92bef572e26f22200d2df463f3ee01cea5068918ded70f3769715225dfa497aff9d9de2e181f626ce044549b8a8c5b3c49ef0a1
 DIST qtlocation-opensource-src-5.9.4.tar.xz 5405252 BLAKE2B 6474251b21baaac6182a0197a7736dcae86d0735e8be499c9bfefa639b3a45c750fa9bfef766849fbf6d7c5db518e5712e0862463e98168e2a3121582966d834 SHA512 a97de23a554f709a39ac8517de85c9beb7e1a8330ba3996593aeb3d64d1c5b8d8b08b0c94df435dcbb4ba5807e262ac6f87ec9620694805e0261a4b2ee8456cb
 DIST qtlocation-opensource-src-5.9.5.tar.xz 5405920 BLAKE2B cd405d3a1eeed95c1c9f8759cc0d3c34d532de6f11c030296cb652e37aba66628578551fc73d5e283a373426b1e7b816b092cad1329d0a61f349650e88836a53 SHA512 80d8a8f3e82238c8a7f3e37999d5f118857e0037e60979de00219db45b3c716e6ac092f0b848c00cccbeb0ac19a1a2f4479bf92c7db701de1b3d239161d46d15
-EBUILD qtpositioning-5.11.0_rc2.ebuild 838 BLAKE2B f2010ba1dd1b763e7999911cd6322ef22c8882175a108a2a9bf72933b3174b735f8b6af7b05aea20f825de0be91d132cdeef29ebdbd80a3309a314e8cad6557e SHA512 4af68dc418fafebaf73cc6dc8b68690f4221ef869d382ba07208707e26fdb1ce1969d18bd3176074e45b87179ff465ed021b16c01e88976c6606f618638aaced
+EBUILD qtpositioning-5.11.0_rc2.ebuild 843 BLAKE2B ad120bb0a2cd8a0655d3b5e271037d7a9e5f4e8bd9e99ebb161bcb1c24e1133c87582b0b0e928607bf7b2f9cdbe0c0e260b518755baeaa646304f6ddfd863ebd SHA512 99d5f6f66130cd18819c3ca6f5f57617ea9848ed73519020981c059faa5ceb8c53a5a945cf073c9e5349b78743ff8c8e1190ba424d3f3bad8f6d9aae96c3e922
 EBUILD qtpositioning-5.9.4.ebuild 807 BLAKE2B 7cd8b965a356bd9ca259d82c1ec4c8b86a722f6b4b3401d30ab99ee92633ee35c88c34e52b04d1a04ed144720ce3ffbbf5ed16967258ce1ca458666e855acb98 SHA512 54c4d3c712ced3fa5bf1755b2df18a74303cf979ba21f5df24157f00e89b1c271fcf045d05492eb851bb31918476a0329cd7e2e09d153c07293093a6329ba584
-EBUILD qtpositioning-5.9.5.ebuild 810 BLAKE2B 86651857bcf1c8fe233d659b49c0d0b2fb85864b2177523df59b6495475eba2a7d78ccab5d73654131e50930425693bbdcd3afe1b4a7104c5a8d3162c2245f7b SHA512 acb350332bc1eac288607d78a287cc64a562e0e984cea7e9df2becd41f7f7e6b5f19288d3ede58354c48c64d0776a734fb2511635a6a47b3667303dc5c68fe39
+EBUILD qtpositioning-5.9.5.ebuild 815 BLAKE2B f03b461ee7759db966f3bd33b9991f3045833fb766f4bb203f1bc994c04f818ea05d87a696396187b2223b995726381db396e8b64c1dd70234f35c0b9be88527 SHA512 e3c49b3b40189b617be96fc69fa92af075d4b5181215cfb7ef1f9b9146358ff31272d0f559170b7745dc50aa4260300d543d31bb8cc3a6f8ed5c48affae269c6
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.0_rc2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.0_rc2.ebuild
index 0fb891e57cce..37f71567e715 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11.0_rc2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.0_rc2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="geoclue qml"
diff --git a/dev-qt/qtpositioning/qtpositioning-5.9.5.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.5.ebuild
index 2af4b954c373..c698a3ca6572 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.9.5.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.9.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="geoclue qml"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index bd9ff6f99e7b..9e593976b2d7 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,7 +1,7 @@
 DIST qtsensors-everywhere-src-5.11.0-rc2.tar.xz 2029376 BLAKE2B b41389279e5d4eb66da018c8217ea0b0cf618f4b10477ebaabfb1eea01e3e7a3447e5c81bc9b0b558954b12075d5717d9b834aa80c17a5c7aa2b110419b010d1 SHA512 a690721df34925ae011da7583ee9b85808bc7da764d589d9fdf6dc784e87d16dee6b6d2a20e4968cd37587e3d77f6fb68bd38f6f181099911bd85f073dd439ed
 DIST qtsensors-opensource-src-5.9.4.tar.xz 1994992 BLAKE2B a7464ea11b7e74cf491a4629058f142f9e85d57e08e8b7fd1708cfe47951d0345445f853c89f8f8d0e4700eaa452e0c1ea00f4ebe12eda643fe512afc7dd6969 SHA512 10b0d4595ced97888c28ddb36626657250ed839004ee61cbb244326529d25c181acbad774e7d40733d9ac48485320e72e52bf52f10f2a18089a6a4ce4fa3097a
 DIST qtsensors-opensource-src-5.9.5.tar.xz 1994612 BLAKE2B 8b65b0781dd784942cec15456eab14453aac308ed948f62dd515fbefb8cae084f74b87736740a0a47043e22bcb82954cf0407209a7843445f6fc3cf47d791af5 SHA512 1413b15287d4dabf3a7541032f622a27b52ddb64b114bcb4a83641f9272f7785324a84c151b723568ad7106b07aaada32d1a006a9613f50532ca14b82886790a
-EBUILD qtsensors-5.11.0_rc2.ebuild 532 BLAKE2B 21e26e655c125242a339bb2b035bd7aa0a2ff71471eac52905c460c8836a038c4380605eefe5bfb5d56816d09a9c392a5335496e96c63ef34eab93100fd49ecf SHA512 6eed64f50257523e54a1ab7605e29627ebd60a37d599c0b8616c7494ddb72f08b7fa702620e4ccda71891eabf86a268f7197448981c507e07f4e4ad9112fc5fe
+EBUILD qtsensors-5.11.0_rc2.ebuild 537 BLAKE2B e560851f2ddb5f429f5d760e1c287f6b6eaeae49013c02ae54c66c13f4ff071ab0665d411a7c53589ca9eaf77a7fa72165730deba2aa2f1617ce2ac831897e22 SHA512 e190d35f102385927cbef9d5b1d685e8261a96cfa3bec1cf7a206ce9405e699af15a31f8437358deeca205acdfadc8821a2e30eedecd20771ffd22d3c4613143
 EBUILD qtsensors-5.9.4.ebuild 529 BLAKE2B 6ea55cffff0218bf22db4721a22de169bf4b19aa56af940cf1cb615efb501a3b599e4a8e492d79d1a136fde81b4941b240d138cafccbb8a06daccb53c07acde7 SHA512 4d1dc97c80a8b984f60d23514db8bc13baf8006e08bf72f0c3a45deb75f9c140940e7b6bef4373823695c2b0a9ab526f16ab06608097fbffe3a0a08cb55aae55
-EBUILD qtsensors-5.9.5.ebuild 532 BLAKE2B 21e26e655c125242a339bb2b035bd7aa0a2ff71471eac52905c460c8836a038c4380605eefe5bfb5d56816d09a9c392a5335496e96c63ef34eab93100fd49ecf SHA512 6eed64f50257523e54a1ab7605e29627ebd60a37d599c0b8616c7494ddb72f08b7fa702620e4ccda71891eabf86a268f7197448981c507e07f4e4ad9112fc5fe
+EBUILD qtsensors-5.9.5.ebuild 537 BLAKE2B e560851f2ddb5f429f5d760e1c287f6b6eaeae49013c02ae54c66c13f4ff071ab0665d411a7c53589ca9eaf77a7fa72165730deba2aa2f1617ce2ac831897e22 SHA512 e190d35f102385927cbef9d5b1d685e8261a96cfa3bec1cf7a206ce9405e699af15a31f8437358deeca205acdfadc8821a2e30eedecd20771ffd22d3c4613143
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.11.0_rc2.ebuild b/dev-qt/qtsensors/qtsensors-5.11.0_rc2.ebuild
index 28845fe6f0fa..d0b0c5b6e6de 100644
--- a/dev-qt/qtsensors/qtsensors-5.11.0_rc2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.11.0_rc2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtsensors/qtsensors-5.9.5.ebuild b/dev-qt/qtsensors/qtsensors-5.9.5.ebuild
index 28845fe6f0fa..d0b0c5b6e6de 100644
--- a/dev-qt/qtsensors/qtsensors-5.9.5.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.9.5.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 7fe156186125..69b394d562a5 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,7 @@
 DIST qtserialport-everywhere-src-5.11.0-rc2.tar.xz 297876 BLAKE2B 81133e58914ade0aa027e7b7f2e4daf934851761eb69be50259e167df9204968aa5322053e5db183a20bc43376ee4f5fbdce373c69ab220c2383632ac532804c SHA512 515d5be70d4a10bd45768ebbc6a148abcfde97b626044f057d799cd4f25eb4ee7d2396e6c391c62e9828b87bc754a1462cf98f9a1fa4d4396b7d0e44fdc94d0c
 DIST qtserialport-opensource-src-5.9.4.tar.xz 273252 BLAKE2B dc9a97465ac22521346da8d676ac31f48fbe1a8b1070e7c774e1d4ee8ea1fe713688775d590205e6149cd276427b35e7c503cfe5fb81cc0eb5063656ff92f745 SHA512 8eb6b850440e6e16ab0a9389259b15ccd7bd783755a6964a3d1ca07260821807c7a3e52237b69ed4e0e6333a74046b03c28e92a2e4e34c1140163af287b5f344
 DIST qtserialport-opensource-src-5.9.5.tar.xz 268296 BLAKE2B 77d78a651e54b04ad5ca2e816a4f2577d1830250fa199f53b1b9b7fba1418800e42a8a970bc5d2a0025dd4cb41d1fef0c1a1dd238893d8621a4bc943a514c65f SHA512 53b0f5002f72a6ffbf2c1cb076823e4b7b2de560d17b6c5af6f8320d755cdeb860e537f39abab22e892edda5e6b2b4e3e10cf5315550c54ad20b66e2b749a88a
-EBUILD qtserialport-5.11.0_rc2.ebuild 542 BLAKE2B e4294b0bd51fcfd1d6c605e26ca0496121dcd06fba63b8cf8870a0bc2a1e0292766210d0da7fbe38514c2db1245f5baf24c36a913db0165eefa34c3634cf2762 SHA512 724d9d28f4f2f75518685652207385f9a1d40845b744952e3f225ba08f6973cc5b306ac6919474fe02b454b3a85b7f0cd2ecffb43f6420d26f14c3d1246ce44f
+EBUILD qtserialport-5.11.0_rc2.ebuild 547 BLAKE2B 9bfc01a34fd6c72d287f2171aaf54bc58b2de2ceb5b08fedddcb507314d3441fdd1dac6ff5fc1c844e56a6f0666645977c43fe1138b41a5da03640261ca44e45 SHA512 4ea49a5ccf688e58cdc09d12773e799b247f65e6ef34e4ded25a06111f4a897263c050eb277d4fc3b3d46c435fcea8762117e7806aceeeb1311ca9d6788f8c5b
 EBUILD qtserialport-5.9.4.ebuild 539 BLAKE2B c2128a79328ce2effe83b6c2135fc07a1e1eeaf00d85b4148116fc30b9e6a459ca7b66983b9051f9e027d7af5ab3e2d39b04b888a730e24a219f4ee092542ba3 SHA512 200bf31da4b42d7ac46e684b2218b94ddb415988967ea175321dba67f4327693db43d86093d13bba151f045d601baf242824802cb1920379b1d3993a4bb214ab
-EBUILD qtserialport-5.9.5.ebuild 542 BLAKE2B e4294b0bd51fcfd1d6c605e26ca0496121dcd06fba63b8cf8870a0bc2a1e0292766210d0da7fbe38514c2db1245f5baf24c36a913db0165eefa34c3634cf2762 SHA512 724d9d28f4f2f75518685652207385f9a1d40845b744952e3f225ba08f6973cc5b306ac6919474fe02b454b3a85b7f0cd2ecffb43f6420d26f14c3d1246ce44f
+EBUILD qtserialport-5.9.5.ebuild 547 BLAKE2B 9bfc01a34fd6c72d287f2171aaf54bc58b2de2ceb5b08fedddcb507314d3441fdd1dac6ff5fc1c844e56a6f0666645977c43fe1138b41a5da03640261ca44e45 SHA512 4ea49a5ccf688e58cdc09d12773e799b247f65e6ef34e4ded25a06111f4a897263c050eb277d4fc3b3d46c435fcea8762117e7806aceeeb1311ca9d6788f8c5b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.11.0_rc2.ebuild b/dev-qt/qtserialport/qtserialport-5.11.0_rc2.ebuild
index 9798eabab40f..f29b276edef7 100644
--- a/dev-qt/qtserialport/qtserialport-5.11.0_rc2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.11.0_rc2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtserialport/qtserialport-5.9.5.ebuild b/dev-qt/qtserialport/qtserialport-5.9.5.ebuild
index 9798eabab40f..f29b276edef7 100644
--- a/dev-qt/qtserialport/qtserialport-5.9.5.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.9.5.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index a4bca9d6ac9f..bbb6ab054877 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,7 +1,7 @@
 DIST qtwebchannel-everywhere-src-5.11.0-rc2.tar.xz 175232 BLAKE2B 7f6b296e70b942ce2394bffe9a7618448dafe78ddd3252ae8d6cad27d14b8814a30212e3499ee29960b576e95f31b6e0f727fb287b76c8586fa8d65c120c9774 SHA512 5aabe3263f5a8e22e6fef311d57264d6fa21bb20cc17bed19086f805d2dce34154e66bd8ace3a863140e23946b944da25edaa52555650a6dad12332d504c0850
 DIST qtwebchannel-opensource-src-5.9.4.tar.xz 147456 BLAKE2B 703bb44c12bb856f311561c772ebe8b716dcbae9f75ac47d7b702f459d47a621431a5eb2cd15c44f60c8f178d6fb6d8405f1c79c5e5501a28ac566298959b58a SHA512 932b56c9e9944e0f639163c4e484ed5260bdc7a186e81a2a6cfa113d14892414cd5b81f2767132695fb2f251c91e4d5ec9711cba10983215baa6e8014689dfbb
 DIST qtwebchannel-opensource-src-5.9.5.tar.xz 147564 BLAKE2B d66c190cae43875cf2845231c47ba5040db7b31724ea88333a8d818c111be9860c43fb7f0b3c16a3f139429361e6a1660ecfb1b2edb1a2e5a1c0f3e48797c4f6 SHA512 d5a3914c20fe541401a662e30f7277d9a57f9f4b9114832fa9b0425003542f646c295b63f31ae02c6cb69a45b88966f80f036f80b7df9a15fbc223a135d3944f
-EBUILD qtwebchannel-5.11.0_rc2.ebuild 567 BLAKE2B 0c2571b19cbdac1eadcc41c8989423580cc0744f6303834e321ac9ee8159dcfe23467bfc70909cced0657ad4e97005dee5ba42326c509cde3639b3e84db8b3cd SHA512 38902c94bf7b214c3d784dc0788fe4257cbfea895a6ad7dac73dfb52546f55bb16c6e84e20192c8e30c0bb57c2716ef8860d79ea0d71df33f3d3aab2a2542263
+EBUILD qtwebchannel-5.11.0_rc2.ebuild 572 BLAKE2B f1c0e3733716fde195c07c6b5902259a7f036552727a4ac893c683ac6c1ab09b82ded3ca27f1ff5bda111830112fc73c7538f9b015d7c8389bcc8990683891e7 SHA512 f05966782c48702b6523f159d3b5d138b4c85946ee947834c4fba0325c2260d5e633b0fadf5a43c7ad60d678e67864bda3556c35ed5dea8ff16a9ad8d8b6a1b9
 EBUILD qtwebchannel-5.9.4.ebuild 564 BLAKE2B 841c1280a0faeb5fe4d2df74b87f359aab2152272e56286a7faf7af0206247a15a50f979a252c2b57a5acb9b5c72991ce3d9582fd4471c2132b465532c935afc SHA512 24facdba59179122b01c05f03d67ddeacbc6d2333057ab36101685128ca80037e63e11d74752236c4cd83a573d74c75f2d94e3a7165333cd7a295ca2fade415c
-EBUILD qtwebchannel-5.9.5.ebuild 567 BLAKE2B 0c2571b19cbdac1eadcc41c8989423580cc0744f6303834e321ac9ee8159dcfe23467bfc70909cced0657ad4e97005dee5ba42326c509cde3639b3e84db8b3cd SHA512 38902c94bf7b214c3d784dc0788fe4257cbfea895a6ad7dac73dfb52546f55bb16c6e84e20192c8e30c0bb57c2716ef8860d79ea0d71df33f3d3aab2a2542263
+EBUILD qtwebchannel-5.9.5.ebuild 572 BLAKE2B f1c0e3733716fde195c07c6b5902259a7f036552727a4ac893c683ac6c1ab09b82ded3ca27f1ff5bda111830112fc73c7538f9b015d7c8389bcc8990683891e7 SHA512 f05966782c48702b6523f159d3b5d138b4c85946ee947834c4fba0325c2260d5e633b0fadf5a43c7ad60d678e67864bda3556c35ed5dea8ff16a9ad8d8b6a1b9
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.0_rc2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.0_rc2.ebuild
index 63c52e4c7747..7f4acf242e82 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.11.0_rc2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.0_rc2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.9.5.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.5.ebuild
index 63c52e4c7747..7f4acf242e82 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.9.5.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.9.5.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 818a1dfadca8..c20647edf6c9 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -2,5 +2,5 @@ AUX qtwebkit-5.4.2-system-leveldb.patch 711 BLAKE2B 26eb498e422836585b2fb2c12126
 AUX qtwebkit-5.5.1-disable-jit.patch 460 BLAKE2B a5ec0644d7f4341993cfbec916bc3c9d69ab992d29df3a62630bf077e211d6c1d3848a93ab25bb6bae2971e44518dafe2841c8b78d3556f1d8f1380d85269fb2 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749
 AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 BLAKE2B 3bb7ec6976934e20d016fc6fa0421cab5d6ce51731a0c5a12b92b6e1611a75396f9db751074f7d9ffdb1c000b1964689d69606ba16e29f3ee5329d141dd3c90a SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
-EBUILD qtwebkit-5.9.1.ebuild 3496 BLAKE2B a4b03d514768ca6ffc45aef9b5a46f68734f38f192a4a94f78ef33b6d340a3d62f6651ce7a1d2ee9296ee99f3d9fe12d78d69731e1d57a9930aa90d6b0833fe9 SHA512 bf246728b9b06a5feaf60880d285f022d27d3c8e6ccd3f94c4c0ff0f6e198352aa6dc06198922ce8c989884245d8814d56aaa0c6c78de499ec820cbd140f2676
+EBUILD qtwebkit-5.9.1.ebuild 3501 BLAKE2B d4387ba74ac8d5cafbd3f3eeb45ac965d4dc3bf40a76466fe79982f445d0f806a7b87134339fb91bf54d4fd3514be053aa7be7fa11ca0e4cf883ef81308abaa4 SHA512 9b681d7c62b6f36648dd363b6d308717cdf22a1df0a65a86893efa6734f32b262a5f966cb74d7bf09580e81d0baa1b2211635f5737b7224dc3118e4fd8c20303
 MISC metadata.xml 1287 BLAKE2B c73fa9c1384ee77a1086a77e3f163e6be0460ede09f84ad4ded3d476ec67dc9c3b677619a06e136d9bca19c1dd884fb1f5397e2f16c1c7a4db70acba2b21adcb SHA512 2ef43378ea8190cac99ff2a400198aa9747b1e451a94cdafc6dc06487aa77afc9322e70e984c48b483dc2c8a3c9e73c5f538f707fbe7837eb4a3f0bff6c4070d
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index 142589aa654f..0ed44ca77672 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 fi
 
 # TODO: qttestlib
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index b9455dd43149..54bd8b191a9a 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,7 +1,7 @@
 DIST qtwebsockets-everywhere-src-5.11.0-rc2.tar.xz 227788 BLAKE2B 53d07124686a13b8844064272aecf49cae55b28aed5c5678e24b2345a800f819b7001f0be19d54c16a01a72d19226787ccfc03244c200144eb923133befe2387 SHA512 be8029474cb246ca24856510baaa7651f67d19c8030c804a2c555b083d4ca163b4126c8bcf0dc2b0ff8b55e3179e0007d1ee75a0f6a8e5388274d588e34f1fbb
 DIST qtwebsockets-opensource-src-5.9.4.tar.xz 199492 BLAKE2B c8e7b32a3ae5f74294006ea0c47e10d34753cf3221484c398bb64b246ac7139a5adbde73b001c9d4e18d1cafb636f57d0b12c30620e777c0472f93dc4ef98b4f SHA512 ecf4dbbaf7da1c69cd649e599118231cca47e7c63a83d40cef15133a0ecc6c4d32e15faac8e545f5672c9e1be15b38c1458a5a5541e680ee1ebb2fc1281260f9
 DIST qtwebsockets-opensource-src-5.9.5.tar.xz 199632 BLAKE2B ac174f9b005ed2fe31395dae844ea5e331603b7320e31d0efb186381f41aa9a3a465eb1f339e1969c8914ae27e6ad494a1197676a6b54881a75af58d2278d75f SHA512 20a1a259fa41b0a743673d1af046b7aa655c375d2ef6dc34b9ea9958650f5288594519291188228b8531631809f21dbb599d333d2edc2c3a516fc0d85cfaaecd
-EBUILD qtwebsockets-5.11.0_rc2.ebuild 534 BLAKE2B c76a76e0afa33140ec7d9cb11ef00b831ed39793ec1f406cbfac2f504b4e65ab916ca367c8ebc31bcc1a0dbc45bc87365d66bf9d87ccb8cbec84ef7959550886 SHA512 7bb5be749d4308840922d502b55ef8fa7e1ebd55ebcedcd25096171227535d732cde405cce6e3dede58c92cfbb059f3c5c79f9bd8b5ebdb2ba365e9e20337e39
+EBUILD qtwebsockets-5.11.0_rc2.ebuild 539 BLAKE2B ef00dfefc365b70159695f236af006dfe992a50274970b1a93ce1cc5141f891887c75fdd4a99b00d37c85980897e03928d3f006192cf31665abca761f5e29dd5 SHA512 f91f054e63e2db29e3ba473d0a9c8f9c3d183eb878d816cd209438cc9cc2d882aa80c2f6774c43d14a1aff82026f55d403f881ba4be90efb11e73f3cd63969aa
 EBUILD qtwebsockets-5.9.4.ebuild 531 BLAKE2B effc25681c849666974ce5c934d2407c70d0f8854ac9af3f80105ff0dafda5c59d11b6c37e9daeb34c7dbab4ea07253ec4de6111fefe92b8f30d4d04a5fcd5d3 SHA512 f116ba3147571fa035701be18ef0fb25747df8e135bda4c2cb75fce0acff9062ee73fff3c814d0c05bc37b8a98a670c39154cf97e26a1e4b3c740c16987d15ee
-EBUILD qtwebsockets-5.9.5.ebuild 534 BLAKE2B c76a76e0afa33140ec7d9cb11ef00b831ed39793ec1f406cbfac2f504b4e65ab916ca367c8ebc31bcc1a0dbc45bc87365d66bf9d87ccb8cbec84ef7959550886 SHA512 7bb5be749d4308840922d502b55ef8fa7e1ebd55ebcedcd25096171227535d732cde405cce6e3dede58c92cfbb059f3c5c79f9bd8b5ebdb2ba365e9e20337e39
+EBUILD qtwebsockets-5.9.5.ebuild 539 BLAKE2B ef00dfefc365b70159695f236af006dfe992a50274970b1a93ce1cc5141f891887c75fdd4a99b00d37c85980897e03928d3f006192cf31665abca761f5e29dd5 SHA512 f91f054e63e2db29e3ba473d0a9c8f9c3d183eb878d816cd209438cc9cc2d882aa80c2f6774c43d14a1aff82026f55d403f881ba4be90efb11e73f3cd63969aa
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.0_rc2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.0_rc2.ebuild
index a0d178ca76b6..362a0a81c42a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11.0_rc2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.0_rc2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.5.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.5.ebuild
index a0d178ca76b6..362a0a81c42a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9.5.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9.5.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 9dec6b4df931..9f7febc4e211 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/cpp_common/Manifest b/dev-ros/cpp_common/Manifest
index 93111b0a0c31..3cee77ff6e01 100644
--- a/dev-ros/cpp_common/Manifest
+++ b/dev-ros/cpp_common/Manifest
@@ -1,8 +1,10 @@
 DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
+DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
 DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
 DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
 DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
 EBUILD cpp_common-0.6.10.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
+EBUILD cpp_common-0.6.11.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
 EBUILD cpp_common-0.6.7-r1.ebuild 420 BLAKE2B b21ab6c6e875b3295217c3c735601d424d86bfca9479e7fc569c5b1c6e3d8b1c1646cb3ca8d41246a6298dc57436ede4efc03f47490367d203d041795e3bf67a SHA512 4f3e377d1cd041b0d7802a182a4182f461d23fcd989c1c89e111702c0679e64a47c48b398b4bf4605052048dae569627091bdf08c4754d95556810bc3ec9158a
 EBUILD cpp_common-0.6.8.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
 EBUILD cpp_common-0.6.9.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
diff --git a/dev-ros/cpp_common/cpp_common-0.6.11.ebuild b/dev-ros/cpp_common/cpp_common-0.6.11.ebuild
new file mode 100644
index 000000000000..4b61973c2c53
--- /dev/null
+++ b/dev-ros/cpp_common/cpp_common-0.6.11.ebuild
@@ -0,0 +1,19 @@
+# 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/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge:=
+	dev-libs/boost:=[threads]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_complementary_filter/Manifest b/dev-ros/imu_complementary_filter/Manifest
index aec53de13a59..b6ab52ac1fde 100644
--- a/dev-ros/imu_complementary_filter/Manifest
+++ b/dev-ros/imu_complementary_filter/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
+DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
 EBUILD imu_complementary_filter-1.1.5.ebuild 598 BLAKE2B c16830be1c852c4e99d38535a6b1305478d94da0875f063d4ef3df176bfb072b9b4771bdd919a5b5e9288b4ceb4a91ad8320926f05ac2a30e5d606c1617ad512 SHA512 43ec4e9e3b2100312b3c8a2db4736f7daaedbfad0c05b8206384ef5af02c5b3d0192ddf9c02ec4ffc1cf129edcf72982d740fb23473dc7f67c61d9b92daf4bd7
+EBUILD imu_complementary_filter-1.2.0.ebuild 598 BLAKE2B e58418a4664e2552c8564ed4a411607c3eb2f25d218b12e79fb79345cb9457fb0044eca36eef10aec9a52f1626b7ebccd6bc393cbbe3eac49657fada0d1174f1 SHA512 0e6ad3862755f9d6f8bc73c337831efa885b669036986ebab789d47350851eb35ec00b8b567fd8494303c9c70da93052e2830769fd6366336ee9f9677102b328
 EBUILD imu_complementary_filter-9999.ebuild 598 BLAKE2B c16830be1c852c4e99d38535a6b1305478d94da0875f063d4ef3df176bfb072b9b4771bdd919a5b5e9288b4ceb4a91ad8320926f05ac2a30e5d606c1617ad512 SHA512 43ec4e9e3b2100312b3c8a2db4736f7daaedbfad0c05b8206384ef5af02c5b3d0192ddf9c02ec4ffc1cf129edcf72982d740fb23473dc7f67c61d9b92daf4bd7
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild
new file mode 100644
index 000000000000..bbbf6e05dd1b
--- /dev/null
+++ b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index 015c900f0e06..d6ac94b16a5f 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,5 +1,7 @@
 AUX pluginlib.patch 498 BLAKE2B 923d0288c75d969156cc5825c624e041821492c0d767873685ca8d479759cc1ded1d30cb22091b45066a8ea57fb2abcccc5acd852bc0f778a203b99760e466f1 SHA512 59e3d0c7e9c7b1dde87e430cee2084afa2c3e443277322c2c21abfe9619392d88d321b90198f03b5e90f8e3d4eb184611c0839ffdb93ca275d6e20db08e4acf5
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
+DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
 EBUILD imu_filter_madgwick-1.1.5-r1.ebuild 797 BLAKE2B c561d840818d5aee7e61a14c076b402c83ab97ec0d6b9f671129723cc4e86f57e953e9ccbbeba362291cbf1b1561990515dcb7f1768813d0f29739117352ee14 SHA512 ab75f6871c652b1852abb67a6f633faf6048782e0924d00ae48ea2bcc6c116c13b1a6dc6cd2aed51ff554b83a9332c933d94b1a0b46e06638dc9bef46d4dfda8
+EBUILD imu_filter_madgwick-1.2.0.ebuild 755 BLAKE2B d9db5fb169aba977dbe2c7b6d67c050938e72bee39137503c79cea7a110aa7d3ab1e66e781e38636113adb2c6b590dd7bbe3ecdec3fb1ea83db96b6116cd38e5 SHA512 88428a38e0ebeefab1df6d2057b808e04b7d6ba88c430934d1cf6aed0f076f5045c227ef17cf4eabd068e3036d775e43b6ecbe21a0fad4cef0e6044607b0c6e2
 EBUILD imu_filter_madgwick-9999.ebuild 755 BLAKE2B dea2ac8e4c97538fddf1d11eb038196677a469352bca4b9a994ff6d4aa05e5471e036ae93e7c303340c1a5f412b49246d193c4804667f9a6e6a5427909a28991 SHA512 fca79c2a9a0308ed99c5c2acde0a66285dfd08ba60cdc974df9a0dfac864ee6999902b321fb6b21de1989358527e578e778b181fb41868c38c4b6f83244bc2e5
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild
new file mode 100644
index 000000000000..1594d52649aa
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_ros
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/pluginlib
+	dev-ros/message_filters
+	dev-ros/dynamic_reconfigure
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosunit )
+"
diff --git a/dev-ros/roscpp_serialization/Manifest b/dev-ros/roscpp_serialization/Manifest
index 2b7fe3fb0f62..07a1e65aadfc 100644
--- a/dev-ros/roscpp_serialization/Manifest
+++ b/dev-ros/roscpp_serialization/Manifest
@@ -3,6 +3,7 @@ DIST roscpp_core-0.5.7.tar.gz 32006 BLAKE2B d63c6bcf314de4237ed8c08b5af7a1a097b9
 DIST roscpp_core-0.6.0.tar.gz 32255 BLAKE2B d184d3d3c05a041c1c027877a314f5bd98515ee02d607cf3575ca939e7ec7d87807bf2ee96717cc5b23971ce297d3bdeb6f78c5883dbb6350ae01ba23ae8246e SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75
 DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023a0241422e463dd8fc12f697604e655f01dfe5ea0142b819aa638903fb94adaec985a0c7c2feb79db886a2b97db18 SHA512 167d3b7bfa048a2c3f7b4239402c9077e1871aa2cc5f60ebab3e5ad3cb5acd94667b4e7de9eb2af2f8dfba74e0d82510f6bb591f7096d99e465f987643b2681a
 DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
+DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
 DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
 DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
 DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
@@ -15,6 +16,7 @@ EBUILD roscpp_serialization-0.5.7.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9
 EBUILD roscpp_serialization-0.6.0.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
 EBUILD roscpp_serialization-0.6.1.ebuild 387 BLAKE2B fc484443ee236c2ab64633cb079387d72ee2f2d4f10a7b6cbfbdcb22b2934f8d3858e45090b393a2081b5c710a43b65026f62f6e11043ae98e8d4acd49ddaa29 SHA512 60b7fd5834da14aa8ee575fc134753d3feda9c91599634474b7e233b7dfd8fa5f5cf4c26de93dbc3d873e2413dfaf1f5135f8291a6c496658c3a79427a584fc3
 EBUILD roscpp_serialization-0.6.10.ebuild 387 BLAKE2B 8c6cce04919a8a1ff197d4518b83da92e5a4e8b72fec4288bae1a0e5a79a26200d5baef7d2f7b33585f453e1082b338c37881601d497134a881139ca4bc3ed5b SHA512 6c11b64d7abcde3b95ae30401a44f183775cedddf083bc50a78dbc2f41e14738315a9b7190fa1f7873f2208eb8227a3a7603235f9c093576cfdd1cc3c2a84b5e
+EBUILD roscpp_serialization-0.6.11.ebuild 387 BLAKE2B 8c6cce04919a8a1ff197d4518b83da92e5a4e8b72fec4288bae1a0e5a79a26200d5baef7d2f7b33585f453e1082b338c37881601d497134a881139ca4bc3ed5b SHA512 6c11b64d7abcde3b95ae30401a44f183775cedddf083bc50a78dbc2f41e14738315a9b7190fa1f7873f2208eb8227a3a7603235f9c093576cfdd1cc3c2a84b5e
 EBUILD roscpp_serialization-0.6.2.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d3f149794a497169f12a02ccb2fe7816c5fd9b03c780a719214b56822e90c34fe3ae46f9cb875d37cc124eadb536f9c4374e04 SHA512 09647fe204192af1a48512bf57b5cc2d2b02c03d15badf41a7595bcbd8fed32e3d22b227dcd2b4a748cc54e664f3139666fed0c8130d1a4aaf09f53c9cc0502f
 EBUILD roscpp_serialization-0.6.3.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d3f149794a497169f12a02ccb2fe7816c5fd9b03c780a719214b56822e90c34fe3ae46f9cb875d37cc124eadb536f9c4374e04 SHA512 09647fe204192af1a48512bf57b5cc2d2b02c03d15badf41a7595bcbd8fed32e3d22b227dcd2b4a748cc54e664f3139666fed0c8130d1a4aaf09f53c9cc0502f
 EBUILD roscpp_serialization-0.6.4.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d3f149794a497169f12a02ccb2fe7816c5fd9b03c780a719214b56822e90c34fe3ae46f9cb875d37cc124eadb536f9c4374e04 SHA512 09647fe204192af1a48512bf57b5cc2d2b02c03d15badf41a7595bcbd8fed32e3d22b227dcd2b4a748cc54e664f3139666fed0c8130d1a4aaf09f53c9cc0502f
diff --git a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.11.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.11.ebuild
new file mode 100644
index 000000000000..85ab25009f61
--- /dev/null
+++ b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.11.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/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Code for serialization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/roscpp_traits
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/Manifest b/dev-ros/roscpp_traits/Manifest
index 45889e34011e..491e0e732886 100644
--- a/dev-ros/roscpp_traits/Manifest
+++ b/dev-ros/roscpp_traits/Manifest
@@ -3,6 +3,7 @@ DIST roscpp_core-0.5.7.tar.gz 32006 BLAKE2B d63c6bcf314de4237ed8c08b5af7a1a097b9
 DIST roscpp_core-0.6.0.tar.gz 32255 BLAKE2B d184d3d3c05a041c1c027877a314f5bd98515ee02d607cf3575ca939e7ec7d87807bf2ee96717cc5b23971ce297d3bdeb6f78c5883dbb6350ae01ba23ae8246e SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75
 DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023a0241422e463dd8fc12f697604e655f01dfe5ea0142b819aa638903fb94adaec985a0c7c2feb79db886a2b97db18 SHA512 167d3b7bfa048a2c3f7b4239402c9077e1871aa2cc5f60ebab3e5ad3cb5acd94667b4e7de9eb2af2f8dfba74e0d82510f6bb591f7096d99e465f987643b2681a
 DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
+DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
 DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
 DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
 DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
@@ -15,6 +16,7 @@ EBUILD roscpp_traits-0.5.7.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a
 EBUILD roscpp_traits-0.6.0.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
 EBUILD roscpp_traits-0.6.1.ebuild 361 BLAKE2B b76fc1310778e384f2bd719b9319a97e24594c84d6c309ab86946024b3484394a1a2170dfd44ab6e113b54b7e36562045196665f1bd9a5e3106a903e739a9595 SHA512 fc9ed293ada85a69388adfefe444e9abda9d6f038922b81f033b86de891fffa34d9ab30ca50426bb3e68014e3791ce082df7254577db2479524c0e2c6c8fcddb
 EBUILD roscpp_traits-0.6.10.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
+EBUILD roscpp_traits-0.6.11.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
 EBUILD roscpp_traits-0.6.2.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
 EBUILD roscpp_traits-0.6.3.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
 EBUILD roscpp_traits-0.6.4.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.6.11.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.11.ebuild
new file mode 100644
index 000000000000..48ba1af0d0b9
--- /dev/null
+++ b/dev-ros/roscpp_traits/roscpp_traits-0.6.11.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/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Message traits code"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostime/Manifest b/dev-ros/rostime/Manifest
index 504bb3b94956..367c8911d6da 100644
--- a/dev-ros/rostime/Manifest
+++ b/dev-ros/rostime/Manifest
@@ -3,6 +3,7 @@ DIST roscpp_core-0.5.7.tar.gz 32006 BLAKE2B d63c6bcf314de4237ed8c08b5af7a1a097b9
 DIST roscpp_core-0.6.0.tar.gz 32255 BLAKE2B d184d3d3c05a041c1c027877a314f5bd98515ee02d607cf3575ca939e7ec7d87807bf2ee96717cc5b23971ce297d3bdeb6f78c5883dbb6350ae01ba23ae8246e SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75
 DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023a0241422e463dd8fc12f697604e655f01dfe5ea0142b819aa638903fb94adaec985a0c7c2feb79db886a2b97db18 SHA512 167d3b7bfa048a2c3f7b4239402c9077e1871aa2cc5f60ebab3e5ad3cb5acd94667b4e7de9eb2af2f8dfba74e0d82510f6bb591f7096d99e465f987643b2681a
 DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
+DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
 DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
 DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
 DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
@@ -15,6 +16,7 @@ EBUILD rostime-0.5.7.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224a
 EBUILD rostime-0.6.0.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
 EBUILD rostime-0.6.1.ebuild 429 BLAKE2B cc3affe89fc8cc3d6166feddede76c4062ed16d3be8be38c603c34bd0a994d4d8b814e23741e1816034ef82d7edc6ace4c483b1da8705b2796186d5415fcad4d SHA512 ef8e1d9ccd89a9c3756ade6ce584796d16273b1ec87f7bf67bc84c17fa81468d33c72fe02677f599631fd04a5ec9cf266b10300fa524bb80b9192d2e5962bcd3
 EBUILD rostime-0.6.10.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
+EBUILD rostime-0.6.11.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
 EBUILD rostime-0.6.2.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
 EBUILD rostime-0.6.3.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
 EBUILD rostime-0.6.4.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
diff --git a/dev-ros/rostime/rostime-0.6.11.ebuild b/dev-ros/rostime/rostime-0.6.11.ebuild
new file mode 100644
index 000000000000..6d97b2f7c4f5
--- /dev/null
+++ b/dev-ros/rostime/rostime-0.6.11.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/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Time and Duration implementations for C++ libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/cpp_common
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/rviz_imu_plugin/Manifest b/dev-ros/rviz_imu_plugin/Manifest
index e937aae30794..0ac395f4956c 100644
--- a/dev-ros/rviz_imu_plugin/Manifest
+++ b/dev-ros/rviz_imu_plugin/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
+DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
 EBUILD rviz_imu_plugin-1.1.5-r1.ebuild 469 BLAKE2B 0f5068d4d4d812f3062ecd046884843c26a47a3c653b68cca70da3d3cd0b7e58e5d0def78a5365df0a6c2b5413504bcf3c3b09764b66c45b65aa5a294ed80071 SHA512 cb48900eae0268b9fc85e9b630da9e6b2d2eaee769279061012ceb8a2196c63d97afd010c9b1340c44369b604152d85147300ede6da6289bfc0ac0c90b4d4d62
+EBUILD rviz_imu_plugin-1.2.0.ebuild 469 BLAKE2B b5a5d6f9e05a3313ea31023d5bec80a35464fd4373156a11b2047a5c8ce29ab80ecb47df59e6962db97703ab72e20f1fa81c68b94a70cda6330a9e3fb6a45d30 SHA512 0efdcfd8766151e774db18ceeb8f8fcae833d7e699f75b4088517f1f344034247e5d19c53f08d762e261b82f2e36309ff0bcf7a84525fc34b2b4d3270e0442d5
 EBUILD rviz_imu_plugin-9999.ebuild 469 BLAKE2B 0f5068d4d4d812f3062ecd046884843c26a47a3c653b68cca70da3d3cd0b7e58e5d0def78a5365df0a6c2b5413504bcf3c3b09764b66c45b65aa5a294ed80071 SHA512 cb48900eae0268b9fc85e9b630da9e6b2d2eaee769279061012ceb8a2196c63d97afd010c9b1340c44369b604152d85147300ede6da6289bfc0ac0c90b4d4d62
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.0.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.0.ebuild
new file mode 100644
index 000000000000..0c243ce8c89e
--- /dev/null
+++ b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.0.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/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RVIZ plugin for IMU visualization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-ros/roscpp
+	dev-ros/rviz
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2e90f37470ca..803c795d868d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/activemodel-serializers-xml/Manifest b/dev-ruby/activemodel-serializers-xml/Manifest
index 23e7dabc4590..72a46dbb7db1 100644
--- a/dev-ruby/activemodel-serializers-xml/Manifest
+++ b/dev-ruby/activemodel-serializers-xml/Manifest
@@ -1,3 +1,3 @@
 DIST activemodel-serializers-xml-1.0.2.tgz 23321 BLAKE2B ad626402acbf3a10a9b14a19713b3855e7eab69cd02ceb63386cb11b147c4c9dbc68dd849b9421b518bc70be29009f54f5effbe734e9c8bb1c59a7d2c3286ac7 SHA512 888db4822f9ed4fd17ba93f2e03e4edc204bc14f62e3622949140a3497f56ad7cd7d49cd7f38fbf557098ceed9f2f1334093fd8493ccc82e56be15f6bf138af9
-EBUILD activemodel-serializers-xml-1.0.2.ebuild 904 BLAKE2B 991cda32c45eb0a805694e69930abb812301f9adae57e98bb8859f975b17c8901881b1645dadc486defaa35e764c092822f5c70e93291ab7918156c791209616 SHA512 9ad0d9ba8e9400895a8dbe0aeebcd05415bf38cf7d1d16bd9a498a52e0905f4055a2572858d6a08ec322f4052407874d0b22d40f8b0929639c9a929d93e53cc3
+EBUILD activemodel-serializers-xml-1.0.2.ebuild 904 BLAKE2B f8f35c6b179ae079ed7906fa8db02bc3dc3dcb274d6262b9fbc52a38d435bad2cd7cc4fb2371b1deac696ba9de727638f33e259c685e8a2975800cea2aa61b6f SHA512 264f8f50c03b4449e218c2304d620aedb26e38250b262ebc3c260cc26e7c81d2e6ac281f558beb79d03a1afb2334a7307aa5424243ff4a2fde4064152222207c
 MISC metadata.xml 359 BLAKE2B bd42be542034857259bf880395f36437fe922d69129d5d9bd42304d91a5c7d4b4abdf14172f107f65145e1d84a357df91a1863ba27769d71cf27ed3b23665441 SHA512 6c897585918895b39efa6695aeb5d21fde017b48de50232067658edaab18b90374996f2e5b10a485373ea5316e2fa7f57f0583a02478d64761e2daf2417c9633
diff --git a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.ebuild b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.ebuild
index 2d603f210bb2..4298b9e7f2e0 100644
--- a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.ebuild
+++ b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.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
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index b970d768f46a..7fbac4c55101 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,9 +1,7 @@
-DIST acts_as_list-0.9.10.gem 34816 BLAKE2B 82e6f5b15b5a9d4d1bf79254e7726f879880513d0ed0856fa7ecf60ee5d1451564ac67c2ef87be883df127ceef109c73cd4e0f497e6405d24d7cc9bfa1fae6e1 SHA512 9dca8e1b00982ef296bd14abd778be2768784b9618f805f2d15fd4aef6d13edf7836ce0132d608b396a4a11a9d30a82e7b6c56f453bb452a021901b616e4bbfc
 DIST acts_as_list-0.9.11.gem 34816 BLAKE2B 6cbe53615b29c5e97aca86acfd0d82b6ea1027d2f2f9a1680aa7c42429d203188af08ab5fd9cbd1502f4028b807ecaab0c1c158efcd9969faecaa0a04efad821 SHA512 b439bacfde4f698e696e748ba26fc1138336d4b8215a3e862416eccf8ea881205c38a4300eddb026902e1b2320a0d0a8dc07ce358482c07ed0d50dedc5c7b4c8
 DIST acts_as_list-0.9.12.gem 35328 BLAKE2B 1e2e11bddf94c5e9213a397e4473c96331352f76581224faf29c125cdf7a0c3cbd6191270921e7134c8c8bc2faad862aab043cea2bf8ab7cec87d71012121ad1 SHA512 7120cbf538fe660861b4a83477ff914deee6f8bed94eaeccf74e1a19cb49ab27fc6e62b01f7295750c2521f92823c4e5167ede8bae1dfe55f00d292b67ad5f21
-DIST acts_as_list-0.9.9.gem 34304 BLAKE2B 9fad714f73f22954cab06fba2317343e328c9fb8b710a033a111dc5448fa3a08e27298cb306ae821ba84846a724be30423a96cc508bc9e5553910c7a937b96e1 SHA512 fb2a47d62af0de69b7dfc456466e19dac0ab4124141405ccd326fd9d0111d3fba1a6f33580e41b99b84a6d54016289f5b446d7bb5edee596079518811469027f
-EBUILD acts_as_list-0.9.10.ebuild 913 BLAKE2B de3e2a6e6250868ddf720901e3db5416efca6a88ebde7397d492de766e52f116c5825276552c89c5a14b0121b0053bed21d214c6acedb36f21d6616caabb6555 SHA512 15784207aa0e4c8ff8c5366bca49533aa4337798a94ca4824c897e7f03766fd3b6a24a6215a8563bc935febdc0424509a20a20629f4290645e99e338e78d05a7
+DIST acts_as_list-0.9.14.gem 35328 BLAKE2B 6d8e9c505a11f0483127b64c62ce86e4228ffeb11fe8a78af44820c614120dd80c87db796eb4130710012a1fba35b03520e23ee4acac988f95cc38be30f7abde SHA512 4a04e4431d6076f8fe28a2039836722540512bb66fa574d0bcb64283e89369423fab460e1aa6da11d9e92b7b7fbae8a03b38cc1d24ea3c3c6e0c99018ca6ac1e
 EBUILD acts_as_list-0.9.11.ebuild 913 BLAKE2B 041acba8b4209277acaa6ed1b58dc82b21e1cdf8f81b8561f88133ba23342a0d579278f58b4728df1fa371ab716495f8490a1f88e29b42b280a4a7a81ed82705 SHA512 3b9b759540cc8519d95b4de804de0404568d154e07e41edf2d4b539723762550f8ebe8aeb0b9aadd946e610f51360ae66e4e71ef7db12d4c7327d88a7cda2a4a
 EBUILD acts_as_list-0.9.12.ebuild 913 BLAKE2B 041acba8b4209277acaa6ed1b58dc82b21e1cdf8f81b8561f88133ba23342a0d579278f58b4728df1fa371ab716495f8490a1f88e29b42b280a4a7a81ed82705 SHA512 3b9b759540cc8519d95b4de804de0404568d154e07e41edf2d4b539723762550f8ebe8aeb0b9aadd946e610f51360ae66e4e71ef7db12d4c7327d88a7cda2a4a
-EBUILD acts_as_list-0.9.9.ebuild 913 BLAKE2B de3e2a6e6250868ddf720901e3db5416efca6a88ebde7397d492de766e52f116c5825276552c89c5a14b0121b0053bed21d214c6acedb36f21d6616caabb6555 SHA512 15784207aa0e4c8ff8c5366bca49533aa4337798a94ca4824c897e7f03766fd3b6a24a6215a8563bc935febdc0424509a20a20629f4290645e99e338e78d05a7
+EBUILD acts_as_list-0.9.14.ebuild 913 BLAKE2B ccc1c8e50ddf3f664eacb516b71d70f446067cd874a3f86bd79d895a467f1cfff1278e22238f9e312277fca0b5db9ad3ec4ae2b4df7b4bc23372f40a8dce33eb SHA512 bab969bccc5f808eb893142cdeb4a33c00920664daf990eb8a3edb2b2da3acfe7bbd2a86095305805f6ec3cff7a7b8cbe13b2a1e33c3c0bf0303cfdcbd8db566
 MISC metadata.xml 347 BLAKE2B 11ae895c0930e176c32dcc84c734b89066c53adad8df298faebc5d0a27a7dd408d5c18d91dbd89ff1b4ab825b40253097a516c75a4f267fabf5c84a0d68cc3b1 SHA512 eb41ba6c7f23b2c30522692f730bc0c7e360faa577c0bb25b4c386c09f1274890475a537d1dba9ac214a39e05ff56bae6f5bf7e3eda5de163159961171883085
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.9.10.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.9.10.ebuild
deleted file mode 100644
index 1ab4686b4cb9..000000000000
--- a/dev-ruby/acts_as_list/acts_as_list-0.9.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
-HOMEPAGE="https://github.com/swanandp/acts_as_list"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activerecord-3:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/activerecord[sqlite]
-	)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/bundler/,/^end/ s:^:#:' test/helper.rb || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.9.14.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.9.14.ebuild
new file mode 100644
index 000000000000..33d89f0386e4
--- /dev/null
+++ b/dev-ruby/acts_as_list/acts_as_list-0.9.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
+HOMEPAGE="https://github.com/swanandp/acts_as_list"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~x86-macos"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activerecord-3:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+		dev-ruby/activerecord[sqlite]
+	)"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/bundler/,/^end/ s:^:#:' test/helper.rb || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.9.9.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.9.9.ebuild
deleted file mode 100644
index 1ab4686b4cb9..000000000000
--- a/dev-ruby/acts_as_list/acts_as_list-0.9.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
-HOMEPAGE="https://github.com/swanandp/acts_as_list"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activerecord-3:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/activerecord[sqlite]
-	)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/bundler/,/^end/ s:^:#:' test/helper.rb || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 6dbc349370a1..25d25b56fb85 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,5 @@
 DIST addressable-2.4.0.gem 102400 BLAKE2B b03ab532b2c761b877973381d023c882d4d1e66372bb68425f45debfab3c546845b3535045f6b47d4f7be88c1a2e539b2c1429312147cb4fe3ebdaf90330c86b SHA512 b81fa48e7c4188827c03ac93960b6fd6fb9f5a438f5243cddea39d6820ef756ee7c0086ec330dc4a3538008b3b254757af7d30248624127649cc006a2793eda8
 DIST addressable-2.5.2.gem 103936 BLAKE2B c6677a2b5e9a7a1b279b2e3f1816cda40c0797254970ecaed2350d4d4739dee5a51580a8e2f94fc6bb87b9fe2a535d0a68b62eb672f8e91ff4da02e15e8dffcc SHA512 ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
 EBUILD addressable-2.4.0-r1.ebuild 1326 BLAKE2B f6d9e7d1d0c1788ef93c1871eadccf43b2db7628e1606cd0f79f1ac54647d4770425b1bc32579280a7a3de70c93357e56ab4e60b5b14772b1b10f54f491493f6 SHA512 314eeced17e5ed33f52ac50b6326a2eac68c2335e65d9bf2bef4fd14fa7997ab42902d50bc2d8645210a11185dd16f4e3b06ffe07a6bfb23caeafe6584e6aaae
-EBUILD addressable-2.5.2.ebuild 1351 BLAKE2B 7c004e30c67295fbadb17ea837c515f9a5e1326b2ea07b101088ad0608d8cb91c34d932a64fb80db3a67ca6940b709e847d6c72386c7c6b4dcd0f03683b2ce9e SHA512 ab2c1ce70be563fbbde7d9abb90947084325f126f7a33000db099560b90fed875aa2e1d4b72ec1f17ec54dff29bc59fcddc0be97b7221c9010ab76e4d2b70b65
+EBUILD addressable-2.5.2.ebuild 1350 BLAKE2B 7eefb341d4d789de27ac8d9711813764c2c733b8861d8a47a203cdee967281f3f359ee54c9ef612bb3b9b56640dc1cf3f4b1d056982a8ca34f1258872eb5beb9 SHA512 d996e82ed00fb02c139ca3ddba53f54c018568716d3cf9cdc8648028e9ae988efef15c2f4bf33e29069987170f281b395c3b3aa2a424b75c5e6ba1b1c70ab604
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.5.2.ebuild b/dev-ruby/addressable/addressable-2.5.2.ebuild
index f26ca7dfe402..38a23114a753 100644
--- a/dev-ruby/addressable/addressable-2.5.2.ebuild
+++ b/dev-ruby/addressable/addressable-2.5.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/public_suffix-2.0.2:* <dev-ruby/public_suffix-4:*"
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 9603ffe5c8da..3d9005cb03f4 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,13 +1,11 @@
 DIST autoprefixer-rails-6.7.7.2.gem 354816 BLAKE2B 4f572e2e6a33825f69764737c756eb39e4773b252574920d97ce8f4fc4de95db936886c6bd065f5fc3450af74bd6ccf2a8e3e9fb0f3fb92f5ef5048f54c95a74 SHA512 5027da925da376fa271eded6792ed754aa34a2b12ae41ca0fd7cb0938f14b530a4ee16b02b62c22d00454da96b839201ea0e60e14e270f4a0f54c5e7105cf5db
 DIST autoprefixer-rails-7.2.6.gem 196608 BLAKE2B 0f9224fbf765877b1b7414c68fc39a6587514d27fb5290e1a623db8dcdcbf6f668b66ddd0133906a97e63e877b8201168a45520a9919dc756021d5a7cffc0d38 SHA512 37b3f245291711f92ab9e264491637e753afb95e52f9fd4e2bda6655cd781b2d031934f3379cabdd5589bdf57b780d0727f2fff1cdf7887ca4cc323d23023396
-DIST autoprefixer-rails-8.1.0.1.gem 198144 BLAKE2B ac02ea54020da8d00f14a3a08609d1f2805bd3e213473e725b2c5e5b4a3eab81df2288b036faf4b4e895b5da02b117179b2d4539959aec81c8b1ed48a452c441 SHA512 4f68152996316acba5aebe77d3882927aeb92a0c81e913c6e54af521ab25a69d35f477a9b0bd6310f1ede71801071b02ec5a3cf52cfa54b33062472f02fd08e5
-DIST autoprefixer-rails-8.3.0.gem 200192 BLAKE2B 17ac3bf4bb9bdea4705cb70232da223b8e53896cf01bc783becff3894f8dc900df4a0dcc5fac759845005fdbcfc1d37b3b5a1ff75837bc4b87a60a62b5baf7b8 SHA512 425c82c07036271ad10d847c71e99364b6737caed7039b73de1f48b003c5382b9926efa04a9bcdf1bf752ce6853eec43eb53c9ca70e1362a004b5107463c6d45
 DIST autoprefixer-rails-8.4.1.gem 200704 BLAKE2B b95f1567fba64f51f35d7a8bb57ca470347ebbae5067244ab50f402f2c596e142b7bd1e90931af4b78a9d3477adbc7b3fbb16ea76d12409f9460b6a6ac58dbf5 SHA512 0e57adf4a52997317d7faacaf409290b441a3806cbebc351c876f08046fca397919f2e1b8a63f58149c2667a48787cb56039cf993803892897f5e74fbc53c840
 DIST autoprefixer-rails-8.5.0.gem 202240 BLAKE2B 881c958c88485e92144d2cd0342b6587b2ec6a96f5a7e6e78c271e07c6071a7544b3acc0d0491fb16094fcedd057878ce9e384599e8301a1b60029e0629e5325 SHA512 19e6737b4d38bac5915bc657de76b4bf2ac593ba754aa6f7f18b3e6e183d21a1a59e0383b071b4767713053258ed2e4214c047199f72cdb92ebb011ba8951092
+DIST autoprefixer-rails-8.6.0.gem 203264 BLAKE2B 23ca172f6c862cb43fa3609ffe1fe02f9d70cd5fdaaa4eece8882aa812327f5a4b8b4b039e898a1800589447463f35832afbceae8c3d59b84c0acf64c897d97d SHA512 7bc5d6991f309aa0f0c6487d5a51fdc30b6ce852f4a3345cc82cdd2b1a6afb19a266cba5c46829cb1defbcc0d88af6b638b8114ab303316bbc844ea75b0181a5
 EBUILD autoprefixer-rails-6.7.7.2.ebuild 779 BLAKE2B cb6d50152182bde70a4ca880a0b245c69b23f4c0ac89c2ad4dee02b3758362f15ff0690aef5eebd2130242591048faecbfdf782da7e3561396360613adab3e59 SHA512 3adf23a8c40426db6275a0c34548155c7f62fb331f99efe0ce0adb9dd6b04107c50ab05aadb9a03919a7ba93da17ef50fe713df772e53a6b51400359f5f75138
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B 1b95e2a789aea1c2d3612f14d90bdee9cf8cdc6545b7b9305bc08e614c2b598966b4ae1ebac1afda7502acd50ecfd6df2634082028b29931dd9201927260ecec SHA512 57dc81b8560f040012f9de1bd8a74bf09c3316a0bb5503cde2ae21498228cee548ce7bf81f798aa1965c992d9d09b4044797852a269c31668b93c05c4837cf35
-EBUILD autoprefixer-rails-8.1.0.1.ebuild 827 BLAKE2B cfddaefbe3dc1aae1fd8895424197bce11c66145933e2183317c88d3617a225e3581fad62abf81c6b85dd4732afc7b8f809bf6060205ad938d6b2859bd416a65 SHA512 0e20ffa160b16977138759ffb1d40317f31a2f03dd4c7b95201f652981c8ed593b1c3537389f46f8a9439a867f05f07a7d34fd7053372ec5e7a3eea00768fb17
-EBUILD autoprefixer-rails-8.3.0.ebuild 827 BLAKE2B cfddaefbe3dc1aae1fd8895424197bce11c66145933e2183317c88d3617a225e3581fad62abf81c6b85dd4732afc7b8f809bf6060205ad938d6b2859bd416a65 SHA512 0e20ffa160b16977138759ffb1d40317f31a2f03dd4c7b95201f652981c8ed593b1c3537389f46f8a9439a867f05f07a7d34fd7053372ec5e7a3eea00768fb17
 EBUILD autoprefixer-rails-8.4.1.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
 EBUILD autoprefixer-rails-8.5.0.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
+EBUILD autoprefixer-rails-8.6.0.ebuild 820 BLAKE2B a6ff9ac662691abdade26a4c5af9762924cbc3007aadf3e5fd1a0a4091f33a06a288f1c69cc8c43597f5736b46dcf36a65372d942c1ce64e1cce73a1ee0986d5 SHA512 028872e339c0fc598fc83906e14b562c86f3b8d487bcf7cbca5483525706c3e53a3d91ff04d693a53cfd01c2245a15814671fab91c6bd8fbfc5acba23569ff0e
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.1.0.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.1.0.1.ebuild
deleted file mode 100644
index 6eca90c140ef..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.1.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="8"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.3.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.3.0.ebuild
deleted file mode 100644
index 6eca90c140ef..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="8"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.0.ebuild
new file mode 100644
index 000000000000..f623a7c290e0
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="8"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rails
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
+	rm spec/rails_spec.rb spec/compass_spec.rb || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 0bb711b6af76..2659c70ce823 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -6,6 +6,6 @@ DIST bundler-1.16.2.gem 352768 BLAKE2B 4ba3729d314aec33a4ce6738a54774d4772714913
 EBUILD bundler-1.12.5.ebuild 2231 BLAKE2B a9d9fa0fd10df02af01ac5b8aecbe1507dcfa0d17db1393aacd5a85dab329313098b95ba6d5eb60614afe85d0fcd6cb8c0a054b8c098961342cde5ddf9b742de SHA512 ef0ca3ab2bf4cfd199926553f3b3d35096c91e3f6b8d32fa70414e2a4bb4a7f60f921e26d7d462e5deb512beb31f1fb74e76b2c8c34898aa87543a52950477ef
 EBUILD bundler-1.14.6.ebuild 1048 BLAKE2B 5626e25d1221e8abcd305d15bda1a5dc7cca8ca36cf14adb09ac81291c069b780569c9c2ce01245c48e84d5ada13d4a0994caaa35508e880fefab321fb5d37c7 SHA512 db402572fe27778a6f085abc8689eb072ae004eaa4ac825462a0b4ce72635a25ede60225c3f1a937e67743d70d85b35df2c770bb193fed853a7c703fae9bbb30
 EBUILD bundler-1.15.4.ebuild 1031 BLAKE2B b3600f31e90ebafd1c9aad89f25d47edfbc7bd55eed6d0c7c1efeafa6fc5757eab454b5285f5e2fccc38de016f83b6ed6e0d60953cd27cb4eb0876c4ccff7e6b SHA512 2bfd35e1a9b84683c2bee05a302b23967c5a5dd051e468ecfe0d22c7aaf7851ec011b8d5a7f25ffa4170249d0be85a224a71e75a623eebcb339d07f598753adc
-EBUILD bundler-1.16.1.ebuild 957 BLAKE2B 95163ec2b6b9953d13dd959a6b070772f577f1ecc03e86b0351df82d6cc107b6be73932c40795c725dfb3cf62bd35916c82cbcf92c0bd53d7f91b8d3540b29bc SHA512 a6435e52e6b0d07fa2166f837c0bd285f86bbf770dee3364437476338b441651226870535b79f000c19d637fcacfbeaaf5c7f4f2cb70aa4ae9922d045116cbd7
+EBUILD bundler-1.16.1.ebuild 953 BLAKE2B ad7234831880aa7d5209d50fa073dcb2eec0ac1367f71db500374afa5eb0caaf5603a4e49ff7c3e59eec682ea536ad7e62af8a1621a127aaa5ebc72a0125cd76 SHA512 9686a858967ccefdeefd071ce32876b01317046626a9eaf1ea0fee9f2f065862fb0ca7d4c56fe4c6e241813a527f6b25bb9e2dbb6624e98cd7b1b85b327a6530
 EBUILD bundler-1.16.2.ebuild 957 BLAKE2B 95163ec2b6b9953d13dd959a6b070772f577f1ecc03e86b0351df82d6cc107b6be73932c40795c725dfb3cf62bd35916c82cbcf92c0bd53d7f91b8d3540b29bc SHA512 a6435e52e6b0d07fa2166f837c0bd285f86bbf770dee3364437476338b441651226870535b79f000c19d637fcacfbeaaf5c7f4f2cb70aa4ae9922d045116cbd7
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.16.1.ebuild b/dev-ruby/bundler/bundler-1.16.1.ebuild
index 24412a047802..3a531cc707d8 100644
--- a/dev-ruby/bundler/bundler-1.16.1.ebuild
+++ b/dev-ruby/bundler/bundler-1.16.1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~ppc ~ppc64 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"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index febf0d4fca94..30ca725d9a00 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,6 +1,8 @@
+DIST bunny-2.10.0.gem 202240 BLAKE2B 7651c904b851930d044c240d83942aa1afd20c5a1e4c97e50dd1c3e40991de916c0435bf28769c6bd4a49202c2d58bb9b7be92a19413f0188472bc1e1ff7ef5b SHA512 af8f5d8b78efffa32824007c3aa472a2492b563767e7d00616feb86b5d350a4bcda0258ecbace02a3e81b5f552476d3b71ef742117c13e6d14a6b352cc4dcd89
 DIST bunny-2.8.1.gem 200704 BLAKE2B 6692bf5e16975193ef2c56992b542258f2dea5f013f0e744f8a7c1537fd3f1496ac1e566d314c65e198aafb096bd20378afd773a2074d1c14526153302ec6459 SHA512 024aa4d8e13dfb6cda0cdb2f3f12d3d2c7bb62b8bb28e7c580214db34aea4a6c88d07ff2fb01f0bf2b679bf2208c6e71b358bf67d55a52b3c8a38ffd61e2e8e9
 DIST bunny-2.9.1.gem 201216 BLAKE2B 008c308484fccd42761f237a57d244a0843b3eaffa04d826a04fae73712aa8b1fce407359905040164a10ff7ca06141951206f5975b3f23a394e2e44ed2949e8 SHA512 56a44c4ca6269c3a120a8e77cb370e008b81d2e072c7637d812b501f7e8793573a7f1fcbccd62a95b677348e8996b156477e9519ed8f6c73104996fe805a4600
 DIST bunny-2.9.2.gem 201216 BLAKE2B c885364558c7833f77f3154765468f1c4d2f3f75c34a14f9c3dc64aacb1f8f048ff1f688914de5831f0f924975facd259e2f55667d58e468aae410f3db9da61c SHA512 24e329fe2cb84a0789ac53d5cd406a999f0b415439dfbce75dc36646e53c5a138d20980489fc1dcc6741026082fc268f9adb00370478d99accf0f42a4e05ad12
+EBUILD bunny-2.10.0.ebuild 642 BLAKE2B 104dda9e0df4fc062f98d57a84eed602fe658247100b0bcfa4b9641d99dc44797e78268e696f6c82c2a170db8ac63802837c0dd99da8ed1641dfe2668de4df24 SHA512 dcc5261152dba7a7e110556a1d3c01b0c7937f81295e152b8290f2a026cc241684e92daf751d44b9692475f9516f58bbd113b0015f63f0773a2439f6e8eff282
 EBUILD bunny-2.8.1.ebuild 642 BLAKE2B 4d46348f3446064dbaabb4a60ba7b11a2fe4599bb10cea3f0f8559852e48502b2aee98646f9f05bfc21a4db02912868edcd87df3dee0ba08fc4217b5a089805c SHA512 955f9ec3b25dde15d2a162ade7fd922ad4ecd4876ba4afa6d6854035af95cf69ceada5eefa68c942f0f00d51392ec66fd4cef6b48a2c33cc646aa07b1c9e0d42
 EBUILD bunny-2.9.1.ebuild 642 BLAKE2B 3c8a5d70f6fe4b60386022c74bb3ee70b2044adf29be2db2659d66dc3c7d4fc67da8199cc3349e006300a165bd91f41244bc76b2cd21730dee970b0037b5f7a9 SHA512 11a8e08b2e9d01f600e0cba9d1eb9ffacaf3980231dac006523fa8306a1186690d0ce98a828d33ffc57103b51488d164e25e899a7ac0878bf0c94a93bb370b58
 EBUILD bunny-2.9.2.ebuild 642 BLAKE2B 3c8a5d70f6fe4b60386022c74bb3ee70b2044adf29be2db2659d66dc3c7d4fc67da8199cc3349e006300a165bd91f41244bc76b2cd21730dee970b0037b5f7a9 SHA512 11a8e08b2e9d01f600e0cba9d1eb9ffacaf3980231dac006523fa8306a1186690d0ce98a828d33ffc57103b51488d164e25e899a7ac0878bf0c94a93bb370b58
diff --git a/dev-ruby/bunny/bunny-2.10.0.ebuild b/dev-ruby/bunny/bunny-2.10.0.ebuild
new file mode 100644
index 000000000000..973c02b1ffe4
--- /dev/null
+++ b/dev-ruby/bunny/bunny-2.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/celldee/bunny"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-2.3.0:2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index cd95fc040cd1..ce6e73f97666 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -4,10 +4,12 @@ DIST capybara-3.0.3.gem 276480 BLAKE2B a1aa8e8ccc3846c87bdc989f456fdd0c09f41b293
 DIST capybara-3.1.0.gem 282112 BLAKE2B 71b275c548e3327dcbad779d48563b6784cbfcc0e5c3ba5fa478488ef90276bab1aeeaecd229255047cd23e01be6923c68c1f753b9d76d3428cc0ce75ff3ede3 SHA512 64c7a22eb8d566b245084e7b95d79dec2c72162e003418c0367a46e1072ad83569e97702f61f9a87f996160a62df3a653543d33878c6d3a46ebc2c286fcfbfd7
 DIST capybara-3.1.1.gem 282112 BLAKE2B 82740933a34bc80ff4901fdf538b9d48d3ae8b5d9c906f462a964104ee1312a74697528f1803eeead0a250823baaedb1f2d4839053b26e4a9ed0fccbc224a137 SHA512 955918a004f11af93caecf964738108edd31ebfb239d6af752bc48ac74b754320014b997d01b8cd12bec5aeef27c88b6737cf7d0ba7dfdb4ce983939ae534546
 DIST capybara-3.2.0.gem 284672 BLAKE2B 7f842877e25bf7eba0bffd3b5cba0c1763d1545b6c0729ac0751e42c40e5317273da3b635c9a5a4eadd65326fe35a32c20ad985f56439da4715ab32eda342f4d SHA512 513283bb0e961069b8746ee869f77a03e632de733b364f385688c93d96228d7a09f6ccf9a9be033fba700c8be1b754ac8a578ec4ea7a3b869431d29c5770ba84
+DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
 EBUILD capybara-2.18.0.ebuild 1526 BLAKE2B 83cdcaa9331642f7bb82fb71e308a8b2ff17807131a92b112f6e4e9c5fd446dc60497d6d4bb6783bff7089acfb272628c6c869bd5a187fb1ad8e5e71158b0e20 SHA512 661b0a28bdd5d6227e73466a38da14c95978a50fe34bfa459881ebf0d0b88902d3f3890816cfa10effc122451b2a6d5e331df69e6fa858e578c3cc371dc0d9ab
 EBUILD capybara-3.0.3.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 EBUILD capybara-3.1.0.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 EBUILD capybara-3.1.1.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 EBUILD capybara-3.2.0.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
+EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.2.1.ebuild b/dev-ruby/capybara/capybara-3.2.1.ebuild
new file mode 100644
index 000000000000..54ef8d17123c
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/xpath-3.1:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 9dfd96f1eaa0..bfdf5b5018af 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -2,6 +2,6 @@ DIST dbf-3.1.0.gem 126976 BLAKE2B 1ab65d152d7dfcb84a857c21fccc7162a0e35e51cff50f
 DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b99ef7487c6a78f5d6f8f1c5257e1a490a169b8cb8e9581fb56827d86844d2d2ee9bc0b3326998206f6e SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5
 DIST dbf-3.1.2.gem 127488 BLAKE2B c71089220f7b2d57b99ab27881c5f094a753c1a7c5378074f18d4a9fccba26d4ac7e8e563b84c0556aa50db7f39d03697957c10e6528ddaed8bef812cac662f5 SHA512 1e9c809cc03d4ecadaadd5cc754e4fa85961cf675465f950cda1c084e80c32e0a62223494f76b4ba8e26cde61eea8e43414d1b03c95fd36e8994222c3ffcab11
 EBUILD dbf-3.1.0.ebuild 489 BLAKE2B 1a5af7d1f9a99b112dba2f7730148ae8e23f6a348690c78a514f4a141b8aadaa4ef15f064029aad85083372434f7984e99ab9ab72680956b75e80d60ef4254d2 SHA512 06260e05926a1318440c173e76493f0c22d7d72f90ff8852af11b8d40f5f7c7d2bdb09eedba3860e434b2011d48cec8ccff36cb44823abb9690bf289dd9736c9
-EBUILD dbf-3.1.1.ebuild 483 BLAKE2B 85f7aceb311d3ff4871e040f0ffd6cb12f65065aadc1c9a6af4da60e64a8156d1e10e12e886ac0731bddc49320b15af01475ca49c8f456044aed91829ae30edd SHA512 de2caa190d9108fd321b3bdd6eb2dff9e20097e63ea0fb3e43853fae5a4d7faa2b7ce52d5c41c6d897ab1e2686056e32a99145e87f3afd5897b690e169c4e0d1
+EBUILD dbf-3.1.1.ebuild 482 BLAKE2B 738e98ccb96a7a99f2debb2dcb04095da1d6358793b6606c30c3e1af9d9b9f2f537e493840eb173700407ce65552b174a1f452cfeb0a90ee1bad11177f8c5b41 SHA512 13bd7c11b6223c133c0081e1dc8b856051cfd8b8faa8952cc6942585238364e1d007fbc27f01635608527b0ae9fdcd903bbcb5ec8c0fcd7d438212d3741af882
 EBUILD dbf-3.1.2.ebuild 491 BLAKE2B 99af868e61c34c2025a82e6b751888cf31505c892804b1f3af8e3675fb37fb57a84bd91ff2132d6cfe54db426299541186d65cc8b28df1f4675a660468605030 SHA512 ffe6b107766e9abfe7eb4cc705836ba3e42d85e7c6d1c54e631b4cb82131026ceee3cc1dfe38ed8f50fd4cd5af7d73872a4229cb7688e704f30f894343ffeb56
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-3.1.1.ebuild b/dev-ruby/dbf/dbf-3.1.1.ebuild
index 9b14a043b84a..459009a3da22 100644
--- a/dev-ruby/dbf/dbf-3.1.1.ebuild
+++ b/dev-ruby/dbf/dbf-3.1.1.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/infused/dbf"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
new file mode 100644
index 000000000000..1d0fad9b49bd
--- /dev/null
+++ b/dev-ruby/ed25519/Manifest
@@ -0,0 +1,3 @@
+DIST ed25519-1.2.4.tar.gz 136685 BLAKE2B d0fd78f16df2b09f5835fca4b0963cee930e17ece2c4eea2cbf4544ed1a5e30c7dc63525b285f4e1e150e5e70d1e8207ca07ce985c27441a903c69875fd92dee SHA512 cf2de7781848d804f3a279baef26f887846d7d846d225293c74dc3f4e301d18518c9edc8b721f9637fff8f087703e91d2376119f2d8185ef19be5862f99801b3
+EBUILD ed25519-1.2.4.ebuild 793 BLAKE2B 7cf4c520f206d698dd5109c2b2061fe4f1a5a2b232b7a9fc4fe077af5784e149ed750e3862cc09b64ab08c0f6ddef8d0c285ac82e94cd58e5474f684e77dcd26 SHA512 28f05e4c9b963581ca923c8388c8688feec1e8679ed97f91f9d87ea9f68ef5799d69bccc1d613d404e409a763ecb64cb45aa45e22612dd5f5242d5ef2c07d743
+MISC metadata.xml 343 BLAKE2B cda5dfa27c8ad6f26c92ebb6ff29d1d861211716018a37c1b4e5736191b9c9b1805b4f9cb05817345af609f0df7b458e3d223b9a2d79e213098ca08bd7457f5e SHA512 68f441e5fba00bf886e2035f32e1f16522340d762b0872f39783d8d8659044c69e63d6b36f401adf2519c5e160c88aa39fb5bed58ea64dfcd607b2e72d8a6918
diff --git a/dev-ruby/ed25519/ed25519-1.2.4.ebuild b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
new file mode 100644
index 000000000000..ad1b52d61a5b
--- /dev/null
+++ b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for the Ed25519 public-key signature system"
+HOMEPAGE="https://github.com/crypto-rb/ed25519"
+SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ed25519_ref10 extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ed25519_ref10
+	cp ext/ed25519_ref10/ed25519_ref10.so lib/ || die
+}
diff --git a/dev-ruby/ed25519/metadata.xml b/dev-ruby/ed25519/metadata.xml
new file mode 100644
index 000000000000..63e6d11b32c9
--- /dev/null
+++ b/dev-ruby/ed25519/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="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">crypto-rb/ed25519</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 62e30ff0ab8f..4aca217b7c27 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -2,8 +2,10 @@ DIST ffi-git-1.9.18.tgz 901805 BLAKE2B b04715095858d461e4a0a904185dbd603e391611e
 DIST ffi-git-1.9.21.tgz 161824 BLAKE2B f31f9caca1c6f90d7f6bee7756630fdfaff527a96735b3a80ac1f5f0c1a860d6ac6500da06c96e99527a2e75de0a839067d1171cdbefdf9401df101d59b38d4d SHA512 c3049baa2aada3deb1d5a029ce659f802cb0533e2fa6ab6ccc3a45abda4a97fde7964dde314f45e93e4ec3e73f66aa53ff8f7a397a12c70e191f4ddd0b3ed063
 DIST ffi-git-1.9.22.tgz 159304 BLAKE2B 096f625d6f1b162cc99f70b9d0783f1176e0d9faa65dcf06c346ef0b78c495a85c50dc728b302bbd9a8648d4d589eea56c0e9791f6065bc5a87331bba92e9656 SHA512 0e2159133629f505de233fa44a004ec74196488540552c8036640c7dd770fadf2b90987096a48ca796ad98436dd63998bd4c7f8b01c871755be49b1ef6045642
 DIST ffi-git-1.9.23.tgz 159194 BLAKE2B 70b651825962c81c82795bcac1c116ef6792d1c2e75e93459d600d1633bb127a9693b58226c7a4fd60a5e57bb2bf9df95d5cee9ef32b9a1eba214a8932bb8802 SHA512 39f862b8f946e67f84f915e015b895d137d68d50b90585c0ce9d4bb9dbcb5c714653c454635ac10b3a71290811f1afb32da90bbeb430dd589245e592fe55c70e
+DIST ffi-git-1.9.25.tgz 164209 BLAKE2B aab3addb5d9138f81d0688ad628082e7aef5f96a1b046dfa57a7195dcf7432533052bb397ac8335f7b17ffece9424fad7d986065a82ac91437e0d8d27d76ac77 SHA512 94a45f4152458d6aedf50645c8074626dcde4326093a606e509c3fbcaac79a1e6a9f7df624f14946db4f3767ef6fb3e311e60531c209676e66ebbf21b07a6786
 EBUILD ffi-1.9.18.ebuild 1539 BLAKE2B f8a42a2d72c94d76b9f9c4178c212b429cf799ee912a7905e806a3aa14e16b361efa873feb00ce1aed50b9e8e0357029fbc805db2596720dcf6c4cfeeda1f168 SHA512 9bb9f63adea8e800990926785cb52853e5f3bfe8cf658381dd87da9eba60051d9d344b53c420816a5e31c29b0d0de88d70542041211118da7a2637d50a8b6bb2
 EBUILD ffi-1.9.21.ebuild 1548 BLAKE2B 4ac2b2687b8f12bfdcadfd59d1a46627cade30ad709306ac542a52e011272930286ef0916ca05717a631df5b25fcda56f729f13ea2050b14029070ead013d4ea SHA512 26ae06b0189c80063ab90673538c282fe0a6dbdc58caca86ce606a8606692c21d8a13d12ed0c4814e0215ec07e74956dddb8192157b0705e3485155978181c3f
 EBUILD ffi-1.9.22.ebuild 1548 BLAKE2B 4ac2b2687b8f12bfdcadfd59d1a46627cade30ad709306ac542a52e011272930286ef0916ca05717a631df5b25fcda56f729f13ea2050b14029070ead013d4ea SHA512 26ae06b0189c80063ab90673538c282fe0a6dbdc58caca86ce606a8606692c21d8a13d12ed0c4814e0215ec07e74956dddb8192157b0705e3485155978181c3f
 EBUILD ffi-1.9.23.ebuild 1555 BLAKE2B aae39f0cde3caf9a343ece5e11b47c00081287bd56a4ed442ac8ad60371fe3bced91b6ffe7ae13b2b916190f6cbdf585264a850f5aa5ab20851ae17c058817ac SHA512 2f2b0c5be104a1e6dd82c1debdd641337022af734fba364454c6369dc3e1bcff9a349e6d2e73e624f7af63fd0b7478f118154cced53f2559157fceae520d2425
+EBUILD ffi-1.9.25.ebuild 1548 BLAKE2B dc9812d8065607919f23e97c7ba5556ff174d64c94fafdf8990ec562b91a99683968e89402549ad6133c472cb087fb625333009c8f8082a517b156baf32af8ef SHA512 943de809394a76536643d50869277875cd76ff70d11ff3446f5bb8a99ac4d93b46012af0e52ac9530ec39164bce3f7ee98685e29c80bf399d39795d2f1def5f4
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.9.25.ebuild b/dev-ruby/ffi/ffi-1.9.25.ebuild
new file mode 100644
index 000000000000..68bbbb7954dc
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.9.25.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND+=" virtual/libffi"
+DEPEND+=" virtual/libffi"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ffi_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/ffi_c V=1
+	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 0da4c2dde4bf..c2c2c48517eb 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,4 +1,3 @@
 DIST gh-0.15.1.tar.gz 64076 BLAKE2B 3611d83d9414349284bbaa7618aee2c9b5cb4c6db98e506891f70cf0f21dd7f25ae87e9f8094a90ec4ed4f62ba1e05bd598722a743e32abe54e7eb2a002d9d72 SHA512 6b8a43360253275408ff3d0f6e8cabe3afe399b4ed362f9b4ded72a9d650d18483cf5e3d10877a97c9112b7ccd5add5f2c9999ab1cd5f8102af3a9e49ef39037
 EBUILD gh-0.15.1-r1.ebuild 845 BLAKE2B 7828fecec0770ef3926b125b7557038c894e9c3ef6c7d424ad23ffdaac51b25619b1bd67db9b5eef7fb884091e8e3e484a37ae5b61197fbe8092d3d3289322b0 SHA512 3634b5ba852cf5df67f116ddb7a264443da28ea9208b51ecb627dbe7b73c68315fb5b137fee881fbaa8153e780f3a1d2840baba2385e02d96f8890d7b45a13a5
-EBUILD gh-0.15.1.ebuild 716 BLAKE2B 6a1fbae1ee603d398e4c68cc16a1c8c46a1ecaf0e8f699c4d97e47d6a8ed8078d362695c858511650a9b24037fe83844769bd30171ea89d1b81decdb6b41b52b SHA512 1519363935e399fc267ab05911c439119fa7651845f69fa23d8748e17eec5d033e862e4f33c897a2535f6bd7cbeafd1b9116552020cc5b4d88e2d7c0d00c4acd
 MISC metadata.xml 328 BLAKE2B ffcac2532a59009124144d5a974ab68f58c35954d76523766184eadaa5ba9602d891c433f40e830cac3d5acc8ea80fe516b5ce69df6e2240454e5ec1d9f198a2 SHA512 827f41487bb4442546ace9b648b2153e910f4e38a9d3edb1d2c231add2ea537c6318da7c5f0b4ee48f016c7c0bc62fba36cf4745fb96f9ad90890b97049d9d29
diff --git a/dev-ruby/gh/gh-0.15.1.ebuild b/dev-ruby/gh/gh-0.15.1.ebuild
deleted file mode 100644
index 9b66495fbddf..000000000000
--- a/dev-ruby/gh/gh-0.15.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="multi-layer client for the github api v3"
-HOMEPAGE="https://github.com/travis-ci/gh"
-SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "
-	dev-ruby/webmock
-"
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4.0 =dev-ruby/addressable-2.4*
-	dev-ruby/backports
-	>dev-ruby/faraday-0.8
-	>dev-ruby/multi_json-1.0
-	>=dev-ruby/net-http-persistent-2.9:0
-	dev-ruby/net-http-pipeline
-"
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 61a438e65a5d..182ff039432c 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,6 +1,6 @@
 DIST haml-4.0.7.gem 121856 BLAKE2B e2598df73b9bf7337c06f60b30fcf7925fa5948f4643051aabbbdf600d25dbc2f614c4cf2054a916f69ef431847279eee1fbdf02e9bf2811369f2c195ed00413 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568
 DIST haml-5.0.4.tar.gz 124580 BLAKE2B c22e464be26f65bd94b202b21604bb9fe3d740865832c9299d93606293794316a5262504e15583fdc2628a3015ea58f9924a9b3aab2f46340b305ad5af7968ac SHA512 125ae514f800b2dd58f7f339ef3bf8c15114c5738813d911985182d4e4b1e8551c92a89149427aa8bf3326f45c8f71f4f13f37ecb7e2bee5cb75163538f6a3a8
-EBUILD haml-4.0.7-r1.ebuild 1242 BLAKE2B 44c46dfad028e32bdddcea69c0734287339353ac70a79c1ae703c8418d90f2a73ebfae5e9aa9366f56befa7f9be9c9b1e8fd4865245262572fc1ac2cd504835e SHA512 b1b65beec53937d299e348b3ea1625762e3c242eeb0b4697fb3eec329da7399238ea29e565b4188b50a52636922f9d1850110c499ed269c158c15953584e0105
+EBUILD haml-4.0.7-r1.ebuild 1246 BLAKE2B a1879eb558ab35464526fafa41d70172a035c9c0a62642eb06f255160b33f311fd656a9b656b734c489006640845b1622c83e09f5d0af4bfc5e241264d033d54 SHA512 3c0a7b865749cb14df8f4a5e074b17a229287d76da4536211f2795c7fb61ad5a027cfa88309b80c9db7f2726896c7ffcd877b7b136fdcef3f2aa9d964f02c934
 EBUILD haml-4.0.7-r2.ebuild 1271 BLAKE2B fb1cad324e3c909854eeb4022651a152bb2608d41209bcbc898d8bc3ec3db4c13744357b43d62c73af6cc3e55864540084c26142de3f857464952431ac014740 SHA512 c77e3d4b71c77b250eaf2a8b929b3e43cf59ea63e1102456181c959cd313cbdfe95d49110da1cd01436f2a68317841258623c69490e951f50160fde195d68d6c
 EBUILD haml-5.0.4.ebuild 1602 BLAKE2B c86d75293465adf42cbb51466bd3e25b5051fc2452b5f6deb575fddecd669e2bc455889d4ecae69cc26c0c7fddd1c0e04bd31368c0669ca7df106877b356296d SHA512 c828a45bf5f6cc3ce7ee583ea183eb7372c1b25caabda39e3143f86ca0abfa1837e5ba0e3a327151c32c03789aa02daf56e92a0cf6c01f9db0d190ccec776cae
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-4.0.7-r1.ebuild b/dev-ruby/haml/haml-4.0.7-r1.ebuild
index d0d6bdc7c988..b32071050bd2 100644
--- a/dev-ruby/haml/haml-4.0.7-r1.ebuild
+++ b/dev-ruby/haml/haml-4.0.7-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://haml-lang.com/"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index f7ae02eb1310..bee1238f9ff2 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,7 +1,5 @@
-DIST httparty-0.14.0.gem 84992 BLAKE2B 5fdb305a01c6c16bd8c9ea7bd11f0dddcb39a4bc3113b1e7ca83965f44b3462a41acaf1020e12e91b323d16ce27b65f2ea6f7d9e62722fbcecadc4d61dfd433c SHA512 db04caaeff3277c071a2d3914f782f9151597d601a2f8817e704c977b95b149144c47df73284f83396ce1099f75f7fdc3caaa17385a515878366e2b3fcb84b04
 DIST httparty-0.16.0.gem 89088 BLAKE2B 27715c6760a9adeec289a005f89de219b32e6ad5c3f937478ad4187df895096f9375b0d20a4b33c1c62b96de6313017a713a036247756a96fe9366e7c1e77247 SHA512 c523ab3555d0a86e2df53e800be57b88f40bb680e7df31e754ddc3e76728eb2228e6ddbe9a3e580c4c604a126ebcd33be79dfde3758faf99aadbba4d30d9508d
 DIST httparty-0.16.2.gem 89600 BLAKE2B 581b5fcadf59bb50864b2fa6d1aae220ff9881bba53363601c6e70c3291dc2cee351a8f42b1946ad516cdcab5a85b832e4260f04394e54255e0cd76bc6860d5e SHA512 13efbacb9ee0325fbb185279ca9f7ffcc0131189ccf98d9889c6a1b6bcfa04fd7cbc6d1393bffe69a5a813a2f54f70b5926e176305fa70480dd0902968c894d0
-EBUILD httparty-0.14.0-r1.ebuild 1046 BLAKE2B 114af3a01a68b18490e38a3aa08b154ba3fe4ca5789a515967b89ccb1cd9f4c89c7c353620069e00058f06badba819f0cb5dbf4fdaebfe1d8769431491474272 SHA512 1b3759dc601a16703f7c29afaa90b64562a4bf860738307429d359ed248ca64c02ec27ae36fea632092941170ea693b2dfd73b70d7c17d55d6b8bbaee27d856e
 EBUILD httparty-0.16.0.ebuild 1246 BLAKE2B d3305c8cd1703486ab374b67d5a8a197e6c9ce0b700e570ba1407148aa692ab1c402f5977e263aa4303a6b3e6bf356297f7572d3a582ae306c9937909c65d137 SHA512 ff0d3fce64021e7ae05c74bd58576bdafd00c52d0ac9241e2faa899f8f12baccbb141f23778f35d0a2878bb468bd8c4cd440fb78d963851053136e6584c0d806
 EBUILD httparty-0.16.2.ebuild 1247 BLAKE2B cf763560c391a029b6dfec085797f97f46d154ae163277e954a914c7a65e172543c9cb4699e15380abc41dd86f4eb2b31b978fdd87ce533ee2061ba23a85d762 SHA512 9d6b5d95df757aea5b389a2102ff106877396e1f82f04adb05ed86af018a9a55672558acac258c5c5d2c2500a522aa6fa480f1da075134860d0bc4efa683056d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.14.0-r1.ebuild b/dev-ruby/httparty/httparty-0.14.0-r1.ebuild
deleted file mode 100644
index 7ebb0f7343c0..000000000000
--- a/dev-ruby/httparty/httparty-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
-HOMEPAGE="https://jnunemaker.github.com/httparty"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend '>=dev-ruby/multi_xml-0.5.2'
-
-ruby_add_bdepend 'test? ( dev-ruby/fakeweb )'
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Avoid test dependency on cucumber. We can't run the features since
-	# they depend on mongrel which is no longer packaged.
-	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
-
-	# Avoid test dependency on simplecov
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '1i require "cgi"' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index c34a617d9d66..396e7b00d867 100644
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@@ -1,5 +1,5 @@
 DIST httpclient-2.8.2.4.tgz 462907 BLAKE2B 46886ff67c9d0d5b81189c975d4bbc732c8bcd328eef9a52b5b22b405e9b12c5a2bf45b876d97195044c699ca9389729acfc384932c7e6698d59770f92a3ee14 SHA512 c225f302e6bd1f08fc089c202d4d870999ae9ef4bf1df416fb7f06b1732f50b9a7c69a5b73f1ee2f963665d5d436c243830555f8d42c60ac536abbae72b693a5
 DIST httpclient-2.8.3.tgz 464624 BLAKE2B ce8ed523a24acce219027a4f1985caf2b4dae29bdba038ca2397e5f4d4b36c90b35cedfb62faa7faf426c3ce8589906df7832968c81b64bc9100eff6f4fe9745 SHA512 b65b5adb97af069d7ff6b6f4cccd6a42c6d9c88b797e9495768fe1f36a6bd93defe50190edc201de5e39c4e306ba0bd17a8ff2f8eba4d636dacafa06c172967d
 EBUILD httpclient-2.8.2.4.ebuild 1768 BLAKE2B 4be7e4820a16c967a1c2deaed905b800f5809bc282fd988722c613f259179f441783de23a176175ce3ab9bcdec25616cca615252b14dbfc9a8cad8ef2f1a9985 SHA512 3d8239e96098db4d928826edbf908e74f1e3765519457697e1b6c3a6ddf743f8b8c31ef9736656df14bb74e322d1deff79afef244aff87cf88347578a34ab62e
-EBUILD httpclient-2.8.3.ebuild 2043 BLAKE2B 4997330c3bd92dd1c8f41117420cf3531d33321b7887d13faf83e242da44a6fed46fb4e2dbe46c6ccee727301c3bbd4c6683bb9524627c2b95af7ede9a21a068 SHA512 d77ed75f0909e1e3408f678988eecb5240611d02fea6f074eb58570a0d37928e1a99d8e5f4f3c584cc21d17280e055c4b5468aaf03aa34e8bf4860e0cf3a48c5
+EBUILD httpclient-2.8.3.ebuild 1997 BLAKE2B 18e5105c08ebb5e7c2f59a4c927c868eed0d130a591e1cc70c389a63df586d3d77426b7878027730e44a24270b15bd78b51143c66416a31e2b34fc91f4aa5db3 SHA512 328ad9b52b99b51979da4a7e7f8fdfefba0240bebfdff4090f807542c96ad689b939c862085b4cc0b8757ea1720ee98cfed894cdc9d91c5e16eb7b59d714aabc
 MISC metadata.xml 341 BLAKE2B 09a632c45802b3044056e60f69c99f2829bd710728ae4014de53ef83dc1e273a6e751a1d84e08195319ea207e8b62f11a1d055c96f6f161483a00746d6103cd4 SHA512 04d6c137c27403e7512feab47cd105f6cef456af315ec05b5204022eb9a8b7eda358f3ef4a19ff457770b3898c6395055880f5a162477f15d0948b148c902288
diff --git a/dev-ruby/httpclient/httpclient-2.8.3.ebuild b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
index 476078115e1f..7479097a9286 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
@@ -26,9 +26,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="${RDEPEND}
-	!dev-ruby/http-access2"
-
 ruby_add_rdepend "virtual/ruby-ssl"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 46544d43f5a2..6e20228cf60e 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -4,5 +4,5 @@ DIST listen-3.1.5.tar.gz 51250 BLAKE2B 8ed941ed72293fad3327f2fb939920f82b02a9c0f
 EBUILD listen-0.7.3-r2.ebuild 900 BLAKE2B 11e9754c6f746da9168889e7b982055c6d06b271cf3724ebc4dbc8df776df02c743ece26620b2be54ef68db32f6c1638c92da0c0ef5eae5090a0d274b3e558dd SHA512 f61ee299ed7fbd237c9dcc4ef3174a80bc86a2c19065d2df3abf93393649a792bf0a103a11fbe12cac16bc655ba31b977aa269feaa86b5b905652fdfc4b9abcc
 EBUILD listen-1.3.1-r4.ebuild 976 BLAKE2B afda93382659828446a14b6536e66d4d52e962ead6007d60eae34a7b67958fd94d755b59347183685ee9d93221092fb5063ce1d3bd2e8cd36a7f5db2f61044c8 SHA512 c6ccce9405650484e343cbbf8306a36486ecdb09ef1b4519861968d6b34b5bdb53c0a5a8cd02803fc551db622b4c038694f554995addd1e3c7adb467c2b5b3f6
 EBUILD listen-3.1.5-r1.ebuild 1246 BLAKE2B 15a9056cf2c52b1272fd2bdb9cfd9b5c9b82121f585b66a82ebf1c6ba83de4a5101d2b0af11df6b38465f53f70fcc5bc7837ecc8c53b27954c555093e4831bc5 SHA512 6a30055ea52a830914bdb85c89ef9dd0cbe4770f0cafe1c48fd3beb6f4e6b3d95ff2f07c390d16995594fef35123d641f9565746e7d7b6d8ceadc45773d4675b
-EBUILD listen-3.1.5-r2.ebuild 1233 BLAKE2B e739d72fa023cab1fb513b04726a9696514027834a98403fa8f200b69d66549db884154f119f7a88f393ed629ad196e3f5b4bc2c2c24f968024ac238b7705db9 SHA512 ee8ccd89a9b02c9956418cbd3c1a7738660e757aef01cd8bcf7180d4920476333f68e8f18bdd8a20aa8ec715db69e181fa21414555a8e79e53f4c24e4e618620
+EBUILD listen-3.1.5-r2.ebuild 1217 BLAKE2B d9dabb9c29deea99845f230e40d30ea8a0125a791c5efda77e8aab482a2de501830e8fa79d82422d4f64727b3ad3839eec2e940521037bad92597b66702f757c SHA512 6afac74e250de69c7a9e741bd9427539eefa387b66cd7ff2b1b1ebd7cff320b4eb29626cb874cfebb604cb042d38a86d4e4d9a4eae26b9c6b5ffeebe3fc3b860
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.1.5-r2.ebuild b/dev-ruby/listen/listen-3.1.5-r2.ebuild
index 5dd290f9f93c..2c24bcad40bb 100644
--- a/dev-ruby/listen/listen-3.1.5-r2.ebuild
+++ b/dev-ruby/listen/listen-3.1.5-r2.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2"
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
 
 ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7 >=dev-ruby/ruby_dep-1.2:1"
 
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index a4b65140c3fa..faa0e52f6ddf 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -2,6 +2,7 @@ DIST logue-git-1.0.11.tgz 11535 BLAKE2B 6515efab4cb42fa7a787bded637ea6d21ff9d4f9
 DIST logue-git-1.0.13.tgz 14389 BLAKE2B a6886989e561124904e6e6016c84b53abd1ea5be2f92958dffdc9b5ce9741728b9760034a9a7517ff35dfe0ebf10d6a6937aee426b85de3e71690098e9eec0ad SHA512 677ef2a8fecc50cb923dcf85ab0bdd984ea5806c31e11df9438af92912b94a4ce227837fac4baee05595f894f6a0fd4167f2984357628eb3e8036479103340c4
 DIST logue-git-1.0.4.tgz 17797 BLAKE2B be99a6c9ecc8bbde25d9a485d83b1d485e7afbe3e5fb8954dd6140881bff496c48185e15ad4596bcf7abba3a19e556da9ac6d44623be33887e32590cb35abd0f SHA512 e3d6ec6a8b302fbdf7a2b7842b31f88af4f0576166b632dd356a40902dc816bbfdaf18a170d5c8066fbfa97643d38d6c8137d4f435f478f04badae4a0120184b
 EBUILD logue-1.0.11.ebuild 641 BLAKE2B 268a65af2a5250319bdbdf3c72f28a8a213e16a5a020aa3dc656e5420141788fab4226ac99a10871216c80242b1b7d27854ecede4bdc9f3dc5501e06704e5083 SHA512 49763d1cede8d908ef5b86a47e07e200bda2d7be3e62d276a793643e3da26b863a101b5f1ca7046af8c74d460ee6cf673c90c70358936e20afb05ea98b739ab8
+EBUILD logue-1.0.13-r1.ebuild 770 BLAKE2B 7db6da7335ac1cf5519ae42a4e28d704b015082c8bdcd54b854421ff76017d01dc50a71a5ee58fa12f79a1cde423b7cff6adeae9777e33bbb9d886057d678581 SHA512 38d01c9ada755e4d180e65f55e95912078d215a2f53cca92a97b4e277a45e5b131037ab2676d0275ab6b2eb513af8ec140c95c626943afdf56249f22d957b50f
 EBUILD logue-1.0.13.ebuild 744 BLAKE2B e7df279983c71b4d2b61f58cf33bd488263545eccd10ec4e715816b684366db24c5530901db6ba52d3d950adb4d4627f619cc331f49b29be19ca830dfb9946ae SHA512 721482f9aa82592cb7624e38f459e455cca7f075d02ff5c29eb5ef62838cc9e28f4dd46713db40546b78e59d946628427c26a2dd034fd9c0cfd0264275375dfc
 EBUILD logue-1.0.4.ebuild 601 BLAKE2B ce2b1f04851d4e26bff1a1bcc2385786c7ed3cf6bf3afad51bd4b6f7a451f322a7c89e37de17fd404ae14eaee066b99d959185dea984831c6483b663b1c4ffd5 SHA512 f3800e592f379b269bb25a2c6ab8ecf64fdbeedc91e7712989a2021181c3081231445c906f3303f0add37cc230e97227f44c8349e6afefa0d3ebf171e03d9770
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.13-r1.ebuild b/dev-ruby/logue/logue-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..1d823a3b3102
--- /dev/null
+++ b/dev-ruby/logue/logue-1.0.13-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module that adds logging/trace functionality"
+HOMEPAGE="https://github.com/jpace/logue"
+
+SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rainbow:3"
+
+ruby_add_bdepend "test? ( dev-ruby/paramesan )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Fix path to match installed gem path
+	sed -i -e 's:logue/lib/logue:/lib/logue:' lib/logue/stack.rb || die
+}
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index 2c96ea53834a..0d4e73df66b7 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,3 +1,4 @@
 DIST marcel-0.3.2.gem 7839232 BLAKE2B 001e03b109617f7804e1e8f77d65eaec81544040a13e1d18ef197fed1caa5a26dfc69e1796632a3ec29c3778eef9458a6f701bbefb2f30c89d77fb22622cdb0f SHA512 0e27c5c36f219e30ad41aa87a94e559ecc0185319ab33fbff2cc54656c5ec378c9f8ebd8d8d28a644c9b64cd7106aa2b235b893c5871ddda9db3596d8b8847bb
+EBUILD marcel-0.3.2-r1.ebuild 554 BLAKE2B 45814f3d6968964df7d46c47de467fd63534fd53506460db01dc211e7f67d2e28c9651e804dbe36ecb9a3e2816a157fa4d7fdf501b0dce70a2dcf2c99e1a6d89 SHA512 3cac0b01ed1822cff00d9297ea3a56e7939821584a53ea3faa08a5ce1d22ebe5f82b7d808a33fab4c723521f30766bff4b17197aba226c163c74e9424a19c541
 EBUILD marcel-0.3.2.ebuild 512 BLAKE2B 34dc9c450e27ef0badd3e17f5db91704c437b6b271ce95f17939d91ca86cf19039a4152f8054b0821e46979a9a2f47641dc143ba38437a9308c990bbec86a484 SHA512 7fce3f35854662a10407208b95b4094df6bdf38b5a7bf904b5a558459853f9587b142aa316a09e91699da21738c9591cb3267b736745a9517e874075da6af513
 MISC metadata.xml 341 BLAKE2B f284cd2a1df740c004e9af77a1aaea9254ddb1672b567faff9c65be99171a69abeedbc229a05db711d2f91f5f8bca0f7e2e6c5442a81b1776ba299db47ebc281 SHA512 1c71acef93507dc8305c65be9fd3e90978f6a2a14781b019f06762aa6159539596404afc32c0d9c718b361ecf90cb4e93b0b0186e7b110d895a14216d25b3360
diff --git a/dev-ruby/marcel/marcel-0.3.2-r1.ebuild b/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..ee661bc7ef38
--- /dev/null
+++ b/dev-ruby/marcel/marcel-0.3.2-r1.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="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
+HOMEPAGE="https://github.com/basecamp/marcel"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
+
+all_ruby_prepare() {
+	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
+}
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 63f7a2c5a409..067fdef06239 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,3 +1,5 @@
 DIST mechanize-2.7.5.gem 137216 BLAKE2B 696b0fbb84b8f25e3d52d9d9f20267d53a4294e15ed64f6cefc87dd6d2a279c6f3c7608bfdbdbfbe6fc188cb16b06e219067c97838db4249f233ae12f047b9b8 SHA512 0dfd000d8f58be3fc08e2d6e625128135d6fc2d22e899152f46f66c545c6ede0d1e7b798f4b7de2f96ccdcf7c47001a3946866d0d6a19f9faa946ade6a4bcf92
+DIST mechanize-2.7.6.gem 138752 BLAKE2B be4e8f53c3ad88ae5aac867f836a20b5bcd47aa61db07e2dfb7e2d0c72d368ddfa620411fdddd5c2a408eeceb3c4c1ed3a15f6086ec846cda3a3c3808977309d SHA512 e89eb75af169ba198e5a82ffe4ce3c0962bc3fb6793f88bc735b647b7816d0c78d8968c43d213071e017e7f836ab91ed0c546c9eb986647355a1d38b1ba18138
 EBUILD mechanize-2.7.5-r2.ebuild 955 BLAKE2B f1f80baa609ce3038103c528da7cb084707c7f55573102538195bffc00f1987e24a573b9f9f65a349c81cab9f81cf76dfabdc96b155d79e03d12505c959b9a68 SHA512 8447d414b6689ac54445071bf07a6542bfc7cd8109670c1633af8c8d058e649e3badf992e03dd56e74cea042e03359a4e1e95c1cef3b71950b77e0e4de96610d
+EBUILD mechanize-2.7.6.ebuild 949 BLAKE2B 3daa78bf712f02a6a8411ec7492ca99b3849fa25f4457d386d7ee2dc025e38cddbe80a37ffea22a814be981d0069afc4edfed2ba8dca0ead5876b627535fb79b SHA512 37bbde32b952328926fcad9cf917f41b4733f90fa2c206d72a5944f7e56beba6648bd945477132d3b2ccec522aabfd9dc05dffd0b243880634919695b6c71120
 MISC metadata.xml 349 BLAKE2B 9d63a73c5a28fb2fcef06d4c7b8da3b24d108534b999e76d0d1df86bdfe615e53248deae3d9450824c700a0740b75d0f7c897c8a8c9e5b4339021e30edab51de SHA512 1bc38bd045fa219ec2c86bd942055c0188561fee4ec5e7e6ba4ad2268f653fdeaac40122ed0605af7d47f8dfceb0781d65aeb68bf2fd62e3b8ae5a939f61076a
diff --git a/dev-ruby/mechanize/mechanize-2.7.6.ebuild b/dev-ruby/mechanize/mechanize-2.7.6.ebuild
new file mode 100644
index 000000000000..b65435a33fc6
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.7.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
+	>=dev-ruby/net-http-digest_auth-1.1.1
+	>=dev-ruby/net-http-persistent-2.5.2:0
+	>=dev-ruby/ntlm-http-0.1.1
+	>=dev-ruby/webrobots-0.0.9
+	>=dev-ruby/http-cookie-1.0.2
+	>=dev-ruby/mime-types-1.17.2:*
+	>=dev-ruby/domain_name-0.5.1"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/* || die
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 09fefdcc7d3d..bd4a98eb3376 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -4,7 +4,7 @@ DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d
 DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35bf553874cfa3e785a6c3d427d3c8b7e5f5f915842ca2b4b2ce594f847873536b49b8860cbfb3812dd58908 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509
 DIST minitest-5.9.1.gem 73216 BLAKE2B 553143159ddc688ee0961a1714aded658dea3b6d5823bfa1555e96d25506eed2a789ad0b31939da1947e3e1d21fa9b4a9f59f3b429354283baa8c28fcda1a444 SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72
 EBUILD minitest-4.7.5-r2.ebuild 951 BLAKE2B 378b2e1f8b34403503cac08066cf9b1bd17cabf18960356ac67986def2416f774f8a7f5f7b44ef7c2d9dc1c293fc5a2f6412e36c9ae507466dc4881dc8f04df1 SHA512 76b836e2e763bc224add765ece794d0c23f986c2b136fd3d762f5165134518a213f2f7477031be6f03e349bfaa329f38ad5e6700bb453f3ba3e5e95c1caf7a82
-EBUILD minitest-5.10.3.ebuild 806 BLAKE2B ba232bd0de4eecddba4e56dd4254a594e379f8cae03fa9f503665d898cc2ee395ea75dfd69ae45c41439bfee275b883e0160b71cba71702b8282384c2245ad36 SHA512 e61c3fc6f57eadaa35bd70dd8539f6445a66867d129ef960c77a6a4c996c57f81c861aa9b93afa447a9fd0c0446104d795bddbd4a18c95a73fcde552d9f9bbd9
+EBUILD minitest-5.10.3.ebuild 802 BLAKE2B c9897425c76c8606de9431650222bf3b781575bb807832234c7c7ae0bbba8f2fa87bb9465551c2f86a785b32e500564dc40da27a9271bb87d2e25d0d63809cd6 SHA512 1a01a36477178f69d450acabb1fbb5c9484cefbb045135192c41c8fe1d4d528ce47dd400f09855948d961e05021793489e28196af275b62af8601790101c4491
 EBUILD minitest-5.11.3.ebuild 806 BLAKE2B 396d4f18c587cdfee04ba8092487f3e8f593bb994a4490827750e943f888b02a713ed34c0ee32488ceea6d77a682627032b3b1637d99bcab38a377881241ee8f SHA512 bbfa20031a7580e63616d78bbd2bbae0137b5478216e151f9d977aaf77ec797c74c3a3fcd318cd440849872665d16e89cd5112607691f0e92e38e7525a94d65e
 EBUILD minitest-5.3.3-r1.ebuild 817 BLAKE2B a2173c0cb66ae8fbce47f13b0afd04f78ffff56c246670462f7cee90a73b6f26435c4489f3dcc4a35bcacba892a752c8681341ad896425565890c21b2c162737 SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53
 EBUILD minitest-5.9.1.ebuild 797 BLAKE2B 3b9cd0b577f21c21ec180ad7e48a3dc73b585ca319a396fcf4fd98131c4309a3eb38856c53792a4a1895c3355feac2414803be081fe5f122ef825f17e9a4b7fb SHA512 ee2593712316571c86e9c6f3564c449af05126b2a58db37c1827fa532e63beb2887563d70b6e38036541e4ba0a28130bdb016c2f99975d570ef966ac4740438c
diff --git a/dev-ruby/minitest/minitest-5.10.3.ebuild b/dev-ruby/minitest/minitest-5.10.3.ebuild
index 26bf95186bd2..4fd4a1fe9f82 100644
--- a/dev-ruby/minitest/minitest-5.10.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.10.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
@@ -16,7 +16,7 @@ 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"
+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() {
diff --git a/dev-ruby/net-http-digest_auth/Manifest b/dev-ruby/net-http-digest_auth/Manifest
index 51092938ff4c..729f916e9a09 100644
--- a/dev-ruby/net-http-digest_auth/Manifest
+++ b/dev-ruby/net-http-digest_auth/Manifest
@@ -1,5 +1,5 @@
 DIST net-http-digest_auth-1.4.1.gem 13824 BLAKE2B 537688c7d83408052d3d5d16d625a51434dbdc452cf36ec5738917b862eab305a85d3f3933d79d878356a76ae698d6eded24249b70e507b2d7131d71b5dcc482 SHA512 db62d49815a96cabde5836b00a1df58d6277f9efafae78e27296b1e2f4410ea613aed2181f8e39f08af5bbf6f5f758d682e1250d0afd4fe8243fb0d5c7fe78b7
 DIST net-http-digest_auth-1.4.gem 13312 BLAKE2B a78d626cc25243d0a1f760aa2ded0071e15ed0ff763f24e9584e31db8087ac24096468de14abc0d10330c6cdfd5d32a99df0a6c5bfb72a0295e6d178b2b91700 SHA512 a743b278bba44541835f28ed86f94a907f7b48e8f314f0cbe6e14888a1d723c0d60cd4bbde5ac02cd263d91a5803021d9fa073d55077ac2b4c2767ebb65624cd
 EBUILD net-http-digest_auth-1.4-r2.ebuild 607 BLAKE2B 6ea53d5e2518e390cd3acdbfe8e0379f94f52498c04a948abe5663bd2e2f24df3f6114f32f05b19a7ed26afbca221b3ede4672be02d41a596346410a8bfbcdbe SHA512 c7c580d783a7e07c47280bc61f5422f07afa745d41a7472fb1ab5458da41618d1ca0589159c6604bd95e81f6ef4130405267934926d7a33a37aabb154f0dbc4b
-EBUILD net-http-digest_auth-1.4.1.ebuild 608 BLAKE2B e8fbbe1fb2c582271ec0f80c23d7c4729ec44f8febc6c3242d94fe5920d3ae1cf4908b790983d0af17deb9455a6cb44f411aaaadbd6bf29641a789e244c6bfdf SHA512 6a6eaa74fdecddd9e4da115bf0508416cab553bed2e8e4736013056555e33d90601be3432b8244253ecaa1486c2e7907f73b1895e574fad59f87ba5fb17dc760
+EBUILD net-http-digest_auth-1.4.1.ebuild 607 BLAKE2B 346d197291d33ad5972d61885caeb8a3661f6d28c769b216831a3481c5021902516b03c75513a3686bca9b441de76f5f3d23d0e32e2db5d6e3ca5982329d9ea6 SHA512 bdc0b67df6968f4be499d7f6a66c7cc3571c0c6cd25eb3ea74de715ff0a9d88689c5c7dd54a62f2cb632094f924d5a92e338971d2e8f15e1dd014844e190679d
 MISC metadata.xml 354 BLAKE2B 912fe468f23b89ed8692e3978fd9de52071db9870ca8dce72c595bc2058bbbc36fd5913c07c54c816d8633e6ac013d02f73b67f8d29e38dd6265fd1ec537ef88 SHA512 d7ddea8f222b8d515bc33b627acb53d18c54ecd8a1fdf44e5d1c51f0ef633d63e607cd9dccf36cdd94fda819a27785235b43152ddfb94fff615c884013a3f53b
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
index 08d276fbcdf4..a546d33b4899 100644
--- a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/minitest )"
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 1c5f1652e087..cd27a3d8c2bc 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,5 +1,5 @@
 DIST power_assert-0.3.1.gem 14336 BLAKE2B d29f8ffb84c1322610e1bfc819a599828a386abe2a21bf60d8e5a397dafbad52885c20899a78f713d39aedde992ac180138ed7fbd96ebf48d9bad753a51f0097 SHA512 0523c9c2f45ae60e93b491bed8ae3ff3bd83cfdf8c23d784ce19f87a52d90b94095d3e5ca38fbc2e4917a8895309194e06ec519099b69096bef69a4d9466da64
 DIST power_assert-1.1.1.tar.gz 16799 BLAKE2B df5f688d4242373f1a5de95fcbcdd63d23a14314a890a32839ba88494d04a09ad6b9c1dedea23f43d53cb708b3e5eee8d0a2307be16a1c11cf3cbf22ea254344 SHA512 a33429bf918c71a5b75e56940d46dfd05ed3c87f909d6f09ebf2d8b2cd43a3c5c37b5ac13c334383f1b3f52817ecd4ccf68cd649c53bebdfbc464a18c88b702c
 EBUILD power_assert-0.3.1.ebuild 792 BLAKE2B 04dc6541c2f8ef2055d8c48190e39dd4caefb01a15bfdbdb9a390615bce66454e9cc2a1c277759f7d0d1fb7de6192dd56b93fa37b3cf0866dbb77f089aea0b7d SHA512 c455df2723fcb267cd3780ccc8b8d86569beeac449688740edf619215a4b2957271a58b697c10e198080a976ce3400de988a71d033dff9fa041de551f022464d
-EBUILD power_assert-1.1.1.ebuild 1338 BLAKE2B 2524d9dba25bf5043ebaf19343427abda1d34869eae3e31133bcda0da76603cb0d5c3c37160b88410f2a1724269d215378a4ae972cd22dff4b6d3ba7ee7c22b8 SHA512 3e9dc2040fe1e3b321e669e060abcf50dfb5cd0abb22e942fcbdf67575bbf1f922985df80b83705bd160159ffa1baf8fa75a5fc540c7e1af81b7c33fe14e347d
+EBUILD power_assert-1.1.1.ebuild 1334 BLAKE2B 92f52321c24ac3ea93838011f12a015da03ec76cb691538174b7ec739e3707039102af6bed4fc780c9b3f26e9ea8a62c51ee0a6756d659857876b18e72673d75 SHA512 82cf59c52582b00c598c07dce17f931189199491d5489796d254ed33e59d69cc84cc81d38aa73fc8c5eb2c616bfc2c387aaa6624202174050bdeeb1abe49999d
 MISC metadata.xml 344 BLAKE2B d878cc041f73fcacc13fc94374eeb102440977f57c47880e9a597af3b4d3b20cd81e8bd0d367cd2abd7799a27b5aaac46611291ffaffb3298bb253d726e23726 SHA512 87e232c55b49880144aa509aaa79413864b3f575df07a559a9f1aa60909d4d8e01d1ce2e86542c847533eda2f233542deb36b1103b56d7c512f2385a6c8eb2fc
diff --git a/dev-ruby/power_assert/power_assert-1.1.1.ebuild b/dev-ruby/power_assert/power_assert-1.1.1.ebuild
index 9d9034a97e8e..e7e223d83bad 100644
--- a/dev-ruby/power_assert/power_assert-1.1.1.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.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
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
 SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( Ruby BSD-2 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index b42cb773345a..3c8d5a682b89 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,5 +1,5 @@
 DIST public_suffix-2.0.5.gem 89600 BLAKE2B c561b32a26c4b605821eff66ae2afef17988c45d954a15b04a7174b202851e6dd0012df32981146a0cbaadfd0358b1f67be359b5526a65de2a3b0f7061ee7beb SHA512 d261dec44c11803631e267f36d82a59278d90dceb2811233ca511e895c5f1a58005b6afea980bd1bbd78bbfc7a3a4e02f9f1fbe351fded38be340ecc235da383
 DIST public_suffix-3.0.2.gem 95744 BLAKE2B 5c06af572214760f7d2a176e1b6603ea9bf0f45c91633cdead841ef8289b7c9ae7ae5b0400d5248d3df4c3bc81d9bb357de622fb85a9c3a67f4973872bdee94a SHA512 eafab08d0114212798390b4b5e9472fab98c91b38ea836c76254673e48bd068afeeb5ec4a2685bdb030ea78e4e5ea0be10dc3b742ed30352e11ec7a7cc1e7bc2
 EBUILD public_suffix-2.0.5.ebuild 793 BLAKE2B 63883d1db9db91b8e76c756889813a48eda032776895d67ccfe07eb7077f61a0bb1f3916d6ce0425b246ceb8a04068adc03be92689a4a0b68de9fd5920198746 SHA512 47f42be38e0d4ebb1c84ae66230f70bec51ad872e664d9acfb1ba62f13008513fe438f47ce8be13464e7308c2466bb10eba85e10c0ef300b433e1080106f8b2e
-EBUILD public_suffix-3.0.2.ebuild 835 BLAKE2B 23533a5bc706261a3c48a4c0d2a1e49c6d6bdc5cd026559af679f9974f9e7b2289ca003883514066e2472b318f50faddc6ac65fcf9e14b7965738c35d2417a9c SHA512 c4cd86f5bbde381e8f2c59ab3a54321f52fc2172388d8e57cdde8091e4c083512f3adb88b88c88d6baf509209f517eafa1b0d96f6dea261000b7605932aa3486
+EBUILD public_suffix-3.0.2.ebuild 834 BLAKE2B 35f65e5abe8032946dbae78be95f3a11f91380f74e8b7736f025c05fb3b68181e7b8712081a3908ae4460ea2a539428acc92b330de1c65573f2956cbbae72402 SHA512 e574ad1b94f28ccf7d19daf05abaf1ad76760499e262c17249d6de12f6f17917ccc9bb7739c33561d48b73de11fd3f253cea1e228c7a22d5c57b8cb197aa961a
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild b/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
index dc427cd7b9d8..16f21ff15835 100644
--- a/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
@@ -15,7 +15,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="3"
 IUSE=""
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 9097b713f956..cc3c35bf64ac 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,5 +1,7 @@
 DIST rack-cache-1.7.1.tar.gz 260613 BLAKE2B fac2f4a476531a3c89e2917e039b3bd27d6b4486b396cfe1de12894bfc1cb2fa7e1739d45b92152e05be243ff1010636260f66b06cc2055ea09c2140ee857d40 SHA512 a4045483b0e10054f8e2dafddb45f72f3d06acde1df9f14ab51f72bbbf16b8e587b3fdb1f0d18a358fd5a46fb7babaa3d4f2b49d26ea1efbaca32cc62d2b19ff
 DIST rack-cache-1.7.2.tar.gz 260666 BLAKE2B dc1f8bc7025f596d40d481d52168964b03610a89c5226967ba0d3d67ec4a116d91df0ce679361e4a15bc41c459e65879a4c2c24c7fb1a9b3183f5b9b705ec3e1 SHA512 67a39f2ebc7afc0159b60b2aaf252c4bc47233adf41244fd5e3587e61df6106710040d4940f162d78e3479fb1616de17dbf9bce36bf2f71b2eea65d6c159b862
+DIST rack-cache-1.8.0.tar.gz 260732 BLAKE2B 79104b2dd82ec1a95abbe84a97e8a7cea918f87e3845816d6252610ed24e82c4bb38fa7dc34ddea9517af06d21091c23b5316ce87a9f80d49fcd3be1a7764b22 SHA512 b5235c0b3d2a3476555bb2420bc5d69ae12d8d650fb9ea1d8d8fd4f1dff0c45f47e920c58c1e44d1e565eb45248d4e63e7643c8c50d43706365a36ae80f2eec8
 EBUILD rack-cache-1.7.1.ebuild 1138 BLAKE2B 5634fe41b8b81e1f5c64a4852d9fb0a43e878a9225e824a2a842888beb58a7ea05e8b1dc1bf329cecf1f70e21db3304c6462b894a9414cee41c5469a081ce006 SHA512 acd7c658c41acb55e40670b337d0ea3ee3b62e8e55ec5368479ca36631c04b7f489e23762d4d0f48eddfedc589f0029f3e6835d2bbb752e83c1512a576b4aa0d
 EBUILD rack-cache-1.7.2.ebuild 1139 BLAKE2B 80117cb99b3cdce517460d7f8c6505890a778647df3bd4a85a2ea16b85a960a0a7299bd0c7394cf729a72ac2fe4eb60ceceeb7266ac7476632070292a4b1ba5c SHA512 247a71dcea1e426381655911498bebcdefd986960316ca75a0f5bedce56c3cc556de41a0fd93fa4cc8caac3405edd300e8fe5a9b0891866bb535ff89e956973d
+EBUILD rack-cache-1.8.0.ebuild 1127 BLAKE2B 8df12966d9bdea38231d551519c4fa97d931966abc5ebfe11f1145820d0c1ea1c81534483216f1df518dd32836cf56b00e5fa4216577701a08c62b93589ce491 SHA512 56f70dc9812b2018bf2a583ee5df0d15071c40afb3c0375ca8d0a014f629bdd10e5c6113bed4e1746c202eb0d0a9b93fa764c7bb3ac44fde360b449b0d9bef5d
 MISC metadata.xml 335 BLAKE2B d6f5130ac567d01cf6c3d831149be70ffc68d04d1b115473e6e8a550f392dd82341d72d9ba813dfd33cfa4bb5453ead5506ae75ae6f80cb9f47623e631e7c997 SHA512 3763e8653d06f4f62a253bd075ff31273fdc39edafdd74838c8fe65bee42a9bdfede99c01f236218baf496b910f5aef722ee3d5ff39d26c901e30df1406ecfa0
diff --git a/dev-ruby/rack-cache/rack-cache-1.8.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.8.0.ebuild
new file mode 100644
index 000000000000..3b6aaa6f0467
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/maxitest
+	>=dev-ruby/minitest-5.7.0:5
+	>=dev-ruby/mocha-0.13.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' \
+		-e "2i require 'timeout'" \
+		test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index acd379ad5634..560ff529052d 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,7 +1,9 @@
 DIST rack-protection-1.5.3.gem 18432 BLAKE2B 96daf85f6b51b4a8c8992109ccb0821b9f713166965a6d1392f20a966e3502facc4294c0a824beaa395306e0ba3234902eef717ed839e3e3ca907deedf83370d SHA512 9f94f9f25197c3f8227f5c9c9fd2e896e35bfc08d4a20f4dded9c42772f348d16dceda6916429833b498b29c4dbba4dbb31b1a3cf90de597fb6df2de145d655a
 DIST rack-protection-2.0.0.gem 15872 BLAKE2B 706fba47a09565bc973a5dbae3369cb26d02839be92347bb153c5f12054ef605e8e025a0666cb0aa44aae316ba494fffdbb7bbc840dfefff9b3e0b0efd39817a SHA512 cce6a8a64c502e4cfec47ae3d76e71aef42b1eec5aa4802a6c443fcb7a8971a99ad9a5b34fea7ae878630faba10d4f5bde4d9a3eb66f63600fcaf02d9ecc0c2e
 DIST rack-protection-2.0.1.gem 15872 BLAKE2B bd2b17d21767f4f6772400168ddd53491693780b62359d526739580cca66b5b27d4f4c6f419a6ef695ffbef5ff9045bac683c78117765ff784fda136ec102090 SHA512 6dd525384a0027a1943741881168433c63dc2d18093833dffb3417f3f6ccc46d597435a880d297d07751db1c449f3e37942ae03e33d378dbc74caec38c5cf1df
+DIST rack-protection-2.0.2.gem 16896 BLAKE2B b3ed6a399f93c359a305cef0893bb5056ac26e8d5f345761f497b5eb77aecc201cd388bc0fc021ed039f230bc2ca2348f7eec19aaaac3f2662500bd4c6496a93 SHA512 e74be8b079a1c436d80df2e6bf58dcaea089aceb58b8ec6c08d6ac78b5390bdb1b494d9155350dc7e2639e858209aac10757be54085a565b910e5e74ee882235
 EBUILD rack-protection-1.5.3-r1.ebuild 726 BLAKE2B f4edf631b7100e462ea90d33aaca1d20ad043adf01458032039d16b365806a0c91974c05f66780c24ab4d1246dbf779de9dbb760922bc1f40767324e632b10b8 SHA512 18b63b6719fc0c27cda9e5ce050e5932afbe30c0118aedd6a64d5d7338427b4faab755cc0e50b96588bf13db16abd752585e424fc682139ec6d007145ff8205e
 EBUILD rack-protection-2.0.0.ebuild 796 BLAKE2B 7103c44fe355976ed905a9f77e1d46882cfd67c51ce429265f7606d9422514df8eb18382ff5e42b8eb5aff0fcef21509f8248a0342ab2589ccff557a41490fff SHA512 5ee15793429e98cf67966e1a41d06e6c51cedaee4f24b2e0747a48f467122c2e17535ec83726b6b91a493adf6b79c887608112ea6fefcf8fc0b15bd1501dd1dc
 EBUILD rack-protection-2.0.1.ebuild 789 BLAKE2B 9ef3981b82f570cc2ee569661d05428ab10279afe7f4d6dce8003835002528308361194294adc22534d1caa12aa1c7919563a274e88f556cb3cc6e2a31253f36 SHA512 62650d79ddde05798cd042bf826dbc1522030b5dde936476dc78656d649ac7232cf5dc7aeaaa08232f8428a0f145d1ae6b2735c2d9e7282bfba69a4ec3f2d1f1
+EBUILD rack-protection-2.0.2.ebuild 760 BLAKE2B fcc65b5c9913f321ef21eca240412a818c5d480b5361ef91c501a0ecb05f92b59deafadbf02721014efabe67cd326bb5e9ecc5b3b3d41bb49fb709d71dc38e06 SHA512 1423babf10def58ef75091b09567ce7f4e6287b3eab4340f7f922832576e2d0c7db45eb1a0fdfb15a22c68d79557e54af5b4359d67aeb579f99cee68c5fc1cc3
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.2.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.2.ebuild
new file mode 100644
index 000000000000..a874a0ed9292
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-2.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://github.com/rkh/rack-protection"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rash_alt/Manifest b/dev-ruby/rash_alt/Manifest
index db647966ce89..6a968dec4d65 100644
--- a/dev-ruby/rash_alt/Manifest
+++ b/dev-ruby/rash_alt/Manifest
@@ -1,9 +1,7 @@
-DIST rash_alt-0.4.3.gem 8704 BLAKE2B 0ce0dfcd1fce8ba8be1b24d352b930bdf93c93d7275de23a0de8727ab152a34fe394229835feb3a37af0127bb338a3f281d08b3db98ad98cff014cc23f81eb39 SHA512 4b56a92b6a73cf92dd9ccb251a2b980d60f8c7e1fa24206fe08b3a825dbf1d56797d05b771935012bd75ee609df5a0a46b55aad59d74eee5194f416912ade7e9
-DIST rash_alt-0.4.4.gem 8704 BLAKE2B 1666023e63bff3ae9ddc2ebe77f7fc759bce2dd3175483cd787edb325c765824e96bc8f79ad5c4d5fbad1d4e91daa3aef884db666aff162002b0226cf0b50b22 SHA512 92eabd11fe571c329d0cd8b45248726589d0a59cf4b6cd80f8ea1b5a17c20db94c4fe6a26868c64fb8eb172b352f228c4d9e0ead296393292c05828dec066c58
 DIST rash_alt-0.4.5.gem 8704 BLAKE2B 21a2c55d6584f02681e7807c476c65beccbf8582f3408391f0da1d8f45ab7d080d4ac1e9f55b458ff2390996ca46a372ebebb848617d90e457a2ab4113e79498 SHA512 8ff46aadfca60aa77439967374198849a7053524c5abd4d1972bc63a328263315f1b6b43ca6d12f960e12dcdff481807b1575ec9d6cce624f44568c5c0d17312
 DIST rash_alt-0.4.6.gem 8704 BLAKE2B bf9489ad3cd7dff9ad376e69b5b9ab0414ecc38a52da48ba04e7be30183637a5924713dc88dbac8b6efba30165e3173e64ca51e50faf236b3d0b69c583afb425 SHA512 d9fbd87e1e5c01056a8d986c985edd6f35c19a27df9fc41cc83353b911973d796e8a28d49c6978c98ad542f9483e116e71a503cb5aa47de64c9b16b17690a1e6
-EBUILD rash_alt-0.4.3.ebuild 636 BLAKE2B e46d21807ebcbb28554e1e3d1b3616eb0cf0e1bb3203e5e72352f121c3fdabd18cf37e9d79cf1a8dabdc189c6cc5e88bf9410850a261a1dfedde538de296bb2d SHA512 197c365b9b4cd4da078b32a45c40f31cfeaacccc122d3dbe67da09a1cdd95c641f358927709b3cd7c7599e88008e83ee87ecbe265e8eebae0ff0c6b27b256001
-EBUILD rash_alt-0.4.4.ebuild 629 BLAKE2B 92cac5d5e1688f9c983ca39568fe91c0d782ffe66358cc6410b35616f7d902ec7acbf49757387729536d4d9e37e7c9994e61ef40d1cec2fdd08bf2d49327a98e SHA512 9855dd23f3ba5b046697e8edc7f271b42b64b3a97330b8cc832453af6e2066d00344698a65732fec1dba64d4f2df85cd988e2cbbd2088e2a17e07c97edf66d40
+DIST rash_alt-0.4.7.gem 8704 BLAKE2B 4b3280fbb630af8a0b3eaa3f3ec03788e9a0420e6e511acce1c038f5197b10afb40e8620023141a89ab65dfb3af318df61fa073fd29aa6d2d7863663498a192c SHA512 c6b58da46e6c05a575482dfecc6e40f3f832595979bb5497f90496a57517a09d123dab691d4493e32937f58337bec37df2d1d342fdd7ed8c8befefcdd388b4ae
 EBUILD rash_alt-0.4.5.ebuild 653 BLAKE2B 2153d96bd5141dc4af2bbecc77414f8fba7ea79512fe89fae222b21f70b61e4aca2dde1aa1944b1a8aae634c15dc61d1b66574afccb2243206095506e86e963e SHA512 da574249bf8e57cd9437e5cb45291e5decd5dc91d66b4088697c2e7dfd53c0344b70caeadbe0db511b98cbdb8aa5b37d4a024ead54fbb4d6e410f63e6015f945
 EBUILD rash_alt-0.4.6.ebuild 653 BLAKE2B 434a04319b1f531f4f98ebf59f0aac4456e63e0a8c6c735b147e13c9b04f305f0423df31da797c08633d446af8fce830f2f1b0f2ff9df3b06e4203a7ff258fc7 SHA512 3074b8e8b6229eb78896c4e2348d3646731209f84c1bf737ec515dd7c5c5f90e65b652cff6f5e00b035a2b3cc1f467a1db5e44c3de9ebce782c9a894bc3a4164
+EBUILD rash_alt-0.4.7.ebuild 653 BLAKE2B aa6e3b26091f35b46c561cf55cabb32dc62107476d02ebf29db6b616a89325b7e23a7b0dedbbf57b29eb88dc1ddb3c0af2f1fb1272a9829a62300ff33065b010 SHA512 d88ef246288ead74b5a9ee5e4131ba51f4d586a7c28b066b12992ee5e2abda400b565c286f93390558fde9acdc42dd47baf54c86798586a7037afb701fb0d472
 MISC metadata.xml 341 BLAKE2B 7caa3a250886847a12aa991c5dd47543d1e7189180f8174dadba5acefc1038284bd60edd162bd597658df0c1fe570abb4e46f7e3e0132090c14208b0c3ac1ff5 SHA512 d194dc7d95ed207f9022e3602712d942f592b3aa773796a1cbd14fe7d5d80d82ba767ebc5dd5fc9e5bac665459f4c624e0f074112ce35fab935a94ec383a4d84
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.3.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.3.ebuild
deleted file mode 100644
index 658e61db5f92..000000000000
--- a/dev-ruby/rash_alt/rash_alt-0.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rash.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rash alt version for Hashie's own Rash"
-HOMEPAGE="https://github.com/shishi/rash_alt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/hashie-3.4:3"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.4.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.4.ebuild
deleted file mode 100644
index 62321d42490c..000000000000
--- a/dev-ruby/rash_alt/rash_alt-0.4.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rash.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rash alt version for Hashie's own Rash"
-HOMEPAGE="https://github.com/shishi/rash_alt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/hashie-3.5:3"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.7.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.7.ebuild
new file mode 100644
index 000000000000..105e4753528b
--- /dev/null
+++ b/dev-ruby/rash_alt/rash_alt-0.4.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="rash.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rash alt version for Hashie's own Rash"
+HOMEPAGE="https://github.com/shishi/rash_alt"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/hashie-3.5.6:3 =dev-ruby/hashie-3.5*"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index a5624d61b75d..29e250ea5ce9 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,6 +1,6 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
-EBUILD rrdtool-bindings-1.6.0.ebuild 1331 BLAKE2B d80bc44d9f5e9834e0a9b490fe497dbe75750b4e1d3bdf7f7b5e63c993a137a0a150f5af6351255c87e249aa661104a58514d0a8b083abb198dacceac84f6af3 SHA512 a0de3b92a83babe5418800d8745cab423f2982984b3abbe16959b3966dfbf239e2d2b9f2eedbff81164d43d92459ddfe64c6956cc6a9cb11e78afad6a1c39f63
-EBUILD rrdtool-bindings-1.7.0.ebuild 1328 BLAKE2B aee64f818c7c9657755ef609043cc61b2687c0039dfd91af1b46bf6789ca6b5c0e31f49b8e37ce0cf64623047394fc7fd9a9c212f72bcb96b61125bcfd18dbc0 SHA512 a01a718ffa2aa81e66237cd45fd51fecb9b3fd66106d019c06747887adcb31cc2ad41c22636188e63dba6938a6308b521c29f1139d51aef813e56d061c32a856
+EBUILD rrdtool-bindings-1.6.0.ebuild 1324 BLAKE2B 3ef5cc35a9b495db4ffb33fd5e4b91c3fc1b6b515eaf92993c5674d281ca58b74afdb9e4ded0d3483396c10ad9761dc39ff6bcc0353ffc6d23e658a0dbbf76c8 SHA512 39ba745ed55bfa103497d66c09d7582d4e33a20ba49e1c8e1ee2bd20895e8ac5722703efd3bf94c54aaa0534cefbd61f322ea01ad39c1704c32592eb917bb80b
+EBUILD rrdtool-bindings-1.7.0.ebuild 1321 BLAKE2B 3d4aa42330134b37f1adbe038c16a1cb0e8274754b15e2ca071acab3ce0f08f573eeb80f57520395acf6f4b7aea93c3d1bbfea6076f7a1099678eaf2159c47c6 SHA512 78d9b941966aab0f4d4d965090e30c4f737c07e3492d60307742e779f43626190111a2df2f2733d1dc351e706d13415eb9170f275b274b55ba5deeeb7e3bad66
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
index b3cde4fb92b4..8d8c2aa3a3c0 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild
index a59a70f1a6ba..6644d0fc0228 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 RUBY_FAKEGEM_TASK_DOC=""
 inherit ruby-ng
 
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index afae7f21232d..f73a426173a1 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1,3 +1,3 @@
 DIST net-ldap-0.16.1.gem 103936 BLAKE2B cea22a78314cdcf5a31a39fdb7b0af2caf32e836e21b77e34c566acfe1426740a1534de9646b90ea26696ea3eac4744a62c05e444c0326ff11ac00b25b570d02 SHA512 08d7fa7a55144dc98ad22b3824deb469dd67d755d4e7655f2fadd71c245ae6496487fc75e974352866a5325b76f3468aed813286b07f19597b6d60507e1362fa
-EBUILD ruby-net-ldap-0.16.1.ebuild 650 BLAKE2B 1d18f318ab8988ff591333b1c44bcae20e957d3e1ff3d806a29f0fe2a3bafabee57e0e584e2a47b3a057424215753b3beb7f055870139bcd70506c1bc7ee58e2 SHA512 9dd9dafa7b7ba6b9365cad8fddcc4aa19a3be514532450309dd110f5f58af317913bd0a36a60f4448ff7cebef432bfc6815fc60e84a3fa7359a32524a895f120
+EBUILD ruby-net-ldap-0.16.1.ebuild 650 BLAKE2B 643fc21200aa61b04a402de1ed0e32d5de2518cf45f913196e7ba314b740dd6ec1953a495c47466d5ded793c0348bda4b6430abcfd34e22abaa4f2e7eddd020f SHA512 940f83b180976009cb179159d4cf741bd5d401a31102a0824e30f37ddd9c5ffca88cca268b36b97c539485978db610653b889639e45269f159d7f9068ba950f1
 MISC metadata.xml 349 BLAKE2B 8048fb25bfc3ecc99fce9301034623a0bb6f946afc23ae87d2308f4cb5e65be2774894573ace6d5808090118105f81a2565cec6a00237a41ccb071170454b7e5 SHA512 522f6bae26a2b7d3ad4876b5fde3e710e07ae82147275a031c3f622df1775311560603960cf6909ba755039f2f62cc2971a3b29871ef7d1320e24d375070bcb3
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.1.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.1.ebuild
index 90499abc17dc..7f4168d17f49 100644
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.1.ebuild
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.1.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
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="test spec"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index ec20e1887c85..d5635900aa49 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-termios-1.0.0.tar.gz 14738 BLAKE2B 61beda48d956a3fb9aa9aad118d1a28576b420e37528c5bf3d8516e0112fd0b648ec2987c8b47048feb50c694ecba6ad0ac27711ea1216b481dffa759b291eda SHA512 16d71a8cf84391da2dc8b138ff381751f5a72d61ce37d2215960d389285dee14862b50cf770d4648b298df093a85005df460ba951c5d7e6fb38e69d8d686599a
 DIST ruby-termios-1.0.2.gem 17408 BLAKE2B f85877dc3c9beb5c8d20e044ef7dfde6a12d540157228c1fdff365f3b662f8c84b9e7460ede985f0d402ec76a1d248fa41d336ac7bd9333222543c6d01748c83 SHA512 e32e899e917eb04e382a02484accf9fea0369de8c1942b445e48e71e9c836305e2d54221c9a044d27ede44a7d5c14f976a8ffda79f79f71b5a121474e759f45d
 EBUILD ruby-termios-1.0.0-r1.ebuild 975 BLAKE2B 1604516e23a132e11decbb53f1ab521b0ed3394dd35b64acb46bfe43efd95959313f7d62d03ad4aa9cee7183de3f3c657a1e117d6b792a7c93837dc4271cd0ab SHA512 bd78505df91239e8a0bf638652537daf075c388ad969dfba80dca5310b9c5d092ec7ac8d93570dcc86f6996661badcfd47405976637fa722b87c7a95fc229887
-EBUILD ruby-termios-1.0.2-r1.ebuild 729 BLAKE2B ab5ba2579674fd6212163a76e7314f3e58fb9c125c7461e7725c1a82d3b0011bc4a484fd46378d215b49baa23a67512e76c166eac57a8a6d8c3fd90bc5004b68 SHA512 014c18df60c33e7439191bfb4dffc007e50dd1665bcb6791860d9ba7107bdaf158e7632537c382d84457fd4f0246c5735805db8b9da29fc8e69aaa41a126913a
+EBUILD ruby-termios-1.0.2-r1.ebuild 728 BLAKE2B 40c46c7da5e7523a4e9b6820c635bca48bfff02a2d828a8db427c33a1cc3aead6a6a791bb5ef5b4e0e97c2c771077f43e5c0cf08a30941cd329f11489707ca51 SHA512 ea214f241021a4c25be2c301ddd542671aa1db3c5163034e39ac4f925bb4fbf60182ce272bd01a398b4677a41705419f3abf64a658d8f79153dcd3191e25bebc
 MISC metadata.xml 344 BLAKE2B bea737f016d7562c237c3cd1da976866362b52c33fed4f356becc724318f0d73129d6d67cb1202658495cd3ca337625f218cf3739dcdb19fab7fbf7df87df8bc SHA512 3c6d07c1fb48f63b2e3b11eaa84b24b6f57e1b7ad4146327950c294e0d49521a7dce7cb63c99bd0641c7b330d64b6c85d91ba6feb150282f35902fce8602806c
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
index 281202b989eb..23e9fbd36d15 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="A Ruby interface to termios"
 HOMEPAGE="http://arika.org/ruby/termios"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ~mips ~ppc x86 ~x86-macos"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index 7b8cfb3b6ca4..e3156b953199 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -1,5 +1,5 @@
 DIST rubypants-0.2.0.gem 11264 BLAKE2B cb5e995a6739ea27c94173fc1fb5c525098d71a17a92d09c924cce6803b156a78097def230c9e935bb17d8dac35e86ccfcbbea0e94349804eec170b3646ae8e7 SHA512 f7efe237860e15b2ce164749973d5ef133dce1a6bc5e9429357703b321fb0af8ef4e849f8ed19ed498b6fff13e29da036bb8d379c1220d939c862aba0138a5d6
 DIST rubypants-0.7.0.gem 13824 BLAKE2B c132b3c60390b712c08ec54b10a14255e21d9622399b9ddba8d2359915411c604052569e5713fdb4b1a3fefcc3416f4d5af16baca19063a0b79203838b8f3066 SHA512 cacd05e0cc87389b5513c83fe085db39202c2789b882b564caaded6b84b1ecb1acbde8232462dadf501c68c1c881ee7b7f4e640feec47c9c0f7a08758b5f5724
 EBUILD rubypants-0.2.0-r5.ebuild 827 BLAKE2B 25ce25c6074acdb86a673517ffaa7f4a6f37d2cd7a11698b75b067d8f8fc6f8689397a1fe1ce417ba1ab0d4b7d238279b7fb15d21085196aaf1710e127b9e9ab SHA512 5096c7df18d37d5c95a2c67ea9e3ba676567925e539fae047cee752c2aa5ecd767b4d856756881c0535985f8bc613a5097f9b2b37483a45c04a22d816b033d96
-EBUILD rubypants-0.7.0.ebuild 597 BLAKE2B c46a1f9111ed3eec58ac9692b9d93741ce7192e24a3a041e946d776d6fadc887dca7f1266f6de12ea755fbd212a6acc9af58ed034021516493b56ad8ef53ff9e SHA512 631d00a0d3cdc1ad447c69d1509eac50e772c41ab08d5c3d38d5df580b6c0da017d9947d5bed52674769748bbb310192dfe2859d0b32f210001cbe9dee62551e
+EBUILD rubypants-0.7.0.ebuild 596 BLAKE2B 4ed94c7d29873f749b392555273aa2fb01bc57f046c82dbfd4ce4e1ccb817a0c85febffe32564184d74dac46d1af634e4f78f637621545a4fb0d44f33eba2c74 SHA512 bfc6644fbe4f8d8f6f21abaa43d1a1c725ef57dcf55b08ea4e6ea1b5cad29af42735d73bbca19685be4c751bd3e34a1a0d39dc3b41eba95a0555bac2a6ce3887
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rubypants/rubypants-0.7.0.ebuild b/dev-ruby/rubypants/rubypants-0.7.0.ebuild
index ccd713e6eb2c..dbbae41015c8 100644
--- a/dev-ruby/rubypants/rubypants-0.7.0.ebuild
+++ b/dev-ruby/rubypants/rubypants-0.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 3ee0f8ba6a2a..d54f4bbfb8a7 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -3,5 +3,5 @@ DIST slim-3.0.8.gem 99328 BLAKE2B a63191186223e32f36cc19b9513b22b2312c9d848aa390
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
 EBUILD slim-3.0.7-r1.ebuild 1689 BLAKE2B 0e89951b909fb7db81b261d78e88798f4f3f7e493ef80973bbc9a55db9fb4813a14a8555cfc2a438467648e1777cd8acd59340682164d1a3f1f9ed6e967cbb6a SHA512 35305de1f03ebc7b1eaefae992bbb73d41e6f3938bfe670a045c810b71e92a6c741fdfdc35b9e67288543701ac0b10bcc48d0b6317ac0752dfbfe69d160538c9
 EBUILD slim-3.0.8.ebuild 1594 BLAKE2B 2a7b23003db0cd991730ca467c371ca9afc951c5c797333fd537d83b67156b84f1cc51af715e8c669e974f2d913a91ae889c2063ab9c75c1ea5da2e59a1addfd SHA512 6f8166253b01ab0a4ef73f3601195bfa492441a33e52ab0ad4c09bfb75bf2bcbea7a1513573a1f875de5889cf05b3487e0d33a60a6d0a76ddeb8d8ddf6a69448
-EBUILD slim-3.0.9.ebuild 1586 BLAKE2B a5cda49c68a90c5cd565c872eccb01efe97c0a6757b0d0dc62a479b693e0e3810348962bbaf2d09375094e311dc4e0600397a96336f10b03ea50e0a7db914571 SHA512 86dbcdb67cd8bcaede6575340ef6d53f5697381252dd707e1a9faa6892e39c9c3b655ee328703230a10cc162711e5487fe6d37402fbda8e4f9ad0131a01c0e39
+EBUILD slim-3.0.9.ebuild 1585 BLAKE2B 64854a66b75b2d4aacabc71c3fc3aadc0b3656b242d1a2f853d72e27c02c93c5c897b1892ee33131cbf9092bad3b2b3abc74e1d3846f84a3d22abccea3890530 SHA512 648350c329afbc72af72edefd1cddb20e4960e79eea28f4e0f11f3225a617e401069a755c685bd003d5e6c00e225cd11972deb704ba9d454f218316277a6b10c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/slim/slim-3.0.9.ebuild b/dev-ruby/slim/slim-3.0.9.ebuild
index 37c8c3450ecb..b3f7d2954da4 100644
--- a/dev-ruby/slim/slim-3.0.9.ebuild
+++ b/dev-ruby/slim/slim-3.0.9.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 770f6295a107..a7a7c2e61c67 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -4,6 +4,6 @@ DIST test-unit-3.1.9.gem 124416 BLAKE2B f1c88d9e7da576babaa979a57eb522a244856711
 DIST test-unit-3.2.7.gem 129024 BLAKE2B 31565510d5a16cf75706810a551dca40129edb0fc1528b9f55c862b23db1986640f42a72432028f47d052bb1aab3600c90c4ed19388ba11f2221a5d1e0619aaf SHA512 a55a5abee0d602b23af34ee8a9a7e26effc95ce9dd8ce98da28c49caf883d47c86bd2d0979176b0d1e239861ea73a4c5a9a280a1ceda7fbfbbd98c888ca6b01e
 DIST test-unit-3.2.8.gem 129536 BLAKE2B ee88fc653b0dc0cad7d88427391cd6a476d2d3c56c3e4bfa7e7cac28d6e9a35663c40e9c4ed29a1d5998255c434ab7884177354fd1e68b07f00fe1e0048506d6 SHA512 b7ed21744118036a997525251af2520158282ca19e99ebccaa7180361a112e0cdafaf570c36126a6b74b8480405c67aaa5394e06465145583964defb68abeb9c
 EBUILD test-unit-3.1.9.ebuild 876 BLAKE2B 7f5334600e70cccd7e83c6c13e42f42b9bb364a9d51d8898270eecc965e178062fbe6498325828b6dc6fc7b081b8e5e1d9428d87c0865f2d317b8c486826a329 SHA512 ec68f762c63e6915340d70423d335c8e26c33d4f7f1a9f859afcaa2af98b8926d364b3baf5a9f3f97f8ec730c3a143d0cb8ae0df5568346494299fb6a5535d3c
-EBUILD test-unit-3.2.7.ebuild 947 BLAKE2B db0960f98ff412d217ff6a3a675038a44fea76366384bdd020e583d6e21c3ab6135fa0cf35a319a68ec8cce4c473278b957188954aab15cb799c7323aed07c5e SHA512 f4db8463e398dd4917f6e54b8c4f2ad170a37a24670974bb96ee3c041ffee9128e4f732d8d3bfec53aa5c29b61f0905a8f86b853238653dea955595914e3ff37
+EBUILD test-unit-3.2.7.ebuild 943 BLAKE2B f5fb79ca5ae3acb165b3a8baa68ee4a833abfc1f70806285603b6e47d5578eb61ff7498e26342e00642498c9dca42063c98ddc32901d5bf56bace766bb501665 SHA512 280bb49cd79286d5ffed94d379328dae6a39d82279d732581e2b65bd302dbbed73205bce018394554a41449cce38cd3b2690ca84750630e4db2fac8fcccba69a
 EBUILD test-unit-3.2.8.ebuild 940 BLAKE2B 3a4b1607379fd7e3b994aa59eabf32685fbe26f8923419c55a9adc96847d41ddaee119157a920a3219e5dcc733af65d9172fc081e90d09190e1dd89010fa9bf3 SHA512 a0477a944bc3d03b9cc7ab8a3e540408e6e8bb828d22a033e51271d13d8ed4a34902f74bbf40ef5b8bca29eb4107301f7315bc1d28a0cb4289b4aa2b42a70438
 MISC metadata.xml 491 BLAKE2B 9bef2b6085dbc82d562f091ae4e136cb7aa0817369b257f77bad4aca6faba4074d4dc70134999f81ea612f70f98c072414e1a92878d349e940df8ad0811304e1 SHA512 ef28e88bb4b269eeaf05f0bb512a6cdd73750247b60c2b4ba6c5b2abdb7b2e946c07bb42e7d6416f30f864378c3fa51b86455be2d3ea4467936602d5742a66b6
diff --git a/dev-ruby/test-unit/test-unit-3.2.7.ebuild b/dev-ruby/test-unit/test-unit-3.2.7.ebuild
index 8669eb42962c..bf53010baaae 100644
--- a/dev-ruby/test-unit/test-unit-3.2.7.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.2.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=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
 
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/uuidtools/Manifest b/dev-ruby/uuidtools/Manifest
index 668670ceee52..a800d2ecf584 100644
--- a/dev-ruby/uuidtools/Manifest
+++ b/dev-ruby/uuidtools/Manifest
@@ -1,3 +1,3 @@
 DIST uuidtools-2.1.5.gem 25600 BLAKE2B 8219d559d92d86e7a87b97d4eda9454b6c203f89beb4a74ff619f51470d339c4063b1982ffb6f8acd5b9c206ac7d0dc537e968b1744a030a4f6cd629a358fc7a SHA512 c56e6329e48638bd5049d348beedec7fadb9ee7a133a5013ddd41ae98baa8213d8944903059729c9ca4f38b24d9b565b5653332685982337a4233f11d4865ac0
-EBUILD uuidtools-2.1.5-r1.ebuild 1068 BLAKE2B b0ee34ec4ace5684c4ccdc5cc5870b402c0a00e1f5f3f018322720ca322dc28453ff6c6a0a56d2d15a5e853585fbf66bdca1fa8405c3b96c96e3de8f528934b0 SHA512 cf7de73fe9ad476284a9d52570e92fc44677cc4e5741298c5cea17998065d0ba9d5f4651edc22a663f6f6d983fc402b207025deec58c2fa43b023ca92182ba66
+EBUILD uuidtools-2.1.5-r1.ebuild 1068 BLAKE2B 23f30a49acdff07929b471b2f9639a6547ef9eff52335129a1ada591442e8a9b3138c8ed4d663342bc00487292f8c2389064f731e0c103e8f97047690a7510ba SHA512 9d49436c07fabfcb1a291fcce7ea0b8ff2f5436fd59f716668ce50519bd5ac813928af1a9045fd7857132cc4ad739244b45f8107742d5bee3096313299d45970
 MISC metadata.xml 539 BLAKE2B 5a99e5c959879b57b6b604bd90b1e7c91fbee2608653e4a6b6cb135012f5c964a1b07ff90f9f8702c99a639df9a143c308722df4c0bcd1e8beea2259d3e9fc39 SHA512 6f697164bc069b62ade929d31fda162c1d25e33fedc1135985cad7bdc80d256db169aa8ee3f2293a9dc56667a1e1d4f75834ca1d4b3c3310e3b26ed85079f09e
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
index 5facdb568b94..2f0df9781742 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.5-r1.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=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index f975d94eddd8..d905dbd8b427 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,11 +1,7 @@
 DIST web-console-2.3.0.tar.gz 47641 BLAKE2B 2756f3958ea77df7dbdf7e7bd79f64711b4f958433f347175a29db2272ba549c79f1f94e2be18c17ceb8f4f1e8d281cf09995354f6ccd21da314df14dde886ec SHA512 36136242012053c2049b0faef682a8fe79f931904cd1007a6e08f36aca7a8923fc47fc058304f11cc0b205db876ca77b1cca65048c8ba4db401123ed9c05c834
-DIST web-console-3.5.1.tar.gz 50779 BLAKE2B e94ebd0bb5ddea665849155bed0bf5a1c9025a48ebdf6a8ea7b032ee5397aa75d63a91e173ba03b49af7833d27950398f50fd189c20b8fdf53738ed4af7bf0cf SHA512 0a28744f8d138a8900f368884cb65a3ab147e3f3fbabe194b15def5f05098a519692155e13a15a758b95c943e861057018b60c75e664b7dc4991a6c3803d1290
-DIST web-console-3.6.0.tar.gz 52676 BLAKE2B 53ed5bab0f30c756f930d1f5531b7100fe468d186841b9a7e646dc0b993649fe3c7d253ab4442e490011aac7f0fb13803f3877f7694dfbf481ce2a2e71653500 SHA512 4ac94124bb0b1161cda0c4060f888d2e442f0f63f38ef77762f62e0c84016461c3641453c7ffef17c5a6005e824c9a59821d5719aa97d72f5717423ed585fdd2
 DIST web-console-3.6.1.tar.gz 52769 BLAKE2B c021ba7cbd75494f58443a9d01d69ea90b31836f87af863ef920ee38147e458e04f07a9e82609091d07992ee851de78c35b68eda0c94f804c93e75cd51bbba24 SHA512 56d27371e856cd38a3c897da411be3922dac9bdd6f16b1019b45fa884f9d7974bf1bdc41930ae0ed9df4e2e06dde59330a717952f6ab2dfb6ed69be6717ceb2f
 DIST web-console-3.6.2.tar.gz 53094 BLAKE2B e832f9ffcb2221156f441e2f08509c79c4c723fc2a1ea4af5904309f310be1110abc757e455ba5c9bbdce41cb34a1b4ff9139c5f5f0c394262f2bdf9fe1dc1fc SHA512 16401e4ae1ee82af290174db0132362199451137b1862e973fdde7dbf0a9e80e73f5cc84baa76f230d5c6feaf0f42def69dc9da517230bff9d316ce0c7c2f085
 EBUILD web-console-2.3.0.ebuild 1121 BLAKE2B f7ea78faa544059960c0c72171b3cdb331acad11fb34116e93efe466c7c2c59f599acf7214f5ac5dba2e2c52d4ca7c8fdc7d3236622d44f98afb4ec4b2572728 SHA512 63a710dd361dc67eb00e433023f74184754776caee0d9d7ea52c4cbf59d292ea1206c456aaac68f88b0de0ed20dccdba7d769a5e4bf4c2ad8173ee0ba6b90f1a
-EBUILD web-console-3.5.1.ebuild 1070 BLAKE2B 0aa8ca647e60ae9b83a0c76115dda70369a7f72428a552f162e699a2e0d1d2dedc9c694d41c38806e934406460e2423ee3afa7ed42466ee55a69928fd605ff78 SHA512 22c2e274b4f16fdf12d1fd8f33f2cf84bdfcb1ef033a2ff2cb7047d9765008eb91a8effa119960e46e2e91d6a7e52475a74c428141afa2bd00e5c1152c9e462c
-EBUILD web-console-3.6.0.ebuild 1070 BLAKE2B 0aa8ca647e60ae9b83a0c76115dda70369a7f72428a552f162e699a2e0d1d2dedc9c694d41c38806e934406460e2423ee3afa7ed42466ee55a69928fd605ff78 SHA512 22c2e274b4f16fdf12d1fd8f33f2cf84bdfcb1ef033a2ff2cb7047d9765008eb91a8effa119960e46e2e91d6a7e52475a74c428141afa2bd00e5c1152c9e462c
 EBUILD web-console-3.6.1.ebuild 1070 BLAKE2B 0aa8ca647e60ae9b83a0c76115dda70369a7f72428a552f162e699a2e0d1d2dedc9c694d41c38806e934406460e2423ee3afa7ed42466ee55a69928fd605ff78 SHA512 22c2e274b4f16fdf12d1fd8f33f2cf84bdfcb1ef033a2ff2cb7047d9765008eb91a8effa119960e46e2e91d6a7e52475a74c428141afa2bd00e5c1152c9e462c
-EBUILD web-console-3.6.2.ebuild 1063 BLAKE2B 517843fd00490630249ff102f59efa7a2a24a2dda0e0d594ed734c92df2fd1180bd62c667689e12373e0155b97ebb2347940dba2eff24d6a961ed8580d7ec0dc SHA512 4528301b8859999951558fc791fbdb4e200366aeca53c1b38e465400acf3d364cd147b03c3bd4c73692cb301af461f430269fcb3b7a3f0011e98bedf5462ef0c
+EBUILD web-console-3.6.2.ebuild 1070 BLAKE2B 8da175a96145a26547169e65ca91ee7a13cbc226e59d444f70b5dcfcb92376d2972e73205fff9dabb26af852c2826462bdf1a6dd0ce74034ca536516f4b1529d SHA512 6aacb8de523d5dfbadf2d26eb801162ae4817fd3b936d2fa7c4b37abf69079d487bf4496c46e674ac7ccfbd03e73be6b87776203b38c7223c630198449b19908
 MISC metadata.xml 343 BLAKE2B 8883d76dc0b31bd49361ba715fc9546328ba5a3fc734e8a2607547cfde3d8b48914231839f0ea3d4a59f005a5074770e1dcdccc6b5d629197c8f7f859453f178 SHA512 9116cd6bba4d0030e6f8cdf055fd66afed68c52d9f5382a8a9cd2cb28f84c3f397a3e793dfef3b5ee0fc9e1a4dcd1c2d6e6b285fd7fbb027e339e2d15a0381ad
diff --git a/dev-ruby/web-console/web-console-3.5.1.ebuild b/dev-ruby/web-console/web-console-3.5.1.ebuild
deleted file mode 100644
index eee8ecae5741..000000000000
--- a/dev-ruby/web-console/web-console-3.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionview-5.0:*
-	>=dev-ruby/activemodel-5.0:*
-	>=dev-ruby/bindex-0.4.0
-	>=dev-ruby/railties-5.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/rails-5.0
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	www-servers/puma
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/web-console/web-console-3.6.0.ebuild b/dev-ruby/web-console/web-console-3.6.0.ebuild
deleted file mode 100644
index eee8ecae5741..000000000000
--- a/dev-ruby/web-console/web-console-3.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionview-5.0:*
-	>=dev-ruby/activemodel-5.0:*
-	>=dev-ruby/bindex-0.4.0
-	>=dev-ruby/railties-5.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/rails-5.0
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	www-servers/puma
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/web-console/web-console-3.6.2.ebuild b/dev-ruby/web-console/web-console-3.6.2.ebuild
index bdd9aaa9fb98..1228f004d912 100644
--- a/dev-ruby/web-console/web-console-3.6.2.ebuild
+++ b/dev-ruby/web-console/web-console-3.6.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 3d134000c940..2329db45e629 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,3 +1,4 @@
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
+EBUILD webrobots-0.1.2-r1.ebuild 955 BLAKE2B 5051e81919edf5c18fdcf5c548762c4965769cc6c7127a84521b81847a542dcf8633b2483a206daa4ec61bbdee9f5a2589fd7afba656178f0d2be501d5e07b1b SHA512 da7857ed0e66764c26dd07c87f676d382947bf362ce3f4b454ad09a2ce3f89ae4cd03137b67c2788f969625adc475ff89936401ad67ce06b67e1031c42722f21
 EBUILD webrobots-0.1.2.ebuild 941 BLAKE2B 0b2edbeb1f2db94603d5723cde9fe3ec09e48dd8e1a99360fb95edc77496d286895bd381af77a000e8b732f91eceb18a4e0e4a9ed98c240f114b6d7946c8e911 SHA512 4a2ae2b257407f23c408664aae3232d6c0dc4d819ba95c084ea94a7ea76dea18338af128c383f4ad06356b027940d619fffdcc062ca05628071acd9ca29a6878
 MISC metadata.xml 380 BLAKE2B 9be818846cc0906eb21d32c72ed1c129d65e10133d8303535c65b942ec24dfba85f422186b754d42dedc9a0a0cb5bd7c28b9099f17543b007f012aec123fbb90 SHA512 0c68a9a014ac9459f1ed9639517189109e50cd101e8bc7c21ed2a3631e22ee7a7fc31c7f4518463170a63d710cb4b1e03a1bffa1275ca8e6629afe89cfa31b44
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..413984e979ad
--- /dev/null
+++ b/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to help write robots.txt compliant web robots"
+HOMEPAGE="https://github.com/knu/webrobots"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
+
+ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 dev-ruby/webmock dev-ruby/vcr )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
+
+	# Avoid tests for live websites requirering a network connection.
+	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_*.rb
+}
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index e6e2408ac095..2a01c0aa514d 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,9 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.12-git.tgz 916462 BLAKE2B 905f0e4408f7829ca599b578344d695e4c7b68d46b982f39277dcd69ee726a9ac283910e1031d635917b149f182fb302cae537ff8a8a81960fa27965fda82a0c SHA512 f987da7e46bb3dafb9ba8c761b51345ee67102e21d05181c3090f31ff37179505134c93e83efdd39bb35cf6fe6dfa530d0017ce4680a08f858e78cbb073b239f
 DIST yard-0.9.13-git.tgz 917734 BLAKE2B ac248a91c581247647dcf78e58fd9b6b9c014bb972fbfbb09179ec489c89a31ec1156e13c99c7e862ece216b0451ac4ccb0441c1bdd45a8078c90f886d1a5135 SHA512 8ae886e1c981f017f740e12f07f90470ac9bf420a51f99692b642c212e26231d0a19e1b64084e3a70e09cad4e3a7175278fca66bd3b2420eac4ba197e20876ee
+DIST yard-0.9.14-git.tgz 917830 BLAKE2B dd0d1d6dbc5aa9b549bd4c110f1abd57edc76b85e7c936bca8f7d35761d705ba86cd169c3c2b2141095dda68a8ab350b46bcbeb978d655addff78b110fbd2b71 SHA512 7974d431b2c1ef4830f225fd2012592405e7fb63546aeb52b74f4ad8b498926be979f3010bd315877bb4f738f6aa6c31f54b71832b461ebd3fa54fe1a1fccf5f
 EBUILD yard-0.9.11.ebuild 1285 BLAKE2B 9b5523610413cb350d8c2b718f5a1d48f79dcb73585954fe08c46cd2306704949c1832414990bc8d12708efce8eead8ecc2d94f42af1cf25f103636310c1cfd4 SHA512 a5fd57835a9710f32446221a78c9dacdcd5437ee628c98b7f8a7a8bb83a65133734a9ae397d5a22a98c8f99b041b037a0eae65763a099e125bf0dff3bda8116f
 EBUILD yard-0.9.12.ebuild 1300 BLAKE2B 77553f2fe49d9f85bb30ec538be8ee0ec55e91cc104018d39e62f0714fba6bb5ad38ad949b7fe5ea5fb9112ef6a68fa2e15a13a9fe8860f23f5068ef84b01f8a SHA512 bef52518e2b0b60b689fe14f90d382cf54b1bcdad8be7fd2ca69d25db3fd27f4709ed29f65f553bc0575493b40a244b263236a44fd22336f23bed71d5faf4470
 EBUILD yard-0.9.13.ebuild 1408 BLAKE2B 476f273ba57dc3cae3c10893a1b554ab09b85d31bed9b6f003050e8d500da3e13fc8dbe5393095b061ad12685e197b79656822498792721bad2ba75f513f7c2a SHA512 3b58b8f5c2e67482b308f80fcb3bb05efe3163565025730e51afc7f8577c10ffe292e1ed49aec1c923dea49d192d20dda65f5af388571b888954c2b0f94ed2c2
+EBUILD yard-0.9.14.ebuild 1408 BLAKE2B 476f273ba57dc3cae3c10893a1b554ab09b85d31bed9b6f003050e8d500da3e13fc8dbe5393095b061ad12685e197b79656822498792721bad2ba75f513f7c2a SHA512 3b58b8f5c2e67482b308f80fcb3bb05efe3163565025730e51afc7f8577c10ffe292e1ed49aec1c923dea49d192d20dda65f5af388571b888954c2b0f94ed2c2
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.14.ebuild b/dev-ruby/yard/yard-0.9.14.ebuild
new file mode 100644
index 000000000000..010fffba8102
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lakes the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 5d9de244591f..20494e03e625 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 22bda362b687..561e67d5b378 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -18,6 +18,6 @@ DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470
 DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
 EBUILD guile-1.8.8-r3.ebuild 3106 BLAKE2B 1f080be08e9d7f69292edfc990466c5c89bd8d312889f798c23c9f29e4d3a689c62288aa669cf09111ae639680bcfb38e509a79cfc44b5151be33b6e433d35d1 SHA512 e83ecd2c5939e940a0b7203bb9e1cdb0e38dac1533d3652155fcfbaaa5009cc243859c800214e4aa0512efba87ccaa08f451fda236dfa3cf7f26897b1f9cfcb8
 EBUILD guile-2.0.13-r2.ebuild 2107 BLAKE2B 1bb3fbed942d57a410549298d16e933c1daaa0c06d167e53ed8ccd6c1b584ffd72bfba09ba066053497b561977514585612d83d3f46784521dbe04140e6f73f2 SHA512 ba403bede09718d687930d77d8bec64cd16c93531de0234fc4b4fcd2711b97cde63af1b5d1c7a65dbd7619cca94b4923388ac85528ee6fba0615a10f1addd8e8
-EBUILD guile-2.0.14-r3.ebuild 2244 BLAKE2B 39ad90f7220ff45838a00fc9c521dcfc56aed400725d493fc40176f6220a9115d22bfbf47f5106695d7e6c5b1c2c465634354fb1e094e6f5664b82f4851a0cb8 SHA512 f5c87f640f601383e47e4fc9057aab8b0cb0ab31463754b8ec92f4b7ae1f8474c958b7a48e6b62730071f9a22e3972a56ee58fef530a25f881ab118e1898f070
+EBUILD guile-2.0.14-r3.ebuild 2243 BLAKE2B 55335cd62d01e3054d24e92258c8c18fae754fa143d8f2b07c38a543344c24ee50a03f9a12b6978c86ce9fd369a666380c759ffac34714dc68dd439cac0af0d4 SHA512 0a2f1c77ac08995c1a60596c634178795c9c3bac2140bf3aa131cc1d89dc2230483b7b05e7afed220217904e3eee488201069cdd4a6181a5e0aa6e6ce8fa7947
 EBUILD guile-2.2.3.ebuild 2016 BLAKE2B 2ae8537a627d4880c93f7a317de57c001685bb1cdc7a07aed1c2b81e01b11b029ee364b0ccc28893ce23236ad7a48fdc1aec8738a7ffc5bf10ac5f77ab867393 SHA512 ddeb74589c283bcd2d767c2670ec57f9d67477f3dbdbb8dcc40dfa8c68c5de7f73616f03e979b2292e91cff4fb05e89b33f319e42387006a120d2199054a7da1
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index 6e53308ee30b..7e73e36e14d0 100644
--- a/dev-scheme/guile/guile-2.0.14-r3.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r3.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools ltprune
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 280117affdf2..51294936371f 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 88385e48883f..2dc9dc163313 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -10,5 +10,5 @@ AUX blt-2.4z-tcl8.6.patch 3281 BLAKE2B bc4963adc5016d8b2606d357538ed6a2940b2e47f
 AUX blt-2.4z-tk8.6.patch 781 BLAKE2B 46e29dc6390033981e9db351d8d00503c37c45a0f7c6777f6d18c1855a143f11be3cb7fd4fde8b26e33c266ba74eb4e7ba32d53cfc7a63b4319004b0f4544f08 SHA512 429d24edf55668827e638647e51131083b879d068d65c6d5d4f4665b42d7e02b26760bc78b8aaee5e089fa48b674a81d8cf861220493a7390aadba814a789602
 AUX blt2.4z-64bit.patch 891 BLAKE2B ddf77f3a5d47a5252271e57adff1afeb9a4bca868a89c4060a13b7c494355499cd14238a5087cd6da43e7f589be8894f7cbdedb2d04c7ea004a7193da63e2c8f SHA512 fee84b20e3cf8491567c11ed1cff3955963b68deda2d4d8a91b48691aa50d83db45a6aa4d86f80f8dd38b0b6bb1f68a1324e9f6805cc10fde2bcfb45f03f71e4
 DIST blt2.4z-8.5.2.tar.gz 2326234 BLAKE2B 83ea57989ee1e7bbbc243058b1a734942c4b6d796d06aa3a702012ea8d01eb059e76b6b8ff0efc9b43b000f1cfe7545419e2d892f1794b2add3d8c2c602e22ba SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a
-EBUILD blt-2.4z-r13.ebuild 3568 BLAKE2B 59339557514f0fc75102ad3cdaa8b8830c30a65fd13a9f9862ac61a0a5db0ab2faf6c3da723032f38eec6d4a6df5c742aeaa7a34c34e684bdd8598429903b80b SHA512 6436495728e939b9ea22e5b6b2071a1ebaa7e08760ec263c41bc4ee9563e10f6b45fb26f54811d7647a8ad4a2880cf6737f6a2bd0020905a64a23145062b02a2
+EBUILD blt-2.4z-r13.ebuild 3567 BLAKE2B 5171c823736a61120eff394735f13a24ee0c485e5a15c65afd77c6725cff1b48f2f0601e220256da01fd22595cf7ad9b5c3395d8aee876aa155942e4e9a3c8df SHA512 5e01b7863ce3797d9083193f4cc49cf1ab46dc0ffd906f3b193d871931deca3c49aa5dec2015a9ad67f9aba86e6c4e485b2e65ff4c4b38d477c9fc36038ff037
 MISC metadata.xml 336 BLAKE2B 42e123497016c3cffffc99cd56d04cf37bc81ad11487a39a97f1200df91edfb8d2c359ef76a3be83d4682cc6e2ba2695fd460af1de06d8f15b0932dd1f3ad211 SHA512 32593908c71225b7869b03d96dde6b7ed0d3db25f921257cf5027c80830cca794d0ed30b73c3189edd34553d6766ae57daf8caceb106bc49398fb519fd95d28c
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
index cda1412a7420..2ec7a4811499 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.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
@@ -18,7 +18,7 @@ SRC_URI="
 IUSE="jpeg static-libs X"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-lang/tk:0=
diff --git a/dev-tcltk/expect-lite/Manifest b/dev-tcltk/expect-lite/Manifest
index 6d7e24523825..653d2ae7b2a9 100644
--- a/dev-tcltk/expect-lite/Manifest
+++ b/dev-tcltk/expect-lite/Manifest
@@ -1,37 +1,7 @@
-DIST expect-lite_4.0.3.tar.gz 99862 BLAKE2B 74dff2f1c44bbce80d07b02ad552538b12ae03d2d0cc239415ad0305240e6ca683239d477c1e7781734464c2eaab4c6e7846d588ee893ef7c46ed211ccf9b38e SHA512 2dc07be8af649c680c436f1c15f350a56684d6126e243f75c0b3ad1d39d962680b6b482d92b78c91fa28ab5e22c09d9f53c1393a08b97361a46ebec821d1afc3
-DIST expect-lite_4.1.0.tar.gz 106191 BLAKE2B 0020b84580cc15885a3f23e6f934608dbe5b9d03bf835347d2dfa40c7c163df05c9299d9134f3e251ba1afb659811d8dfbb11ec3950b502827bc8196911270fc SHA512 23af747693d735d0546dad272d61bf96fba6fc7e43d5e2432ce8bb09662f06aaa3c130bf775c8d567982d8f42068e1689779646015baef64a8fb91350e9c9941
-DIST expect-lite_4.1.2.tar.gz 108253 BLAKE2B 1b85f7501ccd13c1ea3572ca7f824b74bbcc4a3acf30e34b8a51e0e634b4c70a51003e4da1ff9bcf6d84c356ced43d3b9fba011fa9b63cd3d9d63671c295fa75 SHA512 db0f37c88f21d22116cc94085ca50d6dac91e1bd5c7b7b28893a75c2597dbd4f30d82baedcbb2da7cfe504b10ce05f780fd84ea4eb037726a4c27e407ede2e7d
-DIST expect-lite_4.2.0.tar.gz 111827 BLAKE2B 0ddfba42240f094cf12598f5852be7314d9550962ca2e4f04c48dc2d40bf11c1cc30a76865f756c0d9217def610169b9a5475b0b4fd238d6aa5c4a04e6d1688b SHA512 7ad1a85b8f6c74c1e8733440220aab86a721f5a76ea4a09b86a9672cd8cd4ae3dd9ca5f8081a36fca66d785be2b50a8bedd6eec368b84f4007b4974705e3ca9e
-DIST expect-lite_4.2.1.tar.gz 114647 BLAKE2B 60ddef52bb5881a1b92cd203cb0ac1aa7dc71744fc8f44da2a4c47401cfa399dea81fd605f00c9644f8a6b4a60e9bc568696bf1b0ffa382a850d7f14b1450bab SHA512 b8ceca72e754bb803a89155adbbf089803034b8426bc56ac26c3b2a9636b85bee58d73a516fa5a421a900af9066a3bb3ec9631fb4a69ed15bca1510f6a566f6f
-DIST expect-lite_4.2.2.tar.gz 115142 BLAKE2B 7268ff9c655d2b3a548ca7d4c54f2bb19d5b18499401cc663cdfc1235572ff1fa9d69eb1e092c39389c686ba3e240c74e0fc06253abddf2eedd20c9dd17b8143 SHA512 7cee9e85c711595159f69d09fd1f1508e2da2a52755a98fe9b00f26467c5ebc6eef9e871452d1efbe505348138ca1a8eb02473e1276c2ad7b25306c70bc5a550
-DIST expect-lite_4.3.0.tar.gz 122260 BLAKE2B c062268a26c58bbe49ce561641f400e9d2e20a381d3c77c3c4b9f1e0c7b6c785cedb0f3d94b443c072d4a4262619972f45ad824cbc16f30ad96844c3fc76bcbf SHA512 a910932322ba691034e7fc07c7aa2a3912dcb1110064d301e28021e4c7c0414c996bfb7933e09f1656b918a47a69ea145da5f7a66102328b82a083334338b417
-DIST expect-lite_4.3.1.tar.gz 123263 BLAKE2B 4a4cab6083dfb2134dedc65b02e227e0ad7db9ff7bad6f6ee04d4c4cfa672740c8d4510cef2f74a89fbe01f09e062ca3d7ad76c63bc8bb1727452a45de310a5f SHA512 b967dfb0ea310356532c5702f2542eb1f1f45d6089b03c74c895e8e29e09c8cbb6f8dd53f1ee98a8e2e9f2213045cbbdeba1b949e713a12609bb4cd069a87efd
-DIST expect-lite_4.3.2.tar.gz 123364 BLAKE2B f8e3715e2ba05cccc794c8248b7bc68681d01fac739d1a3924264ab82cf67c2acf9cc34ac40322e3e905bcc852dca8450571ae88ec8bfadb9be797e84ad84618 SHA512 c400a091f0fc60a4523d1fd8a72b492c00f786ef0200bc0350432d353f80273ccb1b756002cc0a09363d7b0339304ac115ee5e53d9c3be3be97f948dc7d911af
-DIST expect-lite_4.3.3.tar.gz 124141 BLAKE2B 0153ed6459ac39f4aae8aae822c3babc172881ae9c4d6285dc22afe0c29966d1f3a5c9799c899643e710cd511f8880d1ae32b0417f52a5cb42e0d9222baed27a SHA512 b234033c09fa499090ae1ee31e3bbb70cfd498276465b7d76705e0f3b6dca36dea5321bcecd27067db957c1c5e158abe23fe787bf24c46336ae967ece605680d
-DIST expect-lite_4.4.0.tar.gz 134592 BLAKE2B 08e25bbb28708015798d3b2fce640273eb6ed11b3f30d470b9adeda5a4b97e39389250c96a08ae256f876128d3e3e98b36d72b874af31a9f0a277acc5ac54753 SHA512 b5fe25cb39d30fe0e65441e1510de4d0bd5e8374dfe4505d982d8778d4fa747d679fc5251ce330db0308a9795b8628270aabc1d52c453db648ae0bb9d7c9a922
-DIST expect-lite_4.4.1.tar.gz 134671 BLAKE2B f7735bdc672abe82ad605ed8737ffb7a9795151d9a4f314fead00fcc1ef56146dc8d98bfa3fe1816a0adc621c4e18da047c7be3796fd8042fea42c46241b3c82 SHA512 683d054f6e557ba114684de327a9c01fd27c5f2fdc6324a7f5b80846674e78bf8343b2ce804523df5a72ab4b77a973b571e9073aabf30f60ce4ba3a8946b6267
-DIST expect-lite_4.5.0.tar.gz 138091 BLAKE2B 4c39b552f5424287fcc0586f96704e577e3aabeaf415dffe638ccd41ec346667b791e0cda3ae78053064ea86da7ff3c332017f22226665e68dc22d05a94af9d8 SHA512 6e94337b5438135117c1c2d863548b7a3bc1020a304ed510aa23f69b4dd2085db2ef57a2133d7dd374b16bf5b6ae24a58451655169e3d779fce59b98c9baf279
-DIST expect-lite_4.6.0.tar.gz 142367 BLAKE2B 05a90e0877ba8f789a36d6eb5c26c5e62b905bcf03b429acd67bb855402fa2c73e8efe3b480cc02af6b70efb684f96f502e75f334f40eab73ada7a598fd2063e SHA512 b9c3e27503cf5b368cd3b6e4ce2006de67ea7779f40463c37f9eee23d1e54fcbbc3fda2bd236b97efe64f513d166a9c90f08e54f8e0f0147b4caa425ada231db
 DIST expect-lite_4.6.1.tar.gz 142875 BLAKE2B 9e7143d78d68338c4d6ec2858f3a24c5b5330193bfc064c27b190bf6ac7b01e53340e48006f5313cb301b6f6f9f858e818ead8fbe6117ba9ee8c6035b9f9b059 SHA512 a250f34472dad6c44149edf85d35f7ea159e0673aa5619864a71eb78003d0c1a2ec3d25505618f616d12d82d50bda8039a239b443014b43b2387059e6b6eb7d6
-DIST expect-lite_4.6.2.tar.gz 143721 BLAKE2B aed616d4c509eef7b90e77d568789e612d9f83ae2d5144b0f207dafbf6180ba89c22e6de84d7819f92e5f4e21811104ca24f8353d5fa3ac55615ac00960e07a2 SHA512 573658e32d64643e7cdddc98b3bd4f393ce926c9362bacdf3cd52ab59df4cc68953be9b972c29f5d3d115f67437a050871edd366b1e6ffbf39ba28216c360f69
 DIST expect-lite_4.7.2.tar.gz 145084 BLAKE2B 053f26ceaa98cde7bfe680f3076cdcd5391cfb6483c6ec0d0c9bcdf1f51e4b53c6429cef50a10915cbb01955fbee77bb6075bde612b6299bfd95357ab88f7408 SHA512 1f635f87fb53624f687477bae41edd37474c5358de368af8065d4222181ed4a5efdb55c8fda47e1f1b4c163fa2a423e7d84a7da8415b17cd250417432ee0fc5b
 DIST expect-lite_4.8.0.tar.gz 148917 BLAKE2B 0aeba8356c41f740807b914941c58a7ed26cc826ce2e297c5275b4f9a8c227437b2120d74f60229274aa56858ce03021245ef218e8d75a64cc6508f43b3afe2b SHA512 b4956dbcdde1e5648a51be99069069be6ff2ae6fb7a67116a35bbbb8786228920e9177bd1b14d0ac3dd0a8ebdd6fa523c62bb7f23c84407ebe73abe3523e43c0
-EBUILD expect-lite-4.0.3.ebuild 626 BLAKE2B 181755260910f011d381c29761c7d7e429341705c1569869d0ca9317e9c1b94ee3414850fdc18215c36e19ddcab19268c2a4c160bccdae9a88189060804bdaa3 SHA512 0d8e44cb4262c621b7860505f2d159b92e8c6c60878cb19e1d3a3ce7cb990c8097b4777d106171079e0f437cdae249877696f2ca2f638383a8734132116edbef
-EBUILD expect-lite-4.1.0.ebuild 628 BLAKE2B 6011a7f5312f049f2b83ab16666dc6193c7d6028bb300e990774f08a1d2119f0bc13c60f90f0703cdb2d24afd2d162de6c0693574d76804ee5217f40fc927754 SHA512 59cda8aca630ebfb9000ee99a173a0bf066fbdfadab7a7cfa0edddd952f40dcc30dc7c57e5e820180d829b3f372d776089198c2e5cfc1ab558e07e6619f74f8f
-EBUILD expect-lite-4.1.2.ebuild 628 BLAKE2B 6011a7f5312f049f2b83ab16666dc6193c7d6028bb300e990774f08a1d2119f0bc13c60f90f0703cdb2d24afd2d162de6c0693574d76804ee5217f40fc927754 SHA512 59cda8aca630ebfb9000ee99a173a0bf066fbdfadab7a7cfa0edddd952f40dcc30dc7c57e5e820180d829b3f372d776089198c2e5cfc1ab558e07e6619f74f8f
-EBUILD expect-lite-4.2.0.ebuild 628 BLAKE2B 6011a7f5312f049f2b83ab16666dc6193c7d6028bb300e990774f08a1d2119f0bc13c60f90f0703cdb2d24afd2d162de6c0693574d76804ee5217f40fc927754 SHA512 59cda8aca630ebfb9000ee99a173a0bf066fbdfadab7a7cfa0edddd952f40dcc30dc7c57e5e820180d829b3f372d776089198c2e5cfc1ab558e07e6619f74f8f
-EBUILD expect-lite-4.2.1.ebuild 628 BLAKE2B 6011a7f5312f049f2b83ab16666dc6193c7d6028bb300e990774f08a1d2119f0bc13c60f90f0703cdb2d24afd2d162de6c0693574d76804ee5217f40fc927754 SHA512 59cda8aca630ebfb9000ee99a173a0bf066fbdfadab7a7cfa0edddd952f40dcc30dc7c57e5e820180d829b3f372d776089198c2e5cfc1ab558e07e6619f74f8f
-EBUILD expect-lite-4.2.2.ebuild 628 BLAKE2B 6011a7f5312f049f2b83ab16666dc6193c7d6028bb300e990774f08a1d2119f0bc13c60f90f0703cdb2d24afd2d162de6c0693574d76804ee5217f40fc927754 SHA512 59cda8aca630ebfb9000ee99a173a0bf066fbdfadab7a7cfa0edddd952f40dcc30dc7c57e5e820180d829b3f372d776089198c2e5cfc1ab558e07e6619f74f8f
-EBUILD expect-lite-4.3.0.ebuild 626 BLAKE2B 181755260910f011d381c29761c7d7e429341705c1569869d0ca9317e9c1b94ee3414850fdc18215c36e19ddcab19268c2a4c160bccdae9a88189060804bdaa3 SHA512 0d8e44cb4262c621b7860505f2d159b92e8c6c60878cb19e1d3a3ce7cb990c8097b4777d106171079e0f437cdae249877696f2ca2f638383a8734132116edbef
-EBUILD expect-lite-4.3.1.ebuild 626 BLAKE2B 181755260910f011d381c29761c7d7e429341705c1569869d0ca9317e9c1b94ee3414850fdc18215c36e19ddcab19268c2a4c160bccdae9a88189060804bdaa3 SHA512 0d8e44cb4262c621b7860505f2d159b92e8c6c60878cb19e1d3a3ce7cb990c8097b4777d106171079e0f437cdae249877696f2ca2f638383a8734132116edbef
-EBUILD expect-lite-4.3.2.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
-EBUILD expect-lite-4.3.3.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
-EBUILD expect-lite-4.4.0.ebuild 628 BLAKE2B 4762755e07d9bbaacb84dc0e6295d864e0c6bd3e3985ffedaee761bc380cf8c7927bf5aaaabcf60dfde5bdbb9fe92e9e0138a023adb34e3c92544ec704a53c5b SHA512 aff36ec455374906e646afb0accbd041dfcbab5397e84c41e77e6597db436894c1299db9b12dfcca746a7067ddaf26b1e6a050cb1ff1ca7eab1a43dc0d5a6687
-EBUILD expect-lite-4.4.1.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
-EBUILD expect-lite-4.5.0.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
-EBUILD expect-lite-4.6.0.ebuild 628 BLAKE2B 4762755e07d9bbaacb84dc0e6295d864e0c6bd3e3985ffedaee761bc380cf8c7927bf5aaaabcf60dfde5bdbb9fe92e9e0138a023adb34e3c92544ec704a53c5b SHA512 aff36ec455374906e646afb0accbd041dfcbab5397e84c41e77e6597db436894c1299db9b12dfcca746a7067ddaf26b1e6a050cb1ff1ca7eab1a43dc0d5a6687
 EBUILD expect-lite-4.6.1.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
-EBUILD expect-lite-4.6.2.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
 EBUILD expect-lite-4.7.2.ebuild 628 BLAKE2B 4762755e07d9bbaacb84dc0e6295d864e0c6bd3e3985ffedaee761bc380cf8c7927bf5aaaabcf60dfde5bdbb9fe92e9e0138a023adb34e3c92544ec704a53c5b SHA512 aff36ec455374906e646afb0accbd041dfcbab5397e84c41e77e6597db436894c1299db9b12dfcca746a7067ddaf26b1e6a050cb1ff1ca7eab1a43dc0d5a6687
 EBUILD expect-lite-4.8.0.ebuild 609 BLAKE2B 03e0ccd1544a9c4dff58d7b5e02bef9a5878ddac6e5361725357aded02e4ee164a09a2f08991872ee273302f33ff8251718dd2e744568dd56a81da2c1e017e13 SHA512 659555ec0eb741831fd52046fd335c297046033111102b37591bcc87118a263e1b77649af5ec9fa30db0c81ad32fd74058f7fb50a61e46e4c319ed4acf165b67
 MISC metadata.xml 434 BLAKE2B 7255ecd664e8675ba5728d606b7961ffca2823b680cdc6c2c7cd918abf474563f87a09911cf9e71f82970fe9216c5b91f00dee7b25fcf38fb3296e9695827b8b SHA512 ecdfb3b8fcb84becaf9284a7ca2efdc9d49e662394a6a9a0fb6d8a8ba3249b3c2b622dbbfd41790235be170ee9c64d96b2e5e99cf8dab52ed904ccb18ffbd8bf
diff --git a/dev-tcltk/expect-lite/expect-lite-4.0.3.ebuild b/dev-tcltk/expect-lite/expect-lite-4.0.3.ebuild
deleted file mode 100644
index 4521dcaddbac..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc Examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.1.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.1.0.ebuild
deleted file mode 100644
index 5d74f7f556da..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc Examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.1.2.ebuild b/dev-tcltk/expect-lite/expect-lite-4.1.2.ebuild
deleted file mode 100644
index 5d74f7f556da..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc Examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.2.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.2.0.ebuild
deleted file mode 100644
index 5d74f7f556da..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc Examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.2.1.ebuild b/dev-tcltk/expect-lite/expect-lite-4.2.1.ebuild
deleted file mode 100644
index 5d74f7f556da..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc Examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.2.2.ebuild b/dev-tcltk/expect-lite/expect-lite-4.2.2.ebuild
deleted file mode 100644
index 5d74f7f556da..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc Examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild
deleted file mode 100644
index 4521dcaddbac..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc Examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.3.1.ebuild b/dev-tcltk/expect-lite/expect-lite-4.3.1.ebuild
deleted file mode 100644
index 4521dcaddbac..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc Examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.3.2.ebuild b/dev-tcltk/expect-lite/expect-lite-4.3.2.ebuild
deleted file mode 100644
index 4440e9994297..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.3.3.ebuild b/dev-tcltk/expect-lite/expect-lite-4.3.3.ebuild
deleted file mode 100644
index 4440e9994297..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.4.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.4.0.ebuild
deleted file mode 100644
index c460f1458eef..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.4.1.ebuild b/dev-tcltk/expect-lite/expect-lite-4.4.1.ebuild
deleted file mode 100644
index 4440e9994297..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.5.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.5.0.ebuild
deleted file mode 100644
index 4440e9994297..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.6.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.6.0.ebuild
deleted file mode 100644
index c460f1458eef..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.6.2.ebuild b/dev-tcltk/expect-lite/expect-lite-4.6.2.ebuild
deleted file mode 100644
index 4440e9994297..000000000000
--- a/dev-tcltk/expect-lite/expect-lite-4.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="quick and easy command line automation tool built on top of expect"
-HOMEPAGE="http://expect-lite.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug examples"
-
-RDEPEND="dev-tcltk/expect
-	debug? ( dev-tcltk/tclx )"
-
-S=${WORKDIR}/${PN}.proj
-
-src_install() {
-	dobin ${PN} || die
-	doman man/* || die
-	dodoc bashrc ChangeLog README
-	dohtml Docs/*
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 823677e7ecc0..3d883e319e5c 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -4,5 +4,5 @@ AUX expect-5.45-format-security.patch 428 BLAKE2B 98e4d1da9f790bb1ab1b0b8481c5c0
 AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8acfb681dd98d6e98e54c86588f0e74067b929fe105bc477fedd8709b749857dcdaf5e57fa28445dad34c4139 SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242
 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
 DIST expect5.45.tar.gz 628808 BLAKE2B d7260d3b2ce1bcd72deef121e1f994f45bfa5397291692d794c9b8ad627d7ac183689ba00ba22f728853ac03b6b083fb6f283dc5c453aa991e04263c217be552 SHA512 be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51
-EBUILD expect-5.45.ebuild 2324 BLAKE2B d57b24cead5260aa5f09fc1158db98c9decb5538b8edeb3b88b449bae9d791ee5733d73c992ee031cd003997e8221dc31fc9c9b46a0dc02be2fbd0285c87bdd5 SHA512 993c036dcd1a8376bfc9a6afe8a4249aa5d466f3a3269c8a867cd2c98ad34b214f97c82a64843d7a7a21b99d5047dcda6170e9d9501d02edf11e25cf36e64e49
+EBUILD expect-5.45.ebuild 2323 BLAKE2B a7ddc999f1d2c1b3c8f1a8c5983b94c89e4a4e8dcc3d06e229b63f359d41ea108c3f2d7d92d2427e6ada3fa01c840cc233cc839335d21c41be67cf84378b9808 SHA512 bfef9b4a10fa57845aa223962a457949db55fdcd41fdb507c9413f4fd223bfe37a5cee231394912d0d919dc10641e9f6908cf445e508fc794b5d2dc4c10d3582
 MISC metadata.xml 329 BLAKE2B 9eebe793b4602782f9bd2db8dd7a0cfdfdab3f89400f3ececcf25862220c47e78feebc579b468ae5dc44ae482b8a69f844f141a2f535fbd61dec73f11c8eea83 SHA512 cd5b6144b39381b2b69791171489dd907c3d779ae488b361f744ffacb2459b0c72cb70a72a85dce6bd7a25774e1a42da511dd0d041b25580bf243a515095f3d1
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
index 932c79a2e04e..bfcd37e9d3e4 100644
--- a/dev-tcltk/expect/expect-5.45.ebuild
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
 IUSE="debug doc threads"
 
 # We need dejagnu for src_test, but dejagnu needs expect
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index 203c1dfb43a3..3d94164e3034 100644
--- a/dev-tcltk/tix/Manifest
+++ b/dev-tcltk/tix/Manifest
@@ -2,5 +2,5 @@ AUX tix-8.4.3-link.patch 402 BLAKE2B 229737acefdcea3f424ab0e961cbd6561b981b061c8
 AUX tix-8.4.3-tcl8.5.patch 6808 BLAKE2B f7344618960c685302192cfb4420cf1a18a973eb9e8baf9f7815938439d3a463035ee2724339700a75ace4705e7d03761bccf76b4f2b177a38876d945da4d58a SHA512 e3dacb53df3852c195306f9d7220f931592ea3ec606b121ac02e3b4f84684efb9da9cae4e51e4fb3b818d7277860bf72378fe63ae835d9eb3a2b7539aee9f9cd
 AUX tix-8.4.3-tcl8.6.patch 665 BLAKE2B 188df36874cedc7aade7f04b567dabbfe95c2451fc095d4ece12b1750bc4837c26bb6cb93ad33ee61632cf7d1e5ad82de479030d73b81bf2db7b6b8f8ec1f051 SHA512 3b390b551c6d59d4af695d5c60c8c47c9dc270f97b5e8fd8dab23540c2c0f41b2ef2a43d6dc21249930f294354012718866bcbf773f58c43df7c5e8ee8f22f9e
 DIST Tix8.4.3-src.tar.gz 1831503 BLAKE2B ec3a388bd8ce4f2b433defece3cafcd64aa07da9d8f9b1e23dc5c62f2dca0170cae3c5fc2e8df0ceeada7c48a749929ae9138346d8d38b528ba99b52d036f8da SHA512 f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852
-EBUILD tix-8.4.3-r1.ebuild 1377 BLAKE2B e63fc9179bd3b5a885abdc87f5b3fb6c54c1edc68bf2643c7413dbe6ad6a99b55cd7b5cfa705dff8d08bedc31323d5f528ac141bf8ad97f1f7da8d84c16b5735 SHA512 607ed3c6c35e80b1e58f7847f52d2c55a1c47e000d9f051deb3387a59efb0fddb514cf42ad62f3776d544f8f5769c1d478caec418a6f7240f3a9da37ae47c8c3
+EBUILD tix-8.4.3-r1.ebuild 1376 BLAKE2B 36ed6ae6b88948af499fbf4ed3e972526372e9e4c37cdeabc4e48bb28638bc6f4d52f0b7cd1febdc656aa53ee79ce96d314a57e4615f6461e283314f1f89e6e8 SHA512 3889acc7b693196c1804da46dc20ee9ab60354e2dd11f39ca65465daec1e3934962321b5e21a839a8daef788b4f4f23a2ad5ae6205dd9677f57ca700fa00f1ee
 MISC metadata.xml 326 BLAKE2B 3dd7044d395bacde28195a421c60be7f696572b5e308ecc2e1f8e2012f6a3e1645f849fd67a577bd00f756ab1ed8baa1efce1e64ea3b758fd79a012b9391c9d9 SHA512 dff5470f4f3ea0164cd7bac8ea41ea6589134bd59f8a0992021bcec2962cbaecdfb4f76e68ea417c8b9ec4c573f89dcb109821208d429672dd5467814148aae7
diff --git a/dev-tcltk/tix/tix-8.4.3-r1.ebuild b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
index f3806b06e063..fea8efa756fc 100644
--- a/dev-tcltk/tix/tix-8.4.3-r1.ebuild
+++ b/dev-tcltk/tix/tix-8.4.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-macos ~x86-macos"
 
 RESTRICT="test"
 
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 964da2195599..59760c02351d 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index 99f347ec509c..f0023e82d5e9 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -119,5 +119,5 @@ DIST texlive-module-unicode-data.doc-2017.tar.xz 3488 BLAKE2B 3523f92468e22e526b
 DIST texlive-module-updmap-map-2016.tar.xz 147188 BLAKE2B 0cf7ab46c73b17c4218ca18f2aeeabaf18c6fbfdeb4403d61d4e75e246fc90f2608b32ff7ee8adb04f46e6a37d0966fd2f9adc06a2dcce8ebf13b3fd9e97edc3 SHA512 686e6febfa66fa213b237f54c79967d60fcdfdf13d57874d324bcbbdb383ae1e5fd479464c5acdf29ec96bc22f126117f5a1ece233d04252087790fe7479c5e4
 DIST texlive-module-updmap-map-2017.tar.xz 161664 BLAKE2B e367003b3e9332662d241aef145bc9bbf97213aa626711a5b9a6aba9d5715f03e51bec4f14db85b5355611795e871d5f8bc04aa7096c2f2e5e54b0d7d47f15f7 SHA512 0395c1f7cbc6b9b130af08de0bcc3743a66ad5b81a87c92356cd82dadddafdffbdb67fe92a83ad06e01db32f12b73b1aaa7d8c6d735291e38687f50d46b559c1
 EBUILD texlive-basic-2016.ebuild 3224 BLAKE2B 3bceb6a883a0e125c48c49e6471729650fe8dc1c22fdc32cba5a7583a7b2f29796b0881f38484143a8d98afd602e72183763c8edfbf657f68b253532eb56e8e1 SHA512 da7416cbd7f4efd0efbff5315a9e5c91d11ee4d42a817d674b58c320a5c1dfd141700365ff9ef604fd379d302d2eec084e51d76c1eeca599cf6ca31e98c4788c
-EBUILD texlive-basic-2017-r1.ebuild 3218 BLAKE2B e9ccc29887956ce0b2657865903c010f91a0a171852f7bab26d37d9ceb197a33763e2af947cd3912d2ff65a75a193ede509670de7c1a57c5e54486db640bf369 SHA512 9106df060b838bc1ed55b6c9647fef03889b6c22ec72fc5b83e97158cba56baa51c32ec4f06ba714b2074b129d2582746d14ef68533284b64c4e4cf540c6f7b0
+EBUILD texlive-basic-2017-r1.ebuild 3217 BLAKE2B 4e9527a28911376cc2b7db083d39c09ce550c79363256a62322ecce2f3d25b760fa3a3cdf55b0e56b29d46a7e6f55e9813b78b2c8e6e6a7e0dff6eabe042a141 SHA512 9137f2f8f3220f075c649c8b4ffac4bfc029869347cde0fdbe5f9356fc271d95829505fd114be999ace3b22b68c9f818749c1dd1883483309f6bd59527ca9974
 MISC metadata.xml 688 BLAKE2B aa7b007f62d5b0a2abbf20faf44b53118960ba7cd36777fcd168ee50b41256a6cb46838e0b3757bb45f0e5c7fc5cb1b9ee3a53bbe9c23f2563cb852a24a810f9 SHA512 59ed72f217730364d768f0240839d7dea3ad2e6f01c9b24658e999f7e3415711ef1783e3260391bcfc9d396528d2fc7eb8d28ef96c7c19731f123574a2c64f69
diff --git a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
index 27cfd117cd00..0c3d04967d53 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 SLOT="0"
-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"
+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=""
 DEPEND="!<dev-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
diff --git a/dev-texlive/texlive-fontutils/Manifest b/dev-texlive/texlive-fontutils/Manifest
index d179e342707d..a3f84d2eba21 100644
--- a/dev-texlive/texlive-fontutils/Manifest
+++ b/dev-texlive/texlive-fontutils/Manifest
@@ -63,5 +63,5 @@ DIST texlive-module-t1utils-2017.tar.xz 576 BLAKE2B 695b4eb8df3e244059357a84ab9b
 DIST texlive-module-t1utils.doc-2016.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d3484840b30002ab079cff6066759e38a6635abff28b490ca6bf4d80f483a6237e195b20e4f00144a184c839ce92c0a070343cbf8c74c SHA512 59f3c52154ad0e443f35b5ed90cdecc201295ccad18dc919e8b41e9c5ac636502332e50a00febc0716702606eb98f2b8ae9438f3f881cb93fb81b91c5150451b
 DIST texlive-module-t1utils.doc-2017.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d3484840b30002ab079cff6066759e38a6635abff28b490ca6bf4d80f483a6237e195b20e4f00144a184c839ce92c0a070343cbf8c74c SHA512 59f3c52154ad0e443f35b5ed90cdecc201295ccad18dc919e8b41e9c5ac636502332e50a00febc0716702606eb98f2b8ae9438f3f881cb93fb81b91c5150451b
 EBUILD texlive-fontutils-2016.ebuild 1641 BLAKE2B 99ecfc5d05050363cd18b273307b7dd79116c58417329751d587e461bb5e2398bc84991f4c08317a2350c26901dc6957af1eca345d71f4ef986534416e3f84b0 SHA512 a7e3f93f0a9cda43669fd347051f4350c6c513bddf1754854b894e8ec71115a23d6f3f2aadb053b4a5d46c8091d30454c3a90738cdd40bce26b9257b414586d5
-EBUILD texlive-fontutils-2017.ebuild 1640 BLAKE2B 0d1919946ebac99e471c4a01e3bd2262a2063a3cc3881260b6a26059b319e37540b250cd8b43df2bd3c026348b15dbbf5863719dc17f80aa66e9003f4db83195 SHA512 1152d6d2e2e01b21dca40e46ff3a0f0267f7820cfcfbef7b9183b4a74ad3cacfe1f2d166162f6dc7986b2b0538f5f81969a49fa4abc8b7ee527201026b215d9d
+EBUILD texlive-fontutils-2017.ebuild 1639 BLAKE2B b901e72f5a9b278ba36d10766d097254b637677e6e4110e3ea392e9166634689c4410fe4b7dd58ad3197ea5c0c5598fe21156d5cd4e80d56d680a30161e82b6f SHA512 88def16d621d730132b59a8c3067c2118e2462a3f65944064af364b7b14b1b8537f0d66136fc1da01e422fe1d34f08787035e71e2d1268208c54f4e447e6fef9
 MISC metadata.xml 638 BLAKE2B 309dd88d7961480feda8e50f7c6c2f63274d24fd2beaf6c751cff8224243fbb25f23c176c92df85f0d09dccc8f6a90c9f63a301bb2c8527827aff6c97df85410 SHA512 c2ae5eb56b99612125ed6063f369979c8888a6b253a3a47bb4f125f45a8923207f13d5eacba69ef6af3717017a50e1603e17701cad95b484270c5715cf2c56ff
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
index 21debfc98ec3..e88da6861954 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
 
 LICENSE=" Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-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"
+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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-psutils
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4bd7c422da66..9412bb88b342 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bite/Manifest b/dev-util/bite/Manifest
new file mode 100644
index 000000000000..cb54affe202f
--- /dev/null
+++ b/dev-util/bite/Manifest
@@ -0,0 +1,2 @@
+EBUILD bite-9999.ebuild 1452 BLAKE2B 2dfaa75c4cea242833a8d84fc1fbd91a340d16379cbaad63d69667cd2fb91d345a2d2f9adf386b6cca2621a3c1453c40c503289e61b4677067f1a9094d94a649 SHA512 d3fa7b51f7d0841009aa133a530b8e52629aa4834a1d3513bbc46d0c1635d3227c7ccb1dff9b43f77c58acac5206b2ba6188a7fe3868634a7e7d471b31b8fd22
+MISC metadata.xml 330 BLAKE2B 84591ee05d14a0a3c7db1cd1fc966aca6a614c129babd365d5c2717ca19845a3b391c280e1861ae8c900e8a6124b725a15c775292181f2fc8cf6e5dc000eee01 SHA512 790542c11e1210fef48d1235385493814128da8cb6f1ab33e569e0f37e862b568ffe92f4a18ad6cf0ac8f8917bd884513fe40597540ad299af9feaf7722d2bb8
diff --git a/dev-util/bite/bite-9999.ebuild b/dev-util/bite/bite-9999.ebuild
new file mode 100644
index 000000000000..9460f20c7e4d
--- /dev/null
+++ b/dev-util/bite/bite-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_IN_SOURCE_BUILD=1
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/bite/bite.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/bite/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="bug, issue, and ticket extraction library and command line tool"
+HOMEPAGE="https://github.com/bite/bite"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/requests-2[${PYTHON_USEDEP}]
+	dev-python/multidict[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+if [[ ${PV} == *9999 ]] ; then
+	RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+	SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.8[${PYTHON_USEDEP}]"
+	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+fi
+DEPEND="
+	${SPHINX}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	esetup.py build_man $(usex doc "build_docs" "")
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install install_man \
+		$(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "")
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/bite/metadata.xml b/dev-util/bite/metadata.xml
new file mode 100644
index 000000000000..f5edf41502cc
--- /dev/null
+++ b/dev-util/bite/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>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bite/bite</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index efc944b39337..08fd902eed4c 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -2,7 +2,7 @@ DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b6072
 DIST byacc-20170709.tgz 743677 BLAKE2B 453e0083671ae17e3401bbc474a9724091fb3314adcee0e13ba55a95a12c4cd351ef901b645cb46e0df89d2053054e46a05703d418706bc962a0cacf55bb3201 SHA512 81b6e2dfe674d7e7650e1583c46f67e20cc5ff56b06ef73a54ec2070abd7f4af1a0db7909f31264d0e6157acd3661c19c3478e06c9bab395f53d0371bc1e9097
 DIST byacc-20180510.tgz 744070 BLAKE2B 9ba861ffcd310462513d7eb4b663c5c44f5cb6dc06ecf1cbcb41c309054905781c4ba1ffada88eaf0071caf16d78a5746d53e66190081e388b95f4a148684cca SHA512 89ac9d4bd1edfdcfa304b0efacc478dbdd84cc2a1cd4ef75515863b1ea2731b106202c758b469c39a4379bb155c0a2365baa290797da0a6bb3904295431556d6
 DIST byacc-20180525.tgz 745273 BLAKE2B 5b4732cede6d284f9f866b8e7f7f1f48b7eea26fcf203e633767115a2ba324586590477b9668b2f7e961db4765e2602ba78d78a2ed55d0c102153b5ed15e9cea SHA512 ab200b7f1f0295731cda0aff08ee60c1f8a4e057ca9de265b916de690e900abe67ce9b5f6f5d0e69945485e9adb5505b079d82f8e126eb1ea12d22bc6015d73a
-EBUILD byacc-20170201.ebuild 611 BLAKE2B 513619d2ce72704b5c32a23ab3642a0afe816835ed2989e8b12bb3fa541885745425069251e3b16ad6db79243256dc2759e68e44d3faf1a2ae3aca57ce37432d SHA512 9cb14b8ff369869a7f92ad8ae22a845bf3904da259171dc98ba8a87c8f3138bcdb618477d397b5b07d9d0d073df6a1d5ec36ddfb16f6376fcf708d7bc3c3c04c
+EBUILD byacc-20170201.ebuild 610 BLAKE2B db86272365c30ac4a30d1538078bc3b6e436e624b70c1a403a8e6e878480c075910e72e188d91e60d2b4d71edea2dae6370d81b9bb2685dc8f177c069edddba4 SHA512 22ad1a4d24aa1ae4ec9b7de9e5d6a881547bd4fe4baec8a884313201c2193ca85a8fa30fed24b23ca8b4c6295388dda357f2e5a50a8368831a0ed600596c9755
 EBUILD byacc-20170709.ebuild 620 BLAKE2B 4a2997e5186c9100bbf77da2fb135b7fc552ac4621b36f6b7f72e3c663b37d437eebe7049657c67f24f460c36bb6121b255834296a085de55ff17d7e24c2ad77 SHA512 e7b6590d7bd61eef0a18cfb92cb0426a099b1e276edc0f5b00bbc4c5d48928c8c75620dc48abd5ce17b260ca3f9452ca800dfef57b61e4fc13e288625763871c
 EBUILD byacc-20180510.ebuild 620 BLAKE2B d907534063b452d07169f2dfd86b6a79c7114f0327243d0dca071b66a35e85a58194ea6499e7b88063220104ff910fc937c6444708274c2f495d5460f1c317bc SHA512 2171da36f607ae11b786965935816457f9b4472002bf85f65d92011ec1c176bf2c755ce3621afa07e007269b87533c54013789c5f8b41151634d88d4c6f7ce23
 EBUILD byacc-20180525.ebuild 631 BLAKE2B 1bc795a89457b62902407f047bf3989043137e5bb864cd342617522ae7bffb85f18bcb74cc60ff31a099940ad85d9404a550c7a30c00421d7cdc4b18be6144cd SHA512 52450be448ddbaef7e5292870ee6f48e83f0629fa6793410f65533e1af7c66715928bb3283968063e631260f821789b37a4eb5d9b37fcb439b3c876edd624099
diff --git a/dev-util/byacc/byacc-20170201.ebuild b/dev-util/byacc/byacc-20170201.ebuild
index c7fadef836ce..0ebf724c67b4 100644
--- a/dev-util/byacc/byacc-20170201.ebuild
+++ b/dev-util/byacc/byacc-20170201.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 @@ SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index 409c154b479a..08ca65b78523 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -1,9 +1,5 @@
 AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
-DIST clair-2.0.1.tar.gz 5194465 BLAKE2B b91bc130ce7237c5398715bfd91f6744d89bd9690ddd5d99aabbcc62b22c148dbbe2594d1c1376010d9cd992012d639ceef4e9a78d1837c633978f52b4d223ae SHA512 03293829426d81157860effd893b72164679b4ec40c19294e321d489ced67dfea72415cdd9b1005ae590367c68f746664a76f63a29c7d714b22917f2323c4937
-DIST clair-2.0.2.tar.gz 5194625 BLAKE2B a1866ec881036a3f3891935782ccb4709c26a8051b4d762be2e7eae2da11ecbad794d21fd2d62c842f5d6d18a8f203a2258d9e9fad985455becc494753c75e43 SHA512 1522c40059594f8f7ce17781269a3511e987173c741c550e5c0b87beaabe73e368a23ddd75a2499a6e9f8920308744809c4c938af31cdb93ce2f0a817f906674
 DIST clair-2.0.3.tar.gz 5194681 BLAKE2B b4f809e7699fbf66745c7f528f3f2c249e81541a64c540a8c39b9fa8f5b581d1297abdfe80bdb0ca3aec00010c6c95e8073397df284d2a92a3e95f91049cde80 SHA512 bf2d4ab15efc50bce3e828d0510ceb44463a6c1d978a854b3a05899996203a7c33bb6e60470eccb6e0a1e23b8ff41955cd0fdda4b77a9a7e042e1e27dd2e0885
-EBUILD clair-2.0.1.ebuild 1064 BLAKE2B 1ac199e921555271086203ca46d483133700eadb1cf6f27f699a29e3349b299cda0fea0b451e3fa80aaa2c70e583952b99ddead136244399dc6495fc4d7648f8 SHA512 539d973c09c5926ced69ec55043b292d988ac50ede501bde4a49de8c9ee50db5a731d2ff0f95d76b47c83c1391b535705789f02ac05175f0d08819d1ebc4e4d2
-EBUILD clair-2.0.2.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
 EBUILD clair-2.0.3.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
 MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
diff --git a/dev-util/clair/clair-2.0.1.ebuild b/dev-util/clair/clair-2.0.1.ebuild
deleted file mode 100644
index 2ee9185f3f21..000000000000
--- a/dev-util/clair/clair-2.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/coreos/clair"
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/coreos/clair"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/bzr
-	dev-vcs/git
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /etc/${PN}
-	doins config.example.yaml
-	popd || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/clair/clair-2.0.2.ebuild b/dev-util/clair/clair-2.0.2.ebuild
deleted file mode 100644
index 8c92e5db7e56..000000000000
--- a/dev-util/clair/clair-2.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/coreos/clair"
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/coreos/clair"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/bzr
-	dev-vcs/git
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /etc/${PN}
-	doins config.example.yaml
-	popd || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 50cde1a3ecf1..0e26954e4910 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -16,7 +16,7 @@ DIST cmake-3.11.2.tar.gz 7953913 BLAKE2B 2979f360fdd3727f571d84181a9f1064246871d
 DIST cmake-3.11.3.tar.gz 7954155 BLAKE2B 949ee8c3dfae9d15eecdcd5c2a35fc278e84d1215858714112aea13aa5772f925a2a1b89bd39360e62b8638166038899e80ab48b6917e2c046876283d15d0218 SHA512 a91301bfb51bdf6a6c6ea71a26f05b6017eb375a4fc9c14934a83f2231d7af758bc67d8d9656111d1de56ec3df41dbcd61cb3cf50471bc0901f5bcccdf5267dc
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
-EBUILD cmake-3.11.2.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
-EBUILD cmake-3.11.3.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
-EBUILD cmake-3.9.6.ebuild 5953 BLAKE2B db46745391e5a79484ba90e2dfa02e9dc69de0d84996b21166b53fe427555e57dbef2f37c927afcbcea9df113917bb1548fa6be15a2cce4f881678fef86ba2fa SHA512 f8f54d756d27df0d80bb2d0280af137dd41753fe999b6598fbef1a1f47fbab5e918ec4a828d7fe909ebf355dbe0956b0c746a0eee576a02df14e0fcc1c6d4acc
+EBUILD cmake-3.11.2.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
+EBUILD cmake-3.11.3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
+EBUILD cmake-3.9.6.ebuild 5952 BLAKE2B 2b0c0bb6a20b30aa3b2bb5f28112423253021ac94b36ad8a1ac9bcb62a1da4fa53fb4693f460f47cc374cb0915b0e5c4e7b1f8e7d98a2b3254bb225ea2ee0fbb SHA512 4517b5a521bd3ca9dfd0b6085637a5591f6728b291bdebc4f1ae1fd37d549365866573e51803c363e3199db46a8677263054b01daeb98efa7e10009ff95b485a
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.11.2.ebuild b/dev-util/cmake/cmake-3.11.2.ebuild
index 6bab5d7c8c20..050883851f5e 100644
--- a/dev-util/cmake/cmake-3.11.2.ebuild
+++ b/dev-util/cmake/cmake-3.11.2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	app-crypt/rhash
 	>=app-arch/libarchive-3.0.0:=
 	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
+	>=dev-libs/libuv-1.10.0:=
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
diff --git a/dev-util/cmake/cmake-3.11.3.ebuild b/dev-util/cmake/cmake-3.11.3.ebuild
index 6bab5d7c8c20..050883851f5e 100644
--- a/dev-util/cmake/cmake-3.11.3.ebuild
+++ b/dev-util/cmake/cmake-3.11.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	app-crypt/rhash
 	>=app-arch/libarchive-3.0.0:=
 	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
+	>=dev-libs/libuv-1.10.0:=
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
index 5debbd53be5c..3b09404e21f0 100644
--- a/dev-util/cmake/cmake-3.9.6.ebuild
+++ b/dev-util/cmake/cmake-3.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 0861ad92204b..76b834c53dcc 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -2,5 +2,5 @@ AUX cmocka-1.0.1-fix-librt-configure-issue.patch 1641 BLAKE2B 71214b9f0aec0bfbc3
 DIST cmocka-1.0.1.tar.xz 80240 BLAKE2B eb6baae44e75c3237038dfd32bb2844ed368eba7e2b7c8ddef82984d6b4b086b1667a5d021355d918be7ff63306629e7c6286c2f0ee4f5977362d96b6a9363d5 SHA512 142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
 EBUILD cmocka-1.0.1.ebuild 1150 BLAKE2B 3d184570ee233cd04095eba9d700798a15101fd01482acec0aa381185b34ffcf7e3c9023a9c9209fa673c8151bc3f7c48920032fa1304503f7681659195a17b6 SHA512 fe02af0cc7c5fef6b3655f07a7c23e7dedf9d973226391b0df31c7c3b62cd91b6f02ea0244faf76c0d3df0807704ad1ce39a2464becdd782b0130ed4b4c80a29
-EBUILD cmocka-1.1.1.ebuild 1107 BLAKE2B dd77fd0a443f3ba916b945c3c5b5373f8c69595333df0e425309a78915987679d4867115947687a60f57e8944a8eb12a8bb5fe57dd8db0846025a6ddf3c87291 SHA512 df5ad4f6532bd8302a7ba005c6b4c6bd4ad8703423b086d4d741179a927baeeeff86efa11ab3903514c3f8e9d992c53639bd0753f62cd50fa99eb21ca816a511
+EBUILD cmocka-1.1.1.ebuild 1103 BLAKE2B ad60b9dfe2f5bd7488b5d75fe2dbbcd9d99c0d305dc6c7da1d6eac2473578f2a9efa08e491faf9c6c5553fb4227b4816e5aaa5017b070d6c9f7d691a6216db6e SHA512 e730b7c1b6631572a44aa208692418c35cec596beb6492695d4abb7daba5f61d662b54bbe5e97e1d6e487b1b10e74b6b150e607bc7c316e135c3b2c008194f1f
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.1.ebuild b/dev-util/cmocka/cmocka-1.1.1.ebuild
index a8ba1e6b6d77..76dbc78372c5 100644
--- a/dev-util/cmocka/cmocka-1.1.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs test"
 
 DEPEND="
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
index 50316a061bf4..a6b748223c12 100644
--- a/dev-util/cpuinfo-collection/Manifest
+++ b/dev-util/cpuinfo-collection/Manifest
@@ -1,7 +1,5 @@
 DIST test_proc-04January2007.tar.gz 28831 BLAKE2B 1d405fb971eb0a4958a6127fadd9535ba24529b88d63e22ee726b6296ef5bf77f20e739b4c9475f8f20879950ed9fdb85a53f19dd7f14b91613b51b3a8403407 SHA512 6ff9f42c0847ef897069a7b36ad184b05ac022d1db5ab581e87d2992ee2a511218ef2019a0a94aadb91038e2b99e530618b0b6a380b0aa36f4178620e6719922
 DIST test_proc-14November2010.tar.gz 95697 BLAKE2B 476cf9784d3718ca27f030bc85ca1f526db43cc740ae77fb7cd4b45fad13ead8645ab9a17fec1216d54da8390e04205960c543cf4205f9f6677afe38dafd054c SHA512 2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6
-DIST test_proc-20July2006.tar.gz 27570 BLAKE2B 3f5165a2fb5b368a5b406298dfcc2052007f83974e67bd83985e1db469eb865ce8a6e3385a9c81224d7a0f6d070eeb28258d0761022b111721adaa2e6223ec37 SHA512 c76f59a2b51e414a45c346a8a1334a905be6e5f7ea12f8a2cc92f44048bf0af66b548768910aa07287a4084c675310b6c4cdabc86640705382d654117357b2a8
-EBUILD cpuinfo-collection-20060720.ebuild 543 BLAKE2B d8fd7f2e645dc93b5f090899d41ea17d44b824a5c69a1b34c573dd5db8386c3cfa68a670fc7693dc39e0eadd5792ca0f4cb72e3025570f4e12dfc0a49ecd3d06 SHA512 8feaed0e07e25b79e16f0e27955fa00ad00388e95e280d3d7d23736155ce8cec0210398db83fca1f1affceda97df03934a687280a19b0d76bcb6b71df7a2b1cb
 EBUILD cpuinfo-collection-20070104.ebuild 558 BLAKE2B 5949deb685d52180a0a082fe90dfc66196a287a8d320c97cf152cf6f40987d14663a892c00a7ee4a8d172119da564337b5ac1caeeb47a5d5244ecb2242908575 SHA512 cabde97b357707de00f6545b1ebb7d10cea3212f279791a5cca81f19a877060a893420bd2be5d1aac0415872089d7d4304423fb4210345d36d9023ede6d37fdd
 EBUILD cpuinfo-collection-20101114.ebuild 569 BLAKE2B 6d6ce7d7ecc561c103e0f0142413581db70b85064002f5e5aed9cf5b6c058a3f77223616e84502202b901bc341ffb619a90f3148ffe260fd631a10872474368b SHA512 ffb9aab99d69680dc2df9b5ff9148b92bd4beec3b795f5186eae5d544cb0557f5caf436057d8b34e0b14cb8fb0fc4f6efdd53efa15bce41cf4ead28a73be300d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
deleted file mode 100644
index b34e13a31027..000000000000
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=test_proc-20July2006
-DESCRIPTION="huge collection of /proc/cpuinfo files"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/cpuinfo
-	doins -r * || die
-}
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index a1a22ae2c8ae..b8927636da3e 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7.ebuild 476 BLAKE2B c9a5914641dca48927ea9ca4c707ff9c9a2504603c6204feccbb2c71f1734b709e8c5df843c50a6da768baa3250d1879ee73cac4b80472e18f51e19383ecb9c7 SHA512 574b488acc9f5530861d82ec293c6941f4c9bd2838a789ba798239f3ff4b654d4df41cdb550c11001d696ea9bff0ed6c1bee2f20f6210ff8c37f3e0fd4d9bd8c
+EBUILD cram-0.7.ebuild 483 BLAKE2B 1cfd9d53f13d765ee9c72af7bef57d4e85b7f7630e726d5e416662719b7302c25543afa4ac60f6da811cf3cc1669f2d65cb3deca8cf6b29f0c143712c93ab652 SHA512 24740105e2df30702344be4ce39d95d18c0310f1e18d44480f09619116c0b46318bfd2c2426997a0dfee056933d9829b6adce932563300e6ca383ee227f3c250
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
index e58431cd89f3..3c164062131b 100644
--- a/dev-util/cram/cram-0.7.ebuild
+++ b/dev-util/cram/cram-0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index f3ec524a5c1f..75867c175da0 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,6 @@
 AUX ctags-20161028-automagic-deps.patch 2079 BLAKE2B 25950330e80d81baefa4be9d2cdf9fec5d147ba667522667fb7833f4dba37d91c83cc5033967d2d544b66562ea26634a8b8c2f292f23536ed7690b8d0f3d22ea SHA512 cb9639f7d17bcaedc720774ece7386608b39a91e44cc0aa9cd4359894a5fb06ae29a03b21bc913a110864161f8df623b82477e0d23265bdee88d13aba6c88535
 DIST ctags-20161028.tar.xz 852108 BLAKE2B a4c954c560bb2d0165c12b4ec4f7b7c2c674acde98d438d9388f5d6102d325759faa3d4801eb0f63da70064fdeb32ef1c1cdd4124ade8d87cd9632b77c823e1a SHA512 2b991ca47fc77d26da43f55753624d1b21363dbeec4aff3daa57762ff81df97b18b067e8989f5d92d36dd8c02abc04ad42296dd5da3659ae0c8901001287c75e
 DIST ctags-20170704.tar.gz 1295281 BLAKE2B b58917a876d90df528f51bcd572301dcba8fa8ce8998bdb0a245d7d58033e37c2984af963a312c83b364dafd37633270f5f5d06fdb635a927066282e9382f6a2 SHA512 6ed134347a4be16a5dcff35186bd949e73bea645908a5ac43082b92fdfa6040b0b99ea04590948ae8308d4e9eb1042c83a4f0df006709f15cebfbf0741d73641
-EBUILD ctags-20161028.ebuild 1728 BLAKE2B a2609b3e6a0f49733213230ac8b9718f5766ca0ca68151aab7b15bf23a27875e6095b6558cf8e88a77692a7c83f981c99778e2fb14d7dc07a12350e9a3f73d5d SHA512 df496dad6d9f51921d0a39222463424acd1ad8639c6d28c01e929e50997f86cf77692fe39ff4653d5b408b9cdc2a325defad4463de7ebbddb503c559a9641606
+EBUILD ctags-20161028.ebuild 1727 BLAKE2B b461614b554f4a489d230b6892878b96968f2483b3a6951f206c5e50b852df641aef7025f4d6b50df9951556dfbc165ffac8a2b88d63bda4270151b906167d75 SHA512 ddcd0d9a4d410de17e7d752711c481417d1e93cacf3c3f335da79a33ef37f48d63182d0f0cf12c147ed4a67f7747911789f342dd63adbe90bfd6d5cf6bba6b1d
 EBUILD ctags-20170704.ebuild 1864 BLAKE2B 648dd6499ed80bd2f00e51fbd2524f9ba735d27878bf37ed520135d8a15fd80f1f6351c02fe2bc97fbc49d3275dac201f064736bd666395027fa92a55e860062 SHA512 fb3a06df7d9fb5e0772cfa45c364af9c42ca0c6b3c57c4f00f415236c18ef2fa30f5a1a0055776ea805818faa154d4b6cf18e20b57362f27dc2dbd532894c929
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
index c82ea79817ee..9734f3d20018 100644
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ b/dev-util/ctags/ctags-20161028.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
 
 LICENSE="GPL-2"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
 
 COMMON_DEPEND="
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index 843f71a4e472..1b50c4fa931c 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,15 +1,11 @@
 DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
-DIST cucumber-expressions-5.0.13.gem 17408 BLAKE2B 113554f5350dc289dea2a97530e1982f4afa00fe23da4e63d55d648e8767443c2f6c18bb2639defbe79034e709dbfd5865bdff0e11f090320132de9724994b9a SHA512 7035d3d6b9bba0f56ca15580956bbb69c3449ca75c825563217ea5773984a976e455866a0046f045573c5fcf8398887e19a87f425299a3231a077a158ccf2f97
-DIST cucumber-expressions-5.0.14.gem 17920 BLAKE2B 623b1c328703d6f9919c9fc7ffab64d26b752fe8f75d21d5ff2323aa502fe49e9b65bfb5f9f0c64c4baee3189c28e5cf05a404fd499c72fa8cf95157492a0e6e SHA512 7e44de399250d21d017a38d72e15390e9e0dc48b03755508767c5c237aebec830623428420a500bcef1bbb9db2157994b59718a731e8baca4266d1393e0b5843
 DIST cucumber-expressions-5.0.15.gem 17920 BLAKE2B 83c741f985aee1fdb316693c70f519bd82e4cb373285f0bc9976405dad143ef562cbac92263e7fbf73254713a699270cf99080ed9d3a3f85a6b982caafebeb6d SHA512 0d50975fac9b94e17f7f0388b50cf1fe98775dc34887846f72d4b1f471ff957b466b9d567fd6e0da7561860d6e2d8364c2f3490ad9e8059ee0d1cd99ebc5f386
 DIST cucumber-expressions-5.0.17.gem 17920 BLAKE2B 4b90510f296d3affa659244948913618963204f80db95043924dfdb709e0654dfb5cef55b77c048cac7e7f3cb2af4a9a49150dd77c99f9a87b68d4dbf9f54f16 SHA512 2133e53733c2e68608885df650fed6c8975e310875079ea719c5bfee7635d7b49cc1c5bcc6946ca90323243b13606222993be31bc71da55cdd091b6b93e6567d
 DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d45364579213e97517f0ce57a954f58533230e2ac362c2664567ba79ee3404d02d2a7811986dc66e6a8365572978da5832e1a96 SHA512 4016248cf116920512895a874f67331a84f782dfbe560dd4a9d64ef001fa8d66ea2663b96dce8e2fb561fd533e6a8a0d399dcb923cba451cc452f15c571e3288
-DIST cucumber-expressions-5.0.7.gem 17408 BLAKE2B 1f958063f276154bd75485e1f2b9beabfc41d26e4029ca7a7e89d6f6d81dc25bbd69626920dfbf1a9323f65b6eea105dab328f06daf15c290a11ea0c86dc69e4 SHA512 af83d028df20ac608ce3fd85850da451f1ec76de688f1d0bc71c1e6a0e70cdbb15f4df6710cccf6b736426f9a547b5a5ae0bb860cd626291237c2bc11371a24f
+DIST cucumber-expressions-6.0.0.gem 18944 BLAKE2B ea7987ff411b00b80683e4ace66d6b3e5b91ef35a93af369a79f19472c6fba3eb0be8453fde3d716eef83ec221e35e7c2d0634e0c941693773fbf174e578f45c SHA512 e47a7099cfa3d49cd17bd6f289e0dd6856990e60d1ed4ed68897a4efd40eb5715bdb1bd2fdc0aa5389cf92cd67402ea544238752e38af6156a7b182cd6ebef4e
 EBUILD cucumber-expressions-4.0.4.ebuild 479 BLAKE2B b6d58cb994fcc741ba5c6f8d26531d01530c26803df4ef3a914882bc9eb440a9da4c2b84a593a622807616b8e2bb82191b827f08facad37521d83840bc53e6c3 SHA512 43d857be0ad1cf4cc39ce9852c8d032b65607331eec1402ed7f0ec92524621ec34bf4c2213e8c2bccc0763311a06b0db38b205baf13219cf8d49b63eb52b8f9d
-EBUILD cucumber-expressions-5.0.13.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
-EBUILD cucumber-expressions-5.0.14.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.15.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.17.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.18.ebuild 479 BLAKE2B cd32c66f95ec375ed5457e7ef41cf01537bc7074628379c887d39930c6ba8e999c0bfe85f3894ab0db0350912085eef5b53a26fe1e6d78010f01cb5316f2316c SHA512 02a0b11ec9e2e6de1178eebdc91b3f93fa6d6f834aed8f6e5fc969ef482653a8684ac84e26ec619fd53af74db2d8544745c3164fe6a1d3fe247bc081d1f4d131
-EBUILD cucumber-expressions-5.0.7.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
+EBUILD cucumber-expressions-6.0.0.ebuild 479 BLAKE2B eb8da200398a284c6d43c8fa78fb0a785a8295e0757c2a993ba6855bcd076f31911aee0b9db905477aa973e7cf9150597ac27cb9ba9eb2872e94e5b5b7069d70 SHA512 08f7b4addf7b69101fa252217e4552bb003944108fcd70970a5f09053529d41bae3e1602d2d673b0c84b3502045c5b0c257848b69edf447ba5f89cb6d49c3dab
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.13.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.13.ebuild
deleted file mode 100644
index ff5320baa208..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.13.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
-SLOT="5.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild
deleted file mode 100644
index 832428b34fa9..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
-SLOT="5.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.7.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.7.ebuild
deleted file mode 100644
index ff5320baa208..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
-SLOT="5.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
new file mode 100644
index 000000000000..06b14165109d
--- /dev/null
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="6.0"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 53b61025ff4f..11c8ad3ee642 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-rails-1.5.0.gem 406528 BLAKE2B a43f6bf93d10df49b57f1da914474f54eb5983b53afe54cb13fe1a1b95792c5c9031b26651d3ac8fe2f8788d86e6ec891aaa91853e95c603f746f02a719f7b6d SHA512 d5a416cea8055319b768243b2029fcc05412677ba8fdc523b246d69e12d820e429b80892d6cfc43600aa84257e2175058ddd5f0946d68c42efa7ebadbf1a536d
+DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
 EBUILD cucumber-rails-1.5.0.ebuild 1215 BLAKE2B 3948f577a0a4229a2cdb34f1e97a034380127860894c5a62b918e021cebdec058d91c5cfa7ab938441b27d4172952413ea11aa50adc2104d19e6e64bf4b33ff2 SHA512 c93c1ac5595bfdf823e4c3e2c127eab035cb2c954f19c4c78baeb2f7dab21f4eabc396e3c359b36a5b9ec53324e02d30b974a475df23e0d81d55c33a729243d4
+EBUILD cucumber-rails-1.6.0.ebuild 1213 BLAKE2B ba430abc294ee09c4d903f91aba1e6ff62cb5069df4d511bdd47184379b8269fe607b630d5dffcb6bbcc45db7fad514c5d74ca6a28f166379a6d681cc275e460 SHA512 25896ea0452c98e291cd03f0c05801fb15b01b98e143dd465eaf6fd5e55d37b2f5f7ae4c6028ba8fed04a2b0357b14de66727343b5572d25bf76257c7a9b130b
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
new file mode 100644
index 000000000000..4bb922cd0f1e
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="1"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-4
+	>=dev-ruby/nokogiri-1.8
+	>=dev-ruby/capybara-1.1.2:* <dev-ruby/capybara-4:*
+	>=dev-ruby/railties-4:* <dev-ruby/railties-6:*
+	>=dev-ruby/mime-types-1.17:* <dev-ruby/mime-types-4:*"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 11009dca9859..f56db4a60b78 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -2,8 +2,11 @@ DIST cucumber-1.3.20.gem 279040 BLAKE2B 7615ab4041326b39193cdfc54c5016e5b9e87fac
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
+DIST cucumber-3.1.1.tar.gz 267901 BLAKE2B 19e24da4022103de5a65140d19ed7c1626f46fd050e1917f19a912fd89818f29c530f14efe68b82cc853c4388eb212bb44ae3584aa6b5ec6e2065f094e718dd1 SHA512 3a1267119ba6cb2f7ee0961c7a78521fe10c00a0c4e5ddab8364d5213bd09c4d4f5875a2897df853bb981a101cd6bac77acad1e9377eed234c082cce9330112a
 EBUILD cucumber-1.3.20-r1.ebuild 2165 BLAKE2B 1030d687efe56f2e7dc3b8dc9f3869ab89d7ea3fd79dd33fc06a9495425f22d9b5979467c2875a41bcb4ec43d41db486ec2c0da752ae8a6e9e409f7cc177b76b SHA512 7d468eaee8facf0cf1e1a1272e12e55ba14a927a0611de734f9c4e328dab9b12b6211239b6112883d36769352f216d48e0e253548227b4b80723a8dd544b7831
 EBUILD cucumber-2.4.0-r1.ebuild 2473 BLAKE2B c2af659c58de223eacfee53adeeeaf69095aa1a84b062b5fd9f2de7797941d499e3a88cd79e99cc72e42a15d3e02fcd1e31e024114da8ade82f325d1be2992b9 SHA512 e7087af641078b13fe9bddcfadd09c03bb521a1d2473ce5a29931c923efd58d11292e4e0c97fb1365dd32be699ab6317b6cbbf69742e0377ea41dbf09f5f8321
 EBUILD cucumber-3.0.2.ebuild 2640 BLAKE2B 575206b7bbee67cb9a3e3d0ce269784fe08eb3698ea1ac18ec3a24ab86a65c856c55804f7ce134d4ff634b5f31f24d74b7cab6a59fc629cda81a15ce627f550a SHA512 66d405edd35ff7de97b9ed05994d602e0363d2d92c2370259336fc162a3d91c5aaec4e59e3efecd7be17d075e82c620f972c31aeb85a70d17f19df8566ab4784
+EBUILD cucumber-3.1.0-r1.ebuild 2640 BLAKE2B 6153fd69023f41de353be99be0a2dd06f83b72da4b598e7c41af68a2613ed4a94886c9272256d5cf4191b37a9ff6228a0f4e51a49fd212e14c833f11a2af84ae SHA512 05c022ee6a27cc814aa7e2acdda3da8ec35b9f0e2ac50b9b9d2ad0f38effc43da82dcbffccce4d2e0f0c0d0516dee8ef3874644627549a71cf1e4607ccc4e781
 EBUILD cucumber-3.1.0.ebuild 2640 BLAKE2B 73ed0d1eef2e67fcac273f1c616af5666e5c06791b37690d01e59a79cea8bdc1536b7ba4eb29accba2d6966aa65dda500b8271f4f193b8b805fe2f2b0ce3ca6d SHA512 6317b921eb64ff878fadbb48dcccceae1fbbbd7867afa85839af7d3cf7031a210fbfbe1763530bdd00f3978722ef327d478b8fcf25bc9049c543693b9a206cd9
+EBUILD cucumber-3.1.1.ebuild 2648 BLAKE2B 7c10c2badb563b162ffb0ee8aecbf955fa149558895de9b2b2f18bb754726f0ede0acc851901aee3fcb70c5534d3ecf9d147b5df6254dccd0504ee6fbb65a1ef SHA512 f016d66bf8312c7712d8ec254433b5203f13635b536cf216c958e0a807b315c82ce5b125950fff7659678fc5583ba74a1c859d0a9dea6d440dbe49d7785bdf2f
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.0-r1.ebuild b/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..efb1a9e5bd56
--- /dev/null
+++ b/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
+		>=dev-ruby/json-1.7
+		>=dev-util/cucumber-3
+		>=dev-ruby/mime-types-2.99:2
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2:*
+	dev-util/cucumber-core:3.1
+	dev-util/cucumber-expressions:5.0
+	>=dev-util/cucumber-wire-0.0.1:0
+	>=dev-ruby/diff-lcs-1.3:0
+	dev-ruby/gherkin:5
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged cucumber-pro
+	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
+
+	# Avoid harmless failing spec
+	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
+		spec/cucumber/formatter/html_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
+		-e '/git ls-files/d' cucumber.gemspec || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	# Use the right interpreter
+	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cucumber/cucumber-3.1.1.ebuild b/dev-util/cucumber/cucumber-3.1.1.ebuild
new file mode 100644
index 000000000000..982b9518dfdf
--- /dev/null
+++ b/dev-util/cucumber/cucumber-3.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
+		>=dev-ruby/json-1.7
+		>=dev-util/cucumber-3
+		>=dev-ruby/mime-types-2.99:2
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2:*
+	dev-util/cucumber-core:3.1
+	dev-util/cucumber-expressions:6.0
+	>=dev-util/cucumber-wire-0.0.1:0
+	>=dev-ruby/diff-lcs-1.3:0
+	>=dev-ruby/gherkin-5.1.0:5
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged cucumber-pro
+	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
+
+	# Avoid harmless failing spec
+	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
+		spec/cucumber/formatter/html_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
+		-e '/git ls-files/d' cucumber.gemspec || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	# Use the right interpreter
+	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 3ba41de4d42f..1cca52e75a11 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_11.1.6.tar.xz 453020 BLAKE2B 79a62c37a8b14336516d877f0633d3231cfe57a0bdd19dd50233843d186bff619dd31155d9851d367748f70ffda2d94d138b06357c0dcadba0c99771777ea3af SHA512 8a9e5a98ccafe72f6fd2d3d6376c82cd2ba656b4a72936afb5e0564144a6dc495b8d74b7fc65dfe97aca6282118298f0c256f5433bbc01a5837306329d2c737c
 DIST debhelper_11.2.1.tar.xz 456036 BLAKE2B 31ed91d7546db6f81eb5c40ce8ea203e01281ce3b0ff0cc310a280338bb8138c01f78f0f74175c68dcc53e913aab4f8a2c808e5f4ecf3a8661a5b2d551758e2d SHA512 9ce70ba6c89c77ef6be6a67ac30e9b904235850b2d8671be1a138c681b356e6c48cfceccd49942ed297ef944f4d35eefc8727e06fe72e44a99cc7b542f2a1211
+DIST debhelper_11.3.2.tar.xz 463864 BLAKE2B cdfce5b74d8af2cedec4f4cdd2bd5dcd21a941c420d6be32a145a5ab83ff9ae9bef7e2061ff011e7ecf941e4d6e017f9bc1413865280f0efac9ae0b00478f142 SHA512 b2172638023540593d8dbf525417c8c07e803919d7c0d481f896cff6d562492d22859deab0522aca91f69bd4b8c3350cbbf508cce6859d5bc04596cee9fd4733
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-11.1.6.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-11.2.1.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
+EBUILD debhelper-11.3.2.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-11.1.6.ebuild b/dev-util/debhelper/debhelper-11.3.2.ebuild
index eb7e5fa626c2..eb7e5fa626c2 100644
--- a/dev-util/debhelper/debhelper-11.1.6.ebuild
+++ b/dev-util/debhelper/debhelper-11.3.2.ebuild
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 61b01ff6ed6c..48519dd4addf 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,8 @@
+DIST debootstrap_1.0.100.tar.gz 72269 BLAKE2B 76cb0268d3401463bd4ba72f0bab6b2d854b762df092c7fd6320b15d0de17d6a53ca1beb32df0cbe6beffe0a85909611a8b5ff8b9356fbf61501360cd2eeec98 SHA512 36bdf55207d73f9b5c259b1d9c19c36918778ca35478bf654a97d82d5e98fb6293fbf68adfa2e0a113e0d53ec48f19173232587fb1f727068b2516e9e51436d3
+DIST debootstrap_1.0.101.tar.gz 73074 BLAKE2B 293cd1016af3bb65229cc1fdf1a26a500eea099badd4d94db22d0013b878e6e054d38d2cadf7ddf87f32f1bea0c37a91718b6b20f0bee782c4e99a376ccdbe04 SHA512 692db9d6dcaa7e440e37b4c90e00c56933235f7462ebdfb640588c6cb1c08f7197997066529d2a03f1f3e857c390a693832c625a4de23dba1dd08801adfcfc9a
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
-DIST debootstrap_1.0.98.tar.gz 71819 BLAKE2B 4ac11484540407b8a4ebd1dac42ba99bc1d079989bcbe9b5a69ebb97f621e6beae34a2057726517a69a111087dbbe788e205b73a65a5330578aba3f63db9e34d SHA512 4ab6c6599f09c0d0d851d991cbe780ab6a74df4dd46df02d40e1e03682ea57680a69044a1524c75392e1e726aa538b4fca4fb26e42a140ac4cc00f86c0af29cd
-DIST debootstrap_1.0.99.tar.gz 71865 BLAKE2B 073c3c42133e2fa459cfc3e6a1737e8ceeb2f28986c139734c77a40fb57db293bf664493f6e10f4c1cfac83297b61e9e8fe1da267cc848a1e459fdd6af2ef157 SHA512 1eae4be2b50e98c1c867701affee8b4c63a54418af789bca78ff411c4c97a6284139850d71c118fddd6c62df9223f9ff960a21d45ccf8bdadc9bf0b11eb315fe
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
+EBUILD debootstrap-1.0.100.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.101.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
-EBUILD debootstrap-1.0.98.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.99.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.98.ebuild b/dev-util/debootstrap/debootstrap-1.0.100.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.98.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.100.ebuild
diff --git a/dev-util/debootstrap/debootstrap-1.0.99.ebuild b/dev-util/debootstrap/debootstrap-1.0.101.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.99.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.101.ebuild
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
index e38f0059d313..f9ab1b2a4796 100644
--- a/dev-util/docker-ls/Manifest
+++ b/dev-util/docker-ls/Manifest
@@ -1,3 +1,3 @@
 DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
 EBUILD docker-ls-0.3.1.ebuild 1347 BLAKE2B 0f3795a9d68db30770000123e0bcfd24f695eea8642ee69ceed114636f1eb41befeab3916f41f7672f5f5eeb5f20b11b41240e7172c7faa87cbbe5290c899d39 SHA512 dc20c433d8696b0b111630d0bce4a976f841b116d06d89fef96e543ec5faf86ad5af3ee523f4592071c28ca8ada0efe540445501cfc5f5279aa7e6bb15907fea
-MISC metadata.xml 323 BLAKE2B 509388c3e74b1791db2db40b4386f905d811ed9a8e8b4ec374e78a7479e67b0f0b3c39c56d5070e9eee0070ef86c9dcef71c6668cacca6603416bf0792fb03de SHA512 bf430f00f6338c4790ca536314d722968a2325a46714212c122ac4ad56c401acc88bb593a19c4df4042d4477a9607c73af06e7d1d26fefbfaeeabbccbaeec14f
+MISC metadata.xml 245 BLAKE2B 6032e31aa98a3b51173eed0e5f5e110951fc7782dc921bd64369326613cdf94fbde87ec10c29f309fb4528790698ef105223ccfb5674e7cff05e5e72c10e1d63 SHA512 1808e8e5e1cc6bbb7f336471e940eb2b42489781d60cb302db6182b0ce7aa6a01148332f2d0ce32c32a57060e369c3a99330d7a02f292646acfd9dc40954709e
diff --git a/dev-util/docker-ls/metadata.xml b/dev-util/docker-ls/metadata.xml
index 1aca3044e224..06d6a6e291cb 100644
--- a/dev-util/docker-ls/metadata.xml
+++ b/dev-util/docker-ls/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">golang/crypto</remote-id>
 	</upstream>
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index e5460e005270..7d7263114d75 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,7 +1,5 @@
 DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
-DIST drone-cli-0.8.5.tar.gz 1381755 BLAKE2B 329a73490af7dced38e5a8ca7c8799e3cec5f8f2da396cf2c7e307cf65967c7688e1d9df3484a45da1906a187edfc3d4e45c48c7953549d61cf40903c334da07 SHA512 2e42b5aedf6b4b2666da84e457a161312c59a2e0d8785167ddc272f016d5ffaf4e5964e0da4135ad459a767b16259f8905fdd222e87247ad1915cdf2f85ed50f
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
 EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
-EBUILD drone-cli-0.8.5.ebuild 776 BLAKE2B ce07a12dae83ae7bfec997a93ac3793ea81cc0f0ea3d847130421dde6382c309c60171d3e4ff18cc76844f0978da4cf1f12eac42ecf2130e954b88acd32a98ba SHA512 bf5f47409a06868fe8224dc7b056bb516fab862ea56080d02f8735a41b240236e0e4d9bac8fee38b6c8ea7234beaf43e9027423f0858ac7c1aef8404affa5912
 EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-0.8.5.ebuild b/dev-util/drone-cli/drone-cli-0.8.5.ebuild
deleted file mode 100644
index 47b322c1a786..000000000000
--- a/dev-util/drone-cli/drone-cli-0.8.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="80e17b70e6323c282a02a764158b470f42704128"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index 113661bfd2c1..38184e69e03b 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,6 +1,6 @@
 DIST dwdiff-2.1.0.tar.bz2 79224 BLAKE2B a201c300532757d293bbcdc61f91d81e3a2dcbc4847540bae278be561535b7ef2b6a191e2946b8af941f6550168893a17365e3020771a4468387567c4b3452f3 SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021
 DIST dwdiff-2.1.1.tar.bz2 79628 BLAKE2B eb024d9c0eff18de9eee4a0fcf2d6a9ef6b049286ebb7f9715ddf18d920cacaab2738f04607b358be784f9d3e1c25f279ede620d412fad026f3280b9f8ee471f SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7
-EBUILD dwdiff-2.1.0-r1.ebuild 830 BLAKE2B fcfd491914f5e8c7586e540dc516cf808567581aae0ff2faaf6973b603bc2b9623083c6b06437ee4dc055cdbd2f27dc883be3f879aa5326c91f344d35b82fdc7 SHA512 6c77029c67d10eed55166c01ca5901b99d5e3c49582e24e4de26735db4eaf993a02a761ea04b8481bdb2d1a2265032a79076896a3763ce9b58421cd91647dcbe
-EBUILD dwdiff-2.1.0.ebuild 828 BLAKE2B 229755fba9410afb1d6980504185fbfebb0947acfaae77e5a5e8736a26423001dd47e4dda331e990e12b9c34e5a640c85e4dedcaf6dea43441febb43e80f2f23 SHA512 61bf26f338405963d71edc12ae2c853546bc558a1df425f2f97f6748fac2580ed81464de51f7583152a6767064475d411c2e1799836962dac62ccc39861cd4d1
-EBUILD dwdiff-2.1.1.ebuild 830 BLAKE2B 2f0fe82c945ceb64311e42778f76f99ae617951dbd3a5bd1a28827bea0735ec2bcd3232e07668eed365971d407c410995f5dd24106a0d30a291d54113611fd65 SHA512 b44dcc809a5bfd87d7c0a42895f9da30da6776ace15eea7382741e1694b47568d3a8c8a053abfd0475536c470e1b2bed6f90c5d280bbc21fe7f6c9523c1f461f
+EBUILD dwdiff-2.1.0-r1.ebuild 832 BLAKE2B 0299a22120d753fc90df2c4237e8297cafabf916b491f85679f269da193eae89450d750b80ba32684889e5eb24cd817c3290072e56d7853fe25671460a9427e9 SHA512 9f27bae383dc6d51cf602ab6e0ddab3d31c125fadd3755e207eb7c62979b0bf0a1843e840c5fd2ea0eff209aea124e54b85f82b645311cfa0b71c9a2b1fbac73
+EBUILD dwdiff-2.1.0.ebuild 830 BLAKE2B 0f80d0d578d0ad1d2fb0c565ddb384bda81878f94bacd5b398b983b48c8ed003411748e104b926dd03f6ef2d01bb7fa9fcb2f56816117f79cbcee638a42d56a9 SHA512 eff5be39b231c56c647f5823f9c3c897e21718ef1ddef5e5a85b0cab43c34d15f69b81ec64b6f694c2f4228435b9098192bfc666766d2cfa1acf3742ec1671de
+EBUILD dwdiff-2.1.1.ebuild 832 BLAKE2B 0299a22120d753fc90df2c4237e8297cafabf916b491f85679f269da193eae89450d750b80ba32684889e5eb24cd817c3290072e56d7853fe25671460a9427e9 SHA512 9f27bae383dc6d51cf602ab6e0ddab3d31c125fadd3755e207eb7c62979b0bf0a1843e840c5fd2ea0eff209aea124e54b85f82b645311cfa0b71c9a2b1fbac73
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
index 51b8e6bcee90..b549a993acad 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0-r1.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
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
+SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
index 5fd42d0959e4..acd2c98c7343 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
+SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/dwdiff/dwdiff-2.1.1.ebuild b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
index c8e8a440ba08..b549a993acad 100644
--- a/dev-util/dwdiff/dwdiff-2.1.1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.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
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
+SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 69e14a91e4ef..dfec8b299d66 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2578 BLAKE2B 024f52506892d66d9ab10ebbd5ca30d6e9d0efcf697a38ee187ec83ece15d63301722b7c46123f5c9bc90df21e0b5634f09d47b92912c830e1d49d5692846425 SHA512 f5e4cd040ee03240b251593e4048d08b97f8f770fe3a9e6abd8dcdb36586ad7c97122eb6cb4a82cc257ef631d3cceb214b13290765ea2d901481847c79f8e46d
+EBUILD gtk-doc-1.25-r1.ebuild 2577 BLAKE2B 110bf184a66013282cfaa51032a161eb9ae5ccf19acf42024de136c20921475e6e439fa5c5ac0750e86b6b40d4ac0b70dc09a7b9a2a5bedcf7038a236c14734e SHA512 668b64a119f6895c8f03940155a01ce0fc95e1fc8c7504eb7b2b459b8b29dde8b2696ae619005214a0c29c5ce1dbb4a614cc7a5137553e37ff5d98e9e1ebbb43
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index 31a2782d08d2..155f1f6a02f9 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs highlight vim"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/idutils/Manifest b/dev-util/idutils/Manifest
index d3ba6a298974..5a1f97c3a545 100644
--- a/dev-util/idutils/Manifest
+++ b/dev-util/idutils/Manifest
@@ -1,9 +1,4 @@
 AUX idutils-4.6-glibc-2.16.patch 523 BLAKE2B 271c68c3ceb61a28330d33ff1e07beb9790cfddc51aa347a27303a06e58e1645d5e8d4ea5146f403d50947eba4999449e6252edce5919f95dec7cba0bee7770f SHA512 de4bcdaf2f871de5eeaa026ec578f80dcae73695c65fd5bc7d16a8f377a3e1781805937407fa6e9b50f8ea22a9d1a4575eeea789aa5d5fdfd05456cdbf75896b
-DIST id-utils_4.2-1.diff.gz 6178 BLAKE2B e6820490b546345c8a17d5bfeb2ccb55e91775fc045e1a604312c7937d77e9c2a393e9c81d270e11d759ceb4c2fb2a52e845c62be2effd0c56c7d81b7bf33d5f SHA512 ebeb2f3d35e21d0286d26ea6d703dea1ffbddc943c165ee6414484580a22e2883ace07b8e6670b0e90b6305f0e883fd22d8723c2c62dee664bdd8ab6a2a6106a
-DIST idutils-4.2.tar.gz 706193 BLAKE2B 88f83fbb7159ec7b36dacd539c805b749e2af81f37332a1b0a36ba4fc8cc8530aa4e64c5bd8b4f466592b7ff3d1f281c866e73f5820e25ac657867a5d8f61350 SHA512 319036d449baec65617670fa4ca17e89348f1ed5916731ef2376d96d15f3da032b25ae17234da409c6e439561ccb30056ea22ee37494fd9b196129a21607de3b
-DIST idutils-4.5.tar.gz 1476520 BLAKE2B a30db5ab96303c9ddd5d4b86c6cb2c5c5f280221150f4dc3aa8e22e32711edc003c8d055aab50b499a1c81459b6844026b9c35ee2564987f1f76bf8eb3f474ad SHA512 c5b50c15cdd92d6caf8748c3b35e9d6f2dafb41abab31d83ed0fe95cffc77e1170ac6512424d94a9a61033a99bda2961a9ab339b66078c417ea39c1bd8fe1e11
 DIST idutils-4.6.tar.xz 1001496 BLAKE2B bbb06fd0c1e585c8022ae46f2c721aef60becd512da91fc4191977cd46ecf2df86e7bc65481182881c434de6e9c740853b916e31dacedb75c1f14ae8d94967ea SHA512 830fe4a36693e9bcc8def25982c1a76decac2076165158c39858106f928c1b6ff2bb941fcce7244357c4205c2ecc945b772c9f5a083c4fedb1b75eea0af5445e
-EBUILD idutils-4.2.ebuild 1038 BLAKE2B fb15aa81e5a0dcef4bafca231425b9e12b2d9662e399c79ba10c763e1d775d2b8fa8b2a720e5cfb0370a06637206cf5b2dbe0f05c6fb6a76f73113ceadd73df9 SHA512 26a3c19299a761afe9ced2d245c2fcd0d1547bf8c260fe8b3ea9ecfa6a126c0a79353d29893b65275ca2b13503392fab44f360c32e667c10d69c1f19aa40da6f
-EBUILD idutils-4.5.ebuild 1076 BLAKE2B 44e547a6052a0fde0b590243e8fc05e662c15eef753bfff20d3edf47a8b636277700a8a7d9c79a795265f7ff0cb0ef752d14f9fab9c9916773d64a2a99c1bce4 SHA512 135ca56da2873a32d3b573a04c70a78f833e3273da746760046c48c468b5bec2ddcea7d067a1ca714320eba9d64a803273234bb17037b8d4a2f83effcd44dd4f
 EBUILD idutils-4.6.ebuild 720 BLAKE2B 51a9d40987fff4f15d50335b5c817b6b3097620a5cc8e95efff7efd93e5be1bbf23d550843eb748f13cae6d106f4094ac2d0d9ec01a3be69b94ae0f4cbc2e557 SHA512 0f35d7b81bc9b06df314b40666bc728316ad36f468f5d8cee602798beee5f960bafc1a8a151a67efa9ba50dbfd1b9b5a4ff1ad0a6786a6e9416b9eadce959072
 MISC metadata.xml 591 BLAKE2B 91443111daa5642e9fdac540aec9f5d406ddec96a3ba68b31c6f282018dd463cec8cf9a9c46c1a882bf6907780f7ac4703f088acfadd2162c845777150049967 SHA512 593591a9d4a0d3303f6b96f06a59bae0983abca6b9d0ad9e0df691d3c192cc442a39bd18bac3b87257057ebde50315dd5d6c1be74ebfaa7f21b5ee0c690e9f25
diff --git a/dev-util/idutils/idutils-4.2.ebuild b/dev-util/idutils/idutils-4.2.ebuild
deleted file mode 100644
index 4d8cd335bfb1..000000000000
--- a/dev-util/idutils/idutils-4.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils elisp-common
-
-DESCRIPTION="Fast, high-capacity, identifier database tool"
-HOMEPAGE="https://www.gnu.org/software/idutils/"
-DEB_PN="id-utils" # old upstream name for it
-DEB_P="${DEB_PN}_${PV}"
-DEB_PR="1"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-		mirror://debian/pool/main/${PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="emacs nls"
-
-RDEPEND="emacs? ( virtual/emacs )
-		 nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-		nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz
-	epatch "${S}"/debian/patches/*.dpatch
-}
-
-src_compile() {
-	use emacs || export EMACS=no
-	econf \
-		$(use_enable nls) \
-		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README* ChangeLog AUTHORS THANKS TODO
-}
diff --git a/dev-util/idutils/idutils-4.5.ebuild b/dev-util/idutils/idutils-4.5.ebuild
deleted file mode 100644
index 4f0eafd797c0..000000000000
--- a/dev-util/idutils/idutils-4.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils elisp-common
-
-DESCRIPTION="Fast, high-capacity, identifier database tool"
-HOMEPAGE="https://www.gnu.org/software/idutils/"
-#DEB_PN="id-utils" # old upstream name for it
-#DEB_P="${DEB_PN}_${PV}"
-#DEB_PR="1"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-#mirror://debian/pool/main/${PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs nls"
-
-RDEPEND="emacs? ( virtual/emacs )
-		 nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-		nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if [ -n "${DEB_PR}" ]; then
-		cd "${S}"
-		epatch "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz
-		epatch "${S}"/debian/patches/*.dpatch
-	fi
-}
-
-src_compile() {
-	use emacs || export EMACS=no
-	econf \
-		$(use_enable nls) \
-		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README* ChangeLog AUTHORS THANKS TODO
-}
diff --git a/dev-util/jconfig/Manifest b/dev-util/jconfig/Manifest
index 55d1df9b004c..27c81b5f0fd6 100644
--- a/dev-util/jconfig/Manifest
+++ b/dev-util/jconfig/Manifest
@@ -1,7 +1,5 @@
 DIST jconfig-src-v2.8.5.tar.gz 1171848 BLAKE2B 579074196d538a6e5d38c777344d646c1ed9c9bb76554421cfe7f1772fcfbcc7343f0aa444dbb5dc4a07ad9056178990f337e7dd710549ede0450c136c74db59 SHA512 c6c1af63069ccaf7cfd2fe625318fec4ed3f82671754956f8d861c3254a748bbc8a7b8e63e36cf8abc436d4ced732d8ea04f770551428b04d3078293dc77d6ff
-DIST jconfig-src-v2.8.tar.gz 1155906 BLAKE2B 8aca47d02c026ff91e9d3bf845242c6687a745786c148d920942166f26c738545a411a3389f73ffbccfcc32bc62950679c4b6f51d83fed7ad4990ceebe7c6553 SHA512 ed84e3be2334caa9a7edf0308c6a2cc07c1462235ce27c39ec180c535f163447373f82a0c9f6ad144ec16cc013658e0f23e98e2f2089c7a680d1728a812d49c5
 DIST jconfig-src-v2.9.tar.gz 1202738 BLAKE2B 09e5f869ee671028e5044988a9a27af4d6eddb919fa777cb2b08980e33670359b43a87669f28cf59f421af4381df468bb49f52b3829000d4dbddf60bbf6342d4 SHA512 fb3c171f8204bd41d7b0183707b6f524dbf27d8c82335cce5f9b4070b77ea1c86345692e533f1a6d64e0334e0bfc88f4cc47828aea6b4b56058197122c675b2c
-EBUILD jconfig-2.8-r3.ebuild 860 BLAKE2B 29b91245544c5a94c513096536373de7bf1585e586a95f3eaf8d046006880e3d3907611d41166116b46ec05cef65d3ca5a593792207e0cd6ed4193fcd8882892 SHA512 25c7f813b0e0a1f6821f29102d6da7579bd0de38ecac102c63e03dd9a6d14e74f1bbd5ff52bf7cf4b5816d770b3756d2f0d578dbf225d1bd98fd2e535c3eaf41
 EBUILD jconfig-2.8.5.ebuild 860 BLAKE2B 29b91245544c5a94c513096536373de7bf1585e586a95f3eaf8d046006880e3d3907611d41166116b46ec05cef65d3ca5a593792207e0cd6ed4193fcd8882892 SHA512 25c7f813b0e0a1f6821f29102d6da7579bd0de38ecac102c63e03dd9a6d14e74f1bbd5ff52bf7cf4b5816d770b3756d2f0d578dbf225d1bd98fd2e535c3eaf41
 EBUILD jconfig-2.9.ebuild 842 BLAKE2B 904129fc6bcbd7bb550131c61ed91fbe5626616f7f8c8a879cde4c8c0d0b5e8cc61fe185f9ba73ab0367955aacaffecb324bb1177c6ab7f2ea75536981a340a7 SHA512 589751320dde2e2ee74acac1545a7afd3430f8808de2edf5a641dd25e78390630c66978e290cc61355aa9ad08514ce75254ded91be1933b38d9978a7c58c1067
 MISC metadata.xml 313 BLAKE2B 35d3e65273f55e25c70550785fc394e3e5df5de19e450db23d40253c2384cf67e23ce9431b34d51d34c604b0d60c8926289ce409d80ed81352e6f10abe496e99 SHA512 a763cadd5e639466f136912e6a1abad023e53576ccbfc5b6b82b9ce5e7f7b173000d51d0991332dd52bff2fc0ee77963ce2e77b58c3f9ecf9701344ee4c5f2ae
diff --git a/dev-util/jconfig/jconfig-2.8-r3.ebuild b/dev-util/jconfig/jconfig-2.8-r3.ebuild
deleted file mode 100644
index 1b86b444357a..000000000000
--- a/dev-util/jconfig/jconfig-2.8-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Utility that provides a simple API for the management of properties"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN/c/C}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v dist/*.jar || die
-	rm -v lib/*.jar || die
-
-	java-pkg_jar-from --into lib jmx
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-
-	dodoc README || die
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-
-}
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index ff7b5ac2b746..e0bd11c7766e 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -8,10 +8,10 @@ AUX kbuild-glibc-2.10.patch 756 BLAKE2B 50f0f90daad8f4b93cde4e1ca458ae79c6cfa876
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 BLAKE2B 51d68203d38a6cc86a32e6c66431739a87df738e920bfc9ff902433a46279fd62c704d9bcae02f0a1cb6a1f97cf68dab059c636ebd425d2b15c50c9c9cb4fcc6 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047
 DIST kbuild-0.1.9998.3127-src.tar.xz 2221336 BLAKE2B 12eb542553c2abe4419440d124ed9c6b3c485fc77ca20bc8b8d5265cf2d91003e3bee21ad7e247f1da43c88bd29fdc5d317e42bfca213cde1ac0c900cce03fcf SHA512 b4cfca917efdb19b015a70efc15fdb0f2f08a4b6e493c7ac121dada97866b2f57cb9be9db9dd9b337eda4d5772ab850bf0586e5bfdc370e1332659363374f78d
+DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
 DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 BLAKE2B 75d24ba49ee69a11b8e1d798ebee4470fa50ec4970299faaa67b0537d21729053fa24142d02e428cb56c429c6c17d581d147d659c3a3ad11693e2fa6ab4e6d72 SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0
-DIST kbuild-0.1.9998_pre20171020-src.tar.xz 2190856 BLAKE2B 3918170fdda00ab65136da0deacfe6a2e779a8bcca0b1a565f89f367ac4d73feb8566157b7cfdf2d38beb5864f9dde1010420cf4b03ff71b455f99744096c37b SHA512 53c55a520f3711d1141b10eaeb3bec5dc57bb8476c6b658826e05dbb525eda43a0007dd94dcdde31ea39ad0bb29223ef8ad2a72da1404e53919e444039794043
 EBUILD kbuild-0.1.9998.3127.ebuild 1723 BLAKE2B e4ca9b4b61807247d39cb7216f8eb2fbb17c45c18e241791403393474ec0e58774c7c8e03a50f03fc9dbf51beed9639b37a8646f356b1d34176dd7c05e599c16 SHA512 e0943bb0d315e6673332639031c4ed0e45e8ba3b94bb5de62918bf2de96bdb14c21b6f75012f18b2cab5d90ac10b3be5a38e40457e2012a08cc068f9a2d8bf7b
+EBUILD kbuild-0.1.9998.3149.ebuild 1797 BLAKE2B 77af90d7312b90240f3ff3f03a7c16bf181b6aabb0a19c87f7618f495c7b11cc0f9d10a308da81563e58e5f46176756c8dd6510319afba5826cb5ea354ac1074 SHA512 11add83b15c24aafb276617a596a6e329eab3aed0c35b32c6da9540cada1e89e2e64d3da2f042573a2058ba680c4d3bea99ad18da65f25d46710f5760b8a93f9
 EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1802 BLAKE2B ce3518b0ab413a1a4aa3150d6fa3f13050cf49cae8fab1603da6912beba290135574570acb25fd2d7dffcfe65e54d8c9122ec1071cd589e7d5c46ec0de369805 SHA512 39d21f6ac472c67c3f0aa9e1d160444f89bfdab05bef260eac07aeef9bd464a98f1fa8ce978a47ecd47af350c0484dffbc9c0b057f4d92a9bfdbbe95627fa92b
-EBUILD kbuild-0.1.9998_pre20171020.ebuild 1552 BLAKE2B a0e04657c5729563450407dcb355e1bc5283b1a505ae27b88b199dce130b65ecb6120539dfaa7088c7216c990d88baf29b68eb78747f7170040274b0f440ed73 SHA512 738255ee317a81d0d19b9613537381a10d624325291b356d7494748071f4a494f05f6fe0b075bd3cb39d0353110d00d1ea29df83560deaece8fa4d37f817e8bf
 EBUILD kbuild-9999.ebuild 866 BLAKE2B c14fc7ecf01de63d6812800b52cd61607826a5c52efd11387b818af1c88c2d88c72992fe49490c4cd549b06d75b3487167669bdcba382d32ef3cfda756b61965 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
new file mode 100644
index 000000000000..457775ebe06b
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P="${P}-src"
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/yacc
+"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-unknown-configure-opt.patch"
+	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
+)
+
+src_prepare() {
+	rm -rf "${S}/kBuild/bin"
+
+	default
+
+	# Add a file with the svn revision this package was pulled from
+	printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
+		> SvnInfo.kmk || die
+
+	# bootstrapping breaks because of missing po/Makefile.in.in (r3149)
+	sed '/^AC_CONFIG_FILES/s@ po/Makefile\.in@@' \
+		-i src/kmk/configure.ac || die
+
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
+	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+	tc-export CC RANLIB #AR does not work here
+}
+
+src_compile() {
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
deleted file mode 100644
index 612e8ebbab1d..000000000000
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools toolchain-funcs
-
-MY_P="${P}-src"
-DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
-#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/yacc
-"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-unknown-configure-opt.patch"
-	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
-)
-
-src_prepare() {
-	rm -rf "${S}/kBuild/bin"
-
-	default
-
-	mv src/kmk/configure.{in,ac} || die
-
-	cd "${S}/src/kmk" || die
-	eautoreconf
-	cd "${S}/src/sed" || die
-	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-
-	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
-		-i "${S}"/Config.kmk || die #332225
-	tc-export CC RANLIB #AR does not work here
-}
-
-src_compile() {
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
-		|| die "bootstrap failed"
-}
-
-src_install() {
-	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
-		|| die "install failed"
-}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 2b9a349adbc5..650834c0e45d 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -5,6 +5,6 @@ DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236b
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
 EBUILD meson-0.45.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.46.0.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
-EBUILD meson-0.46.1.ebuild 924 BLAKE2B a28ab9bc203e3c090b8504afb6e77cc7d1b3ea65068f99a011aec4f8855b3bfa587908b4da501f0ab1675c4f60b252188582166e8974bdfbfda98ee10c8c73cc SHA512 32859679d76f6e53ce6482058577d4f022c3e8966b519a3aa2614082720569c9449af18a4a3628a5c05bc67bfe41f9713a6abd16e09974eb55417959bdebb1c7
+EBUILD meson-0.46.1.ebuild 923 BLAKE2B 6d7723e1e6e15cc53032b367aaae44309cf0a5963478802db2d438d3673b0c07363ac552603594cd76be254e8b24905ccef4ee01eed0871e36c3d98c6af6dcc0 SHA512 358f2c36de1dd29ae5afe3cdef73260a1feb89afb2ded1634ca5764eaf7b924736b27ee923e452db27a037d3d9a4853c9f99107b2c7df89cd5bfc85bae14ae3a
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild
index e359d174f2d7..239b7fce1856 100644
--- a/dev-util/meson/meson-0.46.1.ebuild
+++ b/dev-util/meson/meson-0.46.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index f1ce0ee64896..719a5ab22485 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -5,10 +5,12 @@ DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4f
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
+DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 BLAKE2B 3cd45f806009b7ef888c59c566af037109d20a6a4f5306ff6a6187266cfba019575f94c35df3780377a437074d630edcc88e3c4c3510a2511a27808f4d7d1012 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e
 EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf03bd7f14626ef49e505144ef9864aa88c7130878dee1896e0b0fbffec5b7815a4f753c1b5a71e4582676efb03aa62c0663a SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e
 EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
 EBUILD nvidia-cuda-sdk-8.0.61.ebuild 3803 BLAKE2B bb1f549d41e64984e8b3ae629461f3bc616bb776324fd2d29e529a66453bb2304c8ad6d397e7c5b790d759455869b88f9796bf12f760a2816e651caa85226480 SHA512 91ed589b1841b6069e24ea8fd12fc55d73c7bca0b33cd6b7b37746fbd3c896ce8224a5622b7750720595d1f36a7daecc3661612148f58e6e6e79028b2a0333fa
 EBUILD nvidia-cuda-sdk-9.0.176.ebuild 3802 BLAKE2B 721ae934544eec47b19fb1eaee6109fb9bd1ad8ee79a38ee4d9d28a6a00891badf8b2c24c11160c4803c0aa9ff375348fd897d3fb396355853013e03290b35c9 SHA512 ce2afcc297f62e9ef965ec0ad3344286a9df85ec84bc512872e5e7897c07993431ff21eb36e34aa2b5aed05f4a3f107f869e979bfa09cffda035de77c8d89983
 EBUILD nvidia-cuda-sdk-9.1.85.ebuild 3798 BLAKE2B c10c6cd7aaef1b99089f36d319f7f5375fb117c3f8840fc367c44368a7cac7366d54f377c9d775207dec61d0ca67885ef2ba61a70daee4d5326453dc7e831f71 SHA512 e5c37b2319ffd7d91b4d24721ffbd4617aec28924ebef86ffd44d7a3de2eeebf726a6bf518cad195261e485f7fc8d4850565ba83186026962ca9d49e49bfdddb
+EBUILD nvidia-cuda-sdk-9.2.88.ebuild 3791 BLAKE2B bd1fb4d0c9cc42767ac113097f768fc0e944eab1fa4ee8384bb5925abdad0d29b878abdf205c68216b3612451f6e627c40722013be4749c3ac9cc33314290860 SHA512 4ad0d53e6a7c33f578e5e5daef71f3bed147bf2083ee641f72baf62718655b54066088c2c371eb493924d996edbfd522feea3b8497adccdcef50a845c4c8b77a
 MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild
new file mode 100644
index 000000000000..c37d95782497
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="396.26"
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+cuda debug +doc +examples opencl mpi"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew:0=
+		>=x11-drivers/nvidia-drivers-396.24[uvm]
+		mpi? ( virtual/mpi )
+		)"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/samples
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_unpack() {
+	# We first need to unpack the cuda_${PV}_linux.run file
+	# which includes the cuda-samples*run file.
+	unpacker
+	unpacker run_files/cuda-samples*run
+}
+
+pkg_setup() {
+	if use cuda || use opencl; then
+		cuda_pkg_setup
+	fi
+}
+
+src_prepare() {
+	export RAWLDFLAGS="$(raw-ldflags)"
+#	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		sed \
+			-e 's:-O[23]::g' \
+			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+			-e "/CC/s:gcc:$(tc-getCC):g" \
+			-e "/GCC/s:g++:$(tc-getCXX):g" \
+			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
+			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+			-e 's:-Wimplicit::g' \
+			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-i "${file}" || die
+			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
+	done < <(find . -type f -name 'Makefile' -print0)
+
+	rm -rf common/inc/GL || die
+	find . -type f -name '*.a' -delete || die
+
+	eapply_user
+}
+
+src_compile() {
+	use examples || return
+	local myopts=("verbose=1")
+	use debug && myopts+=("dbg=1")
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		"${myopts[@]}"
+}
+
+src_test() {
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	local i
+	for i in {0..9}*/*; do
+		emake -C "${i}" run
+	done
+}
+
+src_install() {
+	local f t crap=( *.txt Samples.htm* )
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			while IFS="" read -d $'\0' -r f; do
+				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
+
+			while IFS="" read -d $'\0' -r f; do
+				docompress -x "${f#${ED%/}}"
+			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+		eend
+	fi
+
+	ebegin "Cleaning before installation..."
+		for f in "${crap[@]}"; do
+			rm -f "${f}" || die
+		done
+		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
+	eend
+
+	ebegin "Moving files..."
+		while IFS="" read -d $'\0' -r f; do
+			t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ -x ${f} ]]; then
+				exeinto /opt/cuda/sdk/"${t}"
+				doexe "${f}"
+			else
+				insinto /opt/cuda/sdk/"${t}"
+				doins "${f}"
+			fi
+		done < <(find . -type f -print0)
+	eend
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 1604b38184c3..1f82dad5e612 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -8,6 +8,7 @@ DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4f
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
+DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
@@ -15,4 +16,5 @@ EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3311 BLAKE2B f9dc70a5ed6c7ba920d07e4b32
 EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3361 BLAKE2B d43051ae9eed5138e952b22159035f8557e8b5cfe0b7c0bdc411b389e60a0db9ad1f890e5c8a0159689aaa1fa06abb7a8c843c6973cd2204a6fcbebd8a0f89f0 SHA512 b98d5b85eb4405ba749061b7d228f3e86057592283a36f189eda2f1d859b2e1e55c9c6c1444e9521ac699ab8bb7b6f87a8e2457a5fe5ca85cc13043e59cdeb33
 EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3368 BLAKE2B 8782b66dd08834300b4f3935544d9e3263725b3e04774bce75c55c174052d0203cef71a94df974b1cf0fa943da76137931d443e20d9f0a733db9cec18d6f3aeb SHA512 719b65770838e7497abcd39f318773d049339cd5e1335a58a7d873c4112edf85c670ddfd9544bbaa1a6f31501e1c0e699f88b9ad3d6f0409990ed7b7ce803c4c
 EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3345 BLAKE2B af1bdce7f452973e1addfd4881abf937dbb17e8ac946e496148805dd8407b3f3485ced3487334779d6d536fedb294a3eb9241f90920bce4529256bb94f4987ab SHA512 9adef55be28117a0875704cbffb4975ac99674b3dc608909e7c5978b53f558c21049454589a5e8624ca12d6ffe4308cdf1839380ad1569955902659d0ffab7a9
+EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3347 BLAKE2B 8b438d0b64b91ad20d293662e7fc1eea788155d7e90bec0746d4a4369cfb5311eb5692c2cf77c24f49d90a6d759ee8a0681635b5de385bfe7543724eb3ba203b SHA512 6a5f413ceee79a2d1a0fbe58bf697e6f6b27bc41608f66155462efc55e139cb5356c28894c7f24cb52c98b47161e8f023b713d32306183d3fcccc14452ec89e4
 MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
new file mode 100644
index 000000000000..de825e179c3c
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs cuda toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="396.26"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-8[cxx]
+	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses:5/5[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="3500M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight )
+		remove+=( extras/CUPTI )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -rf "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	mv * "${ED%/}${cudadir}" || die
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(version_sort $(cuda-config -s))"; a=( $a )
+	# greatest supported version
+	b="${a[${#a[@]}-1]}"
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		! version_is_at_least gcc-version ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
new file mode 100644
index 000000000000..05157ac3dbe9
--- /dev/null
+++ b/dev-util/ostree/Manifest
@@ -0,0 +1,3 @@
+DIST ostree-2018.5.tar.xz 1937184 BLAKE2B ff126d2963296eb9ac270816efed7d2fbfdbcc7b0dba69007ae83e4499a46ef21a5b4e5d387de9bd387af0fe8d4086427d1aa9043c246a49676d116e919a93e6 SHA512 03854c662cddc1e0c7150bb62bbdd2990cf091ef126ddc5bb94494fee2ffb0383afb067b89d63c3e4f39849e2c8b7cabfd887d0d6fc1e7a43fda4fe7da1dc2e8
+EBUILD ostree-2018.5.ebuild 1183 BLAKE2B 749134dbf4e826fd6535cdd94ff66704d136404a1864d8dbbb7bf075cc42d89bd7091100d31fdc0a81b13aa452075c3ae3f4c6fe9d4931ada5e20a6a9d6cc65b SHA512 f1bb169d68fc6658b986b6d443537e6e1a7a05386588a966de08ef9c6da370524abb11ce6b8b95e94a7eeec7cefa4ced461526ffd8abbb1ee123457cc5de02f6
+MISC metadata.xml 1644 BLAKE2B 3085135779d4dbefb278b1b7ca4e80e4b892f38585aea5a71fde726d55b9975c0c097917940045a0770a5d8bc2c3732a371773a8cb6750dd272ca0b4a9488182 SHA512 5fb6f77a5068d1ff4aab1635ba41ed895f6b31cce39b571b4f3487c68242bb5634e7454bce318d0c585cb581533d1fe239344a9eb7f1485c4b75a5a24d78f5ad
diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml
new file mode 100644
index 000000000000..d31a82267686
--- /dev/null
+++ b/dev-util/ostree/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<longdescription lang="en">
+		This project is now known as "libostree", though it is
+		still appropriate to use the previous name: "OSTree" (or
+		"ostree"). The focus is on projects which use libostree's
+		shared library, rather than users directly invoking the command
+		line tools (except for build systems). However, in most of
+		the rest of the documentation, we will use the term "OSTree",
+		since it's slightly shorter, and changing all documentation
+		at once is impractical. We expect to transition to the new
+		name over time.
+
+		As implied above, libostree is both a shared library and suite
+		of command line tools that combines a "git-like" model for
+		committing and downloading bootable filesystem trees, along
+		with a layer for deploying them and managing the bootloader
+		configuration.
+
+		The core OSTree model is like git in that it checksums
+		individual files and has a content-addressed-object
+		store. It's unlike git in that it "checks out" the files
+		via hardlinks, and they thus need to be immutable to prevent
+		corruption. Therefore, another way to think of OSTree is that
+		it's just a more polished version of Linux VServer hardlinks.
+	</longdescription>
+	<use>
+		<flag name="grub">Enable grub configuration generator</flag>
+		<flag name="soup">Use libsoup for networking</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ostreedev/ostree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ostree/ostree-2018.5.ebuild b/dev-util/ostree/ostree-2018.5.ebuild
new file mode 100644
index 000000000000..3c2aec24a4af
--- /dev/null
+++ b/dev-util/ostree/ostree-2018.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/ostreedev/${PN}/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="grub selinux soup systemd zeroconf"
+RESTRICT="test"
+
+S="${WORKDIR}/lib${P}"
+COMMON_DEPEND="
+	app-arch/libarchive:=
+	app-arch/xz-utils:=
+	app-crypt/gpgme:=
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	dev-libs/openssl:=
+	net-misc/curl:=
+	sys-apps/util-linux:=
+	sys-fs/fuse:=
+	sys-libs/zlib:=
+
+	grub? ( sys-boot/grub:* )
+	selinux? ( sys-libs/libselinux:= )
+	soup? ( net-libs/libsoup:= )
+	systemd? ( sys-apps/systemd:= )
+	zeroconf? ( net-dns/avahi:* )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf \
+		--with-crypto=openssl \
+		--with-curl \
+		--with-openssl \
+		$(use_with soup) \
+		$(use_with selinux ) \
+		$(use_with zeroconf avahi)
+}
diff --git a/dev-util/peg/Manifest b/dev-util/peg/Manifest
index f313d297bec8..646d86969700 100644
--- a/dev-util/peg/Manifest
+++ b/dev-util/peg/Manifest
@@ -1,8 +1,5 @@
-DIST peg-0.1.13.tar.gz 55352 BLAKE2B 9b97304333d0386d7011a76638f33dcf5ce5753324a996163c5f66c770f1d67c50f96351e4947065af1e28e28300d8d26e8bc04b2d5b9e8562e6f3f3a82aa3a1 SHA512 fbec192daef2c72511cc17e6f7b301ac48d20746ac9843d61c05e8a069633c5fbc6d92155a94aad5094dc84a2f1bb92bc2b2aabaf6bc563d4401460f1047b3b0
 DIST peg-0.1.15.tar.gz 56522 BLAKE2B cfc13761d4f3de3e4906abefc04fb732e7f30e0a1eb70dcab79de6001434866329cb4263fba68a5c8aac9dd895805d0de43dafa5a9e382c4c2e12fe90189676e SHA512 70b67d57c866c24cc9ceaf029e95bacba56def7ccb289233e3816c1f6f1f210dd8a729446df94d0424b5946959dbf9a33f81a5a95f7563a9dca460d6e2320018
-DIST peg-0.1.9.tar.gz 38485 BLAKE2B 088520a98609fab2b3b419c6f7875daa20b7a3da65224301ee48b37494569f52dc1e574df503c6b53d63ebe250033e586fc91f615e1173a10b126c267bfe8816 SHA512 73d0776972243ca8cba348b63252dee837308df6d6b00d2a186396545b80cb798e3280a9af6a71d51d9ae8c381a518502f96cf3d0d651bcf0f2206276f29ed1e
-EBUILD peg-0.1.13.ebuild 803 BLAKE2B 24168f3527b851881bd0467f24ba4f388b9c2418b0badabda4c0668b0b8911c4ef75da407662e3e3d0ebe4454f09050687da051f6bf1b2d8a725c77c70270a78 SHA512 f96ccd15b32243ba527d3d803a898d416ae49b5f566415e13926c96b9e7724b24453eb839b9c1923f9f052c316ccb2ff476dd13dea78f5b3088236131ad58b0f
+DIST peg-0.1.18.tar.gz 57776 BLAKE2B 3266db2009073ee95a7fe65f3969b06001669dca095a8b77cbef3293557f9919872b44b348ff3de53cf8a132fd414c265bf0da3f77f0da0391d6d53cf4ab9217 SHA512 ca2fb9088bf87955adf6f883370ddb7d5f6f3cae3605a871094317205a124cce4f7b9f83cf4662cb470e2c5a6977608b456eb1fad98022d7e40fc384d1fec0f8
 EBUILD peg-0.1.15-r1.ebuild 896 BLAKE2B e286cf9cd51c9e14563528a27635b4fe4f0779aade712d782a2017f36de303866c0026a0f629e4bfa8185a640165938c0948f1406af94a9a60bf3a546f3d0a9b SHA512 21b10c4f565e3dd927f08e3e4a1aa70cdd572ce8777e74dc069dd830d813abb5080127d2789e91e86d5048217c94663090a4c548ad5efeab595f34200fabcaed
-EBUILD peg-0.1.15.ebuild 743 BLAKE2B 1dc373bc61b005c5ebc46b40c4d751073a2a34c7cd4a18154096a5095ccab51298c5e77917f000549782712840a1c23519de7eed0dc3e45f4e133fe98eaf4091 SHA512 f251edd6def3e93edd4e7e8a0c776e961ff49cd0d1b9062b72061379dcf83033c2b4b2be69c7bc041d951774e3a70a10faee31846b42e1d3eda01ddf27e73ef3
-EBUILD peg-0.1.9.ebuild 757 BLAKE2B 8f00cb6034c6690c9218b53d3857a364dbedb2bc04c6edc974320dcb87c1235e08aa2fefc222a8a3feb9f4ede6c330fc7bba4fb035c65da41b62cd438ded498b SHA512 eb565ee8b4a0d113dc4bdfbcbdc9f4473482b36eb80c811a7dcafd42aa60f12d6145bdd0b21d4a6e8a345e70eeae3d60f2b842b2f2470f68975ea9663e486f73
+EBUILD peg-0.1.18.ebuild 870 BLAKE2B 85683a921523c9b1c83d40f97da4d7b6cff4e152c87025f0bff948c751f3e5003436d5ce783ca636f3688178cfdcfc889642f56744f2f131d886ef17bb9e33fb SHA512 ef827b7ad368c5d0bce2de6731443366b47d6154ef0267581e668f5389940c84075b9a3f5e4da6b758694288a7a8631a841c206155ff8f94f47e7cab872fd2cc
 MISC metadata.xml 257 BLAKE2B c4675d1acb1e5dd4987811e68c4e4b23d7476dc5d5a1c90aea425f43e9f92261fea544c0fe3bb2907b43a47db5a340abce8b8b0e9b777e79a9811a7d5d96dc9f SHA512 7c68096d12fdee234074ad1256cb5075513b3a00795138a18a70003d8498c9418664d4f62772647e090796ea6b9bda9aeeac1e74c271773efa42568aeefde301
diff --git a/dev-util/peg/peg-0.1.13.ebuild b/dev-util/peg/peg-0.1.13.ebuild
deleted file mode 100644
index 9d17112ee19a..000000000000
--- a/dev-util/peg/peg-0.1.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin" || die "mkdir failed"
-	emake ROOT="${D}" PREFIX="/usr" install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/peg/peg-0.1.15.ebuild b/dev-util/peg/peg-0.1.15.ebuild
deleted file mode 100644
index 69f02c21d1e8..000000000000
--- a/dev-util/peg/peg-0.1.15.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	dodir "/usr/bin"
-	emake ROOT="${D}" PREFIX="/usr" install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/peg/peg-0.1.18.ebuild b/dev-util/peg/peg-0.1.18.ebuild
new file mode 100644
index 000000000000..3853be968a49
--- /dev/null
+++ b/dev-util/peg/peg-0.1.18.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Recursive-descent parser generators for C"
+HOMEPAGE="http://piumarta.com/software/peg/"
+SRC_URI="http://piumarta.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	eapply_user
+
+	sed -i \
+		-e '/strip/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/$(CC) $(CFLAGS) -o/$(CC) $(CFLAGS) $(LDFLAGS) -o/g' \
+			Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dodir "/usr/bin"
+	emake \
+		ROOT="${D}" \
+		PREFIX="/usr" \
+		install
+	rm -rf "${D}/usr/man" || die "rm failed"
+	doman src/${PN}.1
+}
+
+src_test() {
+	emake check test \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
diff --git a/dev-util/peg/peg-0.1.9.ebuild b/dev-util/peg/peg-0.1.9.ebuild
deleted file mode 100644
index 6f8f2b50b211..000000000000
--- a/dev-util/peg/peg-0.1.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin" || die "mkdir failed"
-	emake ROOT="${D}" PREFIX="/usr" install
-	doman ${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 8f64eae41896..6a49fc90d1a8 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -16,7 +16,7 @@ EBUILD perf-3.12.ebuild 5006 BLAKE2B 7eb7939628a49ca9dadf7c4a223184b5e4da478fef6
 EBUILD perf-3.13.1-r1.ebuild 5128 BLAKE2B e34cc28ba57866db83fcf9ab639e95306582c66fd7ce427543b19528d72fa78757721efc0ac1b23c6435973766fa4619e5f6448bfb21a6c50cc01cca2a2c3859 SHA512 f7ce04b5f4a4db657dfeb6b59d70c15cfb012ce661a62620773607ee93d5becfea56912dd9fae88db47a9f42ade6ce0ed0d0ba67a3fc37b086eda0e9e87118ab
 EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f02cf9201e78a5d6bcb4c18d645ae4bc8e584237ab738a1739f971a2ae62faf950d8bbe9845f02ad878aab84 SHA512 9a56717e87b9bf6bfa27f3d953e41af18c55e92020fbcc14fd01f43835e542bf1c7adb195387400c955706f5ca8a69090e41d6edfb728717910cd19b801d6dfc
 EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
-EBUILD perf-4.14.33.ebuild 4943 BLAKE2B 59e7d995374f472c9ad91ee43d4c792f193f81dafe14f6fa201115da9938cfb6f9d711b50f9b39e44b9f7a72c479b023b13ee1eabf5f1e932f4ab7140dcee976 SHA512 49832af181b35887504ca047ef7225444f85435e4f91b59f4cca5a982ca9c066e0226f49b99f13c578aae418e93a0ffc6087d20cd18c16062144dd8ab56817ff
+EBUILD perf-4.14.33.ebuild 4950 BLAKE2B f4b86b4fc45dbbaada34a9cbf463dd68675ea74ab93794891eba66e20869e931c653d5e20e6cbf41df035d49a2b5aa298eb08829f2819c0055221d134e2cd353 SHA512 a4a6323f62c46cfcf1141a41025609f8eb990978ca9a3f77be65f1c5913a84a733ad3c16d8e65fea8728064d15308a3d99f20a859364dcd3b3eef58747fec2ef
 EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
 EBUILD perf-4.9.13.ebuild 4925 BLAKE2B 919acbb8b5bc86a8cc0de41f963e87a85f16d7ba3fee026adab0c29ac5a46c8846fd102592576f0efdebb379080bf1580babfb0bc23729ea386ae3cc7ba3d634 SHA512 750501145fd525bf5e973edb7f4645cf0cd94c3449ae859ffcc33896e8963db8e573248893441de971248af2842fa18df9222704b5b92880a356e8656776a597
 MISC metadata.xml 1093 BLAKE2B c10db12ae6c05c68b06dba1112b3c899dd40d2d35f8ff8f2bc840c38e712571256b1ac49d90983b4df6af5806fc93b59bbb86e6d851d197539e776d60da0d7da SHA512 5c83c9c871c23eda63760d4b33b549849236d1f79edf4a69bbf2803987cd6db9c3f5dd8abdd216abacce91c93a589a9487e911d9ee1f57a9fec761f7e39beeef
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
index c7290b313e2a..609530402717 100644
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ b/dev-util/perf/perf-4.14.33.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 9e2961af42cb..0d353b8d1bde 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,5 +2,5 @@ DIST pkgcheck-0.5.3.tar.gz 80896 BLAKE2B f396d14c95f8b9eb652fdc3073be942bc271f67
 DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
 EBUILD pkgcheck-0.5.3.ebuild 1208 BLAKE2B a9a4d89c04ec512be71d2adff1638f6d2daec7b929da8d2fc719fead0337b4e4a58e7b1a80544ec025af96edd8c05396fe4984db5c33ecc79b48f8763cf0e8cb SHA512 5f88cbd4c3162a3e6cb02e8710464c10384268564428b4dc713f9b9d122909e8cce9ed086648c5238a1b1c6092d78abbf248e72b764818b1bea687f3886706d5
 EBUILD pkgcheck-0.5.4.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
-EBUILD pkgcheck-9999.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
+EBUILD pkgcheck-9999.ebuild 1247 BLAKE2B 8da15077358e5e18dc8caf985d2e9930a7324512c82f52053cb4926789562d0624d7b393bd16fcb9d32e758b5f4b3573c98e070f2a2b3d5b369f84da00e5335b SHA512 8209da6dbc589c4e4be06678388cb9050fe00046381eb7d606a00249e17c6e549cd8347677216bce762c8092e769404dc04cc98937463b18b805e70befff5788
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 6a4fce0ea524..2b1a33742b3b 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,8 +1,8 @@
-# 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,3_6} )
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -26,19 +26,14 @@ if [[ ${PV} == *9999 ]]; then
 		=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.7.2[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.9.5[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
 fi
 RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 [[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
 
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
 python_compile_all() {
 	esetup.py build_man
 }
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index bce25fde51b6..b21efa52806b 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,10 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2017.3.3.tar.gz 279677180 BLAKE2B 373276332c918a325290e9ca0fa37ac7512025e0c0ee8149c3c08321b0477a0a5263fc24dece443c471f2a96a1b147153b0952466e374acf62389e1c49a1f114 SHA512 d4e9dffa7d2abef825fdbe7ce2665e2d249b18d81f7dab5051a0a2fda7896e5df7cce16e19518225dd23205c346df8fc5c5b3cb39280886004340cba60aeacd4
 DIST pycharm-community-2017.3.4.tar.gz 279847033 BLAKE2B 451540aae6434f39a94a664d4aa8747071c9c045793a7d445bf1acf4c0412309448b9e05b01c7e86d5b6915d144cb5175956981597d24064b2a7f934bd043bf3 SHA512 0478ca55a0dbd45b54c3d1af45a6cfdc562f0a863e3fe09922421ed121e22f5182c71fbc05b0e9fe7a8e92b197f6ad473da34b30b867297690d7bd9df5fda730
-DIST pycharm-community-2018.1.1.tar.gz 264905980 BLAKE2B d769c1038eb08ce50c93091a435138e30f0b1ff725c59a59e8bcf0c14825b46448856240841f017a24b1c32e501f1282c77716a59ef7841c87fa48d322f16d03 SHA512 c5b9b14b4ef887a242c018f1eab445d756ca96a894f193493c24819e36bc86a734b3a8bf8d540dce5b915a0157fd56acb1f1755bfe0846da218cf3c7f1a2b28b
-DIST pycharm-community-2018.1.tar.gz 264891672 BLAKE2B 4fc85276f1e214ac4f03c11593dfa4e9d50bdca043192816c5bd4f768df436c83ec723683315e8b3558a7129542e371c47945e531d977567e8d87f78b412add4 SHA512 41090a3973a19a53440b68625a1dd448e5c92b07813ab8497478867a06d0b847668db2e9bb179caa967fdaac914073a43fa6db5ec371cc17c491f9614a2ce600
-EBUILD pycharm-community-2017.3.3.ebuild 1046 BLAKE2B 91c20e6afe384e069c14f4650d2c8082a9994c55db770fb21b1ff5490da06a6c342ab4ab537c090689e76ba0e4d697a0cbf349e6fe6b2105fb5d197ccd5bd566 SHA512 44adaaf25bbde27c7170dc818bc7a8b93c597fa0d84b7edc48f53209771467afe1b3c73be60f3b118a2a10e434b790502cd837633efa3c4c5fef466094d2c06c
+DIST pycharm-community-2018.1.4.tar.gz 271284732 BLAKE2B 806fb3774f08cd94ea525a3e3a6de3b1a17f1340e093e897ab185b7e08a4f389b627b5f3b5233421ef6c1468f36ec205bfaac73f3b8f151f57c23f0ce44ad3ea SHA512 00040aa0f6d6cc60837277c1413b155b82ec580c6619d425aeb8c50521c11c17654549901a3c324d335d8818120e1e9e730ec03a03722058aa1064685e17cbce
 EBUILD pycharm-community-2017.3.4.ebuild 1046 BLAKE2B 91c20e6afe384e069c14f4650d2c8082a9994c55db770fb21b1ff5490da06a6c342ab4ab537c090689e76ba0e4d697a0cbf349e6fe6b2105fb5d197ccd5bd566 SHA512 44adaaf25bbde27c7170dc818bc7a8b93c597fa0d84b7edc48f53209771467afe1b3c73be60f3b118a2a10e434b790502cd837633efa3c4c5fef466094d2c06c
-EBUILD pycharm-community-2018.1.1.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
-EBUILD pycharm-community-2018.1.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
+EBUILD pycharm-community-2018.1.4.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
deleted file mode 100644
index 5afd45d5ad93..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.1.1.ebuild
deleted file mode 100644
index 4cba69da5984..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild
new file mode 100644
index 000000000000..c37c85ebc8eb
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.1.ebuild
deleted file mode 100644
index 4cba69da5984..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 95ade0e271bc..1aa33e02d632 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,10 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2017.3.3.tar.gz 356063034 BLAKE2B afe45081582983c05590602ed10b66ee687bd3ef4995bb0ae0404dddefe795ff8e93af2ac384ffa37600f2eebc882fa1bc6de8b6831341957ea69bda4e4632c3 SHA512 1e6d9fc1de13ecea5f4a2cf5bd9f2d7116a40802c24cf21ac731183d4b20aab480e34e039f1ca2fa36b4d873c85204febea975392d73da5a32f239037c7bd59e
 DIST pycharm-professional-2017.3.4.tar.gz 356283723 BLAKE2B 3d2abed57f0459e49034a6b081c69008628ec8a16322ce90e15e0a42c670554ea4eca66b73279ea0f9aeac116dc86e8d52590861d712ccdf93d2be31c2d1211e SHA512 8adc3c46b50c4ed895d0d40b0c235a047fcac7e4ab5262aa88ba69deffa9402b652bc69ec1ee3d7682900698d14bb2ecb7f82a89f998979c009fcadb98ef4517
-DIST pycharm-professional-2018.1.1.tar.gz 343686899 BLAKE2B ac177856ea754bb30561d117925363b9f0dd435187500814e0879ff02c4410280ec6c1a19082e10ec02aff0c0779c7c39b8d95f5ba52631b82378c686bc9d6e9 SHA512 1fc149ac269ace8cdf2fd1154ec9603d740271f867c1934d2fe80bd13f903abdcc23c1b1190cebf8fc83ebbe10c5ba1f4c71d309f528d911ea499cdb1a1f4a5c
-DIST pycharm-professional-2018.1.tar.gz 343431274 BLAKE2B b88ccc821a2e7d35bc2d19582c69493f23bd766c338c2b2964cc0c4993d308783245daf9d6a09fae5206c0d0eee7e1048fb265968b51f614ca4dc9c55c58a2c7 SHA512 a32069fd846e328caa1c0acae3821f73ce98f5268ad934e276adca5ff39371b017f2ce1246e808692fdce8d174f8191fd7c12ef893d0976262059df25e58f3c6
-EBUILD pycharm-professional-2017.3.3.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
+DIST pycharm-professional-2018.1.4.tar.gz 348483306 BLAKE2B d03950a8d91c726f175c51fe512fdedef32a26fc39881ff4651ff09f277e9b7b3c053754e391c760856507b64b0a57128092a9fef5b7d2ab5fbfaac47f3216d2 SHA512 e45623fc0127a5f919015937853a4364344b01f586d5a63cf3605f0eac773228f02326c0714e2c25eb490431716f2b794e191aa01149a07ab87c067f1ff3ce3b
 EBUILD pycharm-professional-2017.3.4.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
-EBUILD pycharm-professional-2018.1.1.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
-EBUILD pycharm-professional-2018.1.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
+EBUILD pycharm-professional-2018.1.4.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
deleted file mode 100644
index 71fdc968f972..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.1.4.ebuild
index 5dc7e67e051f..5dc7e67e051f 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2018.1.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.1.4.ebuild
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
deleted file mode 100644
index 5dc7e67e051f..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
index b356f5c3d4a1..6094ad80bb9a 100644
--- a/dev-util/reswrap/Manifest
+++ b/dev-util/reswrap/Manifest
@@ -1,5 +1,3 @@
-DIST fox-1.4.12.tar.gz 3922769 BLAKE2B 6a38a79d821928d5ec860f9684e998581b9a03855245c860b6d05014c1a7ad6d0399aa3e128151c402e720fbf16c5538a429c4c20b90edf49f281bd1b10d3ff6 SHA512 aa2accc25fc740c4959dec5ebb87b86afb035e65636986a220e3d43582da3aabaa2ee8ce9acc2c043fb530c12fc0f0806c06ff75155afc47e7dc783bef44d8f7
 DIST fox-1.6.40.tar.gz 4353981 BLAKE2B f024341d12a9ab0e69284513e0500a0448a66f112a656cfbaa700720a4823f8a13fa81752ed90b843eb27f72bd948ea3fd7ab106e9fb57fc43c728aefcfc88f5 SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b
-EBUILD reswrap-3.2.0.ebuild 595 BLAKE2B 79f49c63d55bdd4adb9cbac9c14d104f660c14065c87c19a64080afbf6ccaf81b39db903fd487d02f1d0b53565a366287cf11706f9ee33bd52ade724de93fb8f SHA512 80dacf4b971136d3015ecb4478887a13d548981ac6c9a01807138d26bb22718fc97931ca148d5ac182da3866dd35cf3a2f620fae0472feb42526c0d63a6d0977
 EBUILD reswrap-4.0.0.ebuild 592 BLAKE2B 464b2ad09bfb917f5b86d6c88331c6b50e332c45e30698b44b7eaa35596a56deba85bcb32a068bc2add3fc2e4829d44e585458a72c6172366ca9035750d6b322 SHA512 c8c18bad64210a5e94deb89421737683d442b55780a3ac29aa6beed25601f70298d58790a287e6cfd6f35443441c6c3178656f653a247fc54f4322fdc4dfe4dc
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/reswrap/reswrap-3.2.0.ebuild b/dev-util/reswrap/reswrap-3.2.0.ebuild
deleted file mode 100644
index aad5b12ff0f3..000000000000
--- a/dev-util/reswrap/reswrap-3.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-FOX_COMPONENT="utils"
-FOX_PV="1.4.12"
-
-inherit fox
-
-DESCRIPTION="Utility to wrap icon resources into C++ code, from the FOX Toolkit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-
-FOXCONF="--disable-bz2lib \
-	--disable-cups \
-	--disable-jpeg \
-	--without-opengl \
-	--disable-png \
-	--without-shape \
-	--disable-tiff \
-	--without-x \
-	--without-xcursor \
-	--without-xrandr \
-	--without-xshm \
-	--without-xft \
-	--disable-zlib"
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 77394d1034ed..8a8d5463d2aa 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,9 +1,7 @@
 AUX schroot-1.6.10-cmake-add-additional-regex-tests.patch 2283 BLAKE2B bbdf631d09fa45c0befdc31c33b821fc5cfb1cc282bee28913a3fb7cc7f48908199e2c16793b3611c0c1287979f78b0d90c03fc1baa22e221d2a57ecb828eb81 SHA512 e68698dbace2e79c9e89525f22314fb75a42568cbeeac570334956b14051ed8dddbdffb3bdd769f77a6609159377a64df7de5041aff7512d100bbdd72aa6d4c0
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
-DIST schroot_1.6.10-1.debian.tar.xz 27108 BLAKE2B ee4f35767975f2713053c6aae9c1ccb472ef541a3a6d9c335a8a8cd923dc90b78eb45bf1fa1ece590cee94e0d629e0365cc592ec8e966bbdd7f0c4414f55b80b SHA512 2b989054485f397c7de4f9d5e625f2bb2d4738ecb087ff83903a247696a2c98dea611e9743d4ae6bee401b122c21aac4f5e220b5e544f9968f94d6f326fadfa6
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10-r3.ebuild 2930 BLAKE2B 2d5d19a149d394f3a773189d0464ea9f7446b1668957559f71403fe0178b03cb9bcf026eb9ee41d093a9fddba8316bc0f2a9a5129899d3d8a9470603e89e6171 SHA512 cbec9893b42377c72674632b4bc4774c4def3ee0834d863c82ea27435822805b5d52c07f845bf27946377f23e3f79471321ad2258c61fb932ea8d24ae493157f
-EBUILD schroot-1.6.10-r4.ebuild 3762 BLAKE2B fd4c3cde279d5a40278a4de2ebb5facbd5c4f5a58d95056331c91705ed07b57d7079ae18679c812c55df4f5c9c1302c1c85bab730633e43ebcfa26db401858e8 SHA512 0bf878ab01c421189efcada441fac7aa815f9e729e080355fac5f5bbb35f939b4452bbea09c933583758b3206264c51d9a67d53e616e27785b357ec7654ea408
+EBUILD schroot-1.6.10-r4.ebuild 3759 BLAKE2B f389b68a46ca5edb2054ecaff03d28873d689b3d6f8a8a0cce45e65a5be7cec4e78fc5346c2e4f33572d41b0b6934fb607a201bc294a47ba595211c062c171b9 SHA512 a9dd8c9c35e5d64bc0e686cfedce9295cd24589758d966dd15b9046f588973822c4f97c2cb288f9e98654e6167c4786109d7c859e47c3836d6286d35c4d1401a
 MISC metadata.xml 451 BLAKE2B c37cf286c387974fb9d4d9145724da0340d8846ee772548915fbfc24530567b7fda09fdb845a6918ff70e55c6d33621d586da51a8ed222de820035a1eea71eb1 SHA512 372b1bc77d13fde4eff8f5e45bab2a3c75152d05c7fbc272e5bb119e2edf9f8931acb426ca06b413cbcd7b4476424fdbc9eec49b865dd9cd2990bed88201d40a
diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild b/dev-util/schroot/schroot-1.6.10-r3.ebuild
deleted file mode 100644
index 003cb75a0647..000000000000
--- a/dev-util/schroot/schroot-1.6.10-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils eutils pam versionator bash-completion-r1
-
-MY_P=${PN}_${PV}
-DEB_REL=1
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
-	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	>=sys-apps/util-linux-2.16
-	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-apps/groff
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? (
-		>=app-text/po4a-0.40
-		sys-devel/gettext
-	)
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.10-cmake-add-additional-regex-tests.patch"
-)
-
-src_unpack() {
-	unpack ${MY_P}.orig.tar.xz
-	cd "${S}"
-	unpack ${MY_P}-${DEB_REL}.debian.tar.xz
-}
-
-src_prepare() {
-	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
-	sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use btrfs btrfs-snapshot)
-		$(cmake-utils_use dchroot dchroot)
-		$(cmake-utils_use dchroot dchroot-dsa)
-		$(cmake-utils_use debug debug)
-		$(cmake-utils_use doc doxygen)
-		$(cmake-utils_use lvm lvm-snapshot)
-		$(cmake-utils_use nls nls)
-		$(cmake-utils_use pam pam)
-		$(cmake-utils_use test test)
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-	)
-	if ! use nls; then
-		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(usev doc)
-}
-
-src_test() {
-	if [[ $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are not root"
-		return 0
-	fi
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newdoc debian/schroot.NEWS NEWS.debian
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml "${BUILD_DIR}"/doc/sbuild/html/*
-		docinto html/schroot
-		dohtml "${BUILD_DIR}"/doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
-		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
-		elog "upgrade information."
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index 280d789e5202..432388f071b4 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit cmake-utils eutils pam versionator bash-completion-r1
 
@@ -9,13 +9,13 @@ MY_P=${PN}_${PV}
 DEB_REL=2
 
 DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
+HOMEPAGE="https://packages.debian.org/source/sid/schroot"
 SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
 	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
 
 COMMON_DEPEND="
diff --git a/dev-util/sel/Manifest b/dev-util/sel/Manifest
index a931632c867a..1735151dff2c 100644
--- a/dev-util/sel/Manifest
+++ b/dev-util/sel/Manifest
@@ -1,5 +1,3 @@
 DIST sel-0.08.4.tar.gz 22188 BLAKE2B ff965c1e6296482d14e09109932165524f666486d37239edc2c30f268080750de2b20e40fe5dfc65eeb1c52009db139e2b7a47c9f8011b70eb5ae561466c19a3 SHA512 5550f1b78fef10c2ac7c132f752db4e0f7a3318419bf5751a4f812c1da04b07b3fcac341076d32f6ea436a0216ad6746e9cf29c4bcef630b76e307ded6237e52
-EBUILD sel-0.08.4-r1.ebuild 724 BLAKE2B 50930e9e18dfaede634eac8266a93d018f8fcc367ed90dd1ec29a8169ab2123fdbcf0ce4bc2c3e2544ef13f514ce815c60c987c09ce78761acbba028a98b0c0a SHA512 9978eed79f8494738b544c1fa2e122e532a62151db28cf30b6de726db970a88f86897d04bd1f68ea51062042835e28277a42551d1662f85955bb54148465c285
-EBUILD sel-0.08.4-r2.ebuild 716 BLAKE2B 79df43f934e424ca4e229d33edc650ce0255e854d307f7d6e364ff6d1b5a14390073afbdd9af75572d0543dfb945ff86229d6ada0733f9ed1ba3287fa41b8d4e SHA512 8f693c3bbac5c520fa817af1558de234014ba2ec1f0f2b2baf02288964d44f6b6b25ec80381d560b640f013d9c98ddfba3901d1304c304a93b1def71e54093f7
-EBUILD sel-0.08.4.ebuild 848 BLAKE2B 149631b23e51f873a73576a89e9200b1b1119e60964b34c52c3e16845854e0cb21262c810177e78db8307d0bd49e08492018c5330ca8e3cb3288f4d9d41d1e72 SHA512 cc97b987328b3e661b1e5b2c608d154f00fb01b06689f03df3847fbb21b52c6202372e03dd9a2a9dac4ff82f6cb3efd0e81ab5b7dfda330a184282a3b0782232
+EBUILD sel-0.08.4-r2.ebuild 715 BLAKE2B 41e13a713d79512edc37c48b1d105a8a0a81a2cf6de07104dc4e0f4d368ebd741450b691dbf086af5a8fc191a2f5d9435e99a3709fc207cf418a0269e6dd59a3 SHA512 00b466c888d325f1168ad94d9e85ba96aeeba29045fd5545af56a5e42a9b9c54cdae3bab980e61492cd0858be5c0fcca9d856540e5930fbd1ee055e8635ad0b8
 MISC metadata.xml 357 BLAKE2B 350bd3f9b854f7cceb8d9281c73891ef21077ae5e15a51c4a93bc96ac438bde4d687bdbdfaa15b4e8e227c023ac6dc2b560c31033501b9d4b6f7690853fe54dc SHA512 3d3239c312742d66faf8633c15e799b93c48e42c23dc555e7de2df2d773f5b5383a37208f6f11eb37db18d0c9a51cfa3504c5ffb5122a9e62e14192a6e051bfe
diff --git a/dev-util/sel/sel-0.08.4-r1.ebuild b/dev-util/sel/sel-0.08.4-r1.ebuild
deleted file mode 100644
index 2faa3e43c54f..000000000000
--- a/dev-util/sel/sel-0.08.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="A filemanager for shell scripts"
-SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz"
-HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.1"
-DEPEND="${RDEPEND}"
-
-src_prepare () {
-	sed -i -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
-		sel.c || die 'sed failed'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="-lncurses"
-}
-
-src_install () {
-	dobin sel
-	doman sel.1
-	insinto /usr/share/sel
-	doins help.txt
-	dodoc README.GER
-}
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
index ed76a82daa42..62715868b15a 100644
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ b/dev-util/sel/sel-0.08.4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~s390 sparc x86"
+KEYWORDS="amd64 ppc s390 sparc x86"
 
 RDEPEND="sys-libs/ncurses:0="
 
diff --git a/dev-util/sel/sel-0.08.4.ebuild b/dev-util/sel/sel-0.08.4.ebuild
deleted file mode 100644
index 631244e988a5..000000000000
--- a/dev-util/sel/sel-0.08.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="A filemanager for shell scripts"
-SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz"
-HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.1"
-DEPEND="${RDEPEND}"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
-		sel.c || die 'sed failed'
-}
-
-doecho() {
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	doecho $(tc-getCC) -o ${PN} \
-		${CFLAGS} ${LDFLAGS} \
-		${PN}.c -lncurses \
-		|| die "build failed"
-}
-
-src_install () {
-	dobin sel || die
-	doman sel.1 || die
-	insinto /usr/share/sel
-	doins help.txt || die
-	dodoc README.GER || die
-}
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 0d55a99a0a45..fd3b730576ec 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,13 +1,5 @@
-DIST shards-0.6.1.tar.gz 26505 BLAKE2B 2d2f2e6b78c2736b8f42719a005b32e86702351e13b0115473b65f3fd568771d81ce3709f82cad13cb15f9aad5743b4245175d4f12b18a37ae6a963ccedc99e4 SHA512 fc1e32cf459a5c448ef780601b9515cd331fc40d3f6f0666e71e218a62e202e0d4f642f5e82660529d24145a5ed5f5cbf2fdc6fc251421850d9c7ac1ebcf4d07
-DIST shards-0.6.2.tar.gz 26589 BLAKE2B aa0c90c1acac8cbfed4c909007e2ef3abd168a315b8b94a0c807c5ebbd67869ca3080d742b34816ade883971f9e0a3cab292a4aa28fa3be445cadc6b2298e304 SHA512 baeebe496ea52c93313e9a550a8f1dda225674ca49e9e2b2660b059a8e7cd6a148085d33d5c70a46d2d4c7db9260f841a634c079cc590576a6d98c9308fb1100
-DIST shards-0.6.3.tar.gz 26826 BLAKE2B 846e591159f10e418a464ced9078ef21dc8ae11c4ea2fccf619ce7a2ea38a7fff52f1c2be59a3c29e10d0d579fb589963865ec0c62e6fb546f21cb6ddc2668bc SHA512 c9ef7f41dc1feb223fbaa22bc60546a6152eae44ecead6afc3ca5ed68ffb8640444efdf7817dc77f6507200993b6213293e24e006ebb483e804342b877d81c78
-DIST shards-0.6.4.tar.gz 26916 BLAKE2B d8ea6dd7796964220ff24d413a8e3af5379b52a4ad857537c2f9147ff16b1d389e07af3402a2b4d3e15b07021d6087ec9b76dc18f2de12e4585e9b896974bb0b SHA512 56475ab8287f469ec0b97d9ad7fcc36e75da8a4cd3fbddadfaf0156b6b0ede25331634bb3b41fa3e4b3c46adcd881838fe56c56de6e5bbf30d03e3106458e820
-DIST shards-0.7.1.tar.gz 29722 BLAKE2B 60b09254aa9ba6fae558665b669571038f5a841394e9d6fb54d0c6e7d8447d028c5bd66c849cd8dde902579f17a718aae2c718bb4057144c8d7851f30a90e024 SHA512 9371df40a5c5f0f809c5febcbdede6c743e2a0f1898d648ecb8c2be69ed746bdb879eb3653cd2c7aacd43148ac8536c401b119fcf63039b866e284e8003e73ee
 DIST shards-0.7.2.tar.gz 30398 BLAKE2B bf89f978cf9d4687902a8de4222f2c2121a52574c7f1ce46130a97c5770889693efc5d3fcc35208d6b1f23930f83fb98ba8f10391920ff0418c6d28eb810d6a8 SHA512 a99648ae292095278578e47971b556a0da90743db62689a76aae9eab986ad2185ad7adc13c4340f12fce835c5383d8aac93e35258d01fa658e521314eafaf942
-EBUILD shards-0.6.1.ebuild 472 BLAKE2B aad020d221a1b1dd1744c655afe01346ee75f6418356fb61540073428bc8e75ac5fd1ada12f7f686ee411d841c0d0b52a71f83ee4d5762da8a9575840e66aa3c SHA512 22b05fcebaca1a1c0d4cbf599a38da15d9c608472ded6dbdb7b4350373a075e93c77426f5444af83a32c6d4572f8a0b4dbd2bcb9955060ca656c09e9fbcc86d4
-EBUILD shards-0.6.2.ebuild 476 BLAKE2B 656439ab358a95235afbe52ca4eaf91bd8010e41ce371dc7fcf3d8915fae5b8801e30f9dc31ec8fea386749d021a5c7dbc4359d5ae54af70552dc05e3a3204ed SHA512 a64966d302b3b49b18658cbe7a8498d6a1840d1306784860327a688fd4ddebfa9509bebf28d3f12b308b6354157b01ed7c4e97da757a42bd8a63739cae507970
-EBUILD shards-0.6.3.ebuild 476 BLAKE2B 656439ab358a95235afbe52ca4eaf91bd8010e41ce371dc7fcf3d8915fae5b8801e30f9dc31ec8fea386749d021a5c7dbc4359d5ae54af70552dc05e3a3204ed SHA512 a64966d302b3b49b18658cbe7a8498d6a1840d1306784860327a688fd4ddebfa9509bebf28d3f12b308b6354157b01ed7c4e97da757a42bd8a63739cae507970
-EBUILD shards-0.6.4.ebuild 476 BLAKE2B 656439ab358a95235afbe52ca4eaf91bd8010e41ce371dc7fcf3d8915fae5b8801e30f9dc31ec8fea386749d021a5c7dbc4359d5ae54af70552dc05e3a3204ed SHA512 a64966d302b3b49b18658cbe7a8498d6a1840d1306784860327a688fd4ddebfa9509bebf28d3f12b308b6354157b01ed7c4e97da757a42bd8a63739cae507970
-EBUILD shards-0.7.1.ebuild 518 BLAKE2B c47273f3f735198a11d6d6342ccf67fc823e90e2c9a3ba79752b0a1ac5afc23625791ebcd3f32f6180dd39ebaea76a720f5e9bd2cf5fd122730f1da8ad785912 SHA512 0a65554b57b4e7b95f339bcd3c4eb2757a71db034e9224947f16037439c710a4584ed9c42201baaa9d2bc13cf268bc7e6347b28d055a64f07390792bbc1e7201
+DIST shards-0.8.0.tar.gz 30813 BLAKE2B 1a5ce7d2cea896dd8576ab5a6387138627140a0e40ec85ad0c77cf6f6187c34bdc69d7e7403779dcbbad36f2d28b8d3942f5c917919e80ce557e946e9ef26eab SHA512 c366dec216676975cadfd8210a89c407ddc6335859b323736da8e950cf70b78456b3802d2b65d1f6d71a196946a06264b97f60bdc057b6f376e191559a78584d
 EBUILD shards-0.7.2.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
+EBUILD shards-0.8.0.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
 MISC metadata.xml 429 BLAKE2B 4c4fe0bb93f3fbcbdbdac215ed36c90a1c3706409f62e4d1d5398976bdb2bb15a178c050f616b908c2cfe87ca0b3b63697620c3ad3ba95e0f836048263ccaf41 SHA512 c5ef30550acdb2b7e8d3179e42db4f0c3c7b7ab6cc5475992c21b6b8c79ac7949cccc2070c278a04c13c62fac2e63c34a39d8c607809731567927ed306905e95
diff --git a/dev-util/shards/shards-0.6.1.ebuild b/dev-util/shards/shards-0.6.1.ebuild
deleted file mode 100644
index 313c82834ab9..000000000000
--- a/dev-util/shards/shards-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/ysbaddaden/shards"
-SRC_URI="https://github.com/ysbaddaden/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.6.2.ebuild b/dev-util/shards/shards-0.6.2.ebuild
deleted file mode 100644
index 6a29317bdb13..000000000000
--- a/dev-util/shards/shards-0.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.6.3.ebuild b/dev-util/shards/shards-0.6.3.ebuild
deleted file mode 100644
index 6a29317bdb13..000000000000
--- a/dev-util/shards/shards-0.6.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.6.4.ebuild b/dev-util/shards/shards-0.6.4.ebuild
deleted file mode 100644
index 6a29317bdb13..000000000000
--- a/dev-util/shards/shards-0.6.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.7.1.ebuild b/dev-util/shards/shards-0.7.1.ebuild
deleted file mode 100644
index 38b42f417a5c..000000000000
--- a/dev-util/shards/shards-0.7.1.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
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # missing files in tarball
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.8.0.ebuild b/dev-util/shards/shards-0.8.0.ebuild
new file mode 100644
index 000000000000..43d89d4cedbf
--- /dev/null
+++ b/dev-util/shards/shards-0.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dependency manager for the Crystal language"
+HOMEPAGE="https://github.com/crystal-lang/shards"
+SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>dev-lang/crystal-0.11.1[yaml]
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT=test # missing files in tarball
+
+src_install() {
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index b2f37051c851..58d4b78d8056 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,5 +1,7 @@
 DIST ShellCheck-0.4.6.tar.gz 116618 BLAKE2B 67cf8e882e95eaedfbb46e01656889e200b311e3701301da1df02add4c6f7446d275a1b132d6d7e1da0e4eb49205138fffce8d8cb0a2b91045f72cc7f006ca99 SHA512 b053a7f581d73f1e5be51046f2fd77f6e7452acecf841321ef363156a5f72d98c13a723885d1888ab366550625e05396ca207925539fec1d70a00212af920ca5
 DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429a9c4244eb1fa5af71ad8ba2cbdd86a721bbc2b9202c7aecf4ad70025bacb13e696c4731cbfaba22511d773013d6b SHA512 bb9c79911701b3857d29fd63588115888f4d2b1d224066bb944ca00d29d973195ad1f4b1df8e2746fd0666f7438f46abc384f7f915c152f46fcd332163736792
+DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
 EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
+EBUILD shellcheck-0.5.0.ebuild 911 BLAKE2B 6ae6f5c785950da968eb253db682789f44ba50f62c578226af0526f209a67c22f1ee8b8be027c684437ebaaef3b7bc4d1fed5e10a82c075015c105276c1227ce SHA512 69fc399a74442149185b6f7612f6ddd4cb78dca576cb8d579dce7fdda4f79589a2cab9d2382e42078e57f9c852f86078d9d2753b96cc2fdd36137d0d3fc01a8f
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.5.0.ebuild b/dev-util/shellcheck/shellcheck-0.5.0.ebuild
new file mode 100644
index 000000000000..1bd29432c618
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
+	>=dev-haskell/parsec-3.0:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-2.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/valkyrie/Manifest b/dev-util/valkyrie/Manifest
deleted file mode 100644
index 08faefd3de46..000000000000
--- a/dev-util/valkyrie/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX valkyrie-2.0.0-gcc47.patch 963 BLAKE2B f59186ccad8e4b568fad06bc63f735d87ac67e5ebf9cb2fd47cfc7080ff845c6dc85d72c997f6a00ed24ffbb20b78feb0bf2884e64197add2df9b6b5add8015c SHA512 fac2ad08f7726ce448568e6d6f705e85140d2e4846ff150e7b7a3b2a64bc328fd885e17d62c2a5fac70049bb946e3013471bde35cf2e76b0a55155fc50cf5362
-AUX valkyrie-2.0.0-prefix.patch 329 BLAKE2B 20baef5d99b4c4eaf892309914e55c65aeb100973a4e16625c620760b6d9d4ddc460474d1142a47024ef4532b536ab37b169c3db81910f5c80ab59778e590f7a SHA512 67e98f5251d5d4d7831fca702eef4e639e4909af790387d018af2511e9151d4be0e827035d3f1ac6eb61b1115216943a811b32ada3cb5b45573ae089d5571ca6
-DIST valkyrie-2.0.0.tar.bz2 260690 BLAKE2B 842761f7ad2dfd135e1407d3d13bf3ae81db7f9d2fd6c362c378a65d9476fc2d955be8be56e0701e4b8ccbcd7234236b0752799d8afc46e9c46536ffef925d46 SHA512 435abb17ecad114c3e492fa193e508bad7ca61884bd09bf1bf0b8398c63151d33e571fea927b84f05bc2b647183af441da1550161a6f766db9e9a15d00cfc888
-EBUILD valkyrie-2.0.0-r1.ebuild 528 BLAKE2B 70d999d96c0d90eb63df756281ca3b855b970f1a54f9a73f509ab08560eae00d1a91a41572319f2af04e36c00be880c39e5c14c908994ca936eb0629bedff889 SHA512 855533f7deebae542b955daeb82c41fbeca984486fcc59180536e9bae58e35a500468d13836803f9dc41a280d21bd3e386f2b3ab499e86a089ee67ef9440ab84
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch
deleted file mode 100644
index d2d33166a85c..000000000000
--- a/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix building with gcc-4.7
-
-https://bugs.gentoo.org/show_bug.cgi?id=421867
-
-Patch written by LE GARREC Vincent <legarrec.vincent@gmail.com>
---- a/src/objects/tool_object.cpp
-+++ b/src/objects/tool_object.cpp
-@@ -50,6 +50,7 @@ stopProcess()
- #include <QKeySequence>
- #include <QString>
- #include <QStringList>
-+#include <unistd.h>              // usleep
- 
- 
- #if 1
---- a/src/utils/vk_config.cpp
-+++ b/src/utils/vk_config.cpp
-@@ -25,6 +25,8 @@
- #include "utils/vk_utils.h"
- 
- #include <pwd.h>     // getpwuid
-+#include <sys/types.h>         // getuid
-+#include <unistd.h>            // getuid
- 
- #include <QColor>
- #include <QDir>
---- a/src/utils/vk_utils.cpp
-+++ b/src/utils/vk_utils.cpp
-@@ -22,6 +22,8 @@
- #include "utils/vk_config.h"        // vkname()
- 
- #include <cstdlib>                  // exit, mkstemp, free/malloc, etc
-+#include <sys/types.h>              // getpid
-+#include <unistd.h>                 // getpid
- 
- #include <QDateTime>
- #include <QFile>
diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch
deleted file mode 100644
index 2f18491e8f81..000000000000
--- a/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- valkyrie-2.0.0/vk_config.pri
-+++ valkyrie-2.0.0/vk_config.pri
-@@ -14,7 +14,7 @@
- # Set a default value for PREFIX (etc) in the generated makefiles
- # Note: ignore INSTALL_ROOT: it's a qt special, can't be set from here
- isEmpty(PREFIX) {
--  PREFIX = /usr/local
-+  PREFIX = /usr
- }
- isEmpty(BINDIR) {
-   BINDIR = $$PREFIX/bin
diff --git a/dev-util/valkyrie/metadata.xml b/dev-util/valkyrie/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/dev-util/valkyrie/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 type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild b/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
deleted file mode 100644
index 76a94a36b00f..000000000000
--- a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Graphical front-end to the Valgrind suite of tools"
-HOMEPAGE="http://www.valgrind.org/"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-util/valgrind-3.6.0
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-PATCHES=(
-	"${FILESDIR}"/${P}-prefix.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-)
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 4940726e140e..b43aed57a5fd 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,8 +1,5 @@
 AUX visualvm-r1.conf 786 BLAKE2B 863af1d373f3e8633a630c6a1cdbc8ada09b1a9b5f35704db044e12614c997e9648ae9c087caaed89c2632dde7a09a1eb3b158d4227a1e2cd94214ba25d61eef SHA512 243ab8ac4472492edf796582dea5164f53261f654168cde9ccf863e0f265ec5c50442c1c44de89ca759c8d0dee6c00c10a3f807ad45d039976ff4d91c89d8397
 AUX visualvm-r1.sh 424 BLAKE2B ad18e375535b92e5bc5720c7b4f9f9526ee136d29d51103038a68e8c260245222af1e912b8320ca98dbaeb1a8736f041fea89ae87b15d1db9cb916eb1552c8e6 SHA512 8e579f126142f52e14f235a23c3834933b59a9df95ba76b6b9a82175cfc5e12d759bc0d7234ae3cea7684bdfe12f2efb9785afbe6844394f458cff05ae8342f7
-DIST nb802_visualvm_02102016.zip 23257637 BLAKE2B b18570b69a646c975c4b93028438cb7827f82e4e8d7d02bd11a76faf2a40164b9171626a1bd3b0664a216a30e27ff8b14d68941c8eff92e426fb92a45fb95687 SHA512 e33dba0cdfb509e9351fac343a4fbec07d3a893b6f484d0aeab972aefe41b061422dba8695003c6ca33db52d5be2f4ce218ea4fc7129f67dbd48c991c35349b5
-DIST visualvm-1.3.9.tar.gz 3623394 BLAKE2B 8132447427b4abd206a825b4ce45ac54055cbb761a03624438baed7f58decb370d36bd13bb233638daad55086e04e01502b971fd0c95a31648a5b0795d8eb30f SHA512 580e2f3dd7cab1f71c8ae3004101c1067d04a7b4c164e6a59bbe95ca927dd275b8b4389e724cb7d8b38586986762126f261abc1779fb229a778c1c8db0f20387
 DIST visualvm-1.4.1.tar.gz 56752632 BLAKE2B cd171a48a0a9af440c27f2968ce27c5f89af3769046258629ba384ebbfc1c2ecb9847678af9d69bea5847fe1098e9039f35d350fb6f5d112e9236a6510c52bc7 SHA512 de8cf37e619e15c3a30c5116d49becddc09b54062aa22709e412892cf78e3048777116a8388dc6f63609d11bfb6fe37176fe48f5e3263a4dbce8439df676ef15
-EBUILD visualvm-1.3.9.ebuild 1448 BLAKE2B d86f03eeb55c832e33dbed3ee694e6d7737b0bf5b414e5d5c7c675b154be35320afaf47c20c71955d6791278b2a600101479e5887b0fbf68164f816ed14379c9 SHA512 53f14fe6f1ceb34d9a1b0c3da20baa510f115c99b479603a2af36510b20826d6e23f71b7102288ea0a4f817c8ad0e4511bc9c2d427b2324e9eeed9106395d6fe
-EBUILD visualvm-1.4.1.ebuild 1689 BLAKE2B e1fe2081e2792d4b12703ae7250df86464270f6417f164747b0ee9919d97cd479589695f1a515a127fc3acdb2e1be4e490e5c3bb5626788da9acaabe2b8975cd SHA512 71e6ade4c914312b3b03fd6450a51d28b1596f169704ed9a8add7f44009ca83304091f76191a981c425c223abbefcbb73c22cc6830267b09e2021616bf9012bb
+EBUILD visualvm-1.4.1.ebuild 1667 BLAKE2B 92813bb7a920d1f2a83af817d9fdd821be79661331c29b6c4a7f8f945c190a9dfd4a89a8cae04ae347be3fbb68bf6a8f9b02a80310780f7fea29f3522dec0fbf SHA512 b38ac4aae3d549e8f7c749436f885cc538c5844b81af6ba2adbed503ffc5ec297ffc1dec3a4f5e3c96ac7f53dd8f508e25c18e3a11f7a3b9108b05ce0d51d542
 MISC metadata.xml 452 BLAKE2B a1a04fcf6da524fc4bc9d68c415c429dbf43813e594797eaf24f6590e47dd6466d9ec5bae1909011976ab9a47cedb07bbbff29f254f60371aa50ed88a3d9a50a SHA512 cfb0070326f1fc73f96016a138bdba35b6799333a625c38c84fb486134e1446f71bcfe2f170cdbe9ff86befe66905ba79caebd68f811547ec638e69821a5a739
diff --git a/dev-util/visualvm/visualvm-1.3.9.ebuild b/dev-util/visualvm/visualvm-1.3.9.ebuild
deleted file mode 100644
index 7fe5e09f1733..000000000000
--- a/dev-util/visualvm/visualvm-1.3.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NBV=802
-NBT=02102016
-NBZ=nb${NBV}_${PN}_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io/"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip"
-
-S=${WORKDIR}/${P}/${PN}
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	unpack ${NBZ}
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-	   netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
-		 -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{platform,profiler}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-1.4.1.ebuild b/dev-util/visualvm/visualvm-1.4.1.ebuild
index b29eb860b654..a33b5289f774 100644
--- a/dev-util/visualvm/visualvm-1.4.1.ebuild
+++ b/dev-util/visualvm/visualvm-1.4.1.ebuild
@@ -1,3 +1,4 @@
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,34 +33,34 @@ EANT_BUILD_TARGET=build
 INSTALL_DIR=/usr/share/${PN}
 
 src_unpack() {
-    unpack ${P}.tar.gz
-    cd "${S}" || die
-    # unpack ${NBZ}
-    unpack ${S}/${NBZ}  # archive is included in the main archive
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	# unpack ${NBZ}
+	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
 }
 
 src_prepare() {
-    default
+	default
 
-    # Remove unneeded binaries
-    rm -rv netbeans/platform/lib/*.{dll,exe} \
-       netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-    find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
-         -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+	# Remove unneeded binaries
+	rm -rv netbeans/platform/lib/*.{dll,exe} \
+		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
+		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
 }
 
 src_install() {
-    # this is the visualvm cluster
-    insinto ${INSTALL_DIR}
-    doins -r build/cluster netbeans/{platform,profiler}
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r build/cluster netbeans/{platform,profiler}
 
-    # configuration file that can be used to tweak visualvm startup parameters
-    insinto /etc/${PN}
-    newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/${PN}
+	newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
 
-    # visualvm runtime script
-    newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
 
-    # makes visualvm entry
-    make_desktop_entry ${PN} VisualVM java "Development;Java;"
+	# makes visualvm entry
+	make_desktop_entry ${PN} VisualVM java "Development;Java;"
 }
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index ced5774f73f6..42390ee9687a 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,4 @@
-DIST vulkan-headers-0_p20180601.tar.gz 451276 BLAKE2B 7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c SHA512 a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55
-EBUILD vulkan-headers-0_p20180601.ebuild 723 BLAKE2B c795ceec07246e8cee6ef9dec125a7d1ce4cbf72d72a7b95751ce95ce014262a77648e9865816972158bd31fb486df07bce09ca16966d9ccc91922457b6deccd SHA512 3a2425eda721e3091d1f2f8a37a45d757c7c41291e61967d36789827c8296bf249519f99570492dd855e1acfbaca851945cf4b19c7ae5604657fe416a31be297
+DIST vulkan-headers-0_pre20180601.tar.gz 454023 BLAKE2B ac1eafcf4ef84023f5f9445028b03c6e2638652d3a5b9e999b527a636fd1cd8fb6a2d23b47af71ddf3ef29210ab1d4f3bd4c13a86bec6f72174aff98c7e4828d SHA512 427f5ebb248aa0cb2e79ac2ddb5c1977d3b9bb92a4198bd562d4e89e773a8219e4c7923ca3544e4303af7f53c746fe5d754e508c9e83854f02dca7bee3c2e935
+EBUILD vulkan-headers-0_pre20180601.ebuild 723 BLAKE2B c795ceec07246e8cee6ef9dec125a7d1ce4cbf72d72a7b95751ce95ce014262a77648e9865816972158bd31fb486df07bce09ca16966d9ccc91922457b6deccd SHA512 3a2425eda721e3091d1f2f8a37a45d757c7c41291e61967d36789827c8296bf249519f99570492dd855e1acfbaca851945cf4b19c7ae5604657fe416a31be297
 EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B c795ceec07246e8cee6ef9dec125a7d1ce4cbf72d72a7b95751ce95ce014262a77648e9865816972158bd31fb486df07bce09ca16966d9ccc91922457b6deccd SHA512 3a2425eda721e3091d1f2f8a37a45d757c7c41291e61967d36789827c8296bf249519f99570492dd855e1acfbaca851945cf4b19c7ae5604657fe416a31be297
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_pre20180601.ebuild
index d6e2cd6c4876..d6e2cd6c4876 100644
--- a/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-0_pre20180601.ebuild
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 8245a479840b..536d4fbc016c 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,5 +1,5 @@
 AUX vulkan-tools-Use-usr-for-vulkan-headers.patch 1240 BLAKE2B 2206e0777c2c7fea95a1e0b43e09de372b6a898275b3dbfa3bc1cac84125be42ade8834ffb8b2fd872f8d8ffa64aa70b456ad5c2e63c98c9aa4abd1995777043 SHA512 c96da656fe2d32af3ea5fbf348e6297be88b1581bda55e65a97d8d96229363b26285495929d5fa749b8e8fc9c20aa16ee529bcdf020191d46eac9bf97bab4511
 DIST vulkan-tools-0_pre20180601.tar.gz 421373 BLAKE2B d7c6870cf27397800a2af512b0bf05919b01dc30d84961d8a8dceacf005be461a8b250ef65cbfee8b070ef7f6fe8544deb855c06aee99f6b5175f4073b5a051c SHA512 f41517c22fb06aee07d40b947c756d97453810998ccb6e8cf8c48a439de1826361fcd84f0e96eaf3898e373e732d3b938c807da6fc2a736d3b986c2d30778ba2
-EBUILD vulkan-tools-0_pre20180601.ebuild 1481 BLAKE2B 9c4721737812adc65849caf875b2f3537891a7f262c9edcec63d26a441c2687c73f3afbe55621d5437c743b915b642eadfa0006b0c2efda72b03033e62ac6770 SHA512 0c2213ab958601328942132d9b42ae884926ed7d132719bf205b040f55fa7da1590f678663b83032bd8da34234566d1ff43a5c2652cc8f4bc1dbdee9bd53c4fa
-EBUILD vulkan-tools-9999.ebuild 1481 BLAKE2B 9c4721737812adc65849caf875b2f3537891a7f262c9edcec63d26a441c2687c73f3afbe55621d5437c743b915b642eadfa0006b0c2efda72b03033e62ac6770 SHA512 0c2213ab958601328942132d9b42ae884926ed7d132719bf205b040f55fa7da1590f678663b83032bd8da34234566d1ff43a5c2652cc8f4bc1dbdee9bd53c4fa
+EBUILD vulkan-tools-0_pre20180601.ebuild 1493 BLAKE2B 89a9c0db5aaaaf7877c7c2323f88dec89cfbab5b1e15163691fbb242a41fe60b1fd4db4fb5f930bbc0f7083377f7859f90e8923a3eda943bf7615211a9a3fe7a SHA512 4ffbd5f371a42c3c9a4241cc776fb30e530e599a6da800e4ce4c076bb37312c782d8ace93d445f2c25c43355a1772a435dbad5c69ea1fe2ca78ae6ca47f3316f
+EBUILD vulkan-tools-9999.ebuild 1493 BLAKE2B 89a9c0db5aaaaf7877c7c2323f88dec89cfbab5b1e15163691fbb242a41fe60b1fd4db4fb5f930bbc0f7083377f7859f90e8923a3eda943bf7615211a9a3fe7a SHA512 4ffbd5f371a42c3c9a4241cc776fb30e530e599a6da800e4ce4c076bb37312c782d8ace93d445f2c25c43355a1772a435dbad5c69ea1fe2ca78ae6ca47f3316f
 MISC metadata.xml 430 BLAKE2B dd9ef031ce380e8c4f37ab9d1c6bde97ce580b860ddcb6d41ba6b367e1c049528dc1562f228e9e8fd9d8109ed60a32d82faaec5b60e204bda4fc62d054feebc5 SHA512 8a2d53130be6108388981f63b4c2102ad901135254bb14a0568910fc0dc599374962cd39f1d7920cc5d1cab6700f67440f5b637e2850449a9ae16b666c153668
diff --git a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild b/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
index 38d11f8da2a8..42876e8f5904 100644
--- a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
@@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 	dev-util/glslang:=[${MULTILIB_USEDEP}]
 	dev-util/vulkan-headers
-	media-libs/vulkan-loader:=[${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 38d11f8da2a8..42876e8f5904 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 	dev-util/glslang:=[${MULTILIB_USEDEP}]
 	dev-util/vulkan-headers
-	media-libs/vulkan-loader:=[${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 39b406a7fb0f..be0344bc670f 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 1e374d54b99b..c0eea13359d8 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -22,5 +22,5 @@ DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
 EBUILD cvs-1.12.12-r11.ebuild 2995 BLAKE2B ad5bf94a3039b07f6c32a14e8ff99feb209c1e4ccaa6ad922cd8f93ec705594b1fdd7e18d697897ea994898acda877b63c38dea149d7f919f7a1416621d3257a SHA512 51ac321b9d9d1cbb4a7ee8fd46e36c1f5a13559e3f9fe0a42310748fc6c4f5c1348caef72a45d6ac1fafff468fcb9ff6aa13bb2283a6ac07afeac891b8e2d09f
-EBUILD cvs-1.12.12-r12.ebuild 2991 BLAKE2B 162a13b74e621a943a441a0d40de0453737c621251f7675210e0cb54815edb288e2d26b19e8b816dc280da307cd400ee4bab62d98727ab1d8fabfeafe5b01d91 SHA512 d183c00cd4ed5249a6190b6e176adf24abb5e6a34d0a8df04c233baa3c82e6dcd77a718061b2e7cc0371481a7ec910fc399e570ddeac5a89a6fc3c99c3d12306
+EBUILD cvs-1.12.12-r12.ebuild 2990 BLAKE2B 2faab14655d239f863e83edd22bf2d1d0c83954f6fdca7a0032edb89c0ee3c531e4623fc612f83f1e66ce71fbf9b3eb28cb27b4c9f213d8ad8ce2d938cff0ed1 SHA512 2dae2c584e5923334dffc3c7b7b4b101de1995e8c05ded5de4d627570d79f2b06b59bcae01e3a92dcbb9ea5426991d1e78bee536cb20c59a5e353c175836531d
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index 2683223b594b..4fd2e77144a9 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 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 ~arm-linux ~x86-linux ~ppc-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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 RESTRICT="test"
diff --git a/dev-vcs/cvsd/Manifest b/dev-vcs/cvsd/Manifest
index 7b27eb32872a..9f666c4eb2a4 100644
--- a/dev-vcs/cvsd/Manifest
+++ b/dev-vcs/cvsd/Manifest
@@ -1,6 +1,4 @@
 AUX cvsd.rc6 373 BLAKE2B b46409472c76d0ff4374a5f47b051fdf270b1cf8b1bed582f04d75582a8c016047c5e63c4d78494c626d135a98b415c5fee565ed173442600dbd5bcf3105ddc1 SHA512 f71b01a2e5b7eb12cf0a9226015192e82253cec300a19f9841e7ad1b04210ee84532086bc8eb681ea1c4bd19fc0d38c17b365926a21fca4c2752f979759e8e5f
 DIST cvsd-1.0.17.tar.gz 247026 BLAKE2B 82162d74bf63f8eae2141c07f97bbe31a51ee8aeabcf097b2a6aa33a1dfd65aaf6c48017bc11bd6494dac8e9f4f12d9905d1f27fe11361e14910925455ee06d4 SHA512 beea48a288ff580e6cc7fdcd1997b7af01e7ea1b1c185006c92cd7758e7e557d2b1b4fc820bd03b787ebc74b5fa9ef661584d2c523480cf6418f452f5f929c9d
-DIST cvsd-1.0.7.tar.gz 193964 BLAKE2B 0eb91bf9e7c47920c14d1290df0572af96432e33a98ca5f3f21fc5b1e4ecd257c47cefda372dd891b6f6088a21650fde92863dd338f847486606456ae40e75b6 SHA512 6ffc3d554e43d50c0fa4861b3f6cc6c696298d882074f017da80068f7afbca3361e5d88fbd13fcadf930afee2df8d6a0777710bc0f992dd208b7674595cc8ea1
 EBUILD cvsd-1.0.17.ebuild 1021 BLAKE2B d84536eefd276babdd7dd9aa0520d8212008debb28239d29461ac57fc2d1321e26653f7cd00b418f1b2727b7ff75885f73fcff1fd914e4f5cb242ef6fc8ed0b6 SHA512 7261213d686acc64a5df60e00a3f4b86cfb0f8498ae488d65359fb05b740ea0181a5319423966cf0f4fa41f9efef0ccb3b1f668ef783353df3058ddee926b85c
-EBUILD cvsd-1.0.7.ebuild 976 BLAKE2B e5d441de3e2979b4f15a82225b68e74d7079bcacf350521227f44c8b89b6ea81910b5dcf1b031896b6608b8a71b882f122e628678ec0e44ba826e19e5dc3e8c3 SHA512 135f25555838a6dcc93a855a2ac584cca0990c78ee5c23c386a1887fac8f0919852315072c914755ea4a6edf51faf09ace9930dac59553a3aab7c61ecdb694a9
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-vcs/cvsd/cvsd-1.0.7.ebuild b/dev-vcs/cvsd/cvsd-1.0.7.ebuild
deleted file mode 100644
index d82be30964cd..000000000000
--- a/dev-vcs/cvsd/cvsd-1.0.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="CVS pserver daemon"
-HOMEPAGE="http://ch.tudelft.nl/~arthur/cvsd/"
-SRC_URI="http://ch.tudelft.nl/~arthur/cvsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="tcpd"
-
-DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.8.0
-	>=dev-vcs/cvs-1.11.6"
-
-pkg_setup() {
-	enewgroup cvsd
-	enewuser cvsd -1 -1 /var/lib/cvsd cvsd
-}
-
-src_compile() {
-	econf $(use_with tcpd libwrap) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dosed 's:^Repos:# Repos:g' /etc/cvsd/cvsd.conf
-	keepdir /var/lib/cvsd
-
-	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO
-
-	newinitd "${FILESDIR}"/cvsd.rc6 ${PN}
-}
-
-pkg_postinst() {
-	elog "To configure cvsd please read the README in "
-	elog "/usr/share/doc/${PF}/"
-}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 6964c99af662..bd8817463da4 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,7 +1,9 @@
 AUX 50git-gentoo.el 472 BLAKE2B b2b7c2c105d2ce3e066b3b617d095c402032549d92fff4a181ec9af6740033b0446f76b9620c97db582e85eff9aee0e3f88749981a135382c7a8d3187da921a5 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3
 AUX git-1.8.5-mw-vendor.patch 1160 BLAKE2B 37149c1ac222da71b38525ef6abeec21bc5926859725ec6c5282c5e5bee28e2f5c3e94f7bb9a0412e332c4f807ba8b4ed8544475524e857dc5b87be4128a3b44 SHA512 6513104f28eff36c18840f90e56fb21e8e04055e4e9a304ef15e5d7e1c13c8b45c4be0380b7781e776ce3b8ee9f7371ed2200e01174cc257125a613aef43ac9b
 AUX git-2.12.0-optional-cvs.patch 14388 BLAKE2B 146bb74bbf6abd2de767b6bf54f9e55fc1bd62fb52ea59800331c169b598853324b5bc3e168dbf344042c087d04436c9a71a2ba768ec21c730db5771067dba88 SHA512 fb44d17628e0c6d39053c8221296a8d81ccc84cf8cb49a0be13ecffcf79c69902f01c43c3b0ce45d2cb2c880116e2fb6d78d95e9c8d2fe5f19ff37bc4a6f8761
+AUX git-2.17.0-mw_install_path_fix.patch 1642 BLAKE2B 15a2b91abd9be5897d881d3fa09cdd5e7f54cf75846dc62301bf52f30e9de1367b13d00c7761372a5112b5db6719582afe4354468074223e9a0cc9c015ccf135 SHA512 082cbe10574c46c5658b731ca636d4d8663e3466819c423f62634576ebacfa0f4336947284e25e0e393a080016d20ccd9032def60cf251dda7341d9a24ff5ac1
 AUX git-2.17.0_rc1-optional-cvs.patch 14142 BLAKE2B 7ecff90fd346bca0eb40faa704a621f5a4d6de4e15bfcd9f43d34cd27f4844dc05771cd8ec16af7f43346900efbeb63e4611579a7eebe2923fab10c50d7e1bce SHA512 3dcf56252f0ea27f8d5fcdfa87e3637fedafcd08f92ae800b2de22276215904916c5f687f931ced74a678717a1199ea8de3ef1587720899bc51b0ced1fce3549
+AUX git-2.18.0_rc1-optional-cvs.patch 14471 BLAKE2B 0fcd6693bdcb7ef1fb843a19eb3802edb96e0f4820cc56338de6e0042a768d14a72eb4c02dd680bf4a9e536935529dcb5b1f25bd6f7980e46ca0ea0059f2d643 SHA512 d5cafb3c52b0cade0550492b4d52d96a912f9d721eb02677390b6edc7154f171c84b9b225baf42fa328b3ee0a7feaae75b4a4426b73db3deebe878ce62adf9d6
 AUX git-2.2.0-svn-fe-linking.patch 418 BLAKE2B 5030e0dfd7fef0157fd4532aa14bfdb4f2ed09a2e35ca960e0133d8e84ea07a472ddc111ea9c0033158be6e90283b76c9880c08cb7af7de53757dbf9b5d79a64 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd
 AUX git-2.5.1-freebsd-10.x-no-iconv.patch 568 BLAKE2B 5308052e21e28f07633a4503ee1b3703e49f76fc099703a6bdf9e474200fbb2c68b0dce5f0bc495d5f0118fbb75ee2113da309122cb0c445e93b5abc6ec6830c SHA512 9f7334b2c5b69c5a6a94e198a522b176470b0ae9d428694b9a404e4bcf33d269f43c8d2d9b5834e36f9a875d12a7b21f59caaaffad6d05cb6267ab2967e64567
 AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be
@@ -14,14 +16,18 @@ AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
 DIST git-2.16.4.tar.xz 4968252 BLAKE2B 77f76408bde02bfacdb99d22baca05893f63c96d1fb7508c7e92541f8f7ec9ced0dad650be788fd28a1e03b5d88b88708652d07a47bedaae60a9cbd4e2eec858 SHA512 f54e431e78289349dcb927ec34873dfb801c49a41cbb3d0138346d603af26bd7d86f9ac95e7a61a4831017f3503f33374510ccf68b0e62b0691fc5a43283f1ac
 DIST git-2.17.1.tar.xz 5015484 BLAKE2B d3a61023872a15e3176e4dae6df83d4c2369a377244d44dfd7a63a15ecc3a7b145093afd5d6fa72e4eca98ba4f81f7ccd89ac2400c9cf8107ac04fd35d8bf6e4 SHA512 77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960
+DIST git-2.18.0.rc1.tar.xz 5057828 BLAKE2B 9ab6979f86f601e6b2c8838eedf2cd8db0514b2644cc107c984d25e35c5ebc3bc3da8788451f51d59fdeee537f3f7de6981e7c0bf35b3e9c41084fc97f8208b0 SHA512 b3910a0aa699785bbe75fa642105151889eecc79534509a64b32f0af192f9fbc9e546b0209b3ae2882ce46af7c45cea7ad1209e5655af708528712bd9c9049d3
 DIST git-htmldocs-2.16.4.tar.xz 1164256 BLAKE2B 88a7ab5b094f15bc2b6c0f4d4c3eae185f6e6c0f00f4aca75492f0cc964428d1bf53002e0e43468b60b62058af5f13b061231061247e19b32bc70c2c8adb04eb SHA512 8f4a8c51656559af81296fb064ecf0f88444952c7f8ee91b85e5a61b20d200267d7432f720ded12046bab986361cff48cf7a2f5d21e05c1ac7648cc3168a0049
 DIST git-htmldocs-2.17.1.tar.xz 1173296 BLAKE2B 5133a86fb73cd58d6a9d4ed05d32949f642c9a670a49ea67c7170dfb39c4ff3f63d5f220abebcc979f87a360ec2990ccf5a9e3c18e8fcb07082bac111ecb12c7 SHA512 69054b087ffd1c88532672c6edea3cd27e08421f25c09a1a304420ec6aa20806888f71e4ef21aac1bc2fed81a045a64ae164a9dc377eb48d61887bf8d787782c
+DIST git-htmldocs-2.18.0.rc1.tar.xz 1200624 BLAKE2B 367a27cada3ddd563347382c7569d61f7f367f900840feff6bc4404bb6b1863700ae12729b2bd4008c8a70558c103220ea9dbbf39bdace8d79dee94d1406077d SHA512 ac5c4770989645b268e5b966bbff47495b35fefbde7e4e0636eddb33c0a70b81470c26b1007a85b7078a425e537727a9b36c06bba1fcdd54716cb4bd1a316de5
 DIST git-manpages-2.16.4.tar.xz 417136 BLAKE2B 9a75913dae62fa2eb31cf48e77e266aa8d91c67b8a753c1740283b1d626dea1e9aa8d7cea06d9b97887f801b4d1f1b927014851105cefd3241ca7ab7330bfc8b SHA512 8029e9fac1eca542e809da1247f4eec3a2c81c0eb12d03aa816dcf120677011d3e409b06c28c8e7dbf41cbbcca873ec93846dc317bc73e57f4d4701ce7abf73d
 DIST git-manpages-2.17.1.tar.xz 419400 BLAKE2B af8cef1ac43c6b5ee073c7e18c161ba3ebe0669e474833211c95e72b33524050c30ca133ada98e07c8b481ffc4a5cbce1e7d68427b7aeb9bb80534c2ef3623f0 SHA512 fbdd4ef99419d244bc7c03b10cf09e92d1f0894879fe159ee1f53262daebdc7fe72d6c2bbe9e21fe354f8afb26fa06b35788e54b0c078b686706b511bf7c33ee
-EBUILD git-2.16.4.ebuild 19319 BLAKE2B 2f240ace3b44b6b6859c066505ca3bf69643fe1e30133ea8fca3d71144e4cf96d54967372d8e182283550a34de2c7fccff557942ce06ed04970893da410603b6 SHA512 fc530abf2c08fdf37246ff3d66e3e7746e63a3278df907b2c3790fcf0d7dd6e2e8c89d40455d9136e2d7df0ae0e13fd3103c4335aa0b0a588c669c9ea11864cd
-EBUILD git-2.17.1.ebuild 19309 BLAKE2B ec379625357f33a6cfa8049eaa9e207b299de0618284561210e55efec6d9f381a91384837fc29ba16bbf78ca65f50bd71ffbcfcb10f2126b058047e694c6502c SHA512 4fe18afaf0eb09ec9a3ce204a0b84e215525f824fef99cb0eb88d70acae390476b2069b2523edd896a2611ac38c2603e93918d1b9b518b23efdb35a44c574f5e
-EBUILD git-9999-r1.ebuild 19309 BLAKE2B f38bc51a1e5f629336b88f1a4ca98bbe4d06219dcca0e5b0f86a4a4153c7457843108da243afd7d713a66b39af6bb541ba5dbbe40575fccea9729a7d7d33dc8f SHA512 dd5a983ab78ffc1426e784b8130f14a1ddefe4be08c02be1fb5dd43ff0454c0734bcd5f59a1502be9ee74e212454479962f873180e6eb8d973b683f22bd7bd0d
-EBUILD git-9999-r2.ebuild 19309 BLAKE2B f38bc51a1e5f629336b88f1a4ca98bbe4d06219dcca0e5b0f86a4a4153c7457843108da243afd7d713a66b39af6bb541ba5dbbe40575fccea9729a7d7d33dc8f SHA512 dd5a983ab78ffc1426e784b8130f14a1ddefe4be08c02be1fb5dd43ff0454c0734bcd5f59a1502be9ee74e212454479962f873180e6eb8d973b683f22bd7bd0d
-EBUILD git-9999-r3.ebuild 19311 BLAKE2B a6924f4f466d922c227f96d9c170132b3ae8517f25343089e0785bad6726a6e5804f94e8f9092c46430a428ef555c762551f3811d9ff36c08a4b3695c120dd40 SHA512 176a648a57ec497a4f5db1bf9b3115ac72f051e3967e3d2b9f7494c02e66a27fcde667dbe27a7ba548924ca43def395a83c0a625b11faea73af949eab99b4879
+DIST git-manpages-2.18.0.rc1.tar.xz 425484 BLAKE2B a421e3fc79e5bde92c0a4cd4df1aa9fb6235d57136ec704f8170bce0804da66c0b38f8027b598bae66ad355943b1e820d3e840b9f07bf6a6b9b58b853f80803a SHA512 5307bed496468447e3890a4af0362646a3cbdcb517da94eba09fd5c34294588dd27844812c73bacf0151a950abaf0239cf70f9739d340f03d3dd047c896b6143
+EBUILD git-2.16.4.ebuild 19322 BLAKE2B 3653976ab35cf76c4711257faa91d9fd7f475996b925ac3a5b4cabc665623b050dde9a7ea19dc3f2b6a2e29db8900142b567ebdc958d7eef8a6c4d481e131c51 SHA512 a0549569f377552c5c2882d0e2373ee0b471c6d7e7cde9092c500174b36dafe08ba2c1c896973c4bc2c997a26c7c2a45d15aea21e9bc58695a958acd64b69171
+EBUILD git-2.17.1-r1.ebuild 19370 BLAKE2B 0bd701b427978fa0bc187922c1af1075a3d29826dd4cb40d39cf40f4569a925ebbbaad2aa0cc2cf625ac4c5f36f6d7892d5d9b286149ab92cb0d63f22ef83323 SHA512 a046b7f21cf67dacbc561a28edd9fd4d519178bf1f3dc5835e955adabaa4b7abee6dea5be4617c57e41791f55e73e8fde082d766fd0aee8fa0ed9dd7dcac3e14
+EBUILD git-2.18.0_rc1.ebuild 19309 BLAKE2B f34eb5bcbc562199c9f1b512b4c81af3a1fda9b3ad755708543a3e7dec04f4b67dfed707815426961f6e1f60427c4ed201693da35e067d2a5fbbcca60f3f74d9 SHA512 21161ecb50fc0890e40e5d525f0cb9beccc156d14767072017ff5e1b4e16d224e5cebc804c6ca66b2efd5b099a73e7dcbca2c5f445b57ea55bb36ab63d0aa4b9
+EBUILD git-9999-r1.ebuild 19309 BLAKE2B 2b2c16a81e7c84a5768dd793131c90419884edf6a17bb29d41de92e355966f4f1b64ae14d13dcc27908297de2b089088632b0eebc7b8ddf40980567e6b62215e SHA512 2f88ad919815c137ef799d4116641ee2d8caac7435205c33342da0e7f6cc7dbf741b761efca8375b2ad783162d1d1fe7115c910ffaca002601f4cc37d9e80586
+EBUILD git-9999-r2.ebuild 19309 BLAKE2B 2b2c16a81e7c84a5768dd793131c90419884edf6a17bb29d41de92e355966f4f1b64ae14d13dcc27908297de2b089088632b0eebc7b8ddf40980567e6b62215e SHA512 2f88ad919815c137ef799d4116641ee2d8caac7435205c33342da0e7f6cc7dbf741b761efca8375b2ad783162d1d1fe7115c910ffaca002601f4cc37d9e80586
+EBUILD git-9999-r3.ebuild 19311 BLAKE2B 2cc3a3473836ba77a7440d71e51dcd0f5aa9cff22e84fd939db303e74910e8da3b33eabd93b36d95ba669203b9e7b94aaf11f194125b5ebf20574d9aa3b1440f SHA512 8eabe31ddd67d843071cf8bdb510a2a91ebac6f3b0c08456dd6e2e294c39f81ce432802b2cabd333babad42849ab15be484df09d0b50e22aedcefe59e07ca3d2
 EBUILD git-9999.ebuild 19309 BLAKE2B f38bc51a1e5f629336b88f1a4ca98bbe4d06219dcca0e5b0f86a4a4153c7457843108da243afd7d713a66b39af6bb541ba5dbbe40575fccea9729a7d7d33dc8f SHA512 dd5a983ab78ffc1426e784b8130f14a1ddefe4be08c02be1fb5dd43ff0454c0734bcd5f59a1502be9ee74e212454479962f873180e6eb8d973b683f22bd7bd0d
 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd
diff --git a/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch b/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch
new file mode 100644
index 000000000000..5a66a4c89be0
--- /dev/null
+++ b/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch
@@ -0,0 +1,48 @@
+From cfb3a47cada99d1bdccd08426f122ded2a63834e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Tue, 10 Apr 2018 15:36:41 +0200
+Subject: [PATCH] perl: fix installing modules from contrib
+
+Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules)
+removed a target that allowed Makefiles from contrib/ to get the correct
+install path. This introduces a new target for main Makefile and fixes
+installation for Mediawiki module.
+
+v2: Pass prefix as that can have influence as well, add single quotes
+    for _SQ variant.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ Makefile                   | 2 ++
+ contrib/mw-to-git/Makefile | 5 +++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2091f5f892cc8..75b9ad3b480cb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1973,6 +1973,8 @@ GIT-PERL-DEFINES: FORCE
+ 		echo "$$FLAGS" >$@; \
+ 	    fi
+ 
++perllibdir:
++	@echo '$(perllibdir_SQ)'
+ 
+ .PHONY: gitweb
+ gitweb:
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
+index a4b6f7a2cd412..4e603512a39fe 100644
+--- a/contrib/mw-to-git/Makefile
++++ b/contrib/mw-to-git/Makefile
+@@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/
+ INSTALL = install
+ 
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+-INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
+-                -s --no-print-directory instlibdir)
++INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \
++                -s --no-print-directory prefix=$(prefix) \
++                perllibdir=$(perllibdir) perllibdir)
+ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+ INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
+ 
diff --git a/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch b/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch
new file mode 100644
index 000000000000..2e213c00522a
--- /dev/null
+++ b/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch
@@ -0,0 +1,460 @@
+From 7b0d0d066a5f869f86f2be125d63ae98c1451feb Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Wed, 6 Jun 2018 16:25:13 +0200
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.12 to current git.git v1.8.4
+Forward-ported from v1.8.4 to v1.8.5.1
+Forward-ported from v1.8.5.3 to v1.9.0_rc3
+Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
+Forward-ported from v2.0.0_rc0 to v2.0.0
+Forward-ported from v2.0.0 to v2.2.2
+Forward-ported from v2.2.2 to v2.8.4
+Forward-ported from v2.8.4 to v2.10.0
+Forward-ported from v2.10.0 to v2.12.0
+Forward-ported from v2.12.0 to v2.17.0-rc1
+Forward-ported from v2.17.0-rc1 to v2.18.0-rc1
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile                           | 49 ++++++++++++++++++++++--------
+ t/t9200-git-cvsexportcommit.sh     |  5 +++
+ t/t9400-git-cvsserver-server.sh    |  8 ++++-
+ t/t9401-git-cvsserver-crlf.sh      | 15 ++++++---
+ t/t9600-cvsimport.sh               | 41 ++++++++++++++++---------
+ t/t9601-cvsimport-vendor-branch.sh | 11 +++++++
+ t/t9602-cvsimport-branches-tags.sh | 11 +++++++
+ t/t9603-cvsimport-patchsets.sh     | 11 +++++++
+ t/test-lib.sh                      |  1 +
+ 9 files changed, 119 insertions(+), 33 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1d27f36365..b30a14e263 100644
+--- a/Makefile
++++ b/Makefile
+@@ -312,6 +312,8 @@ all::
+ # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
+ # and egrep that are pickier when their input contains non-ASCII data.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -589,6 +591,7 @@ LIB_OBJS =
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -626,12 +629,13 @@ SCRIPT_LIB += git-sh-i18n
+ 
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-p4.py
+ 
+ NO_INSTALL += git-remote-testgit
+@@ -639,24 +643,26 @@ NO_INSTALL += git-remote-testgit
+ # Generated files for scripts
+ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
+ SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
++SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS))
+ SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
+ 
+ SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
+ SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
++SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN))
+ SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
+ 
+ # Individual rules to allow e.g.
+ # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
+ # from subdirectories like contrib/*/
+ .PHONY: build-perl-script build-sh-script build-python-script
+-build-perl-script: $(SCRIPT_PERL_GEN)
++build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ build-sh-script: $(SCRIPT_SH_GEN)
+ build-python-script: $(SCRIPT_PYTHON_GEN)
+ 
+ .PHONY: install-perl-script install-sh-script install-python-script
+ install-sh-script: $(SCRIPT_SH_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+-install-perl-script: $(SCRIPT_PERL_INS)
++install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ install-python-script: $(SCRIPT_PYTHON_INS)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+@@ -665,12 +671,13 @@ install-python-script: $(SCRIPT_PYTHON_INS)
+ clean-sh-script:
+ 	$(RM) $(SCRIPT_SH_GEN)
+ clean-perl-script:
+-	$(RM) $(SCRIPT_PERL_GEN)
++	$(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ clean-python-script:
+ 	$(RM) $(SCRIPT_PYTHON_GEN)
+ 
+ SCRIPTS = $(SCRIPT_SH_INS) \
+ 	  $(SCRIPT_PERL_INS) \
++	  $(SCRIPT_PERL_CVS_INS) \
+ 	  $(SCRIPT_PYTHON_INS) \
+ 	  git-instaweb
+ 
+@@ -2076,13 +2083,27 @@ git.res: git.rc GIT-VERSION-FILE
+ 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
+ 
+ # This makes sure we depend on the NO_PERL setting itself.
+-$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
++$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS
++
++_SCRIPT_PERL_GEN =
++_SCRIPT_PERL_NOGEN =
+ 
+ # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX
+ # since the locale directory is injected.
+ perl_localedir_SQ = $(localedir_SQ)
+ 
+ ifndef NO_PERL
++_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN)
++
++ifndef NO_CVS
++_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN)
++else
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN)
++_REASON = NO_CVS
++_REASON_CONTENT = $(NO_CVS)
++endif # NO_CVS
++
++$(_SCRIPT_PERL_GEN):
+ PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
+ PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ)
+ 
+@@ -2103,7 +2124,7 @@ endif
+ 
+ PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
+ 
+-$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
++$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1{' \
+ 	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+@@ -2149,14 +2170,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb
++_REASON = NO_PERL
++_REASON_CONTENT = $(NO_PERL)
++endif # NO_PERL
++
++$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+-	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
++	    -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ # This makes sure we depend on the NO_PYTHON setting itself.
+ $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
+@@ -2396,7 +2421,7 @@ LOCALIZED_SH = $(SCRIPT_SH)
+ LOCALIZED_SH += git-parse-remote.sh
+ LOCALIZED_SH += git-rebase--interactive.sh
+ LOCALIZED_SH += git-sh-setup.sh
+-LOCALIZED_PERL = $(SCRIPT_PERL)
++LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS)
+ 
+ ifdef XGETTEXT_INCLUDE_TESTS
+ LOCALIZED_C += t/t0200/test.c
+diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
+index 1319415ba8..34ac8e28e2 100755
+--- a/t/t9200-git-cvsexportcommit.sh
++++ b/t/t9200-git-cvsexportcommit.sh
+@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 06742748e9..51d474d94b 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
+index 84787eee9a..eecba88527 100755
+--- a/t/t9401-git-cvsserver-crlf.sh
++++ b/t/t9401-git-cvsserver-crlf.sh
+@@ -57,15 +57,20 @@ check_status_options() {
+     return $stat
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
+index 804ce3850f..c53c50e432 100755
+--- a/t/t9600-cvsimport.sh
++++ b/t/t9600-cvsimport.sh
+@@ -8,14 +8,25 @@ if ! test_have_prereq NOT_ROOT; then
+ 	test_done
+ fi
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -47,23 +58,23 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -91,7 +102,7 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -102,7 +113,7 @@ test_expect_success PERL 'update git module' '
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -110,7 +121,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -119,7 +130,7 @@ test_expect_success PERL 'update cvs module' '
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -131,7 +142,7 @@ test_expect_success PERL 'cvsimport.module config works' '
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -140,7 +151,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -153,12 +164,12 @@ test_expect_success PERL 'import from a CVS working tree' '
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
+index 827d39f5bf..d730a41f67 100755
+--- a/t/t9601-cvsimport-vendor-branch.sh
++++ b/t/t9601-cvsimport-vendor-branch.sh
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
+index e1db323f54..68f097401f 100755
+--- a/t/t9602-cvsimport-branches-tags.sh
++++ b/t/t9602-cvsimport-branches-tags.sh
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
+index c4c3c49546..9b2957d4f0 100755
+--- a/t/t9603-cvsimport-patchsets.sh
++++ b/t/t9603-cvsimport-patchsets.sh
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure PERL 'import with criss cross times on revisions' '
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index 28315706be..6e2f99cdbb 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -1064,6 +1064,7 @@ case $uname_s in
+ esac
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+-- 
+2.17.1
+
diff --git a/dev-vcs/git/git-2.16.4.ebuild b/dev-vcs/git/git-2.16.4.ebuild
index e675a47660d5..3c560c003185 100644
--- a/dev-vcs/git/git-2.16.4.ebuild
+++ b/dev-vcs/git/git-2.16.4.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.17.1-r1.ebuild b/dev-vcs/git/git-2.17.1-r1.ebuild
new file mode 100644
index 000000000000..da380deae0b8
--- /dev/null
+++ b/dev-vcs/git/git-2.17.1-r1.ebuild
@@ -0,0 +1,717 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Net-SMTP-SSL
+		dev-perl/Authen-SASL
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso,perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.17.0_rc1-optional-cvs.patch
+
+	"${FILESDIR}"/git-2.17.0-mw_install_path_fix.patch #655960
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			NO_MKSTEMPS=YesPlease
+#		)
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=( NO_NSEC=YesPlease )
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=( NO_FNMATCH_CASEFOLD=YesPlease )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=( HAVE_GETDELIM=1 )
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=( ASCIIDOC8=YesPlease )
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=( NO_NSEC=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED%/}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED%/}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
+			"${ED%/}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ ${cvs} -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.17.1.ebuild b/dev-vcs/git/git-2.17.1.ebuild
deleted file mode 100644
index 5f55ce0d640b..000000000000
--- a/dev-vcs/git/git-2.17.1.ebuild
+++ /dev/null
@@ -1,715 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: pu
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
-	esac
-fi
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	perl? (
-		dev-perl/Error
-		dev-perl/MailTools
-		dev-perl/Net-SMTP-SSL
-		dev-perl/Authen-SASL
-		cgi? (
-			dev-perl/CGI
-			highlight? ( app-text/highlight )
-		)
-		cvs? (
-			>=dev-vcs/cvsps-2.1:0
-			dev-perl/DBI
-			dev-perl/DBD-SQLite
-		)
-		mediawiki? (
-			dev-perl/DateTime-Format-ISO8601
-			dev-perl/HTML-Tree
-			dev-perl/MediaWiki-API
-		)
-		subversion? (
-			dev-vcs/subversion[-dso,perl]
-			dev-perl/libwww-perl
-			dev-perl/TermReadKey
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	pcre-jit? ( pcre )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.17.0_rc1-optional-cvs.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-		$(usex cvs '' NO_CVS=YesPlease)
-		$(usex elibc_musl NO_REGEX=YesPlease '')
-		$(usex iconv '' NO_ICONV=YesPlease)
-		$(usex nls '' NO_GETTEXT=YesPlease)
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-		$(usex python '' NO_PYTHON=YesPlease)
-		$(usex subversion '' NO_SVN_TESTS=YesPlease)
-		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
-		$(usex tk '' NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	elif use ppcsha1 ; then
-		myopts+=( PPC_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=( USE_LIBPCRE2=YesPlease )
-			extlibs+=" -lpcre2-8"
-		else
-			myopts+=(
-				USE_LIBPCRE1=YesPlease
-				NO_LIBPCRE1_JIT=YesPlease
-			)
-			extlibs+=" -lpcre"
-		fi
-	fi
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=(
-#			NO_MMAP=YesPlease
-#			NO_IPV6=YesPlease
-#			NO_STRLCPY=YesPlease
-#			NO_MEMMEM=YesPlease
-#			NO_MKDTEMP=YesPlease
-#			NO_MKSTEMPS=YesPlease
-#		)
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=( NO_NSEC=YesPlease )
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=( NO_FNMATCH_CASEFOLD=YesPlease )
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
-			myopts+=( HAVE_GETDELIM=1 )
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=( ASCIIDOC8=YesPlease )
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=( NO_NSEC=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		perllibdir="$(perl_get_raw_vendorlib)" \
-		sysconfdir="${EPREFIX}"/etc \
-		DESTDIR="${D}" \
-		GIT_TEST_OPTS="--no-color" \
-		OPTAR="$(tc-getAR)" \
-		OPTCC="$(tc-getCC)" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		pushd contrib/credential/osxkeychain &>/dev/null || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-		popd &>/dev/null || die
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use subversion ; then
-		pushd contrib/svn-fe &>/dev/null || die
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		popd &>/dev/null || die
-	fi
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		git_emake || die "emake git-credential-libsecret failed"
-		popd &>/dev/null || die
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake
-	use doc && git_emake doc
-	popd &>/dev/null || die
-
-	pushd contrib/diff-highlight &>/dev/null || die
-	git_emake
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake
-		popd &>/dev/null || die
-
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		pushd contrib/mw-to-git &>/dev/null || die
-		git_emake install
-		popd &>/dev/null || die
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	if use subversion ; then
-		pushd contrib/svn-fe &>/dev/null || die
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED%/}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-			if test -d "$d" ; then find "$d" \
-				-name .packlist \
-				-delete || die
-			fi
-		done
-	else
-		rm -rf "${ED%/}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
-			"${ED%/}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED%/}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=()
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ ${cvs} -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		[[ ${cvs} -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=${cvs}+1
-		[[ ${cvs} -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=${cvs}+1
-		if [[ ${cvs} -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.18.0_rc1.ebuild b/dev-vcs/git/git-2.18.0_rc1.ebuild
new file mode 100644
index 000000000000..18794ba729d1
--- /dev/null
+++ b/dev-vcs/git/git-2.18.0_rc1.ebuild
@@ -0,0 +1,715 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Net-SMTP-SSL
+		dev-perl/Authen-SASL
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso,perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			NO_MKSTEMPS=YesPlease
+#		)
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=( NO_NSEC=YesPlease )
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=( NO_FNMATCH_CASEFOLD=YesPlease )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=( HAVE_GETDELIM=1 )
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=( ASCIIDOC8=YesPlease )
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=( NO_NSEC=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED%/}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED%/}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
+			"${ED%/}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ ${cvs} -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 1fb66925cbfb..7dfb5f64b1ac 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -137,7 +137,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.17.0_rc1-optional-cvs.patch
+	"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
 
 	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 1fb66925cbfb..7dfb5f64b1ac 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -137,7 +137,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.17.0_rc1-optional-cvs.patch
+	"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
 
 	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 259fc34ecd4e..c810b8798e3a 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -137,7 +137,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.17.0_rc1-optional-cvs.patch
+	"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
 
 	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 75838da6986a..49772aba8661 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -3,9 +3,11 @@ AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb40
 AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7
 DIST mercurial-4.5.2.tar.gz 5779915 BLAKE2B 9abc5a8bafc43bc8e930bb51aa2e57397cd5858dc7bb31d9a37795a4e2799dc03b57130b23e29f89a07bd7502f136594a03d1a4bd5dfd04e2e968213b50413da SHA512 f70e40cba72b7955f0ecec9c1f53ffffac26f206188617cb182e22ce4f43dc8b970ce46d12c516ef88480c3fa076a59afcddd736dffb642d8e23befaf45b4941
 DIST mercurial-4.5.3.tar.gz 5884837 BLAKE2B 61e61624cb397786b7a4f6ed62a3ba0c2ed7cbacc5918341d014a7e0fd9bbe07c91def00539411e71d231d18060de8461bef05590626bf1318691f791e0ad2b5 SHA512 9c23ffefb0a194b5a88ee783186347c21e7d973524ba40119439702953b35b01ad6fbc32ce09ae169f1020963e92312a39321b1da3ffe06db1d44158761abbec
+DIST mercurial-4.6.1.tar.gz 6407380 BLAKE2B 02663a11c56bbd05f123a0903463d7e95cdf3f2e553b0f81b365b4ca296c15bccd735487162870a4e38253c6c0cb1d8f0cf1bbb1b05b3c3b721f2209e4e1b2ec SHA512 0c7737ca803691b135b4906cc527b20595e314009096d8a19f37814ee192b182e7c5360fbf993f632d6071da1f9fca38677e7190c14ed92bafa8add72a4a27d9
 DIST mercurial-4.6.tar.gz 6226745 BLAKE2B 9304fff7f6cc67523e9d1c36aee110f2cfbcf2f059f45072e9175b6cb057273ff13e5823bc7831ac04de2e40b54fa660051861d42426c85b0a62b2c759aaff60 SHA512 2a7e94a338727afc97aab9c33ce4810a17088f5f477a83b581dcbf594e455062e69e6a3782f1665b24ffc011963b0eead6f7e637a63f241d256378d30b006c45
 EBUILD mercurial-4.5.2.ebuild 3547 BLAKE2B f472141575aef5f6091625beeb30674e29b3d18e72887045c0e1f70914f285613317f6549679a695f13eda3f8b9af51a0b1270108355394f0ac49de4e76bdbc0 SHA512 04604379d7d11c530bf178f0b316160f0fbfd76ea0aeca5a806482c780a8142109fa23d43383f25f195421f3eacc9217a2dd58128ed2cad45deb1d730cbeb585
 EBUILD mercurial-4.5.3.ebuild 3556 BLAKE2B 97bf79f486cfeaa783c170df4d8460294073eb6a7c5ad6f79faa42bb78c8e35daff20e48d5248ee845f73d3fa231580f2acff63a0104befb900e8dcb08ec143e SHA512 9fb21045a85f89cda4641224ca3b5e8ee7320004b25b2eb134b66c7e25daa93fbfecd23def0ad2bec5b006372eb67bd3d093fa9eac6c62b68153907706b7044b
+EBUILD mercurial-4.6.1.ebuild 3556 BLAKE2B 97bf79f486cfeaa783c170df4d8460294073eb6a7c5ad6f79faa42bb78c8e35daff20e48d5248ee845f73d3fa231580f2acff63a0104befb900e8dcb08ec143e SHA512 9fb21045a85f89cda4641224ca3b5e8ee7320004b25b2eb134b66c7e25daa93fbfecd23def0ad2bec5b006372eb67bd3d093fa9eac6c62b68153907706b7044b
 EBUILD mercurial-4.6.ebuild 3556 BLAKE2B 97bf79f486cfeaa783c170df4d8460294073eb6a7c5ad6f79faa42bb78c8e35daff20e48d5248ee845f73d3fa231580f2acff63a0104befb900e8dcb08ec143e SHA512 9fb21045a85f89cda4641224ca3b5e8ee7320004b25b2eb134b66c7e25daa93fbfecd23def0ad2bec5b006372eb67bd3d093fa9eac6c62b68153907706b7044b
 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08
 MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1
diff --git a/dev-vcs/mercurial/mercurial-4.6.1.ebuild b/dev-vcs/mercurial/mercurial-4.6.1.ebuild
new file mode 100644
index 000000000000..55a97bb048ec
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-4.6.1.ebuild
@@ -0,0 +1,134 @@
+# 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="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/{win32,macosx} || die
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
+	                  *.el mercurial.spec)
+	for f in ${RM_CONTRIB[@]}; do
+		rm -r contrib/$f || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	#rm -f test-doctest*		# doctest always fails with python 2.5.x
+	rm -f test-largefiles*		# tends to time out
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 948c0d205ecb..bb3531ba8365 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -8,5 +8,5 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5b
 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
 EBUILD subversion-1.10.0.ebuild 15262 BLAKE2B 92a42536e15078a4464f366519f5c0a42fce4652d63c2c9a0145f7b34b925e57c03b5be32bb36b8ac45b2327f85a29b138cc0ad3d5aa9cb6efb1d6bc5ed2f02a SHA512 243b80ca51facd09d2a05847c53895c1a51677daeedfbc098745ab20b55cea2e1539c990909c097a8a942ca40fe726342c02c0c17bc6c6038c8f7ad08643a2c3
-EBUILD subversion-1.9.7-r1.ebuild 15816 BLAKE2B 29b2a237fe4bb7194a02be3a4926ad076e70cfaeb6240b1039aeadb71a2d6b42bb828f1a84acf623b38445772393f871795d08dc5cca73b3c911a38f747545da SHA512 5ad645eff753a18762b3daae71edd906be7e4a63e969614d4564d64a3a7ee11b78b834e88cd591bfd97ff294ecce52726c5ca21e7cf7f87be586cf0dc8ac8682
+EBUILD subversion-1.9.7-r1.ebuild 15815 BLAKE2B 22d899a6f52135775822749a9b2ffbf1cfe02bc80e3565265d1b4afc8bec0c57d7c956b75ed404ced7a6726daa77b1be2c2889c8b01407aec31ee52cb91c5573 SHA512 00c23e222b0a27e9a0239be4eeaa87706402c6bad5c4d8b5202bf21e4d7ff5c564848fffbcf2cea827b16e7b319215b2d2bf420e0c793ad607c81b040f75a2dd
 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
index 69472a20eacb..6f65e8a0b77d 100644
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~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 ~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="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index e956f665ea4f..961a61728733 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,6 +1,8 @@
 AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d91932b2057be81063b55ee93d94c62806e3e9abd3e2392358b0527c7e29f59caa849f3928ebd17352c92296ba31fb SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03
 AUX svn2git-1.0.2.1-include-path.patch 641 BLAKE2B 4df6dbbb8935377355cf9fa35c005e349f5ce5b7d7decb7fb5038db5b70bff25aa1ff91b345c1f3b3d9a3c4a7c566417a49b4385a7f7e6660dcd54f528990210 SHA512 2be52266425ba4b287eb5adde4f2a643759a65b5ece00a7ef1982256dc0f460c069afd4b7d4aee63f2e4a99ebcaabc6f24b5688dd939cb172f333c2d4755a36f
 DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9
+DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359
 EBUILD svn2git-1.0.11-r1.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
-EBUILD svn2git-9999.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
+EBUILD svn2git-1.0.12.ebuild 1103 BLAKE2B 964d3ac156984cb4feac87159b5e9ef63bbdd2e7669fab10da459a69a9128f9c22e9ead763eed9b1fab88febaf68572be6fc231d1d79e489ad49ce4543467c5c SHA512 062419fe42725915a9c3fa5de76fe2dc9f709785ce6e909beea831a9b3db1f21eea3708a1918cffd5a59e35ca7119da7d0e276146be6d0be55969b6f4997b2e1
+EBUILD svn2git-9999.ebuild 1087 BLAKE2B 8eab32efa9f4e0a54a6a071a26bdd3aface14ffb0d6b9d621545d23b7f81fc9db41f2c299238191b40401dd2eec0b7bc010d26867705c39df4df03834beb9ce2 SHA512 36acedf8fe41f50789da0ecad078d6335ba50c10cf14eea2220ab9afa6a3c170a41cdec83acd8d6281bcd8abb3ef497917037bf95e2fcff2a778e6fb29dea508
 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
diff --git a/dev-vcs/svn2git/svn2git-1.0.12.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
new file mode 100644
index 000000000000..ab7c62035ef9
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Tool for one-time conversion from svn to git"
+HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
+else
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=( README.md )
+
+src_configure() {
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+		VERSION=${PV}
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/${PN}/samples
+	doins samples/*.rules || die 'doins failed'
+	dobin svn-all-fast-export || die 'dobin failed'
+	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+}
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index 0fd35c4b742f..77393d1e3fbe 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -28,20 +28,13 @@ RDEPEND="${DEPEND}
 
 DOCS=( README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
-
-src_prepare() {
-	# Note: patching order matters
-	default
-
-	if [[ "${PV}" != "9999" ]]; then
-		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
-		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
-	fi
-}
-
 src_configure() {
-	eqmake5 fast-export2.pro
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
 }
 
 src_install() {
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index a52004e54ebe..a6e9677f752b 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,10 +1,4 @@
-DIST tig-2.2.2.tar.gz 1046910 BLAKE2B b88b48fd24257f32a5892a8a60cf13a51e553c4f0e18918e36fc6afea68befa6d12155f143bcebf37e1beab513cf1a39d50254ac76e406d97b5552389c048222 SHA512 e43cf8b4e7938342b581a1238222d5cbf62e242208cd65fc9b3261c4076b7c60c182f9a80613538fcf8b50187cc2844c22f6d1aeaaa8b23864670667a91dbfcd
-DIST tig-2.3.0.tar.gz 1080956 BLAKE2B 48eaa4803a189df8dd8456b58687d4a7cd3b13c003165fba3f705a3e15eb19d4d1e23f9cc1306c5463e21501ee547ce9551c2278d10a6b069cb49e7af93d449f SHA512 d5e8bf04689fdbeab4f2ee60eef1e8e7686827228dc2f87b20c40a3a1c31aa3476d5088423ba8bcb72616a9f0f211a2dbb631a72cc946553e41cb225ea60ab37
-DIST tig-2.3.2.tar.gz 1083036 BLAKE2B 382e17486e79348b72ec67b71db2c09276262b8a9b092e657814f9d3693f2c70c46dc54a7b05ef890497f55fbc41f2232603c936f16d26a0c4d9b73d0d9281fc SHA512 092e1ea876b077a5026ee7b820e908d1d7aaa340805eb4ff975791f88ba1983eab13af669f5e663b28dfdd9e014cb92ef8c164a335705b777be417e3a7d1d5fb
 DIST tig-2.3.3.tar.gz 1082818 BLAKE2B 0e9bcd02726b004c233a5efd7f58e4fda478dc1d2b738a7f8c086a3d71807d319ac8bd296b0f7c7569ed69a5b2b1db18e5c957cc5ce890a67b8f6ee7ead29551 SHA512 1d1cdf7184eeb3fea301c1959023f4aa97c4f8e25fc96cd61933ca39cf7549b6c7e1d9517f7ffd45d212ae9542ea4be07370b41c623cf6d0db8d025634b1d6d1
-EBUILD tig-2.2.2.ebuild 1242 BLAKE2B 9467f9b83664ace378deaed3ff4083515b8d027f67a018a7c82e554e22a0dd6bb5a86c49a78bda76bbfb857a1d0bbf15ba6fc974c58ca2384212d42e45b9bcb7 SHA512 a42a3cf7b2c4b77f7ab8079092b093d1ba83434263a2cf35278466b2bd50edd3165514ac87f6928ea0356e233880bd6ee38d0e6213c70e45090e293a406094cc
-EBUILD tig-2.3.0.ebuild 1247 BLAKE2B 01007fd3d5d4f56aefda7ad21e9df0ef141b8f292e8692f30f5ea0b4b2acfaed4bdcb0c2356a206c85c0103d212d3806ada0ddfcc158c39118b9a2147f6843f5 SHA512 f72db9554da8ad7d348a8c71b0a0e5d8d58ed07f8f2d933df6572e0450dfb26ac1fb49bfcf724a650a264c47bd7833914681b934b2e9719a1b6a057f8f97ead2
-EBUILD tig-2.3.2.ebuild 1247 BLAKE2B 01007fd3d5d4f56aefda7ad21e9df0ef141b8f292e8692f30f5ea0b4b2acfaed4bdcb0c2356a206c85c0103d212d3806ada0ddfcc158c39118b9a2147f6843f5 SHA512 f72db9554da8ad7d348a8c71b0a0e5d8d58ed07f8f2d933df6572e0450dfb26ac1fb49bfcf724a650a264c47bd7833914681b934b2e9719a1b6a057f8f97ead2
 EBUILD tig-2.3.3.ebuild 1319 BLAKE2B c910552b030958a43c583f0d745c972b6817fe9ef0840409e283f8ec7c3d28b88dfccbf33cf66c4cfeca3247b046c9d70835c01986281af934ed4ed00c53696e SHA512 22997fc3b229a3ca78eee445d4a6761b6bfdb9a379f62d091c57afb17928441f0dc0b2829d48acf3ce474b0785037ad093a4cef5c07813d8fb7169311c6518d1
 EBUILD tig-9999.ebuild 1322 BLAKE2B 6f0cd425ccbe143e45fa5934b2340560a1cad00863cd4691cfb062b745d3f2a8f67672e2e112943d096df23297e11c457d6223e05036780a70cac977591d9302 SHA512 22c37d4453001599b3c7e2cd57da25cb29ac00f44538a916ce1b5cc1c0c95b0e8847a0d5c5223f5fe797355c2c64343eb33dabd34fe84d25ae74a7b26117bafb
 MISC metadata.xml 330 BLAKE2B b73d4c5a79937e78cff86c138950085a6c69ed2b28c8615d37065c7143df047237c014e8c3306b795a3b4fb64a4584fe06bf23d41caa75138f5d6ca07eb75b22 SHA512 bc921303a62d48f0b1b9792df22bf54c1555545c17a2c44a4f946b800c012067cc122011f7735b0f44d0275279450d6290970f127132dc6947ebe09fcba83e98
diff --git a/dev-vcs/tig/tig-2.2.2.ebuild b/dev-vcs/tig/tig-2.2.2.ebuild
deleted file mode 100644
index 04cf7cfbec0e..000000000000
--- a/dev-vcs/tig/tig-2.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-
-DESCRIPTION="text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="unicode"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	docinto examples
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tig/tig-2.3.0.ebuild b/dev-vcs/tig/tig-2.3.0.ebuild
deleted file mode 100644
index 9f6f0769818e..000000000000
--- a/dev-vcs/tig/tig-2.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-
-DESCRIPTION="A text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="unicode"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	docinto examples
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tig/tig-2.3.2.ebuild b/dev-vcs/tig/tig-2.3.2.ebuild
deleted file mode 100644
index 9f6f0769818e..000000000000
--- a/dev-vcs/tig/tig-2.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-
-DESCRIPTION="A text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="unicode"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	docinto examples
-	dodoc contrib/*.tigrc
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 0722b4a4b9f8..0827dd660ffd 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 9a66ec58ce50..0f07a3ef1f7e 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -65,24 +65,24 @@
 # files by dodoc in src_install().
 
 inherit elisp-common
+case ${EAPI:-0} in
+	0|1|2|3|4|5) inherit epatch ;;
+	6|7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+esac
 
 case ${EAPI:-0} in
-	0|1)
-		inherit epatch
-		EXPORT_FUNCTIONS src_{unpack,compile,install} \
-			pkg_{setup,postinst,postrm} ;;
-	2|3|4|5)
-		inherit epatch
-		EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
+	0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \
 			pkg_{setup,postinst,postrm} ;;
-	6|7)
-		EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
+	*) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
 			pkg_{setup,postinst,postrm} ;;
-	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
 esac
 
-DEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
-RDEPEND="${DEPEND}"
+RDEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6) DEPEND="${RDEPEND}" ;;
+	*) BDEPEND="${RDEPEND}" ;;
+esac
 
 # @FUNCTION: elisp_pkg_setup
 # @DESCRIPTION:
diff --git a/eclass/gnatbuild-r1.eclass b/eclass/gnatbuild-r1.eclass
deleted file mode 100644
index 236a9aa1ce16..000000000000
--- a/eclass/gnatbuild-r1.eclass
+++ /dev/null
@@ -1,1102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# Removal on 2018-05-18.
-
-# Author: George Shapovalov <george@gentoo.org>
-# Author: Steve Arnold <nerdboy@gentoo.org>
-# No maintainer <maintainer-needed@gentoo.org>
-#
-# Notes:
-#  HOMEPAGE and LICENSE are set in appropriate ebuild, as
-#  gnat is developed by FSF and AdaCore "in parallel"
-#
-# The following vars can be set in ebuild before inheriting this eclass. They
-# will be respected:
-#  SLOT
-#  BOOT_SLOT - where old bootstrap is used as it works fine for 4.4 - 4.6
-
-#WANT_AUTOMAKE="1.8"
-#WANT_AUTOCONF="2.1"
-
-inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator
-
-FEATURES=${FEATURES/multilib-strict/}
-
-EXPORTED_FUNCTIONS="pkg_setup pkg_postinst pkg_postrm src_unpack src_configure src_compile src_install"
-
-EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
-
-IUSE="nls openmp hardened multilib"
-# multilib is supported via profiles now, multilib usevar is deprecated
-
-RDEPEND="virtual/libiconv
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-gnat-1.5
-	>=sys-libs/glibc-2.12
-	>=sys-devel/binutils-2.23
-	sys-devel/bc
-	>=sys-devel/bison-1.875
-	>=sys-devel/flex-2.5.4
-	nls? ( sys-devel/gettext )"
-
-# Note!
-# It may not be safe to source this at top level. Only source inside local
-# functions!
-GnatCommon="/usr/share/gnat/lib/gnat-common.bash"
-
-#---->> globals and SLOT <<----
-
-# just a check, this location seems to vary too much, easier to track it in
-# ebuild
-#[ -z "${GNATSOURCE}" ] && die "please set GNATSOURCE in ebuild! (before inherit)"
-
-# versioning
-# because of gnatpro/gnatgpl we need to track both gcc and gnat versions
-
-# these simply default to $PV
-GNATMAJOR=$(get_version_component_range 1)
-GNATMINOR=$(get_version_component_range 2)
-GNATBRANCH=$(get_version_component_range 1-2)
-GNATRELEASE=$(get_version_component_range 1-3)
-# this one is for the gnat-gpl which is versioned by gcc backend and ACT version
-# number added on top
-ACT_Ver=$(get_version_component_range 4)
-
-# GCCVER and SLOT logic
-#
-# I better define vars for package names, as there was discussion on proper
-# naming and it may change
-PN_GnatGCC="gnat-gcc"
-PN_GnatGpl="gnat-gpl"
-
-# ATTN! GCCVER stands for the provided backend gcc, not the one on the system
-# so tc-* functions are of no use here. The present versioning scheme makes
-# GCCVER basically a part of PV, but *this may change*!!
-#
-# GCCVER can be set in the ebuild.
-[[ -z ${GCCVER} ]] && GCCVER="${GNATRELEASE}"
-
-
-# finally extract GCC version strings
-GCCMAJOR=$(get_version_component_range 1 "${GCCVER}")
-GCCMINOR=$(get_version_component_range 2 "${GCCVER}")
-GCCBRANCH=$(get_version_component_range 1-2 "${GCCVER}")
-GCCRELEASE=$(get_version_component_range 1-3 "${GCCVER}")
-
-# SLOT logic, make it represent gcc backend, as this is what matters most
-# There are some special cases, so we allow it to be defined in the ebuild
-# ATTN!! If you set SLOT in the ebuild, don't forget to make sure that
-# BOOT_SLOT is also set properly!
-[[ -z ${SLOT} ]] && SLOT="${GCCBRANCH}"
-
-# possible future crosscompilation support
-export CTARGET=${CTARGET:-${CHOST}}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Bootstrap CTARGET and SLOT logic. For now BOOT_TARGET=CHOST is "guaranteed" by
-# profiles, so mostly watch out for the right SLOT used in the bootstrap.
-# As above, with SLOT, it may need to be defined in the ebuild
-BOOT_TARGET=${CTARGET}
-[[ -z ${BOOT_SLOT} ]] && BOOT_SLOT=${SLOT}
-
-# for newer bootstrap starting with 4.9 (still experimental)
-BOOT_VER=${GCCRELEASE}
-
-# set our install locations
-PREFIX=${GNATBUILD_PREFIX:-/usr} # not sure we need this hook, but may be..
-LIBPATH=${PREFIX}/$(get_libdir)/${PN}/${CTARGET}/${SLOT}
-LIBEXECPATH=${PREFIX}/libexec/${PN}/${CTARGET}/${SLOT}
-INCLUDEPATH=${LIBPATH}/include
-BINPATH=${PREFIX}/${CTARGET}/${PN}-bin/${SLOT}
-DATAPATH=${PREFIX}/share/${PN}-data/${CTARGET}/${SLOT}
-# ATTN! the one below should match the path defined in eselect-gnat module
-CONFIG_PATH="/usr/share/gnat/eselect"
-gnat_profile="${CTARGET}-${PN}-${SLOT}"
-gnat_config_file="${CONFIG_PATH}/${gnat_profile}"
-
-# ebuild globals
-if [[ ${PN} == "${PN_GnatPro}" ]] && [[ ${GNATMAJOR} == "3" ]]; then
-		DEPEND="x86? ( >=app-shells/tcsh-6.0 )"
-fi
-S="${WORKDIR}/gcc-${GCCVER}"
-
-# bootstrap globals, common to src_unpack and src_compile
-GNATBOOT="${WORKDIR}/usr"
-GNATBUILD="${WORKDIR}/build"
-#GNATBUILD="${BUILD_DIR}"
-
-# necessary for detecting lib locations and creating env.d entry
-#XGCC="${GNATBUILD}/gcc/xgcc -B${GNATBUILD}/gcc"
-
-#----<< globals and SLOT >>----
-
-# set SRC_URI's in ebuilds for now
-
-#----<< global toolchain vars >>----
-
-: ${TARGET_ABI:=${ABI}}
-: ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}}
-: ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}}
-
-
-#---->> specs + env.d logic <<----
-# TODO!!!
-# set MANPATH, etc..
-#----<< specs + env.d logic >>----
-
-
-#---->> some helper functions <<----
-tc_version_is_at_least() {
-	version_is_at_least "$1" "${2:-${GCCBRANCH}}"
-}
-
-guess_patch_type_in_dir() {
-	[[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \
-		&& EPATCH_SUFFIX="patch.bz2" \
-		|| EPATCH_SUFFIX="patch"
-}
-
-# configure to build with the hardened GCC specs as the default
-make_gcc_hard() {
-	# we want to be able to control the pie patch logic via something other
-	# than ALL_CFLAGS...
-	sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
-		-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
-		-i "${S}"/gcc/Makefile.in
-	# Need to add HARD_CFLAGS to ALL_CXXFLAGS on >= 4.7
-	if tc_version_is_at_least 4.7 ; then
-		sed -e '/^ALL_CXXFLAGS/iHARD_CFLAGS = ' \
-                        -e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \
-                        -i "${S}"/gcc/Makefile.in
-	fi
-
-	# defaults to enable for new gnatbuild
-	if use hardened ; then
-		gcc_hard_flags=" -DEFAULT_PIE_SSP"
-	else
-		gcc_hard_flags+=" -DEFAULT_SSP"
-	fi
-
-	sed -i \
-		-e "/^HARD_CFLAGS = /s|=|= ${gcc_hard_flags} |" \
-		"${S}"/gcc/Makefile.in || die
-
-}
-
-gcc-multilib-configure() {
-	if ! is_multilib ; then
-		confgcc="${confgcc} --disable-multilib"
-		# Fun times: if we are building for a target that has multiple
-		# possible ABI formats, and the user has told us to pick one
-		# that isn't the default, then not specifying it via the list
-		# below will break that on us.
-	else
-		confgcc="${confgcc} --enable-multilib"
-	fi
-
-	# translate our notion of multilibs into gcc's
-	local abi list
-	for abi in $(get_all_abis TARGET) ; do
-		local l=$(gcc-abi-map ${abi})
-		[[ -n ${l} ]] && list+=",${l}"
-	done
-	if [[ -n ${list} ]] ; then
-		case ${CTARGET} in
-		x86_64*)
-			tc_version_is_at_least 4.8 && confgcc="${confgcc} --with-multilib-list=${list:1}"
-			;;
-		esac
-	fi
-}
-
-gcc-abi-map() {
-	# Convert the ABI name we use in Gentoo to what gcc uses
-	local map=()
-	case ${CTARGET} in
-		mips*)   map=("o32 32" "n32 n32" "n64 64") ;;
-		x86_64*) map=("amd64 m64" "x86 m32" "x32 mx32") ;;
-	esac
-
-	local m
-	for m in "${map[@]}" ; do
-		l=( ${m} )
-	[[ $1 == ${l[0]} ]] && echo ${l[1]} && break
-	done
-}
-
-is_multilib() {
-	tc_version_is_at_least 3 || return 1
-	use multilib
-}
-
-## note: replaced with minspecs (sort of)
-#create_specs_file() {
-#	einfo "Creating a vanilla gcc specs file"
-#	"${WORKDIR}"/build/gcc/xgcc -dumpspecs > "${WORKDIR}"/build/vanilla.specs
-#}
-
-# eselect stuff taken straight from toolchain.eclass and greatly simplified
-add_profile_eselect_conf() {
-	local gnat_config_file=$1
-	local abi=$2
-	local var
-
-	echo >> "${D}/${gnat_config_file}"
-	if ! is_multilib ; then
-		echo "  ctarget=${CTARGET}" >> "${D}/${gnat_config_file}"
-	else
-		echo "[${abi}]" >> "${D}/${gnat_config_file}"
-		var="CTARGET_${abi}"
-		if [[ -n ${!var} ]] ; then
-			echo "  ctarget=${!var}" >> "${D}/${gnat_config_file}"
-		else
-			var="CHOST_${abi}"
-			if [[ -n ${!var} ]] ; then
-				echo "  ctarget=${!var}" >> "${D}/${gnat_config_file}"
-			else
-				echo "  ctarget=${CTARGET}" >> "${D}/${gnat_config_file}"
-			fi
-		fi
-	fi
-
-	var="CFLAGS_${abi}"
-	if [[ -n ${!var} ]] ; then
-		echo "  cflags=${!var}" >> "${D}/${gnat_config_file}"
-	fi
-}
-
-create_eselect_conf() {
-	local abi
-
-	dodir ${CONFIG_PATH}
-
-	echo "[global]" > "${D}/${gnat_config_file}"
-	echo "  version=${CTARGET}-${SLOT}" >> "${D}/${gnat_config_file}"
-	echo "  binpath=${BINPATH}" >> "${D}/${gnat_config_file}"
-	echo "  libexecpath=${LIBEXECPATH}" >> "${D}/${gnat_config_file}"
-	echo "  ldpath=${LIBPATH}" >> "${D}/${gnat_config_file}"
-	echo "  manpath=${DATAPATH}/man" >> "${D}/${gnat_config_file}"
-	echo "  infopath=${DATAPATH}/info" >> "${D}/${gnat_config_file}"
-	echo "  bin_prefix=${CTARGET}" >> "${D}/${gnat_config_file}"
-
-	for abi in $(get_all_abis) ; do
-		add_profile_eselect_conf "${gnat_config_file}" "${abi}"
-	done
-}
-
-should_we_eselect_gnat() {
-	# we only want to switch compilers if installing to / or /tmp/stage1root
-	[[ ${ROOT} == "/" ]] || return 1
-
-	# if the current config is invalid, we definitely want a new one
-	# Note: due to bash quirkiness, the following must not be 1 line
-	local curr_config
-	curr_config=$(eselect --colour=no gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0
-	[[ -z ${curr_config} ]] && return 0
-
-	# The logic is basically "try to keep the same profile if possible"
-
-	if [[ ${curr_config} == ${CTARGET}-${PN}-${SLOT} ]] ; then
-		return 0
-	else
-		elog "The current gcc config appears valid, so it will not be"
-		elog "automatically switched for you.  If you would like to"
-		elog "switch to the newly installed gcc version, do the"
-		elog "following:"
-		echo
-		elog "eselect gnat set <profile>"
-		echo
-		return 1
-	fi
-}
-
-# active compiler selection, called from pkg_postinst
-do_gnat_config() {
-	eselect gnat set ${CTARGET}-${PN}-${SLOT} &> /dev/null
-
-	elog "The following gnat profile has been activated:"
-	elog "${CTARGET}-${PN}-${SLOT}"
-	elog ""
-	elog "The compiler has been installed as gnatgcc, and the coverage testing"
-	elog "tool as gnatgcov."
-	elog ""
-	elog "Ada handling in Gentoo allows you to have multiple gnat variants"
-	elog "installed in parallel and automatically manage Ada libs."
-	elog "Please take a look at the Ada project page for some documentation:"
-	elog "http://www.gentoo.org/proj/en/prog_lang/ada/index.xml"
-}
-
-
-# Taken straight from the toolchain.eclass. Only removed the "obsolete hunk"
-#
-# The purpose of this DISGUSTING gcc multilib hack is to allow 64bit libs
-# to live in lib instead of lib64 where they belong, with 32bit libraries
-# in lib32. This hack has been around since the beginning of the amd64 port,
-# and we're only now starting to fix everything that's broken. Eventually
-# this should go away.
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
-disgusting_gcc_multilib_HACK() {
-	local config
-	local libdirs
-	if has_multilib_profile ; then
-		case $(tc-arch) in
-			amd64)
-				config="i386/t-linux64"
-				libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \
-			;;
-			ppc64)
-				config="rs6000/t-linux64"
-				libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \
-			;;
-		esac
-	else
-		die "Your profile is no longer supported by portage."
-	fi
-
-	einfo "updating multilib directories to be: ${libdirs}"
-	sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" "${S}"/gcc/config/${config}
-}
-
-
-#---->> pkg_* <<----
-gnatbuild-r1_pkg_setup() {
-	debug-print-function ${FUNCNAME} $@
-
-	# Setup variables which would normally be in the profile
-	if is_crosscompile ; then
-		multilib_env ${CTARGET}
-	fi
-
-	# we dont want to use the installed compiler's specs to build gnat!
-	unset GCC_SPECS
-	unset LANGUAGES #265283
-}
-
-gnatbuild-r1_pkg_postinst() {
-	if should_we_eselect_gnat; then
-		do_gnat_config
-	else
-		eselect gnat update
-	fi
-
-	# if primary compiler list is empty, add this profile to the list, so
-	# that users are not left without active compilers (making sure that
-	# libs are getting built for at least one)
-	elog
-	. ${GnatCommon} || die "failed to source common code"
-	if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then
-		echo "${gnat_profile}" > ${PRIMELIST}
-		elog "The list of primary compilers was empty and got assigned ${gnat_profile}."
-	fi
-	elog "Please edit ${PRIMELIST} and list there gnat profiles intended"
-	elog "for common use."
-}
-
-
-gnatbuild-r1_pkg_postrm() {
-	# "eselect gnat update" now removes the env.d file if the corresponding
-	# gnat profile was unmerged
-	eselect gnat update
-	elog "If you just unmerged the last gnat in this SLOT, your active gnat"
-	elog "profile got unset. Please check what eselect gnat show tells you"
-	elog "and set the desired profile"
-}
-#---->> pkg_* <<----
-
-#---->> src_* <<----
-
-# common unpack stuff
-gnatbuild-r1_src_unpack() {
-	debug-print-function ${FUNCNAME} $@
-
-	[ -z "$1" ] &&  gnatbuild-r1_src_unpack all
-
-	while [ "$1" ]; do
-	case $1 in
-		base_unpack)
-			unpack ${A}
-			pax-mark E $(find ${GNATBOOT} -name gnat1)
-
-			cd "${S}"
-			# patching gcc sources, following the toolchain
-			# first, the common patches
-			guess_patch_type_in_dir "${WORKDIR}"/patch
-			EPATCH_MULTI_MSG="Applying common Gentoo patches ..." \
-				epatch "${WORKDIR}"/patch
-			guess_patch_type_in_dir "${WORKDIR}"/piepatch
-			EPATCH_MULTI_MSG="Applying Gentoo PIE patches ..." \
-				epatch "${WORKDIR}"/piepatch
-
-			if [[ -d "${FILESDIR}"/patches ]] && [[ ! -z $(ls "${FILESDIR}"/patches/*.patch 2>/dev/null) ]] ; then
-				EPATCH_MULTI_MSG="Applying local Gentoo patches ..." \
-				epatch "${FILESDIR}"/patches/*.patch
-			fi
-			#
-			# then per SLOT
-			if [[ -d "${FILESDIR}"/patches/${SLOT} ]] && [[ ! -z $(ls "${FILESDIR}"/patches/${SLOT}/*.patch 2>/dev/null) ]] ; then
-				EPATCH_MULTI_MSG="Applying SLOT-specific Gentoo patches ..." \
-				epatch "${FILESDIR}"/patches/${SLOT}/*.patch
-			fi
-
-			# add hardening as per toolchain eclass
-			make_gcc_hard
-
-			# Replacing obsolete head/tail with POSIX compliant ones
-			ht_fix_file */configure
-
-#			if ! is_crosscompile && is_multilib && \
-#				[[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
-#					disgusting_gcc_multilib_HACK || die "multilib hack failed"
-#			fi
-
-			# Fixup libtool to correctly generate .la files with portage
-			cd "${S}"
-			elibtoolize --portage --shallow --no-uclibc
-
-			gnuconfig_update
-			# update configure files
-			einfo "Fixing misc issues in configure files"
-			for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
-				ebegin "  Updating ${f}"
-				patch "${f}" "${FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
-					|| eerror "Please file a bug about this"
-				eend $?
-			done
-
-			# apply global slot/path patch
-			EPATCH_MULTI_MSG="Adjusting default paths for gnat-gcc ..." \
-			epatch "${FILESDIR}"/${PN}-4.9.3-make-default-paths-match-slot.patch
-			sed -i -e "s|SLOT_MARKER|${BOOT_SLOT}|" "${S}"/gcc/Makefile.in
-
-			[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-
-#			this is only needed for gnat-gpl-4.1 and breaks for gnat-gcc, so
-#			this block was moved to corresponding ebuild
-#			pushd "${S}"/gnattools &> /dev/null
-#				eautoconf
-#			popd &> /dev/null
-		;;
-
-		common_prep)
-			# Prepare the gcc source directory
-			cd "${S}/gcc"
-			touch cstamp-h.in
-			touch ada/[es]info.h
-			touch ada/nmake.ad[bs]
-			# set the compiler name to gnatgcc
-			for i in `find ada/ -name '*.ad[sb]'`; do \
-				sed -i -e "s/\"gcc\"/\"gnatgcc\"/g" ${i}; \
-			done
-			# add -fPIC flag to shared libs for 3.4* backend
-			if [ "3.4" == "${GCCBRANCH}" ] ; then
-				cd ada
-				epatch "${FILESDIR}"/gnat-Make-lang.in.patch
-			fi
-
-			# gcc 4.3 sources seem to have a common omission of $(DESTDIR),
-			# that leads to make install trying to rm -f file on live system.
-			# As we do not need this rm, we simply remove the whole line
-			if [ "4.3" == "${GCCBRANCH}" ] ; then
-				sed -i -e "/\$(RM) \$(bindir)/d" "${S}"/gcc/ada/Make-lang.in
-			fi
-
-			find "${S}" -name Makefile.in \
-				-exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} +
-
-			mkdir -p "${GNATBUILD}"
-		;;
-
-		all)
-			gnatbuild-r1_src_unpack base_unpack common_prep
-		;;
-	esac
-	shift
-	done
-}
-
-# for now just dont run default configure
-gnatbuild-r1_src_configure() {
-	:
-}
-
-# it would be nice to split configure and make steps
-# but both need to operate inside specially tuned evironment
-# so just do sections for now (as in eclass section of handbook)
-# sections are: configure, make-tools, bootstrap,
-#  gnatlib_and_tools, gnatlib-shared
-gnatbuild-r1_src_compile() {
-	debug-print-function ${FUNCNAME} $@
-
-	if [[ -z "$1" ]]; then
-		gnatbuild-r1_src_compile all
-		return $?
-	fi
-
-	if [[ "all" == "$1" ]]
-	then # specialcasing "all" to avoid scanning sources unnecessarily
-		gnatbuild-r1_src_compile configure make-tools \
-			bootstrap gnatlib_and_tools gnatlib-shared
-
-	else
-		# Set some paths to our bootstrap compiler.
-		export PATH="${GNATBOOT}/bin:${PATH}"
-		# !ATTN! the bootstrap compilers have a very simplystic structure,
-		# so many paths are not identical to the installed ones.
-		# Plus it was simplified even more in new releases.
-		if [[ ${BOOT_SLOT} > 4.1 ]] ; then
-			case $(tc-arch) in
-				arm)
-					GNATLIB="${GNATBOOT}/lib/gcc/${BOOT_TARGET}/${BOOT_SLOT}"
-					;;
-				x86|amd64)
-					GNATLIB="${GNATBOOT}/lib/gcc/${BOOT_TARGET}/${BOOT_VER}"
-					;;
-				*)
-					GNATLIB="${GNATBOOT}/lib"
-					;;
-			esac
-		else
-			GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
-		fi
-
-		export CC="${GNATBOOT}/bin/gnatgcc"
-		export CXX="${GNATBOOT}/bin/gnatg++"
-		export LDFLAGS="${LDFLAGS}"
-		export CFLAGS="${CFLAGS}"
-		export CXXFLAGS="${CFLAGS}"
-		# CPATH is supposed to be applied for any language, thus
-		# superceding either of C/CPLUS/OBJC_INCLUDE_PATHs
-		export CPATH="${GNATLIB}/include"
-		LIB_DIR="${GNATLIB}"
-		LDFLAGS="${LDFLAGS} -L${GNATLIB}"
-
-		# additional vars from gnuada and elsewhere
-		export LIBRARY_PATH="${GNATLIB}"
-
-		STDCXX_INCDIR="${LIBPATH}/include/g++-v${SLOT/\.*/}"
-
-		export ADA_OBJECTS_PATH="${GNATLIB}/adalib"
-		export ADA_INCLUDE_PATH="${GNATLIB}/adainclude"
-
-		while [ "$1" ]; do
-		case $1 in
-			configure)
-				debug-print-section configure
-
-				# Configure gcc
-				local confgcc
-				confgcc="${confgcc} --host=${CHOST}"
-
-				# some cross-compile logic from toolchain
-				if is_crosscompile || tc-is-cross-compiler ; then
-					confgcc="${confgcc} --target=${CTARGET}"
-				fi
-				[[ -n ${CBUILD} ]] && confgcc="${confgcc} --build=${CBUILD}"
-
-				# Native Language Support
-				if use nls ; then
-					confgcc="${confgcc} --enable-nls --without-included-gettext"
-				else
-					confgcc="${confgcc} --disable-nls"
-				fi
-
-				# bug 586538: extra lto-wrapper dorks up system gcc
-				confgcc="${confgcc} --disable-lto"
-
-				# setup multilib abi stuff
-				gcc-multilib-configure
-
-				use hardened && confgcc="${confgcc} --enable-esp"
-
-				# reasonably sane globals (from toolchain)
-				# also disable mudflap and ssp
-				confgcc="${confgcc} \
-					--enable-languages="c,ada,c++" \
-					--with-gcc \
-					--with-system-zlib \
-					--enable-obsolete \
-					--enable-secureplt \
-					--disable-werror \
-					--enable-checking=release \
-					--enable-libstdcxx-time \
-					--disable-libmudflap \
-					--disable-libssp \
-					--disable-altivec \
-					--disable-fixed-point \
-					--disable-libgcj \
-					--disable-libcilkrts \
-					--disable-libquadmath \
-					--enable-libsanitizer \
-					--enable-targets=all \
-					--with-bugurl=https://bugs.gentoo.org/ \
-					--with-python-dir=${DATAPATH/$PREFIX/}/python"
-
-				if in_iuse openmp ; then
-					# Make sure target has pthreads support. #326757 #335883
-					# There shouldn't be a chicken&egg problem here as openmp won't
-					# build without a C library, and you can't build that w/out
-					# already having a compiler ...
-					if ! is_crosscompile || \
-						$(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
-					then
-						case $(tc-arch) in
-							arm)
-								confgcc="${confgcc} --disable-libgomp"
-								;;
-							*)
-								if use openmp ; then
-									confgcc="${confgcc} --enable-libgomp"
-								else
-									confgcc="${confgcc} --disable-libgomp"
-								fi
-								;;
-						esac
-					else
-						# Force disable as the configure script can be dumb #359855
-						confgcc="${confgcc} --disable-libgomp"
-					fi
-				else
-					# For gcc variants where we don't want openmp (e.g. kgcc)
-					confgcc="${confgcc} --disable-libgomp"
-				fi
-
-				# ACT's gnat-gpl does not like libada for whatever reason..
-				if tc_version_is_at_least 4.2 ; then
-					confgcc="${confgcc} --enable-libada"
-#				else
-#					einfo "ACT's gnat-gpl does not like libada, disabling"
-#					confgcc="${confgcc} --disable-libada"
-				fi
-
-				# set some specifics available in later versions
-				confgcc="${confgcc} --enable-shared"
-				if tc_version_is_at_least 4.7 ; then
-					einfo "setting gnat thread model"
-					confgcc="${confgcc} --enable-threads=posix"
-					confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada"
-				elif tc_version_is_at_least 4.3 ; then
-					confgcc="${confgcc} --enable-threads=gnat"
-					confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada"
-				else
-					confgcc="${confgcc} --enable-threads=posix"
-				fi
-
-				# harfloat vs soft
-				case $(tc-is-softfloat) in
-				yes)    confgcc="${confgcc} --with-float=soft" ;;
-				softfp) confgcc="${confgcc} --with-float=softfp" ;;
-				*)
-					# If they've explicitly opt-ed in, do hardfloat,
-					# otherwise let the gcc default kick in.
-					case ${CTARGET//_/-} in
-					*-hardfloat-*|*eabihf) confgcc="${confgcc} --with-float=hard" ;;
-					esac
-				esac
-
-				# multilib and arch support
-				case $(tc-arch) in
-				arm)
-					local a arm_arch=${CTARGET%%-*}
-					# Remove trailing endian variations first: eb el be bl b l
-					for a in e{b,l} {b,l}e b l ; do
-						if [[ ${arm_arch} == *${a} ]] ; then
-							arm_arch=${arm_arch%${a}}
-							break
-						fi
-					done
-					# Convert armv7{a,r,m} to armv7-{a,r,m}
-					[[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
-					# See if this is a valid --with-arch flag
-					if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch};
-					    . "${srcdir}"/config.gcc) &>/dev/null
-					then
-						confgcc="${confgcc} --with-arch=${arm_arch}"
-					fi
-
-					# Make default mode thumb for microcontroller classes #418209
-					[[ ${arm_arch} == *-m ]] && confgcc="${confgcc} --with-mode=thumb"
-
-					# Enable hardvfp
-					if [[ $(tc-is-softfloat) == "no" ]] && \
-					   [[ ${CTARGET} == armv[67]* ]]
-					then
-						# Follow the new arm hardfp distro standard by default
-						confgcc="${confgcc} --with-float=hard"
-						case ${CTARGET} in
-						armv6*) confgcc="${confgcc} --with-fpu=vfp" ;;
-						armv7*) confgcc="${confgcc} --with-fpu=vfpv3-d16" ;;
-						esac
-					fi
-					;;
-				mips)
-					# Add --with-abi flags to set default ABI
-					confgcc="${confgcc} --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI})"
-					;;
-				ppc)
-					# Set up defaults based on current CFLAGS
-					is-flagq -mfloat-gprs=double && confgcc="${confgcc} --enable-e500-double"
-					[[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc="${confgcc} --enable-e500-double"
-					;;
-				amd64)
-					if is_multilib ; then
-						confgcc="${confgcc} --enable-multilib"
-						if has x32 $(get_all_abis TARGET) ; then
-							confgcc="${confgcc} --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI})"
-						fi
-					else
-						confgcc="${confgcc} --disable-multilib"
-					fi
-					;;
-				x86)
-					confgcc="${confgcc} --with-arch=${CTARGET%%-*}"
-					confgcc="${confgcc} --disable-multilib"
-					;;
-				esac
-
-				# __cxa_atexit is "essential for fully standards-compliant handling of
-				# destructors", but apparently requires glibc.
-				if [[ ${CTARGET} == *-gnu* ]] ; then
-					confgcc="${confgcc} --enable-__cxa_atexit"
-					confgcc="${confgcc} --enable-clocale=gnu"
-				fi
-
-				export gcc_cv_lto_plugin=1  # okay to build, default to opt-in
-				export gcc_cv_prog_makeinfo_modern=no
-				export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries='
-				use hardened && export gcc_cv_libc_provides_ssp=yes
-
-				# need to strip graphite/lto flags or we'll get the
-				# dreaded C compiler cannot create executables...
-				# error.
-#				filter-flags -floop-interchange -floop-strip-mine -floop-block
-#				filter-flags -fuse-linker-plugin -flto*
-				strip-flags
-				replace-flags -O? -O2
-				filter-flags '-mabi*' -m31 -m32 -m64
-				filter-flags -frecord-gcc-switches
-				filter-flags -mno-rtm -mno-htm
-
-				# gold linker barfs on some arches/configs :/
-				#tc-ld-is-gold && tc-ld-disable-gold
-
-				case $(tc-arch) in
-					amd64|x86)
-						filter-flags '-mcpu=*'
-						;;
-					*)
-						;;
-				esac
-
-#				strip-unsupported-flags
-
-				STAGE1_CFLAGS="${CFLAGS} -fPIC"
-				use hardened && STAGE1_CFLAGS="-O2 -fPIC"
-				BOOT_CFLAGS="$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS} -fPIC"
-				is_crosscompile && BOOT_CFLAGS="-O2 -fPIC"
-
-				einfo "Environment vars:
-	CC=${CC},
-	CXX=${CXX},
-	CTARGET=${CTARGET}
-	ABI=${TARGET_DEFAULT_ABI},
-	TARGET_ABI=${TARGET_ABI}.
-	TARGET_MULTILIB_ABIS=${TARGET_MULTILIB_ABIS},
-	TARGET_DEFAULT_ABI=${TARGET_DEFAULT_ABI},
-	GCC_ABI=$(gcc-abi-map ${TARGET_DEFAULT_ABI})
-	ADA_OBJECTS_PATH=${ADA_OBJECTS_PATH},
-	ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH},
-	PATH=${PATH}"
-
-				confgcc="${confgcc} ${EXTRA_ECONF}"
-				einfo "Configuring with confgcc=${confgcc}"
-
-				pushd "${GNATBUILD}" > /dev/null
-				CC="${CC}" CXX="${CXX}" \
-					LDFLAGS="${LDFLAGS}" \
-					CFLAGS="${CFLAGS}" \
-					CXXFLAGS="${CFLAGS}" \
-					"${S}"/configure \
-					--prefix="${PREFIX}" \
-					--bindir="${BINPATH}" \
-					--includedir="${INCLUDEPATH}" \
-					--datadir="${DATAPATH}" \
-					--mandir="${DATAPATH}"/man \
-					--infodir="${DATAPATH}"/info \
-					--with-gxx-include-dir="${STDCXX_INCDIR}" \
-					--with-pkgversion="Gentoo Hardened ${GNATRELEASE} p${PATCH_VER}, pie-${PIE_VER}" \
-					${confgcc} || die "configure failed"
-				popd > /dev/null
-			;;
-
-			make-tools)
-				debug-print-section make-tools
-				# Compile helper tools
-				cd "${GNATBOOT}"
-				cp "${S}"/gcc/ada/xtreeprs.adb .
-				cp "${S}"/gcc/ada/xsinfo.adb   .
-				cp "${S}"/gcc/ada/xeinfo.adb   .
-				cp "${S}"/gcc/ada/xnmake.adb   .
-				cp "${S}"/gcc/ada/xutil.ad{s,b}   .
-				if (( ${GNATMINOR} > 5 )) ; then
-					cp "${S}"/gcc/ada/einfo.ad{s,b}  .
-					cp "${S}"/gcc/ada/csinfo.adb  .
-					cp "${S}"/gcc/ada/ceinfo.adb  .
-				fi
-
-				gnatmake xtreeprs  && \
-				gnatmake xsinfo  && \
-				gnatmake xeinfo  && \
-				gnatmake xnmake || die "building helper tools"
-
-				mv xeinfo xnmake xsinfo xtreeprs bin/
-			;;
-
-			bootstrap)
-				debug-print-section bootstrap
-				# and, finally, the build itself
-				# do we need this?  STAGE1_CFLAGS="${CFLAGS}"
-				# or this?  bootstrap-lean
-				# removing both to try --disable-bootstrap
-				pushd "${GNATBUILD}" >/dev/null
-
-				emake \
-					LDFLAGS="${LDFLAGS}" \
-					LIBPATH="${LIBPATH}" \
-					CC="${CC}" CXX="${CXX}" \
-					STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
-					LIBRARY_VERSION="${SLOT}" \
-					BOOT_CFLAGS="${BOOT_CFLAGS}" \
-					bootstrap-lean \
-					|| die "bootstrap failed"
-
-				popd >/dev/null
-			;;
-
-			gnatlib_and_tools)
-				debug-print-section gnatlib_and_tools
-				einfo "building gnatlib_and_tools"
-				cd "${GNATBUILD}"
-				emake -j1 -C gcc gnatlib_and_tools || \
-					die "gnatlib_and_tools failed"
-			;;
-
-			gnatlib-shared)
-				debug-print-section gnatlib-shared
-				einfo "building shared lib"
-				cd "${GNATBUILD}"
-				rm -f gcc/ada/rts/*.{o,ali} || die
-				#otherwise make tries to reuse already compiled (without -fPIC) objs..
-				emake -j1 -C gcc gnatlib-shared LIBRARY_VERSION="${SLOT}" || \
-					die "gnatlib-shared failed"
-			;;
-
-		esac
-		shift
-		done # while
-	fi   # "all" == "$1"
-}
-# -- end gnatbuild-r1_src_compile
-
-
-gnatbuild-r1_src_install() {
-	debug-print-function ${FUNCNAME} $@
-
-	if [[ -z "$1" ]] ; then
-		gnatbuild-r1_src_install all
-		return $?
-	fi
-
-	while [ "$1" ]; do
-	case $1 in
-	install) # runs provided make install
-		debug-print-section install
-
-		# Looks like we need an access to the bootstrap compiler here too
-		# as gnat apparently wants to compile something during the installation
-		# The spotted obuser was xgnatugn, used to process gnat_ugn_urw.texi,
-		# during preparison of the docs.
-		export PATH="${GNATBOOT}/bin:${PATH}"
-		if [[ ${BOOT_SLOT} > 4.1 ]] ; then
-			GNATLIB="${GNATBOOT}/lib"
-		elif [[ ${BOOT_SLOT} > 4.8 ]] ; then
-			GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_VER}"
-		else
-			GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
-		fi
-
-		export CC="${GNATBOOT}/bin/gnatgcc"
-		#export INCLUDE_DIR="${GNATLIB}/include"
-		#export C_INCLUDE_PATH="${GNATLIB}/include"
-		#export CPLUS_INCLUDE_PATH="${GNATLIB}/include"
-		export ADA_OBJECTS_PATH="${GNATLIB}/adalib"
-		export ADA_INCLUDE_PATH="${GNATLIB}/adainclude"
-
-		# Do not allow symlinks in /usr/lib/gcc/${CHOST}/${MY_PV}/include as
-		# this can break the build.
-		find "${GNATBUILD}"/\*gcc/include/ -type l -delete
-
-		# Remove generated headers, as they can cause things to break
-		# (ncurses, openssl, etc). (from toolchain.eclass)
-		for x in $(find "${WORKDIR}"/build/gcc/include/ -name '*.h') ; do
-			grep -q 'It has been auto-edited by fixincludes from' "${x}" \
-				&& rm -f "${x}"
-		done
-
-
-		cd "${GNATBUILD}"
-		make -j1 DESTDIR="${D}" install || die
-
-		find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
-		find "${D}" -name libiberty.a -delete
-
-		# Disable RANDMMAP so PCH works. #301299
-		pax-mark r "${D}${LIBEXECPATH}"/{gnat1,cc1,cc1plus}
-
-		# Quiet QA warnings, wait for adacore exec stack patch in gcc 7
-		#   (note: needs testing with hardened emulate trampolines)
-		#if use hardened ; then
-		#	pax-mark Emr "${D}"${BINPATH}/{gnatmake,gnatname,gnatls,gnatclean,gnat}
-		#else
-		#	export QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatname
-		#		${BINPATH:1}/gnatmake ${BINPATH:1}/gnatclean ${BINPATH:1}/gnat
-		#		${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so"
-		#fi
-#		export QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatname
-#			${BINPATH:1}/gnatmake ${BINPATH:1}/gnatclean ${BINPATH:1}/gnat"
-
-		use hardened && pax-mark E "${D}${BINPATH}"/{gnatmake,gnatname,gnatls,gnatclean,gnat}
-
-		if use doc ; then
-			if (( $(bc <<< "${GNATBRANCH} > 4.3") )) ; then
-				#make a convenience info link
-				ewarn "Yay!  Math works."
-				dosym gnat_ugn.info ${DATAPATH}/info/gnat.info
-			fi
-		fi
-		;;
-
-	move_libs)
-		debug-print-section move_libs
-
-		# first we need to remove some stuff to make moving easier
-		#rm -rf "${D}${LIBPATH}"/{32,include}
-		# gcc insists on installing libs in its own place
-		cp -a -t "${D}${LIBPATH}"/ "${D}${PREFIX}"/lib/gcc/"${CTARGET}/${GCCRELEASE}"/*
-		cp -a -t "${D}${LIBEXECPATH}"/ "${D}${PREFIX}"/libexec/gcc/"${CTARGET}/${GCCRELEASE}"/*
-		rm -rf "${D}${PREFIX}"/libexec/gcc
-
-		# libgcc_s  and, with gcc>=4.0, other libs get installed in multilib specific locations by gcc
-		# we pull everything together to simplify working environment
-		if is_multilib ; then
-			case $(tc-arch) in
-				amd64)
-					cp -a -t "${D}${LIBPATH}"/ "${D}${PREFIX}"/lib/"${PN}/${CTARGET}/${SLOT}"/*
-					mv -t "${D}${LIBPATH}"/32/ "${D}${PREFIX}"/lib32/*
-					mv -t "${D}${LIBPATH}"/ "${D}${PREFIX}"/lib64/lib*
-					rm -rf "${D}${PREFIX}"/lib "${D}${PREFIX}"/lib32
-				;;
-				ppc64)
-					# not supported yet, will have to be adjusted when we
-					# actually build gnat for that arch
-				;;
-			esac
-		else
-			# x86 cleanup (maybe arm)
-			mv -t "${D}${LIBPATH}"/ "${D}${PREFIX}/lib/gcc/${CTARGET}/${GCCRELEASE}"/*
-			mv -t "${D}${LIBPATH}"/ "${D}${PREFIX}"/lib/lib*
-			#mv -t "${D}${LIBPATH}"/include/ "${D}${LIBPATH}"/gcc/"${CTARGET}/${GCCRELEASE}"/include/*
-			rm -rf "${D}${PREFIX}"/lib/gcc
-			rm -rf "${D}${LIBPATH}"/gcc
-		fi
-
-		local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
-		pushd "${D}${LIBPATH}" >/dev/null
-		for py in $(find . -name '*-gdb.py') ; do
-			local multidir=${py%/*}
-			insinto "${gdbdir}/${multidir}"
-			sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die
-			doins "${py}" || die
-			rm "${py}" || die
-		done
-		popd >/dev/null
-		;;
-
-	cleanup)
-		debug-print-section cleanup
-
-		# force gnatgcc to use its own specs - versions prior to 3.4.6 read specs
-		# from system gcc location. Do the simple wrapper trick for now
-		# !ATTN! change this if eselect-gnat starts to follow eselect-compiler
-		cd "${D}${BINPATH}"
-		if [[ ${GCCVER} < 3.4.6 ]] ; then
-			# gcc 4.1 uses builtin specs. What about 4.0?
-			mv gnatgcc gnatgcc_2wrap
-			cat > gnatgcc << EOF
-#! /bin/bash
-# wrapper to cause gnatgcc read appropriate specs and search for the right .h
-# files (in case no matching gcc is installed)
-BINDIR=\$(dirname \$0)
-# The paths in the next line have to be absolute, as gnatgcc may be called from
-# any location
-\${BINDIR}/gnatgcc_2wrap -specs="${LIBPATH}/specs" -I"${LIBPATH}/include" \$@
-EOF
-			chmod a+x gnatgcc
-		else
-			local i
-			for i in cpp gcc gcov c++ g++ ; do
-				ln -s ${i} gnat${i}
-			done
-		fi
-
-		# earlier gnat's generate some Makefile's at generic location, need to
-		# move to avoid collisions
-		[ -f "${D}${PREFIX}"/share/gnat/Makefile.generic ] &&
-			mv "${D}${PREFIX}"/share/gnat/Makefile.* "${D}${DATAPATH}"
-
-		rm -rf "${D}${LIBPATH}"/install-tools "${D}${LIBEXECPATH}"/install-tools
-
-		# remove duplicate docs
-		rm -rf  "${D}${DATAPATH}"/info
-		rm -rf "${D}${DATAPATH}"/man
-
-		# fix .la path for lto plugin
-		[ -f "${D}${LIBEXECPATH}"/liblto_plugin.la ] &&
-			sed -i -e \
-				"/libdir=/c\libdir='${LIBEXECPATH}'" \
-				"${D}${LIBEXECPATH}"/liblto_plugin.la
-
-		# use gid of 0 because some stupid ports don't have
-		# the group 'root' set to gid 0 (toolchain.eclass)
-		chown -R root:0 "${D}${LIBPATH}" 2>/dev/null
-
-		# add hardening spec stuff
-		if use hardened ; then
-			insinto "${LIBPATH}"
-			doins "${WORKDIR}"/specs/*.specs || die "failed to install specs"
-		fi
-		;;
-
-	prep_env)
-		# instead of putting junk under /etc/env.d/gnat we recreate env files as
-		# needed with eselect
-		create_eselect_conf
-		;;
-
-	all)
-		# remove the move to test new install paths # move_libs
-		gnatbuild-r1_src_install install move_libs cleanup prep_env
-		;;
-	esac
-	shift
-	done # while
-}
-# -- end gnatbuild-r1_src_install
diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
deleted file mode 100644
index da72f554439d..000000000000
--- a/eclass/gnatbuild.eclass
+++ /dev/null
@@ -1,849 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# Removal on 2018-05-18.
-
-# Author: George Shapovalov <george@gentoo.org>
-# Author: Steve Arnold <nerdboy@gentoo.org>
-# No maintainer <maintainer-needed@gentoo.org>
-#
-# Notes:
-#  HOMEPAGE and LICENSE are set in appropriate ebuild, as
-#  gnat is developed by FSF and AdaCore "in parallel"
-#
-# The following vars can be set in ebuild before inheriting this eclass. They
-# will be respected:
-#  SLOT
-#  BOOT_SLOT - where old bootstrap is used as it works fine
-
-#WANT_AUTOMAKE="1.8"
-#WANT_AUTOCONF="2.1"
-
-inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator
-
-FEATURES=${FEATURES/multilib-strict/}
-
-EXPORT_FUNCTIONS="pkg_setup pkg_postinst pkg_postrm src_unpack src_configure src_compile src_install"
-
-IUSE="nls"
-# multilib is supported via profiles now, multilib usevar is deprecated
-
-RDEPEND="app-eselect/eselect-gnat
-	virtual/libiconv
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-gnat-1.3-r1
-	>=sys-libs/glibc-2.12
-	>=sys-devel/binutils-2.23
-	sys-devel/bc
-	>=sys-devel/bison-1.875
-	>=sys-devel/flex-2.5.4
-	nls? ( sys-devel/gettext )"
-
-# Note!
-# It may not be safe to source this at top level. Only source inside local
-# functions!
-GnatCommon="/usr/share/gnat/lib/gnat-common.bash"
-
-#---->> globals and SLOT <<----
-
-# just a check, this location seems to vary too much, easier to track it in
-# ebuild
-#[ -z "${GNATSOURCE}" ] && die "please set GNATSOURCE in ebuild! (before inherit)"
-
-# versioning
-# because of gnatpro/gnatgpl we need to track both gcc and gnat versions
-
-# these simply default to $PV
-GNATMAJOR=$(get_version_component_range 1)
-GNATMINOR=$(get_version_component_range 2)
-GNATBRANCH=$(get_version_component_range 1-2)
-GNATRELEASE=$(get_version_component_range 1-3)
-# this one is for the gnat-gpl which is versioned by gcc backend and ACT version
-# number added on top
-ACT_Ver=$(get_version_component_range 4)
-
-# GCCVER and SLOT logic
-#
-# I better define vars for package names, as there was discussion on proper
-# naming and it may change
-PN_GnatGCC="gnat-gcc"
-PN_GnatGpl="gnat-gpl"
-
-# ATTN! GCCVER stands for the provided backend gcc, not the one on the system
-# so tc-* functions are of no use here. The present versioning scheme makes
-# GCCVER basically a part of PV, but *this may change*!!
-#
-# GCCVER can be set in the ebuild.
-[[ -z ${GCCVER} ]] && GCCVER="${GNATRELEASE}"
-
-
-# finally extract GCC version strings
-GCCMAJOR=$(get_version_component_range 1 "${GCCVER}")
-GCCMINOR=$(get_version_component_range 2 "${GCCVER}")
-GCCBRANCH=$(get_version_component_range 1-2 "${GCCVER}")
-GCCRELEASE=$(get_version_component_range 1-3 "${GCCVER}")
-
-# SLOT logic, make it represent gcc backend, as this is what matters most
-# There are some special cases, so we allow it to be defined in the ebuild
-# ATTN!! If you set SLOT in the ebuild, don't forget to make sure that
-# BOOT_SLOT is also set properly!
-[[ -z ${SLOT} ]] && SLOT="${GCCBRANCH}"
-
-# possible future crosscompilation support
-export CTARGET=${CTARGET:-${CHOST}}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Bootstrap CTARGET and SLOT logic. For now BOOT_TARGET=CHOST is "guaranteed" by
-# profiles, so mostly watch out for the right SLOT used in the bootstrap.
-# As above, with SLOT, it may need to be defined in the ebuild
-BOOT_TARGET=${CTARGET}
-[[ -z ${BOOT_SLOT} ]] && BOOT_SLOT=${SLOT}
-
-# set our install locations
-PREFIX=${GNATBUILD_PREFIX:-/usr} # not sure we need this hook, but may be..
-LIBPATH=${PREFIX}/$(get_libdir)/${PN}/${CTARGET}/${SLOT}
-LIBEXECPATH=${PREFIX}/libexec/${PN}/${CTARGET}/${SLOT}
-INCLUDEPATH=${LIBPATH}/include
-BINPATH=${PREFIX}/${CTARGET}/${PN}-bin/${SLOT}
-DATAPATH=${PREFIX}/share/${PN}-data/${CTARGET}/${SLOT}
-# ATTN! the one below should match the path defined in eselect-gnat module
-CONFIG_PATH="/usr/share/gnat/eselect"
-gnat_profile="${CTARGET}-${PN}-${SLOT}"
-gnat_config_file="${CONFIG_PATH}/${gnat_profile}"
-
-
-# ebuild globals
-if [[ ${PN} == "${PN_GnatPro}" ]] && [[ ${GNATMAJOR} == "3" ]]; then
-		DEPEND="x86? ( >=app-shells/tcsh-6.0 )"
-fi
-S="${WORKDIR}/gcc-${GCCVER}"
-
-# bootstrap globals, common to src_unpack and src_compile
-GNATBOOT="${WORKDIR}/usr"
-GNATBUILD="${WORKDIR}/build"
-
-# necessary for detecting lib locations and creating env.d entry
-#XGCC="${GNATBUILD}/gcc/xgcc -B${GNATBUILD}/gcc"
-
-#----<< globals and SLOT >>----
-
-# set SRC_URI's in ebuilds for now
-
-#----<< support checks >>----
-# skipping this section - do not care about hardened/multilib for now
-
-#---->> specs + env.d logic <<----
-# TODO!!!
-# set MANPATH, etc..
-#----<< specs + env.d logic >>----
-
-
-#---->> some helper functions <<----
-is_multilib() {
-	[[ ${GCCMAJOR} < 3 ]] && return 1
-	case ${CTARGET} in
-		mips64*|powerpc64*|s390x*|sparc64*|x86_64*)
-			has_multilib_profile ;;
-		*)  false ;;
-	esac
-}
-
-# adapted from toolchain,
-# left only basic multilib functionality and cut off mips stuff
-
-create_specs_file() {
-	einfo "Creating a vanilla gcc specs file"
-	"${WORKDIR}"/build/gcc/xgcc -dumpspecs > "${WORKDIR}"/build/vanilla.specs
-}
-
-
-# eselect stuff taken straight from toolchain.eclass and greatly simplified
-add_profile_eselect_conf() {
-	local gnat_config_file=$1
-	local abi=$2
-	local var
-
-	echo >> "${D}/${gnat_config_file}"
-	if ! is_multilib ; then
-		echo "  ctarget=${CTARGET}" >> "${D}/${gnat_config_file}"
-	else
-		echo "[${abi}]" >> "${D}/${gnat_config_file}"
-		var="CTARGET_${abi}"
-		if [[ -n ${!var} ]] ; then
-			echo "  ctarget=${!var}" >> "${D}/${gnat_config_file}"
-		else
-			var="CHOST_${abi}"
-			if [[ -n ${!var} ]] ; then
-				echo "  ctarget=${!var}" >> "${D}/${gnat_config_file}"
-			else
-				echo "  ctarget=${CTARGET}" >> "${D}/${gnat_config_file}"
-			fi
-		fi
-	fi
-
-	var="CFLAGS_${abi}"
-	if [[ -n ${!var} ]] ; then
-		echo "  cflags=${!var}" >> "${D}/${gnat_config_file}"
-	fi
-}
-
-
-create_eselect_conf() {
-	local abi
-
-	dodir ${CONFIG_PATH}
-
-	echo "[global]" > "${D}/${gnat_config_file}"
-	echo "  version=${CTARGET}-${SLOT}" >> "${D}/${gnat_config_file}"
-	echo "  binpath=${BINPATH}" >> "${D}/${gnat_config_file}"
-	echo "  libexecpath=${LIBEXECPATH}" >> "${D}/${gnat_config_file}"
-	echo "  ldpath=${LIBPATH}" >> "${D}/${gnat_config_file}"
-	echo "  manpath=${DATAPATH}/man" >> "${D}/${gnat_config_file}"
-	echo "  infopath=${DATAPATH}/info" >> "${D}/${gnat_config_file}"
-	echo "  bin_prefix=${CTARGET}" >> "${D}/${gnat_config_file}"
-
-	for abi in $(get_all_abis) ; do
-		add_profile_eselect_conf "${gnat_config_file}" "${abi}"
-	done
-}
-
-
-
-should_we_eselect_gnat() {
-	# we only want to switch compilers if installing to / or /tmp/stage1root
-	[[ ${ROOT} == "/" ]] || return 1
-
-	# if the current config is invalid, we definitely want a new one
-	# Note: due to bash quirkiness, the following must not be 1 line
-	local curr_config
-	curr_config=$(eselect --colour=no gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0
-	[[ -z ${curr_config} ]] && return 0
-
-	# The logic is basically "try to keep the same profile if possible"
-
-	if [[ ${curr_config} == ${CTARGET}-${PN}-${SLOT} ]] ; then
-		return 0
-	else
-		elog "The current gcc config appears valid, so it will not be"
-		elog "automatically switched for you.  If you would like to"
-		elog "switch to the newly installed gcc version, do the"
-		elog "following:"
-		echo
-		elog "eselect gnat set <profile>"
-		echo
-		return 1
-	fi
-}
-
-# active compiler selection, called from pkg_postinst
-do_gnat_config() {
-	eselect gnat set ${CTARGET}-${PN}-${SLOT} &> /dev/null
-
-	elog "The following gnat profile has been activated:"
-	elog "${CTARGET}-${PN}-${SLOT}"
-	elog ""
-	elog "The compiler has been installed as gnatgcc, and the coverage testing"
-	elog "tool as gnatgcov."
-	elog ""
-	elog "Ada handling in Gentoo allows you to have multiple gnat variants"
-	elog "installed in parallel and automatically manage Ada libs."
-	elog "Please take a look at the Ada project page for some documentation:"
-	elog "http://www.gentoo.org/proj/en/prog_lang/ada/index.xml"
-}
-
-
-# Taken straight from the toolchain.eclass. Only removed the "obsolete hunk"
-#
-# The purpose of this DISGUSTING gcc multilib hack is to allow 64bit libs
-# to live in lib instead of lib64 where they belong, with 32bit libraries
-# in lib32. This hack has been around since the beginning of the amd64 port,
-# and we're only now starting to fix everything that's broken. Eventually
-# this should go away.
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
-disgusting_gcc_multilib_HACK() {
-	local config
-	local libdirs
-	if has_multilib_profile ; then
-		case $(tc-arch) in
-			amd64)
-				config="i386/t-linux64"
-				libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \
-			;;
-			ppc64)
-				config="rs6000/t-linux64"
-				libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \
-			;;
-		esac
-	else
-		die "Your profile is no longer supported by portage."
-	fi
-
-	einfo "updating multilib directories to be: ${libdirs}"
-	sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" "${S}"/gcc/config/${config}
-}
-
-
-#---->> pkg_* <<----
-gnatbuild_pkg_setup() {
-	debug-print-function ${FUNCNAME} $@
-
-	# Setup variables which would normally be in the profile
-	if is_crosscompile ; then
-		multilib_env ${CTARGET}
-	fi
-
-	# we dont want to use the installed compiler's specs to build gnat!
-	unset GCC_SPECS
-}
-
-gnatbuild_pkg_postinst() {
-	if should_we_eselect_gnat; then
-		do_gnat_config
-	else
-		eselect gnat update
-	fi
-
-	# if primary compiler list is empty, add this profile to the list, so
-	# that users are not left without active compilers (making sure that
-	# libs are getting built for at least one)
-	elog
-	. ${GnatCommon} || die "failed to source common code"
-	if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then
-		echo "${gnat_profile}" > ${PRIMELIST}
-		elog "The list of primary compilers was empty and got assigned ${gnat_profile}."
-	fi
-	elog "Please edit ${PRIMELIST} and list there gnat profiles intended"
-	elog "for common use."
-}
-
-
-gnatbuild_pkg_postrm() {
-	# "eselect gnat update" now removes the env.d file if the corresponding
-	# gnat profile was unmerged
-	eselect gnat update
-	elog "If you just unmerged the last gnat in this SLOT, your active gnat"
-	elog "profile got unset. Please check what eselect gnat show tells you"
-	elog "and set the desired profile"
-}
-#---->> pkg_* <<----
-
-#---->> src_* <<----
-
-# common unpack stuff
-gnatbuild_src_unpack() {
-	debug-print-function ${FUNCNAME} $@
-	if [[ -z "$1" ]]; then
-		gnatbuild_src_unpack all
-		return $?
-	fi
-
-	while [ "$1" ]; do
-	case $1 in
-		base_unpack)
-			unpack ${A}
-			pax-mark E $(find ${GNATBOOT} -name gnat1)
-
-			cd "${S}"
-			# patching gcc sources, following the toolchain
-			# first, the common patches
-			if [[ -d "${FILESDIR}"/patches ]] && [[ ! -z $(ls "${FILESDIR}"/patches/*.patch 2>/dev/null) ]] ; then
-				EPATCH_MULTI_MSG="Applying common Gentoo patches ..." \
-				epatch "${FILESDIR}"/patches/*.patch
-			fi
-			#
-			# then per SLOT
-			if [[ -d "${FILESDIR}"/patches/${SLOT} ]] && [[ ! -z $(ls "${FILESDIR}"/patches/${SLOT}/*.patch 2>/dev/null) ]] ; then
-				EPATCH_MULTI_MSG="Applying SLOT-specific Gentoo patches ..." \
-				epatch "${FILESDIR}"/patches/${SLOT}/*.patch
-			fi
-			# Replacing obsolete head/tail with POSIX compliant ones
-			ht_fix_file */configure
-
-#			if ! is_crosscompile && is_multilib && \
-#				[[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
-#					disgusting_gcc_multilib_HACK || die "multilib hack failed"
-#			fi
-
-			# Fixup libtool to correctly generate .la files with portage
-			cd "${S}"
-			elibtoolize --portage --shallow --no-uclibc
-
-			gnuconfig_update
-			# update configure files
-			einfo "Fixing misc issues in configure files"
-			for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
-				ebegin "  Updating ${f}"
-				patch "${f}" "${FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
-					|| eerror "Please file a bug about this"
-				eend $?
-			done
-
-#			this is only needed for gnat-gpl-4.1 and breaks for gnat-gcc, so
-#			this block was moved to corresponding ebuild
-#			pushd "${S}"/gnattools &> /dev/null
-#				eautoconf
-#			popd &> /dev/null
-		;;
-
-		common_prep)
-			# Prepare the gcc source directory
-			cd "${S}/gcc"
-			touch cstamp-h.in
-			touch ada/[es]info.h
-			touch ada/nmake.ad[bs]
-			# set the compiler name to gnatgcc
-			for i in `find ada/ -name '*.ad[sb]'`; do \
-				sed -i -e "s/\"gcc\"/\"gnatgcc\"/g" ${i}; \
-			done
-			# add -fPIC flag to shared libs for 3.4* backend
-			if [ "3.4" == "${GCCBRANCH}" ] ; then
-				cd ada
-				epatch "${FILESDIR}"/gnat-Make-lang.in.patch
-			fi
-
-			# gcc 4.3 sources seem to have a common omission of $(DESTDIR),
-			# that leads to make install trying to rm -f file on live system.
-			# As we do not need this rm, we simply remove the whole line
-			if [ "4.3" == "${GCCBRANCH}" ] ; then
-				sed -i -e "/\$(RM) \$(bindir)/d" "${S}"/gcc/ada/Make-lang.in
-			fi
-
-			mkdir -p "${GNATBUILD}"
-		;;
-
-		all)
-			gnatbuild_src_unpack base_unpack common_prep
-		;;
-	esac
-	shift
-	done
-}
-
-# for now just dont run default configure
-gnatbuild_src_configure() {
-	# do nothing
-	:
-}
-
-# it would be nice to split configure and make steps
-# but both need to operate inside specially tuned evironment
-# so just do sections for now (as in eclass section of handbook)
-# sections are: configure, make-tools, bootstrap,
-#  gnatlib_and_tools, gnatlib-shared
-gnatbuild_src_compile() {
-	debug-print-function ${FUNCNAME} $@
-	if [[ -z "$1" ]]; then
-		gnatbuild_src_compile all
-		return $?
-	fi
-
-	if [[ "all" == "$1" ]]
-	then # specialcasing "all" to avoid scanning sources unnecessarily
-		gnatbuild_src_compile configure make-tools \
-			bootstrap gnatlib_and_tools gnatlib-shared
-
-	else
-		# Set some paths to our bootstrap compiler.
-		export PATH="${GNATBOOT}/bin:${PATH}"
-		# !ATTN! the bootstrap compilers have a very simplystic structure,
-		# so many paths are not identical to the installed ones.
-		# Plus it was simplified even more in new releases.
-		if [[ ${BOOT_SLOT} > 4.1 ]] ; then
-			case $(tc-arch) in
-				arm)
-					GNATLIB="${GNATBOOT}/lib/gcc/${BOOT_TARGET}/${BOOT_SLOT}"
-					;;
-				*)
-					GNATLIB="${GNATBOOT}/lib"
-					;;
-			esac
-		else
-			GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
-		fi
-
-		export CC="${GNATBOOT}/bin/gnatgcc"
-		# CPATH is supposed to be applied for any language, thus
-		# superceding either of C/CPLUS/OBJC_INCLUDE_PATHs
-		export CPATH="${GNATLIB}/include"
-		#export INCLUDE_DIR="${GNATLIB}/include"
-		#export C_INCLUDE_PATH="${GNATLIB}/include"
-		#export CPLUS_INCLUDE_PATH="${GNATLIB}/include"
-		export LIB_DIR="${GNATLIB}"
-		export LDFLAGS="-L${GNATLIB}"
-
-		# additional vars from gnuada and elsewhere
-		#export LD_RUN_PATH="${LIBPATH}"
-		export LIBRARY_PATH="${GNATLIB}"
-		#export LD_LIBRARY_PATH="${GNATLIB}"
-#		export COMPILER_PATH="${GNATBOOT}/bin/"
-
-		export ADA_OBJECTS_PATH="${GNATLIB}/adalib"
-		export ADA_INCLUDE_PATH="${GNATLIB}/adainclude"
-
-		einfo "CC=${CC},
-			ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH},
-			LDFLAGS=${LDFLAGS},
-			PATH=${PATH}"
-
-		while [ "$1" ]; do
-		case $1 in
-			configure)
-				debug-print-section configure
-				# Configure gcc
-				local confgcc
-
-				# some cross-compile logic from toolchain
-				confgcc="${confgcc} --host=${CHOST}"
-				if is_crosscompile || tc-is-cross-compiler ; then
-					confgcc="${confgcc} --target=${CTARGET}"
-				fi
-				[[ -n ${CBUILD} ]] && confgcc="${confgcc} --build=${CBUILD}"
-
-				# Native Language Support
-				if use nls ; then
-					confgcc="${confgcc} --enable-nls --without-included-gettext"
-				else
-					confgcc="${confgcc} --disable-nls"
-				fi
-
-				if version_is_at_least 4.6 ; then
-					confgcc="${confgcc} --enable-lto"
-				elif tc_version_is_at_least 4.5 ; then
-					confgcc="${confgcc} --disable-lto --disable-plugin"
-				fi
-
-				# reasonably sane globals (from toolchain)
-				# also disable mudflap and ssp
-				confgcc="${confgcc} \
-					--with-system-zlib \
-					--disable-checking \
-					--disable-werror \
-					--disable-libmudflap \
-					--disable-libssp \
-					--disable-altivec \
-					--disable-fixed-point \
-					--disable-libgcj \
-					--disable-libcilkrts \
-					--disable-libsanitizer \
-					--disable-libunwind-exceptions"
-
-				if in_iuse openmp ; then
-					# Make sure target has pthreads support. #326757 #335883
-					# There shouldn't be a chicken&egg problem here as openmp won't
-					# build without a C library, and you can't build that w/out
-					# already having a compiler ...
-					if ! is_crosscompile || \
-						$(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
-					then
-						case $(tc-arch) in
-							arm)
-								confgcc="${confgcc} --disable-libgomp"
-								;;
-							*)
-								confgcc="${confgcc} $(use_enable openmp libgomp)"
-								;;
-						esac
-					else
-						# Force disable as the configure script can be dumb #359855
-						confgcc="${confgcc} --disable-libgomp"
-					fi
-				else
-					# For gcc variants where we don't want openmp (e.g. kgcc)
-					confgcc="${confgcc} --disable-libgomp"
-				fi
-
-				# ACT's gnat-gpl does not like libada for whatever reason..
-				if version_is_at_least 4.2 ; then
-					confgcc="${confgcc} --enable-libada"
-#				else
-#					einfo "ACT's gnat-gpl does not like libada, disabling"
-#					confgcc="${confgcc} --disable-libada"
-				fi
-
-				# set some specifics available in later versions
-				if version_is_at_least 4.7 ; then
-					einfo "setting gnat thread model"
-					confgcc="${confgcc} --enable-threads=posix"
-					confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada"
-				elif version_is_at_least 4.3 ; then
-					confgcc="${confgcc} --enable-threads=gnat"
-					confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada"
-				else
-					confgcc="${confgcc} --enable-threads=posix"
-					confgcc="${confgcc} --enable-shared"
-				fi
-
-				# multilib support
-				if is_multilib ; then
-					confgcc="${confgcc} --enable-multilib"
-				else
-					confgcc="${confgcc} --disable-multilib"
-				fi
-
-				# __cxa_atexit is "essential for fully standards-compliant handling of
-				# destructors", but apparently requires glibc.
-				if [[ ${CTARGET} == *-gnu* ]] ; then
-					confgcc="${confgcc} --enable-__cxa_atexit"
-					confgcc="${confgcc} --enable-clocale=gnu"
-				fi
-
-				einfo "confgcc=${confgcc}"
-
-				export gcc_cv_lto_plugin=1  # okay to build, default to opt-in
-				export gcc_cv_prog_makeinfo_modern=no
-				export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries='
-				export gcc_cv_libc_provides_ssp=yes
-
-				# need to strip graphite/lto flags or we'll get the
-				# dreaded C compiler cannot create executables...
-				# error.
-				strip-flags
-				replace-flags -O? -O2
-				filter-flags '-mabi*' -m31 -m32 -m64
-				filter-flags -frecord-gcc-switches
-				filter-flags -mno-rtm -mno-htm
-				#filter-flags -floop-interchange -floop-strip-mine -floop-block
-				#filter-flags -fuse-linker-plugin -flto*
-
-				cd "${GNATBUILD}"
-				CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" "${S}"/configure \
-					--prefix="${PREFIX}" \
-					--bindir="${BINPATH}" \
-					--includedir="${INCLUDEPATH}" \
-					--libdir="${LIBPATH}" \
-					--libexecdir="${LIBEXECPATH}" \
-					--datadir="${DATAPATH}" \
-					--mandir="${DATAPATH}"/man \
-					--infodir="${DATAPATH}"/info \
-					--enable-languages=c,ada \
-					--with-gcc \
-					${confgcc} || die "configure failed"
-			;;
-
-			make-tools)
-				debug-print-section make-tools
-				# Compile helper tools
-				cd "${GNATBOOT}"
-				cp "${S}"/gcc/ada/xtreeprs.adb .
-				cp "${S}"/gcc/ada/xsinfo.adb   .
-				cp "${S}"/gcc/ada/xeinfo.adb   .
-				cp "${S}"/gcc/ada/xnmake.adb   .
-				cp "${S}"/gcc/ada/xutil.ad{s,b}   .
-				if (( ${GNATMINOR} > 5 )) ; then
-					cp "${S}"/gcc/ada/einfo.ad{s,b}  .
-					cp "${S}"/gcc/ada/csinfo.adb  .
-					cp "${S}"/gcc/ada/ceinfo.adb  .
-				fi
-				gnatmake xtreeprs && \
-				gnatmake xsinfo   && \
-				gnatmake xeinfo   && \
-				gnatmake xnmake   || die "building helper tools"
-
-				mv xeinfo xnmake xsinfo xtreeprs bin/
-			;;
-
-			bootstrap)
-				debug-print-section bootstrap
-				# and, finally, the build itself
-				cd "${GNATBUILD}"
-				emake \
-					LDFLAGS="${LDFLAGS}" \
-					LIBPATH="${LIBPATH}" \
-					CC="${CC}" \
-					bootstrap-lean || die "bootstrap failed"
-			;;
-
-			gnatlib_and_tools)
-				debug-print-section gnatlib_and_tools
-				einfo "building gnatlib_and_tools"
-				cd "${GNATBUILD}"
-				emake -j1 -C gcc gnatlib_and_tools || \
-					die "gnatlib_and_tools failed"
-			;;
-
-			gnatlib-shared)
-				debug-print-section gnatlib-shared
-				einfo "building shared lib"
-				cd "${GNATBUILD}"
-				rm -f gcc/ada/rts/*.{o,ali} || die
-				#otherwise make tries to reuse already compiled (without -fPIC) objs..
-				emake -j1 -C gcc gnatlib-shared LIBRARY_VERSION="${GCCBRANCH}" || \
-					die "gnatlib-shared failed"
-			;;
-
-		esac
-		shift
-		done # while
-	fi   # "all" == "$1"
-}
-# -- end gnatbuild_src_compile
-
-
-gnatbuild_src_install() {
-	debug-print-function ${FUNCNAME} $@
-
-	if [[ -z "$1" ]] ; then
-		gnatbuild_src_install all
-		return $?
-	fi
-
-	while [ "$1" ]; do
-	case $1 in
-	install) # runs provided make install
-		debug-print-section install
-
-		# Looks like we need an access to the bootstrap compiler here too
-		# as gnat apparently wants to compile something during the installation
-		# The spotted obuser was xgnatugn, used to process gnat_ugn_urw.texi,
-		# during preparison of the docs.
-		export PATH="${GNATBOOT}/bin:${PATH}"
-		if [[ ${BOOT_SLOT} > 4.1 ]] ; then
-			GNATLIB="${GNATBOOT}/lib"
-		else
-			GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
-		fi
-
-		export CC="${GNATBOOT}/bin/gnatgcc"
-		export INCLUDE_DIR="${GNATLIB}/include"
-		export C_INCLUDE_PATH="${GNATLIB}/include"
-		export CPLUS_INCLUDE_PATH="${GNATLIB}/include"
-		export LIB_DIR="${GNATLIB}"
-		export LDFLAGS="-L${GNATLIB}"
-		export ADA_OBJECTS_PATH="${GNATLIB}/adalib"
-		export ADA_INCLUDE_PATH="${GNATLIB}/adainclude"
-
-		# Do not allow symlinks in /usr/lib/gcc/${CHOST}/${MY_PV}/include as
-		# this can break the build.
-		for x in "${GNATBUILD}"/gcc/include/* ; do
-			if [ -L ${x} ] ; then
-				rm -f ${x}
-			fi
-		done
-		# Remove generated headers, as they can cause things to break
-		# (ncurses, openssl, etc). (from toolchain.eclass)
-		for x in $(find "${WORKDIR}"/build/gcc/include/ -name '*.h') ; do
-			grep -q 'It has been auto-edited by fixincludes from' "${x}" \
-				&& rm -f "${x}"
-		done
-
-
-		cd "${GNATBUILD}"
-		make DESTDIR="${D}" install || die
-
-		# Disable RANDMMAP so PCH works. #301299
-		pax-mark r "${D}"${LIBEXECPATH}/{gnat1,cc1,cc1plus}
-		# Quiet QA warnings, wait for adacore exec stack patch in gcc 7
-		export QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatname
-			${BINPATH:1}/gnatmake ${BINPATH:1}/gnatclean ${BINPATH:1}/gnat"
-
-		if use doc ; then
-			if (( $(bc <<< "${GNATBRANCH} > 4.3") )) ; then
-				#make a convenience info link
-				ewarn "Yay!  Math works."
-				dosym gnat_ugn.info ${DATAPATH}/info/gnat.info
-			fi
-		fi
-		;;
-
-	move_libs)
-		debug-print-section move_libs
-
-		# first we need to remove some stuff to make moving easier
-		rm -rf "${D}${LIBPATH}"/{32,include,libiberty.a}
-		# gcc insists on installing libs in its own place
-		mv "${D}${LIBPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBPATH}"
-		mv "${D}${LIBEXECPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBEXECPATH}"
-
-		# libgcc_s  and, with gcc>=4.0, other libs get installed in multilib specific locations by gcc
-		# we pull everything together to simplify working environment
-		if has_multilib_profile ; then
-			case $(tc-arch) in
-				amd64)
-					mv "${D}${LIBPATH}"/../$(get_abi_LIBDIR amd64)/* "${D}${LIBPATH}"
-					mv "${D}${LIBPATH}"/../$(get_abi_LIBDIR x86)/* "${D}${LIBPATH}"/32
-				;;
-				ppc64)
-					# not supported yet, will have to be adjusted when we
-					# actually build gnat for that arch
-				;;
-			esac
-		fi
-
-		# force gnatgcc to use its own specs - versions prior to 3.4.6 read specs
-		# from system gcc location. Do the simple wrapper trick for now
-		# !ATTN! change this if eselect-gnat starts to follow eselect-compiler
-		cd "${D}${BINPATH}"
-		if [[ ${GCCVER} < 3.4.6 ]] ; then
-			# gcc 4.1 uses builtin specs. What about 4.0?
-			mv gnatgcc gnatgcc_2wrap
-			cat > gnatgcc << EOF
-#! /bin/bash
-# wrapper to cause gnatgcc read appropriate specs and search for the right .h
-# files (in case no matching gcc is installed)
-BINDIR=\$(dirname \$0)
-# The paths in the next line have to be absolute, as gnatgcc may be called from
-# any location
-\${BINDIR}/gnatgcc_2wrap -specs="${LIBPATH}/specs" -I"${LIBPATH}/include" \$@
-EOF
-			chmod a+x gnatgcc
-		else
-			local i
-			for i in cpp gcc gcov ; do
-				ln -s ${i} gnat${i}
-			done
-		fi
-
-		# earlier gnat's generate some Makefile's at generic location, need to
-		# move to avoid collisions
-		[ -f "${D}${PREFIX}"/share/gnat/Makefile.generic ] &&
-			mv "${D}${PREFIX}"/share/gnat/Makefile.* "${D}${DATAPATH}"
-
-		# use gid of 0 because some stupid ports don't have
-		# the group 'root' set to gid 0 (toolchain.eclass)
-#		chown -R root:0 "${D}${LIBPATH}"
-		;;
-
-	cleanup)
-		debug-print-section cleanup
-
-		rm -rf "${D}${LIBPATH}"/{gcc,install-tools,../lib{32,64}}
-		rm -rf "${D}${LIBEXECPATH}"/{gcc,install-tools}
-
-		# this one is installed by gcc and is a duplicate even here anyway
-		rm -f "${D}${BINPATH}/${CTARGET}-gcc-${GCCRELEASE}"
-
-		# remove duplicate docs
-		rm -f  "${D}${DATAPATH}"/info/{dir,gcc,cpp}*
-		rm -rf "${D}${DATAPATH}"/man/man7/
-
-		# fix .la path for lto plugin
-		if use lto ; then
-			sed -i -e \
-				"/libdir=/c\libdir='${LIBEXECPATH}'" \
-				"${D}${LIBEXECPATH}"/liblto_plugin.la \
-				|| die "sed update of .la file failed!"
-		fi
-		;;
-
-	prep_env)
-		# instead of putting junk under /etc/env.d/gnat we recreate env files as
-		# needed with eselect
-		create_eselect_conf
-		;;
-
-	all)
-		gnatbuild_src_install install move_libs cleanup prep_env
-		;;
-	esac
-	shift
-	done # while
-}
-# -- end gnatbuild_src_install
diff --git a/eclass/gnome-games.eclass b/eclass/gnome-games.eclass
deleted file mode 100644
index dd755c3d5023..000000000000
--- a/eclass/gnome-games.eclass
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# Removal on 2018-05-18.
-
-# @ECLASS: gnome-games.eclass
-# @MAINTAINER:
-# Gnome team <gnome@gentoo.org>
-# @AUTHOR:
-# Author: Pacho Ramos <pacho@gentoo.org>
-# @BLURB: An eclass to build gnome-games.
-# @DESCRIPTION:
-# An eclass to build gnome-games using proper phases from gnome2 and
-# games eclasses.
-
-case "${EAPI:-0}" in
-	0|1)
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	2|3|4|5)
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
-esac
-
-inherit autotools games gnome2
-
-EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
-
-if [[ ! ${_GNOME_GAMES} ]]; then
-
-DEPEND=">=dev-util/intltool-0.50.2-r1"
-RDEPEND="!gnome-extra/gnome-games"
-
-# @FUNCTION: gnome-games_pkg_setup
-# @DESCRIPTION:
-# Set proper phase defaults
-gnome-games_pkg_setup() {
-	debug-print-function ${FUNCNAME} "${@}"
-	games_pkg_setup
-}
-
-# @FUNCTION: gnome-games_src_prepare
-# @DESCRIPTION:
-# Set proper phase defaults
-gnome-games_src_prepare() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	# Fix intltoolize broken file:
-	# https://bugs.launchpad.net/intltool/+bug/398571
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-# @FUNCTION: gnome-games_src_configure
-# @DESCRIPTION:
-# Set proper phase defaults, relying on gnome2_src_configure
-# and passing extra arguments from egamesconf (games.eclass)
-gnome-games_src_configure() {
-	debug-print-function ${FUNCNAME} "${@}"
-	gnome2_src_configure \
-		--prefix="${GAMES_PREFIX}" \
-		--libdir="$(games_get_libdir)" \
-		--sysconfdir="${GAMES_SYSCONFDIR}" \
-		--localstatedir=/var \
-		--localedir=/usr/share/locale \
-		"$@"
-}
-
-# @FUNCTION: gnome-games_src_compile
-# @DESCRIPTION:
-# Set proper phase defaults
-gnome-games_src_compile() {
-	debug-print-function ${FUNCNAME} "${@}"
-	gnome2_src_compile
-}
-
-# @FUNCTION: gnome-games_src_install
-# @DESCRIPTION:
-# Set proper phase defaults
-gnome-games_src_install() {
-	debug-print-function ${FUNCNAME} "${@}"
-	gnome2_src_install
-	prepgamesdirs
-}
-
-# @FUNCTION: gnome-games_pkg_preinst
-# @DESCRIPTION:
-# Set proper phase defaults
-gnome-games_pkg_preinst() {
-	debug-print-function ${FUNCNAME} "${@}"
-	gnome2_pkg_preinst
-	games_pkg_preinst
-}
-
-# @FUNCTION: gnome-games_pkg_postinst
-# @DESCRIPTION:
-# Set proper phase defaults
-gnome-games_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "${@}"
-	gnome2_pkg_postinst
-	games_pkg_postinst
-}
-
-# @FUNCTION: gnome-games_pkg_postrm
-# @DESCRIPTION:
-# Set proper phase defaults
-gnome-games_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "${@}"
-	gnome2_pkg_postrm
-}
-
-_GNOME_GAMES=1
-fi
diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass
deleted file mode 100644
index 268cb74bbc1c..000000000000
--- a/eclass/intel-sdp.eclass
+++ /dev/null
@@ -1,502 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: intel-sdp.eclass
-# @MAINTAINER:
-# Justin Lecher <jlec@gentoo.org>
-# Sci Team <sci@gentoo.org>
-# @BLURB: Handling of Intel's Software Development Products package management
-
-if [[ ! ${_INTEL_SDP_ECLASS_} ]]; then
-
-case "${EAPI:-0}" in
-	4|5) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: INTEL_DID
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The package download ID from Intel.
-# To find out its value, see the links to download in
-# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
-#
-# e.g. 2504
-#
-# Must be defined before inheriting the eclass
-
-# @ECLASS-VARIABLE: INTEL_DPN
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The package name to download from Intel.
-# To find out its value, see the links to download in
-# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
-#
-# e.g. parallel_studio_xe
-#
-# Must be defined before inheriting the eclass
-
-# @ECLASS-VARIABLE: INTEL_DPV
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The package download version from Intel.
-# To find out its value, see the links to download in
-# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
-#
-# e.g. 2011_sp1_update2
-#
-# Must be defined before inheriting the eclass
-
-# @ECLASS-VARIABLE: INTEL_TARX
-# @DESCRIPTION:
-# The package extention.
-# To find out its value, see the links to download in
-# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
-#
-# e.g. tar.gz
-#
-# Must be defined before inheriting the eclass
-: ${INTEL_TARX:=tgz}
-
-# @ECLASS-VARIABLE: INTEL_SUBDIR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The package sub-directory where it will end-up in /opt/intel
-# To find out its value, you have to do a raw install from the Intel tar ball
-
-# @ECLASS-VARIABLE: INTEL_SKIP_LICENSE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Possibility to skip the mandatory check for licenses. Only set this if there
-# is really no fix.
-
-# @ECLASS-VARIABLE: INTEL_RPMS_DIR
-# @DESCRIPTION:
-# Main subdirectory which contains the rpms to extract.
-: ${INTEL_RPMS_DIR:=rpm}
-
-# @ECLASS-VARIABLE: INTEL_X86
-# @DESCRIPTION:
-# 32bit arch in rpm names
-#
-# e.g. i484
-: ${INTEL_X86:=i486}
-
-# @ECLASS-VARIABLE: INTEL_BIN_RPMS
-# @DESCRIPTION:
-# Functional name of rpm without any version/arch tag
-#
-# e.g. compilerprof
-#
-# if the rpm is located in a directory different to INTEL_RPMS_DIR you can
-# specify the full path
-#
-# e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli
-: ${INTEL_BIN_RPMS:=""}
-
-# @ECLASS-VARIABLE: INTEL_DAT_RPMS
-# @DESCRIPTION:
-# Functional name of rpm of common data which are arch free
-# without any version tag
-#
-# e.g. openmp
-#
-# if the rpm is located in a directory different to INTEL_RPMS_DIR you can
-# specify the full path
-#
-# e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli-common
-: ${INTEL_DAT_RPMS:=""}
-
-# @ECLASS-VARIABLE: INTEL_SINGLE_ARCH
-# @DESCRIPTION:
-# Unset, if only the multilib package will be provided by intel
-: ${INTEL_SINGLE_ARCH:=true}
-
-# @ECLASS-VARIABLE: INTEL_SDP_DB
-# @DESCRIPTION:
-# Full path to intel registry db
-INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db
-
-inherit check-reqs eutils multilib versionator
-
-_INTEL_PV1=$(get_version_component_range 1)
-_INTEL_PV2=$(get_version_component_range 2)
-_INTEL_PV3=$(get_version_component_range 3)
-_INTEL_PV4=$(get_version_component_range 4)
-_INTEL_URI="http://registrationcenter-download.intel.com/irc_nas/${INTEL_DID}/${INTEL_DPN}"
-
-if [ ${INTEL_SINGLE_ARCH} == true ]; then
-	SRC_URI="
-		amd64? ( multilib? ( ${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX} ) )
-		amd64? ( !multilib? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.${INTEL_TARX} ) )
-		x86?	( ${_INTEL_URI}_${INTEL_DPV}_ia32.${INTEL_TARX} )"
-else
-	SRC_URI="${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX}"
-fi
-
-LICENSE="Intel-SDP"
-# Future work, #394411
-#SLOT="${_INTEL_PV1}.${_INTEL_PV2}"
-SLOT="0"
-IUSE="examples multilib"
-
-RESTRICT="mirror"
-
-RDEPEND=""
-DEPEND="app-arch/rpm2targz"
-
-_INTEL_SDP_YEAR=${INTEL_DPV%_update*}
-_INTEL_SDP_YEAR=${INTEL_DPV%_sp*}
-
-# @ECLASS-VARIABLE: INTEL_SDP_DIR
-# @DESCRIPTION:
-# Full rootless path to installation dir
-INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${_INTEL_SDP_YEAR:-${_INTEL_PV1}}.${_INTEL_PV3}.${_INTEL_PV4}"
-
-# @ECLASS-VARIABLE: INTEL_SDP_EDIR
-# @DESCRIPTION:
-# Full rooted path to installation dir
-INTEL_SDP_EDIR="${EROOT%/}/${INTEL_SDP_DIR}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="${INTEL_SDP_DIR}/*"
-
-# @ECLASS-VARIABLE: INTEL_ARCH
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Intels internal names of the arches; will be set at runtime accordingly
-#
-# e.g. amd64-multilib -> INTEL_ARCH="intel64 ia32"
-
-# @FUNCTION: _isdp_big-warning
-# @USAGE: [pre-check | test-failed]
-# @INTERNAL
-# @DESCRIPTION:
-# warn user that we really require a license
-_isdp_big-warning() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	case ${1} in
-		pre-check )
-			echo ""
-			ewarn "License file not found!"
-			;;
-
-		test-failed )
-			echo
-			ewarn "Function test failed. Most probably due to an invalid license."
-			ewarn "This means you already tried to bypass the license check once."
-			;;
-	esac
-
-	echo ""
-	ewarn "Make sure you have received an Intel license."
-	ewarn "To receive a non-commercial license, you need to register at:"
-	ewarn "https://software.intel.com/en-us/qualify-for-free-software"
-	ewarn "Install the license file into ${INTEL_SDP_EDIR}/licenses/"
-
-	case ${1} in
-		pre-check )
-			ewarn "before proceeding with installation of ${P}"
-			echo ""
-			;;
-		* )
-			echo ""
-			;;
-			esac
-}
-
-# @FUNCTION: _isdp_version_test
-# @INTERNAL
-# @DESCRIPTION:
-# Testing for valid license by asking for version information of the compiler
-_isdp_version_test() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local comp comp_full arch warn
-	case ${PN} in
-		ifc )
-			debug-print "Testing ifort"
-			comp=ifort
-			;;
-		icc )
-			debug-print "Testing icc"
-			comp=icc
-			;;
-		*)
-			die "${PN} is not supported for testing"
-			;;
-	esac
-
-	for arch in ${INTEL_ARCH}; do
-		case ${EBUILD_PHASE} in
-			install )
-				comp_full="${ED}/${INTEL_SDP_DIR}/bin/${arch}/${comp}"
-				;;
-			postinst )
-				comp_full="${INTEL_SDP_EDIR}/bin/${arch}/${comp}"
-				;;
-			* )
-				ewarn "Compile test not supported in ${EBUILD_PHASE}"
-				continue
-				;;
-		esac
-
-		debug-print "LD_LIBRARY_PATH=\"${INTEL_SDP_EDIR}/bin/${arch}/\" \"${comp_full}\" -V"
-
-		LD_LIBRARY_PATH="${INTEL_SDP_EDIR}/bin/${arch}/" "${comp_full}" -V &>/dev/null
-		[[ $? -ne 0 ]] && warn=yes
-	done
-	[[ "${warn}" == "yes" ]] && _isdp_big-warning test-failed
-}
-
-# @FUNCTION: _isdp_run-test
-# @INTERNAL
-# @DESCRIPTION:
-# Test if installed compiler is working
-_isdp_run-test() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ -z ${INTEL_SKIP_LICENSE} ]]; then
-		case ${PN} in
-			ifc | icc )
-				_isdp_version_test ;;
-			* )
-				debug-print "No test available for ${PN}"
-				;;
-		esac
-	fi
-}
-
-# @FUNCTION: intel-sdp_pkg_pretend
-# @DESCRIPTION:
-#
-# * Check that the user has a (valid) license file before going on.
-#
-# * Check for space requirements being fullfilled
-intel-sdp_pkg_pretend() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local warn=1 dir dirs ret arch a p
-
-	: ${CHECKREQS_DISK_BUILD:=256M}
-	check-reqs_pkg_pretend
-
-	if [[ -z ${INTEL_SKIP_LICENSE} ]]; then
-		if echo ${INTEL_LICENSE_FILE} | grep -q @; then
-			einfo "Looks like you are using following license server:"
-			einfo "   ${INTEL_LICENSE_FILE}"
-			return 0
-		fi
-
-		dirs=(
-			"${INTEL_SDP_EDIR}/licenses"
-			"${INTEL_SDP_EDIR}/Licenses"
-			"${EPREFIX}/opt/intel/licenses"
-			)
-		for dir in "${dirs[@]}" ; do
-			ebegin "Checking for a license in: ${dir}"
-			#maybe use nullglob or [[ $(echo ${dir/*lic) != "${dir}/*lic" ]]
-			[[ $( ls "${dir}"/*lic 2>/dev/null ) ]]; ret=$?
-			eend ${ret}
-			if [[ ${ret} == "0" ]]; then
-				warn=${ret}
-				break
-			fi
-		done
-		if [[ ${warn} == "1" ]]; then
-			_isdp_big-warning pre-check
-			die "Could not find license file"
-		fi
-	else
-		eqawarn "The ebuild doesn't check for presents of a proper intel license!"
-		eqawarn "This shouldn't be done unless there is a serious reason."
-	fi
-}
-
-# @FUNCTION: intel-sdp_pkg_setup
-# @DESCRIPTION:
-# Setting up and sorting some internal variables
-intel-sdp_pkg_setup() {
-	debug-print-function ${FUNCNAME} "${@}"
-	local arch a p
-
-	if use x86; then
-		arch=${INTEL_X86}
-		INTEL_ARCH="ia32"
-	elif use amd64; then
-		arch=x86_64
-		INTEL_ARCH="intel64"
-		if has_multilib_profile; then
-			arch="x86_64 ${INTEL_X86}"
-			INTEL_ARCH="intel64 ia32"
-		fi
-	fi
-	INTEL_RPMS=()
-	INTEL_RPMS_FULL=()
-	if [[ $(declare -p INTEL_BIN_RPMS) = "declare -a "* ]] ; then
-		_INTEL_BIN_RPMS=( ${INTEL_BIN_RPMS[@]} )
-	else
-		read -r -d '' -a _INTEL_BIN_RPMS <<<"${INTEL_BIN_RPMS}"
-	fi
-	for p in "${_INTEL_BIN_RPMS[@]}"; do
-		for a in ${arch}; do
-			if [ ${p} == $(basename ${p}) ]; then
-				INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm )
-			else
-				INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm )
-			fi
-		done
-	done
-	if [[ $(declare -p INTEL_DAT_RPMS) = "declare -a "* ]] ; then
-		_INTEL_DAT_RPMS=( ${INTEL_DAT_RPMS[@]} )
-	else
-		read -r -d '' -a _INTEL_DAT_RPMS <<<"${INTEL_DAT_RPMS}"
-	fi
-	for p in "${_INTEL_DAT_RPMS[@]}"; do
-		if [ ${p} == $(basename ${p}) ]; then
-			INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm )
-		else
-			INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm )
-		fi
-	done
-}
-
-# @FUNCTION: intel-sdp_src_unpack
-# @DESCRIPTION:
-# Unpacking necessary rpms from tarball, extract them and rearrange the output.
-intel-sdp_src_unpack() {
-	local l r subdir rb t list=() debug_list
-
-	for t in ${A}; do
-		for r in "${INTEL_RPMS[@]}"; do
-			rpmdir=${t%%.*}/${INTEL_RPMS_DIR}
-			list+=( ${rpmdir}/${r} )
-		done
-
-		for r in "${INTEL_RPMS_FULL[@]}"; do
-			list+=( ${t%%.*}/${r} )
-		done
-
-		debug_list="$(IFS=$'\n'; echo ${list[@]} )"
-
-		debug-print "Adding to decompression list:"
-		debug-print ${debug_list}
-
-		tar xvf "${DISTDIR}"/${t} ${list[@]} &> "${T}"/rpm-extraction.log
-
-		for r in ${list[@]}; do
-			rb=$(basename ${r})
-			l=.${rb}_$(date +'%d%m%y_%H%M%S').log
-			einfo "Unpacking ${rb}"
-			rpm2tar -O ${r} | tar xvf - | sed -e \
-				"s:^\.:${EROOT#/}:g" > ${l}; assert "unpacking ${r} failed"
-			mv ${l} opt/intel/ || die "failed moving extract log file"
-		done
-	done
-
-	mv opt/intel/* ${INTEL_SDP_DIR} || die "mv to INTEL_SDP_DIR failed"
-}
-
-# @FUNCTION: intel-sdp_src_install
-# @DESCRIPTION:
-# Install everything
-intel-sdp_src_install() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if path_exists "${INTEL_SDP_DIR}"/uninstall*; then
-		ebegin "Cleaning out uninstall information"
-		find "${INTEL_SDP_DIR}"/uninstall* -delete || die
-		eend
-	fi
-
-	if path_exists "${INTEL_SDP_DIR}"/Documentation; then
-		dodoc -r "${INTEL_SDP_DIR}"/Documentation/*
-
-		ebegin "Cleaning out documentation"
-		find "${INTEL_SDP_DIR}"/Documentation -delete || die
-		eend
-	fi
-
-	if path_exists "${INTEL_SDP_DIR}"/Samples; then
-		if use examples ; then
-			insinto /usr/share/${P}/examples/
-			doins -r "${INTEL_SDP_DIR}"/Samples/*
-		fi
-		ebegin "Cleaning out examples"
-		find "${INTEL_SDP_DIR}"/Samples -delete || die
-		eend
-	fi
-
-	if path_exists "${INTEL_SDP_DIR}"/man; then
-		path_exists "${INTEL_SDP_DIR}"/man/en_US/man1/* && \
-			doman "${INTEL_SDP_DIR}"/man/en_US/man1/*
-		path_exists "${INTEL_SDP_DIR}"/man/man1/* && \
-			doman "${INTEL_SDP_DIR}"/man/man1/*
-		has linguas_ja ${IUSE} && use linguas_ja && \
-			doman -i18n=ja_JP "${INTEL_SDP_DIR}"/man/ja_JP/man1/*
-
-		find "${INTEL_SDP_DIR}"/man -delete || die
-	fi
-
-	ebegin "Tagging ${PN}"
-	find opt -name \*sh -type f -exec sed -i \
-		-e "s:<.*DIR>:${INTEL_SDP_EDIR}:g" \
-		'{}' + || die
-	eend
-
-	[[ -d "${ED}" ]] || dodir /
-	mv opt "${ED}"/ || die "moving files failed"
-
-	dodir "${INTEL_SDP_DIR}"/licenses /opt/intel/ism/rm
-	keepdir "${INTEL_SDP_DIR}"/licenses /opt/intel/ism/rm
-}
-
-# @FUNCTION: intel-sdp_pkg_postinst
-# @DESCRIPTION:
-# Add things to intel database
-intel-sdp_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	# add product registry to intel "database"
-	local l r
-	for r in ${INTEL_RPMS}; do
-		l="$(ls -1 ${EROOT%/}/opt/intel/.${r}_*.log | head -n 1)"
-		echo >> ${INTEL_SDP_DB} \
-			"<:${r%-${_INTEL_PV4}*}-${_INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>"
-	done
-	_isdp_run-test
-
-	if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as icc might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-# @FUNCTION: intel-sdp_pkg_postrm
-# @DESCRIPTION:
-# Sanitize intel database
-intel-sdp_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	# remove from intel "database"
-	if [[ -e ${INTEL_SDP_DB} ]]; then
-		local r
-		for r in ${INTEL_RPMS}; do
-			sed -i \
-				-e "/${r}/d" \
-				${INTEL_SDP_DB}
-		done
-	fi
-
-	if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm pkg_pretend
-
-_INTEL_SDP_ECLASS_=1
-fi
diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass
index 6f80cbaccdcc..78cbead639d3 100644
--- a/eclass/readme.gentoo-r1.eclass
+++ b/eclass/readme.gentoo-r1.eclass
@@ -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
 
 # @ECLASS: readme.gentoo-r1.eclass
@@ -6,8 +6,7 @@
 # Pacho Ramos <pacho@gentoo.org>
 # @AUTHOR:
 # Author: Pacho Ramos <pacho@gentoo.org>
-# @BLURB: An eclass for installing a README.gentoo doc file recording tips
-# shown via elog messages.
+# @BLURB: install a doc file shown via elog messages
 # @DESCRIPTION:
 # An eclass for installing a README.gentoo doc file recording tips
 # shown via elog messages. With this eclass, those elog messages will only be
@@ -24,7 +23,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5|6)
+	4|5|6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
diff --git a/eclass/readme.gentoo.eclass b/eclass/readme.gentoo.eclass
index fb5f044283c4..0d8949805cf9 100644
--- a/eclass/readme.gentoo.eclass
+++ b/eclass/readme.gentoo.eclass
@@ -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
 
 # @ECLASS: readme.gentoo.eclass
@@ -6,8 +6,7 @@
 # Pacho Ramos <pacho@gentoo.org>
 # @AUTHOR:
 # Author: Pacho Ramos <pacho@gentoo.org>
-# @BLURB: An eclass for installing a README.gentoo doc file recording tips
-# shown via elog messages.
+# @BLURB: install a doc file shown via elog messages
 # @DESCRIPTION:
 # An eclass for installing a README.gentoo doc file recording tips
 # shown via elog messages. With this eclass, those elog messages will only be
diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index fb205c1bfefd..aaea1ee4b89f 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -235,7 +235,7 @@ selinux-policy-2_src_compile() {
 	for i in ${POLICY_TYPES}; do
 		# Support USE flags in builds
 		export M4PARAM="${makeuse}"
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
 	done
 }
 
@@ -269,6 +269,12 @@ selinux-policy-2_src_install() {
 # Install the built .pp (or copied .cil) files in the SELinux policy stores, effectively
 # activating the policy on the system.
 selinux-policy-2_pkg_postinst() {
+	# Set root path and don't load policy into the kernel when cross compiling
+	local root_opts=""
+	if [[ "${ROOT%/}" != "" ]]; then
+		root_opts="-p ${ROOT%/} -n"
+	fi
+
 	# build up the command in the case of multiple modules
 	local COMMAND
 
@@ -279,7 +285,7 @@ selinux-policy-2_pkg_postinst() {
 		fi
 		einfo "Inserting the following modules into the $i module store: ${MODS}"
 
-		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+		cd "${ROOT%/}/usr/share/selinux/${i}" || die "Could not enter /usr/share/selinux/${i}"
 		for j in ${MODS} ; do
 			if [[ -f "${j}.pp" ]] ; then
 				COMMAND="${j}.pp ${COMMAND}"
@@ -288,18 +294,18 @@ selinux-policy-2_pkg_postinst() {
 			fi
 		done
 
-		semodule -s ${i} -i ${COMMAND}
+		semodule ${root_opts} -s ${i} -i ${COMMAND}
 		if [[ $? -ne 0 ]]; then
 			ewarn "SELinux module load failed. Trying full reload...";
 			local COMMAND_base="-i base.pp"
 			if has_version "<sys-apps/policycoreutils-2.5"; then
-				COMMAND="-b base.pp"
+				COMMAND_base="-b base.pp"
 			fi
 
 			if [[ "${i}" == "targeted" ]]; then
-				semodule -s ${i} ${COMMAND_base} -i $(ls *.pp | grep -v base.pp);
+				semodule ${root_opts} -s ${i} ${COMMAND_base} -i $(ls *.pp | grep -v base.pp);
 			else
-				semodule -s ${i} ${COMMAND_base} -i $(ls *.pp | grep -v base.pp | grep -v unconfined.pp);
+				semodule ${root_opts} -s ${i} ${COMMAND_base} -i $(ls *.pp | grep -v base.pp | grep -v unconfined.pp);
 			fi
 			if [[ $? -ne 0 ]]; then
 				ewarn "Failed to reload SELinux policies."
@@ -327,15 +333,18 @@ selinux-policy-2_pkg_postinst() {
 		COMMAND="";
 	done
 
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-	  PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-");
-	elif [[ -x /usr/bin/equery ]] ; then
-	  PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-");
-	fi
-    if [[ -n "${PKGSET}" ]] ; then
-	  rlpkg ${PKGSET};
+	# Don't relabel when cross compiling
+	if [[ "${ROOT%/}" == "" ]]; then
+		# Relabel depending packages
+		local PKGSET="";
+		if [[ -x /usr/bin/qdepends ]] ; then
+			PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-");
+		elif [[ -x /usr/bin/equery ]] ; then
+			PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-");
+		fi
+		if [[ -n "${PKGSET}" ]] ; then
+			rlpkg ${PKGSET};
+		fi
 	fi
 }
 
@@ -346,6 +355,12 @@ selinux-policy-2_pkg_postinst() {
 selinux-policy-2_pkg_postrm() {
 	# Only if we are not upgrading
 	if [[ -z "${REPLACED_BY_VERSION}" ]]; then
+		# Set root path and don't load policy into the kernel when cross compiling
+		local root_opts=""
+		if [[ "${ROOT%/}" != "" ]]; then
+			root_opts="-p ${ROOT%/} -n"
+		fi
+
 		# build up the command in the case of multiple modules
 		local COMMAND
 		for i in ${MODS}; do
@@ -355,7 +370,7 @@ selinux-policy-2_pkg_postrm() {
 		for i in ${POLICY_TYPES}; do
 			einfo "Removing the following modules from the $i module store: ${MODS}"
 
-			semodule -s ${i} ${COMMAND}
+			semodule ${root_opts} -s ${i} ${COMMAND}
 			if [[ $? -ne 0 ]]; then
 				ewarn "SELinux module unload failed.";
 			else
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 0e532a8f201e..552bba37c312 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -15,7 +15,6 @@ if [[ -n ${BINUTILS_TYPE} ]] ; then
 	BTYPE=${BINUTILS_TYPE}
 else
 	case ${PV} in
-	9999)      BTYPE="git";;
 	9999_pre*) BTYPE="snap";;
 	*.*.90)    BTYPE="snap";;
 	*.*.*.*.*) BTYPE="hjlu";;
@@ -24,11 +23,6 @@ else
 fi
 
 case ${BTYPE} in
-git)
-	BVER="git"
-	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
-	;;
 snap)
 	BVER=${PV/9999_pre}
 	;;
@@ -58,7 +52,6 @@ DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 
 case ${BTYPE} in
-	git) SRC_URI="" ;;
 	snap)
 		SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2
 			ftp://sourceware.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2" ;;
@@ -112,11 +105,7 @@ if is_cross ; then
 	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
 fi
 
-S=${WORKDIR}/binutils
-case ${BVER} in
-git) ;;
-*) S=${S}-${BVER} ;;
-esac
+S=${WORKDIR}/binutils-${BVER}
 
 LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
 INCPATH=${LIBPATH}/include
@@ -129,10 +118,7 @@ else
 fi
 
 tc-binutils_unpack() {
-	case ${BTYPE} in
-	git) git-2_src_unpack ;;
-	*)   unpacker ${A} ;;
-	esac
+	unpacker ${A}
 	mkdir -p "${MY_BUILDDIR}"
 	[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
 }
diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index d75ca2eefdf5..5f0e0cfd5cd5 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -667,16 +667,7 @@ toolchain-glibc_do_src_unpack() {
 	# Check NPTL support _before_ we unpack things to save some time
 	want_nptl && check_nptl_support
 
-	if [[ -n ${EGIT_REPO_URIS} ]] ; then
-		local i d
-		for ((i=0; i<${#EGIT_REPO_URIS[@]}; ++i)) ; do
-			EGIT_REPO_URI=${EGIT_REPO_URIS[$i]}
-			EGIT_SOURCEDIR=${EGIT_SOURCEDIRS[$i]}
-			git-2_src_unpack
-		done
-	else
-		unpack_pkg
-	fi
+	unpack_pkg
 
 	cd "${S}"
 	touch locale/C-translit.h #185476 #218003
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 8ebf140ddb3d..3cbb52e28c90 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnugo/Manifest b/games-board/gnugo/Manifest
index 2459e5edbf4e..13b0b989215e 100644
--- a/games-board/gnugo/Manifest
+++ b/games-board/gnugo/Manifest
@@ -2,5 +2,5 @@ AUX gnugo-3.9.1-format-security.patch 1943 BLAKE2B 2dd1c6f7b69da62baac53336e1b01
 AUX gnugo-3.9.1-invalid-move.patch 727 BLAKE2B 5c5a13e3b00175627a45a4ef1d32b4a3dc049114281219ec70a22985c2deb027938b2e4ee1c0a58c1da8759800fdd9f98d6bb4981405f51af6269e0a01dedb74 SHA512 a1f20761e714670e2173b36390492304252bf30e46f93e37dee3cc72de346a59a8daaaaa6f0cf2e20834637598831f0f55d4c6c0825021d6fd00055a57db2bdb
 DIST gnugo-3.9.1.tar.gz 3207748 BLAKE2B 4251e125eac20188926210db8640f1ae4ff2b79f6a59b429af9e10fcfd6b0d34f9bf180b32194c519a7b59905a4b5e8bc1a2e45a071a8b8696bf16dd04f6a342 SHA512 b2b215fb8c1ebb0b58e54d14dcc02af3b76bde3a1b84a842a11a0a6018c77a2464c44b26fe0e7ad73b2b2e7fa22005466821bf762108c2c2e04428d3d459af97
 EBUILD gnugo-3.9.1-r1.ebuild 662 BLAKE2B 48296b632f9c05b031b7550e76af9a25217e21c7503a17f65fd859b4170ef8436251fa8ec911278cf4c469c5544f41c79975a197612c0938169211a89554de73 SHA512 287f9f4e6b7a7daa14cbfa7efe45d8f784c08fd4805a1b6f249e269156d9320a9d490ae1204a7c7bf52881e4bfd3b9e4982b3428a73f1cbae2f4db45f452fc58
-EBUILD gnugo-3.9.1-r2.ebuild 631 BLAKE2B 9bb7b3a76f9626167dd3eeba0461b5708f09766fd5e8da3ed4a998df8b066c1556152b569f39e11753a501d75b017743d0b8970806673addeaa8de5f21f74e0b SHA512 14a7092ef29576c6a51198dcdb260b061c3f1cc538c400f18ba499ffa213bb7acfef7678bcc28fc027395f55e1d77f1804a8dd9e4649189d48ecc09bfe029c93
+EBUILD gnugo-3.9.1-r2.ebuild 629 BLAKE2B 05c8d80d4cf395224f294fde9dcbc2b229ed22658eae5be04b22ade62a03f0851676b2ea23d6949fcfc2394a0f664710c6472ce6cc023ca06771fdec852d2226 SHA512 dcf6fe0a264ce07e6e675c21f91f04114a841587b3a44e6922a452b5ee8559de3dd2df8c83922638bd9d4ba785fff34212e5f8cb99959b3677d4b930c502a9a1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnugo/gnugo-3.9.1-r2.ebuild b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
index b78c0ed865e0..e378df0f20ca 100644
--- a/games-board/gnugo/gnugo-3.9.1-r2.ebuild
+++ b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="readline"
 
 RDEPEND="
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 417645852642..cf1bfe353fdd 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/fortune-mod-gentoo-ru/Manifest b/games-misc/fortune-mod-gentoo-ru/Manifest
deleted file mode 100644
index a26fe6f9bf41..000000000000
--- a/games-misc/fortune-mod-gentoo-ru/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gentoo-ru-0.26.gz 77812 BLAKE2B 40d7db72b75d5dccac75cbedc61abe5ac073f83f8055b9be923f927e171ac7896f401a943fd13830faba2a879d49f52f0516708ed3cbbe3784e862d1111ca0cf SHA512 2f61acd370a7ddcaec80c91129cf624434611deaba6ffa6e207ec82ce960e67bcec63e583afc71187fc0876da97bbf60ab81060d8d9d30081300d93e64fe4eb4
-EBUILD fortune-mod-gentoo-ru-0.26.ebuild 685 BLAKE2B e9ca49c9b8753c270f2d1bac7cfcfe984c1abd08a1f2d352c3207637da5358b1b8fa8c2d5d02d2dc5583c988b183a97d835d80f7261651c7834a357a2bfadaca SHA512 0e9608fec46fbc7a4e7d151c6c061ec78c2620a462aaf81ddea55f2ccfc324e69731f05f9b85a3cf899d49a9bc3867f46d3977d603f11f600e27029181d982bb
-EBUILD fortune-mod-gentoo-ru-9999.ebuild 644 BLAKE2B 7a87fb3afe9b50e28361b1d06d8ae203393db9f654573b13ec1f5b1d569bd68c8fa5c80d4783306feb89699063e0411f9c148681dc497ad1a331183f74bbd188 SHA512 6c00cd321df15fce298517e8920eb61979260b29b0a2585b1102cbd248edf2a7ce27d68a42f646bcfbb452623ee90eb5c6a431c78b6e316fd1dbaaec011e1643
-MISC metadata.xml 405 BLAKE2B b7a25f18d904ad17af5d4009e296366f9c0aa5bcc997d574b2de604c875dbb973a0687ccdc1d9ef79ea4dc484fd06f2a687a2cb242cf99c918170fd4960354fd SHA512 55dcd98ed24f4b8ed9194dd0343d5635eca0159c57b97420974a63652ce81c0e5fdcfacf056161dec24d3574fa4ed479c93d25d1fb71e1a61a6fcc986d3b7a36
diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
deleted file mode 100644
index ba8aa2589f79..000000000000
--- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru"
-HOMEPAGE="http://fortunes.gentoo.ru"
-SRC_URI="https://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz
-	http://maryasin.name/fortunes-gentoo-ru/gentoo-ru-${PV}.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_compile() {
-	mv gentoo-ru-${PV} gentoo-ru || die
-	strfile gentoo-ru || die
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins gentoo-ru gentoo-ru.dat
-}
diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-9999.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-9999.ebuild
deleted file mode 100644
index 868fc0205d6c..000000000000
--- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit mercurial
-
-DESCRIPTION="Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru"
-HOMEPAGE="http://fortunes.gentoo.ru"
-SRC_URI=""
-EHG_REPO_URI="https://gentoo-ru-fortunes.slepnoga.googlecode.com/hg"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	mv gentoo-ru-9999 gentoo-ru || die
-}
-
-src_compile() {
-	strfile gentoo-ru || die
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins gentoo-ru gentoo-ru.dat
-}
diff --git a/games-misc/fortune-mod-gentoo-ru/metadata.xml b/games-misc/fortune-mod-gentoo-ru/metadata.xml
deleted file mode 100644
index 5c8760523dc5..000000000000
--- a/games-misc/fortune-mod-gentoo-ru/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru
-and other russian gentoo related resourses.</longdescription>
-	<upstream>
-		<remote-id type="google-code">slepnoga</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index f21112b7a4c9..2e5a734fea4c 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
index a279ea8c6424..5b2e93b46124 100644
--- a/games-rpg/freedink-data/Manifest
+++ b/games-rpg/freedink-data/Manifest
@@ -1,3 +1,5 @@
 DIST freedink-data-1.08.20140901.tar.gz 51303165 BLAKE2B 28c225cf12b2bdcf0cf4cccb773e39055c756f0d031d851e697b2a47b8d82781b43ac31ae88245e67582be74fed8a67b20498d8e61231bb4106cc1a679b9ac18 SHA512 cdaa50610ed7e365967f6a84f6d540295ccc85bf4d11b882b49c6b97abe2b375be9880afc1e8ea31cdf22a24365d09861b9f4d1d522cc1ae685f7a8b6b4cad82
+DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d SHA512 8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc
 EBUILD freedink-data-1.08.20140901-r1.ebuild 480 BLAKE2B af2dd511e91fc3befa1e7ca9d5af8906e751610c7f7418dbc1f5e579a928c16e53b20728289e76ed0dd9c352e279e3018310bb20d1576ff9585c8eaec361089e SHA512 0d1b688d5c8cab12bd4c3123583f8d20686a65f275b510b97664935b452ba5b76604639e51d9307edf2f5101e4dbdba4c049793936ff1a154a3dbcdbe0f869c9
+EBUILD freedink-data-1.08.20170409.ebuild 472 BLAKE2B 3cf16f3b121aefee27b7d147d7596aa3c4aa545a42d67f6d5fc3a5293798a5576d8c42c6a145da14f376c3a7569a21ebb74e63700ea33773decde06f967a6f0f SHA512 13c954cb0697375126de07de9851f6175705e18d85ed649ac841889af2df779de148cf54aaa20dbc7af2adc4a58f51dc5428f8702f4d527a73b93b8fcbf2fcab
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
new file mode 100644
index 000000000000..61874259e09a
--- /dev/null
+++ b/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Freedink game data"
+HOMEPAGE="http://www.freedink.org/"
+SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
+
+LICENSE="ZLIB
+	CC-BY-SA-3.0
+	CC-BY-3.0
+	FreeArt
+	GPL-2
+	GPL-3
+	WTFPL-2
+	OAL-1.0.1
+	public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_install() {
+	emake DESTDIR="${D}" DATADIR="/usr/share" install
+	dodoc README.txt README-REPLACEMENTS.txt
+}
diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
index 5834dc97f384..8e9f5064bd39 100644
--- a/games-rpg/freedink/Manifest
+++ b/games-rpg/freedink/Manifest
@@ -1,3 +1,4 @@
+AUX freedink-108.4-no-windres.patch 733 BLAKE2B 165eb162877e49b4d2785ca394da2eb092171ae02f46da822d39405a037f40d28553fb46f5900b4b50f84a3e1abe499ae65198e4b21e7d2bb8771e6ce97cfd67 SHA512 f771f54e93d0ce4233d8f895dba91cfe637abae47d1fccefeb5fea615845c107710b1f7c7ccf30dc2a1ef6bc4ec7ee73ff7bc7914387ca5e97de229457c18802
 DIST freedink-108.4.tar.gz 1897701 BLAKE2B b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
-EBUILD freedink-108.4-r1.ebuild 1023 BLAKE2B 9cee4fec543e4d3c406fc076ee6a00f660592f40443f56ff78fe1ba926213b7db486c540d10ff06cf7b75a6744f3af9832810defd0b915eed956e780706dbac6 SHA512 d23fbb32c63d88e023200449c3cacdfcaee5c9872d83d111b668573eb4f5d4ff547460187ed58e911e7064a67c0cac4777a791ede4f7a255575a4fb81d7d597f
+EBUILD freedink-108.4-r1.ebuild 1064 BLAKE2B 51675813c9d58c44da48884bd47b6f51373a7f9d05f8118e7ff35ccd582c87cc3326baf3329668b30ab98dfa80f3b746ef66913f45a1e47b88d406ae08123891 SHA512 29b4f5d78125577e2790e6a46b922b2fcf13099c275898f8ee685be2adda84e6d125daafc650f5dd04473e09d3fe744cc332a058664fe21a705a3dd1efbe4a11
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink/files/freedink-108.4-no-windres.patch b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
new file mode 100644
index 000000000000..81c72e00dae0
--- /dev/null
+++ b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
@@ -0,0 +1,20 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -226,7 +226,7 @@
+ 	update_frame.h
+ am_freedink_OBJECTS = $(am__objects_3) freedink.$(OBJEXT) \
+ 	update_frame.$(OBJEXT)
+-@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
++#@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
+ nodist_freedink_OBJECTS = $(am__objects_4)
+ freedink_OBJECTS = $(am_freedink_OBJECTS) $(nodist_freedink_OBJECTS)
+ freedink_LDADD = $(LDADD)
+@@ -1143,7 +1143,7 @@
+ @HAVE_WINDRES_FALSE@WOERES = 
+ 
+ # How do we handle resources embedded in the executable binary?
+-@HAVE_WINDRES_TRUE@WOERES = woeres.rc
++#@HAVE_WINDRES_TRUE@WOERES = woeres.rc
+ 
+ # Other projects that use Autotools and support MinGW
+ # http://sourceforge.net/projects/chocolate-doom (Doom port)
diff --git a/games-rpg/freedink/freedink-108.4-r1.ebuild b/games-rpg/freedink/freedink-108.4-r1.ebuild
index a40e9cd65da7..743ce07e7546 100644
--- a/games-rpg/freedink/freedink-108.4-r1.ebuild
+++ b/games-rpg/freedink/freedink-108.4-r1.ebuild
@@ -22,13 +22,16 @@ DEPEND="
 	>=media-libs/sdl-ttf-2.0.9
 "
 RDEPEND="${DEPEND}
-	~games-rpg/freedink-data-1.08.20140901
+	games-rpg/freedink-data
 "
 DEPEND="${DEPEND}
 	dev-libs/check
 	virtual/pkgconfig
 	sys-devel/gettext
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-108.4-no-windres.patch
+)
 
 src_prepare() {
 	default
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 7e6ee115de1d..902235331b28 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 230fc27f754a..114cc3e21bb6 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,4 +1,6 @@
 DIST FlightGear-2018.1.1-data.tar.bz2 1576049981 BLAKE2B cfcf028ca04ed785ba7c65979e6566ab773d8af869a9b62050969295eafecf7d1f5b6162f498af96786fa23a46e886390f240b56c83e7107473f59552a1155a5 SHA512 022f102f95c9cd8b153d991dad55ecd182e71aa0f3ecfe1502a35d6dcda0746a1fd183f808e59aba8c7f3a0cc9ae1f2f91ff49565bff4c7bc5a1c4889fcc127f
+DIST FlightGear-2018.2.1-data.tar.bz2 1624676603 BLAKE2B baecea2002fc3c256205e70c6692102f9bccd04c839902353b0e6d803a97221479e8b54095530dc7af366d842c487d04447f0fd775527e6f5ea0ac32ed602dd6 SHA512 93690703965dd83b610ea0ba67938c0d3fb2d5f6d8c842851a979f352387431eacafb4d181a56dad6def474b2ab84f412cf5531570ce18c1ec80076fe92e4d05
 EBUILD flightgear-data-2018.1.1.ebuild 518 BLAKE2B afd977b91675529215c7c72fb939a8a2c1be99b5af682a86cfd06175b9a9386c6fe665b31fe8e2e5102fba0f33f0d28bed2c150e614758f6b758738b9c53c86d SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f
+EBUILD flightgear-data-2018.2.1.ebuild 518 BLAKE2B b28ff44f4d60306ee8edd3d1cc1af8659891ec4d358aa677112d3489584f3d79abc4d093b84795750894ce8f6bbffefaaa219df6b6467189aa445dfe7d05fde0 SHA512 6c2c9171b3d91fd9eeb5c3b2f6cfbdd5cc5a6fe6ab3ec5cb8fbc9bbf6b311f69e43d269fdff725a4eb1e081e72aab191ab544f890954fdec4fd99088be881ddc
 EBUILD flightgear-data-9999.ebuild 546 BLAKE2B ea1647fcbee2eee6a213ad67e6fa6ca22ee66d8a7ed4cc6928a75a9e2852b9befbba63aa5032921da37aa83cbb22d3d6433d459faa5787d80cdd33678215125c SHA512 92dae00bd54b164590c4c9cd66f3797a8f39211a66773c6cb710ecfff4d47f1d65d03861ec9648a8165a823f038f3d19b54dbd2b9b145147d29696569b4ae508
 MISC metadata.xml 445 BLAKE2B a66be5a62283a2a7c8c086ad4d0cfbce8e1c7bdcd890e39fef504821b8eb01facc32f36afcdc4c62544bbc1b5c5b49e8a752f8b42dcbcf7adeb50b0cb5fd7afc SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
new file mode 100644
index 000000000000..f364395e8473
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 5ce45f9ae6f6..6d5c731446e3 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,6 +1,9 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
+AUX flightgear-2018.2.1-cmake.patch 364 BLAKE2B fd191b13792a4a9846dfc1a1f3875e13cd0641f3caf9572498d841ada6b20036610ff667d66781990d71a34f0e7bca893c403e6988c903066abd305aa47be4a8 SHA512 522e4f3cb8f1e0d8f4b44d4454d5652ba545841b9d8f8f180bc45a059274580ed64b11ab64fd2e5214100f85dbf4b8de365478d367115f242f46ce2ae789141c
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93
+DIST flightgear-2018.2.1.tar.bz2 8344999 BLAKE2B fc5fbd43bcc2e40ed3245aa5059b0e5a40918a707cbddc8383de191e29f6cdfaa6960f6cfffb201b20ad10f5da0f343a693768d38be2788fd2582f7b5dc2419c SHA512 d308eebf6d6017794c086d534f6543c03a54e55bd7f48caf8359d5a84776406eac8cd8f32252efb2cd8bbb82c9c15fe4d7e3229ff2483e7a9772bd532331be03
 EBUILD flightgear-2018.1.1.ebuild 3675 BLAKE2B 3b5f1278f9d30def22ce34477f0a014de7aded6c8065758f518040211ddb5df5d834d4eeec3eb70c34705117cc8cd4541e80b37781d6e5fcc27932aec4c476a4 SHA512 b6854ea8183ff5674935a33c223c881e181fc71999e0af93d3af5a9104bc03630b25cb50d7dc019360efb70056fd53f5a2debfb507bff59d2ca08d094eee7c3b
+EBUILD flightgear-2018.2.1.ebuild 3864 BLAKE2B 2cf1d7735e1b5395f00580b83d32518eabc3468cc9992836bc7ab084a5b157e7ff94504f61282a25dd8dbd86ea7dc2d9b3faee58fad80e4b2377146e835ca37c SHA512 67f6547445806bab8e6c57ae727784a7f7c82a3784d3cfd532ecf26b9e19accda55fd0bd265ef18fdb01ee49e5559a2f13bdd73f23a2f855157eebeb14fb2c13
 EBUILD flightgear-9999.ebuild 3725 BLAKE2B 433c07af5de569f1add5ed24527745d40b2f65bdf1e9e9fc611f1bd22159559c778b7b6b4181acd2055ebf4b3c6d6c27298f55979b03f42466ad4ea1435d4c90 SHA512 88412936aa8b2a16fb9501952345185f66d8952c8727422250f17868a3b70639e23da2cb82d2640d80d6183bcc30c1d9cf6baf782cf6da0a8cc1a048c97e3066
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
new file mode 100644
index 000000000000..eca04212833a
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
@@ -0,0 +1,11 @@
+diff -ruN flightgear-2018.2.1/CMakeLists.txt my/CMakeLists.txt
+--- flightgear-2018.2.1/CMakeLists.txt	2018-06-03 09:47:23.000000000 +0200
++++ my/CMakeLists.txt	2018-06-07 01:09:14.621303443 +0200
+@@ -596,4 +596,6 @@
+ 
+ 
+ # The test suite.
+-add_subdirectory(test_suite EXCLUDE_FROM_ALL)
++if(ENABLE_TESTS)
++    add_subdirectory(test_suite EXCLUDE_FROM_ALL)
++endif()
diff --git a/games-simulation/flightgear/flightgear-2018.2.1.ebuild b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
new file mode 100644
index 000000000000..15be88e6c57e
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[jpeg,png]
+	~dev-games/simgear-${PV}[gdal=]
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
+	qt5? (
+		>=dev-qt/qtcore-5.7.1:5
+		>=dev-qt/qtdeclarative-5.7.1:5
+		>=dev-qt/qtgui-5.7.1:5
+		>=dev-qt/qtnetwork-5.7.1:5
+		>=dev-qt/qtwidgets-5.7.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+PATCHES=("${FILESDIR}/${P}-cmake.patch")
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_AUTOTESTING=OFF
+		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_HID_INPUT=$(usex udev)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_BUILD_TYPE=Release
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_CPPUNIT=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 9d7b2ed1b1c9..6fcd554da617 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
deleted file mode 100644
index 9ee0111adc3e..000000000000
--- a/games-strategy/ufo-ai/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX ufo-ai-2.4-anon.patch 731 BLAKE2B 7789e7ae6a748128acbdecebb44e4ac89178128926d3412f8b46889cda125fa267dbfaa44af2aa4df60ecac8ef4fe6ded67fa8e54a7c88751f38cb8b6c57f9cc SHA512 252d3cfe1ad2dc947433e316505b5cbdacd663d3465aa5ffaaeb1ba2a641b2a8a01ef91f503fa335c2642f0fc0342abf159fbc13640802d02d7aabdbbb40883c
-AUX ufo-ai-2.4-locale.patch 744 BLAKE2B 428e500092f5c4c5ed32f271231af2157e989e0d5759fa546cfa3c308c605b1a578004a08836eb29c21ae8d139f95e97a73ff7e57651e260cca04fabbc1ac7ef SHA512 94ae4710bfed572abe7dd4b6238ddb4e240c55250e608d63fc1c8ccf67567927721a0f09234ae7a018fe38e4f5a0bc47745b483e5073d5a4da3816d99853746d
-AUX ufo-ai-2.4-mathlib.patch 1852 BLAKE2B 793a17f18af5dbc3420e5d06b239aa5ed024470cab74c3d278f3d83720ceb6b48e589694e510dd2ce5084106b7688bd64045db3abb62da74d589213429b71ea9 SHA512 3b086458e94ea9a7f1efd4ecb7d96a5b44e326f0d59916476595bf328c1e66250241124a74921302a9e139eeb61fd7b2a860fd972bbbc5664157bf60a2196b02
-DIST 1maps.pk3 242016 BLAKE2B 8b30fd8d8bcb4f59b1626feb00e71d7a2360ab19a7aade746778f3cf668ae670cb4c61f35847f49df677ac6a8948e496c37da980db5a1c780128c6c75c0d9e15 SHA512 9615b365e590dceb82362e7cd683980e15401a3b5a2b359a33c7ed2a4c51e5328efb352618cc48f46971a2ced1717276b5270ca6bf6d2bc7fc2b2238030eb3ae
-DIST ufoai-2.4-data.tar 937062400 BLAKE2B a364058fb06501a93edc23a721849005bdab996b4dab572a102900579db4cfc819d905431f85bd6a3eddc5295996cea8de42b394821f72564fe3bef72a2a4a88 SHA512 471eab2f62cad144fe9966317d48c408fba19de0c33cf7414918b502c723b722af38a025f808848698d9a06ffc10fb0faac145dd01dcd3d321547c87da1c6246
-DIST ufoai-2.4-source.tar.bz2 16875353 BLAKE2B 67da8274733810eeece2fce69d49685433dfca766e8f8e03717f9828cfdd3b0f002c4b0d0402b667b1262a9d1deaeadf4c31e47eb0fe7fab0d3b62ec6715d9d3 SHA512 3f9d0df7392f50c201464c81e42435f860df97d5d7a2ef53bb9a05d2b2fc645a1130baaf16fc34818b88bb07b8cf83283f7479d685cbd3caf80ea7522e13c56f
-EBUILD ufo-ai-2.4.ebuild 2733 BLAKE2B fa9f944bb071f12c2f38d2858052c88da098b6bb6b85859413b843d518d3335cbcd07ec5113ac0103f51f108f5ba4bb25f2f8606712c817b35f0f80a2faed36f SHA512 15aef152ec1fb487ff30e93746c2cd7d5502726fc77e05e25b072825dc39d93e942552f249741b0a07656064976f3a3e6d56a1f84c475d215b02b0eeca4dd8dc
-MISC metadata.xml 403 BLAKE2B cb99fbd5f7f476ce55df930f1a83ce9dd4ceb22f91d4ba3797659247a15c921fbb20342ac603719a3c57aa4bd6fe121fa0bc65fc597c60adf8e9877794e34114 SHA512 959ff148dd3c58fdc06929f0ec98e1aecdced859cd0ce4549582dde6913d7061bc7ad39522f88fd6e18cf8731c04d3c8198d5f731b1839df16a53fc554c4adf0
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch
deleted file mode 100644
index 53f07261bb7e..000000000000
--- a/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/tools/radiant/radiant/camera/CameraSettings.h.old	2014-10-22 08:30:35.690248415 +0200
-+++ src/tools/radiant/radiant/camera/CameraSettings.h	2014-10-22 08:31:12.329900302 +0200
-@@ -16,13 +16,13 @@
- const std::string RKEY_ENABLE_FARCLIP = "user/ui/camera/enableCubicClipping";
- const std::string RKEY_DRAWMODE = "user/ui/camera/drawMode";
- const std::string RKEY_SOLID_SELECTION_BOXES = "user/ui/xyview/solidSelectionBoxes";
-+}
- 
- enum CameraDrawMode
- {
- 	drawWire, drawSolid, drawTexture
- };
- 
--}
- /* greebo: This is the home of all the camera settings. As this class derives
-  * from a RegistryKeyObserver, it can be connected to the according registry keys
-  * and gets notified if any of the observed keys are changed.*/
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch
deleted file mode 100644
index 632e0d4fdc0d..000000000000
--- a/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN ufoai-2.4-source.old//src/client/cl_main.c ufoai-2.4-source/src/client/cl_main.c
---- ufoai-2.4-source.old//src/client/cl_main.c	2012-05-01 10:59:51.720868619 +0200
-+++ ufoai-2.4-source/src/client/cl_main.c	2012-05-01 11:00:57.235869759 +0200
-@@ -1180,7 +1180,11 @@
- 	if (fs_i18ndir->string[0] != '\0')
- 		Q_strncpyz(languagePath, fs_i18ndir->string, sizeof(languagePath));
- 	else
-+#ifdef LOCALEDIR
-+		Q_strncpyz(languagePath, LOCALEDIR, sizeof(languagePath));
-+#else
- 		Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", FS_GetCwd());
-+#endif
- 	Com_DPrintf(DEBUG_CLIENT, "...using mo files from %s\n", languagePath);
- 	bindtextdomain(TEXT_DOMAIN, languagePath);
- 	bind_textdomain_codeset(TEXT_DOMAIN, "UTF-8");
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch
deleted file mode 100644
index 72fd81038fb6..000000000000
--- a/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/509928
-
-src/common/common.c:261: error: undefined reference to 'sincos'
-src/shared/mathlib.c:476: error: undefined reference to '__acosf_finite'
-[ ... snip ... ]
-collect2: error: ld returned 1 exit status
-
---- build/modules/ufo.mk
-+++ build/modules/ufo.mk
-@@ -9,7 +9,7 @@
- $(TARGET)_LINKER   := $(CC)
- $(TARGET)_FILE     := $(TARGET)$(EXE_EXT)
- $(TARGET)_CFLAGS   += -DCOMPILE_UFO $(BFD_CFLAGS) $(SDL_CFLAGS) $(SDL_TTF_CFLAGS) $(SDL_MIXER_CFLAGS) $(CURL_CFLAGS) $(THEORA_CFLAGS) $(XVID_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(MXML_CFLAGS)
--$(TARGET)_LDFLAGS  += -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz
-+$(TARGET)_LDFLAGS  += -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -lm
- 
- $(TARGET)_SRCS      = \
- 	client/cl_console.c \
---- build/modules/testall.mk
-+++ build/modules/testall.mk
-@@ -9,7 +9,7 @@
- $(TARGET)_LINKER   := $(CC)
- $(TARGET)_FILE     := $(TARGET)$(EXE_EXT)
- $(TARGET)_CFLAGS   += -DCOMPILE_UFO -DHARD_LINKED_GAME -DCOMPILE_UNITTESTS $(BFD_CFLAGS) $(SDL_CFLAGS) $(CURL_CFLAGS) $(OGG_CFLAGS) $(MXML_CFLAGS)
--$(TARGET)_LDFLAGS  += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz
-+$(TARGET)_LDFLAGS  += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -lm
- 
- $(TARGET)_SRCS      = \
- 	tests/test_all.c \
diff --git a/games-strategy/ufo-ai/metadata.xml b/games-strategy/ufo-ai/metadata.xml
deleted file mode 100644
index 21d773f531ac..000000000000
--- a/games-strategy/ufo-ai/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 type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="editor">Build map editor</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">ufoai</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
deleted file mode 100644
index 57907a66571c..000000000000
--- a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic games
-
-MY_P=${P/o-a/oa}
-
-DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
-HOMEPAGE="http://ufoai.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ufoai/${MY_P}-source.tar.bz2
-	mirror://sourceforge/ufoai/${MY_P}-data.tar
-	http://mattn.ninex.info/1maps.pk3"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated editor"
-
-# Dependencies and more instructions can be found here:
-# http://ufoai.ninex.info/wiki/index.php/Compile_for_Linux
-DEPEND="!dedicated? (
-		virtual/opengl
-		virtual/glu
-		media-libs/libsdl
-		media-libs/sdl-image[jpeg,png]
-		media-libs/sdl-ttf
-		media-libs/sdl-mixer
-		virtual/jpeg
-		media-libs/libpng:0
-		media-libs/libogg
-		media-libs/libvorbis
-		x11-proto/xf86vidmodeproto
-	)
-	net-misc/curl
-	sys-devel/gettext
-	sys-libs/zlib
-	editor? (
-		dev-libs/libxml2
-		virtual/jpeg
-		media-libs/openal
-		x11-libs/gtkglext
-		x11-libs/gtksourceview:2.0
-	)"
-
-S=${WORKDIR}/${MY_P}-source
-
-src_prepare() {
-	if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then
-		sed -i -e '1i#define OF(x) x' src/common/ioapi.h || die
-	fi
-
-	# don't try to use the system mini-xml
-	sed -i -e '/mxml/d' configure || die
-
-	epatch \
-		"${FILESDIR}"/${P}-mathlib.patch \
-		"${FILESDIR}"/${P}-anon.patch \
-		"${FILESDIR}"/${P}-locale.patch
-
-	cp "${DISTDIR}"/1maps.pk3 "${WORKDIR}"/base/ || die
-	mv "${WORKDIR}"/base/ "${S}"/ || die
-}
-
-src_configure() {
-	# they are special and provide hand batched configure file
-	local myconf="
-		--disable-dependency-tracking
-		$(use_enable !debug release)
-		$(use_enable editor ufo2map)
-		$(use_enable editor uforadiant)
-		--enable-ufoded
-		--bindir="${GAMES_BINDIR}"
-		--libdir="$(games_get_libdir)"
-		--datadir="${GAMES_DATADIR}/${PN/-}"
-		--localedir="${EPREFIX}/usr/share/locale/"
-		--prefix="${GAMES_PREFIX}"
-	"
-	echo "./configure ${myconf}"
-	./configure ${myconf} || die
-}
-
-src_compile() {
-	emake
-	emake lang
-
-	if use editor; then
-		emake uforadiant
-	fi
-}
-
-src_install() {
-	newicon src/ports/linux/ufo.png ${PN}.png
-	dobin ufoded
-	make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN}
-	if ! use dedicated; then
-		dobin ufo
-		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
-	fi
-
-	if use editor; then
-		dobin ufo2map ufomodel
-	fi
-
-	# install data
-	insinto "${GAMES_DATADIR}"/${PN/-}
-	doins -r base
-	rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/game.so"
-	dogameslib base/game.so
-
-	# move translations where they belong
-	dodir "${GAMES_DATADIR_BASE}/locale"
-	mv "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/"* \
-		"${ED}/${GAMES_DATADIR_BASE}/locale/" || die
-	rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/" || die
-
-	prepgamesdirs
-}
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
new file mode 100644
index 000000000000..afc325d031c8
--- /dev/null
+++ b/games-strategy/ufoai/Manifest
@@ -0,0 +1,6 @@
+AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5adf981e5062eb75bffaac51c127fe056e00da59238d91a0b1916d6325ea7e643a87e0945ac3ef20d8f2b958cc88904d96ed9c3 SHA512 b8a61ca5be370bc7fec5d97317e950b2654e6ffe4ffef4473b64f1a37af5dfbfa9152ef4e5bb11e2217bdadae04e7499ef19b67bfdfb32c5ab4a200ac5798ffc
+DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
+DIST ufoai-2.5-mappack.tar.bz2 12200150 BLAKE2B d20f96f74a4b71a4ff55e4e3f81380ee35a71c6e34d35e6300487c916f2d836e240428e8f8529cca13d46ccd5440e7f59d5bfe5f451a2cd84469f8f1e85dc796 SHA512 0f44cc3d99ceb80f91e5df0f7cbd57ce3170f5635feb082c002ab9a0f4f81216b05c346c698475c33e88f97032186f4620bad71d02bfa95ecb5c5d4f68c71994
+DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
+EBUILD ufoai-2.5.0_p20180603.ebuild 3972 BLAKE2B dc47c6537bbf7f4f824300bb639009b64d7cb27fe0f36a334c79617fdac03ab4c4c7d2ef1068121c8730c8775bdc988828496f9366507dde30154b756ecf78f8 SHA512 65256cda61fda4e051a859836841fa8575e8dd224242781e7b444c403bc51ef71807eed6ba919194a9d31719b64c67a430df3b92959ff0f4654b04bf7a38f6e6
+MISC metadata.xml 536 BLAKE2B d0037cae0706304da8c17767d8980eadd1b437bce5f75e980e3a42113b2596d6ed0017962720a9f0c1cc726ceb63028249d5b87b57cf1166dee03d4b884f5d42 SHA512 e02322e3077645800fdc90673261658fe0c33f5e20282cdf40a1867ce85e07e79967f38999031c652f259520489cc65942ae252f8a26182cbdeae6ac5024271d
diff --git a/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch
new file mode 100644
index 000000000000..5c92f433e279
--- /dev/null
+++ b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch
@@ -0,0 +1,37 @@
+* Prevent stripping
+* Prevent installation of useless wrappers
+* Install binaries to the right locations
+
+Chewi
+2018/06/05
+
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2018-06-03 21:55:40.000000000 +0100
++++ b/Makefile	2018-06-05 22:29:08.666944853 +0100
+@@ -33,8 +33,8 @@
+ CONFIGURE_PREFIX ?=
+ 
+ INSTALL         ?= install
+-INSTALL_PROGRAM ?= $(INSTALL) -m 755 -s
+-INSTALL_SCRIPT  ?= $(INSTALL) -m 755
++INSTALL_PROGRAM ?= $(INSTALL) -m 755
++INSTALL_SCRIPT  ?= true
+ INSTALL_DIR     ?= $(INSTALL) -d
+ INSTALL_MAN     ?= $(INSTALL) -m 444
+ INSTALL_DATA    ?= $(INSTALL) -m 444
+@@ -162,8 +162,13 @@
+ 
+ install-$(1): $($(1)_FILE)
+ 	@echo 'Install $$<'
+-	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGDATADIR)/$(dir $($(1)_FILE))
+-	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGDATADIR)/$$<
++	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGBINDIR)/
++	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGBINDIR)/
++
++install-game: $(game_FILE)
++	@echo 'Install $$<'
++	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGLIBDIR)/
++	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGLIBDIR)/$(notdir $(game_FILE))
+ 
+ uninstall-$(1):
+ 	@echo 'Uninstall $($(1)_FILE)'
diff --git a/games-strategy/ufoai/metadata.xml b/games-strategy/ufoai/metadata.xml
new file mode 100644
index 000000000000..916e44355c73
--- /dev/null
+++ b/games-strategy/ufoai/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <use>
+    <flag name="client">Build the main game client</flag>
+    <flag name="editor">Build the map editor and compiler</flag>
+    <flag name="server">Build the dedicated server</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">ufoai</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
new file mode 100644
index 000000000000..0fd98165739d
--- /dev/null
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop flag-o-matic gnome2-utils toolchain-funcs versionator
+
+# 2.5.0 requires several patches
+COMMIT="8b4533e85fdc0665889ff285e1521432084ee784"
+
+# UFO:AI v2.5.0 was uploaded to SourceForge as 2.5
+DIST_VERSION=$(get_version_component_range 1-2)
+
+# Install game data here
+DATADIR="/usr/share/${PN}"
+
+DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
+HOMEPAGE="https://ufoai.org/"
+SRC_URI="
+	https://dev.gentoo.org/~chewi/distfiles/${PN}-code-${COMMIT}.zip
+	mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-data.tar
+	editor? ( mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-mappack.tar.bz2 )
+"
+
+# https://ufoai.org/licenses/
+LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client cpu_flags_x86_sse debug editor server"
+REQUIRED_USE="|| ( client editor server )"
+
+RDEPEND="
+	net-misc/curl
+	sys-libs/zlib
+
+	client? (
+		media-libs/libogg
+		media-libs/libpng:0=
+		media-libs/libsdl2[joystick,opengl,sound,threads,video]
+		media-libs/libtheora
+		media-libs/libvorbis
+		media-libs/sdl2-mixer
+		media-libs/sdl2-ttf
+		media-libs/xvid
+		virtual/jpeg:0
+		virtual/opengl
+	)
+
+	editor? (
+		dev-libs/glib:2
+		dev-libs/libxml2:2
+		media-libs/libogg
+		media-libs/libpng:0=
+		media-libs/libsdl2[joystick,opengl,sound,threads,video]
+		media-libs/libvorbis
+		media-libs/openal
+		virtual/glu
+		virtual/jpeg:0
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/gtkglext
+		x11-libs/gtksourceview:2.0
+	)
+
+	server? (
+		media-libs/libsdl2[threads]
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+PATCHES=( "${FILESDIR}"/${P}-install.patch )
+
+src_unpack() {
+	use editor && unpack ${PN}-${DIST_VERSION}-mappack.tar.bz2
+	unpack ${PN}-code-${COMMIT}.zip
+	cd "${S}" || die
+	unpack ${PN}-${DIST_VERSION}-data.tar
+}
+
+src_prepare() {
+	default
+
+	# Make the build system a bit happier, will be fixed upstream
+	mkdir -p base/{maps,models} contrib/installer/mojosetup/scripts || die
+}
+
+src_configure() {
+	# Avoid noise, will be present in 2.6
+	append-cxxflags -Wno-expansion-to-defined
+
+	# The configure script of UFO:AI is hand crafted and a bit special
+	# econf does not work: "invalid option --build=x86_64-pc-linux-gnu"
+	local config=(
+		--prefix="${EPREFIX}"/usr
+		--datadir="${EPREFIX}${DATADIR}"
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
+		--localedir="${EPREFIX}"/usr/share/locale
+		--disable-dependency-tracking
+		--disable-paranoid
+		--disable-memory
+		--disable-testall
+		--disable-ufomodel
+		--disable-ufoslicer
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable !debug release)
+		$(use_enable server ufoded)
+		$(use_enable client ufo)
+		$(use_enable editor uforadiant)
+		$(use_enable editor ufo2map)
+	)
+
+	if use client || use server; then
+		config+=( --enable-game )
+	else
+		config+=( --disable-game )
+	fi
+
+	echo ./configure "${config[@]}"
+
+	CC=$(tc-getCC) CXX=$(tc-getCXX) \
+	  ./configure "${config[@]}" || die "configure failed"
+}
+
+src_compile() {
+	emake all lang Q=
+}
+
+src_install() {
+	newicon -s 32 src/ports/linux/ufo.png ${PN}.png
+	emake install Q= DESTDIR="${D}"
+
+	if use client; then
+		doman debian/ufo.6
+		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
+	fi
+
+	if use server; then
+		doman debian/ufoded.6
+		make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN} "Game;StrategyGame" "Terminal=true"
+	fi
+
+	if use editor; then
+		doman debian/ufo{2map,radiant}.6
+		make_desktop_entry uforadiant "UFO: Alien Invasion Map editor" ${PN}
+
+		# Install map editor data (without the binary)
+		rm radiant/uforadiant || die
+		insinto "${DATADIR}"
+		doins -r radiant
+
+		# Install map sources
+		insinto "${DATADIR}"/base/maps
+		doins -r "${WORKDIR}"/${PN}-${DIST_VERSION}-mappack/*
+	fi
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 7cce06a5dc8a..733d5525023b 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,9 +1,6 @@
-AUX wesnothd.rc 502 BLAKE2B 70803edb2084abfee5382624adba4a31e0bd1d5e9e2a7d800f7732fb262bacc80eb39550f2c15d19b7be9bc626d07aa5eafca04ea07abfda92a1778681a51428 SHA512 5e0a4680a35f81e749b8e0d56e3cf372c4a13b19578deda072560d0c63460426d7bde3e0e955287c8fbc939c700dc487283373ff9bc72bbcd9cf633ddaeafc96
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6 SHA512 12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
 DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079 SHA512 0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e SHA512 010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
-EBUILD wesnoth-1.12.6.ebuild 3106 BLAKE2B 20d3d1069778f17dde09d92b734ca4aa1a9f6c20cf0cf65339a418c686e83e9a7b1d40e39aa823f467b50c62cf4cc7ec71a110ce390213189008940c0cfe3ef8 SHA512 3220f1581f8f4561d2c179267d47fd8c8c1eeb0a296467e6d07311635e01f2981b64b747377e229f0e3cd575accab4b66be99be36994b81400db20f56f795f5d
 EBUILD wesnoth-1.14.1-r1.ebuild 2656 BLAKE2B 00da7cf0a8939393225357da39a395d0de8c6bfb37b9eb939fc4c6813357ad7ac32ccfb395dfbc6ae6cab918e87fc041b097d5125d3b564ff74f5d045c68d197 SHA512 3276ec8c8b527addd1caf2f413dd95ec219bd7cc47779bb146eeddbd6bc7dd840bb6d852f70992ffde5dca90501489484faf27f6f65053b2b0b098d1cf8f941f
-EBUILD wesnoth-1.14.2.ebuild 2656 BLAKE2B 00da7cf0a8939393225357da39a395d0de8c6bfb37b9eb939fc4c6813357ad7ac32ccfb395dfbc6ae6cab918e87fc041b097d5125d3b564ff74f5d045c68d197 SHA512 3276ec8c8b527addd1caf2f413dd95ec219bd7cc47779bb146eeddbd6bc7dd840bb6d852f70992ffde5dca90501489484faf27f6f65053b2b0b098d1cf8f941f
+EBUILD wesnoth-1.14.2.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/files/wesnothd.rc b/games-strategy/wesnoth/files/wesnothd.rc
deleted file mode 100644
index f8662b0981fc..000000000000
--- a/games-strategy/wesnoth/files/wesnothd.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting wesnothd"
-	start-stop-daemon --start --quiet -b -m \
-		--pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid \
-		-c GAMES_USER_DED:GAMES_GROUP \
-		--exec "GAMES_BINDIR"/wesnothd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping wesnothd"
-	start-stop-daemon --stop --quiet --pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid
-	eend $?
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
deleted file mode 100644
index 3c5d8cf3cf08..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/"
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
-	media-libs/sdl-net
-	!dedicated? (
-		>=media-libs/sdl-ttf-2.0.8
-		>=media-libs/sdl-mixer-1.2[vorbis]
-		>=media-libs/sdl-image-1.2[jpeg,png]
-		fribidi? ( dev-libs/fribidi )
-		dbus? ( sys-apps/dbus )
-		sys-libs/zlib
-		x11-libs/pango
-		dev-lang/lua:0
-		media-libs/fontconfig
-	)
-	>=dev-libs/boost-1.48:=[nls,threads]
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use dedicated || use server ; then
-		sed \
-			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
-			> "${T}"/wesnothd || die
-	fi
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-	# bug #472994
-	mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
-	mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local langs
-		for lang in $(cat po/LINGUAS)
-		do
-			has $lang $LINGUAS && langs+="$lang "
-		done
-		echo "$langs" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-	# Work around eclass
-	append-flags -UNDEBUG
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			"-DENABLE_CAMPAIGN_SERVER=TRUE"
-			"-DENABLE_SERVER=TRUE"
-			"-DSERVER_UID=${GAMES_USER_DED}"
-			"-DSERVER_GID=${GAMES_GROUP}"
-			"-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			$(cmake-utils_use_enable fribidi FRIBIDI)
-			"-DENABLE_CAMPAIGN_SERVER=FALSE"
-			"-DENABLE_SERVER=FALSE"
-			)
-	fi
-	mycmakeargs+=(
-		$(cmake-utils_use_enable !dedicated GAME)
-		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
-		$(cmake-utils_use_enable nls NLS)
-		$(cmake-utils_use_enable dbus NOTIFICATIONS)
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DENABLE_STRICT_COMPILATION=FALSE"
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DDATAROOTDIR=${GAMES_DATADIR}"
-		"-DBINDIR=${GAMES_BINDIR}"
-		"-DICONDIR=/usr/share/pixmaps"
-		"-DDESKTOPDIR=/usr/share/applications"
-		"-DLOCALEDIR=/usr/share/locale"
-		"-DMANDIR=/usr/share/man"
-		"-DDOCDIR=/usr/share/doc/${PF}"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	DOCS="README.md changelog players_changelog" cmake-utils_src_install
-	if use dedicated || use server; then
-		keepdir "${GAMES_STATEDIR}/run/wesnothd"
-		doinitd "${T}"/wesnothd
-	fi
-	prepgamesdirs
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
index 5a1f6c5af2e9..27cde05f1ad0 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
@@ -100,7 +100,7 @@ src_configure() {
 		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_OMP="$(usex openmp)"
 		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		)
 	cmake-utils_src_configure
 }
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 07b67a909795..4f988a4d8c0a 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/dfarc/Manifest b/games-util/dfarc/Manifest
index d7ec33aec5d5..9c336d90b160 100644
--- a/games-util/dfarc/Manifest
+++ b/games-util/dfarc/Manifest
@@ -1,4 +1,6 @@
-AUX dfarc-3.12-nowindres.patch 725 BLAKE2B 2f18e6dac03aea89cc59cdb59d394a1c5cf3b25fda55bdc9742a36d278728ebf9ee5566edf6b671ba2d719d8c3ab193239aea1ce237d7d7c64e8b87eaf9c3491 SHA512 64d6deb8c3bfde0e276b779a000e09803eaea4d3dec86718e23c971f1b4d8d0066fec96d25e881e767ce85f9eddd3c0c2505a34cbd3ca024ecdb6ce1b7ebdffb
+AUX dfarc-3.12-nowindres.patch 648 BLAKE2B 0bc6d823c7bc44ff69730473a55542d974e1695086fef27a6b235306c20978b4645e00878123cadfa10202301b52f3e6731384c9bba140c76312e6cf9ab31b9d SHA512 1ac6a7b889a271b70a2ab606dfa7475c3053aca5f72192cae2b161db9d7ef955df74e7cf94e2db4ac89bee3ada433e20a4dc8ec37f836a12e2810ab61351bdc4
 DIST dfarc-3.12.tar.gz 329925 BLAKE2B ebebfdf42fbd8bcc53696777f5fb06a54635e269dafb59c888990250343e0bca0b20d46b051e753b047f008061ef74070456d83ee72eb37018a2bc1b386d1c9f SHA512 e87e89e67e383c3d25a6620edc38c6ab6f90b9df52b84d6e6de20af1ac3b50588b3037575f2f89a14c90c14151053c08a7bb97143f24471e33326f3f2d2574ab
+DIST dfarc-3.14.tar.gz 336910 BLAKE2B 50f0ad1af2d91a562ba6a7b1e0e5e1821c900fe8ab3cf48f3585ca10ea12d9f7e3125ae85bc2e31c1539bf13d5a950e30a467b05259a7df6e2bda35544820933 SHA512 536c1cb5d1c8bf7012920e39d69fafbb790da78acb89a18f8ab1a3ad985220c74da61adda238e39395b4d7fd8fc62894fb5579691b744fe17600a8fccabc3c13
 EBUILD dfarc-3.12-r1.ebuild 878 BLAKE2B 1015af2a3ad1bd03aed5659c3cd9e09040d4d6830dffa96bd75feeafa5e64ee1c88745b042edda83f4c0f978c804856c8e025ed027c8c99b24494a29e3b04b9a SHA512 dcbeb8a65243501a72dbf861adee7ba1efd771b9d7777992286674e7d5cbfc0db50be9e689e7083760cb5cf57e1545ec410a47d33ce73a8d39126b23e7ac5a1a
+EBUILD dfarc-3.14.ebuild 884 BLAKE2B 1ad3f1122cf29b8927f49b6d95ab151faf58649344027cf94bf313dd9951c082eea85d676f2b4039b14b2d5558e39cd58cd9513eed3a693f7cac48e813825d9d SHA512 9a5b85d95ba5999e289409f17883a1b1a9c9f88a33e872fb2cb73bf40a19193db821094eaeeaa36146cf9f68b0ea69ae47c0bdc8c145cafba0960aa4706f2565
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/dfarc/dfarc-3.14.ebuild b/games-util/dfarc/dfarc-3.14.ebuild
new file mode 100644
index 000000000000..96118b386c92
--- /dev/null
+++ b/games-util/dfarc/dfarc-3.14.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+inherit eutils gnome2-utils wxwidgets xdg
+
+DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
+HOMEPAGE="http://www.freedink.org/"
+SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
+
+LICENSE="GPL-3 BZIP2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	app-arch/bzip2
+	x11-misc/xdg-utils
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}
+	nls? ( >=dev-util/intltool-0.31 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.12-nowindres.patch )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-desktopfiles
+}
+
+src_install() {
+	default
+	dodoc TRANSLATIONS.txt
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/games-util/dfarc/files/dfarc-3.12-nowindres.patch b/games-util/dfarc/files/dfarc-3.12-nowindres.patch
index 142658ccb001..9c4a74e52592 100644
--- a/games-util/dfarc/files/dfarc-3.12-nowindres.patch
+++ b/games-util/dfarc/files/dfarc-3.12-nowindres.patch
@@ -1,5 +1,5 @@
---- a/src/Makefile.in.orig	2016-04-05 12:49:17.997412757 -0400
-+++ b/src/Makefile.in	2016-04-05 12:50:42.058496766 -0400
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -100,7 +100,6 @@
  	Package.$(OBJEXT) RecursiveDelete.$(OBJEXT) Tar.$(OBJEXT) \
  	DFArcFrame_Base.$(OBJEXT) Options_Base.$(OBJEXT) \
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 79bdaef57111..6340b4bb9a25 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 6a9f7afba156..66e429550de1 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -7,6 +7,6 @@ AUX nm-applet-1.8.10-vpn-crash.patch 4613 BLAKE2B 44dbc67736d2025f177de3c2996123
 DIST network-manager-applet-1.4.6.tar.xz 1388916 BLAKE2B 697587e4451d37ab91e99e25e40a1d797724e26568d252c77361e25f32508722a58dba1b2b4d2c784150479493c0451173da0b42314ebb17f1b7215628675444 SHA512 f0eab5c50739c2309fa19336e23ead6603dc953b62fff0600a91988df8d41c2f300c22ebd4d5be8654a3fd7bac38dacc23be149f1a7085f10bb55e1830d9472f
 DIST network-manager-applet-1.8.10.tar.xz 1479032 BLAKE2B 482c7a644edaf4f19ed02ca3f29ffbbcf11c01b1c9572affa430a7edb8314d1381ca6738d998e91537903f6eceea0cff1b82b88e7acd1e9b5665c566271cdf3c SHA512 319a280ad56efe8d1b31db7879aebd6242f2e67453287476d397835069f5f5c6ce7884c84d65e0177a94a554b8f1a6e1d353ab33f8ddfc63269d8133b76b1372
 EBUILD nm-applet-1.4.6-r1.ebuild 1670 BLAKE2B 3119a19f109ee03c9a149167b4e11812b6303fda297485f61c5494c669dbdb99e9b40e0721d8c9180ab7ea95af1e1d20f83a96f85c3915fc53fb3f2f67e8ffaf SHA512 ba565628ef8430a0e93e85ee5495409cd36094801a5ec9cf6207df3cf829405a0c74848e8840c4e6d0cb9ceb642d8abe3f888fc793e57bf9272f66ebb6fe7cf5
-EBUILD nm-applet-1.8.10-r1.ebuild 1783 BLAKE2B 2a1ac3aa1c0de76abcde5f7ddbef6ba119e586906d79e7220fe21ccbd5248df9d9a47453aa927aa11381cb0b3471fdc4550840c90d0542e1edc810a8ecd7483e SHA512 7d13b0c2411215aaec77acba6f7ec2757ce3b3c8faf65b052070acbe7467522907dea736124816cae862b5f1b7d0f0f4a45d9984ea54943215eee9480336942e
+EBUILD nm-applet-1.8.10-r1.ebuild 1782 BLAKE2B d4f25b89b7005270718ac2c0ede3ee063a33f8b434b6033826b5ffe793d7be4d409c0227ccefe84f6479545c636799f22e775ba3f7b8b84cbc71fb80d986e91f SHA512 03855f3ffcf930d139197f33cf2a646dc17071d2634a65021949c2e4845e5244364672b235de56a09828ef162cd1320976481df3e7026cfc802535b1646a966d
 EBUILD nm-applet-1.8.10.ebuild 1521 BLAKE2B 745e2371612905c6d42ff9bc57b1e29f4bfcf078a0ed32ee5bcd9bd6f106d7f44204e84fdeca46701fa64fee6cecad28d155a5b4a56d0fa08514c246b95930fa SHA512 4c498d9b8bba82485134556025b9be43640a259bbb01be404537c655102a1d08198c58c9f28e4bc0b720810a5d4842e92b67885303f6b0a6a3c279bc65224166
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
index d853c0137bcf..7ce48b41917b 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index e1856415e908..350b76e35f12 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/pikopixel/Manifest b/gnustep-apps/pikopixel/Manifest
index 7c4d600fe36e..a61442da4321 100644
--- a/gnustep-apps/pikopixel/Manifest
+++ b/gnustep-apps/pikopixel/Manifest
@@ -1,5 +1,7 @@
 DIST PikoPixel.Sources.1.0-b9a.tar.gz 553753 BLAKE2B 18ab3159c29ba46850a7eee3d5bf45e63f0f2a66270b61141a13ff7fbdf8b9e988979388d608995fc9b8fc089ed2beeafe838db82e16756726422b2ce641bb4a SHA512 03cc3d6dccc26986aeac95074b6cac47d9d5c087c5b3e742409ec41297f634649bcfd4f2d76118e49c95499e1b75dab97e81951ae1186449707c8634ab1519fe
 DIST PikoPixel.Sources.1.0-b9b.tar.gz 566094 BLAKE2B 2f79eb77cbfa5508db600f908b25c2b1543c082364d83f734105b49ef5d0502cc89ac49fc8b08686cd1cee29faa4dcd59ed21372be8ec0fc1d100488f42bb918 SHA512 9579a3455ad77f85686bc01819aa2a008277dc2e8d0205dc0fe26743a150f7f5f4c8aed61eb32c9291fef65f3d1f07db2e560c24b084df53f0360fedd2fc5415
+DIST PikoPixel.Sources.1.0-b9c.tar.gz 566871 BLAKE2B 23b1213dcf553db58b65e2e3e3ad950a7fa55f0ffa288da7c5784bf42b3cdf0d280cc433e03e072dda05b2fd4c818fac28d8ea5e4697b80a40fc583dfb885794 SHA512 0fe4657303be5876229231d45ef8ddf8e04636a5e0137acacecedc634fc5bf52c5bbe3a4c901460cfe629fb545796e7ebf8badd9b19a09f642a77e0d8d17fc85
 EBUILD pikopixel-1.0_beta9-r1.ebuild 616 BLAKE2B 2540d1ebb0130f488ff4f9a59d1a6853c599bc7651e78d96ed7348e483809b3d33f027c709e491a5759ebacb268ea569845cc085e126f1308c6a3c92663156a7 SHA512 76320aced9fcf4267c029546a725289d0b9f4cc0dd354eaedb7e3a63f8f645555ac520c19865c3c041aedfb1f40751ee7446586ffe799dd3bc266620f469e36f
 EBUILD pikopixel-1.0_beta9-r2.ebuild 616 BLAKE2B 6f9c27545090a0fb8a06345a96bde7576b2a0e01f7fdcbf2662034016ba53365e00c0664265f2bab3d2947fff6e9d2e773f0d1cdf4e0150703c8670a91685af8 SHA512 866512d489ab4d4f7151308dface2354890192b618dfa3930c9508cde43df2b08bb6803a42975bb559ce3261a74e3f829a921101fba08ece98f929da96f3c6a0
+EBUILD pikopixel-1.0_beta9-r3.ebuild 616 BLAKE2B 3db887475e2ade7ba42e6fd810d98029c2e6fc83a3a1c667ab30cf7cf9cdb456496cf5be63c453752cb455c0c6a452c43356e17cbb8c90b838480ee8cb8540ab SHA512 8b49fa449c78bd945ec46539ec2246d5eb4bf866242d871ed7b06a2f58a1263cf87f04fff6945c83a2f12d397b1698b8b8b6bfdba464a682611f55e62876a2d0
 MISC metadata.xml 353 BLAKE2B 0a11dabc8c8d4cf8ac0cf566d4f8d6347c4fbbdd3a7501cdfa363c71f370b0898384f966664e8c8f9ae9bf4aec32071b068ee74220ad870970369c8eaeac3aa3 SHA512 638af177226e71ff4d13757ad1d909e627283e92e67475a842280525e3b9fa25980a2f4673b6a194a41b5cd08154e666345961bea4a5dce0e292c2ab6a2256f5
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild
new file mode 100644
index 000000000000..641e11e784ea
--- /dev/null
+++ b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-2
+
+MY_P=${PN//p/P}.Sources.${PV/_beta/-b}c
+DESCRIPTION="a free application for drawing & editing pixel-art images"
+HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
+# Web hosting wants a proper User-Agent
+#SRC_URI="http://twilightedge.com/downloads/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/gnustep-back-0.25.0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index eb7f8d755d49..da32b5501fba 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 570239091f0f..94b491bdeeea 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-17.12.3.tar.xz 284008 BLAKE2B e88d748d5640fd5906b3f4d843d50da59841f9e3dd6f15ce19e9bca32112597300d85e257ba77ca47b6c4a556a14fd2177c6ea7ef3e8cacc0ae6b9b8d8af9791 SHA512 456f67e88961c1187d5a347f2651665848468b3179dce91bcdef2dbbcca7fdb7d760bdf25f8dd8de9b41ea2794a069385c1cfbac407b6e187b0c6f3e460638d4
-DIST akonadi-calendar-18.04.1.tar.xz 335936 BLAKE2B 48f0fa4c881b42e82243de23628110379388aca1a72fda04668fa826d3e4a06a07e744ed582897f65101875f2ceb0eaea7c5efef3d7a3350e426300b6d0d42f9 SHA512 a09b1dea05d4c6be066d2f45e660fb2600bb52afbbd2e17d877a97b9ea9e027b94b42bc0e4facd9b3f88a0c4c82b7b9ee926c37d68757da359846d5cacb965c8
+DIST akonadi-calendar-18.04.2.tar.xz 335948 BLAKE2B 30d15d718632c44f646cfbfa07d620fd33cfacdbcd6dce1c91cd765d556586d570a0be813417c7bf486f1a85ff15ae348031c33ff39e8e8d2365d4ba8b8afa76 SHA512 b6f6b8d8c2e40e6654ebc6054d795eed40916e9b8c6a7d0bf07bf7840f61650f00ce6b79320368f540c4d87d48fc132d7fdbc8c31cc46f87992ad5f0902f1687
 EBUILD akonadi-calendar-17.12.3.ebuild 1119 BLAKE2B a425c6af9addb555435ba7cf30701ef49f06d8bd3612d227e0965215149833a96f7b8d6078b573d373793f0ca393ef379dd0626abe9383d1fcaa5e6530d46c44 SHA512 e4fd44158d5fac5b7e6d3a9642c2a65bcafeb3f23303277aeb054bfe44680b662138a3fc8ea44f111cfba4f7c30b137b23a8f8784239c9f2165401fda45b08e0
-EBUILD akonadi-calendar-18.04.1.ebuild 1157 BLAKE2B 4e2b0e0e13a77f8f22377dc06df05f544552ea2e69467e056f9f93feb9091dda131a937f5e0397db039f5b86cba5ba05e39a215f3f889cb5fa44deabd228318e SHA512 76ce422a144f91b442b90a3351810770d8c81b31903aee03f189d2ed85d949c9b385a4faa768a736ead8c5d4db08d6ce3bcd95ae8180fea3722c7376f402bf49
+EBUILD akonadi-calendar-18.04.2.ebuild 1157 BLAKE2B 4e2b0e0e13a77f8f22377dc06df05f544552ea2e69467e056f9f93feb9091dda131a937f5e0397db039f5b86cba5ba05e39a215f3f889cb5fa44deabd228318e SHA512 76ce422a144f91b442b90a3351810770d8c81b31903aee03f189d2ed85d949c9b385a4faa768a736ead8c5d4db08d6ce3bcd95ae8180fea3722c7376f402bf49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.04.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.04.2.ebuild
index 7d72f8ee9a3f..7d72f8ee9a3f 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.04.1.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.04.2.ebuild
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index e3c527917711..5d3e3b0aa9a6 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-17.12.3.tar.xz 345296 BLAKE2B 2f249c14dd8ea549eb1a8aa8c5508dfb9ba43f4521e979b3ff9a76d50a5337a7df6a7d4ef18cfe821659c45bd7f7c691ef301c32dadca93c9cfcf06eca9b85e1 SHA512 37e621015ebbc80d765e4668cd720901b815c55b84f78ff39c163ec90dafdd50ef46567c6091afa02d434d339d4b172e5332d8954a134a50215a12bb099822bb
-DIST akonadi-contacts-18.04.1.tar.xz 392028 BLAKE2B e34540b3862e31896af8aca3adb6b23b632d673586d30de9090b639716d81415e9803df371786b6129d5cd5c3f937cc424d099e8bea3c3e8c2049bc1b53872bb SHA512 30c6f45fe5ccbc3394144388ffe6c3314c1a1fd85b67e58e0d606b14c31209091ac8f6e5281f22c295bc8bb45d2265a471cc4173952a406963046138ebada929
+DIST akonadi-contacts-18.04.2.tar.xz 392336 BLAKE2B 94054be2b04421be0384420e1b46efc46d40b194214b39c3124e731962bbc560f3e8c11ecd21cc32757316f1aa7b5a8e7877be1c4516490bd6ecb9fc86f784f9 SHA512 70413177bebfab1285b35bf9f59dffb732b617cb9a3b0895312ae1af05a552b8416ef785a642be1090f5e76027afa5500df588a7b97e610082d79cf862eb05c9
 EBUILD akonadi-contacts-17.12.3.ebuild 1058 BLAKE2B ddef52c6bf8a3ddbfee6a98071854aa8d75d78e7cb214e2a4db9fdd24fb91f236226418bd337bd3de8c4bd1efa12d147f23a2498124f72c62212775a60e01bac SHA512 49290735cea6df0b8b5c617db7486bc480fe7afe0953cc09d7bdca9c33008ba145c1be3991b925f7c05c08f6b4544692873711311cd3ffaef8fc02ee9612c75b
-EBUILD akonadi-contacts-18.04.1.ebuild 1063 BLAKE2B 919f870a67faa2401fc885c868e82be4166fc4d56558403b02efd6fbb2729e75ad7ec3de86582d68c635dff7aa4a645005ab950eb86893256076b992a115d38a SHA512 85c70ef918476023c2ea734a9ea341d49060a418ec4c4ae9f638510142d09566946356eaf12813149829a37e6c41c27263f49de08c24929624136b04b69ecac6
+EBUILD akonadi-contacts-18.04.2.ebuild 1063 BLAKE2B 919f870a67faa2401fc885c868e82be4166fc4d56558403b02efd6fbb2729e75ad7ec3de86582d68c635dff7aa4a645005ab950eb86893256076b992a115d38a SHA512 85c70ef918476023c2ea734a9ea341d49060a418ec4c4ae9f638510142d09566946356eaf12813149829a37e6c41c27263f49de08c24929624136b04b69ecac6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.04.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.04.2.ebuild
index 8e7312d67503..8e7312d67503 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-18.04.1.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.04.2.ebuild
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 7e94a3aa868b..6e7dad97ec66 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-17.12.3.tar.xz 436656 BLAKE2B 149488e7c5188df4edd78d9d3d58565b5eb629f25cb7a2e759ee8f6fb6e1112948cbc7e953778ca744616739b3ad86f4707c1680e87e1509c35aab64fb46f5e2 SHA512 3c3001803921c2860bf1c16c73db5cffadd5ae1b77f0577d1bd0eb05e19b4632657ea4524088698e770b9843cda69faee9071c8a4269de158d65ed730b8fa074
-DIST akonadi-import-wizard-18.04.1.tar.xz 436616 BLAKE2B 2bc156d81cfcfffd4a75b712aee566af2fe61cefe034847b8a482187b774067a774efc8b7e64f40a0fd1fa82d12711710df039f9382d7d663cac8d37e94ab2cb SHA512 bb7f54dac6049a0eec4664ac922e6c96e386beca9d857f891afba37f2e7fdccfffd86bf31c9ad9c81ac186d55fb4fd8a95543033e1cd9bd7597f24493a9803d5
+DIST akonadi-import-wizard-18.04.2.tar.xz 436648 BLAKE2B b61dd2f0d41e6f0102538a15f7ab37a1af7855d460bf0aaf640b6d5729799365faf3502d9ddd0135146d0c7c89c793bd4058fa57d849157ec09a8a74e9114547 SHA512 1a7f0f2f35cd153920e381a45bfcea7fcab3296185ddc2bfce967296d59659e2e5e99e7f8c5fc3c698b081b1a50cdf7fd684926fa9d057b0cb6fa384d836314b
 EBUILD akonadi-import-wizard-17.12.3.ebuild 1092 BLAKE2B a3c04404c27a3c23943e62c613292d92c84b8b7d5dabd7f29e31000622d41f40cdd722413a48e295b75a656b289be45a8acc25fdf4c06c2a39fe179f379cd352 SHA512 850a96332b61d3054856ba2e35863d128a9ba3422fae734f405f273c7d309bdcabc780f6d201d3fc7824be9c6ecaf8c418e5632417229f7690f3f2d1afaed7f1
-EBUILD akonadi-import-wizard-18.04.1.ebuild 1094 BLAKE2B 6854fefd7b24dda144412d954eb9bcf680d5e4265fbb92a8f1a70c33e49e1433dd4c25d8ebcf6844a1f1b871fc34ab902a43087a36bdf890924adef288512c13 SHA512 f3bd6bebf5a4222f528a889aec9d92afc79b069ab28d024faf9c1b2e6746aef74ac4d80c66a4068ee563e4eb1cfce047dbcecae3a970fff7b0442fef419e702a
+EBUILD akonadi-import-wizard-18.04.2.ebuild 1094 BLAKE2B 6854fefd7b24dda144412d954eb9bcf680d5e4265fbb92a8f1a70c33e49e1433dd4c25d8ebcf6844a1f1b871fc34ab902a43087a36bdf890924adef288512c13 SHA512 f3bd6bebf5a4222f528a889aec9d92afc79b069ab28d024faf9c1b2e6746aef74ac4d80c66a4068ee563e4eb1cfce047dbcecae3a970fff7b0442fef419e702a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.2.ebuild
index 711036b2177b..711036b2177b 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.1.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.2.ebuild
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index a205135e8b20..b74daf95b0b7 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-17.12.3.tar.xz 129916 BLAKE2B d0aafdbb9b2ba2e39dd33a6e8f5e7638b840c4b7a67731ac87c1c33d986a240b38fe18e467c0987f54b8aea51b42c7078b3eda588a349cbc439031dfbc8b4cb1 SHA512 5f260b00ddb5949cb924e62b1781ef4d6d3b23fca310ef120440345f6095ab678a41672287b139c8e0ac7c3d5a7dc0aaa15cfe9d59ecf75b51b1c09de7d952b7
-DIST akonadi-mime-18.04.1.tar.xz 137320 BLAKE2B 38e89a17d09f9cb9b1264dbb279910d56969c4044ff18651068b6662a3bac50156efbc6b6574bd17207e316960f042c3e49cab0b282c16edff6942669e3fc7ae SHA512 b797a7a964f6277bc5d8e63b19511f1613ec61fe5d2fbb18668e96c291532e4a2e24eef110903fd26676f0269fbebc42d6ff9bee341a5384a90e5190a02cdb91
+DIST akonadi-mime-18.04.2.tar.xz 137372 BLAKE2B d36bc1e9bcfdc985cca493b827bd52aa3a75f7126d89867489b5322977838852f189d80e86d2d4238ad6f4260429d6af1c2a979ac479cad4231fe253701f47c4 SHA512 9f328044442b93cff8c16e82c787de287009a71080fcc092c52117c413bb77e687d7adbf73dac3f1dc04784b0dcb90840c3c7c55e2ea541398bb891f60417524
 EBUILD akonadi-mime-17.12.3.ebuild 854 BLAKE2B 5e2093113fd022f6defade297d54d8b290882949a864e607ec996acb69c3ab6d42aec8c5bc92c12f988d53b6c57387706ed4351770d41c0d299a65ef14a81e57 SHA512 f58ce0841389e462c36a82572177e19a14116f4a4d31b672e0bf7967aad2528492cc2b55096caddc6322e365ddd20a501736fde32368266afffe54a0884edbdd
-EBUILD akonadi-mime-18.04.1.ebuild 892 BLAKE2B 965bfda44299d0d7cb434c893ee2d6ba66480cc49ff32a198ed88e1d9f58c50218783c101f6c03af498ccd8a1dd0348fa79d0c132c052a27c5648c9d9dfd9fcf SHA512 0a38fa339efb8d08f336765b185bf87114f0e8c4230e765bbb7321bb541e5b9e4fa8b7073c49ddbf765ff049e65fcf5a4c66ab3140c357a8dce628b88afcf8f7
+EBUILD akonadi-mime-18.04.2.ebuild 892 BLAKE2B 965bfda44299d0d7cb434c893ee2d6ba66480cc49ff32a198ed88e1d9f58c50218783c101f6c03af498ccd8a1dd0348fa79d0c132c052a27c5648c9d9dfd9fcf SHA512 0a38fa339efb8d08f336765b185bf87114f0e8c4230e765bbb7321bb541e5b9e4fa8b7073c49ddbf765ff049e65fcf5a4c66ab3140c357a8dce628b88afcf8f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.04.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.04.2.ebuild
index 1b39beb487f2..1b39beb487f2 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-18.04.1.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.04.2.ebuild
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index f8a31aa9ea5f..b0ed260e0811 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-17.12.3.tar.xz 24520 BLAKE2B c37debede8bcbf97a6f2bee6d7195ddda69f466034b6ba60299bf93485dee1826930a7d029ebc39df7e6317c9124db57a8b7d97a6713635f4fd266dbc1dcc93b SHA512 306fafd7ef59f541cc30b111f4ab83cc2d218c8949ed14805f8116388a328ec8d522194408afbf455d133ef8a40153c04b9dbf907e4b0e784458f9fe2aaaae62
-DIST akonadi-notes-18.04.1.tar.xz 24608 BLAKE2B a2885a1293aa01450c730ea7e8b2befdd06c3b1b60ae050abaa859c8c4589bd8ff4fadba995937783db7ae2b77441dce7e1f1cdd29fe202c4c8ea2533e21ae93 SHA512 966b917ba7c2c015132bda325ac04765ae0abe035ad899c9b10b5667213a20887208f67af2ca16b027895410d10fe0b673072a2e44b62412714ca78eeeff1f56
+DIST akonadi-notes-18.04.2.tar.xz 24676 BLAKE2B d220d2fb276f1bb97606c62c646fa0d15d5a72ef69c602683505e0a5fa954b04972b663da82b9b18840460a6e87f136d9e199ee08f3830d4863f99e95b44cba7 SHA512 fd6277863f87e0d798768cbb4b8d615eb1d38b5f9fc86111416c8e42ff9121998d5ed3c7d056e87364fdc6c038d84e632ccd1efa0ed1fcde4ec93e79cf534dc4
 EBUILD akonadi-notes-17.12.3.ebuild 565 BLAKE2B 2c4c204454e138dd32186a05beb3fabdc9e52ab2173c3624c7b3b0eedd6cffdb78b6474731a16ae204d542263086c47e31cfea34aff9343714f856b8b76fe6c8 SHA512 2d16befdb5691c46a816b6c0b659d83f3dee26c9f02704870eeed720a1cbf78012690af2172a4e4194cd0929e71679f074bc6ea7f913663fe83cec665ac3dd98
-EBUILD akonadi-notes-18.04.1.ebuild 567 BLAKE2B 6bf6f7d182475533dacf721500c4d2bf0086f6f99c69a8c253a18370073b348e63a220a17964242448c241367b5a4b241d2ed0f28faf474ad9926a6affeed89c SHA512 34371782e6bc37e5c09d0707b177b3fc55513ac6c07ba9d5f4f65236895d511da07196cc34e9e3ddd91e2715062b0599590ecd44675efb143d4e9bf41ac7d8da
+EBUILD akonadi-notes-18.04.2.ebuild 567 BLAKE2B 6bf6f7d182475533dacf721500c4d2bf0086f6f99c69a8c253a18370073b348e63a220a17964242448c241367b5a4b241d2ed0f28faf474ad9926a6affeed89c SHA512 34371782e6bc37e5c09d0707b177b3fc55513ac6c07ba9d5f4f65236895d511da07196cc34e9e3ddd91e2715062b0599590ecd44675efb143d4e9bf41ac7d8da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.04.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.04.2.ebuild
index 0afe6508a57e..0afe6508a57e 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-18.04.1.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.04.2.ebuild
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 64000bc8bc56..da8e94cde96b 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-17.12.3.tar.xz 81872 BLAKE2B bcbc5cd5d2cf37bb80c890164c45f0141d7d668c59ad099888831efb45781d15d8d34ffac2c18a9dde4fc697cf02dfe0493d01c60bc687b137dcd6cbdb11f6da SHA512 3c227f25784069bca95abe43657fa2964049dac840629f6ceeb8ea7378f4a8860b4dc2346a7cf1069d9cd0950ceaa65c1aad772199a4e15b27d099ca16c46689
-DIST akonadi-search-18.04.1.tar.xz 82436 BLAKE2B fc759ecdf4c887298f203b2ea717523d5ce21f047cbd7789f2213c2a5bc12191c322226c6b22ce467ff09f500e5e44d5b79f85e47fca5b6f3e70ff49f5721b4d SHA512 3bcaf0502cc1a0022e593a0daf3843dae3db42ae101b801e596f8c0bfdf8536d9621bbf6cfd6f0dbe6ed26b81eede4a07e060210895405069a9324152f8256a0
+DIST akonadi-search-18.04.2.tar.xz 82516 BLAKE2B 45d336755fbc5141d63e8866c96155f693684aceb6ae5a837e47647a3295cff20c8f51df32235b4d190357754ff6c01958c04dbaaf585791bada01ab3cbbfcd8 SHA512 ea406c095233c037628f3078bfab30bf8139e1e33e428137288cc57f42d7b5175c40176830e11b0b21f9e5793436de8e5922537523a7b00fd07e9c0aa2a01d0c
 EBUILD akonadi-search-17.12.3.ebuild 1083 BLAKE2B 03df45067702dc1038267a895a4e54ea43da89761757bd719311f7056d6dde47f658774046e5527fc3f82b47a29fd13b3c124d519a3f1354dd4a5efe392c9bb1 SHA512 2f9ba09ab02ee26a096a82a0150cf82fd9c116969154e3b3727147822293087716b865f0dcdef4c850dadd27d2a4d8041468fbe1e0209d79591b6cc48b70fb4d
-EBUILD akonadi-search-18.04.1.ebuild 1075 BLAKE2B 8d8f3dbf21a8e5cae0ab11bc2eed9e7c2ff3a6838a4f64563772478960589d38948a3c2fdb201ca7823ff91df45b9d714dc446dacd5a829e3df3ae064d9313d9 SHA512 88f73387b8c6975a746a3f7e8629e409f2e9dd8ff707849ab08def3b08010b96aa294c88fda0e2d69b8358e99cc5e20ef588c0caf57c47598747c30946a26b8e
+EBUILD akonadi-search-18.04.2.ebuild 1075 BLAKE2B 8d8f3dbf21a8e5cae0ab11bc2eed9e7c2ff3a6838a4f64563772478960589d38948a3c2fdb201ca7823ff91df45b9d714dc446dacd5a829e3df3ae064d9313d9 SHA512 88f73387b8c6975a746a3f7e8629e409f2e9dd8ff707849ab08def3b08010b96aa294c88fda0e2d69b8358e99cc5e20ef588c0caf57c47598747c30946a26b8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-18.04.1.ebuild b/kde-apps/akonadi-search/akonadi-search-18.04.2.ebuild
index 069e1b7eb656..069e1b7eb656 100644
--- a/kde-apps/akonadi-search/akonadi-search-18.04.1.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-18.04.2.ebuild
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index d9a4666409a9..d8a21ff01b31 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
 DIST akonadi-17.12.3.tar.xz 1521576 BLAKE2B d4809ccac14a18d922f04bf772892aaf7f43209b030880ec72d7ded662a1dd03bd768d71a30c1655a1634ad7b20f3c24c176d4da9a5beb1e9c543c256dbb4b97 SHA512 410b72dfa6eb3272bb8b959f7e0ba5951faef598e7c73696844bb6e33d4f5edb0bed4dc5ccea68111a7eef3c9f7a776acf8823c9a138b6af28d819ce8077595f
-DIST akonadi-18.04.1.tar.xz 1525744 BLAKE2B 9db4189aeecf293cb3b3bea8977c02d24cf9a2d470c46a527ab50a0dde331a9618e80c77ebc379682c888c7a557d3e8dcc53b14c7a3f75b4d123ef4bbb2b5856 SHA512 db76bbe6e31ff8fa2b0a59a43bd86e86fd73e17c0c30f3e8ce64ba90d2c2f284b1b3422ed00fbdae83d43124cae57aa39a0d80ee116978ccdb6fa38dd7a9a07e
+DIST akonadi-18.04.2.tar.xz 1525976 BLAKE2B 3fa556a67353069b681a6e70492778bae9ea8bc6623ecfc5ea044cf2696d962ffec80f010246eadb16a3fe3dd0f5a8a94f8b4fda53ab08c5ac98b8c11a614da7 SHA512 ea110585fe431f65915862045cf3cd72e4dd8a3ca47c36f62df9ec3967ce4ff48911342c4055faa8b00ff370ed9411150d735b0792d0c3fe9321146d877ef002
 EBUILD akonadi-17.12.3.ebuild 2913 BLAKE2B 11de71f1612a4719b972280d9d5c790cba36f5e35ea84d7491518a69793df1d782b61ecc893b395c6b6ba510b2e32f78e361713b400d39784958fdeee8fc3253 SHA512 0dd8a2ba7c8452a00d4d349636b8ab42ade6da7c9fe9dfe0742301ce397a20aa811c6018a0a0c027f4b0a9c8583a616fbbcaf8d09f93fa4570b680cd92935699
-EBUILD akonadi-18.04.1.ebuild 2915 BLAKE2B 8f061eb8ce1bbcc1ef0aa30066ee3b37c902422f0c2f857f425ef4bea6dcfce8d7ddc37245b36d299c64bf41f321a159f4add3eddb5dbb90ccbd504b4bf7749f SHA512 b509bffd7bf710862d48afeaa18b69936800031dadb3a5d22f87559e179305c06e8ed3c4bd21a33346e2984e910d3718384021584d6caeec029e495127aecc21
+EBUILD akonadi-18.04.2.ebuild 2915 BLAKE2B 8f061eb8ce1bbcc1ef0aa30066ee3b37c902422f0c2f857f425ef4bea6dcfce8d7ddc37245b36d299c64bf41f321a159f4add3eddb5dbb90ccbd504b4bf7749f SHA512 b509bffd7bf710862d48afeaa18b69936800031dadb3a5d22f87559e179305c06e8ed3c4bd21a33346e2984e910d3718384021584d6caeec029e495127aecc21
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-18.04.1.ebuild b/kde-apps/akonadi/akonadi-18.04.2.ebuild
index 99c2e48ae5e8..99c2e48ae5e8 100644
--- a/kde-apps/akonadi/akonadi-18.04.1.ebuild
+++ b/kde-apps/akonadi/akonadi-18.04.2.ebuild
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index bac36a8de558..553d582cdc17 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-17.12.3.tar.xz 185432 BLAKE2B c4be134ccf31a42f9244d7ad0b717e4cd8e7c89d1208e70339f096b84c64fc22223de318fb4d3e843ed7bf2c0d61ceeed4e4dc10db964c581b537ef9d7f7d0b3 SHA512 f491a16fb93a23cbad1160d5bf63ffe07ee015097211e23464031060247b550399140626f016d2a5336ed783a55f8d803a7aea6c8f4cac9495fcde35b082765a
-DIST akonadiconsole-18.04.1.tar.xz 185796 BLAKE2B 36f6f0d465f0920a79c6b368ea3e3c5a05b2e7a943eeb505d3045f385c69eb0051b461624cf8dfaa49767bcc69e2025aad1f82bd3024dce5d26f37e2509e2f9c SHA512 eb6d899f8ca68ba88bd9380dae462930bcf053667bf21b21033f9cda8e662cc127f6e11cfd4141f12c0da7f8c38f069980c8bc7f215edecb23c009141b2eeb66
+DIST akonadiconsole-18.04.2.tar.xz 185772 BLAKE2B c35f5b574a96b26356ae242761f61d9cbd093672a29c962b2a2962356a930310d6d5c12840cb78f0d3e1d3bda97b359e62d3d87eb4fe5271a44091bf14def6db SHA512 6a89c0183093ffcfaf88b0cfd2c49a65f9b0b844cd3c0e01eba3a11948825a652dc66a044ea2ebe0fc886a45a2fd5d7fdcd258bce8e6f4a7034cd744ce418c43
 EBUILD akonadiconsole-17.12.3.ebuild 1257 BLAKE2B 6615ac6b229103c846bbd417d3f4e94ef06325e284b9776aab1c75a3f31a8cf0e9998b7e1b25b2e247f3770392eb91e296715ba7b87f8212217444aeee1d64c4 SHA512 810f571af94767290bcc5173c2c12f637374ded17cb99d08c13d9b2e4a0a890b21b761b36e278424128466cd469a4fc8f58f6e2080f59518a9e39a0b3e67d78d
-EBUILD akonadiconsole-18.04.1.ebuild 1226 BLAKE2B 7d3ea8ff8679de8097b08958a3c5f2398c815eea56de8e3a9bdb9f30901fdbe0ce6a38f5110bcd5ef5fda168550476aa53b3a85189449fe1fde2f95ef395fc3c SHA512 944b60428b920f9d89f7c3e84e6bcba02be7b4748fdcbb08d33eb8c00637aebe6b70f804a64a83e228b81198eca3ea237db4d995b4ac27b40280f64765f19137
+EBUILD akonadiconsole-18.04.2.ebuild 1226 BLAKE2B 7d3ea8ff8679de8097b08958a3c5f2398c815eea56de8e3a9bdb9f30901fdbe0ce6a38f5110bcd5ef5fda168550476aa53b3a85189449fe1fde2f95ef395fc3c SHA512 944b60428b920f9d89f7c3e84e6bcba02be7b4748fdcbb08d33eb8c00637aebe6b70f804a64a83e228b81198eca3ea237db4d995b4ac27b40280f64765f19137
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.04.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.04.2.ebuild
index 5943cc52ea5a..5943cc52ea5a 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-18.04.1.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.04.2.ebuild
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index cae0b0f12e23..6a24e908cdf0 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,6 +1,6 @@
 AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1
 DIST akregator-17.12.3.tar.xz 2251784 BLAKE2B b5adb96501b6226817b6aa29a55f47f34d0dc85bacf68d4b971e9c2688a12c9f5ba24b274a5f154ceb2549a3558359cf97fbff176a2af9ac2abb4e6abdee5f89 SHA512 dc047fdedfba0f45b9822378352ae57e8b1ddef6712e669868be65f6820da46ec601483e1ff6b509b84fde236faea2a8fb4317bfd88cbd641e2d7af034a8452b
-DIST akregator-18.04.1.tar.xz 2250984 BLAKE2B c0ea673095dbc8122dee8f2d9ddfca6bb3d0e5280db4fa279af373b8dfdf1c9ae1bfe1bd8959a07dc70c6e1bcf031e15657d495fa7307c5892d04676a3ac9d8e SHA512 bd353432a32c2499fae5b5c0b2b184069eb322cd53779765b02fe236e6f7bc32322a96fe8931b26f53a992f05a432d3fb95017ddc568b7c4f1749f46324624a3
+DIST akregator-18.04.2.tar.xz 2251116 BLAKE2B 396f56f1c71e2379db2f03066292676fb5529dd92bc11a85b660303c546d56b8d240323bc919acec45702203777b8649b83f9dafee8d55fe0c04e47f74835dea SHA512 413281fedcb21e2f273a709405d0ba411d4c2d1d2fa3e54173a83bdfb3c33892d7e4a1260032cd0d356c9f5e05e46ecdc93785a9497eba3f678549d02ee027d2
 EBUILD akregator-17.12.3.ebuild 1494 BLAKE2B f61953255f5a9da53b9f4f98f24ec9b9b8150f2248c00223c4edc332fb81b326583c686dc057b2badaa131c78adb04a89b511e7caa210484f1c6cb3596569dc0 SHA512 46e4bcb6178e734884715c85d4369dbfdfee7076a520a995c53d06ad89328b0315d12e81474b61dbcde6b1a7c0a163ef700f0593002999b710c9f1e80c21e3c7
-EBUILD akregator-18.04.1.ebuild 1496 BLAKE2B 279651b4549fa9d2565b38e7a611139fade8e73f5b4ae7eb35aa4fec13ebe51b5511f7f1c1cb88002d1dddc714f3333de7d0ae017dc7becb5960143353fc208f SHA512 cca7160091fa046dbe3dfbc852ac87c0983f4689a2b2fe01be599426797d627089bd970015998916b9618755ce4eb2118a7a7cd74d429701afecc2cb6c3416dd
+EBUILD akregator-18.04.2.ebuild 1496 BLAKE2B 279651b4549fa9d2565b38e7a611139fade8e73f5b4ae7eb35aa4fec13ebe51b5511f7f1c1cb88002d1dddc714f3333de7d0ae017dc7becb5960143353fc208f SHA512 cca7160091fa046dbe3dfbc852ac87c0983f4689a2b2fe01be599426797d627089bd970015998916b9618755ce4eb2118a7a7cd74d429701afecc2cb6c3416dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-18.04.1.ebuild b/kde-apps/akregator/akregator-18.04.2.ebuild
index 9d2cb6d441c0..9d2cb6d441c0 100644
--- a/kde-apps/akregator/akregator-18.04.1.ebuild
+++ b/kde-apps/akregator/akregator-18.04.2.ebuild
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index c4b1118bc769..2f1b74055bbb 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-17.12.3.tar.xz 331052 BLAKE2B e250093623dd516051684473fdb03becaed6c3361bc478f633276a16cf5f75f6c6a8e2df5cb98b8a998e570f4619f2a0c32a59170fbad2563ac93e00e29991f7 SHA512 31d461e09736b4109b6d0af37e4ff1af075963566b0363b7801849bea83b411a53a8498d6c7b55778636e7bd22c120e46dd99dfa74d841532269044449f7621b
-DIST analitza-18.04.1.tar.xz 331612 BLAKE2B d7a047810aa77c5dfa98fd0efcfc9e9963fee46b1ee42bf945f23890ba01d67500d59d7aaa6eab7cfc7459a6b765e336d3fb18711d4c6ae717d7cc0a9d5c6b07 SHA512 76547578bf2ac88123ba70ff8f35643cf17c14acf72b720f1dee9cd73f4033741cc99157ec1284cd3ae8d60162a40b202c3bbe3d3f3f6ba22090deb0449b7c11
+DIST analitza-18.04.2.tar.xz 331656 BLAKE2B ff6e2b3bc4fcc072d8f42c7baf8d3400a1bf338515663544494bc64531e8105c5e668c632b4c2d7bc173ec5b474e42a52aaac1c39a2c57c8e09f6516f2dbdc4d SHA512 7c25af38e250e0edaefa85870c6bcb0c3c6e7173eed92d172d121edf94eb9a131ef1d7d9a98b40931592ae9bfad1fb97e730e48ab57d98009ac9661647f4801b
 EBUILD analitza-17.12.3.ebuild 812 BLAKE2B 266c4304bbf2c641f6c7a920266a96c9b318de14cffefda537d363a1daaa14e841e994ecd0aee5f81a28a4b582cd0d11cf91dde00cf2332e7af5a747ed6d33a5 SHA512 d3605937b54067d575f07d1189730ca18d0df4f6d33d2f011ef691a6a48892ee3340da088e873bbd4c4b2f2dd5fab2eab9ed010ef4603aaca881259464cc3ac1
-EBUILD analitza-18.04.1.ebuild 814 BLAKE2B ab20e18be9ecc2c7f816a21f9847b704a0cf55fc32c63bbb241ac7f0058fd2671e653a4a615e3fa5d688618a5fdddb434db801a5ebedd3cbb00a2ac2930076ec SHA512 267071d595f3cb78d909f9ef0f814d90e31ec54cf783a484ed59f55cf3e8d1ea4cf66b7fbd215873119ce2566d9cbe5000ef70c1b2f3c9f1e67f16553b3010d8
+EBUILD analitza-18.04.2.ebuild 814 BLAKE2B ab20e18be9ecc2c7f816a21f9847b704a0cf55fc32c63bbb241ac7f0058fd2671e653a4a615e3fa5d688618a5fdddb434db801a5ebedd3cbb00a2ac2930076ec SHA512 267071d595f3cb78d909f9ef0f814d90e31ec54cf783a484ed59f55cf3e8d1ea4cf66b7fbd215873119ce2566d9cbe5000ef70c1b2f3c9f1e67f16553b3010d8
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-18.04.1.ebuild b/kde-apps/analitza/analitza-18.04.2.ebuild
index dc538401ed67..dc538401ed67 100644
--- a/kde-apps/analitza/analitza-18.04.1.ebuild
+++ b/kde-apps/analitza/analitza-18.04.2.ebuild
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index d19318c264c5..673b2869c418 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-17.12.3.tar.xz 1970120 BLAKE2B b8e14f6b5f541c514107cf76b612edd99d6e0d97dfbe7600349bdcf2bd5afbfd1fcaf256d0358ff0c8838d8334a14ddd1ac5d29ce9befebe960444e0828aba5e SHA512 2f32f0107afa20ef115caddaf3c7ce6be37a575c72ea440f571312309d945a0e0491a4327db379e8ca7622a2b5016c5b2bbbfb3377d3b4272430f85b23fbb911
-DIST ark-18.04.1.tar.xz 1971344 BLAKE2B c1778e8777b6772f9ff72a23296b29daab9179c3ddc83297e46695f8e9b6c64490b3dad716104a5c9cbe936562481174a69d8356032caf901c0e8b91ae732ec2 SHA512 0a6a390f3771c4dc1d6386fcb17eac0416bc7494f6517d60a8007a676322b1986f6ff526ba8514a9f68913bd67f2105dfe9bfd1aa24feb2f19f67b442b1d1f8e
+DIST ark-18.04.2.tar.xz 1973540 BLAKE2B 64bb00807ec0fa0511448bfb6d4e35bae3034b00058806b82a93c753f6dcfa61b75cd5601c42bfccbec3507003864f4543bc87c98cb66a303bc6f192d3d7a96f SHA512 bf3b26ec61a39585505a6e0818dc075424886625c7bb4aed4cb3359fbcb3463e8eaeb186434532eed4612db7968d1d59349013e179c3ef25f241f5070c244358
 EBUILD ark-17.12.3.ebuild 1942 BLAKE2B 33c6fa57d3e3fca99e18c2cef0c2505ff239ea66f2f5bbc9fb177b293344c2b16360021902046fcbafc5ec6e71496fc47a96a07a849ae0a9cb75085d142bab9e SHA512 05f9578df0799c444409bac6ef1c7ac1824493a7080af68d9f908ef0a7bd6348722d2c2c2fdfd9e1e57296d7b5823416869cf57438def2e58942857db267e78a
-EBUILD ark-18.04.1.ebuild 1944 BLAKE2B 3f014c4d6621f7d41dbc11852b11b513ec6844bf73548e22461e503b7afaa2eba1e00a75a3286b4a355c473bd50c988a039c49b8195da3fbf92a2304fd5bacb4 SHA512 2aa41369da96eb37e926d8e8cced96313e30a9356fb96011aee678c29e4afde5b0e32d62734dd88e57fe6f6b32d9f699dac9429cee34a2333c519e639dd4fab5
+EBUILD ark-18.04.2.ebuild 1944 BLAKE2B 3f014c4d6621f7d41dbc11852b11b513ec6844bf73548e22461e503b7afaa2eba1e00a75a3286b4a355c473bd50c988a039c49b8195da3fbf92a2304fd5bacb4 SHA512 2aa41369da96eb37e926d8e8cced96313e30a9356fb96011aee678c29e4afde5b0e32d62734dd88e57fe6f6b32d9f699dac9429cee34a2333c519e639dd4fab5
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-18.04.1.ebuild b/kde-apps/ark/ark-18.04.2.ebuild
index 7a5bb558b1c2..7a5bb558b1c2 100644
--- a/kde-apps/ark/ark-18.04.1.ebuild
+++ b/kde-apps/ark/ark-18.04.2.ebuild
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 105ab895c2d6..d24789a33b73 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-17.12.3.tar.xz 3747444 BLAKE2B 69ab847203f3a6ee408435320d3973d48d55501010ce34c329605ea653cd26a0e2c8a082fba3d91e610f153193441db310cd58416ba6f1907d3680f35197f6f2 SHA512 b984eb53a78bac012a9918a24d995dd89413225ebbd0bda29dd6840ccb14f40efc14b80b0ea6a5df335dcf28f7bb45ad8d1af8296a8d761e4ae48288f2354a23
-DIST artikulate-18.04.1.tar.xz 3748636 BLAKE2B b7a026ae1de19a3a4eefe12e2ff07c61fe800a7a4f52745358a47d86860719ff25118ddaaca907866dfa6fd8a0f6971f30da716d83a00288d661fb54129d6e9c SHA512 503c4fac6f5ecf5bccdaad9f66f4743732b2a2b1fd435a147c2d58dbed58a22002bf5fce04949bf73ed816c90d610e6346fe5d68cee2541b28c4a69292dbae96
+DIST artikulate-18.04.2.tar.xz 3747856 BLAKE2B 97add140fcca2da11881416b188df5e57d433d2df96385aa3d09416ce8f4d55b436f4e0105e04734bd02ac4f353252f5e53c8dc911f19d3556d762e33500cb86 SHA512 924ba33422fd8814efd72dacc3276683e14cf52fb1409b03ae76c357018044662dd95b7153b8e8d216199242b0c67fdf4039b52009203195288a4259fc670e15
 EBUILD artikulate-17.12.3.ebuild 1117 BLAKE2B bdd3c88ff3d484548cca21867c77ce376faddce842e2f6597843b70cf2b1618cdec825309ce1a64ff0d099dcb1943ff9636812a39620d0e2e307041cdb7d85b6 SHA512 4e4eaa3064916cd463b6c296f4e071295496bdd6bfd916ae60f20393cd1673773991b7970c629f19522eafe21086e1c41a45efc20b283a85c3d6cc220ca79a7b
-EBUILD artikulate-18.04.1.ebuild 1119 BLAKE2B 394932d35ece9141d9db95a9544bffa0b86bb114040a05a982d22e365054c05cc7689a29d9a170a79716ab00e79a010e0ddf20a933d24f3e380e397d43ec18f4 SHA512 225511e036aea03d1d495c712cb7f52b42621e803ca3e0bbfccb9e5197a977bdedc8366096d77bf947b210dc25cf50f9bb6c93226100cd58dcd0f77dd831f4f0
+EBUILD artikulate-18.04.2.ebuild 1119 BLAKE2B 394932d35ece9141d9db95a9544bffa0b86bb114040a05a982d22e365054c05cc7689a29d9a170a79716ab00e79a010e0ddf20a933d24f3e380e397d43ec18f4 SHA512 225511e036aea03d1d495c712cb7f52b42621e803ca3e0bbfccb9e5197a977bdedc8366096d77bf947b210dc25cf50f9bb6c93226100cd58dcd0f77dd831f4f0
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-18.04.1.ebuild b/kde-apps/artikulate/artikulate-18.04.2.ebuild
index 9c910d95fd15..9c910d95fd15 100644
--- a/kde-apps/artikulate/artikulate-18.04.1.ebuild
+++ b/kde-apps/artikulate/artikulate-18.04.2.ebuild
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index badb6054eac7..81505ceb5e09 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,5 +1,5 @@
 DIST audiocd-kio-17.12.3.tar.xz 248320 BLAKE2B cc9fd7471fa91c9cc026f9c7b2bc7dd20e8a507ef92a01b170c5fb0f011af31e562eb1f2f848ad6747ccba665c8144e2db01782ea7008eabe5532200e29db5cf SHA512 9d21ba053acd9d9f717aa8e7c3b3021e1f24610762f332584bfd4ce1b4f61b10daf0c6715ed4168f37bb36d4551d43d88a8eea54da313aac7cb6df862680f2a5
-DIST audiocd-kio-18.04.1.tar.xz 248696 BLAKE2B 5de8a195aa0b28049ff573cc603d3aa7413c0eb29aec86f54713f795703d9f68cd42d4635537397a657ed67b5641d8fc484e10c81b911824bfa9b4953e32d2ae SHA512 bbde3170902937a211041cff51d187fc5aab878b8cdbcc64fd17f0de180060a8b91b567f104620abcaa65edc4e754c7e6b87a013669b20f577f274a6e89dd8a4
+DIST audiocd-kio-18.04.2.tar.xz 248924 BLAKE2B a5c1335c34832f5c7170e849c90ba8b82ede2795dc6941c96ac536b8c3c2cd912236b672921dbd2e57a9bc67ae5adb1fb842ee43f07438e43da5e5106a9d99d2 SHA512 aec0b7d6f61d5e00dba42df59949018d42396ffb06bbff5c551ed6817372bfccb0f78d31e9982362a60a87c2f6aa69e68c89d71fdc3a1424e509fe384e69ea20
 EBUILD audiocd-kio-17.12.3.ebuild 918 BLAKE2B 04107dc6d19aa76d37d8d58485141014a54a8615b8e3b86e824a5fba56dd46eafac8282daf3c85ff8a4c7063a75a468a138af2eb18999b66dc2e6b84cde05f94 SHA512 1915e62b9cedc9f91237e26e31a9f16539635181dcf965c5bb72f5fda12b34dd1cf7294bfa99a6a717eb6f26abe8912553b64af7e4af083b3de79468871c9a26
-EBUILD audiocd-kio-18.04.1.ebuild 920 BLAKE2B ecdb36adda2c4ea7c4551405c2f170f7981c17ad04910e3c141ddab9f7db51a6405818c74d66a40110d24b27fc69ffd4cdb010d2d8022a029104b8dc613cd1b7 SHA512 449160c59f5982043e93203e92d8329fbf3aded193adc5d07b55f3b2b5077db596c435c73df58a7cb5123eeffc339fe0ece189c84da48cc868b9345dae195e56
+EBUILD audiocd-kio-18.04.2.ebuild 920 BLAKE2B ecdb36adda2c4ea7c4551405c2f170f7981c17ad04910e3c141ddab9f7db51a6405818c74d66a40110d24b27fc69ffd4cdb010d2d8022a029104b8dc613cd1b7 SHA512 449160c59f5982043e93203e92d8329fbf3aded193adc5d07b55f3b2b5077db596c435c73df58a7cb5123eeffc339fe0ece189c84da48cc868b9345dae195e56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.04.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.04.2.ebuild
index 6bd5adfbc365..6bd5adfbc365 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-18.04.1.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.04.2.ebuild
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index c3b6a220b2f7..e21f4cd6e465 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-17.12.3.tar.xz 151088 BLAKE2B 00cbad49940063cdf3f8b5f6b3cf2c29e81c5c6b2d34de9eef604bdfbcf1e55a2b606aefd6a9616d11dc8ef00c220c7fe7d0da65eacb6b057bb807330cca7677 SHA512 82237401900789b624fd5c7111127e053fad0f13bcd56f9edc063604fd9bb6368de27d5a62fc844c24b0e283da01f5b77135e7a021b880b026931ae1e583a97f
-DIST baloo-widgets-18.04.1.tar.xz 244968 BLAKE2B 72ff900b20d436fa27070df67af2564d1ab9d38e663cb8755aa7f7c950f25b877e44cf7429f551a2b96bb989c085d5d86eb6c7a8b11715098170c3fb8145fd35 SHA512 2aa16584081cf411626a131dda920e73d9ab5625d8cd30c55b644e2925efda1f05d716fc1c0fe5253f2a7a05a0ab8b8feaba60ee5d6536240369b017e25ae856
+DIST baloo-widgets-18.04.2.tar.xz 244876 BLAKE2B 58acd9cdb0da2003e3f0d7d93005eeaafaaeb3132068615d9c0f217d2f6b92e7436ac5493a13598d546c293f433aa2e478d45ef71af68a7412e4d35b0946b495 SHA512 7b00e02ce3345282fff34cdb934ec69151d194f65cf40a3ee634e11b26173e1090cd5a548764ddc1447cc19de79ad495a68b039d984f6566da4479719f2967ce
 EBUILD baloo-widgets-17.12.3.ebuild 597 BLAKE2B a074d5793edd74e8ce736898612bb7eac439e782c64f522db5b133b84c7d8c107ad2ac9ea11f7a0a78062940fa802fe3aa94e1e79bfd77c878ad5d80be520343 SHA512 a3905e6ca2dc2ac8a3b4b8f03fa3e335820e9a24639af4cd9ae0586abe4e870223783a027ec525e68cdae9f1de91c8b050bab71c4bd3d49d498924ba7b5550f4
-EBUILD baloo-widgets-18.04.1.ebuild 599 BLAKE2B b4e916fedc42a1a0246c38bd926592d912218660bf1c3ca5bc3656dc7eafa4a2a459e3031e9fe70733a5764bc6cd5808f0c755c24a6b0fbd857bd9ae87aa61aa SHA512 cf7018e39257e5b8748ef58f94b868ea8e57fd2c9cbe46ac0ac232b7e822f2d46462c99bc88304c747ee72d51c0707679afcd3ca85c62d208022017b72faea75
+EBUILD baloo-widgets-18.04.2.ebuild 599 BLAKE2B b4e916fedc42a1a0246c38bd926592d912218660bf1c3ca5bc3656dc7eafa4a2a459e3031e9fe70733a5764bc6cd5808f0c755c24a6b0fbd857bd9ae87aa61aa SHA512 cf7018e39257e5b8748ef58f94b868ea8e57fd2c9cbe46ac0ac232b7e822f2d46462c99bc88304c747ee72d51c0707679afcd3ca85c62d208022017b72faea75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.04.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.04.2.ebuild
index 585c9262ec1e..585c9262ec1e 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-18.04.1.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-18.04.2.ebuild
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index b24c6f3af533..40f86637ac11 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-17.12.3.tar.xz 2505872 BLAKE2B 304cf939db4bd4609a0bda247119803d0cedb276d99bd7c3ea4cc449dc85c2cf5db1a474ffa79dd09087fbb9cf8dd8e2e1405d02ee5d8f5d265202dc898556bc SHA512 9cd1ce9f74f94d7beab0192f59114459d3434f341f3ad2d83dc6b659f70e6fbfeafd21ead5ae22f4f07fc03ed2d9da85ad59703f6d6af879355575cf7db07494
-DIST blinken-18.04.1.tar.xz 2507668 BLAKE2B ccafbae2164063f0e8ab325c12be80d38b1b56c3bfadfd2f49015727a76960ebe681583a5c1ec040fd61c54cc19118c2015394166539539ac03d113162a2df54 SHA512 08eb8734657aed72eb47c5bd8822126ebf39535dc4da38b59b680f68d95d442db0a74a5d717e987f653d34d3beda1cd85dcc88d4810e09f427c0a01a45956c10
+DIST blinken-18.04.2.tar.xz 2507808 BLAKE2B b6ca67e3da758666ee2b271184afd0dea931b695dad5d41c234bc0412337fa08b9deb790121f7ecf5cafbbb79f320eeb73b4bb81603a3bbd3feb8adad7c90b44 SHA512 608be8da79d61ea6cdccea7426ae4088d2334cacfb4325cc6a69e52ffe41ad9cb349e39f40bc99d25e6381b206597d7722fc7c104325e8548171ce72113c4a96
 EBUILD blinken-17.12.3.ebuild 768 BLAKE2B 02653f2ed7d6bee097378e0afc3e88947aa978bd9027d13bab05aafa1da424e9ef88a4ace0424f134686a207c4a286cc570f708308503ab525c2dbd782940a05 SHA512 9ee30d940c1a3f3cbf398063047ec11fc7406c48751c8e70abd14a54d6fe3febc25118097734ecdc409f80a856274244453e54ec75ec6b6d702ac6fcf923ecdc
-EBUILD blinken-18.04.1.ebuild 770 BLAKE2B aeed4cf2f1b1f9f4a45a0492985ecae692d19c7cac1a618b2bac55165901bdb580cc6d521ed458f997e15168824b5dbe0f006f4fadf73e5f9b9627d8bfec52a6 SHA512 1dfc596d4fc692fd22b70a9ebb1e62dc8f71794b6edb328438852a46f103873f4c98fa196c61f8657981f51ca9de06aac6517120c78d67b740c0184820a70998
+EBUILD blinken-18.04.2.ebuild 770 BLAKE2B aeed4cf2f1b1f9f4a45a0492985ecae692d19c7cac1a618b2bac55165901bdb580cc6d521ed458f997e15168824b5dbe0f006f4fadf73e5f9b9627d8bfec52a6 SHA512 1dfc596d4fc692fd22b70a9ebb1e62dc8f71794b6edb328438852a46f103873f4c98fa196c61f8657981f51ca9de06aac6517120c78d67b740c0184820a70998
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-18.04.1.ebuild b/kde-apps/blinken/blinken-18.04.2.ebuild
index 691085603aae..691085603aae 100644
--- a/kde-apps/blinken/blinken-18.04.1.ebuild
+++ b/kde-apps/blinken/blinken-18.04.2.ebuild
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index cd83d1eb59fd..609d5744b8d9 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-17.12.3.tar.xz 753868 BLAKE2B e865f2c565eea5def26687c3dc813aa40aca0468e6754f9bbb349266fcceda609f7f8260eb44e2313f253a893892edd00456b517642939028921489b8bf9d3f0 SHA512 3c792fd103b93a2ec5e9b030382256cdba1c05477e04e8d95d0a331dd630d88137e0079fd1b91f267ccbc1c32a60e4c94f34330061380b0a069f689b90efb6ec
-DIST bomber-18.04.1.tar.xz 754460 BLAKE2B f30c17bd23ebe7288c6b6102c21f5ba98e26aa661a168553ac333f89915120f69028b8e4a0c19dceaf20a498770c1c32ddfdd0b4b9f113980ab7b991358cbd9e SHA512 24b97268905abe7a57f77c56eec1c4c63374b024becd1802b0b00378f7f236ae57a2a63a8048d686dfb4f77774088e7447a1aa14e5381aeec5fcfabb4c3878c9
+DIST bomber-18.04.2.tar.xz 754712 BLAKE2B fd669ca5dbc8f1d8f862d33afcf75c48bd37cc933d3b6022cb35ab3b7e2a04a965421bde8242a212ecebd7890aa956b6083d77f41f3a65d943bf4ec4d3ff64ce SHA512 b362f0d891270269a1eb15a8bc5d7e4d6d2cffc1fd84227ce2f507f9fa7bfb3975c931628d03e9e25513bac28c5f82debf6410c368aa7203c160525f38cdecdb
 EBUILD bomber-17.12.3.ebuild 685 BLAKE2B b62f0b52aca8404743df8150b990b75228f9b67ce1aae9345f33ae10f53e15c8617df73966be6c880852c1b36dfc4f2522aa986550edca71274973f42fca44b7 SHA512 2858c6a02e8776a651d23bccad7b432bd4f3bb5386840d39bd11275a0154d65ae73aa0fe264a77f5fa1912b8b57898dc69bf68951ce0aaf265e8257188ef29f8
-EBUILD bomber-18.04.1.ebuild 687 BLAKE2B d8b62bfa84ff255f9a0515589a1f0063674340b0ea87486f1a76a1553b0e016dd32928e36799e3608659479a0ee8958783d8a4679e81679055b48a159b68c419 SHA512 9867073869e50018757499d76f4504588b7cdba026763add11849ef309c3e7e197cd5962b67309c7c153b42fa4388551c2425a3c1f655156f5894245c794b5ae
+EBUILD bomber-18.04.2.ebuild 687 BLAKE2B d8b62bfa84ff255f9a0515589a1f0063674340b0ea87486f1a76a1553b0e016dd32928e36799e3608659479a0ee8958783d8a4679e81679055b48a159b68c419 SHA512 9867073869e50018757499d76f4504588b7cdba026763add11849ef309c3e7e197cd5962b67309c7c153b42fa4388551c2425a3c1f655156f5894245c794b5ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-18.04.1.ebuild b/kde-apps/bomber/bomber-18.04.2.ebuild
index 1131554ae2a1..1131554ae2a1 100644
--- a/kde-apps/bomber/bomber-18.04.1.ebuild
+++ b/kde-apps/bomber/bomber-18.04.2.ebuild
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 49b3a966016e..bece949b48c2 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-17.12.3.tar.xz 186488 BLAKE2B b3cf4a9d6b168e9197290d9fb50698b60122a07e91a732ba2f75b50ae6821bec9dfea41142c1e40e982db53f61026e82fa9370cfa39cc2edb3d605cac579eb45 SHA512 11b626795fef8bf8bd30f086e759d26a8f63f74c05dd155506121e5251e2f2e07cd67f3f337a6eb0b567b96c73980875cfbf02ebfdec3f5e13062e2aff21fe76
-DIST bovo-18.04.1.tar.xz 186436 BLAKE2B 9f5558f34a141e34fb75416ca71bb8f2983706f376c5670e470e9e7ae80ab437e6c29c022e59aacbb3066d6bb981b71628f7111e2c5bc7828b43ca6093f4449b SHA512 e35bccc587f3fbd08eeaea4ece58e3d533d9c3fd4ac587df792a6183c95c9e8a05fc6d2e47b987723360ddbad1c0d8b747de6f3212e10a3c16528a5b1b6a0998
+DIST bovo-18.04.2.tar.xz 186572 BLAKE2B b5f0b06ed25dcff180c10fd7cbe6e762d9be69b29d81481aba750c89acd87a6995595343803e732400623cd9bb354015a4fced1523dc170a6db7babd5e41f3d5 SHA512 b794caf7189b29e8311c04928a66bd76f9ec0cd780c57e90d2303d7d280038708b42efe85bf392eb99ee98d0718f11178b736fd2f7272a8186aea0a457e3ce4d
 EBUILD bovo-17.12.3.ebuild 702 BLAKE2B 85a85acba350d651339bf61165f7b0de15cf9bf996f3ae942e6267b0a35ab58a73196f92e5c249ead409f6814f6f16b7de8ac90d451dc3bc0c2f5763e5fc22f7 SHA512 ef0e3d99b0ad580a20be16a3ee18c2316f00cfa8d54c88f2135cbaee3c4c288d10661739afac12f5ca84fa3d77bbeb10896b4d5804e7be3138ceac936b370112
-EBUILD bovo-18.04.1.ebuild 704 BLAKE2B 7abe20171e86fd1c18b0a5ded391057ca3d1e180f60edb47f9daffcc6192412d9b8aceab2458d15cfb7ba20f7bf5f947d7d69ee2433cb4b941751172b2554ba3 SHA512 31fc53db3f3e0fcdf5f240b9e9c935260ea363226881e90b7ad3f59bdd6c3a3cdef2c10d8fbe0be37de10df47bf525e7de58d56a2b4b3e0172d3aa965624bd78
+EBUILD bovo-18.04.2.ebuild 704 BLAKE2B 7abe20171e86fd1c18b0a5ded391057ca3d1e180f60edb47f9daffcc6192412d9b8aceab2458d15cfb7ba20f7bf5f947d7d69ee2433cb4b941751172b2554ba3 SHA512 31fc53db3f3e0fcdf5f240b9e9c935260ea363226881e90b7ad3f59bdd6c3a3cdef2c10d8fbe0be37de10df47bf525e7de58d56a2b4b3e0172d3aa965624bd78
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-18.04.1.ebuild b/kde-apps/bovo/bovo-18.04.2.ebuild
index 8f3de523e8a3..8f3de523e8a3 100644
--- a/kde-apps/bovo/bovo-18.04.1.ebuild
+++ b/kde-apps/bovo/bovo-18.04.2.ebuild
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index f9a38ab64b85..114549e18545 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
-DIST akonadi-calendar-tools-18.04.1.tar.xz 221120 BLAKE2B f36fd0f32dd9554b992efb859b05ec1e09cdc649be12f7f0cd55ddb9b6db814763fa43b191eb3969eb02478ac85b465ab327c94832156e9dbd7c7613e9b889fa SHA512 7c9985a19882d31b698acbdf94eea25d6f572e7fd53927691777a4bf768b86c630c0801cd8118cb0770fa66a8949bf81a032d0c6e4c83b945eb1274cf4ca0542
+DIST akonadi-calendar-tools-18.04.2.tar.xz 221200 BLAKE2B 6c978bbe881ca6272ea457302f0eee0ff0f57ebdb4b0c5fb2a50cc50c7ca84457cd4ccbca609f6ee0fdacdf45cb719dc5b0b98fc982f06643bb43155434416ae SHA512 2cd4fea39b0e79d699ecd9be711b0061d6e6190b97add422a572889c6882666fb75d2507a4ccbb69c9bfdbb62daf28316940ff635f19e3b8a867003017abafe6
 EBUILD calendarjanitor-17.12.3.ebuild 1029 BLAKE2B 19aac37a01db2716f31fcd2a6082a68eea84f8b8fb7a35d76721d2d72cacec48e49fbd08cbdafbb74f6346ed4a8f1084f3e0c62450f04740a9112568b73cdf94 SHA512 beda41c1e93490da51240a8abb47d028f2f1a3cb5b5daa6a11fdbe7e61b58c70941a9d62ddd577a2d7921199787e1dc29c15bdc6d10859214e199fca1f5de55c
-EBUILD calendarjanitor-18.04.1.ebuild 1031 BLAKE2B 515efde0fe008e2d1625e3a51f4b3ab5ba09fdf0cf10fc40c64e1010456ce13165f30e5443c29fd8a1804a514c41cb7c8080841b776043a49f4572545a9a2779 SHA512 4f2b369eb174348da6ad3cd3958ce363df5efbd3a2d153ac33bcb259db30cd58fe60cd22b2be8e0ee961033c11a6ea94b4eed67284eb72d4041132d4dcbf01ca
+EBUILD calendarjanitor-18.04.2.ebuild 1031 BLAKE2B 515efde0fe008e2d1625e3a51f4b3ab5ba09fdf0cf10fc40c64e1010456ce13165f30e5443c29fd8a1804a514c41cb7c8080841b776043a49f4572545a9a2779 SHA512 4f2b369eb174348da6ad3cd3958ce363df5efbd3a2d153ac33bcb259db30cd58fe60cd22b2be8e0ee961033c11a6ea94b4eed67284eb72d4041132d4dcbf01ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.04.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.04.2.ebuild
index 026dab8a1418..026dab8a1418 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-18.04.1.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.04.2.ebuild
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index bb6b3eab4def..f338ea6991c9 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-17.12.3.tar.xz 644864 BLAKE2B 52733e61d06eb1335f5e104daa073be87123c71af99dd2894934275b71b7a61478ac7853954492681327b5047a85dbaf7d634ca7bc53fefd115d3d2148e76048 SHA512 db578210c496c0e127e3c11efeb71cdd1bf56d0e61db6b82528ca036dbe83bb08338598863e51e7c8bead8f83169e1ecfb6080231e2bb97678c3b078fb12ee22
-DIST calendarsupport-18.04.1.tar.xz 647072 BLAKE2B ba76da171147a1287597af98e455d0b667971c00e5a18e7c297296af0bbb727a49e713ee400e569af869a979f28610f5c23d80d05818b4e31449f54ceb3b84b6 SHA512 29af53325d69ffae17b2c444e1347fb862e1e35462335b42190f0a0850ad14513273677928f09dd92d24b1a8c2417f1433905295b968a289efb76d6d12d03dff
+DIST calendarsupport-18.04.2.tar.xz 647164 BLAKE2B c38d8b6bbba8328dbc50c1d55ea0117250017440b2b7394b9626b3c709f46a776ac0f3389973028d404d1d39a36c58cfc64bad6bcef7fd53b63a51f58e2a1276 SHA512 d321751fc1ab61583ae444262dbcec6b09dce70dfc7c9ba6cbdf05d3d1a9c6cc5d28a3d19f3982cb447df813bbe34c258dd95b0f784007ac95fcc8b72366d177
 EBUILD calendarsupport-17.12.3.ebuild 1099 BLAKE2B 6b8b8e7fb0c51e9820cded52e47369ccf5051aa05b3dd014efbf1536d773db9abc7dab18e9d9e579bdcd5164db30c280452aedeb7def43e6e5a504b6141c8c42 SHA512 5b0abb1569c17da4c776639e006fbe19b52b6080801aa0d4273f48271848d9c4334a2a713b2d08801a64bfe5adb6c47cc635e32629d6fb19b60756eefa927ac9
-EBUILD calendarsupport-18.04.1.ebuild 1101 BLAKE2B 06c987a38a03ce150d785d86eb8a358b82a001501ab1aed6e48bfb8ba139cf82fec277ce8e33d4b158d85a98ef0f4e7c41d5ba0213517b65ff78d5b490cfef02 SHA512 f93a5be882627278bbbb52cb4677308d1999b73d9b08776361ff3d0287d9317173ebf629c3e0e4fd9696ef9c9985414f0317928e5c472a87569b11427cbd653d
+EBUILD calendarsupport-18.04.2.ebuild 1101 BLAKE2B 06c987a38a03ce150d785d86eb8a358b82a001501ab1aed6e48bfb8ba139cf82fec277ce8e33d4b158d85a98ef0f4e7c41d5ba0213517b65ff78d5b490cfef02 SHA512 f93a5be882627278bbbb52cb4677308d1999b73d9b08776361ff3d0287d9317173ebf629c3e0e4fd9696ef9c9985414f0317928e5c472a87569b11427cbd653d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-18.04.1.ebuild b/kde-apps/calendarsupport/calendarsupport-18.04.2.ebuild
index 04abac8577ef..04abac8577ef 100644
--- a/kde-apps/calendarsupport/calendarsupport-18.04.1.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-18.04.2.ebuild
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 4109b26eee03..e6dfbab61bac 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
 DIST cantor-17.12.3.tar.xz 1066992 BLAKE2B fdaaa42adf45b3013337374b83b6da77d6adfd610e233d56a80965f35f3433b412d4f1279a3c2c3e257a57a69b44d7e190f42e325f0fd3fa5ef4223ce6ddbfb7 SHA512 37d080fa3e87cbd105e33c687b5bc670c0833639873c41e1dcc519577103186ec629c85b5a1875af915267eb7ca3d13f170894bb9c0c882c964ccc02a24cfa3b
-DIST cantor-18.04.1.tar.xz 1070188 BLAKE2B a5a6dbae3305b00f9f9160e1ab9680e40fadc0bc67020235188c09dc35d5b7a271858746a918c100be9bf180a7aff0bcb728d5a60dfec7ae007fe0c075ec07c3 SHA512 7a5e01ef920f24587009cd58e27428c4e6686250af5a2a0449f95efd6b994d054cf32c9eaa78716b940f9073b04fa0086e6207bb7a30934d1c9f2fcad98fa311
+DIST cantor-18.04.2.tar.xz 1071952 BLAKE2B fcccf731040f49229ba43e5cf00a052f8e7d93736536c63a9b92c93423794e927ea295f292295f2f6ed5844fc3bdf08367907439f3ef9e47900549c8bf6f2c63 SHA512 40b57c65606c771f96d8439eb192436dab7eca126a6d9e6d0b985aff3f11b340e4e3f42c182bceb5f954d2e695f8e13b739685d6c4389fdbcc07a4e99a936d40
 EBUILD cantor-17.12.3.ebuild 3179 BLAKE2B f65cd049ec6997ea90b23d95ceb780f253abba21471f951cf42c1e9f6d5800261743ff40307c754486ce50f976da3ece31acfa28573bd75ad2834dc86002962b SHA512 6f6c02bceb62668e6deae92804f6de12a842234a8bc2597f65b93f202ae756f18fc91ab4fda4bc82d396030bdc9bbe8b76cb425386293a2f09676c5d12740e49
-EBUILD cantor-18.04.1.ebuild 3181 BLAKE2B 0261eb7e7526a73152dbfc6474218b6ec81eb8a6d612f8de2be2a53e0871492303704b93ee74d57b8ffedd2f5fcd7900f199c2016656693cb3da7fcbcb2290ca SHA512 c6acfee7b2aa258b16d66d885f6ff231ca3eb5c5d58dd4939e15f444bd33273610bada28119e8252e3c5e67c8d9dee81bbf2e4fe0b2a6576b538f1c0ef6e4200
+EBUILD cantor-18.04.2.ebuild 3181 BLAKE2B 0261eb7e7526a73152dbfc6474218b6ec81eb8a6d612f8de2be2a53e0871492303704b93ee74d57b8ffedd2f5fcd7900f199c2016656693cb3da7fcbcb2290ca SHA512 c6acfee7b2aa258b16d66d885f6ff231ca3eb5c5d58dd4939e15f444bd33273610bada28119e8252e3c5e67c8d9dee81bbf2e4fe0b2a6576b538f1c0ef6e4200
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-18.04.1.ebuild b/kde-apps/cantor/cantor-18.04.2.ebuild
index cd2bf41394b4..cd2bf41394b4 100644
--- a/kde-apps/cantor/cantor-18.04.1.ebuild
+++ b/kde-apps/cantor/cantor-18.04.2.ebuild
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index dfa0cdea8259..a32f7759a316 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-17.12.3.tar.xz 1905900 BLAKE2B 8ada882e8bd19a272eb622a0bdb5e9fa9a20ed0c31c4b05ecde68f969288907ce00ea4ebd1c541aa8f5e51e3ca248b8413cd86611e96ca94e186cd6edd1e70b4 SHA512 fed1fdb51cba8eb2e02139095fc250f4d4cbed261a815cc9e8cb12df193da79440026730aad4fdda73759a4b8571776014a74b5d0517637d2fd2d86432e947c5
-DIST cervisia-18.04.1.tar.xz 1906476 BLAKE2B d004091e1797ddedba6099450c6193456c64aaca3566e5f7d739750cb3344e0ef5a5a44431a16c3282b84eefbfdfcda6a728c8dacf9507c448a3a9fda648337d SHA512 f3f29c277b4ecccbbcdd539d24fc198b0e347bbce3b8704107354e00faaaae385c98c5e2f1a715d59af76cde2012ebf289a7d238e71385b2a2a913b7dad8675d
+DIST cervisia-18.04.2.tar.xz 1906876 BLAKE2B 8021ef587ed52b942b26922bd96a2a0b9eb58ac32f54df0ed754c96420c54ba0c6e99ad077fcee9d135ad3a1f6f743cf61e236e551d19a751ec06c8ffe65eb7b SHA512 2116fb68979f5faaa6f419fd872bcacfbc83bf5e03b946da660f07d7a4503ed5124f9c2b76cd4a3bbf9adf4511fba92e29106773339f8e74fb522eceab977d1a
 EBUILD cervisia-17.12.3.ebuild 899 BLAKE2B 0c84459c973444f7472abf611c52ba0ad9eaea41757e8313a80d925e14d41e50f7d24237471ed4b671cf685f77ddb72ce4dd4e25f41a8a7ddfc67818485855d2 SHA512 32c8623e3b2c9afcc1589a5335d772d057341b36fc8d51e2b23d65c9d9436f229576e2c015ab24843bb01cc5df22e917031b2b044e7a9f320c45f647c4681bfc
-EBUILD cervisia-18.04.1.ebuild 901 BLAKE2B 02b65ad97b02ffb248a9cc1c42ed5a62133a31c558efc84a3c14db0d146c1c5582d06ce2b1954abe006c9400495ffc37d134d5bef38fa87a5eb11a967bde718e SHA512 8f92984ac5c39c53e755a9cdb48951436b49dbb5f2ebdf23d69bc667c398fea1578eaa99d0a1252f9425334e3d477192bbc19fcfb8355ae5724acb60d12a7f40
+EBUILD cervisia-18.04.2.ebuild 901 BLAKE2B 02b65ad97b02ffb248a9cc1c42ed5a62133a31c558efc84a3c14db0d146c1c5582d06ce2b1954abe006c9400495ffc37d134d5bef38fa87a5eb11a967bde718e SHA512 8f92984ac5c39c53e755a9cdb48951436b49dbb5f2ebdf23d69bc667c398fea1578eaa99d0a1252f9425334e3d477192bbc19fcfb8355ae5724acb60d12a7f40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-18.04.1.ebuild b/kde-apps/cervisia/cervisia-18.04.2.ebuild
index fe35d7708a72..fe35d7708a72 100644
--- a/kde-apps/cervisia/cervisia-18.04.1.ebuild
+++ b/kde-apps/cervisia/cervisia-18.04.2.ebuild
diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index 38bb1b0619cd..1ae9e42653d0 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-17.12.3.tar.xz 187288 BLAKE2B 205db4fddf395f5e1c7ac9db123984f712867d2523b916ba0017525872a56460c2540dacc6b4e49cb3e876d3d504f619ef603372e98622d1634804cf5bee4efd SHA512 fe0e2aabea0870e8f3127178a10c70264fd339391f88aa9e2a1a5238cb25a0ef47ab2c66f60d2da0788a41399cdfd4099542c81d47e8db1ea09cf2f5941fdeaa
-DIST dolphin-plugins-18.04.1.tar.xz 189840 BLAKE2B b7d96426d88e5997661e9ca8adb131ed3122b27ab0f4c2181980660202b9960bca6815de62ae3fe971537226492b5a9feef23b0936e36d092be7882575b26d52 SHA512 83cf680429bff9c6def3cff6135987760e223d22f41ceff385f4e0419f882054f4a2f02193454b9709128cdea8855442bc9f229e913eb2ac91dc5f30073fe922
+DIST dolphin-plugins-18.04.2.tar.xz 189956 BLAKE2B c84d4f45c67b9d394cab0e05ca06755d49f2b734d711cf725bcebebdbede9f192e47eed475903dbd3f820ebd739db8c7a570bf6ae7a7e56736b61cae14a2117a SHA512 4218793e03fd6adc55c489e9b2a9336c2982fdccc2cd1cf1ff95ea7efe6aa32399bad7d0093c70e2d788410ab566152f8511c7f0d0c4a5597eeab7b3f461de89
 EBUILD dolphin-plugins-17.12.3.ebuild 1841 BLAKE2B fae91928416caa376bea9ea1fc58d261665e3777f2d4768b1d2741b1059adc61e58dbd32756301035c444fa21f2f197acc1e0e707cebfe19a2fef8bf07b0db52 SHA512 30ca4eb51eaf61d2bdec582227ff29a1d3ea00264b4f99f22ee593b1a052b3187e75a56792177161d88f55dc677d7e19ef913d08b74086b321080b050b220d9c
-EBUILD dolphin-plugins-18.04.1.ebuild 1843 BLAKE2B e299b83b8d1b9dce59785dc4ee02bf83cec2e48a7708aef8f22d985ed30dac73dc6ab45381d12ab0294569f7b2c7226b55f5c81773692c5baab81172bfb69537 SHA512 8d79773f4279d957f465532c9f3e0fc75d182701550ddc50ffa1989b05747e08d70074ad3593826879bc1000cd800c6e404f84527dcaca8ce87fb98d1f16a23e
+EBUILD dolphin-plugins-18.04.2.ebuild 1843 BLAKE2B e299b83b8d1b9dce59785dc4ee02bf83cec2e48a7708aef8f22d985ed30dac73dc6ab45381d12ab0294569f7b2c7226b55f5c81773692c5baab81172bfb69537 SHA512 8d79773f4279d957f465532c9f3e0fc75d182701550ddc50ffa1989b05747e08d70074ad3593826879bc1000cd800c6e404f84527dcaca8ce87fb98d1f16a23e
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.1.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.2.ebuild
index 125d149d68cf..125d149d68cf 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.1.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.2.ebuild
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 7da44b71c61c..63bfca8b83f4 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,6 +1,6 @@
 AUX dolphin-18.04.1-flto.patch 3061 BLAKE2B d24d99f9cebd2979d6e0b6c8edb30b552601ba502937313395dae35e9c21c2ec6b1978eaf949cb87c5846ea6a12fe535b4fc849b3d7547c6c95c5b75c0cfc2d9 SHA512 7af21ea15381a460b08c02d5dee0bc1702a2a30c0b86b2b8f1b937783a199fb3b3cc1f76ee827ac15ca934d0e975ad2e702053369477afa35990423abe7e9d63
 DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136
-DIST dolphin-18.04.1.tar.xz 4849868 BLAKE2B 3335ced611590b51200135207b5bc5e2266504c7d556e8a903b6f3f63131547369d1fcccce8f13f93f4f15c84e695827ef4deb6088e5ec6219c15f85c140313f SHA512 13c9f45282168a4ae68b9d0977b1734918c662028043167ab36bc67b7b7f1756930a613e7bbd25bafc6db7e1591524f2ec3002247838ddbf0dc49037d4c7a0fd
+DIST dolphin-18.04.2.tar.xz 4850780 BLAKE2B 001fcd1f3fabfe449d5b6ac82763dcba0bfb3aa5303e54b2f72c105521deddd7f0264c435da9471cca5978d69afccb391810c1b6b4ee69f5f66f39034e8e1484 SHA512 760e698903717f30c08d69ae5872b1d42c523d6a554a6570cda6bfbd4fe2c37f2744e461728e7d090cfab6bed0055bf48b8cbb38128503386698f71c5d5f5198
 EBUILD dolphin-17.12.3.ebuild 2230 BLAKE2B 8e3d435eac7d521830bbd13122d7616bc5c54b786eef8386dad3c9b97447058a843d61c060308518c84e776787cdeb0e1b3399fc099f69faa6b7f055eae79c58 SHA512 b3999175d7bf0672fce3b697104b9fb024c9d0487dad8a40d1f37405ca7d611b2981a76629c024eb06cf7503c900a2a2d70c365d718fd8b173562103f1db975b
-EBUILD dolphin-18.04.1.ebuild 2275 BLAKE2B 13fc14e37471e745d503ef2fb3bd56bb9ba8369f652baef4be81336344ae69b80836adc02b64b9cb3c921a4df74586b12de84cc4e843524d85ac8d051d8769a8 SHA512 43d99858981bd3adeb81552a5563b6772a8cda7412c69fc51647a0be6ffee6dda93686c43bff6e8a2c84bc0f626d940ac9dd7d98bb694bca2f80fbd749e2cff2
+EBUILD dolphin-18.04.2.ebuild 2284 BLAKE2B f4f3730c502944edc5ac5bccc02f9bbb9fc4f8ebfd80a383269e1d0621d8b60beb6f18da5d674188d7628503f72bb3ee8505c29ea03b88be9fe7483187250b37 SHA512 570affb49ecb45ee72d5b4217245fbc437b43f77ff4edb5a7380ba56c6ccead36b817a5afe355b299a8706e00fae82a7ab26c0a1951fba1f344eeaea1d23a4e7
 MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-18.04.1.ebuild b/kde-apps/dolphin/dolphin-18.04.1.ebuild
deleted file mode 100644
index 6814ee4e99cb..000000000000
--- a/kde-apps/dolphin/dolphin-18.04.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="~amd64 ~x86"
-IUSE="semantic-desktop thumbnail"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-		$(add_kdeapps_dep baloo-widgets)
-	)
-	!semantic-desktop? (
-		$(add_frameworks_dep kdelibs4support)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kio-extras)
-	thumbnail? (
-		$(add_kdeapps_dep ffmpegthumbs)
-		$(add_kdeapps_dep thumbnailers)
-	)
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-flto.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/ark:${SLOT}" ; then
-		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
-	fi
-
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dolphin/dolphin-18.04.2.ebuild b/kde-apps/dolphin/dolphin-18.04.2.ebuild
new file mode 100644
index 000000000000..45f931da6b12
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-18.04.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
+KEYWORDS="~amd64 ~x86"
+IUSE="semantic-desktop thumbnail"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+		$(add_kdeapps_dep baloo-widgets)
+	)
+	!semantic-desktop? (
+		$(add_frameworks_dep kdelibs4support)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kio-extras)
+	thumbnail? (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep thumbnailers)
+	)
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-18.04.1-flto.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/ark:${SLOT}" ; then
+		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
+	fi
+}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 2af127197081..30b716228b7c 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-17.12.3.tar.xz 1464016 BLAKE2B 54360c45227c2260b4b401978e902de4777a5357812f93d73952938e6400196369e4b41777809619aa8cf2c0bf9a840b47ab71fbd3348e61f37de8943d1fd227 SHA512 0ba2e1845d6b6fcb3885e340160f37d924afd5d5b1a8f1f3e196ad5b04db87d55d1460feb447e0845802757e3b81d550fafcfca2e91bf334209953fc4466eef8
-DIST dragon-18.04.1.tar.xz 1729096 BLAKE2B a6bdf6cbbe85c62abd319643b96888a0396e4b8edc7c70217b91eaa66d7fc39f34124372e666ff18738829139251074f31f63f9fd1326639811f92a5cdbe3ad4 SHA512 8ba785d3ad30e4adc2bc63e9547945799074e49c14fd93b20923fe2c7cee7f0f7afd5b5477582f700c729e3e36fbdf3cc334e16e79735b2da574e2e53f0368b4
+DIST dragon-18.04.2.tar.xz 1729252 BLAKE2B d3150a269e0601ded56d427ecde54dea1137b40392a90df1abf9bf2998183fabca9d7f67e3a987b51579c0c1bf6612597ac57b37c9c53e65bb8535c7ec2df9c9 SHA512 8aab6d05672cb9420a27b1320dae2bd95b74848ee4e3e8f0cc02dc06cefd2ca3e27870051441d0c7912c9440bb626f69730a70f09cb4c91c664954b532ee6a97
 EBUILD dragon-17.12.3.ebuild 994 BLAKE2B 6178094991fce897fefa9626c65c630fc62aba9c716096bd77f74eb7177677f421a4cd6055c4d88d7609730398f9b4d5464d593ca5daeb811306664a07c2fb0c SHA512 adad2bc72bbb13147c70f8bd7c7cf8cc73b9980473f6f7691676d448848307c637b13a5895feb06804888b9827e1d4ed4de97de3c729eda20456667af73d1fc7
-EBUILD dragon-18.04.1.ebuild 996 BLAKE2B afbf32c22cf17e0b45aa6b44b60827253d0dda4566ae1095043e1c37f9b7a7478ac12ba8a0f7003cd07fbbc9eb7ec756728c7af77dd9a128bde9fa1ea85d06e8 SHA512 ca172c2c600e8090fc60e5495cbb1bc23857fd3e536122ee6e4de6d6cc505c0691c2139242f58ca42c7e16ad3ad787090147fd516e1ef3a346c6e2d7499cff01
+EBUILD dragon-18.04.2.ebuild 996 BLAKE2B afbf32c22cf17e0b45aa6b44b60827253d0dda4566ae1095043e1c37f9b7a7478ac12ba8a0f7003cd07fbbc9eb7ec756728c7af77dd9a128bde9fa1ea85d06e8 SHA512 ca172c2c600e8090fc60e5495cbb1bc23857fd3e536122ee6e4de6d6cc505c0691c2139242f58ca42c7e16ad3ad787090147fd516e1ef3a346c6e2d7499cff01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-18.04.1.ebuild b/kde-apps/dragon/dragon-18.04.2.ebuild
index e97559abf858..e97559abf858 100644
--- a/kde-apps/dragon/dragon-18.04.1.ebuild
+++ b/kde-apps/dragon/dragon-18.04.2.ebuild
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index eb4df7bb5ed0..ca87e54cbbc2 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-17.12.3.tar.xz 437868 BLAKE2B 294cfcbb750ae81714257b56dd7f2c7817be8182331ec3517c96e17858997f1e3c49b3ecbce27e906c9485fdbc2f2bcab94131fc9365a0fc484b799ef2e29877 SHA512 6a51eef25eb9ab0522c95ec4ed800af94e5a1243b597e7aee4619a1494bdcd26b08df4d42d04d837c561f5c0d3434edba9f4a72fdd2433816ad3e9e0e6b6bbae
-DIST eventviews-18.04.1.tar.xz 441512 BLAKE2B 64cac1d26536fccf25c2ccfda225219c21c2a13a4952684c5ca5a532ddd35fd23f0e95535639487f94029b3e6809bfd025e312c8e5b1ef88437b2cd3c4d3b15b SHA512 a503cf9cb0700685dd7b0348543ae9e95b9e3711889fe10365ec69e4b63e58664a12761071e3738ba868f2725f2195472489194521fa563b899d54d7591df091
+DIST eventviews-18.04.2.tar.xz 441572 BLAKE2B 21555db4f717121c10b089079c0cc0f608ff8a613ed56d95dd84767fc6e12b298fec793780bda021f41c77a28b4324a102193f45787986cb7a3f41ee74b1b384 SHA512 428981bb3cd35fda4c220009579daf1902bd6f4e3fbdc18d0cf00096099d12f74cd22b1272e5c86132cab5e6dc02d1a07bcb0e2dfdc2428b62c54ca16eb14a90
 EBUILD eventviews-17.12.3.ebuild 1028 BLAKE2B 9cf70479a89f325ef19a53ca963c62807f1cb7256be93e36ba22c37f4d2cb00e222152a2c211485303cce829a3f78e700665f2ad3f354b715c9fd68e90d07019 SHA512 d48878283f9480486e99291fe6ac62bde34eff6f51220abb2cda9a25f09e89c85be22692095904feeed1db7e3d3e5ab83ef7fe0a383fa2b76480f65c920a74d2
-EBUILD eventviews-18.04.1.ebuild 1030 BLAKE2B 41627fe735e93e3eb21510097bba83d17b3bf65a9aec177e1df89c4265bc535eb4cb636895d235cf954040748d0abb432b8662334772058ce982bca7046319d3 SHA512 0d47ceae795d0b382eafa7be4a75e6e1a611a36bd94e0cd5a15dc72c698d8d2ab3b81e8f2c5e94fbcad7a0a47921a0f4906f54a48904bb8c8e9d75fa394cbede
+EBUILD eventviews-18.04.2.ebuild 1030 BLAKE2B 41627fe735e93e3eb21510097bba83d17b3bf65a9aec177e1df89c4265bc535eb4cb636895d235cf954040748d0abb432b8662334772058ce982bca7046319d3 SHA512 0d47ceae795d0b382eafa7be4a75e6e1a611a36bd94e0cd5a15dc72c698d8d2ab3b81e8f2c5e94fbcad7a0a47921a0f4906f54a48904bb8c8e9d75fa394cbede
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-18.04.1.ebuild b/kde-apps/eventviews/eventviews-18.04.2.ebuild
index 8b6b5841912a..8b6b5841912a 100644
--- a/kde-apps/eventviews/eventviews-18.04.1.ebuild
+++ b/kde-apps/eventviews/eventviews-18.04.2.ebuild
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 18e315e1a42b..d1c7c3a94f7f 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-17.12.3.tar.xz 21100 BLAKE2B 6f0ee8bd6c8d775c463734e83c44ee6a59cb52d7d8a622aa33b10e57b944f26aee5f453fc2cfe153d6d970114b19d524811681447eb01f5d8b16bd90e1897bcb SHA512 923bd21bc7e27c3ed511c987ae8011066b713acf6f14794c00cb26a0c6c3d8859a88db02c88ec5cfbc4210dd4a252dddcbbbe6e768d386617b26af3ea9b5184d
-DIST ffmpegthumbs-18.04.1.tar.xz 21228 BLAKE2B a80534367b76b7ff0f696e1ee461cfa77faf7cc1ef7d1b68bb53eb914165b233972230b369763819191a502fad090539e2172772ae528e63c77bdec54e99ebaa SHA512 4997043e9686d48e2158ce599699750c856a1deb0733083f00cfc741313177438839680cfc8b92bbe38855f13dabaa9e8b2c638c38136dd8f1f105913cfba9bb
+DIST ffmpegthumbs-18.04.2.tar.xz 21220 BLAKE2B de63786ec9b156073d17eaa5c7fd6bb26c50bdd556efb3493dd48d1d3640a041786b473c3dff141844f3a2ffd16cc6b95a193f34de5c94560e9f4984629655a9 SHA512 b24c02dd75c408fa91bd8e8a156cdf22ff9af3033d3f39ceeed2d83d0f42d0324778076d081c2769ac9a7a64978492567999588e16c73ae6c86056598fcea178
 EBUILD ffmpegthumbs-17.12.3.ebuild 436 BLAKE2B 1cacb9973f50bbe7d728a2f5cd98e4069db65f49ef979724130fc1c44e9008a400cb963c348763fc43a2d5baaa989ce6874f612a824d98edc45d9e3c155de843 SHA512 036321d6c9cd10f8b118916926aaef81692b73ee07954c6548af423d03ef8c7ee9f6e07bc1cb533e6ea351c4450f798d97b5838b6c07a77dc097ba0d943f31f6
-EBUILD ffmpegthumbs-18.04.1.ebuild 438 BLAKE2B 7f5d2339b4c958231a44f54a6ad61e538d9872e3cf51f464778d6629b2882373ee5cd5f2f2f6408a700c2f11d88a52bd71522720d71a3be47d42e70cdeebc17e SHA512 3fd443e1dcd4ff7800067f636fd464d11f59798bf715fae3c12697443d1012a8a6f7e39ab350de8e32fd7661dae42adb36790ff098902b0a90c88055a689d8d5
+EBUILD ffmpegthumbs-18.04.2.ebuild 438 BLAKE2B 7f5d2339b4c958231a44f54a6ad61e538d9872e3cf51f464778d6629b2882373ee5cd5f2f2f6408a700c2f11d88a52bd71522720d71a3be47d42e70cdeebc17e SHA512 3fd443e1dcd4ff7800067f636fd464d11f59798bf715fae3c12697443d1012a8a6f7e39ab350de8e32fd7661dae42adb36790ff098902b0a90c88055a689d8d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.2.ebuild
index a00942c7569b..a00942c7569b 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.1.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.2.ebuild
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 2f4d854107e1..a39a0bbfa0b0 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-17.12.3.tar.xz 654916 BLAKE2B 3543b15b6a1c691769c01aa24bcb8b8b3f1b81d0060ebb7409e8f22749fa6b08cd5ca0eff94e6a950c6f027bf3c56afcf7f43cee27192a34284509e3d6a8d670 SHA512 6c8efe81b54bc5fa0111d94c65a15a6a2beb079790bb741a38f336baff417eb5c8d6d133063afbd538378b5aadea08d221915cfaab8430fc4dc32a889c2057bc
-DIST filelight-18.04.1.tar.xz 659056 BLAKE2B 90ee5a918d0bc729e643da1351bb5222469a4448926c6980fd412e634b2ecb40fe098f8dc6ad13ce49ed4e15072f3c2cdcaf21fd510d1b64d90ef4063b1f1dd6 SHA512 265cbd30bd87a9767680657e4ba598de7395db5ac8583c636564f82f55dff416658aacf66691507945acfbb019e48db8ddde94d325ed623b80faa42db2a53b57
+DIST filelight-18.04.2.tar.xz 659100 BLAKE2B fb199e4a3f2dff1807a8d17ff2ebf88fb1b084aa638fb9600c18afa653bd05ebc972ac778071a59a558e3702a0963bb160553d187b4c88134f911a0b28816605 SHA512 380d6f5c0811220d72b7c411339e9ae778ae2ee4e472f87cf73af56cee39369e794598ee0601c8181cc0815579305de3af1b562e4d2edc43f2e70250c80f9e2d
 EBUILD filelight-17.12.3.ebuild 697 BLAKE2B 325b5ffebbed3e5cb98173fc20fb6a048d35de8cddb9ec8956823e59fd65fa30cc8a84a49ad8fa1f1fa5335c4c2c52a6a22e403571996babb6607ab356468e49 SHA512 6c9e6f0e094463deeb5d1132bb5c66fe5faaf249a80c11e8b5e09f84e89dfafc6b1b610e329c97beb8f7e06b04f562911474b1e0d22978ec8c6f80a4886eeff6
-EBUILD filelight-18.04.1.ebuild 699 BLAKE2B 6e9b88c7f2f2e90a799caca7ec74a45f4132600c0b0a35a2074e7ffa7e5b9a450b839ac83be89045da2f79f9c4b47443630159117d7847010a817501eb24b7bb SHA512 e1045b8e20af7a4394d171aed98c14f371198e394863bf13e8eb3aecab2ff8e3d653f396c046e06f163a7ef0f687699991a91ed207689670d65d0c9596f0adf0
+EBUILD filelight-18.04.2.ebuild 699 BLAKE2B 6e9b88c7f2f2e90a799caca7ec74a45f4132600c0b0a35a2074e7ffa7e5b9a450b839ac83be89045da2f79f9c4b47443630159117d7847010a817501eb24b7bb SHA512 e1045b8e20af7a4394d171aed98c14f371198e394863bf13e8eb3aecab2ff8e3d653f396c046e06f163a7ef0f687699991a91ed207689670d65d0c9596f0adf0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-18.04.1.ebuild b/kde-apps/filelight/filelight-18.04.2.ebuild
index 03b58843a55e..03b58843a55e 100644
--- a/kde-apps/filelight/filelight-18.04.1.ebuild
+++ b/kde-apps/filelight/filelight-18.04.2.ebuild
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index a95303f6e527..07eae3e2d07e 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-17.12.3.tar.xz 1959944 BLAKE2B 8b25ade780f0679f722eb3a4e323adc73c2e3c3d774595a934bdb2d6017eb0588e2163b0610bb90dd2277a0dbd9e6df590c2fdc238d36d80e50b335abd8702cf SHA512 9d3b8f53452a345a3c48547dc04bb1e58ab35f8d25b0e7611fba4adddefd04b705b681aa24e7e504e742a65b025b0ef5869d1959de9199f2f6d5681bbf7290fc
-DIST granatier-18.04.1.tar.xz 1961324 BLAKE2B 5ca0d7f736708dd1fd909d634b97b83543418ea2c1977763118ef551f1d8ad4091a963acad4390fcf5446af1ced498ed666b48d98e33912c679947a18fdc641f SHA512 8a752ae32bdfa3c3c459f7ed2fb80883494a03eaebac8555a18fd3bee823894a47c5802b3e9da17ee050c02f927bb2812e449e4651d34f9bf367213962b7a0a3
+DIST granatier-18.04.2.tar.xz 1961320 BLAKE2B 93e424d0c31a6cd657e7de658ca49a689f3d6b4cce29b18aec42e53cc8bac8094900e97894f26f3de6754552e019a32fa59255d8196f5cefcc0492a293d7b049 SHA512 afc46a2253885e88a8656260df46b18d5c649dd5e7ef27e18e6aadfa14c7cde57c87db05791dbe9e7002c00b4a381f586b6d2e4afce7b4c75cda3aae159478bc
 EBUILD granatier-17.12.3.ebuild 734 BLAKE2B 317d5bdc8e04ccd6efc3d3133e84967c29bb68ff65c6ad3001e9a7e28a62495f1db35d5b1ad345eb966b37f06fb337e1be2db9d539d4c10d6ee354424c381c6f SHA512 b3c19a91781523d509800563c93531106cb8455eb02bcc4c6a8bd1efbfcec2c9a3ea1c4fc4b622313e8f85ccc4cd3c27ea506fa5fe4c6b6fc0c4dbed72e58904
-EBUILD granatier-18.04.1.ebuild 736 BLAKE2B 8dcc7076fb8e0969030d2221fada5003c4ec9dee303883c19075ea90e2381c51f0eaeaf669c588d9d13ee365723ddd28ec8c9f55909dba8e808af15d7430890a SHA512 07cdcde27cbab58c48e4f68ba9817677e049cc872a6e0223183cceafc29d47f1492e1bb35c77a55c023d6fd396b1fe83c151f0546d318c8d63ae4c0329b8dde2
+EBUILD granatier-18.04.2.ebuild 736 BLAKE2B 8dcc7076fb8e0969030d2221fada5003c4ec9dee303883c19075ea90e2381c51f0eaeaf669c588d9d13ee365723ddd28ec8c9f55909dba8e808af15d7430890a SHA512 07cdcde27cbab58c48e4f68ba9817677e049cc872a6e0223183cceafc29d47f1492e1bb35c77a55c023d6fd396b1fe83c151f0546d318c8d63ae4c0329b8dde2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-18.04.1.ebuild b/kde-apps/granatier/granatier-18.04.2.ebuild
index 28cef3517e33..28cef3517e33 100644
--- a/kde-apps/granatier/granatier-18.04.1.ebuild
+++ b/kde-apps/granatier/granatier-18.04.2.ebuild
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 2ef0f34c2f85..2f2bf621ab1b 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-17.12.3.tar.xz 110752 BLAKE2B 2d0e60207bcf1edd1bd4e69e7a959c59e0e63b14117bafd402f8fa57aea2a1c1eb30c152ab3a70498691e854241046d6ca1ee9ffb3c8303393c6a629244c6be6 SHA512 722db8e101c7132717840137d77dc8c0972a2f1692b4b0d8be3e33c296649d0d5f30f55b4cc6e1dfa58778a3c470c93baae0b060d234a99f967e87296e947f0b
-DIST grantlee-editor-18.04.1.tar.xz 111092 BLAKE2B 69127778d79311b0a883ee6b283322f6c198f452df04d084d635c4e9e345d9c03ed211afdcb5db6941ac6fa57e9e2bed6a764b4a1eb821db046c33f0a6217e94 SHA512 f7205792e882391db8edd2c22022a3fd8bb24a45d32576e4bcaa80c92d4ff7d8f22313bcbe0b8447b707a135874546848cd42600a393c80e290d328cb97f0c39
+DIST grantlee-editor-18.04.2.tar.xz 111264 BLAKE2B a3a8e1cca4d945a830a35b392273f1d9389eda14c8ff135cebc38d70dcdae284b4baa6b0bd139dc89f812fd8091aaa259a44b03ed91e54ac43307d23154ef85c SHA512 aa825d2486c253c5673dfbb9dc874e22a48b05df96e21bd90704af3f5ed5c1ca0c23b8684b0c75f78dc706268c87dfcd5205720a74e0227f371c9fdc1624e13e
 EBUILD grantlee-editor-17.12.3.ebuild 1166 BLAKE2B 2ee5e6679257691d98d7a03e2972fdf33724487bbb69fc3c6aaa3dd7d2682dcff05cd51452f4f276e13e00a6b37d11c8d6ef0a92dc2f715d23886c63b21be55c SHA512 4ceb795d35dc12eecc2dbd69ccacd361aba00b18461340f9a867a0cc0e67fa7187d83e1800f4a8465e1fc82674401145e09585859b0b3b21d07a03227a1f68a3
-EBUILD grantlee-editor-18.04.1.ebuild 1168 BLAKE2B 4afa0384819169395f10f3744458a899afcbbb4c249e3af665da9f5cb33abc1577fc673702698cb0f6e2aec6ee9fadc3c7d0b8084411b8dbc7eed83a51ead388 SHA512 63f60380af87437f2e2005a896d07712278f3906e703c3a093caf6a703ba40077790dcd112922351feb6d093b4be5c7baf14f0012f10951b66dfe8fec7e623a7
+EBUILD grantlee-editor-18.04.2.ebuild 1168 BLAKE2B 4afa0384819169395f10f3744458a899afcbbb4c249e3af665da9f5cb33abc1577fc673702698cb0f6e2aec6ee9fadc3c7d0b8084411b8dbc7eed83a51ead388 SHA512 63f60380af87437f2e2005a896d07712278f3906e703c3a093caf6a703ba40077790dcd112922351feb6d093b4be5c7baf14f0012f10951b66dfe8fec7e623a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.04.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.04.2.ebuild
index 53bf85082a4f..53bf85082a4f 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-18.04.1.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-18.04.2.ebuild
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 9f4ae6caa972..2d2ce8639821 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-17.12.3.tar.xz 51348 BLAKE2B 89055379524d9273b2db9185c1f0116638e5f45414ba674cb7d2511e9539d556daf489e9a54f39a3c1197a8b1939076ccb7bd932d336c0769b97d2c7e59a8062 SHA512 203fd80f303d4c2c76b9375179da9aa7f040416b397ce576ee5836b2bc8d04109601275bad843a192317971852f97c9a7fa83b48401da14ec820f11706187928
-DIST grantleetheme-18.04.1.tar.xz 51672 BLAKE2B b294a0c37a1ba798a1c5458aa0b8ac36aac12e39d984317abde923e9e7d08bd527fa8aca3e9d9ca4180634887807596e26db831638e4c1126076bad6613ae582 SHA512 5e223abfcea21597d353816b82026be66468c3b267b0760347ea6120ece86ef7ab8163d043010bd7064b841361eebc3d6691ef9defa76be134e23a5c20a18477
+DIST grantleetheme-18.04.2.tar.xz 51684 BLAKE2B bdd2ef509b892778c7f391f21f838b3fda99691f916f59c5c73231df4f74a0e8ac5ffda39ae0576fe8aecc37669c41398d2908648a79b5807022cf2e1cca5332 SHA512 c08a7fac35dbac514ffd0da7dd447d1e4a8bcc52f18df387224c6823bce03b816a20985e67ab105665491f1b96baa1826a31809802318d0871099a5463cee463
 EBUILD grantleetheme-17.12.3.ebuild 735 BLAKE2B 01da5ebbc4f0fd762fd77fc496ca81622924d98e60749f366d4ed068ffca33dbc6111433aaf0b057701f6b683eeeba5a3f1a0c552b34fbce741128f4882c427d SHA512 1ea754208f4dca36e52ec2f2ffa5699350b6de9b19106cbfa00dbe655377bbb596aba4d31f2b4a17135bd48673401a4eaafd2a7d6efc3a9a5b46fc8652bcfa0a
-EBUILD grantleetheme-18.04.1.ebuild 737 BLAKE2B 6134740a08dec66d4e42a7ec86acfe10733ba8e26fe5cc86a1592b01bcf5c57329e75229eec68f909f690955fe57bc8e47ddfd1287978ea8f5f939381531c6a4 SHA512 02701da3f71bc003c95b4d9d9487620e83f6fe0d9915c24a9178e6f59433c2be86b809fe5db82d08b17ac795ca59c02ac04c28874816457352c67985167a9866
+EBUILD grantleetheme-18.04.2.ebuild 737 BLAKE2B 6134740a08dec66d4e42a7ec86acfe10733ba8e26fe5cc86a1592b01bcf5c57329e75229eec68f909f690955fe57bc8e47ddfd1287978ea8f5f939381531c6a4 SHA512 02701da3f71bc003c95b4d9d9487620e83f6fe0d9915c24a9178e6f59433c2be86b809fe5db82d08b17ac795ca59c02ac04c28874816457352c67985167a9866
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-18.04.1.ebuild b/kde-apps/grantleetheme/grantleetheme-18.04.2.ebuild
index 605753b034bb..605753b034bb 100644
--- a/kde-apps/grantleetheme/grantleetheme-18.04.1.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-18.04.2.ebuild
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 1c41ac0f5ca4..79f72e626ebe 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
 DIST gwenview-17.12.3.tar.xz 6021476 BLAKE2B a4142239cfe4d82b26977d788a67286625d7469ce4722a1c091691c02abe75ceb5b852e4754b6c3809fc96219b0a967595cd83910e8b809c553adaa0397ee939 SHA512 7691e07f6ec572a46a8b0c3e63aba93d7a3c2886384370d3d77299c94e7f9cc5f7dff4e45390cc6871bc003da27ce0f90d85d8108a7302657bc3f0175e609abf
-DIST gwenview-18.04.1.tar.xz 6054732 BLAKE2B d948ea9e2960fa9501805061cda18ebc7e3c00699143d6da34c8d3dcfdad7dc1658a3288223361d34b60ad83002bcbd8eb7dcb2a560fbd9f510c6395b38a0568 SHA512 cd26954dd050fa2b5e0750c7c07067f86078e7b249f827b2de31c185ac6a2569a2401a70a5c71526af3ab052ddef6be8138d716f5d861cd0adbe947428424364
+DIST gwenview-18.04.2.tar.xz 6055820 BLAKE2B 130a9dfcb69bf7da3a89c45c6a733824e24a17b0c582fb475e5ed51abc9e00f112e7edc32030ffb04db4e156a6a958678a527ea0c504dbb0c6fdd74d264dfc19 SHA512 ea9fdbc88dedbdfc2f15d431a28e2d8df010ed880cf29380b3b6bccd8cc7a93f06b980d2b4491ce3c7244767ed8eddbd8089450762aec3711514e98de8ccf758
 EBUILD gwenview-17.12.3.ebuild 2413 BLAKE2B fec0d82754f8e01f85946c5d9dd3aaeba2d4b7b934327f8bfd37e3c7cc910dd675d3d5583110088a21a07e780e3a25cfa25f03cf4d866a0d0d05b535922b0ddf SHA512 2dc8646d06e47db59f8ca63b89d73a50b70e00ff33e9f8a04043017cf84579ab0406dfc44ca258fc8d722a2e3eb00da00583ac42895985280e380b9322366d64
-EBUILD gwenview-18.04.1.ebuild 2415 BLAKE2B fd42f42af00e5afa906b6e195e55a940642ef9f50fc856a2b33276c41dd527ec2f038b0541ba6af1931d2cfa39634d7720423d15514bf72ca2f366cc05a552cb SHA512 6d41d0865b4f50825bcdc1041e21b69c00d42fd9bc325b2f0a29e8750c14b7c7d57fd336a6abf7f61d115668dcefdffb0578503730de566c23edae58df008497
+EBUILD gwenview-18.04.2.ebuild 2415 BLAKE2B fd42f42af00e5afa906b6e195e55a940642ef9f50fc856a2b33276c41dd527ec2f038b0541ba6af1931d2cfa39634d7720423d15514bf72ca2f366cc05a552cb SHA512 6d41d0865b4f50825bcdc1041e21b69c00d42fd9bc325b2f0a29e8750c14b7c7d57fd336a6abf7f61d115668dcefdffb0578503730de566c23edae58df008497
 MISC metadata.xml 423 BLAKE2B 2e0463d65a7476da0e5a28420f235108b3367b9adfcda7fc2d47c1a5ae0e7f1ca49859d7ac213e3434c7d846c78af041d90da5767bf68e24be5a3e8eb80ad37b SHA512 19d70c59c116bfff13a062076e18d094d77ff06e30a01cc2c1439d464439616f2b758a250ff45c5a792926800906f1de8588a752317b7272e3a1223e543ff680
diff --git a/kde-apps/gwenview/gwenview-18.04.1.ebuild b/kde-apps/gwenview/gwenview-18.04.2.ebuild
index 87a4835bbcaf..87a4835bbcaf 100644
--- a/kde-apps/gwenview/gwenview-18.04.1.ebuild
+++ b/kde-apps/gwenview/gwenview-18.04.2.ebuild
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 9795e146f2ee..6cb3bb292b7b 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-17.12.3.tar.xz 517144 BLAKE2B edbf3e6b3bf7027ca8399d42cb59e5122e8bd85b2fdf0de5e6932bba68fdb1a8b75cc38b20022f8bf3712ac0ee6ac4525b709a0e24609d634cea83d2571bf57c SHA512 b800a3f1f62a195e515b1ff41aae801f17a983549499c2e694f5ad8690bda1a7218aa7ebcc4908b288ee97c6d335df729348d9a34df4400cfea86d4501af2ba3
-DIST incidenceeditor-18.04.1.tar.xz 526728 BLAKE2B 940c2e2bfdce49d9b5bafd164a4a95cd85db6342df96a6aeae5a4ea576866b58b10df3e15f16742e245689dd471849e3c7cc739622a1a9b7a3af3b92c3c69089 SHA512 7e3e649609929ba7e912f7cde4aa96fddf9270046a7c40db4feed53e6858727da31413853d00091d7682b8b7f7d5397932eb6beef604783a7ab1fc7fe24987a5
+DIST incidenceeditor-18.04.2.tar.xz 526600 BLAKE2B c1b04235ddb89741709278cd3863a18e10eb4e1b0e037e20165f0d161fe2b4920c6a0ad6c966d9758007ab8a9f736fab4368eed55c163485d97c7208fcc71714 SHA512 da0e637419abe1f3993cea94f1827d790bf87c73352942aafb02442d7fa785eb3fdd78cfeb861f5cd1bcd9a5a3abff39fc5355ce4ce23c374d46e84444fc0304
 EBUILD incidenceeditor-17.12.3.ebuild 1393 BLAKE2B 5a1a0e42a5a0b48722407844edf81d56d9ac339aeb509b9d12f37dfd6adcfe9306bbc1bd6ad2ba09cc4418aa5fd40550bb7872c5fead39dc2e3195b55647a7d7 SHA512 244023eee75d28a4cea19b01368bc6fd2d6192cdebc1f71dbaeb029a8d7b0088059084139e80a6361d136828c1553b8a0563c3c6cdcd3158f2d57bedd2ce23ea
-EBUILD incidenceeditor-18.04.1.ebuild 1395 BLAKE2B 1bcc6beb89ab64942a405802b1aa18c079f537e027f51decbff9d491687c9585e25b653d93b9da32c6e4e2697482b0ba5a7cc57efc4c71e282baa384281285b6 SHA512 6fc54dfd46dd7210bdba607ed93a8d22da85eae56aa3e718cb151243c4e373eb69d9afc96d3be12cd9c140c082f590e1eb6578b93bbdc3c1c73da16448f9d6af
+EBUILD incidenceeditor-18.04.2.ebuild 1395 BLAKE2B 1bcc6beb89ab64942a405802b1aa18c079f537e027f51decbff9d491687c9585e25b653d93b9da32c6e4e2697482b0ba5a7cc57efc4c71e282baa384281285b6 SHA512 6fc54dfd46dd7210bdba607ed93a8d22da85eae56aa3e718cb151243c4e373eb69d9afc96d3be12cd9c140c082f590e1eb6578b93bbdc3c1c73da16448f9d6af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.04.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.04.2.ebuild
index 8cdf4d1b3dc2..8cdf4d1b3dc2 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-18.04.1.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.04.2.ebuild
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index b3b2670c68f6..67909304bd78 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
 DIST juk-17.12.3.tar.xz 1868428 BLAKE2B e88f8607aa360751cbbb8c72fe04ad52f1d3f66679515cccf048a3802c65212c66e53936c1826c121ae9dd728ace46dfa5d33978818b8c95d088760e2e0a34ea SHA512 b86e8eb68dca55a9a321cbcfb0172a95a4e1536c3959390f62e3e519862c9de32f327db04e55de39ab194a5e46c228614333b22886b5bb2b4578f0f1d6b5cddc
-DIST juk-18.04.1.tar.xz 1872276 BLAKE2B 30ffa608ca27c87a20edae3464f0664d5d639d836920178710e48339fc284444eca60fc848de635e64be5893971cbd6cc782701258784781aa07132aff4937b6 SHA512 2d460d212fd20edd50c2c48d690fc58ba616686109c9392a8d85daa49c299dbde72152500463b571979e1f6cec025219546932678effe362fe0884373ab3f271
+DIST juk-18.04.2.tar.xz 1872656 BLAKE2B 3b4c1b2da3cd3faffcaf60d28c4570f570928ebc38e6b380001164d8c039995a576906bddc4ebbc93e332db6e988e4c968c4cfbf63f27e9ca05896ec5608bbff SHA512 8fde81272567f4edd03ffa70f17cbd45b95af2e13517a2025ade98030a71253188b1aecb2d98968ea767bdb1fa39475b0475a617015bf26b1119be20f44698ce
 EBUILD juk-17.12.3.ebuild 1104 BLAKE2B 4158dca7ff9846b19c1d4330752ce8da36159dcee898b83732b56dd258dcb8909001b25db96b77d95d3e08020a47b54394f5c7c30adab7fa4787f58367c835b2 SHA512 3888df6be004639a2e0b32f3bc68952c41b3da0182417511a2623960efc959cb0c12b10c4552a1a75a1ff243b8c70a3e50e2c272a6a70ca10ebff99705691412
-EBUILD juk-18.04.1.ebuild 1106 BLAKE2B b8c9bb34ba9e7b5f2e93b171bcfd425bf88fb11e881029ac2042bf635abd12751b4aa68f9331e39aa6aea969102fdf0229294aa09d7522e5c2c635d749657822 SHA512 f27f6a8d0df3b89d37a18123f42fcb0e16a2ff4bdbbb8d17c4a1cfdaf930e865cefdb4c55604f88d13994c7c72b37da6bca575472870e3fc850120094ba55578
+EBUILD juk-18.04.2.ebuild 1106 BLAKE2B b8c9bb34ba9e7b5f2e93b171bcfd425bf88fb11e881029ac2042bf635abd12751b4aa68f9331e39aa6aea969102fdf0229294aa09d7522e5c2c635d749657822 SHA512 f27f6a8d0df3b89d37a18123f42fcb0e16a2ff4bdbbb8d17c4a1cfdaf930e865cefdb4c55604f88d13994c7c72b37da6bca575472870e3fc850120094ba55578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-18.04.1.ebuild b/kde-apps/juk/juk-18.04.2.ebuild
index b5a9daf6e7f6..b5a9daf6e7f6 100644
--- a/kde-apps/juk/juk-18.04.1.ebuild
+++ b/kde-apps/juk/juk-18.04.2.ebuild
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 5b9c297c675c..76ba59d32acc 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-17.12.3.tar.xz 10573616 BLAKE2B e5606f7ef96aa34cf2aba068cd7417bd1783910f759dffa2bb4edab3d2e921788513b22839c8e6156f304db4e81b3a6889d1bdf7b4648f64e2cbd383fe032705 SHA512 05cd1413d99f55c4aca5b75cd51691fa0ca0a975660168ee3effa39774deab36d28ef3e7c71860c726d1e7e02b3ac12e6372e2e47bb64d5fa5e21f58540d11e1
-DIST k3b-18.04.1.tar.xz 10596384 BLAKE2B 0017f69e41be6e1d2f46728faa0bf9fee0a81de4eb2afdedc2c9a104891c47e7ff414ceb33bc95910a610c885155fb41820636b346303c649a73b352ae44a294 SHA512 72aa4ccd35569fec686f74a613ab70c6ba472e9b6358269f7ce59e9bd1a1a7ad90187a757e3f01216f1bddf15190d7bcc8488a96064d00b3e368e8e8bb30cd7f
+DIST k3b-18.04.2.tar.xz 10595932 BLAKE2B f4ccb715eab5e946e3489b1addc58d300dfbcdf756ec9fecceacf3c3a5c815a3c488b7fc93c6568c165ac0b73a0c621390396d9c5080a39edb65a672f1767b95 SHA512 164279a3af561d361ced962bbbc878edb45e661026c72abfd3098be5b8caf42f0dbb3edebd1920c4ec2e70c8f8b1550e2b95388dbed983734a7560549bab7579
 EBUILD k3b-17.12.3.ebuild 3334 BLAKE2B 251c4e4a2a963bad70819c3254a22fc55769635e45d04fbec4bf3bfafc49add2323683a2aa32928ead05075c7d394ee35441a471ce6c3fadd76e3c5a883c1e0b SHA512 eb77b10c097657db00a73a3fbc9cec6709ac4886eb50c538c2d8ee1d7a976ecd6219831c884c7bea49c00fd62ba9a86a9dd9fb6dceb79c421dbad32545876fde
-EBUILD k3b-18.04.1.ebuild 3336 BLAKE2B fe17d3a2c96208ab7b4c2b76f3b4be7d9e306da7117295587b353a0362feb3d004c9e03f166d90d79c691499f488c78e17aa6b671dacdfb2f6eb21f3ab119efd SHA512 5816ea681d2966021098d5f85a5c484d59fef6282093528a9cecc3114845103df157796bd1d9edd8669444b2e995f59b1ebe42ed248a469c6f1666c0441933dd
+EBUILD k3b-18.04.2.ebuild 3336 BLAKE2B fe17d3a2c96208ab7b4c2b76f3b4be7d9e306da7117295587b353a0362feb3d004c9e03f166d90d79c691499f488c78e17aa6b671dacdfb2f6eb21f3ab119efd SHA512 5816ea681d2966021098d5f85a5c484d59fef6282093528a9cecc3114845103df157796bd1d9edd8669444b2e995f59b1ebe42ed248a469c6f1666c0441933dd
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-18.04.1.ebuild b/kde-apps/k3b/k3b-18.04.2.ebuild
index 33ccd3437be8..33ccd3437be8 100644
--- a/kde-apps/k3b/k3b-18.04.1.ebuild
+++ b/kde-apps/k3b/k3b-18.04.2.ebuild
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 3ccd39f572f8..0a7f0c56b2d2 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-17.12.3.tar.xz 70824 BLAKE2B 1299d25ac8852362a346edecc9f9d6554cd05e5554dcf58b735bce3b099074de4c0b2f8d77566075d90e775bc7e8a6c5cdac2bcb332207d808641163bac5cffa SHA512 239e273496c6d190a5c07f4fb98d718e435d0d4864f2c58877e90824d8f4fbbefcc4a057bc4a1ea25b4df77da9a111711d18a6111a58febe932844befc0489dc
-DIST kaccounts-integration-18.04.1.tar.xz 71596 BLAKE2B 5970042f217ffc0d525b6cc70b964afabe42ae10d80489bc88c8f6f6838130dceb64be10437b4218dca515ff801e8801c4265afa0135db91a345979566ae6a76 SHA512 f1783daf3bb1488baf9cec78eed9e344d5d185defaaf0635545b68e824a743c5cefb51c58370fd4c3518fbea3b21a59c9b6ab3041cf532076009aea7850cac7d
+DIST kaccounts-integration-18.04.2.tar.xz 71660 BLAKE2B 9d1b6a6e5349a8393c8e460a7df20e83d3d482e162feb70a3e136c0c7dbabca84f555505621dc019c5aacffc199235a2d8647075be988a3dd93670e110e9c404 SHA512 3025586b6c9337d9cf7f9faca05e3dd0eb059dc3ae7c41b9b305f70edc5c728b724e3a852ca6f2167542be3e46f6e11283e876b5469606327f19916b8d45c1d8
 EBUILD kaccounts-integration-17.12.3.ebuild 898 BLAKE2B 9475ceab418eda41c61d749e0a68f555b7885537a8ea181977a24e45ba2070333db6221f44a3489eb531a0a4b06332e13ba8826feeee7e82369599b1e2c8dc5d SHA512 a0cef7b698fd7a977159f8d9ebc10bd2fa99708846486559bb633d59dbd425fa73bda05efe6e4ff910a2bbcbd25edf3168612d53849461d13ce35eac6195fc55
-EBUILD kaccounts-integration-18.04.1.ebuild 900 BLAKE2B b854b476c9fe33b9c4d3baf1bb9433817e17e29b0b9f4870a4af8fcb24e9ad07eb96e85ef68a5e0c8412c43c0fb94423c02d515f5971b719a6bc8a7bd3b33ea9 SHA512 de398edd8633782c3c32cfc218a29199d5017024f6c417110770db2af2f5bfda5d8a56158bff025694ce4dc16ceaa7cc7b4cb2ca1eac51a5784c786735a867f7
+EBUILD kaccounts-integration-18.04.2.ebuild 900 BLAKE2B b854b476c9fe33b9c4d3baf1bb9433817e17e29b0b9f4870a4af8fcb24e9ad07eb96e85ef68a5e0c8412c43c0fb94423c02d515f5971b719a6bc8a7bd3b33ea9 SHA512 de398edd8633782c3c32cfc218a29199d5017024f6c417110770db2af2f5bfda5d8a56158bff025694ce4dc16ceaa7cc7b4cb2ca1eac51a5784c786735a867f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.04.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.04.2.ebuild
index d30f9c20dd11..d30f9c20dd11 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-18.04.1.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-18.04.2.ebuild
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 989038127310..16ada661c5ab 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-17.12.3.tar.xz 31740 BLAKE2B 5518d40bbb28a7657ec406b76df35faefda9b6e9a3e8a2c31b27806329b66487d54c8a72fae50795bfcde519fbad96059b58466cc62b1197b2f7e4f2bbebfb93 SHA512 c8eba2caaa4cf3e33cf86b8a8713292be9666d3eca75931a493206317735b1938b0d36e028461f16229e26f38039d54d25b7c2e5ccdbfcfe5a68adbea69ee756
-DIST kaccounts-providers-18.04.1.tar.xz 31868 BLAKE2B 0ff64d3b7cffd396fcc3cb1e91b0216022fac22a598fe0575d9353854b0b9e3bd785f40be8ce052efbbdd99fc77e153c6c99499ae653839e59df106d5b8b670d SHA512 b323d1605aea69c3de86980b82d6166f12675debf05d3622806fe528c19ef9112c9e66060e2b65dce5797f77517f164d89f6587792f1e032f660e685ae9e35c1
+DIST kaccounts-providers-18.04.2.tar.xz 31944 BLAKE2B 05ddb5de8048bc577e13e23a93f0e064db66c65b3cb011bcf6b0ad6c5a94254d8e0616497d55774b07d3a813bb3b367e8a1056f862de900c9f96b7e159c08913 SHA512 8ece11aa955faae7365fdb69f76cdad691da2c3c960036f449334453240485e3dfd273214a9218af9693911674063c9badc93d65bb8ea7b571dfab16932f473e
 EBUILD kaccounts-providers-17.12.3.ebuild 666 BLAKE2B 859261416a66ffe9af1eb12195fb85bf5f63b2171055fd65cb0a2eec94b24071619e58cfec724842fdb3b366576aa46c11fcde9867f06b6c334a8dfc7df3ded0 SHA512 5a2fbf17eb6a9cd3ff593ad6d4507c796198390c0ac552950098ad50991b78ab02e23fa7a722fd96894ce03b0ffd1c2200d9ddfc536e58c3aaee4a98650bdda4
-EBUILD kaccounts-providers-18.04.1.ebuild 668 BLAKE2B f56d4db5a9321690909cb3ea6f960018c914a86f484fb62a17997d6afb7ff2970a4a8607026b9b876db5021d73fef7e2056da516151d20f7eecfc018d61e0217 SHA512 50f2c4f6102995d364559f04e6cd20ab3ec9f5dfbe30c2f04977137b5705efec0435026392d59665e6e5d1410e6a85971738acad7eb1bf3ea457a825aabfb554
+EBUILD kaccounts-providers-18.04.2.ebuild 668 BLAKE2B f56d4db5a9321690909cb3ea6f960018c914a86f484fb62a17997d6afb7ff2970a4a8607026b9b876db5021d73fef7e2056da516151d20f7eecfc018d61e0217 SHA512 50f2c4f6102995d364559f04e6cd20ab3ec9f5dfbe30c2f04977137b5705efec0435026392d59665e6e5d1410e6a85971738acad7eb1bf3ea457a825aabfb554
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.04.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.04.2.ebuild
index da4738ab4dba..da4738ab4dba 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-18.04.1.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-18.04.2.ebuild
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 6b805b99ff1f..21fc05167a20 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-17.12.3.tar.xz 544148 BLAKE2B 9857bfaca4f94e6108066d4a6270e6e959b110f5a6ba9219cc371665d36b00d445cef0723ea118c285bee7971a9fb480d8851e4eb569d474de29161f37b90915 SHA512 0b498c7ebf49a6a4df3c24b185ae9edd2d53a80fdc6d84c6ebc6b9f5531766dff579ca7240f6c4657bc113b872811de941e75f7f4d171d3cbd08a0e9afb2a054
-DIST kaddressbook-18.04.1.tar.xz 547896 BLAKE2B 36dceea12aec6b1e7f8c2cbbf7371a86252c77931d5ab88f0af76661067977ac7dbbee89f652c56b7f07f5526048bb7786f7f983bd33fde80622b936734a6759 SHA512 8081071572c9ee39d4030d18844310bc2677835e9142e61f21e2f8d1ea07605c9ad2d7d0f956f48233cdd13d6fe4504652308d6c4e3c16eca43f0c31a036c2aa
+DIST kaddressbook-18.04.2.tar.xz 547860 BLAKE2B 630709b3383a40af33be71bc72f327a680eb04a56452a1491ce0a947495488477c401628b7aa79df04b733d7aad44d19761feaf1169db36733d06fd41e2fc925 SHA512 61ce4e4cfc01374105320eaff80fd7bb9750adfaf029f2f1806ba02499c77a2074a9c840ea59ded04d376a7ad6f1ae59990d017f289a1836859b6229ed533930
 EBUILD kaddressbook-17.12.3.ebuild 1706 BLAKE2B c6d7559fb3fac56b6d259836e03f72003d4f89921ae5c4116571ccf80e753fb8c07aa3215ef3e2aeec9eb30d13b7bea139c0ae11a9ef15db77162315587e8b33 SHA512 edecd0701d2519f20045375486ce5f16460cf16879c8c1f76403a4a088cae89a6d68fe03c5ae1183753896d496a6c6056dd93a4651088e929faa9ed897913621
-EBUILD kaddressbook-18.04.1.ebuild 1708 BLAKE2B 519004808433bc563ce8368db1e4ddba8955f50cda9173022563ddbe06cfd232c6b2252a62de76bd57d1d15bd088ce29aea8c68efbd949d36d69f4d762fb1dbc SHA512 a04055dd89f4a29df33b1df154b1841518abce13bbd6fa4b228c0110f906f6a215d2502c901cd2c8e546cc1ae217c97c5fdd22581c81fb612a6340f545fb3a50
+EBUILD kaddressbook-18.04.2.ebuild 1708 BLAKE2B 519004808433bc563ce8368db1e4ddba8955f50cda9173022563ddbe06cfd232c6b2252a62de76bd57d1d15bd088ce29aea8c68efbd949d36d69f4d762fb1dbc SHA512 a04055dd89f4a29df33b1df154b1841518abce13bbd6fa4b228c0110f906f6a215d2502c901cd2c8e546cc1ae217c97c5fdd22581c81fb612a6340f545fb3a50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-18.04.1.ebuild b/kde-apps/kaddressbook/kaddressbook-18.04.2.ebuild
index 23715c549f96..23715c549f96 100644
--- a/kde-apps/kaddressbook/kaddressbook-18.04.1.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-18.04.2.ebuild
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 06486852352d..e9eb8bdd819e 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-17.12.3.tar.xz 4238944 BLAKE2B 5b953695413d8486468be2e83d7326199415a1cfe3f2fdba834f0ac3be841042efc73fea11d0c2e0177573065b0576f058e8e3527d7186c02e37986c86bdcb5e SHA512 c1d8a0934952cf11d3de3bc081cc7b33b42a7707cc0cdf91a669087f6707108aa6be25a34a065128afcf63602491096f8533bbcebc8ba89a37f310caab9515b5
-DIST kajongg-18.04.1.tar.xz 4241840 BLAKE2B 84af78f329c753fa29df4af225dfe44fc6a544415d9b91b7a2eb6a50ffc0ff43faf154d002966cbbb47890263344f5ec38bde961e07b41178ce4af1533623770 SHA512 5d4b7dcf08fee5869d81edbfc87c80051d7535a34eb492c30308042ac035c38628f718719fe63a7a8b6b2f33f9cb6f80952e52c858e68b2593172e71ac4f9bf2
+DIST kajongg-18.04.2.tar.xz 4241864 BLAKE2B cab6e62051b5615a86a266d7075f26564c0bfa31a0fc4146456b3bcae4dd5b67d193115ed5735288ec7c3ecb6a6f528cceba95b066c32373f671204e61a05a46 SHA512 d92b897a52f6b0056daa195ffb3e7abf2db60f99f9572ef9bb51a41afe40f518c491fba6dfb1ecaabbf2228d3fe122771e1eb489c04699cab974362cdbc20511
 EBUILD kajongg-17.12.3.ebuild 1280 BLAKE2B 1a60ed7e29724456829f6b27689bc3e9f0be2f3433da605a45f55b2e36d9ac1c5436858225d796ba41639d66c71a20f220ea588716942d4644bce613461f10cd SHA512 60c40554e4d71fec23832d1097e568a4727a38b8dd91b4e89210d1c6a7c0b219ca1de171205dd7650b179474e5c277280800d0975d876545a9670b0794b44bf2
-EBUILD kajongg-18.04.1.ebuild 1282 BLAKE2B a2e4042d2ea6c95c2ec2245b43130d69a3edc75be2c280e5cfb8f3282aa02e7008b77a8b069d18e82f24918ba8658d3fab280520ba30319682131e776ab88e72 SHA512 b6fe89aee6537ff838da6682bf2a9ad59218b8fbea752857c54e0552d5fee10fc9501e8405e53b4d7a3316d24051eb20a70e10c98a3506a79ccbe8041c159c1e
+EBUILD kajongg-18.04.2.ebuild 1282 BLAKE2B a2e4042d2ea6c95c2ec2245b43130d69a3edc75be2c280e5cfb8f3282aa02e7008b77a8b069d18e82f24918ba8658d3fab280520ba30319682131e776ab88e72 SHA512 b6fe89aee6537ff838da6682bf2a9ad59218b8fbea752857c54e0552d5fee10fc9501e8405e53b4d7a3316d24051eb20a70e10c98a3506a79ccbe8041c159c1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-18.04.1.ebuild b/kde-apps/kajongg/kajongg-18.04.2.ebuild
index 1c531f3048e1..1c531f3048e1 100644
--- a/kde-apps/kajongg/kajongg-18.04.1.ebuild
+++ b/kde-apps/kajongg/kajongg-18.04.2.ebuild
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index b942be24ecfd..2eed1006c806 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-17.12.3.tar.xz 1797760 BLAKE2B 9ba94eb0dec5b6b9d55fdeac4605ed3ea12668c3d82f530072187b4c5010f8b2d0e4042f7a9b64858a353e7d588afc52186e899479884bf78b2ede7807e61625 SHA512 21f5187fbec15e49b9e51b062b1ee1e424c6dd73cbc9c7871940a8441da5faa15d3344b7adfd1795906907c6ea8b469846f1ad1371d9abfd0e1e4df84daac892
-DIST kalarm-18.04.1.tar.xz 1796136 BLAKE2B f180475c9200a7d1118666b69b0b3410a3e912381acc55315bc6aa16ee5ab56d2949a6d2d0710cbd0746634ca01f378a0d7f63f438cd82da0d8ccec5a17747a8 SHA512 a23cd097844d5c7e753140417d328b1bc9997f9b3d9b1eaa609dfdcea312ea8e850123799f94effa66107df3d2ddaab8c6da597118c961d05fcfce3ee6e9f1a7
+DIST kalarm-18.04.2.tar.xz 1796312 BLAKE2B 8d9a44b3368686b7655240f46c388a20513ad99fdd02ba6e31080b3ad24360975e9a8a3eefce98b4b8ff04ef7a1a0e10d6d78f5a46501f49d23fe5f2477115c4 SHA512 f6d5165f639f4f2bd2d6f849623c7ca38a60fdac441737631c502c633ec2249d2dc4282d72bf4b46e78164c6324213cac0d9e493d3645346f94a7e38731532f1
 EBUILD kalarm-17.12.3.ebuild 2062 BLAKE2B 51f37557c4d354d47e423338cd0dae03cda913fc90caf123dfce6cade8e1b68e2f806f4153bfcbe9c4f2099665c42fbb00b7dd78b775b046db31fdcb4886b338 SHA512 b0fe838ed717f8c68454f178a6303c135882e5e82c436a8bcd3570aee33f40ecf2b5b4dd6d457da6f02e30ca4bae491f172b4f9f5f8fa9729f957ad2834e1aa1
-EBUILD kalarm-18.04.1.ebuild 2064 BLAKE2B 7afe46797d3a943191a8480cf1f59550d4aea809a6ee8826fa5fc41a8713f79aa5b10d873e43e25e791e398c76696448463f2118822e710059f2e6f1116e4732 SHA512 9a2ff1b84bd084fd6ec98b3990df5ae54ae6f5557da53f850b0cde21869758f89c61d208f89d5baafd72810ad81e3d7613f18597693cff0650586d6ed7283f93
+EBUILD kalarm-18.04.2.ebuild 2064 BLAKE2B 7afe46797d3a943191a8480cf1f59550d4aea809a6ee8826fa5fc41a8713f79aa5b10d873e43e25e791e398c76696448463f2118822e710059f2e6f1116e4732 SHA512 9a2ff1b84bd084fd6ec98b3990df5ae54ae6f5557da53f850b0cde21869758f89c61d208f89d5baafd72810ad81e3d7613f18597693cff0650586d6ed7283f93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-18.04.1.ebuild b/kde-apps/kalarm/kalarm-18.04.2.ebuild
index dd0bc7c1fc8f..dd0bc7c1fc8f 100644
--- a/kde-apps/kalarm/kalarm-18.04.1.ebuild
+++ b/kde-apps/kalarm/kalarm-18.04.2.ebuild
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 4529c3a81e8e..d00ee2e0ec59 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-17.12.3.tar.xz 494884 BLAKE2B e13c2d013180129eebb497fc26634f53d80cc88b23ea0bba9b5fb775247921e28408ae877651483d803743d531674b4b06ef42c4b33fe87b51978e772714ee80 SHA512 444edd565287441a53da00520bba9b4a22c155048c504a1bd1c0a25f066ae12bea63100589270cd93c26af18cb6e4686c7a753199d10980db638c5a14529239c
-DIST kalarmcal-18.04.1.tar.xz 548224 BLAKE2B 62b0301fb8ac7cf8ab5a2cca287ce63aae9057e2983ac949dae6b34ce16469f917d89fe37e2b1f2d8e69882e05f2771dbad10c49e1bb09fb513f8670c2b24bfe SHA512 d2e03a8630850488246f3bcf1dc6d4aa808358096dc08abccd33992bac7d1587137eb78a8772cef0b488a69b582d6084c7c23acdd88d54a9dca0fe641b4094e1
+DIST kalarmcal-18.04.2.tar.xz 548360 BLAKE2B e090a7d7a3dc1f23df1d47d46ac841ae73a5df8107f42ab87279adf015aa78b6d95b3f1b15f8e5192e718a992c2f9577982e18df69595bf5c9cf8ea9de31d792 SHA512 dca28d8747d9cb9c24c033813d7a1a3a6f9e51d97d0aea4b2290027742e7d58a571751423d88c760df115de2d9e60c091ff2c9a07ee51680425661836acfbedd
 EBUILD kalarmcal-17.12.3.ebuild 537 BLAKE2B 2902310cf6e87a09c6271553dd4eacf94dca96c77ebadc7baf34122f8b13b62550ba3209c940805904d0200e06800256e208898c5170b5d6a51fb75bd22b483d SHA512 ffb7a34980e86816df0216a1162323b3e07a0375becbd257ec7484e57aba1ebeb728c9c6ede1035454dad83dc9adf00fb7794674b05c5526066a33198ffd22e9
-EBUILD kalarmcal-18.04.1.ebuild 605 BLAKE2B 736f8fdf39351bcfb5b0f241b7343f9a0db3656f60a8b915990c0265d6d6bf90b3373126e8cca5396c47bf2cf71d913ed6e3b5c8e6cc614751c58b7c18204497 SHA512 474e798e2dc264f7e1fe49613908b4aeaf6b0443d9bfa65598f9d07093a0ab8c494523de4870ec1173853b722325c7f55a1b483600a4f0cec501d1b927a37c2b
+EBUILD kalarmcal-18.04.2.ebuild 605 BLAKE2B 736f8fdf39351bcfb5b0f241b7343f9a0db3656f60a8b915990c0265d6d6bf90b3373126e8cca5396c47bf2cf71d913ed6e3b5c8e6cc614751c58b7c18204497 SHA512 474e798e2dc264f7e1fe49613908b4aeaf6b0443d9bfa65598f9d07093a0ab8c494523de4870ec1173853b722325c7f55a1b483600a4f0cec501d1b927a37c2b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-18.04.1.ebuild b/kde-apps/kalarmcal/kalarmcal-18.04.2.ebuild
index b1578f2d4290..b1578f2d4290 100644
--- a/kde-apps/kalarmcal/kalarmcal-18.04.1.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-18.04.2.ebuild
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 2054ad0c18a9..9bcf8d3b60ec 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-17.12.3.tar.xz 690480 BLAKE2B 996b66e256d3a87181d03d6fdcd35df9322baef6fa4b6c7a28db8e8641dabf7c33378b632b3a676f983cf25f91377ffc9c98b95553e61805bd1d72ccac958702 SHA512 7062ab6c6a2fce17e313ad16535f51b5ce893384499971dd05e9a256b00e7172b1b83dd3fd4cee76406b32e6abc2a16fa671eb5b95cd8062c760968ede44c62b
-DIST kalgebra-18.04.1.tar.xz 708588 BLAKE2B 9095fb6700f4e51979a38dc6e4bd84d01b5f54e99b803d3d3ea0a9981acf9c98b7ba25f3758ad0562e634e618f961f77e7121c2cd3db4c8cd88455a1d4f8fb39 SHA512 2a32ad208eb452335ca21a27ddf37e751d57ef2e9c639eac6cb44160a7b61586c06847b473675ce1d8b1435b30267acef3d02d14a3d2af3d003d5023fda4e658
+DIST kalgebra-18.04.2.tar.xz 708844 BLAKE2B 56701c62bcb05f5a3d0f91513621284f6e51d5f66bd58e44c5b42490152468b32b6da24db0db0181dc6d864f7ad63462a8635e65f388faa1ed940143e8dd5e56 SHA512 84257ec81e6c0afc87cb5059c8c9f9dc232734f21f488cbc30e4505815238c00489b4a4e2c7dec291454cf3344cea97bd57ff4336e9db258b7599c8be2e10990
 EBUILD kalgebra-17.12.3.ebuild 1007 BLAKE2B 9e112544f4654c52f84734458795bcfa4160f0e571d78be02699ec0e85a8839d130f23ca47d312534c1470dc292dd4cc3c7fa32ce6cafc09985b5a41d1a152fa SHA512 c895f264c4ca7472998cc1890e7b446d8ba05008ca97ad3d572bea333ef6a00030e872b78f487c0a21fd80c42f4f0d54770c706cfe8564e9127ef66654c1081a
-EBUILD kalgebra-18.04.1.ebuild 1009 BLAKE2B 4d7166da92fca274a74aebae0c802c009d8a42573b1e8b2a7f3235c955be49a499fd883e8856f3dfb00e199e41b41a8db7c7af9d1d6ede56b63bacca984fd635 SHA512 7e47687b5b3482e1b147f0c8978c24d9fdd43b3d10764ab5999fe35f0165b33fcf9b8946fe57210431935347534745966bd59859d0f8f6823532e1c0ef7c1fef
+EBUILD kalgebra-18.04.2.ebuild 1009 BLAKE2B 4d7166da92fca274a74aebae0c802c009d8a42573b1e8b2a7f3235c955be49a499fd883e8856f3dfb00e199e41b41a8db7c7af9d1d6ede56b63bacca984fd635 SHA512 7e47687b5b3482e1b147f0c8978c24d9fdd43b3d10764ab5999fe35f0165b33fcf9b8946fe57210431935347534745966bd59859d0f8f6823532e1c0ef7c1fef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-18.04.1.ebuild b/kde-apps/kalgebra/kalgebra-18.04.2.ebuild
index 8cdb5cfa3a59..8cdb5cfa3a59 100644
--- a/kde-apps/kalgebra/kalgebra-18.04.1.ebuild
+++ b/kde-apps/kalgebra/kalgebra-18.04.2.ebuild
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 1d62037c0bbd..dfd615ddd41a 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
 DIST kalzium-17.12.3.tar.xz 24447404 BLAKE2B 48e99e119bf3bdf38603e6fbe942697fdee28c9decc38aecde525b7d0bd4a3b9f8a8084cd13a238b0eb356ebc179f355783d4937e4317bd25dff138d433ee92f SHA512 989e35f617ef019036571103c1fa4df7fb64238fd2cb7c909798b7baaacb1ebc64d6c989c07040a5c46f3db240edf2e415c11ab4a480eb2f532f1ed992af4fb1
-DIST kalzium-18.04.1.tar.xz 24458824 BLAKE2B 4840f5a60b10e3220e960c763c5e427b7e630042d31350e3179212aa6d34f0714632923df889244852c0f229549af7ca6af7fb63ed84400d430becba8f0ed515 SHA512 e98aa1e097cc47d87c37dcc4837afbe0721296c6df14924e13f5df9d9fe180e8ffd67e3f44dd6b524a797824be682d447dd3b4ea98f1a5fbf96ee0116d9bc5fe
+DIST kalzium-18.04.2.tar.xz 24460432 BLAKE2B f75996e21b5cfafd96f114d7561f583f8d02f15d07f7701007f8820823aaaf1e6eabab86a023d82c6a372125d88fc2bac9e2ffef2625ea5a74db9ce0a1d2a41e SHA512 b22e545fc99dfadff446a72f203bb1b08b9db2e1950511276f1d6bc553132e4b130c62ea326923b870dec08ab145507a68690bcccb0d5121a5526e17540a9298
 EBUILD kalzium-17.12.3.ebuild 1563 BLAKE2B 57daa08a596f0f0111aab8f1f7029c78a613c68d2ed81144fb18ac1da44dea82f2272d7c99e793203c1a50cb525604813b662d92a2b29565a0b57339c3cf52c0 SHA512 17c4a6947d2f9ae967c5febe6c29863a877fcc591dfee9e6c39cc0999894ae0c7b5f3ec99cd06312ed7f483b0da14e82e86dc615db77868accb7d82d9e568546
-EBUILD kalzium-18.04.1.ebuild 1590 BLAKE2B 754eec33e98cdc59f42bbd535d644be0db08e26724a8aaf30d32183bd518edd34b375b5ac9d8695626e661f86f33de818808034276c61a8ddd708b4b3970a868 SHA512 b0019a6be3fc2d95074c64f84246d0cdbc9455be0893fc219676b8f7c62909f95fd23bf2f9adf97a0947a31f167a417e7693326c4be08947a59cf1e10199ce6e
+EBUILD kalzium-18.04.2.ebuild 1590 BLAKE2B 754eec33e98cdc59f42bbd535d644be0db08e26724a8aaf30d32183bd518edd34b375b5ac9d8695626e661f86f33de818808034276c61a8ddd708b4b3970a868 SHA512 b0019a6be3fc2d95074c64f84246d0cdbc9455be0893fc219676b8f7c62909f95fd23bf2f9adf97a0947a31f167a417e7693326c4be08947a59cf1e10199ce6e
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-18.04.1.ebuild b/kde-apps/kalzium/kalzium-18.04.2.ebuild
index 6ead311e558b..6ead311e558b 100644
--- a/kde-apps/kalzium/kalzium-18.04.1.ebuild
+++ b/kde-apps/kalzium/kalzium-18.04.2.ebuild
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 3b9b3a3c34ff..695798104b2b 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-17.12.3.tar.xz 96720 BLAKE2B 8f0efe658f007a89fb946be9ead52bf3492f4fdf8684899722c9d6a7273d921b64333e576158ad34c4facb477734b355453ae2379b1fae5db1f11cd5390c6393 SHA512 498ebef75fe32e1ea7a4eb048f6942ab1539db870eecf0550f1f04ab85bbe36543ffa864cd658988110540cc3d8a0ace442c71d00bd9a04497c221bfeba24376
-DIST kamera-18.04.1.tar.xz 97416 BLAKE2B 21a67d9ab3d718a7f0c617715292bc0c9aed28f74decf27fa93c49cd907d0226609ce6ea59b1f9019c5a4f52d15f7e49815b154a7993a33c511a931b73d06e80 SHA512 5ae3ad32d71b79c0c6b3a947231835292b5238e58d01481eaee89ab61a6b93aab35c183b8fc86f142cc947e4064771f137a3651f72bea464da2e0a113281f000
+DIST kamera-18.04.2.tar.xz 97464 BLAKE2B 4925d1e76b0c6a902b32eb5fde12f9e2a7d390e4519ddbe8e08b78a711c5d6e6f7293bdf71415789457d5d3199075501aa9c6bf394218241be66eb740b661545 SHA512 8632558ebbb3fb144c49641fc621ec9c2d2795c9686d6709045070e7d8929862175b7b58d09a7fcb0509e2aa069214a3a29921032bdf2d948ef235c620d77f67
 EBUILD kamera-17.12.3.ebuild 633 BLAKE2B d95148be451dbeb507d1032e69357812ccf0e7e4af0c127ef7e97deeff878c441dbaf332ad5f07f9ea472c6d829e54c57dc579f3d4c38dee64af53dad982e55d SHA512 ca69f736ddb956d31ee251b254959e37c924f9f4a79b91218bf2177ec6c681a405885b6d15058517d9e07de6e153e776161e6edd75d173c544f73f411a6cbe67
-EBUILD kamera-18.04.1.ebuild 635 BLAKE2B cbb7cff569e8363c4890f8650d00abc5b0eaf13c99f6c1e6cc2642dccb428e312061d12c51f176bac0e13e18fa089e94dce086f8399d1280b15e124050a8f709 SHA512 07aeb04539362960a5644022defb5ef6693b6e559099fbe13d4e66c278ac84f7afc2cac57130d9498188f735a622d19c33488ed236727e4f943e92ef28d1dec6
+EBUILD kamera-18.04.2.ebuild 635 BLAKE2B cbb7cff569e8363c4890f8650d00abc5b0eaf13c99f6c1e6cc2642dccb428e312061d12c51f176bac0e13e18fa089e94dce086f8399d1280b15e124050a8f709 SHA512 07aeb04539362960a5644022defb5ef6693b6e559099fbe13d4e66c278ac84f7afc2cac57130d9498188f735a622d19c33488ed236727e4f943e92ef28d1dec6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-18.04.1.ebuild b/kde-apps/kamera/kamera-18.04.2.ebuild
index 8e527cf2d876..8e527cf2d876 100644
--- a/kde-apps/kamera/kamera-18.04.1.ebuild
+++ b/kde-apps/kamera/kamera-18.04.2.ebuild
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 62fb1d8ea881..2c98ae5ce43f 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,3 +1,3 @@
-DIST kamoso-18.04.1.tar.xz 185156 BLAKE2B 3e94399570270dae03605277ce70cf4586860f251daed9f40a5158ad4e5b71b7265773acab2215de81425f909977afa643d31c588aea3d13f842e9d8ae6cb97b SHA512 4ce625e168015b747f986385bfdbbc01f7a87ae1214e8c202ca8683fec317907f7de668a1e92b8384901c3d3b9a7e0432ae580c50f8f94a73fb182f7312728ee
-EBUILD kamoso-18.04.1.ebuild 913 BLAKE2B 7fc5b68ffc45feaa668e0797bca35835d8919a07698e1faa11e75c6cf1438d6757120c9a07f3569936bc041dd083256951bde546f5ba873d4c7a02b9f5dd7d0f SHA512 4c0afff50e66021060b9c7b55c6a58d631d143a264c40954fe612147e8d013c0b92f1af1ab8274ed0b5c38bdf367d51b13609bb423ca9e344d952f08d31af13f
+DIST kamoso-18.04.2.tar.xz 185260 BLAKE2B a8830d5eda34e600230574c6587f2b85d66fcc3fbfcfecb10dbeaf34e0a158a9390ccade0f46290835ac5bea23e00ca6dbfca99f64c8e53dcf7386bd508334ef SHA512 b8751766795a8127e0bb80aed88139f2c2c10a5b2211ca29b255178a494689bb61f132e80d01c69d4d837c7e550ce2c11127d3b003e0e630009cb25221d8e369
+EBUILD kamoso-18.04.2.ebuild 913 BLAKE2B 7fc5b68ffc45feaa668e0797bca35835d8919a07698e1faa11e75c6cf1438d6757120c9a07f3569936bc041dd083256951bde546f5ba873d4c7a02b9f5dd7d0f SHA512 4c0afff50e66021060b9c7b55c6a58d631d143a264c40954fe612147e8d013c0b92f1af1ab8274ed0b5c38bdf367d51b13609bb423ca9e344d952f08d31af13f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-18.04.1.ebuild b/kde-apps/kamoso/kamoso-18.04.2.ebuild
index 78cb89ddcaa1..78cb89ddcaa1 100644
--- a/kde-apps/kamoso/kamoso-18.04.1.ebuild
+++ b/kde-apps/kamoso/kamoso-18.04.2.ebuild
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index a643e4acd440..c0b8fce99318 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-17.12.3.tar.xz 7523656 BLAKE2B 3a3cf6ca8e79be66e48f0d9c9e6a9fe311aba098ab0766b2d07ee6c153a77613167c95a2622fd8c42bb5ca30da7c60470fb824322a9c2a10d97f0afc72a6efa7 SHA512 c75df80c167b155c53cbbad66d90a5b01f8f7ad9a97b303decfa3fe9e02ef5f4fb4f890256f6052ab67d735c0c5a1c587d56ea76738889a0c9dc9f24a6b0eab7
-DIST kanagram-18.04.1.tar.xz 7523608 BLAKE2B 9dbbf115edc954e8e9c83e5eb0a2d19fec58d23f16cfb559dd88a908564c827ce8f0406a7959642160ea40026b7ecdf7c81128bd656bfcc59f8ee5ec11c8bc7e SHA512 be0372a7e195ac9ffdbfbd770551a02408ec4f32941888510221c2fe917fdb34666a4b37788be261ad132a700bd58975cb54b1d5061ebd076b25a6088828d597
+DIST kanagram-18.04.2.tar.xz 7522612 BLAKE2B 77d87ffdba4422a4bb82a34c103ab6e95f2ee0e1c0fcf3ae4f721f2da8fbe42a18a7acafad7fd2ce3f7cbf5adb1203ebfa4e94028978cd6511fad1c70b410a50 SHA512 86600e35f3146fffd156b8043e651c717efb76d5de4b001c0b90a6eb0db1bda1a9ad35cb44d9a1e98e16faadac008dc2435151d3cb6d95f2fabd8c2e8d12f8b8
 EBUILD kanagram-17.12.3.ebuild 1085 BLAKE2B b55b8f7e63892dc7ee25e80c53d13ab12a7091c260e44c300b0e20de20fa11765c501e83f8af155d4d9469f60ad7578383899a2638cfc538989dfc5dc85faad3 SHA512 de7945997daa902534b2e89c7ee9c2eb089b84329c5aa4c3aa63722d776dce28f8ac8fb26c458dec9c88d0d7d839fc15ad0bff4d62b4675b7f320541b5d4135c
-EBUILD kanagram-18.04.1.ebuild 1087 BLAKE2B 72a439633d7576ff80de9499839fc378c210407e9ee93ea9f1d59af7863b0b78d81d88915be91d70c728886472b2ca1a9a1439fc263293fd3468b5522e8b1301 SHA512 c08816e9005583539f5bbd84d1621a0aec0933ff13089a176a61fa1494690b33f777dcb3edff3ce6e50eb8a189ea4977ebc82fa7870ae4bbd40e3f51b9e59822
+EBUILD kanagram-18.04.2.ebuild 1087 BLAKE2B 72a439633d7576ff80de9499839fc378c210407e9ee93ea9f1d59af7863b0b78d81d88915be91d70c728886472b2ca1a9a1439fc263293fd3468b5522e8b1301 SHA512 c08816e9005583539f5bbd84d1621a0aec0933ff13089a176a61fa1494690b33f777dcb3edff3ce6e50eb8a189ea4977ebc82fa7870ae4bbd40e3f51b9e59822
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-18.04.1.ebuild b/kde-apps/kanagram/kanagram-18.04.2.ebuild
index 9899faffa5a1..9899faffa5a1 100644
--- a/kde-apps/kanagram/kanagram-18.04.1.ebuild
+++ b/kde-apps/kanagram/kanagram-18.04.2.ebuild
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index e395d3112bf8..5eee62f4fd5d 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-17.12.3.tar.xz 2525252 BLAKE2B 819e84a0c3c887eb5cfdba86935e174f716fb97a93c0cfb7ca30b13606959e5100fc780d199c1955cc585a505b92b2edb8ecd682de3ca0030613268479e498d9 SHA512 68504b49a9cd41e5093096b24fa8ada843656cedbf4274637aac7f8d0f7d78f35ec35c3502bd5781380cf7ae763f773747193747fe8eb8a7e73a91d97c0af379
-DIST kapman-18.04.1.tar.xz 2525664 BLAKE2B 615a1091f7b534a5e68e4a5e458c8d8027af55c075118b30180bd38cca5bd1f281d6d7e6f5124c11b0fea0247d30e74428b9f5b764220be40b80deedfeffb95c SHA512 527ca891e3c50d241eeda84859f27410a748606d4d7b6bff4cd4f9ed25eec40ab884cd8e43cb6d9920d5d1fc6fe1a4382f950fc18c8677b5d40c3a76cc70cf7d
+DIST kapman-18.04.2.tar.xz 2525836 BLAKE2B 12dcff2b538924912e0fe3e2643df407883b588f4dc81f1b9ebd2d0f49a6a5783ff6b17cac5f45650b8fdcbc4a9d62f1471779c471246ce63b84eb85318c2179 SHA512 158d66dd947ecdad9de3b17ef7b4a6b7ec1f55bc46fbea5f81b57c818c6ed3c26f0e51d7b81d4fc8dc2450ab0d0f73c620b7df7b02c6dc7d4ef64f3f490fdb8a
 EBUILD kapman-17.12.3.ebuild 700 BLAKE2B c1a3f8e5d562345539feb4ecaf04028c9bbd0b2007750f5d3af30872b35257454e2fb07dcc1b72c1d02232837a40a2f3265f1df9202ead97be532918cf34b2d6 SHA512 1bf1c4c78b22de7300801a9acb3b2fc311881664640bdd06272fb5ba1dcabb5c1319509e2d55b3270e8d3d90eae856a63151e1957d0cb9b747c2bc70c124065a
-EBUILD kapman-18.04.1.ebuild 702 BLAKE2B abea90278a162819302c51909e084e29690a89eac38e9800773d24727de9c058fe6b098d224e5b7f2e027b283d09badc57de20585642be5dcb3c37d6dae92a7b SHA512 326b9e2437f143dbb0505afed2f92aa3466219f49698f378ddedf3e69c66f3948b878027be12e4b64f201b8594016d1e81d03ce5a91b08df68eb06f7cded8eec
+EBUILD kapman-18.04.2.ebuild 702 BLAKE2B abea90278a162819302c51909e084e29690a89eac38e9800773d24727de9c058fe6b098d224e5b7f2e027b283d09badc57de20585642be5dcb3c37d6dae92a7b SHA512 326b9e2437f143dbb0505afed2f92aa3466219f49698f378ddedf3e69c66f3948b878027be12e4b64f201b8594016d1e81d03ce5a91b08df68eb06f7cded8eec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-18.04.1.ebuild b/kde-apps/kapman/kapman-18.04.2.ebuild
index 1bb9a2b6f7e2..1bb9a2b6f7e2 100644
--- a/kde-apps/kapman/kapman-18.04.1.ebuild
+++ b/kde-apps/kapman/kapman-18.04.2.ebuild
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index ce66e409a002..e666ca6c4b1c 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-17.12.3.tar.xz 352488 BLAKE2B 203bfee3e05c42b266f7d7c880149ac31e2f8e37306ae46f2091831b68e80477226c05ace0ba63729e1e258fa504ee91133583e76ffdce0239191f2d4b08c22c SHA512 03eff26877917a38bcae3166a16e6b802cc900513bec9a615c38342f6a1ceeb454fbc195d1e05f3cf3b6f8a9a7a64eeaaa83d07a5058efc42c2140b4a8c9006e
-DIST kapptemplate-18.04.1.tar.xz 352540 BLAKE2B 347e8bb66dfe67f8f118ed21b13796e132e8d87ce41cdad77e3b1711f4f8c382a34251b9133766dbcd65fe0e69c3a96bb00edf73e5eb6ca664b0c48cd2b28280 SHA512 75048d449fe70212942c2426d8b7c6203c0e64b17da3bfaf042303222c44b09b7a08f01edd0ea1e4ad51a51854fb8e074e3c281aff2c52256ef240248ec0039e
+DIST kapptemplate-18.04.2.tar.xz 352708 BLAKE2B 9d1d88104c964611d521f744d93cac4ab5d969393d622d8818d6d7e50a3d3325ab264a60b1199bad3f0229a0bbb035f886e3137491c4eaeb89230d1065ab613c SHA512 a7df0f5554d57cf0ece5b282c5705a64160443a7a174aa1e62f00e06f1dcd14d2212353b4b444e8dd1fe9195182a1cdbde6a632eccc0ed274aa048a483bf333b
 EBUILD kapptemplate-17.12.3.ebuild 716 BLAKE2B a463eb5207879e6949c7961f872c177e64c85ae7288987ccdc3245cef428f472624f0d1293cfa8f0ff033417ccdb19d1707d797c8ea718526584ef4b5de6e81a SHA512 54f108f307fdd01e40242592d56da88d6b61ace68f5ab44f18b890339016e8f6dae53b392a6d73d6171fea5ac2cbbfe36509de29e405f219883529bca9db6e38
-EBUILD kapptemplate-18.04.1.ebuild 718 BLAKE2B 23610fc718bdee4457340700b0fff333413814a206c84b89d903715a050b7d3688dad2454f3c28cb37409a60a69cba31d9491ff44045d9b147341b18fe5e3e11 SHA512 4f0b319c78a4ee1f0e2b6a138f16578ed0d366f0063d4b1575d46da47ae06e7b4b3e1d9a6dc27d1a0c887980e36daebbb9b2380974f187ae8abc1547bd2ea5d6
+EBUILD kapptemplate-18.04.2.ebuild 718 BLAKE2B 23610fc718bdee4457340700b0fff333413814a206c84b89d903715a050b7d3688dad2454f3c28cb37409a60a69cba31d9491ff44045d9b147341b18fe5e3e11 SHA512 4f0b319c78a4ee1f0e2b6a138f16578ed0d366f0063d4b1575d46da47ae06e7b4b3e1d9a6dc27d1a0c887980e36daebbb9b2380974f187ae8abc1547bd2ea5d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-18.04.1.ebuild b/kde-apps/kapptemplate/kapptemplate-18.04.2.ebuild
index a1bbc2a3c37a..a1bbc2a3c37a 100644
--- a/kde-apps/kapptemplate/kapptemplate-18.04.1.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-18.04.2.ebuild
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 57a1c6390f43..c90d0c614151 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,6 @@
 AUX kate-17.12.1-deps.patch 3101 BLAKE2B 6cb0a6762041c6f6f2b02d921cee39b9f8eba1f3104d05a4e9565f7e9c7287f1e3ad5cb51bf07ff2f93d1c826c646102ae47c4f67d3e34dc82524ad102fba784 SHA512 abdfce9b12de6b254fecfa8d5f9e532e01212711962c88a02ab099f81ab68ef02a95c6afbae22057467562b37fcb1036b4edd2e8d8f1bde3919c4cba171de38b
 DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
-DIST kate-18.04.1.tar.xz 5639500 BLAKE2B 2c8eb6b64c5551b69a0d6386e0e92d60e6affa451729ac4e9b41a51a22293532d1846a3bc6260eeb70daa881309683d9790230d9a6aba3690f9eaf38def3758e SHA512 c892c90e2f01b1540bd8eb6bc8e23532dff680bd5d8980f69b18ece3a7cfd8fd695653cd461f9f9676d1990f8eda18a89710ae536696f17442e16bd60432542f
+DIST kate-18.04.2.tar.xz 5641048 BLAKE2B 7385aaf26029a6c5b1e749440f41d8ed58e936a06fff9c40ff1b37fd5724298d49d7aa92eb3bdefb2b4088a6cbe106cf6f5796e2a410c2f348c9b42492c7ac7d SHA512 2b3545ba3042f95756f7f3af2d423041107860d390ab6884b52f410adc0a66c8e9fe85e0105935258c0a68daa41c96330ca78de2aa788685daa2b51d97afea7e
 EBUILD kate-17.12.3.ebuild 1971 BLAKE2B 3f2152e20b5d66f38cdaef7e201e2a98c4daf6961e788fabf682a2c9e9e6fa27cd57660767d605f14331ed57053bc6980f6912086b7070b8d7293709844bc182 SHA512 67e615780c13a51e507cf2fa51de9a7826d67cdb07cc3acc23f0798c291ec9119300410bfc064fb760d84139602655388ec072f8e24c6e66bd2350c2738140f0
-EBUILD kate-18.04.1.ebuild 2111 BLAKE2B 7bea7d9d214f5d0b7f2508b565a6b6f71d38783c77ce645d092a2c65dae3a8da5990b18aa2e86f2bc4d76acda143046877aff49fad4142d3c4b7c5e5bbc7d8fd SHA512 ade303f3d9a9ba014a7ec897cf929d1b76c7c7f187159d460a64589db63418fcdcdce02fba2ab47c6ebdbbdb2ca5aa429402cbacbd946554a2e968fa400fe5de
+EBUILD kate-18.04.2.ebuild 2111 BLAKE2B 7bea7d9d214f5d0b7f2508b565a6b6f71d38783c77ce645d092a2c65dae3a8da5990b18aa2e86f2bc4d76acda143046877aff49fad4142d3c4b7c5e5bbc7d8fd SHA512 ade303f3d9a9ba014a7ec897cf929d1b76c7c7f187159d460a64589db63418fcdcdce02fba2ab47c6ebdbbdb2ca5aa429402cbacbd946554a2e968fa400fe5de
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/kate-18.04.1.ebuild b/kde-apps/kate/kate-18.04.2.ebuild
index df641468f081..df641468f081 100644
--- a/kde-apps/kate/kate-18.04.1.ebuild
+++ b/kde-apps/kate/kate-18.04.2.ebuild
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 22bfa11cc96d..67d7b81ba97d 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
 DIST katomic-17.12.3.tar.xz 1236200 BLAKE2B eb0eb2375fbd272d11e77484029fa66a35915021247e0d30a7312a019b1a59fb092cdddaeea28294b0d84085fe18f24ed06ba140a57c6f70f2b6b7d0dcffbdcb SHA512 7254fec57e9c0fcc2a3bdd3d3fe1a608d09aa80cacb42157b0ceef1af8706a5c0c047b554b0a9cc2a3c098a4d68c07738ea07c23e2516c0e58b405e13df16e1d
-DIST katomic-18.04.1.tar.xz 1237068 BLAKE2B a1c13cfd5a818fb7c98838c2d97bba5d98b249bca307ac214aece5c40983e91b35713d050c758c0f697ea596136bdcda43f6061f8f3f52ec2935c86a4b5c56ce SHA512 f616d2074036f8377c63ad123c2ac302c8d8caec20669f33812f0c5146163cfd4c94d782e9adb23dfc41ae2ead789f2a761a3550df49545545338e3fd5b9b173
+DIST katomic-18.04.2.tar.xz 1237164 BLAKE2B 443fc7ace73826f9a1ca4325084e42561aa625090d5c24c492eaf7f1b9b17b14510951998a0862c779d647be6d42ca5acf27def48ee0324778ceeaaa81d52fc7 SHA512 2cce0fc12e4bb755a0995efe096de6aa9b08a5835e173b75f1bac691a934abfcd4d694ea7c7323227550b3bfc0a980bc2eb7d9152e7cff7fbbe530c031872b3f
 EBUILD katomic-17.12.3.ebuild 738 BLAKE2B 06d61d0c6e462e9df7f11bd63a69b231948deb734e6d901789f1bd0efdec80496ff5f0f33121342645062e05d75125e8ab402e583d0594fbafaf839805c08b4f SHA512 767d7acf0f646f59ee8f45bb93d85e2f6c78a870747ec2e795663c07edb7595d13effbc343267f9fcae4c096ec19e84c7adad0edde92b0e26e1acb46a1d4e455
-EBUILD katomic-18.04.1.ebuild 740 BLAKE2B 715396c041dc1e0916a87d511e5007e06ac78ae9e50161a0ffeb1d6da6e7a067746afa26ede22a08c9785587ae77d1f427710422968a0221abc4a88b173ba61c SHA512 1e9f2dee9b0a85a9b0d201b537869d9831767b0349417774ddcc6d488c1227b9486bb6e3e12f5ab80d92505cf1b3e74c3911125913ccbf4ef3416916f345fcab
+EBUILD katomic-18.04.2.ebuild 740 BLAKE2B 715396c041dc1e0916a87d511e5007e06ac78ae9e50161a0ffeb1d6da6e7a067746afa26ede22a08c9785587ae77d1f427710422968a0221abc4a88b173ba61c SHA512 1e9f2dee9b0a85a9b0d201b537869d9831767b0349417774ddcc6d488c1227b9486bb6e3e12f5ab80d92505cf1b3e74c3911125913ccbf4ef3416916f345fcab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-18.04.1.ebuild b/kde-apps/katomic/katomic-18.04.2.ebuild
index 8385fb375b83..8385fb375b83 100644
--- a/kde-apps/katomic/katomic-18.04.1.ebuild
+++ b/kde-apps/katomic/katomic-18.04.2.ebuild
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 2c613d29430e..e9c844b4b371 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
 DIST kbackup-1.0.1.tar.xz 471784 BLAKE2B b700df053423d820ee545953b5303b1223c446185b80cbbd19fecb287316cb29156625490166d005231ceae9a068bf2da5b9a599ca8795d16cdcf90454cc8c2e SHA512 1b398a88ce0d109733ad9efd73b3e5770278203a751612749d747352fb05d278a92faeb713fdc82b5cafe9ca1532896a57065b75a9aad1596a34caf4426a18fb
-DIST kbackup-18.04.1.tar.xz 341332 BLAKE2B 86c72a02b9517029c9f4efcca5436cacf6cc1fb03cb7652e4fcaec4ab329c161f17244bdea5c43c3c74b77144dcc8d4473e61a3a58db696526117aa01f27f739 SHA512 157c1c18c7a0de916d40f906539f7208dff95ca8921c088edb8be203f68fae6a8566aa44a6c413d3fbcdaac17d6701845a05be0c823b7c4a539dc96fd1aba53a
+DIST kbackup-18.04.2.tar.xz 341376 BLAKE2B d126b0e443346e7c53b6f3278841fd309a2f718dd595a8b15f6c33d95cf7d3a431081def56aa8abe1baada62a8b4501b57476a7c0ec229576e6f38d3946e8976 SHA512 e64a8e5cb4e7a243f186e80ca0b07b59f13845af05c622e03ada96d273cf255073691a01858697a19c8d881b50d4f515fe6ed76fe2cbc4620b69116d22642a02
 EBUILD kbackup-1.0.1.ebuild 994 BLAKE2B c279512ccc7550582ef5bccd351d83aa05514e07bb9e4e44475bf845c60ccf7428f2b4dabbf2fae1fd9d4e46554b796c065bb4f61624f590ddfd228ff3a9be63 SHA512 ef976357cf4c7b93c3b1d0422962479e0fa851dd38a2ed2464ef55f375283e6ee56f897415717e52c6a900fcfa4cc8d526dab128c2e82963d0ae06ff62d873a4
-EBUILD kbackup-18.04.1.ebuild 828 BLAKE2B 33d6d607c19d67833c73ea262c81b64b20f92b5aafbee03253c6ca182a53fd1f3238ba29385c2064f660cb785014aaa662f8dd8412870664f9664604e74d4880 SHA512 812004bd1475c623c92bf7228f395f2c0f286f2c0b96511fa5033bb41b7e949a94e04babe4121bdec141d718451015f92f3064d285476577ba32f89f096529ca
+EBUILD kbackup-18.04.2.ebuild 828 BLAKE2B 33d6d607c19d67833c73ea262c81b64b20f92b5aafbee03253c6ca182a53fd1f3238ba29385c2064f660cb785014aaa662f8dd8412870664f9664604e74d4880 SHA512 812004bd1475c623c92bf7228f395f2c0f286f2c0b96511fa5033bb41b7e949a94e04babe4121bdec141d718451015f92f3064d285476577ba32f89f096529ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-18.04.1.ebuild b/kde-apps/kbackup/kbackup-18.04.2.ebuild
index cc493cea15d3..cc493cea15d3 100644
--- a/kde-apps/kbackup/kbackup-18.04.1.ebuild
+++ b/kde-apps/kbackup/kbackup-18.04.2.ebuild
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index bf51ea55ab3f..98322c071a40 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-17.12.3.tar.xz 401756 BLAKE2B 46a6a533271839747e1331f52f6b1b6429b9632bec0473aaf56be90cdb39733257a6ab1f7ddf981c7dc62f4b1e0b3c79aa8a73306c54ead4d4d8f6c303544934 SHA512 e06f251a2b75db0910649e96c0d8ddae449fc23f39d468fc04e56d30b37ce58c3c15483122f40882dcab1ed1791c038caad87131fe2a4c2d140f66e79ed320a9
-DIST kblackbox-18.04.1.tar.xz 404568 BLAKE2B 8459c4b73da20232855bb9d67b870268f7b32e892f59ed07eb06ce7b974c2f88b107b024137a662a75eefde277f3be5b7e666239c33ffd458819f8c85d1a209c SHA512 7f4a42f6810bf8f01e1dd0f10e62b074e7209fda970425e0641099b096396ff9eb2e0b79a45e9ac09405a96dc6e9a31027f85cd0498cfbe515277b392233680d
+DIST kblackbox-18.04.2.tar.xz 404608 BLAKE2B dfdd6d8da35b3eb33bb2ed4988059c92230ce230e50bdc62d2408d8ca968aee111df31148a1870e9093957e6b15a21d022845475da99162fbdb3727fdceba3bd SHA512 dc3041ade230430290126dd58bc53f9106cc36c6f5bfce87360fd6bb90dca9fb0bfee75a7486415ff00efe6476e21af10e6fb658dc1ee79633ac71ae6c8ebfe9
 EBUILD kblackbox-17.12.3.ebuild 734 BLAKE2B 3cd04225e1a8a871bad2c2caa8f52c4b23587ca247f78d17b29d3f5d6f03967cab156ca3940ec606f08a42e9fb966ea1ee890af6da5affacce8abcece4f689fb SHA512 30f4e1bfe5f0751145cdfc2be517c02c062474a3241d89397495699e1192a2818614ccd76a3df171d1e3169def087ba0e8a7ffb12c08275e20045677614b94d8
-EBUILD kblackbox-18.04.1.ebuild 736 BLAKE2B 3d98feee0ff07151beab896ce705fa66bd351f4a2b1916b111ad11e1b218b3696d540c0eda5d1dd066da969f30e71f20b0a8cbc26bd4847ec3510cb97633acbf SHA512 cb87ffeabfc2872538ceda0d78c029257f9effeccfb71c9681f087e839676f71ee866044b7c77a5f9994405239b110593fa4aa45a96f45e2ce8d90402c683bb8
+EBUILD kblackbox-18.04.2.ebuild 736 BLAKE2B 3d98feee0ff07151beab896ce705fa66bd351f4a2b1916b111ad11e1b218b3696d540c0eda5d1dd066da969f30e71f20b0a8cbc26bd4847ec3510cb97633acbf SHA512 cb87ffeabfc2872538ceda0d78c029257f9effeccfb71c9681f087e839676f71ee866044b7c77a5f9994405239b110593fa4aa45a96f45e2ce8d90402c683bb8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-18.04.1.ebuild b/kde-apps/kblackbox/kblackbox-18.04.2.ebuild
index f595a51a7bbc..f595a51a7bbc 100644
--- a/kde-apps/kblackbox/kblackbox-18.04.1.ebuild
+++ b/kde-apps/kblackbox/kblackbox-18.04.2.ebuild
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 4cedefc9c5aa..cf7c742075bb 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
 DIST kblocks-17.12.3.tar.xz 1750472 BLAKE2B 60c4390b9b3625ac6ea8c296fa1ed73b46f255fa5d594b7669a27286a73e296e3d49df0ddb39ec4e244eb465538dfec91f03963911b8e06e8aa46bc85c8367b3 SHA512 72e2d278a5707ca423f1494eec0806a0c267b745f14e0c88b9cb97b4fe5a8ae62c8dd0a78f0c94ad9e285d8090be8b45c91bfd0d88cc2a1956d5e580b090de6c
-DIST kblocks-18.04.1.tar.xz 1750872 BLAKE2B 50df74854fcf0c89fd8243b5c3f6003868c7e23774c28d1b722856fad5857b6dffe1dd0a1eef2599d1129cf4a044f686be32d001e47bf4bf60326a103d0ab7fb SHA512 409c8627e9d4afc7e815c4f0e8862342c2b8f2bef52038268574b2581d0491e807c587a981f7809ce0eea0c40ea5a8addfe0f09d22aa12f5bc134ef072c8ff11
+DIST kblocks-18.04.2.tar.xz 1750420 BLAKE2B 828268cbc9cb57eaef817271911e17763e72d5a0b68575cda7193900b95cf0de3951b3d7f62d75fa308c2d6d1ae110e06ad79168e21deb2c5c2add079401df86 SHA512 a69d0767632e287e6bc5840e57203c2c2321f686197d059d1d8e114d84075ddd0959e68ea69faa93c98a27a80cf489ba5350e9eb987350e9c8165fc11a71e6f4
 EBUILD kblocks-17.12.3.ebuild 686 BLAKE2B 5af8815669b58db0ff6f0cd3641e833a8f70cb792ca2122ae488c34c630dc4244f98a5d1547a9bb9852be31c7787ce664bf973f7be02648ba544e26c56cee5ca SHA512 5701312c7b1fd2389e341f8068cc4c7566930e7f170a623b886cfde6d32a3b16ac29b52bfdea8d4926d2edb0f32a65c8e2b6b6ab98350acdad484e0a76d65032
-EBUILD kblocks-18.04.1.ebuild 688 BLAKE2B b997825b2465fcba231a66f409136b932b7e8a14d6d098efcdb4736b913171f1230cb9827c816fe588e71d0675a58c77467d1469c576ba41100acc9d40f8496e SHA512 a7434eef2ccaf3f52bd5a9ec681959b7c5d8a9519fc7eb4e1183fe607a00f0d3b5d3cd3a9397fa247537bea3dcb34a30672efc858d1eba9031c7ac55688a735d
+EBUILD kblocks-18.04.2.ebuild 688 BLAKE2B b997825b2465fcba231a66f409136b932b7e8a14d6d098efcdb4736b913171f1230cb9827c816fe588e71d0675a58c77467d1469c576ba41100acc9d40f8496e SHA512 a7434eef2ccaf3f52bd5a9ec681959b7c5d8a9519fc7eb4e1183fe607a00f0d3b5d3cd3a9397fa247537bea3dcb34a30672efc858d1eba9031c7ac55688a735d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-18.04.1.ebuild b/kde-apps/kblocks/kblocks-18.04.2.ebuild
index 864dc454ad9d..864dc454ad9d 100644
--- a/kde-apps/kblocks/kblocks-18.04.1.ebuild
+++ b/kde-apps/kblocks/kblocks-18.04.2.ebuild
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 672192d3d32f..8704442c8f77 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +1,5 @@
 DIST kblog-17.12.3.tar.xz 72264 BLAKE2B 36bb90d92b033fcc40f5f899e90b189458b1056c7d3b196d7fe6f0397f98ef5651a1eccbef3294403a27cd37a29ef2d7b45e4be89b752307a3fb2ea011c8db4e SHA512 6e048eed6c247e9af6c96d536fdac371734fc3dfc198094e2cb60218f63347508196ecf9d2d88c190c7e838aa3feb7872001d736be2b7ba01c596f0ca8eea2f9
-DIST kblog-18.04.1.tar.xz 72524 BLAKE2B b7d2cd6919d35c5cceac2fe15b2fbe2788ceb0f0b85d0d2412c917c900c97a96f3598acbcbfdd3d05e73d1cb02edcb080a964585f2604fbc3e940b0f034e4912 SHA512 48bf62ca246694209107174f8db58a89ad1ebabfa80b91fb73ddcac5fc9db0117a373e978b26451d8435672f176877db053b6bec43f0c146cabaa58c59926d58
+DIST kblog-18.04.2.tar.xz 72528 BLAKE2B 7da4f4613c86e19957b74c8d979b1ef46a5a6a6f8002f77332c45743d39fa4aabe0c719fe7b60243684172d2e24fc0cbeabe88b458930e1f6261cc23a43051e2 SHA512 14353655aca0357aa87ac7d2e806e7b037dae0862c7ec7ee7426e5165c429351bfa6e4bed79083c778fcbae8cf1a7708be379f472dd913aa50e01eb796f9c174
 EBUILD kblog-17.12.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4
-EBUILD kblog-18.04.1.ebuild 532 BLAKE2B f3dfd672526dcdb8262f6afdc6926c58f752c6f2a7f9cb8131fd8ffcf76805d8e68e2fa4ff1408dbc8faf1cc2bed8a01595c4cc70739a5852890630f1970d8b6 SHA512 43b74ae97733e3869b19fb4e87e5efe7b6b14ad0bfe57d99b7bffac35f4af783d8129753f2cec3ad4b41f013e60057f254df00603cc0fe2fee75d5b304af2baa
+EBUILD kblog-18.04.2.ebuild 532 BLAKE2B f3dfd672526dcdb8262f6afdc6926c58f752c6f2a7f9cb8131fd8ffcf76805d8e68e2fa4ff1408dbc8faf1cc2bed8a01595c4cc70739a5852890630f1970d8b6 SHA512 43b74ae97733e3869b19fb4e87e5efe7b6b14ad0bfe57d99b7bffac35f4af783d8129753f2cec3ad4b41f013e60057f254df00603cc0fe2fee75d5b304af2baa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-18.04.1.ebuild b/kde-apps/kblog/kblog-18.04.2.ebuild
index 52fe4d617ecc..52fe4d617ecc 100644
--- a/kde-apps/kblog/kblog-18.04.1.ebuild
+++ b/kde-apps/kblog/kblog-18.04.2.ebuild
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 2f9e90d27d11..eaf50b872980 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-17.12.3.tar.xz 3484252 BLAKE2B 0d802cd70a1618acaaa6609bec8c58628a149aa6bfed08a33041e11e30feca0902eb17f834f02be632e26b5e210a1b636a41bc22034f3d4059ea622228756bcc SHA512 e9a3a4ea3abc0fb46fe4595e494285006e29f0994841f2effe1b9c7efdbaea4eeea48d74268e0db610e8c8b58e322bf4d4261349e9ce00de7681158850c957b3
-DIST kbounce-18.04.1.tar.xz 3485172 BLAKE2B 2157bc73972bff8946dcce6e192f68417a2f2f9cdacc657788ab54765e68d8387bf981f2ae4c31f77397288d3e96ef343ab5da636bc81e3ce9bc61067c9b5c1b SHA512 09028226cbbf755aa3380cad36402faeecf14e62dd0a9517551b4baf9c60300daae5b329653dc82b7411fe42255d6921f9c6c067d4b9ae2c0e8c6b9dcaed4380
+DIST kbounce-18.04.2.tar.xz 3486176 BLAKE2B ab6d67bdb133c0b5f818d428f061dc71fe660be43c0d5275822468a0a8d7468bb5e7b1784bb9263fed919c46842de336b5f5957b4700a6d23255e0a317d04a1a SHA512 f5f22fb75697559133e66adda79d747e6f58a2d398355b333878ff7fa7614ffb2c9a1e74bc7f2d8d69d1fceedcc6fb1e95d5e7aacd0cd9a457816dd6978fab7b
 EBUILD kbounce-17.12.3.ebuild 817 BLAKE2B c1344737ccc3e0884ed0aedde6ea0e70832996761448e02325656d595af247a92983cbb79c68ff6a039fd9c68b139eb997cbef02580b8d5782643a89b23567a7 SHA512 52bc73ca5c7f4e1923c93553e14ddb9e9db8ab8e5d407d2743ae29fc6796bd39c9793f59752ab63c6b42fd1154ac539f1ee4ef675d68bfedf4364983f602fe3b
-EBUILD kbounce-18.04.1.ebuild 819 BLAKE2B 6ca3462e7839a2e970005270fa502924e937e115b6684493af8f5fda8804c3ca4ef032ede4885e18e6d6670b0006f5b323530ed3741f8e2ef0fb550838775d8f SHA512 da01056eb58c0178d1cfe3162f3ffbbb02ace4f6fa97d06086f0a5d3c84a5d61a4280db65125ddfcff7067a691debc7d0c2416de9327a713b532ee5c12b4638f
+EBUILD kbounce-18.04.2.ebuild 819 BLAKE2B 6ca3462e7839a2e970005270fa502924e937e115b6684493af8f5fda8804c3ca4ef032ede4885e18e6d6670b0006f5b323530ed3741f8e2ef0fb550838775d8f SHA512 da01056eb58c0178d1cfe3162f3ffbbb02ace4f6fa97d06086f0a5d3c84a5d61a4280db65125ddfcff7067a691debc7d0c2416de9327a713b532ee5c12b4638f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-18.04.1.ebuild b/kde-apps/kbounce/kbounce-18.04.2.ebuild
index eccbc67cbbbb..eccbc67cbbbb 100644
--- a/kde-apps/kbounce/kbounce-18.04.1.ebuild
+++ b/kde-apps/kbounce/kbounce-18.04.2.ebuild
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 66ba39e30f84..7c0477245acf 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-17.12.3.tar.xz 2021172 BLAKE2B 839334740acd0c6ac83b2f977044fcfed5c5546250ff96af973a47b7bf323ebb09d2e0feb6e556ec1b6f6bab9f86b81cca97d84f895408dab9652db492bacabd SHA512 8e0927ed28978175dbe9c9e35e2fd2844987b2d556b297a1eb7a31d6ee32508f14f9eb656ebf5ca29ff36dc1007f270e301c41eefb54e34889564e909c122b08
-DIST kbreakout-18.04.1.tar.xz 2023968 BLAKE2B 706d04cf1bf182a3a7f1eaf68d79bc7a4fdd36e5cc21462cf715d6b5ece48703ea0f11b2edf34089d4f83cbbe7cfd5888a23796c558a6d917971e157f8c7eec2 SHA512 05c27a0f2c2ed8f582ede5fae6c343a53b918d8df4108a2a7b18d660a9d9c7d31739a338da007c8010d58929389171b798d94f73c15a2241c43089bd8c878d53
+DIST kbreakout-18.04.2.tar.xz 2023828 BLAKE2B 12ca528efd485c0e684160cb36a39e9b15e9d3afb322e2024f09bb0532f09901ac2faa9123bbd0acb21bdefc0d8da166450ff7c6d76ea5f7fcdef956c1ed5e19 SHA512 f8c1038fe452cf3b8d00844303b9b87a9687d35f05ab7f28dcfcb43f9bbe3073e072298caf358cc9af8388a172c5841e39cfc88d47770daf7415bf3674a6a966
 EBUILD kbreakout-17.12.3.ebuild 766 BLAKE2B d5c1bdfe47144def260c6f124b99ca2c0ac8567067842de0de128f9e7c5df56b26acd049cf9d32cc04201a5b47b50a923829ebd5ef6f88c9685bc78eeb501b72 SHA512 4137190afc45eaef707c4fe2008cef9a06b7f1021fd3051d993ca5a101c989c3f1440feb758d01ecb71a0da068eec3736d53bbc3dd40575bea06091c216b9346
-EBUILD kbreakout-18.04.1.ebuild 768 BLAKE2B fc85517ecc7e80c9f666512a2543624fd415599b1842acbd0d9c0315c8aaaf6106b4d9c332de0fe28be4c7c9d7eb4bdba61f3f4c3c7826a57fb4a1d2811e314c SHA512 11bed8e4809be58b9b273a03df5ac0bc20ce6367008ac09e0c4dd2f3d531b512c8c01a98924ea0ba8ffab695b6e5d0fb4945575ab39233fc68e517010ee73357
+EBUILD kbreakout-18.04.2.ebuild 768 BLAKE2B fc85517ecc7e80c9f666512a2543624fd415599b1842acbd0d9c0315c8aaaf6106b4d9c332de0fe28be4c7c9d7eb4bdba61f3f4c3c7826a57fb4a1d2811e314c SHA512 11bed8e4809be58b9b273a03df5ac0bc20ce6367008ac09e0c4dd2f3d531b512c8c01a98924ea0ba8ffab695b6e5d0fb4945575ab39233fc68e517010ee73357
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-18.04.1.ebuild b/kde-apps/kbreakout/kbreakout-18.04.2.ebuild
index df3e421e986d..df3e421e986d 100644
--- a/kde-apps/kbreakout/kbreakout-18.04.1.ebuild
+++ b/kde-apps/kbreakout/kbreakout-18.04.2.ebuild
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 34d6d9486fe8..7fb389c996c9 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-17.12.3.tar.xz 5601080 BLAKE2B d6fec580f74cd443f63e3e079060314e29b6b8e706f0ac91209b59c1be948c8cae53b03676d6bbbc7ad22981f43fb62c0975c8c64ff663cbd5dce879a60cee5f SHA512 3b3a4ad6e4abebf803feea0b3145290f9ae4cab048b4711138603cf42a1b856a7175b42bcf30388440c63b6c7025733c2e3f286e821c783f700936eeb890340b
-DIST kbruch-18.04.1.tar.xz 5604428 BLAKE2B d5164f50588651bd6fe374d853df069adce31724431aac1043c92194ab099ae6ff2a20f653e6c1654032c6502bfe86b75fb28b5581c99312a5938a08aba41ca4 SHA512 6fd1f6e1983c8e8c5cc5cdc5dd68c9514ee8f17962723619b65b784c1191f2e7f1c4977909ccc1700b6face3c63f05c512b63f222fdce6a25f5743262496e572
+DIST kbruch-18.04.2.tar.xz 5604760 BLAKE2B 611a4fd217a53c79a1cdb3c2083351f03d91f08c81fde3e46e5d02d4fb2c4892242c396767140d3b23b820c471da01f041b927333ca0cc9e2aeedc3cb615eb34 SHA512 680b60f25711879b8e4dbc2aabf076ac6ae573e4ed0407dadca171715bc25d371e8cf9588a1cde5b2e932381041c37aa7422e29d6c9828e3c310b85aa19e1db4
 EBUILD kbruch-17.12.3.ebuild 630 BLAKE2B 111e2fbbe4ad95c8351455c57ccd531c3390679a9fa5da642c7f14e4d7f6850f510a1429b7c257cd8e151cf7b05b6df67039fdf63b43407b64027ce3eedb9d6f SHA512 53031739e69852f412c0fc32318f46d5c710e1d8dc9b17810fe0f009fa377bf5c13cdcd72db9132f17d50d901f486b34c76d958ae137c0b60359a2fc533d64b0
-EBUILD kbruch-18.04.1.ebuild 632 BLAKE2B 0a6b5ebf28c609236ab86ebc58bf09dcae519f505d6a0d27f44409b2c60ca01e038cff251fc60432e96a76c94f4f52d67bd482f049bf15c00b35ab33b92bdcb6 SHA512 953945f0d5366e10c8f2783cd25e98f4f415ab9dd3e3378788edb835b96a93954be6f3121795c7076bdbf4ab57bdb373e7a3b94433a6b80bf9041a73a42d44f2
+EBUILD kbruch-18.04.2.ebuild 632 BLAKE2B 0a6b5ebf28c609236ab86ebc58bf09dcae519f505d6a0d27f44409b2c60ca01e038cff251fc60432e96a76c94f4f52d67bd482f049bf15c00b35ab33b92bdcb6 SHA512 953945f0d5366e10c8f2783cd25e98f4f415ab9dd3e3378788edb835b96a93954be6f3121795c7076bdbf4ab57bdb373e7a3b94433a6b80bf9041a73a42d44f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-18.04.1.ebuild b/kde-apps/kbruch/kbruch-18.04.2.ebuild
index cdaad6a4a6c1..cdaad6a4a6c1 100644
--- a/kde-apps/kbruch/kbruch-18.04.1.ebuild
+++ b/kde-apps/kbruch/kbruch-18.04.2.ebuild
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 5e15163626f1..dda9134205fe 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-17.12.3.tar.xz 813108 BLAKE2B a5768fb9cff28f22750d0cca761ee6201ba6e53ec42e86fada92451b2f43a2c81235ef71cf7484a754c39739b8501f1c8fc31a5da9108c7cf0aebe802662346b SHA512 56f4fee2ba8d03760858bd9d0fd6601e5beb9aec4d8ce2d87ba1d811698f3e8673d12ae834b20696ec98689992b6a560ccae049a5b69538432df6abd21dcfcd6
-DIST kcachegrind-18.04.1.tar.xz 811640 BLAKE2B 4733492828108f5abd0868b3a1a115f66ad74f842d3054ff55b34964b02deecdca86c4de55ca8def6d5861729b82dac13a506737cfdf0d950fdedf0eec61e193 SHA512 cd8c138975c3d6f2b1452affd4bdd12f533331ee79ccc0d5986a22815036234dfa0969969990ec7fb0770d953816bbe34633f75fec28126211210a8f086f48a9
+DIST kcachegrind-18.04.2.tar.xz 812156 BLAKE2B 842ae20bc4c1fd962e855f0b3ce1a02c3a2681f7f1a641fae5b263d4872997cecf49f37d7e3f1fe97703c734d2a338a66a4901303bad299b6c94c8007650be22 SHA512 7d248d848e406dbf9ecb624d3e083870564b83254f9bdb65423d0a223041605aa9be201e5405a6177e1d39864f23300441f1c48f26101cda7f2ee038201e6800
 EBUILD kcachegrind-17.12.3.ebuild 879 BLAKE2B b6a504162dfc611bded522a77895b797dac2d2fdc9dd9cef6ae89746f1a4c9d5157bc589ddcc1d04ac662065b6bb21cab9582aa9da16aa8564029fd7977b98d5 SHA512 cebea211513f766df63d127f369b9a539bf6137f7908e103e862d706c9f64679f791a9808efff89812c690a7da149204f75a9904896706927fdfe12724d44b3c
-EBUILD kcachegrind-18.04.1.ebuild 881 BLAKE2B 0ca911c9cc2beede7e7b59392cb9d6bfe0eaff3b6c98b1be10f896c84cc7fb923293d1fad1f8a7fa9afc835bf1789b34d6f6a7339e1f6fefa2a9602529398a34 SHA512 57fc2642442e1bdc5f4fe3188f84a061d5c2c1cfc8b11e3fda8448d6cc3b9209e49b2c5517680f2c75c684fbbe340e5f41ef51f8d0a1c2f32b9adea51471c4d6
+EBUILD kcachegrind-18.04.2.ebuild 881 BLAKE2B 0ca911c9cc2beede7e7b59392cb9d6bfe0eaff3b6c98b1be10f896c84cc7fb923293d1fad1f8a7fa9afc835bf1789b34d6f6a7339e1f6fefa2a9602529398a34 SHA512 57fc2642442e1bdc5f4fe3188f84a061d5c2c1cfc8b11e3fda8448d6cc3b9209e49b2c5517680f2c75c684fbbe340e5f41ef51f8d0a1c2f32b9adea51471c4d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-18.04.1.ebuild b/kde-apps/kcachegrind/kcachegrind-18.04.2.ebuild
index e373c6a3ab5c..e373c6a3ab5c 100644
--- a/kde-apps/kcachegrind/kcachegrind-18.04.1.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-18.04.2.ebuild
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index b4e78952cd62..451601fa19db 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-17.12.3.tar.xz 360180 BLAKE2B 5b48e85c8c5bde7a01510d5f9fbf0f4fc98d7afbacf4574e1f8f21ed0c99df0776ac62de7589a1405473ace3c27a01fc54179e8f59463cbe3f5108f95c60f106 SHA512 e8d86165acfa8f6bce5ec0500baedd16ab73330379675b8b92d64093e8f74b8fbaf2758a269ea522682375c3b30c074194f55e1af96cd6ac758cc08ba68e30e5
-DIST kcalc-18.04.1.tar.xz 362036 BLAKE2B 7e9c3ee1d3899eb2631d3fbbbbb01582ea7b58a5ff02b520e1147ba1b13c25bca1d30df3b5a131ab6e44533432a94398252176a3edb1f071282be0cd9dff0da8 SHA512 4c6527389b79373b71fcd5a55b3687ac3c136b8b182d58ad61b2f0d4f1ad53fbfe3e6ca16e69d7524b032de9f3e599247c20b5ae0cb3cf78dcb5f4be10dc00a3
+DIST kcalc-18.04.2.tar.xz 362280 BLAKE2B 2daa08685c36411e915b67cb6e5e0dd18e4150d6df2aa4e601bec8cc1f3a47f8fa8f52dc8634b0c81b65987649292cc5a727b6474df4add1cc12981b7d2d02cb SHA512 42093dc86aa1b1f506bf5dde0d96873338b277622b93b8df4e2ab0f991e156b9ca431eac63825203ec2ac33f20bce0bbaee2676f5a6d5e72c74d875f054e77ba
 EBUILD kcalc-17.12.3.ebuild 771 BLAKE2B c5c8f2f21e376081aefb2763784572876c9541b1221762eb9c43c36b8145a5f172f363b059c7bfa399fc6310182e8b5177593b1d9b36f59d2bcc010430f797bc SHA512 7991e7adec9c5bb4735a755fdb91cb2ff8ecde7c352ad13e1cc98d58970cdd4439621765ca66f8870f54101265af1021aade8a6a4bfe0c3ef02ab5fbf9686c3a
-EBUILD kcalc-18.04.1.ebuild 773 BLAKE2B d4b788d176928f7d3ed49ab3b985439209cc6279e816e2a99ccf0a7d7584484ad7a139845dc6feac14291d0f2059cf45ef19e472313bac7a41db04ed3acc2605 SHA512 db3ad31717a281b74585bcaf1f48d7b739decb4978579c428ad5e1beded5cb269416011d3340a081ca26347304e6610721689a060de7a88802ce59a29e03f33f
+EBUILD kcalc-18.04.2.ebuild 773 BLAKE2B d4b788d176928f7d3ed49ab3b985439209cc6279e816e2a99ccf0a7d7584484ad7a139845dc6feac14291d0f2059cf45ef19e472313bac7a41db04ed3acc2605 SHA512 db3ad31717a281b74585bcaf1f48d7b739decb4978579c428ad5e1beded5cb269416011d3340a081ca26347304e6610721689a060de7a88802ce59a29e03f33f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-18.04.1.ebuild b/kde-apps/kcalc/kcalc-18.04.2.ebuild
index 2877d5cef5ce..2877d5cef5ce 100644
--- a/kde-apps/kcalc/kcalc-18.04.1.ebuild
+++ b/kde-apps/kcalc/kcalc-18.04.2.ebuild
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index dab2640ff694..8261f101ce27 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalcore-17.12.3.tar.xz 276504 BLAKE2B e2843a3aadbf6abadeabcc135b03ceb8278b19df960bbe9069ea36068844c13a330a8820a7d4cb7bd0bee98d39ea32efa6828eab95f851eee18bb41146ae8194 SHA512 af4d1accecbb220f4d2090553a1b8eb70b6c941ae0304cf67863c70cf25647a668c65f3371c7ce40533955416cf8ad7381da65982c31848087308249c6ff0968
-DIST kcalcore-18.04.1.tar.xz 251724 BLAKE2B 9e338d1dfa43a64f9215f64016ea2af0feadeed4c8cb309fdbe92b0c605d364981f981f8332ab47506b8fcdc7fa51278c7927473e2740c2875b71a49bff36c1d SHA512 2ce97d97b15bacec0ae208d5f987abc76d5b5712b99030c38170be5712adaeb76fb376d26bad42bde5fc144e3cc182c1e0430e885f4617d5514dd50a86635032
+DIST kcalcore-18.04.2.tar.xz 252940 BLAKE2B 62d5b5d5c3c5f192d92007ca054bff9bb6a2782c1b0383fac11f3fa9c2bc2473719d99a6e151c7ee975425d976b024ef856de9c440d3b313db20bba2a22335a5 SHA512 1729ea7e6334ab0fe2065ce3b2c71ae45eceb94da8b0dded7602e13bb9ab3921729b356bca33abb10214e9b84a75d7695f2f7a3de80d48cb883bcc5931db4acb
 EBUILD kcalcore-17.12.3.ebuild 438 BLAKE2B 6d19c4126c628848ba833d0eb807d8221b1e82844646b34fc0e2743b900260d3d647c3f85fb290172e10339efc64e8dad5b3fa6e1a21621e3a06dd29ce214883 SHA512 a8ab920761ef69473ec447e42a108829bd8eb5a9d77e5fa3c814c1c28a8234fae375c33ff25b0597bd41b4b46260464adb47deec7feea401140acf6b7fc23947
-EBUILD kcalcore-18.04.1.ebuild 440 BLAKE2B eaf468e17f97f98ae4ac9f39bb6e159edae27965ab693af16cb79ea82f9eac5716cd561e525012fab7d28e1dbabf7d14e8c7577df1929b62ad4d32a2b014fcfe SHA512 d27034f46a439a58a06002885e255f2a1ec6054c3e2d84581082547a1431e2b0b44470563f295a1ab47a47e7d579dcd7fb04c47d3aa3386746b7850e8ae0eafd
+EBUILD kcalcore-18.04.2.ebuild 440 BLAKE2B eaf468e17f97f98ae4ac9f39bb6e159edae27965ab693af16cb79ea82f9eac5716cd561e525012fab7d28e1dbabf7d14e8c7577df1929b62ad4d32a2b014fcfe SHA512 d27034f46a439a58a06002885e255f2a1ec6054c3e2d84581082547a1431e2b0b44470563f295a1ab47a47e7d579dcd7fb04c47d3aa3386746b7850e8ae0eafd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalcore/kcalcore-18.04.1.ebuild b/kde-apps/kcalcore/kcalcore-18.04.2.ebuild
index 88a4662dc2d7..88a4662dc2d7 100644
--- a/kde-apps/kcalcore/kcalcore-18.04.1.ebuild
+++ b/kde-apps/kcalcore/kcalcore-18.04.2.ebuild
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index bdf41d2414bc..15398a177f90 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-17.12.3.tar.xz 323512 BLAKE2B 31ee7f6e9608f496fe3aa3ac59f591ccfdedb421397d36dab0e04aa1cfe21a8e57d6716708dc35d06a32c8053822520c4c2b8b527e725a742de8cdf2b7863aa0 SHA512 68a5cded42a3b2d3cd8eb9f0fa3529b34c270fea06a0861c98bf4d1fd8d9bd239c656c25f5f4cd697b7434458c15b3ba974267161f9b4497020d89345475fae7
-DIST kcalutils-18.04.1.tar.xz 326416 BLAKE2B b218bef8820fdcf1cda9c2581a697532fe26c0814d7f3059ec8d325925d5c0689854d15d850b47302607b838a1af09031d88a7f3f1ddecaa679004f77b2969d0 SHA512 9944bd39de795ea1ea9eadde756205bcc8c905bbfd4fb079d6347eaf6107f8f31b7a96f5ebc53af37e0ca5e6dd16243f90b81834ba0cf47e529c795cfa489cb7
+DIST kcalutils-18.04.2.tar.xz 326460 BLAKE2B 7d9ba898ca17b3f9a6c73cb33c17afdd89f657b29279659fe810eb5cde049a60e4d7117bd4f7b5ab98406de27b60700190a55f462dc337926233b98ecec6194e SHA512 c300aa83667de9c1b9fdb3034f7319d3b4c9f09a9987343f71e7419ca4e9d58972a85634546de24436b41f5788b44ccca33f90d0f6cc534776bd66a56e42b4fd
 EBUILD kcalutils-17.12.3.ebuild 759 BLAKE2B 546d010e2e92c0d0221700a214af1ae5ed62ba1ce307cafeb505f459a2bec783e519d49f190ca6ac94306647c6e8bdf64fa0ed02675b94aecd08bb8d18e40262 SHA512 502e4fcca0ee7e807df7e72a95e7a3e9390a1eb98fd02017b4784872a941face06149f981ac502f247c179813305b715abecb2d6cc84bf82090b0872af62edc4
-EBUILD kcalutils-18.04.1.ebuild 742 BLAKE2B 9d499c034515c7b283b42dd20cda437e3cb11c254896e3324d63f85070260a3cd2de04880dda325007408f13f647c765740e13828422bdab6e31d8576870f8a5 SHA512 aa96a1fc68c59759c40aaa0af819c2a0a57e4162b9bff8c4f0ec9c4070d24540ec04908a7a995f41499097f1cf2e36ab6396ab24f67004ba47744b4ac410071e
+EBUILD kcalutils-18.04.2.ebuild 742 BLAKE2B 9d499c034515c7b283b42dd20cda437e3cb11c254896e3324d63f85070260a3cd2de04880dda325007408f13f647c765740e13828422bdab6e31d8576870f8a5 SHA512 aa96a1fc68c59759c40aaa0af819c2a0a57e4162b9bff8c4f0ec9c4070d24540ec04908a7a995f41499097f1cf2e36ab6396ab24f67004ba47744b4ac410071e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-18.04.1.ebuild b/kde-apps/kcalutils/kcalutils-18.04.2.ebuild
index e2a72988299b..e2a72988299b 100644
--- a/kde-apps/kcalutils/kcalutils-18.04.1.ebuild
+++ b/kde-apps/kcalutils/kcalutils-18.04.2.ebuild
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 90a7947c70e3..2dbaae9d2454 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-17.12.3.tar.xz 351308 BLAKE2B fc9e005381eb83f308c1fa10296f8cb54797cc0f53611cdaa737b6755ad35ba3dcf6a4a69dbdd1531d1dee910f000f62d1ee9bbeb1f3a925920969b33727af56 SHA512 75b4044c55ac539b05306f759bc4241da71500086157cb0847318ea7a9cea8a4fb40580c54d747f3e80a51668c435ca7aec80d68dffb7193e3bcded540b31275
-DIST kcharselect-18.04.1.tar.xz 351776 BLAKE2B 080ba566eb0c25bf24204e3826e214a9f0ec9c9265546d98cc23824afffed20d723da7b597c892af4045378c4b62f1efe92b350281d40322935fddf556d68176 SHA512 1ef8ed4d0e250d2d0e478fdcafd5703fd307eb82a1d3ca8f697852e803c26a5587dc786b9f984775a3959292ef156f7a59ff6c4b722f3a3507cb591733fc9fc0
+DIST kcharselect-18.04.2.tar.xz 351900 BLAKE2B 04f4adfdbb927d0d03b5272e31b0899eb74a6b728474a0fe9f69d300c950cc07c1e7e2a815f3253158356e6e889a12f0d72f30d0c9b14b2b0bcbb31947f763a0 SHA512 2ca786d6f74ce813e7d75c14d480820579acea0a9a4000755558fdcb92a74308ce23450cd8301cf37da97f186b162561f2c0af7d87e6c050f8d668ee46a67626
 EBUILD kcharselect-17.12.3.ebuild 657 BLAKE2B 02d4eb97328d7a29bc35b38d7fbe1d36adec5bf63917e132ef4d3c73af36f466349e0fb69e8e117bac93e81818f24de79ab219a67863741065b9c48146c05a4f SHA512 1b4ad8686d4943234182a53b25579e0f44e8c1a4b5cd6dd1e3b132461906fd70eae7ec3e48603912813212cc8f82d93dc35f331a2c6717a2d393824ddbfde5f2
-EBUILD kcharselect-18.04.1.ebuild 659 BLAKE2B 770987371ea06f0106bd6c902f80d968cf0122cc4914067f2b7378c93d47b83e850b4e79a63e18c0faa7769baefffa998da9e044deb6efeddb3cbffe7fe59230 SHA512 fead3ce266fd1936720aa135138cfd21fa3f02efa9b1a18339d9f99c155e240962e1d81a81994da3583a261635c5bce505a084c7f39e09cdaacb77140f07c725
+EBUILD kcharselect-18.04.2.ebuild 659 BLAKE2B 770987371ea06f0106bd6c902f80d968cf0122cc4914067f2b7378c93d47b83e850b4e79a63e18c0faa7769baefffa998da9e044deb6efeddb3cbffe7fe59230 SHA512 fead3ce266fd1936720aa135138cfd21fa3f02efa9b1a18339d9f99c155e240962e1d81a81994da3583a261635c5bce505a084c7f39e09cdaacb77140f07c725
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-18.04.1.ebuild b/kde-apps/kcharselect/kcharselect-18.04.2.ebuild
index d7ccc94ca3cb..d7ccc94ca3cb 100644
--- a/kde-apps/kcharselect/kcharselect-18.04.1.ebuild
+++ b/kde-apps/kcharselect/kcharselect-18.04.2.ebuild
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index 0517d9f52233..735fcd15c0b5 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-17.12.3.tar.xz 16716 BLAKE2B 2f1f0f7f00104aa3264949b7c14bf304b7f679baee1bf082c4b478742ac18d04989a97b3dd473d2cfa330b86fec7ca913508e4625c64939a12a83be15bfccdbd SHA512 0016433e5f445842e606ae8f258908cd9911b14867695c1aab4d6ba9c2aae2b3255db4442c108a2561cc32b072085a532ebd6ab94a2ac3af70f382e27d4c451c
-DIST kcolorchooser-18.04.1.tar.xz 16892 BLAKE2B e4648e4849191cb70580f887ec5b76f5564cd85cecd39ef9ebdb5e1936a14e4e6dcef759e8a2f28b30437194e583ec45b409a8804be20b65ab1292691ed8588a SHA512 e23fb2b4120fad07db0d3aed14e4dd2231b9766d7adb4a02ee1b111253eec9aee2079e33a1e02301a1763d58395951fe02e0a033f240fa7515de377fc672e381
+DIST kcolorchooser-18.04.2.tar.xz 16952 BLAKE2B 65dcb6bfa2930de1351240f8d3eea21fc5a94ed320aa76f16706f543a31cc4d80a57b58a7e550a4c4fdebff46018e4ab43aba81879af767d2d3c568a46e19875 SHA512 1fb60a33fe5f93cb65a88445c3f2485e7af7a89d00d8a76a64da58313568bb16b5b412096d1fcb997bf952a2bf925badf2ef8a4b2d216f6920f63593ba1793af
 EBUILD kcolorchooser-17.12.3.ebuild 455 BLAKE2B c2b3df4178abef5b4d8d821eb5a598a0d560eb800de0142ef3372189ad9a793d5da46140b669c0f79d4bcba19c9d9ebd78fd597966d12fd80dd3b0eee30529a9 SHA512 6a489f07659676ff90dde300a299efb31711f3eed39bfef10f68a8be4b12c9c2a23a0058dac542b1bbc758bb0161238174f6dd08ef2bd821d0c1b4ed90d09231
-EBUILD kcolorchooser-18.04.1.ebuild 457 BLAKE2B 06ca4df8902e0b76632924fa9c5a26127656cac7939f9eeaea8955c6636f96a45cf3d2e71386fbe6e76d7ee394b52901298a9db5ed02c7b8553c0d63c936c22b SHA512 cd5b9c8296cf2ee12e9fa84afe8a5d65f1171410946fb435522ca8c991d8c4339ec7d34aba1c0109c952ad54dc4a889a0323d55e228c71824906d652530df1d8
+EBUILD kcolorchooser-18.04.2.ebuild 457 BLAKE2B 06ca4df8902e0b76632924fa9c5a26127656cac7939f9eeaea8955c6636f96a45cf3d2e71386fbe6e76d7ee394b52901298a9db5ed02c7b8553c0d63c936c22b SHA512 cd5b9c8296cf2ee12e9fa84afe8a5d65f1171410946fb435522ca8c991d8c4339ec7d34aba1c0109c952ad54dc4a889a0323d55e228c71824906d652530df1d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.04.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.04.2.ebuild
index fdbb64c54d27..fdbb64c54d27 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-18.04.1.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-18.04.2.ebuild
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index a63318a42787..98e52b5dbb73 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,6 +1,6 @@
 AUX kcontacts-18.04.0-unused-dep.patch 1283 BLAKE2B 20a4b624770a7a578d2e0be5a9f8db252d4ddeea5fe8521122023f13d15470b32dd1c0ae7f3e0b8ab65e0848a7f82e568a712e6af2191600bab97995307d881b SHA512 0aa1bffaf62df622975ff092df911a107aca1ec96376aad37339d5a54ed6e34bc7b0aa07b0b2be573382e2e6cd07208ffd463f0e60e13c4f8d5959dc85fe6acb
 DIST kcontacts-17.12.3.tar.xz 206708 BLAKE2B 8c948183fa389be754ee7a8d2928c64f9b854ce06c97fbbca79c784d8e7cd48cade5c2e6a95b3dfe77017f2fcc7bcaebc15c8fb759755b2402a50f4e7dd029e3 SHA512 e6f77cb685d6c163e575862608d127b524815704a4d124234f871aeb36abdbbe6efca26d17c86692094b395e7edf889f53cc70b7c72f33746483c9a04a674e21
-DIST kcontacts-18.04.1.tar.xz 206896 BLAKE2B 0998754221210df835d526fe360a2a7964cd6dec6110b9bc287c109097d8318f2aedc7316cdcd008c1abb0bc204236962ced8bb9c9d8c0a3bfef3b6a0d642694 SHA512 559be58b5236718ed71954866812d0b5f8429ef5d65f92374f1b0ab94fb57f9ea5fb72453c6fb84e706ad653c50b89ad7b39e0a760ef6918f668b57d7c40f81c
+DIST kcontacts-18.04.2.tar.xz 207028 BLAKE2B 30533185229da667d3f2e52acf5995b2406837b3315a65d57ac5e087e3715e3d0a50d2b6a90f2360077bf78e021eeae0a9d8c9d86b95780df4dc196c9ebca9a8 SHA512 7ee83a040189156945ad3f3fdeccc2c66bb3833c015a7668e1f2f0d7158a58c0722b0e154f5d2b9824b140c6f1f613650a0f617b9fcae10f3cd335506d0db027
 EBUILD kcontacts-17.12.3.ebuild 853 BLAKE2B 0301f620a23a5135f1222517ba1a30989033f116a598de17b915f17952db5a621bd64eeff73560b69f6ca951dbd11c80a5462c199336ae5e37a993006658a367 SHA512 1c8457c6e45fb5ca445f23a6b5351de168aa081a66858f717954bcd5eeee620571de1290cc7cb3da929b88e29090cbdcf1eaad83dc9f3b49037fd643e9f57f82
-EBUILD kcontacts-18.04.1.ebuild 891 BLAKE2B d44ae06bb15956e7312aff7579b56e455be2ff87fc089d212be53b024bea7c07c96e33a0ff2d9a3dfbca4dcd47283740c1aa05b4cff2c3943d20614fbb41b9e4 SHA512 60989d76fdb4692875c9a5a5ff427e98d842031887abc93e0f5382ebb148322245ddb75266ddf939128586dd3655c0991e28ec2ed42771e9407d35d8573075e2
+EBUILD kcontacts-18.04.2.ebuild 891 BLAKE2B d44ae06bb15956e7312aff7579b56e455be2ff87fc089d212be53b024bea7c07c96e33a0ff2d9a3dfbca4dcd47283740c1aa05b4cff2c3943d20614fbb41b9e4 SHA512 60989d76fdb4692875c9a5a5ff427e98d842031887abc93e0f5382ebb148322245ddb75266ddf939128586dd3655c0991e28ec2ed42771e9407d35d8573075e2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/kcontacts-18.04.1.ebuild b/kde-apps/kcontacts/kcontacts-18.04.2.ebuild
index 724b2339fd3c..724b2339fd3c 100644
--- a/kde-apps/kcontacts/kcontacts-18.04.1.ebuild
+++ b/kde-apps/kcontacts/kcontacts-18.04.2.ebuild
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index b31a51d93153..10bd97c9ce7d 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-17.12.3.tar.xz 1054784 BLAKE2B e9f37357c1a83f7f9fe162ec5f5e0d1289482ff83b77c0f83ff8a592944fb5c133b99709139c12324be1bb1e0b5b87f92fd306e2a1be9eb0a083240803eba9ae SHA512 edc96b2521d86fd288afb688dc7abc60b575bb5171f2ed0026fcee4f9e12966ead95a15aca55e89b672649d83433cab66b6f569e802ecfb680ace86003a36328
-DIST kcron-18.04.1.tar.xz 1056620 BLAKE2B fbb1751e282400477e12b9dc3a035fa2f174f04b8aa517947b630ed033f716af2c9a38db8d1240e76fa283cab27e99f6f3764bf08bf93742ee5161658b17a5cd SHA512 6196fca373827edac85cf7b8d1dc319371a035a178e9d13f29c04e8cca1d1454a63d4c771f5512877cec432460326ec29d0e71ddaff6f492ca24d7b0d1fac6f2
+DIST kcron-18.04.2.tar.xz 1056680 BLAKE2B f5995ee7ae28e2478c1d4cb0a13c8c0aca16afb61829eacf6220073c4aa1925557c95e5bc2fe9a4279b418178755f9be05ef7f59644f2dc6b0670b84589ed9b7 SHA512 711f867fe1e82f6018fad6212b422d89fd11fa0b7860f5be55995f8e0425d6895bb8f388c564bf35802582955fd72e4ba3cb6bd2d8d99cf4baff90a29ef53621
 EBUILD kcron-17.12.3.ebuild 559 BLAKE2B 08a9cc3b58768927021f06b978efc556a958dba07975d7c5d3959943ac54421530fbb171b5575dcf7aec3f058b6cbe417c2355ce6002449580a830f6745e219e SHA512 f513f09079aab240c87abb113b6406cfce839f382490e9b81e370b763ab5831e7dcaea5a7ff00071dbb45f95143daeb64274737b26bee279860d0262127fdeeb
-EBUILD kcron-18.04.1.ebuild 561 BLAKE2B 78a41d26a37cc0faa24fb78f2248dee0a1b4ece7172155e74cec967d582805c9da6e3349e533b089589ac4acf750c3e1b923a87db9fda9cffbdcadddcb7a0cee SHA512 1e34d2a8bdf8e7a509e3cbf4f636fb4c272ca615c5feabffb354547ad56f6170b54b0f72d13945bf487a4866ff2f6af5ba13a13e93000bbe9e7dc65880a5d81f
+EBUILD kcron-18.04.2.ebuild 561 BLAKE2B 78a41d26a37cc0faa24fb78f2248dee0a1b4ece7172155e74cec967d582805c9da6e3349e533b089589ac4acf750c3e1b923a87db9fda9cffbdcadddcb7a0cee SHA512 1e34d2a8bdf8e7a509e3cbf4f636fb4c272ca615c5feabffb354547ad56f6170b54b0f72d13945bf487a4866ff2f6af5ba13a13e93000bbe9e7dc65880a5d81f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-18.04.1.ebuild b/kde-apps/kcron/kcron-18.04.2.ebuild
index eb1f317ce6db..eb1f317ce6db 100644
--- a/kde-apps/kcron/kcron-18.04.1.ebuild
+++ b/kde-apps/kcron/kcron-18.04.2.ebuild
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index c5698a558efc..5884826a36a7 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-17.12.3.tar.xz 37796 BLAKE2B 3f335f82fd6793d32647d2ab124b349166a7f80aea54d421e57b77f9b68123cde72ed2b8694e4c990303c9e57f73d1fa0a9f367ca2546be267aceec524b4d8e4 SHA512 ae4c28406d9a1cd6e8816ecd693cce1f33c92de8532b29ded33355c417837380bee784608f5784c61d54e77d3bc90e6efcbec9372f64f02131848ee40daba9b6
-DIST kdav-18.04.1.tar.xz 49012 BLAKE2B aff7f74c4af08da985176a8be6a4e229f3035774def6295124d5303e37eef6fff40fff232edfd22bfd5e45bb02b3c0ad5b84e1fdf7b1018e22827910867c2dee SHA512 29ba9079c849118ec2a4a31957a8b98df9660d08e1fdb1e11acf15fd2ee5ac021b50d7238460a3e9036ef8c32d12613a12f9b3641313593a130dbd782f10e2d4
+DIST kdav-18.04.2.tar.xz 49032 BLAKE2B 1a076eec88077156fd1309a354be74eb435a3c41efb5cc31ca67e94daeb7e0dec18c77a2b4e0d11aaa89fcc5a29f6065c078960228971cb362cba78841b26d8d SHA512 377cb2298962e477a192f7259ec570335ff66778422e3e8db29d41e4ea79b5e234effd4807a27df92f0631d1ccba854d9f4ba7562f0028b0f08d701b377a4666
 EBUILD kdav-17.12.3.ebuild 603 BLAKE2B 291e20fc681eabedad8230ea30a292afc79f15e396aa091b3d513712d1ed33e5c8a46294d8d5e2e5b8b5f72502f417bdab5505301830f57026d9bd8425510b18 SHA512 35fdcbe12541c640d42761ef9f4e13058dd99d1de94e4a52acc2194c87c909c60641b7e21ed7e331360bf86070a4b1cde8de41b9e6b02c7756a971ab0b8579be
-EBUILD kdav-18.04.1.ebuild 605 BLAKE2B 8bdcdf35534f2e0aacbbe4f73e502c54ff995a43c7888636386e519c049e6e9be7b1f07448e99efbb6a30296b7e06b1351c7b2e8d33068246bf3bdca8b6dcf12 SHA512 d3a37e5c4b1dd98412f1b713a408400cc2b697de00cc82b15afc25e2a432b9b2620f61d2067f64f5fddf8af2c1083ca777c4c2d5950bdf752dbcd0ce72404168
+EBUILD kdav-18.04.2.ebuild 605 BLAKE2B 8bdcdf35534f2e0aacbbe4f73e502c54ff995a43c7888636386e519c049e6e9be7b1f07448e99efbb6a30296b7e06b1351c7b2e8d33068246bf3bdca8b6dcf12 SHA512 d3a37e5c4b1dd98412f1b713a408400cc2b697de00cc82b15afc25e2a432b9b2620f61d2067f64f5fddf8af2c1083ca777c4c2d5950bdf752dbcd0ce72404168
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-18.04.1.ebuild b/kde-apps/kdav/kdav-18.04.2.ebuild
index 4c5706c9bda2..4c5706c9bda2 100644
--- a/kde-apps/kdav/kdav-18.04.1.ebuild
+++ b/kde-apps/kdav/kdav-18.04.2.ebuild
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 67fb97183003..2541c153b731 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-17.12.3.ebuild 712 BLAKE2B eb22f68f34234dac478d2c68faf184e3d15c1628a2375e8f0195f390559d76372e2af8f71e11bc706ba32232444ddbf71f7dff07a5feb4d80a99a143ba0b41a6 SHA512 68230fba9f71b944ae1f6f5751c56b7d86e9be217a7cff4dc0e35d2f7190d6ead515322f0f4643441f6b46cc3ef06e588869bfe61ea93db7e7a6b8d83a2b1c20
-EBUILD kde-apps-meta-18.04.1.ebuild 714 BLAKE2B 32ffba5e5a2cade7fae5a2ee06ca245f813350412e257eea8517729c06acc1404f4fd50bec458fb5422c352d82e92765d7bf9752b86731f47b82f358cbc5963e SHA512 4840e2c4ac65f5b9688d6dccf69982716c01622179bad74db168bb9f8146efd2e7ba5729d14c7a360744d944394086fdb59315fd6074ae418b6fb530021b546b
+EBUILD kde-apps-meta-18.04.2.ebuild 714 BLAKE2B 32ffba5e5a2cade7fae5a2ee06ca245f813350412e257eea8517729c06acc1404f4fd50bec458fb5422c352d82e92765d7bf9752b86731f47b82f358cbc5963e SHA512 4840e2c4ac65f5b9688d6dccf69982716c01622179bad74db168bb9f8146efd2e7ba5729d14c7a360744d944394086fdb59315fd6074ae418b6fb530021b546b
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.04.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.04.2.ebuild
index e528dfd0deda..e528dfd0deda 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-18.04.1.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.04.2.ebuild
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 9893c3de65cd..860b27a20ae4 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-17.12.3.tar.xz 375796 BLAKE2B 243211c87fe27f298a49107ef48390d30b80bbf904bbeb1a8eb629453f301069e98ca1401a1bc178fc1df98c0ffacf85d253b86077fdeb1ae2c796f1b972c1b0 SHA512 eb55b5016dd4cd50ba8b062496f4f21a8704e48e277c467ef9f9b2e6056afbb6f71e75c9edff84f6e50b0e25b87bcc97f13646cfd6eec892363362d402ee70cb
-DIST kde-dev-scripts-18.04.1.tar.xz 377620 BLAKE2B 6b3827f3e033e1c6fcb4c8aca61517056ddeae8ef3e2a760c03364e657e3abfe63f3f86cfd6a2c1664f8f56ec2694a16625794ced1dcefb1b47235e1733b1426 SHA512 e66ea083ebf54c3b7f89212647236819ee476dfe6e003f23fa98d2d7889a38976c84e2bd24da6ab2e05c5f425fa777b68ec184324ce09fe27e772ef249496698
+DIST kde-dev-scripts-18.04.2.tar.xz 377808 BLAKE2B 46423a37a6b89d741fbdc2845be0f42c2e0bf9093af9f6a58de1c678e61fbc5648b4686662a78115a4ce2eeaa035cfe71b75c5c6d2e3cb7972384ae7a4f22982 SHA512 fc2a8ac778245c787e7ad084a42202230a79db917512882a3dee994602ef3a1f45f67f8af3bd8497481011e37fb5b59ec250a3558401471a0c467ef455b78510
 EBUILD kde-dev-scripts-17.12.3.ebuild 578 BLAKE2B 9449129c76d4f80488dfebf4536e575c1b29770ab5605ad2f271a0798eed4749f3f773754d881ea4c5234a53eb9f0d5c373696d8b30c2d7a92bcef70c6bcefed SHA512 a7caeff730912bb7805c61987203e5f2fae1b7c994a16271d9bcad01ae741b3579d092309c6a25e334c1801a16711cf4b9e0cf24f40d6039e6e2522e6c39d836
-EBUILD kde-dev-scripts-18.04.1.ebuild 580 BLAKE2B 368809e818a99848f0a705ef0eec0939a7277e0e7a1606ca239b230fc3f629ef5b737089ceefb693a8adc931ea318f2cab4713a49a4629d90563303d4cc6ec9b SHA512 cefe74b979f7a9d9f13b9a2057a7b46a726626968f70845a818c2f7191d327915ff1e016cfb52df598e72b15ecdb48c1910b977c46981f61a135437e89a52d75
+EBUILD kde-dev-scripts-18.04.2.ebuild 580 BLAKE2B 368809e818a99848f0a705ef0eec0939a7277e0e7a1606ca239b230fc3f629ef5b737089ceefb693a8adc931ea318f2cab4713a49a4629d90563303d4cc6ec9b SHA512 cefe74b979f7a9d9f13b9a2057a7b46a726626968f70845a818c2f7191d327915ff1e016cfb52df598e72b15ecdb48c1910b977c46981f61a135437e89a52d75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.2.ebuild
index 8f878b4fe584..8f878b4fe584 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.1.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.2.ebuild
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index ce03eed4e2d6..1876f34f8337 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-17.12.3.tar.xz 61000 BLAKE2B 5bdb7ddfaa792d4a74cc3d55e4c1e110c69af3393421ecbef5871a095097645be566137c2b609ec33c6d13a777e62b388d06f417859af390bfd20e33e406c0c7 SHA512 8f774d33f74eec543772db7a39b18a6a52b4fbade62d5ddad9f632c1719aca58a3a77ceb50bc4f4a96df047c3726c1f37e6e9d21b496cb6a2c082334082ae359
-DIST kde-dev-utils-18.04.1.tar.xz 61240 BLAKE2B eb183d61314c1ae68e83aef3b92df27e537439c64d5d1e441b249048a4cde07f6e28620536de31c287c62caab12f4df6655d6909729a9055dc49e85355a50cbc SHA512 0b3ed98c816f170552c3701d2f78943c68c7262189fd05b762f3e48798a6ef69326e5b219823627b4f14d68dcedf086cd53a5457343cb65498a2c2adb2898d7a
+DIST kde-dev-utils-18.04.2.tar.xz 61388 BLAKE2B 9fb45f3d172d66985aafa619374f855af384a0f7b785bea192960af95b69f39c1e7e6c4eff9dc206e00ebfbfff3232bd3309e601d002f840bf31e5e7c35d60fa SHA512 c72f7573422583d6ae71f35f05c21f9ed6c3bfff650bd371007061c17424f3adab1a1bc5f093fb1d5c51b95c4d0f25979b83a077b1ffec872b613d6bca72d9d2
 EBUILD kde-dev-utils-17.12.3.ebuild 646 BLAKE2B f04cd447cd1c22b3542dded1e6beae7bdb7f49e60a9fdc27432ebc880cbe35bd69e65a2d9f252bd865597f573c5c24a4217fedf06fcec07b35315ca0184e03b6 SHA512 4e9066a4830a64b89eedce000fc0addc64ff5a832cb0060f5e02218e21d8bfc6e7197f59561c3f28ad9dba8f9fc91b9aec202922cd5821e1c4bd793bbc31d1aa
-EBUILD kde-dev-utils-18.04.1.ebuild 648 BLAKE2B 19217c351ecc0af8fa5caa88cdd12ca5ab246208a3b9a62d6fd414ada8b526da1fe805722096f977ccad904650a88cbe1dd04c0aeb5d8097d0d5c83dfc9f78dd SHA512 855dfc8e3a1cff2a81a73c1e4dc2d346870d1324c16fae618ab05c3b4d9ca1834b2c5cda2498aab16a74bb07d8494fbed2f20445702944abbc1094f50bb3a29b
+EBUILD kde-dev-utils-18.04.2.ebuild 648 BLAKE2B 19217c351ecc0af8fa5caa88cdd12ca5ab246208a3b9a62d6fd414ada8b526da1fe805722096f977ccad904650a88cbe1dd04c0aeb5d8097d0d5c83dfc9f78dd SHA512 855dfc8e3a1cff2a81a73c1e4dc2d346870d1324c16fae618ab05c3b4d9ca1834b2c5cda2498aab16a74bb07d8494fbed2f20445702944abbc1094f50bb3a29b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.2.ebuild
index fd428260d4a6..fd428260d4a6 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.1.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.2.ebuild
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index a0f113cfb1a7..b32a3acfbdbb 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-meta-17.12.3.ebuild 323 BLAKE2B 50ad12fb1fa077e45f7d87d15d01ab510e6d41ee4d7686830906784c17fc9b742f75d591f37b6e9271b9de3b79b6d463d1837c0ffb059a1b5612997be88e1e55 SHA512 af6bd77fdcabbe77fd664a4da5cde15c790b1b3459dd04aa747b612f12a6953d2030a9c8a0143f3699d1a029b1b463c54be0b61c5b9268a5735dd3a6ce35e885
-EBUILD kde-meta-18.04.1.ebuild 325 BLAKE2B 7346e974fbc6478b6f5a4d315f22b039c298240fd295d8e2c3bc0dc8ef2588f4f33ebf7297a1dabdb6e13fb827d9c1492bcd92dfe33e801a32f6e20e383c1a53 SHA512 63388dfb92585daa39acb4edd10c0770ede4c944680b18d16b69a4bb0c3ad5faee718f232289ac517da14676780920ebc1a04cd2c3ea443dc4a1a4b6c62ad285
+EBUILD kde-meta-18.04.2.ebuild 325 BLAKE2B 7346e974fbc6478b6f5a4d315f22b039c298240fd295d8e2c3bc0dc8ef2588f4f33ebf7297a1dabdb6e13fb827d9c1492bcd92dfe33e801a32f6e20e383c1a53 SHA512 63388dfb92585daa39acb4edd10c0770ede4c944680b18d16b69a4bb0c3ad5faee718f232289ac517da14676780920ebc1a04cd2c3ea443dc4a1a4b6c62ad285
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-18.04.1.ebuild b/kde-apps/kde-meta/kde-meta-18.04.2.ebuild
index e986cfd70609..e986cfd70609 100644
--- a/kde-apps/kde-meta/kde-meta-18.04.1.ebuild
+++ b/kde-apps/kde-meta/kde-meta-18.04.2.ebuild
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index a5660b615a81..1d8df3199ade 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-17.12.3.ebuild 356 BLAKE2B 670b57674d38cd325e3116e6cfb1634827f67526a7a7d43045a4477db227199dff1d21740b19a386a295bdefada351b1320ee969a9ead23bf7431a25f7c6ee9d SHA512 8813797ed8f108a321eddc24c98f2e73834c1aedb4cdfd826b0fc30e66edcb5f55b468b840448be613669777d7223333d22c34d755b44ae31d4a5096099922a4
-EBUILD kdeaccessibility-meta-18.04.1.ebuild 358 BLAKE2B 3985014c80cb5c3bc775e122a8432bb1d2794d837d90178d49123fb6df37fb955f862956be9c41844e163344a317d2d0af46725e0cf5ef67f03daf84b14244ec SHA512 6440329116502f8f4e04a34737579fe3ba91a9fc9fdc8dc45ee37bbab585ba0086876cdde4a326c323ec8b5a791fe6a045bdb349d210d79289507bc6d84b016c
+EBUILD kdeaccessibility-meta-18.04.2.ebuild 358 BLAKE2B 3985014c80cb5c3bc775e122a8432bb1d2794d837d90178d49123fb6df37fb955f862956be9c41844e163344a317d2d0af46725e0cf5ef67f03daf84b14244ec SHA512 6440329116502f8f4e04a34737579fe3ba91a9fc9fdc8dc45ee37bbab585ba0086876cdde4a326c323ec8b5a791fe6a045bdb349d210d79289507bc6d84b016c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.2.ebuild
index f9f04c8582be..f9f04c8582be 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.1.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.2.ebuild
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 6aad9dc03142..ca762729c9be 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-17.12.3.ebuild 346 BLAKE2B e02288f4f94c2cfcefad4805143e8256ef440d6227a1e77ed4b338fd11c35b194932e416b9539103fe55ac60408d4fc5bfad953a7bbc550f47877a313f6c562d SHA512 89332ce2348e6105ea23a41ad6299cd91eef4d232add22e98e8bbbfc29c7f28be81e90e56fd14a9f10872fd21a72984eb9ecfd273c663a07f2d36f19bda76aeb
-EBUILD kdeadmin-meta-18.04.1.ebuild 348 BLAKE2B 219e53eaea47534f1da3284a67db0b3b3276d66f17a503e2f63fea13a4488549c0e87d8edf2ac54ee0fe210db5b6f66c3cd1b77695848e674b8707a407d09eea SHA512 2b0e1bb6625ea97eb83d074ffdd7d824a45a3fb8cf5b629447122cf7bc4b3d9e2bf99b56095c75a7df1313588007cf8e273785096efa5f6914b0d2742293cf0e
+EBUILD kdeadmin-meta-18.04.2.ebuild 348 BLAKE2B 219e53eaea47534f1da3284a67db0b3b3276d66f17a503e2f63fea13a4488549c0e87d8edf2ac54ee0fe210db5b6f66c3cd1b77695848e674b8707a407d09eea SHA512 2b0e1bb6625ea97eb83d074ffdd7d824a45a3fb8cf5b629447122cf7bc4b3d9e2bf99b56095c75a7df1313588007cf8e273785096efa5f6914b0d2742293cf0e
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.2.ebuild
index d87b170fdc44..d87b170fdc44 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.1.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.2.ebuild
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index ef0b24236791..7d82497ebcb2 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebase-meta-17.12.3.ebuild 327 BLAKE2B 279c2650f074343a4ee5c30c3fb2cf145c4e017c0127f4c7e2ffe7046169b565addbb5fc14e7538b38e96a6871d5846b24ae98d0d3cdf153b649d684fb3a30f7 SHA512 c8fbb53ffa1784e26082357b04e3ac25a0a7a93dc490bcdb4e618181a53d545fb7093877b1086933ca0a9a8e3da40f23d1c7c587e793804ef3f23fdbd1367de1
-EBUILD kdebase-meta-18.04.1.ebuild 329 BLAKE2B 304a36e03db7599e610c961bd51291db1a4540ba958c47788201a3a278bf2f3524dec8848e8af4c9d90a55f4150728af9b03d0785fec6642e57ff2f5b5252a20 SHA512 b96417b6b44a56cd3c46ee998588ad7b69ef99893435b7dfb58299c55383381c252541dd8df88ec08caf55cc9ed8878c8f953e5f5440bcb042a2380d54ac208a
+EBUILD kdebase-meta-18.04.2.ebuild 329 BLAKE2B 304a36e03db7599e610c961bd51291db1a4540ba958c47788201a3a278bf2f3524dec8848e8af4c9d90a55f4150728af9b03d0785fec6642e57ff2f5b5252a20 SHA512 b96417b6b44a56cd3c46ee998588ad7b69ef99893435b7dfb58299c55383381c252541dd8df88ec08caf55cc9ed8878c8f953e5f5440bcb042a2380d54ac208a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.04.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.04.2.ebuild
index 37f06d26788d..37f06d26788d 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-18.04.1.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.04.2.ebuild
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 0b6761406fe7..b926ca33b540 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-17.12.3.tar.xz 48668 BLAKE2B 1bba5a7860b47c6cc74e249dbc5b8885ea1721ba5614dbe4246f701c0f759a13efca834298453c17e75bebb1ad9ac155a51d95742b5b428f279bf3090c9a4e89 SHA512 e0f73e18ab1d7bccdb1d4a76a546dfb638f4b0a9ef331a45478fad8e15057a9424bb47d24aee5d870181c00a917ff42ef0e99697ebd3da4319ee8c24aba9264b
-DIST kdebugsettings-18.04.1.tar.xz 51776 BLAKE2B 72209ed719dc7eaf48097b344fef881534284607b7b07f7a8d48be8be85cd634e9abec21ccb757e319792c59434ab35f6f85f1de02db253d39a1778febf24441 SHA512 80661f12660d1d41b482e895e0f1008bd46d28fc270aa527c4388b8fee9429bd6a047310dfccdb6b4b1df770e24bc1bcea644fedabc4cf3d5f4f86a5e3cad5eb
+DIST kdebugsettings-18.04.2.tar.xz 51804 BLAKE2B 7b182ffbaadeb2b6684cc13c8c5b9455879427eec18cc2fb4c248ed02e90a6081e665112ed827eeeaec4b675c849852b4ef463b152d95ec3b044f4f836e8aaec SHA512 e80acc63aac2514cbfb1fe017139a3b8a25de44213aa0a30dd297b31887eb24359647966e529b498ce8b3426d8aad9d55cea165d8efc246bc1f0b8c8b87e2725
 EBUILD kdebugsettings-17.12.3.ebuild 595 BLAKE2B 23e604f648131c3c51d620b8133a1494c1466ff0883ce2037b10fdf402f819e2a7f0b0ee236fb2cd0fdfafb47fe9e6f6bc6eb4d96004d4e7eb63a7fad3ef7d04 SHA512 7facddf48cd39adc8910819bac603a5f2ff784a110364affef27c3c0b8944c36ca2ebea2b89de6a96e7736dd494eaf6a3bea9bba43aa0de063d04547ae8e39f0
-EBUILD kdebugsettings-18.04.1.ebuild 597 BLAKE2B 7979b21e081fbc1dbc93f1108c882910f664af089d6190ef64caed247becf80201fa9190e312557a394fa5f75d8bae8d0187ae6c2ca365870476037291de37e1 SHA512 a3a45ae47890268b8249159f501cecec3df5b6764123cd48ecf90d3fcdad9a5f8f62482f5cb5bb8fdad41550bfded040ec829fe710aad5afea3f618e74adfabc
+EBUILD kdebugsettings-18.04.2.ebuild 597 BLAKE2B 7979b21e081fbc1dbc93f1108c882910f664af089d6190ef64caed247becf80201fa9190e312557a394fa5f75d8bae8d0187ae6c2ca365870476037291de37e1 SHA512 a3a45ae47890268b8249159f501cecec3df5b6764123cd48ecf90d3fcdad9a5f8f62482f5cb5bb8fdad41550bfded040ec829fe710aad5afea3f618e74adfabc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.04.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.04.2.ebuild
index e53b5a97cb69..e53b5a97cb69 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-18.04.1.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-18.04.2.ebuild
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index 7c4c73f6b30a..7fcbc38952e2 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-17.12.3.ebuild 564 BLAKE2B ab892f36312833261e1e698df5d0b79a04f340189169b59d93fcbe9c00f8fe6a50c80af09260675600080669a8c2c444307a946ae934914f8140fd429ad242d5 SHA512 e0a096c7a226d6ebec34759d4cba1b06531be6fdc553bf90fdeacda8f30dd2570fcc0bc112a7acd6c877a7e3a3c44406d1050cb985948ca5ceaaf96af8acdba3
-EBUILD kdecore-meta-18.04.1.ebuild 566 BLAKE2B d4c22b797a56d8d943c71a2d97406c4137d78fae5db9f2f63431e5d59c4f0d532728019a6d7020bc92f49d734d2b92d8b54b186151363e710182cbccd65d0bf3 SHA512 a121188f56bf8fc3ad7c440e3c648b4fbad3c36e5322eb4911ab05bdae1eba0858989a103b2b5891d76a8c236ad353662ac60aa40e4bad71b033d75fb69a3c1b
+EBUILD kdecore-meta-18.04.2.ebuild 566 BLAKE2B d4c22b797a56d8d943c71a2d97406c4137d78fae5db9f2f63431e5d59c4f0d532728019a6d7020bc92f49d734d2b92d8b54b186151363e710182cbccd65d0bf3 SHA512 a121188f56bf8fc3ad7c440e3c648b4fbad3c36e5322eb4911ab05bdae1eba0858989a103b2b5891d76a8c236ad353662ac60aa40e4bad71b033d75fb69a3c1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.04.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.04.2.ebuild
index 10c9f670dda2..10c9f670dda2 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-18.04.1.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.04.2.ebuild
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 26c0df78abd9..bb61b29bac52 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-17.12.3.tar.xz 327652 BLAKE2B 554de77a50fd6ac954dcdb6081f3ab9631c819150994389977142095defc3f7c802d8a94d8fcf0a2e07df60663d49ae27b75a4420d3ea35013a8c6ddf62ab6e4 SHA512 4f6dc1ed4407bc1447d5a4c66e0ee6e1b2eff69545a46ff365f69ac1e93add84e6415e3e397210112f9850556b52d82ac826dacba501713c4495f1b3669b15de
-DIST kdeedu-data-18.04.1.tar.xz 327888 BLAKE2B 6c920a0938057acb1c2824652e2f17d40ef2d731a92993b12e3e6c7453b96731b88a774757839af773537de21a5d1169edd1dda55fa8c29eb22676884f576bc9 SHA512 427ad94b6527dc9b75c446591b8356ad20907ae5595665586af6c8eac889a368ecc11da8357883217d2c3fe634dbb479252ec6c0c0845d9e019dbe7811e3de57
+DIST kdeedu-data-18.04.2.tar.xz 328076 BLAKE2B db555a3dfcd7d716397cf1f60669d24ab4780163cc26896fa3819dd00af2b110871274b2e5e82bde6c0d952f580b90f871afcdecf2d0684705a072f2e53fdd4f SHA512 579a37b40e0116255769bf4612d02c4e3516fa5bd92ba1afb4aa04da65033f630aff17c1b4e1878bff69b9947b51b5947d7035f0f2709bc834bf27008936e9db
 EBUILD kdeedu-data-17.12.3.ebuild 410 BLAKE2B eaa18f5506043dd8df271fed9fbb0745270caf4ab9ca37dddaea6bfd86febe3145e9eda889a1869c0dbb25c276262c81bf4f2f4a7da457a14cc78af7bbda98e7 SHA512 8f1472dc7549a96e75b1d2de05bc4c72c9b908c41c8a7a7fb5decf85b62366914551db39eac1414c2e18c69f134f8067ff086e2d00f47138c2b19877e3656f09
-EBUILD kdeedu-data-18.04.1.ebuild 412 BLAKE2B e3fb9aa2e25a9e485228fc3732618b52bdad72b4929c66c39128f4b3891d30760c95811744dba4fd2656d338201a9a5521e41a222607583fd14112786cad1f18 SHA512 8ab82ea007618d9ace59963319bdcf2cd58ac0e4be9bbbe6027348b357b032ad94f311051e73674931ff27f2f295c9d9b198d2aca6520c0089269c404a0a81b1
+EBUILD kdeedu-data-18.04.2.ebuild 412 BLAKE2B e3fb9aa2e25a9e485228fc3732618b52bdad72b4929c66c39128f4b3891d30760c95811744dba4fd2656d338201a9a5521e41a222607583fd14112786cad1f18 SHA512 8ab82ea007618d9ace59963319bdcf2cd58ac0e4be9bbbe6027348b357b032ad94f311051e73674931ff27f2f295c9d9b198d2aca6520c0089269c404a0a81b1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.04.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.04.2.ebuild
index 0209c5857d99..0209c5857d99 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-18.04.1.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-18.04.2.ebuild
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index a5942ea2bcc1..30f6f086f06a 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-17.12.3.ebuild 1015 BLAKE2B 95de6c64a19be1476baf5ed5b1d1aecbb352eadb71cad7403c624d41c7567d322f2c57da37c9ef69f62746078c147b40911e811524b9b189c350ce18e7711e7f SHA512 112f1316947e28da8c52a36a031e2774ca24896b475e39d06bd200047b697521ab6f4a032ee8cdba07687916474c96b843dcaa3146e41303f3b98f20bb8c6155
-EBUILD kdeedu-meta-18.04.1.ebuild 1046 BLAKE2B e34a041df367563cb5062901806730bd2e24549810a9c4713e24ffc5f67f66670291f209679384e847e55282a53e30584d05b4fe27abbe61feb238ba8b8c4831 SHA512 e66fc5641a1a77ce3943edcc95e30c640a067354c43091cea852ff30cd0ab6306e0e07419b86e0c3a1da4fdca97d03605deee58043a14fce22e52388cc871b8a
+EBUILD kdeedu-meta-18.04.2.ebuild 1046 BLAKE2B e34a041df367563cb5062901806730bd2e24549810a9c4713e24ffc5f67f66670291f209679384e847e55282a53e30584d05b4fe27abbe61feb238ba8b8c4831 SHA512 e66fc5641a1a77ce3943edcc95e30c640a067354c43091cea852ff30cd0ab6306e0e07419b86e0c3a1da4fdca97d03605deee58043a14fce22e52388cc871b8a
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.2.ebuild
index 8c2071918f47..8c2071918f47 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.1.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.2.ebuild
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index 283296037971..0d182d6a0e29 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-17.12.3.ebuild 1512 BLAKE2B 3a5f0d6dfb9135330701276aee09b4e5400ffadc4cb6879f1df0934a6c0553ebb52b86850825bf055b212a08de4b66640dfb9970cbfebefbf497c0962d754fde SHA512 dc97ada20d5b222a9bb252ad15e1c6c771a5bd20655b4a7874ca92d7e263db7eced138eedac778992c7bee28f2000dafbbbd3d8cf8b5facaee35b4d61b36d81d
-EBUILD kdegames-meta-18.04.1.ebuild 1514 BLAKE2B b5f13b6b671b8483ded53326d23b88a51c2e978703850dad408c3b4be3d3fc8b31ff5bf5245096f11b64d2800575a8a2aa332853bc8c5a1f2d4a21a908e7ecba SHA512 2ffcb6c7d05731b990f2c1206b45470c03dd7306e8598725fc4c56602f53a5a13c5a5eacebe5fc4595433e94610cbdbd6c22ba1b103cc0ecb2e0d727ac5d54f5
+EBUILD kdegames-meta-18.04.2.ebuild 1514 BLAKE2B b5f13b6b671b8483ded53326d23b88a51c2e978703850dad408c3b4be3d3fc8b31ff5bf5245096f11b64d2800575a8a2aa332853bc8c5a1f2d4a21a908e7ecba SHA512 2ffcb6c7d05731b990f2c1206b45470c03dd7306e8598725fc4c56602f53a5a13c5a5eacebe5fc4595433e94610cbdbd6c22ba1b103cc0ecb2e0d727ac5d54f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.04.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.04.2.ebuild
index 85eb713ba0f4..85eb713ba0f4 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-18.04.1.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.04.2.ebuild
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index ab18f0c9d93f..e4aa70be5993 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-17.12.3.ebuild 765 BLAKE2B a5a9d2bd8dec75e23280998d581e2359a827ab2b387ab6f2958e1839e62d7c2cf49763099824748b69cc27a894ff349892abcbf492be0d9d4629992bce3b0c9c SHA512 76ff544e418bf64e34d1ecf2034d13ff6ef37c0f107bd92d24d52b85208bef19bfff1c83f90aab64da143845a7438e0223ba52d8eebd1422e55286476f19a2d2
-EBUILD kdegraphics-meta-18.04.1.ebuild 767 BLAKE2B 9164daff434ae0899b3062ddb99474410f11b27ffadecdc0e7b284092f9815ea0fa7a50b114fbcb2e531aa759ccccbeabbc4a4ccc236c00658cf5fa35c1203f1 SHA512 306603582c97ba1add3cba677bc33c58a6e3ba6988f5769c36b63b059f3b3beb98d0267b5e117ddf133d7033900119938300d102858a0478bb9c95def3d0689b
+EBUILD kdegraphics-meta-18.04.2.ebuild 767 BLAKE2B 9164daff434ae0899b3062ddb99474410f11b27ffadecdc0e7b284092f9815ea0fa7a50b114fbcb2e531aa759ccccbeabbc4a4ccc236c00658cf5fa35c1203f1 SHA512 306603582c97ba1add3cba677bc33c58a6e3ba6988f5769c36b63b059f3b3beb98d0267b5e117ddf133d7033900119938300d102858a0478bb9c95def3d0689b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.2.ebuild
index bff71a679d37..bff71a679d37 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.1.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.2.ebuild
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 46f02a34caf8..aab7cdc6dabe 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-17.12.3.tar.xz 13436 BLAKE2B ba45e959dd1f2c807210ac215cad3bfb0270d7bdf4162e2d80560fb4c6d8f6524a2a7da9ff519a6f93a4a937d69b1d1bc8b5fc47d97c3ff900cbf63a73e22adb SHA512 89558644d89bd3c68ab1436adb49698f264c2f59c85646cfbc8dbb2c2364933e74d91d9a24bf266b8ecf2e8852786d21615be1a83d7807e3abf6cd9cef213243
-DIST kdegraphics-mobipocket-18.04.1.tar.xz 13476 BLAKE2B 2810f029dd4f1d765b1d59825e8678701438c1a5f424bf198b6677508a8bb6e5f229816051b3f04e7d79313ef95f2dad70081fb773c0f07b47b21216ac98cbad SHA512 8010969f847b33b4b7fe846f5292c1f767479894f7d837f0350f26ed9d035deb026e29cdc927d03e62f8c475f30c09ae24512b724d9fc2476ebde922677c56c1
+DIST kdegraphics-mobipocket-18.04.2.tar.xz 13476 BLAKE2B 2a24074154c6504436dab67bb698e75da9cb8cede9eae17db0db9327a55bea719e6f31d9103dd6f2becf88c7fa82604655bc4edeb6f2ea5d16886dfdffcf41fa SHA512 9cb5bcfbf2ab5970427ede9552bb36f512ca5a98d65542777ee60ca5d0b1a5466f3f9a455e81e20db1a848b23121d2a23ca9ea7208de561d4e1c67a53fe85513
 EBUILD kdegraphics-mobipocket-17.12.3.ebuild 422 BLAKE2B 6815ff8abcd82d201ccaebe992d7df276ac95c4c2474fb04478bf73092158c0b532157f85275842fd9b5400fd9f10bcbcc32e1c9b9fed2e37613dc453d31bde0 SHA512 b0653f84cf4b6e9a5b5c517268e728f84610939dcd17f5d6ed52f33140aea2e3030394b6584b4437cea46b27019e10f1792a6c35c6eec0641959fb5e4fa1d4c5
-EBUILD kdegraphics-mobipocket-18.04.1.ebuild 424 BLAKE2B 410d921f6cd5cea5db6e26634bb6a07d04c757e4f2497129722b1d4fa910189622fa90d4559aeee5e24bc097d77dc84401a9a307219b66937dd223f684ca67fb SHA512 5b3be652468b0003802063c8f6fe0da42d41dfc4fee9d0fb21ac0d39e346bff441e38b3cfb24b398d58c830fdf5fa6cc9d9aece1bae53cad4c6951316c33d600
+EBUILD kdegraphics-mobipocket-18.04.2.ebuild 424 BLAKE2B 410d921f6cd5cea5db6e26634bb6a07d04c757e4f2497129722b1d4fa910189622fa90d4559aeee5e24bc097d77dc84401a9a307219b66937dd223f684ca67fb SHA512 5b3be652468b0003802063c8f6fe0da42d41dfc4fee9d0fb21ac0d39e346bff441e38b3cfb24b398d58c830fdf5fa6cc9d9aece1bae53cad4c6951316c33d600
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.2.ebuild
index ec101c11b41e..ec101c11b41e 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.1.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.2.ebuild
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index 4d363eafbc74..6357866cf2c6 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-17.12.3.ebuild 683 BLAKE2B 9f2c1c82f6cf5ccaf7f02462d5298468d42aac913133b6b4893c6e0a3c0fdb9e84c89a711405f9605816f66c346ff1ca758e06987f4ef27cadfd512ef5f1eec8 SHA512 cc179782601d05ec6d00cac899a2d290989eccc10e4181dc277e52afc7877cae2bf37dd8cb96579921b5a6138a98b97a76f69c84c6ca1daba2a683537d5722a4
-EBUILD kdemultimedia-meta-18.04.1.ebuild 737 BLAKE2B 0dc7c6ad9bcaff2b6bb495b2486ca5951abd42e78cbcfe3c507280f1dc09517b3d8fb9305875a50345be0575a8c166369a97b6ae0e7c4a7ef4dc52cb213b8ccd SHA512 91cb69c63e506fd5c0de38eadcda200fe74cddb2368819c0ed86208f8c5cd4a0d0fbb646426f498f0f2838ba31e5e98a57f96db745a732b8e4f491d39dece0f5
+EBUILD kdemultimedia-meta-18.04.2.ebuild 737 BLAKE2B 0dc7c6ad9bcaff2b6bb495b2486ca5951abd42e78cbcfe3c507280f1dc09517b3d8fb9305875a50345be0575a8c166369a97b6ae0e7c4a7ef4dc52cb213b8ccd SHA512 91cb69c63e506fd5c0de38eadcda200fe74cddb2368819c0ed86208f8c5cd4a0d0fbb646426f498f0f2838ba31e5e98a57f96db745a732b8e4f491d39dece0f5
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.2.ebuild
index dfa492d4c212..dfa492d4c212 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.1.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.2.ebuild
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 75bc4ecf94e9..4eb6f60dca6a 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-17.12.3.tar.xz 323564 BLAKE2B 5d1e6b96507e983bb0d30aafc57c59517e6095546de71892e2686d13c96a980af390343a629e5f41426bfaeb010bd52739fb377356fb9854cdf783ece5f01316 SHA512 3152b7ba7eea4a8dd5f4dacfc87cdfb4236d678cf305bebeb915e3f13575d1924ef6418df1d7095ddcea83d17d614370b61738f62631e9696e41a313fcca7457
-DIST kdenetwork-filesharing-18.04.1.tar.xz 324048 BLAKE2B e9832cec3913f60987fdee636cb18f9f8a5d204341104ee493584b21aa2886dffc2742ee12ef79434cdc97fcc88bd2ea1e9b1d607d25b3d2f933ad4995fd1340 SHA512 6b96a82ec976dc7a631a46ffb49cd71befe4de6c2a6424b8aff59681006b0ca9da05658eba38e186aa1c189976d11f59de28b4ef250c9f56f5bdbf9dc3a256e5
+DIST kdenetwork-filesharing-18.04.2.tar.xz 324248 BLAKE2B 042f2718aebf6358dd2947ae9b6adc0428bedca0ceaecc4cc1186924ba38b28f51763609c461b0c5fc91805c3675c2bc4bd10ef45400d6d4860f25bdb26099b9 SHA512 0846720e05de6837b4c3c552effc2d72a463406aa35e82b0d7642460856f74faef07765e5731f2587c6b0c40f493e6a429b247869d9b66d2269e01a324a7db30
 EBUILD kdenetwork-filesharing-17.12.3.ebuild 572 BLAKE2B 38ae6cdaeaafa1047dddc6b3c303098db6343279be551b0f72f51b2cc324afb789e6db3ce575572f7b1b793d1e432654dd44f1b9eb337064c4d569e7389459d8 SHA512 755e810f11580ce3c59b3ee8a215521ff5eb7d97bb9d69ca8f0d6a52ac9d73c7ed7c5f6d1e8f1c2ce30cb07cd8cff0f86f219b00075e58f420a1324220f5b3d2
-EBUILD kdenetwork-filesharing-18.04.1.ebuild 574 BLAKE2B 62863974d57cf0fb799937edaedb2db6df3b483e1d803a7388fb3c24348837e264018608468ec9ef379d937dcf7f7a66476a647c15da43283c0bca9a580c5c43 SHA512 0acb6b4093aa0eaf193db4578e51f94ecad8ebc79ddabe531816c0f80cc245cc74aa51e0347d1c5f33c8db5d6abe9501a0ec51b01b9aab77744e89bdaad265aa
+EBUILD kdenetwork-filesharing-18.04.2.ebuild 574 BLAKE2B 62863974d57cf0fb799937edaedb2db6df3b483e1d803a7388fb3c24348837e264018608468ec9ef379d937dcf7f7a66476a647c15da43283c0bca9a580c5c43 SHA512 0acb6b4093aa0eaf193db4578e51f94ecad8ebc79ddabe531816c0f80cc245cc74aa51e0347d1c5f33c8db5d6abe9501a0ec51b01b9aab77744e89bdaad265aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.2.ebuild
index 13f47494f491..13f47494f491 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.1.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.2.ebuild
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index 46c676c8a7e4..4aba82976992 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-17.12.3.ebuild 459 BLAKE2B 3392228fa2e577ad43cf8533792ca73de59d71e6838d72b023e2ceb7cff4ef2f673d258c886ebca4eb6d1ba023e63ba2c9fbca6ea0093dadebbda9e603f04868 SHA512 5dcf7efc7c7574854ba439c20a8af85cbd15818d807605e933c914aa89a5632b06f4ea950df32dbe830c2d865726a10235d803eaa93a7d94806b1c3bcc98dda8
-EBUILD kdenetwork-meta-18.04.1.ebuild 513 BLAKE2B 6d7213059830c2624b7274aa5a7f68f6c8f68e791e3fb21dcba86fd8a30afc98b342ad7f6741d77f0013ca2d2b892a2ae8bddd8c99357d0adbf56aaf80e88a73 SHA512 b78a7765d1c786383b6c085f1c8f7397beaee2208f2f6950de2e4a861b9443f88a6045748dca1f9a41c51d78281fe1692fd9295aaa3804db0756264d5c0509c7
+EBUILD kdenetwork-meta-18.04.2.ebuild 513 BLAKE2B 6d7213059830c2624b7274aa5a7f68f6c8f68e791e3fb21dcba86fd8a30afc98b342ad7f6741d77f0013ca2d2b892a2ae8bddd8c99357d0adbf56aaf80e88a73 SHA512 b78a7765d1c786383b6c085f1c8f7397beaee2208f2f6950de2e4a861b9443f88a6045748dca1f9a41c51d78281fe1692fd9295aaa3804db0756264d5c0509c7
 MISC metadata.xml 410 BLAKE2B 8d98bd833e50db75f604cdb99878a614b28ad320b4a377b75897b7bcb6d0b95f5b2fa102661fc26474533eeda09e7cd5f8fe2131d0162f85b87c45a8aee9649f SHA512 049780b067ed1159cac1db34a6408997d614c74445b74c01d0fb3bca4beb46185b8bed2e2280f590501b44177fe13a5bf3fa090c21cfb5455b4e7a3a44ef1436
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.2.ebuild
index fcca5f5440b6..fcca5f5440b6 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.1.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.2.ebuild
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index cc92708c1851..f6d2bea3640b 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
 DIST kdenlive-17.12.3.tar.xz 9383532 BLAKE2B a348cfc3622735af5c37d60f43645062a0bb077e1b10fd780d91ede4d1c6298fe1cad3ce8d6964b33e4b60ad7074ca656199209c827deb2e67da5a71cd341593 SHA512 8142229d01c4c5108bd1482f6479dd7ef7ccb56e19152a74021a47939aedd5841f9161483994f2e8078099b4e3c65a501736938b1ea3233779498f0d8cf5272d
-DIST kdenlive-18.04.1.tar.xz 9391408 BLAKE2B 73a2bfe21a275d39a97876ae69b22611f9552129b67d15f3255b3f2443c0fe324dbd2388bd8aa5d2693c9053ce21051a46d54ae8505dac2940894a089871bbc9 SHA512 0e9c12359c9a17475573fa15289d89313a12def4baaf44101c51057200b1e259f91663afad16cbd8b93fc27b46bac48a6f9fd3dd7f33c10f219bfacdb552cc0d
+DIST kdenlive-18.04.2.tar.xz 9398952 BLAKE2B 30cf64dc854f0338ba4f26961c1f77233b5e3dfe65659796067083965e9c23a1d673c2a69dceddc92c99df982b94eb272aa03ab85e5e02e73ab36e583be0f2d2 SHA512 efd895d499db6c799d56adcdf0b7b4b034d46f0319a8fe31541ae1dab800cdac62c2a6133f96c359335cd1cf4828cc860aad7698b3033638bb34f50cf3359014
 EBUILD kdenlive-17.12.3.ebuild 2087 BLAKE2B c8ac625eb0726f290615cf273c6b55fa64e4ddd253531be75b0fbaf8e36e8807c17588a95ca005bf7d7f289b56caa834408fcc5ea459e2de0ecc9daace50517d SHA512 23b0d0a856ded3048f40ee67ddb581c5bd385b5d2aa671b3c6cc649d7377a9c234e98c1a3cf6491e9c42d55ef9126ccd9570fffd1733a14de348132c724cf7a0
-EBUILD kdenlive-18.04.1.ebuild 2117 BLAKE2B c797fd67d793c1452dd7036657ce0cb83870a470da672275e3cda99f21e1f2c103f034ae02b21ba1f964f35b3746159d6436e175e56b1407066b4ad68ae975bf SHA512 30ddbb9448936f192b2852928bb86c73921b88caeaf8158f0220262e2faef5c87cacf345feeb20cf0db3ba5094da9536f2dd8ed9f071b2921278f20a38c405df
+EBUILD kdenlive-18.04.2.ebuild 2117 BLAKE2B c797fd67d793c1452dd7036657ce0cb83870a470da672275e3cda99f21e1f2c103f034ae02b21ba1f964f35b3746159d6436e175e56b1407066b4ad68ae975bf SHA512 30ddbb9448936f192b2852928bb86c73921b88caeaf8158f0220262e2faef5c87cacf345feeb20cf0db3ba5094da9536f2dd8ed9f071b2921278f20a38c405df
 MISC metadata.xml 531 BLAKE2B 2418fe9902d1e4253198b8ccb70ce23cee258143c0da3d99198328e02d2a1ce3ca1e327afd5beaa4ec3a41c04a5c5cd6c2b8d0943fa4b33599ddc3e9eaf59737 SHA512 f3658592c4023a1c101a2faff25018061f7514d5110794e137f72b31106021d581a5b9fbf85b460e55b541a2d11af77a074d702896cb6ab07c4e46740832fea6
diff --git a/kde-apps/kdenlive/kdenlive-18.04.1.ebuild b/kde-apps/kdenlive/kdenlive-18.04.2.ebuild
index 898340cc812a..898340cc812a 100644
--- a/kde-apps/kdenlive/kdenlive-18.04.1.ebuild
+++ b/kde-apps/kdenlive/kdenlive-18.04.2.ebuild
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 0f2317928f1a..37870001d537 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-17.12.3.tar.xz 2038588 BLAKE2B 76636629c40b81afa4cd6bdf273ea250e196247e2673365dbfb768c76449b01a72ad80af277bb03e31302b4ba8643f5d783b9c05aa62dea8b8eba1effce8a68f SHA512 15e15f5a7a00db274f1ac643d03b41cb71949ad7c36d35c19a011d2704b887dd1f23e78dd6f8ef04852a7934e5e5361fe0a60c93e17b2c891d55baeee75352f2
-DIST kdepim-addons-18.04.1.tar.xz 2508620 BLAKE2B d1ca4aa0b925b65297d8a3fce98915f2ff9b43a793b0e5bc4eacf3aed2016260fcba4ad03745b37fa190bd3decae201c4642df7fc87c2531b8aa58ded1f28cc1 SHA512 bf7d14869b7feb4f38df776addb409cbcb47ce54014f2c298eb3e1f188093f9b90a6f78ccfeafe7cfd1f0a2bbbad1dc0157aaa0b1e314a7d18f682057098a875
+DIST kdepim-addons-18.04.2.tar.xz 2510472 BLAKE2B fa34cf0e3e8191e4f305f72a3e293bfe2c3b6b30fda2642c5777230055238abd878a81426f1a922fa92552d08f8e97bc01ab19cd9128c36ac01088fc49f4e819 SHA512 c57c3bbc4d1b47ba6b8c6ff782727c0cf47732a465cb06543a48823ecf77d31594cfe93da396857d46b4f401c70228c27992c055fa35096d043dc58b721d6175
 EBUILD kdepim-addons-17.12.3.ebuild 2254 BLAKE2B feb95b32a64c8d8ac8e0f7664cff63fbbafabe83263fb9920dce532d3736c49b7db26506799b267ea74c1b8de94a3600768ebdccd62e0843cbd5c2df0f05e1de SHA512 8d0bb5991fefb409d17e1575cc9ab1aee3784693e15df062c77ab3d07c0df403d905db5eb30728353b48c0287eb5d4b33d7d70f64d7186d2e2a991b12225be17
-EBUILD kdepim-addons-18.04.1.ebuild 2256 BLAKE2B 0489fec6b17fdb1d163e974a1fada3fe8f8e7636e40cda74dd79c14c0d881a160f52890e478add42be02f13424507574372db60973705b5937a983e7ae2aed6a SHA512 e5a7ea05a5ed21b8e3bdd2ead32a03ba87f249b0c9ac43eb0b14664d6fe7203c44f438ee9138438b96df6c7a6385521d99fe92253aa6cbd36c8aaa75db314d62
+EBUILD kdepim-addons-18.04.2.ebuild 2256 BLAKE2B 0489fec6b17fdb1d163e974a1fada3fe8f8e7636e40cda74dd79c14c0d881a160f52890e478add42be02f13424507574372db60973705b5937a983e7ae2aed6a SHA512 e5a7ea05a5ed21b8e3bdd2ead32a03ba87f249b0c9ac43eb0b14664d6fe7203c44f438ee9138438b96df6c7a6385521d99fe92253aa6cbd36c8aaa75db314d62
 MISC metadata.xml 378 BLAKE2B 9ff4bb4cba46c784e2664d026e71aa42bd2bc3336e5107d9476fb13aa57646b06a21890047e2ce763223d1c359c161f701148d58df6c2afc32c18112a6e5942f SHA512 6a36925cdc8648716b5b3c6574f544b5dbe2bcd656a2594930a8d5d9b2600bc3a9c98801221191a2c308c5d05716d48859b381dc6c0343ab6894b8c704280701
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.04.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.04.2.ebuild
index 5a11e4f931dd..5a11e4f931dd 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-18.04.1.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.04.2.ebuild
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 17bf9e603fbb..df5eb2c30945 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-apps-libs-17.12.3.tar.xz 72912 BLAKE2B c7988237e127e6b5c79f1488dbab6b2594c16c93570ba5f2dd3f61f477f9a0eff4061417c913eaae20f359037a045c349b960b8252091c180e1aac1cc69725d9 SHA512 ffa2f59f95245ae5f6de56c8bd70a7f7b08cb063917d37aa225ffb7f580460ee951b442b1678151a1cf9ab8fa2fe04a36fcce8fef9773256dd74091337014e50
-DIST kdepim-apps-libs-18.04.1.tar.xz 73120 BLAKE2B 399c4844d7cae546c1cbc47549bbddc7d4fb7aa4c8c13478d9f3fc39a18a63c30ddc66123c68f497025f656f73afcc17ad5335d38292a3c9f5e8c0d74bc86278 SHA512 7db48df898e0e1c607e026a7da5ea6004cba5943a641166cba9ba3200a0d3f129aef21e93ca800fc460cf815cdf037e97e490dc9f868555550c0a8b19743d8cc
+DIST kdepim-apps-libs-18.04.2.tar.xz 73240 BLAKE2B 1e12269b6a3e87f5b93d42336bda7587c3a6fab7b26372b2b9e8df8c7398522ed82bc3aa8971849c92e417f232825a46e3466224c7c3916563775529485cd9c8 SHA512 5bf83c792d3a3eb9f77e5a0044d272374b29dfd7505b747db177260d3ff6f38a953515b9042ee455d6f66920163d519b5c6824ea1d3efe1d5e76de5c3ff87aa8
 EBUILD kdepim-apps-libs-17.12.3.ebuild 920 BLAKE2B 7f5d44fbc2462713efaac8d6626c0b9a93443b6ab5fc61d2430ffad2bfae7d28df323eb83cd25db915e32df9de55c39e92c0e1003f4a2ffa537775afea24d6ad SHA512 4b0f06a6d396335e9f7d87b6e2d22a4356ae9d4095f4c9a41c865f2fdd50d0e7129b11100c3acaad4e552ee4caaab3fc38461c38bf3f7be2baf03713b3a45a32
-EBUILD kdepim-apps-libs-18.04.1.ebuild 922 BLAKE2B 9023c2146ca7b469d010e479e010ec8671c24fa64ea2ed0a05344c67309ba2a8d069c0f0bafc4d241d561c10144182f65a5addd32badc5c1b6629a95b98b90cd SHA512 974b0ea380d8669d47dd6918c24ab52aa624c47a45e046846f7533936181cb5c57eabf26e07b9332ce3e3cb7706894900918768b9d71be8667b2d9c13b8ff751
+EBUILD kdepim-apps-libs-18.04.2.ebuild 922 BLAKE2B 9023c2146ca7b469d010e479e010ec8671c24fa64ea2ed0a05344c67309ba2a8d069c0f0bafc4d241d561c10144182f65a5addd32badc5c1b6629a95b98b90cd SHA512 974b0ea380d8669d47dd6918c24ab52aa624c47a45e046846f7533936181cb5c57eabf26e07b9332ce3e3cb7706894900918768b9d71be8667b2d9c13b8ff751
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.2.ebuild
index bdabc1a6ae7a..bdabc1a6ae7a 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.1.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.2.ebuild
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 22933267186f..5ec111489475 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-17.12.3.ebuild 2087 BLAKE2B afc09acdaa85df96cf067382914d3b79286d4d72abce61bdef73bd6c922850109803026dda15b62f294b0d68c7af3b2638bbce24fad69693427d05bde5527073 SHA512 a754585116fa52a7c67f85a12928364e3143c0af6610d2e4a7fc11326dabf66c43cdaccfdc9a825553d61f45a509c870ababdb8dad0b0adb12ef3ce67d86d227
-EBUILD kdepim-meta-18.04.1.ebuild 2056 BLAKE2B b8e5e837b44fdb1ff414d772ff6a499d7c92fb8db831517d8f03cd79ccdc166304ec689dbfde8e3c90cc2dc86177230797aeb0df2350e4defdc6ea92b6528d78 SHA512 4284c323335ce71fe2bbdae98cc6a7ee7615d4dac42b3cac7f21860883609af9fa4c2e01e6402078e21e736b7a6e8df784af3dc75e501fbdcb538bccb563d914
+EBUILD kdepim-meta-18.04.2.ebuild 2056 BLAKE2B b8e5e837b44fdb1ff414d772ff6a499d7c92fb8db831517d8f03cd79ccdc166304ec689dbfde8e3c90cc2dc86177230797aeb0df2350e4defdc6ea92b6528d78 SHA512 4284c323335ce71fe2bbdae98cc6a7ee7615d4dac42b3cac7f21860883609af9fa4c2e01e6402078e21e736b7a6e8df784af3dc75e501fbdcb538bccb563d914
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.2.ebuild
index e6ecd44f3a8e..e6ecd44f3a8e 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-18.04.1.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.04.2.ebuild
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 6c4b546f554d..df25286ed4e9 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-runtime-17.12.3.tar.xz 1796892 BLAKE2B 8e74409e6a5eee9201340f971f14324eee68d1510c23f2684686a3e8b8463031cfd6658de2073f1205f8c6f7207d1f1dabbddcfad05c87fa7c8665dd30566bfa SHA512 9ddb7c717a94ca75f561e54f7842c18c2def83c129f004e345a32ab4de4a5b4b15ec50f2044000d785572636a0d78adc4d90f9b3550ed853cf1982c6ef749aa7
-DIST kdepim-runtime-18.04.1.tar.xz 1749484 BLAKE2B 7b1e2654522e15f881e9fb2429387af31f7a46978f367d5183fdf5b2fa119e120a493a768c8a88cd159af5e2922316147031268ce45094a7afa9849edaa35428 SHA512 b9aed0799eb6bd6c0c21c1d8588b84f460a793b46f9cf79381d2f7c8a43a6fcac658c0a887ad7fd62ba7224c8b014c03aed7209a952c6d2814fccb1a3c24e769
+DIST kdepim-runtime-18.04.2.tar.xz 1751204 BLAKE2B 206830dbc56c12924ac6556711d486cc29d83f945582520c4fe9b5b101b788122a56e277ab16bbf7c7d2acd0063749fd2a86c1196e7e2558d6a0033175350c93 SHA512 649a9f9ca2ce0c51a3223ce46a8facb76c6c60447d69648301abf4fb1e5f3b72190812c5f09ee5e4e2faa440680ec661264390238a71c6f1074a03aff3041b1d
 EBUILD kdepim-runtime-17.12.3.ebuild 2099 BLAKE2B 89590057bee63523527965deaa1c1b2b75640d6e3a9a1e4204dfd4122c273ceb20e65e4da8cb6fb456b135fd0d6638e173e80957eddddf1c929a4ba66ce9805f SHA512 cd966833607fa7e46b7d39ccccd557c09698aff2c0b883e7b9f71cd83e147db3d0e2da1e792eaa4c874bc626e05529ac1a5562965120d3b3ac51816fd28fca5f
-EBUILD kdepim-runtime-18.04.1.ebuild 2134 BLAKE2B 2cefa8be75ab1b12d40e5dbd20f42aa5c018b7541ac364aa05da4893d5e45d47a8f561cafa96ccdca3321a379754c14b1d264856342008c3c0bbcb101036666b SHA512 45a5f3c65d3e33404c1a1dae22c59b5514fc566e3bbe905c0a020e8299f335b195434145c8b16d95d5abc7cbe72d8c96e11c6ff94b55ea19cd45d230e6afff76
+EBUILD kdepim-runtime-18.04.2.ebuild 2134 BLAKE2B 2cefa8be75ab1b12d40e5dbd20f42aa5c018b7541ac364aa05da4893d5e45d47a8f561cafa96ccdca3321a379754c14b1d264856342008c3c0bbcb101036666b SHA512 45a5f3c65d3e33404c1a1dae22c59b5514fc566e3bbe905c0a020e8299f335b195434145c8b16d95d5abc7cbe72d8c96e11c6ff94b55ea19cd45d230e6afff76
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.04.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.04.2.ebuild
index 4f1d61f160a7..4f1d61f160a7 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.04.1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.04.2.ebuild
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 402e220a3d37..641daa08154f 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-17.12.3.tar.xz 37376 BLAKE2B 6d3e5f63ba3aa306df92740cb7e0b3adf46475fbdae8d3994e0682f5c6ce51e16e9c1288d85c9b9f5cb20ffe21af39d3fd99602cc6877b7bea0a2a2efaf72d33 SHA512 c82efe950bb23a8a78e941136a544fd61eaa96421c547b1d68a8b21c265ed69d746fdb14078dde007b96d800aa8b53c629549de01b64733ab830990a65161750
-DIST kdesdk-kioslaves-18.04.1.tar.xz 37420 BLAKE2B afb452cc615f021b0718611ddee2e3b8aa12f7e1d5b4149dcb055e6c2b0c8ce0dfb9318637a222b7bb047360c63c8884b737629adc298143fdefe541193560e2 SHA512 31e53613e680a630c99cdf83fbbc6f59fc585aa0084b11dae49b2e02f0ad8c38ca977262f8b86aa7828d1815d379e4438ca1bb50a2cef503453a8090bb16d18d
+DIST kdesdk-kioslaves-18.04.2.tar.xz 37496 BLAKE2B 06fe9b4ae9240632057b1f2131546068c847917d5bd59e57cbe352012d6324d71ad244859f5d68c889b30c95f7e8f7b4d58915cd9246218ff42e4b83f8f23161 SHA512 635b4742a11ae45d0715e6206d18ec807b49829fff659773475f601373b77df8b6297a1770350ad2387430336b4a8a6dbd83e264df51af0bdd86e0eb8e274d82
 EBUILD kdesdk-kioslaves-17.12.3.ebuild 375 BLAKE2B 8df34029202846d40886767b498ad131fbfe88c9a002f50c7b7bee550aa2f9d527ccf52d4d3c4ff4772457ebcd6cdae914030cc4428e9740639da9cd2e8d3c94 SHA512 99cd80231159521eff93142152fe52833f8f36d0678f4ccaa9e85522a34dd77f1ae5b1070d527915ee34e99219d55eb61e811e4608dc40a27fe8c77177152488
-EBUILD kdesdk-kioslaves-18.04.1.ebuild 377 BLAKE2B ca74c8f1cd7219bde81271519fa533aac2b4a2be76d5244f6f064178467d8b517db2cdb6f2119b59cc8972b1105c20f24b0219f72318eeed1b950d2f14d7ad34 SHA512 29bb043e718d0472262fd8d4230e2d8fe2953fd8171e3e974df3b92f967c319486ef73724376385c8cb98c8225999d526f7a63bffc69e6089e3a32d0e3063cff
+EBUILD kdesdk-kioslaves-18.04.2.ebuild 377 BLAKE2B ca74c8f1cd7219bde81271519fa533aac2b4a2be76d5244f6f064178467d8b517db2cdb6f2119b59cc8972b1105c20f24b0219f72318eeed1b950d2f14d7ad34 SHA512 29bb043e718d0472262fd8d4230e2d8fe2953fd8171e3e974df3b92f967c319486ef73724376385c8cb98c8225999d526f7a63bffc69e6089e3a32d0e3063cff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.1.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.2.ebuild
index a659366d3db0..a659366d3db0 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.1.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.2.ebuild
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index 369a22ab1c0d..338fa35d748f 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-17.12.3.ebuild 814 BLAKE2B dcea153082a4c8fd1eafa4845e6f8744c1d3dfa788e886ae726f66b611c3d571434e6d3f91ef586650799ed278d6d859c2f6911f02c25792e8d8ac9d2a183de8 SHA512 543148e3d0c5408e70e99bc83116c233c9fa91224fd0901bd282d6dcf9a980cfefa66a85a80e380791d2a6fca166b6f17254e8085a9f42282951f2e5430963d0
-EBUILD kdesdk-meta-18.04.1.ebuild 789 BLAKE2B 8a714726b17b33dc7543e235c16e3ef1c7e2ba5448e2d13c5099b33694e8f8ce3f086517408c00548f84eb8560b9320ed20c25824d11a0aee38105cfa96ba988 SHA512 b47c1cfd369b996ecaaf797b19a29d2b3984992ff0395da2141b192d25dee55fd0f2c2d6fd53c94f7d31b0984926350c6f0ade56acae5284a7a17d97d2515ecf
+EBUILD kdesdk-meta-18.04.2.ebuild 789 BLAKE2B 8a714726b17b33dc7543e235c16e3ef1c7e2ba5448e2d13c5099b33694e8f8ce3f086517408c00548f84eb8560b9320ed20c25824d11a0aee38105cfa96ba988 SHA512 b47c1cfd369b996ecaaf797b19a29d2b3984992ff0395da2141b192d25dee55fd0f2c2d6fd53c94f7d31b0984926350c6f0ade56acae5284a7a17d97d2515ecf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.2.ebuild
index 0759a45c3992..0759a45c3992 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.1.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.2.ebuild
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 5df9fcbdb929..e20895f40738 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-17.12.3.tar.xz 17164 BLAKE2B 5189bcfd5b39d3d91af18b3e0c2be39c9cd889eea6402b8ba98f6d9bbe2ac1b28d30d68ae476e3b26d2a75f29e8f73cc304dbc67cfaaee381afab2ada1564a35 SHA512 4a1aaee48d72601730a5eaffccfcd8f3fc10c848af4c5b72d0a81a41c3012521e43c259fa1fecc83268261290d86cb188c541d06827bb7cb990148257b699c45
-DIST kdesdk-thumbnailers-18.04.1.tar.xz 17140 BLAKE2B 9308806536b71cfb0ccf2600a35b0b8e02f57b9b77c4603abb075f5a847d6a3a17e4f43ef2a42242cc8d76b5af6ffee3321447790496ee8c5a40c5a050c44aba SHA512 7dfeabb21173f6429e1ee373b251eb42fff8db2d562a3bb3eefde97affd1793f18e100f4f40d5de611b882cd9aaa547436923197ebe4b249f1efa22cf6f2906b
+DIST kdesdk-thumbnailers-18.04.2.tar.xz 17216 BLAKE2B 4f1db9fb77da985ec0b376a07e7382a717c6ba494a61b9174ba27ab1fecbfa003778531447a76361a37fdedfa2a94e982257b6c5621fc3b63c9f7efe5c4c8640 SHA512 6e09965f9b22a4fdaa8029767eb86f2a45f3ae749bf1a1823a316b65a92e8c43722282b24d3211feb036eb51573398a04f709d5765745680ea63d052d1260599
 EBUILD kdesdk-thumbnailers-17.12.3.ebuild 428 BLAKE2B b1487995dfe76b2153c1ce5a8cb91165f9c26b4d92026b662e07c99a792b98dfee71fb2a449cff6170efd6b28eafc35f10e1b66f4fdfe9217fc48c924a96a104 SHA512 0b08e749f42ced5d342bba47dc64a59f5627bd23313b1ddc0ed38f30c6e2804b5827234c6f9335a6f9ae6af61d9e94ea4da5f144719f62addbdaeca2958a3ab8
-EBUILD kdesdk-thumbnailers-18.04.1.ebuild 430 BLAKE2B 925942c8b5354bc3c7e50d06e56501f3b1dc143bf3d37d8e81880130b1638a04b413ccdbb8513ee98c1f5e8838431e63af3ed734cfb71931b80bd32899765ef6 SHA512 a8b1d25f298c26729062444b842d899c65a1923b80e6c72964c0a14dd44eb2963f571610ab221123b23eedbdddc62adae750622d7b2a26ed4cc57a94352e7f6f
+EBUILD kdesdk-thumbnailers-18.04.2.ebuild 430 BLAKE2B 925942c8b5354bc3c7e50d06e56501f3b1dc143bf3d37d8e81880130b1638a04b413ccdbb8513ee98c1f5e8838431e63af3ed734cfb71931b80bd32899765ef6 SHA512 a8b1d25f298c26729062444b842d899c65a1923b80e6c72964c0a14dd44eb2963f571610ab221123b23eedbdddc62adae750622d7b2a26ed4cc57a94352e7f6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.2.ebuild
index aa6e30a17640..aa6e30a17640 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.1.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.2.ebuild
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 85d347f9fa56..432599d3ebf5 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-17.12.3.ebuild 780 BLAKE2B 9c88d6fa4afe2aac44e6346be781b1d01df5b6ece0db29b776d87b22558318b8ecbf51876d6505d626c78a0b5e43a0eca58f66e221d942a4bf8a0856e4196d51 SHA512 9183685acacf514d5e0efaa07af67d15a61b71ba0c5bf02b19c572bca03d39b32cc4be2db42289bbe81f79adb752f537827e26bc9efd8ec1aa9c7ff30c960ee4
-EBUILD kdeutils-meta-18.04.1.ebuild 810 BLAKE2B 254d18dacb012f2eb254911546d48a51132ccd99113b1cf562e12c70207cd9f61b93e2a3c2ed85320a3c3e15b40e0a68feaee7f345a06f574a35904e270cf63f SHA512 26d2a351d77944ef5206636f52eb26162d516c47329d45b8577a5527f6e23fc6088365bf0dcd5ee0623bb588b5c3897435dda26e7328f3657a415e98bee08df1
+EBUILD kdeutils-meta-18.04.2.ebuild 810 BLAKE2B 254d18dacb012f2eb254911546d48a51132ccd99113b1cf562e12c70207cd9f61b93e2a3c2ed85320a3c3e15b40e0a68feaee7f345a06f574a35904e270cf63f SHA512 26d2a351d77944ef5206636f52eb26162d516c47329d45b8577a5527f6e23fc6088365bf0dcd5ee0623bb588b5c3897435dda26e7328f3657a415e98bee08df1
 MISC metadata.xml 389 BLAKE2B 7f665fc6407ec0455464d44f43b98afba7702a6b7a2e65841d2bd54dc7c229cc5c227cdd47fd81eb7cb97e45b69957c2d4085a61e2e2eecd2e2f8186d896971a SHA512 f991910e5080fab1810b9762700b528556370472cb796e02c5f03fe63058f4e5d665ad39b6de597d49c04c233b09a4b703c80408205a3df175025c14767cf564
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.2.ebuild
index d34c1f9cdd38..d34c1f9cdd38 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.1.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.2.ebuild
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 3809c7cfe3b0..c5bcfc5ba653 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-17.12.3.tar.xz 531168 BLAKE2B 34999ff9c3dabd8f83b3b4e1f197d6587926782ee68cf7df1897316ced417a8a5d6fe83821f9d74f3a2eda95e65c87bedd06822e71c6776c9dbde4705405ea5e SHA512 4a39e1f1d25d73171ba5b299227b9e4e51778d27a544b0198d77217904a5479c9e7107b15514f1ed1b9e2c8418ee3afd134f23c929b796a940a851b104563167
-DIST kdf-18.04.1.tar.xz 531576 BLAKE2B f9ae5b8c8a9073bd03f4d7b793fce1f964cb89172b895dbc224cf667abcad90250a478bf1d4889fc82676a36a2655c76ad13a18db7fc57b35676f9328f2820d3 SHA512 8d2821a09831230da41de2c35f0173b7a8a7db7a87132919ca52945b3b4e14d993b8e9771a3718c6e0cca285cb181e5f8e9177d1f4ddd22a6dee9e344c98dfe0
+DIST kdf-18.04.2.tar.xz 531780 BLAKE2B d46fd59d1426a967f70e809f555bb75f4857310e737c054ce8bf79eb59ea2bd2261a9ab1dd4803ea0309f9056198ba7a9aa053abef2ab28707a16fb08fb242d8 SHA512 4eb8b632750cadc6113fb8f9fc6a608290fce168b21a8387777f09e2127e51693333154f17ae72eccfc381e6d50abce39067c18a16d9c254d4d599a003e118a2
 EBUILD kdf-17.12.3.ebuild 723 BLAKE2B 2cd42edaa2ee679b03d8557f41d0751eb21363e51383ba705ad10269628fcf602425cecc819004cc22e0635a3f1e0ff71c9807db6109afff199def42e8458be3 SHA512 c3d2ccc31530c8902ec386e9c7e0f91906cde6cce2b9702e44cbb5dd71c3a9b40b13eb679f11da1c90436f5eccb13a7bcde0ba5f14f869858e0979bcb8a38885
-EBUILD kdf-18.04.1.ebuild 725 BLAKE2B b0897058417fce2b6c420dae4a8568151b2a7602e2d7b900353917ec88a21b695f973a8f6b0c3da21a681aedf9bfa2d44c79230c513cdd653ee9aec6e2385724 SHA512 f7c33825bece4ef0b1a4058795947e9a9ce15bcdf47e0021df052406811a9b485e7fcb44de20122e0864e50eb464c1fb7b6e674753961e3b5a405776c779775e
+EBUILD kdf-18.04.2.ebuild 725 BLAKE2B b0897058417fce2b6c420dae4a8568151b2a7602e2d7b900353917ec88a21b695f973a8f6b0c3da21a681aedf9bfa2d44c79230c513cdd653ee9aec6e2385724 SHA512 f7c33825bece4ef0b1a4058795947e9a9ce15bcdf47e0021df052406811a9b485e7fcb44de20122e0864e50eb464c1fb7b6e674753961e3b5a405776c779775e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-18.04.1.ebuild b/kde-apps/kdf/kdf-18.04.2.ebuild
index 3ac87d6ff652..3ac87d6ff652 100644
--- a/kde-apps/kdf/kdf-18.04.1.ebuild
+++ b/kde-apps/kdf/kdf-18.04.2.ebuild
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 4347aaaa5650..ee29811dc883 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-17.12.3.tar.xz 95956 BLAKE2B 5a7aee1b13e3163e29f85a98f17fb94e0d4503ad43f4c9a6be82df8bbd64e9ad12de80ebc33248c79c63f27240d192d184e5c9f7d85e458dca22731b5678a599 SHA512 412cff325ff8bc77f91077d5a364f4e900d7344f27a0b13d9319c16c903bf9d7ae79e3687f53167e0157600988ca8c77ef005e37e3fe8d1a0c45c8f776de1e4c
-DIST kdialog-18.04.1.tar.xz 96468 BLAKE2B bfd26f0b425a5092bc94f00d988fe221929d5f3644edfb6bcd2925d73d111a85813411cfaa9f136d7f6193257c4809e71e73daea08b7173d31cea2e6387c6544 SHA512 b51ea436c6e5ea9650a7f4322d5e21e704e7e77a579fdb6e4a100606bd71bd9abc0d3603aa1e75524c3c0885e910f5b6b0f5e5d1f1f5c6bd03a85e97a99e3ced
+DIST kdialog-18.04.2.tar.xz 96488 BLAKE2B 10434a6cf2c6ff0d7a72e506d001fd1a5ff5f532545e9edd99715d2432ab194a66d4e831947315ef1704ea17c10bf55bdb023ada13b953f39e7b78263562fe00 SHA512 8e5589a1ca714bc84597f3ebadc91727f314e5834495a8559a19087f41a5cca56e01a9ec594e71708082bb30e4f639397f9b5788d2d4effab9a409b3f03b8f78
 EBUILD kdialog-17.12.3.ebuild 835 BLAKE2B d1530d890374d6a94b326c053cb83f3bd834e9a1447aae26877096cc997bf4ff4dcca7fa80d2122b32e5a0006e73e8e02c2ae1821af62e7f89aad286e20b2bca SHA512 801f9facb90bcbb670e3c253e4e308b1c46f17435fdc5306170d3a54d744393e8552b9428e313310fdd85ca5b122c99c92b87ec83ad95adca7929b8b0f87a96d
-EBUILD kdialog-18.04.1.ebuild 837 BLAKE2B 699390df60024475a60b5b2f0ab567839357b01ad6db2ffa9987ccb6daba501749181e4b4b9b30dfa1d928e56743545c448ff9f7096ecf92e6ca92b8ab3b1e8a SHA512 e25479d71bb7c8ef910cdbd858489cef9d1c75636b84841edd36861ebd9d0983d09d209ad716b57137d4816bcb4303acfa19562f74702dfcae07ed57d316c49e
+EBUILD kdialog-18.04.2.ebuild 837 BLAKE2B 699390df60024475a60b5b2f0ab567839357b01ad6db2ffa9987ccb6daba501749181e4b4b9b30dfa1d928e56743545c448ff9f7096ecf92e6ca92b8ab3b1e8a SHA512 e25479d71bb7c8ef910cdbd858489cef9d1c75636b84841edd36861ebd9d0983d09d209ad716b57137d4816bcb4303acfa19562f74702dfcae07ed57d316c49e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-18.04.1.ebuild b/kde-apps/kdialog/kdialog-18.04.2.ebuild
index a3f46e46a8fb..a3f46e46a8fb 100644
--- a/kde-apps/kdialog/kdialog-18.04.1.ebuild
+++ b/kde-apps/kdialog/kdialog-18.04.2.ebuild
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 911e9c5ebafd..5b7697f30146 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
 DIST kdiamond-17.12.3.tar.xz 4606848 BLAKE2B ddb65e22deeaf41cdb125ea7dbac51c82a7f7e2528f77e49738261da79d4507f3b61a4261014d16ec5e1507b2317e483bc2e01d2815587ba6629feaa55a16521 SHA512 bcf362489e0e1ace69de17fb33bcf2fe8237565a620f6cb4f6a0ac5563c93c1e7ecdf76e5411463daa7a71225b91c2dd4131b1726566e9ac6b80d49babfd2b4c
-DIST kdiamond-18.04.1.tar.xz 4607692 BLAKE2B 44063ab058c5ba6d7121d1d7aa9b6cdae821aa1e59c524a2242558890b6c8c4b6ed1ae50db8cec9b494b19310283a60ee514fc2cf7dcff986973b1544827dbc0 SHA512 07b8ac34f5fdb940a694477bd0f52480498060ed73560d5babc95958ee6b9e5b9ed542c7be52a8ec6120a628cbce0f092ce800026fa9b31c7088d407a09bf8ec
+DIST kdiamond-18.04.2.tar.xz 4607796 BLAKE2B 65d1e6f350e59a1eedabdf96ffb44f0226aa016edf1eb1688c543b5e1fca31c8c8777a9b7b8fa088b6005bf76df2031c656b38880433681dd83ac8576f8b8c48 SHA512 82ad3610ca701760a818290624ceffb2f99925139c0161b889a11e17a9b6e11a4ccc157feedc28dc3c22ea22b01a0f3a1a9f11571fa6d0a316308482e1ea594c
 EBUILD kdiamond-17.12.3.ebuild 789 BLAKE2B d3c9f7a689285fa19ca4a69867de48ec75c3159cf478ea9f6a65fd6fb2f1c411422f6c34548cf3217a3ffdf1b66221f6ea1861527696bf8f0848cc68d15a7793 SHA512 2ac9033bedf4e831528a6998b77f6f02bcbc453648a9dfa2a4d564cc4c6d0bbc9ad108d171d79b722245daeeeb89395bd16860676d74d0561544e24e48cdc47b
-EBUILD kdiamond-18.04.1.ebuild 791 BLAKE2B f8f0d78bad52684bcb399ddddb76929baf952180ff20aacb16e49a4323463a6b241fbd6650a7dae843de84491738a6300538b41abc416712a5732ce3e836c170 SHA512 e9bb4228f2e50537b53d82ef584db97ddacdb96eede82a8034893b106ed9967168b7c716610d41a7931d6fb09ba26f091895024c2a7eaf705cc37ef092919c93
+EBUILD kdiamond-18.04.2.ebuild 791 BLAKE2B f8f0d78bad52684bcb399ddddb76929baf952180ff20aacb16e49a4323463a6b241fbd6650a7dae843de84491738a6300538b41abc416712a5732ce3e836c170 SHA512 e9bb4228f2e50537b53d82ef584db97ddacdb96eede82a8034893b106ed9967168b7c716610d41a7931d6fb09ba26f091895024c2a7eaf705cc37ef092919c93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-18.04.1.ebuild b/kde-apps/kdiamond/kdiamond-18.04.2.ebuild
index 111637d702bd..111637d702bd 100644
--- a/kde-apps/kdiamond/kdiamond-18.04.1.ebuild
+++ b/kde-apps/kdiamond/kdiamond-18.04.2.ebuild
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 6e16a480bdac..adb26d50c2c1 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-17.12.3.tar.xz 183248 BLAKE2B 89c2c23d1d0c9387d38dd84843b9da21cf9fc2d93d58f3b28c1f88bfdcf5c3e35862b7db9e13832cdc72b81a38421ba813bb4b00c21ce6ab2e21421d3a3abdf2 SHA512 9febc64485af7ecc4e2d80d3412a4c6ee8cc6cc38ef4606f31c10bf822389da9318f5e5ac97386bb68f6d4640f4ee5212871bc7c7a2b1a4ffe229936a00c0848
-DIST keditbookmarks-18.04.1.tar.xz 183996 BLAKE2B b3a6fbbcd1a4b7cdf48f93417b668897bb46b81f551f8e692f87f624ee17d92e7e6ca739e8e6eacc36bbcd56ac99e12a75533021a7ff41e4ef39d9aef527bc5f SHA512 e9fbaba43a3e5bf21467c1429de6aea806e7ceafeef933071338943d1014f93bd354d7085a59670aaa9e4346c578207c7e97aefbae13835105850e3cd49c6c16
+DIST keditbookmarks-18.04.2.tar.xz 184120 BLAKE2B 9907d155f2feb4585f020bd23f2afb91d41bbee31308df15253b828ca362ca200228e42e0bd19b78e92696135baa7317bde7becadd7db196131d247856e699eb SHA512 9e064154d2536074f408c399480b53720bb399c6fb1a51af7a4be17bdbea2fe319816606a222da37ea57530903445c17a94386bda3d16b96bb6e377bc601da11
 EBUILD keditbookmarks-17.12.3.ebuild 1011 BLAKE2B c7e602a87e3a8c4b2d24670c70fac2603e67ea23dcb7face912e902d968f0fdd8f6fa35b364a20e8736cbe13918a2f3b82685cab68dd5c2a783d8c97ab9914a2 SHA512 62ab8d13685bef04dfaf60adcda07034f10212bfbafc11d27b2161d275e69ef00cc338d4f25eade629da6e7fc3564965e597111d8bdcab2c849675f1b2f14fa6
-EBUILD keditbookmarks-18.04.1.ebuild 1013 BLAKE2B db456d32470eb7a37bca70d4b93bfe8f1fbaaf0dae78e61b026931e33c3599693568ec0b556b576606cc84f3f90e42683f0c90071b4afcb86b4c1fa7f3a98907 SHA512 9837274abaa372edbc12fbb7ddd0c1b7d84d233c983fb2b07930bc270ace635c57474d46939dec628149bfc60daaf80fc43e716269e4beb7f42ac592af516fa0
+EBUILD keditbookmarks-18.04.2.ebuild 1013 BLAKE2B db456d32470eb7a37bca70d4b93bfe8f1fbaaf0dae78e61b026931e33c3599693568ec0b556b576606cc84f3f90e42683f0c90071b4afcb86b4c1fa7f3a98907 SHA512 9837274abaa372edbc12fbb7ddd0c1b7d84d233c983fb2b07930bc270ace635c57474d46939dec628149bfc60daaf80fc43e716269e4beb7f42ac592af516fa0
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.04.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.04.2.ebuild
index b048c6a9cf89..b048c6a9cf89 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-18.04.1.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-18.04.2.ebuild
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 26a997294694..825033c51f9f 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
 DIST kfind-17.12.3.tar.xz 208948 BLAKE2B ac1830df924a8e81fb0756a331e1bec1ed267cc8cf27ac38d2c1c36be8e9293b92505f6446ce0b291871bd0c09e9a3a3399dd63b2d372da7f242d6bb7dc3bbcb SHA512 bc6edb248208f7ef6f609bd3b49cea6c621276dc2e43fec9b4dc28c86f162eb01af6656adc6bd9d90f3b47c92c35470985468c0b166e41a12fac608d77214121
-DIST kfind-18.04.1.tar.xz 209980 BLAKE2B 9c66b5d7c84f735e7a6e737a7f3d73b153a36e5c81910f256e5664665eefb75bccaf448576b7f37a122760bb51c68e66a3310b00b77f844e5deefeb97dfa89a3 SHA512 7cc2225b727273232226bbf2bb044cba200edf8ea222852bd4811fea2792030f04f58a69f2ded2f69a382500e5f029f9c839400651e8bcf5f1e8f6182943d278
+DIST kfind-18.04.2.tar.xz 210260 BLAKE2B aa761fc672ee7da876729346a35474d7a253d903592c0a8e9d5d30f02f5187be6e0cf8278ae55bbc54057109444d2c95f4f274e96c0222276ea3944b3917a774 SHA512 f8e5224b7447b2402e8d717f7859b0817210910633568227ec9b20e79769c4e4047b265e954294c6a2a054670ba492adf5fb610c115b50ef98461069ca14e678
 EBUILD kfind-17.12.3.ebuild 787 BLAKE2B 0eb3991ac4ee3a81e94971f0dd5ee1747b6baa4967e32ecbbb34f07725adeec4212dc9a04d88839f3b0ab69bfc2a3065debf2979ce9e40d35c8800e9914a80b2 SHA512 d6588b758e9318d5b33c6f85affb13307bbf6931f70a12fb359e80e35cfcaf23792a9993437353d19912bc88c93e281d23ca14b26528877d99ea415e2907f5c4
-EBUILD kfind-18.04.1.ebuild 817 BLAKE2B 84ac05337939e4644b43b80c8805bd53b68ab800d0e1e5594bfec72acc30b5c5e1bd22f0705c226b4b740733ab282e3ba81e2f0edc75ca8fe60da614c23b2384 SHA512 d458b026288e2a6f55626dbba241c328a2c30e67f9a306b3587bba69858a8c5cb373f4c633f0be1e723bd4d5589911aed21c34877dd0123fcde240f92349e82e
+EBUILD kfind-18.04.2.ebuild 817 BLAKE2B 84ac05337939e4644b43b80c8805bd53b68ab800d0e1e5594bfec72acc30b5c5e1bd22f0705c226b4b740733ab282e3ba81e2f0edc75ca8fe60da614c23b2384 SHA512 d458b026288e2a6f55626dbba241c328a2c30e67f9a306b3587bba69858a8c5cb373f4c633f0be1e723bd4d5589911aed21c34877dd0123fcde240f92349e82e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-18.04.1.ebuild b/kde-apps/kfind/kfind-18.04.2.ebuild
index 281d188e459e..281d188e459e 100644
--- a/kde-apps/kfind/kfind-18.04.1.ebuild
+++ b/kde-apps/kfind/kfind-18.04.2.ebuild
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 857d0580b86a..f770d794af5f 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-17.12.3.tar.xz 199060 BLAKE2B add58331fd220c61c7b764e2bc970181b515dc08ddb7b867f41a23d1a70ffc2d8b457ed7a97ef4f49040f048b508e8431478c96db6eb18af990056c934055710 SHA512 1197b15ad8953e037f4fd8463b49da903b56dd5108472b24c9d9e9af22a7c247737650e80c70310d4d906baffb2783e4b911a3645afcd3c69a9acb124a782a16
-DIST kfloppy-18.04.1.tar.xz 199872 BLAKE2B 5954931a6f8449d033dca26186fb3bbaba34708117d21facdbfc0cea88b9ad9fdba68fb2d06ef2982ed8dfdf33e74857f0477741431646b2308110f99b9b3418 SHA512 882f67eebd217289c71e3076f3d6f03abc9e3634aa6a16fd5f903630ca644572c1c587981e4b3cb1558cf63a95d4936c73d867478e410dce11e36bb32fb80835
+DIST kfloppy-18.04.2.tar.xz 199976 BLAKE2B 26ec555a1468ff5a7533a27f5ff360cba39742f874f260865b2d536f42f21cb709aea9a1092d10bd7762714f2c7f25dd44f5a4cbb4bc10fb2fa109428ac969b0 SHA512 032dc6c22c63ae100a530c996c51c94e16085cafc6273dd5bce9b63eed3e44a6b8400ea7296b65733035928eb83d93dc4b82ec6c9544b355798be7ac06fcdb50
 EBUILD kfloppy-17.12.3.ebuild 751 BLAKE2B 8b20fa977aa4e17b58157a3b469c54c047705a992ddc884f45b3b9954cc678562df906bb7eaafd14d0f3e129988bf586918b2886076adc93180e0f04b134a9c5 SHA512 a4215b6c1d1ef610c17327f070e8a1ef4823855a0cd817e88b9d2974ec9f0acd8b7aa6f83f7bd5b6fdaa1d4d5f9da1495cbfa076410898d192e6e5fa0297c1ab
-EBUILD kfloppy-18.04.1.ebuild 753 BLAKE2B 143df62aaaa9e8af5d022311750a264e7f46c16059d29ab886353b031c594cdee73451d5724bf51fb6cc6f3c893b5708feab56a342513c93de40a3bc26443dc7 SHA512 b418a3eb55fa2fedba1042641cbc8abb18daf064bc50446ace4fa8ba22746bdccb56cb83225b06297130777a209cd9a77ce2550547e6d877d9b7e573a7512725
+EBUILD kfloppy-18.04.2.ebuild 753 BLAKE2B 143df62aaaa9e8af5d022311750a264e7f46c16059d29ab886353b031c594cdee73451d5724bf51fb6cc6f3c893b5708feab56a342513c93de40a3bc26443dc7 SHA512 b418a3eb55fa2fedba1042641cbc8abb18daf064bc50446ace4fa8ba22746bdccb56cb83225b06297130777a209cd9a77ce2550547e6d877d9b7e573a7512725
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-18.04.1.ebuild b/kde-apps/kfloppy/kfloppy-18.04.2.ebuild
index 6bdbc688d3d6..6bdbc688d3d6 100644
--- a/kde-apps/kfloppy/kfloppy-18.04.1.ebuild
+++ b/kde-apps/kfloppy/kfloppy-18.04.2.ebuild
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index c99d339fad88..8712fd81f9b5 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-17.12.3.tar.xz 573076 BLAKE2B b7fa506a3e602286b6e5329fd5b091e8165f80104ddf9c6c859e75caaa29257f124c05da82a04e7e8f5ff90ffe5654287a1e10b2f1bbaebde90042b240ce08a3 SHA512 77f9046d477e65aa99a7dd9b4c88b1bf8727e25127b1afdf9872f01d8154bb01e3dd3d8dfe294698dcbc8acdb666f0cfa80bace9893448a5a696485316997005
-DIST kfourinline-18.04.1.tar.xz 573848 BLAKE2B ce298b28d47aadcc9201fac1041bf530e8ed9522342250e70d46c59b765ebd667c3617eea45ea7360eba9f2a676b6ed16804c122efad4dda1a087aeb11751ba4 SHA512 f83b2bf29f800dd3fa379dc05c6ae65387f9661a0e37b8862071f24c4ca269345d1889fdd9f92a404a571edefdaf665a94d16c8d690f920326e64e41706939d4
+DIST kfourinline-18.04.2.tar.xz 573656 BLAKE2B 2ca236166a181862ead00396fc232d136f0e170faac9b054369ad133ba7757ccf3acafc13f79839984756a84d22091bdd1a279e4eaadc0dff3030a1da72749d9 SHA512 c2c42ddabbb8ddf796e442e3fee55a6999647ac0c48af15744dc2a418bdabf3ea4cb0ad3b062db0a729b6ce7fc3d46102f2f4a026eb7589038e34a85044de4e0
 EBUILD kfourinline-17.12.3.ebuild 733 BLAKE2B d663c190f21719280e58c0fc51f1f5e28977c9f9ee7804980023dfb57407cd51c1ef548645413ef568197106226d75c88d45deae4e6210f947ad4d56df379be9 SHA512 b158cefe8e92b3561ad8e6cd19f490c6f1397769b6a1cbeccc216667548aa3c4fb38d7add1af2491eafb598ac7a63a562b97c9047879f7bc51ba1e541425113f
-EBUILD kfourinline-18.04.1.ebuild 735 BLAKE2B dea403b189c3d5c834cc37fd44b7b537dd1e260096c88815cd43147a155ae915d88ae364a176a581351f099288d6b0062cba835554b1e7f63551633879693fad SHA512 5605cb8cb86f9ad0acabf4350d35a22cdfa3e082e9956eb6f47d32b8321bb5c1c10e8e27a233b2acfcffe3b462c6c00c1cdb815fd6250e1d3f99a5d61542626d
+EBUILD kfourinline-18.04.2.ebuild 735 BLAKE2B dea403b189c3d5c834cc37fd44b7b537dd1e260096c88815cd43147a155ae915d88ae364a176a581351f099288d6b0062cba835554b1e7f63551633879693fad SHA512 5605cb8cb86f9ad0acabf4350d35a22cdfa3e082e9956eb6f47d32b8321bb5c1c10e8e27a233b2acfcffe3b462c6c00c1cdb815fd6250e1d3f99a5d61542626d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-18.04.1.ebuild b/kde-apps/kfourinline/kfourinline-18.04.2.ebuild
index 3e6be98491f5..3e6be98491f5 100644
--- a/kde-apps/kfourinline/kfourinline-18.04.1.ebuild
+++ b/kde-apps/kfourinline/kfourinline-18.04.2.ebuild
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index edbbbf0fa54a..31414453a41c 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-17.12.3.tar.xz 10922256 BLAKE2B fd19344317ced08cebce16caf2f927b6cc8e4059ea6807a0a176ce390d4ce40a9072d06c53454650d77b26f824afe4d1adc89b6c69380258cb9e6208bca57e8e SHA512 de54afe24786535fc90433322cd6bccbbd130e9a1fc162e32dbc2ca2c6ff4a0277be851bce5e6dc722e32f5bea709186a1c6f30eddf0f6a9d403bf5e86b1c1d8
-DIST kgeography-18.04.1.tar.xz 10932516 BLAKE2B ac600ebb079073cb480d77f6a8daa4ba88b0dc03b176c6e511d2dc2afb1396c9e886e8f7ea748bfae6204f0fc4b016a522bf8cab5564c2e39f42b61e520524e3 SHA512 dd6d72a3824bdf3a12ddc9f69a1193840698b03edad0a1850fa3c5d4d599d98f1ebf6587ecea90832eca52e356433649b3d6028edd9c91fb2e74d573e138c693
+DIST kgeography-18.04.2.tar.xz 10932792 BLAKE2B 2b2c5b037110815027922a86c6bdd99dcd6a62e36c3fca069427e8e07565eb777d47e317b4e570c202ecaab6b48ef93c4872156aee0bb2ea8d682f213f1dab4c SHA512 cbdd39713037d1cf3c7ab6bae77394f61f75c2e35a392d6704357a0ddc1da906324af1b7776538dbdaa6a7a9141949649c977bee15342e58b8f6941b35259987
 EBUILD kgeography-17.12.3.ebuild 743 BLAKE2B eb402c1e0d48c0741540dc47f4490c42b072893c2a916f642714e63f89fd98767ae0e3ce37c88689ebaeb96881a0522f6fa1d5d7159ff0a3c8e6449886662452 SHA512 9b1bab3a408adc8835c0b25fe01358af0ccf897656cacb2be0e39257948eb9259d29477bc50da5e96038ea836e3ba0b49237080ae4331c6488e090a1499b0b55
-EBUILD kgeography-18.04.1.ebuild 745 BLAKE2B 0579dc2b562fd939866d5e772d71cb050043a5d3289e6428b906c9714b388bbc8d4fa6f7dcfe4ff6712201fd1ae1abfe57fe89eb8746c711424eda84a9627210 SHA512 031550e8d91800430084a44b85e735fd01cd0df415e3aa5c8d55c320b5200e06d21a26d22d07b812cf53a28e21346ff368feaa826b6eca43d5329c33fd5b3fe3
+EBUILD kgeography-18.04.2.ebuild 745 BLAKE2B 0579dc2b562fd939866d5e772d71cb050043a5d3289e6428b906c9714b388bbc8d4fa6f7dcfe4ff6712201fd1ae1abfe57fe89eb8746c711424eda84a9627210 SHA512 031550e8d91800430084a44b85e735fd01cd0df415e3aa5c8d55c320b5200e06d21a26d22d07b812cf53a28e21346ff368feaa826b6eca43d5329c33fd5b3fe3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-18.04.1.ebuild b/kde-apps/kgeography/kgeography-18.04.2.ebuild
index 1a573e6946c7..1a573e6946c7 100644
--- a/kde-apps/kgeography/kgeography-18.04.1.ebuild
+++ b/kde-apps/kgeography/kgeography-18.04.2.ebuild
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index f7b15b469e25..0d34c78d2de8 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-17.12.3.tar.xz 5388864 BLAKE2B def36699a85dcf35166b2466884966acff152a5db16501ecdfd99540c42658f2b63e15024b6f0a891d24fbbb856c19aa8538b42f28fb084e0ce004a4c4f68ef9 SHA512 7f4f12090ed94fa16c71bbfb1e00702fc71b145cf9fed3b3d49197360f2533cdd8f9e442caf3d41e9d1749f94156f48b935e03a9027826def6a3b334af5bdd18
-DIST kget-18.04.1.tar.xz 5213276 BLAKE2B ca1527e0879d2daf1ef95c752156c12e56d7a798a57943e74f08293e3163b101917bebd7256cb71e04f524dc0032bebc6a2d410dadeec376f52a61aff5fdd31f SHA512 b93a1503ee6440aebe304472c6faa88bc375b0a6279fb50b65e09a33132dc76d04793f30b2bf0ab8e8ae2b8766080044f03be58e9729777e73620cb50f72ead6
+DIST kget-18.04.2.tar.xz 5214012 BLAKE2B cf6aa5c6a3fdd3710d7b77ffa9247dccf3f3163abf4e322ea894ab662f74e0c6b75cc71b5b67ff379d2d8de81341bd9c588bf03b53389b60fb379a85e5c624c9 SHA512 8d9ff085f3a656cacc995434d689f078117a54472fbf0462d8772112a8fd52edd0bc3d71c064f88331ba2bed1f88e2daef53737ae7fe96eeef795409db40bac8
 EBUILD kget-17.12.3.ebuild 1713 BLAKE2B d94cad35694aec4cec379d31b90615bbc941a16b4ee5ee8a50a605b30c552839c043d5f3f2b2271d2052e9c581eef6109396475e8eebfc3537c92656f29ab97a SHA512 042f1e1fd81492bdd01e6ccba914a9213bbb5f8706367b1a2f17797adb62bb9a9a19584d965454cc6396a8c5c11d5f6f2e4251e50da67241f2a404b895894bca
-EBUILD kget-18.04.1.ebuild 1816 BLAKE2B dd04a78374a90ef7a45e828d7741db2207f60fe8e8b8ed79d319fea34c93b547c44fcd7932ed503d520b02c59e6aba416e82fcee9af3c81e2e39fdf1cedd0c36 SHA512 521ded887e48515cf8ee0d870c493584a23efa0e61fb4606873901a7d509f3c864053ffe5ca43f9daff200bd34ed1097278d81043231a2c24216867508ec5f5a
+EBUILD kget-18.04.2.ebuild 1816 BLAKE2B dd04a78374a90ef7a45e828d7741db2207f60fe8e8b8ed79d319fea34c93b547c44fcd7932ed503d520b02c59e6aba416e82fcee9af3c81e2e39fdf1cedd0c36 SHA512 521ded887e48515cf8ee0d870c493584a23efa0e61fb4606873901a7d509f3c864053ffe5ca43f9daff200bd34ed1097278d81043231a2c24216867508ec5f5a
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-18.04.1.ebuild b/kde-apps/kget/kget-18.04.2.ebuild
index 314ad8dce43a..314ad8dce43a 100644
--- a/kde-apps/kget/kget-18.04.1.ebuild
+++ b/kde-apps/kget/kget-18.04.2.ebuild
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index e6d3b0f5f5af..82650aa6df04 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-17.12.3.tar.xz 4403404 BLAKE2B e075034c51de901f78c53d1156488ef4f81bf5822217e69ea957c26a83060365f037dd565a83e4eace9a271449ccf06c7da0d8b592162fa1117957cb20422af6 SHA512 b8b0e596270f9f231e79a83eb0597932bfac675e33574320bbee60290973f907f753316e336c111b370a15989fb945fa5ab762d55bc8db64c782a695a8e4eb1f
-DIST kgoldrunner-18.04.1.tar.xz 4405508 BLAKE2B 7d38b923111ada1e84bcbffa5b024374d6d3557100304ac2faec570f24d31c3fec970ab8abd9dc02cd88079b77ef3c623ad00e157a895162026dadbe93c8793b SHA512 9e563aad5a16e8b2e15c84eb867983291912a4560df151fd17d8675b75a5fb31debcb1f3e36765f17ca9d6571b646f47682a40bcd135c8b65b749953c0f4cc14
+DIST kgoldrunner-18.04.2.tar.xz 4405424 BLAKE2B c9b2ffb1e11eeed606afd7b1ed7c2fc85e88b24be16d59901cc79ffc2fb331e4c0318316a5ba3c1e9ce601052599b9c068f5cd2a537b809caf3e086d24029cc0 SHA512 6cc878015c3bcd9f963de230066f249d0f30c7480996290b93411abd0ff1673c04b0f3431a4be719b22c1be877c4ffef6199a1774f1e56f058266c776bc96ec4
 EBUILD kgoldrunner-17.12.3.ebuild 863 BLAKE2B 8ad0721fbcae4c372e89fcc4c69c78a22c9fb603d2f2d8779ebb2ba043bb5e98967c24740228440d28f54ba77ddf66d3bb9a466c35f757f208c67109e89d8c5c SHA512 0194780fdc4fa17261a8db7853cb2149f09fd25d6a8a5ca28e97a19eade16e1e41628d93da452c442e351c5bd9d882ba4c18e0947a8e358e30707b30ee8c3dd1
-EBUILD kgoldrunner-18.04.1.ebuild 865 BLAKE2B 07adfe33b82ed75b910c7f70dbf4100c5a50493969a849db89ee07393789d0c19e6ba9b41c8045bfbbb9ad736da5e5cb60e969a5342ffead6760ff93dfaea171 SHA512 bd4e86f8e7e1414ab02cf5e602ac5f288d47e62d78dea0751d87537f083cf01a0b241a5cdac467e62ebb9187f700504e61221623b54010330d0d32cae966204a
+EBUILD kgoldrunner-18.04.2.ebuild 865 BLAKE2B 07adfe33b82ed75b910c7f70dbf4100c5a50493969a849db89ee07393789d0c19e6ba9b41c8045bfbbb9ad736da5e5cb60e969a5342ffead6760ff93dfaea171 SHA512 bd4e86f8e7e1414ab02cf5e602ac5f288d47e62d78dea0751d87537f083cf01a0b241a5cdac467e62ebb9187f700504e61221623b54010330d0d32cae966204a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.04.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.04.2.ebuild
index 1377b14402d4..1377b14402d4 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-18.04.1.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-18.04.2.ebuild
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 84924d838bef..3d98c7c016db 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-17.12.3.tar.xz 2817380 BLAKE2B 0ea960f82cbd25a8b0d5bafaaa4ee08f8a70a187c438dc89a113e6f6192e9bc1f70778815257cb2009c117fff698c8d5de87a23feab3c15b798a9a1786cd49b2 SHA512 ff013f675a8a28cd6771683060cbafc12ce2f11fa0bbe400c75483c3eea78311aed6a35c11e799372b79ae6f33d8bfe38410c4faebba6f3c5db693a359cc0cde
-DIST kgpg-18.04.1.tar.xz 2821544 BLAKE2B cc0b45559a9f25f0dca3078f963ceb5397fc1c90ed97d3b45a93703ce5697c5e028307fbf5b2e942e09b77d6aec0e6e70c1646b68de50b313d41b3eb6dea41a3 SHA512 516f074b161fd545383bbd58e86ec33f7d4e8c654138af14a9e3cec78e5521b62b85ce3723474599b4377930a6bc9e1b0f09b6bb56e063c8381ac7bf441c8e35
+DIST kgpg-18.04.2.tar.xz 2822056 BLAKE2B b543fcd669e4fa81c4191b0b97bdecd62ca3d8b8b53ebef9e677a04963c6583e06e8c8c2dc86cc5edb1e526539fccec831dc5e07ddf23e33815cf0c8ffe09b26 SHA512 04252d0942f1e1f583e81a78ccc1a2b5e2198e1c2a32ca72477b9b805e6817419cfe42be168daf39ee80c96f7504a9fd48c1268b81eaff5753d1bd8542b5a766
 EBUILD kgpg-17.12.3.ebuild 1275 BLAKE2B 77b4aa15a4b469e0510d1a30bfd3cb7c5b618ba1085b35f6f1b00c23f03e79a868a32db2191443552eb7f3cb37c56358a0232cbc1eea9601528147d0cd7169ff SHA512 7ba158f0997cd7f36f9944928f3946f5526d0c9b356667e19a263d374e8f9eabc024b1c82eb591cae49c189dd4654339bf85a3c7cc2dd25d1858fcbe263930b7
-EBUILD kgpg-18.04.1.ebuild 1277 BLAKE2B f3f78e4a5b985339c81bec48fc4c8d0de639ee60aaee91d7f2437fb0188f229577d93ef2b21446e94cb4d801eba99a4e1c9c7b8c16a69689e077dc335c2b2e77 SHA512 b2c6c0702e4c46af859b4e13eac465e404ed7f2848b82350603916f5b1030ca3bc62aa103137b337ccbce081077d7f3191199ea4564cdbabefae374f0fae75aa
+EBUILD kgpg-18.04.2.ebuild 1277 BLAKE2B f3f78e4a5b985339c81bec48fc4c8d0de639ee60aaee91d7f2437fb0188f229577d93ef2b21446e94cb4d801eba99a4e1c9c7b8c16a69689e077dc335c2b2e77 SHA512 b2c6c0702e4c46af859b4e13eac465e404ed7f2848b82350603916f5b1030ca3bc62aa103137b337ccbce081077d7f3191199ea4564cdbabefae374f0fae75aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-18.04.1.ebuild b/kde-apps/kgpg/kgpg-18.04.2.ebuild
index 9179f8168592..9179f8168592 100644
--- a/kde-apps/kgpg/kgpg-18.04.1.ebuild
+++ b/kde-apps/kgpg/kgpg-18.04.2.ebuild
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 79ec67e3d95d..0941ce2ad31f 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-17.12.3.tar.xz 6456648 BLAKE2B 48bd56b9bebbc2f91715c5b1d33b9f3c32908a8fced9f609c37a0f91cd431d9bb6dd5afd5cf452074662c3fe0f7b1017809918b4f2f00fbab94a447edf6f8016 SHA512 9b2759a272089422e1929854cfa584c356e3b69a6f58a26d3f610961cf36d581f06b41e173e19783c80cca4d9adb0f239a98316dcf36f82ecc17fc829d0aa5dd
-DIST khangman-18.04.1.tar.xz 6464020 BLAKE2B 3ca155211b8b59e7b8837a3cd10d6f7697b4406009fdb3e5189e979185d9c45313e4cd0ff4a4871291803f0ddab24261c2f53c564966ad585b55db53d310d85f SHA512 300a1cfcf9b35facc765001914dcf639cbfbaac9fe263f9741a93c26e092fa4cc5cef090893bbaa115eb95393335fcfe147cba594dcaa7870c185e096a58210c
+DIST khangman-18.04.2.tar.xz 6463248 BLAKE2B d29d0a69bab07ed7daa9dff21f2dec346c3449b8f182dc90b3ea37917fdc0dbe144e562a22b76e4f06b0d4bb188afe5cc3e2642930d108a931f87d320e0b2d15 SHA512 015a7f6cba833d38b4bf244e36c03e53476cb1426fe74fd88d8cfcae17aafed08c9bcdb2445e2d57a2d7eb73de519f5ff79b2427b35fa68307ad3aa2a860c684
 EBUILD khangman-17.12.3.ebuild 1039 BLAKE2B 562fb8187fc5281462879c78a3ea6840a9328cd242557b470d5b099acc8d692f43288068b6e55aefa02d62f75bee5cee1d6819d2b11a39ba706f86973650afeb SHA512 695ea6506d595c25d3cc7b8f3db3a3cbb6e6bf6c7a43938eb0f5d11fd862090efd374b0ccd9c1163527a18fefb38446f1df254bb1594f0950fd2721ae2a278a6
-EBUILD khangman-18.04.1.ebuild 1041 BLAKE2B 9ed11aa400845ca9377bc3a25671f853076e5f6572cc6d8909748677e8a6485790db332c07175e247bd8a7b91606c8d29a33bb8936cd07688aa3541c27b91d20 SHA512 26d8fc36ac7f2e6e18ce909bc89da18f5ec504b2ffb988f08dab7db2a34aec767c550ef4f91220bfe17c3492a132641dcdf5eb0df29c44d0586ce452012db8c4
+EBUILD khangman-18.04.2.ebuild 1041 BLAKE2B 9ed11aa400845ca9377bc3a25671f853076e5f6572cc6d8909748677e8a6485790db332c07175e247bd8a7b91606c8d29a33bb8936cd07688aa3541c27b91d20 SHA512 26d8fc36ac7f2e6e18ce909bc89da18f5ec504b2ffb988f08dab7db2a34aec767c550ef4f91220bfe17c3492a132641dcdf5eb0df29c44d0586ce452012db8c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-18.04.1.ebuild b/kde-apps/khangman/khangman-18.04.2.ebuild
index cb57c5103efc..cb57c5103efc 100644
--- a/kde-apps/khangman/khangman-18.04.1.ebuild
+++ b/kde-apps/khangman/khangman-18.04.2.ebuild
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 6122f0fea0ab..565c844d0c96 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-17.12.3.tar.xz 3024356 BLAKE2B 97f0ada4b68485204d0a239932a581c3e89312d5e0f5d991d35983e17ddb65331660e8a4d134594880989c17d36ad3a2b21a9ff327fc171aec7fbfe57e0489f2 SHA512 32febc1984c44112c22877e05742c6e7bbf0933ada1708305687fb6147e9bf3e06141cb2e88d8d3a4fe6442d983a56d4dd0e813f05e8ddb8b7083826575bf40d
-DIST khelpcenter-18.04.1.tar.xz 3045748 BLAKE2B 0dcb7863bb6bcbf7999b52d554419cc5af9cd425661d0d7bb2978d3462c01faf3a0599a55fde996826c2883e4a7fb638e48cb09b5590d2b007ea934761ef5d52 SHA512 f99273d6d7dc9753b973112ede2dc606fda430d0f02f7a0a14e8db6359d91d4c73fcb1b6573da2a2363aa83e397e2bb1512f88eb5c40016850624f22065022f0
+DIST khelpcenter-18.04.2.tar.xz 3828152 BLAKE2B 5fc88e22a8858471fb29a2c70ecf5b68e7177fa18c818d9a07cf186909107f1d149850a4e47ee631905e2fee5783fccd722fa4b85b3575c1b95d58a0dc77138e SHA512 0855c7ccbc7e78e1c90185d767faeaeb08497bbb1a958e33874e08076d927fd0b4ebd3ef19395c908cbdd062db3e7052bc170d63e7e003b44acb2cf6063eaed0
 EBUILD khelpcenter-17.12.3.ebuild 1074 BLAKE2B b8398202280e0f2022e1344b8dad8bd08d265751f6ee1cdae608b0629a636064b1191e2e9c66e034f5639c6b85d5bfbe4f5155c77679227bd3a045b0bad1f58b SHA512 95f51a67a22432bfc25d0885d511405d50573443211e73a4504f3e9c82a9f544493aec6598334371df026ac67f2d5458d5f6224b6d1779c0c4db5dcb9886b4ae
-EBUILD khelpcenter-18.04.1.ebuild 1076 BLAKE2B 486b0db2c0b7c4e56c202eb8a20011af55e91b9e898f843a70442ec051534a092d4ea08504f33c3dd9a2d4732e1ecae20df1f1a1f27bbec56e9e055be95da9e3 SHA512 f3bc0e7f5bf85730e8a81911932ea2280e4c5240e1d63f545a3ef487dac21a8d8ede2cee67119c33915ee1e0a8aa94a7515013a7927bb34493282dbd4404b554
+EBUILD khelpcenter-18.04.2.ebuild 1076 BLAKE2B 486b0db2c0b7c4e56c202eb8a20011af55e91b9e898f843a70442ec051534a092d4ea08504f33c3dd9a2d4732e1ecae20df1f1a1f27bbec56e9e055be95da9e3 SHA512 f3bc0e7f5bf85730e8a81911932ea2280e4c5240e1d63f545a3ef487dac21a8d8ede2cee67119c33915ee1e0a8aa94a7515013a7927bb34493282dbd4404b554
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-18.04.1.ebuild b/kde-apps/khelpcenter/khelpcenter-18.04.2.ebuild
index 7a7d14ca377e..7a7d14ca377e 100644
--- a/kde-apps/khelpcenter/khelpcenter-18.04.1.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-18.04.2.ebuild
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index f58229363233..eaa4e50affc9 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-17.12.3.tar.xz 147912 BLAKE2B 84c2252caaa7b30145910fc6012018e325ea5013dbe5f780504a181d067ff3279520a0e64385861130e6eaa350bf44edf14890e01bd17621026393eeb7ad98c3 SHA512 3ab1f0ebe6f993a5c1d8bc6b4952f7ab99150ec9938d4599c3b15451880089f385fe4775a950bcd948ca0926082038c47ddd3dd1f3ca5e9dfcd625f4934a66ea
-DIST kidentitymanagement-18.04.1.tar.xz 148084 BLAKE2B 4579656e7d0d227f7d7034048a7f7939403f61bf7bff7307af046ac7cff5a1b4d6aa306a1615aee76babc0fe33d19cb8a4dcd69c618408206fbd00634eb62b07 SHA512 fcf40085f5f12b21c371308db378e0a15bae45389597eb224840bc43c08e8add479414f5409873f9ff8e1aafac462084aa92d3144b6e096e8061afa4aad32254
+DIST kidentitymanagement-18.04.2.tar.xz 148228 BLAKE2B 4e10ab52f3f3cdf703eae48ff7365b5d04d346ff81c88001504d8dbf8b9c04d895dbbaa3d56732001777e8dc04d1e3ad01f1eee8750b2a683a3bcb4c953351b7 SHA512 2622656bab7c3944baaf88443ff74b3dbb018acc9c648f31b13a5c7b9f398a37e8609a3b9af5e548052d80de331a1d3e852f2880a6a8147df3c1d77fa47fdac5
 EBUILD kidentitymanagement-17.12.3.ebuild 768 BLAKE2B c958331ed3a4f7db3328327f9f42f9e1d52b8b220062f74d787cef3a93a9019f1ea98e0c5f3205a0e9d7f053cced1bbc665d09e1ebbccf93169e45f995121914 SHA512 684a847d7e536f9c19785d0a1cb3bbd473ee3c75bc370b6a492bca0eb4b27769b310f87e3033fd73dad99f292dfd54a891f7145e2ed5af3be6899ca23f5f1b9f
-EBUILD kidentitymanagement-18.04.1.ebuild 770 BLAKE2B 5c57835bf25c9ece4b51ff3f3b728d3f32316c1446c3841432e18b4449cb8e701eaaff6add43f87c3758d0d1d144de9fbb605d31e983244f61861796c4462f9e SHA512 a60c9d8eb988c69225c6db31ce360b7bd096e40e489899f9c0b619591d4dd28fcacd2ec5d325ad76eadb27fe6219eaec317b1cb5d6d388490964271683462dac
+EBUILD kidentitymanagement-18.04.2.ebuild 770 BLAKE2B 5c57835bf25c9ece4b51ff3f3b728d3f32316c1446c3841432e18b4449cb8e701eaaff6add43f87c3758d0d1d144de9fbb605d31e983244f61861796c4462f9e SHA512 a60c9d8eb988c69225c6db31ce360b7bd096e40e489899f9c0b619591d4dd28fcacd2ec5d325ad76eadb27fe6219eaec317b1cb5d6d388490964271683462dac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.04.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.04.2.ebuild
index 9cc840613bb2..9cc840613bb2 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-18.04.1.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-18.04.2.ebuild
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 3a37a3151cee..f71257cc22cd 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
 DIST kig-17.12.3.tar.xz 3589648 BLAKE2B ebe02b35f3244d3e9f262dace700f194b8083f0f3f996c12b466ae1f722085205bc39e8a743ed201f5e41c5b201cc512c2b5700f6c2a11d3c596479c718f9b2a SHA512 bf6201c74627e3892a584c455875f6aeabf466aa092ff35255423e152ca59b9b4d364281c740ba5f65ec3b6a208628ed229368c223193c28ae0c7fa6a21aee36
-DIST kig-18.04.1.tar.xz 3592016 BLAKE2B 6074d66cd8c2637d47c3099e58dc9fa679524ea0fc91eac76abee743502ccae20c1b8ffbe5706627f1e08e3e1814d4482a1bfb36b4ef6589cc5f2b84b997f12c SHA512 53a7c8d391629f387d99f47d7e710392a61d49c30395a0381927d949b70c237b1ec3cd200d5a94519ac39deac86a09354c0bd6a43c5839a1bb61eabbba604e03
+DIST kig-18.04.2.tar.xz 3592260 BLAKE2B 52e6f5a8b4331553a0bfb849207fcccd32444919019cc9ef7b03e956d43e2f9d2c765fac18d6c7eed84d48882a104dc2cf58d835ebde2663199ee5b331992876 SHA512 6de1d50baff032f46cda8440e344556176bfa356353c08ca26a632afe1e73c3fafca034cf29519d6c537c5d42f1e43f377ae114c022f209bff371599267d7d49
 EBUILD kig-17.12.3.ebuild 1499 BLAKE2B 2b4a6e92492c904751cee9d89337a09e6eadcba375167a2c47e8e391b647a7cfda57b9fa9c03673fdc601f7fd636f486d9a752875cf18834d33079ab933ea3c2 SHA512 3f95555910729514ab7534c5017c33396bf1df644ce89961e339997874e859237ff3808846f5b963831f5023e7e86a1248ede3da3af4c9790e1812f94683f432
-EBUILD kig-18.04.1.ebuild 1501 BLAKE2B 4e253b1af7946157292a42f9386d49629901f0c0be646584d75ed70b86e8e323372df58fae69b0b43b4691963de94f9ba12b6e624c1037da13db03311d100b3b SHA512 519374484f25b8b838c0dc2d4b739be2b1e30e6901748dbd96a9a2d560886c1c0a7be4b120a98786e0d1fe56cafb38583689fb221154afb90d4c06088fd2725e
+EBUILD kig-18.04.2.ebuild 1501 BLAKE2B 4e253b1af7946157292a42f9386d49629901f0c0be646584d75ed70b86e8e323372df58fae69b0b43b4691963de94f9ba12b6e624c1037da13db03311d100b3b SHA512 519374484f25b8b838c0dc2d4b739be2b1e30e6901748dbd96a9a2d560886c1c0a7be4b120a98786e0d1fe56cafb38583689fb221154afb90d4c06088fd2725e
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-18.04.1.ebuild b/kde-apps/kig/kig-18.04.2.ebuild
index 7e2644a1fb74..7e2644a1fb74 100644
--- a/kde-apps/kig/kig-18.04.1.ebuild
+++ b/kde-apps/kig/kig-18.04.2.ebuild
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index a6118099dfc9..99195c11aae0 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
 DIST kigo-17.12.3.tar.xz 5222512 BLAKE2B 24fa500c8b5b973fdaf266f710c120a824e7e7832c1d973f915c745cfa5a6528dbfa4c3fb0b62fd80520b6ce8b8da1149c1b24438c11c679bb08718ba34ef9a9 SHA512 23e998bf600b7cd97b92ad5d327448b5190885c1470286e0c1c76755b5cd4d278806010854ea98b7ac71ba6776b6748895f62f4c9c309adae44a97c5c9295112
-DIST kigo-18.04.1.tar.xz 5224124 BLAKE2B a9fa992b19e7d07c636585f32acffb82756dde235b048697e207557d324a96b2030308d70d549c7a0064a7f9bece98f27ae1f2a7ccf632f9ea9b5cd2220ffbf8 SHA512 500107ab519a9f8969a84eae5d5868f2147f547dd8ad2c477fe9728ff8eeb42f999e4a11b65162c24997c4a5b843542a30ee6159f0f3d18808de5f53d0fcea0d
+DIST kigo-18.04.2.tar.xz 5224476 BLAKE2B 8c0f2d501410f21834df35d4a5fde2369b07df86117f962ca321149469b3088ef5d595af7f1b6c2e89ccff4d56168cab772f9e04c48d6d54ed98e4a921d62453 SHA512 e57c6acc2eb39e5c45a368a9b026faf67e73de7d01d75877ae22a6aa654efec7594a36952eff92bb63fa4510a825f24f129143c272407f5ce23a837e1858a70a
 EBUILD kigo-17.12.3.ebuild 853 BLAKE2B 317ccf14cb550b706e68ddbcd4ae5f155bb53afcad1421b8455173e7847586a8f192929e41a186c73d5a2b01fe46ee2b273491847b10d36e4f186806850e4089 SHA512 da2004f56ef18d098ca8008a12a320229021fc1809b96f237c61a3b1a88311fabdb927c4c609aaea5a6911f47315caf96578f6995ab3555b8dbe78c70d6ad7f0
-EBUILD kigo-18.04.1.ebuild 855 BLAKE2B b7b6b082300f6584f3156865dd32934aa948593c333a3b9b6b77adda18cb267bebdb09c3237423762f9898bccc1a0be561f7360be9e2e12b4448bb251bb555d3 SHA512 72a0cabf0383e7eae958f0b5812afbc7a9e7e868efb38ff2d81274d1a41311e14e7339c74d84f167929d47adf0147227801addccb0ebf2ab8db89ccba3cbe74c
+EBUILD kigo-18.04.2.ebuild 855 BLAKE2B b7b6b082300f6584f3156865dd32934aa948593c333a3b9b6b77adda18cb267bebdb09c3237423762f9898bccc1a0be561f7360be9e2e12b4448bb251bb555d3 SHA512 72a0cabf0383e7eae958f0b5812afbc7a9e7e868efb38ff2d81274d1a41311e14e7339c74d84f167929d47adf0147227801addccb0ebf2ab8db89ccba3cbe74c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-18.04.1.ebuild b/kde-apps/kigo/kigo-18.04.2.ebuild
index 3dd95da49b6c..3dd95da49b6c 100644
--- a/kde-apps/kigo/kigo-18.04.1.ebuild
+++ b/kde-apps/kigo/kigo-18.04.2.ebuild
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index f7d7958f47ac..b869f57c41e8 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-17.12.3.tar.xz 1166204 BLAKE2B 418c9e86420e9d8b7014e949f2afd910503e9cd90bca71034af1f99c26f5a2bbc339e36c1c46df091a088a71c23a1294dd04cd31c600ebbc9c1fc31050148686 SHA512 327229cdc3f2dfffbc3cafa152b899081d66e0fd7560251c948cbca0bf961bfb4df16e3cf7eacef281278441a4eaa58985197942d653980d6f3ed82e754b7cc7
-DIST killbots-18.04.1.tar.xz 1165244 BLAKE2B 715fc5dfa598a1bea92b455b7dedbe52badc6ce5bef987c1e97650944000b5fe6c93e9277ce0d5725469e0d1ca3b568bd6e31b29894ed910ccb573da9a0929f1 SHA512 db51ab4e60d99765e0912e5b793d01155236187df1938b3072210d2e2e4b12663759ab243acbc5e0526547d21062997e04a26982b3a1a2228f368fd294a7fc42
+DIST killbots-18.04.2.tar.xz 1165280 BLAKE2B 266d174c227848f347b87320391f14b5ead04da4f4aa152c996d7ab23bc0b08efd47ea382ccf72414eba8f3653f1fcabbe80b54f2e36ae1720d92c2537a7620e SHA512 5a347e762eaec32bbe73f78233ce438d8589a96cc5cf48008fb0353ef9e98f6ea2ad0917fe5d5e46588fc7522cd2ddf3676bae73caa6d3eda62ac26ecfa937bd
 EBUILD killbots-17.12.3.ebuild 715 BLAKE2B e8df4101325f24ec3ee979166690ef2b70ba9c0fc409149f5cf9c4b5d02d3fc68c70c6d896956fe334c1d6870371b46a2de36455e157c82c95b4c7623cc9ab0b SHA512 70888187c4e26ea0e12baedfffb483cf0b2b15c372f8e4241344f2cdeed0448ea1b930867d7928060944fd03132fd29d3aaa1b50b8fefaf8a5dda55ced792e94
-EBUILD killbots-18.04.1.ebuild 717 BLAKE2B dc4b87bdf1ec9849a50259f97d40bba1ce533d5602fad5a0946806e7016c7dc43a6855866d220c44b09fb0e53e746d415964e7a48e899bd655e4b5d9137cabad SHA512 d56d56fe75a815f7eae1c06f02592ca819ea7bfb06fde0cfcadb1d268e0d9b8e58000e7c252794a7be740607f4ecaaff39cb469e2824ee33cfcd3e34ad12efda
+EBUILD killbots-18.04.2.ebuild 717 BLAKE2B dc4b87bdf1ec9849a50259f97d40bba1ce533d5602fad5a0946806e7016c7dc43a6855866d220c44b09fb0e53e746d415964e7a48e899bd655e4b5d9137cabad SHA512 d56d56fe75a815f7eae1c06f02592ca819ea7bfb06fde0cfcadb1d268e0d9b8e58000e7c252794a7be740607f4ecaaff39cb469e2824ee33cfcd3e34ad12efda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-18.04.1.ebuild b/kde-apps/killbots/killbots-18.04.2.ebuild
index eb0d9bdadcb2..eb0d9bdadcb2 100644
--- a/kde-apps/killbots/killbots-18.04.1.ebuild
+++ b/kde-apps/killbots/killbots-18.04.2.ebuild
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 89b20474f551..551f853988c9 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-17.12.3.tar.xz 1053900 BLAKE2B 07606cc923bf586027111797822f61c4a9bb04bb26216e52e7970ace5a6729f2b2493b2c89cc1a8945ef3955273b7684ce085cb2268f917873a682343b1ac9e0 SHA512 5a8922131f5847bca4100ced10d8b02e4d0b641f14afa0df7162ac71682bc19bed499515df57e40ce61f1c30bb3593e8c68ee5c650d60e9e62d390a10dd12bbf
-DIST kimagemapeditor-18.04.1.tar.xz 1054836 BLAKE2B e6271b2ca76b0e73e5a266a868ba5b62b94b16d55c5bcfc0f299ccb09797deb8baa0d8f38eaff6f8921d1deccea508b797a00ad4cf81d87e5b961eb555b842a1 SHA512 7ffd57ceb36e72194e9258cffd2a26c269c3cee53a2c4b86144b0dc39866b3ac7fa35179858c2d1d09c27ea8bd190c949bf23128d42b898c7e67343e9d996e3d
+DIST kimagemapeditor-18.04.2.tar.xz 1056192 BLAKE2B 7d572475307e8d1d5a617093201ed2e6503c199fb88dcd27eab1a27881f06fc23451e6bfe0bf60b4d1278545751987ca2dc3c2670558841d788e3e65f9b9e5fe SHA512 579944dab65a623dd05247d1b46f76b48013992bf5d1ca2f2804f288352123f5d9efd700ffcec1749428f5b1a14d8f950dbf36b5898a72b8794b784eef9111bc
 EBUILD kimagemapeditor-17.12.3.ebuild 803 BLAKE2B 67094a945e9991e016c3b2be781596040669dfa639ed51e4325be9b413bbec359fb128f069a5e2230f78705f7fc23509545c1f04e66109f85adee60a63ec6b43 SHA512 4377f373dce195b367de3ad344da3c9600f1ab840378eb5c98530b0c3e31763e45dd70d5fad6936f2e4c3034d9a97a342d0147ead10a6267bef1eba87fe081b5
-EBUILD kimagemapeditor-18.04.1.ebuild 805 BLAKE2B fb2f5741989795260a1543150fde839c273dd8c41d33a0b9e20b1cf48078f17dbbac54a3f543720a4a66ba9c12538405f33f234b5bf52c890d6f36ac6d0e1f6a SHA512 09a4ff56d3833b12d11eea326eacab5ddebde43828ca947ee1635655d8efb9d5c0782bd20d78dcef66bba939bf6556074dffce941d37134636df9f5d133896db
+EBUILD kimagemapeditor-18.04.2.ebuild 805 BLAKE2B fb2f5741989795260a1543150fde839c273dd8c41d33a0b9e20b1cf48078f17dbbac54a3f543720a4a66ba9c12538405f33f234b5bf52c890d6f36ac6d0e1f6a SHA512 09a4ff56d3833b12d11eea326eacab5ddebde43828ca947ee1635655d8efb9d5c0782bd20d78dcef66bba939bf6556074dffce941d37134636df9f5d133896db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.04.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.04.2.ebuild
index a457413fa6e2..a457413fa6e2 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-18.04.1.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-18.04.2.ebuild
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 49c57ca5b0d8..cd1505161cbf 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-17.12.3.tar.xz 119720 BLAKE2B 49bc60c94804735468f491f6d50308f580cff8a7f19f95cbb0e2168a6c357783ecc1efbef3eab6a8dc5f841bb5166116690e2542fab51dbfb86f4e8b94569a03 SHA512 588a681bca53d4a0b961ba6670007c1d507c6622db1e3c058ec20b1bdaefb603fb6d071931ac988916b0686d3a020a86aaf96ddb29f1e75355f53090b79aabc5
-DIST kimap-18.04.1.tar.xz 118864 BLAKE2B 102b069eb4599f2fd59807144cdf628802cee03f80dc4ce57689dddee0ba951ea6a98713dd39adc406497b4041b191f774a5028b277a486a50db109953037160 SHA512 09dfca618d6911a2191f2280014e0c5f126df817a901ec8a393e8ae83f6666a99998ff828ec3552afe8497992ab6fd81697f03ca89ec47c3cfde798e2be274ef
+DIST kimap-18.04.2.tar.xz 119184 BLAKE2B 503bb58af9864d1ab0f5a10adb11c05ca4b85f89a1b564112a4da5ad00a8c7b8dd018cf5e837b0cd50dca8ec9bfd9463a13553b570336b6901a8bfea8c2ec9d5 SHA512 57f83df874e816b07624d6f6107882ba8bbbff1e521810543ee6bc764f2e5a27c12bce65cdad2b5cf8871376cf55f27ba5f37aacde81c4be2f083abcc8f03379
 EBUILD kimap-17.12.3.ebuild 721 BLAKE2B 6cf62bd63ba1cfffc493e50b6ab7310ccfb8559e537315f17fac45891cfddcc67d3b831e4a8e8bacc686cde7898598c873ab70bbe080434e70426e2e4f31b3b5 SHA512 2ff2f8668fdc35bf1771a88c1be2816ecf5bc352d2c93b3d751037ba4f486552f223a1776ba0ecd93da94a2115edbf9ed2af6f5160b3cb35e31248dc0d25127c
-EBUILD kimap-18.04.1.ebuild 723 BLAKE2B ff74601211e0f90b30ce69f1daa4681b583b45f049455cb3fd51d2d704d28bd2eefcf3245ca7577834d366ecf215363ddc8951c6ac3debee0d8de5c180c94537 SHA512 81a73956d8983e4e526fa3ca3256e345a0c6740dcb1939e177a59212d3beb13716be5ffa5d0a788cc4e88f306b3f2c7c9072975dce8d89ec18fc2ae0f2ff8e85
+EBUILD kimap-18.04.2.ebuild 723 BLAKE2B ff74601211e0f90b30ce69f1daa4681b583b45f049455cb3fd51d2d704d28bd2eefcf3245ca7577834d366ecf215363ddc8951c6ac3debee0d8de5c180c94537 SHA512 81a73956d8983e4e526fa3ca3256e345a0c6740dcb1939e177a59212d3beb13716be5ffa5d0a788cc4e88f306b3f2c7c9072975dce8d89ec18fc2ae0f2ff8e85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-18.04.1.ebuild b/kde-apps/kimap/kimap-18.04.2.ebuild
index e7bcd2eec264..e7bcd2eec264 100644
--- a/kde-apps/kimap/kimap-18.04.1.ebuild
+++ b/kde-apps/kimap/kimap-18.04.2.ebuild
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 0c1b8b35116b..16c9937e7202 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,5 @@
 DIST kio-extras-17.12.3.tar.xz 555544 BLAKE2B f8821e0ce5c3f6a7a28ae6a5d672227697efec49b9841b272bc9574aca897bbf104644ea303f11749161c68543206407c26174141ae31c43ca6b403c7d39c179 SHA512 a7d13516646954a00b03d1284c6d93ae71ec9598d03e3f500a6449160c228be9e41aa2351b71522423960e5321cc3a30a46ac6d2ba9e8dbad043def2804b57d5
-DIST kio-extras-18.04.1.tar.xz 549832 BLAKE2B 5771114528fbdd65a909d8a9674df1bf4160e3d7f5716245d5aa9cc5a6dbbb31bf07f45c22106316bd090bf48934fb7d866a4d97fa192a962cb5d398d82b4c08 SHA512 7a08fabf8ff3cc03b02e88f38e889798489e1997c6678635c07c7597bbd9142450030e28958d4ccfd5e1aabc2ba0b213faa981fc30256d7edb76217ae99e40bc
+DIST kio-extras-18.04.2.tar.xz 550488 BLAKE2B 21b6be4cbe060ddee3dc05b7ae15a426fd69db4b17d178a4aa1392feb349427c26ee7aa16d5fbf85ddac95beff143e0be02727df8018e84fc0602999f711993e SHA512 122dbb68740e80af346dc4ca01f53ee6bf267c9d2c0e2f09c04999d3b2aba69586c9ca446b3b5426160571c4b64b6a09452aa46e9451e3de12c20db6bf654251
 EBUILD kio-extras-17.12.3.ebuild 2296 BLAKE2B 765a560c155d84d38e9b2112ffc9bbb8c24b25fbf77e45a82b263c4a84ef0931b3d42f75f37416b685ce630e0988bcde065c513ba70e16cfb76dc380b34781b6 SHA512 6d7d7f1f347b11b038d6d0c224f26762068b495b90447d82f2ca4b9e54f45529ffd37250d60a1c273e5e8e95fc3e97e819d7381e0ebcf3ce003a238276d42bae
-EBUILD kio-extras-18.04.1.ebuild 2225 BLAKE2B 1fee0b466ed3ff3feb108bcbfdac696749c94b550bf17d9b5e86f86359926c8b0404c29341192a4ee1a1bea14fa5fe400b0355cf63ebe370690d150e396aa42d SHA512 67b691874315de0d52cadab2f404d54d63b1677f660c80cf2cd8ee966ff2967f83bf46080a74c2b3e03ca600af93ebd652b61c3f5240b1010487659d96acd818
+EBUILD kio-extras-18.04.2.ebuild 2225 BLAKE2B 1fee0b466ed3ff3feb108bcbfdac696749c94b550bf17d9b5e86f86359926c8b0404c29341192a4ee1a1bea14fa5fe400b0355cf63ebe370690d150e396aa42d SHA512 67b691874315de0d52cadab2f404d54d63b1677f660c80cf2cd8ee966ff2967f83bf46080a74c2b3e03ca600af93ebd652b61c3f5240b1010487659d96acd818
 MISC metadata.xml 765 BLAKE2B dc7954f6adcbf433e73a70b1e352c0522d61a9dbcd09894584407d5bad621788b36eb8e9f5f79c83b923baf11b14dea8372244d06f005220c282549a7d8f3dd6 SHA512 63acedc06b541f4150c89fc289ce05b86fab57de253e33626fbe9b02ca0511e9d34cdc1169c1559945ee1621f46aad09fd526c7fa647ffd1cc04e09509516378
diff --git a/kde-apps/kio-extras/kio-extras-18.04.1.ebuild b/kde-apps/kio-extras/kio-extras-18.04.2.ebuild
index b884ebc08a3d..b884ebc08a3d 100644
--- a/kde-apps/kio-extras/kio-extras-18.04.1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-18.04.2.ebuild
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index daf088fa1dc1..98b730891b79 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-17.12.3.tar.xz 325916 BLAKE2B a84aa79acde6f9ed16e9f92a7e64b3b479e161e8f394321fa929c6da9083215c60bae64fce92d4a3f59acb59c6eedc95365e58475788eb852aa0ea0981bf0877 SHA512 68ef87ee08d3ece79a90eff2e231851bf0cba0c8dda335be68716188646c6b2c85bfe45b0d159d063ef80e51b096e5a8872037f82a79250dce7cb64139cef1a0
-DIST kiriki-18.04.1.tar.xz 327084 BLAKE2B 69987c39ff21a5c03c4972fc62c91833dad9a7da67ca51769400d1b7df9dac4761102c25e8e22be53554377840c4cecebb99345663b1b4012dc3f90e9791a3c2 SHA512 a230e09862fa11be20c780d671eaa47d2168ac468d89680fade39e5c012ea634243d7b5e79554cb70b96f7bb5d24b16b07c99887bbfe0199ca0c9f9293f9d86f
+DIST kiriki-18.04.2.tar.xz 327204 BLAKE2B 054652793a79b4eee0b5df0ed541647a459523c3594c9341cb79c4cd258c039f299f2fb988e5b95ba5212fe2dc3d31d68c43c7afd2ebd9a82823e82b72e57885 SHA512 74d5cc31f976cbe96a713a7d30929b0e96d94bfc2cbb559594e7008892f02531c87c0ef4cc556a2acf8bdfdd59c988f2c43b82a121975846a4b424cceb64c694
 EBUILD kiriki-17.12.3.ebuild 780 BLAKE2B 3ccd5c6a3d359aaea020421a3a9fb70cd37bdbd012fee6e8de431c47b96881e118a826c4b4f481890e705690177116c1cd97265994b56455bc0a42362dd703c9 SHA512 54c9b931af8bc19c85b70736a8d459b8df1d798db8732f7f55fd26e26e8ec30e31e8f4d83dbc02b48a05a635ba9af00f95a9b6be6174392457491f6aa1a7ac46
-EBUILD kiriki-18.04.1.ebuild 782 BLAKE2B d4d941f4735a95ce94622cfa97ffdd8d1528c836f28d6569cc35358fd0195566373a2581686f9793457ec04a1ad61495f2c54c035c9fb699af106fbf391bcd81 SHA512 5a251124e885dba2fd70f11b412af3a060060b8fbb4f06cc65419d5c22c7d1463fa4b4d451cf768f0a34ed556f4730e071eca2ab932629f6a5eeb5dbc9a45b5f
+EBUILD kiriki-18.04.2.ebuild 782 BLAKE2B d4d941f4735a95ce94622cfa97ffdd8d1528c836f28d6569cc35358fd0195566373a2581686f9793457ec04a1ad61495f2c54c035c9fb699af106fbf391bcd81 SHA512 5a251124e885dba2fd70f11b412af3a060060b8fbb4f06cc65419d5c22c7d1463fa4b4d451cf768f0a34ed556f4730e071eca2ab932629f6a5eeb5dbc9a45b5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-18.04.1.ebuild b/kde-apps/kiriki/kiriki-18.04.2.ebuild
index b0d97b3b53b7..b0d97b3b53b7 100644
--- a/kde-apps/kiriki/kiriki-18.04.1.ebuild
+++ b/kde-apps/kiriki/kiriki-18.04.2.ebuild
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index a08f90a52c14..8399d629b2ad 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-17.12.3.tar.xz 11556408 BLAKE2B 4e6604d0fe67cb6a10aa43f8339bc161ff66c7699b26c88b4b973de84fdcbce2bcd448f82e670f6c7e5f5f940ab4707aca513c671cffc5d840b5265d30dc21d3 SHA512 aa84ca7fddf98eceb2215f4040b4494f529d7270f9b0157b916e3e9e97efbc9de0c6c7483d31f99eb17ac9a7c78e6765be2853090da9e86b379678678b8f2fa3
-DIST kiten-18.04.1.tar.xz 11555176 BLAKE2B 21bc7e2fb57fcb5660f7b3582d2d5e4be724f6861e77d6b10b760e4aaf3ad6c3f27591862d80b729c7fe43abdf4a3a3f3d0bddeeee8372a10ace1ab3415c7fd7 SHA512 7ebb52935b7a0344b51f950aaa8b546c442aae6a6abb4404cb0a29d6ba207f8474d1e5bde2cb015b815e65fc5cc11d68abda917db5bde909d2448cc30d024c1c
+DIST kiten-18.04.2.tar.xz 11555704 BLAKE2B 556188993fa3579366e56b35d7000b71a80b27d3a220954c2833b6f41af6e83392c979f7a16c71f16e3751db424f1d159da8f390359562e82c0c7260152ef81d SHA512 c98566dfc7afdcf93a7de2abcd1ebc82046286f67a3f553ddc333f071885dfe56aebc728d00d03076768db3fe8dd23841c79e677b2b558b5cfce59c4cff33f69
 EBUILD kiten-17.12.3.ebuild 811 BLAKE2B 4e2610272301095da9b26ef32278393ac8db2affd5bf3b79baac0e335d5907a721a8c74717a02b52b232cabf41f206f54ebd155ae41abcbf4bd5650cc9dd04ce SHA512 c77cf3e29c5437897a144100518da7012531ee7cc3d5cd628481be988b446feab3f193ebc877aa96e7a2263acc1ddc1ef089e1e0286aadd30972f374faf5ca22
-EBUILD kiten-18.04.1.ebuild 813 BLAKE2B 35f2e8a4415df279ec436d66ae69f785107c4f65ce7f8b34cbe06d2938f39c2985599a3ba9aca040ee95a9c6fae7b2b3761ee94d94de3d1616ce343cad141dad SHA512 3829e1ed3036fac31a30e9fac59257db3372191a6186052405d32438ddc5eb1a2e7d0730e638606f18155b3795e7ef36ff1ec276706e0bf16dbd56dd20abfdd2
+EBUILD kiten-18.04.2.ebuild 813 BLAKE2B 35f2e8a4415df279ec436d66ae69f785107c4f65ce7f8b34cbe06d2938f39c2985599a3ba9aca040ee95a9c6fae7b2b3761ee94d94de3d1616ce343cad141dad SHA512 3829e1ed3036fac31a30e9fac59257db3372191a6186052405d32438ddc5eb1a2e7d0730e638606f18155b3795e7ef36ff1ec276706e0bf16dbd56dd20abfdd2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-18.04.1.ebuild b/kde-apps/kiten/kiten-18.04.2.ebuild
index 19dcab41571c..19dcab41571c 100644
--- a/kde-apps/kiten/kiten-18.04.1.ebuild
+++ b/kde-apps/kiten/kiten-18.04.2.ebuild
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 220f00c695d1..908efbac6ec0 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-17.12.3.tar.xz 293288 BLAKE2B 4efcec26285087b8eedfb406c9f702972e93e609a6f2a34ff98e1cd7f097fc7c27d51ecba4bda582adf36c07affd2c7825a6300feb4c0790f711931c00d5b090 SHA512 880ac463dead49d103947b228f80153e38c43c0c75d7b1f9a60445f61fd19999403d8d04848250b29a1a3424c2d5815312e99ea1a3b520eb511369b26462e3cd
-DIST kjumpingcube-18.04.1.tar.xz 293976 BLAKE2B 8e3c1b31d97cb96f3b2f1083b44c83b4431b378d91c6ed74bb12095f53b9f896a5fd9ca303dc1929ffc2ddad9c1f05ba377e01f2bad0d094b9d0297f0dc28a25 SHA512 0569efb04303d9ac5f37989ce9a5646736430dc0447119c65bcbfcac53c2d63f5361dc4f459e2057fcaa0207c7bd709e00dd91026fd9ba976ddde1ea4a52d378
+DIST kjumpingcube-18.04.2.tar.xz 294072 BLAKE2B 5eb8533c32f5684980903a58903ed5ac64ebc6df857a41112800f6b2f95d78f36348103ac3323624d44e4f7e82ba49c72d0796c763e35bb300ee802f2dac6431 SHA512 5daf8c4788d924d5e7fb6d8cc0746aa4c396e6c5be18ad9e9f3ce7fe6d62a0c9f43ac151c71c62eb6a267c2074d6ac217d178b0b31b2b3e0efa16ca4a5e7746c
 EBUILD kjumpingcube-17.12.3.ebuild 767 BLAKE2B 68f9ca993109e2efda935509a8b4f5f93f6a283a43048b6d5d27fe0deee39961fd5a3210eaa307c0a51fa07a00d5976f4de8d016584aa586f85f1d48a2848803 SHA512 d0940a208cdbf9ab81d93511e2616ccefe4acabe2163b33d6835c732a45a0952f3122081ef6e32686e368384d71d3a3accee538cff583695035b9e12f2607b4b
-EBUILD kjumpingcube-18.04.1.ebuild 769 BLAKE2B a2bd3204739357b90f6f764551ee3a98f89ca63c09bd79e68582d080972591d384adf2e37a882e781e2deb51ad9438ba99115f39287658b4f7579afb7cc52657 SHA512 f94fa9955815fb7fea4b99012e0cfa26b13d4450f4d7bd225067490366f2570d48c026ba18ad5ce62839b145f2a288a7454fb2ea2711cc933ca1999f67323578
+EBUILD kjumpingcube-18.04.2.ebuild 769 BLAKE2B a2bd3204739357b90f6f764551ee3a98f89ca63c09bd79e68582d080972591d384adf2e37a882e781e2deb51ad9438ba99115f39287658b4f7579afb7cc52657 SHA512 f94fa9955815fb7fea4b99012e0cfa26b13d4450f4d7bd225067490366f2570d48c026ba18ad5ce62839b145f2a288a7454fb2ea2711cc933ca1999f67323578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.04.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.04.2.ebuild
index 24ea87a948d0..24ea87a948d0 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-18.04.1.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-18.04.2.ebuild
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 78cf0e8d2837..75addf844ac2 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-17.12.3.tar.xz 155112 BLAKE2B f4d124243e39f5ef94a9a8d5c9c0eefba9881c243867f8d873256cedb96a03f3e2791a390f2e14dadec84cf4255ff4627ec2cf435b3eead21963efa516bd1d3a SHA512 d7cf0fa6b7a0f6fdcc712fb91f3214a4696ceefdc5bbdebb67f5f03c59901e0eebc6a7010c51f17791ffef490f2e39aa82d81dd581f2e2075e9f3bb4a3e8d3af
-DIST kldap-18.04.1.tar.xz 154192 BLAKE2B 2f86517fa3f61a60d9d3949fd495a87769868f3ad2867235ccb2a431c77b8c90cbabf28bcfd35283bd82526f3664ad92c5fbcd1dba0d4a2717d60a171b6f3bf5 SHA512 1ee3f434b7818d7883f875ca8494b9d620ea2ea2474c14ccb335565c78f1b6f9e8ac6b9afbc5f1055daeb501f59aba7c98a3ab7a614d224d20160d7a68bf3d6f
+DIST kldap-18.04.2.tar.xz 154284 BLAKE2B f41b75af3444862b3e4a38145e891715002a453db7c1a885da73583eb0563f69765429801c8d7e2c88dff235f74d49fc3598a970ee54cfc3615035c45209afbd SHA512 2ea30ad9b0e6fe7750cbce0706d2d2985f54f0152331e613b369cf47913d9a0dbccfda04b9604a72f12c41d456b723bfc53d59f8381eb14602e3a2fa1a892630
 EBUILD kldap-17.12.3.ebuild 760 BLAKE2B f1950ca416e0f20b9dd05e0b3b94a683b3012219e2da5f06d395b1060d26c05ad3df42f9f96432f6f4c6d1de295c16e4bc53c0ccabf8e9c9989ff3bed90e0cb3 SHA512 97040219bf3b380924624e7e7f34b13597ad2d664a0c784ee5ee18367dabd79d4d6f95a3630812fbf0684943da9f99990bd67a454be9190f1e2655315859237c
-EBUILD kldap-18.04.1.ebuild 762 BLAKE2B 70a07add502728cca0387b5e6b9b98c6c422cb40ec8b3f0e57c2041aff3a81bfd1043a602d392d17e88f2e45baef2b97f9ed0ae76fc09f833d1b79dcde5c0b4e SHA512 185da5965001d19497bb0f83a4819b7e505d86bfc1017b8b5227a88ca252fcbfc96934c581afa06f71ea507027e87c6a6bf2c23b65bd8b7b223cda3b9fca90a0
+EBUILD kldap-18.04.2.ebuild 762 BLAKE2B 70a07add502728cca0387b5e6b9b98c6c422cb40ec8b3f0e57c2041aff3a81bfd1043a602d392d17e88f2e45baef2b97f9ed0ae76fc09f833d1b79dcde5c0b4e SHA512 185da5965001d19497bb0f83a4819b7e505d86bfc1017b8b5227a88ca252fcbfc96934c581afa06f71ea507027e87c6a6bf2c23b65bd8b7b223cda3b9fca90a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-18.04.1.ebuild b/kde-apps/kldap/kldap-18.04.2.ebuild
index fd1452bcfd54..fd1452bcfd54 100644
--- a/kde-apps/kldap/kldap-18.04.1.ebuild
+++ b/kde-apps/kldap/kldap-18.04.2.ebuild
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 494c767281d3..d7edfbe48b37 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-17.12.3.tar.xz 1895848 BLAKE2B ed9c6b72edd555b1707ce95804c32ca7fb682016135f290677a7964af344fe6a2c1529f7b621626fcf5cf7fd1d7a72bff7d4d7e5e8f7c379a82326ee1fc9c343 SHA512 36cb2e8abe68d11e8d1919e1d87f80d0f926e3934432f0ffc0988574e5d82adf67fb9891fb3bb81d0c68b63d80f7165462dc78572bf29d5cd905284fc255cdbf
-DIST kleopatra-18.04.1.tar.xz 1900604 BLAKE2B e7fa9fa6f8b0ab72933124b9c9e341a0ec6580952728b57467d6082042c27a2c52cc2f3f6793a50f71758079bc87deee3702c0c083674073e8d99407d5473c53 SHA512 d4e404ef7ac8d6a97c57dd25fddfd0ca4f00cfbdbd158cdeb803f880137b583fa201fd1a60b4e00b083935a4784de9cd6d28961acce71eaaf36481f253950ad9
+DIST kleopatra-18.04.2.tar.xz 1902360 BLAKE2B ce263a0d82cd748f2fb061921cdb92bfd28493c73798bbc951276d2bf26c6748c67c37d6b3a6413353049885cda9bed35d5f1ace845e87807b051744a7aa3822 SHA512 d81e95ae5abca5c2b0ece5732fe7ef86036740f79629ea212f5c207293b514245c19ff0d6d5144228afa3d299d33e9126b5551220b9a671aca029b545e38f355
 EBUILD kleopatra-17.12.3.ebuild 1323 BLAKE2B 1aa3bd4a95a6dd7eccbc6ac669c78250343d3c7b99369b443aca92a489019aaebec2408a693b7269350a1b230c6caf399f328b0b7d966cad70d87ffd35aea06d SHA512 b247b69325a3119fa09d7d9e1bcefb121aaa09933578fad290b3ba8c17ccdecc0de7b40a99fbe13f0640c0506670dbe9076e6439f83380824fd7a2ef8f9c3cff
-EBUILD kleopatra-18.04.1.ebuild 1325 BLAKE2B c246da8fa42e95769d488fa8f361fc7767fd9050f2d1609db9860bccf19a9d6ad36e21b466c2619870d6a5c05302110deacb3db75176a41b3b1d802a3ef2c6f5 SHA512 2db9c95924ae4a085a79e26866020b2411e7909c6012d81afb140d5af0db2ac03ec2150fcfa24f3afd1c65756bd2b120e1e8617fac1ad711d61523dce5861f5b
+EBUILD kleopatra-18.04.2.ebuild 1325 BLAKE2B c246da8fa42e95769d488fa8f361fc7767fd9050f2d1609db9860bccf19a9d6ad36e21b466c2619870d6a5c05302110deacb3db75176a41b3b1d802a3ef2c6f5 SHA512 2db9c95924ae4a085a79e26866020b2411e7909c6012d81afb140d5af0db2ac03ec2150fcfa24f3afd1c65756bd2b120e1e8617fac1ad711d61523dce5861f5b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-18.04.1.ebuild b/kde-apps/kleopatra/kleopatra-18.04.2.ebuild
index 9526ad8ef1bf..9526ad8ef1bf 100644
--- a/kde-apps/kleopatra/kleopatra-18.04.1.ebuild
+++ b/kde-apps/kleopatra/kleopatra-18.04.2.ebuild
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index e9fa0f7a7a95..11808eaaa46b 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-17.12.3.tar.xz 21712168 BLAKE2B 79e8e2798fc50fdf0b78eac94f3d346fadf90e4ca70ea8e51cfbf298e08c9143b4ad68cfcdd7e7970ed02f4c4b16189403ebbcd9aea0c1f8ae6cb6a9c015efbf SHA512 a251699633712938393c81f314f9ef8069ea8ab792201ede097cfa2e46ddce6e2184add5a8959dcf6925a87b329b2b3b1acf134c9da1c25e3d39850a42276158
-DIST klettres-18.04.1.tar.xz 21713056 BLAKE2B eab5942bdd06d39978226d79e653ec9739da4294f8c3cc706762d8c279e6b925429250e715d713afa4cf1c5272073029d79f035f2bf0f6dbeec9dc0ef2536435 SHA512 8223bab25a60c515f3ff0d001e38cae1e9d97159eacbb5fa7a8154d1939a8e99ff1cea38162674a3c7f20d8d319e5cdfaba7568226a730ada0100c290f9c3b23
+DIST klettres-18.04.2.tar.xz 21713472 BLAKE2B e898fca68e50a3825318b0669caa0612dc6fff27bfc20c1557acfdfd54d31bfabfc492d0dc0daa90c28dd20a9f85e9aaa545ff37049765bb7b7ee5d148beb710 SHA512 62b51904e14e61b150050cc42d28d44068c0ef17a5e144936579c99dca64f70337cbd71bace797bc2d66e5f25f4d15a2fcd19c88128a3985d53f4861a6c70054
 EBUILD klettres-17.12.3.ebuild 771 BLAKE2B 2def2ad609ebfb87f7352dde75c0b6cf0b5b1939897ed4dbc8badbab50fb711aa106cfb7269a87861c40a56d1af2a41770ffe5b44df5eabff6d3682fc40a8b0f SHA512 ac4b1f7434ff79717f691a88825da9160b47c2e7a173a766b12dc9d8f1c2f95ffa275ea6c3231467d39c4112618d2ddcd268f9b948b0887ad991b6c37098b5df
-EBUILD klettres-18.04.1.ebuild 773 BLAKE2B ebee50fd20662bd100ecf61df3849f12b49608b2d3989e17749a308c958c125f11f65a898ff793f8df38c074b760b72c642a0f9b5163e4b3f766687f17fcd36b SHA512 cd209d6708323c85846b9a789fc024fe118a59bcaab421200ab7b607119c18695f705f6796d05db09ee429a655c83618eb2ed5bb1cfcb11dac4d560c70a8bd60
+EBUILD klettres-18.04.2.ebuild 773 BLAKE2B ebee50fd20662bd100ecf61df3849f12b49608b2d3989e17749a308c958c125f11f65a898ff793f8df38c074b760b72c642a0f9b5163e4b3f766687f17fcd36b SHA512 cd209d6708323c85846b9a789fc024fe118a59bcaab421200ab7b607119c18695f705f6796d05db09ee429a655c83618eb2ed5bb1cfcb11dac4d560c70a8bd60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-18.04.1.ebuild b/kde-apps/klettres/klettres-18.04.2.ebuild
index 5a99090d00ad..5a99090d00ad 100644
--- a/kde-apps/klettres/klettres-18.04.1.ebuild
+++ b/kde-apps/klettres/klettres-18.04.2.ebuild
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 3f600aff1d0d..a30738daebc3 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-17.12.3.tar.xz 1410128 BLAKE2B 224d7df32d37039e289e436c60a432c94cfe4fbd1e467b846272b710e86a089f946e0dd9dfd421f04a1d890311bf293335ba0af1f78e1e40cfe6437dd9dd4aac SHA512 3236c3f294d7270a6da40526436ab789b722e61f17774cc337287f482602967ebb5428bdc843e45fb375d0ce227a0d20e4dbe285477df846ce46e52b215e5b18
-DIST klickety-18.04.1.tar.xz 1411016 BLAKE2B 0ce4f4ce5e483ce3fbbd41db070049be05823c981f04688dfdf53de8eb4344f488b24fcf5cc5a9a19105253807306253d6d5c6d0273639d08536d5b8506474f8 SHA512 dff325417bfbe41ab7ecc83e203de638e781c3882eb966c2bce0c6ec7c564be66fd44437ddf349983afa5be0190b662c94c083f917194d227da3a27d68b36a77
+DIST klickety-18.04.2.tar.xz 1411244 BLAKE2B 580cd433d4058cd6b1deba78dbbd6ebc24d2d03648d28bf5c3b3d8ab1dd476aa181ac483c89f841ed5bf025e7ff3549ba2fd69cc4d401e9b498b6944164816b8 SHA512 89e19ee5952443dd390cc9d466681be23609d29aa70df73ee33f7c10860bcfd4fca9b3c648fcefd209f5b7a5c57ed1652f51f0ad6fbddfdf9cb6bfbbf7c8e592
 EBUILD klickety-17.12.3.ebuild 777 BLAKE2B 9d0562efe8ed345c19c2038b1d8790c73c08531624a981acafec198470974f6adfd41c079f52dad4ed05e94f9496caf314d7b5d310f2eaafc6500c5d30a1ab6b SHA512 2f5dc2324fc5538e5a58416f58af57edc34ddcf6d3608c24b22d97b1c099c93652f8c89b403302846c30c2edf6f2df047dd286c7dc34d9b1514b920667fae3b8
-EBUILD klickety-18.04.1.ebuild 779 BLAKE2B 823d03b8596084535d467a2359c484000ec6616429b2dd968174f29daca821022b90bdf7011d6e0bad92b5271a00976e90987c5416bf15b996c7cd3a9c8ce642 SHA512 b0795f1815438432719b97f1686354757831b20338ccf4a93fae0d10f5bcd6a049117dcb1fb93ae87ee8b0d4422631bc421ab690ba59828733794a1e74c8f920
+EBUILD klickety-18.04.2.ebuild 779 BLAKE2B 823d03b8596084535d467a2359c484000ec6616429b2dd968174f29daca821022b90bdf7011d6e0bad92b5271a00976e90987c5416bf15b996c7cd3a9c8ce642 SHA512 b0795f1815438432719b97f1686354757831b20338ccf4a93fae0d10f5bcd6a049117dcb1fb93ae87ee8b0d4422631bc421ab690ba59828733794a1e74c8f920
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-18.04.1.ebuild b/kde-apps/klickety/klickety-18.04.2.ebuild
index 29d07f818c1b..29d07f818c1b 100644
--- a/kde-apps/klickety/klickety-18.04.1.ebuild
+++ b/kde-apps/klickety/klickety-18.04.2.ebuild
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 4767875498a2..6821d33fb656 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
 DIST klines-17.12.3.tar.xz 1667652 BLAKE2B 1159f2867e124b95475efe73a4bc2588eaaaca5172f4932e8aa9fcf5b06e6d895252e019550a4aef05f4d7c6cfdb17bd50b17a75f2ef59a4c7130e34c2496dbd SHA512 14a3fff0dd010d94b7e76308a8032c4bce428950b5024cb81676a18c264f0c1de7d87540d8a36060588beaad5da7f22a4140551b8c46be08cac7a50c314ff3e6
-DIST klines-18.04.1.tar.xz 1670904 BLAKE2B a379040cfb4dde02faabc70c57af14b1b816c4b9af7aa5b6ee73a01e5a14923d70eb9a8f0e81f840e947cab72fe1fe6eae7518cf14a5da9343ed43da5163739e SHA512 a4a3c5ec071d2acffd3e7badb26da103801b0ef9463b485dcf584f444b3615a6355058136e68efd6af974754396fa9ef8cff1cf178b34b0c3edc6088a65cbade
+DIST klines-18.04.2.tar.xz 1671072 BLAKE2B 54c10abc863478ae94a283c287667b17cfd5259bb955554d109bb2135c412a2ff2bce374537077f5db41a07224995f5e3590fd510335cafd2230f9d8150b724a SHA512 686483b05c52d478106b66924ca843f39ba1d5a9c0fc03429201f87cf02c5403fddd26bbe4b6f8d5ba141bb1e7f821e0cad0db5a576ec38c53705a6e3594d17b
 EBUILD klines-17.12.3.ebuild 786 BLAKE2B 77bc18df1dc422f77976c3c9d1a0c6d5a9dfe3a3261c18766a1e68ca755c5db1831848b74c6b927e3f1bd7b005ba1998bf2ee1f4025a82f9e4d5659fc8091741 SHA512 87a9781483b04be005d26690868278dced7c776a105b274d38381781f46e25a64c23fc640b3d8cb899282d03518330394cf5cb0d69c1c5226a247a7145f9e216
-EBUILD klines-18.04.1.ebuild 788 BLAKE2B 6ce27fbd68fdc1bb29f99dc59c5c61080f680882d87bebf95eae4009ef221e69256da0e42d27a60bdc83c90010ed310daf9cc1ffdb32691fb63e636895496ef7 SHA512 19f860eefc5c4c6d070ae2652471c87d38aeff1337b50f8df0091b9b5c1c9955c9b3fc300c14f3e83110c89599d8856d75f8ccb1ff8fd94fa43a0bdd8c849f2e
+EBUILD klines-18.04.2.ebuild 788 BLAKE2B 6ce27fbd68fdc1bb29f99dc59c5c61080f680882d87bebf95eae4009ef221e69256da0e42d27a60bdc83c90010ed310daf9cc1ffdb32691fb63e636895496ef7 SHA512 19f860eefc5c4c6d070ae2652471c87d38aeff1337b50f8df0091b9b5c1c9955c9b3fc300c14f3e83110c89599d8856d75f8ccb1ff8fd94fa43a0bdd8c849f2e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-18.04.1.ebuild b/kde-apps/klines/klines-18.04.2.ebuild
index 7d4775b223b4..7d4775b223b4 100644
--- a/kde-apps/klines/klines-18.04.1.ebuild
+++ b/kde-apps/klines/klines-18.04.2.ebuild
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 77f888268102..cf5bf03a75bf 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-17.12.3.tar.xz 588224 BLAKE2B 7e5a9c5eba52fe751b1bdf8f5e5afea400a82cb3b48bc8e5a31c7219b44f5fa69b9bd047c8e0b508c5229c367b2ddd706e0b2c7b26e18ffef8105310f2fefaad SHA512 d9815d9e59a25765a74b3a33253de718b333f53c32df9afefdf4cb6551f10faeedaed189e625f20593d8d3528b835a01a47891dfaed341f0e943a317d6c6aab0
-DIST kmag-18.04.1.tar.xz 589236 BLAKE2B 2ad424a77446eee476d8d6a21a194178cfe84b466a195a4a3d028e5ee4fa34c99fc462f1f3fccefc9035044bd534505dd19900e7bc2a7fa2d8df19ea36c90464 SHA512 d7498a1b6f60383f0b23826d654412d8001e2179f96b8fb703cd982d53bde5202ebaa00c3527b4efb320767e6d92f22874d01703bf2b678cc0ae082c67e93288
+DIST kmag-18.04.2.tar.xz 589336 BLAKE2B 8a6a07a3bb1fdc48377bb0e10f9064eda578d5c3fdabf15bea347a40bd1425f178030a6d08e8690cfc7a0681cec2dd8700911e3343bc4d2b49ef64e4b9a5da41 SHA512 6b1d2a330ea4d395f3d67c1104310bff367e728317d8f96d46fcf48f84f0481937217bf96fa66fc1fc175d0dbcab91eb66f4773958be78ec585326324d8f0462
 EBUILD kmag-17.12.3.ebuild 857 BLAKE2B e51060f466ca3fb7845575a3fb80fbe46933deb5e19141eb4a4c2024c82a9dbd3b3fb5101e831ee907fef31b49d9c5e1bdcbd8050cb6e10e33af603eb70664cd SHA512 741d51b88c16628b1eedeca0641ab3ca71f8e3c8bb6ddf36cdaec2d35eabd435f60ccd47d021caa5dab16146c9a7d3f3d7cbc6286785a012402ad13d61d491b8
-EBUILD kmag-18.04.1.ebuild 859 BLAKE2B 09eff3061722d92f59307af5037e312404860cf3bc753d0fd2ca874f5ac0a05ee04a5826877a4aae2db42d5915690d1a64c97f69d84f89a837a72104f3936889 SHA512 806fa0da2c4917e98bee7f4a9ddaae977bc0a16d3a4f0466fa434ecfc1b1d5fd00e112756c16eaafbdaf66986f0558e8ab715b645a416c3d2f7dc84c607243a5
+EBUILD kmag-18.04.2.ebuild 859 BLAKE2B 09eff3061722d92f59307af5037e312404860cf3bc753d0fd2ca874f5ac0a05ee04a5826877a4aae2db42d5915690d1a64c97f69d84f89a837a72104f3936889 SHA512 806fa0da2c4917e98bee7f4a9ddaae977bc0a16d3a4f0466fa434ecfc1b1d5fd00e112756c16eaafbdaf66986f0558e8ab715b645a416c3d2f7dc84c607243a5
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-18.04.1.ebuild b/kde-apps/kmag/kmag-18.04.2.ebuild
index 78ea685239b2..78ea685239b2 100644
--- a/kde-apps/kmag/kmag-18.04.1.ebuild
+++ b/kde-apps/kmag/kmag-18.04.2.ebuild
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 6c43b272a068..509c35b25ca6 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-17.12.3.tar.xz 4084868 BLAKE2B 761d68c0d027110a6898d3697898ed6824681fed98bc0a87b042406432a6796dd771a2012866d82c2b41eaf447a3cc89c6baab72d3fb09002aa1d9f3f0c3ebe3 SHA512 c6835b0900e7969f65f5cf74cccdd0271aac1e4d0f161fea13812e91415db77b7b5937b75adbadd027a3b424e520de8cb7c9ce277dd29285ba6a8e439888e8fe
-DIST kmahjongg-18.04.1.tar.xz 4086480 BLAKE2B c433297f3593f54013f9bffd4559d01ae3470ebdf50dc82592a4382ae5a05ec4b49f4d096d7d5774029a00e6b52721592ba9d14521bc855946d8ffbc2016f1dd SHA512 72d787fd92db6a1a0f2f526157e8910a76b21eb2b5344534a8459b754de757a0b9d38047d5e8caa16ffd7c8c9edcf1da565824cd56276d38787de9a501beb736
+DIST kmahjongg-18.04.2.tar.xz 4086472 BLAKE2B 9dc776378c8f7fd3ec0ac5e1af69ddcae9116b0ba2bf5c4a74ee6d458d1946cb6bec0fc0bbef0dc4a757a79a79ddae79ab0a6f3538f585c1bfe4fe7031243747 SHA512 08eaf4fbd38bc02fe61380966d13abd5e1b6c9814709e868912fb17db94f31a6ec68d3b412b2946778436bab4f837c818458274802a2651f2bb2aaec67d2415e
 EBUILD kmahjongg-17.12.3.ebuild 919 BLAKE2B 6f6c7d03718a1c1884cd05e759c43cbe6931bef488ef1086032d5e503c9ff63636b0d6e54fa3e38fad15552060bbd50827b9a5a7dcede35c4888046d1d478c4d SHA512 f0f8629356ae75045ea083099e0deec449046034a97a28119708565fae484aa88e1d41b53d519de7d21186dd2a4e730c0b3e93bbbab1f88e584bb36d2e62da31
-EBUILD kmahjongg-18.04.1.ebuild 921 BLAKE2B 305bdb04b2711bb691601ae5f1601802fe5e6aa29da6962f0a72ba8f6bba065157cc1adc77fe31db30570564d83263a8c7266575c2eb5bec87c0a18964fce7ed SHA512 dcb4016864dfa052e5340a8ca81cd32775ad3b4a40ac5ce56b6100df862e4e1a9aa51e326b43c6403c34b1fed15584184766071af5d1f164b2513216c7a925cc
+EBUILD kmahjongg-18.04.2.ebuild 921 BLAKE2B 305bdb04b2711bb691601ae5f1601802fe5e6aa29da6962f0a72ba8f6bba065157cc1adc77fe31db30570564d83263a8c7266575c2eb5bec87c0a18964fce7ed SHA512 dcb4016864dfa052e5340a8ca81cd32775ad3b4a40ac5ce56b6100df862e4e1a9aa51e326b43c6403c34b1fed15584184766071af5d1f164b2513216c7a925cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-18.04.1.ebuild b/kde-apps/kmahjongg/kmahjongg-18.04.2.ebuild
index 7f03c60e0f6e..7f03c60e0f6e 100644
--- a/kde-apps/kmahjongg/kmahjongg-18.04.1.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-18.04.2.ebuild
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 7297f9760cfe..4a70b0d43e74 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-17.12.3.tar.xz 153456 BLAKE2B 84dcb3249dc82d22e29597ce9396d788fa6447f0e5ab4ccb783904e54eb86f65e8cf7b7e583567bf7d61a45f4eda485b46e5abb9767f91fbb71ba95aee0c981a SHA512 c19d89cfaecb4072b1dbf4fbd059e522e60b148edb78eb94e46ec73d56f3794e29b4af198d453d6b837431fdb738ab22dc6ba3c98766c2848c0e3a24135bbd02
-DIST kmail-account-wizard-18.04.1.tar.xz 154864 BLAKE2B 00c0cfacf049cb0b01e17e625dee5ab48ea8ce29dfd7bc5e23898373634d0940a3da2c5065f580f0a7db9c450853f0d229171994aedc4c42e1f0371a71829cc4 SHA512 8ae8c2d899d0f72449858b033a3635894348a3a3dfb44892bb07f04c4da911b15ac90805b62d14a1d8bc1af1945cf04202d4b7e31ebf720997e4d910e9160c9b
+DIST kmail-account-wizard-18.04.2.tar.xz 154980 BLAKE2B 000801b4f0103c71031f3562d87a16845b5405aa7f9f7fe778c447db108acac1ef0cfc9643f38904ffde3172b92b1a8323fa049cb23133ab1a49c6bb8c8df0d2 SHA512 ce867e194241539155e82260dc20c6550e65bdc81e44821211000e76304a44bbf9cf375802b955b8ca77c4b0393ce61b6fbd20d27ba7a057ca0572c1709d41dd
 EBUILD kmail-account-wizard-17.12.3.ebuild 1443 BLAKE2B 6007a7862e8aef132649f83be8b139a1202b3c8ecf62b32e63fbce7e8be706ee36e358a03fcbd555cced21d43a5d9ecb57e18eba0c7ea0c0d7d6a885e72bfc6f SHA512 4cdba7be5e9e59617a5f37ec4282e66dca61a13570acaffdc39738ecd5eab0b60ddd1d77e3ee1708832df59985e6d9a15e890ebfe1d02eae53e1e4911354eaa5
-EBUILD kmail-account-wizard-18.04.1.ebuild 1445 BLAKE2B 7926b75b4a9d5f435c4d4d30a5c59cf1ccb137394f0680b831a09a6106011d8850bbe218751d35965300e2ac6fd323f7385e44152d0b7559169c420ca5168962 SHA512 b8007880b6400c349c7491ffd23cb28f873851ca77e39766dfdcb113eaceb9548e936bc1e47c7409031214b4c26f94dda2a467301b494b81267525044abfc188
+EBUILD kmail-account-wizard-18.04.2.ebuild 1445 BLAKE2B 7926b75b4a9d5f435c4d4d30a5c59cf1ccb137394f0680b831a09a6106011d8850bbe218751d35965300e2ac6fd323f7385e44152d0b7559169c420ca5168962 SHA512 b8007880b6400c349c7491ffd23cb28f873851ca77e39766dfdcb113eaceb9548e936bc1e47c7409031214b4c26f94dda2a467301b494b81267525044abfc188
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.2.ebuild
index 1d631b73e888..1d631b73e888 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.1.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.2.ebuild
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index cd9df2b5439c..172a950948e3 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-17.12.3.tar.xz 4746820 BLAKE2B a8ffca362a5cb7433917cc361a786039e9792714910ccd46b305d97826111d21502a9598bd044988949cf4b1ed74c3eb49a4cb70f5d7af22a118a876d3d17b52 SHA512 903e6accd92cf70134a162fcbe2bb78c5058453c4272ed2fae02cc75aaaf185da7fa87b64926c0ad6d40a3f42ffb60ba7873106076c034840cd75dd965e406a0
-DIST kmail-18.04.1.tar.xz 4758416 BLAKE2B c87c85d7bf7921cfba955fe057ddca0f99af8152adeaa0a8f420a6ab232a0e4b08feee39883c6d29cfcbdd148d612320041c3055965676094ad33f7e62260cb9 SHA512 61d8e0d35bb9f4bebbd0695a7059c84b781626df5da3d23919822bf95da62e26f44bce1a182324590ea6245f2d7d7d888ee651c2941e42125b3607bf6ecf4974
+DIST kmail-18.04.2.tar.xz 4757740 BLAKE2B 978cec7458ef7c9a2b8dc157a68e60540e44f6608abc1bb1d89b1301705732ac799e55b8d3867129e1dbecbbde01b9806b3cafcdb3a502a3cfc760457cec0da3 SHA512 d264a77509a36cbd702dd046472b4058857eee6f9ff808d0b15530b146df471948bc671b88e3839a3b1a13bed57878d515686245c368fef4bc0903df05c63d2b
 EBUILD kmail-17.12.3.ebuild 3201 BLAKE2B 542857f6faef4b8d94c223f6caf64c47cb96d38df8f44ae86d58dd6b6473b9ec75c1fcd7b6fb1dfb8f0b633b2e99aa979fabe9fddaafb7b596300d9abb479f58 SHA512 852462e0a5ec668dceae6ef15495ca9c193469f308cadb3d51c8ff5a8ad4c812d4f457e1f38c6e1abc646fd2e9eb54696fd46e856c158066cc910f8387348a24
-EBUILD kmail-18.04.1.ebuild 3182 BLAKE2B ca1c1db4d7c158360d8d5f41057d4c35df7b588e3dcd8687ac6be1bccee6e199d9b6cd3a39192045fba959e410ad0bdef24383834a5ea4946160c32d11ab5d7e SHA512 2e653f8da18b09d27bd8e4a25af283860836ffc41136c5c792beb3e6dbc0da95ad8567d320c9c744424071b09d7fdc8b5039ebf360c9a9043fd06efac0ef3dda
+EBUILD kmail-18.04.2.ebuild 3182 BLAKE2B ca1c1db4d7c158360d8d5f41057d4c35df7b588e3dcd8687ac6be1bccee6e199d9b6cd3a39192045fba959e410ad0bdef24383834a5ea4946160c32d11ab5d7e SHA512 2e653f8da18b09d27bd8e4a25af283860836ffc41136c5c792beb3e6dbc0da95ad8567d320c9c744424071b09d7fdc8b5039ebf360c9a9043fd06efac0ef3dda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-18.04.1.ebuild b/kde-apps/kmail/kmail-18.04.2.ebuild
index 42818ab48cd1..42818ab48cd1 100644
--- a/kde-apps/kmail/kmail-18.04.1.ebuild
+++ b/kde-apps/kmail/kmail-18.04.2.ebuild
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 6ae472c69a1b..b9b5e5edeea5 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,6 +1,6 @@
 AUX kmailtransport-17.11.80-deps.patch 1450 BLAKE2B dfb1e3c3d0e232986bd187e0bd1b623a0f1895750af69b9aa03876dce49c0baf09c2d2dbb83c40241da280d40045f9898ff218f4e8cafc4df09daee8f3fd27f8 SHA512 037a7efb891883cfa388d252a8e4fc12994a851eea56770c0f6c7acc368fe507d66937392ff6a401cf2781c30cff748e2521f014024ca2f61c690664b63b5af9
 DIST kmailtransport-17.12.3.tar.xz 164804 BLAKE2B 79b2e5d28429c777f1b6f205a950109bf8f16310eb8e6700079a9e28c4876398e813406376aefbecef5565caf0d75262bef700f1a69ee59dff393ce93d10d18f SHA512 a90d305a0ca9e938c0629ac602862307f1561280cd8f90159e0d9eab48bc8e3ad67208a04db724bae5e8b5edb08ff7901843c86f3d6ab3b5a2d7092de127d513
-DIST kmailtransport-18.04.1.tar.xz 165012 BLAKE2B ddd029562c8fce9062db5f56766e2577bb8deb0c50d653b09ab3838002d30468e1139263e54358ce6195f2235445a4bf5e43561f19417d384b0c113b552762d0 SHA512 15f049d217a8401c26f036f55d226603168552ff11025c589ec7c3ae59f635a73857c29f9fa343c49bd273889a21abeea087240f0959a9b980ae5f485794d3f1
+DIST kmailtransport-18.04.2.tar.xz 165044 BLAKE2B 2d9b4477832f7c56cb9d8e2a2abd02844a342fe7c24eab8a6f9f6d2f5a7a94f99cc4515c89c768ea72f82da4c2902666a23acdbe7e137490d1513212cc1d42f2 SHA512 e0f566d91d2c57de06234b6c1341bcec2c7ae5bcbca3e9707bce90d7df9522f204eea542db15a3952a9da4e3afcf8780328cd92bbb19f8f4549fc0a5522b8d71
 EBUILD kmailtransport-17.12.3.ebuild 973 BLAKE2B b1eaef0dadbf94bbfb1db48bfec8d330d2797afd3f346f17c8e70198c252010f92428762c4203ecdca63dc67da850b4b4c47d1e4a007fbb8026dc81fb131d634 SHA512 b6dae6990a2ec2754b147851e5d027e1b436000ac79cd06021b2fe1f8d146ec6e54d8ea5562619c44aa6736bfa821dc36aa02558999afa0b04be3d3cb4295819
-EBUILD kmailtransport-18.04.1.ebuild 922 BLAKE2B f7669c1a6b67aee39fe777c8163ffc5f206f6501b71c7509db6332eb0e495c9232cd4f6c17d1300c799bf7455a3ac551bf80bb34a4e0377665df2c7fc4baa689 SHA512 7188152ece084912e8db2bf7b0113ef92d4c4d776ba29f5fd77243e185ed4aec44e1837f70984575b0302b66c61b7c5e389099188ba2e7a0867633109784f171
+EBUILD kmailtransport-18.04.2.ebuild 922 BLAKE2B f7669c1a6b67aee39fe777c8163ffc5f206f6501b71c7509db6332eb0e495c9232cd4f6c17d1300c799bf7455a3ac551bf80bb34a4e0377665df2c7fc4baa689 SHA512 7188152ece084912e8db2bf7b0113ef92d4c4d776ba29f5fd77243e185ed4aec44e1837f70984575b0302b66c61b7c5e389099188ba2e7a0867633109784f171
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-18.04.1.ebuild b/kde-apps/kmailtransport/kmailtransport-18.04.2.ebuild
index 5814e89ef59e..5814e89ef59e 100644
--- a/kde-apps/kmailtransport/kmailtransport-18.04.1.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-18.04.2.ebuild
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index c77d8bcaae44..6cbf6e9564e8 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-17.12.3.tar.xz 24356 BLAKE2B 7780c408317bbc7aaf1d0d8cb128550afcdf0a8a5a5d035c51fe25a9b9870ef825f74351b4bad33f0d8524582771ff91f15297bd1e3c1d8c119c3d4e399af335 SHA512 785dfc65b7b3ef7b5bc9a1dde9d67d04d06110995fbc0b4112670c27350fdee4cfffdae7867dd73f07a431f4116b784faef716de902cf4da0767f396e7d3624e
-DIST kmbox-18.04.1.tar.xz 24540 BLAKE2B 9aa2809e1f8e5e6a7ab7e919832758969d4b3adf94be073046029cbb5b56deb6e56741628a6d387c449cfdd2b9b5b53a36d2fb21bc238486656ec6e5ef0a37e5 SHA512 d7e63b1d60ecb362a12edda10c6e1c03f4b2c68177864d7e07aafdbc04e23cd65f45ffda5621ffca931a0145d449e2ed2a0a3a42743a93428390d471f5931214
+DIST kmbox-18.04.2.tar.xz 24552 BLAKE2B 8d118dbe61dbec68c3dfaab6215f4b9cde7497d2d286f42bbb01668d90028861d1479ef8e418ba7c470ae530dd38dd24065b04ff1c4aeceb974dd023ff731d03 SHA512 d0e5bf0d1e50d85d78e1ef35cb4b5931a31c3777c0f93175be9dc32dd0e07677bdfc542f5739db32a815715a1caef6dccf84a7153f1bcb1a9f7a2a3654cae570
 EBUILD kmbox-17.12.3.ebuild 309 BLAKE2B 455819bdc1f3f68251a13c8449aeb6be5e2b7e54dc73f78a852b6ec3e8c2b2a893adc1ab9f2dcccc016a1e80bfc46b6c1d936d35784ac7da7d2398dc4b623c02 SHA512 20f579addae7175ce34af42be9092340339b17b36562ba819228658a50b5d72f1187c6cb7267e0d7d513237ebe84f152e902807bc1b0392ffa0fe59675db634b
-EBUILD kmbox-18.04.1.ebuild 311 BLAKE2B ec5ab4224dc43c1bcd235f6d56af794f20d976d89064385a35010c554615f4239515304e6278c11a09da0602b9ec6b82f6a26977d0dfbbdcf62ca0a3c903f164 SHA512 b88679b1d6e88f7c8e1834d47b2d0f35acc1221e273856c019c0296b8769617afa0084e1664c47c1314ed6c36e568f4cf2ed422a56535799e7477c82f4ad34dd
+EBUILD kmbox-18.04.2.ebuild 311 BLAKE2B ec5ab4224dc43c1bcd235f6d56af794f20d976d89064385a35010c554615f4239515304e6278c11a09da0602b9ec6b82f6a26977d0dfbbdcf62ca0a3c903f164 SHA512 b88679b1d6e88f7c8e1834d47b2d0f35acc1221e273856c019c0296b8769617afa0084e1664c47c1314ed6c36e568f4cf2ed422a56535799e7477c82f4ad34dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-18.04.1.ebuild b/kde-apps/kmbox/kmbox-18.04.2.ebuild
index aecae880bedf..aecae880bedf 100644
--- a/kde-apps/kmbox/kmbox-18.04.1.ebuild
+++ b/kde-apps/kmbox/kmbox-18.04.2.ebuild
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 17a2a315e718..7bee0260f84f 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-17.12.3.tar.xz 146456 BLAKE2B 106a985528ae9ecebdf3f9363ed2d84eb1067e53cdec59dae09896575bb49cb350527ee72c2d44ff5a7f48c8208360c2a919f8b1362bb5397796fe32d6c7a922 SHA512 f1d9ce2468da62836f9db461c2da71293ca38666576acece3c7e60c6f1bad10380f5db650c4bc5c4ebdb5bb12969c6a11f88e0e9205d265a8b0af825c34afab8
-DIST kmime-18.04.1.tar.xz 146364 BLAKE2B 8a397859ba802b5090915888e3a96a446946f8310d799b140ae3087e1590946590ee48e4c1256f573d4f9e2b44d2eff7eb79e47cb314a49c0d3ad27e32525b56 SHA512 40f25aef78e1d91e2c75f7e0a5a30b22aadd481372b3a2d6965daebcd717d20e6b0d63a11e678ffc20c4f33875130d93ca263a3e43a32610b7a19f6e5fe1f8d6
+DIST kmime-18.04.2.tar.xz 146424 BLAKE2B ba2209d6ef3b51b82471f6c9d2bb27ec10b5b0131022a91559d04a5d008553c4c0847ebab39df6dfe31b93331fe167c6a4f5eca2f908eaa6acff2f2d29c9d21a SHA512 3b6801391c70ac2fcd2b99cbfd605238fb70d78c8e358fc4a9382f8e3297a53ec8a4684067747f09887ca33383e7b0e356b4d5bc1c1f8e249e0ef317ec0c6d88
 EBUILD kmime-17.12.3.ebuild 379 BLAKE2B 216ed6d21e1450630791516fc558d407840f4839a29251580707da273b38ee58e7a5ca0f7277e1d76df18be46e4f48582691e7d29b8a08d7fcf66d3fc4cdbab8 SHA512 9a3fd01d1dad25cbb1614bf1beec04bd3f6b2afdd93c9eb78b24992eb0920d2a5dd10259441adc92efd41c3b46307578e7fc8e8bfb78b8bff917abb8c4bcd709
-EBUILD kmime-18.04.1.ebuild 381 BLAKE2B 52d676a1e2fbdb96f54c165253d4a8cbe3d1174a6638b3cbbf86eb37042d073150e82f95c03fbe8465a6161c142969568cdbb74dc42e3d55d64ca974be692e7b SHA512 0011bcbc77462fe44c6ad9ee2534528026077eeae7effc8c50beb7210b7c76057639142bacf7447b7f28277b96f52b57f68fc966b97e8bb3df6f9ab3a1fd0dad
+EBUILD kmime-18.04.2.ebuild 381 BLAKE2B 52d676a1e2fbdb96f54c165253d4a8cbe3d1174a6638b3cbbf86eb37042d073150e82f95c03fbe8465a6161c142969568cdbb74dc42e3d55d64ca974be692e7b SHA512 0011bcbc77462fe44c6ad9ee2534528026077eeae7effc8c50beb7210b7c76057639142bacf7447b7f28277b96f52b57f68fc966b97e8bb3df6f9ab3a1fd0dad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-18.04.1.ebuild b/kde-apps/kmime/kmime-18.04.2.ebuild
index 18fc8866db0d..18fc8866db0d 100644
--- a/kde-apps/kmime/kmime-18.04.1.ebuild
+++ b/kde-apps/kmime/kmime-18.04.2.ebuild
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 904cba7ca220..c4055ee43bb0 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-17.12.3.tar.xz 882616 BLAKE2B 80d87205c646c6f4fba54bbbc92361678e6247cf34859649dcff73eeddf62fb6830b47520ac6778aab43cb0378c7469f0f82e14636e57abf1305c7ad6fa4986d SHA512 09f17fc4ebb8babd9c2a1470269e55c9f10f94680577812aa65ef84191668226e4aefe206cdab4997a05ef9db1eb45a568563da7061de8be6d1629c1bbbc8a33
-DIST kmines-18.04.1.tar.xz 882500 BLAKE2B e8e1938cf860f89e8a0882e78fee79f3242da37d415d1c287856a697f531da8d6de03937b629c7749ceba9d9241be61cf5dafa28d1dc1c9b0dbfd9854cd5d1e9 SHA512 3f581f1713a83e9789ba7f19d5115b2108f6b54e644f53b123d548b715640e877af2719aa571bc12215de0f45ff7ab93c9a5888c04c4d967ba95d3b7cb385883
+DIST kmines-18.04.2.tar.xz 882576 BLAKE2B 4249254f7fc4acc460f022fd46e8abce2a257a881abac331dac5800ac2052a8c943aefdc1e8c2de6a18c9b606326830ba21a69530b3090f5cf87fc61fa03e867 SHA512 3c52d677166357872ad2555025f95afcfa15e5018d93929311f004039946e12e9f910f74409ae1836a51f6f63c89cf9e4f780dedef677475e68adf5526fe79ff
 EBUILD kmines-17.12.3.ebuild 773 BLAKE2B 10d7004524f7f641407361453077250c3069ce28f6dcf2281ed5bfb66bb155c8eb0bffcc4c857914acb960c3c13056dc7fd5c949cde406ffd6468ff6f81473ce SHA512 6fdd7890ce470b3596249de91c0194453fba15b32c7f1bd3fd4dea40ee375e636b80a3f718308daea3d99f1ff6d4b505114423deda6d8037cc04c18ee39aa642
-EBUILD kmines-18.04.1.ebuild 775 BLAKE2B b0d600e715c012424b6f5d13f1293b65b2e2ad7b999808cfca0d3565436377bd4884a7674fcdad38007ccf8326d7d6dd682d012bf1539292fd6cbe103cd5c78e SHA512 c4fc7ff0268222cd745be8f5fa449b7e0577f6811c67a330ff1d2036ffb90fb7d87ad225eaaf1de54210e20349772234eb4c81b988761769c080b39e7501ecb1
+EBUILD kmines-18.04.2.ebuild 775 BLAKE2B b0d600e715c012424b6f5d13f1293b65b2e2ad7b999808cfca0d3565436377bd4884a7674fcdad38007ccf8326d7d6dd682d012bf1539292fd6cbe103cd5c78e SHA512 c4fc7ff0268222cd745be8f5fa449b7e0577f6811c67a330ff1d2036ffb90fb7d87ad225eaaf1de54210e20349772234eb4c81b988761769c080b39e7501ecb1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-18.04.1.ebuild b/kde-apps/kmines/kmines-18.04.2.ebuild
index 517fa32429c5..517fa32429c5 100644
--- a/kde-apps/kmines/kmines-18.04.1.ebuild
+++ b/kde-apps/kmines/kmines-18.04.2.ebuild
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index a2de65ecf826..c92c3fe34bf5 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-17.12.3.tar.xz 1281524 BLAKE2B 7eb86417515b33a1ee0d50f87d20e2ade27df4be6792e9b2991065eb99bf123b0d5aefe4477c952a129aef08052dbc96960e32b58cafaad124e4072254e4d6b8 SHA512 e238331586a9c77792c10b1011f789ba739ff0811cf457e73812b31ffea7bc8bd4d3db66d5d50395676d1b8eebaf1894e01ae10166bddf7818c2833c6f346688
-DIST kmix-18.04.1.tar.xz 1284496 BLAKE2B 56e32b693391132bb3b4f6a040aa1cee48d746b5638cc3e953ee2e7f2e57a8905df1d80dad85d6f151e2fd0b7fae7fa4247320548c4c16c3fe40a409f4f5bc54 SHA512 c763548b76e2cd8e01654c4fe5499a21cfbd5152f927c007fa46518d6eadab022fdca02cc0c422a9882945897d85a61d1d05020dcad156fb5171bcfcef712a1d
+DIST kmix-18.04.2.tar.xz 1284608 BLAKE2B a707ea2ce7b941c41c8ec651cb2764575814e85648d62b045d3a5bfcf5f003f0c08bc38aeff5bb6f3275f90483a2efb2b2fb8e32dfa3fc95a9fb97884135be37 SHA512 b178a31642f5f7a7891b8549598aaf1203f3ab779ddef660e161c16b466a6ca12270de4c75f29e8af934ceb099d425a42a6b384ca2a84e006fab3798bcc2731c
 EBUILD kmix-17.12.3.ebuild 1257 BLAKE2B b6e380cfc5ad9dacfad944abdf8938eedeef0b2fb645ed3b8e9326991468a08d674327cb5bb883084867c13023e20b33ccb98b3b1aee513f005bf3ceaf0fd980 SHA512 a5f8527e8a10eab94ff93b1694a8656c460ae1b6c5bb91f4f6741a2a140bf6e0c98720b2041c69ec9a85ea86b82366075443bdc3c82c6676c418df42b28dddf0
-EBUILD kmix-18.04.1.ebuild 1259 BLAKE2B a6bbc426ed3368d528f398f4d97b9629312bb2f729d9b36f6cf0f5ad6bad3584253638400dfd62b3204078ef36967e0f5d6cf52be6ff5710cda067eee04ec512 SHA512 96c0bcc813d442a7dfbd28b35984008e3836fb19d7ef865d891329d0eab10b4405b170d722c54d5ee1c5469e34c64454330bb951d430a31358ebde56e5db15cf
+EBUILD kmix-18.04.2.ebuild 1259 BLAKE2B a6bbc426ed3368d528f398f4d97b9629312bb2f729d9b36f6cf0f5ad6bad3584253638400dfd62b3204078ef36967e0f5d6cf52be6ff5710cda067eee04ec512 SHA512 96c0bcc813d442a7dfbd28b35984008e3836fb19d7ef865d891329d0eab10b4405b170d722c54d5ee1c5469e34c64454330bb951d430a31358ebde56e5db15cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-18.04.1.ebuild b/kde-apps/kmix/kmix-18.04.2.ebuild
index 768fa6584e01..768fa6584e01 100644
--- a/kde-apps/kmix/kmix-18.04.1.ebuild
+++ b/kde-apps/kmix/kmix-18.04.2.ebuild
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index c2c1dc3ab963..96c72c4a262f 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-17.12.3.tar.xz 110788 BLAKE2B b0212a774095735d69048430b0181a88d6c375ab74d850d8fd0a2e1978ed85a201d860fbf957b151f8f513dd785c15f4b3a8ec0616bfdcad43b456cd4a1ce010 SHA512 5e67d82d8034568c27e367f77e591688a3f9cb2fb0a84e06323994fa36f486004dc1bb9bf8c7d2cbbc42c234bbbcac95605e05eca6590ec53499f391b36eac83
-DIST kmousetool-18.04.1.tar.xz 112588 BLAKE2B 5155cf81b7f2e6c4b55b5fffdaa600000ddca30981c1adb112d9d0614f58fb3824559543d2344c2f8137cf638395e2cb938051382b276c9537691526889017eb SHA512 04baa9c22ff60cf61be4c60081b23d83d666e91e31b912c02407b8c784ce8d746673f640f94f3254a59048ed33224d8ced6163fd4e722e5e55b6e5d5c7f22140
+DIST kmousetool-18.04.2.tar.xz 112840 BLAKE2B 48a7577379660da0dcd42bbda8bcfdb43a5494f8db748ae13307c3d3abe621ed81a800615286e532a231a77a470c7a0c5aed05eb84ddc392d1a2dce323481acd SHA512 1ad3e6a0db007ebb1d54df1e0bbc063ea95843d06ab9b27bb3caa106f9570161d1d8078e0a77bcf333f3343e3843a45c1aacdc1e144604e458d845fe6c56713d
 EBUILD kmousetool-17.12.3.ebuild 819 BLAKE2B 6a2ea6ff7754da477d8ad6811a29fc343cda6f2db8d170c6bbbcf9e84f93a65b475f6b4a069d4e048bd658b1cd6445f5203f07b489253d5fc93280053d22006e SHA512 2dd8c2c3ec5e7851267027ab2c9b3f07e2748ccccd92e839abcd5bc9a776cd8171ba129ef3feeed9347aea1ab5b1953288d752f967c16b472234ad3d21992906
-EBUILD kmousetool-18.04.1.ebuild 821 BLAKE2B f5e6e898ea58477837ce48ca399d62d7795c979701149e3456269a2335db09061f0f46261d425670caec0b37434b0abd4a62fbfee050c3fb64924ebbac94f416 SHA512 a9369b2b459edb1f7c89aaabc36e48f0d62afd3dd073477367b20cedb577d6425162477fe53cb5f0348576c390183c9f85c25fac44ca3b5c1b1fd199586c8954
+EBUILD kmousetool-18.04.2.ebuild 821 BLAKE2B f5e6e898ea58477837ce48ca399d62d7795c979701149e3456269a2335db09061f0f46261d425670caec0b37434b0abd4a62fbfee050c3fb64924ebbac94f416 SHA512 a9369b2b459edb1f7c89aaabc36e48f0d62afd3dd073477367b20cedb577d6425162477fe53cb5f0348576c390183c9f85c25fac44ca3b5c1b1fd199586c8954
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-18.04.1.ebuild b/kde-apps/kmousetool/kmousetool-18.04.2.ebuild
index 27f3e7583436..27f3e7583436 100644
--- a/kde-apps/kmousetool/kmousetool-18.04.1.ebuild
+++ b/kde-apps/kmousetool/kmousetool-18.04.2.ebuild
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index c4400a0ae11d..2e11a8317ee0 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-17.12.3.tar.xz 1823724 BLAKE2B 782ebccaeab0fcbeba98fd6b3deebd3a19b445032e5b0b921d0130b88dad60b96cc4d7b46a5b5cc94b9a70620f4aee12704ad0c581bba7ca75d4218f5e17b10e SHA512 3f1af3952d8ed591b7e492f7db0ed3a80097b111e9b5f37039f71145ebb4bb6c907fad4748b6fb804e0f404ac1b30a7aa70e00946bce5ceaf3b54f3ad0f51576
-DIST kmouth-18.04.1.tar.xz 1766428 BLAKE2B ec91b422b7132d7e9f5370be1f3fe3f9d66b6dd3fb205a60b8659f9a171c1a47fdd0cb4c8ad0a956003520410dbc3e1bb4e75101556d9c0e44fb302f9f0c1d86 SHA512 eb0015ac4cce99adcbfc6aa1d5afea1b1234a4ffd1f5038d997a1855ce5ee47ba81607fde16779864340d3eb6842bdd80bb31f6d0d1dbe0d128dcc6554d123f0
+DIST kmouth-18.04.2.tar.xz 1766928 BLAKE2B 29bc1453fde206acc1edbe1bbe7c42a69048e6898a4143a076fcf4eb04adc436157e2db001d00f42e2eaa2c5eed933796996e6ecb2f229d2432e9b3dd244a501 SHA512 808fea7cb14d7bd30db7a879212f675cc8773cab5b2309c3b494c897da10f4290d4a447005b92e8fee6a9ad6249ea433c0de4d3d2b67507c3739961ba6bebd1e
 EBUILD kmouth-17.12.3.ebuild 770 BLAKE2B 28a86a37b22b5dba01003bf8444da389068e8daf9b7f903a4c4a19a219987afdf9faaad273d765f440d272e219b999b9de3562a148f2729382080cd15b83a1d5 SHA512 db09f5401d25b9e38e440ec9b705b2327f7329f3be9423e22183836654223646de3c63e5f93a4c945abe80a9c9a5c81bfbd4b253f8b984c9de624399b2d2f7a8
-EBUILD kmouth-18.04.1.ebuild 772 BLAKE2B 8b5ca8777554aa552b6451d9eac8f6f9e40d59b39642c344b8f5576a9ea5dec215fece9321ef6bb90aff548766e2c1603425242cfbfd6839fd13840755e99172 SHA512 e5dec01f18741b121eaa940b2c39eac03d61043620dde414eb1bed4dc704b2c279b6b4e4a337050eeedd61ea36cfc6f9ca20f2b6fce4165848a042fe5be86304
+EBUILD kmouth-18.04.2.ebuild 772 BLAKE2B 8b5ca8777554aa552b6451d9eac8f6f9e40d59b39642c344b8f5576a9ea5dec215fece9321ef6bb90aff548766e2c1603425242cfbfd6839fd13840755e99172 SHA512 e5dec01f18741b121eaa940b2c39eac03d61043620dde414eb1bed4dc704b2c279b6b4e4a337050eeedd61ea36cfc6f9ca20f2b6fce4165848a042fe5be86304
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-18.04.1.ebuild b/kde-apps/kmouth/kmouth-18.04.2.ebuild
index c648621058fb..c648621058fb 100644
--- a/kde-apps/kmouth/kmouth-18.04.1.ebuild
+++ b/kde-apps/kmouth/kmouth-18.04.2.ebuild
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index f3b0cc50ffbc..130ebe0eebc8 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-17.12.3.tar.xz 3024624 BLAKE2B bb733da35bc751b853e0e7f0b22f215552417bfefaa12d0591fd4a5d18e9c693b891a1521bece8e4bce68b653758001621078b082db2513a3814fe23f366894f SHA512 c82c6560e41aa24b7eed69fb24b1f96825b36ea8c6bc82a3d73d95aef74ceaf534bb4e7da64b68fd3a7e291e96790cee123d1c6fbef06b578996ba3df6180af9
-DIST kmplot-18.04.1.tar.xz 3028864 BLAKE2B ae83f3175d5dd4ad18ec25aa1ee286ae05c5a16dae49fe52b7366a2c2a4bd66b82d4a8e08398f299b32bc5422727d08cdd649e356fe5cf9bd5f7e7381183a721 SHA512 1827a959c106348008d09ba7269b7adb40d2ec3ba71abc8163333dd25b82f062778cb53329aad79057a71cf174d5ddbb032149c284f4779ba84e5df302544373
+DIST kmplot-18.04.2.tar.xz 3029056 BLAKE2B cf068d238731e4cfbe4c7a24e79c4ed230b26150d2b5686dee11932b62e30e2ba4638656698c11f05d68e5c49ae69012e590338969263e93b36a6aee22e2014f SHA512 975cdaea1605b0cbff7fdf41bbe285e815002442944acbe300d86046831d11cc18dd9fcc22db517508f1081aff99177b77cf5519195dee2bdb10ff431f55f1b1
 EBUILD kmplot-17.12.3.ebuild 930 BLAKE2B efb2b3bd9ea45ca378ecb970201fc6e8b407d27a182b394e0b7c574e81306353977d0b6c0afd61a5a257157e5d5930319b75eba768514cb65818f2a1af0c3a9d SHA512 7f7d9085b96b736c20b7a2281000a0550e9041176b2ed543ef78240f44f649e8994a6f4aa29073313ec1af57422ffbc9df2f1f0b93add0b1ac8f8b27075219da
-EBUILD kmplot-18.04.1.ebuild 932 BLAKE2B 34fd54c966744b264388baa2dd271f98e3170df02333cdac402fd2189d221e9dc9fefc7e70671ad1ef8cad41c3e0b4835a54ecc888ffe02b481801c3096f6692 SHA512 3c10eabb2745eac8c98a436bd1ea9958bfa24a3c75912a5333c5a37dfbf1c8bca69ba3987cfdf1b31ee35f88c15f35c0611d97a14f0aab65fe3ac32220ded28c
+EBUILD kmplot-18.04.2.ebuild 932 BLAKE2B 34fd54c966744b264388baa2dd271f98e3170df02333cdac402fd2189d221e9dc9fefc7e70671ad1ef8cad41c3e0b4835a54ecc888ffe02b481801c3096f6692 SHA512 3c10eabb2745eac8c98a436bd1ea9958bfa24a3c75912a5333c5a37dfbf1c8bca69ba3987cfdf1b31ee35f88c15f35c0611d97a14f0aab65fe3ac32220ded28c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-18.04.1.ebuild b/kde-apps/kmplot/kmplot-18.04.2.ebuild
index 029f91d4ded4..029f91d4ded4 100644
--- a/kde-apps/kmplot/kmplot-18.04.1.ebuild
+++ b/kde-apps/kmplot/kmplot-18.04.2.ebuild
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index bd48abbe09ec..ab6dcc8a3376 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-17.12.3.tar.xz 1220100 BLAKE2B ed09e00653164e254fbf1fa259861d26507ce61df5d126343691b804067c0facebf0aeb88d32d7d4d8f0440e66bb886f5ab469a904fe66d9980c83a7ce6920ae SHA512 3f15e67cff9ea4a055fe20896787568e1171cd3de58b57334be1bc3a50c0922b87a8f81c0fbd7acbe793c5882aa06581e73756f91bf15cfce3047dfa057e26e2
-DIST knavalbattle-18.04.1.tar.xz 1221288 BLAKE2B 9d542d459a42f333792bf4bd117ba2a6593c7e6d7b7193abfdf9132a468f7f22451bae3679248f3df6a0946089fb63d499ba22266532c819a208ccbaf2cd1975 SHA512 f6ce84d2e8cc7e76b42ab065c4e9f57beeac94cd79fd63ae01bca9d985a36263291678f244220ba89875bf5323e5f5a5f5d18c5fb59dbc2a5b33b440ccfb1ff3
+DIST knavalbattle-18.04.2.tar.xz 1221364 BLAKE2B a060419c78761ce62c508bf8bcf938fb7d3d5add12a2971efa0af1acbaadc741e2e97f84850ceee3511359f7dc87f07cc6ce288edf876e8f4d77d58c59fcb656 SHA512 f6406b65b8933dd5c9752274ea2ea6af4a437e0b5e7b691fbdcfcdf60e6ab3a2eb403a315cb5a352d6e63a55686c3f59d89455ac0ab0efe6b4656d0c02915606
 EBUILD knavalbattle-17.12.3.ebuild 872 BLAKE2B 6f45834f266fa08a99416868578f894d12c04cb13fd023b56f5c32c82c19b02af5ed50a38a3fe667a3eff4e49431b2699c426b463c7543c1bad19ba669b31aa4 SHA512 ac29b5cee1b9d45e47167cefaac334fadf27f3d47e493415bb571557fd6a44aff1ce8f8fac623eb25e5899326782363b97cfb68c42756d22d87b26281c67deba
-EBUILD knavalbattle-18.04.1.ebuild 874 BLAKE2B 0a4214d170991f89f402a8ea61dc85a4aff52cb4d9ed54db23cbf63f639d4f1b0eb9ea835673a3888bebb479ad88f6ec0c23caa81dbe30bb14305788f8e6c6ec SHA512 7bd9501435861e85526502a20f16aabb2115c0c805687ba3b7ad759b03cfbfebb2f762954e7476a54206e257af398c76bdc3c780e1444afa41afd579931d4e8c
+EBUILD knavalbattle-18.04.2.ebuild 874 BLAKE2B 0a4214d170991f89f402a8ea61dc85a4aff52cb4d9ed54db23cbf63f639d4f1b0eb9ea835673a3888bebb479ad88f6ec0c23caa81dbe30bb14305788f8e6c6ec SHA512 7bd9501435861e85526502a20f16aabb2115c0c805687ba3b7ad759b03cfbfebb2f762954e7476a54206e257af398c76bdc3c780e1444afa41afd579931d4e8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-18.04.1.ebuild b/kde-apps/knavalbattle/knavalbattle-18.04.2.ebuild
index aa760fb43133..aa760fb43133 100644
--- a/kde-apps/knavalbattle/knavalbattle-18.04.1.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-18.04.2.ebuild
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 7f8b396a421c..3a09f0c40340 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-17.12.3.tar.xz 981588 BLAKE2B 9ab231ff78d0ded0fc44a1f3d719f512edfc831f2eaad7a1622259c399eee6272441532ae24ed40f324cb8ec65e8484954c1f0087ea8c6021e640b7a499fb462 SHA512 c7fc0cd8622eadc3036a1a286736162a9c6240546741591b48b74d4b5fa84aec25b5764ffd05ef7ec2ab85ad97bee7c0ec63d3f009e07410444f09b99f26ea9a
-DIST knetwalk-18.04.1.tar.xz 981420 BLAKE2B de2fcaa827a37680962c8d804f6cbbe7f70b938bcbd4d52304df79c82d8497b0a41df4e07e270ce090d9a3e56f1ac32176930d731d597866054c5899707d7aba SHA512 d765742422f8439d30c7fde125b671d45cde76482a620b647fd2817a3a9de990bb19340c22760a76d098742486d41c56f2267e01be62d873710645dcb08bade7
+DIST knetwalk-18.04.2.tar.xz 981508 BLAKE2B c32aaa82d2996b1b0056b1796595acbb861baeba3b7c809f6ca4176e9bdfe5adabffeae6df1d389813cf22faa57f27c029cf27e91af0a3dbeda51ac8e19a80b2 SHA512 e5a4de400e2e67492bb5a5031617e6a1761236c40461e7ebc6062499adb50e7eca52f8205ac4c3e177466a3669ba9172426714cd7c816c70995aaab4fcd9e736
 EBUILD knetwalk-17.12.3.ebuild 864 BLAKE2B 0c06b84f708811b29b156ce4adaab1026eaa439538d5f7a599f9d9d0d6da5cddbc30ee13c1f245a6ac489ad23df5cf8f45d35edb8680ccc3842ce3144a7a748f SHA512 adf4cb12f6d2628806e9702f67dd45648fcc78105e0bbb652a6e8c02752740d1e54ad1c63ef953b613d0ed52d950913bc031561341d8608b674ad8e76743eccb
-EBUILD knetwalk-18.04.1.ebuild 866 BLAKE2B 9504fee5cc5ff740aec0f22f3b86e09dd4178c363bb3d3520a485957e1ef76f24760755638fad19a125dada4cc561e079b524daaab674bb48d1029dee1187496 SHA512 078ee1be05e95a9013294b346e0db0b4711d17723922f421f6b928d218ed694e483a59851dc1f9f19507cd92c2e5cdd4999370712a145cfd2564b0473cd82fea
+EBUILD knetwalk-18.04.2.ebuild 866 BLAKE2B 9504fee5cc5ff740aec0f22f3b86e09dd4178c363bb3d3520a485957e1ef76f24760755638fad19a125dada4cc561e079b524daaab674bb48d1029dee1187496 SHA512 078ee1be05e95a9013294b346e0db0b4711d17723922f421f6b928d218ed694e483a59851dc1f9f19507cd92c2e5cdd4999370712a145cfd2564b0473cd82fea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-18.04.1.ebuild b/kde-apps/knetwalk/knetwalk-18.04.2.ebuild
index cd1421b84e74..cd1421b84e74 100644
--- a/kde-apps/knetwalk/knetwalk-18.04.1.ebuild
+++ b/kde-apps/knetwalk/knetwalk-18.04.2.ebuild
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index c6596bbbccf0..b881ad9498b3 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-17.12.3.tar.xz 335744 BLAKE2B cb49c9542939bafe89846470d3a799128ff8f7397cdff3185e281fa8c00df40966560403f60639c3afe688bf863c4566073f561601be188eaa88804847a0c1f4 SHA512 b3c24cecdbfb72280d2fdd83b1cab481691980a9a29cd93a33af2a62421186b06d4df98bbde484d50140d8db3d17b0ea6186208bedcab7094a314fa08e5fe085
-DIST knotes-18.04.1.tar.xz 335916 BLAKE2B 3b52efe6188bf1e0fd9b960c02b4ded2d5b0806da0eea75b61d0603a071a5ad322de145dfc350b4574b6dfe1be498623d3b41f64cefb388662db138d5c8752cf SHA512 1e17b687dd187a67df858f4060f16854539dd5d69bc2a112a44cbcb2b228392a1e89d4d7bac9115839caa45f1c5cab6b5ad6e134ddd9eb315954973b1cbae353
+DIST knotes-18.04.2.tar.xz 336128 BLAKE2B 46b26d89c1866f1eb94a57ac1a0e6df1a0cbb82178065f08b5e5e742d317b0361c4a150be1b380a7a2a77afe70acbc6419d5b58fb38a83fa8c319017825ea814 SHA512 b24d4425938dda5a1d57f18c615a442ecca30db94c2633e1844880739b0ffaf10cfc81ac583650d015cf8360316fa6d36f497f9ec0430c368e39c6a49c40822f
 EBUILD knotes-17.12.3.ebuild 1849 BLAKE2B b3c436a1c3c07292e46de05368258fcd55a914388f01ce7ad8e0dbfacd1ef0276be14fec8934ce0e887a95d677b00bcb736424b4b728b65d7a58725dc91ffaf4 SHA512 cdc0a287ad739d2db30ecef025af186a5fa16c92658f9e66928bfff76fe405f5be44f67b3df494b54e2e31b293086c6bebfdac8a1e071cf95acfa9c0014a5a68
-EBUILD knotes-18.04.1.ebuild 1851 BLAKE2B bada3858e1dc27170d669f330da0ad3b88857e484eaf06119bcab5bdb9900ae05958908412bf53fc701c07769c1de246c3fa227cbe139f9c3fa4d2e3aea5a05e SHA512 4a847cb9b48503bcba01629ab034fe83774d603960eabd8c3317eb2c5de3ddf92998f6a34a5eb10f44b7cc02331c880f1a66593ded255e782fb77f422d0a906f
+EBUILD knotes-18.04.2.ebuild 1851 BLAKE2B bada3858e1dc27170d669f330da0ad3b88857e484eaf06119bcab5bdb9900ae05958908412bf53fc701c07769c1de246c3fa227cbe139f9c3fa4d2e3aea5a05e SHA512 4a847cb9b48503bcba01629ab034fe83774d603960eabd8c3317eb2c5de3ddf92998f6a34a5eb10f44b7cc02331c880f1a66593ded255e782fb77f422d0a906f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-18.04.1.ebuild b/kde-apps/knotes/knotes-18.04.2.ebuild
index 95df2eeed40a..95df2eeed40a 100644
--- a/kde-apps/knotes/knotes-18.04.1.ebuild
+++ b/kde-apps/knotes/knotes-18.04.2.ebuild
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 57d3cca584f8..33226718824e 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-17.12.3.tar.xz 923672 BLAKE2B 2329786f8dfbbee92cbcd84219b091bd30872b44179bf1f688997df0b4fb05ba4a2dc45c634873708b4a2dc365dec325b21af8540114814c81648015e1a7242b SHA512 8040362317639222c4b4046b65de77888d66daa3e7d99dec9661e8b868b253408f3f45b5636b4b5771e0bc07700d506810e95e7339141901947b8bec78b5e92e
-DIST kolf-18.04.1.tar.xz 924316 BLAKE2B 0b760a559f522145437d8fb2d217a6f48499e9d60253cd17c9fea40c25ac117410b38aebe2cc615f8ce3975af37ab1c8d44d5ba981401cce31aad90413e88540 SHA512 dcdf3d47bb71fc254356b5500e3c641843a40ecf3ee2269fb17f8466b406a394129a347f986edaf1a7d1024b653d413877c1471affa4b7048edb5e114d6fde5c
+DIST kolf-18.04.2.tar.xz 925316 BLAKE2B 246118e80c47ce8c71f1626368bfec0370af43890fe66198d007e29074ff1d0a6597ff093601945c92d68109a2183c09ad038289271d008ad9496289531ee5d1 SHA512 452622ded7e36112978792ecb3047ce9fc599ca031145f3e0505bbea33d66811c9c0e5cdc613a71afc03d5997d49334b6f921a005a75dae872bc820c8ae67652
 EBUILD kolf-17.12.3.ebuild 815 BLAKE2B 00ef1d34aa586ff26f65db6fa933b43b20a5b9d483d9f43e1d370b7be06dedef78e7a49dd7d5dff2e244e506f3dce10d9754c714864d1369074d43e2ab1dc7ba SHA512 b3b84088137f392ce0996c59fc630083f1dfa7aac5978d4525adc747da630dfc5c69810aded6f23b4651b9f24ae54cecf42809e0cd517eac8170f7aa0041529c
-EBUILD kolf-18.04.1.ebuild 817 BLAKE2B 1da1133b078288f0198bdb6afada8cbbd4f9f5edb05bf02c57e4788e3b916b3d9464a46947fc455e5dc54b0502968fe9071b9cd3cf8dd31bc114c1dba20134f3 SHA512 d253cb1657b52798e4131ca7b6d48df356693d716195665268194b1b4b21338aaaff5ced2373619f09be9253c80e1aba49e419ac0c76ef9925dea1c6353f82fa
+EBUILD kolf-18.04.2.ebuild 817 BLAKE2B 1da1133b078288f0198bdb6afada8cbbd4f9f5edb05bf02c57e4788e3b916b3d9464a46947fc455e5dc54b0502968fe9071b9cd3cf8dd31bc114c1dba20134f3 SHA512 d253cb1657b52798e4131ca7b6d48df356693d716195665268194b1b4b21338aaaff5ced2373619f09be9253c80e1aba49e419ac0c76ef9925dea1c6353f82fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-18.04.1.ebuild b/kde-apps/kolf/kolf-18.04.2.ebuild
index c4fe51941993..c4fe51941993 100644
--- a/kde-apps/kolf/kolf-18.04.1.ebuild
+++ b/kde-apps/kolf/kolf-18.04.2.ebuild
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index c4edd15b9497..1c7496995f99 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
 DIST kollision-17.12.3.tar.xz 272044 BLAKE2B 86178a9a39c79accfd21e8797feddff506cf260e81c407c32ab465894f37df9877619aecbc66619f04f10b887ca27ade0c47bc1a96d1e24ce34d81a04a51993f SHA512 e28d33f6fa0e52b08c674a68116586561bc0a786fc089922c313107d1d3b39ee89768192a203fc7473cdfe40fb67675e421f1058443703df859f1003371f1393
-DIST kollision-18.04.1.tar.xz 272544 BLAKE2B 8ef58b3d2d5422451c63a3711935fba4d5f27d36ed03e6007e810994f65ad757a106df4d8066908b644ce1a0efc1b71eb74ccc4a359745bec17c7567ad8a9ece SHA512 2b7f4801089b290b9ce03d9b4d461f47427a15236fb5645f97017a5d5586dc4e17e866c0e547965bb28bd1bbaec1e181cf1f762e1dbf6d15c038e50412a3968f
+DIST kollision-18.04.2.tar.xz 272596 BLAKE2B db9f20b54e97f112d6a1f3fa99fa1d7ecc08c4840821810444997c0b888ac45bd53acd2859e53eb2b37088d8ef10b511a427adf15f784f5f27a0a75924750584 SHA512 97eba84f25a88abeb21165e69bfdcc5cd5da3a0f06e278eef510d334d7bc443503a0e363ffef8c59f2625d231d8f8b99450fb351b5c7ed34b23a85a7eccfa72f
 EBUILD kollision-17.12.3.ebuild 677 BLAKE2B 4aa766c5a0d006410dfe46eaaddde0c53297a4f138d6441383a1331169f3bb4a553f3ff3b35a68f12d85c4c1c3462f71bcc1c6d64bc0ac0d63b580b3a80fc118 SHA512 ba86505711ba8223554c71eb569c50319f71653cb92b9e329b82708d543a8c5056a00af6172e91efc1d0d739b7038b098b53844889c9c28f04e6580a2c2f8402
-EBUILD kollision-18.04.1.ebuild 679 BLAKE2B 6c6b183428a7eefcc27771c0a57339e65830ba080e48ed47cbdbe387576f06412926368fc6e730a9dbb692539b86b9437f402c2fc4d650d23d46e15290551328 SHA512 d377731ce231e3e3ac3026fcedd6455cf361bf848d7d26be944dd67827fb33e1c1f728b064848c396abb5eb25f094500ff10bdabed3197fb781ec4a7c8ca5af3
+EBUILD kollision-18.04.2.ebuild 679 BLAKE2B 6c6b183428a7eefcc27771c0a57339e65830ba080e48ed47cbdbe387576f06412926368fc6e730a9dbb692539b86b9437f402c2fc4d650d23d46e15290551328 SHA512 d377731ce231e3e3ac3026fcedd6455cf361bf848d7d26be944dd67827fb33e1c1f728b064848c396abb5eb25f094500ff10bdabed3197fb781ec4a7c8ca5af3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-18.04.1.ebuild b/kde-apps/kollision/kollision-18.04.2.ebuild
index 159531afe066..159531afe066 100644
--- a/kde-apps/kollision/kollision-18.04.1.ebuild
+++ b/kde-apps/kollision/kollision-18.04.2.ebuild
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 5b0a90d65372..cba425688666 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-17.12.3.tar.xz 5546236 BLAKE2B 9cf7aa982fc92fcead172a43bcd0a73b9fe88b05a893d51251600bf3a22eee8973f112874f5253bc127c8b287837a144d0f2a2e21b997affb73979af50b34797 SHA512 abe94f8bb56e975914302429f9d38fdd7ee5cd7b7942f0684fd993c2db0c3b7ab83b7562eed2c1e5d8330939df7705ba99dfe15249a5f6f1abb6c5b1e837d2fd
-DIST kolourpaint-18.04.1.tar.xz 5549048 BLAKE2B cf1ac1548133b5085ae5d54e9e8703be3f7b642127b7143006ce864e646c7c6373e04eed8b4c5b13f776b14cce6447334a61d35267ba74e95441e08109c8f37a SHA512 000a2534cbbb7bb026db9371c113e216b39ec48818cafe0bda8d04fcb2fa10a59b5532098d38584807de0e3e9368a2cf99ec83ab557a95b4778e2674bc917da5
+DIST kolourpaint-18.04.2.tar.xz 5549144 BLAKE2B 71832c8f9848ab18887a897fdc1d01f0b1cce5bc2c6c6ec76c1273df65b27303122b039a6c0795878f1d5ebb7d179cf22a25e225916ff49684b9d2c37c52cea2 SHA512 9bf3b8cbacafcf118bb073383af800c94d05c35c100270adb874245557ff4bba13e0df35dd287503d348610615ceb13b7894f214bec211e6a3132b570534003d
 EBUILD kolourpaint-17.12.3.ebuild 1034 BLAKE2B 6e9776b8a4bc28871147943f6a1be6c0e6abb7f6b94fba18d2fa4d8a98abb00ac20a495c8ffae4315d70f53adf3c57d96f9186def14d067ac15cbd7f14c24f0a SHA512 2a91e2766f47103d893779861492223455289982fc509eba3919aee657f240b984d1daece66659275f5aacdf2543aa833f254c54ed505db591a1d4df5385a921
-EBUILD kolourpaint-18.04.1.ebuild 1036 BLAKE2B df3ded586352185271f0fd744a2a07c8523a8bfad034cba22b576c1431fc8965bf2b4ad605fa02c173ed1503146ee9b135fb37074fc68400c069e6b995f917fe SHA512 a0454ea658f33609cf469aa8c5d808078d7bf19155f8bedaa6562cac479385ea21912f487b189a1ce92a2c1e07dc171da889736f6a966628ca23f24a9f36496d
+EBUILD kolourpaint-18.04.2.ebuild 1036 BLAKE2B df3ded586352185271f0fd744a2a07c8523a8bfad034cba22b576c1431fc8965bf2b4ad605fa02c173ed1503146ee9b135fb37074fc68400c069e6b995f917fe SHA512 a0454ea658f33609cf469aa8c5d808078d7bf19155f8bedaa6562cac479385ea21912f487b189a1ce92a2c1e07dc171da889736f6a966628ca23f24a9f36496d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-18.04.1.ebuild b/kde-apps/kolourpaint/kolourpaint-18.04.2.ebuild
index 5052eeec56d2..5052eeec56d2 100644
--- a/kde-apps/kolourpaint/kolourpaint-18.04.1.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-18.04.2.ebuild
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 52a2312e4635..f94d2b856e90 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-17.12.3.tar.xz 710940 BLAKE2B 421d6c9a348f7f50272fba87c3c92f078604c1f4d641514ed30b92a1f8582291b69f85bdeb027a390c6c71df783db54217ed7ba3b12d60aae398696c0589ac44 SHA512 19cf624d6e3362d3b0b6d384b08aea25b74aebbeaf7c8f6c4849eb233f07016189a393551c2a0a60b4b31094b4f5de1d0c1bd747c0829ee2f2276e570a22e483
-DIST kompare-18.04.1.tar.xz 712084 BLAKE2B 74d0694cd9e84f73f08eccc81bfe07ac8f28b9aaac35a62b3e501f6ea0c3b0c0e7261ec61d8b55b2f31d3bdd04c3ebc6c3c5696f48fc9a8b9fe5ea72c5206ad0 SHA512 2df9729c7d4437cca014a1ad4b2edf020644cdc8b9b16a464a7fb1d0cd97512afd5903cf4f45f31713caf8a0ec20cb2d9d33eb6ecb8693524d22760790d0d79a
+DIST kompare-18.04.2.tar.xz 712272 BLAKE2B d67b0d210c1decce0b210ebdee16fa91a0dcbd82ab8e01b753e76608ecd57deb71fa6d1d5b5c44eb9a98c8ffbf9281f06f2f079334b340dd5eff0a9c7cc11184 SHA512 7e8f9c3b9b3af51cc454de4ac8a4bd31cba15a0166fbc209edda82979c8782e40beb82bd390869d7bfb7ad45ff6c905a58d4f3514d59ec2e20915a76937e699d
 EBUILD kompare-17.12.3.ebuild 957 BLAKE2B 7b5ebca036dbca4a2306a6c090b758850cb904f34a845b5c74339b3b203b5c9df205a21189707be0d39097603340785456bcf7531986dfc2369bb8ac807449d5 SHA512 3dc0f9aa5b85f173d7150f074130d5b2a25262113c63a735bc14d2998cc2eab5da4a71ae61fbb340d6a8aa0fa6e89cc66c2622d1864d83b0022fe41b93573c4a
-EBUILD kompare-18.04.1.ebuild 959 BLAKE2B 3b70af60469b94895ec7dc93ae77e40aee70bef5cee9fea82c95b6e0f22f4b5515630905ec820a930aade616e7b06b35c3e004db673ce1f279b41347e6fb7d95 SHA512 73c12348fd0005db8f423272c661a3f7e5de65cba7f7732793d94db30ddaf542a39948611f9307cfd155471dcbebef49be8b00ae24f60524482c48a2279cc2a0
+EBUILD kompare-18.04.2.ebuild 959 BLAKE2B 3b70af60469b94895ec7dc93ae77e40aee70bef5cee9fea82c95b6e0f22f4b5515630905ec820a930aade616e7b06b35c3e004db673ce1f279b41347e6fb7d95 SHA512 73c12348fd0005db8f423272c661a3f7e5de65cba7f7732793d94db30ddaf542a39948611f9307cfd155471dcbebef49be8b00ae24f60524482c48a2279cc2a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-18.04.1.ebuild b/kde-apps/kompare/kompare-18.04.2.ebuild
index 5c3fbbe779a7..5c3fbbe779a7 100644
--- a/kde-apps/kompare/kompare-18.04.1.ebuild
+++ b/kde-apps/kompare/kompare-18.04.2.ebuild
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 5d523b9bb72f..a35a9d3328cc 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-17.12.3.tar.xz 7720068 BLAKE2B 803f1ea753764be169339e48f490f4e379eaeeec1ab048fca8fc75c82a0b952b9f1e1a3b0cd1f40f35f7412d51f1b8c909526c03676b8e946acebcfeb060296e SHA512 12d3b33b8d437e8f20bd329281c3b03600bc15d2ebbb85016b79d9f5da002f88f2906cc982bc3e5c94d8a9511880ee0155e6ac800e7186ad8368620b3ab5ff92
-DIST konqueror-18.04.1.tar.xz 7729888 BLAKE2B 22f03c2d8cc1a6c7ee4cc470a8aac9bc63188957f59929f1f27dc148fd47378b91cca7d2fafe9021a6e0c7cbdd066e02c47c1496134a76320c4e8cb0d7732a27 SHA512 7385c753fee216a728c08d3d7dd4645a63f95804a158ab4b0d38da69d1c8391ebba3e1cd6d8f5b349ab4e12c659c6a38d01dba43119828668c8f6080e3976be1
+DIST konqueror-18.04.2.tar.xz 7731372 BLAKE2B 41a2f7ed09af82b2868486efac8e533359ff597538cbc6224a1fca8dc520bb7f9561001c3fe6d0dc81ebeecccb609e4b62bbcd311e1cb4c308836d0a3e994174 SHA512 59d05a0740ed77418791ca4006053a5e9f2fb4e7fc492cb2f8524e6c759fe3ec9a77870cc6183582930d7eacd60a6a612848bea017fd4f8b2f356e758bd3fff9
 EBUILD konqueror-17.12.3.ebuild 2782 BLAKE2B 356f538e8b789972345c451b56226ba2c8f14bf998f6e4e314a54047a9b1af2aea560b9abc39e43bb7471fbe5e4e53cce56c520a3dc521cb2b9c25022dd8854b SHA512 7c918eb59c79a1aa283ad7b9fa0d237c0fe68af5a4397002934db635cbcf2e4abbcb99a2c0f2c7ca6d7efcd52840605213be9730f2b96a779ca9d46ee0d591df
-EBUILD konqueror-18.04.1.ebuild 3001 BLAKE2B 0589ca1207c070b35188e6cff8d90c24abcb2c0567bb2291ac525869f22ffd7824ec596c4798e396d7f8b55b60fcf72967f2ceb467037101d2360cf772afca74 SHA512 631bb163fd808a8950a094ea8d958098cab38e208a85afbb2146730cbe6379e89f116937a32645e86530beea1e4994c95371a7298f4b7dee0f948f9cf3d3245e
+EBUILD konqueror-18.04.2.ebuild 3001 BLAKE2B 0589ca1207c070b35188e6cff8d90c24abcb2c0567bb2291ac525869f22ffd7824ec596c4798e396d7f8b55b60fcf72967f2ceb467037101d2360cf772afca74 SHA512 631bb163fd808a8950a094ea8d958098cab38e208a85afbb2146730cbe6379e89f116937a32645e86530beea1e4994c95371a7298f4b7dee0f948f9cf3d3245e
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-18.04.1.ebuild b/kde-apps/konqueror/konqueror-18.04.2.ebuild
index 2ca638dfbc27..2ca638dfbc27 100644
--- a/kde-apps/konqueror/konqueror-18.04.1.ebuild
+++ b/kde-apps/konqueror/konqueror-18.04.2.ebuild
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 09307c07ebd3..3574b84dc4eb 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-17.12.3.tar.xz 658364 BLAKE2B 45ab884319512ffd4e8264b5cff389906c53552148825eb1028ae5bda9f324f00df19bb11a45573aa42f5c07aab0f451436fff1028bcedb0c73df4024993a4af SHA512 24c7dea266b3acbd7d006592c15a0ed28e55143a04ed107806bf9476eeb0ac8d30af18abde283e89433bb86f151d5e0363c8db672aee49368a53a963ad3bc7e2
-DIST konquest-18.04.1.tar.xz 658768 BLAKE2B 2bc4ef09c14c1264c5c09005efbdb2111cab675c4c3263e9fc761d0cf20e01f058d67e05317952e9ee79365fb28bac7ad96f535d32520571d7cdbdcc54e2bd2e SHA512 44e0950c0de9dd988035cc6b9a77e20cd1860bc14769737772d92eb7971d23d6076f37ddab32c39a414ea2ec516d4ec2121152f4db651b61e7b05cac3baa46da
+DIST konquest-18.04.2.tar.xz 658928 BLAKE2B 452ee54581a3912400d353b3a9f7dbfb834eeb5f5d2f2e740ac28ee39d0809dbb3908a1077e9b918d90b8baa7a3afda41ffe3361d9a1ccecbf192b7e6e5673b3 SHA512 16dc001a4cbdc6038e286e355363cd6ee37a5a3b966aa2711a0287ef3d41af3ec2297f622eed01a3762f564bee5bc19eed17a4805456fca09d7b0efa8fcdff6d
 EBUILD konquest-17.12.3.ebuild 791 BLAKE2B 3f0d7085c9c1c666655799412dc59a7a42eeba0bcae00a63eec0e6b633a7e5108088e30098c0fc962441f3d9e1a666ecfb3c6fcb5986d50e0d8685511d01a921 SHA512 5954afd4c9bed7e21e9b1ed5ab809e0e777e57a06242fbcf6cd87219a2d85d82c496e52186a730d88d8460262700a4ad247878e4f9db2525266007addbb34c2c
-EBUILD konquest-18.04.1.ebuild 793 BLAKE2B 4af4ecc52b869bbfd4b6aee14dadc2ae1e87ecab3cea02b1cdc50e062d6ee09b2085467bc56c3af5adf98df73e2dc78ebd24207d5d3af356b68bf4dc761193c5 SHA512 295bf448bb9e99118d2c8057831c437daf5dc42deb0032bd08416ddbfb8bf435f54ac1cc87b553c9ba7c4087b7d3bc88ad69c6471f4a12c5f16551591df09b92
+EBUILD konquest-18.04.2.ebuild 793 BLAKE2B 4af4ecc52b869bbfd4b6aee14dadc2ae1e87ecab3cea02b1cdc50e062d6ee09b2085467bc56c3af5adf98df73e2dc78ebd24207d5d3af356b68bf4dc761193c5 SHA512 295bf448bb9e99118d2c8057831c437daf5dc42deb0032bd08416ddbfb8bf435f54ac1cc87b553c9ba7c4087b7d3bc88ad69c6471f4a12c5f16551591df09b92
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-18.04.1.ebuild b/kde-apps/konquest/konquest-18.04.2.ebuild
index f2519a625009..f2519a625009 100644
--- a/kde-apps/konquest/konquest-18.04.1.ebuild
+++ b/kde-apps/konquest/konquest-18.04.2.ebuild
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 222aaf606250..634fea84abd9 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,6 +1,6 @@
 AUX konsole-17.12.1-libinput-pixeldelta.patch 1914 BLAKE2B 27fdeb10eb73f0e935ade90c3c453256e5e8bde94ef4ae3920b6e6caeb109c8fba226698745c6d7116116e3c0e6c8aaf935e77c503bba52549874b861d26809d SHA512 0d9cda130728f6b5e618b73fbc9c07431b924d6190df8f91f7801b798822ce001e7b077fde2992dd8f570bac9e7af857576e149fbffbfe37ae4e9a7b3873cb5b
 DIST konsole-17.12.3.tar.xz 1026672 BLAKE2B 98f2f545aae26965009a79d196640811702e9444a21c665db1f4da277a1059943f192a31ea1020c52867523ad40bfe21bc09503ec2643b289da1ed69c7eda30e SHA512 973c47341ebe729442ba8f8a7523eccaf5da28afbfe236fd4ec2897f710c3967f22ed5cd8f2f997f631a5369625c830f7a4540cdf6953874c2f556f547c413a0
-DIST konsole-18.04.1.tar.xz 1043036 BLAKE2B fd5fe81f8e985b2a78f5ff4cca7e5b97d2359bca8d24a632f8807459b70c06f4500036e36ecb6f3891413e300b1486103ca8235092ddf53bd850bb96ce3bdff4 SHA512 cc73eefe0c7fe4e9ef91f4085ae19f658a5ce31e0617f2cb06c7faee57feae33fee6071aed63b6a599d8d0cad6fa9877908d64eda8573edf406205bdf70f2570
+DIST konsole-18.04.2.tar.xz 1043764 BLAKE2B 7e1eb21e230190cde87b92530d101548e05f24923fe0ac2c39a3bbc43ecbcfd665b2d597ddf1a76618c7aec00bca8ff072cf7be3791e8fb2c75cf0dc9337ad73 SHA512 043d7cb544dbf583b409dafb095e4081fe652612d1c2ee9f94c2658d99ff370d0e5e0bcafafbafe2e468a0cf7db8fb627d84a846e4545c2420b7f9285a00ce12
 EBUILD konsole-17.12.3.ebuild 1454 BLAKE2B eaa62cd6b0b0a5467bd2f66f48588a1c961d07e42441b1a64caa1533faa15df7a5549b3eb2ae4e59b6fd65f45f3ad0e53373509e61f514ff97a641c684131f64 SHA512 1ab838c8422d38cee71f1ec09613bd0b7077d844d037345144a2e905d63d90ba4c0f4a165ef7702dfd798a571cc03670b6fbb0ecba0d58704115f102bf8d5d87
-EBUILD konsole-18.04.1.ebuild 1422 BLAKE2B 778c8136ecb75be65351a76e148c6623edcaf5c77c2d5c1102330d16636e8451887b0721eda816a89b22505109d19f5f0e0e20ae89f5b2f1715f88dcf396ed24 SHA512 07cba89c64e10561589be711e4e806d91fb6c4cf91c88fcc2033df0d2efd4b7097c20d4849dd78f08f568da8d16676b8c2a25df0dc969bf6f8e07fcb1b0d3879
+EBUILD konsole-18.04.2.ebuild 1422 BLAKE2B 778c8136ecb75be65351a76e148c6623edcaf5c77c2d5c1102330d16636e8451887b0721eda816a89b22505109d19f5f0e0e20ae89f5b2f1715f88dcf396ed24 SHA512 07cba89c64e10561589be711e4e806d91fb6c4cf91c88fcc2033df0d2efd4b7097c20d4849dd78f08f568da8d16676b8c2a25df0dc969bf6f8e07fcb1b0d3879
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-18.04.1.ebuild b/kde-apps/konsole/konsole-18.04.2.ebuild
index c0b85015b179..c0b85015b179 100644
--- a/kde-apps/konsole/konsole-18.04.1.ebuild
+++ b/kde-apps/konsole/konsole-18.04.2.ebuild
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 26d899ed7e42..6fd253f71862 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
-DIST akonadi-calendar-tools-18.04.1.tar.xz 221120 BLAKE2B f36fd0f32dd9554b992efb859b05ec1e09cdc649be12f7f0cd55ddb9b6db814763fa43b191eb3969eb02478ac85b465ab327c94832156e9dbd7c7613e9b889fa SHA512 7c9985a19882d31b698acbdf94eea25d6f572e7fd53927691777a4bf768b86c630c0801cd8118cb0770fa66a8949bf81a032d0c6e4c83b945eb1274cf4ca0542
+DIST akonadi-calendar-tools-18.04.2.tar.xz 221200 BLAKE2B 6c978bbe881ca6272ea457302f0eee0ff0f57ebdb4b0c5fb2a50cc50c7ca84457cd4ccbca609f6ee0fdacdf45cb719dc5b0b98fc982f06643bb43155434416ae SHA512 2cd4fea39b0e79d699ecd9be711b0061d6e6190b97add422a572889c6882666fb75d2507a4ccbb69c9bfdbb62daf28316940ff635f19e3b8a867003017abafe6
 EBUILD konsolekalendar-17.12.3.ebuild 942 BLAKE2B 9488a6d4c482fd997d83dbba4d8a461af2c7594832bc30ca9ccb1de4a804021db5121a659bf1c2da3a23dac63f58d7ce2af33ff63b8906fc66e3915529cdc245 SHA512 944719833fbfcfa708a2f77b840782cd42b5abeb9d06339c07ea98e8f97f30bcf868a6e6c98d9d7230b76ed33e85691ed5f6e48dd0ffdba6c2e8d0acaa0d9a85
-EBUILD konsolekalendar-18.04.1.ebuild 944 BLAKE2B d7ebd61dc165d1b27f594b2ff0e9c8cfd7a7a420708bb818273028cb388338f57bdca34a729e0e078d5a67449d0a54f3842eabf2ac3156eaf8c8a398a28cb43f SHA512 1da4cd1ff978c206ac1123778984679c10801a2b20bb10f5853d83a598f8860470f8d2e22eedb0c015297a947ed809317bd165523f7e7f9e0a69fb4a2aabe199
+EBUILD konsolekalendar-18.04.2.ebuild 944 BLAKE2B d7ebd61dc165d1b27f594b2ff0e9c8cfd7a7a420708bb818273028cb388338f57bdca34a729e0e078d5a67449d0a54f3842eabf2ac3156eaf8c8a398a28cb43f SHA512 1da4cd1ff978c206ac1123778984679c10801a2b20bb10f5853d83a598f8860470f8d2e22eedb0c015297a947ed809317bd165523f7e7f9e0a69fb4a2aabe199
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.04.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.04.2.ebuild
index 5e43736100e8..5e43736100e8 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-18.04.1.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.04.2.ebuild
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index ed8e57288791..685404e6097f 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-17.12.3.tar.xz 862984 BLAKE2B 3428fea3f4b207fabf3e0a486044f79487baa1c3d5012835f4d502c884212dd9973d90c8ad2dc2eb53ee17d47bc1d6dd40f75dcb2202b696406f9f054956aa8d SHA512 f6ec9c2e4631246aca06d6af1cd0681d7cd1477d6932ce24d444f3d74e9805dc91da62afb40093e088390778a2ca08c92ae186d30de99bb488406cbdda7a0c86
-DIST kontact-18.04.1.tar.xz 862660 BLAKE2B 6a1830580977bb2b469867d872aaacf75d52e697eb8bdcdfc646b015286ecab694818814acea8a56d9aa4a7196b8d48fda68767e9af7942c65769c2f2c57070f SHA512 8e5b9b98c614a96b04ba6ef1e6b95561db373570f866753a15ba643e790bc4c843fb5169a7af4e64293b62fb054c2476c0cdf8661162f86c44528e8893656943
+DIST kontact-18.04.2.tar.xz 862824 BLAKE2B d89e0a29f55d4521b2c58429a8924f7b107c7bfa31558d1addc262a1c22d7edd127378b10bda64c7daf715ae7f97a2860207356098064a2113d57d4d5ffa8a37 SHA512 7347a1d9fe8fdea2b7f107fd5e5e498f1ffa49aed763272db1e6bd26a88786dc196509f5f8b6a16e4f642ea5d5f457e056d3b921180f58062d1afd41f7eed9c5
 EBUILD kontact-17.12.3.ebuild 1201 BLAKE2B 25a39047a7b805c48b0e125a9abdd90fd399f4adc01857261370205157d3dd8d92e7858d6be58434770ae0cc29eeed686894c7c8d377ff3bb9a114fb7bc93331 SHA512 8fb6256b7a1e35ab92642cf673ff334281deb9c6e8afde36dea0357d39e942aec77cd602186cc69e1f4e49f758c7fb6b4d995c938b8a230f465de270b4d252a3
-EBUILD kontact-18.04.1.ebuild 1203 BLAKE2B cdef8cba6e3df6aec11b61303dc23fcd1873131a3dc96ee29850bb122e44eb6e3aad6c4bb03d13b42ec956637f9f6d594ef64ff2b7859b3a84f81b4c6a461a35 SHA512 d37fe6a38579456611800285b765b19c957f18b0957fd4321fb93129b4fcb0a74d1ba75a16c634ab0a3f0f897e156b9fbe20fae26729f1f5660e57588033e882
+EBUILD kontact-18.04.2.ebuild 1203 BLAKE2B cdef8cba6e3df6aec11b61303dc23fcd1873131a3dc96ee29850bb122e44eb6e3aad6c4bb03d13b42ec956637f9f6d594ef64ff2b7859b3a84f81b4c6a461a35 SHA512 d37fe6a38579456611800285b765b19c957f18b0957fd4321fb93129b4fcb0a74d1ba75a16c634ab0a3f0f897e156b9fbe20fae26729f1f5660e57588033e882
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-18.04.1.ebuild b/kde-apps/kontact/kontact-18.04.2.ebuild
index e768a574bfe2..e768a574bfe2 100644
--- a/kde-apps/kontact/kontact-18.04.1.ebuild
+++ b/kde-apps/kontact/kontact-18.04.2.ebuild
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 3ed05f591da5..d38c2d04ce4a 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-17.12.3.tar.xz 32768 BLAKE2B 3bdfcb9910bd733a937a90cf24b9af15b6dfeb5c41a996f86229a0cbdebaae3103e04fbb21f957f6e246891345deb7167d99cc492d84832e5ebba28910c2fde6 SHA512 e65bbfb7e717f60aafd47d4a0f8f37da3058a1c1f7b6ada3e806b1c292502a91bd2f7cb46a4e9f2512e8b4f33aa93fd91cbc891b68d89ddb14a33acfc1b0aa57
-DIST kontactinterface-18.04.1.tar.xz 32864 BLAKE2B fd092d3c27951baa84109aab69e8ff49f31270e94954cf975eda63d659b0be34a3fbb825099a25a54e71800ceeb5faa47484690143bb3262e3b61f38eadefd35 SHA512 13ce42ef6e50d21070d73671af59e5ffc9d555e73b826460f1f385971b06758e9ab78173f053c829866840221508655c1af75097b3fa6ab13dbeb1da600bc08f
+DIST kontactinterface-18.04.2.tar.xz 32952 BLAKE2B 50a6a8e86c0bc9eb9d884268384289c2addd93ad0249e725f37fac4195f6d149c913a71d254c42c3a2bd046795a528e423c701ed79d8840012b8c41cba556c13 SHA512 d07eb07d26173cae09188e33f83377cf6ba3218edcbd4130a73ab04c494517ddd280034133a30e20bcc641a7df2b402895a146ccd9d48b94e98e70d72d1f252f
 EBUILD kontactinterface-17.12.3.ebuild 592 BLAKE2B 459a8ab4dc042f07180f7571e3a23d1e99051835e77ba7f60b79b188fa592f0ccab18991ffefa550235d1fe54fbbafa8ca7a2829ea54898051404f28b27fbe52 SHA512 7e8dd97122cb8ad60418dc70f39c153b8cf0f4be05724be1ed4890c87cecea3daede34b6f7df5dd36706699a4adc5da78f5ca34d3a4c96590f6c56681dba94c8
-EBUILD kontactinterface-18.04.1.ebuild 594 BLAKE2B 6dabfaa2233c3fd1fab75a4a8a9c1e2329f94ccdecbcc81d483ec354f27d9abc15e9b4b6ac231ae3e3f3bf562ec7e79239787764ef56eafcfc116287036236a7 SHA512 2f16ac78757ad95fb651605c1d71ce09715ff517fb00e46b7dba71a0281c420d35ef8f1bc45290ed911df7db31760b2a91cb71cc13da40f2365825914efac3c7
+EBUILD kontactinterface-18.04.2.ebuild 594 BLAKE2B 6dabfaa2233c3fd1fab75a4a8a9c1e2329f94ccdecbcc81d483ec354f27d9abc15e9b4b6ac231ae3e3f3bf562ec7e79239787764ef56eafcfc116287036236a7 SHA512 2f16ac78757ad95fb651605c1d71ce09715ff517fb00e46b7dba71a0281c420d35ef8f1bc45290ed911df7db31760b2a91cb71cc13da40f2365825914efac3c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-18.04.1.ebuild b/kde-apps/kontactinterface/kontactinterface-18.04.2.ebuild
index 9622e2e660cc..9622e2e660cc 100644
--- a/kde-apps/kontactinterface/kontactinterface-18.04.1.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-18.04.2.ebuild
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 3c0a4d37a4ec..65516be32599 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,3 +1,3 @@
-DIST kopete-18.04.1.tar.xz 9733608 BLAKE2B 33879b2d95c47f1d21e50b0577c82ce8a619d2967b8b6389cac11b0bd3b1235c9789b28e318f89387496639669cbebaa1e109d479b6365622bef74cb9d127d04 SHA512 2b503ba717d4b64823a64eb093bc4ddbdeb7cb7ae0a73827eaa4a8ae4ad3a5aacf33c4d9e3cc28d88bc4f915418135ddb6b236e5c9d8227e14c802f8b9385e6a
-EBUILD kopete-18.04.1.ebuild 4615 BLAKE2B b6d483eb30ee85504a8ff917549d13354be4b907827d61c398303ce594086c536a8570561fd0bf1e4dd5e719ccad49ad4281d3727c283f06381e59e1a0720fc7 SHA512 c56282f80044aa835bec79c03b0e4b03b54641c41e262cf02fa1bc0f56c52de09f2cd5fa5c6bca01f8ae7ecdcde4f13a2c481530e01ed3078948f7e68cedb799
+DIST kopete-18.04.2.tar.xz 9569128 BLAKE2B 87a8e398f9db0d11057beb281c2604b3b5b2169526fd9dbff6a6de15b79e4d895be57c9255dee90c8e97a8456ca9d99eb6b156ca492e49141d614742c204930d SHA512 b015fd30344f2d55c4026332d9c51578b0ac242d329503b9b8039c1c1b5d18dcafe7122a9d79820452978a55c3ca19fbfdefa68c444ded5ed81afaaca348f746
+EBUILD kopete-18.04.2.ebuild 4551 BLAKE2B 592c0d933d7871b67c7762be5f38240a6033fe39995d990e2870b3c17df999ad139d61c2769fc14855fc9419d58f24d9d1cb17692023cdb314551cf802ed0923 SHA512 feded942ef2682c5a1329b93e14ee5397f4989178f4150afc0fd822460dcd71ec41a100e35d96da8d799cb5915b71b5beadba1f3149e4ab9f3c3cf687305ecf6
 MISC metadata.xml 2090 BLAKE2B 33e9e9e73f5140e7775f5e8b00ba6c96b66e99457fcd460a84d3f191b65b2af1c99d18526c2b43e2f71cdf58c1f6668c23e00e65d38aa2417bd9d48ae1e55f92 SHA512 24e7bd54aacee76798f9182a145c4bd271effcc624aa9283bed05e5fb156feabd73d5d29143034158fda85feef2f43100c5d9ded586a8136ca63438560dc7136
diff --git a/kde-apps/kopete/kopete-18.04.1.ebuild b/kde-apps/kopete/kopete-18.04.1.ebuild
deleted file mode 100644
index d0421ecf7aa2..000000000000
--- a/kde-apps/kopete/kopete-18.04.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	meanwhile: net-libs/meanwhile
-#	oscar: NO DEPS
-#	telepathy: net-libs/decibel
-#	testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-# DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise jingle meanwhile oscar
-testbed winpopup +xmpp yahoo zeroconf"
-
-# disabled protocols
-#	telepathy: net-libs/decibel
-#	irc: NO DEPS
-#	msn: net-libs/libmsn
-#	qq: NO DEPS
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMONDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt5(+)]
-		net-dns/libidn
-		sys-libs/zlib
-	)
-	yahoo? ( media-libs/jasper )
-	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMONDEPEND}
-	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
-"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
-		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}
diff --git a/kde-apps/kopete/kopete-18.04.2.ebuild b/kde-apps/kopete/kopete-18.04.2.ebuild
new file mode 100644
index 000000000000..1c613fd92017
--- /dev/null
+++ b/kde-apps/kopete/kopete-18.04.2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
+otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	oscar: NO DEPS
+#	telepathy: net-libs/decibel
+#	testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+# DISABLED until fixed: skype sms
+PROTOCOLS="gadu groupwise jingle meanwhile oscar
+testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#	telepathy: net-libs/decibel
+#	irc: NO DEPS
+#	qq: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt5(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt5(+)]
+		net-dns/libidn
+		sys-libs/zlib
+	)
+	yahoo? ( media-libs/jasper )
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+#	sms? ( app-mobilephone/smssend )
+#	winpopup? ( net-fs/samba )
+DEPEND="${COMMONDEPEND}
+	x11-base/xorg-proto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DWITH_qq=OFF
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			jingle) x2=libjingle ;;
+			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
+			*) x2=${x/+/} ;;
+		esac
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
+	done
+
+	# disable until fixed:
+	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+	done
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use ssl; then
+		if use xmpp ; then
+			if ! has_version "app-crypt/qca:2[ssl]" ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca package with USE=ssl."
+			fi
+		fi
+	fi
+}
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 0e1f9d379cc7..ef25e23cfb20 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-17.12.3.tar.xz 2257368 BLAKE2B 3ecd3ea0711df1d7d45f8b2e8efa0942e0f1e189b08c1fab73c18aa8358ad2175c2b4f69101d29fe062894f9e614e35a72d7bae39872221b63edecf3ff70d8e0 SHA512 c6127e3d0c8a1892b1da4435885076172f6026f83fd412a0069ce0cd75156e7211356b07032ec2f673d5d38787bec352f03aff561143e50f61909ae7445bb686
-DIST korganizer-18.04.1.tar.xz 2267120 BLAKE2B cf0c4a183e425280d043f04d530bd708d09ffdbaa8e89aef3fe124908c31090535e87e26eb87f77d595035a1b0ba64d61f7809678b4f9ddc8ff6fc5c8a226c70 SHA512 ae4965523f48fbba296e4db721799f7fa997d36139f7393091da4091c836326504838225801e850bc493df55fca3f14e31cf86e44d5d115e1617a1b163477d66
+DIST korganizer-18.04.2.tar.xz 2266972 BLAKE2B e6ae3ab79479acd8c9ff1d53d18d2552e2f9c6ae4a9d7a56a973626b12fb8815d4882e3b3bbf58e1600fb804362f5ee92b6ada991e47a6b3a0688a6d1ec3fa6c SHA512 a5c2f42151c761fb940d6f3c8d6488e910f0db44c18321e123068c69191002a1a3e8197e9217ff8c0bb3408b2e106916f0331f53155e5f432f488b81a5f35bfb
 EBUILD korganizer-17.12.3.ebuild 2443 BLAKE2B f38ce60432d217eb8058f7d6e3fffa1eef7b3d166a33c5cbbc3fae2c9f3e3cb350fc34f99b8cff9195ef3e3c29679411c01a4a2e962c10024914e316df59bf5a SHA512 b9fa737cd0da1572db7caaa16a44b746bbdbd31ab7195fdf423a0d0b67b12c196718bf5aada4a7ce89c3f9c1ac00305d94b4ea915ef722e4991e04433a8c3035
-EBUILD korganizer-18.04.1.ebuild 2445 BLAKE2B a9ce7dcfde048a202b542e3f9b8599236b33806ba28df437ce22d14f6a42decb8eac26e36b1728cf14ed20539459c0b125f73dc080658708e2bcbeedbc5cf158 SHA512 62aa03dadfad2d0dfb94e6b0c82df767fd8fb388421840b40a5851b450591526fa07c373632e7157bf62f874b92ad55db5c1ae26d25be9470c84e16e1d93e8e1
+EBUILD korganizer-18.04.2.ebuild 2445 BLAKE2B a9ce7dcfde048a202b542e3f9b8599236b33806ba28df437ce22d14f6a42decb8eac26e36b1728cf14ed20539459c0b125f73dc080658708e2bcbeedbc5cf158 SHA512 62aa03dadfad2d0dfb94e6b0c82df767fd8fb388421840b40a5851b450591526fa07c373632e7157bf62f874b92ad55db5c1ae26d25be9470c84e16e1d93e8e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-18.04.1.ebuild b/kde-apps/korganizer/korganizer-18.04.2.ebuild
index 23f6fc99a125..23f6fc99a125 100644
--- a/kde-apps/korganizer/korganizer-18.04.1.ebuild
+++ b/kde-apps/korganizer/korganizer-18.04.2.ebuild
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index cd13ae7d6816..d74f24f23551 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
 DIST kpat-17.12.3.tar.xz 3566240 BLAKE2B 0fc1339871589216ca0ed037e89c12fe9a0e66279a51c71da9913ad035b528dd0ae9ed59b07f656142bed1a27b8f1214f9f4ea4a1231dfdee3ee69ed819a5b41 SHA512 e30ac4a80c81285513d730cc331e2c93c208bc2d6a1521914675bf46307f9b90b612e2ed247224cd9495b443cd67efb6b01a009c62727abc127e112d94f0d25e
-DIST kpat-18.04.1.tar.xz 3564944 BLAKE2B 4c43b3a9b5915a637bbc28a95e3d148c4fb5b588276cfa86128b2a9efa1af004af4452ec46063676f94dd926f9ceaddbeab20f41df3c799e1522eb1eeaf55d3b SHA512 4ebaeae39171fc9a26c1494a6eddf467cb6ef19d8b1293f9a4a7d0d24978b34671141917f4e8b2a1fc9874d31c3dab07b3fe6189487492d76df4c6a9fc20f760
+DIST kpat-18.04.2.tar.xz 3564884 BLAKE2B 58b77cb6f826a0403e7f431a1e105789ec117c3dff8aaa58d00252d5ecaf96216a66034d5ac1aa13a98b6507ba05c903a13bea5f45c2ad223a01c0eab5d3ec34 SHA512 10a27e4d9221743443608783236055e87929478c29c43e454104b4935caa76f9c49e0c625c04365d8a7fcd28b2eae66e680adbaa8bcb669f0755dec892ffa914
 EBUILD kpat-17.12.3.ebuild 853 BLAKE2B 8724d194b60c10f9a0386989e414b1d9d0fade5392c76f21c348c4b3d9fb14db11a0ee6d76a46a93f0abcff7067791a72db01709e14229eef7977728521955e9 SHA512 9a0cbbb1783a646df6fded9fa68a2a192b30bf861f0cba51778b353e0f82cc8375b7ba30987c225e3dd80076382469dec16b58fda35f3cf560a02b6be90cf2a2
-EBUILD kpat-18.04.1.ebuild 855 BLAKE2B b39433cfbcc9b56c1bd3b5a9766f152ca01efe3dfbf80596867d5f9c2a120339b7866897cf43655db4c29a85d495fc5f2108fdbfe106bbfd4dc4753b4479fda6 SHA512 d44200a9121eb25577898f4db6fcd233d3a27e2774d969f2f96c381e53662fd8db813b789eb810d66924ca55050775b63ccc4d104528da99b675f0f67fca9fa2
+EBUILD kpat-18.04.2.ebuild 855 BLAKE2B b39433cfbcc9b56c1bd3b5a9766f152ca01efe3dfbf80596867d5f9c2a120339b7866897cf43655db4c29a85d495fc5f2108fdbfe106bbfd4dc4753b4479fda6 SHA512 d44200a9121eb25577898f4db6fcd233d3a27e2774d969f2f96c381e53662fd8db813b789eb810d66924ca55050775b63ccc4d104528da99b675f0f67fca9fa2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-18.04.1.ebuild b/kde-apps/kpat/kpat-18.04.2.ebuild
index 14604a38fb25..14604a38fb25 100644
--- a/kde-apps/kpat/kpat-18.04.1.ebuild
+++ b/kde-apps/kpat/kpat-18.04.2.ebuild
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 37b591f1d677..f75100066d89 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-17.12.3.tar.xz 141572 BLAKE2B 04c091748c8f4c5cfd9e57de3a1888d755aae2b9e6550f19738213cea21a487f65bcfcb5ff7e71dcce7a64a7c4a43b073442ef238541f090a108ac49f5760306 SHA512 0dd7891de260c2497ff0b44340a6a79994c512ad906db4bffe0217cff0fda11f27c86fcb89bd43a40668bcc8068b76b9287ad43de6a277909585b6b2737953cc
-DIST kpimtextedit-18.04.1.tar.xz 142852 BLAKE2B b84583a70d262232355babaf478e49b6b00efe0abb461d1f426399a685dd54a108e829b122cc8813eba1e92c068c173763582caa202142ee38f397d89ec4206f SHA512 c5b74261653cbe86e660d56f556d17da5d57798b6affc860e502fe8ce8675005204f62ff568fbe49df62ce237b4c6beae1196e5beba61412b59d263649e8b8a2
+DIST kpimtextedit-18.04.2.tar.xz 142924 BLAKE2B ce3fa43f24eadae1bad946506c603d37f72662eab20b41fbaefb3f1ca9ada1cb9da240083b782efb639ec0d9f4e00c6c1921c99c5c138881474585e623894a70 SHA512 609e925ae91744be5a91e06da5cf01ede0daa123711fa0fada8a5a3f4eb0b7cc205867b125adfdbb34f37b410a9783012b9864285be857ce74ef36ecb2b4a3c8
 EBUILD kpimtextedit-17.12.3.ebuild 1129 BLAKE2B a2e761276a599082c12b2a2567ec078a53bc09f946cd06d57e5d61eb40aa35380202b7f4369a6cf0f6e5e6468cecbd2f674791c9d6002a91293d13c18a44e11f SHA512 1c09e0d93b126047052e1655df2877b5538ab13964eb42a918e1ed08c5c345e6674819f3ff6a578ecd5f386cd98dc7449f7eda6cf1f0f5643af3824919400e52
-EBUILD kpimtextedit-18.04.1.ebuild 1131 BLAKE2B 630c96348004565c7a2f78bfdf5777bdb2ef3d7a527e4c0a1d6414771ce8714e22e1e5b7bf9deefc378af14ebfce7bf6145bfbdad1c1865f6810cb2e49cae785 SHA512 559fbfd7903cdd25c624a262fde1fb9859e151bc4065a80e3eeb82247a13b597bc5b2244df3972b928abcf333c236b6325640e54b01b73e36983d6534913ca52
+EBUILD kpimtextedit-18.04.2.ebuild 1131 BLAKE2B 630c96348004565c7a2f78bfdf5777bdb2ef3d7a527e4c0a1d6414771ce8714e22e1e5b7bf9deefc378af14ebfce7bf6145bfbdad1c1865f6810cb2e49cae785 SHA512 559fbfd7903cdd25c624a262fde1fb9859e151bc4065a80e3eeb82247a13b597bc5b2244df3972b928abcf333c236b6325640e54b01b73e36983d6534913ca52
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.04.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.04.2.ebuild
index 4df08dc9cce6..4df08dc9cce6 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-18.04.1.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-18.04.2.ebuild
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index dca5d9b23074..a18227c3303b 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-17.12.3.tar.xz 25516 BLAKE2B 3f9e906bfbb6de0e70855e721b08b52f78be415b4b862a8aed8210c5c5f51648d01092151646231b3f6ef49c1d884c978fe2d9b74924d22f8f6198f8612031bc SHA512 496502071f079798ef61c7ff2542ad77f5cce505efc6492d18c998e017ab6eb2b0b4c6f7565511ba951ec21af45e6f0e45b58586d69ade3867ddf07e5e5de913
-DIST kqtquickcharts-18.04.1.tar.xz 25700 BLAKE2B c4a169ab702e2e6bbf94989de903a478c6363eab20f73572bd30b72f09c5cd903362f12804da00eeafc8bbdf46dc36d685588cc878f5e9650a2a50a1310c2264 SHA512 60b853818d8f501a20af6636ac67fac3e59472a41470b6d2771ae0066b4402710f26210aefe2556e0eaa5400fb9e2f9e6db5cf6905d5e9e4874de630a2d4bac1
+DIST kqtquickcharts-18.04.2.tar.xz 25684 BLAKE2B 03594ba9bff548f2c5eab5c44fea4acc166d282de8f1ef8618a2953821565977425860df0f8d94e281d409d63c0c90532a8fa998cfba06a80837192205961b54 SHA512 e597d59aea53fcb2be8d4e9bc640c1ca72b5f40682a4700cdbabccba297c76693e5baf44f327f1bf70425033e38f751bad5187c4f300989104e0e9c007a883a5
 EBUILD kqtquickcharts-17.12.3.ebuild 308 BLAKE2B d7cf5e9111fa6601dacc8c513226c6633e1a9c267522b2ccff1781f5642e845aabe57be692c6ede94aa76496df5907867636d6125eef33e242f7cdc6912c7698 SHA512 d7245eefebe52badffb56eaf5c63e54009ddd6843dbcc130d8eb62d4618d4d418b2e592b5d050c940d70acd139ee688907906edce8fd051b11ea9ee793a73c7f
-EBUILD kqtquickcharts-18.04.1.ebuild 310 BLAKE2B 1a8188f042b79b458a146cd412ac47916cc3884ea6fc9b3ab5a16fca9bdefe2cdd73972705104c3fc5632a91c4511ba7c036d61a84fba059fa8b481e96ae2c67 SHA512 72a31b499061b26e1c41431067a9d6a52a74f111346c2fcb5e1ed5528c848f64077a7dd70e31aa356c3111caed838a596bfd4f26ac675d846f873ccf9eb645e8
+EBUILD kqtquickcharts-18.04.2.ebuild 310 BLAKE2B 1a8188f042b79b458a146cd412ac47916cc3884ea6fc9b3ab5a16fca9bdefe2cdd73972705104c3fc5632a91c4511ba7c036d61a84fba059fa8b481e96ae2c67 SHA512 72a31b499061b26e1c41431067a9d6a52a74f111346c2fcb5e1ed5528c848f64077a7dd70e31aa356c3111caed838a596bfd4f26ac675d846f873ccf9eb645e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.04.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.04.2.ebuild
index 25309fd1765c..25309fd1765c 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-18.04.1.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-18.04.2.ebuild
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index d613608b587c..41349f4a0ebe 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-17.12.3.tar.xz 1554384 BLAKE2B 800a1365d3bf73573e0b36510531d215f7297b666805bb8a27a1a311e8125307e18d6d0b8d860c92e20bd4c81747a8aebb8ae8fd36a1034b15e32c10728d90a9 SHA512 aefd7f2ae3120482d9b85550eaa5ad5e771e4bd2663c0646d0256f95413ce27d45ee843a6dcc7ce5c6b33513e72983d528ac3e4e41e6a2eef61e094aaff2b82a
-DIST krdc-18.04.1.tar.xz 1553624 BLAKE2B 2c1a41e6516708cf5e57a5ca3441dc16a804d49b499ddeada702baae9b448f455479b0c00ce7a9efff5f28d4790b0bdd8bb434e07d4b64d8663febcf44fcd2ae SHA512 06b9713adbb26be6b5f5e0201d78b4fd006b5b83b5b3e3dbd8e927e695ad008e7bef0d4273e75bae845fbc9164f5e293217f05174e19360758712624a7bd58b1
+DIST krdc-18.04.2.tar.xz 1553904 BLAKE2B 9054b4e4bd4e32d2d34b8126e43a0422af6aee9a325524d008a29bd2b22b3a2140bade037cd4202b66a9e2a8a3635176f60c477f163e357bf0180de22f501b32 SHA512 9e6cdf7c9c9555145edf46b3e009b2bf3e19a04e4ea3a57ddcfc010879b934025e58bcbd3c244a4693f98b895bcb400372fb98ac061e5d00c8be26bb1e8619fd
 EBUILD krdc-17.12.3.ebuild 1175 BLAKE2B 6206722e0bc1d69af854ae2a41512651cb216e6c4e1db5041785fbd0439c1fda773158f3f3983483cfd7efa1f4264460a50580467ba9512ff0a811f31075e41b SHA512 65e5f03c34946e9c14a7637a075e6bf2a3af3433ccb6197f94a9676b89bdd14bc185109c419e15c085162836c9108ed8fe19ab4b39bc8891c172eae3450c71ed
-EBUILD krdc-18.04.1.ebuild 1177 BLAKE2B d1e1598816451bb7b14f62e6a77d4e3ea8141805793202d381366255b52fd2e4bb3539d0327332cadcaf8a7c40f789b59efa64f0bb701d2a91893300efe9f4b5 SHA512 0bf55091823829480b807e59534214f1d10104c92b437b59450480315255470f50bdb9c6a188ad34debd6663d1a99f2fc927c4f117781f0bbcf4178e604dff17
+EBUILD krdc-18.04.2.ebuild 1177 BLAKE2B d1e1598816451bb7b14f62e6a77d4e3ea8141805793202d381366255b52fd2e4bb3539d0327332cadcaf8a7c40f789b59efa64f0bb701d2a91893300efe9f4b5 SHA512 0bf55091823829480b807e59534214f1d10104c92b437b59450480315255470f50bdb9c6a188ad34debd6663d1a99f2fc927c4f117781f0bbcf4178e604dff17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-18.04.1.ebuild b/kde-apps/krdc/krdc-18.04.2.ebuild
index b2db820336ce..b2db820336ce 100644
--- a/kde-apps/krdc/krdc-18.04.1.ebuild
+++ b/kde-apps/krdc/krdc-18.04.2.ebuild
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 3a5a38be9b7c..423b6f65a256 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-17.12.3.tar.xz 913036 BLAKE2B c76b01192e3ca636306007e5b3014d4af20f38f98403f337af2cc72ffa076b76ff6bf5f9ffb4c1e4b7145a6f48528076848572d93837e1f9496968bdc90156da SHA512 dfc0cc5d4b49375754a1928cd45d87bfe4b6d18e62766828bd3ada8bdec017df12f51d18e432980449879f4fd321c38c75fa5a2c3919397f1363860d5d52559e
-DIST kreversi-18.04.1.tar.xz 913484 BLAKE2B b2474fa85da95db0d4df3a148e5bbd5f633b9f69ca65c5eb5367e3cb71ae7974a86f53e0db95b5b5ece1a13f4e283e1d461297375414cde86106b54efebd94b2 SHA512 feb10efac9a8be20f813dda272d398e79b1df7c64ba69b51a38471bb91997e0146ef93c95076bf9c18fdf329cfdd85d1c66fff33e4b70f9779e200eee85afb92
+DIST kreversi-18.04.2.tar.xz 913760 BLAKE2B 8e202827c65c085252f8995a16d537145ff4df3b713e6c7cb1d2e6801a188a400647d50f614e1544e6330857fd4e95c0c33a0a3e468f34bada199574374d4b6a SHA512 a32f2f246a3b879704e004355dd2c3fc2b83f2b89f756af3de0e7328304ab3ce0cd814add0d7624b6a9ff7c21c09284ede9cd0642b7da43596a5138c8bfc1a6c
 EBUILD kreversi-17.12.3.ebuild 929 BLAKE2B be265893561a6148a0bbb33c1d2664af84aa002a40f6539a7dc07d3dbb6be2c889094d3ac76a2fc91bdf3fc5b7c54454c9d4f7eaf2e2ea824e8d3a373ad2d491 SHA512 0272785202f8ede0810cef15e8724aff7183e366e00c7cfa63387922d67a2e13a7bc43c3dde9eb638593b19cbea4b2f5978f44b4d16b3ad7db7dc7501594d7c7
-EBUILD kreversi-18.04.1.ebuild 931 BLAKE2B ded588961b76ac18e507125686f38d67dd87682642dc3e9d5278cc81c75c68954b21729420c7cc8469d8c20b75ce5448accc20c9ff5338ebbd8ec727a538303e SHA512 a4fd2df9c133974db526ea85c911293e62c934c5b033f7320b8cf306ce84609b55cc687df0b84636df93c322541d7149a46e6777d171609b8717bb74a35c4cbe
+EBUILD kreversi-18.04.2.ebuild 931 BLAKE2B ded588961b76ac18e507125686f38d67dd87682642dc3e9d5278cc81c75c68954b21729420c7cc8469d8c20b75ce5448accc20c9ff5338ebbd8ec727a538303e SHA512 a4fd2df9c133974db526ea85c911293e62c934c5b033f7320b8cf306ce84609b55cc687df0b84636df93c322541d7149a46e6777d171609b8717bb74a35c4cbe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-18.04.1.ebuild b/kde-apps/kreversi/kreversi-18.04.2.ebuild
index a18a0c64d8dc..a18a0c64d8dc 100644
--- a/kde-apps/kreversi/kreversi-18.04.1.ebuild
+++ b/kde-apps/kreversi/kreversi-18.04.2.ebuild
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 521f98fde48a..4bd95e748d4f 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-17.12.3.tar.xz 995712 BLAKE2B afe6fa51e0b44b96a2bb7f1da1cb5b35c901219d6f8d0a086ec5d73915aaee47dd039d2346649d0aa5aaee280239dec9a2be1c52a436c4caf2a7bb17fd5d4898 SHA512 934bbd9e6b92bf6e6a2b46ac7df03fae9bf2d604a0fe9e5420d16332576251e621caee1057b0e743a32cc38bb38b54ed95a6ef99bfc613754a5fe23e8f697a53
-DIST krfb-18.04.1.tar.xz 996076 BLAKE2B ffb4ff50713da04d6feb787a18a239c0040379e825b155fe0632a4cb71b76f34b6b881fc48c36694c615f6f95346e609014762e307a30ea99af25ee9e70de6d5 SHA512 f637055b8aaef32c28a5199a24b783e1e169791e9e28470c73c342eb7aad98c0b6ae517bee7da4be1692eb1a96fd05f73b1dc52b44630aebbf48a3fa36b0a4fa
+DIST krfb-18.04.2.tar.xz 996280 BLAKE2B 12b56dc856265e54e9f5d103e1696387e00da5e34786e990bcdc0e2c16f4d4e293c62fbf9ae223c3ab740a563cb54515a031ed2a4630f87843e56cbf76da1794 SHA512 b74bcb914bd65e26e8c8dce14ab788038c4332c44378ab5852dc4663906f6b26e5cbd4fb48a1dbba03ef12329c9c41a0807fb91361784816cf81d4cde1d4706f
 EBUILD krfb-17.12.3.ebuild 967 BLAKE2B 31a7a97ddf448e04a6647a706fd05e9be0a3cf1abe6b1f95ae0d3560203318f2faec4f0b4d719b2dc995b03acb9de7f2ea9888a2fc5a85755a6331ae5778a9c1 SHA512 9b65eae19b6ba77d51add635b0b7d5f6d987b22a0200e46f1deecdb75059ed69339433c801be23f974a707c5c85526d5b066ac0e326570e632931ba8fec8a9f3
-EBUILD krfb-18.04.1.ebuild 969 BLAKE2B ebd6a5c1d982efc735b1bfe75e758dd5f23b556412ca78396f291ed054526e55752ccf83dfaa4c13be8ddea1bfac53ff3b42dbb8df2719e92ba19323f1dc73da SHA512 039911742a2b627be7e9fbe64085b8182faf73097bd9e34f3f6bf5b4cb41a68c628c208e570de34b4544ff64e07a3bc84b80bdde03ce302d51e0eeb061fd07e9
+EBUILD krfb-18.04.2.ebuild 969 BLAKE2B ebd6a5c1d982efc735b1bfe75e758dd5f23b556412ca78396f291ed054526e55752ccf83dfaa4c13be8ddea1bfac53ff3b42dbb8df2719e92ba19323f1dc73da SHA512 039911742a2b627be7e9fbe64085b8182faf73097bd9e34f3f6bf5b4cb41a68c628c208e570de34b4544ff64e07a3bc84b80bdde03ce302d51e0eeb061fd07e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-18.04.1.ebuild b/kde-apps/krfb/krfb-18.04.2.ebuild
index 479224e0ac41..479224e0ac41 100644
--- a/kde-apps/krfb/krfb-18.04.1.ebuild
+++ b/kde-apps/krfb/krfb-18.04.2.ebuild
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 1829dabe1662..15b8d60cba2a 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-17.12.3.tar.xz 144424 BLAKE2B 0eec653e071c026e3485c33325d9656c271e59ec187c166f2440cac8095f6ada195ffdd07622d05a9a1be100b4c6b06265771b2245a3ea79b00a2b1c5ea21fc4 SHA512 2eb261cbf57c505766dbc1d7086350f8e93b0c4da804464488701444a650119350b6ffded93beaf9956ee5974701ddaa3354838341ade3d080877918c91c6c63
-DIST kross-interpreters-18.04.1.tar.xz 144844 BLAKE2B 0cbe2066da80b327e629b78647f4175f55871fc9b23262a3c50f95bb5dfd74a6b623be181695487c3717e1288577a39ba4aa24b28e2ab4bc0fab161c90c254b3 SHA512 9b1b94a19aa8c8e83c75cbdb532545af8bb95c6d3dfe0e51d77a36107d309fe3a2d562c835cfc392348020c2397efa0135c6bc8ce9435e8bc9c7b4c67ccb3edb
+DIST kross-interpreters-18.04.2.tar.xz 144868 BLAKE2B d0bde9315fe387a735a52b744853a151d2f137d9a6b661031120a0ea5b756f62cb91790c5d6f48bbb7660d5e7088cb39debd0c0a2fdda4903ae5360f9506226a SHA512 e385e7680c29ea778e09a0b99e28382dc3540798782a1a579def10644245e7e16339e29e91968ebd5516c5d953dbe3d8061b232aa0b647dbc0c60dcd87b655ca
 EBUILD kross-interpreters-17.12.3.ebuild 852 BLAKE2B a41c05e9e3a4463898168dcf2256903b44cb4710bbe7eef54e38720bd598176158c3e528ed0c11cca9e170f0a55c551103bbcf57f1aceaccf4f334f21b49a403 SHA512 4aa4a2f5a807e6b33317d6033cdaa525702d98341f78962bbbe1487d0557214ba8fb6e919cc78950d08ca11e2677b7b6b11ce153e46a939ae19e730e1c56dd48
-EBUILD kross-interpreters-18.04.1.ebuild 854 BLAKE2B 1b77ec3193b2c667f3f2bdb057a92bdd954d7ee67d7c4d85621a7d85aa3d094feb34a7a635d502c00212564027321babcf17103c0ac64c9e011e6184e71924a6 SHA512 cf0972e54f2da0fe0f960d476b2092d607642cae78009fa3087cfa9b0f71fcbe5cb7852ec7a353920f813a7d570320902f9b3456357af6c59f9bfdcc69f6cacf
+EBUILD kross-interpreters-18.04.2.ebuild 854 BLAKE2B 1b77ec3193b2c667f3f2bdb057a92bdd954d7ee67d7c4d85621a7d85aa3d094feb34a7a635d502c00212564027321babcf17103c0ac64c9e011e6184e71924a6 SHA512 cf0972e54f2da0fe0f960d476b2092d607642cae78009fa3087cfa9b0f71fcbe5cb7852ec7a353920f813a7d570320902f9b3456357af6c59f9bfdcc69f6cacf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.04.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.04.2.ebuild
index 0ef8019aaf2d..0ef8019aaf2d 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-18.04.1.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-18.04.2.ebuild
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index e1907190179b..3cf66b4f8fd4 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-17.12.3.tar.xz 259608 BLAKE2B b79ef372469b76d5734aa758b18e570c9aaba410d24f76f80a97e64bf35e61d0ac578a37dba088eb2c2ad10a8a46d4a5b24376a36a5e5f770011d51cd7230990 SHA512 e505604e01916226401ce0bbaabe8660910ca6a3e4f0e7213312b1f889ea86023d394e7ef7f821f29251ea1b16d44e3f270298304aff2f65bb1b5a937eadf23f
-DIST kruler-18.04.1.tar.xz 296076 BLAKE2B 720efb511e5668d26e932134204f37e485eda6732afafc3c1dda14c863e57baa26dfa776957330f667f8db35fe87d02393c21e1fc47caaf108f0a4bfdf12b99c SHA512 a373b1350eb294989c15bae586b79c114d8121337d159fc22e00444f20f6ba9ab0fbb895d99ef996ed30e95e675b6ce71be8330f8292297312aa6f4d76ea571e
+DIST kruler-18.04.2.tar.xz 296076 BLAKE2B 39769b3b19d16da1c7b427ad2ce98214e5e41c49dc5e4f4cdfcd4cf05044565093c4695acdb49f150ae34f1ee5143452625c5077a5c248ed09019aafcf75c74e SHA512 c75b225db11953169fb0c41b8f31a335cfc4e0fe4e4ad1342a96bafb4924f95ce0c46d16b12496a34ae0aa0b44c11d2a4bf555dfee46a453c8b4488bbb8e5ba8
 EBUILD kruler-17.12.3.ebuild 844 BLAKE2B 2dca8d115cb3241c82e077a2ba890874fd5ea94a09f8a47c99f5b4ae2dd195e5f9770e90a4ffc7e8704423b84358f87c64d00da40bba4a844c188f9fe206ff59 SHA512 6bc2032c25a9c2c903aa305544488269822b689acf312585ead9017318494c0c8bff8ebd87e9298bf5eff5ea9567a5778fd839bb6c89ed6dc19ed2aae429de39
-EBUILD kruler-18.04.1.ebuild 846 BLAKE2B a078943cd2ca7950ea8454e6a6bdc47c7146db0a60188b95f0d9905e946d0f1e3d6710770390643c8c32a8a4aaf3b446a7fb32afb5ba879666a3c3e466117f7a SHA512 c514fd769c844711d89ca0067b28b42b1ac705364c609be198d47768fbc48f1f8151490f994666c50f14bd8a0b9748efdb022f4c07ba9ac7d0192189006d0eee
+EBUILD kruler-18.04.2.ebuild 846 BLAKE2B a078943cd2ca7950ea8454e6a6bdc47c7146db0a60188b95f0d9905e946d0f1e3d6710770390643c8c32a8a4aaf3b446a7fb32afb5ba879666a3c3e466117f7a SHA512 c514fd769c844711d89ca0067b28b42b1ac705364c609be198d47768fbc48f1f8151490f994666c50f14bd8a0b9748efdb022f4c07ba9ac7d0192189006d0eee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-18.04.1.ebuild b/kde-apps/kruler/kruler-18.04.2.ebuild
index 77f5502679f9..77f5502679f9 100644
--- a/kde-apps/kruler/kruler-18.04.1.ebuild
+++ b/kde-apps/kruler/kruler-18.04.2.ebuild
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 3937b16b17eb..562b60a345e3 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-17.12.3.tar.xz 708896 BLAKE2B 736271af515dad98556f6003b7fef81be7a7d56ed4a76219b479370cfb064e53a19fc829ae3049bba8ac902d5a29ea77aad2ee70457ca540e38f41f7d9e2dacb SHA512 50599330d51f4a08de050b2f4af764f084c505a5de09e3044cba00b687d9daa81618c8d9526bc76e4ab3fb53fa84e28a2f1508b992a05e284240649cfc1a0b96
-DIST kshisen-18.04.1.tar.xz 710728 BLAKE2B b8808372920a6ef16fa192114ae85c57cbba5450927426a3ad83b957656c466fb4973d71dbb76b33255bc71a53156c62b37b6dd58e81af4b324f586459761926 SHA512 1b05cc50e310ecc29d161de373f645e354777da34ae1c763f164f0db78474b9ee3264ef5cfc23979f8aafe57a40931b065999ed8fc4a694fb722fa034256065e
+DIST kshisen-18.04.2.tar.xz 710944 BLAKE2B e38547057bf0bd703cb4391344ee2d902c8e16a9693e25b598cd06299c83a90e238c72672b060f82361e25e1455ea4592a556fa44c3e9607f3ff4934858f4424 SHA512 e1063494a4a08f4a2d54b83a3406993e54694d45e6d83eb3e242389953fe14ec87089f00825525fe98b777d58a9586e75db0912c7ac7d792a72c61c454c83191
 EBUILD kshisen-17.12.3.ebuild 778 BLAKE2B 287c583e113f4b8dd114318ab6d66bf34171193851d65c02c9cc92a8ea5940823b90fa543ab15deb6030e987e371b9cf26ef6199896ef4d5c68e1b178dbe2824 SHA512 ddcdf43eebd4d156e7df00bbf8eeee016d7c16f72f84d3813996aae88b63e938d94f23f88594dd0d20e6139e06be3c880004d7fde01a1889946c36725aa99c60
-EBUILD kshisen-18.04.1.ebuild 780 BLAKE2B d069380134f5bcbe8c979c5de039a7b5033dd35ff3505c9f5635e06ed0e5aee5a994c3874d24716735a5b84df2f1bc1648150677488e6e88d4ce0d859fdbceff SHA512 0bd4cb9f1f0650a0aae00bab0541f78a4a9f169b59922075e08181c30ae6f4e97b61db444ed86667132d2397284598f5577ec47f1112b17ca1357d198b996f49
+EBUILD kshisen-18.04.2.ebuild 780 BLAKE2B d069380134f5bcbe8c979c5de039a7b5033dd35ff3505c9f5635e06ed0e5aee5a994c3874d24716735a5b84df2f1bc1648150677488e6e88d4ce0d859fdbceff SHA512 0bd4cb9f1f0650a0aae00bab0541f78a4a9f169b59922075e08181c30ae6f4e97b61db444ed86667132d2397284598f5577ec47f1112b17ca1357d198b996f49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-18.04.1.ebuild b/kde-apps/kshisen/kshisen-18.04.2.ebuild
index 907e49003ece..907e49003ece 100644
--- a/kde-apps/kshisen/kshisen-18.04.1.ebuild
+++ b/kde-apps/kshisen/kshisen-18.04.2.ebuild
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 8f78b3329dfa..ae37d83c9a7c 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-17.12.3.tar.xz 6987416 BLAKE2B 280cfdbe3254d6ca6a63be411f1b96f2d892323fcc72b8800982461712d9e16b1a76f824c355e227db0d862fc8ebecdc73210275dd394b76aa1669cc2fe9e1b0 SHA512 dc18e40bd3db456dd5313365bc531c597ac4724b887465585ce4ac496c2086c078e059aaebc2e7f3e554fb3c51dd4b103e55017474020d5663209ffaf16aadce
-DIST ksirk-18.04.1.tar.xz 6985308 BLAKE2B 1a61eaadcb5303f87c12558fbd16a1f2c4e92091f2cd4eff5df96d02cb9d6c5383825421bdb13b7d367f2cbe932d0545e0336fd6e71b56aa25b6eac5d2f82215 SHA512 59d064f3a2d9b3bbc731ee5ba33c13515960fa4c4040dbbc27cfef4d672e5bcbd71d45d3c77d6cff123573f9b5b7b3b704ef78d0c7e9665b843f0d8cf5b1217c
+DIST ksirk-18.04.2.tar.xz 6984936 BLAKE2B 62903f2b4e26d0d5e1c297fd8ec764d7b108b59a6827fdeb49c55ab3bd3a7368cef22f7e31a7fcac5d9e7a9662338ef6f46a72b0ce88c376ce1ff8a89659370c SHA512 66cd8a19a2a3d70e96736895fb8ad7115a86b81ba7ba99a5444ac1f0085b17cc456f483492100ba629e943571a649882102c8653b74f62818262d2d93b23c5de
 EBUILD ksirk-17.12.3.ebuild 992 BLAKE2B c23517b1e85f4b12db1417bbd326834aaf1af327883e98a61d3eec720f1e1a18aeb43f5c2aa94a33b14cfaf266996c2e0ee2cce99c428e04cde9b1aaed2f9b44 SHA512 9a40f9bf1d56099ba864c113e828dad9d5543381016970c51a1cd66456cb25b37d02aeba727d524aba1a0e887b2538e51e4f0e4a4b64f1353edd0b956671e1c8
-EBUILD ksirk-18.04.1.ebuild 994 BLAKE2B cd08b8b936d7a93ebe93d00f6844952bc444306c4347df62cccb72b6f9af813e551d8b67730714feae3a1458f9f04461fa2b116190471599f1ad962e52297ac5 SHA512 9137101978c70391a671149bac924352ec42a0245a3167a44f7cbc9ef2aed7710e61ac3a27aeced5ccc9fa75fd46b73eeb6d2ec20a1893ac38b21dddd99bf310
+EBUILD ksirk-18.04.2.ebuild 994 BLAKE2B cd08b8b936d7a93ebe93d00f6844952bc444306c4347df62cccb72b6f9af813e551d8b67730714feae3a1458f9f04461fa2b116190471599f1ad962e52297ac5 SHA512 9137101978c70391a671149bac924352ec42a0245a3167a44f7cbc9ef2aed7710e61ac3a27aeced5ccc9fa75fd46b73eeb6d2ec20a1893ac38b21dddd99bf310
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-18.04.1.ebuild b/kde-apps/ksirk/ksirk-18.04.2.ebuild
index e147ac059f48..e147ac059f48 100644
--- a/kde-apps/ksirk/ksirk-18.04.1.ebuild
+++ b/kde-apps/ksirk/ksirk-18.04.2.ebuild
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 9cc3e89c8f85..5855beb900fa 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-17.12.3.tar.xz 38496 BLAKE2B 448a00e29c8bbd8143b5a18848aa6a1bf9bbc2f0b9270ff90c695e3b44c7fe6c055442cee685cb32259bd5fb9bc913ca0d302e68a3d600d0fadebb303fa7ff89 SHA512 9f11e39cfc7fc56a2e84b7a33ea832c3817069d8e91980bef936d3cffacbce320af1d31ead13b3d7db56953d6aa4bb0a91ffb28cbc6d2cd1d435bc9e077ea197
-DIST ksmtp-18.04.1.tar.xz 38080 BLAKE2B a68f6a03b8aee4cd68a6a4aa309dd355b391748c953d10601a7fb78f1b0848b118fb25574751fc70e6881a265130239b2c47a8826a118ee6bdc9de7fc5b1ed61 SHA512 9593421d6cfaef49cb2aa2e4ce09cf0f956b6901b312ac7d60d28859e7e26ada8e2637e9393b1be833e9e66fb0299ca4993c67af8a208375149268a3ed2bec07
+DIST ksmtp-18.04.2.tar.xz 38092 BLAKE2B bd24a6df4c4600ceed1be2757521fe08048e3d9f144aee3a2ff4bf11b7a010cdcaffa6a989aac5917be04fd041eeef7bbd6d27f526e2fc605606d1258ed22b9d SHA512 d12124d564484a15862c92022e17ef94d3aeaeb8f3d44c79e9962f6712edcd8ab47de8af8433b76fdc3e568f03c95f59159a7d691aeaf4a26d8cf0683f74305f
 EBUILD ksmtp-17.12.3.ebuild 491 BLAKE2B 0d8c11d06da656a119826b39db7a9134334fb0efad3e7c731e4b9b4d435460b2dda02f8340e5864b89c236bf9e669aab0f401f5fdf4e32daeecf425d8605cfcb SHA512 88050509a6d5ab2286bcf680d77be6f781c9eb9936813b5c839bf887b8459d923fe17983504bd461cda3bc251cd8b0608a3c20bfcf50ad5d8511718f4ecdb7f0
-EBUILD ksmtp-18.04.1.ebuild 493 BLAKE2B 0227d2a472e6819e5961a812af3f15e6ef92c5a0b089c813b5ed206915c77d320b06fe7464b4945a51f55c153dce0452b0d3faa1fec2e4e72135cfddc7fd1649 SHA512 951d85a292c545396672d20369ee9e9582430e56fd910f4898c59a8fc22709ebb8ef22cb1dea9b0a642b964e1637161351a6db5635d7cb1bc325ad4e146bd337
+EBUILD ksmtp-18.04.2.ebuild 493 BLAKE2B 0227d2a472e6819e5961a812af3f15e6ef92c5a0b089c813b5ed206915c77d320b06fe7464b4945a51f55c153dce0452b0d3faa1fec2e4e72135cfddc7fd1649 SHA512 951d85a292c545396672d20369ee9e9582430e56fd910f4898c59a8fc22709ebb8ef22cb1dea9b0a642b964e1637161351a6db5635d7cb1bc325ad4e146bd337
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-18.04.1.ebuild b/kde-apps/ksmtp/ksmtp-18.04.2.ebuild
index 237add174dc6..237add174dc6 100644
--- a/kde-apps/ksmtp/ksmtp-18.04.1.ebuild
+++ b/kde-apps/ksmtp/ksmtp-18.04.2.ebuild
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index e862401e95a9..7f48d80139d1 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-17.12.3.tar.xz 606008 BLAKE2B 5f0860f9b5c2848e7a4ce1b1b01c49df05280d5e7369b09fc7cc458aaab6f40c6f9414c19c44f9445bf8ec8a1be73191d8f9ec8a8981631d66f519d4919fcc4b SHA512 aed3e2f9744dc8b3a85aa3119a68f9a5081703a69c7f75394e23c9a5bb8308b4a2a2feabb6f404ecbabbc6e48fbbc7c38f592fd66a840a0628f416f0d724b4c8
-DIST ksnakeduel-18.04.1.tar.xz 605440 BLAKE2B f7e7ebd827829f4d85653fa6f2c8a915e760c5310457ec33f1b3cdefba6b739e84ee63087d28d0082ac4278553070e7e870ff4f9d43054e8dda8442dbe9d0c19 SHA512 58a67080e81a4dabb1e2816866dbc240168e9e1ee4ee3d264f98daa711ddf31b7f65c753fab540f2a593583f3d4e26bb7d902e0f1b1f6f74ebd28d12bc902640
+DIST ksnakeduel-18.04.2.tar.xz 605648 BLAKE2B 485ee456f1fe3b10c22c0f96574bd9b4be736842d4dac5be8ae929fdcfc7e2aa83a35400db7875ee47ba3c4ae757529cd15fff5c63a54453d816c3608965cf9d SHA512 01db3e2fbbbe2f7d6c1f9ea3190dade122ceaa005ea06b44ab135740a907b9c93a28a97133ad2e8041f95d6273a777233703dddb9dcf9a82859c6062c8ff3a0f
 EBUILD ksnakeduel-17.12.3.ebuild 799 BLAKE2B 49dec31ff6c24dcfcfc3810913d57aca0ffe7b897c65c78336ea245e0bd979dfe8650a0cd6a3f156e9be5f4a209b09d1e28a1bcca7d932f5e35b1ce139de1f39 SHA512 1dbfac43ba40f312124b25bb6b3170f5e85ce5ed7da0b083ecaa023558fc434f40e74fdb7e23290df763178a52c3f15e442b20740a3bb4ba0b194fc40c1c73b3
-EBUILD ksnakeduel-18.04.1.ebuild 801 BLAKE2B 1a611f1d5d84d3bfd30126b7a17b03eb34be062a965805be3a0e4fe47228ac94c6b955f77e448f233b8963cbaf9570ad02715957da0296c4fc8222f2a48a9717 SHA512 86b3777fbf8ddab82b9ad9691cb54ab31612659c124af790b8f1207d5912dc171c8e4afeb66a9b5e5b9b25c7f882f61caef31067addeb606a18ae2a919e862f0
+EBUILD ksnakeduel-18.04.2.ebuild 801 BLAKE2B 1a611f1d5d84d3bfd30126b7a17b03eb34be062a965805be3a0e4fe47228ac94c6b955f77e448f233b8963cbaf9570ad02715957da0296c4fc8222f2a48a9717 SHA512 86b3777fbf8ddab82b9ad9691cb54ab31612659c124af790b8f1207d5912dc171c8e4afeb66a9b5e5b9b25c7f882f61caef31067addeb606a18ae2a919e862f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.04.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.04.2.ebuild
index 7bdccd636b12..7bdccd636b12 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-18.04.1.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-18.04.2.ebuild
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index a34578b4396e..f971d478861e 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-17.12.3.tar.xz 609992 BLAKE2B f50359fd07ca4580e4532e1797c8d7e0e083b16429aa1a8202a38c74c0a7dcbfd41104003497449572fa299b748c28598749d2e8dc4b50e997bdeabc272fccb0 SHA512 c4a9851ef9af9d9db4248800548a844e5ec64c0f368c5aac18efa2172155e2b7d10daa1c7f0e7bee3161faae20acd3b4a3a10dfdc75f197d07dc981a633752c3
-DIST kspaceduel-18.04.1.tar.xz 611112 BLAKE2B e17427d8bc540852d76093b43a8c08314e0bc892f18845f9c305a9b4ace59ad2a558e5533d9a468ec73add6147600b7cc9f120276f8f20d9bf25d7860e14805a SHA512 9d3b663890c688a43fdaef4395543c3ffd48c8714db9c2b7d31f2b5786b1344161e5ea50ecec278fad724f75cf5a0bc20060f252e836c01e19e1efa93b37d820
+DIST kspaceduel-18.04.2.tar.xz 611224 BLAKE2B 930c2c02793f9d6b3a72c5b866701503adbd68de5d59576fce497586b6eaef1f9ba375bddb136af0258c8275d87a00fbb32764917bb310cd63a0d5ebed35eb05 SHA512 e3136df77f8006cbdb85078190687a34f1ee04c1865719b9d9bf5d36136299427e92243dc381a9cdc54b7b1eacee64bf6289be3ce1c2b91f82c399bea8f958d7
 EBUILD kspaceduel-17.12.3.ebuild 752 BLAKE2B c4b0dab1f8fe500bd162eda61631e9b155962a7a6c31f292e39c5b21434a86d0bdbc58afb31b94fd06c6f229863bdf16b32f5100fea08fd5db7152d6fbb1ac0c SHA512 4d7187ab554af0e9e8a8bc7b8a9ff64f3f120c10bcdda8f39c6674aa47b07fa48be65357f73e397f218ab93ad8334461eb06bafc3c017dbb6765425b8d9b326a
-EBUILD kspaceduel-18.04.1.ebuild 754 BLAKE2B 3adc0b4f2e5684930df2ce805f4f73747ef54959147ca2f6856ec9be17ad6679a98b3aeca90785bc4e91c74daf137e9ae1eab29453a614e245566c9160cc227d SHA512 a96eb8ae4de358c2b69d52a5eb05faa16dbcfba220cc1f3a378cc6798bfcdd9cc4cce41ff9c2880f05508aeae79f03b5d88d3eafee6806d8c2b68503f15099e7
+EBUILD kspaceduel-18.04.2.ebuild 754 BLAKE2B 3adc0b4f2e5684930df2ce805f4f73747ef54959147ca2f6856ec9be17ad6679a98b3aeca90785bc4e91c74daf137e9ae1eab29453a614e245566c9160cc227d SHA512 a96eb8ae4de358c2b69d52a5eb05faa16dbcfba220cc1f3a378cc6798bfcdd9cc4cce41ff9c2880f05508aeae79f03b5d88d3eafee6806d8c2b68503f15099e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-18.04.1.ebuild b/kde-apps/kspaceduel/kspaceduel-18.04.2.ebuild
index f04dfdae0a5e..f04dfdae0a5e 100644
--- a/kde-apps/kspaceduel/kspaceduel-18.04.1.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-18.04.2.ebuild
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 90d8186d4031..50655cabe066 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-17.12.3.tar.xz 215668 BLAKE2B 779f1b9dd804b008fa14353fedabdde12ddccb003314b7d326d8606537fe71e3827f2cc4179140ed0dee067eb6445e6f90b532509542011d754ebf44f2a272bd SHA512 d22db7bf1563005c7ae1bb64bac77211be7c0ab0fba47832f91759a88814d5b4ed97f121156599f9203025657167f4f6ed542ecec7c64da3dcb7503216b9345f
-DIST ksquares-18.04.1.tar.xz 216720 BLAKE2B 36339bd07af90eacf55c9e7ce0890c9643f6af7ce35d26a01dc0a8d152c6882f49661db5b8059b00005820ba2f7b24d61396c7e6dd0ea4ec145e7a385d959ccd SHA512 fbeb28e5eebea5b6fe808761d891d423e6f7503b031f5500a0582ad0fdd0310e8756d1bca578844c11c06c7d24cee079ea26e078aa3b5c48a4eba2112f0a3a65
+DIST ksquares-18.04.2.tar.xz 216836 BLAKE2B cb01cddee4e926b9b7846c2d12eaed43d92ba47fc9e6f10b7fd791fd27cd6bb8bc1a38551ae6bee0863b717e6cf33d285eb9079fd008df6058d876fe7acf0454 SHA512 46490de750f3409379d8d1618787a1540954fcf076652f96ca67a054b38db76007a88107322318b7b59bc14133b7601ec868e17d7db728d4d552bb92fe25c352
 EBUILD ksquares-17.12.3.ebuild 753 BLAKE2B 527ea5200d86e94fe946f3ee106694729f0d7517807907d7a5acd3b4403b3b8e36245ac2327b29be254ccd664dfe277c31c2fd9031cea2d65172036ee3dd30e8 SHA512 37bafc3b3251cc6bb4651e13bf4db0c9de0a1fd8fe0f019c33e592e318eb4b8a7f6bb6b1e88f47f839d9c49044b22c5e6b67728287dc3b0aebf9579aa8c69514
-EBUILD ksquares-18.04.1.ebuild 755 BLAKE2B 34666b61861ef5d4cb094c3fb98bdf38ab93f26db755f9346573b9f18c82f08ba79ea6094388fad2d5791a1ee04f8377594f97e5ddc9d024f243fba449a66c41 SHA512 074c44d9b495cebe06681d14ea9a1b1af3cd83c97c0126b37cc2a3d2b3a6f22e845d7eb09cb1fedfa7b786190e0e9487b84a1adbc72798bd38b9c99686ae3679
+EBUILD ksquares-18.04.2.ebuild 755 BLAKE2B 34666b61861ef5d4cb094c3fb98bdf38ab93f26db755f9346573b9f18c82f08ba79ea6094388fad2d5791a1ee04f8377594f97e5ddc9d024f243fba449a66c41 SHA512 074c44d9b495cebe06681d14ea9a1b1af3cd83c97c0126b37cc2a3d2b3a6f22e845d7eb09cb1fedfa7b786190e0e9487b84a1adbc72798bd38b9c99686ae3679
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-18.04.1.ebuild b/kde-apps/ksquares/ksquares-18.04.2.ebuild
index 2a05f5517dc7..2a05f5517dc7 100644
--- a/kde-apps/ksquares/ksquares-18.04.1.ebuild
+++ b/kde-apps/ksquares/ksquares-18.04.2.ebuild
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 75f459194f0a..a7814e90762d 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-17.12.3.tar.xz 1635656 BLAKE2B 19dc7c25d38db5b86b83abfe4a68b45ce0499e3ff8850649d9c9b4b77623662e57146011d8ba1dbdc2f8b06a19e3fa08a47873d51b677466aa1364dfae52be72 SHA512 4c35e01d793dd8358350378766b85f7567a91c18d9637aae7cfd752255fdf84cdc028c70ba32e7b0e71c6bbd4a2a1b06d04257524fca3ddb7dcc411ff983d841
-DIST ksudoku-18.04.1.tar.xz 1638940 BLAKE2B 50f22fae22f9142aba625b0e457ea84d4498568730cd1b695c13d913e6f2628bea4f5691a056f3bf087fd040d5f4aa1cccc12ccc7699e1e3966ef814e18ae7bc SHA512 9aa7e5e4d4038f902450193b1befb5f8529c129f68c1172139199f00c1829589c1ed2ad6682c0f78ae970a5a89edeeebaccba1c582ae6437ab75d04693420a02
+DIST ksudoku-18.04.2.tar.xz 1639064 BLAKE2B 495f35538d3e814de3e11f379003ad1b897eb140a8f132dbcfce1ba266d1e7d3b7482d805083440d9f5110e71f5235523e4973166a222fda847757aee1e0932e SHA512 ce5dcb8f08500f40a4d0acfab5bc17df60adb2c859ac9db2892569479eac62420a2a6a9a10d49a38b771437dc66bcf7d22179a7af018f1b7426d51bf48ca82ef
 EBUILD ksudoku-17.12.3.ebuild 1134 BLAKE2B a3974c852ae75b254b7b6788daad23ddd899df4d163be21c6f4209b779eeba49a7d7fac7274ea323a814231179b6cfb09d016448fd9e0cd787cb9d3c07e59c50 SHA512 bfdd9f816c958358db157ee94f1f22c9bb77d2eb404e505ff2da78481472111fdc255d9b04092d761da064cc479994c024e3fb323e748beb5284f7a25309ccdb
-EBUILD ksudoku-18.04.1.ebuild 1136 BLAKE2B eeae04131cb917f58883f5e8ba326c6f9ea8f581743bc8847d22a1fbccc1d329454b9102e499999ecaa96920ffa4139f2c8107861b89760d91a787ef3bacfa5f SHA512 00123512fde8754b05e13f98ee3b26f1caa4c3a370ab913de29eaead31b4faddbd1f9fb1901f094f15ddf0f9096b7a59a452ec13287793ae7988c662f9c39963
+EBUILD ksudoku-18.04.2.ebuild 1136 BLAKE2B eeae04131cb917f58883f5e8ba326c6f9ea8f581743bc8847d22a1fbccc1d329454b9102e499999ecaa96920ffa4139f2c8107861b89760d91a787ef3bacfa5f SHA512 00123512fde8754b05e13f98ee3b26f1caa4c3a370ab913de29eaead31b4faddbd1f9fb1901f094f15ddf0f9096b7a59a452ec13287793ae7988c662f9c39963
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-18.04.1.ebuild b/kde-apps/ksudoku/ksudoku-18.04.2.ebuild
index 816d157b242d..816d157b242d 100644
--- a/kde-apps/ksudoku/ksudoku-18.04.1.ebuild
+++ b/kde-apps/ksudoku/ksudoku-18.04.2.ebuild
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index b8b4e8596adb..b1ace8a07dc7 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-17.12.3.tar.xz 1782044 BLAKE2B 0679e1f79edf65dc99958932d1e60cf4e5979d02786a97b0f5181a819b289ceb3dd219b4678dd84537df4fabec0560a6cf112fd55adb1155da2060b826acdd39 SHA512 b9f1a56a4ec0c26cae5556f3454d69fb7f186762affe95008ee4403071a42d1c76cc2b8451fdd19b3d0302fb0f2b1e7c8e04f84b0efae6fda3ceac90d83d9b61
-DIST ksystemlog-18.04.1.tar.xz 1784856 BLAKE2B 91ae07e9b968f695efcd3e5ec8a3b17286eec3a786d55423e2d4db7a486f9ce41ae817eb16204e792ac39f4e0a4a308fd22bc2f51af66852d649bd526667dd34 SHA512 714cb96ccd5201c4e6716bf8520bc315cf17fcb3485568cb50578fc011c42c04d63704272209d959d70dc00e2457b46aefd2d011b0ddf8cd6f4dc1db00fad698
+DIST ksystemlog-18.04.2.tar.xz 1784856 BLAKE2B db717c04762de5001b91fdd1faf45ccafad4240bcfada50852e4f00b65028afa55e70bf1c0a93b9e2577aad760a670e9889554b8e786ed4b8460cfcd89a5724a SHA512 c9d9bbc1c9cb6435aaec7236d6652e639e251709c8a70830c17b23bdf7597bce52bfc895533bc26cc06a0f6a7dc6155debbba30863086d8fea3ed4b6be0b6722
 EBUILD ksystemlog-17.12.3.ebuild 1564 BLAKE2B 3c90337a6c5caca3d546aeb611e8545be0cb9fc2d840bcb5bb1b41f837b7faaf1dfc8537ce60e3de21bec325173a5e968b3d55612b1d2173f2af69aa65f0fedd SHA512 ef1ae57fd6276bcc9bb529b2a142b3f83774f58fe93f727320c5ec8ca696d1b6d5ff8a2a8f7a7ff4268408516050f989c6467ed623075a84d6db26dbad12a77b
-EBUILD ksystemlog-18.04.1.ebuild 1566 BLAKE2B 4e4b5120e06c4602c24fb80d11749d6d27b4e2830b879680162c47969688baef6db86ac036f807111dacbbf8f68a50b2716d0450108e62c63b6984d57ae39d49 SHA512 f197ce7053e9d69e276f1950b80d5cf47bf4693683fa65fed355efe0b7e3adfec58aa0c2606ffa75caee9843d771d2f435546eb16de98096db31e7e1452ea060
+EBUILD ksystemlog-18.04.2.ebuild 1566 BLAKE2B 4e4b5120e06c4602c24fb80d11749d6d27b4e2830b879680162c47969688baef6db86ac036f807111dacbbf8f68a50b2716d0450108e62c63b6984d57ae39d49 SHA512 f197ce7053e9d69e276f1950b80d5cf47bf4693683fa65fed355efe0b7e3adfec58aa0c2606ffa75caee9843d771d2f435546eb16de98096db31e7e1452ea060
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-18.04.1.ebuild b/kde-apps/ksystemlog/ksystemlog-18.04.2.ebuild
index 613a2eccdf4d..613a2eccdf4d 100644
--- a/kde-apps/ksystemlog/ksystemlog-18.04.1.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-18.04.2.ebuild
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index bb355a5ff184..44aeb37038c8 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-17.12.3.tar.xz 297228 BLAKE2B 48bd8240ba9b8c5d31522ac5a5fa84483709f18c690b88af003c0534b70390a92c11c90c280b1021bb0e3ebc9e6b2191dbbd0ebe5f188e30b9d248d6222ce187 SHA512 658f08d6d11705d4bae1c458a44d1910ebd1297b6d245e3b866fc6355dad517081ca2feb6a33cd7e0629eaafcbf0d6007d94c54f1aea6bc4a45bd423c10f4f49
-DIST kteatime-18.04.1.tar.xz 297888 BLAKE2B dac2d69ba5fa1a386fc96bd1e3828ec8db054ac63eee130660e89753cfc4305ba0a1c592eb9fbd4c8fe5c8a09c4f2fe235582973e68a6ffea4b96984a3b3ea93 SHA512 5057bd44aed7101d2323040c2a0712a24a214b19ad1a965464295ce5ff0733902e8a55a98503fb3901000233a8b21831cc03f59335f617b7a5ac493ff82e84b6
+DIST kteatime-18.04.2.tar.xz 298032 BLAKE2B 6a742323b261e159ed6c117b999fbaf4b8190ef47ca8a92fa3029fdca24dc4f45dc7a551a3dbc6e78d5754025aa91d58899042fbe32479e68dee4ebc0bbb6428 SHA512 3fbc93507ffd1a373b808bdc85c2fa130af458d865ba20d4ab281b8334867177cac1ee3cf08c033bed4e07fc561fd7c90461bde4849c3c0d35d1c92201521e58
 EBUILD kteatime-17.12.3.ebuild 718 BLAKE2B 06cbb4252bcdc2d843e2f162fff7e915db999203d1e0ce37d3e355587350bc311e838aae0b4069250cc10207d81b8b68e0bf1789cc709960879680686aac268a SHA512 80ee20c830c03c3b364fb562d08e09fe50b33186336a7409b476b5e1d786b8a36c56658954b33a413006ca5bbc5743f11144a67d82693740633d3001e4a80d61
-EBUILD kteatime-18.04.1.ebuild 720 BLAKE2B 7b22415e088d49fac77aa261a0f6e00074826295ef889336e933125e40324410ba48ef681ba6435cb7cf3e4a0cfe5ee671e1d69d2d1274a9a5616cbc8911a586 SHA512 d436ad0d811c8cb6c174a6cfcde05eca6286c51bbb907a255c039960f303278e30db94f170bd382d373c1f04951e158793fafe9e5a7a322e680c074c752c5631
+EBUILD kteatime-18.04.2.ebuild 720 BLAKE2B 7b22415e088d49fac77aa261a0f6e00074826295ef889336e933125e40324410ba48ef681ba6435cb7cf3e4a0cfe5ee671e1d69d2d1274a9a5616cbc8911a586 SHA512 d436ad0d811c8cb6c174a6cfcde05eca6286c51bbb907a255c039960f303278e30db94f170bd382d373c1f04951e158793fafe9e5a7a322e680c074c752c5631
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-18.04.1.ebuild b/kde-apps/kteatime/kteatime-18.04.2.ebuild
index d6175c6546cc..d6175c6546cc 100644
--- a/kde-apps/kteatime/kteatime-18.04.1.ebuild
+++ b/kde-apps/kteatime/kteatime-18.04.2.ebuild
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 7887fd09bf6f..a525d38fdb6e 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-17.12.3.tar.xz 452056 BLAKE2B 2b1916d8b26232824296893d4ed0c9e3db510b8e6dda93a8b547fe83e490e2d646b7d6abddbf781730bc831c7aeaf05ae478658b85fe1395069fdce090f3b437 SHA512 89445386f152ce0960f0de9c84d50701d30811a526933c3bcc4441a29b5ee71cbf7e3f674b49ab8554f5e58e884f46a6727c66c60f273d52dec5d597e053df5f
-DIST ktimer-18.04.1.tar.xz 455220 BLAKE2B 17f36c56f8896f80bcfb748316c1073fccc361292c6c8561c0cfe91b4101343cedfe77a5b311ad27080e3ba46fa54eb42d8e000f24eeb5a83a6fbdbb2279a217 SHA512 fd43c136df4c3c740be74cdee9aabebfce8b1527b97f17f357c15d5963f53c743f4d63a39b231654c99eeef0728d200639bce2d0ec0c780f8d69ddafe14716ba
+DIST ktimer-18.04.2.tar.xz 455708 BLAKE2B 95ea365773a19949b7479ded669c64300f6b77c361188220d9eb457840f2905715bd925722d8138c0096b29ad01d2f81009442d8da9495e2760360d48e44615d SHA512 8016afe5e8f9e276d8c1b046c2442f668f4c31e0d4a16e194a97c0daf019c8485f548bedd74cd51bd7df1b546746b7fe32e79f85e07d01cbf6dca15c0e3f6257
 EBUILD ktimer-17.12.3.ebuild 660 BLAKE2B 37955088d78d5daba9a62a36db829157900185ef1b934d99d2567782185c2397c1826b13c9a7b4ab5c3212ea9c5ed04c2eba48226c3acdbf7d40278545a8961e SHA512 e7b802fc6f09b0bb488546c02891708c4c8a5ff442c68537e8b2ed64c2559bfb749b2c390bd8699adaff7a37dba3e3be270be631dc61ba27ab46584217fcb2cb
-EBUILD ktimer-18.04.1.ebuild 662 BLAKE2B 8318d70484ae17a9e0f41dc423a44f204b535e7c9671301097d68482d313569aa552a7dd1e6142cf52ce0c6c290cb231b727d6d7e769f9c37a5a3bd4e7a1734e SHA512 dd1be55288079829704847d901181329b252ee506732978cb53bc838648b8128e6effb0f9e1a626ef0ab39fd8e37f8e9f5c97e7f63575923ac3602b40e3e0996
+EBUILD ktimer-18.04.2.ebuild 662 BLAKE2B 8318d70484ae17a9e0f41dc423a44f204b535e7c9671301097d68482d313569aa552a7dd1e6142cf52ce0c6c290cb231b727d6d7e769f9c37a5a3bd4e7a1734e SHA512 dd1be55288079829704847d901181329b252ee506732978cb53bc838648b8128e6effb0f9e1a626ef0ab39fd8e37f8e9f5c97e7f63575923ac3602b40e3e0996
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-18.04.1.ebuild b/kde-apps/ktimer/ktimer-18.04.2.ebuild
index f21e3aa1385a..f21e3aa1385a 100644
--- a/kde-apps/ktimer/ktimer-18.04.1.ebuild
+++ b/kde-apps/ktimer/ktimer-18.04.2.ebuild
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 0c3e5743b691..9c9ec4cbdcb7 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-17.12.3.tar.xz 5105460 BLAKE2B 1878e633bd2aebe9f3da34a53d3ca868f1b1585c55bb0bfe6a05ac18788480caa3385ffc6f0249c0687aa0a44e65f4db4a69e75880550aa0f29b42b1bcc6d2f5 SHA512 6fb3f1ee7062331047aca2d44159bc47717cd0fdbf72e97a19e6bdf0fdd86df35f05405b724cdb0401c42b6a390eae7e9aaf26caddaa9f15e44c9ee7388b6c9e
-DIST ktouch-18.04.1.tar.xz 5110224 BLAKE2B 2864e349b50d78b799fb2592ffa7b576df0a854bf64a14697269c487add2137e7b485c74d91f1dbf6de380a4b4b241b314dfbe4d14ee3b9da1c7256d2546d310 SHA512 b907f0e32fada964cfbc58cae7555eaabf1b1b3f39b8d67a02af1b0d81abe9db15d6502e33116e46a3b263c2c14af1ad6d0536a602dfaf5a0087c47b5916ff49
+DIST ktouch-18.04.2.tar.xz 5110664 BLAKE2B c4e2d84602a1d69e33974b348c643f13e5c85d2d84872dfd2fc112a7a0642ecd7ac688c232061dd6bf4f7899bbc07e178791acde3d705c475d3c61f305037a03 SHA512 b09ddd8017313f0cf754e108bfdcf035b882d4f33d2a7581802760afcec1a90fd98d5fbc5f1d944e18a4b4e1a276a18406e6fbb4e65abecaa3715bcf8b9fc957
 EBUILD ktouch-17.12.3.ebuild 1111 BLAKE2B 3595076fec0dc3b9e18b41285dd9ec7cc8c2bfd155555a25537d612c2e946b038be06fdfb3b7b86296238a12a58f6dd4e28a0d3697bea836fa2e672575d9d660 SHA512 ba126e96bff53bedb5210766322cee11ae7f5e828aab493a58b42389131e098f65c879b32ca0f3f1f5876d32faa006754ab8d146639302840460e4bc29d8f5db
-EBUILD ktouch-18.04.1.ebuild 1113 BLAKE2B 22f4ddde7dd55145787c72259495d40470a683024092a787e037347c6f2195614e608fe4b433e84221c23b735f4326e9abbfb6dfd77573a1cfa8e50b2356f303 SHA512 5e866834706e18c4d1af4319fbc0d2d135c13cc7b3099b631393addd93bbd777f620ccf97374311f63d349fe13893ef6c34bbb2631d5930c3a2e6f7d0b31dd8c
+EBUILD ktouch-18.04.2.ebuild 1113 BLAKE2B 22f4ddde7dd55145787c72259495d40470a683024092a787e037347c6f2195614e608fe4b433e84221c23b735f4326e9abbfb6dfd77573a1cfa8e50b2356f303 SHA512 5e866834706e18c4d1af4319fbc0d2d135c13cc7b3099b631393addd93bbd777f620ccf97374311f63d349fe13893ef6c34bbb2631d5930c3a2e6f7d0b31dd8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-18.04.1.ebuild b/kde-apps/ktouch/ktouch-18.04.2.ebuild
index 548ca5f0385e..548ca5f0385e 100644
--- a/kde-apps/ktouch/ktouch-18.04.1.ebuild
+++ b/kde-apps/ktouch/ktouch-18.04.2.ebuild
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 64db2cf16357..cfe15397e1b2 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-17.12.3.tar.xz 262800 BLAKE2B 63db8496c2a21114ade346ae060b1ecea49faf8df101cc6ecb465ef0c5b856d54f6240dd7900f0917fb9729182b32c376634e6fdf29cd94c5e2d66e4d768fce5 SHA512 5cb33357fa974e383a288f7af4785b9d18e35445130a01a3062e127be4f01039a4f65e894cfc5fe2f0002cd8bd837b066be03e5e19f4fed89a8a0bef5436f43c
-DIST ktp-accounts-kcm-18.04.1.tar.xz 263620 BLAKE2B 946df24cedb24081eabb4035e6a9310c854ab2b284ff80dd16222f2f16505c4fe5607b305dab87bc48f07067f8b6de59da361a02a0028fe3c97101f0b4915731 SHA512 68074dbf2190b34f0ab3a643135d399f4b016624d85a6363f8f7b48fa43b0c7ee8a5b7c2551fcd1126e34c07141c55c470f50e50564f0bb94566d23845bd842a
+DIST ktp-accounts-kcm-18.04.2.tar.xz 263812 BLAKE2B 05eaee4f514d2df75f7a7a2403220ebed6764b458f218c511c8d9ac6fbe56cd7e3b7435e09d05d58fe0c90eac2f118af80af09435e8441e4e8776f0253dee9d0 SHA512 ec0ae75618af3e1296e70b8f71ed123e8d737ba78a1bd9363f107bfb66cbcb0331b07b00449b44918925f787a576304693949bdb2391c783f14312705301b49b
 EBUILD ktp-accounts-kcm-17.12.3.ebuild 1515 BLAKE2B 39bd4bb71f741d222d7d468d71f34f00d442fef3eb8c605943238f4681d3464cab0fad1fbd1a06078d9b3ad64db33d54a62762fc51193bec9934ee253ea42d79 SHA512 fa5225abb028f052b8f1a4b0e28512e6675588382b50a0fcd4c0395024c510f7e0b1673d3aaba341baca65eadc2154f8969cd0165c65a49270100b3b17a32d9a
-EBUILD ktp-accounts-kcm-18.04.1.ebuild 1536 BLAKE2B 982ada967ab497b18037c33b4292a2fcce6279c31aeb2bcb18a4d385be011e5ec9b95be16327091f5cc2d6400744c65ab7021940d6f81c4a88e5bf768a3e48d9 SHA512 6adf909744fffe199f984f65ea2943af3668b146b2929fc97bd79a776cfe567a7763aed5789ced0295c459d3c3b0160eb489398c83e429fa5c128631b28cac08
+EBUILD ktp-accounts-kcm-18.04.2.ebuild 1536 BLAKE2B 982ada967ab497b18037c33b4292a2fcce6279c31aeb2bcb18a4d385be011e5ec9b95be16327091f5cc2d6400744c65ab7021940d6f81c4a88e5bf768a3e48d9 SHA512 6adf909744fffe199f984f65ea2943af3668b146b2929fc97bd79a776cfe567a7763aed5789ced0295c459d3c3b0160eb489398c83e429fa5c128631b28cac08
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.2.ebuild
index c3ee1a2c42b1..c3ee1a2c42b1 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.1.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.2.ebuild
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 641c1f09878f..ed32a5f5534e 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-17.12.3.tar.xz 37044 BLAKE2B 7c9f25572a3a1bd9d38adbfff60a161900d2a02fa1a02f95be2412f4ecc3682097f63dbe4b0b29a8f6e5cbe6a63be63f405e74012816dec21a8fdcea0625eb96 SHA512 30668c4ee3b03b11a4781b57f4c8ba9c596c4e965016522ed9d6bd579cf42f9cc394c36ae1c4035288a1821276a392094a6c6b9bbf4e0bd6f94c3e46546ca4e4
-DIST ktp-approver-18.04.1.tar.xz 37076 BLAKE2B 173140dce0fa9639ed1325f07701bb334b3f411dceb01d874af8099772b1ee01d94923953627074f7575f0ccafec0c7e6283220f88d948c051f8a81140011035 SHA512 54be0d61fc537a4696b65cac6e10c5eb8f97f6ed3ee3599100c0dc306a58ec6f96acf8602fb5e7a027c883dd7edfd740c368cbd17a6fd0b03bc921d71ab1ad4e
+DIST ktp-approver-18.04.2.tar.xz 37204 BLAKE2B 8c57df6f51ed0e12b9d387723d33748f1afa47ea9d7e5e5931384ea4730327b8d1876f3864e9d831d57ba7bad8eaf41e03c23bdcf8cd13feb0f58031fe3a5f6a SHA512 ab4b033527c3c5ef811d6bf50710508d7795976cf5203cf38794bb0adc3f0a011ce60b5fffd817d37b9b98c691989e121f667f177253d3a8274f9345254cce1d
 EBUILD ktp-approver-17.12.3.ebuild 676 BLAKE2B 27dece05da5da88d16f3d81d4824a7eebc02cd9bbfb3cd5a16ff13fda8f1b0528e2ada5f1255c977743a1317eebcb23f081a186b85cb1a103cf477083886b7d7 SHA512 be36ec7dfa033aaf1618172cc4ce9a7a1ffd81fc5bae4e606489b063766a896c0743aba06ef359409f7fe6005fc0a0740e2ad4ced0bf00c0e6e3b40f193ff87c
-EBUILD ktp-approver-18.04.1.ebuild 678 BLAKE2B fc2e7bbe1593511b7f1e6df21cfc923160759e6444f45f511c427dd1b8b748a50adcb6aab1bbc3232aae16083d3e0e8c727c41c0bbe445dfe1b52c789f29a425 SHA512 39a4495a943b4d041cb3b229558272cc0fd8ff17be19af01c47254a2113ebc070ea7fcc6546a9c9368d7c1b1af90dedb4806561b7a92d6353f88dae0757e9297
+EBUILD ktp-approver-18.04.2.ebuild 678 BLAKE2B fc2e7bbe1593511b7f1e6df21cfc923160759e6444f45f511c427dd1b8b748a50adcb6aab1bbc3232aae16083d3e0e8c727c41c0bbe445dfe1b52c789f29a425 SHA512 39a4495a943b4d041cb3b229558272cc0fd8ff17be19af01c47254a2113ebc070ea7fcc6546a9c9368d7c1b1af90dedb4806561b7a92d6353f88dae0757e9297
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-18.04.1.ebuild b/kde-apps/ktp-approver/ktp-approver-18.04.2.ebuild
index 58706d972a41..58706d972a41 100644
--- a/kde-apps/ktp-approver/ktp-approver-18.04.1.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-18.04.2.ebuild
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index fad3d5cbbb9d..7531aaddd22c 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-17.12.3.tar.xz 46260 BLAKE2B 22d2089a51776a0adc363422fe93b7a179f8c7fc143c42197ba8ed43e74c35b91558444f116d9527cd009235a670563ae73aac4a135c393da84a6083069584c6 SHA512 08b6a5e0b1a4ade40dd93ac8c515f4120e84e5251a7117c824194c47e35e30992e6afbd371c46ca8f29684caecb3f0e0ae26ab8d9c090019ca9c78336f24478a
-DIST ktp-auth-handler-18.04.1.tar.xz 46428 BLAKE2B c8a155eb666e35ba122449ef1ad2427480531d9101dd302934056ae886ccc24afceff41e4ad2f267589b21ccdd3559773c9539e069d26a347c84110fdb255e69 SHA512 cafb91bdbd746bbdbe2ecafaa9d5b2d140e4db72bfabdb804a662d51f22bd3b4b309831dc233bfd76f86190075552b005a7e80e5aeb06c2f5e4c652501637445
+DIST ktp-auth-handler-18.04.2.tar.xz 46460 BLAKE2B 8e49918ea403190ac3b0fdfb609657a757c758ff57bac242bb68b69bfa258b92f0a2b35c76b8b0a950a3fb2fe68be3d4f0814139c661d53f09190476fb913d9b SHA512 1537a7ca292553a23769880ca536f53f7d1a58c5986d2743f6ce305621270b293787651ec610a2f8b30d3e8ba266dc042c6b16b680e8ee76cce88f2f8cebeec0
 EBUILD ktp-auth-handler-17.12.3.ebuild 827 BLAKE2B 237e604a61a6c5ac61a2541a0daa73d1afb77db4ad747305f14a8ea31cad8c443fde4249e3729f77071c95e754750e5875d5d58a5609e9af8796e31a892ca1e4 SHA512 47e2ff24b54a5a88fd2ca27dcb5e7f8f0bc76bbf78e111263a3fbca089b29c72e38c7c42fc0d0a74acbfa0564ddf39ae9ff319804879e7e8c9b8cb24cbd88345
-EBUILD ktp-auth-handler-18.04.1.ebuild 829 BLAKE2B 1e90ee2f5a17492191a56be9bbfc1cb26e394c2bf6d3bc1c57f3f5256708c0fe0e42a0917251cc0c4f4a4644380529cd56a83651923635ec9215e5cfcce15a02 SHA512 bb41447b6482491ee55f860b305d93837a1540b162285ef14a560959439c3ae96c4e01b6b894275cb11ea3beb74236c31389f67b771578a3f718788f9674ab38
+EBUILD ktp-auth-handler-18.04.2.ebuild 829 BLAKE2B 1e90ee2f5a17492191a56be9bbfc1cb26e394c2bf6d3bc1c57f3f5256708c0fe0e42a0917251cc0c4f4a4644380529cd56a83651923635ec9215e5cfcce15a02 SHA512 bb41447b6482491ee55f860b305d93837a1540b162285ef14a560959439c3ae96c4e01b6b894275cb11ea3beb74236c31389f67b771578a3f718788f9674ab38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.2.ebuild
index 2420ddb40f4e..2420ddb40f4e 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.1.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.2.ebuild
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index be2065ae96bc..7e9d70150450 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-call-ui-17.12.3.tar.xz 96532 BLAKE2B ed43fa92c5ccb10b831c3577a1a58f91195d50c3207b56e11911f0a153fea4705a5a2b99de950e40647730473dd53815333819cdc933bdb71d2fa7087a1bb5c7 SHA512 9fc96b1e83b95a2e6d2793631c94ff1092e72fdd78b700ed7d44bd1dfe7dd2c010ac86ab7baea1ddaad02c99cbf75b27f8d42da43867fe84d2d7dc245aef0ea4
-DIST ktp-call-ui-18.04.1.tar.xz 96688 BLAKE2B 46ee7dfb470833413e813255c366adfc25b02d3d9a2c63c9ac0a874c33e4d78d57477e3989778ff3681c0fce0a3402b9beeedc80f735b7d7ebb566fbec8ded67 SHA512 e1ada15f1560e7ffb4745ba8820be64abe04f3433bd0bb2dbdd0b12ac846c1416ddceb16c33a448f191f9b66988cb2d54ee7ec36ce52924b0a0fcc4be3f2e16e
+DIST ktp-call-ui-18.04.2.tar.xz 96808 BLAKE2B 731d92868ab3abf347d53be686ea8c1565f146ed93273f9a2a52d389f1d477da75e65f8711d05692090270cea87bb6878b7094124eef30cc9952b7c2a69648e1 SHA512 c80306e6ea15701d5a47e4e3557321ed823305c92deb34e7f5f56ff4dea408f1371fd10f984b7fb33daebd7dbe46fa9778500084280c07ad31803d54a3faa940
 EBUILD ktp-call-ui-17.12.3.ebuild 986 BLAKE2B d96de4faed6b79fc39132c4b39f7f747d3295e6a8e8d6246e7470717b8f1632f35a52e9265857f260c6f3776209b281af8dba8fedef29bb8a3733dbf7fa67fe0 SHA512 d9d93eea87d6b24e113835482a9a48af0e0bb24ce6d6e4ae5aca97bb5506ae932624931df319240a586586eef89bd07c79d0b01b053b1b8d48ef3d4c577ee385
-EBUILD ktp-call-ui-18.04.1.ebuild 988 BLAKE2B df355a4c0202bb4806aae3cc920d3403a36078d209e061ec3c17e69923cdd7bf9c0276e7cbd4cc793332d0fecb32e663e9760fb85bdb8312b840c7fc64583fc7 SHA512 a7d7fa274e4b223836b68ab0ef7edab29464bb09d9515e0f52e412d96abb4da608ee0df38d79179daffe879c24bee06591fafba5e7feb2eb970411f6f688d00b
+EBUILD ktp-call-ui-18.04.2.ebuild 988 BLAKE2B df355a4c0202bb4806aae3cc920d3403a36078d209e061ec3c17e69923cdd7bf9c0276e7cbd4cc793332d0fecb32e663e9760fb85bdb8312b840c7fc64583fc7 SHA512 a7d7fa274e4b223836b68ab0ef7edab29464bb09d9515e0f52e412d96abb4da608ee0df38d79179daffe879c24bee06591fafba5e7feb2eb970411f6f688d00b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.04.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.04.2.ebuild
index c0ba9a38bb85..c0ba9a38bb85 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-18.04.1.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-18.04.2.ebuild
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index b8ce45575840..7ada1c4e0eaf 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-common-internals-17.12.3.tar.xz 441184 BLAKE2B 65b3e4e830e5d90f9318d160ddb3ec239772a840973464b95c0b6dba1e753a5a12120896a31aa9d6663adfc235591181adb4b0f938a3a56f7f18d63ff4e1146c SHA512 7662017f3186ed0b70dc02a6af33b0f0f5547c2a3da5f76855cbdaa7ce8bdc31cc43929033b040cd1d7bea0b9606dfb440ee93a8ce5d0f9835363775b95c9cf1
-DIST ktp-common-internals-18.04.1.tar.xz 442268 BLAKE2B a21617ebd2f0d61533bbf405de4ff873b8007d47f5bb7aaa65c6499d74d326e45488799dc879302d0d363f73aeda7d3a8c4c5c55f4c4d581cdb128e8906f8efa SHA512 05dc4707dce1e53a30c03edc5b8768dcc9c51a848996b86d13fc3e910762779a2070ef30bd08598f96c0c58ae3a93d9421c26dc102e5fd14de2cb1a8618ecb16
+DIST ktp-common-internals-18.04.2.tar.xz 442460 BLAKE2B 87864878120b49250380abde84a55be3c4f1c15096c7fd8232ae5f8dfd31163b4f67f65016556ef6f4d4d1ceb1d8a4bfb3477ab7ad20f27135f19c23e3b7d51d SHA512 4a24164a187997d8dba5fd055b7e6c288296e630b45e0078d6ba2f0a115fecd60fa52293515d535ab3699755552fcba73eab5fe58692fb6ce3298ee40e225e03
 EBUILD ktp-common-internals-17.12.3.ebuild 1575 BLAKE2B 40d89f97145068b5b6e27077941ba229f258698a3b05bedde6c966d22ae5ed39801ed4310d6dfbd736578d9f5dc8853b671b73d7dc8d50f65462c88c8e483844 SHA512 11ec9de3d9940f861e4eae9d3dcf1cbe4291d108f414c7a0bac0c1362cfc3d7831cd0ce7cd1ce5ecef8d7f58b01e5245da6e10cbebbde3b3ef568a83d99e3d60
-EBUILD ktp-common-internals-18.04.1.ebuild 1577 BLAKE2B 13d5904f8057dc070c46a30faf664df43a09f0a27aa60bb526cf8c254c97ff4feaa3741531888c54591acd0aebe1670934c08e2f24fc63348e677ddade7f0abe SHA512 883bdb30443d1b8999bb0ac2d984224729f2baa5f572824206da23a247fca8a47d46edfe8987c1dfaf1ba11065062c9b071a2fa825b5ab97a21245448bee9d23
+EBUILD ktp-common-internals-18.04.2.ebuild 1577 BLAKE2B 13d5904f8057dc070c46a30faf664df43a09f0a27aa60bb526cf8c254c97ff4feaa3741531888c54591acd0aebe1670934c08e2f24fc63348e677ddade7f0abe SHA512 883bdb30443d1b8999bb0ac2d984224729f2baa5f572824206da23a247fca8a47d46edfe8987c1dfaf1ba11065062c9b071a2fa825b5ab97a21245448bee9d23
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.04.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.04.2.ebuild
index 6325d2580a18..6325d2580a18 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-18.04.1.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-18.04.2.ebuild
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index 9a5345296baa..c34b96c4fba7 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-17.12.3.tar.xz 131508 BLAKE2B 55f46331693029939137067e98d252cf6b8efc816b96e597042c2adbaec3bbefdfe5bf027ffda47d9ece869285107425da27661f2b5d0bc63c438843bffdabfc SHA512 4ceaad321e180a121ed8dc10001932c070042544fbab6df1716d882ff429a51615fa3d97615c443141f0e709eb78aee6a013a2e36159d500494bd406761c8983
-DIST ktp-contact-list-18.04.1.tar.xz 146448 BLAKE2B 40d84cba9fdccb4c2f4640ba9cd40b8a9c6751a191b6d1e3bb2be85204071ad52ccad21d52a5c01b2afb1f7ad6e0e46714351baf104e14502d176d6e655887c6 SHA512 390ab4410252ba889b228540ee5aaa237d2ddd8f60b92fd0ce037fe2f361e844ef07d945f07346787b14aec0f6c5b9c6463c34fe7b65e8f7db32233f29ae4508
+DIST ktp-contact-list-18.04.2.tar.xz 146660 BLAKE2B b1b22b821e89c8f8eb8474ccb22bd92e834921b79e0957a6f322949ce32f65cbdc56ce2e7455b913ffeb8f11d675f317e18d456aa7fa5e13ca765344e9a72d78 SHA512 484a6ea50c2c67039da296714458daa2c7388a789030e09436b6aa7317682a06cef5bb6ce268b7dbda231c0a04f28f202a100b432d805a6841cf8c5963427b27
 EBUILD ktp-contact-list-17.12.3.ebuild 1032 BLAKE2B 81c466f9879a9d4cc03c073c74ecc85ee7787a4ec026dc9ada56d75102cee2d026b8c3235d905927fce3c3e62edfb075c46b5053b9482ac064bd45449e22bacf SHA512 914e0ff38721394f9b828072c806a7884c32f9ca93e32196566b0b85025db90d97e4be207b4a805fe7afb0db9ff411fed4aca561a99bbb35ed68191f54751239
-EBUILD ktp-contact-list-18.04.1.ebuild 1034 BLAKE2B 56bc019c2d9917f22c97d7590c00e838b817369bc5c19e3b7fa94a695a5d2e36651b677f6461571a331a9a38e255f606e22d7033a160c3b347cc5a526095d3ad SHA512 7a6442a27d413edd477ae3f4463d300a6eff463df6b5288ed5cd0f16d5840472c10e78679706215a66ba55464049496019fa808e415befe2c885d2c225be7186
+EBUILD ktp-contact-list-18.04.2.ebuild 1034 BLAKE2B 56bc019c2d9917f22c97d7590c00e838b817369bc5c19e3b7fa94a695a5d2e36651b677f6461571a331a9a38e255f606e22d7033a160c3b347cc5a526095d3ad SHA512 7a6442a27d413edd477ae3f4463d300a6eff463df6b5288ed5cd0f16d5840472c10e78679706215a66ba55464049496019fa808e415befe2c885d2c225be7186
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.04.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.04.2.ebuild
index 93ce9c752242..93ce9c752242 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-18.04.1.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-18.04.2.ebuild
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index cde10db369e4..54390355fd0c 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-17.12.3.tar.xz 40100 BLAKE2B a328c6f8af07e2d7a3d1bacad077fe83e39d412ad1517feda7a1f0f17aed45fd503e22fa3064cf57e3687c572b1dde4a99df48e36405ba1662edbab33614f5c5 SHA512 b2ebd74bc9dfd893867fca624a1e4ccb2b999b27b87c2f460735fd0c1e7d9627765d012cd901a9db1d5d6df79a587da3d2457d7a2afd504eae8b41cc9917cf9f
-DIST ktp-contact-runner-18.04.1.tar.xz 42512 BLAKE2B 0b9ed1139ae67d12908675f42d74957821c820994ecf1e47f0adec24df4d6ed11a56222bdfc1183dbadb9a3fbed42d669b52e4c63524c595f4d922206e6b8f7f SHA512 3fcc7407dd730323773ec49adb1f6755ce392e21bc342f018eb911049d9e980e03e5261ac9834edababe97c5bfc4d62d1cece2d8b80f9c9f64a7402418c14c48
+DIST ktp-contact-runner-18.04.2.tar.xz 42588 BLAKE2B 33dff45c643289fa564ebd0cee149821de57dcfb8cec83b409c548c69e89a31f9f0fd49fbe0d89ddb3270be5444a90c7bc6fd72284e0f88f3827114c6aeef72d SHA512 39aa1e0fe4ef9029b4fa3bb3a3634af4d99859b118f4294b0400aa71770535c7563f671b8e04ca7fbaccb65aba9a2c7824c126f8ac3f001d25a337f4b4da8b65
 EBUILD ktp-contact-runner-17.12.3.ebuild 602 BLAKE2B e61fc57cf35cb8129dcb9c034316c2ac66fad4b4e91d7055cfc3a9cff345b5a22706678ff35487d660c78f1f861768abe94a079e3ef0cca103be7e1c2ee2b10c SHA512 28eefe0bd03dcffbe5f6707ffc9b54616f795434fe9d6a932c666f203c004973c41bf8e71b0fa57aa2ff1f346027bddf75e61c6246f22af36970c1584ad91288
-EBUILD ktp-contact-runner-18.04.1.ebuild 604 BLAKE2B 6622ba50a4d80fc7b4d1d363ea4c70784959f9a4d7ee0e14d40ab895acffd1d9ee82192723d1aba091c0967cb153efe696835c1c3bf638b2416cb1fd80d839f3 SHA512 5948d7f4be6801e6f4258d79bfce0a59fd87de8a0635a95fb27d717dd8dfcabf99ccf89c90d37c43dfcb7f8a3175b73aeb5dfbbbec9d0b143e28bebdc24675ec
+EBUILD ktp-contact-runner-18.04.2.ebuild 604 BLAKE2B 6622ba50a4d80fc7b4d1d363ea4c70784959f9a4d7ee0e14d40ab895acffd1d9ee82192723d1aba091c0967cb153efe696835c1c3bf638b2416cb1fd80d839f3 SHA512 5948d7f4be6801e6f4258d79bfce0a59fd87de8a0635a95fb27d717dd8dfcabf99ccf89c90d37c43dfcb7f8a3175b73aeb5dfbbbec9d0b143e28bebdc24675ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.2.ebuild
index 9aba85ad01ae..9aba85ad01ae 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.1.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.2.ebuild
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index aa62c90eca7f..bc8be8298360 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-17.12.3.tar.xz 43220 BLAKE2B c1d783c2c10481e4eda0e18cabe6598d8ee5fb0342f3d3b23f75916c66b2bebe6e43ac330fb224b1380d8fdfa746ed458e447b1525b3b23ad15a6ed2d4f8d1d5 SHA512 e6f1edace6b543c56b85b79f421c0023d28495c5dbf6d821f729970161a8d097faa03433051f385117d4b0968c4d877ecc5b0134b94feddb73a577763de63a3a
-DIST ktp-desktop-applets-18.04.1.tar.xz 43104 BLAKE2B 1933c210de28a8456bf1ab86abf2ecc015f2408c16964cac81241cba5d77def233e9ede4444d874b21bf5d7e81fedbd25274a6298cb43010a24aba57446529c4 SHA512 88d850f5733c665fe77ba5e7079a155554c04164e4637ed838e945ddc8853f30d9a1f60328e5d7f648a288b02d9edc3fd80f950af4d41062b05c674260e9aa35
+DIST ktp-desktop-applets-18.04.2.tar.xz 43216 BLAKE2B 70b426a2c49cec2424a46d5fda7f610e74a64e777eedab9fddd8a929657d48e7a465d2be9d837e259f628c157a9c12bcb9810feafddc35195f40b5b3efa17dce SHA512 0060adc9e5fb15b1d6c7f49b825dd4164812db757055a2677c3c315ab417a49860eded241011fe3f92ec28a07b85d1dd609e83bcf441bc0767eebb51e9832cb1
 EBUILD ktp-desktop-applets-17.12.3.ebuild 572 BLAKE2B e2dd4ee48db45d71f005e75677cde0fb38304368dddfb448870ee5aeca7a68ef017d45fe215a8f6a264390a48747d2c62b93f45527b1e976b2ad0461343c7f68 SHA512 2da8ae5261b2abec7f5286e308e31a048a2d794b6fd40071bc192401dc320ed1d87e78ba865cb7496b8c614063e8f557c7c097abf416a6ca4bfab962636d2eb5
-EBUILD ktp-desktop-applets-18.04.1.ebuild 574 BLAKE2B 1851b413a5b983170f7e860ab060b37e568045536683a592e487b5809d114b88d21034823ea822ca28d23756c6a1b7d84c7aea11e3169b8fe39186511c453b14 SHA512 9be0e929b6e3875531784f3c6e6d396ad5f1d529570f988d11e1e225329765b20ced20117b8e0bcb44dc16347b27843e665010a76d45e23a8c98b26de2639e53
+EBUILD ktp-desktop-applets-18.04.2.ebuild 574 BLAKE2B 1851b413a5b983170f7e860ab060b37e568045536683a592e487b5809d114b88d21034823ea822ca28d23756c6a1b7d84c7aea11e3169b8fe39186511c453b14 SHA512 9be0e929b6e3875531784f3c6e6d396ad5f1d529570f988d11e1e225329765b20ced20117b8e0bcb44dc16347b27843e665010a76d45e23a8c98b26de2639e53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.2.ebuild
index 71c40a130e42..71c40a130e42 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.1.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.2.ebuild
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index f21ce40eae5e..dbf8d5baf1fd 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-17.12.3.tar.xz 45968 BLAKE2B d982a94ec787124d5d6df5284a1effdeb58c4f1dd15e7a9bfd6e017f8acc172becbfe83162b9769ee12a3617d1dc7348efde4e563f95e771976cbb58d3d1cfc8 SHA512 145b3616523c224b479107b94de6b267151a9e6b12a412a86abf8da7a1f0b18fdb88783167149e84641532fe4ebf5105d64976155561f3ce7d23139ef58825c3
-DIST ktp-filetransfer-handler-18.04.1.tar.xz 46016 BLAKE2B b38e52599f1f30cf5808bc26bf14ee12cdb59628f617b81c6cc6fcd4b3be0a32422965d0e307439330a8c24a40f71e1cd0face09b8cfd968b94a81b95c7c3519 SHA512 f34f2dad171162d430a38287532eb09841e90bda073406782db99f792b6ef8358eeefbc011dc726ad4e0d94f07c9a929b9188771687752b2ff4b62f916a6e84b
+DIST ktp-filetransfer-handler-18.04.2.tar.xz 46108 BLAKE2B f450e5e03776c8ca7969bf4ce15637bdafc9a937f1690d8addd5f79db65ed7c164c651a10f1de8143f8e45c189c3d3e725baf3c8086349e51c1199c65d62954c SHA512 7ae81e983e50e877ba6629e24d0eeac3cb557e16bcff5d8c6d8bc95b07884c9db0a3912096a2612de51f22baaf4635e3349b8b65f082ac3e39c8f291131e34e3
 EBUILD ktp-filetransfer-handler-17.12.3.ebuild 618 BLAKE2B cf226ea7a2f1f229bc6d48fb99dfb341fc1fc8f3f5fd8fbaac9c21ecf0ce7a39fc1abe20a65e799517036ce2bf158daecd52428b6905d31583ab422cbf46e89a SHA512 f441d634b4b082e5456777422ad0c423d5f5931dd2b7f3af04fccd1fc766989244e4427241bdd1e76841def3a1f32437a6833897d8dfa20de1aaf4343b3266c1
-EBUILD ktp-filetransfer-handler-18.04.1.ebuild 620 BLAKE2B 593dcc7dd236df4297f96770b92fc759329eab0c7e6489961c47e2fe9748eed796380e92a3f47063c0d67b05fc36d042b818938508c8fcb617b23ebeec55b040 SHA512 ff66dba93e4ef81b2d53e34865dba2ecf9f517a814134bc67cdd350e68adface3a82815eeefb5edf2c086da89b71dd87c25969b2c8757e8b3b68f559fe7c366b
+EBUILD ktp-filetransfer-handler-18.04.2.ebuild 620 BLAKE2B 593dcc7dd236df4297f96770b92fc759329eab0c7e6489961c47e2fe9748eed796380e92a3f47063c0d67b05fc36d042b818938508c8fcb617b23ebeec55b040 SHA512 ff66dba93e4ef81b2d53e34865dba2ecf9f517a814134bc67cdd350e68adface3a82815eeefb5edf2c086da89b71dd87c25969b2c8757e8b3b68f559fe7c366b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.2.ebuild
index a8e607bd7257..a8e607bd7257 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.1.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.2.ebuild
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index a7a067592d95..fc048fa1bb6f 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-17.12.3.tar.xz 81256 BLAKE2B 690a858e80614ecb1f3fa465361010d846acb73c4a92d9355735cc6cde97648894182a11065aae28954f093a09e4e950ff5e104f0b6675caadae79126ddcf913 SHA512 0d804705662ed87fe56217e603ade5b0ad28b3dc852a7f6fb005c42b033464ae92f866ef00e52e80cdb67c2e107d94f104f3e0b7ce7bb7660cc4555f4e414d57
-DIST ktp-kded-module-18.04.1.tar.xz 93268 BLAKE2B a2fbad722bdddf1dcb8a2e7720db869d6c60415d79ef9bcac243acc0352c50dffd605d1e467e5ea32a291389499f33b1bebdc02ee5ab04ecb0882cef6725ea36 SHA512 eeb6b3a7c00cd9ee302d60a4f4d77dba0ae24967e6c1a82e268285ff8d6dbfa53f904a4ebac80e7ea5b223d96314ab1b6eb65a8f7e92ba5f681026b4428d18ed
+DIST ktp-kded-module-18.04.2.tar.xz 93412 BLAKE2B b72d916c3cf863ee14a6cbb582fc799cc7eae45b6602e609defc18420b5f481f34add39b000e15ac5c98fd1b17055ee51d90a24c2c2fd5c7933b158143c59c36 SHA512 861e51c14dc282779cf2cb7f675731d9158dd8b479d8d876629c998255b0ac1b750ff7bb6571c0f48641d6cdecb11737af4d1cb5363f334cd1460ddcbd97ee78
 EBUILD ktp-kded-module-17.12.3.ebuild 977 BLAKE2B ff58345e59fac7e503b76fc1a3a290c1447d4c3791a9227296749d90b0e0d23c6ba689e32ff2623298df2f0ea3eae7d83562c6ffdb693b8e19ce94465f660807 SHA512 1a911854ecc01b8955542d1a0c0e416a23cb7455b06d0840371d79a27f3fa29418f82f52b86656a037832b2b09b05797eb8c40a23c5b5e4c7bcde0c2e35e519f
-EBUILD ktp-kded-module-18.04.1.ebuild 979 BLAKE2B 62dac52cf5e965eabb275e915d898a86347509755c7414de327027b249ce23324ce34b5f9c48eb50c23d11b702241c53a8d955f3efa440b2985e5175f8a7eb4d SHA512 23bdc7544d762b335a2f0b41538bd81517338570905d1019a4f2f7d9790f73f44a6b763a8847e592e2cdde9188d0f97839dd683c6df0bc2a7370e8680edeff3d
+EBUILD ktp-kded-module-18.04.2.ebuild 979 BLAKE2B 62dac52cf5e965eabb275e915d898a86347509755c7414de327027b249ce23324ce34b5f9c48eb50c23d11b702241c53a8d955f3efa440b2985e5175f8a7eb4d SHA512 23bdc7544d762b335a2f0b41538bd81517338570905d1019a4f2f7d9790f73f44a6b763a8847e592e2cdde9188d0f97839dd683c6df0bc2a7370e8680edeff3d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.04.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.04.2.ebuild
index 6d59197ba41d..6d59197ba41d 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-18.04.1.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-18.04.2.ebuild
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 3ed2755509f6..95cc9028e003 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-17.12.3.tar.xz 28820 BLAKE2B 267abc501fa4d2890e5c530ed7df132cad2a56800d3008f72dd3599779e1ba34c14f82635991bd43035af25087ec2c36dd14c79384819a01c2f9e4d3a7050f95 SHA512 887a7d4008f77fbc48355c32e4716f164df77c901ba4bf7eb0b0305e83b03e3e8fd38e7b5381532e3037f42b60055e65c4b49e1510799000c3951c67ee2a0ef5
-DIST ktp-send-file-18.04.1.tar.xz 28776 BLAKE2B 778b68c20012e90460befd1b82577eb51861c256b1a54373dc94179d83348787397bbdfeb99897dbe52056cfbd775583ab7925e82b9c19eab56c2891bf600619 SHA512 19e1f90320eea7087ba1ba83f47b747110487b27e2aa6041b47d85abe07ff2681aa65924eaaf47e604fcf81ce92587703a1df34fce0db6e81fadb5c20e1e4a2d
+DIST ktp-send-file-18.04.2.tar.xz 28864 BLAKE2B fb86ad5b94dc282c497c0e3e27089db3cf593c7553d484a72f8705efcbaa6b79246a48d4ce0873229fef40b2cae4f5d5b0d9e42ba322327f5fe05baddcf4ee76 SHA512 c4f862048cc2b60ff40d2e496a3780551748a662c73fefda2a3913dcae0a22fc06f1e34e1c171cd0997ed4cc336b31025db190ce0b93d1302d605c78b2dcb633
 EBUILD ktp-send-file-17.12.3.ebuild 825 BLAKE2B a70d898988364281be37568053a6177286bb6156b18031a317e0d17514a40f527e3dd3f104ec3fcfea6a3057f300f9942b8ce8e2619cd05d250dcabb103294ca SHA512 93249abba02c9fe9d9b9e9d990b4497d4cea760dc8c41f0eda35ee701c5a64818bfa5ce67f5e0d2ce082309f26cc53556cc79508c84ca9ea6313a8d0700172df
-EBUILD ktp-send-file-18.04.1.ebuild 827 BLAKE2B 7d38262647862837204cdd934c6d57f4982cdb6150814a81d839b8efa2172e680e5c609658a2ad8517c8e21368fc68df5104e51763ec6ba8014d48e103c2e28a SHA512 091f5ff352e87aad765423053b464eacac61cbefde4cbc3b095673a4657292516673fd4bd52634f594ccc25593bf8409b5e1571cf5701265e639c6c34abe2d12
+EBUILD ktp-send-file-18.04.2.ebuild 827 BLAKE2B 7d38262647862837204cdd934c6d57f4982cdb6150814a81d839b8efa2172e680e5c609658a2ad8517c8e21368fc68df5104e51763ec6ba8014d48e103c2e28a SHA512 091f5ff352e87aad765423053b464eacac61cbefde4cbc3b095673a4657292516673fd4bd52634f594ccc25593bf8409b5e1571cf5701265e639c6c34abe2d12
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.04.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.04.2.ebuild
index d297bb178cd7..d297bb178cd7 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-18.04.1.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-18.04.2.ebuild
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index e80dcd648ee9..07329bfeee33 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-17.12.3.tar.xz 468592 BLAKE2B d4a4aadce200e67f40ec16382902f386ff06bc14bcbc0b91fd7ad0193eaf31e9bf7b1e8fefdf80dbf1cbd6e3e100a61fefcfcf1a67d4dd578f2191760877519b SHA512 2ae0dbfac8f23e478cf208be610cb2d5b73648b1bda43af75f4fa33dcbdb00a5342a19c4b2b6cd8c5a59a07ec6ca3a8d3d8d95cbc42d24c4b74ff40ee22b427f
-DIST ktp-text-ui-18.04.1.tar.xz 469716 BLAKE2B 9c29b03ea734f7f7bcb616f57fca6385d7860ec7780e9a5a7d7e940720056a5861eeff0562f8940af22229f6671017a82b3e16af7d5c37d8e4becd4f011ab8fc SHA512 4e35f6383e990e4941c1bade47f4e0044b740e7f35fa226bd96ea77395836bd883710d751b2901cdd11e8b453be42812827c5a299d37efcba4c6fee31b50413a
+DIST ktp-text-ui-18.04.2.tar.xz 469676 BLAKE2B ddf66e51bb1835e9d0acb531518baae84107be90db350c93ebeea59bb884c63591f187a401c2c6eebc857d29d73256aa793dd7fb3821c133271b4f191cbf2370 SHA512 1c23b7967370e367f453b02a51d43ba0a79e5b6ccdffb2eb6ac7f9d04f2cd01ef9aa9e5566fee7ea188c1c5fd294c25764cebf91517954b704c08dde32ff9ae0
 EBUILD ktp-text-ui-17.12.3.ebuild 1487 BLAKE2B cde9527f6ec6e11917ac0e4c0f747658f3f680b313cc969ab4e839682849cd0d93f4419e96067838901bf127b8c114ae2956bf344c872c5e8796d3fdd5b8b4d8 SHA512 562849c9bac6ed0c34bbace3ddeccaa36cfed9c48ec957640d2fdeba30e6ee64ee46a67c9e689ab9100a20dd7a1e00a60ca88c73b3d37550ac1901e19dd32884
-EBUILD ktp-text-ui-18.04.1.ebuild 1489 BLAKE2B c36a18cf0d96100167035bb215b826ec98eb208654a2946cf170123cfd1cbb6c59cea679c5ba1288120d2608308b9809208d4a6d3484dc1c23840d93fa7049ef SHA512 0a64956660b2fe4212400ddf29bd69dda53cc7ad1c708181319d68b283fef21acbd1cf3801b0832ac6eb0e610835afd69651a8aace292c166ea17c6e0f8a5cae
+EBUILD ktp-text-ui-18.04.2.ebuild 1489 BLAKE2B c36a18cf0d96100167035bb215b826ec98eb208654a2946cf170123cfd1cbb6c59cea679c5ba1288120d2608308b9809208d4a6d3484dc1c23840d93fa7049ef SHA512 0a64956660b2fe4212400ddf29bd69dda53cc7ad1c708181319d68b283fef21acbd1cf3801b0832ac6eb0e610835afd69651a8aace292c166ea17c6e0f8a5cae
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.04.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.04.2.ebuild
index d8d737632890..d8d737632890 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-18.04.1.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-18.04.2.ebuild
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 4f05278450cf..e96785ab9640 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-17.12.3.tar.xz 32802036 BLAKE2B b80c4fcf37315889270de1e9cbef3ce70817b6823a5f20305d05e4213be0714d3a6fb575c388d77fc264b32acf9458e1317bd29ca4021cdb9524b13bde0a76da SHA512 f92d1f97c725bbe45e2590b3873978a321fc5fc78930e21f98274ec34eb665d71542a3451e7970c964e5f3cd7a615f472f6e4f5656562f6c349d45807ed2bda1
-DIST ktuberling-18.04.1.tar.xz 32796220 BLAKE2B 33d1d330d35695468fab0826f03321021160876dd9c17354a802e539a729add8808b4d0366de6bc8117e392a0f94a10965fb17ed56e9c8a095021b0262f9a54c SHA512 eab5ba3c31a38be8d6f0db325856510752508dad843db5cb749e6a542437a7fbba45d2bb76d0dc78d6f53ed3146c687add677413c09aa67260d26709aa79016f
+DIST ktuberling-18.04.2.tar.xz 32794900 BLAKE2B 93404f7421d37c10cfa1511dcb9f798c78f8f91a3333d60e5e240c3fd91124b4df29250665546b4ddebd6b570c18575f72189eb15648a16619bc7d01f1f5aea2 SHA512 2c2b1160fde97efb8dfc0c319f0d2ec0e0e338b6af04ba71e22afcd3225900c68d41f442b2da6c02628ba8706871ba356333d635cdfb87b16d16da358355e025
 EBUILD ktuberling-17.12.3.ebuild 975 BLAKE2B ec8f1d47106ecaee3fb5fb1d87a30a65e0015031bd4c0721b7038e9a7546b230e3e68374f856bc6d9e19820290c66cfdc401a4e3187952ab92e05664a9453f49 SHA512 4a8c6fd5a2492d094eaf7dbd351630b8224ba8529d16a026e9f99883f3f0aa4492372c2f14e2d8cf12cf47fefa4a36075c74b49c4ecb5de51e437a490a68dba4
-EBUILD ktuberling-18.04.1.ebuild 977 BLAKE2B 299bffd77102e299e2416972dddd86fd96e627e656162b2621c2505acd3993562868046c11f958cb858baef5f4e833bca0ed2b408042b17eac8c17b3f66ff7ab SHA512 10095f2c1f4d4e021815fd8d72d2dc2c5be57adfa67be12b3153225db93303a0d38263650880a982f436e1a13999b166e5eff28a149c79c830f96c98ec1084b3
+EBUILD ktuberling-18.04.2.ebuild 977 BLAKE2B 299bffd77102e299e2416972dddd86fd96e627e656162b2621c2505acd3993562868046c11f958cb858baef5f4e833bca0ed2b408042b17eac8c17b3f66ff7ab SHA512 10095f2c1f4d4e021815fd8d72d2dc2c5be57adfa67be12b3153225db93303a0d38263650880a982f436e1a13999b166e5eff28a149c79c830f96c98ec1084b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-18.04.1.ebuild b/kde-apps/ktuberling/ktuberling-18.04.2.ebuild
index 6f603a18c561..6f603a18c561 100644
--- a/kde-apps/ktuberling/ktuberling-18.04.1.ebuild
+++ b/kde-apps/ktuberling/ktuberling-18.04.2.ebuild
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 2d8836e89032..604597921485 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-17.12.3.tar.xz 1608852 BLAKE2B 1f8fa96742f08bb3e9ff4be1c6b2f1cc9bae22acf9e54f69a19a74f621fae9cf55bad26f4baee1313e03ea3a575b21f5d45d66541f712c128b823718fcc7936f SHA512 5510621296a824cdedd2454cbda21e5eb906bb72a79addae5ccb19d011af813c29c7702166bd2e4b728a3cd1d62589842b44983af01af10d3f6a13536afcff2e
-DIST kturtle-18.04.1.tar.xz 1608868 BLAKE2B fa92f08d97eb112fb6304f67ae509c84271263049209a14cd57e127924118a55f320b3320c34f095094263231d12727181b1921d797ebad40a90f364e5ec2126 SHA512 4e5fb4f1994bf2eee633ecaefd888d745d589de16531a10ddc8a821212ce79d918a0b2b61e3af43d85bb33d9c2865d82f4d8bb6b7b5364de1cb1798b96c669f6
+DIST kturtle-18.04.2.tar.xz 1608920 BLAKE2B 3e5d131a97eeff97bad5666cb8e9a96adb8fc3ef70761f6ff12b3766a97d34909b2576cd05cbf27f4474e6449d6bc05e1bed18dd37e1f8ab1b396a2811b84fc8 SHA512 084801ca4c89d84f326608ecf7e6084d105aadd439e7a705b34e557b0b16dd339d42eb2ecb825757e4b7481bb5c263cbcc3afe1ad264600e505c88df30a4a065
 EBUILD kturtle-17.12.3.ebuild 843 BLAKE2B 0efee60c3bf185f01be78b64a97e73d630ac9d194c4211b9baba35551de7994e120832f6b4615490c678029b5be3a715378c76d2de1b913ea8c82279a1c496bf SHA512 e61ee8e395c453417cfbfb1cc7f6f1b6fea53b02f3ae2046700f42e3e5129e9cf081cba65526f358c7a43a3133bd3997362a2be5911ffadf1256d59958f0b684
-EBUILD kturtle-18.04.1.ebuild 845 BLAKE2B 0e90bf87697adf33bbaa56b35c9b17d9a6ba93c1cb97426bafd41726539ff3e8770f9864978683c720d59e642b5d3ef47f302d697ae57184fb8b1859018f8db6 SHA512 a4c17a088109a03edaf0f9e951a1dde4025ce91a5bb483c62247787652dc244efbb8d0042ecc7781324240a1808ab5ce540cd7ca8cfdbf1c136b37599ce8a3ca
+EBUILD kturtle-18.04.2.ebuild 845 BLAKE2B 0e90bf87697adf33bbaa56b35c9b17d9a6ba93c1cb97426bafd41726539ff3e8770f9864978683c720d59e642b5d3ef47f302d697ae57184fb8b1859018f8db6 SHA512 a4c17a088109a03edaf0f9e951a1dde4025ce91a5bb483c62247787652dc244efbb8d0042ecc7781324240a1808ab5ce540cd7ca8cfdbf1c136b37599ce8a3ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-18.04.1.ebuild b/kde-apps/kturtle/kturtle-18.04.2.ebuild
index f1c34975ae1b..f1c34975ae1b 100644
--- a/kde-apps/kturtle/kturtle-18.04.1.ebuild
+++ b/kde-apps/kturtle/kturtle-18.04.2.ebuild
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index fcc1954f67ed..dd0812542523 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-17.12.3.tar.xz 307056 BLAKE2B 737e97392692bc9aa7e1ba67d1cc04e370824932248586ab1a6a04afe4f4a3f4feea6e8dc86a4f39e56714bb01781c637d466d6eea6c950d22146d61b7fedc1d SHA512 4aaa118514674458513ffc8b4ce0d5cad479d33103302979e2a9ee6f9ed7955147dd42d8f31ba73a6ad39e1050ffbd48f85d8eab6954bad834fbf1e6b92f39d6
-DIST kubrick-18.04.1.tar.xz 308268 BLAKE2B 26430abb4f6c59db6b5f8666e589d7e33672e31821f0124bcc01ab75d2da51f00ac06f138f638615c16c6904710568c8216bdcf612e2497551d905dfa0615e6c SHA512 479d545c1dea21e3025de75c13c0c00e24ad7176ae4775d49b34ae7121e5856c550dde7672bcf97ac2cc5f03725225fd6a392a9d609a0eb3fc09d0e0c1f9a839
+DIST kubrick-18.04.2.tar.xz 308348 BLAKE2B 778f4e9b87a4df5e9093924ef068f4854a9306189096ea329967e517399f83a62ac1498a32d93cbb41ba339db7dd8f209d9b7ae9e1e70cad1466a244ddb0aa22 SHA512 f4f467e95f46b8b2677ce2f4cf5c5836a3877e5aa79ead65e0117091cf98a75831c3d124839a1f3a6a0a12724909c70e56a4842f2ca8bf4d6589d68faddf8314
 EBUILD kubrick-17.12.3.ebuild 749 BLAKE2B da0554f2e3eab3029a90b6d791de0f008d9f16f2d241da6943c3cb526ac3bc620e0ecfb9b96e760d35805ff3e09c121fe0bd71fbb291bb1b79a326da4a5f95a8 SHA512 d0a1c727665ec7b34e12d3970f109d31187a0e54ace76dd7214cc9f1172b9581a61af9791a4f12830c6a5b9714e40aa65611da6032d826771dc18253b5e2b89b
-EBUILD kubrick-18.04.1.ebuild 751 BLAKE2B 6cacf182b70e54fe782431103279e8651a04bd005afa323c309f622b9b74eb16c68b37cd11e5981e5370812c05ac24081521ff91c9843be6efd78b809845765c SHA512 01bbcc27c295fc836dad806987e8a3b3e786762fc7f4be0dd33aeab430a58f644e96adf3973cd444df9cab24a70962e38776afd3dd8818b45bee21ec480bc1bd
+EBUILD kubrick-18.04.2.ebuild 751 BLAKE2B 6cacf182b70e54fe782431103279e8651a04bd005afa323c309f622b9b74eb16c68b37cd11e5981e5370812c05ac24081521ff91c9843be6efd78b809845765c SHA512 01bbcc27c295fc836dad806987e8a3b3e786762fc7f4be0dd33aeab430a58f644e96adf3973cd444df9cab24a70962e38776afd3dd8818b45bee21ec480bc1bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-18.04.1.ebuild b/kde-apps/kubrick/kubrick-18.04.2.ebuild
index 49fdf450e365..49fdf450e365 100644
--- a/kde-apps/kubrick/kubrick-18.04.1.ebuild
+++ b/kde-apps/kubrick/kubrick-18.04.2.ebuild
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 81950c573665..e11bbd74801e 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-17.12.3.tar.xz 778500 BLAKE2B 106e4cae3ec45f1782f838dc7fdf6722ebf766120ca922c6ff49a469afe09c48ff2dd81607094864a56f69355408b292e5dfa68138375bf1b2e48415f9227766 SHA512 b06bd097c580dc70d51388a12f30bd0ff0460d6dec5789333e460037ee3d132886e004c1fb1cdb13add6e588bce554d72b5cfb33bffa205b0edfebcf074610ac
-DIST kwalletmanager-18.04.1.tar.xz 779080 BLAKE2B 1243f09df3dd4b489867bd44554e1e4875b9778bb26b2b532ff7ccc1227afd6bafdec28a00a95d2580fcb3b2e883f9ef51f622445910f294bdd99ccde119c761 SHA512 6ce72cb891aaccbd1ec01225409455a70571083d0809a2d2eb91a1da7f3f0cfce66af2a51e3c14c0eda0c8089ee353ebd865f2d475f422b6d3f95fee82f1c747
+DIST kwalletmanager-18.04.2.tar.xz 779268 BLAKE2B 0181a9e4d9ecb35dd839b793e01716f54adba70430595d08760a850555616e9b11f165d7d8e80d4469ce815f7889a552cb5fd854fd84d40c1fbafb2beab4eaea SHA512 1dcfcc854ba3651bd9a6bbf549c435f87881236bae33c5f2bf192b59aa36de3bb3952fa75d5e17bccdf9b2a908aba9af2b9cf7130e95626667e63adbca5ccabf
 EBUILD kwalletmanager-17.12.3.ebuild 1246 BLAKE2B aac270c42cbeb8fb891dd9d65a8de55d51993e296ad3e56ae59015746f6d19bf3b6fe70e857ca2a575c94b21ae69dba5c1d2b6151457a8027faacfc177e54450 SHA512 18f35758834e8b4d9dc2f32d87d998ce4b36f278c6f24a76dfb9c38501382bd986abbf0181ad68c632b303855c9d882d6b8a09a89535965e9dc7e2779673766c
-EBUILD kwalletmanager-18.04.1.ebuild 1248 BLAKE2B 1c1648ca2ce4e47e83986f21e29f868372e726638d87570e41a71128b1c2bdf8c0928a63e8a29a123004c86a146d5b2732b5201649e69b77b22468e0d46fe9c8 SHA512 03769d48ada6730a20e40906a42aaa80b1fc3bd773003636b27728e70f2e9ac4a77a83ef3f0263ad38a6adfabfd99542f46d14f171f3210e16baca82a6a25054
+EBUILD kwalletmanager-18.04.2.ebuild 1248 BLAKE2B 1c1648ca2ce4e47e83986f21e29f868372e726638d87570e41a71128b1c2bdf8c0928a63e8a29a123004c86a146d5b2732b5201649e69b77b22468e0d46fe9c8 SHA512 03769d48ada6730a20e40906a42aaa80b1fc3bd773003636b27728e70f2e9ac4a77a83ef3f0263ad38a6adfabfd99542f46d14f171f3210e16baca82a6a25054
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.04.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.04.2.ebuild
index c557ba43034d..c557ba43034d 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-18.04.1.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-18.04.2.ebuild
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 170417a71ee4..9e73459377f8 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-17.12.3.tar.xz 4757724 BLAKE2B 1479b75aada209ec45fc69a735f789512f8c81177a469e7f87f55e8063f8bf2421b7c901aae0886f6aff238ff6ed9acec2b872fa61d596d30251745ca5553619 SHA512 008df107d05c5e9d07a9b8f64ad261a03bfdca64c8ffc098be6838a4672bce2d0c00f9fe4afe07cd7418390e0973720c0bcc1703ac4ab8fb5e0bbd5fee9fb503
-DIST kwave-18.04.1.tar.xz 4761628 BLAKE2B 3f209119be07cb338c1b3eaef1e26dc93ac0af374099fbf8b42b97bd6db5231b09c793a0b197af73783907b830f8f4501e95ccfbf964ff69a58d05aab1e71d47 SHA512 91d11151ecf955d1c8d287c2f7d5f212302aec7b8b351a5318ba6e43638b1a6c53aa089dc544c05a401c6cf8ae99bfaaebb8467f44eb1e4e694caa5d924b906c
+DIST kwave-18.04.2.tar.xz 4762332 BLAKE2B 96ca5858ddadb2be5859080e87519c664049ffee1608b09be2ab93529a5031cf86df1de3e47c8c721efa03fe9ade7101df19887dda02e071b102294009a7a140 SHA512 6ce691b2d12f6abe8d1269985d630eb077a63eb8c3f3b77ba028ada9b11d858ae592ad3411c172726d933096951c1ae2af00448973c401000c228e47e1ac41ed
 EBUILD kwave-17.12.3.ebuild 1987 BLAKE2B 9b5d443154717b131c0f807a64f76e16dfc38b993c268003f778ae80d285a4fb63b124b54b0762b81dfa84c8dd69e722df52aebbd218c2f4761363f2890ef612 SHA512 c80dcbd90fa9b0aba14d7d007c940646c477a8be7d3d7f97449bd267628676da6f72d44c0af285220b5d3d64ee6fd958a6239f52e6600e345cee4ef77ad2d7d7
-EBUILD kwave-18.04.1.ebuild 1989 BLAKE2B e8c7647550262f52d7f74f0aeedc8aceef0179c084b845195f7f41eb32b38bba4d67f7fa9ec5ce65d308601ec5cf5ab5c95eb3d9af9d8124395626cd455da6d7 SHA512 728ec4b1fc1ce79f7856f8a28c1566512a132d657c6997b6cbda6f9adb1f8bea02161330e9ca56450806705841e71c3b1c87402467cd74a0b2b3795ff259a08f
+EBUILD kwave-18.04.2.ebuild 1989 BLAKE2B e8c7647550262f52d7f74f0aeedc8aceef0179c084b845195f7f41eb32b38bba4d67f7fa9ec5ce65d308601ec5cf5ab5c95eb3d9af9d8124395626cd455da6d7 SHA512 728ec4b1fc1ce79f7856f8a28c1566512a132d657c6997b6cbda6f9adb1f8bea02161330e9ca56450806705841e71c3b1c87402467cd74a0b2b3795ff259a08f
 MISC metadata.xml 749 BLAKE2B 860265ca3ab192b9f0eb386b4f8c32d400ffe0d79d9ae52fd1b03e10b6c1955406219641cab9c38cfa3c45de2a7bc2d37525ddb264599922e3359d764add4318 SHA512 ea33dd37159d916ce727354e5183f77e4435553fad594e6f0494419e41137bc29d9f1d7b1035ab88ac982ca4c56a68065783a9336f29a511f681074bf2d772a5
diff --git a/kde-apps/kwave/kwave-18.04.1.ebuild b/kde-apps/kwave/kwave-18.04.2.ebuild
index 5327a15228ed..5327a15228ed 100644
--- a/kde-apps/kwave/kwave-18.04.1.ebuild
+++ b/kde-apps/kwave/kwave-18.04.2.ebuild
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 2a59e767b655..597908cc4a0c 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-17.12.3.tar.xz 4168956 BLAKE2B ae201895e4b04e692af562a4adff052f2d6c6897cd7e441f17a1c4613d0a5094fd34d2ab842f4d0661fca35b1a5512b1906ef54179ce22e135d4a0a196c281d9 SHA512 b07d8673c14752ebf38e4ff18771189a701f52435b4c565e4355f48246eb81660f2d0d6d5beb22ca19774e1ec6c0495cf203dcb0e5634609f7f021751e64f561
-DIST kwordquiz-18.04.1.tar.xz 4168780 BLAKE2B ef2e1fad5e43a8a5546b64a1399fdc131099da0ea30b86316036e8fcc9e5acfc1df463910ad996bdcc7506b4f79d989cd20874f09f0b6e8d5b804519549476fd SHA512 40adab7058d085c739f46f093814961a64fdb802479680c56641194ca9d04a37e6940a8228d20e33dac8dcf426babdb788bdb1b8399e6ec3611f93492d0f4994
+DIST kwordquiz-18.04.2.tar.xz 4168848 BLAKE2B b930989cb231f21d0fc08e721d8f0e02b6d73bf6e101d95b29f10161634066ee3f6c5fb1c6a4212dbba16c25b3f7e2b82b9ecc075bc02b783ae7b72c0d6df965 SHA512 8e277ac2c672addd44ab1ab2d9ba3f6fb856d0fbad6a9c615b063c029c7673e52439e2bcc92dd64f0f8f3f83060d59ee7bbd5112c36b2f0b402ec737cf91ddd8
 EBUILD kwordquiz-17.12.3.ebuild 1062 BLAKE2B af1b796b5bdf1ee2b0768e8fc2dc796923f3c7aaeb103237dd2b960b4d122bfa4f6b89fa2a8ea8d56ccbed138b54703119e21131ce289291a120e1e90a4165be SHA512 29d5c304d3074e6f46fb31b8bdfe161d6ffba70793c133f2658d11e3a2af0e41d2fa121b6f9b1cec1769cf375b7a71785c89ea9509d982b364bee0bccc5d92f1
-EBUILD kwordquiz-18.04.1.ebuild 1064 BLAKE2B f56195944503c694f323cf7071299a9cdd136d6888386f8e8d34d6a1650cc247051f7a4ac71dc1d7b6ea79ae1c4afc106ec8da6ae254b0b338a9fc057deb3353 SHA512 b6ad92dbca261e758eabce63c10f59e5666a5ae1405780d71c00e8055c8d0cf1de120ad10c5cc8216d5570489a7b2cded008950dca8da66bda87fa8257b5bf48
+EBUILD kwordquiz-18.04.2.ebuild 1064 BLAKE2B f56195944503c694f323cf7071299a9cdd136d6888386f8e8d34d6a1650cc247051f7a4ac71dc1d7b6ea79ae1c4afc106ec8da6ae254b0b338a9fc057deb3353 SHA512 b6ad92dbca261e758eabce63c10f59e5666a5ae1405780d71c00e8055c8d0cf1de120ad10c5cc8216d5570489a7b2cded008950dca8da66bda87fa8257b5bf48
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-18.04.1.ebuild b/kde-apps/kwordquiz/kwordquiz-18.04.2.ebuild
index 666208ff0dae..666208ff0dae 100644
--- a/kde-apps/kwordquiz/kwordquiz-18.04.1.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-18.04.2.ebuild
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 8a3014e71427..c390e6042aa7 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
 DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
-DIST kate-18.04.1.tar.xz 5639500 BLAKE2B 2c8eb6b64c5551b69a0d6386e0e92d60e6affa451729ac4e9b41a51a22293532d1846a3bc6260eeb70daa881309683d9790230d9a6aba3690f9eaf38def3758e SHA512 c892c90e2f01b1540bd8eb6bc8e23532dff680bd5d8980f69b18ece3a7cfd8fd695653cd461f9f9676d1990f8eda18a89710ae536696f17442e16bd60432542f
+DIST kate-18.04.2.tar.xz 5641048 BLAKE2B 7385aaf26029a6c5b1e749440f41d8ed58e936a06fff9c40ff1b37fd5724298d49d7aa92eb3bdefb2b4088a6cbe106cf6f5796e2a410c2f348c9b42492c7ac7d SHA512 2b3545ba3042f95756f7f3af2d423041107860d390ab6884b52f410adc0a66c8e9fe85e0105935258c0a68daa41c96330ca78de2aa788685daa2b51d97afea7e
 EBUILD kwrite-17.12.3.ebuild 1187 BLAKE2B d4013638f4e083e2bb09d4fd13b8460576be643f743275a6db02cc662c93c498bcd99c8293ef1aab6a14fca1874f3d066c92544479a1bc0636bd942bdb8292e6 SHA512 46a6a9c2da045780652a90adfd6390c3623c1b5da38f75228bd87fe7ad4ca7a0cafda28d926a8e09f5ab49d4027a4c3cf73025a0c54e0a1e05b875458eea755e
-EBUILD kwrite-18.04.1.ebuild 1189 BLAKE2B d42d84f053107c7d7631f8008515a1022ab162b36c5e55471c9536e6c6b67399c185f6055d6de97f773ecab1481cccec261cfa38c0c2273fdca3ebc616904ce2 SHA512 8dfbabe38a589b0fa4dac0db266d1dd15a276ddf19335352013f5d7f13494cc2f50051d931821a3b180c48c697627382a2014358e9e87c261bdd62b6600c4b7a
+EBUILD kwrite-18.04.2.ebuild 1189 BLAKE2B d42d84f053107c7d7631f8008515a1022ab162b36c5e55471c9536e6c6b67399c185f6055d6de97f773ecab1481cccec261cfa38c0c2273fdca3ebc616904ce2 SHA512 8dfbabe38a589b0fa4dac0db266d1dd15a276ddf19335352013f5d7f13494cc2f50051d931821a3b180c48c697627382a2014358e9e87c261bdd62b6600c4b7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/kwrite-18.04.1.ebuild b/kde-apps/kwrite/kwrite-18.04.2.ebuild
index 40a36cff18e3..40a36cff18e3 100644
--- a/kde-apps/kwrite/kwrite-18.04.1.ebuild
+++ b/kde-apps/kwrite/kwrite-18.04.2.ebuild
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index d9e353be886d..2fb41a68ed6f 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-17.12.3.tar.xz 30064 BLAKE2B 0bababb8f69e9d18b336e59e15718f0d59a333c3a77801e2a5a1f39d39cdce498b0ca6a76277131194e1292b2649dbd31dfd5ec035cfa4338a2dc62867629344 SHA512 66491e357c8c1c89261abe1aec07fd3e56c45368404c5e06857c9c8bdc95001176eede18446317971e42731d604467ea0b5c829f7e1fb435bd7ed11b8a15f512
-DIST libgravatar-18.04.1.tar.xz 30440 BLAKE2B 175e86999cd8c60084c11b67939f1a74e4321402a1b59b4fddc2bd864934ab07e74440c337d35c92e8fa7a3d013b9cbd77b56bd11893114f7ab44c67da56239a SHA512 4a518c4c8a1f5f73bd4e2e5314fe612a61f993ba484e1d087ad000386f9cbeca0f4099ff3ab5fbdbaf15cbdedac1728f60ae70d90a9987d6ebfb85e89ef1127f
+DIST libgravatar-18.04.2.tar.xz 30480 BLAKE2B 8bce3dd136911d641263221d7086abc4c96eb58d7f527f6f6c16e28902d67960229375a2aee0d83fb0dbb11bd68f1b5cff25f9a5540be9d397acccbb45896f6a SHA512 0c211b0dd9fc90b11dd0b27a08ff7452b06467fe0f07fc3b5658c64fcb53eb3467e732c5fe3e145ef863280c96b80f524e06c7feb022d5549ac1e3591e7517d0
 EBUILD libgravatar-17.12.3.ebuild 723 BLAKE2B 0f5d2a3d1a7011380d42421b390af600d9467276583fb75c8840b83d8841ce32146fe9ffa296245107ec8180b554b9006a6d254f73260134803f139b28b7873c SHA512 bc6df3e5eb4efe3fd4c312ecd077d9e40b291f0c19f280f5074fdb5b46449009cfe95592065f1e95ad2df7a7ee9f3b2a9d867ef7616ec190006fe890e94afc80
-EBUILD libgravatar-18.04.1.ebuild 725 BLAKE2B 0ce98d77067c2fa52d9b36e59961ba0520717cc9f4959b9f05e5498127c78b8984eca411819b04fe22926005d82cdebdabaa1d63ca37a5f2dcec9b0e842cb5fc SHA512 a59206bbb628d9f43f5f058e3d25c7fac8bc21e8328e8c268ac71605e7bae72fb78fb3f609e4c5f1e972d1571dcdb002119428986da5879356199340c12aec54
+EBUILD libgravatar-18.04.2.ebuild 725 BLAKE2B 0ce98d77067c2fa52d9b36e59961ba0520717cc9f4959b9f05e5498127c78b8984eca411819b04fe22926005d82cdebdabaa1d63ca37a5f2dcec9b0e842cb5fc SHA512 a59206bbb628d9f43f5f058e3d25c7fac8bc21e8328e8c268ac71605e7bae72fb78fb3f609e4c5f1e972d1571dcdb002119428986da5879356199340c12aec54
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-18.04.1.ebuild b/kde-apps/libgravatar/libgravatar-18.04.2.ebuild
index 06eba7322aa8..06eba7322aa8 100644
--- a/kde-apps/libgravatar/libgravatar-18.04.1.ebuild
+++ b/kde-apps/libgravatar/libgravatar-18.04.2.ebuild
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 732c8b6bcee9..8d56282f1a0c 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
 DIST libkcddb-17.12.3.tar.xz 423976 BLAKE2B a5d4723e01e53c9b168bab44b54e89d16fd5d6689da6bfb677e023ccc4478e30c1e26d682712b4313991820282628a879e4a016397ca5b84f4b53a2158870f5c SHA512 f2131996ed0727a591a3e8a265c9c65f1d1700377ccaf35e9008a2c7aee1222bb3d37d47de9f740011e9fc9c7c13936f5e473f2ccc6990e683ccce5bdd0e95f9
-DIST libkcddb-18.04.1.tar.xz 426972 BLAKE2B fbd33690b7d7ecf3e05fa6f3be489e91a37a4da0f4d09cd5cbeb963d377c070c9d4df87c378083093e41bbba734afa08230a25f1ac82f01997c8a1962428dc2d SHA512 344e846f35cfc5d9d29301eae8b966984c163e500e591546bfb34862f3fa93782277d254a24bcba4e61fb1bf78c9a710ccdd24c5fe05373d5241055fceef0da8
+DIST libkcddb-18.04.2.tar.xz 427096 BLAKE2B ddb251b5faf057578583eaa5702e38b3745586ac3f5205476a6fdb487004091d508675f3380c8b813de2815fcec162ebff5dc0ce7199aad44b6c12ef2eec7dfa SHA512 e1bd8a52ede59c21d051ae224225a224c4b8211deafa4ac0ce1402b651acf3eb9a7d719d3e2f9164eb4e732498c8c11315db3d01a7a32ca16f0682272889201d
 EBUILD libkcddb-17.12.3.ebuild 1069 BLAKE2B 0d275ed8bbda299bf0cd8b9178ce2062e2e8a85e1d98b0c01ef93285955c3905caaa4d30a6fce1cf0a7fb1730a68db6b4cafce6b85c53c8b7e3b6ad4c2551da6 SHA512 52eae08f381c5726122a9f41b123dccb1aa39584519962f187f1de2572ab169991e1a8eab62faf08c98a02565d0cd6152b2438d68633466f560b52cdd3a7765c
-EBUILD libkcddb-18.04.1.ebuild 1071 BLAKE2B f2837e7e3fbfd7781481841030ea90fef579df78c782b7e210d8c062c8cdf1e20868d3b948402fd242c452c26574deb7389cab51b4c44254604c32294e55adcb SHA512 9a3a30e3a3268c65916497944b788b8355d0984c6a41fbc0e3c8f82ae9e0c3d5919b205b92f67cf10a1e65ffbc94005ddc695c19b1d3cf2a03c432b1e8af7145
+EBUILD libkcddb-18.04.2.ebuild 1071 BLAKE2B f2837e7e3fbfd7781481841030ea90fef579df78c782b7e210d8c062c8cdf1e20868d3b948402fd242c452c26574deb7389cab51b4c44254604c32294e55adcb SHA512 9a3a30e3a3268c65916497944b788b8355d0984c6a41fbc0e3c8f82ae9e0c3d5919b205b92f67cf10a1e65ffbc94005ddc695c19b1d3cf2a03c432b1e8af7145
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-18.04.1.ebuild b/kde-apps/libkcddb/libkcddb-18.04.2.ebuild
index 7c3b36bcccd4..7c3b36bcccd4 100644
--- a/kde-apps/libkcddb/libkcddb-18.04.1.ebuild
+++ b/kde-apps/libkcddb/libkcddb-18.04.2.ebuild
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 6ee95084577c..16db0def964e 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-17.12.3.tar.xz 88684 BLAKE2B 6fc33d00d71d03c6bdc8f35eabfcb21d69c14b81c65b88d1272da509a974958ea8c35df33b5c7834592098245dd46d3af132fc644c6203d9517657b871e54487 SHA512 260bac30666eae88575d5a584c89d78a3f39c9281260f07773cbed150eb7ef7f7b65bb41d904bf346faa311a118a6fea955a3cb127a27ee68c91b37b1d516cc2
-DIST libkcompactdisc-18.04.1.tar.xz 88420 BLAKE2B a4b37bb8da1712c90402d50ed9562e10546bcc36110f7395c840bfca3993db74d53b1413f67b398136d1dd36ef20c21a6db67e0cda375b4246a333990f7a5c14 SHA512 ab39bc514e7c2305f28fdbb12104476b15c137cea614450ad3635ad55f18b198e2c9c525c74f3e480ae9a042b06b456e718cee39ee4aef148618b0ec99c72c47
+DIST libkcompactdisc-18.04.2.tar.xz 88516 BLAKE2B 768be553d2e5eb1a85db6fb30feba8856431e51ec5a54d0461fdadab06de391f58903b01f10871d52514282245ec452cb2dd3dd83a9687fc2331a7bdc4914a5e SHA512 4999cdc99150396591b9596fa1c256cec4bc7f3a4d3ae6cf1a297c0c679e457113739f29985e2a37dfed4c77a2649a243baab92b9312ca2f208bd63bb9ab2c46
 EBUILD libkcompactdisc-17.12.3.ebuild 574 BLAKE2B ae958c84b73a13ccd9041222779ebccc2a0c3bdc95d6a2f3e9e7240e75a957e9692499202364a0c92d6da8df44c6ac3ea17cccd3de0643df32d249e6fda3642c SHA512 9167faf732377f25cc22b616da9f5fd8b41e6e9960cae6635e14bebef73084a5d74a2cd6964f3c8f48855db1451b225d2ab13e6337e82dc72afdac3e736cdbe4
-EBUILD libkcompactdisc-18.04.1.ebuild 576 BLAKE2B cc9c1fe1b60007e8f07343ff96afbedb8762e7f8ae23b9533936d585d17629b8f723d3b20df597785c911362d0b4522832f9aac3a69d56b5fbbec7d52c567d7e SHA512 73e81d8d450aed9a7631f6882e9d3895e3be03d6725edf006242b0312652777c1059cffd5d24d5c3387ac7080305ad0d1b875d7d01cdf3e40ee2da31af4a6739
+EBUILD libkcompactdisc-18.04.2.ebuild 576 BLAKE2B cc9c1fe1b60007e8f07343ff96afbedb8762e7f8ae23b9533936d585d17629b8f723d3b20df597785c911362d0b4522832f9aac3a69d56b5fbbec7d52c567d7e SHA512 73e81d8d450aed9a7631f6882e9d3895e3be03d6725edf006242b0312652777c1059cffd5d24d5c3387ac7080305ad0d1b875d7d01cdf3e40ee2da31af4a6739
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.04.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.04.2.ebuild
index 3c73db683d51..3c73db683d51 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-18.04.1.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-18.04.2.ebuild
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index ad2d2191b8ad..87eb1778540a 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-17.12.3.tar.xz 41840 BLAKE2B ce2fca321aae3fd5121e883299b2e10aaf79befbc4bbce0488f88200cf2816a9b83cd035e2af1c382751e8eca5d369ea88a63eaf71b1e7987eccb9e69f7198ce SHA512 f8248b22636b07083af84bcf66cddbca91cfe3d3966299f1d6c18681474d01fea395c4f855a628cfe5ec857efd4e4965cdc987463b8ff661f3425e81aa2f2eb9
-DIST libkdcraw-18.04.1.tar.xz 42088 BLAKE2B 386b859b7818b45de6dddbd72921847c20d68fd512f9f5245e03dd559ab6c14b9e317136882de5a758e6ba2e7ee5c2977024526d9fa2d5b850dca24d78a5b8e1 SHA512 d2cca854e3a5cfa805d6592b6796a26d84073187abff8846051fb02714b017d6d87b5a911dba2f7e30608ec92ca5d1908d5677fedf7093d1996203c1c51de0e6
+DIST libkdcraw-18.04.2.tar.xz 42112 BLAKE2B 8ff4b0b18ec645b1c4c0eac08cbaca00f762f135698cc52f265c687b67d79db57f718671fb0134ec6e8cf888f45c3c892b51cf3a77e19ff0fdd4dee60e062777 SHA512 4d4ba23e1db01b16ef721c3a35d09afc1735fe643d6b797b77910306915ad4c9458f8b5fb254769dd3fb37bf24eccd72e012a081bac1195270afa7114055ad11
 EBUILD libkdcraw-17.12.3.ebuild 336 BLAKE2B 36a6479ea2f7383d1c2d7b09c93d3fec87fc971a870d5d67045e765fd5156488dc066bd394e76acb7c58de09b0ca7844ff3bcaa1f5d6501d8d59568ced2ec2d4 SHA512 41df8a1049b57817760a4cf41808b74de3ab2c08b29d82d7304d405bbc983719cf0bd6ef1cec6fe40e99fe210b0f1d78fa71d48dfb3baa9a80628fd1703d730d
-EBUILD libkdcraw-18.04.1.ebuild 338 BLAKE2B bab16be60be734551f780f9b3b3f43cca133a109eecfc384f5b87212e8526691d5b02772690cd1fc1dc2efc9e82b2ed6ad12eaa70f2233f9d2e16dd19538fdc8 SHA512 2525ed91ff4e820d8bc3a1625421b0267d465e6250ea17b0acfed768ec0f6ea59e7184dfdbf9f559c0828d88905dfe6019f2295be9bf4cf1e19ac62c9c009c0e
+EBUILD libkdcraw-18.04.2.ebuild 338 BLAKE2B bab16be60be734551f780f9b3b3f43cca133a109eecfc384f5b87212e8526691d5b02772690cd1fc1dc2efc9e82b2ed6ad12eaa70f2233f9d2e16dd19538fdc8 SHA512 2525ed91ff4e820d8bc3a1625421b0267d465e6250ea17b0acfed768ec0f6ea59e7184dfdbf9f559c0828d88905dfe6019f2295be9bf4cf1e19ac62c9c009c0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-18.04.1.ebuild b/kde-apps/libkdcraw/libkdcraw-18.04.2.ebuild
index 88aa2516004a..88aa2516004a 100644
--- a/kde-apps/libkdcraw/libkdcraw-18.04.1.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-18.04.2.ebuild
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index a822616cd8ea..e4c86e85f610 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
 DIST libkdegames-17.12.3.tar.xz 5941232 BLAKE2B 6cb6f92c374f09c4c8f51bc34a163584ba48f44e9efc0408fed539cb9567d98f5c10ed1208a38c3117e64993826e006739a252623237028a9f2e1943d837f5c6 SHA512 159a2d6e84600e3dd92455c143ee0f8084db35e5f13a1d05013e8afbacf2d56cc9f67f1215be38ec420cdf66cb026d9e51b0f0d0daad76e3370374cd4317cd8b
-DIST libkdegames-18.04.1.tar.xz 5957092 BLAKE2B 1d8e0aad5679c8363ae39886b6613017c6b821380646b6e489f630fe88e5801e4129bdb915a69508ddb3092a90a5d091c37a29b8c9c96a28ce440f050c44e6e6 SHA512 b2999a525de23312f28d146af590fad363ecf828449b892fd1a6c2d2d628d8fba9e998b7596fde8c88a090045a71c5f86f8b4c24528057ef7f5ee4350ea46a09
+DIST libkdegames-18.04.2.tar.xz 5956504 BLAKE2B f95db68110f843d6395c267846b849ca0abe3ed54280aee24c1c2e6010e61c97fdada5a841588ecf6dd4b86ecec4d480192e3cbbc308cc3d2fc29e66a1a8166a SHA512 0dfaf23460c1510bd3d8fac6abab7cc542a29ee3e2ebdd6cf3276c6ea639ae5e99f4c05132fbe27eb903040a382f72de24eb333f579284c6d3bfa804d4507d99
 EBUILD libkdegames-17.12.3.ebuild 1278 BLAKE2B cc571e37412a87bef3391d21cbbecc7a374f56202910e10d59179e7ebb68f61a91b7cee5d19487d5bd56206e8a21e8072f372244ae62f0df80c5f3352b2a8987 SHA512 e8e8cb5dac8db9f01df93954ac12013ae64cd91c30fdeb240ae164613aa7848f9419323b5385ea544616fbf3cfe49377a6454fff04a26061b1b2f2f8cfba3b7b
-EBUILD libkdegames-18.04.1.ebuild 1280 BLAKE2B 8f427db1240dc4e26ef8bd7a343d5dc7b5433a9f6217a2f62c930aa2bdb865a5030830a8b9bf6aad154d90633a8c48ef0cd666a317c978cb352d3c0a56e55604 SHA512 e4010308d83818419622692eac3fc26884f77643b8457e48ec33f085fbfb1ae48b5494e2d7cee7e37def7419412c90b7ec49f4d4370d9cda8168e56be84e2750
+EBUILD libkdegames-18.04.2.ebuild 1280 BLAKE2B 8f427db1240dc4e26ef8bd7a343d5dc7b5433a9f6217a2f62c930aa2bdb865a5030830a8b9bf6aad154d90633a8c48ef0cd666a317c978cb352d3c0a56e55604 SHA512 e4010308d83818419622692eac3fc26884f77643b8457e48ec33f085fbfb1ae48b5494e2d7cee7e37def7419412c90b7ec49f4d4370d9cda8168e56be84e2750
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-18.04.1.ebuild b/kde-apps/libkdegames/libkdegames-18.04.2.ebuild
index a70604c955d3..a70604c955d3 100644
--- a/kde-apps/libkdegames/libkdegames-18.04.1.ebuild
+++ b/kde-apps/libkdegames/libkdegames-18.04.2.ebuild
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 18d7042b48c1..86553b463977 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-17.12.3.tar.xz 339628 BLAKE2B 318002f913bc16750f89c516a1f85e400caa7e11cd0e166fe5ba476927c49476700bc486ee3e20d38fe910ee109c95eb4cc0e54cbdef4bd80ccb0d3965177dab SHA512 e5e2afa569513d937c4f5f88909f158e7fbb067eed1a5a6ea7d6e91a784f75547e6f63e20a1d0bc9022229a695a010af43da6d7aa34b9f86cac57503aff436c0
-DIST libkdepim-18.04.1.tar.xz 341364 BLAKE2B 0553e6fb2c7515064846ceeb2b44f7a7edec256f1d90887112a595de2398299cc34328608459d90208649711a417acbfbcbbd1eceeecacd5e78899c33bdec96e SHA512 a68937fb1e0d561ac42d6f75b165d1d3cfe8f7282146ebbca7b407796c03e82509729729503c29b16bf1ba78951b18afede649d6f7964dc2a085f947da54e7f0
+DIST libkdepim-18.04.2.tar.xz 341376 BLAKE2B ddf21a7105ebc793d4a17677bbf7cccafbb850d98d3a829a7a74fea422f5020dede43e17c3346c39898c403fd181656e6e0de741df42e965e916e9d2051599b3 SHA512 3e802528a514d83745223a54f9ae506cc159962a1997283cf9b8ddf1b3b7f39dc8f0d6737517051599417f6b9564b7c497c0745f9e220d526072e16fe31374d8
 EBUILD libkdepim-17.12.3.ebuild 1065 BLAKE2B 81cf1c504eec9b5df7d634929733a64b718ac73fd33f9392e85302259581c4b764c593e03362517a1fba2097ed7a110e66469faa34e80011697b6591e9dfe73e SHA512 6407762a57ee1d30d4d853e93914c59c0c6781a49eba791386de97b1114cb1067b27e919d0cc57c506e35aefe3310b272b9148a0061fa10f0133b0c1965ede99
-EBUILD libkdepim-18.04.1.ebuild 1067 BLAKE2B 45a9feb8824992d1dc25deca216965436eebabde4155a4a97ed4136baeb523afabf5aa948c367129f871c6bd89791f3d363c78187184768e5e2b5aa87789d5b5 SHA512 f52b9a8645c67ecb349717833241c866bff426e52b14a618e6dbabcd5abce266d7f1b9478e729e128c8487fa9eb91359eec0691651b55311ace43bd14a98ed96
+EBUILD libkdepim-18.04.2.ebuild 1067 BLAKE2B 45a9feb8824992d1dc25deca216965436eebabde4155a4a97ed4136baeb523afabf5aa948c367129f871c6bd89791f3d363c78187184768e5e2b5aa87789d5b5 SHA512 f52b9a8645c67ecb349717833241c866bff426e52b14a618e6dbabcd5abce266d7f1b9478e729e128c8487fa9eb91359eec0691651b55311ace43bd14a98ed96
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-18.04.1.ebuild b/kde-apps/libkdepim/libkdepim-18.04.2.ebuild
index 416b05fa49e7..416b05fa49e7 100644
--- a/kde-apps/libkdepim/libkdepim-18.04.1.ebuild
+++ b/kde-apps/libkdepim/libkdepim-18.04.2.ebuild
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 6824f86499de..92746e3fabe7 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-17.12.3.tar.xz 205608 BLAKE2B 5f25f6b96ca0c892fd746ecb3acc1c0799f7fbbef0e33611d28c30a56129ef0f0ae0e94db9abde02152f8394779902951be0c008e41b4938bf84f6a45cfa2799 SHA512 658b3a37483405f70e619054f4e99ddf23e590d4ca02f081f7ba217c6366f1db69c4de3041264fd7aa2610c20f927f810c5904a4b70dc7740609e2bb71349c4a
-DIST libkeduvocdocument-18.04.1.tar.xz 210484 BLAKE2B eff11abf4f629b2740a367a051df56786087ec8b688e099e04b0d1afad5e5aeffa52bee6c5fffccd49b4caff581b828c48e91e2bcb89dd834ff70cb0401ec739 SHA512 e0b010f4b8d753667e5bc4a93a08023e4788f6aa7ca2f0c2f3cb49ec1208dfc204b46e31c2ad3aca48c36dabd669e072911c8263db61f55cdef74030b023df06
+DIST libkeduvocdocument-18.04.2.tar.xz 210508 BLAKE2B 26b30da44ba1ecd7c8d5e5b90f739b568c16cf86033da827132bd4a7c05e0d81dcf36ba54c783c3b917ebe1ff8fc31a3fabdd0ced3df6a10d071f39a35ed30ae SHA512 9035d7d867b18aa39148c416933399b47e086025e04e4de268ce92343006b1c19fddcb690dfc210936e969bd63b67a0dd683e9c5cfcdbd78be614e7f1a7eb8bc
 EBUILD libkeduvocdocument-17.12.3.ebuild 599 BLAKE2B 3b0c2e79516e1084349d8088ddc01bede11ef22d9b5e439b5c86e9cd7ba3b7800d1089aab8c9357f0db802ed8bf2f00b509190c226241867567f317bb085d0dd SHA512 5cf55d956909d21739659cc8f2951d93a665e87451e6a30775ccdaa1358cc0302b2c59c3efcfc3c3a27141b05de42dfea553908b68dd22309e11077edecdf26e
-EBUILD libkeduvocdocument-18.04.1.ebuild 601 BLAKE2B 74d7d9eeee13777e79a09e3f315acb4a9df6c126b7b39f3b1f483e4c61101622cdbc5cd73a5acd7b8161442a1a976913f8602c1eb252559eac09055ebf4b00b0 SHA512 cdf8a940df3c45216d0b61d17a419ba34790f61c43fae374e9271ffb938a7b2560303f214bd1ee62fdd8b0b019f8a90093fc0274cf489c18a6aea203a08dad45
+EBUILD libkeduvocdocument-18.04.2.ebuild 601 BLAKE2B 74d7d9eeee13777e79a09e3f315acb4a9df6c126b7b39f3b1f483e4c61101622cdbc5cd73a5acd7b8161442a1a976913f8602c1eb252559eac09055ebf4b00b0 SHA512 cdf8a940df3c45216d0b61d17a419ba34790f61c43fae374e9271ffb938a7b2560303f214bd1ee62fdd8b0b019f8a90093fc0274cf489c18a6aea203a08dad45
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.2.ebuild
index caf1c7213dda..caf1c7213dda 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.1.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.2.ebuild
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 3698036c52ca..2bb9cebee597 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-17.12.3.tar.xz 64296 BLAKE2B 048fc2190770694fe76d1f0add3586fe3a8db0bddfb86714d1955753c9243863350912dbab670433f32f46051154b5fa9c0090794e3c46b70128cc42b73b8f9c SHA512 a442ab46a7dbcc7fe39e4907851d272dc8645a2e18c7a04de9723f6456aa04131f90def553ad922f51773574be753f13a0107cc85f39d1b136d1c422d1791fe7
-DIST libkexiv2-18.04.1.tar.xz 64524 BLAKE2B f46e11121333fdc3d63308f5dd9554aa33bdd142a777c42ce923d5414b4a6b5a76691b72cfeff3fbd3b9ac2df53b9bdeaa9739100271dd45e44e210cb0536fa0 SHA512 d2cce4cf1e8de531c2dad980c8ae38c38764d8839be077fe5e459cf3c8f476a33a2dc7ed430785b763d0adc90071df6b5d511fa657897da015b583856b3ba5f7
+DIST libkexiv2-18.04.2.tar.xz 64532 BLAKE2B 1849a8e529a72536d9336baea6ef3f2629cdbf3663d480c81ec28cce7a2206a524c06e3a56b7392110e24d66bde40d65b89e6dcab2483ae7dce84c44358e8d86 SHA512 4fb6172c30a9bae0c2b5ea63f37139d76d7d689338f8bc653d2b9314c3f26fbabb1130ce9f6715a7da49b1980c65c19dadca8969d365d7f6dc6b2e526dde76e9
 EBUILD libkexiv2-17.12.3.ebuild 356 BLAKE2B aaca5ff52a0b87eb93324ef09899225558c281b241cf6b11aa08a2d16b57118dc3d94a45a6bb5b0475715e205994c646ad54eccb0aa5fcb8aa779ce803f86a26 SHA512 75fb0fa4f9658956aabe61b4b25a8d2cdcd175c9a42d1d33f1a997c142df35243c49f4a9f1e9e94f10db251da8fcecd8bc11fd85e54dd016f868e9b4e0046c8c
-EBUILD libkexiv2-18.04.1.ebuild 358 BLAKE2B ec256b620c25093496b98d7f3203e7247720a51b3fc6adbabd6670940553a4d810c4fde10b465c9a5c496cb54500178ed6ee5f32a7335bf9cf80cd3fdf6ae653 SHA512 208c67ba5fc4e5ed887725efd846994099f8f914f880865107261b81cc9edfb19f08820e61a2d8a2ad83bf02d4d27390428fd576b3deda3bd2538500f7d013ca
+EBUILD libkexiv2-18.04.2.ebuild 358 BLAKE2B ec256b620c25093496b98d7f3203e7247720a51b3fc6adbabd6670940553a4d810c4fde10b465c9a5c496cb54500178ed6ee5f32a7335bf9cf80cd3fdf6ae653 SHA512 208c67ba5fc4e5ed887725efd846994099f8f914f880865107261b81cc9edfb19f08820e61a2d8a2ad83bf02d4d27390428fd576b3deda3bd2538500f7d013ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-18.04.1.ebuild b/kde-apps/libkexiv2/libkexiv2-18.04.2.ebuild
index 8566db655bed..8566db655bed 100644
--- a/kde-apps/libkexiv2/libkexiv2-18.04.1.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-18.04.2.ebuild
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index dac26d3ac2f5..3b403c081659 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
 DIST libkgapi-17.12.3.tar.xz 175460 BLAKE2B debb06dd1619024ac29c9529b638f27896494049fe682b3740355a0e375bd0acf27d6e7e431b6fd241fa9285a6a1b1e076b51323aeef7d592e49c624a7e1fa7f SHA512 953ba55c5e645b38bde930a79daaf6129f7271fd2add45609975e51bfcaf516f87ea6f0e3b6811eb655aa0ae0a40d6408a29ed966acf22ee946f7a2b432079ef
-DIST libkgapi-18.04.1.tar.xz 176124 BLAKE2B 614e6d37019abd852d80a45e1028460ff4b36484f870d05e73ffd65812b77d01a48bba54ad534bad7ab90896c05cf0551c626ba067f5680565342d114e361121 SHA512 1cc20b8d9277c685593f66a1d3b68b569cb4d8e23cf86fe6fa18e17234496b432c08fb42928e5a2900f795bc60e4ba5acbb1160928df00db746bd8c056651252
+DIST libkgapi-18.04.2.tar.xz 176204 BLAKE2B 5db49cddde83ea618f90017980f084cbdd94659da117fa0e2bc195a40f8286f9d2e566d97ca4f777e3773274834c8caf09f64180e5cf764bc9d9e2be78037685 SHA512 47c161d6d8ba7bab7ae3571143ff27d797f53e6c6fd972a642397c8ef94d33e2e8834ca95d163656e06de150517ec62f04cbd436d9f2217fdac4886ac47264b3
 EBUILD libkgapi-17.12.3.ebuild 755 BLAKE2B 889eb43fff87414830fb430940bbe90357414780485b0c45d2b9ae39caf3dba7d862c06c45074873acfed8f4556561e17a9c7367bb5da72a9f6b53380abf17cd SHA512 0bbc2a10dba06b6a4d19f32121ef32026f90fd5a50638ef24563409103de7f90b62b639d536dcf6499619357265cd2b48afc1bc3af64b9cd6aef0e845db986a1
-EBUILD libkgapi-18.04.1.ebuild 757 BLAKE2B 551e4d7347e476635b2800f3c45f66271ec8a71bf719faec7434f1bc44335d4b6393c5ea0b2379d53ade5f7b03f868985cb1075efe36804d8077ff2faaff3d74 SHA512 5f93d6951e92d348785e2d2145d115c28e686981629806acece86fc3d04e452649cafb41eec14cfab9555265d90c5ebf43b379527a02ee3ee299c7a2ef12e741
+EBUILD libkgapi-18.04.2.ebuild 757 BLAKE2B 551e4d7347e476635b2800f3c45f66271ec8a71bf719faec7434f1bc44335d4b6393c5ea0b2379d53ade5f7b03f868985cb1075efe36804d8077ff2faaff3d74 SHA512 5f93d6951e92d348785e2d2145d115c28e686981629806acece86fc3d04e452649cafb41eec14cfab9555265d90c5ebf43b379527a02ee3ee299c7a2ef12e741
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-18.04.1.ebuild b/kde-apps/libkgapi/libkgapi-18.04.2.ebuild
index 9f3e37a77649..9f3e37a77649 100644
--- a/kde-apps/libkgapi/libkgapi-18.04.1.ebuild
+++ b/kde-apps/libkgapi/libkgapi-18.04.2.ebuild
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index cc51646c0285..c62ac6f8b0ac 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
 DIST libkgeomap-17.12.3.tar.xz 149616 BLAKE2B 105229bedee238e85d31e382fde4d3b86e44120f6caa4ed346ba2832f01a71cb9c072a7330679934399a492d4978a72e2cc027810d5f897e4f940d50c19581bd SHA512 8d2a504cd7abf4a70b3ef3d956504279b5e4e8c045771faaced9dec140252a37ccd6ec098e93572530196adb8503de597ba45b340f5a9e787706680e734bbe76
-DIST libkgeomap-18.04.1.tar.xz 150284 BLAKE2B ce3f25235fe6a7045bd61123994efd47ee2334084532a77783fe17d78761474c14c95e122a9dd1d0f48f3d0dfd90646a020c5f2c5c1cfef979d9f9c00106f3ff SHA512 76f523cfb3a16a6dabc46092ad2bf3b34eb79459a59b060713d3286fa2bae70f8d02ec3a52aa4ac9ea46c8e3e33b801f04ac13467a4e2d9ec8af632f5ed568c0
+DIST libkgeomap-18.04.2.tar.xz 150316 BLAKE2B 86b3637916030730c958d5eb80249721ebbdefd4974d1b0e6a6ed15b29b33c04b26e6f99bbbabb6f20fc8fa133843bd5221ec2d0e699acb48b6e50ec18416fdd SHA512 781463834221b1340e0e7093cbe67145f89314705448a0cc972b1f4dffe6ae149a5c599c6079ef9672c295add5f002fee2488a18239d2cc60a89f5a8dfa7b68e
 EBUILD libkgeomap-17.12.3.ebuild 774 BLAKE2B abed07263428ec8dc362d01d70e992a05d9fe46fcca1649c5f279f84aa78cdc8ab14188e6945179449e42c588766c323129f6854e4f1c7310f7858c62dd72c74 SHA512 98576e08eba5a37853eb64bc01c523f615eacbd2a3fa008592cdec9c94c19e06a6e0763b5d3203f490653678d5496407008d2134eb567e630d2cdaef5820f7bc
-EBUILD libkgeomap-18.04.1.ebuild 776 BLAKE2B 6701ec26ccb7b89b13e30655352621824984faf2e962c2fc8b44137db64c073aa9afc996b743c9cda4214a3eec774064fef547e688c5f6f48996656bcd47b376 SHA512 b2f15bcf21166f30c6f2261d8a4c500923ac47d6a9b33b0504dacc50911c3f6472b4342413735424bf2e66a3897dcbfa0b8c4c97cc2993ede7c841367f498f53
+EBUILD libkgeomap-18.04.2.ebuild 776 BLAKE2B 6701ec26ccb7b89b13e30655352621824984faf2e962c2fc8b44137db64c073aa9afc996b743c9cda4214a3eec774064fef547e688c5f6f48996656bcd47b376 SHA512 b2f15bcf21166f30c6f2261d8a4c500923ac47d6a9b33b0504dacc50911c3f6472b4342413735424bf2e66a3897dcbfa0b8c4c97cc2993ede7c841367f498f53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-18.04.1.ebuild b/kde-apps/libkgeomap/libkgeomap-18.04.2.ebuild
index 5bbaf24dbc0d..5bbaf24dbc0d 100644
--- a/kde-apps/libkgeomap/libkgeomap-18.04.1.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-18.04.2.ebuild
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 35d44715ae61..42836d0f7d81 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-17.12.3.tar.xz 103492 BLAKE2B c1833e63fad20cff775d9e047dff4df5ef98df111ddf1742180250248d86413769561f33cb5e32dbf228adc6990684b7376155b502b679a174990c820ae5b9b5 SHA512 de41304046874c95555d25828e4cc89be6391adcad657aa912d0eae62bed1fd52930e420aa24d53ab1fbe47677408416ccd86f3de027839a8cb44cd67a0352a7
-DIST libkipi-18.04.1.tar.xz 103640 BLAKE2B 7cb5f87ea59495517b689eda819603766d78e58d463cbb5d1bc7f30c2bb3be1dfaf5061ca57c0f42907d35c7eece6b766198663ee14be01900195dfe650af07d SHA512 b495ad4db5a29da2cf7d05d35e4abad2ded1b3b7497d601ab074b3604d14eef9c2c5e04ebcae0afcc53bdaa91f8522a4e4e601cfc2b298f49b6dfcf7d594704b
+DIST libkipi-18.04.2.tar.xz 103632 BLAKE2B 4decbe39d715fdf9f77a70f44a71d3d6b9b5fc1e11f4e7bbfaf9a6d3bdec1cb07b99d291c05f4d8c9dcc45bebfd992692240d17e2bec19bbfd42b46385cfce64 SHA512 10707833c9e6d7b9212a3c75b90b89bfbcc18c58470b1fc236cd168cb2738954d71abcec534482728e53676f30322a99d87deb89e4a375521bbd41243fb3a229
 EBUILD libkipi-17.12.3.ebuild 565 BLAKE2B acee4da04f26efc545d222e1c19f89798033e9490457538e053b9d2d454a705aca5afa45525db0fd9f46bd79a9f5a5acb3c2ab78f47e63904d3e26d94c345886 SHA512 cd81c2e285559058b0cf2f400cca5ce4ed7ee59f95d695ec92d378e5c1c10d69a25dcd3d23ade4f6ee77fb0c31ccfc92bc4ebe1fd401b7cd10fe0cef63995113
-EBUILD libkipi-18.04.1.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
+EBUILD libkipi-18.04.2.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-18.04.1.ebuild b/kde-apps/libkipi/libkipi-18.04.2.ebuild
index a0615d81f262..a0615d81f262 100644
--- a/kde-apps/libkipi/libkipi-18.04.1.ebuild
+++ b/kde-apps/libkipi/libkipi-18.04.2.ebuild
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 186bd88b5b74..7ac8c5aa57e1 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-17.12.3.tar.xz 314656 BLAKE2B 18556390e7dd405f274709df054881ea565973b1fa1b743312506716d9e88dad1680722df35bd0e5d4431394249d5b30caff27456eaa028c61160133374226a6 SHA512 0ed3fd2416b3838a295e877b7f4134f4e5e8abf67229b40a70fb1d2310115e1eb51ee990a3f8f80045169ceddbb5bc4df85b9b9109c3e2fcc9a3f8aaa93cbdb1
-DIST libkleo-18.04.1.tar.xz 318356 BLAKE2B 76172fa857b805eb9bb499a1ac47384182eec26a214497af530deec59173dbe17fb8cae55144adf71bcaf7d0796b495cdc038b1ccf56b30359e486ed0a17a886 SHA512 be6979ea01c74974919771634272921a5d213a19dbc4e8befdd9882f1086f74c8c36afed5505d629a51a6712ad7703a37479a2b01eac1aa9effce33862ee6b8d
+DIST libkleo-18.04.2.tar.xz 318620 BLAKE2B 24c4588a9a5fcbd45fb979f230edeb5fcfb19c0ec5ffb7b454bb16b5395c249cfc24afdc4d64beb25b4f3e1f759044011bb371e5f87b3b172f67fa02abe815ff SHA512 e0fe8b4727e4ed2342f047c0797b6bd14feb2b77f1202bd6cdc2275dbd471d2e7be3675a06f4db8c75c469c8b47cd3e4087dd617d7acdf3df17d948db5e69ef4
 EBUILD libkleo-17.12.3.ebuild 736 BLAKE2B 9f3303689ba756680690c9760ba4a506b84dd0e08b868130113a5618fabc45ec2648cf8a3c3081a75f124e76a727dd836b8813de6b0950cc5730252e2b62bf7b SHA512 d1cc5597530ec2f1dc6d986835a67aea42a02cf03e4c60d1c893edd4a68fc253c3a06e9bc155a66d8f2e33862ee4657be279a6560e8a2262364910497b3b2366
-EBUILD libkleo-18.04.1.ebuild 738 BLAKE2B d36242f36d93cf29b4c01df38a358e8c917193f3dc4c97f05cd5d9a1ef6b2df2ac4dbe4eb1f068e58533276f3bd3911c7d20870c73681bac774f1776c92a9fc6 SHA512 86a5a68c07859e2c58222fdf95ea538968ba78afea0a1660d0d3991b440a4bcdfa4789d7476fa6107f411d454a3f1212192f145e01921f3b0ffbf937964abc96
+EBUILD libkleo-18.04.2.ebuild 738 BLAKE2B d36242f36d93cf29b4c01df38a358e8c917193f3dc4c97f05cd5d9a1ef6b2df2ac4dbe4eb1f068e58533276f3bd3911c7d20870c73681bac774f1776c92a9fc6 SHA512 86a5a68c07859e2c58222fdf95ea538968ba78afea0a1660d0d3991b440a4bcdfa4789d7476fa6107f411d454a3f1212192f145e01921f3b0ffbf937964abc96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/libkleo-18.04.1.ebuild b/kde-apps/libkleo/libkleo-18.04.2.ebuild
index c7fd42409ee4..c7fd42409ee4 100644
--- a/kde-apps/libkleo/libkleo-18.04.1.ebuild
+++ b/kde-apps/libkleo/libkleo-18.04.2.ebuild
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index fb422b381541..239cb44a4e9a 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-17.12.3.tar.xz 1684924 BLAKE2B e6be87c90fd56848d7328564478f39451e9f90819ebf5e3df1555e7da2bbfb4417d6c08586b3e91ee4d76d585bff468d1609c9de2a6b0fa1bfe4a9cb6b65bda1 SHA512 ce98494e7f6169176f1ba6bd612adbe69ff725d20881f9ddea358bf31a52a15913653dc774c00ae7f805d6d4e0c563d77ebbc724d57425583d49bb093c94c83f
-DIST libkmahjongg-18.04.1.tar.xz 1683632 BLAKE2B ba2a2b0d20c34a8a2035d3d631539f2f38c16afa8cca538b5bf5f55c147989d95b2e41e8efce8bd60068a58f7422d1debe5cdfc60754e19a22fc64f9d79233bb SHA512 4926ef9b958fa3543dbf050534a0ed21fcfd25f16c9b7b15fa04b132fb0f7a4ee2ad2aec752b82ea6220a05cb545cfdb25512b11f1afeba31a77eefd8162220f
+DIST libkmahjongg-18.04.2.tar.xz 1684528 BLAKE2B 76bdb3fa4ac6aa9a747e238b7c73cb94d521dc5058b6e10c4971ced86afc80d1a8c2c41d02c2c1d277b7317f129469e4e54eab93008872ac4793c77a63300914 SHA512 9d0fdede5330aab8a0b8d0d9fcea63623a17e68effab45ea279b75de3bb8a10b00f35157e523680777495d243101a846a6b7a569ffb39bf3bb2ccfafbe6f8e88
 EBUILD libkmahjongg-17.12.3.ebuild 546 BLAKE2B e57ea6057346bd3e9da580787aa6687cc0a81c075412c2b10d5fb4e6eb06bb5e8158430e71325f0ded62c2bdc14088d6eb4d015e198b6a71e46edf5c9faa10e8 SHA512 d3ff2d9cba4ab97be8ef283af7b2e2c140d86a9a36091806d6723779b7200027e16fa5f9f7dd4a452f8484e800105af77c3cf1c5820d9bf570eb077b2253c9d1
-EBUILD libkmahjongg-18.04.1.ebuild 548 BLAKE2B 41d9fbafa13eac18be62234c1d05d2ade61a9acdbc27008f45d261edcc76a9d975d96b5d553dd778bd1befa69faf5affe0d2aeb9bc197915fd2b26f1dcef7767 SHA512 b4d012f712fb6ca3b46ea181c5191dda4c0dd6914a67e305d69d07146e8e121ff993d822f740ff44951dbfc0a5eb267a6849bf35227fc54aea9f9c7a9077b97a
+EBUILD libkmahjongg-18.04.2.ebuild 548 BLAKE2B 41d9fbafa13eac18be62234c1d05d2ade61a9acdbc27008f45d261edcc76a9d975d96b5d553dd778bd1befa69faf5affe0d2aeb9bc197915fd2b26f1dcef7767 SHA512 b4d012f712fb6ca3b46ea181c5191dda4c0dd6914a67e305d69d07146e8e121ff993d822f740ff44951dbfc0a5eb267a6849bf35227fc54aea9f9c7a9077b97a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.04.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.04.2.ebuild
index d8054495d76b..d8054495d76b 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-18.04.1.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-18.04.2.ebuild
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index c9fd1071351e..f5ac09367873 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-17.12.3.tar.xz 173804 BLAKE2B 51c3b5020ad614e947c69e6134954bfcb31a989970e8a5bb38781ba15c6c25b9c2eb05cb5026b7e22bb8481bf1a7a4c95498331aa4626ee6a86f154b13fb225e SHA512 d0a36eebf6bd64f69a49ff2908cb37672bd1ca8778e515e6638d199a626175026cbbca4ebbc7bd8739c683195e203162139833c24b1be4adcb019730d4ddc1ae
-DIST libkomparediff2-18.04.1.tar.xz 176804 BLAKE2B 9290f1b64f0a844010b0a46a3174643388220b9c78918d12d5c71b911dca835632b8ef65f6f685e6807fa79c719329d95a6801334f8cf81ee3ff5329875c31ca SHA512 c96c2e07b775f2e692d8b0099e0a41e3378b1f2fdee532bdda75e56ec2823bff6c56bfb227f9baf2656e86e3b1c653570eb61ee29661f9232ec2a5ac32650813
+DIST libkomparediff2-18.04.2.tar.xz 176844 BLAKE2B 4255340f17e30877b87e9bab4808b660a153aa3f33caf56015c0ea25cc7c1e5acb4d49eed0aad82c015bcdd22651ecbefe7715df8d3f6f2b2ca39d0c12fadb7a SHA512 30003c3598b9a6f6d2416a6df45145a91c75c32dfc6deaff4f0e4d5c4db4e4196cfde1076d24f89c0201e7d88028e4cf1b782db17c1f86efb96190ed4b5f3cc3
 EBUILD libkomparediff2-17.12.3.ebuild 530 BLAKE2B d8b0ea58712bf6f90fcf89a5cd3a6674c7cfe1639c7abfcf00159fdabdd868679baf6438d03fa6d24811dee5222c11bd195996744a1776e702f71ce2f417902c SHA512 eb1e7e4ffa3bb48746d6032f6b4d08756021609cee91f1fab8aeb81ac3a9135a7bfeea3980ee8bf930813af2e7b8ecb6b9734894b92e9bd000b22627acb43601
-EBUILD libkomparediff2-18.04.1.ebuild 532 BLAKE2B f258ad870b88155127698612a950ffb630846ab4734b29fc274ade0f1c83afff84b91037c0b70c012560f39434a09d2797a01a7d8e370fb93b20dca21e581435 SHA512 5033558286497a0f1036d3a1a28c5e363a949097c408a78353646bbdec694db715ac378c0b2165de3fed0a93d6675645838d8200bb91755f21784324c29ba5c3
+EBUILD libkomparediff2-18.04.2.ebuild 532 BLAKE2B f258ad870b88155127698612a950ffb630846ab4734b29fc274ade0f1c83afff84b91037c0b70c012560f39434a09d2797a01a7d8e370fb93b20dca21e581435 SHA512 5033558286497a0f1036d3a1a28c5e363a949097c408a78353646bbdec694db715ac378c0b2165de3fed0a93d6675645838d8200bb91755f21784324c29ba5c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.04.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.04.2.ebuild
index 78b78d3cb9ce..78b78d3cb9ce 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-18.04.1.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-18.04.2.ebuild
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index a8d86f97a9bb..ffe9b35988b6 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-17.12.3.tar.xz 136860 BLAKE2B 35b0a42949e007bdff85f9d6a68bbb52679e7d0307565f526354c21c0e027973ad5953aecb0dad31efc46927eef7b76dfb330083a9a3899a443d19c45868b1c0 SHA512 37c2e0dffb5cfa46254097668988da5691117b5fb4e93154e585025b031374577843d0c34d88515fc6068f80dd54b3865fb8e202b0b2e7c7a16729737dd79dd6
-DIST libksane-18.04.1.tar.xz 137396 BLAKE2B bebe97c190d50e4f648447e96b9de23e7bf9d755effdeba442441686b20c6d035c9ab223ad0f89b4dd599093c7875695ac9965061576e9a68bd1420aa3308b6f SHA512 5a6a18e6b892f0c5151573b7040771c43ecd7d512c33b8102857876ce37e1cbf87381a2803816bc0ba0de14424a0dded2ffcc8460df939f543df446954a87b79
+DIST libksane-18.04.2.tar.xz 137488 BLAKE2B 13c468680a7e6b5b73bb4f0f7c9d028fe5448608528d3a6f40cff2124aa5783d1a4cb1bc9470cff35cd2d2c11c32748885b2329745a816df417c985249940af9 SHA512 7c4fd37ab689d4fc03e8969689ba149399ed23d61bede19f8ad59971fdfa96f389727c7943f3fd24ccd8771f563768f0954e81f35da7fbf73a42e5e252e5786f
 EBUILD libksane-17.12.3.ebuild 573 BLAKE2B f1fd3da85259cb1b0e8d9dbeccb1af04aee1d6adb46bd8fc1be7c147b24a4707dd5b5766de6a0818fbeb4d0360d9466473074a854a342443607765ae3233dfb2 SHA512 28dffc81aa825234a80e0be688b8ad8ef18f708981682d4585a219267204ad847ab9d0949f66ffaec2cc9c18c155fb061a86e069a94d75b4bdc2a4ead8591ea5
-EBUILD libksane-18.04.1.ebuild 712 BLAKE2B 37d9440884a7c76bdd73cd78adf0acd1cde2e1e108c932b80fc85d5e11e15eb48c706f7a16570433fd0406dafe97175c7e0b34435e86b5616030ce109a7b218c SHA512 9836b0abeb36f46bf6e0deb8b0b24d1c8b8a60b642ec53cc7d303e7d70b5eabc1fd29d5034622c8800744b4a83d5d17595d1303fb9bc960a0de1e215f757a44e
+EBUILD libksane-18.04.2.ebuild 712 BLAKE2B 37d9440884a7c76bdd73cd78adf0acd1cde2e1e108c932b80fc85d5e11e15eb48c706f7a16570433fd0406dafe97175c7e0b34435e86b5616030ce109a7b218c SHA512 9836b0abeb36f46bf6e0deb8b0b24d1c8b8a60b642ec53cc7d303e7d70b5eabc1fd29d5034622c8800744b4a83d5d17595d1303fb9bc960a0de1e215f757a44e
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-18.04.1.ebuild b/kde-apps/libksane/libksane-18.04.2.ebuild
index 4e7403dbbfc9..4e7403dbbfc9 100644
--- a/kde-apps/libksane/libksane-18.04.1.ebuild
+++ b/kde-apps/libksane/libksane-18.04.2.ebuild
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 441baf052c10..2466ba2901f8 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-17.12.3.tar.xz 547852 BLAKE2B 28951b1af9ffec39ae86f718dc4dc860337a57f87a92716dc4db7ea1baac08d972210e655cdee1122fab7c0c30aa3ead36e2b4b52a47fb5d8a5cd4ea9fb9785a SHA512 d22dcb9294ff460511f64385988795d9ef16c3fd1766c9fa4e8696c5cde6250c5b499e135e605d97438aec91cbf831a9bed006aa008599d6d0eb1a30bfa5973c
-DIST libksieve-18.04.1.tar.xz 550244 BLAKE2B a2e747103cfc8b101c4e6adf7f2bd6b09e77430418a1bdd2e1d4b40c1948afc987ef6ac2bff6bd2c9ebc5541de84f48f93374e0a73d6b95a3537f5bd7964281c SHA512 9f5954942d0042abd0bdcad65e1f294a2eab79025f1be64087d87ae610d6b0f6f724f008ddf76948250c0b1fb67afbcf7dcaa2ec20f1ffe3c704c6a295222ac8
+DIST libksieve-18.04.2.tar.xz 550552 BLAKE2B 5ed96e4c2fd3f22519d49e6e857940fbfdd7fdabbcc85fe182b071a0ba938d6e38ab54da01311865197deba9511b4a6855ddab5f1121fc41ef38e2beed9a0afc SHA512 9433004829cc737bb07ae6a913c9023a667ff930a49a7bf55ed64f3559fbc648a7f3c96e257c98fd73e6968fc54c6026067f7fb413f47ecc5a825118589a6f52
 EBUILD libksieve-17.12.3.ebuild 1464 BLAKE2B 812989087ef5e61c75a37c632fb6a11439d3b444b8fb3403f12310cd46c872b3ba5f6295b340be65717fbe55e91bdcdcd9e63904b057b956935cffbfd63776eb SHA512 27610bb20a24088bf895302ae1e08280ff9ce2681170283247a2420f150ab019f51ad9c742d4391c300533d2bb764e3db6490d2374cf939ed1536a1b109bd049
-EBUILD libksieve-18.04.1.ebuild 1466 BLAKE2B 298be1cdb6d281c4e9c4f835b1e6bcaca255ba52975f908dd49bd6cb898b4912ad485f46577538a1aa8b91af377c3a648ae8da54f5c2cbde937cd3700620a09e SHA512 ecaa71d696c464badfd030cfc31caaad7fcc65b0bdb6381b40157daac905d106a7ceca13a76b90e5357b13c7fa246f3a1ba45cf73ef160409bdf219eaa23b203
+EBUILD libksieve-18.04.2.ebuild 1466 BLAKE2B 298be1cdb6d281c4e9c4f835b1e6bcaca255ba52975f908dd49bd6cb898b4912ad485f46577538a1aa8b91af377c3a648ae8da54f5c2cbde937cd3700620a09e SHA512 ecaa71d696c464badfd030cfc31caaad7fcc65b0bdb6381b40157daac905d106a7ceca13a76b90e5357b13c7fa246f3a1ba45cf73ef160409bdf219eaa23b203
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-18.04.1.ebuild b/kde-apps/libksieve/libksieve-18.04.2.ebuild
index aed045a2025a..aed045a2025a 100644
--- a/kde-apps/libksieve/libksieve-18.04.1.ebuild
+++ b/kde-apps/libksieve/libksieve-18.04.2.ebuild
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 409f632f9441..05c8e3cd75a3 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-17.12.3.tar.xz 299892 BLAKE2B 1dee6c9babf502d91540e7c0322dcd6c4d8ac6002887b677a8e2f549f9bc90a77c448f3f3cf2eca1beaaf38613f65dce70dd61765dbb2015569936957c30be06 SHA512 77e86827a0bfbe614cbe170b503c88b298f155a58ca381e914779a7ea2f82cc1fbd655735cc6586b07d8e0f73e3b38c7ff5b94cc4513fdb6de74a82940c468c4
-DIST ktnef-18.04.1.tar.xz 300376 BLAKE2B 0b4559403d855d74fd5b38ed7e1972736947a92fc27e2483abbc8f2a486f38fc84375ee77c3272d52e41c7dc7b1194af5b79cd85106790c882478ee980290365 SHA512 3ac215a3820d5a973d8c4c6ed1b8f3faa919fa2bd2fff424ca795f74a0b2f03fd3de7f28ed1da4382b0f572c99d1115cf2016cbbe44f361fd5164aa6b2bbb411
+DIST ktnef-18.04.2.tar.xz 300424 BLAKE2B 58c16a6d33d616d734d8f7a3700ab27d0ef62030998a038eb8f81fd9375e19eb11a88583c707962c70f0b18cb8b425a9206b717489d542fac65652263a7e7c7e SHA512 8c573bc0b653989f71cab33d9d3ca62204407a6d1b4a759cf9c334be772e530727f8b113f7af9b12377f3616acbcae7c9f59feece8256df2e90855da76cec622
 EBUILD libktnef-17.12.3.ebuild 451 BLAKE2B b0818698561127b95312c67c06dbf836f350874c1433518ede4a2f26eff96a781e1886fa14291c9e936cb95d8060563f0a30d675a7fd7fcc5db4c971a2e4abd9 SHA512 89d2e17a77c1be864b7dc9f5ae11578046754fd0550ac42668918f2838bcf29a98d7e7d9148cbc458048572b114b517d1cbe9d1adc06da168f7f4dcaaba63ebe
-EBUILD libktnef-18.04.1.ebuild 453 BLAKE2B 17349c18c88369bb03bae390beaa38601028d127362bbbdc4954a4271d3787cfd42f3d9e1a3c56d26cbe9099294428ab36ea140079200b1ec83895ab71fa6e22 SHA512 3ec1b90fb9d308800ceac53827ab9c5376ea0853b6bec07d0955f41515748562ea7383df8c320ae128e28f91e77bd2933fb5309c8863a2b384eae686acfcb86d
+EBUILD libktnef-18.04.2.ebuild 453 BLAKE2B 17349c18c88369bb03bae390beaa38601028d127362bbbdc4954a4271d3787cfd42f3d9e1a3c56d26cbe9099294428ab36ea140079200b1ec83895ab71fa6e22 SHA512 3ec1b90fb9d308800ceac53827ab9c5376ea0853b6bec07d0955f41515748562ea7383df8c320ae128e28f91e77bd2933fb5309c8863a2b384eae686acfcb86d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-18.04.1.ebuild b/kde-apps/libktnef/libktnef-18.04.2.ebuild
index bd9497e32c2e..bd9497e32c2e 100644
--- a/kde-apps/libktnef/libktnef-18.04.1.ebuild
+++ b/kde-apps/libktnef/libktnef-18.04.2.ebuild
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 4c1a6640709a..21005b342d4c 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
 DIST lokalize-17.12.3.tar.xz 2219220 BLAKE2B 1f3d0617e7a504f643a52cecf1edbd50c62d4fb789914308fef9579649f0c272710ea0ee3682bceb6280d264481c228a52809bfb2623e0957ec4b1fea8256352 SHA512 02249c1aa91309bd7269eac593282d4b52ded71c7fdf251f01d63a56d7d0201b0def95b701cb5ff149468fc22edbe4022d1633d09adbbfdc8a8038460f3eed71
-DIST lokalize-18.04.1.tar.xz 2861644 BLAKE2B da0dab30a16a55f04a9a17178d623fcf3413d1d8538129af9fca2a8a10c3f8a3c16b25a49289e4ce598817d9ee7144ca34f5776c99e97a86d03ac417ed158a0e SHA512 df8cd6dfc67313bed4b9f776e738ad52f114dbc3fcb3cc926db98675176d0f10e4d8ba052bdf563fe09c4104d30aeead4d83ef73adbdf50ce252cb3de1c7fea0
+DIST lokalize-18.04.2.tar.xz 2863048 BLAKE2B 52f26ed536625afc7d585094475fd0a2496110a698a5b02fa0eceee8e9ca72c8a1e2ea232d63edcf4919733972ad5f76cddd1ad6ecf1e151677896f9f97dae7d SHA512 571e9124d326f3745786953e89ab97f0f31b0746ad9ba86800067211ff5d1908d62309a1115d4215ca66680629a2d298daab04611220fd4ae91540eb6846932e
 EBUILD lokalize-17.12.3.ebuild 1551 BLAKE2B 01b4ac0e17aaa796ef8db9fa0dd1907eef6f3d95bbb893b47d6f1ac5458bbcc568c9b635c70f02e6f628b5c1f14e0405608da680fdcf00ff0217dab0ed294b97 SHA512 1eb3598f2a061cbe443a386d611083f24fde12fbafa4e18c08823eb5f21d02b5210a2688b821658a0c414768b546becd461c4bb091f3b4b703a887e2bfd12607
-EBUILD lokalize-18.04.1.ebuild 1553 BLAKE2B bed03e4cfaac8c73b72d1e32b0a5eaa85dff568173e3f062c55947b8678b5b884866e5689ef88162cd118f6f968dac1093d0718bf4d97f886e392244625bfc97 SHA512 f76d5d1d99a6ef89747ba72601bdb9694cec495f5409801d61c5d0d7029c188a9c0a8982d49550fcf16e2c8c01f63a938bb7335435e36c7d6da180f71b5f7ee0
+EBUILD lokalize-18.04.2.ebuild 1553 BLAKE2B bed03e4cfaac8c73b72d1e32b0a5eaa85dff568173e3f062c55947b8678b5b884866e5689ef88162cd118f6f968dac1093d0718bf4d97f886e392244625bfc97 SHA512 f76d5d1d99a6ef89747ba72601bdb9694cec495f5409801d61c5d0d7029c188a9c0a8982d49550fcf16e2c8c01f63a938bb7335435e36c7d6da180f71b5f7ee0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-18.04.1.ebuild b/kde-apps/lokalize/lokalize-18.04.2.ebuild
index 3bd5fd7b1459..3bd5fd7b1459 100644
--- a/kde-apps/lokalize/lokalize-18.04.1.ebuild
+++ b/kde-apps/lokalize/lokalize-18.04.2.ebuild
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 0136fbf215f7..2eaa30bac950 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
 DIST lskat-17.12.3.tar.xz 1216536 BLAKE2B 74fa8783569827a65a4554cb77a14fd61fb966c766b170f441d3c6655036ba0c582ecdbb06bd23a889ea759ccc34cdd80d6050fa8874d0e4cd8d22342c7f113d SHA512 519f68ab80771cd0704eb7c0afb3ef0c8b0f8e11d7cefed7e30a966dd0445adce9f6fe3a539be126640f70fd827f3f59a876d780a887e1086132ef6fdb8948b8
-DIST lskat-18.04.1.tar.xz 1217908 BLAKE2B 88dad06b023d101aa9b9d7322b3d2b0e5f94669dd86f6de71bddf6358b6af2f14e2178e3191f3dfeef46d5b5e59426ec9ed5b456455d9b9acc8c03105c1c910a SHA512 522b1e09b19618e238ac19552094be463e148b543b2500e799d5047bb649d30ef898056c9d1bf10108b490fc723a2d269227ee1747a4de5c9b8cd8107f51932a
+DIST lskat-18.04.2.tar.xz 1217768 BLAKE2B 752c52b702025840f32d3c95017c67dc7a161b391fcd879718b3ac77f1680acdb3f6654be8961cb123817bb809336c17c2cfef8df842446e6e61828d8a2cb00d SHA512 be3fca7c3420e20babdd4cc2d9ab52a3e40c18dcd2d0614cf689ca38f71f9cb7a0593bbd0a7a03e2c875062748e531eba0baf3aa12f09e780367fdf2e1a0a9ee
 EBUILD lskat-17.12.3.ebuild 729 BLAKE2B e827015aceb86093a7a185aadc8532565d70a2d2bf3a1215e5604d2e1b2e29a13127866b96d28a9aeda7b0ace684b1d4cd1a934b6e40d863ff67a0712a01014e SHA512 0169e697827de480129f379829dbf56917c52ee09c8d09aa1a85eee10920a50ff3ab9fcae502acfefbaa9c897dea66171e6a328a913e71d69a13c8b4fe050f2c
-EBUILD lskat-18.04.1.ebuild 731 BLAKE2B 139bdfd056ac84ecc4a9dc8ea79782c99fed057d4ea09d076bdb5b158dd66bef54067475ff1deaa9a8f780be92964c7f67055c45672ee45acf79a08ca7d72b3e SHA512 478a0dfc87d26092cd71e3dfa43da39bd1cccbeba41de83687dbf95f8a3f3f36856ca5ca8455b50cb04c0045c2016b7e1245ab983bd82f17849095425b1154d5
+EBUILD lskat-18.04.2.ebuild 731 BLAKE2B 139bdfd056ac84ecc4a9dc8ea79782c99fed057d4ea09d076bdb5b158dd66bef54067475ff1deaa9a8f780be92964c7f67055c45672ee45acf79a08ca7d72b3e SHA512 478a0dfc87d26092cd71e3dfa43da39bd1cccbeba41de83687dbf95f8a3f3f36856ca5ca8455b50cb04c0045c2016b7e1245ab983bd82f17849095425b1154d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-18.04.1.ebuild b/kde-apps/lskat/lskat-18.04.2.ebuild
index ca1d75ae4777..ca1d75ae4777 100644
--- a/kde-apps/lskat/lskat-18.04.1.ebuild
+++ b/kde-apps/lskat/lskat-18.04.2.ebuild
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 0c479cbc504f..4fadcaab0d07 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-17.12.3.tar.xz 683392 BLAKE2B bb4796e8ce8fee59e3b4849c2c7c386ada08f77e2c2c15b9425f29c32efc3c65bc4bf9f667fd4e465e7c5f218ea5830ac8a0416a956606c5c12f6918ee8e3b8e SHA512 49c6ad5844cf5f4f884b7cdbbb855973bf8d0e5b9630700e926b75024b6aab98f5f7e05dec6dace3648181f2c57e07344245b2d49c3f293e378310f4b647450b
-DIST mailcommon-18.04.1.tar.xz 691992 BLAKE2B 1237499c8e064c885149080e68c2f706163af098dec4940814aeb9ad1590a42a8d3f46982e6453d64b2f604051beb3805ed6ac5646315db0e6d7072fb71d1819 SHA512 07552e0bbdb5fe8ea95af0ad1f846999d910b34e777ad44f0449728190d508d348c5c9a1a9342f0a9c3a7a948467f2b389cb4e113855a23ddbb50c804db77296
+DIST mailcommon-18.04.2.tar.xz 691940 BLAKE2B 99350176c7c1474b3727dabdb4a2f1b3843739655da50224264ed01d26a73aa0124d9f891d8b55d380ff4ab6893d659e571b4e3f0ad77c98796dbc5fdc8092c3 SHA512 87a2c678acfe5a16206f8e841b66d5fa467fa760865c669aefb0f580e4324ac5ef80bb75808d88557162c13e62a43ca45063fa1d40b2dbeb4087cbe2b6be692b
 EBUILD mailcommon-17.12.3.ebuild 1439 BLAKE2B 6afe7626b6cf19240d45ffc4057e3be1eb77b2b15cdba71255b01de6a9c36dcf0f805efde511afa09c38ba1b6562c52f263b12883be15a3fb932608984cd03ab SHA512 9f535e7696aaaf7395ddad6927bfe3e6ebddeceeb6ddbbe37511427a722179850d251646959958e6682055b62f9760d1f803e3bfeeb67a2da0c200b970907667
-EBUILD mailcommon-18.04.1.ebuild 1441 BLAKE2B 49ab94d207419115653979f9992bbb77c37996f6270285c66d1d297b6f01ecf56d4b0d85579b50cf9bccd3010a598fd7452361bf980b8d2ec79732c44ed9d8b2 SHA512 7f8aadc824fcc06f54e90a4cf16e99d732827bc8a3dc00afdc3b828b65f2a31fa9b67882bd9a643c9651b96402a4ad55b73bc2525c94998c1034d962d1c210aa
+EBUILD mailcommon-18.04.2.ebuild 1441 BLAKE2B 49ab94d207419115653979f9992bbb77c37996f6270285c66d1d297b6f01ecf56d4b0d85579b50cf9bccd3010a598fd7452361bf980b8d2ec79732c44ed9d8b2 SHA512 7f8aadc824fcc06f54e90a4cf16e99d732827bc8a3dc00afdc3b828b65f2a31fa9b67882bd9a643c9651b96402a4ad55b73bc2525c94998c1034d962d1c210aa
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-18.04.1.ebuild b/kde-apps/mailcommon/mailcommon-18.04.2.ebuild
index 22fe87d28fff..22fe87d28fff 100644
--- a/kde-apps/mailcommon/mailcommon-18.04.1.ebuild
+++ b/kde-apps/mailcommon/mailcommon-18.04.2.ebuild
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index d8a5b9f57cef..0367bba03673 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-17.12.3.tar.xz 541040 BLAKE2B 42152e6205c7cd0320c6475f731af1cb1877ebbaf7b1b77fd3c84d2474ef7fd9b815e3640fbf962d283627b84cd5096a200e030ff8f22ad4052a8df27fe977ac SHA512 a3485867ef68499660c6b9b078a75892df0fb880a050699543fedfd32992deda641d1477c3f30036d59cdaf926a83ff868cec700a394e595216d0094870f8ded
-DIST mailimporter-18.04.1.tar.xz 541300 BLAKE2B 68dd8db9fcf9050052c734c57d67b46812948d011c0e20d100295b48adc04d4c53e735a866b43e61f3021d37b1e31cc43105ca4a916a90ce17de2f1b8ca09c4d SHA512 28618979eee4fe71125be15cb7b89ed886c3269f7740e1ed29964a20f317f69bad11e78b3336fdc0552182c3e00426f756d7cf5d5cef7273782810693857ebb3
+DIST mailimporter-18.04.2.tar.xz 541460 BLAKE2B 4c730195db067124253eb3bae5ebcdd6935ac4554f4d7892d1204622913332d65c8994b7f8c72d0feb9b3dea0c240d5a16e4cbde6ef5f8a59c792edf71dff617 SHA512 6ae47db19d2c3b9d5952609b7497d0adfd28a0462a3cf46cbd85201a3ff96c699d2e7d7d5908fb242bd5a11132bc3fc384611aeb8b5b6741381e174283b28c81
 EBUILD mailimporter-17.12.3.ebuild 652 BLAKE2B aaeaf5851aff5c9785c614f4229218af0597bae46c8ff3071037df37037e9d494981209f7b2ce9a8ebc95260e40097860ffba31f915f0d5edfe82a25a31e57ea SHA512 6f7383f6b8195bd05773c49ebcaf97d6dafcb3241694dc5416b294e5e6659b03b437ed39688c8015ad7766fa85e97a1b4201d6229644c89c17d572be46c62861
-EBUILD mailimporter-18.04.1.ebuild 654 BLAKE2B 9ef5a0b869e5b13e9ea6e51df8fc22effc796235ada13277a9ed4b81d184646b73be1ccdcefe705ee34f78df15ea6c90220dd201c20cbd7608fe80049230f877 SHA512 7b4da4ee77779f525a895ff3752afb86e15b6eb84a79b7b62dd0c0f9ffd72b71a9877a952329b6a4de359630a2011bb5b821fda30a03396cd574ed28749982aa
+EBUILD mailimporter-18.04.2.ebuild 654 BLAKE2B 9ef5a0b869e5b13e9ea6e51df8fc22effc796235ada13277a9ed4b81d184646b73be1ccdcefe705ee34f78df15ea6c90220dd201c20cbd7608fe80049230f877 SHA512 7b4da4ee77779f525a895ff3752afb86e15b6eb84a79b7b62dd0c0f9ffd72b71a9877a952329b6a4de359630a2011bb5b821fda30a03396cd574ed28749982aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-18.04.1.ebuild b/kde-apps/mailimporter/mailimporter-18.04.2.ebuild
index 948285cee867..948285cee867 100644
--- a/kde-apps/mailimporter/mailimporter-18.04.1.ebuild
+++ b/kde-apps/mailimporter/mailimporter-18.04.2.ebuild
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index e102b66962fc..8842ce589349 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-17.12.3.tar.xz 52353704 BLAKE2B 529d889631fc5c2409d72bc7b1626673957db3db1b8e40478668596a3993dea67fd9f6d341e62ad426d1cc8e4295726471247bb9c2dc7fdf9439c4304f6bcff8 SHA512 a370f6bbce35ad4d4eb5a6d372939691322c81b7108fe64468ac3a2d491d0eb71e6c3135106e33d59115008a527aba60d2bd3508df721b5728286f526f199064
-DIST marble-18.04.1.tar.xz 52439528 BLAKE2B 645caa2faeab9f2d4f1cc4b64a76dabc2c62d8a6266a1f6b4aec92878b96cd4da9a922ee014775f07ed82e28103265405b54c85c5a05df7a52f475838c7b2bb0 SHA512 e5839042c80b6cd854a5c350ba87f3fc3193eda52c36caf5effe013b702f524facddba29a236883e4f12c889c01d28c270fd9d9ce424bfd7076dcbbf58e53332
+DIST marble-18.04.2.tar.xz 52434940 BLAKE2B dd2881da211d4111ecbc0950b9bc7220dc25da5f8a94c2bac42b92230498885526882df8dc2bc93cedab4420351ca2a73f295a142ec7d02db68d1ef28235b2fb SHA512 617941338c25b73e33fd9fdb943078544851d0e214c5cb4da6d32ba34630c0eb96165e37f3b14fe163be31720572411feba6bf6a6f24b15b469707e361b5d435
 EBUILD marble-17.12.3.ebuild 2246 BLAKE2B 3419d417193227f60d58e636982adef8c5cf42dc0ca0f136a3f349dc4b5f1211709f32eedd042faca10d333e905e879b6bfcaa562f2b97626711aced0007ecf3 SHA512 51b20869705dfcfc4a304da541c3a79eb7e3ae354f103080aded77d0929ca4e8541e3441c85f904be32409438411c4c532ef85ec6088bc3d49672851709a9644
-EBUILD marble-18.04.1.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60
+EBUILD marble-18.04.2.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60
 MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
diff --git a/kde-apps/marble/marble-18.04.1.ebuild b/kde-apps/marble/marble-18.04.2.ebuild
index 428bed2765e2..428bed2765e2 100644
--- a/kde-apps/marble/marble-18.04.1.ebuild
+++ b/kde-apps/marble/marble-18.04.2.ebuild
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 3dc5353b1f50..6092a01404da 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-17.12.3.tar.xz 32868 BLAKE2B 12d8d215e019a65e4f81239cda524cde0ea16dea78ccdde7fc5c7cef12234b2771ad140e29ba9d96b277188dc43f2faebb98f7ebffe9aa12b92ef5d69f777d0a SHA512 018aaa5f533dd70c1e11b164e9ea948dd04b31d6747cd879ee082fe0544b32a5d5223e9708d489c96b1b95f662d549a207c336555a6e16c28cd57345d8d50bcb
-DIST mbox-importer-18.04.1.tar.xz 33608 BLAKE2B 9e58a7b77051bd4bd552c793e3f79568be8af7bcca313c6456ed1bb08ef4307411b16a1bb5c72ccb02bb8451e79adf5e51335e81e6581e94573e9f6bf232a433 SHA512 29bd096e2b50c849f0b94754ce283aae5b80abd17179afc6c1c013e669eddaee5e4fbf2bae9304cf0ccec1dd2551e367242847fd14e5b79c265ba5064742f3e9
+DIST mbox-importer-18.04.2.tar.xz 33700 BLAKE2B 6172a52b9c7febb3b5a4c171b5b92dc3f9156b22c58fceeaf879d559c3b82f3bb1e37dfcb2ea3800156b045985f24c17318f63fcf208de04f4a9c8f01bc0d273 SHA512 dc96c38997d071f33d8cbdf624f010dffd03a56533744f31c130b216b83c1bb69f9adb68abc2925fad89cee02fdd04429868a2b064e7e2c65ae2c40c0c1f59c9
 EBUILD mbox-importer-17.12.3.ebuild 825 BLAKE2B 11afb1b2de82dd61e9d11e97ce26ae6bb992e7258a35e54a81af71a0007a377f31e0c26ca4bba99cbba271788b817f911fa4b49806d189527343aaa0e545c592 SHA512 bcef7a6cf789a20310b5de726944689465a4bcc1263b0f65f4c3f8463834ac1e9fee9024745ed1b0a364b05a2edf42c517f687681f6158bcc3a1ad36cc71a8ff
-EBUILD mbox-importer-18.04.1.ebuild 827 BLAKE2B 9a2ece799fd5f1526a24c0501844b31e3933000040e426f1ef466e5f3b4a89384e2ff75ae749a1dae030d9c388ed5c2911f8179474791112e56a8a51aae55314 SHA512 c18b40ec4b237a9acf9f6d84f8bd65fe1fb65a23f3996a45af1399b7378352fcf4bb4cc387fa8b5e4e1e055e73eb0edbc69bc566ea0f6bbc2a9524113207a8c3
+EBUILD mbox-importer-18.04.2.ebuild 827 BLAKE2B 9a2ece799fd5f1526a24c0501844b31e3933000040e426f1ef466e5f3b4a89384e2ff75ae749a1dae030d9c388ed5c2911f8179474791112e56a8a51aae55314 SHA512 c18b40ec4b237a9acf9f6d84f8bd65fe1fb65a23f3996a45af1399b7378352fcf4bb4cc387fa8b5e4e1e055e73eb0edbc69bc566ea0f6bbc2a9524113207a8c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-18.04.1.ebuild b/kde-apps/mbox-importer/mbox-importer-18.04.2.ebuild
index 7e0ab68ff2a9..7e0ab68ff2a9 100644
--- a/kde-apps/mbox-importer/mbox-importer-18.04.1.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-18.04.2.ebuild
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index a93eb0e7b8d9..3a144d5c5ec7 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
 DIST messagelib-17.12.3.tar.xz 10462804 BLAKE2B 4fb020e5f351a14fa73cd8a648440bb2da8b9658fafd36fa58b7499726bce480e5d452c64a3ca5cc2e8b99596088b858601dc97311bd3ab6b8fceaf0ac2738f3 SHA512 db83fe6de67a4fb2a805d8aaec8de6455509868e1bf664bcd5a3f6d25ec100dce71ca517d4de11c9bacaf194c2dcab78b83c15ef0d0eb82a789ad1af5a352412
-DIST messagelib-18.04.1.tar.xz 10469836 BLAKE2B d1ca1a54292bf897677a2c5f82ff98ccaa0c3a1c05d8ba14c698723edc341a32aea94e625267083879681e9a17e9cdff98358387da81dc8143b1ee6a3508a5d0 SHA512 ffe4b9f90f0fc2efae945fc86b302a4e390bff7583c10149f2cb20f71f8b4d7ff32da8974065edad54814ccdb323f91127f15e558130b7a2b721dec254a2b205
+DIST messagelib-18.04.2.tar.xz 10470968 BLAKE2B 70f108b8578f77a146d02990ab4162c0b469e0b61f5206d93708cc1fbc97ccde796bd007015dc59a018728185512475e0bcc93fd85e60e07d2faf765ed35be30 SHA512 72bf59c87b463663df69a0b42ad35f6153f304e09d034a7f2eac9df31200a0700576cb2c58df239a12967861694938e66e6c9a9f08fa8d2ff9bc3021dfe23a63
 EBUILD messagelib-17.12.3.ebuild 1937 BLAKE2B 2237b3b9c9742e7db917847cb813d8a84ee64de76870e5a3c5cb2400b2faf67fc63e5c08ab68d436b02a4e0500bd847c32e915eb01c1c17914a32907505ea6d4 SHA512 29b95b086b5e8b2a4edb98b10ca1b7b7d88afa8f557496c7a88557631b6fa47c05085e7e7a234a6fc8df2319eb8aba4e9aaaaa405530925564311f54038ddb77
-EBUILD messagelib-18.04.1.ebuild 1939 BLAKE2B 5a13ce58b75c27ca9a4f3410bdb2e6535db06202e33feec882dcf0d6c827f916bfcf900a92b15b4bf406bae13376de0ae77ac3711a085b10c6796ca826c4c878 SHA512 692d1b92a062b6a67512c415fd7341070c1aa44335bb3e637ec3e73f4ea5836e891428ba5f80e5cc9ea2e1601ee12eda73f243eb5d798d6d458882c677c570cf
+EBUILD messagelib-18.04.2.ebuild 1939 BLAKE2B 5a13ce58b75c27ca9a4f3410bdb2e6535db06202e33feec882dcf0d6c827f916bfcf900a92b15b4bf406bae13376de0ae77ac3711a085b10c6796ca826c4c878 SHA512 692d1b92a062b6a67512c415fd7341070c1aa44335bb3e637ec3e73f4ea5836e891428ba5f80e5cc9ea2e1601ee12eda73f243eb5d798d6d458882c677c570cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-18.04.1.ebuild b/kde-apps/messagelib/messagelib-18.04.2.ebuild
index 2c9ae95e4387..2c9ae95e4387 100644
--- a/kde-apps/messagelib/messagelib-18.04.1.ebuild
+++ b/kde-apps/messagelib/messagelib-18.04.2.ebuild
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 236a1b1896d7..aaef2415679c 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-17.12.3.tar.xz 27860148 BLAKE2B 20d897fbebe844fd77da3c1cffd94c021999263b434507a2bc73ce5c2a7e3d0823c2f724a6d51450fbfbc450a72a66cc4823d6c350090372280b51bc5f3458c9 SHA512 ddba91a1d8165412099bd60cc06e57db70b3aa6997bb93c9e3c46ea933df728836cd59f24a2b7ff1e1adc71e802a0c237ea90a72012bbee79c6601f73e650dbd
-DIST minuet-18.04.1.tar.xz 27850616 BLAKE2B 69ebd5d91ce423bcb34c260b9430f6e330db1123a2c14813f3b232584c8fc5fdf5093f3c775d18341fdda8e0910108ed20bcc424b13300c8ea4a5939f6612c43 SHA512 03d5586d4c48168a64376c593d4d154c536bbe4215f912009a881e76bf472892036ff940fdc19b558074067c7e75ab0571eead8f6d957004e06cc252515dea4b
+DIST minuet-18.04.2.tar.xz 27843668 BLAKE2B 77a62fea779228df9bc0c7bb712b10dae8756971d6526891931311ad704efb8ad9dcf0e25ba19ce24e542ca3bf6878922cff6409b435e3485f8804446df8ec22 SHA512 44fe5c9f23114cd0295602dface7fd45e3920c7ad66a96594bf25d39825e4de3ab395f67479f55ae7c793e33ab5d5f100457d5ca9451da37a0dcfd226fffe27f
 EBUILD minuet-17.12.3.ebuild 586 BLAKE2B e62f58a2382c54cf41dbf6f476c22f6e51ad0d93c42fce1718bcccfd91d0a6825b988d2b906d6865d8750b748c1e0005d58a7e60a8debbf809f3db8cf8e1544b SHA512 45d18600f13c35676b18976ebed1cc6d6f447730ac50e80b9b0d4de05b56f31eef1433c8b947999d8d7da724afd4b78bc9481a32d7f254ed65f3863d1bbee730
-EBUILD minuet-18.04.1.ebuild 588 BLAKE2B e9be0a1f2b0971d041ec3cb99dbf250ecd862421adef49d028443d1a94b8861f137683a791b0cae25d194bd9c61414efe428821a5a63e34a15cb4c402173c7af SHA512 9315c52f7b0bba2f2764cffeca373edf4ab5d709b4f5e6238a910f5019f809c430535452cffed512ee0a70bf605773a91f9abc08ee20a74c5bedf0e87fdc63bb
+EBUILD minuet-18.04.2.ebuild 588 BLAKE2B e9be0a1f2b0971d041ec3cb99dbf250ecd862421adef49d028443d1a94b8861f137683a791b0cae25d194bd9c61414efe428821a5a63e34a15cb4c402173c7af SHA512 9315c52f7b0bba2f2764cffeca373edf4ab5d709b4f5e6238a910f5019f809c430535452cffed512ee0a70bf605773a91f9abc08ee20a74c5bedf0e87fdc63bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-18.04.1.ebuild b/kde-apps/minuet/minuet-18.04.2.ebuild
index c0bd89a53dfc..c0bd89a53dfc 100644
--- a/kde-apps/minuet/minuet-18.04.1.ebuild
+++ b/kde-apps/minuet/minuet-18.04.2.ebuild
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 261c2beab477..f636356da606 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,6 +1,6 @@
 AUX okular-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 DIST okular-17.12.3.tar.xz 5737804 BLAKE2B 959f83cbf7713333319400abefe70390b75bd1fdf5d907c362e4e36d65fba3115d6c4091ae04c2058e557a6df1a8587cb5adbfd345cc4702439db2d837d4ed2d SHA512 803e69a918a385798905eeda15afa817ff145406947abc793c62c26879ed9b98ca601adedeb5133972be50e679cc31cc2ad8ccc97c084c64a3cad791a778d361
-DIST okular-18.04.1.tar.xz 5784656 BLAKE2B 9a3570bec7ca7cd20d8474d9d1b2c00c95681dd1ca677f70313cb71a4294cae5d3e2db970112859a5dbba79df610ba8d47e0e677096c36a0fc0d65f6b5f5f172 SHA512 279b00539a2ea65e9d93eb6b73b3bd68e3468758c35120f4e733708d6b9a36eb5653af1d23cbb4d4ccf36a1bc143fa9e6d385d813c48292103056039addf3e26
+DIST okular-18.04.2.tar.xz 5786132 BLAKE2B 18132088abc4bdabdb66dacdf9fef6b3870ebfee54b95ee4b3e7da29d54cf2e86af705c56ea3ffc9609601ae4b1f81bdcdb095cfac7e60e3f5af66af73a372d6 SHA512 486df74c7791a87a9e38601f4d7039e59cafef3a474d67d58592da81a1a61b116063b0868f4aa75a15eefa79568ae5f609ce0e65f4e14edd012d9e2622ef1935
 EBUILD okular-17.12.3.ebuild 2898 BLAKE2B 20461830de043ba6ebae2e954b183d8bafc534e70198d184246bff9154313147b283259d23321569ee6276ad13ddb0d7b064eaab0b5f636c8570b72d5fd9c001 SHA512 85d87372e18d51bbec5b08c4e7fe4dce0eb120a721f47b69c7f53252e4884193a16b4711133af0316417e4c9c1e546a505cd6cd4d1ff7dc7b21a0c4db31a8e9f
-EBUILD okular-18.04.1.ebuild 2930 BLAKE2B 8407385022004fed7420d19c0d4bfa5eebb810c52a3dc49364afab64a5e50d294f3fd217b33faddc922c53bd9c7266398172f4b480e32171bd10658d0b61fa4d SHA512 09380bae4cd247fcb9d95e1c6edf0c9acb8e0c96af227eb4bc97f391c5eb18ccf851a7c38c636ee8f368da51e587c7d249e1e5647b2cf5e1144bb6899aba8e44
+EBUILD okular-18.04.2.ebuild 2930 BLAKE2B 8407385022004fed7420d19c0d4bfa5eebb810c52a3dc49364afab64a5e50d294f3fd217b33faddc922c53bd9c7266398172f4b480e32171bd10658d0b61fa4d SHA512 09380bae4cd247fcb9d95e1c6edf0c9acb8e0c96af227eb4bc97f391c5eb18ccf851a7c38c636ee8f368da51e587c7d249e1e5647b2cf5e1144bb6899aba8e44
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-18.04.1.ebuild b/kde-apps/okular/okular-18.04.2.ebuild
index 94de9fbb3559..94de9fbb3559 100644
--- a/kde-apps/okular/okular-18.04.1.ebuild
+++ b/kde-apps/okular/okular-18.04.2.ebuild
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 35e1e1ac4a43..c926088bc4c9 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-17.12.3.tar.xz 2061492 BLAKE2B 677f29453a22a4f48b842f4c8d368251344cf9cd2cfcfee0b3e2fd6aed315a2879e6a6c86003debf2ffbcf083a9b1164171fafc14691df953f909185c74a8edd SHA512 7c43d9854fa8d27290b97d8fbb56594ca45593d80ac029652ed355c0bd59eac3c73d0b226a91801a7dd62c76c41a53783dbfbc62238dc26cd6bf3aad3aadec58
-DIST palapeli-18.04.1.tar.xz 2061720 BLAKE2B e0e8d724a79e38afdbeee7db4f059040a14a7a429af278ef37d33580ef0a2735a2d894461885fa38ba4498d9f48db76b44f1f422fe79f23c4691a9f5bd4d475f SHA512 9facd3f93bdcdb5ee33e9f18a24a059a780311ce7297dbbb207b4689d7c88f925a0b32b5a6c0a7dbd9dddf7cfd1dd5bbd5aec0459249abb8fe65b5cabea126c3
+DIST palapeli-18.04.2.tar.xz 2061884 BLAKE2B a4d345706f3f4db707638d1f7dfacad1efe156cf723fcb31d4196af0c472e8f14fbd977e71790417bff8257760b5a669f475a3d00a6c69bdaad0c7e431e4019c SHA512 5345cc2d31d093fd3341becab6e08a8d53b6f9e969eec89c52a7f2f5df1c9d39a30f81b22380504ef2b3a8070addb93febf12999a6cda214fc5ed7e19113423a
 EBUILD palapeli-17.12.3.ebuild 935 BLAKE2B d6b5a0c2e8e1174f8ad344c1160ef01efc80dbfdd801a2f41521b870b64e4615640c86aefccb24372e620bf6d61dab3ab0ed6a03b6746d0f7794bebcbfd9e079 SHA512 c019e484efbcba665f5a0848132555e341f9447964f2c2d35d963c146b082aa829c98cc87367d00356239a65032a82b48f7bed9a22ba7cac442061cadeca32e6
-EBUILD palapeli-18.04.1.ebuild 937 BLAKE2B 57aef5a7c39f7945679db1f5bca34bff7d08ee04adee1e14197de68ee3fe7ca07989c6e1267018404b418ae0ea6a4b29bc321c0aa14a17727c606ac6d0c5486f SHA512 ce341d56efa545e4ea7f4cf8e71fa17d77e39ab14cadc8e6941d20a2e8c800bfb7b0072847036eddb2b495d34be81738573ee4c428db2bcbc365f8bd919cc4c5
+EBUILD palapeli-18.04.2.ebuild 937 BLAKE2B 57aef5a7c39f7945679db1f5bca34bff7d08ee04adee1e14197de68ee3fe7ca07989c6e1267018404b418ae0ea6a4b29bc321c0aa14a17727c606ac6d0c5486f SHA512 ce341d56efa545e4ea7f4cf8e71fa17d77e39ab14cadc8e6941d20a2e8c800bfb7b0072847036eddb2b495d34be81738573ee4c428db2bcbc365f8bd919cc4c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-18.04.1.ebuild b/kde-apps/palapeli/palapeli-18.04.2.ebuild
index 40ee410a23a5..40ee410a23a5 100644
--- a/kde-apps/palapeli/palapeli-18.04.1.ebuild
+++ b/kde-apps/palapeli/palapeli-18.04.2.ebuild
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 7ad1bc0f989a..447da57d0606 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-17.12.3.tar.xz 8826604 BLAKE2B b24d1f7fde26b78c4d7abcdc18994a09adc58a29edd6123c8961d2dc148aa1adb82b0791e98dd4f4f588acf2400ce64b7a911334909b75deca07cfb0dde5dd84 SHA512 301e87605e754aaed520fa1bf96a7cf23b0c0a6523ae59817a6b14a8f69d3689a8646437e580a3257f42b197e6c7f899593cd242e9cd44ea1cd135327e83885f
-DIST parley-18.04.1.tar.xz 8829876 BLAKE2B 3f5fc818f0a24c8b2c6d762887ee09e4bb076b67f0110975a0e81fed040703c6b494e21e8b1dc80914791a3ceabe89cffefd798c6903485b407c4971742b4f3d SHA512 6c8ae2bc47c75690dd410cffe9be56f2bb4b012563b1bfa6c14333473f29b2d56dc3f9c61ae667a9bc2c456c66353eb4c58271b1332638e46921fe1e1ae6f4b6
+DIST parley-18.04.2.tar.xz 8829752 BLAKE2B 992abd4ba39b7dea1c725cae085875842781ee0d0087635dab7b4d51108373b7ff77ac3a5ff73664e44883181566a87659519979d305308458c4388e32de7325 SHA512 d213c3ceeb33a31a8848840c16207788009041eafdcd0fb40c362dc1365ae743f92536d5bf7508711f813c54e23cc0bca9b9e712861e6e8897e074017c539867
 EBUILD parley-17.12.3.ebuild 1255 BLAKE2B 2e0d0fedb3759793846d8f2c4e7a25c8a9bca996591a1baf1b38eeca9ab23de3565f6310c85ed404e4b08bf32d22a05e98462cc5af6546a8fb70902f54927520 SHA512 6a1dd8f607503b55fa87cb6b148559f631008a741453703264232268a83f632f5fec0baff9b71c2002defefe5f92594fcaa883867f884f00558ccb9fac6ff952
-EBUILD parley-18.04.1.ebuild 1257 BLAKE2B 094b00436dac68f3c5899f9f70f97433970eddf2d48ff34b90621f3777e77c60ff9b6d1785827dd9075e21bd50c7946bb15a6019d0d931cc519f75d0ae41f8de SHA512 68bf20bcc3ae12d15ab4b3297fc3760af9da33b09de58993db688bda01365301fe958063cb37a1935d3a89efa2fef82082b9f9450f9267e6a0c2377839ca4df3
+EBUILD parley-18.04.2.ebuild 1257 BLAKE2B 094b00436dac68f3c5899f9f70f97433970eddf2d48ff34b90621f3777e77c60ff9b6d1785827dd9075e21bd50c7946bb15a6019d0d931cc519f75d0ae41f8de SHA512 68bf20bcc3ae12d15ab4b3297fc3760af9da33b09de58993db688bda01365301fe958063cb37a1935d3a89efa2fef82082b9f9450f9267e6a0c2377839ca4df3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-18.04.1.ebuild b/kde-apps/parley/parley-18.04.2.ebuild
index d059e01c325e..d059e01c325e 100644
--- a/kde-apps/parley/parley-18.04.1.ebuild
+++ b/kde-apps/parley/parley-18.04.2.ebuild
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 1fb53092e796..91bbb1f7fcc8 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-17.12.3.tar.xz 1147600 BLAKE2B 9a09704d57b93e6e8ffbd5843570f9c6ab407c31a60313f9c4119aab97237b348b17ad1d8cc1437a664f05411816e91e8870694e8aeb09e9275e3327e0092f5d SHA512 06fff4d49e4e2bea3aab3c0ac9d06552acbe1b4e006ed79d5a1f10c31f4f7255bf132fe6149451536498959eb90fc7dad3c20396f783efe5c16fecb2b4828647
-DIST picmi-18.04.1.tar.xz 1146724 BLAKE2B e123227323c08406835fe099f2951bf774b5484e50ec54486ca1d9c69da742e9c40f014e0e268aa04a3dba4124cec2bab715f234b8ca251538e4c20f7381dbc6 SHA512 e4f47a4f7ba91b899981b15e67b2b450afded880c28f578c9c19e662fe1a74ac768d5307680e0fc59dcb91384cc2cf6c7addbf76ccf5e3c68c478c5c267d07b6
+DIST picmi-18.04.2.tar.xz 1146788 BLAKE2B ed4cdbd55e0d18d555a90f795be3a1f83f6f3c26d7c640ecf095148feb0e32060bbabeb2dbd9a60ae58ce5d1705bef57124c34a4f67efb716a46684aa6354204 SHA512 696f3a7feb304bd2d53c4fdf255c5488b1332c2cbd43123f50c900da1c056261de7b5b906828ea7b92030423db762bbfe921442f612d468c607431820d3f5b59
 EBUILD picmi-17.12.3.ebuild 845 BLAKE2B 724f2fc96d2c3a5ea5aee9e9f745e2190c7b30d3622f8810ced762021488873373cb33a37675d0c50d22f1c1a2ca6fe9c483773fbf704dfa40a49f667dcf9826 SHA512 3734ac1dad577ca724d2a7136512cf4c5e99be5f998ff2be871169f3d80196b88c6af53a1ca7e9b5efc8983e418211bc604af7eae4b2b24d0087ce29198f5aaa
-EBUILD picmi-18.04.1.ebuild 847 BLAKE2B dd6afeaa9bb3bce256d0cc34cef6ab1f47db8d08e1c79596373de2145614ec107b8fe477abed8966cbd836a25145fd77dbf0dda5e1a4ca4b39616d5f8019594f SHA512 07c00e401719efdc9e9be168aace9dc97521465cbc19b07268a776637f09ee403a58837221fb0bbe1631b02bd7d52a518a3d8110b7a3af09621bfc44094c43bb
+EBUILD picmi-18.04.2.ebuild 847 BLAKE2B dd6afeaa9bb3bce256d0cc34cef6ab1f47db8d08e1c79596373de2145614ec107b8fe477abed8966cbd836a25145fd77dbf0dda5e1a4ca4b39616d5f8019594f SHA512 07c00e401719efdc9e9be168aace9dc97521465cbc19b07268a776637f09ee403a58837221fb0bbe1631b02bd7d52a518a3d8110b7a3af09621bfc44094c43bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-18.04.1.ebuild b/kde-apps/picmi/picmi-18.04.2.ebuild
index c25ff58b234c..c25ff58b234c 100644
--- a/kde-apps/picmi/picmi-18.04.1.ebuild
+++ b/kde-apps/picmi/picmi-18.04.2.ebuild
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 9edf6880b3cf..639d5d043d93 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-17.12.3.tar.xz 267124 BLAKE2B 6c515327b444c9a7ddecdaa4e13f8d2c7f674a6acd1b2d4a5e314f330bb9e505112bad52674639f4a1f2f1ed29f5c5903b5eeba62578b49354a7feea0005fc21 SHA512 e0dd0fd6356b668f662afedb64d3fb9ed68da9b869635b7773bcae23262245e4b3246e0eec9b4e5bd45c28c506a0e54cea5819556bc1681378417830de458a0f
-DIST pim-data-exporter-18.04.1.tar.xz 270208 BLAKE2B 575ce187da803ad2a47826fa0efb87abecd0888103639104eb49fff0937be62fb88b2d05264d9bbbb9d977cc163eb5d27140b3d2d94fd7a37e7f3852153e4744 SHA512 daf4beb904a2ac3061367b93bbd9888c7a1ae03951ef41b72e42648a139d2f61400b5c2c45c135004167383a217b5c88d03b38cf9cd978cc26ddd78c0651e6cb
+DIST pim-data-exporter-18.04.2.tar.xz 270236 BLAKE2B 91fd5b2496a869a0c42eed1de92f4c9e5fed5faecaf3e5a2e9691a0885c4fcdd93a4ccdbca920b55806599354a9b49070429444be53832cb8277ae29605af0d1 SHA512 22600cd10bc728fe61337d5c85d05fcaf7838ca63cb000e5ceea0d697d41b5fe2cd351ae5d97690876f6fc535a9756fa33b89119fab5addf243300c716b6ab6e
 EBUILD pim-data-exporter-17.12.3.ebuild 1233 BLAKE2B 3d01b778d211e289765ed9cdc2943d4c05725fac2585ace174b413b699daf23e2898fccc0a99f8901ebb57a68398e9f9919d5c313205c0e56845eb79ea0bea05 SHA512 da978bfb6782f9ba3b95e453ad1b001da34ae6758bcc0cf1bfbdab98539a7b644f0b24191059c25041148dd85ae2ea8681452240248c1f550ec2f5e885fc3b7f
-EBUILD pim-data-exporter-18.04.1.ebuild 1214 BLAKE2B ee29f508cf6d59c9df144775e0c690c11363e5e5cbd8f86c69bbdc524da3ff948ae7cf658871f355c0a0950c484bb058a79c00eceec9fd7684e6a4a243176216 SHA512 27af2c79e3b61d5cd352ff791bd6fb5b7f2d7a8451a8de11bbd4ec9fc6664fab6796c8e8fff5fb2fa27dcd930206bc35d438d5a62d855a414e12ce62872684e7
+EBUILD pim-data-exporter-18.04.2.ebuild 1214 BLAKE2B ee29f508cf6d59c9df144775e0c690c11363e5e5cbd8f86c69bbdc524da3ff948ae7cf658871f355c0a0950c484bb058a79c00eceec9fd7684e6a4a243176216 SHA512 27af2c79e3b61d5cd352ff791bd6fb5b7f2d7a8451a8de11bbd4ec9fc6664fab6796c8e8fff5fb2fa27dcd930206bc35d438d5a62d855a414e12ce62872684e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.04.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.04.2.ebuild
index d6967027d499..d6967027d499 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-18.04.1.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-18.04.2.ebuild
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index f47b5b33ae19..13316d3de123 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-17.12.3.tar.xz 444364 BLAKE2B 621dff6212eb50b328ea5a559cff3322fb7a7e22d7ad33937c0a84e3bd4af5b519e1c1abb4a5586e84b042e4f0d4c39416aa0e8404ebc786f400747c85533e3b SHA512 812508b69ed0d4f0d2312cc74a3f800a06246e0984fcde386fdbb9e9a4ba949dfdb8c41a88f5a6d01d4f4c0c019a791a1c72edc50f446dcd9bd68a18c6623bd9
-DIST pim-sieve-editor-18.04.1.tar.xz 447240 BLAKE2B 06e7441a82349c329e1f0c7b5a5073964918c9a0eb25876c97bf0127eb0d064419cac3fef08bbc86ef63c2c09a62262da59aa5687c4036915a51de8353478500 SHA512 ea7b8df60afc6540d33d2f74677d11a250557c0d7fdefc4f66a969c64b6ded02112f203df2e23bf70eae897911158974452606dc34ad93adff6d792cf14b2201
+DIST pim-sieve-editor-18.04.2.tar.xz 447292 BLAKE2B 3aebf7e12ceabcba10967976f345b89c877dbbed3cce93125ead7da2866d4643452b8bcbaad74d95ff9a1a47f2b022d50b88479ae43788e937814c2ced4f6406 SHA512 c90da8147d444529c0a33791846e671d4075ec24e0f84b3a2edc9091e27d2d8f45dc324cc3e4365dcaab47de33431d3e44d47eb003af6fe504e2d693b8b5694a
 EBUILD pim-sieve-editor-17.12.3.ebuild 1147 BLAKE2B 1d382e5e13a982287274b27772e0250fff48428528e706571632cfa50503ce889b8ba4d26472c4168fdbc8c790228de9c2d7cdf87e9ac84601a94eb9b775d268 SHA512 5e496bc3fc0e16dc80eebcba13bfc3a4b0f69d0a166965bbbffe1eca523eb14619d50d61ee95320a11cf4e15af41187793f691924d00c700c71199c6b9bc7269
-EBUILD pim-sieve-editor-18.04.1.ebuild 1149 BLAKE2B dd7bccd086023a6ae4577ce85173e664cdc9d70c380268355f772e00d45b106d6977f280414e90bb6b13900463469f48e35d00fab154eda674d6f4d99b0a6309 SHA512 2cc007e8ef84d2dddad22bba7ad9316b04e4d90b707d3d55f4d4cf74909bf66d0282c474a03975b28fe299f71b564053a6e4358670ea89ffd37a7b16f167141a
+EBUILD pim-sieve-editor-18.04.2.ebuild 1149 BLAKE2B dd7bccd086023a6ae4577ce85173e664cdc9d70c380268355f772e00d45b106d6977f280414e90bb6b13900463469f48e35d00fab154eda674d6f4d99b0a6309 SHA512 2cc007e8ef84d2dddad22bba7ad9316b04e4d90b707d3d55f4d4cf74909bf66d0282c474a03975b28fe299f71b564053a6e4358670ea89ffd37a7b16f167141a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.2.ebuild
index 844361049fc3..844361049fc3 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.1.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.2.ebuild
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index f00ba1a23e47..4dd4003cbb52 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
 DIST pimcommon-17.12.3.tar.xz 287564 BLAKE2B 862d6bea6398edffca88f78901f8c59ab8721b210cd9d4e7e73f16474c7c58357977981d65a808b2d02501927257e96990b79071056e86aad08d97d23491569d SHA512 79aa5f3b7d61de547a07ef659e1a7d0b2c456010cb7ad929218853d5f1057a97e5a0e2d1197cb50a1f5bb201b3702efa0e3e1c154d530c49ebe51578d2690df1
-DIST pimcommon-18.04.1.tar.xz 295476 BLAKE2B 035688a22c3a093f081b942c945c9966e2c157fcb1203c10f5bbef4eb812ce28ba4f7a3228dfb0545d3e2a2d6c1a9fd1b6da0f3cfc25c0a71893ee9c9d394649 SHA512 26ec50fbdf7520f190ef7900b0d9181f8cdf1b5d0f35bbaa63ece9534e67aaebbd171b52d974d3d0f8c54ef8d28e15d343b6fc6b361269fce458e01c57a76278
+DIST pimcommon-18.04.2.tar.xz 295500 BLAKE2B 82ed80b00e3f4c1a7ca342f961348127b60ec4f3b8562323652bd1091de8150ad4160523ffed091f5d9796c38ce8d2e64beb86fb2b619a19471ce1b588ce5943 SHA512 75db5a4792dc0043ab93080e7a8c5efb6069e1e5e65b96cf88bc319dcfe86996f7421547f9f81fb951b8e8707f8a736df5aaf7d3ce55b2f727a7548e3c4204d7
 EBUILD pimcommon-17.12.3.ebuild 1459 BLAKE2B 85c6ef7e1ac73a542307bc6178c9ccc71e53e4ad0da21ae809f1a55c3a372af0a1cb2a5d51c7a32631ccf53aadb2244306742526968b2c723953e56f66081cf9 SHA512 42388f17e049e53efdb3209e43c522073559eb7be6f289cd273a6d1c518cbefbe8241b30e31cc53b2aea2f0da79293e081f4ccf79845144dfc9124e38d516a4d
-EBUILD pimcommon-18.04.1.ebuild 1461 BLAKE2B 1e9e2decb5d661e13a23511c10f3038fb4422cdf972f5b0367ddbb75ee2ab6e444f0380a8d1c1d5e40e4cab1b1a22a938d03abd2e2a94486a34cea90e3efbbbe SHA512 c220857379e90d1c470057b13b503679ca7f4c488765382990f72836b572a57ab0633a4c0498a1a6d0e221dc88428b14ddb0cb3fea387a3456945cfd49ed9ca1
+EBUILD pimcommon-18.04.2.ebuild 1461 BLAKE2B 1e9e2decb5d661e13a23511c10f3038fb4422cdf972f5b0367ddbb75ee2ab6e444f0380a8d1c1d5e40e4cab1b1a22a938d03abd2e2a94486a34cea90e3efbbbe SHA512 c220857379e90d1c470057b13b503679ca7f4c488765382990f72836b572a57ab0633a4c0498a1a6d0e221dc88428b14ddb0cb3fea387a3456945cfd49ed9ca1
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-18.04.1.ebuild b/kde-apps/pimcommon/pimcommon-18.04.2.ebuild
index 6295115f9d17..6295115f9d17 100644
--- a/kde-apps/pimcommon/pimcommon-18.04.1.ebuild
+++ b/kde-apps/pimcommon/pimcommon-18.04.2.ebuild
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 878cbd859a0f..b0c1a415d257 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-17.12.3.ebuild 936 BLAKE2B 8ba54ecd638b9340f9d950f4a2288d975c3cfbebb2fb9bdd1038e36f70f7156346085aa5c8835eca823fa772856ecdfa748e8fa1277df16befde03790c3a3f96 SHA512 7f6648e8285f603c0d3ace3b178262fb3d76a47dfb4dd65e68aa2d31326f785183b4fead521bd410c75ad65161ed94cbb0c0e09583eda6bf27f8075f225fc47d
-EBUILD plasma-telepathy-meta-18.04.1.ebuild 938 BLAKE2B 8db0a9c7f43f15bd87173c274bda17aaf9a8d608e761c786e023e580c3a0e2abbf9366744d6777b3a64fc5152b721b2af31356e7b906a28638c9cdc7755e6b59 SHA512 dc03d147befe8be681fdf9839bcca74e14c7aef11d6e6b371dfea235e57c9ade24245f1205f0119fc4210888a8bd74c487b275104803edba1243886a82db2124
+EBUILD plasma-telepathy-meta-18.04.2.ebuild 938 BLAKE2B 8db0a9c7f43f15bd87173c274bda17aaf9a8d608e761c786e023e580c3a0e2abbf9366744d6777b3a64fc5152b721b2af31356e7b906a28638c9cdc7755e6b59 SHA512 dc03d147befe8be681fdf9839bcca74e14c7aef11d6e6b371dfea235e57c9ade24245f1205f0119fc4210888a8bd74c487b275104803edba1243886a82db2124
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.1.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.2.ebuild
index c133533744d5..c133533744d5 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.1.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.2.ebuild
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 4e7d8aba5909..f2b83be03fde 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-17.12.3.tar.xz 43004 BLAKE2B d6a29c953c091cb7df6a181285ed1a9376db87be2617b00efe9de56ae6bc06d11522a0fac69a7a4d1e2b1a085227c0e17935bb1ff0abca6119bb115b72e2a952 SHA512 c9b45bf37c200b206ab4e114964d6dfce941f974f56d2703ce9ce5ea5314be0224cbf3fa1855d0e423b27b7ca1664a9a372f9322305c76b26bb340e9876a0e34
-DIST poxml-18.04.1.tar.xz 43172 BLAKE2B 98c139cc37d6027560ed19851c858bb8607949f81ef3cf06b2116e9bc28e4c4e3ea1a17dd78be5a09f8100008d3844aac611dbf5d75e9a53f55c3506e80a1a0a SHA512 ffca06f2594c02d1c7e08d46582f14a58867107316473e2d6b2b0b4a6b95e53a00cf1b9389ac83026bfd10b32776476202f86b9cc09faf6ca889293a8aabf292
+DIST poxml-18.04.2.tar.xz 43268 BLAKE2B c22afdfe38764f4900da32cdda6e2e9972f5daf662f5e0bb4b8f984d9916d047edc8a62f301bc1e25f50861021ef045293471025dabd131c6cabb253ab7cc40e SHA512 9880af0e92f2bc6a5c1145305ca39d8eb8ede1b8edcb15fd2a0015fd7f6e8a4db82a2d3a80655b22e3fe70ce6a65ccb022ec26fd288cc3665716c4a82841e4ba
 EBUILD poxml-17.12.3.ebuild 340 BLAKE2B 3a45ed2f3c9c6d5e8ae2fa23280ccf1e95e347eb220486ece8e9460db877e225f2f31a5906585f732cf4fca44a716f5b46526dd879db9c45cc22725d73987f8f SHA512 4efa4312b7453dfd5a86cfaf8b2ff1866f237be9cac5a28049d09b2a2b473c9061021f82918d9327c4d083a5513cd4e6a1029f92a87badab392d9df8d23cb55d
-EBUILD poxml-18.04.1.ebuild 342 BLAKE2B da47dd0d971b37d1a80e6791ecf18d17aa4b051914edf17404219f16a3f944f1f139d44c97b0375cb6ba57b1ca059b3934df902105e4744f45b8a017dfea6a83 SHA512 8271762279435f773cc4b7565d1afaa4f4a731cbdb4fee1e4e46cf0bb990e7ba6b7ed78a7f5e6ca8cdd28e4c83ada388fc76f60c2cc9a04d9217b22ed2860946
+EBUILD poxml-18.04.2.ebuild 342 BLAKE2B da47dd0d971b37d1a80e6791ecf18d17aa4b051914edf17404219f16a3f944f1f139d44c97b0375cb6ba57b1ca059b3934df902105e4744f45b8a017dfea6a83 SHA512 8271762279435f773cc4b7565d1afaa4f4a731cbdb4fee1e4e46cf0bb990e7ba6b7ed78a7f5e6ca8cdd28e4c83ada388fc76f60c2cc9a04d9217b22ed2860946
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-18.04.1.ebuild b/kde-apps/poxml/poxml-18.04.2.ebuild
index 3c605a013f0f..3c605a013f0f 100644
--- a/kde-apps/poxml/poxml-18.04.1.ebuild
+++ b/kde-apps/poxml/poxml-18.04.2.ebuild
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 186a841bb011..327c23e0deeb 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-17.12.3.tar.xz 237128 BLAKE2B cc1a85c6ed2f160329c5428de7c6de562de7f5c3876fdd504e619801e8ededd792c8b69c9193a787d1600948f7fae3a62a7290e1e50ea5bf39475d9db9c9c66c SHA512 80e40c913da002beb3e473e0e6fa6f02b0e3b699bdc49c390435d9139f46b1fb3ffef54c042b5dc2a1db3b83da2f4f53377710b31281b0154f9654f605b95830
-DIST print-manager-18.04.1.tar.xz 238656 BLAKE2B 8f863a570e67931e16d1e3ceed3eeb8f4ed9e937254a31400359372b9c9688c928e98174959fa5fc81460946d827d9a51da397492a4eda552a3d9de0b6d096a2 SHA512 87a50adeb14b5ea64a28ff6e8c5f2434f2d35d51f26c29434b40755d626c75561da487d283e63c389a616b1c37870f429bc29e247ad7ece2d7116fe39bdd12b7
+DIST print-manager-18.04.2.tar.xz 238860 BLAKE2B ebf93bbd7f824603df8819be16f829a5e8e40efc3a4eebe4aa3d6a32ba2c5d28afc128482445127d53231c50d149820ee2aed22d055df27a916e9f885ff729b5 SHA512 ab9db5fdb6e21c1774d1b7294a096febfc669a9151329d11133d36575565b8c0bce41b4e89e99c8ed0d2a39d4b71cfd94389c197b2515f507ecfd8582ed85fb7
 EBUILD print-manager-17.12.3.ebuild 1439 BLAKE2B 81ab868d0134e4530cb5b9a998946c501eba943c17b2193aff153abd2197ff7974b0b1669b1ddf8464b2660bc4e0646ac0ca7692ce2b8bdfcce4a68c0ddae955 SHA512 6b9979f6d7aa30329cc0e272b7c7ad15c17bfeea61ff516ae4cbeb442f7aa3bfd42144ebff0e0219d45f67c72c37a9b552b4d10584b4be0da3ac49cc3e555e8c
-EBUILD print-manager-18.04.1.ebuild 1441 BLAKE2B ae4ce614d01293367cd277e0018874f25901aa90e82904701c3a4b90cc73ef96bf72d9b9804840c35a665f16ba5b5204cab1c82df2fbb45c23fde8a039907e97 SHA512 a47f846b9276a5b9116e2e76e595aba7688292440e7934f05f435c62009b6c6afa16d1212aa54f431db20e9c83f30579fda50fc801fb50af6df51a32edddc820
+EBUILD print-manager-18.04.2.ebuild 1441 BLAKE2B ae4ce614d01293367cd277e0018874f25901aa90e82904701c3a4b90cc73ef96bf72d9b9804840c35a665f16ba5b5204cab1c82df2fbb45c23fde8a039907e97 SHA512 a47f846b9276a5b9116e2e76e595aba7688292440e7934f05f435c62009b6c6afa16d1212aa54f431db20e9c83f30579fda50fc801fb50af6df51a32edddc820
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-18.04.1.ebuild b/kde-apps/print-manager/print-manager-18.04.2.ebuild
index e59f9d37adbc..e59f9d37adbc 100644
--- a/kde-apps/print-manager/print-manager-18.04.1.ebuild
+++ b/kde-apps/print-manager/print-manager-18.04.2.ebuild
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 6b097f25c3cd..aa5da992701b 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-17.12.3.tar.xz 1529908 BLAKE2B 2913e6b609b349c6b4fe2e08c41ba63c90f0a144676ec9dd64203f01ca0240b934e0de48e2e068dfa2c860be5bfdf4fcf883b27b1c11b7dccc6d832dbff520ad SHA512 5b90ed37b62ba5752843d0d9be46e5139fc7017dc5f620ad5bd07de10a6cb6acf601609edf5856048914fa11866045b2e1fcd859881dc6e9bcaf5239ccb2a6e2
-DIST rocs-18.04.1.tar.xz 1535884 BLAKE2B 96eb12ef7831f3ab2cb91f2574f94f479b08472809d931d3d0ae4d8a9241b534f5470767130a53f58d7a8b678602c94e02f0f8a286f6c49454e4bb0015fabe46 SHA512 df96e1d1b21e065b38e2f054e51521b9113752491576a030bb65ec63b037dcaa81c9f9c1f0f79fa304c8755892dcdde3498424b743ece42991d6f7aadddb459f
+DIST rocs-18.04.2.tar.xz 1536088 BLAKE2B 0c5e20357162bf52d5a05b2d43d553e5371b93f8a62fbfb2215cfaaf870f1481a716752a4301aa15d2be4bef78818c0100612030e923c754c17efa164b80f80c SHA512 e820eccf34da78fa5c165b98576e5e25625e49f21826cc63375f38b777c573750d5e65203635def4ff0dbdea2aaf72e30aaa3b45127a1e6c550b179adc7bcc24
 EBUILD rocs-17.12.3.ebuild 1159 BLAKE2B 26a466581221934abb3f2a63d4a953b1acce35d695b9a0b39cc4f4ac64a78f7b5b7506a9523aaa82c50777051309a24d94ce0f42a7163b5ff50100867ba8024c SHA512 f3d82947fe9726d008005ba100f062e9497e1d5cf714637a44945ba233d991b2c9e45ad9085cfd99ab7fcfaeb2c1c610b6ab770da542a35c8489f96f7f578f2f
-EBUILD rocs-18.04.1.ebuild 1161 BLAKE2B 30882ac451dd49a4fc551be55d678e659417d00bb10663b5a3607eb7dff79b270648dc53e61cab589505e6f6759b289ffc38bc779720de2877e386439aeb4ee5 SHA512 c98f2c0dba40578a6c1927dd3f5f6648c584e6798b834670314f7e668aef0c561d5ac5d082c186801f0caaef3630383618265f2e55dce777cefecc72ca1c91fc
+EBUILD rocs-18.04.2.ebuild 1161 BLAKE2B 30882ac451dd49a4fc551be55d678e659417d00bb10663b5a3607eb7dff79b270648dc53e61cab589505e6f6759b289ffc38bc779720de2877e386439aeb4ee5 SHA512 c98f2c0dba40578a6c1927dd3f5f6648c584e6798b834670314f7e668aef0c561d5ac5d082c186801f0caaef3630383618265f2e55dce777cefecc72ca1c91fc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-18.04.1.ebuild b/kde-apps/rocs/rocs-18.04.2.ebuild
index e20797a7baff..e20797a7baff 100644
--- a/kde-apps/rocs/rocs-18.04.1.ebuild
+++ b/kde-apps/rocs/rocs-18.04.2.ebuild
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index aac4c52b22ff..c001e2004dba 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-17.12.3.tar.xz 10580 BLAKE2B f5b674d99146663411ece436715330a990d15d19befaeb481e97669a9fc84c6e726deabb247c084e9761c713d98ad250ea2fa3cfc4996ab640d1aca3e9e27ea8 SHA512 181f990db14bcb7c2247a85dae98026289bfacf3f6052047c7d8590c3e756f06f072569c295d687bd3fb81a45796e6e2436665dd1bf233c0ec6e84bcd03c7588
-DIST signon-kwallet-extension-18.04.1.tar.xz 10692 BLAKE2B d975d6fb95d88d19bd44330b15e5dd97fe7f0a1883b149446d150612cfb3ff5bb56f4015fd7c751dd842f408680aa621a51952272b744a6f8f083fb1818af272 SHA512 cdad756d33d2dd07d346fdaf011b0ca2173fbf9e10b7e44ec5641a4fba42adc0bd7f82bb069e5bde17337531752310ba6ac9d4419eaba2df4d4c7f03326af2ab
+DIST signon-kwallet-extension-18.04.2.tar.xz 10692 BLAKE2B ea3d36123ad1343e38af7909bdb838ef5b118d0a5e0badccbb67d1a299207d16599901760c3716db81b06a3ad0f46f088c972404264edd9ecac5e3a49538d6c6 SHA512 7680c38196d2782cadc922f53379ae3bd396d446ea8b2205facd1d22e24d1c9c783e33ec51012de76f9892cc06734b007770870b7e5b7ab0c965e63cf914294d
 EBUILD signon-kwallet-extension-17.12.3.ebuild 325 BLAKE2B eb4c69958966690f2a85381a81bd7934ab3cbf95711aa7cd7a3c6ae0eb71cec195087ffa317c1a67e9119d4d23886024474f886ab682363ad5b358c3d0aab948 SHA512 ee754c65c63ccde2b638292aea56815f5877c4adf88a1ae99c2a70f45cc332045bb6237e37faece50e0618c6f141af1fef66c9d3d4ae2deb1577455bb728bda0
-EBUILD signon-kwallet-extension-18.04.1.ebuild 327 BLAKE2B 0a3f7e51e8e27cabcefeb6237fa06c72f2f57be9fa3c64d689589a2cd6526ef09997765b6cedd21e41d7f607f3e80b2f361fa6f4018595212f6a148708f724b9 SHA512 b61412c9e2dbf34b877161d5b6f49509fc9610ba7206a248bb5bb1dd66c3799aea371321fa528258490ca0ec93d34192ae4112fd37bd8ccd0895cbb7ef9e48bd
+EBUILD signon-kwallet-extension-18.04.2.ebuild 327 BLAKE2B 0a3f7e51e8e27cabcefeb6237fa06c72f2f57be9fa3c64d689589a2cd6526ef09997765b6cedd21e41d7f607f3e80b2f361fa6f4018595212f6a148708f724b9 SHA512 b61412c9e2dbf34b877161d5b6f49509fc9610ba7206a248bb5bb1dd66c3799aea371321fa528258490ca0ec93d34192ae4112fd37bd8ccd0895cbb7ef9e48bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.2.ebuild
index ce5d29586a9f..ce5d29586a9f 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.1.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.2.ebuild
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 802a9a993a0a..855a430b8385 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-17.12.3.tar.xz 765132 BLAKE2B 824e2f260e6da5daf51463dd9f99d4a4dc405e9b3c9c1149cf8dc6dc4296ac7ae75d2dba7ca341c767b86ef0d6fac44a50cc644e9a8dcee469de7bd5f792e514 SHA512 286a4c4fb0a6d97eb31bed38865f2717b52c215074bee5dc4b5730ba607d6d25ce641d1b611e974178d33d6bff400e88cc0730c6249d21a4308d0092fcff3ef9
-DIST spectacle-18.04.1.tar.xz 1070616 BLAKE2B 3d835d0224eccf388bdf542d9003217a07f6adbdff955426261df8ffe1afa9366af2f3aa20312da9832a7ce5904c4f7a6ea68b9f58dc33da666e903f50e0945d SHA512 a85003842715f4e46a50da81f17403bd7d5e6ef4fa38d149bbfe30baaf9eee16251bc885821db7f14adb46453406bd3f07a64cadcaa11ab2cf919977a8881b08
+DIST spectacle-18.04.2.tar.xz 1070964 BLAKE2B 59cb1e6477691c4e019b08f74f142eccfc3f1de81ba94e30e2217afad1a1a36423b7a44dc958afc9f4d9e0008c5e0d4b0cec52499bd7269e836e1728e666db8f SHA512 3f7c0aa2d8f858aff927d7ab0bbf7b0be5aecf395c09d9a0321cbaa95b34271825b8a2e4b4d2051c7e54af85f76af54fbde4740aa5bfe3ffd8c30aab5f1210da
 EBUILD spectacle-17.12.3.ebuild 1332 BLAKE2B 86737aa93d36446293c1f7d0526dc78cef05e1b345b913c7357d7b87568122c33a286c8aaa4745e6bbf0ddf173d82a557edd2594a13f388598d70c6d2ce0bd3e SHA512 ecee281e04b20758ed47c6f2033b9ed46d7f146b0581ffa113f185ad9d700cd03f76241478a4339c14dc9ec1c53c28e245a04dea913aee941b65110f09999965
-EBUILD spectacle-18.04.1.ebuild 1334 BLAKE2B 9ad5fb46992bb3e3fe8076aad8b68ced44610dbf45e7356d469bc82e02dcebbef5aeb57d1a646b15f814035390c603dfc4be6b33f17be31b1d12bc73674e8233 SHA512 22a664c150b210f0b2be8fa87838743b4d2e5b242db79572aef08f15c106e4bc114cad8f334eb452ce570af84bef952465a531d1f50996851534af86363a562b
+EBUILD spectacle-18.04.2.ebuild 1334 BLAKE2B 9ad5fb46992bb3e3fe8076aad8b68ced44610dbf45e7356d469bc82e02dcebbef5aeb57d1a646b15f814035390c603dfc4be6b33f17be31b1d12bc73674e8233 SHA512 22a664c150b210f0b2be8fa87838743b4d2e5b242db79572aef08f15c106e4bc114cad8f334eb452ce570af84bef952465a531d1f50996851534af86363a562b
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-18.04.1.ebuild b/kde-apps/spectacle/spectacle-18.04.2.ebuild
index cf8b419f4a56..cf8b419f4a56 100644
--- a/kde-apps/spectacle/spectacle-18.04.1.ebuild
+++ b/kde-apps/spectacle/spectacle-18.04.2.ebuild
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index dc4c4f2f1d91..1d7e4c557006 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-17.12.3.tar.xz 862236 BLAKE2B b931d732c54467fefbf217326776b4ca664c93f384c11a8bed32c9084b5b31debf463645d5b1f697a62a6dc1f08a2e481246be25518cf1c526d58d0f29614a43 SHA512 40de257c593483bf1ddc84c76b8bab608d8e0ac49b0bd5acbb94a3f1bc6dba0cbe18f30d9e4d4ccdcf5e764a21209229b57abb8c3149dc9fca86fe00a732c4f3
-DIST step-18.04.1.tar.xz 862508 BLAKE2B abf2aa2f6f56fa35d4750c96304a85c36d4ccc22c382fb2bb222ffac4d011823884b59c7214fc4f1d856509e442deef6105e6b22ed8dcddf3c866aee543e2791 SHA512 cc790b66ba845bcc97820c3a81d9a5899a3977c99108dd286d09f06b0b8e6f91e2f92440bd8404af584f026e8e3c32ff14b7b7b8acada604ea39fa4261a3c5f3
+DIST step-18.04.2.tar.xz 862796 BLAKE2B 88ffde04ad2e044e8b58e4199672645f3694032074f39b091756d2ef0ece4e79271a7a05cda34c5e7e22967b9e38390cb440ba92568b12668579bd42e4feac9b SHA512 c0014d4d13c1c13355ea0ae4108dd085f65fc044879cdd2f47a30525b8fd37c7350df37eb6fbbf4376381b9e1e78b343fe5551cb59c2e7e4c5ba75d3864b9615
 EBUILD step-17.12.3.ebuild 1578 BLAKE2B 154226cbb51fc9a345ab059ce1af8c7a7d3cf3dc868f7f3992ee644041ed2010bf16579703c2f83bd1cc7b5fe28de727cd76a19f829796b8ef35da2ced0b5d53 SHA512 7d9dea75d6d531c4c649f059f3fd268b8107b9f57c4cf4ed6de11bb245a312e9892566ec07f1d99e41eb2bc3796f96312da4e2c82e35417cb9cb0b1719ba6e5e
-EBUILD step-18.04.1.ebuild 1489 BLAKE2B b3856e1ce092d3485e1cec6932a64809c17f989fa94673639561fe065c963a6c07a06fd14a2b75b7bc707c37d548dd8c58b1bd817f448531911dc91df0e089cd SHA512 4e42856ed4796035fc4fd318c42310eef2d3fb496ef4a69f3fdc4ef2043a281c4decfedac7095f5cae56a0f7ae9d2ad684d125850359c61228df2efa5e45957d
+EBUILD step-18.04.2.ebuild 1489 BLAKE2B b3856e1ce092d3485e1cec6932a64809c17f989fa94673639561fe065c963a6c07a06fd14a2b75b7bc707c37d548dd8c58b1bd817f448531911dc91df0e089cd SHA512 4e42856ed4796035fc4fd318c42310eef2d3fb496ef4a69f3fdc4ef2043a281c4decfedac7095f5cae56a0f7ae9d2ad684d125850359c61228df2efa5e45957d
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-18.04.1.ebuild b/kde-apps/step/step-18.04.2.ebuild
index c14241e8ebe8..c14241e8ebe8 100644
--- a/kde-apps/step/step-18.04.1.ebuild
+++ b/kde-apps/step/step-18.04.2.ebuild
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index f66d88ecb49f..617e57b0f58f 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-17.12.3.tar.xz 20836 BLAKE2B 1c17ed56a304398cde1be7e6c9fd1faab134666c306dd871fef9bd7a8f5d777e4c909159edb7f5ed56b6b709589640fa119bb7daa4df5a88297d557215b2aa2d SHA512 fe49860728452ec4d7dc42ef5532b162f5baa1d50b83254f27f148a3fea41efb179f90162c4dc83aeaa5639cbfcca251f696ba44d63d898357d535080f4fd329
-DIST svgpart-18.04.1.tar.xz 20948 BLAKE2B ecb1c18b2ace7935ece992014722f61f213e01156f42d0d2f717321f55f3dff3e3f097ae8ba62e9e2f57a583f602d784d4da7f5c132b3bd8b7027f9f8749f1e8 SHA512 875605618ea2048fb825ec57d7d52a16ee56b7718f86089006fbe95bb4bad4a6c3b19edb781687c42d0c463b652ef38b6484c85702562c56e2def72b55525f07
+DIST svgpart-18.04.2.tar.xz 21036 BLAKE2B b9dbb27ca3684d4da9d45ed0530a5bbd570a5f6ebadc929d57417ce544aa023265c7fe88810a754e22ab987227e24fef210aab64e41b1f35f47e2e5548d9aff9 SHA512 e6bdf471d393f0c5bcd322663f4f5273d74f95fe4154646eec8d666fd231f8f67fd00bbfbcaa898447aea5d7b569d521bc2d11e4a6b9ea0fc94713be1fdb4f18
 EBUILD svgpart-17.12.3.ebuild 499 BLAKE2B 7ce47fe611520b7e2ce3ab7c3c1d19655b7a255199baa736166dc838e6e007c3501ef95fe6ad20eb73bf7e60ac40529e912586131d038bcd08d1361d35e7e6df SHA512 4ecc4acbd8dad4220fada4b4e3229902df053aa3d858857255174faaaae19d203ad11b1c33e9c105c04a828127086130908fb2eaf93a7d7b126261500b037ee3
-EBUILD svgpart-18.04.1.ebuild 501 BLAKE2B 23f8b66931dc752d8d102a23d5f27ab3901a0f6be8fb80607999e5956bc80616429fb494a003633b161c4e5bafd1929e41cd86442e8561349bed5a785842ae98 SHA512 ab3a934803b623bb17348ae70822fe73d96e04669e94a43d353e1890131d1104125d4ff7d19d20e9b58a79a99973a51e9165c95dd79e9eaed5bb1f15472d5c05
+EBUILD svgpart-18.04.2.ebuild 501 BLAKE2B 23f8b66931dc752d8d102a23d5f27ab3901a0f6be8fb80607999e5956bc80616429fb494a003633b161c4e5bafd1929e41cd86442e8561349bed5a785842ae98 SHA512 ab3a934803b623bb17348ae70822fe73d96e04669e94a43d353e1890131d1104125d4ff7d19d20e9b58a79a99973a51e9165c95dd79e9eaed5bb1f15472d5c05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-18.04.1.ebuild b/kde-apps/svgpart/svgpart-18.04.2.ebuild
index a2929a955b58..a2929a955b58 100644
--- a/kde-apps/svgpart/svgpart-18.04.1.ebuild
+++ b/kde-apps/svgpart/svgpart-18.04.2.ebuild
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index dd90eb910057..13b512809b2b 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-17.12.3.tar.xz 382244 BLAKE2B 9dae94d488241f330b04ade4b07061fd3407020ab6b246339906bdbe9599a316ba90232b2ba684e1f9b502b60347d3b3c8d47b61add4b3b62c1e200c76519eb4 SHA512 0f62ec23f3ab3d6e50787ceceef611cfc02af1c6f7a85e87f59b08f337b064ea34a5a6339f88ef909cb970ac9850eb660a03344cda4772564d4766fa6b727a95
-DIST sweeper-18.04.1.tar.xz 369036 BLAKE2B 7f3f829e80d73c5f2f6031a97395eb9cc16e58ede25e5e7420dc1fd907c9f3db332f7127d23ad634dcc60bd23985b8b4158bd79a19787bde1d667af4bd7491bf SHA512 368ef0eb1d9613857b8c4771e04e91ff450a6f4b4b58c2a6c38fbc27d93150985db2230b6cc94f68b1a8fa0a499169a137855b90aa187d64a4b9796f89afd1cb
+DIST sweeper-18.04.2.tar.xz 369192 BLAKE2B 4d431b2fb65acb4945cd1bb525e6b858dbee0567ab57b601d66ce94af58cc1f46f7bb9a68223519acf69b6c644b64367efe843c436e980a00a3358601144039c SHA512 7a754b956b52509a6c960114c34bf1ef9150ad957e09452bc4a73c794f0a8eb7c8cd3d708393d4cfb3ff5cc856dce5238ee874741832ae3cd45f3fcd10972ccd
 EBUILD sweeper-17.12.3.ebuild 880 BLAKE2B 328f32c415952ac91d846bd4dcd71dc18e5afe2345a9b9bcacefefa5a139e69b86bf0829e012fdeb3f1ea19aa3578fa3a0125c617980cb0b16d544f19748c46c SHA512 fa7096464c23a7f51aa6d2341ded2076836b43566aaab5dabb4d7561dc6001ce9c6bf43c09a8641b1b131820c52bb70dcf3c3cbf84293cc1beef09f78acab107
-EBUILD sweeper-18.04.1.ebuild 882 BLAKE2B 19021a1432adcd1efcea32b0967f4ae8189734c615f54bfa602f42ccdc2ed5f0e089d89169d158f1f6cbe5ba7189233806d1afe4291a6b1a3f1444562c9daf4f SHA512 fbb82a22e966acd01aae418831169aa48c5bcbb7b160b0e8edbec8d91900f056ca8e89a40742f6465b03392fb90a8d231240782645699257960aa3e409325ded
+EBUILD sweeper-18.04.2.ebuild 882 BLAKE2B 19021a1432adcd1efcea32b0967f4ae8189734c615f54bfa602f42ccdc2ed5f0e089d89169d158f1f6cbe5ba7189233806d1afe4291a6b1a3f1444562c9daf4f SHA512 fbb82a22e966acd01aae418831169aa48c5bcbb7b160b0e8edbec8d91900f056ca8e89a40742f6465b03392fb90a8d231240782645699257960aa3e409325ded
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-18.04.1.ebuild b/kde-apps/sweeper/sweeper-18.04.2.ebuild
index 41e32c5dd330..41e32c5dd330 100644
--- a/kde-apps/sweeper/sweeper-18.04.1.ebuild
+++ b/kde-apps/sweeper/sweeper-18.04.2.ebuild
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index 4604ca578c31..b1852a879cd0 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-17.12.3.tar.xz 159804 BLAKE2B bf89604b4976a28016720d74ab5c36de7bbaca08cc15c1db2d03ccad339049fae5fd06eced4e8c60ee278ad4fcaac3ceca3ee8f217839936cc79ea995f4de31f SHA512 a1f2c472194355b570e4128ab4e4be70d6baa3d1c91e35706b7ec242caa950ec3686ab20772aec6fc2ecc7b0d6b390195e6bca5ec8a130951886589df73c1f9c
-DIST syndication-18.04.1.tar.xz 160128 BLAKE2B 12a5f60b9a6e5d0c09e0088d39a021bccb9dc61f48802bb16c5900b21853a45292f095841c51324499834f3348a8a3da68c1cf450bc7c12d61caee0f5d1eff9c SHA512 8069c200575e7872c116b25cc76acfd236825357af0c73d57a1ffdd1c840a359c0fc58a4cf83a5506bc2e8bbc87a76ecdc96fa6123d409c9079ce61472fc3c38
+DIST syndication-18.04.2.tar.xz 160132 BLAKE2B 133d874915eea9007ec03a031a71a5aabc5cde5d1b82638bcfb69456639c126635b406ab677c85b696cd526aeacaf24fdaadd065c94e037be2dcc2cfb9453214 SHA512 658488b67d62dafa359620d95469f781d6ab0dd4789fbf0b54fc18867d2a61fa8baa7c1c1ba3e3474bb94239b0df1e864078c7619cc5b3bd2d142408647ffebd
 EBUILD syndication-17.12.3.ebuild 392 BLAKE2B fe48411fd2d0a2ce7b77635085b328069282da9be4e109a6564af6b469d6f7d37641251784f2ceebc6e5f9314ba78aa1f96da97f6b9ae306ce1ed0d52af248df SHA512 68be4e60c5cdd987e45f798912091a6a06bd27307f9b1bb7ecf8701d4468a7d50b6d14f92a0f2084f67cc646a058f4dad20056200b4c473343a3ce25ad750c0a
-EBUILD syndication-18.04.1.ebuild 394 BLAKE2B ced8fdbdf1e87b6dc082522243b990771d532221ce7b79f17a2aa0781f107d0a7b36e6a582a8a19372219a83f3cec01bcc7a759558bf7bbe5c0b32ba273890eb SHA512 bf4cdaa30b49c0f364692c541a011dce1feebc900f8d2a45113338e0832a63d5ed42afca6f59c5e699d71fbb969728b164868ba60bc1927cb8acc615ee253388
+EBUILD syndication-18.04.2.ebuild 394 BLAKE2B ced8fdbdf1e87b6dc082522243b990771d532221ce7b79f17a2aa0781f107d0a7b36e6a582a8a19372219a83f3cec01bcc7a759558bf7bbe5c0b32ba273890eb SHA512 bf4cdaa30b49c0f364692c541a011dce1feebc900f8d2a45113338e0832a63d5ed42afca6f59c5e699d71fbb969728b164868ba60bc1927cb8acc615ee253388
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/syndication/syndication-18.04.1.ebuild b/kde-apps/syndication/syndication-18.04.2.ebuild
index 3ee4afc41ebb..3ee4afc41ebb 100644
--- a/kde-apps/syndication/syndication-18.04.1.ebuild
+++ b/kde-apps/syndication/syndication-18.04.2.ebuild
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index 97717d5ddd84..c50423900623 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-17.12.3.tar.xz 41628 BLAKE2B 41a95cf201d03d7ef0a4b35c9603c61113f3fbf2a5319724b88a14de979c310e2d50f2ac0fa68d60cdb7bf4d396d21d59bb60622b18ad548cd5389b68e8c0e46 SHA512 67bfea3314008d2024d07afe02b4a9b2d7d952460e831c152b6eb79b9214e73c4a90312b27f6fb02666edf2e40baa59c5c924f5750bb56d731ab09c9b2cddd6c
-DIST kdegraphics-thumbnailers-18.04.1.tar.xz 41300 BLAKE2B 0ecc9c5272bddb56b1dfb43c4da4761a404de9a5db9f650e32242593b7df50634fcc16a40f8bb032507d8657ff64b57ee5b158a7ecd67e85a27ff3236d4ed1d0 SHA512 2a2d05a97f5ba9f534cbcc2a325895f9dd9aecfd48b8da225ac3ee7285ba09d7ac9e1634fe6f6d82654a5c47e82cc159d6f65ce2ecada46ac6b43ad25cc2c66e
+DIST kdegraphics-thumbnailers-18.04.2.tar.xz 41288 BLAKE2B 520da32ff08091741b7f2809e7b0edd13adb4029ac1cfae37dee4a611689fb6fb05008e9f4b357f60a28d025b0fbe6ca603191a9d4bdb2d20a62d91d44a5a5c7 SHA512 c20f6a3157999f9cb0d98e985714c9ab6ec16e0f66486ab9cb80bbfb108ffab550db2bea6f258c823c70a711a9a9493cdfd0ea1702c4342fcc17259dc69d42c9
 EBUILD thumbnailers-17.12.3.ebuild 610 BLAKE2B fb61ab186c414471900aeed69873d5c7737d9cdfeb9a82460ca73cea2be4031c0d40f757de7625afc7bb457172b9518433330d28e1b1cd3a8bb1c5225324ac6a SHA512 c45fa2fb6982139f595e19f99421ddd334f97c2f55196e71a7e6c135cd3b94b7b1b6893bf2cf6e159960fb51f40edac12ef3e94326982c2ff9dc8bec7855a403
-EBUILD thumbnailers-18.04.1.ebuild 612 BLAKE2B cb2d75bcd8a1a07288e7c3d4776dba4883079527d0f38e8f147fea9eafefdf657b3fcef66124d46bc58405655839d2127d67d0fb6f84955508158769cd13197d SHA512 4d1dceb5d12f96997ee5df7a2c55f408e230ff232cb5cb05a5eecda7efcabd296fbf83a02c6b3783346dba31844816b350cbb17d612af150ed1172020c4d740c
+EBUILD thumbnailers-18.04.2.ebuild 612 BLAKE2B cb2d75bcd8a1a07288e7c3d4776dba4883079527d0f38e8f147fea9eafefdf657b3fcef66124d46bc58405655839d2127d67d0fb6f84955508158769cd13197d SHA512 4d1dceb5d12f96997ee5df7a2c55f408e230ff232cb5cb05a5eecda7efcabd296fbf83a02c6b3783346dba31844816b350cbb17d612af150ed1172020c4d740c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-18.04.1.ebuild b/kde-apps/thumbnailers/thumbnailers-18.04.2.ebuild
index ff1362dbc75b..ff1362dbc75b 100644
--- a/kde-apps/thumbnailers/thumbnailers-18.04.1.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-18.04.2.ebuild
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 33f9d05ea5b8..957225f08462 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-17.12.3.tar.xz 2960868 BLAKE2B 1218ff36c08404312c182dddfd21179dd579e07c11b819f08333568bcd1639f56be3d85e268e2815dbdcd7576e8a33638148aa417a1a4830a85585b301912a1c SHA512 e878e4add5301ee60a11522b678c781c54582fb36d4a59451bdc4a1220559cfe4128451271198f93f0333204c3a42cbff73b75e9d6c83ecf4b75e98c4a5b12fd
-DIST umbrello-18.04.1.tar.xz 3019540 BLAKE2B 2bce12665ee53aed4161717c2dfd33fd9afe8c52abe9f5727469dd09e3ec6e8b3e79e1b69a9fc03ccebb051ccd97cbff8c80ab9dcaa1a4bb0966553ff56b91ce SHA512 2049d6f3b088fdd48b8f452ce521a992142b4d08c66028e0294c26e2ec21472bcec009921d3ddc4ea06fb934da59e212a5ac7e86c37347efd8d3971ab9c5e747
+DIST umbrello-18.04.2.tar.xz 3019532 BLAKE2B 0f5bd56b23c7ef5f278e54881eccfb367b86fc5fd2b28bae7c25324fddb43bbfbd71dc55df14684850a92916fe3f535f8c586093c21c0df5b212197ca9978c35 SHA512 7143dbe7ed80bbb140ec4718fe089d51023545b2c568190b74a38b42df93a5e7b081b19053629243275d75698010fdc8d2c8ec7f5d34846283cedbc13ba1bce0
 EBUILD umbrello-17.12.3.ebuild 1372 BLAKE2B 4cf613b6910521a8477356953063c645532760498ce8b54719f3c29e1720ee3eb0ccd7ff1076b2f69ab588ffdf2ca940941438fa948567f4196a125d50b3ce8a SHA512 65168a40a49253b23bb22c1afdc8e5221924073d5dd1bdfafd9575d1c4bb511e8b9605ed09197e1688ffa3b7da7d605355af9a2ce74f0600ac119700835e6fca
-EBUILD umbrello-18.04.1.ebuild 1374 BLAKE2B 1141ee3a928cd4bb47b90c7352cd7b0b9a9ecd4e90ee0765d37b0c66844cd4c2572076de1aa6a5c5b043885f236525466996341ad0ea84431442be851226ff7c SHA512 c6cde8863f1bed8e4bd142095799e9b4c4aa3392a1baa7dbc25707158e429218f270d20a3866c6c31ff5e50e352800b00bdeebcfba5c2eaea3f5507796dd298e
+EBUILD umbrello-18.04.2.ebuild 1374 BLAKE2B 1141ee3a928cd4bb47b90c7352cd7b0b9a9ecd4e90ee0765d37b0c66844cd4c2572076de1aa6a5c5b043885f236525466996341ad0ea84431442be851226ff7c SHA512 c6cde8863f1bed8e4bd142095799e9b4c4aa3392a1baa7dbc25707158e429218f270d20a3866c6c31ff5e50e352800b00bdeebcfba5c2eaea3f5507796dd298e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-18.04.1.ebuild b/kde-apps/umbrello/umbrello-18.04.2.ebuild
index 7b9d3d5c2d81..7b9d3d5c2d81 100644
--- a/kde-apps/umbrello/umbrello-18.04.1.ebuild
+++ b/kde-apps/umbrello/umbrello-18.04.2.ebuild
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 686dcf9c5825..e932c0ea8106 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-17.12.3.tar.xz 38576 BLAKE2B 69b06025f51c5d9c9104e60e35cfc0399dd6b0f40097174a402476630656a2a8f2ea72a14d029a92b9eebd7d4e954c1d3c96cc921c8b23002b5ff16ad7b49228 SHA512 1d41a2da78a0e161f8d31a65e6783a8ffe4820837d8e509b241916f78a046f286bbd129c116b88f98f270c61b8bb1bee358004f01d44112dfe25c391fb96c152
-DIST zeroconf-ioslave-18.04.1.tar.xz 38908 BLAKE2B d524f70af01b3ea94df4601a1790612ff83dad11d826ec59a5bf02d78c68ed45e3dc0a784b59e0a52d369af1f1755a90ff3247a733606bde475a9b2a3756fbb3 SHA512 d94e5b234c6ba65fefc42f38304df73b11912136089b11f8fe4407851259b00ab1e54e0a77ed7d2c3db4bf585f3f3265c182882673188773f8490d6d726c7b0c
+DIST zeroconf-ioslave-18.04.2.tar.xz 38996 BLAKE2B 5876855a219bd8295671f8b1350299002ae8fc2ffbb1b085c4f0bed9afe70e167bfbb8592c92269f9fd96083c7454e042e08e48d5a2aebefbd09a0386bacb43c SHA512 1264ca04175d3a0b03b2031f36c451a353917ff9b8eeecfa2ef28e84b4d7ddc50138bdaef13bf4bc902d083b4f1a449e6abfe06c2631518a010406cfaed45890
 EBUILD zeroconf-ioslave-17.12.3.ebuild 480 BLAKE2B 86b9ede6f3a8ea99d360448d161804c2670b1f56a2cc45c779d42066638b4d37a18d3576c6b7977deee7de52742a3fb0c2b57906cbd606108b58571ce22f1ab1 SHA512 c3373cc48130617e01e151179a6d61d973f647b158663b2e514fb1e03cf181c9f5daa661eca4cf3d7ae4017030e2a4ebef5c5eeefe4049c588937ee45ded30bd
-EBUILD zeroconf-ioslave-18.04.1.ebuild 482 BLAKE2B 982c5e9af2f7868325b995b89bbccd8126357095be79b1fcf8164e22139ba36dd4c865e9f1faccf53138db60049162185c954060ccc5006f1d307d7bdf2da67c SHA512 af3773c381108def72974d02c96fa175a5fb5c132a812d333a277ab2b1b6510b119a06b0ad87e7fc82c24cfea3200ff246dc65577c0c74ebd3bb58f803a7f97b
+EBUILD zeroconf-ioslave-18.04.2.ebuild 482 BLAKE2B 982c5e9af2f7868325b995b89bbccd8126357095be79b1fcf8164e22139ba36dd4c865e9f1faccf53138db60049162185c954060ccc5006f1d307d7bdf2da67c SHA512 af3773c381108def72974d02c96fa175a5fb5c132a812d333a277ab2b1b6510b119a06b0ad87e7fc82c24cfea3200ff246dc65577c0c74ebd3bb58f803a7f97b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.1.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.2.ebuild
index 9b485d5e9478..9b485d5e9478 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.1.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.2.ebuild
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 465c8a555b7a..33e9620d3662 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index b7d44a79d5cd..d2ad8e47ece1 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
 DIST breeze-icons-5.46.0.tar.xz 1543996 BLAKE2B 634622e86a0931aed43aa18fda5ec502f9e9ee3d6443de327cf70b25078ec267080f619511221921a083d162bdb4578cc5e05413fc362829293fde9df33942fa SHA512 ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc
 EBUILD breeze-icons-rcc-5.43.0.ebuild 569 BLAKE2B 21e3a83934e04a4de03a5198e2a7d3b217ee5d7cdaf1d4008f8dce29f84de8635652cadd3b60c9a542ab2434d5d65afd815bb757ce0cd88df8be115a78731db7 SHA512 3760d506222833bf904edf51b5aa6b334ecfff3b94b7e072df45203e5fed0dfb8d57b8d43f7af19d697cc9b6761f766647386e654df9c9cc630665f1f6253200
-EBUILD breeze-icons-rcc-5.46.0.ebuild 571 BLAKE2B 478ba0537ce2a381e9fe24e461525419e8aa35b11b79d250848094bb5c06441b332139827e8521235f70fa524bd256a5d8f8863f45dbad2618a47e469d10cd2f SHA512 3ae8d5969305e5e99256102a67d41571bfab241166a1e707a40b6f0502f1154b01d12e006b2b8c04948fc742a85e74a663cd7e35fafef8886e9c15b3793e97c4
+EBUILD breeze-icons-rcc-5.46.0.ebuild 660 BLAKE2B 11217b620b6d8009ceed8a38564b961c4bdc11d6a76c268ab836ac8ee124835aaa6911fe2423c370fe3a2493538a2d81f585e1521c6a5670f3fb20c0648cd64a SHA512 8b6e0735eadb1be833ff24f974a7075cd10c13cb4350e7c7276af1568e9f82f74ae5576800786cba2fb535c1c799c800d25c6421097e238ec1c9de4c9f8aae82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
index 93736a98856c..86f1e24841b4 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
@@ -31,3 +31,12 @@ src_configure() {
 	)
 	kde5_src_configure
 }
+
+src_test() {
+	# bug: 655586
+	local myctestargs=(
+		-E "(scalable)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 39f2fe8544f3..e6bbddf89b23 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
 DIST breeze-icons-5.46.0.tar.xz 1543996 BLAKE2B 634622e86a0931aed43aa18fda5ec502f9e9ee3d6443de327cf70b25078ec267080f619511221921a083d162bdb4578cc5e05413fc362829293fde9df33942fa SHA512 ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc
 EBUILD breeze-icons-5.43.0.ebuild 525 BLAKE2B ddbd3095dab5fd24de2a4d1cc6e3335471653ea002c6cdd764c89118a0ae04a3a691a52e08982549d5017f68ff673e8a7f152f3a80f314c2201699a8f9bab8dd SHA512 465183143eff6527be88bbe1ea2b56c59ed75227dc89531d22b735cbe02ab2bd0ff1e4e71a0721356b6cf5c958688d264b17943b49e4364cb10db03beb0d24c3
-EBUILD breeze-icons-5.46.0.ebuild 527 BLAKE2B 14f6ee3048dd35f588990049657065f814f45fd07532932d7f610762e6d3494b8f89c737f285568ddb7ef96068fb35a890d97658bd051cfc953a59a988f2eceb SHA512 c21b69fa244a2da927b7e9dc9eea75427b53f746b02299290f5a581c2533d3073eeed62f704c01806046e27d68afa9f2acf5bfa3c0fc91c1e93b0f0bb4d73288
+EBUILD breeze-icons-5.46.0.ebuild 622 BLAKE2B 2474feab406f40bc12ada0ae7f9e6d4678e25a5d295096c7388380377e45e3b357c2bca77b5203ca01175f4dce46c64356466fa75e4387c3e9d579d69228c7bd SHA512 ea72e1e19649291bb51174b308388ddcf3db0db8341907500292d572e57ef13ab5d6a666af338212212d17a7dd54120878586a31136a400bcc3b80730977f2e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
index 137584fea4d7..fad25ff406bb 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
@@ -29,3 +29,13 @@ src_configure() {
 	)
 	kde5_src_configure
 }
+
+src_test() {
+	# bug: 655586
+	local myctestargs=(
+		-j1
+		-E "(scalable)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index b069bb046e2a..3d90416f729a 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,6 @@
+AUX kcoreaddons-5.46.0-kformattest.patch 3537 BLAKE2B 8f662df8a950c6cd102dc18c67c18628ac1318d1a76a076af08e0e7d6dc7aa92b502196d209b0e544c67ab83bd6cfa6b86098f305b9bbd8f10cd7f6cfdab9d6b SHA512 8cd914a542f5ba35857f8378b28413649fe27761d4a000589972b8ec25d1effda8e4f7d9e07c04f9e168af1d892051b263b8b61da42cb6b7be6a7643c2c31729
 DIST kcoreaddons-5.43.0.tar.xz 355784 BLAKE2B dd76abee04ba0e3772b1e1c8b03192ad3ae2768e1ef54059cffdf0fbac5e1d75d31495951ebf37470823121b4dfef9dca19246c44ba31b2751589820361e1607 SHA512 895a6b3547f78f5222a16be71c8fe8865b922e2d9b2a8fedf322c7df607ccdb6b4fd3928470dc5cef385eaf13c37a5d1dcbd959afc326afb48b8636cb4a4b77b
 DIST kcoreaddons-5.46.0.tar.xz 350224 BLAKE2B dee0f20b3f35a1f787f263e080a0e4641222b4a9e7f3a8eca736b97a4688ecfa30f26c3040cb655bdb47852381a6810dec712f8a426181bb24b680270a41e6bb SHA512 3c12462729a163fc7ab5a49ea9473b94d44ad4276243d65bcbe10a28fe6c1c4a9996bdf09c4f03b0083b4dff97e1719eb1aaf8b7d8dc882d4f66de61e7ef416a
 EBUILD kcoreaddons-5.43.0.ebuild 729 BLAKE2B 37c862eae2a91b817843435b50c3d90db529584f05b38dea876173dadda8721ad691fd83e5cb05d283d2a6541b12d7f28cab6438f9b35126ab8a71fb091b991a SHA512 22cf03b4cdd444a1829584a84efe5984caf8cd5aeb31c4b249173bfc19d91f448e20da2366eab5c94c8a2375af35e73cdcea3afcba1ef2cc1d0fb85abf82ab88
-EBUILD kcoreaddons-5.46.0.ebuild 731 BLAKE2B 055f5add0ea3bfd79aa2955aabeb9ea891a82715cf9611884ae07e13ec4ca4f5d8d94e141e91423add3a4d35db2025da22d57b16300b7ca996c20927f28071a3 SHA512 a0559e6e94b565853bba672dbacbdf961fe43f938ad3add4d0dac9b95a6bb5759a2c66bd5e71fb41aa0476bcedfeb6479063e123407d872b6d58b76301776eec
+EBUILD kcoreaddons-5.46.0.ebuild 873 BLAKE2B 3c0480db378ae21111958c90e7b096f038edce33a9843cc0c64910badae73a3e9add9ba7595bfb39cd79bb5027f3456cd17470ba50df56a8c5fcb613f175b788 SHA512 92e14d36fa59ac9d58dc81458ec919e2da2a418990c59c9f82181548c768688e846d386ea63d2429a4a3fcc3be4de761fe011ecbcdcc57cf0c327aecac822b2e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch
new file mode 100644
index 000000000000..64031659fdda
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch
@@ -0,0 +1,56 @@
+From: Maximiliano Curia <maxy@gnuservers.com.ar>
+Date: Tue, 15 May 2018 13:06:53 +0200
+Subject: fix kformattest plural forms
+
+---
+ autotests/kformattest.cpp | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp
+index 15080be..6cc3c52 100644
+--- a/autotests/kformattest.cpp
++++ b/autotests/kformattest.cpp
+@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration()
+ {
+     KFormat format(QLocale::c());
+ 
+-    QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)"));
+-    QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)"));
++    QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds"));
++    QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes"));
+@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration()
+ {
+     KFormat format(QLocale::c());
+ 
+-    QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minute(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hour(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)"));
++    QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second"));
++    QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds"));
++    QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute"));
++    QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minutes"));
++    QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour"));
++    QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hours"));
++    QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds"));
+     // Problematic case #1 (there is a reference to this case on kformat.cpp)
+-    QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minute(s)"));
++    QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minutes"));
+     // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is
+     // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there
+     // are hours in scene.
+-    QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)"));
++    QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes"));
+     // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration
+     // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result.
+-    QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)"));
++    QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour"));
+ }
+ 
+ void KFormatTest::formatRelativeDate()
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
index 4e70e58a430e..1848371366c2 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
@@ -19,6 +19,14 @@ DEPEND="${RDEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 "
 
+src_prepare() {
+	# bug 650280
+	has_version '<dev-qt/qtcore-5.10.0:5' && \
+		eapply "${FILESDIR}/${P}-kformattest.patch"
+
+	kde5_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-D_KDE4_DEFAULT_HOME_POSTFIX=4
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 796a272b9dda..68ca6b2761eb 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,7 @@
+AUX ktexteditor-5.46.0-CVE-2018-10361.patch 6579 BLAKE2B 9e992f2fc416cf51b30476df46f290069d490c22c09f5f0a7d790789163f1269373c607260ed638c62984cf405944ebd7a36b564ef6d80603827a3f23c4c5662 SHA512 c67557557e8eea7c74426df333301c8e8db6af7d892e7a8aff7e545b450155253b47eabc3a1baeb669e7e34539615d8f8cdf99e4b199204a4decb9962b11b423
 DIST ktexteditor-5.43.0.tar.xz 2302580 BLAKE2B 458e60148b02f59dd2da11a865bb11386b38a483493b3e7cd95b2f9edef4d8b90c03e453a37411f64e70ea66a81f486bba934111ae9e8d1361c1b38e6e7ed69b SHA512 fc2b3b69224e62d1bf240410fa5c3dab04e020f210230474e5e924c7125f626cd2dd30dee449948cb9197adc8f0d6e1886ed85e03312a51d116d86fc13fbf08d
 DIST ktexteditor-5.46.0.tar.xz 2296888 BLAKE2B 45572ff487505c38f6dfa23b96bd84ba83292ae1077bf3615fc2d30aaf6aa0347605a7c2ae4df68cc92552c1ecd8060ce1ba44f11bc78cfe736149476d6af5ab SHA512 b0197a82e9489c4093594c68a6c21dc9e204ec78cd17e5a0117d84e501710d90ad06214ed217332279f3b67ae84119d09d6eb19e33b37b7bde2ebb8a07b6a543
 EBUILD ktexteditor-5.43.0.ebuild 1425 BLAKE2B 00eeb14ac463fc23b391229bb4bf605b9c12c0e91fbdb81773f7bb0bdab0ec3836b0463c43beed8146431b14b28ffb73a456b192c27fdebdecca86da57dd073e SHA512 ba454c8d95abc15b5f746f63bf175b83991c46dccf54117b9769820341fa400ee35dc0bf54d3a7cced63deec5daa3cb49ba55751a7461e48adb7edd89a88abe8
+EBUILD ktexteditor-5.46.0-r1.ebuild 1480 BLAKE2B 4b75e3a34ae782e26e53bc636aef5b0d71b4b54c129239120205bca4db3f1ffca5b4635a473032a486e3948cac1edb9f9860ad6a4df9c7debc89b5b6603e226c SHA512 c857d1bc43c348c825224c4ab05aa1efdc0d19da91580fb95fc8550967014662a8a3de6d5d62bc0bf001b4a95a0e04ba3865234e64f8c57c91fba1f8d3b7bc0d
 EBUILD ktexteditor-5.46.0.ebuild 1427 BLAKE2B 06ae9c7111371de93791cac534e9959d6b32ea22affe26193148185b2564332cde237eb7c0c698894c69f52c62a9e10c4ab5508dad736ce9e953a964fda28be1 SHA512 1fc22a7562f17aed007dce8a6d1263944a432e680da55a93355092f413483ae8ab37244b8d189d7d70ace3a9bf16108195e39397eca6d5f6f4d65e39a1cc4100
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch
new file mode 100644
index 000000000000..d3b9b5d480ac
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch
@@ -0,0 +1,187 @@
+From c81af5aa1d4f6e0f8c44b2e85ca007ba2a1e4590 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 7 Jun 2018 16:12:25 +0200
+Subject: CVE-2018-10361: privilege escalation
+
+improve handling of temporary file to avoid possible race-condition
+
+Differential Revision: https://phabricator.kde.org/D12513
+---
+ src/buffer/katesecuretextbuffer.cpp | 99 +++++++++++++++++--------------------
+ src/buffer/katesecuretextbuffer_p.h |  4 --
+ 2 files changed, 46 insertions(+), 57 deletions(-)
+
+diff --git a/src/buffer/katesecuretextbuffer.cpp b/src/buffer/katesecuretextbuffer.cpp
+index 0647bee..c014608 100644
+--- a/src/buffer/katesecuretextbuffer.cpp
++++ b/src/buffer/katesecuretextbuffer.cpp
+@@ -53,39 +53,37 @@ ActionReply SecureTextBuffer::savefile(const QVariantMap &args)
+ bool SecureTextBuffer::saveFileInternal(const QString &sourceFile, const QString &targetFile,
+                                         const QByteArray &checksum, const uint ownerId, const uint groupId)
+ {
+-    QFileInfo targetFileInfo(targetFile);
+-    if (!QDir::setCurrent(targetFileInfo.dir().path())) {
++    /**
++     * open source file for reading
++     * if not possible, signal error
++     */
++    QFile readFile(sourceFile);
++    if (!readFile.open(QIODevice::ReadOnly)) {
+         return false;
+     }
+ 
+-    // get information about target file
+-    const QString targetFileName = targetFileInfo.fileName();
+-    targetFileInfo.setFile(targetFileName);
+-    const bool newFile = !targetFileInfo.exists();
+-
+-    // open source and target file
+-    QFile readFile(sourceFile);
+-    //TODO use QSaveFile for saving contents and automatic atomic move on commit() when QSaveFile's security problem
+-    // (default temporary file permissions) is fixed
+-    //
+-    // We will first generate temporary filename and then use it relatively to prevent an attacker
+-    // to trick us to write contents to a different file by changing underlying directory.
+-    QTemporaryFile tempFile(targetFileName);
++    /**
++     * construct file info for target file
++     * we need to know things like path/exists/permissions
++     */
++    const QFileInfo targetFileInfo(targetFile);
++
++    /**
++     * create temporary file in current directory to be able to later do an atomic rename
++     * we need to pass full path, else QTemporaryFile uses the temporary directory
++     * if not possible, signal error, this catches e.g. a non-existing target directory, too
++     */
++    QTemporaryFile tempFile(targetFileInfo.absolutePath() + QStringLiteral("/secureXXXXXX"));
+     if (!tempFile.open()) {
+         return false;
+     }
+-    tempFile.close();
+-    QString tempFileName = QFileInfo(tempFile).fileName();
+-    tempFile.setFileName(tempFileName);
+-    if (!readFile.open(QIODevice::ReadOnly) || !tempFile.open()) {
+-        return false;
+-    }
+-    const int tempFileDescriptor = tempFile.handle();
+ 
+-    // prepare checksum maker
++    /**
++     * copy contents + do checksumming
++     * if not possible, signal error
++     */
+     QCryptographicHash cryptographicHash(checksumAlgorithm);
+-
+-    // copy contents
++    const qint64 bufferLength = 4096;
+     char buffer[bufferLength];
+     qint64 read = -1;
+     while ((read = readFile.read(buffer, bufferLength)) > 0) {
+@@ -95,30 +93,43 @@ bool SecureTextBuffer::saveFileInternal(const QString &sourceFile, const QString
+         }
+     }
+ 
+-    // check that copying was successful and checksum matched
+-    QByteArray localChecksum = cryptographicHash.result();
+-    if (read == -1 || localChecksum != checksum || !tempFile.flush()) {
++    /**
++     * check that copying was successful and checksum matched
++     * we need to flush the file, as QTemporaryFile keeps the handle open
++     * and we later do things like renaming of the file!
++     * if not possible, signal error
++     */
++    if ((read == -1) || (cryptographicHash.result() != checksum) || !tempFile.flush()) {
+         return false;
+     }
+ 
+-    tempFile.close();
+-
+-    if (newFile) {
++    /**
++     * try to preserve the permissions
++     */
++    if (!targetFileInfo.exists()) {
+         // ensure new file is readable by anyone
+         tempFile.setPermissions(tempFile.permissions() | QFile::Permission::ReadGroup | QFile::Permission::ReadOther);
+     } else {
+         // ensure the same file permissions
+         tempFile.setPermissions(targetFileInfo.permissions());
++
+         // ensure file has the same owner and group as before
+-        setOwner(tempFileDescriptor, ownerId, groupId);
++        setOwner(tempFile.handle(), ownerId, groupId);
+     }
+ 
+-    // rename temporary file to the target file
+-    if (moveFile(tempFileName, targetFileName)) {
++    /**
++     * try to (atomic) rename temporary file to the target file
++     */
++    if (moveFile(tempFile.fileName(), targetFileInfo.filePath())) {
+         // temporary file was renamed, there is nothing to remove anymore
+         tempFile.setAutoRemove(false);
+         return true;
+     }
++
++    /**
++     * we failed
++     * QTemporaryFile will handle cleanup
++     */
+     return false;
+ }
+ 
+@@ -141,28 +152,10 @@ bool SecureTextBuffer::moveFile(const QString &sourceFile, const QString &target
+ {
+ #if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID)
+     const int result = std::rename(QFile::encodeName(sourceFile).constData(), QFile::encodeName(targetFile).constData());
+-    if (result == 0) {
+-        syncToDisk(QFile(targetFile).handle());
+-        return true;
+-    }
+-    return false;
++    return (result == 0);
+ #else
+     // use racy fallback for windows
+     QFile::remove(targetFile);
+     return QFile::rename(sourceFile, targetFile);
+ #endif
+ }
+-
+-void SecureTextBuffer::syncToDisk(const int fd)
+-{
+-#ifndef Q_OS_WIN
+-#if HAVE_FDATASYNC
+-    fdatasync(fd);
+-#else
+-    fsync(fd);
+-#endif
+-#else
+-    // no-op for windows
+-#endif
+-}
+-
+diff --git a/src/buffer/katesecuretextbuffer_p.h b/src/buffer/katesecuretextbuffer_p.h
+index a38285b..e00721c 100644
+--- a/src/buffer/katesecuretextbuffer_p.h
++++ b/src/buffer/katesecuretextbuffer_p.h
+@@ -56,8 +56,6 @@ public:
+     static const QCryptographicHash::Algorithm checksumAlgorithm = QCryptographicHash::Algorithm::Sha512;
+ 
+ private:
+-    static const qint64 bufferLength = 4096;
+-
+     /**
+      * Saves file contents using sets permissions.
+      */
+@@ -66,8 +64,6 @@ private:
+ 
+     static bool moveFile(const QString &sourceFile, const QString &targetFile);
+ 
+-    static void syncToDisk(const int fd);
+-
+ public Q_SLOTS:
+     /**
+      * KAuth action to perform both prepare or move work based on given parameters.
+-- 
+cgit v0.11.2
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild
new file mode 100644
index 000000000000..6920f6f7c32f
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2018-10361.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index b5ec0c63e8db..abad900a4258 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.43.0.tar.xz 2180220 BLAKE2B cd82f14bc6d4970377857d0f66a5694473db33459be0337cba863bba206243bdcc1aa4c2c7a3b37df3aded7e88174215c01b5f8be82662cb56ef6d2b56aada2b SHA512 ae7664ab700cdb9aa35334005ae58d49db659cea4112fa81a09a37538809910841494bf97f3f982f99e27a376031645c5d0349e4cc77ab2c0fa6ea9484a08140
 DIST kwidgetsaddons-5.46.0.tar.xz 2183504 BLAKE2B 5f8535b6e0ebb93eed8fd8e5079fc00476278bcdf70cad97b9309026066f0fb7b872210ab5cef21a15f5043ccdc5b73bf74be8083a67bf90be4796f76f1cb621 SHA512 7b5f7ea2d2af4c5d16f4a826031bf452545d55c4041c34610e82ad2d65d28404d4f2bc928dc61ea4a181513d607c6268ea9d9fda93d284396e35f9caa502feaa
 EBUILD kwidgetsaddons-5.43.0.ebuild 498 BLAKE2B 44dc1162aff32eb6069345dce9c3a2f75dddcb5955c952a67958436df706b7d334e23e473842e26501a220bf92e40f5ef3755cdd05f65be75193578475453903 SHA512 a0171abb9e65dc90622692372ea936a3eafbd6385ce56a1ffc40c854e0325c0a602ef23beb4bfc0cd68a637b64802eadc06b72c82929d02b94b0b9246b031ea3
-EBUILD kwidgetsaddons-5.46.0.ebuild 500 BLAKE2B 95a0f3134bb01436d8e78856da003bc0e7eabdf6a7377e9794def8fbe0ebb19450c71bed0e673817ead403bb6a954a6e4453a1e0372ba3442894e924343671f1 SHA512 40b55d6615d540f441401eb4589c1375f684323e940e916891a1350e099158fb4663c035c964b1006c4d1c7ae5084bce0cc9ee9e748eadcd3bcae4c3b070cc73
+EBUILD kwidgetsaddons-5.46.0.ebuild 527 BLAKE2B 4aa9b42503b70985dfe90ea3a726d568ab272cd52bac59734578589a5339cd1608f43b03074cfbcf6978f363812eeae2813b142595569b92d65c941ef33e36b8 SHA512 1dcdceac3c33cc3d9078c4fb10a61b1c1367cd605242d10cb92a34a88e2f8cc316845c7a7d5368a3573ea8ffec581600457c55dd061c0fd1f24ddeb99156141b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild
index 7a1f9c81fc77..1b30813bfb33 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 "
 
 src_test() {
-	# bug 650216
-	local myctestargs=( -E "(kdatecomboboxtest)" )
+	# bug 650216, 653186
+	local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
 	kde5_src_test
 }
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 9ba93c5adab0..29fa82fcfa9b 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.43.0.tar.xz 884284 BLAKE2B 01228a6aaae155bce38e44ee64110a2cb29e952c1ac9cf0107e1f09a7003b35487bb23000eeae17bbf0debe8b7b509b03733b4a0d595ff3bae58db9e013a28bc SHA512 ace47a5a01267ba33bc9173058a05cb49cfba7d18a171527df4afb094e437885b697fe5ab02d1609f6e577857f3f27d7d4ac2a25f6ea2dd659291d82fe25aa75
 DIST kxmlgui-5.46.0.tar.xz 884584 BLAKE2B d3beefcdf8ec6bd3e31d6a4a0b505725d7fbe9964f0d6eeefdbe6403b65ac7fd6e040da619fc4d6d87152ef1b6278a9dde34b7baae81a0835f66ba3a8d7e68ee SHA512 2b1595a83957fa2a9c974ba991fb17a83032e52c06bbb76c7aa0331af0d27efb1509fbbeba66e6c2292f674903b20b82b570aa32ee524b2c3f5d8e76c7d25848
 EBUILD kxmlgui-5.43.0.ebuild 992 BLAKE2B 777d84fa2d932bf9758640531703ef8274f2821a8f85fece9bbe8fee9bde09e2c2bfba48197aca0868b473eca9c04eb1ccf8c2ffc8793a5c854886abb79639b1 SHA512 be4678470f84a04046f91f9b29499eced1c26c534bd0fa58c2b536dbc7840c369bb73a6d13e5160a93a64bafef5ab9229d6c332345370a101b55e211ebd98609
-EBUILD kxmlgui-5.46.0.ebuild 1074 BLAKE2B 9bfeee09c275034b61d631f4ea3ca4c460193e9305f60ab870d9036bedb309c1fe9cc7e45144729951960f9f761e479052a7e0e9224ab5945c5e498e8ecf0fa0 SHA512 0151f461109cd890abc41164cd11f902ca17f07c141f72472b9fa6c2613a5fb6ab481dbf69c151bfd3a80075263a90cd5ad43fad32d24c369c357dba71f11aaa
+EBUILD kxmlgui-5.46.0.ebuild 1206 BLAKE2B 4e36b82216ff2743aa84b0f79d45e84e706033965cf6a168593dea3f7d6f4f0b3d8593c4f665468e5c445306d5a60fdd024c6f9cd0050ad0cf58a1d1c8660633 SHA512 87fd2f59cedde55f733fd2da6bfc74a4c2e6144579dbf76a05e2155d291bffabaff763a0de789d6f6f5a779192f693f850d2c5e7d923a405460d34654b322325
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild
index 6ef406394e84..daa137afbf96 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild
@@ -41,3 +41,13 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	# Files are missing; whatever. Bug: 650290
+	local myctestargs=(
+		-j1
+		-E "(kxmlgui_unittest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 84a911dc88ac..5944777c7769 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 501cab12a655..2b1b95e97af0 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,8 +1,4 @@
 AUX kdeconnect-1.3.0-no-wayland.patch 523 BLAKE2B c29b58a3f1f97f09c67270f6b55f8122ccca834b979717bc1c5ad279675106acaa23da1d4a4a08dcc4194b6837cb5fce23ecfd12d5d8d1ed4adb8b4fdd077eae SHA512 68527f15ec3f0af14e33e857567c2fcc622f5dd5fc0652dc0af95e91dc5b96929df9db4961d9aa528be73b87e021877d7f6ee5894a2a195446a7235ca979b664
-DIST kdeconnect-kde-1.3.0.tar.xz 281972 BLAKE2B 62e8b59bc661be7a17ef4e160411dff2150ea8639f69388f32453d3b0066ebc7333987b7df31241eac7d95b994f91347432226ef7f5d7bb864b87108fb974544 SHA512 837f6129393fc1e6d68c1c0cc7eea244bc1702fa4beb9bfc764d001077a890ff7c9a954de738ccabb3369f1a9a08325300514eecdbced939ad8e8b360a4b2045
 DIST kdeconnect-kde-1.3.1.tar.xz 283636 BLAKE2B 8790ff2f411539db6759ddcad6a9401b2769c7c02f7a0465e0141f10eb6b5675fa56ac89bce94ae02326ce6eb13911f0b97684660df05195df596c1848d1f219 SHA512 52157dc7c7c3caec9871e9feb69c7aa8b82738fa5d4e60bb7492a9ded672351fbb6773ebf166281da9e585798583c1b23ac52bfd60927bb606472b19c5dc8538
-DIST kdeconnect-kde-v1.2.1.tar.xz 278612 BLAKE2B a0803f34232eca16baf2c00ea96ccc33be8c631b40041aa6cfffab933ba984ff95639ae3103bd6499583ac6ba0c8e70f50bd6db30ff3d50f93a5d9e232dec303 SHA512 d336350ce1698d1fc2aa2ee02a4fec9c7ce5eedbf346ec40d502f7b5c1c555a370f09a65d88d70ece09c4a7bcf240921df31f803215afce657c9b4cb113baa58
-EBUILD kdeconnect-1.2.1-r2.ebuild 2076 BLAKE2B 8f40f9ffb412de628ec3e5c5dc44d544cc671ee47d76b4c22161d3379b66cae93ed4512a76f94d79eaee9fb028f22541fd2bfa3cae0299094a96c2209846ea26 SHA512 ed0da87b29207690d11064329db26c70c28d2c168ae7d990574c582290ec3d533c3dc63ea83b10632370075c13bb7410ae3bbbdd0feac14a89fcb8c2e33211e8
-EBUILD kdeconnect-1.3.0.ebuild 2146 BLAKE2B e56911e541a3bbabb08a23fabced60d86974d8539a50c9f378e48f2a2a1618a0657b4b3e6ef213d7f711295e2b4d5aa0279b23c5e967e523cc15b4d3cf7f7221 SHA512 f5434ee734a0404c86ac660567acbd61c309ce840ac28c63f8950af7db135aefa07c9a59344cb7e96ff9f2fd55b823b2392391a196fc8c364896cb8d13c8360f
-EBUILD kdeconnect-1.3.1.ebuild 2207 BLAKE2B 3b75875fbe52ad33a627d412277c0be62312a1710dd8ddf9e8f3c308c8c77f40e96358ea9335bfdf635e9772710b46e552ba1e971e828b502faf3248be496150 SHA512 98ccf280b12b92177db192c7b1fac8eaeeeb634a7eb3158be777a7c551b350aba8127f575ad07e932baebba27830fb5874ffd58874d5a24bfb0ecc66b5317f6a
+EBUILD kdeconnect-1.3.1.ebuild 2205 BLAKE2B efe4fbd831eb259ea1feda30b17fbe305c3603a4891991e9be78fba96845ada5909856e68001c137f8fc49fabad2928fe860b651bbc38d7163e61c9a60de4d1d SHA512 e42292f167f7fc261249502dab25a9df91cae5123b616d497df872780721eada3d889f99dd17141ec9404e597347a01eedd5ffaf97b3ae90b8ca86c0bdae14f8
 MISC metadata.xml 542 BLAKE2B ca880a9dbf862f3b76d30b2fe8bdcf83487606179785fa7060dfc50342df4b73c55a45302b8eb0306559d5da907d958c71ccde0028f23ddf3353465b446a536a SHA512 76c1a4ccab6959be8982ffaab3830fbbe4e3c1c55ad5793bd07fa1c037b1632a2b568d2049bf83f71d437b72f01638d6fe54e17744df95cfe04b2d99828a08bf
diff --git a/kde-misc/kdeconnect/kdeconnect-1.2.1-r2.ebuild b/kde-misc/kdeconnect/kdeconnect-1.2.1-r2.ebuild
deleted file mode 100644
index bb97c4bef86f..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.42.0"
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-KMNAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-inherit kde5
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-v${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="app wayland"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=app-crypt/qca-2.1.0:2[qt5(+),ssl]
-	x11-libs/libfakekey
-	x11-libs/libX11
-	x11-libs/libXtst
-	app? ( $(add_frameworks_dep kdeclarative) )
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-RDEPEND="${DEPEND}
-	app? ( $(add_frameworks_dep kirigami) )
-	wayland? ( $(add_plasma_dep kwin) )
-	!kde-misc/kdeconnect:4
-"
-
-RESTRICT+=" test"
-
-S="${WORKDIR}/${KMNAME}-v${PV}"
-
-src_prepare() {
-	sed \
-		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
-		-i daemon/kdeconnectd.desktop.cmake || die
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DEXPERIMENTALAPP_ENABLED=$(usex app)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	elog
-	elog "Optional dependency:"
-	elog "net-fs/sshfs (for 'remote filesystem browser' plugin)"
-	elog
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog "or via"
-	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
-	elog
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
deleted file mode 100644
index a4c3a879ba28..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.42.0"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
-LICENSE="GPL-2+"
-IUSE="app wayland"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=app-crypt/qca-2.1.0:2[qt5(+),ssl]
-	x11-libs/libfakekey
-	x11-libs/libX11
-	x11-libs/libXtst
-	app? ( $(add_frameworks_dep kdeclarative) )
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-RDEPEND="${DEPEND}
-	app? ( $(add_frameworks_dep kirigami) )
-	wayland? ( $(add_plasma_dep kwin) )
-	!kde-misc/kdeconnect:4
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-no-wayland.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed \
-		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
-		-i daemon/kdeconnectd.desktop.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DEXPERIMENTALAPP_ENABLED=$(usex app)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	elog
-	elog "Optional dependency:"
-	elog "net-fs/sshfs (for 'remote filesystem browser' plugin)"
-	elog
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog "or via"
-	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
-	elog
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild
index e5896a909ecb..2becdf4d6b4b 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index 6515f0c21751..d535c5e6bf49 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1,5 +1,3 @@
-DIST k4dirstat-3.1.2.tar.bz2 227623 BLAKE2B 718360b79fb164960f99680a1501f72e65b0108a6ab9a38f72100df7ea9541a77d1d967d4eb645dd84978fa94553e9dd4b1b91d73144862bca8668ea401a0be1 SHA512 52c8fb58bde8f2ebb3404a3553ad5e3c838e95353808165f2e8f088f4848b40a5dda3427c6f24dd3d8bc8858e9c28f1f1db0993963c16cf355eeba253fc8344c
 DIST k4dirstat-3.1.3.tar.bz2 230480 BLAKE2B ddb91b9d6a4ce119f4f3c71541ad490b973de1e6648ce019e48374d825b18ba697b652f59d42995b14f53e730370ee41f9910056406711003e506e0826b9ad39 SHA512 b5e71d5d235ead64d1a7c6005551585316a8565c806a3ca07050331b2a8ff13f7048b1cc54489e84f49be3abedf01c65b5b6951724c955f540d7c3fa0bfd2afc
-EBUILD kdirstat-3.1.2.ebuild 1036 BLAKE2B 756228e6969124077919c7196ceab5c3f0f75a903d61f1c6f019cefa428df61f9fbfe577217b268c0b071d0f186d83bbd4014c46cc48fa8fbd2e9b5f8032d106 SHA512 3708c0378d32bcfb65d582ec5d84295669c998284e2ce1ee891ef06e73c03bed546a9242298e1ab0a3e1da6b97983c55b26b2faa7dbe43754a5bb81a3d774e2b
-EBUILD kdirstat-3.1.3.ebuild 1038 BLAKE2B 6466e587ce87458d30345e9c0b049f07fe672e8ee91c753cf8d9307e4276dae58df7f48d76207dafd8f4bbc9f856669f15e2e596cd1b6b2f89bd834541363708 SHA512 13691e8dd649ad5c09677be090e667a805884202507a7100587daea59f21493a984174f600f40ae071a04ce1cc28c0aa2816c12852e947415e8b6cffff12c1d0
+EBUILD kdirstat-3.1.3.ebuild 1036 BLAKE2B fa895b42652630eb5c74c64bbdebe300bf75e0c9fbc6eb8c521cbb2d2ed08aa724aea7e00e1e5ef705f21f9438b850c2785912d490221cef47eeb05c1c3ce82a SHA512 6f9e41d2c696388e45d426cb58335c28d48ad73350266eaf634b42963dc3326145043ef26918ae3ead56a1309870164845de5fd331c33fcbb09b5413e58a9708
 MISC metadata.xml 339 BLAKE2B 4d90cd665c996f0ff88b63c4d0184f1b090af57d024918fddb2fbe59f8d5de1f01e4acfcae03e08368958abb93abb841a5e18affc7e6345d60d556aaabbf775d SHA512 5ca88965bbed764c5ad756afe72df1aecf665b9325d1c40161836a0cbf44b117e20679dd8e62795b5a85f8b4b417f56a02ad8ce7a739198f4f5084d7c63dd3da
diff --git a/kde-misc/kdirstat/kdirstat-3.1.2.ebuild b/kde-misc/kdirstat/kdirstat-3.1.2.ebuild
deleted file mode 100644
index bef8cfdf24dc..000000000000
--- a/kde-misc/kdirstat/kdirstat-3.1.2.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="GUI equivalent to the du command based on KDE Frameworks"
-HOMEPAGE="https://bitbucket.org/jeromerobert/k4dirstat/"
-SRC_URI="https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/kdirstat:4
-"
-
-src_unpack() {
-	# tarball contains git revision hash, which we don't want in the ebuild.
-	default
-	mv "${WORKDIR}"/*k4dirstat-* "${S}" || die
-}
diff --git a/kde-misc/kdirstat/kdirstat-3.1.3.ebuild b/kde-misc/kdirstat/kdirstat-3.1.3.ebuild
index ef6184cdc45f..06caeec19ea9 100644
--- a/kde-misc/kdirstat/kdirstat-3.1.3.ebuild
+++ b/kde-misc/kdirstat/kdirstat-3.1.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/jeromerobert/k4dirstat/"
 SRC_URI="https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
index a44196aab888..9d814152a273 100644
--- a/kde-misc/kmarkdownwebview/Manifest
+++ b/kde-misc/kmarkdownwebview/Manifest
@@ -1,3 +1,5 @@
 DIST kmarkdownwebview-0.5.2.tar.xz 60468 BLAKE2B f484d7c9efe370fb56243ce1ffaf04b37f3f45c9a5922045efcf1c6441278256335c98022fee1f78afa4877f5563be764dcbfd2e19f13cf9bbc205384147cc6c SHA512 0e0ff8880ea372c2ee406ebd54a7fd8e19e68bbed7a03096ff39e773d80728220ccc90a5791728d467fe10d8174c5bda46f25577c081cede2690648fe9964b9c
-EBUILD kmarkdownwebview-0.5.2.ebuild 870 BLAKE2B 6e3d20c70c6a966e0bdd99e73485942e50285b629cd59d9366fa72937c92281776695c9c749d786f44b9b2e06d0335c5be6512ecc851d8e648380d515e29db22 SHA512 1b812e6d85c1b10458eec8d94dc2ee584343b8f92c17bfe61dc6e1c502839a7be0923b9b5bf61c47f0562ea7475345094e4ad03eb9ca887e14458cc953cc2b3b
+DIST kmarkdownwebview-0.5.3.tar.xz 62480 BLAKE2B ea8104b084e4be66aa37001cf7b1b159c8f7f03c2a32eb75d69aff2d447c9a57c1a5f0419137bfa790510bd8532a8bd7e171dae901d0bceab0cc193868069d83 SHA512 04864a069b502f0293d7b66c7ecfb4e32048611028f54b4e33cfcef4931fdc6a3947aff8c863975ea639bd2c3b9c8f2fbc27624247864e20862d050b032b6fc2
+EBUILD kmarkdownwebview-0.5.2.ebuild 869 BLAKE2B 9f7fefdb255c10f908a78a9541f6be05bf8eac7dec210f8c5af23c533b1a44fd55d53cdcc7cce77f297feca26a0d8f47d18ea28286f16c023935958722a1ec65 SHA512 ed02c2320731c15c84ddaf84f2b2b67a8f022e7b76ec1431231517658f65ca842e1eef963664c6cb91a5f8a2dca934160ef6675eef7efb7f7eeb6673822d468c
+EBUILD kmarkdownwebview-0.5.3.ebuild 870 BLAKE2B 6e3d20c70c6a966e0bdd99e73485942e50285b629cd59d9366fa72937c92281776695c9c749d786f44b9b2e06d0335c5be6512ecc851d8e648380d515e29db22 SHA512 1b812e6d85c1b10458eec8d94dc2ee584343b8f92c17bfe61dc6e1c502839a7be0923b9b5bf61c47f0562ea7475345094e4ad03eb9ca887e14458cc953cc2b3b
 MISC metadata.xml 365 BLAKE2B 708304c47cade844b320dbdbe71124d0cdbab506b655095ab9ee703f3cc5f44c0bc1561ccd7dfec9d9b2b14edaae90abf323cbd1ea6cdda1fbc6fa5193c15c81 SHA512 dbb15189ec2a5c3cc0afd100dba5c187a2464c8fd12e048f4d65aa39165c7cc093fbca646792768371f5fb2997c3b721d64524e63542693b44562b6f3bf755f5
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild
index 4a3e6df449f9..e1551634f349 100644
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="!webkit? ( BSD ) LGPL-2.1+"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="webkit"
 
 DEPEND="
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild
new file mode 100644
index 000000000000..4a3e6df449f9
--- /dev/null
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KPart for rendering Markdown content"
+HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="!webkit? ( BSD ) LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE="webkit"
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? (
+		$(add_qt_dep qtwebchannel)
+		$(add_qt_dep qtwebengine 'widgets')
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QTWEBKIT=$(usex webkit)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 9b2feb3b406d..b6a144990acd 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,6 +1,4 @@
 AUX skanlite-2.1.0.1-cmake.patch 2978 BLAKE2B 68d39415f4199b018028b16727f734117a7499be83904e80b9aeb2837a835141363516e0b452d81ddaab8b874de75e869168c9215babb3230c9a02a33b7f33e7 SHA512 7a7ee0f6b7b82a2b8e90ac58d632c92eb7c0992195f104ed794d14c451a21fefb7a3621bc22c14948b83b8e9aa86d9868ebd97d780a8d31f01186485d507d3ce
-DIST skanlite-2.0.1.tar.xz 2139624 BLAKE2B f6959650e6e59899e24f20214b2e94b0f4c004982e2ff961384c4a07e13305c6f839f679759db088c16ab879b499eb700edb5f7d8d65056ddd155c3a55f5365b SHA512 2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e
 DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
-EBUILD skanlite-2.0.1.ebuild 1037 BLAKE2B b3c71e2dda3337152176a621b3fe600a10ff99fdb1ac8ee11a51d7e0bc1f2852e12cf13f0533ad77682ae3f7e91e027ea37f50cca07b0bdf2bcd8592c2511717 SHA512 9f736d35833822020e1d569c03ed67d1695fdfcdd81db2996fe2212b55db192ad27ce9bc659fb22b558066ccea60fcb1a9978da61501b88a6346fde0000a6717
-EBUILD skanlite-2.1.0.1.ebuild 887 BLAKE2B 07625cdeb396047ad3a55197f7d24b976b7f932756e4bce5067123a0019c0fb6a635deb5d205c676ed34a83a231c102a0194ec0a86768c9ba825561a3942f6a4 SHA512 1b570692ae768fd6cf9d581c0c47e4949e3aff32193446125188bf8305615743eb8ad2d500a8203b6cd53f89ca440bfd80425c8ae54a00d039cbad9355848787
+EBUILD skanlite-2.1.0.1.ebuild 885 BLAKE2B 98420a2dc02261ad4480f6e87b65fccbb227f6f6c2ddfdbd6462041a2ef03258cd444c9fd88e47add8e64368a4c7d439fd92b222cd77cd4f0c949e20d8057d19 SHA512 9c03dd4f8ae6190bb7274dbc3a625b71a3743a62ce93fa607647b213bf24153cc46cf8cd50fc5dbf29699a6a9557a52f7fb19ecc47450bcbb129c503ed93605f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/skanlite-2.0.1.ebuild b/kde-misc/skanlite/skanlite-2.0.1.ebuild
deleted file mode 100644
index 1d3bed58d364..000000000000
--- a/kde-misc/skanlite/skanlite-2.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE image scanning application"
-HOMEPAGE="http://www.kde.org/applications/graphics/skanlite/"
-SRC_URI="mirror://kde/stable/${PN}/2.0/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libksane)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libpng:0=
-"
-RDEPEND="${DEPEND}
-	!kde-misc/skanlite:4
-"
-
-src_prepare() {
-	kde5_src_prepare
-	cmake_comment_add_subdirectory autotests
-	cmake_comment_add_subdirectory tests
-	sed -i -e "/TextWidgets/d" CMakeLists.txt || die
-	use handbook || sed -i -e "/DocTools/d" CMakeLists.txt || die
-}
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
index c0883592a570..6c23b07d2c59 100644
--- a/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
+++ b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/graphics/skanlite"
 SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 6b34aa0e06a8..5565c7567848 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/modeller b/licenses/modeller
new file mode 100644
index 000000000000..4921a6462b45
--- /dev/null
+++ b/licenses/modeller
@@ -0,0 +1,19 @@
+End-User Software License Agreement for MODELLER
+
+   1. Andrej Sali (``LICENSOR'') grants to (``LICENSEE'') a fully-paid, non-exclusive, and non-transferable license to use the ``MODELLER'' computer software program and associated documentation furnished hereunder (hereinafter called the ``PROGRAM''), upon the terms and conditions hereinafter set out and until termination of this license as set forth below.
+
+   2. LICENSEE understands that this Agreement is license for use of, not sale of, the PROGRAM. Consequently, no Purchase Orders can be accepted by LICENSOR.
+
+   3. LICENSEE acknowledges that the PROGRAM is a research tool still in the development stage, that is being supplied ``as is'', without any accompanying services or improvements from LICENSOR and that this license is entered into in order to enable others to utilize the PROGRAM in their scholarly activities.
+
+   4. LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. By way of example, but not limitation, LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE PROGRAM WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. LICENSOR shall have no liability nor be liable for an direct, indirect or consequential damages with respect to any claim by LICENSEE or any third party on account of or arising from this Agreement or use of the PROGRAM.
+
+   5. LICENSEE agrees that it will use the PROGRAM, and any modifications, improvements, or derivatives to PROGRAM that LICENSEE may create (collectively, ``IMPROVEMENTS'') solely for internal, non-commercial purposes and shall not distribute or transfer the PROGRAM OR IMPROVEMENTS to any person without prior written permission from LICENSOR. The term ``non-commercial'', as used in this Agreement, means academic or other scholarly research which (a) is not undertaken for profit, or (b) is not intended to produce works, services, or data for commercial use, or (c) is neither conducted, nor funded, by a person or an entity engaged in the commercial use, application or exploitation of works similar to the PROGRAM.
+
+   6. LICENSEE agrees to notify LICENSOR of any IMPROVEMENTS made to the PROGRAM, as described in Section 5, above, and hereby (a) agrees to supply LICENSOR with a copy of same, and (b) grants LICENSOR a worldwide, perpetual license, with the right to sublicense (at any tier), such IMPROVEMENTS without any royalty or other obligation to LICENSEE.
+
+   7. Ownership of all rights, including copyright in the PROGRAM and in any material associated therewith, shall at all times remain with LICENSOR and LICENSEE agrees to preserve same. LICENSEE agrees not to use any portion of the PROGRAM in any machine-readable form outside the PROGRAM, nor to make any copies except for its internal use, without prior written consent of LICENSOR. LICENSEE agrees to place the appropriate copyright notice on any such copies.
+
+   8. This Agreement shall be construed, interpreted and applied in accordance with the Commonwealth of Massachusetts and any legal action arising out of this Agreement or use of the PROGRAM shall be filed in a court in the Commonwealth of Massachusetts.
+
+   9. This license shall be for a term of 5 years except that upon any breach of this Agreement by LICENSEE, LICENSOR shall have the right to terminate this license immediately upon notice to LICENSEE.
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 1c7065bdc997..960e8239529d 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/kube/Manifest b/mail-client/kube/Manifest
index bb941c9f900f..b11bf77e91df 100644
--- a/mail-client/kube/Manifest
+++ b/mail-client/kube/Manifest
@@ -1,3 +1,3 @@
 DIST kube-0.5.0.tar.gz 990978 BLAKE2B 7bdabbe89e81ab26465f7e3d8ad769b4b07fccb09bdec5a9cd905eec89de7b25a0165ec1f1b916c668cf50d9f2e889f9763bddfe49c4223b167bf69a61bd5658 SHA512 90579ad21b755ff151bfed362f389fdfa66185f92a8fc72b7c9eb4e0108d97a8fdfbbd7a07f81a5c6d6cdcdf79255c3e614bfd43961984863866de8f13a21d28
-EBUILD kube-0.5.0-r1.ebuild 1087 BLAKE2B f8a253d1df15613a926a88ef2304f01850cf0ea5ddfc30d38f7fa25a4f465440470eed361f73ad65717aa3bdf9ac68cc957a4cd3083865fcdfbd59e9c3d34670 SHA512 992e30ea5e7f80c66c0704970e56e067bfdecbc3dcb9dd92fbc023ea0615eb4a4cf5e9aafbe3e39efe11908bbc5ada0524e675afe89c3bdda89d92c0963f5468
+EBUILD kube-0.5.0-r2.ebuild 1080 BLAKE2B e874c46c0f836721ce9fe063a2cfccf5b4723aa4a2b68b2b69784abe4a7e914981ff1c761fdb1756d35bc9eb046ae6cca219f4081c28f6ea65ff5b17ff57353a SHA512 0ff88600e4f40c1c4cab8d5ad3ab33add364ce7f857df2cf098e58b25368c789b973fa2a042d71f50a073fdb1879fa4491d4f3d35364c32fd81d35a3deae6ecd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/mail-client/kube/kube-0.5.0-r1.ebuild b/mail-client/kube/kube-0.5.0-r1.ebuild
deleted file mode 100644
index 14c545bd70e2..000000000000
--- a/mail-client/kube/kube-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-QT_MINIMAL="5.9"
-inherit kde5
-
-DESCRIPTION="A mail client by KDE"
-HOMEPAGE="https://kube.kde.org/"
-SRC_URI="https://github.com/KDE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	$(add_frameworks_dep breeze-icons)
-	$(add_frameworks_dep kcodecs)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwebengine)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
-	dev-libs/kasync
-	>=dev-libs/sink-0.5.0
-"
-DEPEND="${RDEPEND}
-	test? ( $(add_qt_dep qttest) )
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use test; then
-		sed \
-			-e "/Qt5::Test/s/^/#DISABLED/" \
-			-e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
-			-e "/domain\/modeltest.cpp/s/^/#DISABLED /" \
-			-i framework/src/CMakeLists.txt || die
-	fi
-}
diff --git a/mail-client/kube/kube-0.5.0-r2.ebuild b/mail-client/kube/kube-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..99eab6a5cbde
--- /dev/null
+++ b/mail-client/kube/kube-0.5.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+inherit kde5
+
+DESCRIPTION="A mail client by KDE"
+HOMEPAGE="https://kube.kde.org/"
+SRC_URI="https://github.com/KDE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	$(add_frameworks_dep breeze-icons)
+	$(add_frameworks_dep kcodecs)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
+	dev-libs/kasync
+	>=dev-libs/sink-0.5.0
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_qt_dep qttest) )
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use test; then
+		sed \
+			-e "/Qt5::Test/s/^/#DISABLED/" \
+			-e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
+			-e "/domain\/modeltest.cpp/s/^/#DISABLED /" \
+			-i framework/src/CMakeLists.txt || die
+	fi
+}
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index ca0ebfb04861..0c8ecfe99b6f 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,12 +1,8 @@
-DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
-DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
 DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb965e8974b8cf2f7fd1f417cb9a3f0fcded951d5506092f90ad03b8fd209392143240b1d48560f9772242652a347817 SHA512 6fbbea9e182d087d8fe90094dfcbadaaca2878fa71e024e504999d1a54d853dcd346ea7aa32f421ed9dfdf90c42307f2796518dc43748805c4e36fd5755d4adc
 DIST neomutt-20180323.tar.gz 2650465 BLAKE2B 59f11208320e514119e60f6c85a876fed2693b9eae3127fc3fa5a35722a80dfd99b0c6b5a5074711d42b35d459e70f4dda3d29e7358e1d95d5d0d350438290d5 SHA512 997c697300768809823b8d8588c93003c6cd7fcc6cbe7ce524096033e91c618119f78c697ccd15b4c93751b3156d50e611974e8f8b332efb467c031385e9f819
-EBUILD neomutt-20171208.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f
-EBUILD neomutt-20171215-r1.ebuild 3960 BLAKE2B 1e47347a16c8c0f31c2c89f2173e106dfc78f369564bcd4dac1850649dbeb5ebc71afb9094a5a4f8e52c1c8a8ad1bedf0af5839ee4eaaa55b89df52fc22a5dc6 SHA512 5cc4e2c11e859a1d17f96091ffa97bc0ca3843e6debe2dc4dbba05ab71950f47852404bfb89244e7ec2e4b2d60bdf9c4ff6bbc25ce5262637201189bca571a3c
-EBUILD neomutt-20171215-r2.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
-EBUILD neomutt-20171215.ebuild 3470 BLAKE2B 0612a05bd1f2250b350a02b8868fecf1a8711ea246531352012c8894ef118fe50834a16800f464d31e9b30ebed427980c214e1c38f83cb68fe34d15512af4fc9 SHA512 96ef8e7f5e8e2a674ece11e400943545f07d71b7b694a25f41b31bf36cb52080f2c9509954fc8b83f1dd4a8b1c3ae935a1101c0e52b75e2acc649a000b5dfa4f
+DIST neomutt-20180512.tar.gz 2758674 BLAKE2B 47a8d1fe5d5e2725a6ee868b937eea3807ab35dc8eefe47f0d9b1db3aeaa97e69c36e3b8544fc43f1ce0a9980017d654bace8d342094fd7d26ecdb13cdf54253 SHA512 033faa27b01998895d2452d541ed5942cf7dede7a935fc807e6a7f88f3a8c182ea0ab5b4ed7db852ff2afb4d3b990db05477d9ff0dcf7dee186c393244d1db66
 EBUILD neomutt-20180223.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-20180323.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
-EBUILD neomutt-99999999.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
+EBUILD neomutt-20180512.ebuild 4151 BLAKE2B e83a033603433e6cd5074b382a939990bcd048bc1a453024b27375fa1c70fa44a3c750ff596f549325116c434c7cea38d2457413dc0c116e7b576e30f4b40c5c SHA512 3abd149f283125eb048e29ad8295810951a033fbc91072ba5cd32f913031c9633a61eb6b17fc1821cb02b9f570347eed8b4a7e8fd762d30058823728301336dc
+EBUILD neomutt-99999999.ebuild 3269 BLAKE2B 71a2c2172f924211aa4fcf2406fbcd3e05e4c40a0505bbc5a3390e63f76b483a6baca21d8e2ad4f2db079f7b0806053bc4d6db758f9d75721db54f511bd43be8 SHA512 4a327c9ace86888d7e4bf5d71079eba3b70dafd3cc5603b2c4cd54965495beddd5d4397583c81b4e2769fc462e420e4d957cf176abc13648d7cf87c4cffdae6c
 MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/neomutt-20171208.ebuild b/mail-client/neomutt/neomutt-20171208.ebuild
deleted file mode 100644
index 406bc5c0cc73..000000000000
--- a/mail-client/neomutt/neomutt-20171208.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
-	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
-	smime_classic ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-		"$(use_enable crypt pgp)"
-		"$(use_enable pgp_classic pgp)"
-		"$(use_enable smime)"
-		"$(use_enable smime_classic smime)"
-		"$(use_with berkdb bdb)"
-		"$(use_with gdbm)"
-		"$(use_with idn)"
-		"$(use_with kerberos gss)"
-		"$(use_with kyotocabinet)"
-		"$(use_with lmdb)"
-		"$(use_with qdbm)"
-		"$(use_with sasl)"
-		"$(use_with tokyocabinet)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
-	ewarn "(https://bugs.gentoo.org/637176)"
-	ewarn "crypt -> pgp_classic"
-	ewarn "gpg -> gpgme"
-	ewarn "smime -> smime_classic"
-	ewarn "The old USE flags still work but their use is deprecated and will"
-	ewarn "be removed in a future release."
-}
diff --git a/mail-client/neomutt/neomutt-20171215-r1.ebuild b/mail-client/neomutt/neomutt-20171215-r1.ebuild
deleted file mode 100644
index e5725c955639..000000000000
--- a/mail-client/neomutt/neomutt-20171215-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
-	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
-	smime_classic ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		# During the transition of the crypto USE flags we need to support
-		# both sets of flags. We do not want to emit a configuration setting
-		# twice, since the second flag overrides the first, potentially
-		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
-		# details.
-		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
-		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
-		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
-			Makefile > doc/Makefile.fakedoc || die
-		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
-		cp doc/neomuttrc.man doc/neomuttrc.5 || die
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use crypt || use gpg || use smime; then
-		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
-		ewarn "(https://bugs.gentoo.org/637176)"
-		ewarn "crypt -> pgp_classic"
-		ewarn "gpg -> gpgme"
-		ewarn "smime -> smime_classic"
-		ewarn "The old USE flags still work but their use is deprecated and will"
-		ewarn "be removed in a future release."
-		if use gpg && ( use crypt || use smime ); then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20171215-r2.ebuild b/mail-client/neomutt/neomutt-20171215-r2.ebuild
deleted file mode 100644
index f90289f77c00..000000000000
--- a/mail-client/neomutt/neomutt-20171215-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
-	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
-	smime_classic ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.2
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-		<sys-libs/db-6.3:=
-	)
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		# During the transition of the crypto USE flags we need to support
-		# both sets of flags. We do not want to emit a configuration setting
-		# twice, since the second flag overrides the first, potentially
-		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
-		# details.
-		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
-		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
-		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
-			Makefile > doc/Makefile.fakedoc || die
-		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
-		cp doc/neomuttrc.man doc/neomuttrc.5 || die
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use crypt || use gpg || use smime; then
-		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
-		ewarn "(https://bugs.gentoo.org/637176)"
-		ewarn "crypt -> pgp_classic"
-		ewarn "gpg -> gpgme"
-		ewarn "smime -> smime_classic"
-		ewarn "The old USE flags still work but their use is deprecated and will"
-		ewarn "be removed in a future release."
-		if use gpg && ( use crypt || use smime ); then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20171215.ebuild b/mail-client/neomutt/neomutt-20171215.ebuild
deleted file mode 100644
index 3741c7d074e7..000000000000
--- a/mail-client/neomutt/neomutt-20171215.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
-	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
-	smime_classic ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		# During the transition of the crypto USE flags we need to support
-		# both sets of flags. We do not want to emit a configuration setting
-		# twice, since the second flag overrides the first, potentially
-		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
-		# details.
-		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
-		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
-		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-	doman doc/*.{1,5}
-}
-
-pkg_postinst() {
-	if use crypt || use gpg || use smime; then
-		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
-		ewarn "(https://bugs.gentoo.org/637176)"
-		ewarn "crypt -> pgp_classic"
-		ewarn "gpg -> gpgme"
-		ewarn "smime -> smime_classic"
-		ewarn "The old USE flags still work but their use is deprecated and will"
-		ewarn "be removed in a future release."
-		if use gpg && ( use crypt || use smime ); then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
new file mode 100644
index 000000000000..45c87850f70c
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180512.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 9999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	smime_classic ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	idn? ( net-dns/libidn )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		# During the transition of the crypto USE flags we need to support
+		# both sets of flags. We do not want to emit a configuration setting
+		# twice, since the second flag overrides the first, potentially
+		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
+		# details.
+		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
+		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
+		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use crypt || use gpg || use smime; then
+		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+		ewarn "(https://bugs.gentoo.org/637176)"
+		ewarn "crypt -> pgp_classic"
+		ewarn "gpg -> gpgme"
+		ewarn "smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release."
+		if use gpg && ( use crypt || use smime ); then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index f90289f77c00..fb8ad83183d0 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit eutils flag-o-matic
 
-if [[ ${PV} =~ 9999$ ]]; then
+if [[ ${PV} =~ 99999999$ ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
@@ -15,13 +15,13 @@ else
 fi
 
 DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
+HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
-	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
-	smime_classic ssl tokyocabinet"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic
+	ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types
@@ -40,7 +40,6 @@ CDEPEND="
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
 	gpgme? ( >=app-crypt/gpgme-0.9.0 )
 	idn? ( net-dns/libidn )
 	kerberos? ( virtual/krb5 )
@@ -74,14 +73,9 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
-		# During the transition of the crypto USE flags we need to support
-		# both sets of flags. We do not want to emit a configuration setting
-		# twice, since the second flag overrides the first, potentially
-		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
-		# details.
-		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
-		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
-		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
+		"$(use_enable gpgme)"
+		"$(use_enable pgp_classic pgp)"
+		"$(use_enable smime_classic smime)"
 
 		# Database backends.
 		"$(use_enable berkdb bdb)"
@@ -109,32 +103,28 @@ src_install() {
 	# A man-page is always handy, so fake one – here neomuttrc.5
 	# (neomutt.1 already exists)
 	if use !doc; then
-		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
 			Makefile > doc/Makefile.fakedoc || die
-		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
 			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
-		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
 		doman doc/neomutt.1 doc/neomuttrc.5
 	fi
 
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+	dodoc LICENSE* ChangeLog* README*
 }
 
 pkg_postinst() {
-	if use crypt || use gpg || use smime; then
-		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
-		ewarn "(https://bugs.gentoo.org/637176)"
-		ewarn "crypt -> pgp_classic"
-		ewarn "gpg -> gpgme"
-		ewarn "smime -> smime_classic"
-		ewarn "The old USE flags still work but their use is deprecated and will"
-		ewarn "be removed in a future release."
-		if use gpg && ( use crypt || use smime ); then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
+	if use gpgme && ( use pgp_classic || use smime_classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+		ewarn "  and smime_classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
 	fi
 }
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 3803313bf60d..e68b51328bee 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 3e6dc09f41b7..16e77cfbe4fd 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -1,12 +1,8 @@
 AUX asspd.init 557 BLAKE2B b73f8361139a8103048009783d039ed63c7d96c7200167da316d02359bcefd56cd9003df6f28922661af5a0804e2468085289993564e8fa9b32222c349539b96 SHA512 ca762f84f123146a2e17c8c429ca03960d4cb82d74166ce3cead0d70529112eae2ce02f5ffa47d4730b21ff151c6eb05b1b28fa12d87d7f16d2859773c2845d7
 DIST ASSP_1.8.5.9-Install.zip 750552 BLAKE2B 6118ce4c66990632a7915a4fc9b13b89ec3aaf4893c911d87c9b541ea55d7d71ed97bdd5337128cba04e0e4f95eff824679dc792d2085633628cf9bb357965f9 SHA512 146f86b8ddd235cca784057a73ae45395d4dc81591001f28a63275e6cf0e234145086029f112953e26aa8433ba434002e5ca85acc2e63af1615e7b9f58764f1c
-DIST ASSP_1.9.4.7-Install.zip 1461151 BLAKE2B 243d7a9457c8562dcebd396d0c97697c36915fc741f287bb82df35e830d8346a8e48f7c7824428e915f55b2cf72715788af5bbb5681c223249777cbb9ef43b0a SHA512 02083320630831fee048e13d6101dd844aceadddf36a5f2b5bff6f203d67be2e456fb992a71e903a9dace48992962a6d26f90998025b8666e24f3f4aaec76cfc
-DIST ASSP_1.9.4.8-Install.zip 1462121 BLAKE2B 6f156a45c357fbebcbe180e90716c0c5ccb00c7633f3bf5c5db8da76763a2153b53d501d1152bff92f1bde2b16f1fc4bcdd9b682600d251ad35876e93e4099e8 SHA512 4888bfb4e8577608ee638391c6c9f38901f70e60fa29829d0f5a56102f13ba08b8363d9041bfb64d9d238526bc4051d5d97faddd6d819909d6dd4e6aa0a96225
 DIST ASSP_1.9.4.9-Install.zip 1461140 BLAKE2B ce79146c42a2c48da125b603dc1084688baf4dc020a5fc4e8305a7afd5467f2e2a978d2fdc2e06055e8f7ab94a9a8b11b7ec40cf23f566dd8a76f9c8c21b2ccb SHA512 a049a8e36193aee12c7abc7bbfdc41a92a7a33f6f01f7e6cded406f1f84ddf3c514808ca1c4c6a25c3a441b3a2792b4451ca218021bb09dad508a56434c8656b
 DIST ASSP_1.98_13030_install.zip 874117 BLAKE2B c23e51dea63a9ecfa94a4110dbe4cd7dee44faf89107a0f1ba72441acbd28cf7a09928c1a2f0b5e39f7e47d5a197651740c82e0a6ec8ddd61f7bd29b3354b954 SHA512 46c067c9ffe98f860669166fca69346c974bc82a1c0a5046f607aae8344fe18d41f7a87c2f79bdfcaa24c6233a88a590031deab66c76d42fee78fec64dc2a2a1
 EBUILD assp-1.8.5.9.ebuild 5808 BLAKE2B 7080afa1842713cecdca76d7a57af7527a86103ab2a77492fd0705c6a9ec3c2b3e39150f033450a0c19c27a0341e5be2e24522a877729b46291a68edfc88d7fb SHA512 aead31f7b7b93154430eed8a66568d858ae569540016606890697538da62374553f90b5bf9be29e6244e76c765e5493c5d481d12252bb4ce2f5a37b763de50dc
-EBUILD assp-1.9.4.7.ebuild 5858 BLAKE2B 7cf3fe11ba05b1b864598458a71d8516a2622045155db4d85d84108e88cbcc177e09b1f475fb72cbbf3e59f745a58bbad11b1de888e870753fd5cfe568e87700 SHA512 32f7d74cac895f26f33f0e4a248b3d370c179afcfcebe2d6154ffc7880bcf1cc0d1d4327c639bc40e2f2052bc3768a8ceb24f94f1ac3ada41510b556f1cb1979
-EBUILD assp-1.9.4.8.ebuild 5858 BLAKE2B 7cf3fe11ba05b1b864598458a71d8516a2622045155db4d85d84108e88cbcc177e09b1f475fb72cbbf3e59f745a58bbad11b1de888e870753fd5cfe568e87700 SHA512 32f7d74cac895f26f33f0e4a248b3d370c179afcfcebe2d6154ffc7880bcf1cc0d1d4327c639bc40e2f2052bc3768a8ceb24f94f1ac3ada41510b556f1cb1979
 EBUILD assp-1.9.4.9.ebuild 5858 BLAKE2B 7cf3fe11ba05b1b864598458a71d8516a2622045155db4d85d84108e88cbcc177e09b1f475fb72cbbf3e59f745a58bbad11b1de888e870753fd5cfe568e87700 SHA512 32f7d74cac895f26f33f0e4a248b3d370c179afcfcebe2d6154ffc7880bcf1cc0d1d4327c639bc40e2f2052bc3768a8ceb24f94f1ac3ada41510b556f1cb1979
 EBUILD assp-1.9.8.13030.ebuild 5869 BLAKE2B de1572ea63ad737b9c11577e148f9fe8b9614cbfabb9c117b7a3172d12870d5f850c7e03bc56f5a22caafa11777f6158691caaa2d109fd456214c5ca174b6997 SHA512 6fa4a530524fe24e9c11b33b0ed052b5dba3a2640bd7df53cfb0cf8d7ea46df2fc5299fb2dc646519ddcf9668ce5484c53625c6f4917368bab14037f4dae6ac4
 MISC metadata.xml 1012 BLAKE2B a1d7936ab341bb80ed931ea07d09eafb9f5d0bd9e84f18fad315693e6585e39cd098aaff4ba63dc51b942d864f9b6b97d1c84d9d6939c13591ce35ba3000a958 SHA512 32be6692f834f853e7c7382422075851a8c86c115e5ac119a583d9c66b21350939e62197a9bbca3ef1d1b988833572de82cc2118eae9cc0b9eed260ce0838066
diff --git a/mail-filter/assp/assp-1.9.4.7.ebuild b/mail-filter/assp/assp-1.9.4.7.ebuild
deleted file mode 100644
index 28803fea46ce..000000000000
--- a/mail-filter/assp/assp-1.9.4.7.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl"
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-# this is a pre-release, so no keywords for now
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( virtual/perl-Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.9.4.8.ebuild b/mail-filter/assp/assp-1.9.4.8.ebuild
deleted file mode 100644
index 28803fea46ce..000000000000
--- a/mail-filter/assp/assp-1.9.4.8.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl"
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-# this is a pre-release, so no keywords for now
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( virtual/perl-Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index de75376fb9d8..f84178125de6 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/mini-qmail/Manifest b/mail-mta/mini-qmail/Manifest
index cfcdf8ceab27..c62bc32221ce 100644
--- a/mail-mta/mini-qmail/Manifest
+++ b/mail-mta/mini-qmail/Manifest
@@ -3,10 +3,6 @@ AUX 1.06-headers.patch 640 BLAKE2B 6dded7fbd55a779fa60378296819b7f24481ee65de174
 AUX 99qmail 84 BLAKE2B 81bd3a3411945fc627fe14b6662450055db48e4f4e34086b58d52f026acdc14663128fffe35898824fc0345d2763af57af85d858c33915a6250f1fc978a4b6fb SHA512 ef7c83996a8714114353e0e2f4ace04a1d82e5e5324afc14b3e51f92821d8e2c535431f0bfc4c843f548572b73e3993e204ef78a97a555aef039aeec941124d5
 AUX config-mini 961 BLAKE2B b6f89f19aa5a12b8d1dcc3df2db5409d59c892b06f58a6cc64063feb522b0ebce87d900627367f5723db6362be3ccc57f5defd6df89b3b2559a099d54c5b4ac0 SHA512 a98f18b0d705506e524d5959f296d9e47d44871b59cedb154cc0fb51283413f84ef2cf5db2786e3e4af7e1a80a55691437598b3ee8af014a4ae7ac8bccd60102
 DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
-DIST mini-qmail-kit-0.52.tar.gz 6174 BLAKE2B 8fa4ef8ae30c3f158747540b5fb85d610500efdc5569a2b9b84bc71aaf1527100b9b41534079969c4ebb5bec8204d044d560baf46b795ccb20d4ac4d8a82db56 SHA512 d3d2acb008f48f71a1b3aeff7653a694b2ed2704705a229a3e7f7154704eae1b34238fb6c8a7cd3f4e44c23841e4c49910e3c0498815d836a6f37e73ed19bf3e
-DIST netqmail-1.05.tar.gz 252264 BLAKE2B b5aa3cf5e472137fcf7f51d7f5ea99859b63f703ee884b2f41ad3d315eed0d511f2a9b0def9ff45c55ad149a79336bea8a007d12caf958ec0b97bc116be7a9d4 SHA512 9504e3ff98e5c9278000cd9dd12eecfa504a7604641ff5b2ed735d6bfacfbd0ae69a4b9c7287217320f15fd51e4e94fe6d85c927b9c7dc07f62fe7cccb7d7070
 DIST netqmail-1.06.tar.gz 260941 BLAKE2B f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a SHA512 de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
-EBUILD mini-qmail-1.05-r1.ebuild 2669 BLAKE2B ed29518722317132866cc9751ff9c9a0af181419c8a96c8f8135ac244a8669297ae43deb569890df89efafc667ab06fff5a0e5a94daf116969358f5eab4769ae SHA512 5e1bbea0b0b62b4daf93759cf8f7fb84295b3331eb611700793bde395a1162471b4e0eba016cc94f5f17a6e5a9dd5754c802900693871adf3ab2ca514c70c314
-EBUILD mini-qmail-1.05.ebuild 2954 BLAKE2B f439068a02d8bea03da1c2432fe2a651b57e6969addb89ed49226095d57c9418e1d989be82222d988a9fb8943241fc09e5f2f0ca7df1df4a69335832240006b4 SHA512 01710807c8efc744de4448cd832f36f2ef88713df87be4a75eeb1fab3bb83ed7beb0715f529becb5e79e6c72be85321d241699e4eb3600da0b7524209af1423e
 EBUILD mini-qmail-1.06.ebuild 1344 BLAKE2B ac0232cc63216e224d26c453f979e699095f6210175176ee08f9d62166ec61c8e5ee162e55234ec85abead17a15560cc165f7bc92b91a0a58a20a8035b124806 SHA512 33bd6dccfb30fe2b7093f65f31324f1cb60219594579645236b7b753f6a6a8775e7c16a20caa684d31a1ad0cad8341c05ab0571b7f789fab25c73c82b9b410f4
 MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
diff --git a/mail-mta/mini-qmail/mini-qmail-1.05-r1.ebuild b/mail-mta/mini-qmail/mini-qmail-1.05-r1.ebuild
deleted file mode 100644
index 81d560e4723d..000000000000
--- a/mail-mta/mini-qmail/mini-qmail-1.05-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs fixheadtails
-
-MINI_VER=0.52
-DESCRIPTION="a small null client that forwards mail via QMQP to a full qmail server"
-HOMEPAGE="http://www.qmail.org/ http://cr.yp.to/qmail/mini.html"
-SRC_URI="mirror://qmail/netqmail-${PV}.tar.gz
-	http://www.din.or.jp/~ushijima/mini-qmail-kit/mini-qmail-kit-${MINI_VER}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc x86"
-IUSE=""
-
-DEPEND="sys-apps/groff"
-RDEPEND="
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	"
-
-S=${WORKDIR}/mini-qmail-kit-${MINI_VER}
-
-src_unpack() {
-	unpack netqmail-${PV}.tar.gz
-	unpack mini-qmail-kit-${MINI_VER}.tar.gz
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-config-mini-help.patch
-	sed -i \
-		-e "/^qmail=/s:=.*:=${WORKDIR}/netqmail-${PV}/netqmail-${PV}:" \
-		Makefile.mini || die
-
-	cd "${WORKDIR}"/netqmail-${PV}
-	./collate.sh || die "patching failed"
-
-	cd netqmail-${PV}
-	echo -n "$(tc-getCC) ${CFLAGS}" > "${S}"/conf-cc
-	echo -n "$(tc-getCC) ${LDFLAGS}" > "${S}"/conf-ld
-	ht_fix_file Makefile
-}
-
-src_compile() {
-	emake -f Makefile.mini || die "mini prep failed"
-	emake mini || die "make mini failed"
-}
-
-src_install() {
-	einfo "Setting up directory hierarchy ..."
-	keepdir /var/mini-qmail/control
-
-	dodoc INSTALL README
-
-	exeinto /var/mini-qmail/bin
-	doexe qmail-qmqpc forward qmail-inject \
-		sendmail predate datemail mailsubj \
-		qmail-showctl maildirmake maildir2mbox \
-		maildirwatch qail elq pinq \
-		|| die "doexe failed"
-	dosym qmail-qmqpc /var/mini-qmail/bin/qmail-queue
-	newexe config-mini.sh config-mini
-	dosed "s:QMAIL:/var/mini-qmail/:g" /var/mini-qmail/bin/config-mini
-
-	doman qmail-qmqpc.8 forward.1 qmail-inject.8 \
-		mailsubj.1 qmail-showctl.8 maildirmake.1 \
-		maildir2mbox.1 maildirwatch.1 qmail-queue.8 \
-		qmail.7
-
-	einfo "Adding env.d entry for qmail"
-	doenvd "${FILESDIR}"/99qmail
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-	dosym /var/mini-qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/mini-qmail/bin/sendmail /usr/lib/sendmail
-}
-
-pkg_postinst() {
-	elog "In order for mini-qmail to work, you need to setup"
-	elog "the QMQP server information."
-	elog
-	elog "You can setup the values in /var/mini-qmail/control yourself,"
-	elog "or use the utility /var/mini-qmail/bin/config-mini"
-	elog "To find out what values to put in what files, see the install"
-	elog "section of http://cr.yp.to/qmail/mini.html"
-}
diff --git a/mail-mta/mini-qmail/mini-qmail-1.05.ebuild b/mail-mta/mini-qmail/mini-qmail-1.05.ebuild
deleted file mode 100644
index 03d835c0a45b..000000000000
--- a/mail-mta/mini-qmail/mini-qmail-1.05.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs fixheadtails user
-
-DESCRIPTION="a small null client that forwards mail via QMQP to a full qmail server"
-HOMEPAGE="http://www.qmail.org/ http://cr.yp.to/qmail/mini.html"
-SRC_URI="mirror://qmail/netqmail-${PV}.tar.gz
-	http://www.din.or.jp/~ushijima/mini-qmail-kit/mini-qmail-kit-0.52.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc x86"
-IUSE=""
-
-DEPEND="sys-apps/groff"
-RDEPEND="
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	"
-
-S=${WORKDIR}/netqmail-${PV}/netqmail-${PV}
-
-pkg_setup() {
-	# keep in sync with qmail pkg
-	enewgroup qmail 201
-	enewuser alias 200 -1 /var/qmail/alias 200
-	enewuser qmaild 201 -1 /var/qmail 200
-	enewuser qmaill 202 -1 /var/qmail 200
-	enewuser qmailp 203 -1 /var/qmail 200
-	enewuser qmailq 204 -1 /var/qmail 201
-	enewuser qmailr 205 -1 /var/qmail 201
-	enewuser qmails 206 -1 /var/qmail 201
-}
-
-src_unpack() {
-	unpack netqmail-${PV}.tar.gz
-	unpack mini-qmail-kit-0.52.tar.gz
-
-	cd netqmail-${PV}
-	./collate.sh || die "patching failed"
-	mv "${WORKDIR}"/mini-qmail-kit-0.52/* "${S}"/
-
-	cd "${S}"
-	echo -n "$(tc-getCC) ${CFLAGS}" > "${S}"/conf-cc
-	echo -n "$(tc-getCC) ${LDFLAGS}" > "${S}"/conf-ld
-	ht_fix_file "${S}"/Makefile
-
-	epatch "${FILESDIR}"/${PV}-config-mini-help.patch
-}
-
-src_compile() {
-	emake it man || die
-}
-
-src_install() {
-	einfo "Setting up directory hierarchy ..."
-	keepdir /var/mini-qmail/control
-
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
-	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION README*
-
-	exeinto /var/mini-qmail/bin
-	doexe qmail-qmqpc forward qmail-inject \
-		sendmail predate datemail mailsubj \
-		qmail-showctl maildirmake maildir2mbox \
-		maildirwatch qail elq pinq \
-		|| die "doexe failed"
-	dosym qmail-qmqpc /var/mini-qmail/bin/qmail-queue
-	newexe config-mini.sh config-mini
-	dosed "s:QMAIL:/var/mini-qmail/:g" /var/mini-qmail/bin/config-mini
-
-	doman qmail-qmqpc.8 forward.1 qmail-inject.8 \
-		mailsubj.1 qmail-showctl.8 maildirmake.1 \
-		maildir2mbox.1 maildirwatch.1 qmail-queue.8 \
-		qmail.7
-
-	einfo "Adding env.d entry for qmail"
-	doenvd "${FILESDIR}"/99qmail
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-	dosym /var/mini-qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/mini-qmail/bin/sendmail /usr/lib/sendmail
-}
-
-pkg_postinst() {
-	elog "In order for mini-qmail to work, you need to setup"
-	elog "the QMQP server information."
-	elog
-	elog "You can setup the values in /var/mini-qmail/control yourself,"
-	elog "or use the utility /var/mini-qmail/bin/config-mini"
-	elog "To find out what values to put in what files, see the install"
-	elog "section of http://cr.yp.to/qmail/mini.html"
-}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 050910bdbfc3..76fd65e2bf5b 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 1aa0aed93520..368b85f99e62 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,4 +1,4 @@
 AUX font-alias-1.0.3-cvs-tags.patch 1240 BLAKE2B 6bed61707b1d6dceb6c6b89679b0714b9c02659db08efa004b2fdb8f56fa18b817fb509f5f8f8576329d35e221b489886835c86f683c913f025e87927cb932c3 SHA512 dc8beffe37539162a71d2a2635955d3e7c348406c14baf874448af8bc3a21495b27d1797e08153b40bb8e44c6af69137e7a754456e5bfa2f040f4a5c08ce99f1
 DIST font-alias-1.0.3.tar.bz2 102537 BLAKE2B a4a92e147a7c106c6feac39d7b2eaa5785bc4c086d2cf204587ed5b22b1633238b8ddfb8ef212ae84cfa0a61d018fec79cbf9c83b102c8073d3978dfa66fd007 SHA512 05abfef4615722d8cf3f21ab1118494522553a75427140d9753b3d312f404735c20766ceacc1b53f9e783ea25ec8f2f6bdb8696525a4962afe29f524ed8b6552
-EBUILD font-alias-1.0.3-r1.ebuild 532 BLAKE2B e047d3edf0d1faa6f0efe2e0f5eb987474fe64d1d2c83b2aef469f2a12cbba0e6939441fdef6413c1b804a5e3773538a255867713704762b63288cba36f96662 SHA512 79f95eff9458c40d5080f4c3f419a7624a3dd43cc4df0baf8b536cbcb4a1f58a058dc259a80164563b85c381cc1a425940c3bdee1f550b1dfbfc12caf50dca85
+EBUILD font-alias-1.0.3-r1.ebuild 531 BLAKE2B 60a6170ecadd1b7d388edfeef643afe2dc7250101beda7f4f274949ede1591541760943c462179bd710722b1d383287c2c2993c2c9ecfbd0cea8c9c4772da4f9 SHA512 e632672a08ee93306304379dd9ed22d061eb246dd95f031f1c526ffa58a642ea9810bad50b017c09ad9611bcadfb0e0b35ef14e735ceb5402d8040424e301fe3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
index bac830b2cc02..81191b37bd0c 100644
--- a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org font aliases"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index d53004d022ac..545bc4605c89 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,3 @@
 DIST font-util-1.3.1.tar.bz2 153289 BLAKE2B b85b2dbbe3ed97e22d765b73a9fee7472790ff037878967ee6865e3122c651ff5e3b6aeb99492b1330bb77d2518157abcc45e503419b21f2cc76a3196d505f22 SHA512 9fd6dd4c0a01ede5f0b09ec0f9d316267ca086e2ee9526a43a4e4d6ce3cd67c977293bd3cf440328ca417292fcae1579888b24b7259eaf012230890210d74889
-EBUILD font-util-1.3.1.ebuild 632 BLAKE2B 77c7e583d51e1aff577c782adda1d0ff634bdc397b244e6f37e36f92da62eb4cc0d8152a4791c8281126a84b4187064d1e7e7b991c966794b5aac4944a0bb557 SHA512 0d54814d6f26034403784bcbc795290a70f92ba86c35b7290b7c3147d15127546c2cb1737b4d102c05b5093f18a3b7b9ec2ed98c3b62f57b0177c4cb57eac5cd
+EBUILD font-util-1.3.1.ebuild 631 BLAKE2B fa0b546ddbc384fac75dd77893b97567d76794e084a3621c969ba27ae539c99b3db80ad2df41d706477c2ba960afabf66daff2c158a9cc978501557a29facf65 SHA512 28fd7d6a760bc5d5cac9ac31549dcaa7a69a223fb40236145942bb452c70e4501e07861961fa17a70817dd1ebcfdaa36bd3d484245fbb1d4ce5c1f4fe92232c8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-util/font-util-1.3.1.ebuild b/media-fonts/font-util/font-util-1.3.1.ebuild
index c3990c9396ff..1d2c0324a0d5 100644
--- a/media-fonts/font-util/font-util-1.3.1.ebuild
+++ b/media-fonts/font-util/font-util-1.3.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
 DESCRIPTION="X.Org font utilities"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/sil-abyssinica/Manifest b/media-fonts/sil-abyssinica/Manifest
index c65e7702945a..00228e3112a0 100644
--- a/media-fonts/sil-abyssinica/Manifest
+++ b/media-fonts/sil-abyssinica/Manifest
@@ -1,5 +1,5 @@
 DIST AbyssinicaSIL-1.500.zip 1852827 BLAKE2B 59b29242f39fba70b60ca23363e82d093354deef9f8e46386fc5408994b9629b10b0400bdb860e5482a79cddd1ffa8b5057da62cafebfc128a49057abf195462 SHA512 56cfed3d41ea0a16d041b29f417296f4cc89f3fa8e718b3e352690a954168b018a5da68745f61db77395c292e92f8964d868c8824be5edfb24fb7539dcc62c59
 DIST AbyssinicaSIL1.200.zip 1021262 BLAKE2B cc4e55276c0cc07488d2721db0c6284422e9f98fa37d46672abce60e9124c9ce58d0ec71e00156585a3b83931ce45507188397f938da7afcd42e5f6c817cf551 SHA512 49c74476da85a38b0bccf341953198c5f5f750fbeaec724e2d50ea305d8c127b928304d7410b001997a3c91d4d5d5144c226c29873eae9e18de38cdfef7a6ada
 EBUILD sil-abyssinica-1.200.ebuild 672 BLAKE2B c5075b84c77739de6aa37f961e09ce5df2e62d3d33345472058785274dabe81995546d193eeb0ec448fab90766dc5d28be2c84cd303d89673ece35a52edde598 SHA512 d84dd83341dd345d3b241dc4a842ee982ff54734b8f49f1edbd96b333622a61d0a651197917b77ec25297bbb15f8a9040e4adf89019479788e3f804d616ebdd2
-EBUILD sil-abyssinica-1.500.ebuild 704 BLAKE2B e05fc6753e73d391fef5cf40a2fea072f964d63ee4194233b12d4e4647e27a5c6440ad525c2e05d33e675e9d8226754db9454cecdd4f9389df30c4f6a71a4c39 SHA512 75bb71fc805a31123607fef03ac2c81ac05ee27e59f66727f3f1755382b30ba25a8b87de722861346a5d3bcb7575083248be71bcf5c7927694473d1ab745c436
+EBUILD sil-abyssinica-1.500.ebuild 701 BLAKE2B 925f79cf16a2ee593b0f93d722d595e6404a2ebb616ec2a7e177df78b571cc182fb7733a9e9a65b0ee977c5714b6ecb877675b4c35b6d2c216d75cf092943f0a SHA512 0c0f322c260d40e6150ae21a6e54d9a593bc034e9786080fb5c74852f61002945bef19d867bf49d72669eacf4ef1372513d38453cb8735c4e4630ee668047e3b
 MISC metadata.xml 1078 BLAKE2B 77b83a9768d6536a29bb8aa73031b25c456faa20276c5e1e54de18b7fbebb6931e6be6a53b7cee0901f5dbd2ee48f9ca7b62d5e75b472805e76d3baf309684b5 SHA512 77da0918b61ce3649d2b7b25c336443e056f11915f8d757a20cb6527f7fcffd6152b9fbb15796e557d40fa8af65332622f71284000adfd356043d1edcabf64d1
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
index 71ad446a2f2f..0f3281b637f8 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://software.sil.org/downloads/r/${PN/sil-/}/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-arabicfonts/Manifest b/media-fonts/sil-arabicfonts/Manifest
index 7b77fde712c3..e2b054f347a7 100644
--- a/media-fonts/sil-arabicfonts/Manifest
+++ b/media-fonts/sil-arabicfonts/Manifest
@@ -3,5 +3,5 @@ DIST LateefRegOT_1.001.zip 121996 BLAKE2B 49420da7535a3614183bfbad9aa8a34cdb7a81
 DIST Scheherazade-2.100.zip 1114645 BLAKE2B 27743054c58afc93c79765abf6ac0698b394e1480e28fe59006da8a369d61a26fe3e0a2deec2df298fca6ee1f31185d3d0a0429b74803f049ae8e384735920a0 SHA512 53a6b684a9c6a6f136da28cc2f663fca9e22d1951203587394ff979c4769e4beb898ab73a7cabedf5ed6eaa2775d10c7281439f10331b203f0e03bd434aa2fb2
 DIST ScheherazadeRegOT-1.005.zip 125091 BLAKE2B d3eef8f181a7222c26fef1976f1785328e054736a03505828f56825702f41b665aa9a1e61edd45526fd36b28a93ec9589d80c88ff3b12a35d36b11d18122d6a4 SHA512 d225df081b9dfbc21d9e636b70755f532fe06c6ed91e4ab332e213c8739981f382ffd414caeb573853ba6b3178de7d059ac0d9f7b0e7b3ddc119375a65debb0d
 EBUILD sil-arabicfonts-1.005.ebuild 559 BLAKE2B 7d93d71543b3d6a23988c9723aa09ded2a9f6c7559fb068a273a1e80e6f2324787469966d21a7b7ae4ef192c5c20f2e84574bd1567163bb196a8a29246e48a2b SHA512 899e203301762d4b73f6e5be6c06c980725afb1f9d5eb6dd435dff73f4521b4ed5977576037e837344b6530df1f7c22d7c43fc484cb3b066e757b5e2d1554596
-EBUILD sil-arabicfonts-2.100.ebuild 747 BLAKE2B f485d98182d208efa384ff5ce5779f185b467e0af9fa85d15b818b196213b29f236ac4858cedf98954636c32418f7c07142f5aea1b5f14b4db26e0d7ec6fbe26 SHA512 26d606b81ca8ff71b3a60f1bb34bd00b9505d5491333427271936c18c6b87a02fc2e2300199d3643f64360aafa6369e4ad126926ae1f38acb9a7bf5476835fd1
+EBUILD sil-arabicfonts-2.100.ebuild 744 BLAKE2B f56ba022290221897a534377ec7d8a110afee6e99a1f37c643041a415fd751c8e8af250d392d0fa144f7c1ae3a97fb449ddc9fb6cb4f3798177f5719f9d70cbc SHA512 88944c7e9d80e0681f877c154fb7ae1a1dac99db739dc6ab71c10ba5ab1cf5ce72ce1aaabbad91f6b5bf5e7ce4988eb85820f2cd33ccfd5ce0ef5694454f3c8f
 MISC metadata.xml 1185 BLAKE2B 0632c1af557645a51a58bb7e3859a0897c39f4145c5a65c9f4316e1573811991b18e3e29ec55c38444471a6533d4770a2c80414c8ec2382839359ad5d46afbe1 SHA512 0fa80c2a6452c1da5049fef563358571259f73b0cf8bb65c17710a37760fd0643ee3bab66ea399531c8e7d190c46d7d1ea9a953a3a572c41c342babda2d73eee
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
index 680feb917460..c47e4a431977 100644
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
+++ b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://software.sil.org/downloads/r/scheherazade/${MY_P1}.zip
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a92b0ac5b498..43d61bc86d75 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 5a5275c9ed46..d33adf05074a 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,13 +1,11 @@
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
-DIST darktable-2.4.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f756c79fef4e4994236569d46e2b770c85303e07c6937f670d0b657ba826cc7b0f1b8b713cdf66b11cd625865db525f SHA512 50de282d26b345deeca19ebacfd9eebcc8b1ef3eec4d73d7853e918eef0d23b5ddba96695e7084b808891f0778b5765dc6bf718b9f25c5e1ce5ed393c1421c94
-DIST darktable-2.4.2.tar.xz 3415724 BLAKE2B 2c7149ff14283f38208f223cab78c57d30cf0f50841484411bec64d8154b6c4f2213990d169da057d734b9ac792a549aa9c3a6137a0ebfcec6b4c7d6f3991817 SHA512 4ad698bbfbeb94ab8d25a5414e65a5e5d6d8edae0e77d1ac327dfed0e0519e1a8a6761f9efe653aa8c421cc37269efaef4da96c5bc3797f923b4a0df4ebdfa8b
 DIST darktable-2.4.3.tar.xz 3422460 BLAKE2B 2fa1d7787301b6bc83b09e8d93bda251d2f9b7cf7d47979087b6da5126272d17c15f925be26652580aad6601f8613eac593c08e91638f2d445de1981f8694798 SHA512 adc0740f866890c53a1389b43042d76a4c668dd22654d91fd5a7eb728aa6979cb7dd3703d6e7d3689b6d3840e892432b3c3ce6953a76d4355dfc1f90a8f29506
+DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4dfeaab3eb0061dd817e65c7118a5fe3f1832ce2d7b5adf1d8501c17adff7f1e87545774ca17bd2e33b749e993886 SHA512 143739b18217cb2b47f7c5cb29bbb17e0d78b380ccd9358e96e179639d8e3526c76f3822edace605856ec3272b099a09f052867479d20879bf36ef45dafe5df6
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
-EBUILD darktable-2.4.1.ebuild 3999 BLAKE2B da571509858accbfcc514c4283c58fe4fe820f5dc0baabfd07a056c7934671c2526c86ded6219f903d094f24888cb0115bf451292facdaf56b657faf48678c8b SHA512 c655edc4067ff2744244bf7f07d5239da45594d906c0032e2bf881d5ab1be7f83807897f8b60d0d7dd4e2fbbbd39e96d2ac47dfdcce79ccf8c16790d0b2ca455
-EBUILD darktable-2.4.2.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
 EBUILD darktable-2.4.3.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
+EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
 EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
 MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
diff --git a/media-gfx/darktable/darktable-2.4.1.ebuild b/media-gfx/darktable/darktable-2.4.1.ebuild
deleted file mode 100644
index 34320cc4d26b..000000000000
--- a/media-gfx/darktable/darktable-2.4.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
-
-DOC_PV="2.2.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
-
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-CDEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-libs/pugixml:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)"
-
-PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-DCUSTOM_CFLAGS=ON
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	for lang in ${LANGS} ; do
-		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
-	done
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	elog "when updating from the currently stable 1.6 series,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
-	echo
-	ewarn "It will not be possible to downgrade!"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/darktable/darktable-2.4.2.ebuild b/media-gfx/darktable/darktable-2.4.4.ebuild
index 76721f6a80a4..76721f6a80a4 100644
--- a/media-gfx/darktable/darktable-2.4.2.ebuild
+++ b/media-gfx/darktable/darktable-2.4.4.ebuild
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index aaf652bf2328..7790b0c84b66 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,12 +1,5 @@
-AUX enblend-4.1.3-cmake.patch 1004 BLAKE2B 7912d827e702d85e6c356b0a246e3f9d465371d0f875523384772397a7a2cfa4320b4b743c76263e4069a9abd70e2429bd654d47e537a795df9a3b5dc6a000b3 SHA512 2143d9b448d29c37cc03dd40ee99f841ccb8d79f53597ef5fc6ef9a2090eaeaa7b789f86f85c468159f19f199cf3a1c330971b51ce6590b2ca6bf4b90765fef1
-AUX enblend-4.1.3-texinfo-5-more.patch 2392 BLAKE2B 57f6f57cb19487afb6a093d5bc671628fd24533ad2dd7319d63d1c2a452ad170da18b023545d5601957469f06ff972a94ac3049a7efe55a469939bf1190ed952 SHA512 3f3d398d8c5a39289aefb36050658cd27c477b1b23d94b1e2fdb5c9e40b54c9ee0d62f8cd1aa281618c9b48e803b082aaf6196824038c04bf090ca49cfdd21f2
-AUX enblend-4.1.3-texinfo-5-upstream.patch 18609 BLAKE2B 86aa3c27e2e79a8064949a4599a64ed767b998204532f54d362842e6dc6112772abca5b497073997f18290dd568bdccffd7fddf065f7ecaaf9c04da7869ee5aa SHA512 f42d102a534887bd56637d08d64c37436b8590310a87a8dc5fb63550bd10ae2602ec3ddb51ea6b46d16ad3477e4b8b8f20fa48821e8745a5cf9e5693ae4af40e
-AUX enblend-4.1.3-vigra_check.patch 463 BLAKE2B c1e4ef25952285edeab6f78f74c715fbd1726490ab31b788e6a0dd708df7faec275bc1bd6b9dcd4082f635ed742f1b2485a74262eea1b8b44f51cd1d39a1a61d SHA512 5b459c7da0608369fc591ad67fd295f3e2b11f78d5cba4e7d57116dbb0038f00b6c5f0fc190e4c40b0b625f77885ddfe51e8432654c78c03dc9040d34ae96372
 AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
-DIST enblend-enfuse-4.1.3.tar.gz 862079 BLAKE2B 1ea6d909bbc32d6141090862f658cc29ee0156e898e133fa88a10d1ea1df1e3eb0b6481010a0b3c0795bce0345ff3a77d1916310bc7b39fb292478c622d4493a SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73
-EBUILD enblend-4.1.3-r1.ebuild 1828 BLAKE2B 8b11df2857f52ddb4e1efb0d86ca577c23af0ba5b8ec0bf8f5a682bf953fc6fb822b7fe207437af2b60b905710d544d1e382801b8a62d68ec38c215add67adc9 SHA512 df0d81b83868daabf072b557b70ec0ad555682133b44165694167a98c713d84123b2736f6f7e914a2b6a366ff7b5810acb0d090422c0dbd95c4a874403007f71
-EBUILD enblend-4.1.3-r2.ebuild 1930 BLAKE2B 078a4dcde4bfb1eba7d639f22620083d72449e953e56fe56907658308221fde6b196fc172b18ea5f1622f40570fa4cd9df46b3c810bd221fdada0d1642869666 SHA512 002f38789573df33f650cd0127b8499859ee3855e4674cefecc9aa9f10be7b0b413942d40d23dd14e1dc29d8037bb452df0149ee825f320038e65dd260ec1453
 EBUILD enblend-4.2.0_p20161007-r1.ebuild 1755 BLAKE2B 651b934a2e1a63a5761b2fbd2ffc3fe2a9e45464359d7877041b65abea4cb001927a91d05159421d0e3dea042d1e6ae8f0802b40f371a00de2a17fe92219a234 SHA512 7b082d0d7716ed034b484173fef1a68beb892ca0f01048a23d00cdcd8ee99631f05bd1fd7531ebf5b1769eb927961c1ee0689a3e4bf8aeb69a289b0e12eaf2d3
-MISC metadata.xml 472 BLAKE2B acab18a5d54df3704a279c6a0a98d61f35e072f6dbe264c555e15265851472417a469f5f84678c9f8cdf889ff834ed5810a2768bc2ad656f7e402ab96d518d68 SHA512 f2623eccd20aee91ae2ffe90e3999e359865757269d8ca84cd095ee5f0d55e18000d3afb602531231799a31a14edbf1bdeea72b162976fcd51727a169045d100
+MISC metadata.xml 336 BLAKE2B ca7263a1856bc0a6de0a9085fcaa0df5745cda2f678c36984fc2bf11218207214dbad308c39811213d7ce5d376228bc87a60adbfd4fee8f02b2119af0ebac207 SHA512 ac71d3806312b434087a0ce55eadd3db06091e11a195fe90da48570bdb4ad47bf50c864ae2b82e25acb08b6ce78ebc6dc8b33bdd064ee449efcb0995806f2eca
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
deleted file mode 100644
index 6f9f1fa58337..000000000000
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-MY_P="${PN}-enfuse-${PV/_rc/rc}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc gpu image-cache openmp"
-
-REQUIRED_USE="openmp? ( !image-cache )"
-
-RDEPEND="
-	>=dev-libs/boost-1.31.0:=
-	media-libs/glew
-	>=media-libs/lcms-2.5:2
-	>=media-libs/libpng-1.2.43:0=
-	>=media-libs/openexr-1.0:=
-	media-libs/plotutils[X]
-	media-libs/tiff:=
-	>=media-libs/vigra-1.8.0[openexr]
-	sci-libs/gsl:=
-	virtual/jpeg:0=
-	debug? ( dev-libs/dmalloc )
-	gpu? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick
-	sys-apps/help2man
-	virtual/pkgconfig
-	doc? (
-		media-gfx/transfig
-		sci-visualization/gnuplot[gd]
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" )
-
-src_prepare() {
-	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
-	sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-	cmake-utils_src_prepare
-
-	epatch "${FILESDIR}"/${P}-texinfo-5-upstream.patch
-	epatch "${FILESDIR}"/${P}-texinfo-5-more.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_FLAGS_RELEASE=""
-		$(cmake-utils_use_enable debug DMALLOC)
-		$(cmake-utils_use doc DOC)
-		$(cmake-utils_use_enable image-cache IMAGECACHE)
-		$(cmake-utils_use_enable openmp)
-		$(cmake-utils_use_enable gpu)
-	)
-	CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake-utils_src_compile -j1
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README )
-	cmake-utils_src_install
-}
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
deleted file mode 100644
index 296bc122df57..000000000000
--- a/media-gfx/enblend/enblend-4.1.3-r2.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
-
-inherit cmake-utils
-
-MY_P="${PN}-enfuse-${PV}"
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 VIGRA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gpu openmp"
-
-RDEPEND="
-	dev-libs/boost:=
-	media-libs/lcms:2
-	media-libs/openexr:=
-	media-libs/tiff:=
-	media-libs/vigra[openexr]
-	sci-libs/gsl:=
-	debug? ( dev-libs/dmalloc )
-	gpu? (
-		media-libs/freeglut
-		media-libs/glew:*
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	media-libs/libpng:0
-	sys-apps/help2man
-	virtual/jpeg:0
-	virtual/pkgconfig
-	doc? (
-		media-gfx/transfig
-		sci-visualization/gnuplot[gd]
-		virtual/imagemagick-tools
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-vigra_check.patch
-	"${FILESDIR}"/${P}-texinfo-5-upstream.patch
-	"${FILESDIR}"/${P}-texinfo-5-more.patch
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# CRLF in files, don't bother with patch
-	sed -i -e "/FIND_LIBRARY(LCMS2_LIBRARIES/s/lib32/lib/" \
-		CMakeModules/FindLCMS2.cmake || die
-	sed -e "/FIND_LIBRARY(OPENGL_gl_LIBRARY/s/lib32/lib/" \
-		-e "/NAMES.*MesaGLU/s/lib32/lib/" \
-		-i CMakeModules/FindOpenGL.cmake || die
-
-	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
-	sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_FLAGS_RELEASE=""
-		-DENABLE_DMALLOC=$(usex debug)
-		-DDOC=$(usex doc)
-		-DENABLE_GPU=$(usex gpu)
-		-DENABLE_IMAGECACHE=$(usex !openmp)
-		-DENABLE_OPENMP=$(usex openmp)
-	)
-	CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake-utils_src_compile -j1
-}
diff --git a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch b/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
deleted file mode 100644
index e9fef85278d5..000000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt	2017-02-12 13:43:46.862787952 +0100
-+++ b/CMakeLists.txt	2017-02-12 13:50:03.461229021 +0100
-@@ -185,7 +185,6 @@
- FIND_PACKAGE(TIFF REQUIRED)
- FIND_PACKAGE(Perl REQUIRED)
- # this one is needed in doc. (Especially the program "convert")
--FIND_PACKAGE(ImageMagick REQUIRED)
- FIND_PACKAGE(GSL REQUIRED)
- include_directories(${GSL_INCLUDE_DIR})
- LIST(APPEND common_libs ${LCMS2_LIBRARIES} ${TIFF_LIBRARIES} ${GSL_LIBRARIES})
-@@ -394,8 +393,9 @@
- add_subdirectory(src)
- 
- # you really should have perl installed, when creating doc's
--if (PERL_FOUND AND IMAGEMAGICK_FOUND AND DOC)
--  # this should be set from comman line
-+if (PERL_FOUND AND DOC)
-+  FIND_PACKAGE(ImageMagick REQUIRED)
-+  # this should be set from command line
-   # Possible values like described in README: @smallbook @afivepaper @afourpaper @afourwide @afourlatex
-   # @letter is default
-   set(EXTRATEXI2DVIFLAGS "@afourpaper" CACHE STRING "Papersize: @letter @smallbook @afivepaper @afourpaper @afourwide @afourlatex")
diff --git a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch
deleted file mode 100644
index dd63ae3697a5..000000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-more.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7ec0e758430f9e31fb9fc0f85d72339a307263d6 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 14 Aug 2015 03:09:57 +0200
-Subject: [PATCH] Texinfo: Fix parameter handling with macro "mainpurpose"
-
----
- doc/auxmac.texi |  6 +++---
- doc/enfuse.texi | 10 +++++-----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/doc/auxmac.texi b/doc/auxmac.texi
-index 59520c3..ad35d6a 100644
---- a/doc/auxmac.texi
-+++ b/doc/auxmac.texi
-@@ -88,12 +88,12 @@ not displayed, because of lacking <acronym>SVG</acronym> and
- 
- @c Text Fragments
- 
--@macro mainpurpose
-+@macro mainpurpose{purpose}
- @ifinfo
--@strong{Main Purpose}:
-+@strong{Main Purpose}: \purpose\
- @end ifinfo
- @ifnotinfo
--@strong{Main Purpose: }
-+@strong{Main Purpose: }\purpose\
- @end ifnotinfo
- @end macro
- 
-diff --git a/doc/enfuse.texi b/doc/enfuse.texi
-index 92fe597..9e601ea 100644
---- a/doc/enfuse.texi
-+++ b/doc/enfuse.texi
-@@ -5164,7 +5164,7 @@ Fire in rapid succession.
- @cindex series, simple
- @cindex noise reduction
- 
--@mainpurpose Reduce noise
-+@mainpurpose{Reduce noise}
- 
- @noindent
- With the default settings, Enfuse computes a weighted average of the
-@@ -5193,7 +5193,7 @@ be worth an extra run.
- @cindex series, exposure
- @cindex dynamic range increase
- 
--@mainpurpose Increase manageable dynamic range
-+@mainpurpose{Increase manageable dynamic range}
- 
- @noindent
- An exposure series is a set of images taken with identical parameters
-@@ -5322,7 +5322,7 @@ the multiply occuring exposures and reducing noise.
- @cindex series, flash exposure
- @cindex dynamic range increase
- 
--@mainpurpose ???
-+@mainpurpose{???}
- 
- ...
- 
-@@ -5333,7 +5333,7 @@ the multiply occuring exposures and reducing noise.
- @cindex series, polarization
- @cindex saturation enhancement
- 
--@mainpurpose Reflection suppression, saturation enhancement
-+@mainpurpose{Reflection suppression, saturation enhancement}
- 
- In the current implementation of Enfuse, it is not possible in general
- to fuse a polarization series.  Naively abusing
-@@ -5345,7 +5345,7 @@ to fuse a polarization series.  Naively abusing
- @cindex focus stacks
- @cindex depth-of-focus increase
- 
--@mainpurpose Synthetic Depth-of-Field Increase
-+@mainpurpose{Synthetic Depth-of-Field Increase}
- 
- A @dfn{focus stack} is a series of images where the distance of the
- focal plane from the sensor varies.  Sloppily speaking, the images
--- 
-2.5.0
-
diff --git a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch b/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch
deleted file mode 100644
index ef04aa73633a..000000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-texinfo-5-upstream.patch
+++ /dev/null
@@ -1,633 +0,0 @@
-# HG changeset patch
-# User Chris <cspiel@users.sourceforge.net>
-# Date 1438958604 -7200
-# Node ID 8387f0170f7b352baea887f77960e8066185a6cd
-# Parent  c1bcd2df4e3724f3bb0414d3a5e2e9302be78921
-Get the Texinfo documentation to translate again with makeinfo-5.2.
-
-This patch takes thus care of issue #1181678
-    https://bugs.launchpad.net/enblend/+bug/1181678
-
-We do not strive for a nicely formatted documentation anymore in the
-Stable Branch, because the Development Branch already has a flawless
-new documentation *not* based on Texinfo.
-
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/Makefile.am
---- a/doc/Makefile.am	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/Makefile.am	Fri Aug 07 16:43:24 2015 +0200
-@@ -46,7 +46,7 @@
-                    -I $(top_builddir) -I $(srcdir) \
-                    --css-include=@srcdir@/default.css \
-                    $(MAKEINFOHTMLFLAGS)
--export TEXINPUTS=$(top_builddir):$(srcdir)
-+export TEXINPUTS = .:$(top_builddir):$(srcdir):
- 
- TEXI2DVI = texi2dvi $(TEXI2DVIFLAGS) $(EXTRATEXI2DVIFLAGS)
- 
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.tex
---- a/doc/auxmac.tex	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/auxmac.tex	Fri Aug 07 16:43:24 2015 +0200
-@@ -1,13 +1,6 @@
--\input thumbpdf.sty
--
--
- % Auxilliary Macros.
- %
- % Include this file before texinfo.tex!
- 
- \def\mathit#1{\hbox{\it #1}}
- \def\mathrm#1{\ifmmode{\rm #1}\else #1\fi}
--
--% These definitions are required for older versions of texinfo.tex.
--\def\geq{\ifmmode \ge\else $\ge$\fi}
--\def\leq{\ifmmode \le\else $\le$\fi}
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/auxmac.texi
---- a/doc/auxmac.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/auxmac.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -2,16 +2,6 @@
- @c Macro Definitions
- @c
- 
--@c redefined commands
--
--@c Get the spacing of dimensions right.
--@ifnottex
--@macro dmn{unit}
--@tie{}\unit\
--@end macro
--@end ifnottex
--
--
- @c extended commands
- 
- @c Add a title to a DocBook element.
-@@ -80,73 +70,6 @@
- 
- @c Operators
- 
--@c Generate a nice representation of base^exponent.
--@macro power{base, exponent}
--@ifinfo
--\base\^\exponent\
--@end ifinfo
--@html
--\base\<sup>\exponent\</sup>
--@end html
--@tex
--$\base\^{\exponent\}$%
--@end tex
--@docbook
--\base\<superscript>\exponent\</superscript>
--@end docbook
--@end macro
--
--
--@macro classictimes
--@ifinfo
--x@c gobble following newline  -- The Tricks of a Texinfo Wizard.
--@end ifinfo
--@html
--&times;
--@end html
--@tex
--\\ifmmode\\times\\else$\\times$\\fi% gobble following newline  -- The Tricks of a TeX Wizard.
--@end tex
--@docbook
--&times;
--@end docbook
--@end macro
--
--
--@c Required for older versions of makeinfo.  The definition of @geq
--@c for TeX lives in auxmac.tex.
--@ifnottex
--@macro geq
--@ifinfo
-->=@c
--@end ifinfo
--@html
--&ge;
--@end html
--@docbook
--&ge;
--@end docbook
--@end macro
--@end ifnottex
--
--
--@c Required for older versions of makeinfo.  The definition of @leq
--@c for TeX lives in auxmac.tex.
--@ifnottex
--@macro leq
--@ifinfo
--<=@c
--@end ifinfo
--@html
--&le;
--@end html
--@docbook
--&le;
--@end docbook
--@end macro
--@end ifnottex
--
--
- @macro plusminus
- @ifinfo
- +/-@c
-@@ -163,62 +86,6 @@
- @end macro
- 
- 
--@c Special Characters
--
--@macro inlineomega
--@ifinfo
--@math{omega}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
--    <mi>&omega;</mi>
--</mathinline>
--@end html
--@tex
--$\\omega$%
--@end tex
--@docbook
--&omega;
--@end docbook
--@end macro
--
--
--@macro inlinesigma
--@ifinfo
--@math{sigma}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
--    <mi>&sigma;</mi>
--</mathinline>
--@end html
--@tex
--$\\sigma$%
--@end tex
--@docbook
--&sigma;
--@end docbook
--@end macro
--
--
--@macro inlinexi
--@ifinfo
--@math{xi}@c
--@end ifinfo
--@html
--<mathinline xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
--    <mi>&xi;</mi>
--</mathinline>
--@end html
--@tex
--$\\xi$%
--@end tex
--@docbook
--&xi;
--@end docbook
--@end macro
--
--
- @c Text Fragments
- 
- @macro mainpurpose
-@@ -236,26 +103,3 @@
- @noindent
- @strong{Summary of influential options}
- @end macro
--
--
--@macro semilog{significant, exponent}
--@ifinfo
--\significant\*10^\exponent\@c
--@end ifinfo
--@html
--<math xmlns="http://www.w3.org/1998/Math/MathML" display="inline">
--    <mn>\significant\</mn>
--    <mo>&times;</mo>
--    <msup>
--        <mn>10</mn>
--        <mn>\exponent\</mn>
--    </msup>
--</math>
--@end html
--@tex
--\\ifmmode\significant\ \\times 10^{\exponent\}\\else$\significant\ \\times 10^{\exponent\}$\\fi%
--@end tex
--@docbook
--\significant\&times;10<superscript>\exponent\</superscript>
--@end docbook
--@end macro
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/bug-reports.texi
---- a/doc/bug-reports.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/bug-reports.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -77,7 +77,7 @@
- @item
- A complete set of input images that will reproduce the bug.  Strive
- for a minimal set of @emph{small}@footnote{Images of a size less than
--1500@classictimes{}1000 pixels qualify as small.} images.
-+1500x1000 pixels qualify as small.} images.
- 
- @item
- The type of machine you are using, and the operating system name and
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.info
-Binary file doc/enblend.info has changed
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enblend.texi
---- a/doc/enblend.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/enblend.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -508,9 +508,9 @@
- twice as large as the previous one.  So, the zeroth layer, the
- original image, obviously defines the image at single-pixel scale, the
- first level works at two-pixel scale, and generally, the @math{n}-th
--level contains image data at @power{2, n}-pixel scale.  This is the
-+level contains image data at 2^n-pixel scale.  This is the
- reason why an image of
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
-+@math{width}x@/@math{height}@dmn{pixels} cannot be
- deconstructed into a pyramid of more than
- @ifinfo
- @display
-@@ -1194,11 +1194,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{1.2, -38}
-+Minimum normalized value: 1.2e-38
- @item
--Epsilon: @semilog{1.2, -7}
-+Epsilon: 1.2e-7
- @item
--Maximum finite value: @semilog{3.4, 38}
-+Maximum finite value: 3.4e38
- @end itemize
- 
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
-@@ -1210,11 +1210,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{2.2, -308}
-+Minimum normalized value: 2.2e-308
- @item
--Epsilon: @semilog{2.2, -16}
-+Epsilon: 2.2e-16
- @item
--Maximum finite value: @semilog{1.8, 308}
-+Maximum finite value: 1.8e308
- @end itemize
- @end table
- 
-@@ -1236,11 +1236,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{9.3, -10}
-+Minimum normalized value: 9.3e-10
- @item
--Epsilon: @semilog{2.0, -3}
-+Epsilon: 2.0e-3
- @item
--Maximum finite value: @semilog{4.3, 9}
-+Maximum finite value: 4.3e9
- @end itemize
- 
- @item -f @var{WIDTH}x@var{HEIGHT}
-@@ -1250,7 +1250,7 @@
- @cindex canvas size
- @cindex size, canvas
- Ensure that the minimum ``canvas'' size of the output image is at
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}.  Optionally specify
-+least @var{WIDTH}x@/@var{HEIGHT}.  Optionally specify
- the @var{XOFFSET} and @var{YOFFSET}, too.
- 
- @pindex nona @r{(Hugin)}
-@@ -1572,7 +1572,7 @@
- @value{src::default-coarseness-factor}, this means,
- option@tie{}@option{--coarse-mask} shrinks the overlapping
- @emph{areas} by a factor of
--@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}.
-+@math{@value{src::default-coarseness-factor}x@/@value{src::default-coarseness-factor}}.
- With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a
- run of Enblend shrinks approximately by 80% and the maximum amount of
- memory in use at a time is decreased to 60% (Enblend compiled with
-@@ -2494,7 +2494,7 @@
- When using this option in conjunction with
- option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the
- smoothing occurs @emph{after} the overlap regions have been shrunken.
--Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR}
-+Thus, blurring affects a @var{FACTOR}x@/@var{FACTOR}
- times larger area in the original images.
- 
- Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}.
-@@ -2606,7 +2606,7 @@
- @rimage{seam-line-visualization}
- 
- @caption{Seam-line visualization of a simple overlap.  The
--853@classictimes{}238@dmn{pixel} image is shown at a magification of
-+853x238@dmn{pixel} image is shown at a magification of
- 100%.}
- 
- @shortcaption{Seam-line visualization}
-@@ -2618,7 +2618,7 @@
- @rimage{seam-line-visualization, 15cm}
- 
- @caption{Seam-line visualization of a simple overlap.  The
--853@classictimes{}238@dmn{pixel} image has been rescaled to a width of
-+853x238@dmn{pixel} image has been rescaled to a width of
- approximately 15@dmn{cm}.}
- 
- @shortcaption{Seam-line visualization}
-@@ -2629,7 +2629,7 @@
- @float Figure,Figure:seam-line-visualization
- @rimage{seam-line-visualization, 15cm}
- 
--@caption{Seam-line visualization of a simple overlap.  The 853@classictimes{}238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
-+@caption{Seam-line visualization of a simple overlap.  The 853x238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.}
- 
- @shortcaption{Seam-line visualization}
- @end float
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.info
-Binary file doc/enfuse.info has changed
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/enfuse.texi
---- a/doc/enfuse.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/enfuse.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -621,9 +621,9 @@
- twice as large as the previous one.  So, the zeroth layer, the
- original image, obviously defines the image at single-pixel scale, the
- first level works at two-pixel scale, and generally, the @math{n}-th
--level contains image data at @power{2, n}-pixel scale.  This is the
-+level contains image data at 2^n-pixel scale.  This is the
- reason why an image of
--@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be
-+@math{width}x@/@math{height}@dmn{pixels} cannot be
- deconstructed into a pyramid of more than
- @ifinfo
- @display
-@@ -1255,11 +1255,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{1.2, -38}
-+Minimum normalized value: 1.2e-38
- @item
--Epsilon: @semilog{1.2, -7}
-+Epsilon: 1.2e-7
- @item
--Maximum finite value: @semilog{3.4, 38}
-+Maximum finite value: 3.4e38
- @end itemize
- 
- @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10
-@@ -1271,11 +1271,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{2.2, -308}
-+Minimum normalized value: 2.2e-308
- @item
--Epsilon: @semilog{2.2, -16}
-+Epsilon: 2.2e-16
- @item
--Maximum finite value: @semilog{1.8, 308}
-+Maximum finite value: 1.8e308
- @end itemize
- @end table
- 
-@@ -1297,11 +1297,11 @@
- 
- @itemize
- @item
--Minimum normalized value: @semilog{9.3, -10}
-+Minimum normalized value: 9.3e-10
- @item
--Epsilon: @semilog{2.0, -3}
-+Epsilon: 2.0e-3
- @item
--Maximum finite value: @semilog{4.3, 9}
-+Maximum finite value: 4.3e9
- @end itemize
- 
- @item -f @var{WIDTH}x@var{HEIGHT}
-@@ -1311,7 +1311,7 @@
- @cindex canvas size
- @cindex size, canvas
- Ensure that the minimum ``canvas'' size of the output image is at
--least @var{WIDTH}@classictimes{}@/@var{HEIGHT}.  Optionally specify
-+least @var{WIDTH}x@/@var{HEIGHT}.  Optionally specify
- the @var{XOFFSET} and @var{YOFFSET}, too.
- 
- @pindex nona @r{(Hugin)}
-@@ -1501,8 +1501,8 @@
- @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement
- step, @var{LCE-FACTOR} is the weight factor (``strength'').
- 
--@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original}
--@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original},
-+@var{enhanced} = (1 + @var{LCE-FACTOR}) x @var{original}
-+@minus{} @var{LCE-FACTOR} x Gaussian@/Smooth(@var{original},
- @var{LCE-SCALE}).
- 
- @var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and
-@@ -1531,7 +1531,7 @@
- @opindex --contrast-window-size
- 
- Set the window @var{SIZE} for local contrast analysis.  The window
--will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.  If
-+will be a square of @var{SIZE}x@/@var{SIZE} pixels.  If
- given an even @var{SIZE}, Enfuse will automatically use the next odd
- number.
- 
-@@ -1585,7 +1585,7 @@
- @opindex --entropy-window-size
- 
- Window @var{SIZE} for local entropy analysis.  The window will be a
--square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels.
-+square of @var{SIZE}x@/@var{SIZE} pixels.
- 
- In the entropy calculation @var{SIZE} values of 3 to 7 yield an
- acceptable compromise of the locality of the information and the
-@@ -2433,20 +2433,6 @@
- from 1 to the common height, and @math{i} from 1 to the number of
- input images@tie{}@math{n}.
- 
--@macro equationW{}
--@ifnotdocbook
--@ifnottex
--(W)
--@end ifnottex
--@end ifnotdocbook
--@tex
--(W)%
--@end tex
--@docbook
--<xref linkend="equ:pixel-weighting-function"/>
--@end docbook
--@end macro
--
- Enfuse allows for weighting the contribution of each @math{P(i, x, y)}
- to the final @math{Q(x, y)}:
- @ifinfo
-@@ -2454,7 +2440,7 @@
- @math{w(P(1, x, y)) * P(1, x, y) +
- ... +
- w(P(n, x, y)) * P(n, x, y)
----> Q(x, y),}@w{                                                  }@equationW{}
-+--> Q(x, y),}
- @end display
- @end ifinfo
- @html
-@@ -2520,9 +2506,6 @@
-                 <mi>y</mi>
-             </mfenced>
-         </mrow>
--        <mtext>,</mtext>
--        <mspace width="4em"/>
--        <mtext>@equationW{}</mtext>
-     </mrow>
- </math>
- @end html
-@@ -2530,7 +2513,7 @@
- $$
-     w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y)
-     \rightarrow
--    Q(x, y),\hskip4em\hbox{@equationW{}}
-+    Q(x, y)
- $$
- @end tex
- @docbook
-@@ -2948,7 +2931,7 @@
- be extreme, favoring only a few pixels or even only one pixel in the
- input stack.  Extremes are not typical, however.
- 
--Equal weights are another extreme that turns @equationW{} into an
-+Equal weights are another extreme that turns the equation into an
- arithmetic average.  This is why we sometimes speak of the ``averaging
- property'' of this weighting algorithm, like smoothing out noise.
- 
-@@ -2969,7 +2952,7 @@
- wins, this is, gets weight@tie{}one, and all other pixels get the
- weight of zero
- (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The
--Winner Takes It All.''}).  With @option{--hard-mask} Equation@tie{}@equationW{}
-+Winner Takes It All.''}).  With @option{--hard-mask} the equation
- becomes
- @ifinfo
- @display
-@@ -3114,8 +3097,8 @@
- 
- @noindent
- Note that this ``averaging'' scheme lacks the nice noise-reduction
--property of the weighted average@tie{}@equationW{}, because only a
--single input pixel contributes to the output.
-+property of the weighted average, because only a single input pixel
-+contributes to the output.
- 
- 
- @node Single Criterion Fusing
-@@ -3562,7 +3545,7 @@
- 
- @noindent
- It associates a probability@tie{}@math{p} with each of the @math{n}
--different possible outcomes@tie{}@inlineomega{} of the random
-+different possible outcomes@tie{}@math{omega} of the random
- variable@tie{}@math{X}.
- @cindex expectation value
- Based on @math{w}, we define the @dfn{expectation value} or ``First
-@@ -4189,7 +4172,7 @@
- @end docbook
- 
- @noindent
--The parameter@tie{}@inlinesigma{}, the argument of
-+The parameter@tie{}@math{sigma}, the argument of
- option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges
- are detected by @math{g(x, y)}.  We apply the Laplacian operator in
- Cartesian coordinates
-@@ -4401,7 +4384,7 @@
- </informalequation>
- @end docbook
- 
--where we have used the dimensionless distance@tie{}@inlinexi{} from
-+where we have used the dimensionless distance@tie{}@math{xi} from
- the origin
- @ifinfo
- @display
-@@ -4556,7 +4539,7 @@
- @float Figure,Figure:laplacian-of-gaussian
- @vimage{laplacian-of-gaussian}
- 
--@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.}
-+@caption{Laplacian-of-Gaussian function for @math{sigma} = 0.5.}
- 
- @shortcaption{Laplacian-of-Gaussian}
- @end float
-@@ -4656,10 +4639,10 @@
- @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only,
- @acronym{LoG}-only, or a blend of both) scales to different image
- sizes.  In practice, this means that if you start with a set of
--reduced size images, say 2808@classictimes{}1872 pixels, carefully
-+reduced size images, say 2808x1872 pixels, carefully
- optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find
- @acronym{LoG}-only the best mode, and then switch to the original
--resolution of 5616@classictimes{}3744 pixels, multiplying (or
-+resolution of 5616x3744 pixels, multiplying (or
- dividing) the parameters by four and sticking to @acronym{LoG}-only
- might @emph{not} result in the best fused image.  For best quality,
- perform the parameter optimization and the search for the most
-@@ -5080,9 +5063,9 @@
- Images should align well to be suitable for fusion.  However, there is
- no hard mathematical rule what ``well'' means.  The alignment
- requirements for 16@dmn{MPixel} images to yield a sharp
--4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per
-+4"x6" print at 300@dmn{dpi} (``dpi'' means dots per
- inch) or even for web presentation are relatively low, whereas the
--alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print
-+alignment of 8@dmn{MPixel} images for a 12"x18" print
- ought to be tight.
- 
- @pindex hugin
-@@ -5548,7 +5531,7 @@
- 
- Let us use an example to illustrate the problem of relating the
- sharpness with the local contrast variations.  Say we use a
--5@classictimes{}5 contrast window.  Moreover, let @code{sharp_edge}
-+5x5 contrast window.  Moreover, let @code{sharp_edge}
- and @code{smooth_edge} be two specific configurations:
- 
- @example
-@@ -5727,7 +5710,7 @@
- Apply the default grayscale projector: @code{average} and throw away
- all edges with a curvature of less than 0.5% and replace the
- @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data.  Use
--a window of 7@classictimes{}7@dmn{pixel} window to compute the
-+a window of 7x7@dmn{pixel} window to compute the
- @acronym{SDev}.
- @end table
- 
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenblend.texi
---- a/doc/versenblend.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/versenblend.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -1,4 +1,4 @@
--@set UPDATED 10 March 2014
--@set UPDATED-MONTH March 2014
-+@set UPDATED 15 June 2015
-+@set UPDATED-MONTH June 2015
- @set EDITION 4.1.3
- @set VERSION 4.1.3
-diff -r c1bcd2df4e37 -r 8387f0170f7b doc/versenfuse.texi
---- a/doc/versenfuse.texi	Fri Aug 07 16:43:18 2015 +0200
-+++ b/doc/versenfuse.texi	Fri Aug 07 16:43:24 2015 +0200
-@@ -1,4 +1,4 @@
--@set UPDATED 10 March 2014
--@set UPDATED-MONTH March 2014
-+@set UPDATED 15 June 2015
-+@set UPDATED-MONTH June 2015
- @set EDITION 4.1.3
- @set VERSION 4.1.3
-
diff --git a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
deleted file mode 100644
index d067df3c57ae..000000000000
--- a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ConfigureChecks.cmake	2013-10-07 10:50:00.000000000 +0400
-+++ b/ConfigureChecks.cmake	2015-03-31 13:42:40.179527224 +0300
-@@ -53,7 +53,7 @@
- if(VIGRA_FOUND AND NOT VIGRA_VERSION_CHECK)
-   unset(VIGRA_SETIMAGEINDEX CACHE)
-   set(CMAKE_REQUIRED_INCLUDES ${VIGRA_INCLUDE_DIR})
--  set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES})
-+  set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES} -lpthread)
-   check_cxx_source_compiles(
-   "
-   #include <vigra/imageinfo.hxx>
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index 621b21a35cf1..9495d45d212c 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -5,10 +5,6 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<use>
-		<flag name="gpu">GPU support for Enblend</flag>
-		<flag name="image-cache">allow for processing of large images</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">enblend</remote-id>
 	</upstream>
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index ea2849992c20..3c4a9aea012e 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,8 +3,10 @@ DIST feh-2.18.3.tar.bz2 2127924 BLAKE2B c667a7bea38e66afd4ed7c688c32327700419648
 DIST feh-2.24.tar.bz2 2130683 BLAKE2B b1f720d9ef74b4418daf92b945e57ca7d34839f72f5be47312dd936274e411a0ec4d4df2042cbb98a0656fd52a9cce804d627e8db497467ef4461eb994e5ccd3 SHA512 5d745586201dfc9b72a2e3987aed5d9c36f18c3123d3083c1c130f6b301da98dccbc79bc6aa55c70a895e831a7325c4cbf75fa2ca82a3a05eda3e98e1de8cb7d
 DIST feh-2.25.1.tar.bz2 2131624 BLAKE2B 3e7d9145bb416d433f3ec92b5c921a734de137e3637999b6c3c6ac7e8d8b2e05a8a34dcdb12715431d4dd22f37a6e70b93bd18831c5e05ae9ce91b8e2e2f17d4 SHA512 a821d46901d4cf59bb09b911f28c6ab26fbd0ee9784b50fbacfb6cf23483da5d29ebbb4cc53b23289181bb3ba0dc9893a3f39a90b3420d0bd98d740d5583fc3e
 DIST feh-2.25.tar.bz2 2131457 BLAKE2B 50a3ab469dc637195e4421871ee01f690dd890abf97d408e2781684e497623d455ce3a92f5f809b3ab1562396d605618061786cfbaf78541064cc6c2c0892d1a SHA512 42bac46f71d3833affd076d985464c32dbba5ad34c0ab02692e6d9dba68304b2209c87221340f695408c1959a4482cdaf18fda6552a14cc42e08655bbb28ae4a
+DIST feh-2.26.3.tar.bz2 2132140 BLAKE2B 4d1e87ecdc0aac06c06fe0f0901aaaf26cd288bbf7283e9106b3034c806230680feb18742dabd6648efe9dfe81e703fe6b17580f1a1ea95a6d21d50a47aac438 SHA512 b7212e99d4210b71c1d84e6712b7cac18a65367ebf9a17d889412dddb66aefd2c3f0bf0b624b09f3b46aa007cd27ac1bd2e4a7c4757e8bc90d49d2a435baaf06
 EBUILD feh-2.18.3.ebuild 1194 BLAKE2B a9ba56ee28f45ba475db7373f3caf7534fb9cb1e020b85b6f4fa19fecd00cd23c493d862b662639e73cd2e9b38bc8703e42a36107e26cee636b0ad871b1d6990 SHA512 f23c472d2686a21fb3c81111415682d059a121eb5e0a14a6a71298395407e3aea0f5a16b9d91ca8c46c2e7a1ce455656832863ba63de2a142e056dac132e7346
 EBUILD feh-2.24.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
 EBUILD feh-2.25.1.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
 EBUILD feh-2.25.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a
+EBUILD feh-2.26.3.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
 MISC metadata.xml 465 BLAKE2B 8f1b9aeb152fc8941e9cf72cf562b46d4b7b93677713b99cc7ba01cffba527cfc818e5b0dfb8d5d3878dd31f2488277036f876c01d2d85a5422b285275819eb3 SHA512 7156b24a140c6b586af743cc670b588eaba3c255fd356f689c26c737195ebcb9d36bcf7cc6291c668d8ae6a4da3d4914a0830d80d86e3831e966bc38708607c8
diff --git a/media-gfx/feh/feh-2.26.3.ebuild b/media-gfx/feh/feh-2.26.3.ebuild
new file mode 100644
index 000000000000..0fc4bf732db8
--- /dev/null
+++ b/media-gfx/feh/feh-2.26.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs gnome2-utils xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index 1334b780b78b..c0624b8cda49 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -5,6 +5,5 @@ AUX freepv-0.3.0-noplugin.patch 1099 BLAKE2B 41c3c76e19d058764a700665f7c139f3b1d
 AUX freepv-0.3.0-stringh.patch 273 BLAKE2B 16781116005749beead28a96190ae04f19808934c20d52f62c7c858a6eb42793b5de2bc394373499636b7367e48819e1e48fe4cf40dcb9de80c3001d395d34ae SHA512 b368117f3a675df53e76ada4b13aa6d99f2744f006b2a8d6e37c96c5a1c62f48383042a519e82d03bd569192615de94f1b87dfa851178924d6b002522372b67f
 AUX freepv-0.3.0-unsigned_short.patch 1787 BLAKE2B 975d3b534deb4198b505553cd05f34369db07a98706a2b6154891cc1d163e538ca9430d91db340fcf88ea2e9b6325c3047af4c24d0e248fb384da7a749ea2eff SHA512 aba4a7b0d882ebce73b5ec823e8a51cec2788efdc4d9000c9d48a3c07a77e88dbee1e24ffdb1a57b2a4ae45b9310b25cf0157c15d73f8fffdf0a2582e8b88078
 DIST freepv-0.3.0.tar.gz 175545 BLAKE2B 7169679ffb5eeaefb4f558056fc7abe9b8093722e21c0313bf22ad9839c8274d58f8123758a5842bfe06edd3fd9b84b927a25b932607efe7d0f67b772d99c8e3 SHA512 0b207dc25c51b19fd76637743adb8e395c6098d03611612086d66d3f1aa6e4d0c5700aa0e23210082d6aa7495f19d1c3d8f0f93ad11a5236df86d709d5f71a7d
-EBUILD freepv-0.3.0-r4.ebuild 979 BLAKE2B 640fe9ed24fed4dfb0cc58a729bf4047f7f3afa5436d0b551f540cf0fe20969cacc213dcd17ddb81e160704ca30568fd920f3491963107824abcb9a3de5ae94d SHA512 7e5243b3abfbcbfbe8a766f581950439e9609bf3ecb899f951df21851acdde5ee955388d89ff9a0ef18e748c30a3d12d41f214d37a01d7955d652837cd4e4f3a
 EBUILD freepv-0.3.0-r5.ebuild 1065 BLAKE2B 1390f41b75114a3ae735e3d55fa666444f6272bc9184a7b3b6893d590a3b04e59e77eb96e5cc1a6fe388b9d704b89551335c1a6ee216c16cda3ae33e6d4bd9a7 SHA512 32077cae06f717bb1e07331d07e1f945e2968eee23907891e6c20341c074a48415b1cd20209455d30f4c17cf9b9e49e46fb83393e92de65cee758a449e54da01
 MISC metadata.xml 474 BLAKE2B d3d6659b4526c50e8b141bed97fedbf2dc99626760444f637c4a8601b634cdd2e2c3fa18ab5a269adc32efccaaaaf8f39c7dbaa71b5ff83ad2204417e1e0dc2b SHA512 4466402d68177a660716acf3afdb8ddc2074e8ac7ad35f2ad6b31adc9fe938b39cc999dc082fa07f8787be8798a053a6248dac12091a22d32d9fb83a1022b421
diff --git a/media-gfx/freepv/freepv-0.3.0-r4.ebuild b/media-gfx/freepv/freepv-0.3.0-r4.ebuild
deleted file mode 100644
index 464bdb32ea38..000000000000
--- a/media-gfx/freepv/freepv-0.3.0-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)"
-HOMEPAGE="http://freepv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/freeglut
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXxf86vm"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc44.patch
-	"${FILESDIR}"/${P}-gcc46.patch
-	"${FILESDIR}"/${P}-noplugin.patch
-	"${FILESDIR}"/${P}-libpng14.patch
-	"${FILESDIR}"/${P}-stringh.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \
-		src/libfreepv/JpegReader.cpp || die 'jpeg sed failed'
-
-	sed -i -e 's:^INSTALL(.*)::' \
-		src/libfreepv/CMakeLists.txt || die 'static lib install sed failed'
-}
diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest
deleted file mode 100644
index c4816a72db66..000000000000
--- a/media-gfx/ipe/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ipe-7.1.3-gold.patch 1175 BLAKE2B 4ef9651bed7c62093bc6a7ac15c50ca758f327b05ea69e6330830fd32df6496f3a7c1b90aedcc0c622df33f3dcfffb916df1b73a511b81df424e6535d91348f3 SHA512 8ae03dd3b1720223db8a009948f09b0581eeeb7df02f61558d26c27a36108ee780d071ae46bea81c5173b3329b1ec856f3ded10faf0609cc59c140910f1af562
-DIST ipe-7.1.2-src.tar.gz 1416404 BLAKE2B e3eb5e92d7713703eaac5c6591a2553e9ba428d7a4d99cb9b5b88212f7bb8f72b7f315db4949a8665ed26c8d11e9fe16a2416291b0613ba28365b3a5e436dbb6 SHA512 9d49c5f116a6271fce5a5a6c77cad64e348b17b9b02d1be8bece341231ebc15f642d6af49e73958e4d26814eafc52be38855e4d24e8cf44488da6a752151a189
-DIST ipe-7.1.3-src.tar.gz 1497624 BLAKE2B 2e2c635d4797c5b3b1c7101f6c5112437caf6c3bf013ce5edd3439827d47aceb6d6b7aa33c21d758b9a8b8c0a265d4ee96617d0ae9fc8db97034991942bd9ed2 SHA512 eea85ed6f4bc23e746222e01f4cdfd101c9c18aeb19fcba9abff565a65614a2a5e6630ddf9f7b024cac225582a34238a22f6fc5cf7dcc3733b8281ce844ef23d
-EBUILD ipe-7.1.2.ebuild 1712 BLAKE2B 9f1d1a8ed22bd8f29363474ce8c696b2391ee8424d797339d905aa512aa1bb0099f142a011d48cb777df01dadce1438ea0c66cae4cb946dcdf76966946ed0655 SHA512 ab00eda3ddbcadf56f98014a95fa86456ffda64241dff4341e5127297f67e82fe9d2b024c658557619767940e00a1087e494da00e07a36b91337b6701af01e4c
-EBUILD ipe-7.1.3.ebuild 1753 BLAKE2B 24f296ff90650c417a9335c05b31f78b3464dfb7859986bf62e6c8392f955064f4e3ca8c3ab5705b9f72f3bb1e67ce2915d284aa430fd5f8c63bc1be8a7bf7b5 SHA512 a7cf07a4e420e181e7692eb2226c74119b94af44181ee14f622f6077e3e296b7f1b7303efa44a51a8180e7055cbbf9d3b6259e82748986464dfc38681c3e34af
-MISC metadata.xml 600 BLAKE2B 990436716dce9ba595b39445d063bbbf2754940adc3741e079fd861db5848b975af8551de9da4c8e1e89da3d7357626c1d2784e5541225cbe3c2339c1e5ae33c SHA512 7a0feac244ba6e344f4a88f41bf9c4ffb25c9a37c62326ad71bcd5b64ad61edab86f14b59121182d21f2e171899fd5a1ec63869b06ebb88773eed1e150f7d417
diff --git a/media-gfx/ipe/files/ipe-7.1.3-gold.patch b/media-gfx/ipe/files/ipe-7.1.3-gold.patch
deleted file mode 100644
index a28fafa15c43..000000000000
--- a/media-gfx/ipe/files/ipe-7.1.3-gold.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- src/ipe/Makefile       | 2 +-
- src/ipescript/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ipe/Makefile b/src/ipe/Makefile
-index 21ac500..5a7a1ad 100644
---- a/src/ipe/Makefile
-+++ b/src/ipe/Makefile
-@@ -10,7 +10,7 @@ TARGET = $(call exe_target,ipe)
- CPPFLAGS += -I../include -I../ipecanvas -I../ipecairo -I../ipelua \

- 	$(LUA_CFLAGS) $(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS)

- LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipelua -lipe -lipeui \

--	$(LUA_LIBS) $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS)

-+	$(LUA_LIBS) $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS) -ldl

- 

- CPPFLAGS += -DIPELETDIR=\"$(IPELETDIR)\"

- CPPFLAGS += -DIPELUADIR=\"$(IPELUADIR)\"

-diff --git a/src/ipescript/Makefile b/src/ipescript/Makefile
-index ff35fd9..2315f1f 100644
---- a/src/ipescript/Makefile
-+++ b/src/ipescript/Makefile
-@@ -8,7 +8,7 @@ include ../common.mak
- TARGET = $(call exe_target,ipescript)

- 

- CPPFLAGS += -I../include -I../ipelua $(LUA_CFLAGS) 

--LIBS += -L$(buildlib) -lipelua -lipe $(LUA_LIBS)

-+LIBS += -L$(buildlib) -lipelua -lipe $(LUA_LIBS) -ldl

- 

- CPPFLAGS += -DIPELETDIR=\"$(IPELETDIR)\"

- CPPFLAGS += -DIPESTYLEDIR=\"$(IPESTYLEDIR)\"

diff --git a/media-gfx/ipe/ipe-7.1.2.ebuild b/media-gfx/ipe/ipe-7.1.2.ebuild
deleted file mode 100644
index 95a1767ba501..000000000000
--- a/media-gfx/ipe/ipe-7.1.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
-HOMEPAGE="http://ipe7.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ipe7/${PN}/7.1.0/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/texlive-core
-	dev-lang/lua
-	media-libs/freetype:2
-	x11-libs/cairo
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-
-search_urw_fonts() {
-	# colon-separated list of paths
-	local texmfdist="$(kpsewhich -var-value=TEXMFDIST)"
-	# according to TeX directory structure
-	local urwdir=fonts/type1/urw
-	# add colon as field separator
-	local IFS="${IFS}:" dir
-	for dir in ${texmfdist}; do
-		if [[ -d ${dir}/${urwdir} ]]; then
-			URWFONTDIR="${dir}/${urwdir}"
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_setup() {
-	if search_urw_fonts; then
-		einfo "URW fonts found in ${URWFONTDIR}"
-	else
-		ewarn "Could not find directory containing URW fonts"
-		ewarn "Ipe will not function properly without them."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/fpic/fPIC/' \
-		-e 's/moc-qt4/moc/' \
-		-e "s:\$(IPEPREFIX)/lib:\$(IPEPREFIX)/$(get_libdir):g" \
-		config.mak || die
-	sed -i -e 's/install -s/install/' common.mak || die
-
-}
-
-src_compile() {
-	emake \
-		CXX=$(tc-getCXX) \
-		IPEPREFIX="${EPREFIX}/usr" \
-		IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	emake install \
-		IPEPREFIX="${EPREFIX}/usr" \
-		IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
-		INSTALL_ROOT="${ED}"
-	dodoc ../{news,readme}.txt
-	doicon ipe/icons/ipe.png
-	make_desktop_entry ipe Ipe ipe
-}
diff --git a/media-gfx/ipe/ipe-7.1.3.ebuild b/media-gfx/ipe/ipe-7.1.3.ebuild
deleted file mode 100644
index c25f67000442..000000000000
--- a/media-gfx/ipe/ipe-7.1.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
-HOMEPAGE="http://ipe7.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ipe7/${PN}/7.1.0/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/texlive-core
-	dev-lang/lua
-	media-libs/freetype:2
-	x11-libs/cairo
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-
-search_urw_fonts() {
-	# colon-separated list of paths
-	local texmfdist="$(kpsewhich -var-value=TEXMFDIST)"
-	# according to TeX directory structure
-	local urwdir=fonts/type1/urw
-	# add colon as field separator
-	local IFS="${IFS}:" dir
-	for dir in ${texmfdist}; do
-		if [[ -d ${dir}/${urwdir} ]]; then
-			URWFONTDIR="${dir}/${urwdir}"
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_setup() {
-	if search_urw_fonts; then
-		einfo "URW fonts found in ${URWFONTDIR}"
-	else
-		ewarn "Could not find directory containing URW fonts"
-		ewarn "Ipe will not function properly without them."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/fpic/fPIC/' \
-		-e 's/moc-qt4/moc/' \
-		-e "s:\$(IPEPREFIX)/lib:\$(IPEPREFIX)/$(get_libdir):g" \
-		config.mak || die
-	sed -i -e 's/install -s/install/' common.mak || die
-
-	epatch "${FILESDIR}"/${P}-gold.patch
-}
-
-src_compile() {
-	emake \
-		CXX=$(tc-getCXX) \
-		IPEPREFIX="${EPREFIX}/usr" \
-		IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	emake install \
-		IPEPREFIX="${EPREFIX}/usr" \
-		IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
-		INSTALL_ROOT="${ED}"
-	dodoc ../{news,readme}.txt
-	doicon ipe/icons/ipe.png
-	make_desktop_entry ipe Ipe ipe
-}
diff --git a/media-gfx/ipe/metadata.xml b/media-gfx/ipe/metadata.xml
deleted file mode 100644
index 6446d13a5fe6..000000000000
--- a/media-gfx/ipe/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Ipe is a drawing editor for creating figures in PDF or
-  (encapsulated) Postscript format. Ipe supports making small figures
-  for inclusion into LaTeX documents as well as making multi-page PDF
-  presentations.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">ipe7</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 372ce08e3065..8701c6928731 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,5 +1,5 @@
 DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
-EBUILD librecad-2.1.3-r2.ebuild 1238 BLAKE2B 4d8663d5bd9897969121283c5d272dfea333dd23e58dac53ee284721a50fc19ebf3ddb915bafa08bf07fb9e649e562256d476cd799c9ab9b2a6f33b30e25daf6 SHA512 ac694a6f1d02179250898479ee0cd0d819793ec4c9747d3f062ee72e2b13438174008cf507aa55f741371de42d1f18c06cb11f0f5edf5e237f88612071cac0a8
-EBUILD librecad-2.1.3-r3.ebuild 1240 BLAKE2B 58aabdf88496e831a36dccf809ff69c334bacb15245dfbd3b94fe44ff3968a4eb8330f2fb64828ed507378053a10b2642bb5896336f9ed557bc406db001f9bef SHA512 eea97966207d444a19c95f83e94420af6e9287d82528a70bdd5fe45bedf83c301e3784d5504d0dbfdcabd5307d76de3b45fce9c8ead0a4dbcac86cbe7095338d
-EBUILD librecad-9999.ebuild 1183 BLAKE2B 9b1ac89fa4d9bf2b29408b3588779fcfc99951bc884f1f68f7964bf78a8d10a907a84c78d8b12b5925f0a89a49ed4e5ec8307a8d2b0f4a272ad86ae790274421 SHA512 b6297b5e9686f35e0fd3efaf52a0e551cec321936cd0009370f17fdabcab61fdf501f505a427748d9af88130653997d7100b6c58d94db16562183205926f4676
+EBUILD librecad-2.1.3-r2.ebuild 1239 BLAKE2B 39a94d6a4804a225549c5e4b7f74ebf79578bcff2a1189347694fd39673c2c73a5513a35fbe6cf5214b5a26d5b729d404dc6a46c98ac6aeb33ffe8b05cb6eef4 SHA512 05095a8861c0c884afe82a5637ad0218ff0ac6a2d68a7610c8a4e49dbed73e2845d7b33e93549cdd039f12fe2364b7fac8e0f0dd497c246f49230d67030812bb
+EBUILD librecad-2.1.3-r3.ebuild 1241 BLAKE2B 2856c0a78d2dd5b3d43d7e1726be5258871e5eddb3dcdf79f34f9b3c31142f6b91c5fc8ec4cfdab7e1cad7f8fa012e2eaaa9cc19fa7bef4ee959b0c7212f174f SHA512 523de0503d2259089327399ff1fd3a1ffe73a8c3c024084bd07181714dca734fc16e8be49213c4fb3dafda0e12772b9ee12f36df0bb013a6857c9d83b9509f96
+EBUILD librecad-9999.ebuild 1184 BLAKE2B ccb254d96ec419c864da6ae95a37a6efce6e2dfc3e86d12f71fb4d5b5f6312a60792c7518edd01390c3110063d8b36c852d59210ecdc7d00b1c78b6b1d1a2c6a SHA512 8ab5110a9f847b221451da6de60b6b6ccc9f6fc694e77cdd4e3c8df67492a3cda7c11c21daffbd35ec4ba4f9755428c681d75a31e225dc18aa8d51372c006e28
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index f7735d744d31..aedbfb3814e6 100644
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
+HOMEPAGE="https://www.librecad.org/"
 SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/librecad/librecad-2.1.3-r3.ebuild b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
index 20902c58015f..52d397d7a4b8 100644
--- a/media-gfx/librecad/librecad-2.1.3-r3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
+HOMEPAGE="https://www.librecad.org/"
 SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index efb61a9472a1..2ab7e7f06f7f 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils git-r3 qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
+HOMEPAGE="https://www.librecad.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
 
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 944c1e135d7f..4576a7a09ce5 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -11,5 +11,5 @@ AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea
 DIST luminance-hdr-2.4.0.tar.bz2 10507522 BLAKE2B b8dc777211b63e4e03466612e1c4b7c685f921db292712c749fc14d9638a69fd735990fd5412c7376a7452911cb15212448afc03aa8407f0d6f9c65fac5d5769 SHA512 aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702
 DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
 EBUILD luminance-hdr-2.4.0.ebuild 2010 BLAKE2B 725e43d724a797d695dcb8d6d0675442a30dad0b7fa4392daca1e3aafdffc479f30d3d5dc2777df7a8a7dfbbea30ec4a39d937d3f5b77cfeb08e6e7b6008f44c SHA512 017a18d18e0e724e7271f311371e19adadc40cc52a5699cd15f4b6383d4b761d2285833d408fe7db08fd8c2a9b8b0f9a3335f57112cadd40f9d73c6d9434521f
-EBUILD luminance-hdr-2.5.1.ebuild 1942 BLAKE2B fdc60d5f4bf3ee0336e269a7457de2e16547e24bb2865603df2a5fdfff9360f03067e4d607fa99158d7e194ed3c7728998f6738e59ba7a616a5824220e6434c4 SHA512 2412f71b89971d678a41f0301c500986f5c1e24422ca52e4b222f972be4f54f8f8fb6f13b959f81481040f35ea8d2d60d006799ee70bc8f28daf014c510c3a7f
+EBUILD luminance-hdr-2.5.1-r1.ebuild 1952 BLAKE2B c50b64bfdd0159e60108d0e02689ff3102c2332f9b501f6e31afbd2a45f7030518faca6b34a5a6dfd6ea61b204b1d7e1d8ee4bf019d142063561d2cc85ede12f SHA512 e085e42e58228f8da396f879071035d1ee5f299f82ff8e7f6ec170ce1252fc29d40ef28380f377b26b442955b2583ec7a122366ecd97212fc3b3d590f37d5a8a
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..1321f071b96d
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-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 cmake-utils toolchain-funcs eutils flag-o-matic
+
+MY_P=${P/_/.}
+DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
+HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
+SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
+IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / l10n_}"
+
+RDEPEND="
+	dev-libs/boost:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebengine:5[widgets]
+	>=media-gfx/exiv2-0.14:0=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	>=media-libs/libraw-0.13.4:=
+	media-libs/ilmbase:=
+	>=media-libs/openexr-1.2.2-r2:=
+	>=media-libs/tiff-3.8.2-r2:0
+	sci-libs/fftw:3.0=[threads]
+	fits? ( sci-libs/cfitsio:= )
+	sci-libs/gsl
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-cpp/gtest )
+"
+
+DOCS=( AUTHORS BUGS Changelog README.md TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-no-git.patch
+	"${FILESDIR}"/${PN}-2.5.1-docs.patch
+	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
+	"${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch
+)
+
+pkg_pretend() {
+	if use cpu_flags_x86_sse2 ; then
+		append-flags -msse2
+	else
+		eerror "This package requires a CPU supporting the SSE2 instruction set."
+		die "SSE2 support missing"
+	fi
+
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DUSE_OPENMP="$(usex openmp)"
+		-DUSE_FITS="$(usex fits)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for lang in ${LANGS} ; do
+		if ! use l10n_${lang} ; then
+			rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
+		fi
+	done
+}
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild
deleted file mode 100644
index 8bf884629bcc..000000000000
--- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs eutils flag-o-matic
-
-MY_P=${P/_/.}
-DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
-HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
-SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
-IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / l10n_}"
-
-RDEPEND="
-	dev-libs/boost:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebengine:5
-	>=media-gfx/exiv2-0.14:0=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	>=media-libs/libraw-0.13.4:=
-	media-libs/ilmbase:=
-	>=media-libs/openexr-1.2.2-r2:=
-	>=media-libs/tiff-3.8.2-r2:0
-	sci-libs/fftw:3.0[threads]
-	fits? ( sci-libs/cfitsio )
-	sci-libs/gsl
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-cpp/gtest )
-"
-
-DOCS=( AUTHORS BUGS Changelog README.md TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-no-git.patch
-	"${FILESDIR}"/${PN}-2.5.1-docs.patch
-	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
-	"${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch
-)
-
-pkg_pretend() {
-	if use cpu_flags_x86_sse2 ; then
-		append-flags -msse2
-	else
-		eerror "This package requires a CPU supporting the SSE2 instruction set."
-		die "SSE2 support missing"
-	fi
-
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DUSE_OPENMP="$(usex openmp)"
-		-DUSE_FITS="$(usex fits)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	for lang in ${LANGS} ; do
-		if ! use l10n_${lang} ; then
-			rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
-		fi
-	done
-}
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index cbdf96d121f0..17fe1a2078e6 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,10 +1,4 @@
-AUX nomacs-3.6.1-batch-resize.patch 757 BLAKE2B 0eba44f34bcde704fcb5ae907ee25fbab3752481409df81d48feb7b923328dd03ceeb0958f5221da493eb9e847f9c8ca7c13a313f532a929e7c6627ddf12f2ff SHA512 781921c31fdd7714e654c7112b4b866c76a2140f5b7e2e9ec2859a06281e01d00912813bae8b6b44b2cc263c27da03ee4610cde692a184125d82747c8c8cf9df
 AUX nomacs-3.8.1-qt-5.11.patch 4507 BLAKE2B 5473253ebd9405ee31dc8fa230dc3548f15f3b01cbeadf388339f836091c4a0880346a1d06344e1935c79fa1f25d30f76e1bba87363b777235a181c28aba713b SHA512 14495e3f1a93c5559fef6bfa3a141ec8b9b84e11cce09d3f362f1a8f9de1ab2b31b6c3f1407fa3f79f828b79d65f940118a311c69ae0aefee9c19cd87880bb3c
-DIST nomacs-3.6.1.tar.gz 28604636 BLAKE2B 74045163d5dabf9858de4e11a2300a298c15d691b3991a56dc802e6b16ee484637de05674aa13ba1d31848bce2df4724c3e083c5d35f82dba926b16aeaf81327 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e
-DIST nomacs-3.8.0.tar.gz 32240476 BLAKE2B b0bf2832cda09c01b98c5ef540a0d3d61046ca652c2c0b8b382ba69b7623327f6bcaf030cce2b87719a4bda1141b2118cb184700bfbff83fc86b496622178a16 SHA512 90ffd1ea7f6d8e2f07b2b093ebc7cfec682f11b874d95e249f3d35a2ceb8b75e7a0c55f19c978231c3c8342abe5cb251359771fd90aa39b50ee0a6d1514e88e1
 DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134
-EBUILD nomacs-3.6.1-r1.ebuild 1598 BLAKE2B 95aa8b0faf792aa1a6fdd92f1b3ef1f3ab740eb3900e454f2ba45a7f4700b0ddd20ecf9f40cbe086932058b2a9a670d71c3c11c0b7f7e57d1efc57b1abd1cdfa SHA512 57fce8366da69eff7739e5cd05c461ab1a577e59caf194d2b472ab1db83c29ad2ed12da6372d651d15339ae0307d58e260686e78f67ede84fcfd71f86b6054a8
-EBUILD nomacs-3.6.1.ebuild 1516 BLAKE2B 6f90ecc2401786a6ff3c06649006fd7994fe8dc53c1507937923eea49592b629102c5d49bf3047901a0d1464eb452e9294af482c0b75b3757870126914763513 SHA512 7852f9e0d3c4091b5326f4081bd3fa90d729910a036832a901f83880f55a196c26b12ff89e7f2c0cd2514af67e86c89ee939342aa459c333e0d580e17e9615bc
-EBUILD nomacs-3.8.0.ebuild 1661 BLAKE2B 286200d262f759b648747fb014ca76c24718153b9cbca0630b645637976a1b8871126809ab47971a1b03ac010ee3b3b163936c31d6a35e736c4eeead0dd8d528 SHA512 1edc2400b6f53cfbcc900cb8e3c94d82b3a1a4fc216383de413a73b9c76eada1bf5a8ffbb03a3aa35ccdd229171451352a334e34f1b90906bfc5c038c4f1fd31
-EBUILD nomacs-3.8.1.ebuild 1735 BLAKE2B 2bb1754a19a26e8547de56d1e97bbb49a36ac244df4e26fc86f50a224d1b1af2f64a49f62229c00f19a01c44669c410d05fac5ceacef8e776002b3892e28d1a5 SHA512 55c837c5117ce8ab7f97c95ed0b053c1139f257d6d9edfb38403828470bb6facd80a6a62ad84a166d4631d81a582f575970fa865f92f0a18f515320e78afab6e
+EBUILD nomacs-3.8.1.ebuild 1733 BLAKE2B 52eaaba8455349581f26a583159df4ad8494e68fca503fa1659455dea921a9829145e2ac4302e36325fc33fc77424b6b263191995f7d8be7ab8a9051f9eb7860 SHA512 894b46f2662f472253b281b007018caace584076517bd010908a506533b7b299325a4fd5c43443096b66bcd9a80a976b43a05c2938caca5748cf684b17986ec4
 MISC metadata.xml 588 BLAKE2B 544009f8f7b184b666e5b7bbb88ce395028032bd060a7abe16f2ed096accb11b0819c19b3898ca1fc96c61aacc9cf0bb5960716f711ba77c5f545f040dd31567 SHA512 f681a8f2f1ec2c2902d34829245790edd014eca1829479f2a47b9179f370d3c3d3c562c32dae1918a7616c8f75c7d94b525beec410ad39704b25fd502cefb5fb
diff --git a/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch b/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
deleted file mode 100644
index b2dd078d0e94..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 11cbd66ca66ea9d97d72546a92fe2b487e62481b Mon Sep 17 00:00:00 2001
-From: diemmarkus <diemmarkus@gmail.com>
-Date: Wed, 17 May 2017 10:08:05 +0200
-Subject: [PATCH] fixes #118 batch resizing - used to only work if rotate was
- active
-
----
- ImageLounge/src/DkCore/DkProcess.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/ImageLounge/src/DkCore/DkProcess.cpp b/ImageLounge/src/DkCore/DkProcess.cpp
-index a47b4194..d0dfd97f 100644
---- a/src/DkCore/DkProcess.cpp
-+++ b/src/DkCore/DkProcess.cpp
-@@ -255,8 +255,6 @@ bool DkBatchTransform::compute(QSharedPointer<DkImageContainer> container, QStri
- 		rotationMatrix.rotate((double)mAngle);
- 		tmpImg = tmpImg.transformed(rotationMatrix);
- 	}
--	else
--		tmpImg = img;
- 
- 	// logs
- 	if (!tmpImg.isNull()) {
diff --git a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
deleted file mode 100644
index 4f755d2ab8f7..000000000000
--- a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-PATCHES=( "${FILESDIR}/${P}-batch-resize.patch" )
-
-src_prepare() {
-	default
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild b/media-gfx/nomacs/nomacs-3.6.1.ebuild
deleted file mode 100644
index 7d4943b91dc7..000000000000
--- a/media-gfx/nomacs/nomacs-3.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? ( media-libs/tiff:0 )
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-src_prepare() {
-	default
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.8.0.ebuild b/media-gfx/nomacs/nomacs-3.8.0.ebuild
deleted file mode 100644
index 91389e8030f2..000000000000
--- a/media-gfx/nomacs/nomacs-3.8.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.8.1.ebuild b/media-gfx/nomacs/nomacs-3.8.1.ebuild
index 782838abb005..4720454ff095 100644
--- a/media-gfx/nomacs/nomacs-3.8.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 5fecc0366f9f..9f44eea6f64c 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,6 +6,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4458 BLAKE2B c79b313eb47ecfe82a712e8ac44b3ad556ded679bc2fd96de5741b605d64f5d8a06717d0133389b258cc669e17645a6278d2e96284f86d13c09cc27f6b2d7e59 SHA512 227579890ea76e496c3c09c6783cdf96320659da73c365d3b96fba82b0241320a39be0a3a3cf6f29ab34fa4b93784a8aa1d205755ef6a009f3dbb383cfc06df8
+EBUILD povray-3.7.0.0-r1.ebuild 4513 BLAKE2B bca3975cbff9e41c8c5f560f554f0f64bff7d0d5a14eb27185e960ba56ee04cc4ff9fa779aa4aac40bb4a4548edaa267b34669c856abfa015a234526bdd13bee SHA512 deb99cdee185fe98d00c744ace38dc434188050bf38b2f62b2320cf3a0fcfea670b64c4ce8f28020354f9412276721906fb9704828aeaa6de3b48362eae8ed50
 EBUILD povray-3.7.0.0.ebuild 4392 BLAKE2B 7889135b1482356090f1073d4680e17905335c7586f20d47d8dc29c375e802c3440786ede36715e3f873c70d2ff61f30fff0ab2125024aaa12dfe36b99b871d1 SHA512 c74582d9f9534c9b1c3976e2c7bb5d61a4e24afcdf4ffe08ea2626125e96a5549805d0ab5fca60410da4842e446932dcacea2d628391282f8c6dc06980c56a5c
 MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index 097bd61ed04b..2b48c77734e6 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -112,6 +112,7 @@ src_configure() {
 		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
 		$(use_enable static-libs static) \
 		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes") \
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--without-libmkl \
 		--disable-pipe \
 		--disable-strip \
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 2bc077e6c5ae..c3d1a7ca8d9a 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,6 +1,8 @@
 AUX qrencode-3.2.0-pngregenfix.patch 1339 BLAKE2B e4ae15f573ac9d00ae5286c41aa57fb2029f49f581d9e15dc6bd36a8f9364be83eae551d7db4995da5975e2dc5c0b984e5bec38b4839aaa2b6c710876021e3db SHA512 3155814da1abcbf0ad3c144e3470b5b2ae9e93d9d1b1df2437dfdf16b31aaa9efb3642ceedb6facdc640685ddc41cfddf2e7266994d6ad5f1fa0f24e1473a89a
 DIST qrencode-3.4.4.tar.bz2 369136 BLAKE2B 19e9a2089c6c22284da61dda57d1150573b72833c3e9d96d1aa8742a69cb7495b3c39b8162b0dd268e94412bbc618d1358dcfd969f12c0b3e9701414955aed46 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d
 DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
+DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
 EBUILD qrencode-3.4.4-r1.ebuild 577 BLAKE2B 19577c82a04b248a08201344b226a236bf73b58540f0fb5c8e4d55493dfeade02cc1f0d22d096dda91a82b52f1c532f8068b755dc47be06e138e4b4a30516f7a SHA512 af41d0ff230fe92fdc21d7ee0ab93820187f1973f633dc7cc5b32140504c48729c30a9d35488cf59e90010a5852fd72111275118053789c6e5e4ccefeab35288
 EBUILD qrencode-4.0.0.ebuild 877 BLAKE2B 29aea20c217c2d95eea2083f8a5f7be1d1060bfd1de0bfadea9ec34594f5f2503de322274c9cca2fa9f45dd9841c6e04b09750f346ff93b901146ae74116ac0c SHA512 25fc4c0abc58d351c1d53c105d89c39d61a8eb9f63e9a2084183d047fc1846339842f0f17d6264dd524be298b5b8f8dcf92692327aa08f4b6b053a5ac8f45dbe
+EBUILD qrencode-4.0.2.ebuild 785 BLAKE2B b223dac0308d17648761f32b45339aa12074113f81f9c35f37f806198f2922239efe9634135a68fab44b7ffd4f7d2e29a6f14940e5911e765c51f2aa91a3a2d9 SHA512 a4d2e49119d9365f75f2d7c740496d6e302ad66dfefb1894925f6323c105ca3f3d0a5788afbafbeee85015ce4380626c8948f175ddf54d567086493c3eabb14c
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
new file mode 100644
index 000000000000..a12c5fe02c0a
--- /dev/null
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="C library for encoding data in a QR Code symbol"
+HOMEPAGE="https://fukuchi.org/works/qrencode/"
+SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_with test tests)
+		# TODO: figure out how to make SDL check fail as the SDL test
+		# program is not useful
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	cd tests || die
+	./test_basic.sh || die
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 882b2e4f9b66..a40652e99642 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,10 +1,13 @@
 AUX slic3r-1.1.7-adjust_var_path.patch 274 BLAKE2B 7f360a202f1bcbeb42619ed7293a5997ebc47ab754fc2fed0c88bbf514bf32b6c72f7c64e9c86efef90d8aec93a72662da599af910c14f6186e0f3cc5b1e9482 SHA512 c13cf1a6f37aa13a9b85093e75de0d2368b4ca4623b28be17e7cfef5740b2b4f4cee69492c099bf936e4ee553e37389b8ffa9ea0df804a80a1cb6295cd198653
 AUX slic3r-1.2.9-adjust_var_path.patch 293 BLAKE2B e16ca1eb4c7037adc704250e090cee3be3bddf0b4e7f4cb24a1d3d6769239904bc7fcf1cc34dd521424a3555f02732253578c05f2b343570c202eec58bc5a519 SHA512 5a1ddca0380964c2bce9ba83dd9654671636433d0719cb54851e2ff521bd08c886f317073a1db5c145f8b3689248781cc1dc734c2071e6f6319be21845ed8a9d
 AUX slic3r-1.2.9-c++11.patch 1102 BLAKE2B 3cb6c1ab196a73da820190e2f00f65654a1e3ac22926a6de94f64bb23d8d31df73f4a4cbff1e757602b018d4e3a430ddd1f43f0f33d13a5814dff601d9ea4538 SHA512 e5fa8ba0ce1ccbf5da34559c1e4d6d2db3c71acff69129125aef68e785285649a2e9b6c66779caffd2fe400859e878178afbd3f1884a28d9bdbee3b66d86311c
+AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 DIST slic3r-1.2.9.tar.gz 2165322 BLAKE2B 49643284520e6c85ff0e32fada165c8d4c75c15e484555aac1004bc9527bacd552c6aa4916cbb56e304553a47ef6c2db703f6e9d705a585cfbac909c2e84bb79 SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51
+DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 EBUILD slic3r-1.1.7.ebuild 2909 BLAKE2B e27ded00dbfe3869bd08b5a7d969f78d23c96c34611e50997a57f9331a0b142de3e984e5a15eea219414b39c97fcd99633014bce2df072117ea334db2d41a868 SHA512 03a2ffd9a3290b582da0feb1eaff5445ec1baa991faa5dde9899f68d557bd234c2f20cca24a5660093e0695ef5ca47ed76059688da48d2561b92b45d17ece834
 EBUILD slic3r-1.2.9-r2.ebuild 2472 BLAKE2B 60a07b07348bec52717fa7476286030dd0ff9bda794c634e054386d67a46d3a640429eb8d301b356cf8e01d08f0b73777ae33944a2a65a7882618bca5ef16a95 SHA512 9937794276d490f75476fa39208f7726d0ad83534acb84ab5818cd1849c580cf3ce2c9f01b9eeaaee9ed9d4f49cc24bb9c4b95c4b45bbd70fd304678e0246795
+EBUILD slic3r-1.3.0.ebuild 2602 BLAKE2B e4f9a4e793ee552d839a563427ba4ffc4458736b114dfb13f0d99ea0c34d70d1bcc247f4679a436672b1259a4e1d4caa83e652ff6f6c942229c12af734058982 SHA512 7884576a45326e4ac368f3780595ac95ab90005d1d3abe9101fb7a45a16dfb56908b787e5deca39ac0f7e47f7e8390793dd514226fd4171c5abcbcd25d5b0bf8
 EBUILD slic3r-9999.ebuild 2621 BLAKE2B ac3c5a2f2790214a68522edae4b4e93958bd866bc236c0435ca535733a209ee05b96cee6ba1a470420ca1a9a3f66454c09b38eeb0e44d683a38977b797853626 SHA512 bfff6a690433fdd85398d841c738578e44569eb58df43b602502c062419a77b3786288944414b3114538cbc278ccb029fa074ce44e4f2fc919209052888dacdc
 MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
new file mode 100644
index 000000000000..8cb7fd6d16dc
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
@@ -0,0 +1,609 @@
+commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
+Author: Ian Stakenvicius <axs@gentoo.org>
+Date:   Wed Sep 27 12:22:14 2017 -0400
+
+    Revert "Use --local-lib when calling cpanm"
+    
+    This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
+    that add local::lib dependency
+
+diff --git a/Build.PL b/Build.PL
+index 2dd18435..18befbf8 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -109,16 +109,7 @@ EOF
+         if !$cpanm;
+     my @cpanm_args = ();
+     push @cpanm_args, "--sudo" if $sudo;
+-    
+-    # install local::lib without --local-lib otherwise it's not usable afterwards
+-    if (!eval "use local::lib qw(local-lib); 1") {
+-        my $res = system $cpanm, @cpanm_args, 'local::lib';
+-        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+-            if $res != 0;
+-    }
+-    
+-    push @cpanm_args, ('--local-lib', 'local-lib');
+-    
++
+     # make sure our cpanm is updated (old ones don't support the ~ syntax)
+     system $cpanm, @cpanm_args, 'App::cpanminus';
+     
+diff --git a/slic3r.pl b/slic3r.pl
+index 11dc2fad..76885c90 100755
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/lib";
+-    use local::lib '--no-create', "$FindBin::Bin/local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
+index 64c3769f..5ab631fe 100644
+--- a/t/adaptive_slicing.t
++++ b/t/adaptive_slicing.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/adaptive_width.t b/t/adaptive_width.t
+index 7a0baa75..c200f844 100644
+--- a/t/adaptive_width.t
++++ b/t/adaptive_width.t
+@@ -7,7 +7,6 @@ plan tests => 32;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/angles.t b/t/angles.t
+index 2ae00b4e..1e1a6c9c 100644
+--- a/t/angles.t
++++ b/t/angles.t
+@@ -7,9 +7,6 @@ plan tests => 34;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/arcs.t b/t/arcs.t
+index ec85dfbc..65b83de4 100644
+--- a/t/arcs.t
++++ b/t/arcs.t
+@@ -7,7 +7,6 @@ plan tests => 24;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
+index 7cd04e50..dd6c3e7b 100644
+--- a/t/avoid_crossing_perimeters.t
++++ b/t/avoid_crossing_perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/bridges.t b/t/bridges.t
+index 677115b8..3dc6b84a 100644
+--- a/t/bridges.t
++++ b/t/bridges.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/clean_polylines.t b/t/clean_polylines.t
+index 50c6f5bb..4526bd60 100644
+--- a/t/clean_polylines.t
++++ b/t/clean_polylines.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/clipper.t b/t/clipper.t
+index 3c983814..a898a53f 100644
+--- a/t/clipper.t
++++ b/t/clipper.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(sum);
+diff --git a/t/collinear.t b/t/collinear.t
+index b28a3602..9dee7770 100644
+--- a/t/collinear.t
++++ b/t/collinear.t
+@@ -7,7 +7,6 @@ plan tests => 11;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/combineinfill.t b/t/combineinfill.t
+index 66e461d4..6661cdd6 100644
+--- a/t/combineinfill.t
++++ b/t/combineinfill.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/config.t b/t/config.t
+index 829ef5f3..7f85dae8 100644
+--- a/t/config.t
++++ b/t/config.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/cooling.t b/t/cooling.t
+index 80819bdc..5b2d4b4c 100644
+--- a/t/cooling.t
++++ b/t/cooling.t
+@@ -7,7 +7,6 @@ plan tests => 13;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(none all);
+diff --git a/t/custom_gcode.t b/t/custom_gcode.t
+index 9b58344e..3ff7c35d 100644
+--- a/t/custom_gcode.t
++++ b/t/custom_gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/fill.t b/t/fill.t
+index 765cfd47..d422d27a 100644
+--- a/t/fill.t
++++ b/t/fill.t
+@@ -7,7 +7,6 @@ plan tests => 95;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum max);
+diff --git a/t/flow.t b/t/flow.t
+index 37e9deaf..071d290c 100644
+--- a/t/flow.t
++++ b/t/flow.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/gaps.t b/t/gaps.t
+index 01ec1b4e..16baa036 100644
+--- a/t/gaps.t
++++ b/t/gaps.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/gcode.t b/t/gcode.t
+index ec9b7bb2..525356df 100644
+--- a/t/gcode.t
++++ b/t/gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/geometry.t b/t/geometry.t
+index 9c6eef55..4e6e7097 100644
+--- a/t/geometry.t
++++ b/t/geometry.t
+@@ -7,7 +7,6 @@ plan tests => 44;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/layers.t b/t/layers.t
+index a8599807..57fd2576 100644
+--- a/t/layers.t
++++ b/t/layers.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/loops.t b/t/loops.t
+index d2bf7717..725154c9 100644
+--- a/t/loops.t
++++ b/t/loops.t
+@@ -7,7 +7,6 @@ plan tests => 4;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/multi.t b/t/multi.t
+index fb8cad81..4d6f8193 100644
+--- a/t/multi.t
++++ b/t/multi.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/perimeters.t b/t/perimeters.t
+index 513c76ef..3ddde0b8 100644
+--- a/t/perimeters.t
++++ b/t/perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r::ExtrusionLoop ':roles';
+diff --git a/t/polyclip.t b/t/polyclip.t
+index 0808c7be..1292d321 100644
+--- a/t/polyclip.t
++++ b/t/polyclip.t
+@@ -7,7 +7,6 @@ plan tests => 18;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/pressure.t b/t/pressure.t
+index dde23695..6bbb81d8 100644
+--- a/t/pressure.t
++++ b/t/pressure.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw();
+diff --git a/t/print.t b/t/print.t
+index b78739e4..28cf1ee4 100644
+--- a/t/print.t
++++ b/t/print.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/retraction.t b/t/retraction.t
+index 237af3ab..37dcb64b 100644
+--- a/t/retraction.t
++++ b/t/retraction.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(any);
+diff --git a/t/shells.t b/t/shells.t
+index 2347ff36..d64eb28c 100644
+--- a/t/shells.t
++++ b/t/shells.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/skirt_brim.t b/t/skirt_brim.t
+index d6181ba2..cfa0698e 100644
+--- a/t/skirt_brim.t
++++ b/t/skirt_brim.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/slice.t b/t/slice.t
+index 51b52163..301ae164 100644
+--- a/t/slice.t
++++ b/t/slice.t
+@@ -8,7 +8,6 @@ plan tests => 16;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ # temporarily disable compilation errors due to constant not being exported anymore
+diff --git a/t/speed.t b/t/speed.t
+index 5d9fb54c..3deab75b 100644
+--- a/t/speed.t
++++ b/t/speed.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(none);
+diff --git a/t/support.t b/t/support.t
+index 8d4655b3..b4f9ce04 100644
+--- a/t/support.t
++++ b/t/support.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/svg.t b/t/svg.t
+index 6092efe2..9299eeef 100644
+--- a/t/svg.t
++++ b/t/svg.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/thin.t b/t/thin.t
+index 2d256d28..51461480 100644
+--- a/t/thin.t
++++ b/t/thin.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/threads.t b/t/threads.t
+index 7fcd86f0..106a68af 100644
+--- a/t/threads.t
++++ b/t/threads.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/vibrationlimit.t b/t/vibrationlimit.t
+index 1a5488a6..7bfa27ac 100644
+--- a/t/vibrationlimit.t
++++ b/t/vibrationlimit.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
+index 56df2e23..7edc1460 100755
+--- a/utils/amf-to-stl.pl
++++ b/utils/amf-to-stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl
+index e1d7f614..beecd666 100755
+--- a/utils/config-bundle-to-config.pl
++++ b/utils/config-bundle-to-config.pl
+@@ -9,7 +9,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl
+index 6da275ab..4df94268 100644
+--- a/utils/dump-stl.pl
++++ b/utils/dump-stl.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
+index 43c558b6..eab4f6da 100755
+--- a/utils/estimate-gcode-time.pl
++++ b/utils/estimate-gcode-time.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl
+index b94a2fc4..4d9619e4 100644
+--- a/utils/gcode_sectioncut.pl
++++ b/utils/gcode_sectioncut.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl
+index 30c41ae4..fa7612bb 100755
+--- a/utils/pdf-slices.pl
++++ b/utils/pdf-slices.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
+index d87e6826..6f529b90 100644
+--- a/utils/send-gcode.pl
++++ b/utils/send-gcode.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/split_stl.pl b/utils/split_stl.pl
+index eb659b9c..16cf5a9d 100755
+--- a/utils/split_stl.pl
++++ b/utils/split_stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl
+index cb041893..81648b8e 100755
+--- a/utils/stl-to-amf.pl
++++ b/utils/stl-to-amf.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
+index 91cd20a2..b122faed 100644
+--- a/utils/view-mesh.pl
++++ b/utils/view-mesh.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl
+index d4c47f07..4bbbaab4 100755
+--- a/utils/view-toolpaths.pl
++++ b/utils/view-toolpaths.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/wireframe.pl b/utils/wireframe.pl
+index f49b66e5..053581de 100644
+--- a/utils/wireframe.pl
++++ b/utils/wireframe.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/media-gfx/slic3r/slic3r-1.3.0.ebuild b/media-gfx/slic3r/slic3r-1.3.0.ebuild
new file mode 100644
index 000000000000..52dbf45085be
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.3.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="http://slic3r.org"
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+	>=dev-libs/boost-1.55[threads]
+	dev-perl/Class-XSAccessor
+	dev-perl/Devel-CheckLib
+	dev-perl/Devel-Size
+	>=dev-perl/Encode-Locale-1.50.0
+	dev-perl/IO-stringy
+	>=dev-perl/Math-PlanePath-53.0.0
+	>=dev-perl/Moo-1.3.1
+	dev-perl/XML-SAX-ExpatXS
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-parent
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Test-Simple
+	virtual/perl-Thread-Semaphore
+	>=virtual/perl-threads-1.960.0
+	virtual/perl-Time-HiRes
+	virtual/perl-Unicode-Normalize
+	virtual/perl-XSLoader
+	gui? ( dev-perl/Class-Accessor
+		dev-perl/Growl-GNTP
+		dev-perl/libwww-perl
+		dev-perl/Module-Pluggable
+		dev-perl/Net-Bonjour
+		dev-perl/Net-DBus
+		dev-perl/OpenGL
+		>=dev-perl/Wx-0.991.800
+		dev-perl/Wx-GLCanvas
+		>=media-libs/freeglut-3
+		virtual/perl-Math-Complex
+		>=virtual/perl-Socket-2.16.0
+		x11-libs/libXmu
+	)"
+DEPEND="${RDEPEND}
+	dev-perl/Devel-CheckLib
+	>=dev-perl/ExtUtils-CppGuess-0.70.0
+	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+	>=dev-perl/ExtUtils-XSpp-0.170.0
+	>=dev-perl/Module-Build-0.380.0
+	>=dev-perl/Module-Build-WithXSpp-0.140.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.800.0
+	>=virtual/perl-ExtUtils-ParseXS-3.220.0
+	test? (	virtual/perl-Test-Harness
+		virtual/perl-Test-Simple )"
+
+S="${WORKDIR}/Slic3r-${PV}/xs"
+
+src_prepare() {
+	pushd "${WORKDIR}/Slic3r-${PV}" || die
+	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
+	eapply "${FILESDIR}"/${P}-no-locallib.patch
+	eapply_user
+	popd || die
+}
+
+src_configure() {
+	SLIC3R_NO_AUTO=1 perl-module_src_configure
+}
+
+src_test() {
+	perl-module_src_test
+	pushd .. || die
+	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
+	popd || die
+}
+
+src_install() {
+	perl-module_src_install
+
+	pushd .. || die
+	insinto "${VENDOR_LIB}"
+	doins -r lib/Slic3r.pm lib/Slic3r
+
+	insinto "${VENDOR_LIB}"/Slic3r
+	doins -r var
+
+	exeinto "${VENDOR_LIB}"/Slic3r
+	doexe slic3r.pl
+
+	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+
+	make_desktop_entry slic3r.pl \
+		Slic3r \
+		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
+		"Graphics;3DGraphics;Engineering;Development"
+	popd || die
+}
diff --git a/media-gfx/structure-synth/Manifest b/media-gfx/structure-synth/Manifest
deleted file mode 100644
index 7f183702d699..000000000000
--- a/media-gfx/structure-synth/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST StructureSynth-Source-v1.5.0.zip 1922583 BLAKE2B a2b35d824d73f28cf8ccb6d57feed1d3442b30e1797425a3184cbf6af72507def24136165ee7bc43afe6fc5039eeaacd84ea9646853ee7a755d9283ca37fe18c SHA512 50fbd2838ccc9978e9646d3b0a45bcad92cf64008db205fa171b2ea90ca6327981de6bce9d0eec61a670be8c883f03731c265c730a1218c5ffc9882d53ff7289
-EBUILD structure-synth-1.5.0.ebuild 884 BLAKE2B a361b5d56a30c3d6f1647b7d0deafcc37599f68cf9ccae69fe3536e3b40c26953fcd8e9259ae60361f57a65b009b64cef581aa6e497e557e8db404024d1f03a5 SHA512 7a37113e860a89dfd0bdf4beaaa68b017d6c9290ae1a8e68243d3a948bb189aee8606d03005ca71ebdf181e358954b734930335f8cb4fecb41fd1ee402eab828
-MISC metadata.xml 353 BLAKE2B 76a6cdd97b007713e73c76c4024293dfd59175d3420dc6b032f73db6ac73fd2f3ee9e512891c0b768dae968cf770da7b9f41584c9a2c5840795b39c209ad1f49 SHA512 8986f6fad8fbb9e07ace8336ff6bff63220f61dc97dbe63c91df44aa4fa368f0099e35798d81bdb0f8fc5eade7c2077a7d8c5227f1c1da6cf8d9b518b459a060
diff --git a/media-gfx/structure-synth/metadata.xml b/media-gfx/structure-synth/metadata.xml
deleted file mode 100644
index 66e0f549e615..000000000000
--- a/media-gfx/structure-synth/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>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">structuresynth</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-gfx/structure-synth/structure-synth-1.5.0.ebuild b/media-gfx/structure-synth/structure-synth-1.5.0.ebuild
deleted file mode 100644
index 0974d6a6c10d..000000000000
--- a/media-gfx/structure-synth/structure-synth-1.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-MY_P="StructureSynth-Source-v${PV}"
-DESCRIPTION="A program to generate 3D structures by specifying a design grammar"
-HOMEPAGE="http://structuresynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/structuresynth/${MY_P}.zip"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtscript:4"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/Structure Synth Source Code"
-
-src_prepare() {
-	qmake -project -o ${PN}.pro -after "CONFIG+=opengl" \
-		-after "QT+=xml opengl script" || die "qmake failed"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc roadmap.txt changelog.txt bugs.txt
-	domenu ${PN}.desktop
-	newicon images/structuresynth.png ${PN}.png
-}
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 16fa5553f774..8a5c024a595f 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -2,6 +2,8 @@ AUX wings.sh 182 BLAKE2B e9facdbcd7520af19045bab0ef89e835c1e2f1d7b4e8c8d45d64f18
 AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc22280b2341621e17f13c97e7031072b242db42c533f4012b21ac46645cf32e121e5aad1884774 SHA512 739b8e68a1b47a3f4adbff8a1f34b713d7b0ac2d8103d85d3fdd6020bf08e81c231d210239c140d23e1dd135ff7122bfd43327a27585a333eafab473ea1480df
 DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067 SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244 SHA512 db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
+DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
 EBUILD wings-2.1.5.ebuild 1190 BLAKE2B 0099d6f003a286d3a13c63a6aea374b373869d683798c2d6e7513d9d103964a8fbe67b1dab880090c671f7738de8c7443adb85b7b6e77931ee83175369e56bae SHA512 387ae28ae4a7c06335fcf2bb4f891c1497029ae02d4f18b05819932ff17208fcd8dd6f41b2022b8dd1cc24fdc2004c64132705f555ab5a27bd95812d9ca12964
 EBUILD wings-2.1.6.ebuild 1192 BLAKE2B 399b138a6c495b20ee8d4a3591d82e12487f3b7f150d88fcd7a21f95ecf1875677dbc912d7c2275a6eeebc4a5fdfb9b95ceb0dc992aad10403c406938e686df2 SHA512 90a78aa8008951f1c3f6ccfa00486acde5a457c2b378741a68299757e754b1a61f064e9b0b1ee710bffd88bc3d936108508c2d7ea46711c35f3940dd2cdb8eae
+EBUILD wings-2.1.7.ebuild 1192 BLAKE2B 399b138a6c495b20ee8d4a3591d82e12487f3b7f150d88fcd7a21f95ecf1875677dbc912d7c2275a6eeebc4a5fdfb9b95ceb0dc992aad10403c406938e686df2 SHA512 90a78aa8008951f1c3f6ccfa00486acde5a457c2b378741a68299757e754b1a61f064e9b0b1ee710bffd88bc3d936108508c2d7ea46711c35f3940dd2cdb8eae
 MISC metadata.xml 730 BLAKE2B c74a1bbba0f4b98683e0d3d1d5045ffdfc7ea81b6180cd7ee967bb3846f446e5bda5528bec501e7941c076d6bc755cc0fb1b005506203d7ef57ccb15378724bd SHA512 7672ac58e0f7ba153b0a5939cf8e426e8c3f8c97366436340e1bbb65e85a785add4c6394e81e1aade634f58d8751a85ba75cbb1bb57fa822773a632736d96086
diff --git a/media-gfx/wings/wings-2.1.7.ebuild b/media-gfx/wings/wings-2.1.7.ebuild
new file mode 100644
index 000000000000..bc645abc4232
--- /dev/null
+++ b/media-gfx/wings/wings-2.1.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/"
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-lang/erlang-18.1[smp,wxwidgets]
+	dev-libs/cl
+	media-libs/glu
+	media-libs/libsdl[opengl]
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/include_lib/s|"wings/|"../|' \
+		$(find . -name '*'.erl) \
+		|| die
+
+	sed -i \
+		-e 's|-O3||g' \
+		-e 's|-Werror||g' \
+		-e 's|CFLAGS = |CFLAGS += |g' \
+		$(find . -name Makefile) \
+		|| die
+}
+
+src_configure() {
+	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+}
+
+src_compile() {
+	# Work around parallel make issues
+	emake vsn.mk
+	for subdir in intl_tools src e3d icons plugins_src; do
+		emake -C ${subdir}
+	done
+}
+
+src_install() {
+	WINGS_PATH=${ERL_PATH}/${P}
+	dodir ${WINGS_PATH}
+
+	find -name 'Makefile*' -exec rm -f '{}' \;
+
+	insinto ${WINGS_PATH}
+	doins -r e3d ebin icons plugins psd shaders src textures tools
+
+	newbin "${FILESDIR}"/wings.sh-r1 wings
+	dodoc AUTHORS README
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1474c15bc0d9..f95508e547c6 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aften/Manifest b/media-libs/aften/Manifest
index 955c49f57b19..184d0280df6a 100644
--- a/media-libs/aften/Manifest
+++ b/media-libs/aften/Manifest
@@ -2,6 +2,6 @@ AUX aften-0.0.8-multilib.patch 576 BLAKE2B c049de0a7f99ec04a7edfff591ab320c61ad7
 AUX aften-0.0.8-no-static-aften.patch 684 BLAKE2B c0df8086a8b73d155ec3175767cee9c32ba9f835b0307e880dc985602ee901b43a5bd9458a288380ef0d99981f62092d7eb9758ee52281a4250f3e5bb9d24a57 SHA512 cfd2b151a031b64cb3f09b0bfa514e220fade4372dbe37bccbb58a158053ec25715617ffbcd5fd3b5e0a348488f28d13711db5a18bd62fc67058dbee540a36a5
 AUX aften-0.0.8-ppc.patch 4066 BLAKE2B 27285a58026f95b2974f8ceb09dfeaf38d53c019c19e96ef8e8da42a7a368432a59bde54b3b72bf80202da7ce7c3f3faa279b5b5801bca7a1237c269cf7d05e3 SHA512 5022529320ae0cefbbd4124c37bdf3d2451c4733b41007f77cfcb5a26ae32ca159716ce4782b6e75767309a2057c839e467e966c8d9ad159d074c53ffdaf4ef5
 DIST aften-0.0.8.tar.bz2 80865 BLAKE2B 8746ba1f061255a6ec79a1253aede9aca8fa9bbdcb3bcc38636a99ec2f83f882cb713183483143ba0dc3852bff821d00a9029e0812b67e67540b303fb67b26b7 SHA512 1261297eac5065c6f028618d3e15e9b152ac35440c74cfb09d98cd99a90fb1c6a49585f70928834c3f6ddbcdd1d8721f7329d24f57cd30901dff09bbc0d419e3
-EBUILD aften-0.0.8-r2.ebuild 753 BLAKE2B 1e2aa4495ddd28989845f35f74bc40d9ba715b009542b1469054fed9d53d64986dbc7740b7d70a73394480bfea77d11dd6250dd71add23b804fb2eecdef4dd8f SHA512 78c4c2c0cc1b467e5eee3c92016c7b6328ffbd5649b3bfe8ff0160e208242d0555161e0486d4d281eac5f2c1dca841043a0d49496751a2a9d0a4e247acea2225
+EBUILD aften-0.0.8-r2.ebuild 751 BLAKE2B 5c89d01269c80fb77ecbab3be72cd7e849c7a24244fb46fe4e31c575f732e837e6f413851f875ee04275dc9251b8ff48ed0dc78cbdde174b8a16c1d6011387b3 SHA512 80cfb35bd2ffd6d0622c247f654b82f9d55a6671bc8adf839d15e38224a8d907a01f4aaf9fd4355031a9401909ae6b82dd5c039896dea88bddc214fbea7d7169
 EBUILD aften-0.0.8.ebuild 739 BLAKE2B 1bd159a956fcd25e4515a3b27775bb83b05b42e1a123fe86df4c8ce72adbbadde85c07f2c5945eb3289a51037b71d66e41025fe1dd1146cfc907a48c671e96d5 SHA512 002b86d193810c8696a3fd17e6f883201503d26f49fe2daa89abaadbc20f76a4968560eee07997490cbda2887c8794569b729c3ec50f2c025e2bd989a589f7c7
 MISC metadata.xml 602 BLAKE2B 87b43f5a24944d2583cc0b10dbb51babab9de77027aa6f19460e7a217e5370c7f8343610df5ada3f21827f267c2a1b84bb720afcb1221112fd112ff944001467 SHA512 6b78ecfd5eefe1ce29c875db4d487ed23fda5faf9a1bc97b75d6de9afad30be6aceffabd3031bf35badbfb8cabdb4bfa24fb2c7a3905d7a68b9ef9bc0bf0d458
diff --git a/media-libs/aften/aften-0.0.8-r2.ebuild b/media-libs/aften/aften-0.0.8-r2.ebuild
index 65594d77cbbd..a52cda27855c 100644
--- a/media-libs/aften/aften-0.0.8-r2.ebuild
+++ b/media-libs/aften/aften-0.0.8-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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="cxx"
 
 PATCHES=(
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index 69adb3ffeaf0..ea2e57ac694a 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,3 +1,3 @@
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-EBUILD bcg729-1.0.4.ebuild 620 BLAKE2B 48dce29d6f60a204e17691744375acce4fc5214c26bd3201325e6cc3108811c7300b5df1de17340a59fab3faec9a160caca98c2ba4fd613030d05cbca471fc96 SHA512 3701912187738433f839cf4d99fe99d4d4e17e9366bdd46b89ea71220991aab2ccb6228c0cdcef34094a8b4d808471bde1bc7915335434a0db7490c1955f03ab
+EBUILD bcg729-1.0.4.ebuild 619 BLAKE2B a983b94d38ac2e0b20b233d120c80c62cda702786cd58cffbd5f9e48150c6ff94e6aa3948612950ae39e3d65b39cc8b8b0bf979e81075e31c3fbebbcd54d002a SHA512 87ab1565f610d2701360fe57e9799d616f4772ccc70853c835675cb32529a002bc2ea3fd48824ebaef26aa540294ffe8edd5d0e3c530ff778be62e2b9c3bf3e7
 MISC metadata.xml 213 BLAKE2B be9f4b06d7567b80dc4d16cb47551ef3e825a84f13897115ef207911582b9062e23181c5d7583fbe1a8299e563eefc7cdeee4114d36ab911f685fd27b294d23e SHA512 b2ac78c6617cda0ce08982f7a56bbedd709df884c5ac51b5ae4fdbc36eee2690a177afa507206d8e3914c0e1b80d96291a329164a1883b7c76e5e4eae376b667
diff --git a/media-libs/bcg729/bcg729-1.0.4.ebuild b/media-libs/bcg729/bcg729-1.0.4.ebuild
index dff0967147ac..cd937c1470c1 100644
--- a/media-libs/bcg729/bcg729-1.0.4.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ia64 ~ppc64 x86"
 IUSE="static-libs"
 RDEPEND="
 	!media-plugins/mediastreamer-bcg729
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index aad55a4adb71..aa2e1c39d6bb 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,16 +1,7 @@
-AUX chromaprint-1.1-gtest.patch 3954 BLAKE2B cf94b85a97407f6efe1f6de75959506d3e50af685220df8ad7a454a46087029117de8c6b730172d69369e203856102771a3c234137fddcbf84511cba9cd83ddb SHA512 adbbfd9a8456751b4071d78cad1a67c4d11dcbb0f74dfefcbf6e92505c6543f81df316b2e43b927ac98405b054b1dba74658610c226e40e26184d4e927099fa3
-AUX chromaprint-1.2-ffmpeg29.patch 1573 BLAKE2B 8375d1ea02edbfaf1e39d8e5f33529296f3c80648ee8d534d5f289404f399830e28169109d9813aa844a1bfa42ec048f548e21f1d3c15ab540f3fb9d5f76834f SHA512 7366b9ebff706e67ebe3e0a57605607351076d071b62c9c1aa6e17f2721bbba315a0bde42b4a44f0a6d1921c410e224aac724017e8b4e33ec239b83675936579
 AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59
-DIST chromaprint-1.2.tar.gz 529646 BLAKE2B a45b88edfe7e37bc09d960a385f8b7303705da9cc717c85f707b6ea3ed2f2f288589850461ab368ef5a9873239d058416757c5f7fd524d0e240b14145e3aa07e SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb
-DIST chromaprint-1.3.2.tar.gz 538395 BLAKE2B b08d6ff106c3728d91352e694d39722390500480bb5049298150de198593116def213445d5cd96772d3956508df80b92ce3b440c14606aeff8eeca934aa402de SHA512 7f89eb09f293a3691efcb01544da612cf674a00af1c188db3f1075db44fee0a8e0aeff3ca6eccd0731ae6bbff9eb0fd51b22128fa927fdbd21638e2832f76e95
-DIST chromaprint-1.4.1.tar.gz 611014 BLAKE2B 139a3d58392f442feab1d955b03accb5ec81df3cb3de43a9a1d53d7ce061cee94aaad4ce66a860326fa84f155eba39e50e34a7055522e0637cacee8c91e7f7e7 SHA512 9d414ba01be87f973df877afc600c761bf338292680d2626baa2a483f0bb681b506d02baa8f9de297489459ba1ebae9005202bfe7ba661b7bd4d60d4a2463ede
 DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3f0ffc0a0c0e88ee5e864e9112ad96cced629dcb8422f5e74aca3c48f93f7fa153cc6aabf0659a4e90416c34f34e43 SHA512 69449adf1c95c1395a5545d36877afe95b409d045357cc675e9ac58aee2955b3a9a245f37805192804a9b7fddc792b9e9289bf6448fa3393131048d28e06d7e2
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD chromaprint-1.2-r1.ebuild 1131 BLAKE2B 4ef0cdb9dc37d917a1dab48f9d911b965e372fd7c75b8d56b1d70515df321892df4149b651aa5de80c2eee13306c58bbadfe60c92f4fa009b710366262866ddd SHA512 7aa5ffe126beb93e43af83fe34d853e86949a7fee2cdf95329b3c33ee4399db6fec4505604a1f6c8adf7cabfae5edd2b70b72c0b2dd153518f394e2d6596cca5
-EBUILD chromaprint-1.2.ebuild 1077 BLAKE2B 7c9097b038c87c0742331d664d885d57fedb544f41a9a9f2239057c3c3f35f06a7375a33508d7e87119011205ef2f5c90282dc8a3ac0b20d4f92e4771e8f98a3 SHA512 c11f6ccbf8b7c0186caf07455c97428a8793389757c44674f588e61171beeb489351daf2a4e01360f621371e3fdd19398a9444928395e36b5d1a508951723afd
-EBUILD chromaprint-1.3.2.ebuild 1099 BLAKE2B eae31032f7ff4149b15053850fe6ae3bf38f391a05a9df4a0f40da6a7f295aad1ef534b2d9942f74e4918d499911346c6d5e24356b206a56050e790ffe4fe4c9 SHA512 70de616dda26df13fe39cf64ec6686e73391774ac3439ed1fd9b9456f7551e909ba74e6aed81f12fd1d2abf8c18b86eb78e5413aac77730f81f3294efb456496
-EBUILD chromaprint-1.4.1.ebuild 1332 BLAKE2B 38f0c3f4fa222d6b9263e103a96b75cb1d86635e22da11cfed090864a02053a0649258d58d1e2866c2f7c4525f1356091a5e590870c69b80ae076fca5af71d2f SHA512 5b488ad56ab7de56531a7e9fce045463e91bc2c37202e1115836247b964ac04385376a2a067b3a6178148543d09c3d2c944981efa25d5cb814d0ef18a8c602d1
 EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
 EBUILD chromaprint-1.4.3.ebuild 1468 BLAKE2B a7aca368f640e533b391838aa2b865442310d6c210ef64a4872b8245417e4b19dba18cd20738ba7195d99dd66b31c038af01d6cf40b352e8cf9a2abf7ef69120 SHA512 7419ae2d36b6cb92a1d8aac11075eadd1775358768b890ba58a32a12b767a307eacafda9e88c7cc92909b213a16ff42d3b8babbf91f2cdc7ab66f1a6911ca344
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
deleted file mode 100644
index 81b0bbafac94..000000000000
--- a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest[${MULTILIB_USEDEP}]
-		dev-libs/boost[${MULTILIB_USEDEP}]
-	)"
-
-DOCS="NEWS.txt README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		-DWITH_AVFFT=ON
-		)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/chromaprint/chromaprint-1.2.ebuild b/media-libs/chromaprint/chromaprint-1.2.ebuild
deleted file mode 100644
index e6bff8e54792..000000000000
--- a/media-libs/chromaprint/chromaprint-1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-fbsd"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( media-video/libav:0= )
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-	)"
-
-DOCS="NEWS.txt README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build tools EXAMPLES)
-		$(cmake-utils_use_build test TESTS)
-		-DWITH_AVFFT=ON
-		)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/media-libs/chromaprint/chromaprint-1.3.2.ebuild b/media-libs/chromaprint/chromaprint-1.3.2.ebuild
deleted file mode 100644
index dcff5eb696a9..000000000000
--- a/media-libs/chromaprint/chromaprint-1.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest[${MULTILIB_USEDEP}]
-		dev-libs/boost[${MULTILIB_USEDEP}]
-	)"
-
-DOCS="NEWS.txt README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		-DWITH_AVFFT=ON
-		)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/chromaprint/chromaprint-1.4.1.ebuild b/media-libs/chromaprint/chromaprint-1.4.1.ebuild
deleted file mode 100644
index 102d01c254b0..000000000000
--- a/media-libs/chromaprint/chromaprint-1.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-GTEST_VERSION="1.8.0"
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz
-	test? (	https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="libav test tools"
-
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest[${MULTILIB_USEDEP}]
-		dev-libs/boost[${MULTILIB_USEDEP}]
-	)"
-
-DOCS="NEWS.txt README.md"
-
-multilib_src_configure() {
-	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
-	local mycmakeargs=(
-		"-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		-DFFT_LIB=avfft
-		-DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample)
-		)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch b/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch
deleted file mode 100644
index 8305ae7c1af0..000000000000
--- a/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch
+++ /dev/null
@@ -1,104 +0,0 @@
- cmake/modules/FindGTest.cmake | 82 -------------------------------------------
- tests/CMakeLists.txt          |  1 -
- 2 files changed, 83 deletions(-)
-
-diff --git a/cmake/modules/FindGTest.cmake b/cmake/modules/FindGTest.cmake
-deleted file mode 100644
-index 21dc2f5..0000000
---- a/cmake/modules/FindGTest.cmake
-+++ /dev/null
-@@ -1,82 +0,0 @@
--# Locate the Google C++ Testing Framework source directory.
--#
--# Defines the following variables:
--#
--#   GTEST_FOUND - Found the Google Testing framework sources
--#   GTEST_INCLUDE_DIRS - Include directories
--#   GTEST_SOURCE_DIR - Source code directory
--#   GTEST_LIBRARIES - libgtest
--#   GTEST_MAIN_LIBRARIES - libgtest-main
--#   GTEST_BOTH_LIBRARIES - libgtest & libgtest-main
--#
--# Accepts the following variables as input:
--#
--#   GTEST_ROOT - (as CMake or environment variable)
--#                The root directory of the gtest install prefix
--#
--# Example usage:
--#
--#    find_package(GTest REQUIRED)
--#    include_directories(${GTEST_INCLUDE_DIRS})
--#    add_subdirectory(${GTEST_SOURCE_DIR}
--#        ${CMAKE_CURRENT_BINARY_DIR}/gtest_build)
--#
--#    add_executable(foo foo.cc)
--#    target_link_libraries(foo ${GTEST_BOTH_LIBRARIES})
--#
--#    enable_testing(true)
--#    add_test(AllTestsInFoo foo)
--#
--# =========================================================
--#
--# Copyright (C) 2012 Lukas Lalinsky <lalinsky@gmail.com>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions are
--# met:
--#
--#  * Redistributions of source code must retain the above copyright notice,
--#    this list of conditions and the following disclaimer.
--#
--#  * Redistributions in binary form must reproduce the above copyright notice,
--#    this list of conditions and the following disclaimer in the documentation
--#    and/or other materials provided with the distribution.
--#
--#  * The names of Kitware, Inc., the Insight Consortium, or the names of
--#    any consortium members, or of any contributors, may not be used to
--#    endorse or promote products derived from this software without
--#    specific prior written permission.
--#
--# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
--# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
--# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
--# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
--# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
--# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
--# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
--
--find_path(GTEST_SOURCE_DIR
--	NAMES src/gtest-all.cc CMakeLists.txt
--	HINTS $ENV{GTEST_ROOT} ${GTEST_ROOT} /usr/src/gtest
--)
--mark_as_advanced(GTEST_SOURCE_DIR)
--
--find_path(GTEST_INCLUDE_DIR
--	NAMES gtest/gtest.h
--	HINTS $ENV{GTEST_ROOT}/include ${GTEST_ROOT}/include
--)
--mark_as_advanced(GTEST_INCLUDE_DIR)
--
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_SOURCE_DIR GTEST_INCLUDE_DIR)
--
--if(GTEST_FOUND)
--	set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
--	set(GTEST_LIBRARIES gtest)
--	set(GTEST_MAIN_LIBRARIES gtest_main)
--    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
--endif()
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 791cd96..9115391 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -3,7 +3,6 @@ include_directories(
- 	${Boost_INCLUDE_DIRS}
- 	${CMAKE_CURRENT_SOURCE_DIR}/../src
- )
--add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/gtest_build)
- 
- set(tests_SOURCES
- 	main.cpp
diff --git a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch
deleted file mode 100644
index 6910f243b2e0..000000000000
--- a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 37092d380a28abcc63fa120499030a0f2b7df80f
-Author: Rodger Combs <rodger.combs@gmail.com>
-Date:   Fri Oct 2 14:48:01 2015 -0500
-
-    fpcalc: remove uses of deprecated lavc APIs
-
-Index: chromaprint-1.2/examples/fpcalc.c
-===================================================================
---- chromaprint-1.2.orig/examples/fpcalc.c
-+++ chromaprint-1.2/examples/fpcalc.c
-@@ -17,10 +17,6 @@
- #define MAX(a, b) ((a) > (b) ? (a) : (b))
- #define MIN(a, b) ((a) < (b) ? (a) : (b))
- 
--#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
--#define avcodec_free_frame av_freep
--#endif
--
- int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration)
- {
- 	int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index;
-@@ -131,7 +127,7 @@ int decode_audio_file(ChromaprintContext
- 	remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate;
- 	chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels);
- 
--	frame = avcodec_alloc_frame();
-+	frame = av_frame_alloc();
- 
- 	while (1) {
- 		if (av_read_frame(format_ctx, &packet) < 0) {
-@@ -139,7 +135,7 @@ int decode_audio_file(ChromaprintContext
- 		}
- 
- 		if (packet.stream_index == stream_index) {
--			avcodec_get_frame_defaults(frame);
-+			av_frame_unref(frame);
- 
- 			got_frame = 0;
- 			consumed = avcodec_decode_audio4(codec_ctx, frame, &got_frame, &packet);
-@@ -196,7 +192,7 @@ finish:
- 
- done:
- 	if (frame) {
--		avcodec_free_frame(&frame);
-+		av_frame_free(&frame);
- 	}
- 	if (dst_data[0]) {
- 		av_freep(&dst_data[0]);
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 2e8cbe44e2ed..c1d086684043 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,9 +1,5 @@
-DIST Image-ExifTool-10.88.tar.gz 4379772 BLAKE2B d0d4c2fef52e314ef96d7bb117a5221f571004f3e1928db4f04ef1f43d9956915dc7b78550bb5a49508961de985600f728fdb4529bd0e5870b7369a4a4122628 SHA512 85ed7cf1564f92145673b08a6759c83576b40cfc5ec8f723fdbbf72375d0c9779fd90178db719664126e2cbb4b60208e1f8de9d3b94e814f53824d68ebb119dd
-DIST Image-ExifTool-10.93.tar.gz 4386567 BLAKE2B 1ce53e13b58deca4e898ffe069aebadddc2508589f878c12db9abaeefe426cdebd976801fb452819f7d33aefa50d7c55d74a5ef1ff76e3c6710efb5efde0f38a SHA512 047cd3bcd6c67736b85cec3edaccb6d7156dd2e63a86fe918a0e1e0b319f2cda8edc87fb356639a0a43fe4d37fb6ad9dcc91f1f00cb76ba6ac535297678eac39
-DIST Image-ExifTool-10.94.tar.gz 4387592 BLAKE2B 974408e7df2ebc742cfc2eaf5b4638f3af0cc8505a4aa3adfcd6d603866ecd87834409deb71e9f3e9af2a4a155d0035ecbad3d30edee8126d383a53d9673cdf8 SHA512 467c53bfef5f64fcec89f67da01a4d0dad612f2e2db890e7829a0805fa5b4f07598dfb2f690bf58e22415ced30df215834a5b2247ba29cfcb0afe78a6a5f0d39
 DIST Image-ExifTool-10.95.tar.gz 4393497 BLAKE2B 34591d8626366f41d316c18e7453b6d2b222820c19e3b6693ab0f2065c52a9e5121f1d9831baaeb09f67d96bbaa2ed3737651c4feaf43acf3a9132eaa92da7ec SHA512 925557772f6b9588f946e7889904166e66c4c1b40da499822908d99f5211e1cffc1e911d468226d7052fef1e9f61e8069fa86e2ab4fa49fbc6a31d3d82c5c308
-EBUILD exiftool-10.88.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
-EBUILD exiftool-10.93.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
-EBUILD exiftool-10.94.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
-EBUILD exiftool-10.95.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
+DIST Image-ExifTool-10.99.tar.gz 4400996 BLAKE2B eec9774493347d11c4d1ba00b167cb6f6ae10a3e0abf7139c5a8117a45a358831db6cd7e36d371eeda16c0a99aba621923c199c9b1512038cac1ab354490781a SHA512 d1f5347453ff8c3e724bd642ca8ac880e0d338d06dc25fa58674e3990c4e35752078c7ab7b8e05849420debf8eb3b770ec2100e6a975bb43abb3d57229c839ba
+EBUILD exiftool-10.95.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
+EBUILD exiftool-10.99.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-10.88.ebuild b/media-libs/exiftool/exiftool-10.88.ebuild
deleted file mode 100644
index faee03d12dff..000000000000
--- a/media-libs/exiftool/exiftool-10.88.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.94.ebuild b/media-libs/exiftool/exiftool-10.94.ebuild
deleted file mode 100644
index ec856d3619aa..000000000000
--- a/media-libs/exiftool/exiftool-10.94.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.95.ebuild b/media-libs/exiftool/exiftool-10.95.ebuild
index ec856d3619aa..faee03d12dff 100644
--- a/media-libs/exiftool/exiftool-10.95.ebuild
+++ b/media-libs/exiftool/exiftool-10.95.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-10.93.ebuild b/media-libs/exiftool/exiftool-10.99.ebuild
index ec856d3619aa..ec856d3619aa 100644
--- a/media-libs/exiftool/exiftool-10.93.ebuild
+++ b/media-libs/exiftool/exiftool-10.99.ebuild
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 777e8f081497..7ff8b25bb232 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -5,6 +5,6 @@ AUX fontconfig-2.13.0-locale.patch 4096 BLAKE2B 8ebb0d8b72af07053a0fb7ee5550558d
 AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58b6fc7e1e1bc7b341d59bd1dcdfd818cd15071278fac69229e3f6b8b09d19a351390d76b7112ebf8d9749d2e1de29b8d SHA512 7c9bebf3eb76de05cfd1481e679715bebc5c429ea6976e96866c0e80b0021d3f00adae888e348897574193d7029e48409a0b73698dc2c8963e485992400192ad
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
-EBUILD fontconfig-2.12.6.ebuild 4926 BLAKE2B b8b83130b0f82d6f9981ecede285f65ceb902a8a200c4debb4b1a259b70f1b8038def66c09a294200b51d01bfdd5c5f54da2e0539ecfdf514609581caba3b0be SHA512 a97bbeebdc22f9ffc7f1f72429b1061465b7744e2d653717f0897c4fe97579641e3beab2b8854778f4c19bde3fd645280ed79008f19d8dddc0a5a01f03698d52
-EBUILD fontconfig-2.13.0-r4.ebuild 5136 BLAKE2B 066466bdbb4fea16505e7dd8f613556ad59ba7569c969d8071bde03cabdfba582335d43d2aa78395fb15b00c2abd0b6d223b352c820f5de05f903096c21c78fb SHA512 25180d5c66b1a0b033f7dd441ea15bb3a58a8f6f6ccbbeb22c085b5c66165aa9dce510f7d54d2dcb9e22f5f4c8a652161ecf7e8725b7221a551b96254390e543
+EBUILD fontconfig-2.12.6.ebuild 4925 BLAKE2B 3f5cb18e7af4f0b20020b52d6804b8410fee703164ba3f62dad2993dad51b17f3572af57e3b9229f0e420235481c0c018247dd5e19bad289ddebd8cd3490f5b6 SHA512 9fff043fb6ea1445198868f96dee0d626c1cda0948893cccd05e8ea002282e3a1bdf8e05d59ac96c047a203a6ad00e17d365396188da3557d8b583c26a4bf011
+EBUILD fontconfig-2.13.0-r4.ebuild 5140 BLAKE2B 4832e0b08fdde4aa5262b2b48ebeb5790fae18b0534e9d18ef09896807fb59035da20f5341595cbf8b80306d8c653039095c5b61c5b48f1e50969755a8dac304 SHA512 6178a6b767887fb47d469eccf86f79f0ba6080b50458bc9fcb534ee7e2c9310fd11fcdafecb7def6d8246c23ac8d3a3e74d348b8d624d95fcb95f558ca0c4e71
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index f912eab68233..c65b40a2d38f 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 2e0e7986dda0..6cce3f4bef03 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -20,7 +20,7 @@ IUSE="doc static-libs"
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
 	!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-	elibc_Darwin? ( sys-libs/libuuid )
+	elibc_Darwin? ( sys-libs/native-uuid )
 	virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index aab9ebae3d94..4b10a2b8b3c6 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.0.tar.bz2 493206 BLAKE2B 9c8c27bf8b415f4962079f200f64d4ecadaabecc7cddf832ccc75146b30260bb386ddb87cee26d911f6b7c2451ed0484e0fe8bfa39ac27e33b87a2b5d025ca81 SHA512 ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
-EBUILD glu-9.0.0-r1.ebuild 934 BLAKE2B 7db1fe47fe9529f5131da6492f6bac37e7ac8135cf683975b5c623e43589e9f97247926a0c25efcc31ca945b51dec1b735da6c41f59ed4ffc041ce55f3564930 SHA512 0d446a7710e976d497a0b9e48134d86cbd9d902cff92b3e97c9522ffbef29aa2c2a71bea8cf89bdc57ded88af7b3e6b28e635769829538573de5ef86399feba2
-EBUILD glu-9999.ebuild 957 BLAKE2B 6d291485eb4d029da1d5a078fc490c11abc2c7acdf630e062275ea50e52831dda3dc80b510d7becf954e59e7562522ba726ef5f64341207dff2b7c927503cee2 SHA512 5dc2c93e480e2ad4f7d59fb248396b2130716ebcbb8cd6e26b9ce9be06a487f9710013c98acdf1a438aab749d62dd0c7f3d8c4edaf9b16f31d61e027007feeb9
+EBUILD glu-9.0.0-r1.ebuild 866 BLAKE2B 606c9f855435751dd58b9495d2afa9f7fb68186a9076ee12235b3444c3e35deec3b14730319faacf4b27028400d929180fc0acbb1be54c09cc605ec04b1ca544 SHA512 6bfeb606a727dcf359be4a073790eb6c32a39a59bcc06ca415a9cff8dfdf1d8c6d608682ab2dbc5260d161050cc8a940d5119ce5d23dc3be460f6d048845ee54
+EBUILD glu-9999.ebuild 1110 BLAKE2B ff62ebb8660e3507d3bb8a72859a52b914577e25bbdcb1cee3a665988b3eb9c37d44e4f1036dbfc34ce564e7efbaa5a51112894b8afa66cef008949a9fbdfe89 SHA512 f60e1a9f41a41488e8d53d1c1fd11d07e44d5a29e00b87af9d640d01ea3b711a5b36bac1fca2aa22ab4257e2be6275e5f18fa4a07e83f40636236d3172bc1cdc
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.0-r1.ebuild b/media-libs/glu/glu-9.0.0-r1.ebuild
index 3f4f63eaf043..379b61d7c309 100644
--- a/media-libs/glu/glu-9.0.0-r1.ebuild
+++ b/media-libs/glu/glu-9.0.0-r1.ebuild
@@ -3,39 +3,34 @@
 
 EAPI=5
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/glu.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
 
 if [[ ${PV} = 9999* ]]; then
 	AUTOTOOLS_AUTORECONF=1
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
 inherit autotools-multilib multilib ${GIT_ECLASS}
 
 DESCRIPTION="The OpenGL Utility Library"
-HOMEPAGE="https://cgit.freedesktop.org/mesa/glu/"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
 
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!<media-libs/mesa-9"
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
 src_test() {
 	:;
 }
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index 684f3b54380a..b743ef44af75 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/glu.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
 
 if [[ ${PV} = 9999* ]]; then
 	AUTOTOOLS_AUTORECONF=1
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
-inherit autotools-multilib multilib ${GIT_ECLASS}
+inherit autotools multilib-minimal ${GIT_ECLASS}
 
 DESCRIPTION="The OpenGL Utility Library"
-HOMEPAGE="https://cgit.freedesktop.org/mesa/glu/"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
 
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -32,9 +31,18 @@ DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!<media-libs/mesa-9"
 
-src_unpack() {
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
 	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
+	find "${D}" -name '*.la' -delete || die
 }
 
 src_test() {
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a366d1c93aa7..2ed8c17df8e9 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,9 +1,9 @@
 AUX harfbuzz-1.7.6-test_fixup.patch 789 BLAKE2B 6a57e25b3b20607c571c61c06f9f37f10b2c506e1f0c303f2b52302d1c32e7cb282a8a0544b91689da9fe1bfc6d07c2ab5d56698377af83752d4939f582536cd SHA512 87184db1f0a8e7bdf66fdabb1b556e2fdeb44c26ae7dc215e2a8a8808116274822e08d71f47c21fc3f027bae1bb15010404881ce36c053143e447fe252df9e40
 DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
-DIST harfbuzz-1.7.5.tar.bz2 2350389 BLAKE2B 735fc36dda153e50bd83ae5e64a18d872506f07dbecf04ca85fb96b2b3c4bba46245c2326c1414811ba5d312cc21ac21dd7efe595665f134812b719c24ee9e49 SHA512 c2c13fc97bb74f0f13092b07804f7087e948bce49793f48b62c2c24a5792523acc0002840bebf21829172bb2e7c3df9f9625250aec6c786a55489667dd04d6a0
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
+DIST harfbuzz-1.8.0.tar.bz2 3793974 BLAKE2B d6f6a58e1fe2778f5007e73abc90ccd5bed3b170f27ef1a656fcad824a410b2f4d7f560ce01e5dc87ad97dea0bc926c7d49f2c9e87fec5b7c84cac6be4373afc SHA512 90cccdaa45bbd7b5a75c9600d49e15dea820f0db4f9e4eda2c451092000281657a2ecb281b574d339e84e72842e978f5cbf505845fa573e6b76382192d8dd4fb
 EBUILD harfbuzz-1.7.2.ebuild 3196 BLAKE2B 9e5fd81a09a5af0195bd40bfac953e3f974a7433c9dd7b7d21954ef043bf94e9aeb7d408021f3f7697eaf6a4d5bf65dd0f147a5978e6936e8d77cfa211d6b40a SHA512 52b2c7acee286bd2ad9e1e934408cc4b3d3b6f24b35e736cbe537da2ef0a41e755329ff76e2d5c9cdb9127a1a55730fcddd8fe01767240baa2d4179acf2f8495
-EBUILD harfbuzz-1.7.5.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 EBUILD harfbuzz-1.7.6.ebuild 3254 BLAKE2B 9509b338dd156440ce72a45f39f35dae51690a69b86979eb766ee8f3925307fbf9a8f6218c5e0c9314a25280ae306bb2af2a2a69ca5c77d8e3143b9c144404ed SHA512 b9526d44a37d2783c1d1755e8ca5f0a04b7594a0381faf3f390014d53ffe4510bb9f496b7bbbe33225d07b1ffe7604229cb812b227e92312a0217eace53ec7ed
+EBUILD harfbuzz-1.8.0.ebuild 3215 BLAKE2B e3e8dd964ff7dd7cddd8f493be4f5d4a816e90c6ff64994e3f0cf77446c5cd3f85f97cde0cc8fe198f72574f8589e70d1123997afb0220ec50df4e78d8ea3f88 SHA512 2476547f182aa0138ec49cc61fd5af2dc06b9980a335f7a93c9698fa63b9e0e29765d774098f3a17ee6b9669a6de3cfef0de9ca359c0ea89028bcae3e431d191
 EBUILD harfbuzz-9999.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.5.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.5.ebuild
deleted file mode 100644
index 81bf676d86a2..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.7.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic libtool ltprune multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-if [[ ${PV} = 9999 ]] ; then
-	DEPEND+="
-		>=dev-libs/gobject-introspection-common-1.34
-		dev-util/ragel
-	"
-fi
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local myeconfargs=(
-		--without-coretext
-		--without-uniscribe
-		$(use_enable static-libs static)
-		$(multilib_native_use_with cairo)
-		$(use_with fontconfig)
-		$(use_with glib)
-		$(use_with introspection gobject)
-		$(use_with graphite graphite2)
-		$(use_with icu)
-		$(multilib_native_use_enable introspection)
-		$(use_with truetype freetype)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.0.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.0.ebuild
new file mode 100644
index 000000000000..778525d28f8f
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.8.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with fontconfig)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 6b9895335624..0464282eaa50 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -8,5 +8,5 @@ DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc
 EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
 EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
 EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
-EBUILD jpeg-9c.ebuild 1999 BLAKE2B 61674ac6d4fcacf27289e09f9233ffd31557836d32cd3e750ce5300cab71706386d9e6028d05d57090f341a78916383f46018ec759f32f75787f57d7172e79e2 SHA512 80829a2063476bad79f367308206dcef8e3253ce4825e73a5f9d9a7dcc5a8d1254c5ff51d0d8d8ac85f2122b44926920d2e1f5cb810460b0e2f1640e4010fb8a
+EBUILD jpeg-9c.ebuild 1998 BLAKE2B ef1d626e18da1597331b4ebdf885008e28dc3d725e00aa9bba23877435a78a9a64bcf836cd53f4d4955fac205e2ef4ff788486d6edbefceb08926605a3b767d5 SHA512 00c596c65e6a1a9aaa0d4ec04cd63a7e7cf605f6ff895441ac3eb43e32104a487798a7170f2c1a94971cc68a97265765e37670a55ffbd85b5f5f713f56213b5f
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 8c78b2668aff..4bad071b5db0 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libclthreads/Manifest b/media-libs/libclthreads/Manifest
index db46c63bb3f9..1256b0b9342b 100644
--- a/media-libs/libclthreads/Manifest
+++ b/media-libs/libclthreads/Manifest
@@ -1,9 +1,6 @@
 AUX libclthreads-1.0.2-makefile.patch 917 BLAKE2B c5a84695e1706ae23877de6b382477cc039768efc3bde862228d8dae33dc2a8c4227b796fb9c45cc4e4a4312ce749f18f37d97d83107e30e9a740272ef80a8ff SHA512 2a50e274c92103c8ea922174666f9aa69f88161ee4d6c52a34aa4b98d7d5fb1ef72326d627edf84e72b5fcab2b96c5335053e59ad428d0099c79bc2b52bd50b5
 AUX libclthreads-2.2.1-Makefile.patch 1462 BLAKE2B da80c7e3382cb5b5961ed4b3ccf4a47e8e4ca6652414dc85abce329ae906030c8bda18c94ba90659079f587fd68a7ea657588ce919dc589e3bc2fc2f9a318788 SHA512 f89d4746ed938f95ed12f04c01150c384c1c117808504f40a4399121a7a6e6bc32d4dd9e518a705842e7ac9a4f4547618000d76381c212a6042fe93dbba08cf5
 AUX libclthreads-2.4.0-Makefile.patch 1589 BLAKE2B 13640b1e9a449e87277c5a89fd1df71b8cda59976b0db0d8102593c84880131ff82002f64f1157838d7297b01cd4ffd66665712d503706131c91f330bd945d86 SHA512 3b58b701d46027d5c1fe7c540b100e1a62059db3d1c3b4c2201ab2e02557de5393a3b1eace0656fab4ea14089a35752e5676f1a52a2a3ed7c60f5fea89abae75
-DIST clthreads-2.2.1.tar.bz2 5968 BLAKE2B 4326f517fbcf24dad200edd93e79e0c067aae4b47b9f24c34d0737ab24ca3103cdc25522a360d9af3788bb0a4750031cdfc90c7f865b875b65eb02ae4d6d7f4d SHA512 0f0fe2d296a32ccaa4073629007ca762ed9f6c1d901d8cc8ac2aa65255c80cc6fee4ea353c914729b09be5e67012add794edbc92015e23d0e96da904dc2c3e14
 DIST clthreads-2.4.0.tar.bz2 14796 BLAKE2B 7c79608b8ebe29a8170a355069aa39496f785146a272edfe048e7dc61100302b56789ab5faa0aaad227cbe8b44eb660132f1ba22d34d304e417301d8582d5431 SHA512 c307d9611e0530469b36367f05721e6676d7bb186be97d38b851e66d9f670663ceceedf065823b27ac5864725d52cc2f462fd8d96f1398a202e30d82910ec58b
-EBUILD libclthreads-2.2.1.ebuild 774 BLAKE2B 4b044a79a7ccf4bd9a95d06882f4554a5c179adab4edf009d22462cb7fa5aeaf67d931186e46992d8aee33a1cc2423c0b97a517621966d12f28e49ea2bc0d2d5 SHA512 8fe28fbc5d0f63e1333ffb3eb2d017fc559629b6af358c2e5db1976eb68ff6d91587625b41ad354ab9c525f161f3e21fb8465cebe22646e0fe79cd429ab14260
 EBUILD libclthreads-2.4.0-r1.ebuild 739 BLAKE2B 8eb9711168dc0f54f2a662aad9f1595950e4c554fe016550532490dafadc2c137e67d1518e6346653df4e0f73aacb04a714022861f363023d164f688738ec807 SHA512 41cfe771ca41c61052cef3205a68864fd96e1ae93da38f22a30d72e0f1064fb95c55c122ebbdb88b97513b2e7feaa263dc5b01f9837c5c11e05420f43cca4714
-EBUILD libclthreads-2.4.0.ebuild 785 BLAKE2B 505c680937b077c927f197c17dd7c203be6927902ee8b6e55904de52cfbdaa647fab7d987f452a91435efe6422999182a180085b6b6c93ec87821ba00bc33150 SHA512 8dfca894957dd8a36d492266336417944b0bf8814bd451ebd5b0416c9b2d02e873df36515bbd21178176b357b3158bd3d2bf535aee006834a79662755f935cc2
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclthreads/libclthreads-2.2.1.ebuild b/media-libs/libclthreads/libclthreads-2.2.1.ebuild
deleted file mode 100644
index c44a78bd3a66..000000000000
--- a/media-libs/libclthreads/libclthreads-2.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P/lib/}"
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclthreads/libclthreads-2.4.0.ebuild b/media-libs/libclthreads/libclthreads-2.4.0.ebuild
deleted file mode 100644
index 721f8011dc6b..000000000000
--- a/media-libs/libclthreads/libclthreads-2.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P/lib/}"
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.2.1-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclxclient/Manifest b/media-libs/libclxclient/Manifest
index dd15748cd3a8..5af51bad158c 100644
--- a/media-libs/libclxclient/Manifest
+++ b/media-libs/libclxclient/Manifest
@@ -3,12 +3,6 @@ AUX libclxclient-1.0.1-makefile.patch 1057 BLAKE2B fd8706fb93bcdae2f63ccd675a338
 AUX libclxclient-3.3.2-Makefile.patch 1278 BLAKE2B 727bda7d600ea0c04935b59b278e4792f5b7c4cd84b01545013b74457457247869a4f34834d9471dec481cf3a05a68c9c3ab1611e0760ef6ff8cc9bd588a84ff SHA512 dd362de3556b22390a520fa6ab3546d4c10c144e9176aabbdcb9b4ba1cf65eb494be6adcb190fa2c5a44ceab756313e2a56ca5da9b5f07cdf3288516c38957a9
 AUX libclxclient-3.6.1-Makefile.patch 1630 BLAKE2B d718974b4c1c92b1fdb642b2245332f13837d0f59467d1ccaba818daf740bde4dc0240d3d88164ead3fea7c2123d4d7160cb5de5c1aaa578143ad3ed7009abe7 SHA512 ce012a5b8f5065c9ab79d66419ece9503911aacb837436c67cdc9a8f354730d7829235d23446c7df4c3a6b98ba94bedc426d91dcd6d484c91b5f45f8adda9c1e
 AUX libclxclient-3.9.0-Makefile.patch 1738 BLAKE2B f80642596892693bb4c46a404173aff3c1663ef227f06ace9247d44a9e5c1dde60afcda8c97073fd1106b3d929b5a1a61832cbb101a7d64a3518d3cadc0efc66 SHA512 51f938f60ce442a92c47509e8c2f0fca6614863f2482afe7f7dd558d27dfb9162cb86f4b151dd0c03f25eac65353bf796aac93374b030c70c5ac8957a456f7a2
-DIST clxclient-1.0.1.tar.bz2 16499 BLAKE2B 977f4a67c47939255e026aaa18785f0d1a330d09fc3703396097f87781b1046192719c734c13476f3f008c05750807b31d7d2a03c862783cca755530340d1afe SHA512 2e5829349838d4eae3de4a5ebcf8357c005ca9c8884326ea9666ff1f03c6905202ab703d0ed2c1c6ffc4cd0a82484ed662de5cce25b12ba3cf57a9d67902f9e4
-DIST clxclient-3.3.2.tar.bz2 20835 BLAKE2B eb0334903c03b282ac753eb5d8f661e5803b4e3bd53fc48a87e2ccd63f4f5f47123d103afa7d6943e426a0ae92bf42e1773be4a44947fd5c10d5347e89c42282 SHA512 5888f4ca6fb72ba0fb7e822189b362dd8d0e113f32f5426235732359eab7756465e51bea64de597c06122cdc5bb8e9df86be8e02242e103e49af11491ee8a087
-DIST clxclient-3.6.1.tar.bz2 30089 BLAKE2B 29f47fc39cfe60992a341846514dd19543fdc59a364284ca894cd85add59ffc60074b88ca96ea314a0bd984d7321200164add0fc6181052b688b9e4af13839f7 SHA512 9f4592d8fa11b6dd0e27af73ca140591d0f8b2672e127e44e5dc58ced5eea9d6956c12990f84f7d6706cdbbf641f0611605c410ea8daa7ff565178c01298166e
 DIST clxclient-3.9.0.tar.bz2 30272 BLAKE2B 51d7dbbf6e474b849461aaedb859bc92da0cb56f368e631016cfcb7dae1e5b3dca7630f35bc2d608fe8851cb5e60be599933834bbe358e092f2b08ad97cdc659 SHA512 4bbd621ceeebf3dfc36f0a3d02c63ba1c0e818e691e5c9681e737710824f53a58c682fb2475a7a2bba4f2dfd520166b782977320ceb73de39448cf512e26c842
-EBUILD libclxclient-1.0.1.ebuild 835 BLAKE2B 5b864604fd2b086b9056ccfb2e997caf63c42729798c021f9010cf82a2b5752407c3e6d76cf290b53dc6ce7d839b68f6aa856f1b64fe944c3ae1aee288583f4e SHA512 e63480f50fc55ba1c30cdce436870e8226e94303707b4ba055f923a23298b5a3f9a62d7e79c8a65cfe11bb0f003c5e64db1abde528d8fdd2a47a8278fe4abcc3
-EBUILD libclxclient-3.3.2.ebuild 849 BLAKE2B f44b4e2ecc560838757ff4f22fd32243828d319299ebb299868ef7b34c032a6222a2a06a49ab54456ef002c6a4bb0008f07923aa4fc44bcd43548b29fe5673a7 SHA512 3c7b1700f1a06f2aead0dff8e3b12373c1be674e3fa78432ca6f2b5232e400f049dcd81142789d4cc9e1a10d24b777f035a9154ee2fc0359271c14b869ab1d43
-EBUILD libclxclient-3.6.1.ebuild 932 BLAKE2B 9a77380b38ede01845289273481823ae7bc69942326ce4bbd7ff6c5590cecc5997e1bda176a078e47ecf250a8c668919bfef7f32aff9fee03ec7bbc06b835efd SHA512 ea3b7f162aabef8214a51b3a8b468b13a0c33b9f3924f23d34a66220287ecda0820907199aaf8fa26ff6be9772077caca840fc8e0bb79c7e6ac0ebdca543ed47
 EBUILD libclxclient-3.9.0.ebuild 920 BLAKE2B d102a195e6d77d427f9f3a7234c7bc5e71c3134f4c3d65f583dca65ab51410494f049635c40c82cff63b69ab3a2d8b7baf9367d2c88d0ea0491b1ec0394c4e38 SHA512 2a74cc4ad9d10d61b0b7ce90f372ae7d0eb72f2c45b34279654e0a77406bde530cab66917127578d5c0e7deca9a1151733c0ece650656b0fb7b4cc6f29375ee5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclxclient/libclxclient-1.0.1.ebuild b/media-libs/libclxclient/libclxclient-1.0.1.ebuild
deleted file mode 100644
index 855bf5f6d6e6..000000000000
--- a/media-libs/libclxclient/libclxclient-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-inherit eutils multilib toolchain-funcs
-
-S="${WORKDIR}/clxclient-${PV}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://users.skynet.be/solaris/linuxaudio"
-SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/clxclient-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-RDEPEND="x11-libs/libX11
-	>=media-libs/libclthreads-1.0.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	make CLXCLIENT_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/media-libs/libclxclient/libclxclient-3.3.2.ebuild b/media-libs/libclxclient/libclxclient-3.3.2.ebuild
deleted file mode 100644
index 69386949aa8e..000000000000
--- a/media-libs/libclxclient/libclxclient-3.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=${P/lib/}
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	>=media-libs/libclthreads-2.2.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake CLXCLIENT_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclxclient/libclxclient-3.6.1.ebuild b/media-libs/libclxclient/libclxclient-3.6.1.ebuild
deleted file mode 100644
index 986123b25622..000000000000
--- a/media-libs/libclxclient/libclxclient-3.6.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=${P/lib/}
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	>=media-libs/freetype-2
-	>=media-libs/libclthreads-2.4.0"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake PREFIX="/usr" LIBDIR="$(get_libdir)" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index cc5d3e9e2d0f..5ce09ae7bea6 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -5,6 +5,6 @@ DIST libepoxy-1.5.2.tar.gz 324905 BLAKE2B bbc1904b99e6674b03259bc2a5f4076f248d69
 EBUILD libepoxy-1.4.2.ebuild 1055 BLAKE2B 585d84565beffa47a418913e8b9833c38676f551222dae02c1f0f4a20788a8a27727709ea9bd4df4fa27e136b2f5e3b1c8797abb4ffd761d9e48ec8eb39dd14f SHA512 80291d0d467d736c6e865ad9786ec876a64e6b05ecc22e5df13a7ac60ee48703a514d73bc42562eabf7d54364b8e6a00635904478e551ca4dd70a9694e4e9356
 EBUILD libepoxy-1.4.3.ebuild 1080 BLAKE2B 4546353e099a85502a82a35c551621e1092fa21228ea78c3f02ab8db8ed760472ec42ed08b1a86d29a8a0079912c8e12f8d784fb5bf1064bc78f6af573cba4e4 SHA512 706ca5de96e6833cd77237c95dd9d638e06dd1b266ce0522db3774f37edfd61293c2fbf7fc480ff02484f124042875dca28b630ca6b72806ab945aafb3e23cd8
 EBUILD libepoxy-1.5.1.ebuild 1203 BLAKE2B dccf195c51e8a940a4e8d662069d86aaf933dc04bea426bdad78a49745b282edd392f4373f31a1863ace42e824476b88ddd177bb1ac8bfc13a777124d7e81524 SHA512 6ff58a8592e299ab63c3128428b0b817a1aee5f09cb2b112a14fe4edf7e96f5f180928ecce1be1e6a3e2e8caa141db4ac3951ad4fb944c9dc7ff8398f436ded6
-EBUILD libepoxy-1.5.2.ebuild 1241 BLAKE2B f6361dd6d472d8e68cbf5594438365126015593b0e4b5152aee0e79289b7fbd6bc07a9286e07a0dec5704f0c07ba781b3655de1eb7137e9a25ec3769e48fac4c SHA512 f78655ff92745ae8d36070a850932248291989828dcd9057436981eed97d7b937c7a3a9aba146fcb8a5fdc379851573854d24cb20bbd543be527c460e9de0ff8
+EBUILD libepoxy-1.5.2.ebuild 1253 BLAKE2B 764a6e010d232ffb04193ace7e1e2b209bba2acb667d06b570095df7b1ab68e80a414bd73360a2b0b2c49eb6c5132da87452d1b74f0fb0014784d0e4c448ece4 SHA512 42ef98f03c60a60cda685c8ec151195c307c908a6dd01e07172aca1755527425afeb2de3e705503594794b58f3b3cfbe0cdbbcf3551a68142e1be7bd2937e5fe
 EBUILD libepoxy-9999.ebuild 1253 BLAKE2B 764a6e010d232ffb04193ace7e1e2b209bba2acb667d06b570095df7b1ab68e80a414bd73360a2b0b2c49eb6c5132da87452d1b74f0fb0014784d0e4c448ece4 SHA512 42ef98f03c60a60cda685c8ec151195c307c908a6dd01e07172aca1755527425afeb2de3e705503594794b58f3b3cfbe0cdbbcf3551a68142e1be7bd2937e5fe
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.2.ebuild b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
index a814fceec62f..476702c15fb7 100644
--- a/media-libs/libepoxy/libepoxy-1.5.2.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/liblingoteach/Manifest b/media-libs/liblingoteach/Manifest
index 5bdb53dc4eba..eb0f35acb2c5 100644
--- a/media-libs/liblingoteach/Manifest
+++ b/media-libs/liblingoteach/Manifest
@@ -1,3 +1,3 @@
 DIST liblingoteach-0.2.3.tar.gz 341557 BLAKE2B 188cb5455f979225f909b88fecce34c510c6938f8b81f8949ae3d7a24209d86916d2ebcc561dc2f7332deee45a13674cdc05b892c46ee343398898daf4b36b68 SHA512 e29cd146750a8b913019c1eaff9eadceaaf9aa85ccd5e6a13174bc3e5cab548e5817fd87ada3a1820c3ad575e768caafde4d7a82ef238331b161d11c4f569c4e
-EBUILD liblingoteach-0.2.3.ebuild 730 BLAKE2B 205f2b6a5d5bafe0938b7890b4f8bac0ce54cbe43f331f69870b37fd1eb4c2d99bc00a2973e3e334622f5fe4b2230af9dd3482d1590b8dfcc1f9b166a3c611c4 SHA512 aab7e7906246c4f43e2ca56d1c3ee922c730c589466ac149ecc4099e1f2e496e08698a678cb4e29648c518eafd03e40e5291900a996daf379c66ebc196b2f511
+EBUILD liblingoteach-0.2.3.ebuild 549 BLAKE2B b4af4cca6848fd93d9dfc78e4667ec23be298d180e86e88af527dc22443b1a99322d6412c86ab8a9b58c50606db79e0dacf4de4c553a423325d536ac1c381c83 SHA512 120417c99f9895a6c25336e90a4f431e112df3504d27baf6c6e0ed01d243b190078d5ec263f549ae98357a88360645b2cb1f945fa20a615435b722e827f83e45
 MISC metadata.xml 343 BLAKE2B 8b665f4dcbb66dbefbafc7e563a4c8860f4b4e08dcea7f6a2b2f5aa254aa7be83dbdffc0d6491cfa0959dcd797245a04a80d806cf377a9b0fccf5a2a70927e28 SHA512 4494651c3fb84ad67bca867e5393c7960f7a8ee8de967558b3b02fc345ec947d612e62580176eeea2496993ebb870350cae0922512b3a0ce1bb3e511a6de166f
diff --git a/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild b/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
index 054e996b92ca..cc1b3d3936b6 100644
--- a/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
+++ b/media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="A library to support lingoteach-ui and for generic lesson development"
 HOMEPAGE="http://lingoteach.sourceforge.net"
@@ -18,13 +18,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	econf --disable-dependency-tracking \
+	econf \
 		$(use_enable zlib compression) \
 		$(use_enable debug)
 }
-
-src_install() {
-	emake HTML_DIR="/usr/share/doc/${PF}" DOC_MODULE="" \
-		DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog HACKING NEWS README
-}
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 12d6ac179c5c..00e5a02cec2f 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,6 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_17.12.tar.xz 1612420 BLAKE2B 1e1bd62efe45783d4973bbe0ff264db1ed20b064dc18fe3ab4fa3614c1b41663fe6727e469ef1769b4736827f89940edd959b270ec1c673a190c9078a81f3955 SHA512 c425612ca84f4655c851332a4c13bdd75df094fa5468b2d61db512ff8431b41e94068d2f645b669dbee286ccae3979a38a5f4ebbb5cda8abdbadf0313df5680d
 DIST libmediainfo_18.03.tar.xz 1627584 BLAKE2B 02ee429fe22af753e8a62a621999b949541e2db4f83705eaf1ce90bda29062fffa76cb1e85e860c7b02d5892044fed5954635b0680965949864cb220868133aa SHA512 d903309fbf9ee78633e833372b13b9676dae2d3d0aa19e584d4972ca2c76cff5524a08201e73b2a6d97a84a0fd469c5bc136d09a27ce0363a7e743e889719c6d
-EBUILD libmediainfo-17.12.ebuild 1834 BLAKE2B a54b2a81cef3bb3309c7d5ca6671ca85f0726a9ea28c224b3b3eecb3e45739c7b8bf5653cd69e3cc5f65f795d396dc813412e8c86125d23480893c09708974ba SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e
-EBUILD libmediainfo-18.03.ebuild 1836 BLAKE2B 1847028ad80e0c65c8b046c5c048547c209eb7e3e61e44d6c87298a61b2cc425bcb2bf9a97dce6081c9bc7dea6fb035c46b8e78f50f3f9c4a0d0ea2484148180 SHA512 10cf52d6df0e23d28be0ee4c6d3eff0a3ba8f0ee7f6e5ba7d92ddab90deca01c3bc72081ff9c7d5f9799601d5d213a591dc95a4671fd472104f58c6d915edd97
+DIST libmediainfo_18.05.tar.xz 1630284 BLAKE2B 8fcf6a2ccbf1f0b9769e22501187d3563b991df0d274d3cc07b1fd02883dab23c0b446a7206e4dd2dd6e2944f99498b04721ed701ed4a60598b08466bd7f45ec SHA512 47d03380197f105bbd2e575558f4b4c1fade8c350af0f69a807c042abbf3aa02413fa88c047988f47cef77240e1106800a1dfd4ef1b41a1ceb019e3d52979901
+EBUILD libmediainfo-18.03.ebuild 1834 BLAKE2B a54b2a81cef3bb3309c7d5ca6671ca85f0726a9ea28c224b3b3eecb3e45739c7b8bf5653cd69e3cc5f65f795d396dc813412e8c86125d23480893c09708974ba SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e
+EBUILD libmediainfo-18.05.ebuild 1836 BLAKE2B 0f6a3e335f681ad0c4831123e585b3e9a73212ab20f532d986ae8a0a599e60869582749abccca1f77b712e942b5f3bd15d7f06c56b8c8b06aa2f200f5d00c2ef SHA512 21955ea85241744206f86c931893686e914a215e410a018302d970989cc920bd39ea9f1e39ed2a52f5d4f7e458bcb1939c18696885d10c484838483d391a7091
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-17.12.ebuild b/media-libs/libmediainfo/libmediainfo-17.12.ebuild
deleted file mode 100644
index c5d85f15c216..000000000000
--- a/media-libs/libmediainfo/libmediainfo-17.12.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	prune_libtool_files
-}
diff --git a/media-libs/libmediainfo/libmediainfo-18.03.ebuild b/media-libs/libmediainfo/libmediainfo-18.03.ebuild
index 7be3ed1e7919..c5d85f15c216 100644
--- a/media-libs/libmediainfo/libmediainfo-18.03.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-18.03.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmediainfo/libmediainfo-18.05.ebuild b/media-libs/libmediainfo/libmediainfo-18.05.ebuild
new file mode 100644
index 000000000000..1de014e4ca3f
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-18.05.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune flag-o-matic
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.37[static-libs=]
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+# tests try to fetch data from online sources
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+
+src_prepare() {
+	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+	eapply_user
+
+	sed -i 's:-O2::' configure.ac || die
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	prune_libtool_files
+}
diff --git a/media-libs/liboggz/Manifest b/media-libs/liboggz/Manifest
index b9e29e289de2..7bd01dc80ae8 100644
--- a/media-libs/liboggz/Manifest
+++ b/media-libs/liboggz/Manifest
@@ -1,4 +1,4 @@
-AUX liboggz-1.1.1-destdir.patch 546 BLAKE2B 3fabdd42a8810172f5497c1ed55e8cb2fffcf334ddcc5866ab04f4571c21a54e067e0d9ffa61cd10224388cab4ebfc2ecba7f71eebf30d701e32bc088d54a86b SHA512 6afbb1a546571abf72fb71fdd8e23d5f1ca37fad66e2aebabb45abc7d43dd3b6c5faf53761bc73068b1b7aaa85126ebbf1f83840b0cfa3cf784e1d97f2f9f9bf
+AUX liboggz-1.1.1-destdir.patch 550 BLAKE2B a8823cc2159aa869fb1f6888be83819407bcc9832cda8ed0b43d5b3292914ef1e9fbf2737814904650423df8e60f7e0b2892a5862494b8a9c9b6d63e64e280ae SHA512 e988d3eae103874b905929f749687eba6e539b06ba4d4a4963e6030ede04cb86af6a9dcf84bf7456a25d267fb02a3b55ccd20bb907c3cb7e5e19049f05a78fdf
 DIST liboggz-1.1.1.tar.gz 702261 BLAKE2B 0631d1c30a045c67b38b9de107a97dc8963890a867262b01271adfb4483c77f8d14e203dffd057194b19b4e6cc28169a3a085fbb79d683a48ee091316cca8a4f SHA512 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
-EBUILD liboggz-1.1.1.ebuild 1042 BLAKE2B d5fa887622a49a3486ef420e8fee1ff7fa9acad416cc7faa65d52256549fa1985a476d15078d3a7994c1684e640c41167b44824a82410366f3a71010cf81c17c SHA512 ead2dd80b6236ca90dcc62fc358267bf77a47298ebfb3a36922108212de1fe01e44b283c4d344642390429b348114d5fb452cbdb438e489a5648d7c8e422fc3b
+EBUILD liboggz-1.1.1.ebuild 944 BLAKE2B ee1fa4ea416ab129f9bbdc9538d687dd6b0a620a3e742c8d2ab2df60cc1d04f37fa9bc75813c393643b2b0669c943eefbba83cddfa5f766c3f6fd959642164d0 SHA512 d4827c4991982c0752e374b6ba9fd20a0f795c44794453543308ee24c860f60d09c92f09c314ca2b6edb631e279b94998608fbd943fa765ccaefdde660b71efc
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch b/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
index c58a0c960f75..54378b2d728b 100644
--- a/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
+++ b/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
@@ -1,5 +1,5 @@
---- src/tools/Makefile.am
-+++ src/tools/Makefile.am
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
 @@ -75,10 +75,7 @@
  # see http://lists.xiph.org/pipermail/ogg-dev/2008-July/001083.html
  install-exec-local:
diff --git a/media-libs/liboggz/liboggz-1.1.1.ebuild b/media-libs/liboggz/liboggz-1.1.1.ebuild
index fc5cf5c65a11..3897d7e78353 100644
--- a/media-libs/liboggz/liboggz-1.1.1.ebuild
+++ b/media-libs/liboggz/liboggz-1.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="Oggz provides a simple programming interface for reading and writing Ogg files and streams"
 HOMEPAGE="http://www.xiph.org/oggz/"
@@ -19,8 +20,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( app-text/docbook-sgml-utils )"
 
+PATCHES=( "${FILESDIR}/${P}-destdir.patch" )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
+	default
 
 	if ! use doc; then
 		sed -i -e '/AC_CHECK_PROG/s:doxygen:dIsAbLe&:' configure.ac || die
@@ -31,13 +34,10 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die
-	dodoc AUTHORS ChangeLog README TODO
-
-	find "${D}" -name '*.la' -delete
+	default
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
 }
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 13a78082fc12..a088cec63a18 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -8,5 +8,5 @@ DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
 EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
-EBUILD libpng-1.6.34.ebuild 1372 BLAKE2B eb8dd1b99ce17f4012954030c0f0a4b03a34192959662b5f44f437193d58add6489c9764245b64d8c9c70004d1b24023e32bd5e3deed58acf73ad12fbb2d05d5 SHA512 5f2d0bc6174bdb8f0737e6e3596b0d247b5bfa22f5ec304d690c7b8f9702f6a93ef54ed8dd90c80b2b57d285c1bf1936c4872568e32270b2c11475eebd5452b9
+EBUILD libpng-1.6.34.ebuild 1371 BLAKE2B 95fd73fd3cc816d70f5c67c7769cd04d02a651fd90263c67127f8a58048ba7f05a9032b1b2c808aefe7dec4c8e1f54846f6867f24fd1ae646092e5a5a9cab57c SHA512 57e3acb2e8ceef43c00a95c06ebb851afaece1d37f760623236eaa1670f21e62699661cc5f19e6143613954ba3ae7ff5b4d066d5baa7a7921ece775eef329933
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index f8f1a98b2e7b..29b9b0173685 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libprojectm-qt/Manifest b/media-libs/libprojectm-qt/Manifest
deleted file mode 100644
index 16a295254b88..000000000000
--- a/media-libs/libprojectm-qt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libprojectm-qt-2.1.0-multilib.patch 901 BLAKE2B 84a7c774c6a8b32015ad1c568ecc118b5ee308ba27b016619a9e7aa58b6ace8258eacb7e13ecbe867feee04cda84532b9ffeb0912317b54e9fca89f5bc129599 SHA512 b6d89fa0f5bb68db2a5dbd75a80705c5a379b920d155ddeb3b8d96aa6ed86a89af28677c73e798b0c73b48088d6d61e1fcc4189fecaeed4d7e7d804cbcf4cc42
-DIST projectM-qt-2.1.0-Source.tar.gz 100928 BLAKE2B bf6d835f361502daeef7656bfd041760bdec0e2e9f9c0fc9d27665f97604b61021fd570c9caa48e74d220a4aef23d069cff2a9fa0ef0a9d71fbb5ae8017133eb SHA512 fe3f88941da763086a20dbb8a32d25081361a39cb98a87467b06a98c87e3d3c05db555b357974c376ee1d0af01efcec4b1522405d8bd5b7c9860ccecdfb4a887
-EBUILD libprojectm-qt-2.1.0-r1.ebuild 611 BLAKE2B 0c15c85a6e55e1b9c733789dd6d20f45a9535499f485c021ad40ed518cb9b4f6646d353c0ba35ac288e18ff00d487a56fe0bd5ca80fa9f8c7c3d984d2df90f78 SHA512 d83ff18b8c46c1f86884cae90b937229a3548c957776caf37b23f0a2e22738f8b115bfc9716e326b65a0d19fa1afc93f88e77f8f64a687142ad2160f2163d708
-MISC metadata.xml 331 BLAKE2B a0d10fc64d4ccd3f2b0074f00f48827ecf31eb22f9823d9ac43e8c5d0074e90263dd507457d2467ed33d6b2c09d872af2e2f28f733d8ae9600ebc1862f1da60c SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740
diff --git a/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch b/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch
deleted file mode 100644
index 99c5b25068cf..000000000000
--- a/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt
-index 750d1ed..ed14840 100644
---- a/src/projectM-qt/CMakeLists.txt
-+++ b/src/projectM-qt/CMakeLists.txt
-@@ -131,6 +131,6 @@ include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR
- target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
- 
- install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt)
--install(TARGETS projectM-qt DESTINATION lib)
--install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib/pkgconfig)
-+install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX})
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- install(FILES "images/icons/prjm16-transparent.svg" DESTINATION	${CMAKE_INSTALL_PREFIX}/share/pixmaps)
-
diff --git a/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild b/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild
deleted file mode 100644
index d73babdd2c3d..000000000000
--- a/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_P=${P/m/M}-Source ; MY_P=${MY_P/lib}
-
-DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=media-libs/libprojectm-2.1.0
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
diff --git a/media-libs/libprojectm-qt/metadata.xml b/media-libs/libprojectm-qt/metadata.xml
deleted file mode 100644
index 4b7d1d427e51..000000000000
--- a/media-libs/libprojectm-qt/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>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">projectm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e8ef68761ee6..15d2a2452d14 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,10 @@
 AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5
 DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25d2a01ac4767ab12bee85fe5dae1492d5bb1df06b6e8c6b0fe960bbd5ea38691c75d08a6b4302c64377ce58e54 SHA512 83deffbc6b9823b8e93cccf57d7952106f3d55fea881e3924f9f9586f0e9347a6e3a1a36cc19c24af819f2fde3af9496652a6ff56132511a5618d5774404f63f
-DIST mesa-18.0.4.tar.xz 10939356 BLAKE2B 6bbf19f4e547be3be7385f6e8b094444fe78c0e1ac04d42f1e762ec92d83a53c06bae987b63a542553df4a8a1e17c0b3738e2db6faf356897f49b8d7efd5845c SHA512 f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c
-DIST mesa-18.1.0.tar.xz 11118776 BLAKE2B 0da5486e96596b3f919f15d2db9cd12de825811a0f2222bb76859bb7d275914dda0cc19a518b269fa0745d52982b92d5d645b6da639a870709193db721262658 SHA512 8b26af2df8b94373cbc339521974cd568c1d4ff4204986ee7b439e4cf3ebe14d822ea081a7769b68eca9263b7bc6dbca01836b8bb0d6495d2e2614c4e3d601ad
+DIST mesa-18.0.5.tar.xz 10952996 BLAKE2B 708cdb2ef95a618430cd4e7eb45bcab0f6575774065b61f53787aa378385fe0dfa0b04f9c80c5426f9581851edc545a75c137777dc304ac8ba57465d365fcd50 SHA512 63b47cdca7f8282aab7aaa66233411f02918e5c4804b7a0010de2b1867fe90171e492ff031dfc4aa20968dfc99bd7dceb5d35fd44c709e54a2ece61175a60f3d
 DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90
-EBUILD mesa-17.3.9.ebuild 14426 BLAKE2B 1b6e0152cae7d03daff8c214d5ba17e2e320d8f989c8ade3b1c146bfe6d3da14540cf43a78b244d855acc709f9a464d0362ce145fc51ae0b6b3bd24f75c7964e SHA512 dd5f69042a0432a4b820ecd5263c8269956b6e2063e95f645d1b845d744d322d348c67d6aa017666c0694f38e03cda1609e1dc507107328255363700a2796ce3
-EBUILD mesa-18.0.4.ebuild 14381 BLAKE2B d96d38ef80c12c0e9b11ce47a85fa4b3a0c4b384909b925100415d294b5b7a71b3c88669c819f212fcf768c14f1b5efbe51bc7963e9e80cbaebc6378c1158567 SHA512 8b921bed35cd1005bceb0b05855a0043e556b2353fb66bb2bef42e826a0da44719aace06d57f494dce1435fbe947a25e65c39e285bfc63d90a832b7aa76fcbeb
-EBUILD mesa-18.1.0-r1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
-EBUILD mesa-18.1.0.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847
-EBUILD mesa-18.1.1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
-EBUILD mesa-9999.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1
+EBUILD mesa-17.3.9.ebuild 14421 BLAKE2B f60b36e7ef9f6a3631a9db2ae15375aefd3ab29d82cadf14908577aad0f1d1a208a8734207e84fc79b313014f3ccc5fed03cf82e51922fceaf8e966088954b60 SHA512 d5400d63c4c44630e80d0a5c4bbda0f2449208630907fd50fc362f3e724ec81003205642da5457ae246b5392728b27afaea621d3b5287e1fb70ce7ad3b5cf5ad
+EBUILD mesa-18.0.5.ebuild 14376 BLAKE2B 4631d39a37936ca8660bfbbbaeceb2c31fae34a84a8713f817b2bde87e438b43384bcd543c2a32a17ab95b88c87c843b0622bd256ff3882b638f400962a78cf6 SHA512 b2c612e863b37a3e8e056907fbd4aa0cd4fd20fc5cd9ce3fb21a1e84c40c58b3d5976c83f9c5585c9e1f1e3d20ff39ad40d07bf780b7b2f63185d500137e6157
+EBUILD mesa-18.1.1-r1.ebuild 13369 BLAKE2B fda4a58fe25d1c5fc16fa8710924095b3bd7b8b07f36aa1dcdd34fe3f2e76ba771ffddc40e7d21a61beca4932ac88b69e293c0eb25e298b3598cb9da452d5c8c SHA512 6aa45ea27f6a166f571e58a9ac3690ebae854092667636967771a4d622b457e91c7e6234d42bce7afebe1fdf0357efa828d0366bc98dc93dbe20bb849ec57a09
+EBUILD mesa-18.1.1.ebuild 13041 BLAKE2B 7b9578fae60728474e7a33776b59b78415772be46afcf2597c787c1ee489c85ce6a351fb94efd13ac267ed5e134df91ad1db120b90ed7065de4e648573170659 SHA512 b9ca1aa333646315dd419664c45ec71e9f9554b55d9ce14679e4489dcba9448bee7a5db50a4a341698f2dbda0d4ac878a590016f68775f732dad020692e323fe
+EBUILD mesa-9999.ebuild 12143 BLAKE2B 4900a624fb12f537f4a7dca0a22e9592a73176b637a0afddba827a6c6d6342fd211d3afc065051b51768a8db75ace58c27c365f2c42b73c856e40a199146bb7c SHA512 47ed0e058a7c9937fc3bddc0b53cccf9c34a128788d186a2ed2d9a58331ddadad5bfab04842d8df0b33fe23a8bbd6b2933fcf893c649d1a5c534224b0354dafe
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild
index 378c8541a722..6a26d1b522d9 100644
--- a/media-libs/mesa/mesa-17.3.9.ebuild
+++ b/media-libs/mesa/mesa-17.3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
 
 if [[ ${PV} = 9999 ]]; then
 	GIT_ECLASS="git-r3"
diff --git a/media-libs/mesa/mesa-18.0.4.ebuild b/media-libs/mesa/mesa-18.0.4.ebuild
deleted file mode 100644
index 944b89c49377..000000000000
--- a/media-libs/mesa/mesa-18.0.4.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# 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/mesa/mesa.git"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-	vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
-RDEPEND="
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	openmax? (
-		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-		x11-misc/xdg-utils
-	)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-	eapply_user
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm)
-			$(use_enable openmax omx-bellagio)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_imx imx
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi radeon
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
-	else
-		myconf+=" $(use_enable osmesa)"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable unwind libunwind) \
-		--enable-valgrind=$(usex valgrind auto no) \
-		--enable-llvm-shared-libs \
-		--disable-opencl-icd \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
-		elog "explanation."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-vulkan_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			VULKAN_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					VULKAN_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-18.0.5.ebuild b/media-libs/mesa/mesa-18.0.5.ebuild
new file mode 100644
index 000000000000..0f5fe7b791a0
--- /dev/null
+++ b/media-libs/mesa/mesa-18.0.5.ebuild
@@ -0,0 +1,571 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ $PV == 9999 ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
+RDEPEND="
+	classic? ( app-eselect/eselect-mesa )
+	gallium? ( app-eselect/eselect-mesa )
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? (
+		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+		x11-misc/xdg-utils
+	)
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+	eapply_user
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--disable-opencl-icd \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mesa/mesa-18.1.0-r1.ebuild b/media-libs/mesa/mesa-18.1.0-r1.ebuild
deleted file mode 100644
index 70702be097dc..000000000000
--- a/media-libs/mesa/mesa-18.1.0-r1.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# 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/mesa/mesa.git"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-	vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	openmax? (
-		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-		x11-misc/xdg-utils
-	)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm)
-			$(use_enable openmax omx-bellagio)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_imx imx
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi radeon
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
-	else
-		myconf+=" $(use_enable osmesa)"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable unwind libunwind) \
-		--enable-valgrind=$(usex valgrind auto no) \
-		--enable-llvm-shared-libs \
-		--disable-opencl-icd \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
-		elog "explanation."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-vulkan_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			VULKAN_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					VULKAN_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-18.1.0.ebuild b/media-libs/mesa/mesa-18.1.0.ebuild
deleted file mode 100644
index cf00b47b8bc8..000000000000
--- a/media-libs/mesa/mesa-18.1.0.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# 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/mesa/mesa.git"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-	vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
-RDEPEND="
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	openmax? (
-		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-		x11-misc/xdg-utils
-	)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm)
-			$(use_enable openmax omx-bellagio)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_imx imx
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi radeon
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
-	else
-		myconf+=" $(use_enable osmesa)"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable unwind libunwind) \
-		--enable-valgrind=$(usex valgrind auto no) \
-		--enable-llvm-shared-libs \
-		--disable-opencl-icd \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
-		elog "explanation."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-vulkan_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			VULKAN_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					VULKAN_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-18.1.1-r1.ebuild b/media-libs/mesa/mesa-18.1.1-r1.ebuild
new file mode 100644
index 000000000000..616c90765a3b
--- /dev/null
+++ b/media-libs/mesa/mesa-18.1.1-r1.ebuild
@@ -0,0 +1,539 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ $PV == 9999 ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? (
+		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+		x11-misc/xdg-utils
+	)
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--disable-opencl-icd \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use wayland; then
+		# These files are now provided by >=dev-libs/wayland-1.15.0
+		rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die
+		rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die
+		rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die
+		rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die
+	fi
+
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mesa/mesa-18.1.1.ebuild b/media-libs/mesa/mesa-18.1.1.ebuild
index 70702be097dc..5e8a02ef74dd 100644
--- a/media-libs/mesa/mesa-18.1.1.ebuild
+++ b/media-libs/mesa/mesa-18.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
 
 if [[ ${PV} = 9999 ]]; then
 	GIT_ECLASS="git-r3"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 70702be097dc..65c767803a3c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,16 +3,9 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+inherit llvm meson multilib-minimal pax-utils python-any-r1
 
 OPENGL_DIR="xorg-x11"
 
@@ -21,8 +14,10 @@ MY_P="${P/_/-}"
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
 
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -30,7 +25,10 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="
+	!bindist? ( bindist )
+	!test? ( test )
+"
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
 VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
@@ -39,9 +37,9 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-	vdpau vulkan wayland xvmc xa"
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+	lm_sensors +nptl opencl osmesa pax_kernel openmax pic selinux test unwind
+	vaapi valgrind vdpau vulkan wayland xvmc xa"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 gallium )
@@ -88,37 +86,40 @@ RDEPEND="
 	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
 		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		lm_sensors? ( sys-apps/lm_sensors:= )
+		opencl? (
+					app-eselect/eselect-opencl
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		openmax? (
+			>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+			x11-misc/xdg-utils
 		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
 		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	openmax? (
-		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
-		x11-misc/xdg-utils
-	)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	wayland? (
-		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.8
 	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
 
 	video_cards_intel? (
@@ -215,17 +216,12 @@ DEPEND="${RDEPEND}
 	opencl? (
 		>=sys-devel/gcc-4.6
 	)
+	sys-devel/bison
+	sys-devel/flex
 	sys-devel/gettext
 	virtual/pkgconfig
 	valgrind? ( dev-util/valgrind )
 	x11-base/xorg-proto
-	vulkan? (
-		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
 	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
 "
 
@@ -236,7 +232,7 @@ QA_WX_LOAD="
 x86? (
 	!pic? (
 		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
 		usr/lib*/libGLESv2.so.2.0.0
 		usr/lib*/libGL.so.1.2.0
 		usr/lib*/libOSMesa.so.8.0.0
@@ -269,55 +265,46 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	eapply_user
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
 multilib_src_configure() {
-	local myconf
+	local emesonargs=()
 
 	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
 		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
 		if ! use video_cards_i915 && \
 			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
+			dri_driver_enable video_cards_intel i915 i965
 		fi
 
 		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
+		dri_driver_enable video_cards_nouveau nouveau
 
 		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
 		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
 		fi
 	fi
 
 	if use egl; then
-		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+		emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
 	fi
 
 	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm)
-			$(use_enable openmax omx-bellagio)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
+		emesonargs+=(
+			$(meson_use d3d9 gallium-nine)
+			$(meson_use llvm)
+			-Dgallium-omx=$(usex openmax bellagio disabled)
+			$(meson_use vaapi gallium-vaapi)
+			$(meson_use vdpau gallium-vdpau)
+			$(meson_use xa gallium-xa)
+			$(meson_use xvmc gallium-xvmc)
+		)
+		use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+
 		gallium_enable video_cards_vc4 vc4
 		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
@@ -333,17 +320,16 @@ multilib_src_configure() {
 		gallium_enable video_cards_r600 r600
 		gallium_enable video_cards_radeonsi radeonsi
 		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
+			! use video_cards_r600; then
 			gallium_enable video_cards_radeon r300 r600
 		fi
 
 		gallium_enable video_cards_freedreno freedreno
 		# opencl stuff
 		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
+			emesonargs+=(
+				-Dgallium-opencl="$(usex opencl standalone disabled)"
+			)
 		fi
 
 		gallium_enable video_cards_virgl virgl
@@ -351,55 +337,59 @@ multilib_src_configure() {
 
 	if use vulkan; then
 		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi radeon
+		vulkan_enable video_cards_radeonsi amd
 	fi
 
 	# x86 hardened pax_kernel needs glx-rts, bug 240956
 	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
 	fi
 
 	# on abi_x86_32 hardened we need to have asm disable
 	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
+		emesonargs+=( -Dasm=false )
 	fi
 
 	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
+		GALLIUM_DRIVERS+="swrast "
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
 	else
-		myconf+=" $(use_enable osmesa)"
+		DRI_DRIVERS+="swrast "
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
 	fi
 
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable unwind libunwind) \
-		--enable-valgrind=$(usex valgrind auto no) \
-		--enable-llvm-shared-libs \
-		--disable-opencl-icd \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
+	driver_list() {
+		arr=($(printf "%s\n" "$@" | sort -u | tr '\n' ','))
+		echo "${arr: : -1}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use !bindist texture-float)
+		$(meson_use d3d9 gallium-nine)
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use unwind libunwind)
+		$(meson_use lm_sensors lmsensors)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list ${DRI_DRIVERS})
+		-Dgallium-drivers=$(driver_list ${GALLIUM_DRIVERS})
+		-Dvulkan-drivers=$(driver_list ${VULKAN_DRIVERS})
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
 }
 
 multilib_src_install() {
-	emake install DESTDIR="${D}"
+	meson_src_install
 
 	if use opencl; then
 		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
@@ -424,7 +414,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
 	einstalldocs
 
 	if use !bindist; then
@@ -433,14 +422,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
+	meson_src_test
 }
 
 pkg_postinst() {
@@ -478,54 +460,23 @@ pkg_prerm() {
 
 # $1 - VIDEO_CARDS flag
 # other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
+dri_driver_enable() {
+	if use $1; then
+		shift
+		DRI_DRIVERS+="$@ "
+	fi
 }
 
 gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
+	if use $1; then
+		shift
+		GALLIUM_DRIVERS+="$@ "
+	fi
 }
 
 vulkan_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			VULKAN_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					VULKAN_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
+	if use $1; then
+		shift
+		VULKAN_DRIVERS+="$@ "
+	fi
 }
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index d312c9ee4fe4..8110cb256573 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -8,5 +8,5 @@ AUX mlt-6.4.1-qtopengl-2.patch 2573 BLAKE2B 3a313c170a079b8c036a75773b2e9f8b047b
 DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
 DIST mlt-6.6.0.tar.gz 1365768 BLAKE2B e2e6919d603560dac3d809740a3be2989a3b52a4e933fa67927c5c26796a5c9b35da1aedb54caa4c87133dc682d5f41455900594ebdfd6ec1516ff02d477d58f SHA512 06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845
 EBUILD mlt-6.4.1-r6.ebuild 5685 BLAKE2B 9785e64a795bfa740e4e70b4c4941b2be9ef3ceeb936c112137e137c19e814cbca10b168498e1da4e5e63010589c98f21c0cc06d23a60870fd645d0229679293 SHA512 f77ba0383dc88fb9f5d473fee589995a8b8a77d433b691e54e165c3785adcdc0d8dc2c6af34f7eb4e17d866769cf85e1e3f8066acacf27d3b70460ec382d19d3
-EBUILD mlt-6.6.0.ebuild 5565 BLAKE2B 246d08c7d5c88f9b4d50548d7c9f1a25d26675445eb463876045f629056a35871ce97894ae2dbebd5d2c3bfca4bbdeefb43d16a25988d82b17ed7291cd2baa90 SHA512 dec02dc70ec8b515a8358957d0b5311984e1619de6490763945b5ae4182926df1f9a9e7398041c28a00dda56c67fe12537c717d2549be8af2f347631092b1375
+EBUILD mlt-6.6.0.ebuild 5570 BLAKE2B ad04d53ba03cfdbb2b1e2a073f3c5ebfdb96ba997d65b1038df10ecb0792978d5594abee77d7bd9766594091f7f9b4f4bfdde389bb2bba8c034e76acd62f9129 SHA512 54992941e5c45b3a8c43aad80e2f121790d54551cbcd8f644a995821feaa76c48fcb49ee5cdd436714f339ba62442bac33e41661ad770611dab8100de154cf88
 MISC metadata.xml 1571 BLAKE2B d048070896ee31a768268cef47e8b051d24a7a48a0728a82045f8a1cccc361378945cb6d84dadb31a7c664e5f57fe15dde85e08fc579fe8f839ce5c3e64e75cc SHA512 6dbfe8206f62d5c8801e2f3a71ab409a3f3072f600d6fc935b1dbb0cc4cb67f3a0ed221a3c6a76977b3fbea60c7fb7bbf2047e55ef5a7a5aacc8bf60252fcc01
diff --git a/media-libs/mlt/mlt-6.6.0.ebuild b/media-libs/mlt/mlt-6.6.0.ebuild
index 04688b411f89..16e7f54c7d0e 100644
--- a/media-libs/mlt/mlt-6.6.0.ebuild
+++ b/media-libs/mlt/mlt-6.6.0.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 COMMON_DEPEND="
 	>=media-libs/libebur128-1.2.2
 	ffmpeg? (
-		libav? ( media-video/libav:0=[vdpau?] )
+		libav? ( >=media-video/libav-12:0=[vdpau?] )
 		!libav? ( media-video/ffmpeg:0=[vdpau?] )
 	)
 	fftw? ( sci-libs/fftw:3.0= )
diff --git a/media-libs/skstream/Manifest b/media-libs/skstream/Manifest
index ba04e0e485c7..5eb26af61b9b 100644
--- a/media-libs/skstream/Manifest
+++ b/media-libs/skstream/Manifest
@@ -1,4 +1,4 @@
 AUX skstream-0.3.9-test.patch 565 BLAKE2B 776d0b9d2dd2efbacc6f6a838aa90abe787bd4a09e2913dbd4f7238dd23e4dfe9b1b4dffea2e4e6748f85294f151d19d19d73f8890507c044f3fc237a904f0db SHA512 88f66feefeaaecc19190ee2eded9fd935c3a81aab89bd339fdc5c10f51e949c5f560912c248f75f9291ffddb94c62d0825a25c3158bab6ea64c5ccd4f5353562
 DIST skstream-0.3.9.tar.bz2 326088 BLAKE2B 8eac32ad80c2ca6f3026a10facbc34f7d2a1f113c5b8ee1a550118c13b1819f79b4846082099685d37ab43bf57f6e9da0262d19d3aa1c1bdbace2892f07e0794 SHA512 88cf67a76c9983eaa50d2350a6895a1782e77d9e9794084999770989436a3306d1f4d4d4a6ddfa199235f1dc0518d65988cd1956fdd2ce5306fd6b2246db91d9
-EBUILD skstream-0.3.9.ebuild 537 BLAKE2B 0310594537c701a62cf398c78daf8dd87b54139c37042adadd655eaedb6097195c15d4672e711d38db2cc727ddcd2a1c6bf21b95826b9ec912a10799618966da SHA512 b8467d0d8ef3f08605ef3f0b86a166036079b689fdd0e7ec65d7bacb64a7d5927ae7cfad3c4d2611b13b6520fc24844cc90bc1b77b711d1174122318be9fad74
+EBUILD skstream-0.3.9.ebuild 538 BLAKE2B ec5f0bfb5ed258d2da2f6a9d2643fd926981a00d2835f40eccf5cee9038849f8b5fa097cb48e14c346d9b62cf4c6150cdc256caef5f156c96692f72e6b5e9cb5 SHA512 9e2a05fbe8e3e0dc5a4d11b76e1069ac80cae6f2744ee78144187ff74ff54cc8d486a9e4deca51ed14261c3c04d57912004cb6714f7dc97b51f9716ba781551a
 MISC metadata.xml 297 BLAKE2B 5b10a51b749a46d330855e89fe7fe2f7a06a4ab9d2d497bc09add82ecbd0d84d3088bc60f7f4d5022191aac8a31f258a0b8605d89a78908118fd89ded0b75497 SHA512 3bc0a3cb0bcf72257ec7d027cc751e538b2f31be039b4e9b86ffaf127e358f37eaf4e9caff7d933d7a86a7ab2d4ff24b6034f776a89854cd516e4d0d45d380c6
diff --git a/media-libs/skstream/skstream-0.3.9.ebuild b/media-libs/skstream/skstream-0.3.9.ebuild
index 0acc8b73db99..f4dc2d81af1a 100644
--- a/media-libs/skstream/skstream-0.3.9.ebuild
+++ b/media-libs/skstream/skstream-0.3.9.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic
 
 DESCRIPTION="FreeSockets - Portable C++ classes for IP (sockets) applications"
-HOMEPAGE="http://www.worldforge.org/"
+HOMEPAGE="https://www.worldforge.org/"
 SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-libs/taglib-extras/Manifest b/media-libs/taglib-extras/Manifest
index 651a48fe40fc..e780ee3b1228 100644
--- a/media-libs/taglib-extras/Manifest
+++ b/media-libs/taglib-extras/Manifest
@@ -1,4 +1,4 @@
-AUX taglib-extras-1.0.1-taglib110.patch 1217 BLAKE2B 21bc16152022034363b77c3c9c50197d2b1b14419a56c5433b3841d31920fe3e156f6f205357d312d1fe68add31463b16bb73c896c3f2538b9350c2a099b469c SHA512 339319e2378cbfdc9dfea7c620ce170fa6491c8217ed90e3b7786f27f8466d3224e947e37f9d589f815c5b5fc7691ec984f27dec58a82af92b8a533b9d5a90eb
+AUX taglib-extras-1.0.1-taglib110.patch 1221 BLAKE2B 9777a4031c09284fa959ced28e356af87de9c7799dea5f01c7674ef7cff0bd86320db694d27d5327692414fbc85ffb8bc8f898a4d1a1d900f6411e02ac25f2de SHA512 1099cd225ed9b248b71d10d4526272e2cc4df8a3f86f0bf464e21b10ff1166576f7e06763fe19a1b1caedc3711f5832dd0270d27d25d793437dba8c9b6fabbbf
 DIST taglib-extras-1.0.1.tar.gz 31363 BLAKE2B 19150c26d06fad281f172c7f360155ced709d461b26431adf3a02d34cf029237855b21980b0bd2de026420a3f3a45bb0bc9fde3a5f6091f1219eff51a55f9b56 SHA512 282f9c9cde81a250d8d6f4416658167665044d53cd10d8ecfa490df60a1fb95e1309feb17f69963f8dbfccc83ebb76af7275c25339931117435f34a56c4f1a65
-EBUILD taglib-extras-1.0.1-r1.ebuild 538 BLAKE2B ad0a500230568d080875a5867dd1bac06fd9fcc276032cff38ef8a5e05fe39bade1d06f329cd4d4ed3117e15ef6f6dcd84391d7a30a0d6ed8ff7c2a578f78305 SHA512 5da828b36e0edf146c40dccf0d42824bc9b4e2687774fd037e1dc2a5a89d2470ec06c5be5488873f7c8ae90020ccd0f954426fed46ea99cc6162055aeec32cdf
+EBUILD taglib-extras-1.0.1-r1.ebuild 511 BLAKE2B fe4429d438341dd8b0f86bc06d000e5c3103eff05a05cfc897e12567796e73a3ac1ddfedfbf8ba89ecaba846c556601e28fc735dca4aefd3f5c3942d5f06f4c6 SHA512 9e763eeba95281a88bc429eb620794f4aed02843a55347c6d0aa165643cbb264708a0874d0a76550466a6fdecc5396edfc19f411b79cd6d9746bb152aa2b84c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch b/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch
index cce4201dece4..87f297511413 100644
--- a/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch
+++ b/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch
@@ -2,8 +2,8 @@ Fixes build with taglib-1.10
 
 Gentoo-bug: 571072
 
---- cmake/modules/FindTaglib.cmake	2015/11/16 18:32:25	1444332
-+++ cmake/modules/FindTaglib.cmake	2015/11/16 19:05:39	1444333
+--- a/cmake/modules/FindTaglib.cmake	2015/11/16 18:32:25	1444332
++++ b/cmake/modules/FindTaglib.cmake	2015/11/16 19:05:39	1444333
 @@ -29,10 +29,10 @@
  
    exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
diff --git a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
index 9e7774c8447a..2a912b0522b7 100644
--- a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
+++ b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
@@ -19,5 +19,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS ChangeLog )
 PATCHES=( "${FILESDIR}/${P}-taglib110.patch" )
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 6f0a7ae5e17f..b05b08b0508e 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,9 +1,6 @@
 AUX vigra-1.11.0-gcc-7.patch 550 BLAKE2B c3eda6330490a4fd83ae6c0cd19ca68a71437a2acf905447864dd853fee859bbddbeeb237fda084c89b65257a644033ccd0b3a0762ff03b1c79a4f084bf94702 SHA512 fcab28aea46fd2bcc9b227611d9b8881f1492a70042fab5b7209dd855c4bcb06575ac41489d9f78be1c70937e2f77c951f6c2a60d73d9f6a84c77581810ded1a
-AUX vigra-1.9.0-automagicness.patch 2470 BLAKE2B dbe9116f2864cba0a20d125ec494a08275b4da7798ff9a210a4384ff39c0fb4848638d544d4f68b50a8a9cac14a1157df87e621465ddbfb2db1bd6e59d1e105f SHA512 88374bc6e7c17e4528e4ba78c56c13cc680ace4befe738c910b1007644d068f73b6c60b959bf1f33cc243c38e35fce9aaf77e49a173366c3ec8182ace1443f44
 DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757
 EBUILD vigra-1.11.0.ebuild 3492 BLAKE2B 304c3a1ec38d2239999edb9088144379b0cd08f166e2c6d73e60f1c962217daaa4d3fe5e98c3a3ea5918ab199a030537902823f31cc54d5803130a9e259396ca SHA512 d006b82c2d904308da82a4bdb90860f502a509be2fb5cc0a143c8f8a88ef69fa054b15af63e7a4228d86403bf3d19fe4757f25bb123f4013ba046c70d2b1e160
-EBUILD vigra-1.11.1.ebuild 3535 BLAKE2B 23c0f6fea13190f8b0e729de8d2b28d3a8efbcd5fc77223f553b6c354dacfb61ad13c25f4f991b6b4ca87b73ee53050ba5fa77ab643469a3b5ef675ef0ffe949 SHA512 b1f535c04ca2df0724d6e2b45b714eb1cc0e217c4c1f22e00bdd7dc241730341792c2280a14299031907c7177c45ca69deb27e709d32f411ed0eed23293522be
-EBUILD vigra-1.9.0.ebuild 2637 BLAKE2B dc273de65af90b7b5093f00ab90d1f93a11e989dd267eb014e5e80fb635a85bb42250661761c897dfe499b3fb7796585d87505739a848e2f6f5f57596674cbd1 SHA512 c6d217e3a07bb9332f83a9eb98d98bf76909ec40528cc155c882ff00c2a1fc287935098798793ebc57505185dd7bd36b3c88ba6259b05464d822d3f1a61baf92
+EBUILD vigra-1.11.1.ebuild 3534 BLAKE2B 373b00b7edf79ebe3e9e5ca82cabaf032c87c0e3e8a96714f4f8fe2ac19bd6c6d1b5101303f0f048e1300b8f6e87807f31e6538b1af0eec25efbad0c08e769d8 SHA512 043b293c2648690780fffd19d55029ffdcfe8d8d60f80224c7fab8527e1ad75b15d3def0a2fa3ab7f8d92a905456232662ec000d94e5ea9d56dae22df0c22378
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
deleted file mode 100644
index e6deb761d1c5..000000000000
--- a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -urN vigra-1.9.0.old/CMakeLists.txt vigra-1.9.0/CMakeLists.txt
---- vigra-1.9.0.old/CMakeLists.txt	2013-06-04 13:38:43.158564579 +0200
-+++ vigra-1.9.0/CMakeLists.txt	2013-06-04 13:45:19.290550486 +0200
-@@ -57,13 +57,27 @@
- #     search for dependencies
- #
- ##################################################
-+OPTION(WITH_TIFF "Enable tiff support" ON)
-+OPTION(WITH_JPEG "Enable jpeg support" ON)
-+OPTION(WITH_PNG "Enable png support" ON)
-+OPTION(WITH_OPENEXR "Enable openexr support" ON)
-+OPTION(WITH_FFTW3 "Enable fftw support" ON)
-+OPTION(ENABLE_DOC "Build documentation" ON)
- 
- INCLUDE(VigraFindPackage)
--VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
--VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
--VIGRA_FIND_PACKAGE(PNG)
--VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
--VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+IF(WITH_TIFF)
-+    VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-+ENDIF()
-+IF(WITH_JPEG)
-+    VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
-+ENDIF()
-+IF(WITH_PNG)
-+    VIGRA_FIND_PACKAGE(PNG)
-+ENDIF()
-+IF(WITH_FFTW3)
-+    VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
-+    VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+ENDIF()
- IF(WITH_OPENEXR)
-     VIGRA_FIND_PACKAGE(OpenEXR)
- ENDIF()
-@@ -72,8 +86,10 @@
- ENDIF()
- 
- SET(DOXYGEN_SKIP_DOT TRUE)
-+IF(ENABLE_DOC)
- FIND_PACKAGE(Doxygen)
- FIND_PACKAGE(PythonInterp)
-+ENDIF()
- 
- IF(WITH_VIGRANUMPY)
-     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
-diff -urN vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt
---- vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:38:43.207564577 +0200
-+++ vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:45:51.962549323 +0200
-@@ -1,4 +1,4 @@
--IF(PYTHON_SPHINX)
-+IF(PYTHON_SPHINX AND ENABLE_DOC)
-     # vigranumpy documentation generation using sphinx
-     IF(DEFINED VIGRANUMPY_DOCDIR)
-         MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.")
-@@ -49,7 +49,7 @@
-             ${VIGRANUMPY_DOCDIR}
-         COMMENT "Generating vigranumpy documentation")
- 
--ELSE(PYTHON_SPHINX)
-+ELSE(PYTHON_SPHINX AND ENABLE_DOC)
-     # no vigranumpy documentation if sphinx not available
-     ADD_CUSTOM_TARGET (doc_python 
-         ${CMAKE_COMMAND} -E echo
-@@ -57,7 +57,7 @@
-         "(sphinx-build not found)"
-         VERBATIM)
- 
--ENDIF(PYTHON_SPHINX)
-+ENDIF(PYTHON_SPHINX AND ENABLE_DOC)
- 
- ADD_DEPENDENCIES(doc_python vigranumpy)
- ADD_DEPENDENCIES(doc_python doc_cpp)
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index c7db801f5f0d..44a25f14450a 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
 
 # runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
deleted file mode 100644
index 0252dcd97b64..000000000000
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-
-# This ebuild could use python-r1 in the future when upstream gets Python 3.x
-# support working
-inherit cmake-utils eutils multilib python-single-r1
-
-MY_P=${P}-src
-
-DESCRIPTION="a C++ computer vision library with emphasis on customizability of algorithms and data structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff"
-
-# Pull in dev-lang/python:2.7 for vigra-config which is always installed
-RDEPEND="dev-lang/python:2.7
-	>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
-	fftw? ( sci-libs/fftw:3.0 )
-	hdf5? ( sci-libs/hdf5:= )
-	jpeg? ( virtual/jpeg )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
-	)
-	test? (
-		python? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
-	)"
-REQUIRED_USE="doc? ( hdf5 fftw )
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
-DOCS=( README.txt )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automagicness.patch
-
-	# Don't build nor install API docs when not requested
-	use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
-
-	# Don't use python_fix_shebang because we can't put this behind USE="python"
-	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-
-	# required for ddocdir
-	_cmake_check_build_dir init
-	local mycmakeargs=(
-		-DDOCDIR="${CMAKE_BUILD_DIR}"/doc
-		-DLIBDIR_SUFFIX=${libdir/lib}
-		-DDOCINSTALL=share/doc/${PF}
-		-DWITH_VALGRIND=OFF
-		$(cmake-utils_use_with python VIGRANUMPY)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with hdf5)
-		$(cmake-utils_use_build test TESTING)
-		$(cmake-utils_use test CREATE_CTEST_TARGETS)
-		$(cmake-utils_use test AUTOBUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
-}
-
-src_test() { :; } #390447
-
-src_install() {
-	cmake-utils_src_install
-
-	use python && python_optimize
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 1b7b852bbf93..22370f3a9e9a 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,5 +2,5 @@ AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B
 AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 4914 BLAKE2B d8a2cadee0230a84aa25957944fb5a6944be4ad7cd19442332204be4f5c428abd181f89a40d464065e4a8ff00b4f43c8d2aab086857b611059de75f0650cd0fc SHA512 76abae6ec5f1ab2db66c8a9db3e5f2c28f7993c8d9e3d582c018ee3c6d6f4111fcd29288a5593d3c37d4e4e3d7e52c324582718b1d7f6db6a8e7b0edad834da2
 DIST vulkan-layers-0_pre20180601.tar.gz 1099188 BLAKE2B 74bc6aeb789485768639482bee5d4383db80344b3bd1f25c8767769d99199fb7db8c9bb6dfc597290aac1bec742851658300e52884fc734f5f6a1e4f8d3f8194 SHA512 7212a5359e56ef593d05c9aa61fd64f13737c55757a38d5d45d71f97f59a0719bf154dfc5a62a54905a944b3fcc24c08b56226c517fc79180a6f6584bf54850b
 EBUILD vulkan-layers-0_pre20180601.ebuild 1591 BLAKE2B 410cf3f55a861ac1f77d6f3ee230e4375cbd72470efcbf0ba166ff241220932fa5bbab2801e57021fa4d81e24a37add62e3a22ee061471b34285eeb482591dd1 SHA512 d026d69ff9b2545309ac4b118e021491e9369c6b32f9bc899dd880b5bc925c2f09830d64d01a060bfa4036ed577f9b15e7b8023e51c67af147584f73caf5e77d
-EBUILD vulkan-layers-9999.ebuild 1591 BLAKE2B 410cf3f55a861ac1f77d6f3ee230e4375cbd72470efcbf0ba166ff241220932fa5bbab2801e57021fa4d81e24a37add62e3a22ee061471b34285eeb482591dd1 SHA512 d026d69ff9b2545309ac4b118e021491e9369c6b32f9bc899dd880b5bc925c2f09830d64d01a060bfa4036ed577f9b15e7b8023e51c67af147584f73caf5e77d
+EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B d9a5a239e0287f50a2c9fcff4fe788379d94e092261d455fa76b0588e969b34887c2b937a27b38de085645f06529c8c7570be7d5cfaad57bdd461447b924a1d3 SHA512 5f1fe4527a620fe027570c823fca1f8c89ae4a9ab8d9efbc52484a82c239e6049e602acf5968ad163211f60207ae155dcac5ec0c482572410eeba0359d34641f
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 2187d9d65c0d..c4dcf61a753b 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -37,7 +37,6 @@ DEPEND="${PYTHON_DEPS}
 		   )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch"
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
 	 )
 
@@ -50,6 +49,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=False
 		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 6acb4cab38d1..ea09b33e56d1 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index b37b0d48b270..3ecddf4ed38c 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,6 +1,7 @@
 DIST imlib2_loaders-1.4.7.tar.gz 384739 BLAKE2B 125200707c6bb9bb8f0c4ded56a3f8c0073843819e11d7ded6a363e1bef1a8c95227c4d010a3101c8a4714f9df8593cb2b58fd9e8b8f6da514a4be06ca1af10a SHA512 c7be31b9a7b50ea5a44cadf0ec7f056f5080498ec53fcd32d82a0a6da163b59397e8470c7bbe536d2cabf88c7694d18b450ad85cc6693e8862aeb7d4ee0f4835
 DIST imlib2_loaders-1.4.8.tar.gz 384862 BLAKE2B 53ac4d0dec5fccf2cb442883dbf9a0a31dab26c3ef206ef07b1bacf59ab74d9318dd6836eb0371183863e43b68db7f209efe92a1f8ecc18a1c2cfe038992f631 SHA512 5acf6568000d98571f0a4b7e63c3e5c534a7d12139654cdc64eaa3a551b7952f3752ad78e4ced595945adf03454367cc9c3dff7766bd35c2f7ee6baffdbb0a1a
+DIST imlib2_loaders-1.5.1.tar.gz 378169 BLAKE2B a65dabb8fb537489fe77fdc7c197ce4fa91dc13a86d1a5bf5aae4fbc9ac65a4194b57de8d49bb0dc2d906b20b7c79aa458d0ba668aa947a847414f377fd3b540 SHA512 a94996091a7f9f1271c19d24e6edebeb34977a4e67b8300897de0e5afd06bb9b209e404dd86ab3f397c6dec64f4985a515986b6b048d2c13416265eb2058a8a6
 EBUILD imlib2_loaders-1.4.7.ebuild 688 BLAKE2B 042e80b5ca9f28e17a98b86101d70226d7bc7c341ba4f1a17cf40f282ed9b5617b56557b7c9407d74bb6f73291aed118b8f17c4df69f34a04ce5c445cb87c594 SHA512 e42176a5845b12927225667704ebde5a73458cd7e03140b0d36d113c7c7404bff6088da5e83b57459d57babb377f1709ed058b2afd4b3d0ae74db6e07b8067d8
 EBUILD imlib2_loaders-1.4.8.ebuild 688 BLAKE2B 042e80b5ca9f28e17a98b86101d70226d7bc7c341ba4f1a17cf40f282ed9b5617b56557b7c9407d74bb6f73291aed118b8f17c4df69f34a04ce5c445cb87c594 SHA512 e42176a5845b12927225667704ebde5a73458cd7e03140b0d36d113c7c7404bff6088da5e83b57459d57babb377f1709ed058b2afd4b3d0ae74db6e07b8067d8
-EBUILD imlib2_loaders-9999.ebuild 540 BLAKE2B 8602436eb581c5bcbebd85a6f9515e1ddd50e030e82a8a6c0b5942551d32b5926eca06c473138c0f232733483c061f65b22460690c91964c0aaeac0de5c36356 SHA512 7ff084e57014e3506b724e86a642274750df2eb470f35b3732e5b5914deda16a4a45e6561e4d44624b7083487ab58e91ed0d6dc694b8ebb686e9b0cd2557d2bb
-MISC metadata.xml 438 BLAKE2B 01a974e43ba1ea6f7249e3dd9fc58abb36d4ddf582de86f3154053b46703439ff640a92a692f982d7d0b2c3c96baa888787d3defe52d8474e022f139528780d9 SHA512 47c55c6e5a800cd52bc03c0ad16ddb614d82f6694eec40050e558499cc921425aecfa92ea88a6db189c9b6c9cc4b3ed71971ba1a8ed16734f20d0e235e3ffcd9
+EBUILD imlib2_loaders-1.5.1.ebuild 694 BLAKE2B 611aa5e81944b34a4b78447fe0c9395dee5673c71ca71a1d9fb5363f5937960bcea9c1cb0c34202585fcff1ae8d5f1c5efa3e610dfaf29815fac34c40f86f8f6 SHA512 1192edfec21029550f3daeaedf1ff7d505a479b2a98f57119cd2e6f5444d735dc6c89603ebe90942584ee944ff8bff3cceb29ea9b749c366a31c5e06ccc4851c
+MISC metadata.xml 922 BLAKE2B 6f1e856106a42159a968188e7638f70f8a5b0570f452c0fec6f917f50fa86e1be0ab9b3688dd1917c4db62968cecaa1c658bb403c7a55a08223566fb403d1468 SHA512 18ff6fed6da1e8e9657eca8b04c05b509c2f968f4798a2f5a54d54d6827c4a11f22ee4efdb174c5008816b9fad8b496a3cf2e6561efd8c55e23b9031de2becbe
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
new file mode 100644
index 000000000000..44ed51cae4d5
--- /dev/null
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Additional image loaders for Imlib2"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eet xcf"
+
+RDEPEND="
+	>=media-libs/imlib2-${PV}
+	eet? ( dev-libs/efl[eet] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable eet)
+		$(use_enable xcf)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	V=1 emake install DESTDIR="${D}"
+	einstalldocs
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-9999.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-9999.ebuild
deleted file mode 100644
index ac30d7f3eec6..000000000000
--- a/media-plugins/imlib2_loaders/imlib2_loaders-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="legacy"
-	EGIT_URI_APPEND=${PN}
-else
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="image loader plugins for Imlib 2"
-HOMEPAGE="https://www.enlightenment.org/pages/imlib2.html"
-
-IUSE="eet xcf"
-
-RDEPEND=">=media-libs/imlib2-${PV}
-	eet? ( dev-libs/efl )"
-
-src_configure() {
-	E_ECONF=(
-		$(use_enable eet)
-		$(use_enable xcf)
-	)
-
-	enlightenment_src_configure
-}
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index 1f5dc09a7f4d..f427414f57c9 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="eet">Enable Eet image loader</flag>
-	<flag name="xcf">Enable XCF image loader</flag>
-</use>
-<longdescription>
-additional image library loaders for imlib2
-</longdescription>
-<upstream>
-	<remote-id type="sourceforge">enlightenment</remote-id>
-</upstream>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="eet">Enable Eet image loader</flag>
+    <flag name="xcf">Enable XCF image loader</flag>
+  </use>
+  <longdescription>
+    This package contains image loader plugins for Imlib2 that are not 
+    distributed together with the Imlib2 package itself.
+
+    The XCF loader cannot be packaged together with Imlib2 because 
+    Imlib2 is distributed under the BSD license, whereas the XCF loader 
+    is using elements of the Gimp's (www.gimp.org) codebase, which is 
+    distributed under the GPL. The XCF loader therefore is GPL'd as well.
+  </longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vamp-libxtract-plugins/Manifest b/media-plugins/vamp-libxtract-plugins/Manifest
index b075ee810096..06976f8ddaa4 100644
--- a/media-plugins/vamp-libxtract-plugins/Manifest
+++ b/media-plugins/vamp-libxtract-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST vamp-libxtract-plugins-0.6.6.20121204.tar.gz 20891 BLAKE2B 092358f93d00637627dd3ab2163cb9c38f65b3d1a1a5b9c118f8c50a38dc0f6dd5be4adba9027a8f1cd2d059d22457e79008fa16b2c93e4a1cc003727f9f54f2 SHA512 227b848409e4b57be042350ad1dedc8c02c0358239eaf530a0955a4b19ec2c4788e61c7b53b43de5ec1f051a33241e7a4c878584da1480b384756268b501c4c4
-EBUILD vamp-libxtract-plugins-0.6.6.20121204.ebuild 796 BLAKE2B 67e06a531a56ab4396fd0233c276c73f6c61c21f7661bf03a537bac1d99822d00f709f8d2aae665bce4b9b283aac94bc841476e1d41725ef4161f7ee85ab67f4 SHA512 dfb1d5c82fcf37e103b6f79504a856893d43ffa206d51cf65cb7d08497eedfbc56c3d7fa4cd3c8ac3eeba0ca5250788cc6a56613cdc6ddda1944e10bc52963fb
+EBUILD vamp-libxtract-plugins-0.6.6.20121204.ebuild 772 BLAKE2B 94067258b019ad8eb3a3abb93531bd6fb592e22f9697e85daa4ba08cb6926602ca7357027a7281c29be61d89c8c2bbc029463e4d085963dec7b64402cbe4b4a0 SHA512 3b2747bac958cd5ad1e40e71efe3e8c5f9b663dfde31b91fe32ea1da5c7f71dd803a2e94c971e217f0d60ec48bf975431b254131a6d694ec70c64e01be1f7685
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
index c6fb88e8947c..08a717bc9b5a 100644
--- a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
+++ b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils multilib toolchain-funcs
+EAPI=6
+
+inherit multilib toolchain-funcs
 
 DESCRIPTION="Vamp plugin encapsulating many of the functions of the LibXtract library"
 HOMEPAGE="http://www.vamp-plugins.org/"
@@ -19,16 +20,16 @@ RDEPEND="=sci-libs/fftw-3*
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -e "s/-O3//" -e "s/ -Wl,-Bstatic//" -i Makefile
+	default
+	sed -e "s/-O3//" -e "s/ -Wl,-Bstatic//" -i Makefile || die "sed Makefile failed"
 }
 
-src_compile() {
+src_configure() {
 	tc-export CXX
-	emake || die "emake failed"
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)/vamp
-	doins vamp-libxtract.{so,cat} || die "doins failed"
-	dodoc README STATUS
+	doins vamp-libxtract.{so,cat}
+	einstalldocs
 }
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index e2b4dc4d31e0..71dfde6f13d9 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 8c4eac8d7832..f6fd89465e09 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,5 +1,7 @@
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
+DIST clementine-1.3.1_p20180523.tar.gz 8490122 BLAKE2B 783cd420c8e3cd7423ecb6caa3466efd2c09e9033c2a198f52dc113603233f1bf3e3dc5208491338c0fdc9ab26e5b661e7fced0dd835b4c19a867fa3cacc9ccd SHA512 a47de226108240313fef2ce965726b3afea988030adffe38fdabf5d0dc46b2eda42cfebc32d77e939eb6dd687a99556c9bd8848c6a5e78c434950d00a8833200
 EBUILD clementine-1.3.1_p20180416.ebuild 5173 BLAKE2B 911367e87faa64ca4664a2765ee05d8df3809f86f0dffc560681fc5702b5e562e8ac6db8b8efc85cd9fcf3c574b0be05974353bdf45a9f8636a0d0c3508a6a58 SHA512 ac365714bc8e1477d2d7484816ac834334d9bb861a6fec763ef86ea79f88ab154c70d4bc027264f434bd97e46497d54ee9c68d84e0fd05894e3f33b0f16d0b2e
+EBUILD clementine-1.3.1_p20180523.ebuild 5175 BLAKE2B abd9e0acf98581c7bd9cb1cd4256c1e89401e0f6ae18d63582b0171663865abb26e5680520ed335a455dadae919460eb4bda420f26ae80013b97a951b19e4ede SHA512 6276db36f7e99efb51fe01ff708a46039d33364f6817883d1c9e7b4f47924fbcc8919dd817407be5ef27f1985213e528b940373ec8505d36ebcc628646e5162c
 EBUILD clementine-9999.ebuild 5108 BLAKE2B e5c0ed007db9b57a2934458a540f655bd546504308588b5e387586da1ade150d0562b456de63054c4434725265f0c97d1a17793ed50f6f2e8a689ebafdbe7838 SHA512 7952dd7ea1b9e3b7ddd657d5891791ed66fdbd0c844a317190055a6e08ffbaef1953b58a3cb3980b436a81fd30bb75f71da538ba1b371694b5e00e3f03e473b6
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20180523.ebuild b/media-sound/clementine/clementine-1.3.1_p20180523.ebuild
new file mode 100644
index 000000000000..429b9aa05e05
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20180523.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="qt5"
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	GIT_ECLASS="git-r3"
+else
+	COMMIT=4619a4c1ab3b17b13d4b2327ad477912917eaf36
+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
+unset GIT_ECLASS
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_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
+	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
+	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.1.0_pre20150206 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-1.2.0
+	)
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+	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 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/linguist-tools:5
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml: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
+	)
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN^}-${COMMIT}"
+
+DOCS=( Changelog README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake-utils_src_prepare
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory tests
+	fi
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="cryptopp"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_DEVICEKIT=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/combine_wave/Manifest b/media-sound/combine_wave/Manifest
index 6a338b0a132f..6a51265600a6 100644
--- a/media-sound/combine_wave/Manifest
+++ b/media-sound/combine_wave/Manifest
@@ -1,4 +1,4 @@
-AUX combine_wave-0.3.1-overflow.patch 840 BLAKE2B 49e64ea5cfe76b4d9338406c9d5f12054f4da2510cedddcef38f42f17ff936d235d7961fa75e936e05fca3d8de456d3e9e4cef9024106fe2d4b29b22832230c0 SHA512 2352267f8bcad2485e26ea6f49188cea39e720efde324aa09943f1f9bde449c37b1b626328a8a3f19e5fefaeac65ce2f19af6666efa0473a85e6b6e60ad313b1
+AUX combine_wave-0.3.1-overflow.patch 765 BLAKE2B 3b4be839e5292b059345535a67ea4702c62aee72ac04e44bce52d8321f52e2b46efc7a8161b8fc5dc246f441dff3a6d6631246aac0ccfaf4dd6d2eb212fa7f22 SHA512 0c19f3f7344b586fa546b1c32fc7e4469ba84fd415e24ddbfdf5085739c1bc6f3b2e518e7715da52a647e30961219eda310cc6d5505f803486491996f3e71887
 DIST combine_wave-0.3.1.tgz 14875 BLAKE2B 8884cbb07bf2f713c9f308420e7c48c366575ca5fc390d0e067760eba3f6bdd197fe1b12bf5fe5b0100f376146b85d42fc6ac42ad01e48a2b9e30ffc85f136c0 SHA512 81c97074b86945d6dc7299a79e38483ce50693f25b450e9bbdfc60ea1812e9a767e726805f0cd638e27321146cd72a9ed4df77cae5522b1777d0980c3eaaa3a8
-EBUILD combine_wave-0.3.1-r1.ebuild 718 BLAKE2B 0bd913a367be7adfe27efda1056a7f36cb2fc0fcdd1d6c7423da3f4a2572bad8f1dbcac5ea5543bcd013125aad720db2286b404020394e191de08a7de00e8802 SHA512 a0285a40be48e3b94936b53f800f596ee163b98e5e4d671d088e1e37253b829577d204e55da68b51c3e23ab187ad7077015d717b04457a722eda5c4481133a07
+EBUILD combine_wave-0.3.1-r1.ebuild 731 BLAKE2B 1636b0ad274c8bf049819ce1e6696f22e0da7da05fa30dcba8c9d0ceace00e6cdd9a8a6399f829197a1b617b905ab21b0d87e937ddc3915b4ddfd9704f7b0665 SHA512 d5a17daeb8193f544708a8259a1743d13b71577f6ab6847e49c1c3eaf211dcfffc051822ea1a0eb140c21daf44cb9b2061a2a1e0d95ffa97c73fc2b2bf4b78db
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
index cee491df0ef9..6974e43cf260 100644
--- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils toolchain-funcs
-
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
@@ -14,19 +12,24 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( CHANGES README combine_wave.man )
+
+PATCHES=( "${FILESDIR}/${P}-overflow.patch" )
 
 src_prepare() {
+	default
 	# fix makefile
 	sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \
-		-e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile
-	epatch "${FILESDIR}"/${P}-overflow.patch
+		-e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile || die "sed Makefile failed"
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin combine_wave || die
-	dodoc CHANGES README combine_wave.man
+	dobin combine_wave
+	einstalldocs
 }
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch
index ee7fe38da458..657ff24bbf75 100644
--- a/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch
@@ -1,5 +1,3 @@
-diff --git a/combine_wave.c b/combine_wave.c
-index 5bfa4aa..391db25 100644
 --- a/combine_wave.c
 +++ b/combine_wave.c
 @@ -601,9 +601,9 @@ for(i = 0; i < header_size; i++)
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 6b1db86df2ba..e1e3ae02d41a 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,5 +1,5 @@
 DIST dir2ogg-0.11.6.tar.gz 19442 BLAKE2B 4cad096f6e727b90e8b09594b1b189b3dbeae581e5ecd485ac8dc853b3f059cd73529422835d682ac7db96d4225380c48ef101343faecc8f32aa8ce056a6b784 SHA512 c5b82640b21e5c94bf15ae174b1351bab11511fee15c30ba39f8ac64103fd5f6934687eb5c025f68adb3e70701f1b644f61800e2d745e33ecb02005f07b6c6b0
 DIST dir2ogg-0.11.8.tar.gz 21145 BLAKE2B ff3fe7586e935bc3d3c2de7e3625807bc91c0b507670af20d9707f777255f3c953c0a084b92e23f55a83c4ecbd1343eb258b1baa8adda158a0a46921c173ac50 SHA512 44275ab5b1bda26e2148b24a1b9fc49ee09e6f2848c1e62d13da12369e28a1f787c695c1547b002f13e1733d14984bf3ca0c425d60ace8bda69f0de28af0ed8f
 EBUILD dir2ogg-0.11.6.ebuild 872 BLAKE2B 87808d632d07bcb7508af868d3402486314b0fc18b1da430e3548e97d89efbcc8dfd4121aa54686c26a7aadbc1440a35101fdf8a7f3579ae9507890ff848fa7b SHA512 a85412cd58fca620d19da47247d3bba1878bc91a179381b9a252d403aea5cc7d7f3d6e4700aa8c0c71b0a387d27af150b96f2429309f0ce5fef9976bb0d9f5eb
-EBUILD dir2ogg-0.11.8-r1.ebuild 1197 BLAKE2B a5f610b4182895aaf618aed7169c90aa40c134379c35f2308bf332cd902c93245a73aed4936aae32802e913c83fb82179b680348683c636db8b924e04d68b058 SHA512 1594417a158e9b3ee93cd435b7bdb29c2fcf55304cad2c265c3ace3485e793d99c0fb82010e0737f41f93244d2aa1f698ebd70153a5b9760ce3d88ea1e36a6b1
+EBUILD dir2ogg-0.11.8-r1.ebuild 1145 BLAKE2B 41a93cc9b8d4f3ec250d4a954b5e7fc2727998e6cacc192b7b524564d886581c419e00fc58b35da0a40d41d546d57e883722f92fa7c4d2065b01ea8af7566ef7 SHA512 5d8b1e1ecd29a43a84163f0bb6ffe12b13e65772f011434e1754703316fb58b170895e2624b7cb72ee42953979f3b852bfabca81991c0698a08f3227ce15085c
 MISC metadata.xml 420 BLAKE2B 96885d28693df18ad564fe6ff658cd66bc39b3d556dcb5079ba531fea3bf603cdd558cd083c82bf76e06c170bf21e880600981dcb114117e55d585664119f1e5 SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074
diff --git a/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
index 6dce143a8128..15713d829874 100644
--- a/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit versionator
+EAPI=7
 
-MY_PR=$(get_version_component_range 1-2)
+MY_PR=$(ver_cut 1-2)
 
 DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format"
 HOMEPAGE="http://jak-linux.org/projects/dir2ogg/"
@@ -39,7 +38,7 @@ RDEPEND=">=dev-lang/python-2.5
 DEPEND=""
 
 src_install() {
-	dobin dir2ogg || die
+	dobin dir2ogg
 	doman dir2ogg.1
-	dodoc NEWS README
+	einstalldocs
 }
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 8f327d3ed0ee..693662f1a495 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,5 +1,5 @@
 DIST playerctl-0.5.0.tar.gz 17015 BLAKE2B 5da1d0fd4e442ac5f124bd693ae14222624c5239c9fad72e57d43977467339522344bc8d8c37b0f2bfda51c61861dc33d7e35e4a730ce59a87b691b5657ec729 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c
 DIST playerctl-0.6.0.tar.gz 22124 BLAKE2B 6bb90586c56e21a00b5e6e1769248b9782a8211b01dacf590857fe4fe199d6d3fa7aa46a36cba9a8e198a1aad0bf17973fc15140db11c484edfb0275971d3d08 SHA512 8023b5704ca2a428510df6228850b616061289764cc3c4190c0c46f79d6a20e499495f2d773bd821357653ba63bca40eac70f7cc3a11251da3c6a4f7781db739
 EBUILD playerctl-0.5.0.ebuild 909 BLAKE2B 4b4149e81209610d4de900f59860270d9bee8d97821350f5a9dd921869c6987b0952d93e958f662ded41a08ba58709dfb9af5b4c71e9b5ce209cbbde8c1135b7 SHA512 81bd0b13240357151302d2ba9bc28631e634b25437a19112b3b10e0d1939141c9acb0cf26f62d795bfff8f0d0d70c0a74149aeafa0185a2cae6a67ee8c8db666
-EBUILD playerctl-0.6.0.ebuild 912 BLAKE2B a426ad033e49a4e9ac00f23d9fcb45c525737cfbdfb48cbb9ff40c98047b129f6d9658f0d2d9a5e3b868acfedf0a1a1853ff4939fd6436a91a8c074b9003757b SHA512 e6d985e557864d7587e3d6632464265d9ea45c56b375b8671f78a2ebcc33d1228b774fc4752c9ff8dd3a649a299fefc79e5e0b1e121478fd8f57874c56a80896
+EBUILD playerctl-0.6.0.ebuild 919 BLAKE2B 9023af5a6c9fe937c5096e12720b676c434e45c21238326d957dd50f33d4a44ed20abd2f541386ae471ce6835efdfad1f406fcb220ae6833cc94544aeec2445f SHA512 898d55b119f86d63a9b46dab9b10f53017caa728ba484c7ab814b58f936ae4a25d168b407d86e560099b478b4dfa10fcef01ea5c9c4ecb1d8367cc833cc26e28
 MISC metadata.xml 487 BLAKE2B 26a06ce93634d362dee7b3a595d5257ef946c27a17c181f758fa3c0acd33aeb45c825643311da3739791f80402e38b8fd618ea43655ec60689978cf2e0f2f30f SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f
diff --git a/media-sound/playerctl/playerctl-0.6.0.ebuild b/media-sound/playerctl/playerctl-0.6.0.ebuild
index ae41da21b7df..8741ea6e29e6 100644
--- a/media-sound/playerctl/playerctl-0.6.0.ebuild
+++ b/media-sound/playerctl/playerctl-0.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/acrisci/playerctl"
 SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-sound/projectm-jack/Manifest b/media-sound/projectm-jack/Manifest
deleted file mode 100644
index c98f2ce13fdb..000000000000
--- a/media-sound/projectm-jack/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-DIST projectM-jack-2.0.1-Source.tar.gz 35003 BLAKE2B fb6c6686bb94474685c8e7b4da4c440cdbeda2f8722a38b4309121ae5f903e92e66f86a49d808284eb7ae332b4de043b5fb8f20008cb0f505bd5aecb7c058dad SHA512 8cb57029685b182a82fdc0bd1479028de462b2364106f415bf11990b6642b4fd667c2a4adb13a04886cb0a89e1828133577f6d2623cfc821f4323d21fab21464
-EBUILD projectm-jack-2.0.1.ebuild 532 BLAKE2B 7c7cce7bff7c8d317fa93c07b68f09b33a64953dd047e2e2cd64b72a241bcc08f60dbd6e26d8c0fbe14721215e6761f15bbb5a10f08f68fc7692b3231e679796 SHA512 736da0bb157fa9479c864f493273d40cecedd41896ac354a24f119409979ee6a29c711c8a1f3858f29a1365be7729676f18d9c3ac3269c8a3074a520d9f66c09
-EBUILD projectm-jack-2.1.0.ebuild 572 BLAKE2B 43dc92c82eff0e952ef9b4e402183a37bc110c17f6033b24bf3413625393e257912704091bf3ca6d93df5bb36d39ebd8c36fc1ed957a15de4e88ac1ea7e29e05 SHA512 c477ccadff1c013e4280d3e32d6de0800df89737ed474c5a2bfeac273f83439417a0c5b567e26c0d4ffd3cb279cdb3aa7ad84509d68a1344a85f861592232c83
-MISC metadata.xml 331 BLAKE2B a0d10fc64d4ccd3f2b0074f00f48827ecf31eb22f9823d9ac43e8c5d0074e90263dd507457d2467ed33d6b2c09d872af2e2f28f733d8ae9600ebc1862f1da60c SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740
diff --git a/media-sound/projectm-jack/metadata.xml b/media-sound/projectm-jack/metadata.xml
deleted file mode 100644
index 4b7d1d427e51..000000000000
--- a/media-sound/projectm-jack/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>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">projectm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/projectm-jack/projectm-jack-2.0.1.ebuild b/media-sound/projectm-jack/projectm-jack-2.0.1.ebuild
deleted file mode 100644
index f0c0fdc31cc3..000000000000
--- a/media-sound/projectm-jack/projectm-jack-2.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_P=${P/m/M}-Source
-
-DESCRIPTION="A Qt based GUI for projectM that visualizes your JACK output"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-sound/jack-audio-connection-kit
-	>=media-libs/libprojectm-qt-2.0.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
diff --git a/media-sound/projectm-jack/projectm-jack-2.1.0.ebuild b/media-sound/projectm-jack/projectm-jack-2.1.0.ebuild
deleted file mode 100644
index 6a96ac452c97..000000000000
--- a/media-sound/projectm-jack/projectm-jack-2.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_P=${PN/m-jack/M}-complete-${PV}-Source
-
-DESCRIPTION="A Qt based GUI for projectM that visualizes your JACK output"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-sound/jack-audio-connection-kit
-	>=media-libs/libprojectm-qt-2.1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/src/${PN/m/M}"
diff --git a/media-sound/projectm-pulseaudio/Manifest b/media-sound/projectm-pulseaudio/Manifest
deleted file mode 100644
index f256e8a02eb0..000000000000
--- a/media-sound/projectm-pulseaudio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD projectm-pulseaudio-2.1.0.ebuild 628 BLAKE2B 671446a5a280d8ace0b2c56d0633c6f88d15ce5653d274e7fefed6ea7c2b033c98339f6c061bfa8856da7f1f78bef770c9c87b203c329ed80db2fc0bd1437a69 SHA512 10124655b0acca25cc01ef626861699e40f29c0b820445018e3b3d6b5cc4b46d6e5d4edf46c975ab30685c502044baf422c6f808ac39806a7880d376458d727e
-MISC metadata.xml 331 BLAKE2B a0d10fc64d4ccd3f2b0074f00f48827ecf31eb22f9823d9ac43e8c5d0074e90263dd507457d2467ed33d6b2c09d872af2e2f28f733d8ae9600ebc1862f1da60c SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740
diff --git a/media-sound/projectm-pulseaudio/metadata.xml b/media-sound/projectm-pulseaudio/metadata.xml
deleted file mode 100644
index 4b7d1d427e51..000000000000
--- a/media-sound/projectm-pulseaudio/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>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">projectm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/projectm-pulseaudio/projectm-pulseaudio-2.1.0.ebuild b/media-sound/projectm-pulseaudio/projectm-pulseaudio-2.1.0.ebuild
deleted file mode 100644
index d34667d2de2d..000000000000
--- a/media-sound/projectm-pulseaudio/projectm-pulseaudio-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_P=${PN/m-pulseaudio/M}-complete-${PV}-Source
-
-DESCRIPTION="A Qt GUI for projectM that visualizes your pulseaudio output"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-sound/pulseaudio
-	media-libs/ftgl
-	>=media-libs/libprojectm-2.1.0
-	>=media-libs/libprojectm-qt-2.1.0
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/src/${PN/m/M}"
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 29c3536db7d7..c73330d659a8 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,7 +1,14 @@
+AUX pulseaudio-11.1-disable-flat-volumes.patch 1992 BLAKE2B 1ffbaf129d57abc7c02f430bdd59a76384456d7ef020e9765bc0541327279dcf7d005d87fe989fd0c89b2767564f99af87ece8c374e1d67c5d1cae1695f0819c SHA512 603f60ef38aeba83038fe5dc9e5f6a82e42d10a7f057f158b489dd04857c3bc8203b728d9df6736314ee3002648390cd564fdce347f2e6791e901a47041dd1fc
+AUX pulseaudio-11.1-glibc-2.27.patch 2220 BLAKE2B b6575208bfa6051d98efbc672ffb9ed72c5b933d2c63a9ee51c35e108c2bfc213b8ad9750eeeeb6f115c551598bdbc01f54c2237bede3846c887e3360628cd6a SHA512 01928928c485f1122952bbd5585c49748a5d192da8aa584185c86c6b5d6cd8ab4c18533ce4113e874fdd36489c163c4c443ef0e8711bb4104ac776f70c8b57c3
+AUX pulseaudio-11.1-qpaeq-pyqt5-1.patch 9231 BLAKE2B 179859aba1b09142976cb5ea4d4c3006e1ef342ffe2bb16424f78f11027083d9cbdde2506b3ed99fa28b88ae9867c846176d71a1ba3c86441afa19708c894278 SHA512 3697c0972f8a66bbfeb74fa5ccd048889e0de194229afed5d11c981910c6042d52ac6d2f7a6fc0c8f20b56654cca3a4606755801967c7ebb350f693e384eda1a
+AUX pulseaudio-11.1-qpaeq-pyqt5-2.patch 970 BLAKE2B 63f1d47125a083404da515114986ad2b225bd4506a6b095cafcfdf7914e80a61387e2da495867ef083e88aab8f4a5f8c43461e5be08bdfae57764aa5384cdb91 SHA512 7a0e31f0e32682be10413dd42f689c56b90069bd1117f0c2194908e9858dfe13315c9b8f560d9580b7e9d65f27219d1484743b1a214d955ee77796f533fc833b
 AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d06af4b298ad71d9c577dd6b3f0d9097fc95184b14193d0d55252987465ebd93bd0005849a68ce9b428d SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b
 AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7254455b9ff19128c2fc69f176368976d835503554eb60a80a8f4b53797cf46ba11b55c82bc742bf03551f SHA512 d0e1519fc97208c2d42c7d9d8f2e7d4658e741e8063102713da361748b6deaeae475619a65b3d3d1893c107a4511e17d4245264b5430190087f1823899c0f64b
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
+DIST pulseaudio-11.99.1.tar.xz 1655948 BLAKE2B 33d774bbcb2cf4a1d457e2cecfae007a75acc5c8ba188c5f2fbce773cf3fb67c9c345538584014898f42b3ff7c6e680c9660ff07f7d74630f711f85d9c514d2c SHA512 f9340f836bd12756ddb30e27bb04f8470a97ec372f5d9a2703da3ac348436b7b3efe074635c5a994cc6cd77c7f18aa2d74811c7e12bc52c0578fd15f8dffaab8
+EBUILD pulseaudio-11.1-r1.ebuild 10996 BLAKE2B 7d6af43e4525bbd456e7f0ebae53762224e17725916cf7f1c65eb2916b231313ba3e5ef674c71a4695933c97dd37420079c821eebd688c7cc023bb5f9c73412d SHA512 f669994b58fead40b07caab102783f1ea08ca0735d638118b0b333ef11ea219031ca17311c7d2b16e921bc412167291a81c4025c1b79c9338e2453e135348da8
 EBUILD pulseaudio-11.1.ebuild 10850 BLAKE2B 7c4423b125ba27e84d4af9b0ae99d31c5672490aed122a71887746ac9ca4554a96cddaf7eec8ae9b7ed91b3fa72a1caab541c95fe53a7117b4a93e8d9c982274 SHA512 88584bc0f38e6bb559d913d92fa5b06370590f43eaa11ac59af4ea07739d6f6870165e0801655982a11ff4f42e44de1b58962e5123f3d657cfcdf4727f04b0d0
-MISC metadata.xml 3415 BLAKE2B cb46d59d9af2a364730ebe48d9ee009659ba8c9b51c8da97c341151784dcb595cc7d6469dae20f5a5da2382d762a984e038077ce95840fcb8e4205b1f0fab06f SHA512 1c7e7a12eeafc6abd5d9bd315e4b512a7b479ae933ee3865b9fc37d994f123beea8208dfe742334d12dd4b20c7eb8077bb37fcd1a862dcf1f5874a0fa8777896
+EBUILD pulseaudio-11.99.1.ebuild 10906 BLAKE2B 0511d4e32f37a86ba313ebb2001fd7b870a293cd0e29305248c7849992c3f9fdaed4b9ece01cbcfa765610bcdbe7f7a612c7e845d0eeeb00c78cc665c2e44729 SHA512 39e663ba1ad3ede039fde0d13febdcdb67e3283a80e3f32fa1b1d39f218e8eeff7c776183a254ecc15d90d2249006126f68b06911b1a61085454d64e6b29395a
+MISC metadata.xml 3519 BLAKE2B 74036438eaaaa2c36cb6c13881bd2b89cef89d01827187fddc259e856951971a098ee935035c83e426a4757ddb45e01aac129c8eb781f761d478be8a5206493e SHA512 784a4f07bc098a1dbc2d49c8ff810a5945ab0ef48ca4f6903f7f5bae19781a08316f1909dd1f46411d50c3f5710b981c9f9ae71d72a6bfc914a4eae42b3d8e08
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
new file mode 100644
index 000000000000..40b23ec05f2e
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
@@ -0,0 +1,48 @@
+diff -up a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
+--- a/man/pulse-daemon.conf.5.xml.in	2016-05-26 23:21:17.000000000 -0500
++++ b/man/pulse-daemon.conf.5.xml.in	2016-05-31 10:01:55.679976730 -0500
+@@ -220,7 +220,7 @@ License along with PulseAudio; if not, s
+       <p><opt>flat-volumes=</opt> Enable 'flat' volumes, i.e. where
+       possible let the sink volume equal the maximum of the volumes of
+       the inputs connected to it. Takes a boolean argument, defaults
+-      to <opt>yes</opt>.</p>
++      to <opt>no</opt>.</p>
+     </option>
+ 
+   </section>
+diff -up a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
+--- a/src/daemon/daemon-conf.c	2016-05-26 23:21:17.000000000 -0500
++++ b/src/daemon/daemon-conf.c	2016-05-31 10:01:55.680976735 -0500
+@@ -68,7 +68,7 @@ static const pa_daemon_conf default_conf
+     .realtime_priority = 5,  /* Half of JACK's default rtprio */
+     .disallow_module_loading = false,
+     .disallow_exit = false,
+-    .flat_volumes = true,
++    .flat_volumes = false,
+     .exit_idle_time = 20,
+     .scache_idle_time = 20,
+     .script_commands = NULL,
+diff -up a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
+--- a/src/daemon/daemon.conf.in	2016-05-31 10:01:55.680976735 -0500
++++ b/src/daemon/daemon.conf.in	2016-05-31 10:02:28.048133267 -0500
+@@ -57,7 +57,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
+ ; enable-lfe-remixing = no
+ ; lfe-crossover-freq = 0
+ 
+-; flat-volumes = yes
++; flat-volumes = no
+ 
+ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
+ ; rlimit-fsize = -1
+diff -up a/src/pulsecore/core.c b/src/pulsecore/core.c
+--- a/src/pulsecore/core.c	2016-05-26 23:21:17.000000000 -0500
++++ b/src/pulsecore/core.c	2016-05-31 10:01:55.681976740 -0500
+@@ -135,7 +135,7 @@ pa_core* pa_core_new(pa_mainloop_api *m,
+     c->exit_idle_time = -1;
+     c->scache_idle_time = 20;
+ 
+-    c->flat_volumes = true;
++    c->flat_volumes = false;
+     c->disallow_module_loading = false;
+     c->disallow_exit = false;
+     c->running_as_daemon = false;
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-glibc-2.27.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-glibc-2.27.patch
new file mode 100644
index 000000000000..a89167b603d0
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-11.1-glibc-2.27.patch
@@ -0,0 +1,59 @@
+From: Tanu Kaskinen <tanuk@iki.fi>
+Date: Wed, 24 Jan 2018 03:51:49 +0200
+Subject: memfd-wrappers: only define memfd_create() if not already defined
+
+glibc 2.27 is to be released soon, and it will provide memfd_create().
+If glibc provides the function, we must not define it ourselves,
+otherwise building fails due to conflict between the two implementations
+of the same function.
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733
+(cherry picked from commit dfb0460fb4743aec047cdf755a660a9ac2d0f3fb)
+---
+ configure.ac                   | 3 +++
+ src/pulsecore/memfd-wrappers.h | 7 ++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 77b5ff5..3a71fd8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -607,6 +607,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"],
+     [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory.
+                   *** Use linux v3.17 or higher for such a feature.])])
+ 
++AS_IF([test "x$HAVE_MEMFD" = "x1"],
++    AC_CHECK_FUNCS([memfd_create]))
++
+ AC_SUBST(HAVE_MEMFD)
+ AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
+ AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
+diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h
+index 3bed9b2..c7aadfd 100644
+--- a/src/pulsecore/memfd-wrappers.h
++++ b/src/pulsecore/memfd-wrappers.h
+@@ -20,13 +20,14 @@
+   License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ ***/
+ 
+-#ifdef HAVE_MEMFD
++#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE)
+ 
+ #include <sys/syscall.h>
+ #include <fcntl.h>
+ 
+ /*
+- * No glibc wrappers exist for memfd_create(2), so provide our own.
++ * Before glibc version 2.27 there was no wrapper for memfd_create(2),
++ * so we have to provide our own.
+  *
+  * Also define memfd fcntl sealing macros. While they are already
+  * defined in the kernel header file <linux/fcntl.h>, that file as
+@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) {
+ #define F_SEAL_WRITE    0x0008  /* prevent writes */
+ #endif
+ 
+-#endif /* HAVE_MEMFD */
++#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */
+ 
+ #endif
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-1.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-1.patch
new file mode 100644
index 000000000000..62012c121472
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-1.patch
@@ -0,0 +1,198 @@
+From: =?utf-8?q?Andrius_=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Mon, 20 Nov 2017 19:56:53 +0000
+Subject: qpaeq: port to PyQt5
+
+(cherry picked from commit 480e0e74f43565d7ece72141666961ae8cc2ed75)
+---
+ src/utils/qpaeq | 68 ++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 34 insertions(+), 34 deletions(-)
+
+diff --git a/src/utils/qpaeq b/src/utils/qpaeq
+index ac4b9e4..508b233 100755
+--- a/src/utils/qpaeq
++++ b/src/utils/qpaeq
+@@ -18,13 +18,13 @@
+ 
+ import os,math,sys
+ try:
+-    import PyQt4,sip
+-    from PyQt4 import QtGui,QtCore
++    import PyQt5,sip
++    from PyQt5 import QtWidgets,QtCore
+     import dbus.mainloop.qt
+     import dbus
+ except ImportError as e:
+     sys.stderr.write('There was an error importing needed libraries\n'
+-                     'Make sure you have qt4 and dbus-python installed\n'
++                     'Make sure you have qt5 and dbus-python installed\n'
+                      'The error that occured was:\n'
+                      '\t%s\n' % (str(e)))
+     sys.exit(-1)
+@@ -62,7 +62,7 @@ def connect():
+ prop_iface='org.freedesktop.DBus.Properties'
+ eq_iface='org.PulseAudio.Ext.Equalizing1.Equalizer'
+ device_iface='org.PulseAudio.Core1.Device'
+-class QPaeq(QtGui.QWidget):
++class QPaeq(QtWidgets.QWidget):
+     manager_path='/org/pulseaudio/equalizing1'
+     manager_iface='org.PulseAudio.Ext.Equalizing1.Manager'
+     core_iface='org.PulseAudio.Core1'
+@@ -70,7 +70,7 @@ class QPaeq(QtGui.QWidget):
+     module_name='module-equalizer-sink'
+ 
+     def __init__(self):
+-        QtGui.QWidget.__init__(self)
++        QtWidgets.QWidget.__init__(self)
+         self.setWindowTitle('qpaeq')
+         self.slider_widget=None
+         self.sink_name=None
+@@ -84,50 +84,50 @@ class QPaeq(QtGui.QWidget):
+         self.setMinimumSize(self.sizeHint())
+ 
+     def create_layout(self):
+-        self.main_layout=QtGui.QVBoxLayout()
++        self.main_layout=QtWidgets.QVBoxLayout()
+         self.setLayout(self.main_layout)
+-        toprow_layout=QtGui.QHBoxLayout()
+-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
++        toprow_layout=QtWidgets.QHBoxLayout()
++        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+         sizePolicy.setHorizontalStretch(0)
+         sizePolicy.setVerticalStretch(0)
+         #sizePolicy.setHeightForWidth(self.profile_box.sizePolicy().hasHeightForWidth())
+ 
+-        toprow_layout.addWidget(QtGui.QLabel('Sink'))
+-        self.sink_box = QtGui.QComboBox()
++        toprow_layout.addWidget(QtWidgets.QLabel('Sink'))
++        self.sink_box = QtWidgets.QComboBox()
+         self.sink_box.setSizePolicy(sizePolicy)
+         self.sink_box.setDuplicatesEnabled(False)
+-        self.sink_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
+-        #self.sink_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
++        self.sink_box.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically)
++        #self.sink_box.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+         toprow_layout.addWidget(self.sink_box)
+ 
+-        toprow_layout.addWidget(QtGui.QLabel('Channel'))
+-        self.channel_box = QtGui.QComboBox()
++        toprow_layout.addWidget(QtWidgets.QLabel('Channel'))
++        self.channel_box = QtWidgets.QComboBox()
+         self.channel_box.setSizePolicy(sizePolicy)
+         toprow_layout.addWidget(self.channel_box)
+ 
+-        toprow_layout.addWidget(QtGui.QLabel('Preset'))
+-        self.profile_box = QtGui.QComboBox()
++        toprow_layout.addWidget(QtWidgets.QLabel('Preset'))
++        self.profile_box = QtWidgets.QComboBox()
+         self.profile_box.setSizePolicy(sizePolicy)
+-        self.profile_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
+-        #self.profile_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
++        self.profile_box.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically)
++        #self.profile_box.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+         toprow_layout.addWidget(self.profile_box)
+ 
+-        large_icon_size=self.style().pixelMetric(QtGui.QStyle.PM_LargeIconSize)
++        large_icon_size=self.style().pixelMetric(QtWidgets.QStyle.PM_LargeIconSize)
+         large_icon_size=QtCore.QSize(large_icon_size,large_icon_size)
+-        save_profile=QtGui.QToolButton()
+-        save_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_DriveFDIcon))
++        save_profile=QtWidgets.QToolButton()
++        save_profile.setIcon(self.style().standardIcon(QtWidgets.QStyle.SP_DriveFDIcon))
+         save_profile.setIconSize(large_icon_size)
+         save_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+         save_profile.clicked.connect(self.save_profile)
+-        remove_profile=QtGui.QToolButton()
+-        remove_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_TrashIcon))
++        remove_profile=QtWidgets.QToolButton()
++        remove_profile.setIcon(self.style().standardIcon(QtWidgets.QStyle.SP_TrashIcon))
+         remove_profile.setIconSize(large_icon_size)
+         remove_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+         remove_profile.clicked.connect(self.remove_profile)
+         toprow_layout.addWidget(save_profile)
+         toprow_layout.addWidget(remove_profile)
+ 
+-        reset_button = QtGui.QPushButton('Reset')
++        reset_button = QtWidgets.QPushButton('Reset')
+         reset_button.clicked.connect(self.reset)
+         toprow_layout.addStretch()
+         toprow_layout.addWidget(reset_button)
+@@ -192,11 +192,11 @@ class QPaeq(QtGui.QWidget):
+     def save_profile(self):
+         #popup dialog box for name
+         current=self.profile_box.currentIndex()
+-        profile,ok=QtGui.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
++        profile,ok=QtWidgets.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
+         if not ok or profile=='':
+             return
+         if profile in self.profiles:
+-            mbox=QtGui.QMessageBox(self)
++            mbox=QtWidgets.QMessageBox(self)
+             mbox.setText('%s preset already exists'%(profile,))
+             mbox.setInformativeText('Do you want to save over it?')
+             mbox.setStandardButtons(mbox.Save|mbox.Discard|mbox.Cancel)
+@@ -217,7 +217,7 @@ class QPaeq(QtGui.QWidget):
+         profile=self.profile_box.itemText(x)
+         self.filter_state.load_profile(profile)
+     def select_channel(self,x):
+-        self.filter_state.channel = self.channel_box.itemData(x).toPyObject()
++        self.filter_state.channel = self.channel_box.itemData(x)
+         self._set_profile_name()
+         self.filter_state.readback()
+ 
+@@ -295,13 +295,13 @@ class QPaeq(QtGui.QWidget):
+         self.profile_box.blockSignals(False)
+ 
+ 
+-class SliderArray(QtGui.QWidget):
++class SliderArray(QtWidgets.QWidget):
+     def __init__(self,filter_state,parent=None):
+         super(SliderArray,self).__init__(parent)
+         #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
+         #self.setStyleSheet('font-family: monospace;'+outline%('blue'))
+         self.filter_state=filter_state
+-        self.setLayout(QtGui.QHBoxLayout())
++        self.setLayout(QtWidgets.QHBoxLayout())
+         self.sub_array=None
+         self.set_sub_array(SliderArraySub(self.filter_state))
+         self.inhibit_resize=0
+@@ -359,11 +359,11 @@ class SliderArray(QtGui.QWidget):
+         self.set_sub_array(SliderArraySub(self.filter_state))
+         self.inhibit_resize-=1
+ 
+-class SliderArraySub(QtGui.QWidget):
++class SliderArraySub(QtWidgets.QWidget):
+     def __init__(self,filter_state,parent=None):
+         super(SliderArraySub,self).__init__(parent)
+         self.filter_state=filter_state
+-        self.setLayout(QtGui.QGridLayout())
++        self.setLayout(QtWidgets.QGridLayout())
+         self.slider=[None]*len(self.filter_state.frequencies)
+         self.label=[None]*len(self.slider)
+         #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
+@@ -375,7 +375,7 @@ class SliderArraySub(QtGui.QWidget):
+             self.layout().addWidget(label,1,c,qt.AlignHCenter)
+             self.layout().setColumnMinimumWidth(c,max(label.sizeHint().width(),slider.sizeHint().width()))
+         def create_slider(slider_label):
+-            slider=QtGui.QSlider(QtCore.Qt.Vertical,self)
++            slider=QtWidgets.QSlider(QtCore.Qt.Vertical,self)
+             label=SliderLabel(slider_label,filter_state,self)
+             slider.setRange(-1000,2000)
+             slider.setSingleStep(1)
+@@ -461,7 +461,7 @@ class SliderArraySub(QtGui.QWidget):
+         return int((x-1.0)*1000)
+ outline='border-width: 1px; border-style: solid; border-color: %s;'
+ 
+-class SliderLabel(QtGui.QLabel):
++class SliderLabel(QtWidgets.QLabel):
+     clicked=QtCore.pyqtSignal()
+     def __init__(self,label_text,filter_state,parent=None):
+         super(SliderLabel,self).__init__(parent)
+@@ -566,7 +566,7 @@ def subdivide(xs, t_points):
+ 
+ def main():
+     dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
+-    app=QtGui.QApplication(sys.argv)
++    app=QtWidgets.QApplication(sys.argv)
+     qpaeq_main=QPaeq()
+     qpaeq_main.show()
+     sys.exit(app.exec_())
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-2.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-2.patch
new file mode 100644
index 000000000000..7706bfb3416a
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-2.patch
@@ -0,0 +1,31 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Thu, 5 Apr 2018 15:44:26 -0300
+Subject: Use the pyqt5 dbus mainloop integration
+
+Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=102572
+---
+ src/utils/qpaeq | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/qpaeq b/src/utils/qpaeq
+index 508b233..a319dad 100755
+--- a/src/utils/qpaeq
++++ b/src/utils/qpaeq
+@@ -20,7 +20,7 @@ import os,math,sys
+ try:
+     import PyQt5,sip
+     from PyQt5 import QtWidgets,QtCore
+-    import dbus.mainloop.qt
++    import dbus.mainloop.pyqt5
+     import dbus
+ except ImportError as e:
+     sys.stderr.write('There was an error importing needed libraries\n'
+@@ -565,7 +565,7 @@ def subdivide(xs, t_points):
+     return left+right
+ 
+ def main():
+-    dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
++    dbus.mainloop.pyqt5.DBusQtMainLoop(set_as_default=True)
+     app=QtWidgets.QApplication(sys.argv)
+     qpaeq_main=QPaeq()
+     qpaeq_main.show()
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 3a9d6bb69ff7..a36f0e99dc20 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -26,6 +26,9 @@
       enable this flag if you want to use a system wide instance. If
       unsure, enable this flag.
     </flag>
+    <flag name="gsettings">
+      Use GSettings instead of GConf to store user preferences.
+    </flag>
     <flag name="oss">
       Enable OSS sink/source (output/input). Deprecated, upstream does
       not support this on systems where other sink/source systems are
diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
new file mode 100644
index 000000000000..d8ac0eea02e3
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( virtual/jack )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	media-libs/speexdsp
+	gdbm? ( sys-libs/gdbm:= )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.10 )
+	X? (
+		x11-base/xorg-proto
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt5 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-5 )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-qpaeq-pyqt5-{1,2}.patch
+	"${FILESDIR}/${P}"-glibc-2.27.patch
+	"${FILESDIR}/${P}"-disable-flat-volumes.patch # bug 627894
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if multilib_is_native_abi; then
+			myconf+=( --enable-bluez5 --disable-bluez4
+				$(use_enable native-headset bluez5-native-headset)
+				$(use_enable ofono-headset bluez5-ofono-headset) )
+		fi
+	else
+		myconf+=( --disable-bluez5 --disable-bluez4 )
+	fi
+
+	myconf+=(
+		--enable-largefile
+		$(use_enable glib glib2)
+		--disable-solaris
+		$(use_enable asyncns)
+		$(use_enable oss oss-output)
+		$(use_enable alsa)
+		$(use_enable lirc)
+		$(use_enable neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable jack)
+		$(use_enable zeroconf avahi)
+		$(use_enable dbus)
+		$(use_enable gnome gconf)
+		$(use_enable gtk gtk3)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable orc)
+		$(use_enable X x11)
+		$(use_enable test default-build-tests)
+		$(use_enable udev)
+		$(use_with sox soxr)
+		$(use_enable systemd systemd-daemon)
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable all the modules and stuff
+		myconf+=(
+			--disable-oss-output
+			--disable-alsa
+			--disable-lirc
+			--disable-jack
+			--disable-avahi
+			--disable-gconf
+			--disable-gtk3
+			--disable-samplerate
+			--disable-bluez4
+			--disable-bluez5
+			--disable-udev
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--without-fftw
+			--without-soxr
+
+			# tests involve random modules, so just do them for the native
+			--disable-default-build-tests
+
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			--with-database=simple
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src ${targets[*]}
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		use doc && dohtml -r doxygen/html/
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+	fi
+
+	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc NEWS README todo
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+
+	# We need /var/run/pulse, bug #442852
+	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+	# Prevent warnings when system-wide is not used, bug #447694
+	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+
+	if use equalizer && ! use qt5; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+}
diff --git a/media-sound/pulseaudio/pulseaudio-11.99.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.99.1.ebuild
new file mode 100644
index 000000000000..a0fdcad4226a
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-11.99.1.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gsettings gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	gsettings? ( !gnome )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( virtual/jack )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	gsettings? ( >=dev-libs/glib-2.26.0 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	gdbm? ( sys-libs/gdbm:= )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.10 )
+	X? (
+		x11-base/xorg-proto
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt5 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-5 )
+	)
+"
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if multilib_is_native_abi; then
+			myconf+=( --enable-bluez5 --disable-bluez4
+				$(use_enable native-headset bluez5-native-headset)
+				$(use_enable ofono-headset bluez5-ofono-headset) )
+		fi
+	else
+		myconf+=( --disable-bluez5 --disable-bluez4 )
+	fi
+
+	myconf+=(
+		--enable-largefile
+		$(use_enable glib glib2)
+		--disable-solaris
+		$(use_enable asyncns)
+		$(use_enable oss oss-output)
+		$(use_enable alsa)
+		$(use_enable lirc)
+		$(use_enable neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable jack)
+		$(use_enable zeroconf avahi)
+		$(use_enable dbus)
+		$(use_enable gnome gconf)
+		$(use_enable gsettings)
+		$(use_enable gtk gtk3)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable orc)
+		$(use_enable X x11)
+		$(use_enable test default-build-tests)
+		$(use_enable udev)
+		$(use_with sox soxr)
+		$(use_enable systemd systemd-daemon)
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable all the modules and stuff
+		myconf+=(
+			--disable-oss-output
+			--disable-alsa
+			--disable-lirc
+			--disable-jack
+			--disable-avahi
+			--disable-gconf
+			--disable-gsettings
+			--disable-gtk3
+			--disable-samplerate
+			--disable-bluez4
+			--disable-bluez5
+			--disable-udev
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--without-fftw
+			--without-soxr
+
+			# tests involve random modules, so just do them for the native
+			--disable-default-build-tests
+
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			--with-database=simple
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src ${targets[*]}
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		use doc && dohtml -r doxygen/html/
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+	fi
+
+	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc NEWS README todo
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+
+	# We need /var/run/pulse, bug #442852
+	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+	# Prevent warnings when system-wide is not used, bug #447694
+	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+
+	if use equalizer && ! use qt5; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 0460345b9e22..648355ab8e12 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,10 +1,10 @@
 DIST qmmp-1.1.12.tar.bz2 1147871 BLAKE2B e511b02c38cbc5fcb478585df14a50c9f67985da9ef5e1e11557f2acbbd454d1b1beb430c8e2e2725a7d9ceea63243746fd41ecf2970fd3c52bcf21857bc1228 SHA512 a45680dcee478a7f03a04dbc87525368ac227a9de7e803252470f517027639d3426bf27a3235996d94ad68212596c03e7a67b5ad00a642532f02a820bf4097ee
 DIST qmmp-1.1.7.tar.bz2 1135005 BLAKE2B fc6574b5baa1aaf89cb13f194e59daafa0fe502c1e5ebe5322ae5564eeeb590b6f531307470dc93ef586d992ac827c114b89559ba83b6daab57d16e364388c53 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72
-DIST qmmp-1.2.0.tar.bz2 1182024 BLAKE2B 0dc471b053a68ddd1f4e5e09d37776712a7c3f323f801920e34843df54a188c9bc5edfeade5791be67177bb9b7a9435ab41763b156d068522db654d9c5a51809 SHA512 63b3a499efa1886d2bb0da093ab5b495a147a0d9ad23780780fd85011ae571179d71dc4222efab39609fe59ec25b9b62d907c8d10decd7fddb73220d963dcf57
 DIST qmmp-1.2.1.tar.bz2 1187267 BLAKE2B 11577481801c9a89acd327c23c94bbfee8e1d3869da6f271f6fa392623977dea256e3a521493f1de5255ac57bc7b881cd0a47b2bfeb5f516d1a5238dd6ac6912 SHA512 a21483e075934b4f696384737cc852c5054f2b088430db84cd461f6c16d6018ea02c992ae50467093f30c82d671113a4c308040d91328ce941e14fabaeb93e17
+DIST qmmp-1.2.2.tar.bz2 1187439 BLAKE2B 984a1a38cc20500c07a928cc2a1cd5d0210307c0acaedc73b36d3d7d90fc9ddd1b7d84e8791ec7f2dfbfe1288c24b1e62dbadc191e6ef596863a3ec5ca777075 SHA512 deec5ad6e53222d390e5f147ac1dbf3f471c0266eb32315b9b334348ae10f54b88842ae016d95282a41d27592c46f3479c6f594dc8eccb330750025469b468b6
 EBUILD qmmp-1.1.12.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
 EBUILD qmmp-1.1.7-r1.ebuild 3858 BLAKE2B 544e062718ea06fb28e0920ef7d4c1ee1fa8ad850248a956df78054f1f63b06538af04cd8b09fb5f059af5748ce2530f8fb72dc33f902b1c6b5cfab9c8d62c28 SHA512 88a97842bd3b8f43409c420d391421845a45ce597e9334a6218b13bd36ce18dcc510f82dbe67f175e88ed8da5c8bb28eb3a526c0499f828041fadc9b6c3ba22a
-EBUILD qmmp-1.2.0.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
 EBUILD qmmp-1.2.1.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
+EBUILD qmmp-1.2.2.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
 EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
 MISC metadata.xml 1888 BLAKE2B 32fdf16e8d12c830b72d46d887c9573f583c83c69a405ebb32bb9ac6b46f2100fd29b78241e0982df54fac2b2f7f9ee0e53f56d5f06e388f177514a427ad10ad SHA512 8d17a27caa187aca78e9fbbd64a6226a4055232a39f68e8b211ec8d4062343885e2c4efd47a551e157fbb1cb674cefb3be26c645223e68a57e0b75e4b3a40fe0
diff --git a/media-sound/qmmp/qmmp-1.2.0.ebuild b/media-sound/qmmp/qmmp-1.2.0.ebuild
deleted file mode 100644
index f7eff28d1dbe..000000000000
--- a/media-sound/qmmp/qmmp-1.2.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	QMMP_DEV_BRANCH="1.2"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/qmmp-1.2.2.ebuild b/media-sound/qmmp/qmmp-1.2.2.ebuild
new file mode 100644
index 000000000000..b0b24f039928
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.2.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.2"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index ecabfb22b0b2..e6f975f7af8d 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,9 +1,7 @@
-DIST quodlibet-3.7.1.tar.gz 3651908 BLAKE2B dd221aae3af83e7f7b1c535c5294a5262b8b08bb7ac068078fb3be1b1c6a3a8770dda20b6a03b3fd998bac17f1087b748d5fd1fe3b7f010ee107283b2170b452 SHA512 73f2a909e29178fb4074dbf451a6d04170aebecb7934248b04b909f9639c9098054eefe3343cfb67cc3c622f6d453b5417e5233d4d2ec9c87c48a0c5b4debf4f
 DIST quodlibet-3.8.1.tar.gz 3697363 BLAKE2B 67c56281a998d93b2ea457656473ab7fc45a1d4d80aa561fc1946e129ac91a01c65fdb34bd314b5742756708714ac043341cae6ee38e93e37a7a16e3bf481c20 SHA512 5f8f7ba3157dea83782c64989114ad38295c660300284b72e825eba46eae053120c96e60518d573b4010dd49e396a4fe8d04788e632e61e38fa6edd953014275
 DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72708f7b6e260a68e2cfe6e949f44e08df5884f3613804955b18b7284f0140f9d2d409833bd0a139732728903ae978 SHA512 6d6b6380de2fc2d3ab1614b304f2d7219ff1d823e03f532baa0e9b1308fd36094ad745433494253d956182ae9914eb62846df3d3e5fea92dddccdaa725178563
-DIST quodlibet-4.0.2.tar.gz 4730188 BLAKE2B abe5cdbb6302bf381a7426145c25f6c1e205a2be8ffd801b93ed47e0a23764c142b59cd8de001458ef378fe70523308035517b82bfacbc1213eb7f4a86dcdb7d SHA512 c8c1f823ace03f69fab848f8e312edf9aa1e1e417a843ad2e08d75a0e26a0e095b7050e737be450e5b0b72c7c51b16d1d2143e297dde67bae310b9cdb6f85e3b
-EBUILD quodlibet-3.7.1.ebuild 1664 BLAKE2B 2b21f56d7273061f1c20388896b64ee93b5ade1bbd98dcc7446b3e24094a92a79ece88499c436998c84e12fb532709590e9471620c857d96a457b4d39718d644 SHA512 22b3a19022cfc91dc77fadbfa87e579a938af73e7805df4d304d191ebc3bd1a0d1f6b6624bdb1c4908cf175590b950ab6060fb99937afa83023e38b87d7ce450
+DIST quodlibet-4.1.0.tar.gz 4882607 BLAKE2B 1e0c519eb3f1d377dc7fc0ee2a08faa51632eabd1f21638e38aaf5edc4faa6707274edfe314910b32895e59a5cdd27434914afb1c33aa2914788e644db2d2aaf SHA512 987001b6335e18ce18d25b71be327261c3fe5e0a142395ce061d7460e9ade2543a3372a64560b804be3e4d70889017612e9bc1a72215d45b215caf4da545e9ae
 EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
 EBUILD quodlibet-3.9.1.ebuild 1762 BLAKE2B a19a65c10150735cc5ac8b0ceea6fd38437065e1ff8041f4300574e6987a42a0e3c2231167e625d3e22a483a7755e63331d6de26dbd97bd0531c74006be81e19 SHA512 37131164403e18228e787385b04bf4cb517d340b48925a64b9bb83a561c84749542818ceea10915849406398762268d338a83cbbdbc5466184f82c13416130a0
-EBUILD quodlibet-4.0.2.ebuild 1611 BLAKE2B d1a37f206b0bc5014bdf3da1e361006c03916ad9fc6763a330651a4c44eebf45ad1dd0b406b92f4638f019e6f60293dec1440f63b8afe573c48e90100cbef8f3 SHA512 1caf57d3f99aae71e015db3ed126265e08b9a5a19bc4adbf86028a7e27cfe9c64a1fd3c4db18ec1f40258e2b405cb68f3e049aeae858ea95a908bc8797697644
+EBUILD quodlibet-4.1.0.ebuild 1611 BLAKE2B d1a37f206b0bc5014bdf3da1e361006c03916ad9fc6763a330651a4c44eebf45ad1dd0b406b92f4638f019e6f60293dec1440f63b8afe573c48e90100cbef8f3 SHA512 1caf57d3f99aae71e015db3ed126265e08b9a5a19bc4adbf86028a7e27cfe9c64a1fd3c4db18ec1f40258e2b405cb68f3e049aeae858ea95a908bc8797697644
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-3.7.1.ebuild b/media-sound/quodlibet/quodlibet-3.7.1.ebuild
deleted file mode 100644
index a92aed014d81..000000000000
--- a/media-sound/quodlibet/quodlibet-3.7.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="http://quodlibet.readthedocs.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+dbus gstreamer ipod +udev"
-
-RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
-	net-libs/libsoup
-	x11-libs/gtk+[introspection]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-meta:1.0
-		)
-	!gstreamer? ( media-libs/xine-lib )
-	dbus? (
-		app-misc/media-player-info
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		)
-	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
-	udev? ( virtual/udev )
-	!media-plugins/quodlibet-plugins"
-DEPEND="dev-util/intltool"
-REQUIRED_USE="ipod? ( dbus )"
-
-S="${WORKDIR}/${PN}-release-${PV}/${PN}"
-
-src_prepare() {
-	local qlconfig=${PN}/config.py
-
-	if ! use gstreamer; then
-		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
-	fi
-
-	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/quodlibet/quodlibet-4.0.2.ebuild b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
index a6d06fe5a038..a6d06fe5a038 100644
--- a/media-sound/quodlibet/quodlibet-4.0.2.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 01f3b1a3db5f..7d57007e7aaa 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index e14d0ae302da..f4401ced7b5a 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -22,6 +22,7 @@ EBUILD kodi-17.3-r1.ebuild 8578 BLAKE2B 21fbf62bcfc7515fe2051b3ddd71cf8b08a22222
 EBUILD kodi-17.5-r1.ebuild 8831 BLAKE2B d000b959e2290f0b0d4a81f76f2f1b15eea719708355c40eec0c443b1a7a9afb024364852ce5ef49a95bbcce252217f3a0c0ded61a149bbe2c40d91613aa5471 SHA512 2f0f4a338862a6a2b6c7077e2cdab03555f720ba5a37ab56f4d7d27d7f474ae012b7f18841174c58cde0b1931ddf7a56a31ceddeee0d6e307b87a620b81df30c
 EBUILD kodi-17.6-r1.ebuild 8742 BLAKE2B 0312ac3de60702ef038f007d7c4f98739956769b335468425b17a6e1ba7a7e28e1cb86e6a109106d45818abf5a52b425cfb30b30928c80b842bb11c828131c62 SHA512 1662699a15383d3dded76b3a6aa473604075a59218723d0179da19ba7df996a21f9b8b85d2bcf7dec1ddbd7abca8243a54eaf657a962199c374f5d5d30d97d0d
 EBUILD kodi-17.6-r2.ebuild 8744 BLAKE2B 67d8bbffea4f9ab543a2099af0a843bfc10ff9d2905d0a713e0f7ed653bb991ed194cd1b8ddd03532658a532436db0344be0816f8d866aa3e3006799fec59d53 SHA512 dd81f1691b3a97567aa426f1383caf3dac95f6a5f12d40305206d05486601da656b90aa969dcc37df627823e23fd9f2c33678d28fba50cfb4cf64787a0b02c6b
+EBUILD kodi-17.6-r3.ebuild 8618 BLAKE2B 17bd96da57cc644b97bff5b37ec2929d71e4fd57b952973f6b744826679f103f085e841ebd8db779b73c8d7ae81c5ff899ab9dae67b65c6b1fe601c2e193bce9 SHA512 01158cbba4f8156c6c62c4fecb86e5cd769ca63b9b5a1f8fec6cc293e1efab5a6cc41f4689ec20404aaadec5d8be56ec68ea90ef142f1ef95cdc633d05bdb612
 EBUILD kodi-17.6.ebuild 8746 BLAKE2B 395d3403c75cd6c73a28dce7bbb221d27e418edd84f575c2037d9a4c30f327339193c00d05a3ff56b875b7bc1df7190da75055ac338ef5713fc0d02a9b207e64 SHA512 b4ba942c94019328250e27b1158e8681f12c319ee9f32c633005ddade17a1c09a3e2c875282ba10c93eb3484e19e220bd1aa4e95f96d80f632c8881722172711
-EBUILD kodi-9999.ebuild 8986 BLAKE2B f1f9025200b99fde467ed3e6c8f6fe914b80dc9d67d3d1350df5949ec31325feb94bdfa46f0ff306c0dbf30397cd8c6c59b3d340e7b4834cdef2fe8af0284658 SHA512 03440edbec0786b78a09214df56f2a6c7d874ce92e4e302b3db50ec764d139eb8067f8202a059ac84fd20498864e5d7a57039d5cb90965554733383e49e77430
+EBUILD kodi-9999.ebuild 8985 BLAKE2B df873002ce53228e18c5920584bfe668652217d831b2f753dd45bb1510e2fa4440553ab5be409a24a74b0a7b258dfe109f793659c8838e3a4137a55b44bf523e SHA512 15f91442920ec36499e985e9ad6ba9c1ce5cf8ba31ed05923ff683a9114dd1b20a440fd6e2ec2a04bdde7436c4c50fb71228e7652c24f2893511f2d4448820b3
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-17.6-r3.ebuild b/media-tv/kodi/kodi-17.6-r3.ebuild
new file mode 100644
index 000000000000..fbf96a8efbba
--- /dev/null
+++ b/media-tv/kodi/kodi-17.6-r3.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.11"
+FFMPEG_KODI_VERSION="17.5"
+CODENAME="Krypton"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
+		<media-video/ffmpeg-3.4
+	)
+	mysql? ( virtual/mysql )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva:=[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=ON
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index ea7527a0e6ba..92db3b4a017f 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -308,5 +308,5 @@ src_install() {
 		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
 
 	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
 }
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4eb544270037..a9de1e22a8f4 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest
index 6b437f0e30e1..eaa0b56f5ec3 100644
--- a/media-video/aravis/Manifest
+++ b/media-video/aravis/Manifest
@@ -1,6 +1,8 @@
 DIST aravis-0.1.14.tar.xz 414932 BLAKE2B ea4c443297c5b8d2caf1cc944519bb274998acd6a6e6074ef1099a505296bd92fc264dcdb304bd34b75b3347a7522aedbad6cbc16cbef875627252a856691509 SHA512 d84fe519074a69e679b08e0c0933bce191e50cfcdd1b46b743aa68ba33445a3a87cbd1701ba424666b638949f9faf531ec668acbe5d22017712f70cfa9620ea9
 DIST aravis-0.1.15.tar.xz 448348 BLAKE2B 0a20aab1e434999ab1d08ae55c2654ca4809be2f9d64b65729ce14977b724ba864513dcb652c6ccda3d768b9fe47e5c4cc3951ee716a4d34915768651a814830 SHA512 f6a2e1f7fa4f712bea6a91f896bbc92afb3dcf3146109f3f7aee2ad6812a69f0b47a0f2116062cba6163dc058c7981a01a6eec395d4af633da666fe186291929
+DIST aravis-0.5.10.tar.xz 540700 BLAKE2B f12a2bfa2bf8ac1875b28ec0549e5ebe3e5eb1cd646e417acc52a760546343893e19d7fb13741799346286dc69d9ecf2a7d7a3c9ada6ffefafab5c6450468848 SHA512 27a182a8fce66416e14baa16609b91307683613fab9324c96f94b9a7dd956ba0d60f5c966b2ec5184374ab8f9f527ad4d7733dffd2c40faa409ff196c344eb29
 EBUILD aravis-0.1.14.ebuild 1399 BLAKE2B 81c3740a05a4452044da379d3d2c1d0018bc28a6788313ce6a06d58179f299bd5a8505f1602f3327783b9a5859e55c533665bc75bb6d2305b45159cff49f0b64 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e
 EBUILD aravis-0.1.15.ebuild 1399 BLAKE2B 81c3740a05a4452044da379d3d2c1d0018bc28a6788313ce6a06d58179f299bd5a8505f1602f3327783b9a5859e55c533665bc75bb6d2305b45159cff49f0b64 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e
-EBUILD aravis-9999.ebuild 1399 BLAKE2B 81c3740a05a4452044da379d3d2c1d0018bc28a6788313ce6a06d58179f299bd5a8505f1602f3327783b9a5859e55c533665bc75bb6d2305b45159cff49f0b64 SHA512 7bc823b724cc4db6d0129291c46a296b147f29d8c076e6476145fd68315e35af77d67c57a40bbdacec4fb7708ee728ef02b0d79a69662b280ac17d58f23d8d0e
+EBUILD aravis-0.5.10.ebuild 1390 BLAKE2B 58a5a35064bcd74edafa67032ff6c0d15dc4a646a938a903820c0a84c23729edf4f5be56881760416fe95e0750f7be22aa4fc885efd64be21d87fa210be1f879 SHA512 70fb3d42abaed577cf0db2b56e4386e8671456260ec7ad8f4db760b610692a82f19666fa9e8d6b432409ede58f373582fc6462b0be0ca212ab205cb0440eb98c
+EBUILD aravis-9999.ebuild 1390 BLAKE2B 58a5a35064bcd74edafa67032ff6c0d15dc4a646a938a903820c0a84c23729edf4f5be56881760416fe95e0750f7be22aa4fc885efd64be21d87fa210be1f879 SHA512 70fb3d42abaed577cf0db2b56e4386e8671456260ec7ad8f4db760b610692a82f19666fa9e8d6b432409ede58f373582fc6462b0be0ca212ab205cb0440eb98c
 MISC metadata.xml 664 BLAKE2B 95779521829c716f4efdc591e0422c62be595b83c3eb3fd9d947314381cc92b8a74d62ce8f2338f073ab99f62a9e696a18e17d70fe4ea6f77664d47ea48af8cd SHA512 023c02e3a69fad5c7302d2dc857fa0de23096ecb80640f9adba7d12ab10e969be2a10f1183e44cf3a3afc6e57ec1585826b73907103490b78052bd10b0857cac
diff --git a/media-video/aravis/aravis-0.5.10.ebuild b/media-video/aravis/aravis-0.5.10.ebuild
new file mode 100644
index 000000000000..ed18bd2b6343
--- /dev/null
+++ b/media-video/aravis/aravis-0.5.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/AravisProject/aravis.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Library for video acquisition using Genicam cameras"
+HOMEPAGE="https://live.gnome.org/Aravis"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="X gstreamer caps"
+
+GST_DEPEND="media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
+
+RDEPEND=">=dev-libs/glib-2.26
+	dev-libs/libxml2
+	X? (
+		>=x11-libs/gtk+-3.12:3
+		${GST_DEPEND}
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libnotify
+	)
+	caps? (
+		sys-libs/libcap-ng
+		sys-process/audit
+	)
+	gstreamer? ( ${GST_DEPEND} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/gobject-introspection"
+
+if [[ ${PV} != *9999 ]]; then
+	DEPEND+=" dev-util/gtk-doc dev-util/intltool"
+fi
+
+src_prepare() {
+	default
+	if [[ ${PV} = *9999 ]]; then
+		intltoolize || die
+		gtkdocize || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--disable-static \
+		$(use_enable X viewer) \
+		$(use_enable gstreamer gst-plugin) \
+		$(use_enable caps packet-socket) \
+		--enable-introspection
+}
+
+src_install() {
+	emake install DESTDIR="${D}" aravisdocdir="/usr/share/doc/${PF}"
+	find "${D}" -name '*.la' -delete
+}
diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild
index 5d0d72cf0220..ed18bd2b6343 100644
--- a/media-video/aravis/aravis-9999.ebuild
+++ b/media-video/aravis/aravis-9999.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit versionator
-
-KEYWORDS="~amd64"
-
-if [[ ${PV} == "9999" ]]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.gnome.org/aravis"
-	EGIT_COMMIT="${aravis_LIVE_COMMIT:-master}"
-	inherit git-2 autotools
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/AravisProject/aravis.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Library for video acquisition using Genicam cameras"
@@ -19,33 +16,35 @@ HOMEPAGE="https://live.gnome.org/Aravis"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+IUSE="X gstreamer caps"
 
-IUSE="X gstreamer"
+GST_DEPEND="media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
 
-GST_DEPEND="media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10"
-
-RDEPEND=">=dev-libs/glib-2.22
+RDEPEND=">=dev-libs/glib-2.26
 	dev-libs/libxml2
 	X? (
-		>=x11-libs/gtk+-2.12:2
+		>=x11-libs/gtk+-3.12:3
 		${GST_DEPEND}
-		media-libs/gst-plugins-base:0.10
-		media-plugins/gst-plugins-xvideo:0.10
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libnotify
+	)
+	caps? (
+		sys-libs/libcap-ng
+		sys-process/audit
 	)
 	gstreamer? ( ${GST_DEPEND} )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-libs/gobject-introspection"
 
-if [[ -z ${EGIT_COMMIT} ]]; then
-	SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
-else
+if [[ ${PV} != *9999 ]]; then
 	DEPEND+=" dev-util/gtk-doc dev-util/intltool"
 fi
 
 src_prepare() {
-	if [[ -n ${EGIT_COMMIT} ]]; then
+	default
+	if [[ ${PV} = *9999 ]]; then
 		intltoolize || die
 		gtkdocize || die
 		eautoreconf
@@ -58,6 +57,7 @@ src_configure() {
 		--disable-static \
 		$(use_enable X viewer) \
 		$(use_enable gstreamer gst-plugin) \
+		$(use_enable caps packet-socket) \
 		--enable-introspection
 }
 
diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest
index cb1a42169463..730b6722b0a0 100644
--- a/media-video/jubler/Manifest
+++ b/media-video/jubler/Manifest
@@ -1,3 +1,3 @@
 DIST jubler-5.1.tar.bz2 1815531 BLAKE2B 59f9c3c57b906a73e16b32841900ef16450758115d930e767bc4d63882ad2b8a35100a34057ab6bb353f4bea87cb4036e080d8d13a844ae4bfcae8bb361d5b18 SHA512 e2a0da737362a3c8dc12966aec1e9939291237fc714a586186b72daa16abf967c8fea8dac04fb191cb803aa11db20cf6d67468d2383f17f5c6114a643860acef
-EBUILD jubler-5.1.ebuild 1713 BLAKE2B b7d2d4f1064b797e107f372d0949bc9de829e9fbae7f5d9d28976b7f0068cc3c31054cf084228024e41e79228dab05eadf12f0f090ee9dc4e041871d2a46d29a SHA512 1c372639fde50e4cf4dd7a4025a45f972941cc138a60f489cec88e545b234e5dd1fe433a87acde8117dad613c3a68df74aed64bd822015cfd569cf34d666d6f6
+EBUILD jubler-5.1.ebuild 1702 BLAKE2B 9a8c6d5bbca022ec8add190204624a07519841e065023b9bc39f6d925eee8669dca9b81ea5be59be76ade21a025bf60885d2997440e80378c13204d826387829 SHA512 d4e24438b6e58c44781e271159bfa834be0a5e0d5b34aed1c96606bf8d517f37d93472479ff5301866cf18c9d98a3dbb1c0fe22742786dcf529c63e0ec5e4c7e
 MISC metadata.xml 292 BLAKE2B 9d8724a93d3fe4fb781615a11ad6e90963fcedcead3075387baf4dafb9dde7e31f0e2ade52adfdae19122d3a24682c4f58a9630c676ba040813569ca41c41b74 SHA512 c7131847c06b95cec1212b3ead2a170abc2a5eeae13d6e7db0683370c7e8949e6ebbcffd320f54c3bf26cf50b88cdd44bc02a7e315e7a943407a68c8747c4031
diff --git a/media-video/jubler/jubler-5.1.ebuild b/media-video/jubler/jubler-5.1.ebuild
index 7b4baee2da7f..eba4d6276365 100644
--- a/media-video/jubler/jubler-5.1.ebuild
+++ b/media-video/jubler/jubler-5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit fdo-mime java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2 xdg-utils
 
 MY_PN="${PN^}"
 
@@ -71,11 +71,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 17f8a693bd3e..3de8edddfa4f 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -5,5 +5,4 @@ AUX kino-1.3.4-libavcodec-pkg-config.patch 451 BLAKE2B 87a6292a89627000437c07e60
 AUX kino-1.3.4-v4l1.patch 635 BLAKE2B 5f4d4c69c2505fa59aff8ed2323b303092809d1c1991387795a8cd58687b27631d697997861f1b17e921875c5e798495fc4866eb1163afc19c80c376616c95da SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77
 DIST kino-1.3.4.tar.gz 11090771 BLAKE2B 58d61257c09638d12cc4ec1e40fa5f51c6812039825f915b0b8c32817c791c7ce89b69145ffffed8fb65ea21b57d50628bab2654df731b79c39d120ea4335bb9 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32
 EBUILD kino-1.3.4-r1.ebuild 2893 BLAKE2B 2d731a652c1e4db45f15398b713a284de8af2396047ca4c25401d3ae979f113ddb1615c99fa753e201d64bb6511633f75e80e25e985178f42707f8131b260f64 SHA512 33d51922bc141cc8937c75af230b1ef0e6b29a26870a31bea885d7d0ac6812d61cdf06720100638770b2f22f92966652b3c651745e9f83568ca30590dddc87f3
-EBUILD kino-1.3.4.ebuild 3401 BLAKE2B d6d7c7b679421e1d220bff4536e3797662a8cf6b68e59b011e0a3ffda353d452c9466236040447c6a1216eaebba39552edf156a21f99c0930e654497fee146a9 SHA512 7eac2bfb55dc38e725d77557c7310cb98bdbc8d94ca9dbf3f8041eda9a0e33e2b5ef139acd73dd3d10db534227172aeb788ff585ce57fca7bb8a72f8aea06f10
 MISC metadata.xml 439 BLAKE2B e5c5ba3dffa41f889738582a879e23b49a17ca31787c5461a6d136317d3fce8d1df4cc29657eec57af00ec8d810e52ad0a125cbd5b378fc1de63d018696e932b SHA512 b6c464f30ce0e75cad151021288fbf2e2fa360a978b707108eb39e23bb15d3d91212abbb23fa181c97959bd80ce519e4f26bf59c6a22a99ab19bc5051a0746a4
diff --git a/media-video/kino/kino-1.3.4.ebuild b/media-video/kino/kino-1.3.4.ebuild
deleted file mode 100644
index 8f4d4bfa586f..000000000000
--- a/media-video/kino/kino-1.3.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils udev
-
-DESCRIPTION="Kino is a non-linear DV editor 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 ~sparc x86"
-IUSE="alsa dvdr gpac lame gstreamer quicktime sox vorbis"
-
-# This ebuild would benefit a lot of USE dependencies but that has to wait for
-# EAPI 2. The usual fix is to issue built_with_use checks but in that particu-
-# lar case it would make the ebuild rather complicated to write and maintain
-# (certain features can be enabled in various different ways). Also it would
-# also force the emerge process to stop a bit too often for users not to comp-
-# lain. Thus, if you need features like theora, x264, xvid and maybe others,
-# make sure you activate the required support where it should be (ffmpeg, mostly).
-
-# Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
-# dropped because kino may run with it but won't build anymore.
-
-CDEPEND=">=x11-libs/gtk+-2.6.0:2
-	>=gnome-base/libglade-2.5.0
-	>=dev-libs/glib-2:2
-	x11-libs/libXv
-	dev-libs/libxml2:2
-	media-libs/audiofile
-	>=sys-libs/libraw1394-1.0.0
-	>=sys-libs/libavc1394-0.4.1
-	>=media-libs/libdv-0.103
-	media-libs/libsamplerate
-	media-libs/libiec61883
-	media-libs/libv4l
-	alsa? ( >=media-libs/alsa-lib-1.0.9 )
-	virtual/ffmpeg
-	quicktime? ( >=media-libs/libquicktime-0.9.5 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	media-video/mjpegtools
-	media-sound/rawrec
-	dvdr? ( media-video/dvdauthor
-		app-cdr/dvd+rw-tools )
-	gpac? ( media-video/gpac )
-	lame? ( media-sound/lame )
-	gstreamer? ( media-libs/gst-plugins-base:0.10 )
-	sox? ( media-sound/sox )
-	vorbis? ( media-sound/vorbis-tools )"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README* TODO"
-
-src_prepare() {
-	# Deactivating automagic alsa configuration, bug #134725
-	if ! use alsa ; then
-		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die
-	fi
-
-	# Fix bug #169590
-	# https://sourceforge.net/tracker/?func=detail&aid=3304495&group_id=14103&atid=314103
-	sed -i \
-		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
-		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
-	\$(LIBQUICKTIME_LIBS) \\' \
-		src/Makefile.in || die
-
-	# Fix test failure discovered in bug #193947
-	# https://sourceforge.net/tracker/?func=detail&aid=3304499&group_id=14103&atid=314103
-	sed -i -e '$a\
-\
-ffmpeg/libavcodec/ps2/idct_mmi.c\
-ffmpeg/libavcodec/sparc/dsputil_vis.c\
-ffmpeg/libavcodec/sparc/vis.h\
-ffmpeg/libavutil/bswap.h\
-ffmpeg/libswscale/yuv2rgb_template.c\
-src/export.h\
-src/message.cc\
-src/page_bttv.cc' po/POTFILES.in || die
-
-	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' src/filehandler.h || die
-	epatch "${FILESDIR}/${P}-v4l1.patch"
-	epatch "${FILESDIR}/${P}-libav-0.7.patch"
-	epatch "${FILESDIR}/${P}-libav-0.8.patch"
-	epatch "${FILESDIR}/${P}-libavcodec-pkg-config.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-local-ffmpeg \
-		$(use_enable quicktime) \
-		$(use_with sparc dv1394) \
-		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
-		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale"
-}
-
-src_install() {
-	default
-	mv "${ED}/$(get_udevdir)"/rules.d/{,99-}kino.rules
-	fowners root:root -R /usr/share/kino/help #177378
-	prune_libtool_files --all #385361
-}
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index f60452566074..63d11a1bbaec 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,5 @@
-DIST mediainfo_17.12.tar.xz 1335676 BLAKE2B 66bf02f74a63b40446cb061fe6422c84d61cb10db53394a7b356e0c0b76a7c934548bf75a8e8e5556a3fab2bd2f65c2a8c3d57040bd404e5258f0cfa4f87bbd9 SHA512 3fd6c8538c7703e657c6c20fec3ba071e5575f6010f41188bdd46749ecad9bddfa2362a5f0df6c23aa98375bb9078f14704b0729d1c54174449871992b968ff9
 DIST mediainfo_18.03.tar.xz 1328024 BLAKE2B 3d304d7894b02f0f9355217b4c3a3f26a85e88d7be7c66a16ad8a8995421a51cf32c6f0f358aa7fbf246a1deb710cecec13a1be3f1700247c132b248624a414f SHA512 c4ed389c9d6a918196d3337fd5f50229e9e3b565745fc328462de7e0fe3a55496300ef5e2f784027669ff6f2428c5d573c5941eb0b26276dca6dc93a1286fbc1
-EBUILD mediainfo-17.12.ebuild 1584 BLAKE2B 49cea9ff3121b817481007311568e514170c93a07c1c6eb51b39758d7b1069e48c3e42b253a16d048a1a346cf687df74328cb605e4a4ffd25861b41abb789db9 SHA512 c34ec1a3a435ea8e511da66e370d8924c1583d3193479ac02f492afa0b3830c6a841e80986f37243331f8121969f01dcce2f7e12d6531f5a44c24f8578312e82
-EBUILD mediainfo-18.03.ebuild 1579 BLAKE2B 7a04fcd279c9f1c892d00e620194143dd4b6c4baec926007fae5f4ad21901e0cab8dcf1fbfc181711809df8e7a9d438e2489e1897937340ca0d5c0071732cae7 SHA512 123b967d7f22a1b699a52b90f2412dbe2798ffb979350db05491f01a9b46d6feb08952fa8e03a92858330840f810d375fa898b3641394c3e701817644c153acb
+DIST mediainfo_18.05.tar.xz 1359000 BLAKE2B e82e337f7ec7158bf8b9222fae8fc65b16211a42214f0f24003c0eebee523cf7d383aee827e4170a5317e8c470eb637ebb7154fdd2f104f2c1ce9913e8b4519e SHA512 10ffad5828d7afe83533e6e850f7124499fe1cdce024c9f3f46c5ab2333e19d40747feea641ce0b8a8d37f9aa069db39e205d0ac2bf1f5189ee2b044d6d7e2bf
+EBUILD mediainfo-18.03.ebuild 1577 BLAKE2B 51903a0f1a34350dfcacd76f10842ae9748918b8df00b4e8264c2af1f2cd64b6fcdbf02cc44f7e01c5dd884eb0acd9b5fb36aa712435ad7b85f5623f8edd5eae SHA512 9e3b0a882c366d7d9cfe2a7b3f4fc54e56e966833aa19a7cce4b9c5499e3327f914f3147f68798e5bdc506fb98254c6103985e159f0046429c56b6dc8f69d362
+EBUILD mediainfo-18.05.ebuild 1579 BLAKE2B 7a04fcd279c9f1c892d00e620194143dd4b6c4baec926007fae5f4ad21901e0cab8dcf1fbfc181711809df8e7a9d438e2489e1897937340ca0d5c0071732cae7 SHA512 123b967d7f22a1b699a52b90f2412dbe2798ffb979350db05491f01a9b46d6feb08952fa8e03a92858330840f810d375fa898b3641394c3e701817644c153acb
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-17.12.ebuild b/media-video/mediainfo/mediainfo-17.12.ebuild
deleted file mode 100644
index 904d5ce192e3..000000000000
--- a/media-video/mediainfo/mediainfo-17.12.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit eutils gnome2-utils xdg-utils autotools wxwidgets
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	eapply_user
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		sed -i -e "s:-O2::" configure.ac || die
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-		dodoc "${S}"/History_${target}.txt
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/mediainfo/mediainfo-18.03.ebuild b/media-video/mediainfo/mediainfo-18.03.ebuild
index 48b2796d9299..23284f7dca84 100644
--- a/media-video/mediainfo/mediainfo-18.03.ebuild
+++ b/media-video/mediainfo/mediainfo-18.03.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/mediainfo/mediainfo-18.05.ebuild b/media-video/mediainfo/mediainfo-18.05.ebuild
new file mode 100644
index 000000000000..48b2796d9299
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-18.05.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit gnome2-utils xdg-utils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libzen-0.4.37
+	~media-libs/lib${P}[curl=,mms=]
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+	TARGETS="CLI"
+	use wxwidgets && TARGETS+=" GUI"
+}
+
+src_prepare() {
+	eapply_user
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		sed -i -e "s:-O2::" configure.ac || die
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+		dodoc "${S}"/History_${target}.txt
+	done
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 666f61f70c24..38b962ecd987 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -7,7 +7,7 @@ DIST mpv-0.27.2-patches-r0.tar.xz 6564 BLAKE2B c02efea40e0b19d60eaa49520988464fb
 DIST mpv-0.27.2.tar.gz 2957191 BLAKE2B 35e316e5a30869ae44ff229e99ae11a88e2f7d55b55946bfb752d5ed2d8212885c0c2abb59c9ff6d23a72daee47d80f44511313d67ee6fb265e6681ba4b89ee1 SHA512 bf74a150b3732b8c233362e0902c54f85fbea9ca1765a2a8f946a6eecd9b37a72ede36a36d0dd98a770539c4f81fe24c8ce26be9db7cd6eddd8514a8f82d9cda
 DIST mpv-0.28.2.tar.gz 2982558 BLAKE2B 5faef4122d456916f43bd603192fc72dee1ad16fa3c842d54a2e53dc8f9db416545549a86af62481fe211dc088821ab13b832c09f82572b36167dd3a73d57f62 SHA512 e6206e8c65dca084e2cfa73ab09278b7113cdfd90b89877d1f75a1068c6379a093ea3955a023857357683edce1aba8c12ee441fd195d887af4d939fc7b66cef4
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
-EBUILD mpv-0.27.2.ebuild 10639 BLAKE2B 4a4b859d4d2558d14bcd83ffe1962812448052b266fdab5960607a683c4dbd302bdd6bd612f7dc3e02ebfa2b7a1b634591523f4d4594ddfc168805932af74392 SHA512 8a83e656261d2ddef3edf0157b0356e9776f8bce60cb191420e160e5a0a1d354019349e1e0b513c38e7841de42944dca4372f859efe62eca0fb19e72c7fc437a
+EBUILD mpv-0.27.2.ebuild 10646 BLAKE2B d540c5bf23ccaca0a46462b64e615468d6f3f7f60d834da91f200e1919db3ab5f8624d3545fe583431908bef16e24aa60fe1023cd11b913840590aecf5519906 SHA512 e233419cec44ddc5d2391a3dca4795772f3c0fec57f8f306e05a9abd53c163b29402458fc11b76a5508cfa6c01a0205d6b8a49eec64b4d9b9097bc36523a2b3c
 EBUILD mpv-0.28.2.ebuild 10281 BLAKE2B 0eb80d6a06bf9dac088643f13b2e725795a7c47f5ca4b402eb7391e9f48320268cd8374a76fa97f9ba245e8d75c3d6df0a3e0c2b9d5027aec0c7c64fe403b7d3 SHA512 e5ace3e7aef224e6d9b3fe89c14db87b9b55b222f50b3ba7d0262f3f3892e76401193f0bfc7acc30836d0feb0aa5e6ce6fbec50eb8ffa02dc8a9b37abc5bb923
 EBUILD mpv-9999.ebuild 10142 BLAKE2B 0139cb5a3755ed71ba48052f42a6762aefc7260cb27c5a8a175a5ee0b32d6e875ac5a82642bbe8b8fa7ddf896134982491dc8d87cbc04f28cd8df207fd17c5be SHA512 b5dc1ee844267ee5b7bc7350b269c48be8aae90b1876978a662ab7631d9c4c486a4e4d0c4cd000d231534f121f4664ed72712f4b87cbc78431b2bdf2f0009a0d
 MISC metadata.xml 2189 BLAKE2B 00ef1b58d48470241e6d1fa451a46ac73c6719c30531380edfb8af0c52441fb2f3e90f6bcd0aec0ab6b98dba7f9ebe8491868e3939e71128af139efb38b08c3a SHA512 68e4ca79451d81ba5cd16f0042d2177a1002135e6d2bdefe6aa3e9670ddd3f7b6a5239245de4ae89f71b49878c6bd43122bd7d860f61ced1f704f9e90439b930
diff --git a/media-video/mpv/mpv-0.27.2.ebuild b/media-video/mpv/mpv-0.27.2.ebuild
index 6f6911235219..a24e3f1eb1d6 100644
--- a/media-video/mpv/mpv-0.27.2.ebuild
+++ b/media-video/mpv/mpv-0.27.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999* ]]; then
 		https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz
 	"
-	KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/media-video/recordmydesktop/Manifest b/media-video/recordmydesktop/Manifest
index 3eb2978c1abd..3595b443ecea 100644
--- a/media-video/recordmydesktop/Manifest
+++ b/media-video/recordmydesktop/Manifest
@@ -2,5 +2,5 @@ AUX 0.3.8.1-fix-libjack-check.patch 518 BLAKE2B b4486cf048577f7d8f527b977d3cd981
 AUX 0.3.8.1-fix_new_theora.patch 2212 BLAKE2B 260643c7092e44fd040ee3f248f97969e4fc5be2d2b12946ab57b6412cded727676fd8426caacd0ad3e98b456f51a7173a66ebc9f8a95abce802ca65039199e9 SHA512 f504d9c889344be7f44a06b6125acf73fc32573256356afd99093af92ee3268267616b5956c0ada7a8484dcfb9f482ffa9c6c6d6f54b4080bc17a12cd2f21761
 DIST recordmydesktop-0.3.8.1.tar.gz 198732 BLAKE2B d28b8d61e340f100ea0954fef2861c4dd8ec2cdaef5a70b18d727d652579c85b901d35a056af7a81e49c98a602a9fb75ce0b5a302aab53ab735577b0159b95fa SHA512 a32df1257d7d8928123437b38abcbdf623a9a65d313df5bec9bc06ef7229ebe4664a3cbea1fe5f6f1f9b89efb939873adc020f4ac072477f6df9481a37e7c350
 EBUILD recordmydesktop-0.3.8.1-r4.ebuild 1214 BLAKE2B a87fd37e4ec96284509d3955762a59d1eb9aa664c43d0c767b8bd0e344a883d0facd973f800598b3a1861348efe90de80d62997fc3048be54174304123bfd68d SHA512 150babc27790593a51ce03bd446afacfcd9e872449294c85f4d2178edd448f416ebf2b642cf9953300e4fb5ae896d86b8691b74868e9593d1101ecdbea44421d
-EBUILD recordmydesktop-0.3.8.1-r5.ebuild 1207 BLAKE2B eef6212df53bf780147457f4c103d299a4381547b54328501cea0b7fbb71925a66f7d854624add6c6aa925af03e56b25fd0b01a3592b0b9aee51b9f09905711a SHA512 b64361f21c275ec3fcc729596ea0b642efef009ff80706391a0108b978a0631b3d61afe83976d5ce4097f1b225e8038ef8911565e26b2f438218f5c83c0c256d
+EBUILD recordmydesktop-0.3.8.1-r5.ebuild 1205 BLAKE2B 9878d6359d9fb20e38ed71d7e78781c96e8802875c95e6b3ca1e086e6a657eb528e927aad015222d00ef1561891c0cf4595c43e2e2b36ac863510057f450aede SHA512 56f9a24d29d57e6401b02a83de0e356e061d9ec39825f28fcd87b2c7eadadb817b6512b13288c61584c6558b0bb01b1e3740f91db959c39fa5f6893e82eb0950
 MISC metadata.xml 316 BLAKE2B 1742ad6dfbf9b34550898774321b339ebe6e6b5205650a9cf5f9ffb73b0e37ddccec560ccfc3657c8b21fd539367c3a14b7d6ecac87037a600290a16900f8856 SHA512 b2b2172a9a6fe5c1b1677138e045a24ec1922838e0ed7c2a958b41b73864c8a35f4dc6717468f0d2231763521b9b067d5123c930ec48c51789a7ea962629e1a8
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
index 5247e79de061..31fc84d1a5a8 100644
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="alsa jack"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
new file mode 100644
index 000000000000..0adc6ff44de5
--- /dev/null
+++ b/media-video/vcsi/Manifest
@@ -0,0 +1,3 @@
+DIST vcsi-7.tar.gz 18350 BLAKE2B 840f17db49a0b538a53bc0c3cd426e117d6a29d4b6f7b1ab7bf2f3a1697ea903a908f19b798c5898abf3cb0d308b34aeffc863517c682b8b9a114f5f9dcefb42 SHA512 5b5a3b9db76003c364aef0574a1b43c1177f5b7dae1339be981d6358c38102f0e7f275c9ec074e7cdd6b042ae30b982cfbbffa35c67eb8e2fc887c00073f2e48
+EBUILD vcsi-7.ebuild 837 BLAKE2B f9bd89584c205521e436092c28163d8ea2373db11212402474a6eed806e146868afd4cce2850306ee058a3ced14151a980b0e413300e943351bbaf24bdbae70b SHA512 b9d639e288eff34afbf53d169a22cfbcc9d9f750c5d9f654d550b63d195701c1d0d116dcf8e51e061726aa14981c8c9d5164ace00532a842b2a71a57d046d2a3
+MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/media-video/vcsi/metadata.xml b/media-video/vcsi/metadata.xml
new file mode 100644
index 000000000000..d9a6217dd22d
--- /dev/null
+++ b/media-video/vcsi/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>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/vcsi/vcsi-7.ebuild b/media-video/vcsi/vcsi-7.ebuild
new file mode 100644
index 000000000000..87cb0c19609a
--- /dev/null
+++ b/media-video/vcsi/vcsi-7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create thumbnail sheets from video files"
+HOMEPAGE="https://github.com/amietn/vcsi"
+SRC_URI="https://github.com/amietn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=dev-python/jinja-2[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	dev-python/parsedatetime[${PYTHON_USEDEP}]
+	>=dev-python/texttable-1.0[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-video/ffmpeg
+"
+
+python_test() {
+	nosetests -v tests || die "python tests failed with nose"
+}
diff --git a/media-video/xvid4conf/Manifest b/media-video/xvid4conf/Manifest
index ca4906b74694..d1f839c0c735 100644
--- a/media-video/xvid4conf/Manifest
+++ b/media-video/xvid4conf/Manifest
@@ -1,3 +1,3 @@
 DIST xvid4conf-1.12.tar.gz 133494 BLAKE2B cafe728bd85d2f34ba382d672d38b60378e632358ea7a03b9e3599c8a415517c6a84678a04383fbb2480e3ef35890a134c8fb6aa98eeeea8aac2fe9566282fc9 SHA512 277b081563b3e9ec2e3c78cf0ea7c504acf0585c0184ee359d0174be38c4c32b931360ce543193df3b323083d21a58d2ff94380647773c71eebed6928c857f57
-EBUILD xvid4conf-1.12.ebuild 524 BLAKE2B 365a9b7674d1da60a119d4bf70766cd49d8b4852c258742a0ddb36afb8b43892e2b7bf9da8c17c36f250bede706e9daa3acc35b1bff16e3954f3f0712effb4ee SHA512 700f93efe0abf6f645070e1a2001d4d2fdd52c4b37c56bc9a13736be95a09665614bd21221f062b77294041e5a67b1a32aa6ae74d8705e637a2146d28bbf28de
+EBUILD xvid4conf-1.12.ebuild 429 BLAKE2B be4067398879468b19eeffd2c740f8378bc0b6be874acb2c6c96c0e50eb57a05c92c4fdf1296dcda5ae43f5ae0d7c35fd9a258474752fb992b5d3d4ea70a80a8 SHA512 eaab56b2e0eb30d82ca851c7b9be7c7481284545f99e327a447e0c17b6e5dffab9b07a3ae5e8d2f7d30b86b0ed19d569b47ba8a17b41208234022db5b272fc88
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/xvid4conf/xvid4conf-1.12.ebuild b/media-video/xvid4conf/xvid4conf-1.12.ebuild
index 429e8eb26845..e3cc6e622ee0 100644
--- a/media-video/xvid4conf/xvid4conf-1.12.ebuild
+++ b/media-video/xvid4conf/xvid4conf-1.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="GTK2-configuration dialog for xvid4"
 HOMEPAGE="http://cvs.exit1.org/cgi-bin/viewcvs.cgi/xvid4conf/"
@@ -15,10 +15,3 @@ IUSE=""
 RDEPEND=">=x11-libs/gtk+-2.2.4:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-src_install() {
-	dodir /usr/{include,lib}
-	einstall || die
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e9d285cb6ea0..ac8ece683756 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e3df520b876a..2f9edffac363 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jun 2018 15:08:29 +0000
+Sat, 09 Jun 2018 07:38:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7736a8b83db5..d56a25b6be5e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 425353 BLAKE2B ec410f73e8160a04f1e8d9ba24f8a9a7403de8d80de422b45237ee3d29412684c7b01eb6c65076d2a0e39e2a5a031fa3a30e25eaf8291e44c92b9e9e62cb3412 SHA512 f41e2315afb547d2663e7d73d1c71ddccb41cbcb981f32843e47a742285e23731f0c982f66fc7df7697259b315666ee38e690923c6014e4574c7d7496b96947a
-TIMESTAMP 2018-06-02T15:08:33Z
+TIMESTAMP 2018-06-09T07:38:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsSsvFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsbhABfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBMUxAAsvAKow9T8Y/8MrMVXm2f6JC31f1KI/wdcKJKGbJsm9tWKfjUzQWwRcpu
-DKFCu7RH7PMeNU+2YXwu51Lq55koHZBMhovttSogjmXkk3pBN97D/W6WYN7jDElV
-XEBueLSriannpzfoAVAfONN0rZssk4dHJYiwMLGRvChZDQIdlD/++8PuWtSyB3FM
-EakfAuecvwfMMdA7iHf+DGqFNVMQVY59wtHVJle5wcmo+KavZdWZzCMi1j12ttb9
-Zx0DOAC8hb2UzhiWISD34KRivZvQG1zJpKW3ePCZfEGsNh32rG4Ov4u4MLO/Gj1C
-DodePpfHqyUTdgRMQSkkpq5VEY+fuiuK4jnHXtczeDZM/aBYGYNpaHtKp7XEQifQ
-KNioa6xHbub8dovZyJRM5tzHRINfCgFvgJCf7JWiZklo9Xo7FnoEZ6MMbne2O+St
-3TTxXkBe88vrPA5EHzmmMKpvdSuE1IpdGrHwfqU77zcXL8/KGCEVSGtblNprJglO
-HD1/tMJbRMYKFbCWhofB0SfX10Kk7qYmgAUk2zMxi9HGH+GAqxERdlZIIKEOSzVt
-vb165PblIfK3rdK+NLh/q6AGY3qkT9I/xmaBcEH9JT3JcmrFzZ0f8WQF7lWec73c
-NBbj0R7a2opJ8xTnIHP9Jl7RmmZ0Bg1+h+LTeCHf+tSUl9Qx81s=
-=vNl7
+klDzWhAAhVdT7hhGiPbYCO+mQH40xr5WGgTRKVxMcRg1QdJt7EVRdXt0UcuFXRsy
+RMR07dJWhyf3+mRJEhacJpx+Va3I1WG9Kfn7WllciqGQVb2Hs4+iH22uIiCF8E7A
+VaqI/qtCEDVYSLjdf+JlmYktdtwFrqgBCD9vK8ZLvhg2f6IBnRhsdTH9omss6D42
+p+2S+pwGOsYNmQp2lHE5wt+B2AOFVZOwwvG5E6y0IxhaAMMlPA5CNjs026ZmDHRT
++J9L1VDq3x8lZpUBQfJIYnXQG4mXSlJKnBQ02vwwnlllQQLMvThXo8gTx7SFr2zF
+btW8HsGWLpB92aYYyEP+aI+72yRTunrN9nl3NTvK/rV0Xyt2JCnSz7A7HqGVihLk
+qAogMFDhbdoruq4BaZ6MwizAkIXnPPPgs/gMnj7QswGypjGsQFTw5sYPLTg25Tr+
+Vj+upzZgLluwmwgloCeX6Y9o9KFKvpy4M7FJcJbR+Zjb1Pqugel95M7W1jg80VDz
+EsnVegV1ZmJ4w0llH9OjzAyZZjUwRFSbm/bDXFv9zh6e+Ziemz6SbBECEW1hweu4
+mi9pF1nCHE0Ac7Oq3kJG7M/8LLd7sghRgXmV61EbAB2TKZTRNvI2mE4OgDo5tgr0
+thEMbrEIrdoYruQb0twK4fmI4+FUybYSNKVPz14zreXELoH/pEQ=
+=DtZ2
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e3df520b876a..2f9edffac363 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jun 2018 15:08:29 +0000
+Sat, 09 Jun 2018 07:38:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a3240045e213..ab06cb942772 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index a20096df9559..10b39351ea61 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2 b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
index ee6b95f0d5b3..c9e3ab166976 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
+++ b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://emacspeak.googlecode.com/files/emacspeak-39.0.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=02876f569083daff9874034ee9576174
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-9999 b/metadata/md5-cache/app-accessibility/emacspeak-9999
index 64291d805ac4..6673b8929135 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-9999
+++ b/metadata/md5-cache/app-accessibility/emacspeak-9999
@@ -7,5 +7,5 @@ IUSE=+espeak
 LICENSE=BSD GPL-2
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=virtual/emacs-24
 SLOT=0
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=bb5e081141fefe72f22d1d7405b36da5
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.5 b/metadata/md5-cache/app-accessibility/speechd-el-2.5
index 9d07a002e4b9..8c159c8e8156 100644
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.5
+++ b/metadata/md5-cache/app-accessibility/speechd-el-2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.7 brltty? ( app-accessibility/brltty ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.5.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=20323b1a4156951fb1c7625027308a41
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 4cffca5eed2f..ebc0d812a646 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/aerospike-amc-community-3.6.13 b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13
deleted file mode 100644
index 1dfbcce6175f..000000000000
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.13/aerospike-amc-community-3.6.13.all.x86_64.deb
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b95040c95ac80c09e3e9577d3b8fa7cb
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.17 b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.17
deleted file mode 100644
index 5dc9587a3565..000000000000
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.17
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=6
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=http://www.aerospike.com/download/amc/4.0.17/artifact/linux -> aerospike-amc-community-4.0.17.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=073a7e686e88f0a946543e939ddc80a5
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19 b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19
deleted file mode 100644
index af351833f4f1..000000000000
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=6
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=http://www.aerospike.com/download/amc/4.0.19/artifact/linux -> aerospike-amc-community-4.0.19.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=073a7e686e88f0a946543e939ddc80a5
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1 b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
new file mode 100644
index 000000000000..4b4471b7ef48
--- /dev/null
+++ b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
+EAPI=6
+HOMEPAGE=http://www.aerospike.com
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=http://www.aerospike.com/download/amc/4.0.19/artifact/linux -> aerospike-amc-community-4.0.19.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cf40d77563db21a4e3d76a4ae324d824
diff --git a/metadata/md5-cache/app-admin/conky-1.10.4 b/metadata/md5-cache/app-admin/conky-1.10.4
index 1f4af3ac29f8..37037038dd41 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.4
+++ b/metadata/md5-cache/app-admin/conky-1.10.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.4.tar.gz -> conky-1.10.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=abec6c50df26a139da1af85505e2564b
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8 b/metadata/md5-cache/app-admin/conky-1.10.8
index ba28582dd900..5f4658ac4019 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8
+++ b/metadata/md5-cache/app-admin/conky-1.10.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=330fb397c7c26a5dfdbd58b54dd7092b
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r1 b/metadata/md5-cache/app-admin/conky-1.10.8-r1
index 8878ec5e2942..ecc5cbf0d7ba 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r1
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f2ffb1255984d39f15a26b2a1176c45
diff --git a/metadata/md5-cache/app-admin/denyhosts-2.9 b/metadata/md5-cache/app-admin/denyhosts-2.9
index 6b1e2b3f2bc3..f796bfff57ff 100644
--- a/metadata/md5-cache/app-admin/denyhosts-2.9
+++ b/metadata/md5-cache/app-admin/denyhosts-2.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/denyhosts/denyhosts/archive/v2.9.tar.gz -> denyhosts-2.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e36ec6ddda1d4221a665185083c0e53e
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0 b/metadata/md5-cache/app-admin/denyhosts-3.0
index f5a0e44f66bf..eeadaa023de6 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=39ca360141575427014c961f9042e3c4
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0-r1 b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
index d6e143cf95df..ff81645a6f7f 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0-r1
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 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/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0eb116e1cb2532a0a76873473e84c81e
diff --git a/metadata/md5-cache/app-admin/dxf-7.0.1 b/metadata/md5-cache/app-admin/dxf-7.0.1
deleted file mode 100644
index a27e6646f50b..000000000000
--- a/metadata/md5-cache/app-admin/dxf-7.0.1
+++ /dev/null
@@ -1,15 +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=Docker registry v2 client in Python
-EAPI=6
-HOMEPAGE=https://github.com/davedoesdev/dxf
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/jwcrypto-0.4.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(-)] >=dev-python/requests-2.9.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(-)] dev-python/setuptools[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/tqdm-4.10.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(-)] >=dev-python/www-authenticate-0.9.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(-)] 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.0.1.tar.gz -> dxf-7.0.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4251ba489a3b2dc17002705967e3e0ed
diff --git a/metadata/md5-cache/app-admin/dxf-7.1.0 b/metadata/md5-cache/app-admin/dxf-7.1.0
deleted file mode 100644
index 6d1170c4df49..000000000000
--- a/metadata/md5-cache/app-admin/dxf-7.1.0
+++ /dev/null
@@ -1,15 +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=Docker registry v2 client in Python
-EAPI=6
-HOMEPAGE=https://github.com/davedoesdev/dxf
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/jwcrypto-0.4.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(-)] >=dev-python/requests-2.18.4[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/setuptools[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/tqdm-4.19.4[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/www-authenticate-0.9.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(-)] 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.1.0.tar.gz -> dxf-7.1.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2065d37149c49b2d34cfb169f442a10a
diff --git a/metadata/md5-cache/app-admin/dxf-7.2.0 b/metadata/md5-cache/app-admin/dxf-7.2.0
new file mode 100644
index 000000000000..185f4342e573
--- /dev/null
+++ b/metadata/md5-cache/app-admin/dxf-7.2.0
@@ -0,0 +1,15 @@
+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=Docker registry v2 client in Python
+EAPI=6
+HOMEPAGE=https://github.com/davedoesdev/dxf
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/jwcrypto-0.4.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(-)] >=dev-python/requests-2.18.4[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/setuptools[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/tqdm-4.19.4[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/www-authenticate-0.9.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(-)] 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.2.0.tar.gz -> dxf-7.2.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=733e3753e677d4263046b3e07a7605dc
diff --git a/metadata/md5-cache/app-admin/graylog2-2.4.5 b/metadata/md5-cache/app-admin/graylog2-2.4.5
new file mode 100644
index 000000000000..2eb566bfdc03
--- /dev/null
+++ b/metadata/md5-cache/app-admin/graylog2-2.4.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=Free and open source log management
+EAPI=6
+HOMEPAGE=https://graylog.org
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=virtual/jdk:1.8
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://packages.graylog2.org/releases/graylog/graylog-2.4.5.tgz
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a803b85e7182f280cecdf6423d71e11a
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
index d7d806a0bba0..885fe10001d0 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-hddtemp )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2685c28e91e8dc880cbeebf4f0d27dc9
diff --git a/metadata/md5-cache/app-admin/killproc-2.13-r1 b/metadata/md5-cache/app-admin/killproc-2.13-r1
index e2d9a87a7a20..2e25d560be39 100644
--- a/metadata/md5-cache/app-admin/killproc-2.13-r1
+++ b/metadata/md5-cache/app-admin/killproc-2.13-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=killproc and assorted tools for boot scripts
 EAPI=5
 HOMEPAGE=http://ftp.suse.com/pub/projects/init/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/init/killproc-2.13.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ac23c7bb0d5be4f26a31842b2a92897
+_md5_=0591b7c828ec605aeb9916fe70a63afd
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.17 b/metadata/md5-cache/app-admin/kube-bench-0.0.17
new file mode 100644
index 000000000000..936c7472463f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
+EAPI=6
+HOMEPAGE=https://github.com/aquasecurity/kube-bench
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.17.tar.gz -> kube-bench-0.0.17.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1 b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
index bcae45dc4541..7f7e51c9bc65 100644
--- a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
+++ b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=!app-admin/logsentry app-misc/lockfile-progs dev-lang/perl dev-perl/mime-construct virtual/mailx
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/logcheck/logcheck_1.3.18.tar.xz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=28c1e4f3e54d7917cbcdb4e231c2a254
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.15.1 b/metadata/md5-cache/app-admin/syslog-ng-3.15.1
new file mode 100644
index 000000000000..1ce603e88788
--- /dev/null
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.15.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=syslog replacement with advanced filtering features
+EAPI=6
+HOMEPAGE=https://syslog-ng.com/open-source-log-management
+IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd 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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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
+SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.15.1/syslog-ng-3.15.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=64939ad0db6ecba3baf560aabb807d46
diff --git a/metadata/md5-cache/app-admin/sysstat-11.6.1 b/metadata/md5-cache/app-admin/sysstat-11.6.1
deleted file mode 100644
index 42b85e75a4ee..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=75fd9cac1b98a4a8a5000fb3587df35a
diff --git a/metadata/md5-cache/app-admin/sysstat-11.6.2 b/metadata/md5-cache/app-admin/sysstat-11.6.2
deleted file mode 100644
index 3cbff6a6d970..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/sysstat-11.6.4 b/metadata/md5-cache/app-admin/sysstat-11.6.4
new file mode 100644
index 000000000000..d24fbd1efb3f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-11.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=System performance tools for Linux
+EAPI=6
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/sysstat-11.7.1 b/metadata/md5-cache/app-admin/sysstat-11.7.1
deleted file mode 100644
index 3948cb85d7aa..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/sysstat-11.7.2 b/metadata/md5-cache/app-admin/sysstat-11.7.2
deleted file mode 100644
index 4e125e4b7c68..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/sysstat-11.7.4 b/metadata/md5-cache/app-admin/sysstat-11.7.4
new file mode 100644
index 000000000000..c8453e866ee1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-11.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=System performance tools for Linux
+EAPI=6
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ca29918b76d1748279cf3fefcaeb5a68
diff --git a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2 b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
index a8702319ac5a..adfc1c699594 100644
--- a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
+++ b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<app-admin/gnome-system-tools-1.1.91 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.15.2:2 >=dev-perl/Net-DBus-0.33.4 dev-lang/perl >=sys-auth/polkit-0.94 userland_GNU? ( virtual/shadow )
 SLOT=0
 SRC_URI=mirror://gnome/sources/system-tools-backends/2.10/system-tools-backends-2.10.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=20afbfd8e5fb43d8cf35c9e97f1dce1f
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.5_p20161017 b/metadata/md5-cache/app-admin/ulogd-2.0.5_p20161017
index 86ce42aacebb..7ea61e285415 100644
--- a/metadata/md5-cache/app-admin/ulogd-2.0.5_p20161017
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.5_p20161017
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=http://git.netfilter.org/ulogd2/snapshot/62064f6a9e054739ecbdda010dbe9c3fd69bbaa2.tar.gz -> ulogd-2.0.5_p20161017.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ab73e3bd3639815c5cfd6a4afa186814
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.7 b/metadata/md5-cache/app-admin/ulogd-2.0.7
index e7555f39bfce..975528f9ea06 100644
--- a/metadata/md5-cache/app-admin/ulogd-2.0.7
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) selinux? ( sec-policy/selinux-ulogd )
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.7.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=38685ec34c91f049203b8b918d3d8bee
diff --git a/metadata/md5-cache/app-admin/vault-0.10.0 b/metadata/md5-cache/app-admin/vault-0.10.0
deleted file mode 100644
index 2357e3a4b7ce..000000000000
--- a/metadata/md5-cache/app-admin/vault-0.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for managing secrets
-EAPI=6
-HOMEPAGE=https://vaultproject.io/
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.0.tar.gz -> vault-0.10.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-admin/vault-0.10.2 b/metadata/md5-cache/app-admin/vault-0.10.2
new file mode 100644
index 000000000000..9004f6526b34
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-0.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=A tool for managing secrets
+EAPI=6
+HOMEPAGE=https://vaultproject.io/
+IUSE=+filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.2.tar.gz -> vault-0.10.2.tar.gz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-admin/vault-0.9.3 b/metadata/md5-cache/app-admin/vault-0.9.3
deleted file mode 100644
index 0078ff47bd9b..000000000000
--- a/metadata/md5-cache/app-admin/vault-0.9.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for managing secrets
-EAPI=6
-HOMEPAGE=https://vaultproject.io/
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v0.9.3.tar.gz -> vault-0.9.3.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=021cd6ec2fdba0fe1d171a9fb812376f
diff --git a/metadata/md5-cache/app-admin/vault-0.9.6 b/metadata/md5-cache/app-admin/vault-0.9.6
deleted file mode 100644
index 82d91aa63f0c..000000000000
--- a/metadata/md5-cache/app-admin/vault-0.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A tool for managing secrets
-EAPI=6
-HOMEPAGE=https://vaultproject.io/
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v0.9.6.tar.gz -> vault-0.9.6.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=021cd6ec2fdba0fe1d171a9fb812376f
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index d0b9f35d9191..ec86a4a538d8 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/skyldav-0.7 b/metadata/md5-cache/app-antivirus/skyldav-0.7
index 4c5c0246c661..4fc73ee9b63e 100644
--- a/metadata/md5-cache/app-antivirus/skyldav-0.7
+++ b/metadata/md5-cache/app-antivirus/skyldav-0.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=app-antivirus/clamav-0.97.8 sys-apps/util-linux sys-libs/libcap libnotify? ( media-libs/libcanberra[gtk] x11-libs/libnotify x11-libs/gtk+:2 ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/xypron/skyldav/archive/0.7.tar.gz -> skyldav-0.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=0b1e22da07652fa0a32fe35589937ade
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index a5d911964688..0f427dbd9a0c 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/file-roller-3.24.1 b/metadata/md5-cache/app-arch/file-roller-3.24.1
index 1912c2f7373f..59ac272a08e8 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.24.1
+++ b/metadata/md5-cache/app-arch/file-roller-3.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0f8444a135fd97fbe5a287e73d473b59
diff --git a/metadata/md5-cache/app-arch/lz4-1.8.0 b/metadata/md5-cache/app-arch/lz4-1.8.0
index 31671fe4539f..6bb806297ab7 100644
--- a/metadata/md5-cache/app-arch/lz4-1.8.0
+++ b/metadata/md5-cache/app-arch/lz4-1.8.0
@@ -4,9 +4,9 @@ DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=6
 HOMEPAGE=https://github.com/lz4/lz4
 IUSE=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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD-2 GPL-2
 SLOT=0/r131
 SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.0.tar.gz -> lz4-1.8.0.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0a3f8afb8b6f1769c81dabb113dc19c
+_md5_=7f5eae4a4ac663aa29dba6c785b27b12
diff --git a/metadata/md5-cache/app-arch/rar-5.6.0_beta5_p20180604 b/metadata/md5-cache/app-arch/rar-5.6.0_beta5_p20180604
new file mode 100644
index 000000000000..0f17281a20f6
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rar-5.6.0_beta5_p20180604
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=all_sfx? ( app-arch/unrar )
+DESCRIPTION=RAR compressor/uncompressor
+EAPI=6
+HOMEPAGE=http://www.rarsoft.com/
+IUSE=all_sfx
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=RAR BSD BSD-2
+RDEPEND=sys-libs/glibc
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=x86? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.0_beta5_p20180604.tar.gz ) amd64? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.0_beta5_p20180604.tar.gz ) all_sfx? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.0_beta5_p20180604.tar.gz https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.0_beta5_p20180604.tar.gz https://mirror.whissi.de/distfiles/rar/winrar-x64-5.6.0_beta5_p20180604.exe )
+_md5_=f5d13154e2023af11f1ecab75240fb21
diff --git a/metadata/md5-cache/app-arch/rpm-4.14.1 b/metadata/md5-cache/app-arch/rpm-4.14.1
new file mode 100644
index 000000000000..6dca9c47f360
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rpm-4.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig test? ( sys-apps/fakechroot ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=
+DESCRIPTION=Red Hat Package Management Utils
+EAPI=6
+HOMEPAGE=http://www.rpm.org https://github.com/rpm-software-management/rpm
+IUSE=acl caps doc lua nls python selinux test 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2
+RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=78c31b074340ddd2b8288d2d2fe00fb8
diff --git a/metadata/md5-cache/app-arch/unzip-6.0_p21-r2 b/metadata/md5-cache/app-arch/unzip-6.0_p21-r2
index 809cb481d3ad..124f7c3f4dbc 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0_p21-r2
+++ b/metadata/md5-cache/app-arch/unzip-6.0_p21-r2
@@ -4,10 +4,10 @@ DESCRIPTION=unzipper for pkzip-compressed files
 EAPI=6
 HOMEPAGE=http://www.info-zip.org/
 IUSE=bzip2 natspec unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-21.debian.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46535af00e311943d6a95870149196cb
+_md5_=171683d2c7e4efc6d4af89a3c7a00aa7
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 97019e810b51..7b10e562dd13 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/duply-1.11.2 b/metadata/md5-cache/app-backup/duply-1.11.2
index c1c4cdc5ce86..61742a3dffe7 100644
--- a/metadata/md5-cache/app-backup/duply-1.11.2
+++ b/metadata/md5-cache/app-backup/duply-1.11.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-backup/duplicity
 SLOT=0
 SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/duply_1.11.2.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a10108cc322dbcb5cd94e8157480b80d
diff --git a/metadata/md5-cache/app-backup/duply-1.11.3 b/metadata/md5-cache/app-backup/duply-1.11.3
index 5f768fc12a16..85c770741d47 100644
--- a/metadata/md5-cache/app-backup/duply-1.11.3
+++ b/metadata/md5-cache/app-backup/duply-1.11.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-backup/duplicity
 SLOT=0
 SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/duply_1.11.3.tgz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=e371e26c38dd0f92c837e8c85932f5e5
diff --git a/metadata/md5-cache/app-backup/duply-1.9.2 b/metadata/md5-cache/app-backup/duply-1.9.2
index 3e0dce553846..f07b42535a6e 100644
--- a/metadata/md5-cache/app-backup/duply-1.9.2
+++ b/metadata/md5-cache/app-backup/duply-1.9.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-backup/duplicity
 SLOT=0
 SRC_URI=mirror://sourceforge/ftplicity/duply_1.9.2.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=127dea5bcc7f9816e78a737db94ae36f
diff --git a/metadata/md5-cache/app-backup/duply-2.0.1 b/metadata/md5-cache/app-backup/duply-2.0.1
index a8d8e5bb53df..933fbb734a87 100644
--- a/metadata/md5-cache/app-backup/duply-2.0.1
+++ b/metadata/md5-cache/app-backup/duply-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-backup/duplicity
 SLOT=0
 SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.1.tgz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=02da013bd077ed748082aec9afca3ec2
diff --git a/metadata/md5-cache/app-backup/duply-2.0.2 b/metadata/md5-cache/app-backup/duply-2.0.2
index cd4f66a9a4ae..0c5293fb9d34 100644
--- a/metadata/md5-cache/app-backup/duply-2.0.2
+++ b/metadata/md5-cache/app-backup/duply-2.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-backup/duplicity
 SLOT=0
 SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.2.tgz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=19ef2ea2992c1341bc29d544e91e0037
diff --git a/metadata/md5-cache/app-backup/duply-2.0.3 b/metadata/md5-cache/app-backup/duply-2.0.3
index f64309d7cc92..92573769ddd3 100644
--- a/metadata/md5-cache/app-backup/duply-2.0.3
+++ b/metadata/md5-cache/app-backup/duply-2.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-backup/duplicity
 SLOT=0
 SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.3.tgz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=19ef2ea2992c1341bc29d544e91e0037
diff --git a/metadata/md5-cache/app-backup/restic-0.7.3 b/metadata/md5-cache/app-backup/restic-0.7.3
deleted file mode 100644
index 74ab5fd0c30f..000000000000
--- a/metadata/md5-cache/app-backup/restic-0.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.9
-DESCRIPTION=A backup program that is fast, efficient and secure
-EAPI=6
-HOMEPAGE=https://restic.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.7.3.tar.gz -> restic-0.7.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=e77b8fda57dd89a0ee9841ed83a3864d
diff --git a/metadata/md5-cache/app-backup/restic-0.8.0 b/metadata/md5-cache/app-backup/restic-0.8.0
deleted file mode 100644
index e9a5cfce4ad0..000000000000
--- a/metadata/md5-cache/app-backup/restic-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.9
-DESCRIPTION=A backup program that is fast, efficient and secure
-EAPI=6
-HOMEPAGE=https://restic.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.8.0.tar.gz -> restic-0.8.0.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=11bf7ee0191c9b94f80cfd75d1a61f36
diff --git a/metadata/md5-cache/app-backup/restic-0.9.0 b/metadata/md5-cache/app-backup/restic-0.9.0
new file mode 100644
index 000000000000..989ce7faa384
--- /dev/null
+++ b/metadata/md5-cache/app-backup/restic-0.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=sys-fs/fuse:0 >=dev-lang/go-1.9
+DESCRIPTION=A backup program that is fast, efficient and secure
+EAPI=6
+HOMEPAGE=https://restic.github.io/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+RDEPEND=sys-fs/fuse:0
+SLOT=0
+SRC_URI=https://github.com/restic/restic/archive/v0.9.0.tar.gz -> restic-0.9.0.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7e2dbdbf792732e212edaf20ad8cc9aa
diff --git a/metadata/md5-cache/app-backup/sarab-1.0.0 b/metadata/md5-cache/app-backup/sarab-1.0.0
index d554b6811d74..839486f2ae40 100644
--- a/metadata/md5-cache/app-backup/sarab-1.0.0
+++ b/metadata/md5-cache/app-backup/sarab-1.0.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-backup/dar virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/sarab/sarab-1.0.0.tar.gz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=3d1dab619fc96ad74147d9811c125df1
diff --git a/metadata/md5-cache/app-backup/tsm-7.1.4.4-r2 b/metadata/md5-cache/app-backup/tsm-7.1.4.4-r2
index 4f4bd8f2161d..9c971441dd30 100644
--- a/metadata/md5-cache/app-backup/tsm-7.1.4.4-r2
+++ b/metadata/md5-cache/app-backup/tsm-7.1.4.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/libxml2 =sys-fs/fuse-2* acl? ( sys-apps/acl ) ja
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/patches/client/v7r1/Linux/LinuxX86/BA/v714/7.1.4.4-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=bb79ca89a58583ab0a48630c3b7c2c93
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index f2b49262e63d..857a626f16ae 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/cpuburn-1.4a-r2 b/metadata/md5-cache/app-benchmarks/cpuburn-1.4a-r2
new file mode 100644
index 000000000000..bbbdbb8add4a
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/cpuburn-1.4a-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=CPU testing utilities in optimized assembler for maximum loading
+EAPI=6
+HOMEPAGE=https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/cpuburn_1_4a_tar.gz -> cpuburn-1.4a.tar.gz
+_md5_=0ef4fb8e8a1ced1a83e2075784824d6f
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-4.2.3 b/metadata/md5-cache/app-benchmarks/geekbench-4.2.3
new file mode 100644
index 000000000000..9ee7a371ea3d
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/geekbench-4.2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install nofetch postinst
+DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
+EAPI=6
+HOMEPAGE=https://www.geekbench.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=geekbench
+RDEPEND=sys-devel/gcc sys-libs/glibc
+RESTRICT=bindist fetch mirror strip
+SLOT=4
+SRC_URI=https://cdn.geekbench.com/Geekbench-4.2.3-Linux.tar.gz
+_md5_=d5d8469d80c0b43e2786931b9379f76f
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index e0a5d0f5665a..6644ba017d1b 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/burn-cd-1.7.4 b/metadata/md5-cache/app-cdr/burn-cd-1.7.4
deleted file mode 100644
index 563aa685fc94..000000000000
--- a/metadata/md5-cache/app-cdr/burn-cd-1.7.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Smart console frontend for virtual/cdrtools and dvd+rw-tools
-EAPI=0
-HOMEPAGE=http://burn-cd.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-lang/python virtual/cdrtools app-cdr/dvd+rw-tools
-SLOT=0
-SRC_URI=mirror://sourceforge/burn-cd/burn-cd-1.7.4.gz
-_md5_=6028624c265cd31d5f1d2b5065bf900a
diff --git a/metadata/md5-cache/app-cdr/cuetools-1.3.1 b/metadata/md5-cache/app-cdr/cuetools-1.3.1
deleted file mode 100644
index 76ac33bed3c2..000000000000
--- a/metadata/md5-cache/app-cdr/cuetools-1.3.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Utilities to manipulate and convert cue and toc files
-EAPI=0
-HOMEPAGE=http://developer.berlios.de/projects/cuetools/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/cuetools-1.3.1.tar.gz mirror://gentoo/cuetools-1.3.1-debian.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0facbd0390331dc948d13900c026a871
diff --git a/metadata/md5-cache/app-cdr/cuetools-1.3.1-r2 b/metadata/md5-cache/app-cdr/cuetools-1.3.1-r2
deleted file mode 100644
index 874f4c9048b6..000000000000
--- a/metadata/md5-cache/app-cdr/cuetools-1.3.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-devel/bison sys-devel/flex
-DESCRIPTION=Utilities to manipulate and convert cue and toc files
-EAPI=5
-HOMEPAGE=https://github.com/svend/cuetools
-IUSE=extras
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=extras? ( media-sound/vorbis-tools media-libs/flac media-sound/mp3info )
-SLOT=0
-SRC_URI=https://github.com/svend/cuetools/archive/1.3.1.tar.gz -> cuetools-1.3.1.tar.gz mirror://gentoo/cuetools-1.3.1-debian.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7bc8ee8d5b1c0587524ae6e084707982
diff --git a/metadata/md5-cache/app-cdr/cuetools-1.4.1 b/metadata/md5-cache/app-cdr/cuetools-1.4.1
index a30efcb453c3..76586c9a5f68 100644
--- a/metadata/md5-cache/app-cdr/cuetools-1.4.1
+++ b/metadata/md5-cache/app-cdr/cuetools-1.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities to manipulate and convert cue and toc files
 EAPI=5
 HOMEPAGE=https://github.com/svend/cuetools
 IUSE=flac mp3 vorbis
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=flac? ( media-libs/flac ) mp3? ( media-sound/mp3info ) vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=https://github.com/svend/cuetools/archive/1.4.1.tar.gz -> cuetools-1.4.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65740dde659eb8d1c7a2e7e2a9b83696
+_md5_=bffa6513f64df8eb8f594d4c1000d828
diff --git a/metadata/md5-cache/app-cdr/mkcdtoc-1.0 b/metadata/md5-cache/app-cdr/mkcdtoc-1.0
index 99a39274e527..1a6b230110e3 100644
--- a/metadata/md5-cache/app-cdr/mkcdtoc-1.0
+++ b/metadata/md5-cache/app-cdr/mkcdtoc-1.0
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=-
 DEPEND=>=dev-lang/perl-5.8.0
 DESCRIPTION=command-line utility to create toc-files for cdrdao
-EAPI=0
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/mkcdtoc/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.0
 SLOT=0
 SRC_URI=mirror://sourceforge/mkcdtoc/mkcdtoc-1.0.tar.bz2
-_md5_=721696aaf319cf66406d22f6b592192a
+_md5_=6902c2ff05d9af850ace0d1d23fbab1d
diff --git a/metadata/md5-cache/app-cdr/multicd-1.7.5-r1 b/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
index a741ea6ddda2..fd65df28e0a6 100644
--- a/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
+++ b/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Tool for making direct copies of your files to multiple cd's
-EAPI=0
+EAPI=6
 HOMEPAGE=http://danborn.net/multicd/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.6 virtual/cdrtools
 SLOT=0
 SRC_URI=http://danborn.net/multicd/multicd-1.7.5.tar.gz
-_md5_=280defe6ba2aa746ddf98ce7e21d6d22
+_md5_=18c650fc3086fa7e78654081847528da
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index bb09c6eabae4..451b585e064a 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/acme-0.21.1 b/metadata/md5-cache/app-crypt/acme-0.21.1
deleted file mode 100644
index 1a0a645cc027..000000000000
--- a/metadata/md5-cache/app-crypt/acme-0.21.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/six-1.9.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(-)] dev-python/pytest[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/pytest-xdist[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/setuptools-1.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(-)] 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=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/six-1.9.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(-)] 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/certbot/certbot/archive/v0.21.1.tar.gz -> certbot-0.21.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23b04df47634a50e31466fa2eef8b826
diff --git a/metadata/md5-cache/app-crypt/acme-0.24.0 b/metadata/md5-cache/app-crypt/acme-0.24.0
index fe5861b2ac1d..8d470d4a66ea 100644
--- a/metadata/md5-cache/app-crypt/acme-0.24.0
+++ b/metadata/md5-cache/app-crypt/acme-0.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/six-1.9.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(-)] 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/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe33790c2c8e65303a83e4eb518e8b2c
+_md5_=23b04df47634a50e31466fa2eef8b826
diff --git a/metadata/md5-cache/app-crypt/acme-0.25.0 b/metadata/md5-cache/app-crypt/acme-0.25.0
new file mode 100644
index 000000000000..2475b0fae6ed
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.25.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/requests-toolbelt-0.3.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(-)] >=dev-python/six-1.9.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(-)] dev-python/pytest[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/pytest-xdist[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/setuptools-1.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(-)] 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=An implementation of the ACME protocol
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/requests-toolbelt-0.3.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(-)] >=dev-python/six-1.9.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(-)] 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/certbot/certbot/archive/v0.25.0.tar.gz -> certbot-0.25.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1a7abec592349f646d918532d93eb3f
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index 6863e9a0f0a4..4c3b037912fc 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/six-1.9.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(-)] dev-python/pytest[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/pytest-xdist[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/setuptools-1.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(-)] >=dev-vcs/git-1.8.2.1 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(-)]
+DEPEND=test? ( >=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/requests-toolbelt-0.3.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(-)] >=dev-python/six-1.9.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(-)] dev-python/pytest[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/pytest-xdist[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/setuptools-1.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(-)] >=dev-vcs/git-1.8.2.1 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=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/six-1.9.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(-)] 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(-)]
+RDEPEND=>=dev-python/cryptography-0.8[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/josepy-1.0.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(-)] dev-python/mock[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/pyopenssl-0.13[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/pyrfc3339[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/pytz[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/requests-2.10[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/requests-toolbelt-0.3.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(-)] >=dev-python/six-1.9.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(-)] 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
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a37c4885ecc9ecfb96ee898159a6e99
+_md5_=1571888aef854a3e1f7e1cd74c71a2ed
diff --git a/metadata/md5-cache/app-crypt/certbot-0.21.1 b/metadata/md5-cache/app-crypt/certbot-0.21.1
deleted file mode 100644
index 89f3898a4bed..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-0.21.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-1.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(-)] test? ( >=dev-python/astroid-1.3.5[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/coverage[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/ipdb[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/pytest[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/pytest-cov[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/pytest-xdist[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/pylint-1.4.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(-)] dev-python/wheel[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(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-1.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(-)] ~app-crypt/acme-0.21.1[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/configargparse-0.9.3[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/configobj[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/cryptography-1.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(-)] dev-python/mock[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/parsedatetime-1.3[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/pyrfc3339[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/pytz[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/zope-component[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/zope-interface[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://github.com/certbot/certbot/archive/v0.21.1.tar.gz -> certbot-0.21.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae4eaeeb0a17b675de0e2e3ff44f2cc9
diff --git a/metadata/md5-cache/app-crypt/certbot-0.24.0 b/metadata/md5-cache/app-crypt/certbot-0.24.0
index 5e8a4c93e8e6..231a5b10872f 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.24.0
+++ b/metadata/md5-cache/app-crypt/certbot-0.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[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(-)] >app-crypt/acme-0.21.1[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/configargparse-0.9.3[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/configobj[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/cryptography-1.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(-)] dev-python/josepy[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/mock[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/parsedatetime-1.3[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/pyrfc3339[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/pytz[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/zope-component[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/zope-interface[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://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d9be03bc3782ea12e224cf8d49b9a571
+_md5_=cc4373e421ce8bc7bf2afb23fff184c5
diff --git a/metadata/md5-cache/app-crypt/certbot-0.25.0 b/metadata/md5-cache/app-crypt/certbot-0.25.0
new file mode 100644
index 000000000000..a33883043372
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.25.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[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/coverage[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/ipdb[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/pytest[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/pytest-cov[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/pytest-xdist[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/pylint-1.4.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(-)] dev-python/wheel[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(-)]
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[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(-)] >app-crypt/acme-0.24.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(-)] >=dev-python/configargparse-0.9.3[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/configobj[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/cryptography-1.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(-)] dev-python/josepy[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/mock[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/parsedatetime-1.3[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/pyrfc3339[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/pytz[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/zope-component[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/zope-interface[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://github.com/certbot/certbot/archive/v0.25.0.tar.gz -> certbot-0.25.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f03ce6884e526b8fbc63855e6dbdf67c
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.21.1 b/metadata/md5-cache/app-crypt/certbot-apache-0.21.1
deleted file mode 100644
index 76838d6ce0c1..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.21.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( ~app-crypt/certbot-0.21.1[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(-)] ~app-crypt/acme-0.21.1[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/mock[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/python-augeas[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/zope-component[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/zope-interface[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/nose[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/setuptools[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(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=~app-crypt/certbot-0.21.1[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(-)] ~app-crypt/acme-0.21.1[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/mock[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/python-augeas[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/zope-component[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/zope-interface[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://github.com/certbot/certbot/archive/v0.21.1.tar.gz -> certbot-0.21.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9dffaf6e2109c404d2c196e48010ed9
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.24.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.24.0
index b6ea0d0ef5f3..e987d1d76b90 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.24.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/certbot-0.21.1[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(-)] >=app-crypt/acme-0.21.1[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/mock[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/python-augeas[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/zope-component[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/zope-interface[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://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0f442d27c88b57bea90a18ee500037c1
+_md5_=d87198043c9a15f93e724bcb070e9d60
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.25.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.25.0
new file mode 100644
index 000000000000..b0616e20ff13
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.25.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=app-crypt/certbot-0.21.1[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(-)] >app-crypt/acme-0.24.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(-)] dev-python/mock[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/python-augeas[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/zope-component[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/zope-interface[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/nose[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/setuptools[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(-)]
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/certbot-0.21.1[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(-)] >app-crypt/acme-0.24.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(-)] dev-python/mock[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/python-augeas[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/zope-component[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/zope-interface[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://github.com/certbot/certbot/archive/v0.25.0.tar.gz -> certbot-0.25.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f45456e108ae7eaddd92fccf1672c69a
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.21.1 b/metadata/md5-cache/app-crypt/certbot-nginx-0.21.1
deleted file mode 100644
index 52b05af7c07c..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.21.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-1.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(-)] 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=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-1.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(-)] ~app-crypt/certbot-0.21.1[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(-)] ~app-crypt/acme-0.21.1[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/mock[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/pyopenssl[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/pyparsing-1.5.5[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/zope-interface[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://github.com/certbot/certbot/archive/v0.21.1.tar.gz -> certbot-0.21.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=38663c494fd93fec75be6889e15ffb2d
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.24.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.24.0
index 18bbf893c682..93364f37b8dc 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.24.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[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(-)] >=app-crypt/certbot-0.21.1[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(-)] >=app-crypt/acme-0.21.1[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/mock[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/pyopenssl[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/pyparsing-1.5.5[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/zope-interface[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://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c082bef19a5aa2797c0b4f6537e30186
+_md5_=4d10a6ca3b06619b627a8f374462c332
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.25.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.25.0
new file mode 100644
index 000000000000..4995506a254f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.25.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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(-)]
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[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(-)] >=app-crypt/certbot-0.21.1[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(-)] >=app-crypt/acme-0.21.1[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/mock[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/pyopenssl[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/pyparsing-1.5.5[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/zope-interface[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://github.com/certbot/certbot/archive/v0.25.0.tar.gz -> certbot-0.25.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c082bef19a5aa2797c0b4f6537e30186
diff --git a/metadata/md5-cache/app-crypt/cfssl-1.3.1 b/metadata/md5-cache/app-crypt/cfssl-1.3.1
deleted file mode 100644
index e5116821e62b..000000000000
--- a/metadata/md5-cache/app-crypt/cfssl-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Cloudflare's PKI and TLS toolkit
-EAPI=6
-HOMEPAGE=https://github.com/cloudflare/cfssl
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=!!dev-lang/mono
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cloudflare/cfssl/archive/1.3.1.tar.gz -> cfssl-1.3.1.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f07aea9d578db832f0deccb9c56ac19b
diff --git a/metadata/md5-cache/app-crypt/efitools-1.8.1 b/metadata/md5-cache/app-crypt/efitools-1.8.1
index 9d18725aa270..f79dea1c781e 100644
--- a/metadata/md5-cache/app-crypt/efitools-1.8.1
+++ b/metadata/md5-cache/app-crypt/efitools-1.8.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux app-crypt/sbsigntool dev-perl/File-Slurp sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
+DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-apps/util-linux app-crypt/sbsigntool dev-perl/File-Slurp static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
 DESCRIPTION=Tools for manipulating UEFI secure boot platforms
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git
-IUSE=libressl
+IUSE=libressl static
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
+RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-apps/util-linux
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.8.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8cbbc96c00acb4161c7842abf3466e9
+_md5_=6f1a84d0ef8f7067e469c0279e25b0ae
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2 b/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2
index a1d43fe5ed91..c17023540d7c 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.4.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c88a3effcef1ac8a42251f242fa95cde
+_md5_=baa29d5a0f0b646f4215c8c78d43e586
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.8 b/metadata/md5-cache/app-crypt/gnupg-2.2.8
new file mode 100644
index 000000000000..dc48fb509f00
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo ) virtual/pkgconfig
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=6
+HOMEPAGE=http://www.gnupg.org/
+IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.8.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1074385d609eb0eb1c5a061f30b0c5a5
diff --git a/metadata/md5-cache/app-crypt/keybase-1.0.44 b/metadata/md5-cache/app-crypt/keybase-1.0.44
index bd8c7d63c796..bc20b6aae642 100644
--- a/metadata/md5-cache/app-crypt/keybase-1.0.44
+++ b/metadata/md5-cache/app-crypt/keybase-1.0.44
@@ -3,10 +3,11 @@ DEPEND=>=dev-lang/go-1.6:0 app-crypt/kbfs virtual/pkgconfig
 DESCRIPTION=Client for keybase.io
 EAPI=6
 HOMEPAGE=https://keybase.io/
+IUSE=+suid
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/keybase/client/archive/v1.0.44.tar.gz -> keybase-1.0.44.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c94e9e6a9bca448b06a51a0d9af5532d
+_md5_=ddbeb869a067b3fd9645c0a716a82189
diff --git a/metadata/md5-cache/app-crypt/keybase-9999 b/metadata/md5-cache/app-crypt/keybase-9999
index 9b23da61e752..5ac1c2b72b91 100644
--- a/metadata/md5-cache/app-crypt/keybase-9999
+++ b/metadata/md5-cache/app-crypt/keybase-9999
@@ -3,8 +3,9 @@ DEPEND=>=dev-lang/go-1.6:0 app-crypt/kbfs virtual/pkgconfig >=dev-vcs/git-1.8.2.
 DESCRIPTION=Client for keybase.io
 EAPI=6
 HOMEPAGE=https://keybase.io/
+IUSE=+suid
 LICENSE=BSD
 RDEPEND=app-crypt/gnupg
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce3af3d2fe83e2cbe1c9d3b2ec279093
+_md5_=95749e68a19e69d8fd9a05d104e4bb76
diff --git a/metadata/md5-cache/app-crypt/keylookup-2.2 b/metadata/md5-cache/app-crypt/keylookup-2.2
index b88ed8733d54..ec7886b753eb 100644
--- a/metadata/md5-cache/app-crypt/keylookup-2.2
+++ b/metadata/md5-cache/app-crypt/keylookup-2.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=A tool to fetch PGP keys from keyservers
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.palfrader.org/keylookup/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl app-crypt/gnupg
 SLOT=0
 SRC_URI=http://www.palfrader.org/keylookup/files/keylookup-2.2.tar.gz
-_md5_=833371bf8905a03c751991dead01ff56
+_md5_=a2a0506cda94e5cca3f59041a29275a1
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.16-r2 b/metadata/md5-cache/app-crypt/mit-krb5-1.16-r2
index 0a010e6bd76b..dd613da8d3d0 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.16-r2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.16-r2
@@ -4,11 +4,11 @@ DESCRIPTION=MIT Kerberos V
 EAPI=6
 HOMEPAGE=https://web.mit.edu/kerberos/www/
 IUSE=doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86
 LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,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(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[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(-)?] ) nls? ( sys-devel/gettext[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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-1.16.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ba437bbc13aa0021df01e6be81f88f47
+_md5_=696132132f7ca2c6d196da4301f941ad
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.0.0-r2 b/metadata/md5-cache/app-crypt/pinentry-1.0.0-r2
index 789e7fb5e4aa..17b8ef5c535a 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.0.0-r2
+++ b/metadata/md5-cache/app-crypt/pinentry-1.0.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=6
 HOMEPAGE=https://gnupg.org/aegypten2/index.html
 IUSE=caps emacs gnome-keyring gtk ncurses qt5 static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr )
 REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.0.0.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8532b4f97f2af98cc1ad3057b2c4a2a4
+_md5_=827e7d4de6ac59f9cd103078fa7f0687
diff --git a/metadata/md5-cache/app-crypt/qca-2.1.3-r2 b/metadata/md5-cache/app-crypt/qca-2.1.3-r2
index c62599148b18..ece202704cf1 100644
--- a/metadata/md5-cache/app-crypt/qca-2.1.3-r2
+++ b/metadata/md5-cache/app-crypt/qca-2.1.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:0 ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) ) dev-qt/qtnetwork:5 doc? ( app-doc/doxygen ) test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:0 ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) ) doc? ( app-doc/doxygen ) test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Qt Cryptographic Architecture (QCA)
 EAPI=6
 HOMEPAGE=https://userbase.kde.org/QCA
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:0 ) gcrypt? ( dev-libs/libgcrypt
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.1.3/src/qca-2.1.3.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a245d0eddda1cba0afb3c8965d84586d
+_md5_=8727e469a476712aa4c4d9499c33f3dd
diff --git a/metadata/md5-cache/app-crypt/rhash-1.3.5 b/metadata/md5-cache/app-crypt/rhash-1.3.5
index 9fcae30126ce..1a4a37d1c33e 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.3.5
+++ b/metadata/md5-cache/app-crypt/rhash-1.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Console utility and library for computing and verifying file hash su
 EAPI=6
 HOMEPAGE=http://rhash.anz.ru/
 IUSE=debug nls libressl ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl: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(-)?] ) libressl? ( dev-libs/libressl: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
 SRC_URI=mirror://sourceforge/rhash/rhash-1.3.5-src.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4aefbd488aec345d7b4bbc5c784f021d
+_md5_=d889018abdcef45fc3ff02b529d49bd4
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
index 2dc919523ec3..f4aba35579b3 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 GPL-2
 RDEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0 ) libressl? ( dev-libs/libressl ) selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=2b30b563ddde3b8eedd2fe6aa8c36b52
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0 b/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0
index 65c6cb1be802..bc4bd69039f4 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.6.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4eeeafbbf8db34967b5ec170e25d21de
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.7.0 b/metadata/md5-cache/app-crypt/yubikey-manager-0.7.0
index f3134e4cf66c..ac959c207d90 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.7.0
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/fido2[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.7.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8af1f590fefc56794d7b3261bc712e11
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 9a5f55942a2a..4c80a2b72cc4 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/aspell-en-2016.11.20.0 b/metadata/md5-cache/app-dicts/aspell-en-2016.11.20.0
index 031f6c3aa4ef..6d4759fdee47 100644
--- a/metadata/md5-cache/app-dicts/aspell-en-2016.11.20.0
+++ b/metadata/md5-cache/app-dicts/aspell-en-2016.11.20.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2016.11.20-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8150e92e02255d33450581729171deef
+_md5_=9bea218bcc35a2db90d4d38e6c50401f
diff --git a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2 b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
index 2e3811a6b201..8bfd14a3271a 100644
--- a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
+++ b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Hungarian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/hu/aspell6-hu-0.99.4.2-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=77cceb228ef0897ba7e22d60f1b5848c
+_md5_=91e9fb9b69548eb355046cd3c9aea69c
diff --git a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0 b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
index 27d0c4dc0c0b..65e2683e9d69 100644
--- a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
+++ b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Armenian language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/hy/aspell6-hy-0.10.0-0.tar.bz2
 _eclasses_=aspell-dict-r1	340906f655106dec40252eccc43e3503
-_md5_=5e0c1cff544764a8a47f1e6943fd51c1
+_md5_=122c2035c07a5d2bce3454ea10f809fd
diff --git a/metadata/md5-cache/app-dicts/myspell-cy-20130708 b/metadata/md5-cache/app-dicts/myspell-cy-20130708
index f12abd79f156..0885d6b185e8 100644
--- a/metadata/md5-cache/app-dicts/myspell-cy-20130708
+++ b/metadata/md5-cache/app-dicts/myspell-cy-20130708
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Welsh dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/gwirydd-sillafu-cymraeg-welsh-language-spell-checker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> myspell-cy-20130708.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=54459fbadd07d9bd89352188dc83d253
+_md5_=4f687adbf6eaf95b984e25a498489738
diff --git a/metadata/md5-cache/app-dicts/opendict-0.6.7 b/metadata/md5-cache/app-dicts/opendict-0.6.7
index a01691a78641..69060631321c 100644
--- a/metadata/md5-cache/app-dicts/opendict-0.6.7
+++ b/metadata/md5-cache/app-dicts/opendict-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/opendict/files/opendict-0.6.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d53b4b3e46f145382187b0159dfbbdbb
diff --git a/metadata/md5-cache/app-dicts/sword-ab-1.3 b/metadata/md5-cache/app-dicts/sword-ab-1.3
index 0620f1b6d5af..18aa6fa9b564 100644
--- a/metadata/md5-cache/app-dicts/sword-ab-1.3
+++ b/metadata/md5-cache/app-dicts/sword-ab-1.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install
 DEPEND=app-arch/unzip
 DESCRIPTION=The Apostle's Bible
-EAPI=0
+EAPI=6
 HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=AB
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=freedist
@@ -9,4 +9,4 @@ RDEPEND=app-text/sword
 SLOT=0
 SRC_URI=mirror://gentoo/AB-1.3.zip
 _eclasses_=sword-module	f93b38348e60d75f292f55df132bbac4
-_md5_=47af8b5e605da2c2488cc61448c8ab39
+_md5_=29468c206ccd7bcbc233435c4dad7a69
diff --git a/metadata/md5-cache/app-dicts/sword-abbott-1.1 b/metadata/md5-cache/app-dicts/sword-abbott-1.1
index fbd820cbc670..d85c2a702d73 100644
--- a/metadata/md5-cache/app-dicts/sword-abbott-1.1
+++ b/metadata/md5-cache/app-dicts/sword-abbott-1.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install
 DEPEND=app-arch/unzip
 DESCRIPTION=Illustrated New Testament
-EAPI=0
+EAPI=6
 HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=public-domain
@@ -9,4 +9,4 @@ RDEPEND=app-text/sword
 SLOT=0
 SRC_URI=mirror://gentoo/Abbott-1.1.zip
 _eclasses_=sword-module	f93b38348e60d75f292f55df132bbac4
-_md5_=ce9549673a1337aff873a8abc250b997
+_md5_=fba54edb657b88ad691df71b5a9d5d20
diff --git a/metadata/md5-cache/app-dicts/sword-klviklingon_en-2.1 b/metadata/md5-cache/app-dicts/sword-klviklingon_en-2.1
index 4b8d38e016be..89db7042e5ab 100644
--- a/metadata/md5-cache/app-dicts/sword-klviklingon_en-2.1
+++ b/metadata/md5-cache/app-dicts/sword-klviklingon_en-2.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install
 DEPEND=app-arch/unzip
 DESCRIPTION=Klingon Language Version Klingon to English mapping lexicon
-EAPI=0
+EAPI=6
 HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLViklingon_en
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=public-domain
@@ -9,4 +9,4 @@ RDEPEND=app-text/sword
 SLOT=0
 SRC_URI=mirror://gentoo/KLViklingon_en-2.1.zip
 _eclasses_=sword-module	f93b38348e60d75f292f55df132bbac4
-_md5_=1af264ad5b7c53a43ce911a48d5652a8
+_md5_=bc6b740d79bcb1ddf63a47bab3d4a9ac
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 4231734893a7..a48cbb0224a0 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/devmanual-0_pre20141116 b/metadata/md5-cache/app-doc/devmanual-0_pre20141116
index ffa009e5f054..8469275fc670 100644
--- a/metadata/md5-cache/app-doc/devmanual-0_pre20141116
+++ b/metadata/md5-cache/app-doc/devmanual-0_pre20141116
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=CC-BY-SA-2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/devmanual-0_pre20141116.tar.gz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=29fc17a51063da4e25cb135e56d8ca87
diff --git a/metadata/md5-cache/app-doc/devmanual-9999 b/metadata/md5-cache/app-doc/devmanual-9999
index 163c65e2dd6e..6312e8805490 100644
--- a/metadata/md5-cache/app-doc/devmanual-9999
+++ b/metadata/md5-cache/app-doc/devmanual-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://devmanual.gentoo.org/
 LICENSE=CC-BY-SA-2.0
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=29fc17a51063da4e25cb135e56d8ca87
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.13-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.13-r1
index 3c9c5d2868c3..36744f85f319 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.13-r1
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.13-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=6
 HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
 IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-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 ~x86-solaris
+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 ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.13.src.tar.gz https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d22c9a217d9129697afbf706909c2e9
+_md5_=c8685d20b1da26d5ec25bc30377f85ad
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.13-r2 b/metadata/md5-cache/app-doc/doxygen-1.8.13-r2
deleted file mode 100644
index 85d0932e9bdb..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.8.13-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Documentation system for most programming languages
-EAPI=6
-HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
-IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-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 ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=doc? ( latex )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.13.src.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96fd3ef3d8d0263b56597a5b248942cd
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.14 b/metadata/md5-cache/app-doc/doxygen-1.8.14
deleted file mode 100644
index e2678433f7b1..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.8.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Documentation system for most programming languages
-EAPI=6
-HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
-IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-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 ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=doc? ( latex )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.14.src.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c7b75705e69d8110b9f4c1e0ce38bfee
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.14-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.14-r1
new file mode 100644
index 000000000000..886a256aaa51
--- /dev/null
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.14-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Documentation system for most programming languages
+EAPI=6
+HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
+IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
+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 ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=doc? ( latex )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.14.src.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a4e77bdc39ad3b235dd443a20b274450
diff --git a/metadata/md5-cache/app-doc/doxygen-9999 b/metadata/md5-cache/app-doc/doxygen-9999
index 61151116e252..0138d1053d01 100644
--- a/metadata/md5-cache/app-doc/doxygen-9999
+++ b/metadata/md5-cache/app-doc/doxygen-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
+DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Documentation system for most programming languages
 EAPI=6
 HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
 IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
 LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5dd9ff3ccb15e302730dcf5003fe6fc8
+_md5_=d9bc667c97af64ba7a9e211910a8adaf
diff --git a/metadata/md5-cache/app-doc/linux-device-drivers-2 b/metadata/md5-cache/app-doc/linux-device-drivers-2
index 13bb0577149a..143f5d827e94 100644
--- a/metadata/md5-cache/app-doc/linux-device-drivers-2
+++ b/metadata/md5-cache/app-doc/linux-device-drivers-2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DEPEND=app-arch/unzip
 DESCRIPTION=howto write linux device drivers (updated for Linux 2.4)
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.oreilly.com/catalog/linuxdrive2/
 KEYWORDS=amd64 arm hppa ia64 ppc s390 x86
 LICENSE=FDL-1.1
 SLOT=2
 SRC_URI=http://www.xml.com/ldd/chapter/book/pdf/ldd_book_pdf.zip ftp://ftp.oreilly.com/examples/linuxdrive2/ldd2-samples-1.0.1.tar.gz
-_md5_=578ca01f3b174cc3b05837fceef9e1bf
+_md5_=9e32625555dcd2fb4eb055941c9935f0
diff --git a/metadata/md5-cache/app-doc/linux-device-drivers-3 b/metadata/md5-cache/app-doc/linux-device-drivers-3
index 03f22f2186e2..576f941d6431 100644
--- a/metadata/md5-cache/app-doc/linux-device-drivers-3
+++ b/metadata/md5-cache/app-doc/linux-device-drivers-3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=howto write linux device drivers (updated for Linux 2.6)
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.oreilly.com/catalog/linuxdrive3/ http://lwn.net/Kernel/LDD3/
 KEYWORDS=amd64 arm hppa ia64 ppc s390 sh x86
 LICENSE=CC-BY-SA-2.0
 SLOT=3
 SRC_URI=http://lwn.net/images/pdf/LDD3/ldd3_pdf.tar.bz2 mirror://gentoo/LDD3-examples.tar.gz
-_md5_=502d424d956fc78535de4ab327153c09
+_md5_=be3127d3d5711f122956ed2f79222791
diff --git a/metadata/md5-cache/app-doc/mkdoxy-1.0.0 b/metadata/md5-cache/app-doc/mkdoxy-1.0.0
deleted file mode 100644
index a7e9c0352ba7..000000000000
--- a/metadata/md5-cache/app-doc/mkdoxy-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-doc/doxygen >=dev-lang/perl-5
-DESCRIPTION=mkDoxy generates Doxygen-compatible HTML documentation for makefiles
-EAPI=0
-HOMEPAGE=https://sourceforge.net/projects/mkdoxy/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86
-LICENSE=BSD
-RDEPEND=app-doc/doxygen >=dev-lang/perl-5
-SLOT=0
-SRC_URI=mirror://sourceforge/mkdoxy/mkdoxy-1.0.0.tar.gz
-_md5_=8f31037667da3d63684859d68a438f20
diff --git a/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1 b/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
index 2da8be2100c4..02a526553a10 100644
--- a/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
+++ b/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
@@ -3,8 +3,8 @@ DEPEND=app-doc/doxygen >=dev-lang/perl-5
 DESCRIPTION=mkDoxy generates Doxygen-compatible HTML documentation for makefiles
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/mkdoxy/
-KEYWORDS=~alpha amd64 hppa ia64 ppc sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/mkdoxy/mkdoxy-1.0.0.tar.gz
-_md5_=162ce641f05cf84b0d51b2b9d8e4d23d
+_md5_=05b28b138d7d2169554eedf4ab890970
diff --git a/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r2 b/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r2
index c00221e04ce5..7b0022f81a37 100644
--- a/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r2
+++ b/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r2
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-
 LICENSE=OPL
 SLOT=0
 SRC_URI=ftp://ftp.ics.com/openmotif/openmotif-2.3.0-manual.pdf.tgz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=a00de83a469be17e6d5b3a9b77198cd2
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index b1e06f14e4f6..5bcaff692615 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/emacs-23.4-r17 b/metadata/md5-cache/app-editors/emacs-23.4-r17
index e6b6863b2694..24f8c3d676a6 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r17
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r17
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c
 REQUIRED_USE=?? ( aqua X )
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-21.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=69bd7e19651947e24e92013f9e75322e
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r5 b/metadata/md5-cache/app-editors/emacs-24.5-r5
index 93102d32a8ca..a85689eccc02 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r5
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r5
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad161661680242712e06812f51b35d9c
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r4 b/metadata/md5-cache/app-editors/emacs-25.3-r4
index 75caad2bb618..755aa175669d 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r4
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c
 REQUIRED_USE=?? ( aqua X )
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e838e73282401024e00ad442dd4106b9
diff --git a/metadata/md5-cache/app-editors/emacs-26.1 b/metadata/md5-cache/app-editors/emacs-26.1
index 547be09a1f66..f538ae629626 100644
--- a/metadata/md5-cache/app-editors/emacs-26.1
+++ b/metadata/md5-cache/app-editors/emacs-26.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c
 REQUIRED_USE=?? ( aqua X )
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f12a795c75d0fd2267a8efe9969341e8
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-26.1.9999 b/metadata/md5-cache/app-editors/emacs-vcs-26.1.9999
index 50d4712aa5c4..d72f40829ae5 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-26.1.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-26.1.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=26
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da09b867d33e43bbcc76f4d81d7e6eb5
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999 b/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
index 03c9f507cd33..661f158f49d1 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=27
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5668c63ed927628935d3155be9ec1e46
diff --git a/metadata/md5-cache/app-editors/gvim-8.1.0034 b/metadata/md5-cache/app-editors/gvim-8.1.0034
new file mode 100644
index 000000000000..3e1faba18464
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-8.1.0034
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.1.0034 >=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 ) !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.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+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 ~arm64 ~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.1.0034 >=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 ) !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.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) 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.1.0034.tar.gz -> vim-8.1.0034.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec747914aa624dba0602c911b803e97f
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 425b8b80da8c..b55b70c667f0 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~app-editors/vim-core-9999 >=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.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=~app-editors/vim-core-9999 >=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 ) !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.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 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
 LICENSE=vim
-RDEPEND=~app-editors/vim-core-9999 >=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.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9999 >=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 ) !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.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) 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
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=157e217532e4d3c7d0538261ffecf766
+_md5_=ec747914aa624dba0602c911b803e97f
diff --git a/metadata/md5-cache/app-editors/jedit-5.2.0-r1 b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
index c4278c18abe8..b8f9176aadee 100644
--- a/metadata/md5-cache/app-editors/jedit-5.2.0-r1
+++ b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-java/bsh:0 dev-java/jsr305:0 dev-java/ant-contrib:0 dev-java/ant-apache-bsf:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.2.0source.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c5b3c487a3cc0bb29f7d8423d48c65e
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7760eec716cb10e10b228a73c691d297
diff --git a/metadata/md5-cache/app-editors/jedit-5.4.0 b/metadata/md5-cache/app-editors/jedit-5.4.0
index 57d7f9da3a11..f23182f9025b 100644
--- a/metadata/md5-cache/app-editors/jedit-5.4.0
+++ b/metadata/md5-cache/app-editors/jedit-5.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.4.0source.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2947ddefed1d87160008a7c10afd29e6
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c443e73b58ac0d64096f78ef00a85e9f
diff --git a/metadata/md5-cache/app-editors/kile-2.9.91_p20171209 b/metadata/md5-cache/app-editors/kile-2.9.91_p20171209
deleted file mode 100644
index 6580ed489c39..000000000000
--- a/metadata/md5-cache/app-editors/kile-2.9.91_p20171209
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdoctools-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/okular-14.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[qt5] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Latex Editor and TeX shell based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://kile.sourceforge.io/
-IUSE=+pdf +png debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=FDL-1.2 GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdoctools-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/okular-14.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-14.12.0:5 >=kde-apps/okular-14.12.0:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=https://github.com/KDE/kile/archive/dab0507f1df74ee66f88bdb4b294179605df60f4.tar.gz -> kile-2.9.91_p20171209.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=645733828d410fa886fb4328d9af329b
diff --git a/metadata/md5-cache/app-editors/kile-2.9.92 b/metadata/md5-cache/app-editors/kile-2.9.92
index acea4aed9297..db8e755a9da7 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.92
+++ b/metadata/md5-cache/app-editors/kile-2.9.92
@@ -4,10 +4,10 @@ DESCRIPTION=Latex Editor and TeX shell based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://kile.sourceforge.io/
 IUSE=+pdf +png debug +handbook
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=FDL-1.2 GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/kdoctools-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/khtml-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kinit-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/okular-14.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-14.12.0:5 >=kde-apps/okular-14.12.0:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kile/kile-2.9.92.tar.bz2
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3cff797b8045bb1fa48ea7bd4dbb9927
+_md5_=f1ba6770546e81551f08d66e4e1478bd
diff --git a/metadata/md5-cache/app-editors/mg-20170828 b/metadata/md5-cache/app-editors/mg-20170828
deleted file mode 100644
index e8071b66e4a2..000000000000
--- a/metadata/md5-cache/app-editors/mg-20170828
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
-DESCRIPTION=MicroGnuEmacs, a port from the BSDs
-EAPI=6
-HOMEPAGE=https://homepage.boetes.org/software/mg/
-IUSE=livecd
-KEYWORDS=alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
-SLOT=0
-SRC_URI=https://homepage.boetes.org/software/mg/mg-20170828.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=14f7277cdb99f67ee4e33d6ef7944ea1
diff --git a/metadata/md5-cache/app-editors/mg-20180408 b/metadata/md5-cache/app-editors/mg-20180408
new file mode 100644
index 000000000000..b0172245c8b9
--- /dev/null
+++ b/metadata/md5-cache/app-editors/mg-20180408
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pkgconfig
+DESCRIPTION=MicroGnuEmacs, a port from the BSDs
+EAPI=7
+HOMEPAGE=https://homepage.boetes.org/software/mg/
+IUSE=livecd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
+SLOT=0
+SRC_URI=https://github.com/hboetes/mg/archive/20180408.tar.gz -> mg-20180408.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=78e071e1b6098d88e54ff2e8f0fadca9
diff --git a/metadata/md5-cache/app-editors/nano-2.9.6 b/metadata/md5-cache/app-editors/nano-2.9.6
deleted file mode 100644
index 73d8b1cd4070..000000000000
--- a/metadata/md5-cache/app-editors/nano-2.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!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 ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
-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 ~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.9/nano-2.9.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ba334a4032e57c9e2d888e1cc8bf11eb
diff --git a/metadata/md5-cache/app-editors/nano-2.9.8 b/metadata/md5-cache/app-editors/nano-2.9.8
new file mode 100644
index 000000000000..994c2a5216b5
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-2.9.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!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 ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
+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 ~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.9/nano-2.9.8.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ba334a4032e57c9e2d888e1cc8bf11eb
diff --git a/metadata/md5-cache/app-editors/teco-1.00-r4 b/metadata/md5-cache/app-editors/teco-1.00-r4
index 5aba103ac18b..199d6f58eb62 100644
--- a/metadata/md5-cache/app-editors/teco-1.00-r4
+++ b/metadata/md5-cache/app-editors/teco-1.00-r4
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=sys-libs/ncurses:0
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz doc? ( mirror://gentoo/tecolore.txt.gz mirror://gentoo/tech.txt.gz mirror://gentoo/teco.doc.gz mirror://gentoo/tecoprog.doc.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6028d318a98195c814e4d907b4488607
diff --git a/metadata/md5-cache/app-editors/vim-8.0.1298 b/metadata/md5-cache/app-editors/vim-8.0.1298
index bd626e834fec..8f3ac710e418 100644
--- a/metadata/md5-cache/app-editors/vim-8.0.1298
+++ b/metadata/md5-cache/app-editors/vim-8.0.1298
@@ -4,11 +4,11 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager 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 arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1298 dev-util/ctags ) 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 ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 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	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=c9accdddbe544e6eeb3b647bf4298628
+_md5_=e85bf788be58c38fe55c688482e2c7d9
diff --git a/metadata/md5-cache/app-editors/vim-8.1.0034 b/metadata/md5-cache/app-editors/vim-8.1.0034
new file mode 100644
index 000000000000..18773423b3ad
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-8.1.0034
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.0034 dev-util/ctags ) 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.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager 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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.0034 dev-util/ctags ) 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.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+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.1.0034.tar.gz -> vim-8.1.0034.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=f8ed57a036b344f607abf197a4c1d51d
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.1298 b/metadata/md5-cache/app-editors/vim-core-8.0.1298
index f2d5aa61ff67..923d7d397983 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.1298
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.1298
@@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=nls acl minimal
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 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	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=1a218cceabb40bf4d4de0724178f3cea
+_md5_=940ab938f93e34a02ee63c39e41795e8
diff --git a/metadata/md5-cache/app-editors/vim-core-8.1.0034 b/metadata/md5-cache/app-editors/vim-core-8.1.0034
new file mode 100644
index 000000000000..e5358403a299
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-core-8.1.0034
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=nls acl minimal
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.1.0034.tar.gz -> vim-8.1.0034.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=7d531716359d739145efb6f2ed2fb600
diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999
index d162aacd98ef..db35ab5115d7 100644
--- a/metadata/md5-cache/app-editors/vim-core-9999
+++ b/metadata/md5-cache/app-editors/vim-core-9999
@@ -8,4 +8,4 @@ LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=270757509200029d6bc809620769bf83
+_md5_=7d531716359d739145efb6f2ed2fb600
diff --git a/metadata/md5-cache/app-editors/zile-2.4.14 b/metadata/md5-cache/app-editors/zile-2.4.14
index 1b918959c904..8766897a3d59 100644
--- a/metadata/md5-cache/app-editors/zile-2.4.14
+++ b/metadata/md5-cache/app-editors/zile-2.4.14
@@ -4,10 +4,10 @@ DESCRIPTION=Zile is a small Emacs clone
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/zile/
 IUSE=acl test
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.2:= sys-libs/ncurses:0= acl? ( virtual/acl )
 SLOT=0
 SRC_URI=mirror://gnu/zile/zile-2.4.14.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=839dc9a77b70c083932c2bd91a6723fc
+_md5_=cf8384e34917d25dea6c457b8e62d592
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index a0f3f38c4e12..719e529aae52 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20120405 b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20120405
index 047e9a0191c9..1b60f6504b41 100644
--- a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20120405
+++ b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20120405
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/austinhaas/actionscript-mode/tarball/aa7e63d566a815152e7e652010becd46a406abb2 -> actionscript-mode-7.2.2_p20120405.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=e0966953bb0ee16ca2ffabe326c95be6
diff --git a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20140605 b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20140605
index 72687838adfd..968d90a19cd2 100644
--- a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20140605
+++ b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20140605
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/austinhaas/actionscript-mode/tarball/6822d0bfd5d7ff2c0b246ca90ef9480d3c528b97 -> actionscript-mode-7.2.2_p20140605.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=1e56fa6b1ff705b3bad634000b928d55
diff --git a/metadata/md5-cache/app-emacs/adaptive-wrap-0.5 b/metadata/md5-cache/app-emacs/adaptive-wrap-0.5
index a940ceed8a70..49ef5ce6fa1a 100644
--- a/metadata/md5-cache/app-emacs/adaptive-wrap-0.5
+++ b/metadata/md5-cache/app-emacs/adaptive-wrap-0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/adaptive-wrap-0.5.el
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=83e875035ffad89385a03e77ac48ed82
diff --git a/metadata/md5-cache/app-emacs/analog-1.9.99 b/metadata/md5-cache/app-emacs/analog-1.9.99
index fbbf4dd9965d..cd999c32eae1 100644
--- a/metadata/md5-cache/app-emacs/analog-1.9.99
+++ b/metadata/md5-cache/app-emacs/analog-1.9.99
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/analog-1.9.99.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=75f704bb9b2d72766e7d87f624b783d6
diff --git a/metadata/md5-cache/app-emacs/anything-1.3.2 b/metadata/md5-cache/app-emacs/anything-1.3.2
index 6e18ffb31bbc..7981ff4b178e 100644
--- a/metadata/md5-cache/app-emacs/anything-1.3.2
+++ b/metadata/md5-cache/app-emacs/anything-1.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/anything-1.3.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=16b48a21ba6876fa9133a53659d04ca3
diff --git a/metadata/md5-cache/app-emacs/apache-mode-1.1 b/metadata/md5-cache/app-emacs/apache-mode-1.1
index 94e81b3ca7b5..d62c403d796b 100644
--- a/metadata/md5-cache/app-emacs/apache-mode-1.1
+++ b/metadata/md5-cache/app-emacs/apache-mode-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/apache-mode-1.1.el.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=ab97577be0a372ee3bc4f90f14faa3f1
diff --git a/metadata/md5-cache/app-emacs/apel-10.8-r1 b/metadata/md5-cache/app-emacs/apel-10.8-r1
index decde8107713..743f9865be56 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8-r1
+++ b/metadata/md5-cache/app-emacs/apel-10.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=ftp://ftp.jpl.org/pub/elisp/apel/apel-10.8.tar.gz https://dev.gentoo.org/~gienah/2big4tree/app-emacs/apel/apel-10.8-030_Use-new-style-backquotes.patch.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=1ee795580f54ca9a62ec640a07224c92
diff --git a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0 b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
index 0191c64efa73..b4a09360a4a2 100644
--- a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
+++ b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/websocket >=virtual/emacs-25
 SLOT=0
 SRC_URI=https://github.com/alpha22jp/atomic-chrome/archive/v2.0.0.tar.gz -> atomic-chrome-2.0.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=05fb60580edb6036dc0dd7411f3e627c
diff --git a/metadata/md5-cache/app-emacs/auctex-11.89 b/metadata/md5-cache/app-emacs/auctex-11.89
index b4df52cb20ae..b69b67f6a91a 100644
--- a/metadata/md5-cache/app-emacs/auctex-11.89
+++ b/metadata/md5-cache/app-emacs/auctex-11.89
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-11.89.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=1d5e5beef4e4f8cb34a69d02a4c5e0d7
diff --git a/metadata/md5-cache/app-emacs/auctex-11.90 b/metadata/md5-cache/app-emacs/auctex-11.90
index b214f56369ba..68a9be8f4a7a 100644
--- a/metadata/md5-cache/app-emacs/auctex-11.90
+++ b/metadata/md5-cache/app-emacs/auctex-11.90
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-11.90.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=38fea10d9f5040b95d3435bc534fb7eb
diff --git a/metadata/md5-cache/app-emacs/auctex-11.92 b/metadata/md5-cache/app-emacs/auctex-11.92
index cb044dbaa15d..e18d668296d1 100644
--- a/metadata/md5-cache/app-emacs/auctex-11.92
+++ b/metadata/md5-cache/app-emacs/auctex-11.92
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-11.92.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=f323736e1d87895fef3529033cf7b879
diff --git a/metadata/md5-cache/app-emacs/auctex-12.1 b/metadata/md5-cache/app-emacs/auctex-12.1
index 893d62d3a915..b4f5d286cf9d 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.1
+++ b/metadata/md5-cache/app-emacs/auctex-12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=5242d1e86b687bce5e0b8278c8909eea
diff --git a/metadata/md5-cache/app-emacs/auto-complete-1.3.1 b/metadata/md5-cache/app-emacs/auto-complete-1.3.1
index 2ce3df0e0b1d..d04a0d3537e2 100644
--- a/metadata/md5-cache/app-emacs/auto-complete-1.3.1
+++ b/metadata/md5-cache/app-emacs/auto-complete-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://cx4a.org/pub/auto-complete/auto-complete-1.3.1.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=353e561a404a4db73fd756e3d72ad448
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.69 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69
index 0324ff074baf..6323b4f3597b 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.69
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.69
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Emacs major modes for editing autoconf and autotest input
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=85adecaf954ea8b26c99e09f13fdf432
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_md5_=a948ca0e5e18cfee7ee797e20750664a
diff --git a/metadata/md5-cache/app-emacs/basic-toolkit-0.3 b/metadata/md5-cache/app-emacs/basic-toolkit-0.3
index c73057de9ffa..cf82338dd921 100644
--- a/metadata/md5-cache/app-emacs/basic-toolkit-0.3
+++ b/metadata/md5-cache/app-emacs/basic-toolkit-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/windows app-emacs/cycle-buffer >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/basic-toolkit-0.3.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=0c230d096a7327451b5e32ee55203705
diff --git a/metadata/md5-cache/app-emacs/bbdb-2.35-r1 b/metadata/md5-cache/app-emacs/bbdb-2.35-r1
index 0b10ad34d4a1..c58d40c6d5e9 100644
--- a/metadata/md5-cache/app-emacs/bbdb-2.35-r1
+++ b/metadata/md5-cache/app-emacs/bbdb-2.35-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=tex? ( virtual/tex-base ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://bbdb.sourceforge.net/bbdb-2.35.tar.gz http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/point-at.el http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=c7c46092f21d39aef87dd8af20b24bca
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.1.2 b/metadata/md5-cache/app-emacs/bbdb-3.1.2
index 4025afcc93d7..87f4d9a245e5 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.1.2
+++ b/metadata/md5-cache/app-emacs/bbdb-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=tex? ( virtual/tex-base ) vm? ( app-emacs/vm ) >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=c5d64fbd5cc261242cd6c4bdb4690a31
diff --git a/metadata/md5-cache/app-emacs/binclock-1.7-r1 b/metadata/md5-cache/app-emacs/binclock-1.7-r1
index 1d153f7aa075..ed512898c312 100644
--- a/metadata/md5-cache/app-emacs/binclock-1.7-r1
+++ b/metadata/md5-cache/app-emacs/binclock-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/binclock-1.7.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=9e1faba3da55aff056e752ee3152fb8f
diff --git a/metadata/md5-cache/app-emacs/bison-mode-0.3 b/metadata/md5-cache/app-emacs/bison-mode-0.3
index 8ff3b2246f49..99965632d1b4 100644
--- a/metadata/md5-cache/app-emacs/bison-mode-0.3
+++ b/metadata/md5-cache/app-emacs/bison-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~nicolasbock/bison-mode-0.3.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=f6114b331d83c9457c02563141761d21
diff --git a/metadata/md5-cache/app-emacs/blogmax-20110305 b/metadata/md5-cache/app-emacs/blogmax-20110305
index 0caa3772727f..17ee8d7e93d7 100644
--- a/metadata/md5-cache/app-emacs/blogmax-20110305
+++ b/metadata/md5-cache/app-emacs/blogmax-20110305
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20110305.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93a360bdc45a7fc2b8e172fdae55b86e
diff --git a/metadata/md5-cache/app-emacs/bm-1.32_p20140214 b/metadata/md5-cache/app-emacs/bm-1.32_p20140214
index fd3d2e3af764..adbc116cc1b9 100644
--- a/metadata/md5-cache/app-emacs/bm-1.32_p20140214
+++ b/metadata/md5-cache/app-emacs/bm-1.32_p20140214
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/bm-1.32_p20140214.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6df1ff33b1abbb61255de347bbe6d2e7
diff --git a/metadata/md5-cache/app-emacs/bongo-20110621 b/metadata/md5-cache/app-emacs/bongo-20110621
index 7515d8dd5f38..6cc8e4e2b6d2 100644
--- a/metadata/md5-cache/app-emacs/bongo-20110621
+++ b/metadata/md5-cache/app-emacs/bongo-20110621
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=app-emacs/volume >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/bongo-20110621.tar.xz mplayer? ( mirror://gentoo/bongo-mplayer-20070204.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f0bf496d9ab7628f9cc714088551254
diff --git a/metadata/md5-cache/app-emacs/boxquote-1.23 b/metadata/md5-cache/app-emacs/boxquote-1.23
index c056d80079c5..c63ceb2ed2e0 100644
--- a/metadata/md5-cache/app-emacs/boxquote-1.23
+++ b/metadata/md5-cache/app-emacs/boxquote-1.23
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/boxquote-1.23.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5685256c9b4473f8248fa8c83a380f38
diff --git a/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c b/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
index 29b5b081f913..1f7590d6ae49 100644
--- a/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
+++ b/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/browse-kill-ring-1.3c.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=be646652641940aa5dc7128e2f3358a1
diff --git a/metadata/md5-cache/app-emacs/bubblet-0.74-r1 b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
index 3d81b463be0c..0425d3b71071 100644
--- a/metadata/md5-cache/app-emacs/bubblet-0.74-r1
+++ b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/bubblet-0.74.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=9d7df46d5874f4b531cd6b46ff4fc67f
diff --git a/metadata/md5-cache/app-emacs/buffer-extension-0.1 b/metadata/md5-cache/app-emacs/buffer-extension-0.1
index 422e6f22b237..cd01009c1fbc 100644
--- a/metadata/md5-cache/app-emacs/buffer-extension-0.1
+++ b/metadata/md5-cache/app-emacs/buffer-extension-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/basic-toolkit >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/buffer-extension-0.1.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=1125e52ab92d346c6b0d7d932387d58b
diff --git a/metadata/md5-cache/app-emacs/calfw-1.3 b/metadata/md5-cache/app-emacs/calfw-1.3
index 346ef3965bef..c5f75ecd2cdd 100644
--- a/metadata/md5-cache/app-emacs/calfw-1.3
+++ b/metadata/md5-cache/app-emacs/calfw-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=howm? ( app-emacs/howm ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-calfw/tarball/v1.3 -> calfw-1.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=807579a59bc02455c0ad316b0470bad0
diff --git a/metadata/md5-cache/app-emacs/chess-2.0.4 b/metadata/md5-cache/app-emacs/chess-2.0.4
index d15bfb472b3b..995f07e7a89f 100644
--- a/metadata/md5-cache/app-emacs/chess-2.0.4
+++ b/metadata/md5-cache/app-emacs/chess-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=|| ( games-board/stockfish games-board/fruit games-board/gnuchess games-board/phalanx games-board/sjeng games-board/crafty ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/chess-2.0.4.tar.xz mirror://gentoo/emacs-chess-sounds-2.0.tar.bz2 mirror://gentoo/emacs-chess-pieces-2.0.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=2194ac6c05f7510540879af6ef8162af
diff --git a/metadata/md5-cache/app-emacs/circe-1.3 b/metadata/md5-cache/app-emacs/circe-1.3
index 488e98ac1493..87b8bf7e33df 100644
--- a/metadata/md5-cache/app-emacs/circe-1.3
+++ b/metadata/md5-cache/app-emacs/circe-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/circe-1.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=e53068bd0c5540275cec98e010046420
diff --git a/metadata/md5-cache/app-emacs/circe-2.7 b/metadata/md5-cache/app-emacs/circe-2.7
index d34975c19243..6a5eed2252f2 100644
--- a/metadata/md5-cache/app-emacs/circe-2.7
+++ b/metadata/md5-cache/app-emacs/circe-2.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.7.tar.gz -> circe-2.7.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=622a1229176cfeb5e2ba5ce0c3339a14
diff --git a/metadata/md5-cache/app-emacs/cldoc-1.16 b/metadata/md5-cache/app-emacs/cldoc-1.16
index b8c6b5fa81b5..11f0bd746cf8 100644
--- a/metadata/md5-cache/app-emacs/cldoc-1.16
+++ b/metadata/md5-cache/app-emacs/cldoc-1.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/slime >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/cldoc-1.16.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5649f4938b9311309d03cd39327db3fa
diff --git a/metadata/md5-cache/app-emacs/cmail-2.62-r1 b/metadata/md5-cache/app-emacs/cmail-2.62-r1
index fceb13d7d008..bd39a0c5b048 100644
--- a/metadata/md5-cache/app-emacs/cmail-2.62-r1
+++ b/metadata/md5-cache/app-emacs/cmail-2.62-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-emacs/apel virtual/emacs-flim app-emacs/semi >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/cmail/2191/cmail-2.62.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=c9cd281334ace0d142e2187b3255d1bd
diff --git a/metadata/md5-cache/app-emacs/color-browser-0.3-r1 b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
index d449cf4e8968..4b8da340d6fe 100644
--- a/metadata/md5-cache/app-emacs/color-browser-0.3-r1
+++ b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/color-browser-0.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=84f683ae4d80a8f1c9b7806d08654798
diff --git a/metadata/md5-cache/app-emacs/color-moccur-2.73 b/metadata/md5-cache/app-emacs/color-moccur-2.73
index 47099e6f2f85..b75d701e7384 100644
--- a/metadata/md5-cache/app-emacs/color-moccur-2.73
+++ b/metadata/md5-cache/app-emacs/color-moccur-2.73
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/color-moccur-2.73.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=88523ed9159a2dd28b347df8139b690c
diff --git a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1 b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
index 50c80a40257a..59ba645069f7 100644
--- a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
+++ b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/color-theme/color-theme-6.6.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1f178526650674e4162eefcbf31c3bd1
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.6.14 b/metadata/md5-cache/app-emacs/company-mode-0.6.14
index 5495f99c483b..1a4d00c794b5 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.6.14
+++ b/metadata/md5-cache/app-emacs/company-mode-0.6.14
@@ -10,5 +10,5 @@ RDEPEND=ropemacs? ( app-emacs/pymacs ) ropemacs? ( dev-python/ropemacs ) >=virtu
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.6.14.tar.gz -> company-mode-0.6.14.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=67897dab04be20a955654811f546d4a3
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.7 b/metadata/md5-cache/app-emacs/company-mode-0.7
index 141448fc30b7..1a57cbc5b720 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.7
+++ b/metadata/md5-cache/app-emacs/company-mode-0.7
@@ -10,5 +10,5 @@ RDEPEND=ropemacs? ( app-emacs/pymacs ) ropemacs? ( dev-python/ropemacs ) >=virtu
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.7.tar.gz -> company-mode-0.7.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=67897dab04be20a955654811f546d4a3
diff --git a/metadata/md5-cache/app-emacs/crontab-mode-1.20 b/metadata/md5-cache/app-emacs/crontab-mode-1.20
index d0843a97365f..f394354be946 100644
--- a/metadata/md5-cache/app-emacs/crontab-mode-1.20
+++ b/metadata/md5-cache/app-emacs/crontab-mode-1.20
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/crontab-mode-1.20.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=20eed63c32d49e35eff076b103006f65
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.92 b/metadata/md5-cache/app-emacs/crypt++-2.92
index f14f3774e49b..9f55aaf01a4b 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.92
+++ b/metadata/md5-cache/app-emacs/crypt++-2.92
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/crypt++el/crypt++el_2.92.orig.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=4aed8484b69e882ca00d5dea4bd9a32f
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430 b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
index d0c184ad4464..d84571e6d001 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
+++ b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/crypt++-2.94_pre20080430.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=f58e55ff624a1d04965eea2ef384ec98
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.7.0-r1 b/metadata/md5-cache/app-emacs/csharp-mode-0.7.0-r1
index eb6d8384cab4..7325a768aa88 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-0.7.0-r1
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.7.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://mfgames.com/releases/csharp-mode/csharp-mode-0.7.0.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=9ba3dd4c977e2bc9859b7af896b5c651
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.9.0 b/metadata/md5-cache/app-emacs/csharp-mode-0.9.0
index 08bc4c9bad95..52591d77a53f 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-0.9.0
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.9.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/josteink/csharp-mode/archive/v0.9.0.tar.gz -> csharp-mode-0.9.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=6866f35edbe30391a54f6474bd9c79ed
diff --git a/metadata/md5-cache/app-emacs/css-mode-0.11-r1 b/metadata/md5-cache/app-emacs/css-mode-0.11-r1
index 1d40a1d26c1e..ee85bab661d3 100644
--- a/metadata/md5-cache/app-emacs/css-mode-0.11-r1
+++ b/metadata/md5-cache/app-emacs/css-mode-0.11-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/css-mode-0.11.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=f7443342a076810d5d14663373a0bae1
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.50 b/metadata/md5-cache/app-emacs/csv-mode-1.50
index eaf8e31a1110..f2cbf70d4ad3 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.50
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.50
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/csv-mode-1.50.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=7389fadcab84aae669fa7a7694f5cd0e
diff --git a/metadata/md5-cache/app-emacs/cycle-buffer-2.16 b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
index 172030cba754..c4246282e3c1 100644
--- a/metadata/md5-cache/app-emacs/cycle-buffer-2.16
+++ b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/cycle-buffer-2.16.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=4be7ed4e297b2ed839d87a67103beca2
diff --git a/metadata/md5-cache/app-emacs/d-mode-2.0.6 b/metadata/md5-cache/app-emacs/d-mode-2.0.6
index 637b215df9cd..7a13d4481e7b 100644
--- a/metadata/md5-cache/app-emacs/d-mode-2.0.6
+++ b/metadata/md5-cache/app-emacs/d-mode-2.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.6.tar.gz -> d-mode-2.0.6.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6f6ea9e0f8d0f499f9b6e42023b4f3cc
diff --git a/metadata/md5-cache/app-emacs/dash-2.13.0 b/metadata/md5-cache/app-emacs/dash-2.13.0
index 869cc9956606..79e4d2a15247 100644
--- a/metadata/md5-cache/app-emacs/dash-2.13.0
+++ b/metadata/md5-cache/app-emacs/dash-2.13.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.13.0.tar.gz -> dash-2.13.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=ec6f430e0dbf9ddd86bd15258dc71305
diff --git a/metadata/md5-cache/app-emacs/dash-2.14.1 b/metadata/md5-cache/app-emacs/dash-2.14.1
new file mode 100644
index 000000000000..c72d973ef166
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/dash-2.14.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=sys-apps/texinfo >=virtual/emacs-23
+DESCRIPTION=A modern list library for Emacs
+EAPI=6
+HOMEPAGE=https://github.com/magnars/dash.el
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/magnars/dash.el/archive/2.14.1.tar.gz -> dash-2.14.1.tar.gz
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=6ce1b5a990717c85a8af9f04ca8e8721
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.1 b/metadata/md5-cache/app-emacs/ddskk-16.1
index d47515f67869..6c8b5f0b63c9 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.1
+++ b/metadata/md5-cache/app-emacs/ddskk-16.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c
 _md5_=0a951dc90a5d6b347a711e3a562a9a9e
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.2 b/metadata/md5-cache/app-emacs/ddskk-16.2
index 877857e62f56..af2162f5abad 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.2
+++ b/metadata/md5-cache/app-emacs/ddskk-16.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 ) virtual/rubygems ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c
 _md5_=8703ecfbd004a57a1bd315f77f1c48d8
diff --git a/metadata/md5-cache/app-emacs/desktop+-0.2 b/metadata/md5-cache/app-emacs/desktop+-0.2
index 78d581d8b105..da77809b7be6 100644
--- a/metadata/md5-cache/app-emacs/desktop+-0.2
+++ b/metadata/md5-cache/app-emacs/desktop+-0.2
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/f >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ffevotte/desktop-plus/archive/v0.2.tar.gz -> desktop+-0.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=a5c7a45fc1dfda3ece1bc0cd4fdd77ba
diff --git a/metadata/md5-cache/app-emacs/develock-0.45 b/metadata/md5-cache/app-emacs/develock-0.45
index 8c7789259561..49cdf47ab764 100644
--- a/metadata/md5-cache/app-emacs/develock-0.45
+++ b/metadata/md5-cache/app-emacs/develock-0.45
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/develock-0.45.el.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=fa3d1f5bdb01fed056e6718980ce8ff2
diff --git a/metadata/md5-cache/app-emacs/df-mode-20050509 b/metadata/md5-cache/app-emacs/df-mode-20050509
index 92f8cd85d4a7..c145a52c271d 100644
--- a/metadata/md5-cache/app-emacs/df-mode-20050509
+++ b/metadata/md5-cache/app-emacs/df-mode-20050509
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=9bbc4fbdede67fdfe43d2becb8296e58
diff --git a/metadata/md5-cache/app-emacs/dictionary-1.10 b/metadata/md5-cache/app-emacs/dictionary-1.10
index 714fab552d18..6adfb69e7ca0 100644
--- a/metadata/md5-cache/app-emacs/dictionary-1.10
+++ b/metadata/md5-cache/app-emacs/dictionary-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.myrkr.in-berlin.de/dictionary/dictionary-1.10.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=654aab74f3e37cd0b430041f780f3458
diff --git a/metadata/md5-cache/app-emacs/dircolors-1.0-r2 b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
index 366ca2443d3e..d88a86265c0c 100644
--- a/metadata/md5-cache/app-emacs/dircolors-1.0-r2
+++ b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/dircolors-1.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=2de18fcb85da42b9fb3efca31f87f378
diff --git a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26 b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
index 0665b9c8bba9..d275402d63f8 100644
--- a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
+++ b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/dired-sort-menu-1.26.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=d253ae322ac667913331ea69c50b19aa
diff --git a/metadata/md5-cache/app-emacs/distel-4.0.6 b/metadata/md5-cache/app-emacs/distel-4.0.6
index 763d5254a57c..2a93d445fe32 100644
--- a/metadata/md5-cache/app-emacs/distel-4.0.6
+++ b/metadata/md5-cache/app-emacs/distel-4.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/massemanet/distel/archive/4.0.6.tar.gz -> distel-4.0.6.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6913ad83c31042a7cf02fd581afd91c9
diff --git a/metadata/md5-cache/app-emacs/doctest-mode-0.4 b/metadata/md5-cache/app-emacs/doctest-mode-0.4
index 5843859f8658..a46db4d2b1d2 100644
--- a/metadata/md5-cache/app-emacs/doctest-mode-0.4
+++ b/metadata/md5-cache/app-emacs/doctest-mode-0.4
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=!<app-emacs/python-mode-5.1.0 >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/trunk/python-mode/doctest-mode.el?revision=460 -> doctest-mode.el
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=ff9e441c0e2d9b64c687b19e39554b79
diff --git a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3 b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
index ec210bd2dacc..75d14d9e5d65 100644
--- a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
+++ b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.13 >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5a343760d9dc6d77e002778fda24e094
diff --git a/metadata/md5-cache/app-emacs/dropdown-list-20120329 b/metadata/md5-cache/app-emacs/dropdown-list-20120329
index 1fdff0aff6e4..bfd004718c6b 100644
--- a/metadata/md5-cache/app-emacs/dropdown-list-20120329
+++ b/metadata/md5-cache/app-emacs/dropdown-list-20120329
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dropdown-list-20120329.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=0402d6ca62dc7d6393838b65203682bb
diff --git a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20141014 b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20141014
index f3841b470cf0..3277c6e688ba 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20141014
+++ b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20141014
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dts-mode-0.1.0_pre20141014.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=85b972ed67c33605e4b244ebb3371317
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.42 b/metadata/md5-cache/app-emacs/ebuild-mode-1.42
index e61b690194f5..a2d2964bb156 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.42
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.42
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.42.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=398f669a0cd34008ddd8fba2ce5a3bde
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.43 b/metadata/md5-cache/app-emacs/ebuild-mode-1.43
index f6e541670404..0f0b9c90d6fa 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.43
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.43
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo >=virtual/emacs-23
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.43.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
-_md5_=13ad931a47c8e39f2d088e6e85f5fddb
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
+_md5_=af23a76fb885ac02cbee74018c5ee2b8
diff --git a/metadata/md5-cache/app-emacs/ecb-2.41_pre20140215-r1 b/metadata/md5-cache/app-emacs/ecb-2.41_pre20140215-r1
index c9ba9bb521e5..740dd5a9b7c1 100644
--- a/metadata/md5-cache/app-emacs/ecb-2.41_pre20140215-r1
+++ b/metadata/md5-cache/app-emacs/ecb-2.41_pre20140215-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=!!<app-emacs/cedet-2.0 java? ( app-emacs/jde ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.41_pre20140215.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=abe352e66741b4c385c2c8c751a849cd
diff --git a/metadata/md5-cache/app-emacs/edb-1.31 b/metadata/md5-cache/app-emacs/edb-1.31
index 2674d687c80e..12a3325351ed 100644
--- a/metadata/md5-cache/app-emacs/edb-1.31
+++ b/metadata/md5-cache/app-emacs/edb-1.31
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.gnuvola.org/software/edb/edb-1.31.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=3cbae0835a6c0f2d3c5132285b4fac23
diff --git a/metadata/md5-cache/app-emacs/edb-1.32 b/metadata/md5-cache/app-emacs/edb-1.32
index 32d96887e702..a1ba90e2bca2 100644
--- a/metadata/md5-cache/app-emacs/edb-1.32
+++ b/metadata/md5-cache/app-emacs/edb-1.32
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.gnuvola.org/software/edb/edb-1.32.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=5685dde303cd36eb202869f846564224
diff --git a/metadata/md5-cache/app-emacs/edit-list-0.3 b/metadata/md5-cache/app-emacs/edit-list-0.3
index 59cd4678b959..1d031a2f7d95 100644
--- a/metadata/md5-cache/app-emacs/edit-list-0.3
+++ b/metadata/md5-cache/app-emacs/edit-list-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/edit-list-0.3.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5d539a6ee458ce78acfc32033f419aba
diff --git a/metadata/md5-cache/app-emacs/edit-server-1.15 b/metadata/md5-cache/app-emacs/edit-server-1.15
index fcd2b2d8aa0a..a77e0a7b30a0 100644
--- a/metadata/md5-cache/app-emacs/edit-server-1.15
+++ b/metadata/md5-cache/app-emacs/edit-server-1.15
@@ -1,5 +1,5 @@
+BDEPEND=>=virtual/emacs-23
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
 DESCRIPTION=Service edit requests from a web browser for editing of textareas
 EAPI=7
 HOMEPAGE=https://github.com/stsquad/emacs_chrome
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/stsquad/emacs_chrome/archive/v1.15.tar.gz -> emacs_chrome-1.15.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=c4ba721291f40f8820688ec4f7d711c4
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8
index cfc4fa3d2306..13b70642306e 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.7.8.tar.gz -> editorconfig-emacs-0.7.8.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=45a6720d261f05d54d8ffd7e846a52f2
diff --git a/metadata/md5-cache/app-emacs/elib-1.0-r1 b/metadata/md5-cache/app-emacs/elib-1.0-r1
index 63f1181e7848..ed1e378445a8 100644
--- a/metadata/md5-cache/app-emacs/elib-1.0-r1
+++ b/metadata/md5-cache/app-emacs/elib-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://jdee.sunsite.dk/elib-1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ee149b06afa1d9783e88a157d730cccb
diff --git a/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1 b/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
index 13eab6961e0c..7030185fb35f 100644
--- a/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
+++ b/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-emacs/apel-10.8-r1 >=virtual/emacs-23
 SLOT=0
 SRC_URI=ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/elscreen-1.4.6.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=092911457242e00291bd3dae970ee3bd
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
index 1a7fefefee27..28421144fea4 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PDEPEND=virtual/emacs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=679a5f9c0096e79f2cfd2977f3fee2c2
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.22 b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
index 40d1c909e7a7..d8a86c079bd7 100644
--- a/metadata/md5-cache/app-emacs/emacs-daemon-0.22
+++ b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23 >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=2f82ffa99ce2064372db7516804a488f
diff --git a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92 b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
index b6d787749fb7..a10b601eeab1 100644
--- a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
+++ b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/hexrgb >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-jabber/emacs-jabber-0.8.92.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=245c6dc4f9563e577abbe8fa01a8d4e9
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.528_pre20140213 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.528_pre20140213
index d0f994c46174..629a70ed63dd 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.528_pre20140213
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.528_pre20140213
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.528_pre20140213.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=377777d442835d827463cb6c45fbf818
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.570_pre20170203 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.570_pre20170203
index 7dda05716a67..74833f551c04 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.570_pre20170203
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.570_pre20170203
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.570_pre20170203.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=75b43078b19c6756e51110852963886d
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
index 474510d39156..3e2188f43607 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.625_pre20180518.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=75b43078b19c6756e51110852963886d
diff --git a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1 b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
index e0c2f9ca8c8a..01f873a4cb6d 100644
--- a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
+++ b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/wget-1.8.2 >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/emacs-wget-0.5.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=9356f8b157e11f8cc9b83453dd5611f0
diff --git a/metadata/md5-cache/app-emacs/emhacks-20070920-r1 b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
index c6fff7aeb5a5..a895934bfbd9 100644
--- a/metadata/md5-cache/app-emacs/emhacks-20070920-r1
+++ b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=2865aeb84bbd72d2a7ca214d2e7fd99c
diff --git a/metadata/md5-cache/app-emacs/emms-3.0-r1 b/metadata/md5-cache/app-emacs/emms-3.0-r1
index 45fd2bf71c8b..74128952969d 100644
--- a/metadata/md5-cache/app-emacs/emms-3.0-r1
+++ b/metadata/md5-cache/app-emacs/emms-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://www.gnu.org/software/emms/download/emms-3.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=0ebaba582add43d378c974bc1e74d2d4
diff --git a/metadata/md5-cache/app-emacs/emms-4.1 b/metadata/md5-cache/app-emacs/emms-4.1
index e96831f1decc..e61e331655fb 100644
--- a/metadata/md5-cache/app-emacs/emms-4.1
+++ b/metadata/md5-cache/app-emacs/emms-4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=e609db7ea9023fbbaa8be7a10968a5b6
diff --git a/metadata/md5-cache/app-emacs/emms-4.3 b/metadata/md5-cache/app-emacs/emms-4.3
index 224b14eed4f6..841e2e4d9ba1 100644
--- a/metadata/md5-cache/app-emacs/emms-4.3
+++ b/metadata/md5-cache/app-emacs/emms-4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/metadata/md5-cache/app-emacs/emms-4.4 b/metadata/md5-cache/app-emacs/emms-4.4
index acc745b489ad..e03cdd31d7e2 100644
--- a/metadata/md5-cache/app-emacs/emms-4.4
+++ b/metadata/md5-cache/app-emacs/emms-4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.4.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1 b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
index 0c6253b56ea9..629aa4751ee3 100644
--- a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
+++ b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/erobot-2.1.0.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=bd274dd6ad0e51c0cb0e24f9bc36b80c
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.12 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.12
index 56559cfa146d..4557663f320c 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.12
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.12.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=d4294194c07c7704346ad6661075a6b9
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.13 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.13
index 518feb53cf3c..ffb51f65663a 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.13
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.13.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=a9c3481235d0004c1abcbb9e4e57abbc
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-9999 b/metadata/md5-cache/app-emacs/eselect-mode-9999
index d452d9380565..f756d2daee51 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-9999
+++ b/metadata/md5-cache/app-emacs/eselect-mode-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	af51ccfceeb403ab80f1bf9209d372c8
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	af51ccfceeb403ab80f1bf9209d372c8
 _md5_=56b653dc070aca53252610b5c684f5fa
diff --git a/metadata/md5-cache/app-emacs/ess-15.09.2 b/metadata/md5-cache/app-emacs/ess-15.09.2
index d9dd5703c121..17f58a6d0d16 100644
--- a/metadata/md5-cache/app-emacs/ess-15.09.2
+++ b/metadata/md5-cache/app-emacs/ess-15.09.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-15.09-2.tgz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=1da5ffdc9441badc679354e89782ccc8
diff --git a/metadata/md5-cache/app-emacs/ess-16.04 b/metadata/md5-cache/app-emacs/ess-16.04
index b42f5101fa5d..0d38706a7d5e 100644
--- a/metadata/md5-cache/app-emacs/ess-16.04
+++ b/metadata/md5-cache/app-emacs/ess-16.04
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-16.04.tgz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=325d57ae9a08564e86c16962bfb67661
diff --git a/metadata/md5-cache/app-emacs/ess-17.11 b/metadata/md5-cache/app-emacs/ess-17.11
index 507f9141f8e4..fa8544675809 100644
--- a/metadata/md5-cache/app-emacs/ess-17.11
+++ b/metadata/md5-cache/app-emacs/ess-17.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-17.11.tgz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=8b0cff49eef44d3a0c91de39c8f88668
diff --git a/metadata/md5-cache/app-emacs/evil-1.0.8 b/metadata/md5-cache/app-emacs/evil-1.0.8
index e1348ff618e4..21c32f0a5531 100644
--- a/metadata/md5-cache/app-emacs/evil-1.0.8
+++ b/metadata/md5-cache/app-emacs/evil-1.0.8
@@ -9,5 +9,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/evil-1.0.8.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=93f1a7384a166e5a1c1a795131e7520e
diff --git a/metadata/md5-cache/app-emacs/evil-1.2.13 b/metadata/md5-cache/app-emacs/evil-1.2.13
index e376ab31df79..d7beb3181513 100644
--- a/metadata/md5-cache/app-emacs/evil-1.2.13
+++ b/metadata/md5-cache/app-emacs/evil-1.2.13
@@ -9,5 +9,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.2.13.tar.gz -> evil-1.2.13.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=a82dbf926d147f57a100f151bb22bd04
diff --git a/metadata/md5-cache/app-emacs/expand-region-0.11.0 b/metadata/md5-cache/app-emacs/expand-region-0.11.0
index bd83668a3c67..d0cac17b6f68 100644
--- a/metadata/md5-cache/app-emacs/expand-region-0.11.0
+++ b/metadata/md5-cache/app-emacs/expand-region-0.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/expand-region.el/archive/0.11.0.tar.gz -> expand-region-0.11.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=f202b3e8272591c85d33aeb45faf7bb1
diff --git a/metadata/md5-cache/app-emacs/f-0.18.2 b/metadata/md5-cache/app-emacs/f-0.18.2
index a58334bd9a14..6afaff82e3a7 100644
--- a/metadata/md5-cache/app-emacs/f-0.18.2
+++ b/metadata/md5-cache/app-emacs/f-0.18.2
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.18.2.tar.gz -> f-0.18.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=7a9da92b807a341d6ba095067abdb864
diff --git a/metadata/md5-cache/app-emacs/f-0.19.0 b/metadata/md5-cache/app-emacs/f-0.19.0
index 1011ad9e5dbe..c9408179e956 100644
--- a/metadata/md5-cache/app-emacs/f-0.19.0
+++ b/metadata/md5-cache/app-emacs/f-0.19.0
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.19.0.tar.gz -> f-0.19.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=7a9da92b807a341d6ba095067abdb864
diff --git a/metadata/md5-cache/app-emacs/fff-20050517 b/metadata/md5-cache/app-emacs/fff-20050517
index fed4bb3e9a82..610073813ef4 100644
--- a/metadata/md5-cache/app-emacs/fff-20050517
+++ b/metadata/md5-cache/app-emacs/fff-20050517
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-apps/mlocate >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/fff-20050517.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=12b1675b84a5227ea8320a27133f2636
diff --git a/metadata/md5-cache/app-emacs/filladapt-2.12-r1 b/metadata/md5-cache/app-emacs/filladapt-2.12-r1
index 68d95647279c..4c6d47c8aa34 100644
--- a/metadata/md5-cache/app-emacs/filladapt-2.12-r1
+++ b/metadata/md5-cache/app-emacs/filladapt-2.12-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/filladapt-2.12.el.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e584814ec6d6ce5d55baa51e8c0d862
diff --git a/metadata/md5-cache/app-emacs/flashcard-2.3.3 b/metadata/md5-cache/app-emacs/flashcard-2.3.3
index 790654839afb..53b30041e2b3 100644
--- a/metadata/md5-cache/app-emacs/flashcard-2.3.3
+++ b/metadata/md5-cache/app-emacs/flashcard-2.3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/flashcard-2.3.3.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=cf43d3d1026844c736a52a42505b7d97
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9-r2 b/metadata/md5-cache/app-emacs/flim-1.14.9-r2
index 0b79ac64b631..06addc9532f9 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9-r2
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.3 !app-emacs/limit >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://git.chise.org/elisp/dist/flim/flim-1.14/flim-1.14.9.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=9b3835a95753d7271eb65319fd74a24f
diff --git a/metadata/md5-cache/app-emacs/folding-2012.0226.1623 b/metadata/md5-cache/app-emacs/folding-2012.0226.1623
index dc208e77a6b9..09939e071668 100644
--- a/metadata/md5-cache/app-emacs/folding-2012.0226.1623
+++ b/metadata/md5-cache/app-emacs/folding-2012.0226.1623
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/folding-2012.0226.1623.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=3693122b6b300e800bd0c8755df59d70
diff --git a/metadata/md5-cache/app-emacs/folding-2013.0613.1821 b/metadata/md5-cache/app-emacs/folding-2013.0613.1821
index 4d50af82c1d3..2ac1ce620526 100644
--- a/metadata/md5-cache/app-emacs/folding-2013.0613.1821
+++ b/metadata/md5-cache/app-emacs/folding-2013.0613.1821
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/folding-2013.0613.1821.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=7335d31607b34621f3b5ef9915f2a43c
diff --git a/metadata/md5-cache/app-emacs/ghub-2.0.0 b/metadata/md5-cache/app-emacs/ghub-2.0.0
index 6f5259d57af5..f421f0f118df 100644
--- a/metadata/md5-cache/app-emacs/ghub-2.0.0
+++ b/metadata/md5-cache/app-emacs/ghub-2.0.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-24
+DEPEND=sys-apps/texinfo >=virtual/emacs-25
 DESCRIPTION=minuscule client library for the Github API
 EAPI=6
 HOMEPAGE=https://magit.vc/manual/ghub
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-24
+RDEPEND=>=virtual/emacs-25
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v2.0.0.tar.gz -> ghub-2.0.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=404e05b3097a1be5c0fe1338a08d1100
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=8568f9c9a6a1f2b8b96039ccbe68f290
diff --git a/metadata/md5-cache/app-emacs/ghub-2.0.1 b/metadata/md5-cache/app-emacs/ghub-2.0.1
new file mode 100644
index 000000000000..2d3b486526ad
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ghub-2.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-apps/texinfo >=virtual/emacs-25
+DESCRIPTION=minuscule client library for the Github API
+EAPI=6
+HOMEPAGE=https://magit.vc/manual/ghub
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-25
+SLOT=0
+SRC_URI=https://github.com/magit/ghub/archive/v2.0.1.tar.gz -> ghub-2.0.1.tar.gz
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=d53bc004abc36a0290c26b04c1e2d0a8
diff --git a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0 b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
index 80866faf2416..3d5b6be74a66 100644
--- a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
+++ b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=sci-visualization/gnuplot[-emacs(-)] >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/bruceravel/gnuplot-mode/archive/0.7.0.tar.gz -> gnuplot-mode-0.7.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2190ff50741af619a6fb4892a293dd93
diff --git a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r3 b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r3
index 78abbf857afd..d5c93693abfa 100644
--- a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r3
+++ b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://meltin.net/hacks/emacs/src/gnuserv-3.12.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=985c681c2f88e21cdf6439a608175349
diff --git a/metadata/md5-cache/app-emacs/go-mode-1.4.0 b/metadata/md5-cache/app-emacs/go-mode-1.4.0
index c4b113b324dc..9fe632e25a87 100644
--- a/metadata/md5-cache/app-emacs/go-mode-1.4.0
+++ b/metadata/md5-cache/app-emacs/go-mode-1.4.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/dominikh/go-mode.el/archive/v1.4.0.tar.gz -> go-mode-1.4.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=247235d1f8ad0bf07c308ffb4e5faa7b
diff --git a/metadata/md5-cache/app-emacs/go-mode-1.5.0 b/metadata/md5-cache/app-emacs/go-mode-1.5.0
index bfd525e2254a..5b64fbfaf2ae 100644
--- a/metadata/md5-cache/app-emacs/go-mode-1.5.0
+++ b/metadata/md5-cache/app-emacs/go-mode-1.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/dominikh/go-mode.el/archive/v1.5.0.tar.gz -> go-mode-1.5.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=1db9b6722e79d0fb313dd9baeddba9a9
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20091009-r1 b/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
index f393cad75616..ca7752e165e8 100644
--- a/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
+++ b/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/google-c-style-20091009.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=bee802399350b6667d0152ca4a2e277c
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.3.7 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.3.7
index 3e8ad90df127..675a1d115176 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.3.7
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/graphviz-dot-mode-0.3.7.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=0a9b1697986ed99989f7bfaa86170977
diff --git a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1 b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
index 350634a5780c..27733119abb2 100644
--- a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
+++ b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/h4x0r-0.13.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=301f11a63b200eb335215acb45503948
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-13.07 b/metadata/md5-cache/app-emacs/haskell-mode-13.07
index b27d8424a07d..8d6e1ed38c22 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-13.07
+++ b/metadata/md5-cache/app-emacs/haskell-mode-13.07
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz -> haskell-mode-13.07.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5738abedf9ccb8b1b1d16ba6ac9ccb7b
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-16.1 b/metadata/md5-cache/app-emacs/haskell-mode-16.1
index 19f8b053624c..91a7fc10623f 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-16.1
+++ b/metadata/md5-cache/app-emacs/haskell-mode-16.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/v16.1.tar.gz -> haskell-mode-16.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=77407a1384a072e0008dc66d51dc3cd0
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-2.9.1 b/metadata/md5-cache/app-emacs/haskell-mode-2.9.1
index 67bd2cbb0cc6..fff6dc236125 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-2.9.1
+++ b/metadata/md5-cache/app-emacs/haskell-mode-2.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/2_9_1.tar.gz -> haskell-mode-2.9.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=134513d548b478ca3623d777b809e483
diff --git a/metadata/md5-cache/app-emacs/hexrgb-0_p957 b/metadata/md5-cache/app-emacs/hexrgb-0_p957
index 0de42ae752f4..40b3f1efb072 100644
--- a/metadata/md5-cache/app-emacs/hexrgb-0_p957
+++ b/metadata/md5-cache/app-emacs/hexrgb-0_p957
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/hexrgb-0_p957.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=77adb975f12d919fdcf4ea8d326be6a8
diff --git a/metadata/md5-cache/app-emacs/highline-7.2.2 b/metadata/md5-cache/app-emacs/highline-7.2.2
index d13d10d434f9..dba599d5d24a 100644
--- a/metadata/md5-cache/app-emacs/highline-7.2.2
+++ b/metadata/md5-cache/app-emacs/highline-7.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/highline-7.2.2.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=324208d57617741dbfa6670a6592f89d
diff --git a/metadata/md5-cache/app-emacs/howm-1.4.3 b/metadata/md5-cache/app-emacs/howm-1.4.3
index d7a241648b45..79034e70a66a 100644
--- a/metadata/md5-cache/app-emacs/howm-1.4.3
+++ b/metadata/md5-cache/app-emacs/howm-1.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-1+ GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://howm.sourceforge.jp/a/howm-1.4.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=04d46ed151d4abf45fe98af177f47e8e
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.43 b/metadata/md5-cache/app-emacs/htmlize-1.43
index e01f781d0138..b65b12fa09f1 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.43
+++ b/metadata/md5-cache/app-emacs/htmlize-1.43
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/htmlize-1.43.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=b473dcc8260b44e56ffe5fb92afec84e
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.47 b/metadata/md5-cache/app-emacs/htmlize-1.47
index bd2ce9696902..7c681c00205f 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.47
+++ b/metadata/md5-cache/app-emacs/htmlize-1.47
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/htmlize-1.47.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6ec1ed3b0e5da0b2f515f7445171eed4
diff --git a/metadata/md5-cache/app-emacs/httpd-1.1 b/metadata/md5-cache/app-emacs/httpd-1.1
index 8bb9dbe729a1..09720d8233fd 100644
--- a/metadata/md5-cache/app-emacs/httpd-1.1
+++ b/metadata/md5-cache/app-emacs/httpd-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/httpd-1.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=aaf120d14a436b709ffe81a3c3e7806b
diff --git a/metadata/md5-cache/app-emacs/icicles-2013.04.23.23400 b/metadata/md5-cache/app-emacs/icicles-2013.04.23.23400
index 3617de813146..4d9d463f5550 100644
--- a/metadata/md5-cache/app-emacs/icicles-2013.04.23.23400
+++ b/metadata/md5-cache/app-emacs/icicles-2013.04.23.23400
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/icicles/archive/2013.04.23.23400.tar.gz -> icicles-2013.04.23.23400.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=d5fca20b6cd88db9dd843d5d0e157442
diff --git a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733 b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
new file mode 100644
index 000000000000..761d9e6fe403
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Minibuffer input completion and cycling
+EAPI=7
+HOMEPAGE=https://www.emacswiki.org/emacs/Icicles
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/icicles-2018.02.13.23733.tar.xz
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=2d73a2a1b120177c8ca359abc399f902
diff --git a/metadata/md5-cache/app-emacs/identica-mode-1.1-r1 b/metadata/md5-cache/app-emacs/identica-mode-1.1-r1
index b9c91d330a55..524ed9d84339 100644
--- a/metadata/md5-cache/app-emacs/identica-mode-1.1-r1
+++ b/metadata/md5-cache/app-emacs/identica-mode-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/identica-mode-1.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=9f493811f73c2ca8c9a52129836ba2df
diff --git a/metadata/md5-cache/app-emacs/igrep-2.113 b/metadata/md5-cache/app-emacs/igrep-2.113
index 2587256c58a3..88d14a24d711 100644
--- a/metadata/md5-cache/app-emacs/igrep-2.113
+++ b/metadata/md5-cache/app-emacs/igrep-2.113
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/igrep-2.113.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=2b6be75021c3acb0ce6c42aac099a505
diff --git a/metadata/md5-cache/app-emacs/inform-mode-1.5.8 b/metadata/md5-cache/app-emacs/inform-mode-1.5.8
index 0852ae1b8ea2..db8ea55762bd 100644
--- a/metadata/md5-cache/app-emacs/inform-mode-1.5.8
+++ b/metadata/md5-cache/app-emacs/inform-mode-1.5.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/inform-mode-1.5.8.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=a045f24f1cbc21e6f787c7bd312c30e6
diff --git a/metadata/md5-cache/app-emacs/inform-mode-1.6.2 b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
index 22b3008a601b..26eee65f3122 100644
--- a/metadata/md5-cache/app-emacs/inform-mode-1.6.2
+++ b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://rupert-lane.org/inform-mode/releases/inform-mode-1.6.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=be7a165f2831b3f2c45a191c88d8ce06
diff --git a/metadata/md5-cache/app-emacs/initsplit-1.7_pre20140203 b/metadata/md5-cache/app-emacs/initsplit-1.7_pre20140203
index 9583cca40b2b..3ce314f02476 100644
--- a/metadata/md5-cache/app-emacs/initsplit-1.7_pre20140203
+++ b/metadata/md5-cache/app-emacs/initsplit-1.7_pre20140203
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/initsplit-1.7_pre20140203.el.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=39bc0b72bb5d1f177ef5d2f39a831f93
diff --git a/metadata/md5-cache/app-emacs/jam-mode-0.3 b/metadata/md5-cache/app-emacs/jam-mode-0.3
index 16a69fdca8af..01192f21ba71 100644
--- a/metadata/md5-cache/app-emacs/jam-mode-0.3
+++ b/metadata/md5-cache/app-emacs/jam-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/jam-mode-0.3.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=7f003f9c0bf4cfc216bdaa8892280813
diff --git a/metadata/md5-cache/app-emacs/jasmin-1.2-r2 b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
index ecc671309ac4..729f1cfe1cae 100644
--- a/metadata/md5-cache/app-emacs/jasmin-1.2-r2
+++ b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jasmin-1.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=55ee0f378d2394e57dc540ef76d8c14f
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1 b/metadata/md5-cache/app-emacs/jde-2.4.1
index 8752314a0999..c26ff36933e3 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3 app-emacs/elib dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c9da711d9544abd501f08ca0b643ee4e
diff --git a/metadata/md5-cache/app-emacs/keywiz-1.4 b/metadata/md5-cache/app-emacs/keywiz-1.4
index e15d6236e970..06a1e91af95c 100644
--- a/metadata/md5-cache/app-emacs/keywiz-1.4
+++ b/metadata/md5-cache/app-emacs/keywiz-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/keywiz-1.4.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=4da1db7778a8decef98ca926f9c9fc7a
diff --git a/metadata/md5-cache/app-emacs/limit-1.14.10_pre200811252332 b/metadata/md5-cache/app-emacs/limit-1.14.10_pre200811252332
index a45e25fe455b..4e887f203240 100644
--- a/metadata/md5-cache/app-emacs/limit-1.14.10_pre200811252332
+++ b/metadata/md5-cache/app-emacs/limit-1.14.10_pre200811252332
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.3 !app-emacs/flim >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.jpl.org/ftp/pub/m17n/limit-1_14-200811252332.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6eec88c5fb38c4949bd613f609043927
diff --git a/metadata/md5-cache/app-emacs/lookup-1.4.1 b/metadata/md5-cache/app-emacs/lookup-1.4.1
index edc459901fde..e0abb77f9e4f 100644
--- a/metadata/md5-cache/app-emacs/lookup-1.4.1
+++ b/metadata/md5-cache/app-emacs/lookup-1.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://openlab.jp/edict/lookup/dist/lookup-1.4.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=138414fe428b9584a9e019f2d9beb70d
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20130419 b/metadata/md5-cache/app-emacs/lua-mode-20130419
index b24683968a39..a5d707dc7b0e 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20130419
+++ b/metadata/md5-cache/app-emacs/lua-mode-20130419
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/rel-20130419.tar.gz -> lua-mode-20130419.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=bf62c2abcc45a2aed3d8e436a84ccafd
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20131231 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20131231
index c3371875c96a..9d3bb2681cb4 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20131231
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20131231
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20131231.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e1a9ad17c414c2328fd5e2e97114c3c9
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20161231 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20161231
index 48569d2eac58..68eca6343e2d 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20161231
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20161231
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20161231.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=fb4b47d61f1b02648354ebe2ce153ca3
diff --git a/metadata/md5-cache/app-emacs/magit-2.10.3 b/metadata/md5-cache/app-emacs/magit-2.10.3
deleted file mode 100644
index ec006b3abfae..000000000000
--- a/metadata/md5-cache/app-emacs/magit-2.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.10 sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=A Git porcelain inside Emacs
-EAPI=5
-HOMEPAGE=https://magit.vc/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.10 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/magit/archive/2.10.3.tar.gz -> magit-2.10.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=e81977b9dbd053c32969687d83d6e323
diff --git a/metadata/md5-cache/app-emacs/magit-2.11.0 b/metadata/md5-cache/app-emacs/magit-2.11.0
index 1896e3940781..7852e484ec85 100644
--- a/metadata/md5-cache/app-emacs/magit-2.11.0
+++ b/metadata/md5-cache/app-emacs/magit-2.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.6.0 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.11.0.tar.gz -> magit-2.11.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=d7b232295cabdb038b52aace0aa4a4df
diff --git a/metadata/md5-cache/app-emacs/magit-2.12.1 b/metadata/md5-cache/app-emacs/magit-2.12.1
index da522c066e2e..214c7c64b75c 100644
--- a/metadata/md5-cache/app-emacs/magit-2.12.1
+++ b/metadata/md5-cache/app-emacs/magit-2.12.1
@@ -3,10 +3,10 @@ DEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/ghub-2.0.0 >=app-emacs/magit-popup-2.
 DESCRIPTION=A Git porcelain inside Emacs
 EAPI=6
 HOMEPAGE=https://magit.vc/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/ghub-2.0.0 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.2 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.12.1.tar.gz -> magit-2.12.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=2d5fd850953fb7305aa00dc02a39b350
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=ff69ab48044599e15a8b5f19ff2cb828
diff --git a/metadata/md5-cache/app-emacs/magit-2.13.0 b/metadata/md5-cache/app-emacs/magit-2.13.0
new file mode 100644
index 000000000000..1897bc110d27
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/magit-2.13.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.3 sys-apps/texinfo >=virtual/emacs-24
+DESCRIPTION=A Git porcelain inside Emacs
+EAPI=6
+HOMEPAGE=https://magit.vc/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.3 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/magit/magit/archive/2.13.0.tar.gz -> magit-2.13.0.tar.gz
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=39a046bcc9e958ac95e4ada36927cbe6
diff --git a/metadata/md5-cache/app-emacs/magit-2.9.0 b/metadata/md5-cache/app-emacs/magit-2.9.0
deleted file mode 100644
index 7089f1e0eec5..000000000000
--- a/metadata/md5-cache/app-emacs/magit-2.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.8 sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=A Git porcelain inside Emacs
-EAPI=5
-HOMEPAGE=https://magit.vc/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.8 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/magit/archive/2.9.0.tar.gz -> magit-2.9.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=e7493088bf08a24d9e531adfbad36cf2
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.12.3 b/metadata/md5-cache/app-emacs/magit-popup-2.12.3
index 4f38af231411..d50668c7ace0 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.12.3
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.12.3
@@ -3,10 +3,10 @@ DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo >=virtual/emacs-24
 DESCRIPTION=Define prefix-infix-suffix command combos
 EAPI=6
 HOMEPAGE=https://magit.vc/manual/magit-popup
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.12.3.tar.gz -> magit-popup-2.12.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=d947adf27f6360b2ec6830a474d730e0
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=e15638e635397d241590b5c40e48a642
diff --git a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9 b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9
index 4041f1127ddd..f738819a2f12 100644
--- a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9
+++ b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4be673de725bdd58019ff1a000e9f362
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.1 b/metadata/md5-cache/app-emacs/markdown-mode-2.1
index d7590ef19949..b40ebbbc9b10 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.1
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/markdown2 dev-python/markdown ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/markdown-mode-2.1.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=2c412ebe9b12f0451a09838d2db1488f
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.3 b/metadata/md5-cache/app-emacs/markdown-mode-2.3
index f93949a97aeb..4a235cdc0fda 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.3
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/markdown2 dev-python/markdown ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://stable.melpa.org/packages/markdown-mode-2.3.el
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=96d0d55530ff13324b9c7f17e18a4047
diff --git a/metadata/md5-cache/app-emacs/matlab-3.3.2_pre20130829 b/metadata/md5-cache/app-emacs/matlab-3.3.2_pre20130829
index 0ad260fa3a74..b723418a1d5d 100644
--- a/metadata/md5-cache/app-emacs/matlab-3.3.2_pre20130829
+++ b/metadata/md5-cache/app-emacs/matlab-3.3.2_pre20130829
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/matlab-3.3.2_pre20130829.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=990e213706cfb26162892e73264b024c
diff --git a/metadata/md5-cache/app-emacs/mediawiki-2.2.4.1 b/metadata/md5-cache/app-emacs/mediawiki-2.2.4.1
index c6f46069f9d6..6bcfe6548142 100644
--- a/metadata/md5-cache/app-emacs/mediawiki-2.2.4.1
+++ b/metadata/md5-cache/app-emacs/mediawiki-2.2.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mediawiki-2.2.4.1.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=0a9d1448f80a21e985009120da25b65c
diff --git a/metadata/md5-cache/app-emacs/mew-6.5 b/metadata/md5-cache/app-emacs/mew-6.5
index c58b2db42f59..aa16c47ef321 100644
--- a/metadata/md5-cache/app-emacs/mew-6.5
+++ b/metadata/md5-cache/app-emacs/mew-6.5
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mew.org/Release/mew-6.5.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=725eefd02e6e75a1c7e7a57aff4df574
diff --git a/metadata/md5-cache/app-emacs/mew-6.6 b/metadata/md5-cache/app-emacs/mew-6.6
index 18f3a1a49292..b83abfca22e3 100644
--- a/metadata/md5-cache/app-emacs/mew-6.6
+++ b/metadata/md5-cache/app-emacs/mew-6.6
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mew.org/Release/mew-6.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8efc070b8386571104b0b33e90d9973
diff --git a/metadata/md5-cache/app-emacs/mic-paren-3.11 b/metadata/md5-cache/app-emacs/mic-paren-3.11
index 173396211e61..4138604dc99b 100644
--- a/metadata/md5-cache/app-emacs/mic-paren-3.11
+++ b/metadata/md5-cache/app-emacs/mic-paren-3.11
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/mic-paren-3.11.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6502c441b1513c0ce29e69f2fa12da11
diff --git a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1 b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
index c1f94daec6fe..ebdddd621a5b 100644
--- a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
+++ b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5e49c2278d2327f7559448aa9f713b2b
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.4 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.4
index 1c7b42c32f9a..7731f603e9e8 100644
--- a/metadata/md5-cache/app-emacs/mmm-mode-0.5.4
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.4.tar.gz -> mmm-mode-0.5.4.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=c73a1344ec261dfde8f17b9c4ca4a185
diff --git a/metadata/md5-cache/app-emacs/moccur-edit-2.16 b/metadata/md5-cache/app-emacs/moccur-edit-2.16
index b249f58a6578..91db75439f68 100644
--- a/metadata/md5-cache/app-emacs/moccur-edit-2.16
+++ b/metadata/md5-cache/app-emacs/moccur-edit-2.16
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/color-moccur >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/moccur-edit-2.16.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=04a639edb97b622a0a18b219bd50febe
diff --git a/metadata/md5-cache/app-emacs/mode-compile-2.29.1 b/metadata/md5-cache/app-emacs/mode-compile-2.29.1
index 722ac8b311b7..4b8f62be85e8 100644
--- a/metadata/md5-cache/app-emacs/mode-compile-2.29.1
+++ b/metadata/md5-cache/app-emacs/mode-compile-2.29.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/mode-compile/archive/2.29.1.tar.gz -> mode-compile-2.29.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=15119779a3800ff257e955dc527f5615
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.59 b/metadata/md5-cache/app-emacs/mpg123-el-1.59
index b09cb5c039ce..9b83167a08ca 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.59
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.59
@@ -8,5 +8,5 @@ LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.59.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=6ebd2629c67964303e7956f52b973098
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.60 b/metadata/md5-cache/app-emacs/mpg123-el-1.60
index f7da59e4e809..86f4a66e0ba0 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.60
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.60
@@ -8,5 +8,5 @@ LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.60.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=e6099f87b5a6fe83efa5ab70f6c7802c
diff --git a/metadata/md5-cache/app-emacs/mu-cite-8.1_p200709030413 b/metadata/md5-cache/app-emacs/mu-cite-8.1_p200709030413
index 156ddb159187..091fffa3d89f 100644
--- a/metadata/md5-cache/app-emacs/mu-cite-8.1_p200709030413
+++ b/metadata/md5-cache/app-emacs/mu-cite-8.1_p200709030413
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/apel virtual/emacs-flim >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.jpl.org/elips/mu/snapshots/mu-cite-200709030413.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=1c9ca4574331eba118c53ba61eb61403
diff --git a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201202272330 b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201202272330
index 549a55cd1d20..5d438563fe32 100644
--- a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201202272330
+++ b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201202272330
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/apel virtual/emacs-flim >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.jpl.org/elips/mu/snapshots/mu-cite-201202272330.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=1c9ca4574331eba118c53ba61eb61403
diff --git a/metadata/md5-cache/app-emacs/multi-term-1.3 b/metadata/md5-cache/app-emacs/multi-term-1.3
index a4422a691c82..28025dfeeeb1 100644
--- a/metadata/md5-cache/app-emacs/multi-term-1.3
+++ b/metadata/md5-cache/app-emacs/multi-term-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/multi-term-1.3.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=68617363436e516c149d0f96f63aadd1
diff --git a/metadata/md5-cache/app-emacs/multiple-cursors-1.3.0 b/metadata/md5-cache/app-emacs/multiple-cursors-1.3.0
index 74ffba94b623..d71bd589bd8e 100644
--- a/metadata/md5-cache/app-emacs/multiple-cursors-1.3.0
+++ b/metadata/md5-cache/app-emacs/multiple-cursors-1.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/multiple-cursors.el/archive/1.3.0.tar.gz -> multiple-cursors-1.3.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=539232a5b28df0e146473b41ec4fd010
diff --git a/metadata/md5-cache/app-emacs/muse-3.20 b/metadata/md5-cache/app-emacs/muse-3.20
index 23a4a5c00d41..3a6391615c83 100644
--- a/metadata/md5-cache/app-emacs/muse-3.20
+++ b/metadata/md5-cache/app-emacs/muse-3.20
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/muse-el/muse-3.20.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=786cec026029bd3dcad409eacfa548ed
diff --git a/metadata/md5-cache/app-emacs/nagios-mode-0.3 b/metadata/md5-cache/app-emacs/nagios-mode-0.3
index 3d823ea9ae2e..2b8bb70445f8 100644
--- a/metadata/md5-cache/app-emacs/nagios-mode-0.3
+++ b/metadata/md5-cache/app-emacs/nagios-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5aa3ef0fb9e20d021d212835860a5b5d
diff --git a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1 b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
index 39200c39b1f6..b54659b0a44b 100644
--- a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
+++ b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/navi2ch/navi2ch-1.8.4.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=359774a25ee966f5690be38cc758152a
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922
index c540087b6fb8..83631634811d 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.docbook.org/xml/5.0/rng/docbookxi.rnc
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=a85f9f24520d9c2f44c2008d4d215a1c
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20160506 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20160506
index 0ace3f7e4725..5fff0e039e1d 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20160506
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20160506
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20160506.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=9aa2d78a158fc15b88394a73f92cdf6c
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20170302 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20170302
index 5705a04fdc57..29870a1460db 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20170302
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20170302
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20170302.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=95da40e82ccf2e7f44697bb4af120db8
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-0.9.7 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-0.9.7
index 5c7aa2f650c9..3a612e2cf0e9 100644
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-0.9.7
+++ b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-0.9.7
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-0.9.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a81945731cb659d17938e5be416f6834
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-1.2.1 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-1.2.1
index ae05158a1532..a6510df221a0 100644
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-1.2.1
+++ b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-1.2.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=abb77aa0bb782b9e9bf745f77fb6e2ef
diff --git a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123 b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
index 459b5e1dd2c9..ef5ce0bdd18f 100644
--- a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
+++ b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=1.1
 SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=4beb092b9449b517a8894a3ded799f47
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1 b/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1
index e5d8e8c6a460..e0b5fc66b43e 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.1.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=c9d57ce29db7be196ab7606b037fa77c
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1 b/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1
index 9826c0d6539c..40a2bdffa904 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.1.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5319ba0b45260f84dd7125c1ccd6400c
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-4.00.1 b/metadata/md5-cache/app-emacs/ocaml-mode-4.00.1
index 80d07d97a2e6..593faf3c32bc 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-4.00.1
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-4.00.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://caml.inria.fr/distrib/ocaml-4.00/ocaml-4.00.1.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=4109d3fec5dbde4d8c3ba4afd0600068
diff --git a/metadata/md5-cache/app-emacs/org-mode-8.3.2-r1 b/metadata/md5-cache/app-emacs/org-mode-8.3.2-r1
index 6ef9d77eb730..ffb08c0a4116 100644
--- a/metadata/md5-cache/app-emacs/org-mode-8.3.2-r1
+++ b/metadata/md5-cache/app-emacs/org-mode-8.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-8.3.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=9fb4c436babce6a6ed8400299d8a9dda
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.0.4 b/metadata/md5-cache/app-emacs/org-mode-9.0.4
index 8a7d2826cde9..87d494a914b1 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.0.4
+++ b/metadata/md5-cache/app-emacs/org-mode-9.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-24
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-9.0.4.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=333be05cf5593ba73f84af361938e32f
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.1.13 b/metadata/md5-cache/app-emacs/org-mode-9.1.13
index 2a3f30f2890a..b9becd3eddb3 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.1.13
+++ b/metadata/md5-cache/app-emacs/org-mode-9.1.13
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-24
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-9.1.13.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=27393e3e36475cfd7d6ceb1f7c6b70c1
diff --git a/metadata/md5-cache/app-emacs/outline-magic-0.9 b/metadata/md5-cache/app-emacs/outline-magic-0.9
index e9ebdd5af8c4..fe4deb0cf5ea 100644
--- a/metadata/md5-cache/app-emacs/outline-magic-0.9
+++ b/metadata/md5-cache/app-emacs/outline-magic-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/outline-magic-0.9.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=aac2f3da7eb68b1e579c68132b4e8e3d
diff --git a/metadata/md5-cache/app-emacs/paredit-23-r1 b/metadata/md5-cache/app-emacs/paredit-23-r1
index 251b167d332d..d915e6e8914a 100644
--- a/metadata/md5-cache/app-emacs/paredit-23-r1
+++ b/metadata/md5-cache/app-emacs/paredit-23-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/paredit-23.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=cc59a57ffcb8673f6fcbedc308687d55
diff --git a/metadata/md5-cache/app-emacs/pariemacs-3.14 b/metadata/md5-cache/app-emacs/pariemacs-3.14
index d206c83afce8..21b10211397a 100644
--- a/metadata/md5-cache/app-emacs/pariemacs-3.14
+++ b/metadata/md5-cache/app-emacs/pariemacs-3.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sci-mathematics/pari >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/pariemacs-3.14.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8ee143a7579375bbf2417a32b2dce359
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.18.2 b/metadata/md5-cache/app-emacs/php-mode-1.18.2
index 46c0f2268844..7ea7c7990bf2 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.18.2
+++ b/metadata/md5-cache/app-emacs/php-mode-1.18.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.18.2.tar.gz -> php-mode-1.18.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=c4377dfd2b1489d5f12f39d8a2813f1a
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.5.0 b/metadata/md5-cache/app-emacs/php-mode-1.5.0
index 9aa570932542..c5d717c45f37 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.5.0
+++ b/metadata/md5-cache/app-emacs/php-mode-1.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/php-mode/php-mode-1.5.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=33c21ad5a4d9e059fa967f343ad71824
diff --git a/metadata/md5-cache/app-emacs/planner-3.42 b/metadata/md5-cache/app-emacs/planner-3.42
index b0271c3c625c..18e5c1358d92 100644
--- a/metadata/md5-cache/app-emacs/planner-3.42
+++ b/metadata/md5-cache/app-emacs/planner-3.42
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/muse-3.02.6a app-emacs/bbdb app-emacs/emacs-w3m >=virtual/em
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/planner-el/planner-3.42.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=fdbd25d48761fcec7cbe9f27a12f6267
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.19.3 b/metadata/md5-cache/app-emacs/po-mode-0.19.3
index 217e59b2b786..6983d80386a8 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.19.3
+++ b/metadata/md5-cache/app-emacs/po-mode-0.19.3
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Major mode for GNU gettext PO files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gettext/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6ce71263987210c2e21a561a9d9ca8be
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_md5_=41a3760efa85ed0da1f2858ecd891111
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.19.4 b/metadata/md5-cache/app-emacs/po-mode-0.19.4
index 44637db06928..327aba775a7f 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.19.4
+++ b/metadata/md5-cache/app-emacs/po-mode-0.19.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.4.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=d287ab343631ddff0ae2f17848f28495
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.19.8.1 b/metadata/md5-cache/app-emacs/po-mode-0.19.8.1
index e09364b9f03d..06d9b1860183 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.19.8.1
+++ b/metadata/md5-cache/app-emacs/po-mode-0.19.8.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=868f67ac75d796721e89e066a3cee0fb
diff --git a/metadata/md5-cache/app-emacs/popwin-0.6.2 b/metadata/md5-cache/app-emacs/popwin-0.6.2
index bf09ab43e698..79c50455960e 100644
--- a/metadata/md5-cache/app-emacs/popwin-0.6.2
+++ b/metadata/md5-cache/app-emacs/popwin-0.6.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/m2ym/popwin-el/tarball/v0.6.2 -> popwin-0.6.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=36fe7d81eae60eeda29847056d6e7418
diff --git a/metadata/md5-cache/app-emacs/pov-mode-3.3 b/metadata/md5-cache/app-emacs/pov-mode-3.3
index afa5195b9a93..b315c088aef2 100644
--- a/metadata/md5-cache/app-emacs/pov-mode-3.3
+++ b/metadata/md5-cache/app-emacs/pov-mode-3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3 FDL-1.2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://gitorious.org/pov-mode/pov-mode/archive-tarball/v3.3 -> pov-mode-3.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=1d3e447754238df65c797f171522473f
diff --git a/metadata/md5-cache/app-emacs/prom-wl-2.7.0-r1 b/metadata/md5-cache/app-emacs/prom-wl-2.7.0-r1
index 40f9f9c035b6..7feb2224748d 100644
--- a/metadata/md5-cache/app-emacs/prom-wl-2.7.0-r1
+++ b/metadata/md5-cache/app-emacs/prom-wl-2.7.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-emacs/wanderlust >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.h6.dion.ne.jp/~nytheta/software/pub/prom-wl-2.7.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=3d140981be32ee2cccec37aea048bf9a
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.2 b/metadata/md5-cache/app-emacs/proofgeneral-4.2
index 6d8e792936dd..d331770eb646 100644
--- a/metadata/md5-cache/app-emacs/proofgeneral-4.2
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6c2ea7ea38869e682388bf70048f2a3d
diff --git a/metadata/md5-cache/app-emacs/protbuf-1.7-r1 b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
index 8ad72b1d39a5..68504c24fb32 100644
--- a/metadata/md5-cache/app-emacs/protbuf-1.7-r1
+++ b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/protbuf-1.7.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=33a7bc541106ab1268d2d4a72591c33d
diff --git a/metadata/md5-cache/app-emacs/psgml-1.4.0 b/metadata/md5-cache/app-emacs/psgml-1.4.0
index 8bda4c6211dc..f2f5e8009319 100644
--- a/metadata/md5-cache/app-emacs/psgml-1.4.0
+++ b/metadata/md5-cache/app-emacs/psgml-1.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=app-text/openjade >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.fsavigny.de/gpled-software/psgml-1.4.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=ffe97c67a6abff87b1163e7eb678217a
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1 b/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
index d6b381b50fdb..e061e88718bf 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/0.3.tar.gz -> puppet-mode-0.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=e4a9dbfd4450767946ea207b47218536
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221 b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221
index b954c43460e2..712e8110bfc9 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/b3ed5057166a4f49dfa9be638523a348b55a2fd2.tar.gz -> puppet-mode-0.3.20171221.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=bbb591e196ab9e0f8ab1527b583ec63e
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.25-r2 b/metadata/md5-cache/app-emacs/pymacs-0.25-r2
index d012e4de8d06..21bb3d1fb35c 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.25-r2
+++ b/metadata/md5-cache/app-emacs/pymacs-0.25-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 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/pinard/Pymacs/tarball/v0.25 -> pymacs-0.25.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c83fd58e7feccc536ef542ee445103f
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.1.2 b/metadata/md5-cache/app-emacs/python-mode-6.1.2
index d1e4f978d727..d11c6faf92a4 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.1.2
+++ b/metadata/md5-cache/app-emacs/python-mode-6.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.1.2/+download/python-mode.el-6.1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd16f700e6799d0c3a1e033d343b7bea
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.2.0 b/metadata/md5-cache/app-emacs/python-mode-6.2.0
index 8afda53dc442..81c5e479462c 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.2.0
+++ b/metadata/md5-cache/app-emacs/python-mode-6.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.2.0/+download/python-mode.el-6.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aef7350405f30f41fa84b7664655084
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.2.3 b/metadata/md5-cache/app-emacs/python-mode-6.2.3
index 9c04de50569b..4ae98732ea4c 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.2.3
+++ b/metadata/md5-cache/app-emacs/python-mode-6.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.2.3/+download/python-mode.el-6.2.3.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=5ed12d6f060ca1949442f72b58913668
diff --git a/metadata/md5-cache/app-emacs/quack-0.47 b/metadata/md5-cache/app-emacs/quack-0.47
index 9848cfc57d01..7f822d014280 100644
--- a/metadata/md5-cache/app-emacs/quack-0.47
+++ b/metadata/md5-cache/app-emacs/quack-0.47
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/quack-0.47.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=85e99630f660b1f2cf6368fe718b404b
diff --git a/metadata/md5-cache/app-emacs/quilt-el-0.48.0 b/metadata/md5-cache/app-emacs/quilt-el-0.48.0
index e068ddcff147..e6b066c24cd4 100644
--- a/metadata/md5-cache/app-emacs/quilt-el-0.48.0
+++ b/metadata/md5-cache/app-emacs/quilt-el-0.48.0
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=dev-util/quilt >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://satoru-takeuchi.org/dev/quilt-el/download/quilt-el-0.48.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=782ff3365f43f511c6dda3a57eaba466
diff --git a/metadata/md5-cache/app-emacs/qwerty-1.1 b/metadata/md5-cache/app-emacs/qwerty-1.1
index e60a3394d12a..bec802616b37 100644
--- a/metadata/md5-cache/app-emacs/qwerty-1.1
+++ b/metadata/md5-cache/app-emacs/qwerty-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/qwerty-1.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=cf1594a28e7122d83a56e40de3a71b7e
diff --git a/metadata/md5-cache/app-emacs/redo+-1.19 b/metadata/md5-cache/app-emacs/redo+-1.19
index 851253122b13..afe54e65c71a 100644
--- a/metadata/md5-cache/app-emacs/redo+-1.19
+++ b/metadata/md5-cache/app-emacs/redo+-1.19
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/redo+-1.19.el.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4607c67d0fb787a12a6812c76da2aa7a
diff --git a/metadata/md5-cache/app-emacs/regress-1.5.1 b/metadata/md5-cache/app-emacs/regress-1.5.1
index d6b43dd205f3..c2c4d29db643 100644
--- a/metadata/md5-cache/app-emacs/regress-1.5.1
+++ b/metadata/md5-cache/app-emacs/regress-1.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/regress-1.5.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=d889dd47b1a8158484c80b2393b0af51
diff --git a/metadata/md5-cache/app-emacs/remember-2.0 b/metadata/md5-cache/app-emacs/remember-2.0
index e844c6a10bef..164c3ca0e6fc 100644
--- a/metadata/md5-cache/app-emacs/remember-2.0
+++ b/metadata/md5-cache/app-emacs/remember-2.0
@@ -10,5 +10,5 @@ RDEPEND=bbdb? ( app-emacs/bbdb ) planner? ( app-emacs/planner ) >=virtual/emacs-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/remember-el/remember-2.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=65e6a3d8d3467b646ddd8e0f83464b42
diff --git a/metadata/md5-cache/app-emacs/revive-2.23 b/metadata/md5-cache/app-emacs/revive-2.23
index 85efee878613..9b525c75ad5e 100644
--- a/metadata/md5-cache/app-emacs/revive-2.23
+++ b/metadata/md5-cache/app-emacs/revive-2.23
@@ -8,5 +8,5 @@ LICENSE=yuuji
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/revive-2.23.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=98b19388c02e94f02e99f204863785b8
diff --git a/metadata/md5-cache/app-emacs/rfcview-0.13 b/metadata/md5-cache/app-emacs/rfcview-0.13
index 8659585f677a..a040dfde89b0 100644
--- a/metadata/md5-cache/app-emacs/rfcview-0.13
+++ b/metadata/md5-cache/app-emacs/rfcview-0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rfcview-0.13.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=cb897fba3f1eda6e19a81cb4dcf3ae15
diff --git a/metadata/md5-cache/app-emacs/riece-8.0.0 b/metadata/md5-cache/app-emacs/riece-8.0.0
index 3c8f5f26aa6c..c66c53b80953 100644
--- a/metadata/md5-cache/app-emacs/riece-8.0.0
+++ b/metadata/md5-cache/app-emacs/riece-8.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/riece/riece-8.0.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=71a44dbf6f3b2ddb5f7ecf394be66aa7
diff --git a/metadata/md5-cache/app-emacs/riece-9.0.0 b/metadata/md5-cache/app-emacs/riece-9.0.0
index 44f86c9d86db..b4662007f39a 100644
--- a/metadata/md5-cache/app-emacs/riece-9.0.0
+++ b/metadata/md5-cache/app-emacs/riece-9.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/riece/riece-9.0.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=160f9d8694ab1b3354d7c45461d1771a
diff --git a/metadata/md5-cache/app-emacs/rnc-mode-1.0_beta3 b/metadata/md5-cache/app-emacs/rnc-mode-1.0_beta3
index 1ea6a919a4d4..1ec525230231 100644
--- a/metadata/md5-cache/app-emacs/rnc-mode-1.0_beta3
+++ b/metadata/md5-cache/app-emacs/rnc-mode-1.0_beta3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.pantor.com/RncMode-1_0b3.tgz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=454ab1ba09ea37b4d8409f57409ddc81
diff --git a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15 b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
index 521a74d41a2a..650528bd8219 100644
--- a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
+++ b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rpm-spec-mode-0.15.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=c2e58e28a9eb5afcfb8279229609d7a2
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.0.0_p247 b/metadata/md5-cache/app-emacs/ruby-mode-2.0.0_p247
index eb26e19b1614..4de973da901b 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.0.0_p247
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.0.0_p247
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.0.0-p247.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6b84a469160e067002ca75900c919aec
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.2.2 b/metadata/md5-cache/app-emacs/ruby-mode-2.2.2
index a2da161856df..69899561491a 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.2.2
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.2.2.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6fad4280e25b0e64ea19ae37cee98431
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.3.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.3.0
index e474752f3926..c9128582b06c 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.3.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.3.0.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=9279b393c8061ee05149198a4dcbb0e0
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.4.1 b/metadata/md5-cache/app-emacs/ruby-mode-2.4.1
index 427d56d78815..c0265c9ed4c7 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.4.1
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.4.1.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5925b40e2b38b0b875de5ff991cffe00
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.5.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.5.0
index 59419fdc1bc0..e5ab91928d62 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.5.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.5.0.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5925b40e2b38b0b875de5ff991cffe00
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1 b/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
index aa8208552baf..6810fead0208 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
+++ b/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3_pre20110721.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=85263b1b75dbbc1c717d2b0d2d6345e9
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20180221 b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20180221
index c2c0d5e8574b..106432a24e52 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20180221
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20180221
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rust-mode-0.3.0_p20180221.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=072f698d4157029219fc8b6f466d3e77
diff --git a/metadata/md5-cache/app-emacs/s-1.11.0 b/metadata/md5-cache/app-emacs/s-1.11.0
index bd4ec9b3a551..72de6038de77 100644
--- a/metadata/md5-cache/app-emacs/s-1.11.0
+++ b/metadata/md5-cache/app-emacs/s-1.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.11.0.tar.gz -> s-1.11.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=5973a823a15ca80de223c9ee8e21bf09
diff --git a/metadata/md5-cache/app-emacs/s-1.12.0 b/metadata/md5-cache/app-emacs/s-1.12.0
index 06b421540491..538cc730a501 100644
--- a/metadata/md5-cache/app-emacs/s-1.12.0
+++ b/metadata/md5-cache/app-emacs/s-1.12.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=54d87a75642a2220b8a305fb0b1ed56b
diff --git a/metadata/md5-cache/app-emacs/scala-mode-2.10.3 b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
index c9c1504aa545..ebb0c7fa1e28 100644
--- a/metadata/md5-cache/app-emacs/scala-mode-2.10.3
+++ b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/scala >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=c166f8e1187eae832175edd2b5f13e37
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.8.10 b/metadata/md5-cache/app-emacs/scheme-complete-0.8.10
index 8bd2b420852e..c85ea62f20bd 100644
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.8.10
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.8.10
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.8.10.el.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=906795cc2b7a92d9bc18e9ee60499e78
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.8.11 b/metadata/md5-cache/app-emacs/scheme-complete-0.8.11
index ab4812a50180..0c3d3e1fa310 100644
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.8.11
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.8.11
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.8.11.el.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=5aa9661dc7a8a9be71c72bab07eaccd7
diff --git a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2 b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2
index 38346f632b9f..958def1cd18a 100644
--- a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2
+++ b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-i18n/scim >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/scim-bridge.el/0.8/0.8.2/+download/scim-bridge-el-0.8.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f746a632cae4d4b75d36768825daf800
diff --git a/metadata/md5-cache/app-emacs/scss-mode-20130215 b/metadata/md5-cache/app-emacs/scss-mode-20130215
index 6d734ec21940..07c529a33c9a 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-20130215
+++ b/metadata/md5-cache/app-emacs/scss-mode-20130215
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/3452e92800c345690195f55a74ba4118c5c4d004.tar.gz -> scss-mode-20130215-git.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6772d534b6630f63890d4b1a043b76fb
diff --git a/metadata/md5-cache/app-emacs/scss-mode-20150107 b/metadata/md5-cache/app-emacs/scss-mode-20150107
index dad084e28b96..b2fdfbe36a09 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-20150107
+++ b/metadata/md5-cache/app-emacs/scss-mode-20150107
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-20150107-git.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=cad1c8757e7d3264459320be90051a21
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.6-r2 b/metadata/md5-cache/app-emacs/semi-1.14.6-r2
index 117cb18531d1..70634f0343ce 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.6-r2
+++ b/metadata/md5-cache/app-emacs/semi-1.14.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/semi-1.14.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c313275b501818bebe688ffb0a9e917c
diff --git a/metadata/md5-cache/app-emacs/session-2.3a b/metadata/md5-cache/app-emacs/session-2.3a
index 684b04cd2524..364b80d4c191 100644
--- a/metadata/md5-cache/app-emacs/session-2.3a
+++ b/metadata/md5-cache/app-emacs/session-2.3a
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-session/session-2.3a.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88c23321f526464402bec92e8090401a
diff --git a/metadata/md5-cache/app-emacs/setnu-1.06 b/metadata/md5-cache/app-emacs/setnu-1.06
index aa31247296a4..619ac7105cb5 100644
--- a/metadata/md5-cache/app-emacs/setnu-1.06
+++ b/metadata/md5-cache/app-emacs/setnu-1.06
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/setnu-1.06.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=98e5281c80d21620565645931af2c3c3
diff --git a/metadata/md5-cache/app-emacs/slime-2.15 b/metadata/md5-cache/app-emacs/slime-2.15
index d25547074bf1..3daede21e98d 100644
--- a/metadata/md5-cache/app-emacs/slime-2.15
+++ b/metadata/md5-cache/app-emacs/slime-2.15
@@ -11,5 +11,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.15.tar.gz -> slime-2.15.tar.gz
-_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98c79f3f2a6acba7af7899fb46c6e6ec
diff --git a/metadata/md5-cache/app-emacs/slime-2.20 b/metadata/md5-cache/app-emacs/slime-2.20
index 963f4b71c2c1..1816812c0143 100644
--- a/metadata/md5-cache/app-emacs/slime-2.20
+++ b/metadata/md5-cache/app-emacs/slime-2.20
@@ -10,5 +10,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=71fab08a56bba930e1b4c43108ccda3b
diff --git a/metadata/md5-cache/app-emacs/slime-2.20-r1 b/metadata/md5-cache/app-emacs/slime-2.20-r1
index 0e35e25d726e..f4d215a49bd1 100644
--- a/metadata/md5-cache/app-emacs/slime-2.20-r1
+++ b/metadata/md5-cache/app-emacs/slime-2.20-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=0f0983bcef5b74f09cde1319baf3ed0c
diff --git a/metadata/md5-cache/app-emacs/slime-2.21 b/metadata/md5-cache/app-emacs/slime-2.21
index 69f29e31e6c7..7a3248dc96e1 100644
--- a/metadata/md5-cache/app-emacs/slime-2.21
+++ b/metadata/md5-cache/app-emacs/slime-2.21
@@ -10,5 +10,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.21.tar.gz -> slime-2.21.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=cfa0ecee09b801e6edc00e600cac08e1
diff --git a/metadata/md5-cache/app-emacs/sml-mode-6.4 b/metadata/md5-cache/app-emacs/sml-mode-6.4
index 18c502c568c9..f91d92bd5917 100644
--- a/metadata/md5-cache/app-emacs/sml-mode-6.4
+++ b/metadata/md5-cache/app-emacs/sml-mode-6.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=mirror://gentoo/sml-mode-6.4.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=efa5606badc441fd5eb4b3efe4240a4e
diff --git a/metadata/md5-cache/app-emacs/sokoban-1.4 b/metadata/md5-cache/app-emacs/sokoban-1.4
index 623c7e1e1609..3d4ae005620a 100644
--- a/metadata/md5-cache/app-emacs/sokoban-1.4
+++ b/metadata/md5-cache/app-emacs/sokoban-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/sokoban-1.4.tar
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=8326b11b7282fc2081463a76e1ea434e
diff --git a/metadata/md5-cache/app-emacs/ssh-20120709 b/metadata/md5-cache/app-emacs/ssh-20120709
index d1846b2ae2e0..70685b253ea6 100644
--- a/metadata/md5-cache/app-emacs/ssh-20120709
+++ b/metadata/md5-cache/app-emacs/ssh-20120709
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ssh-20120709.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6a02d9ef2357593fecc321e4831db3cb
diff --git a/metadata/md5-cache/app-emacs/stripes-0.2-r1 b/metadata/md5-cache/app-emacs/stripes-0.2-r1
index 3f870ab2c34b..31afeb2d90cc 100644
--- a/metadata/md5-cache/app-emacs/stripes-0.2-r1
+++ b/metadata/md5-cache/app-emacs/stripes-0.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/stripes-0.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=c0c044a6e3b47c66743688d0c4223d0c
diff --git a/metadata/md5-cache/app-emacs/sumibi-0.5.2 b/metadata/md5-cache/app-emacs/sumibi-0.5.2
index 9de6c41e3d25..fdb0fbaaac70 100644
--- a/metadata/md5-cache/app-emacs/sumibi-0.5.2
+++ b/metadata/md5-cache/app-emacs/sumibi-0.5.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/sumibi/17176/sumibi-0.5.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=560442c45b71e2970dc537c42e02a3cf
diff --git a/metadata/md5-cache/app-emacs/tdtd-0.7.1-r1 b/metadata/md5-cache/app-emacs/tdtd-0.7.1-r1
index 1556ad07ef30..a84406d3f80f 100644
--- a/metadata/md5-cache/app-emacs/tdtd-0.7.1-r1
+++ b/metadata/md5-cache/app-emacs/tdtd-0.7.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.menteith.com/raw-attachment/wiki/tdtd/data/tdtd071.zip
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=f8708119d34b07c40de6d2ac43e255cc
diff --git a/metadata/md5-cache/app-emacs/teco-7-r1 b/metadata/md5-cache/app-emacs/teco-7-r1
index 145cb69b45d4..8bb963a66061 100644
--- a/metadata/md5-cache/app-emacs/teco-7-r1
+++ b/metadata/md5-cache/app-emacs/teco-7-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/teco-7.el.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d215180cb6c6da72dd796d079310908
diff --git a/metadata/md5-cache/app-emacs/template-3.1c-r1 b/metadata/md5-cache/app-emacs/template-3.1c-r1
index c799471d83dd..c8484140d43f 100644
--- a/metadata/md5-cache/app-emacs/template-3.1c-r1
+++ b/metadata/md5-cache/app-emacs/template-3.1c-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-template/template-3.1c.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=b640653dd9ae778d130218a172fa782f
diff --git a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5 b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
index 704ccb11ef23..d2ed2e7a8c02 100644
--- a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
+++ b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/tempo-snippets-0.1.5.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=a0ad0574231c6a1a06a1b7db2832b23e
diff --git a/metadata/md5-cache/app-emacs/thinks-1.9 b/metadata/md5-cache/app-emacs/thinks-1.9
index 006de64f9e5f..b2386a6875ab 100644
--- a/metadata/md5-cache/app-emacs/thinks-1.9
+++ b/metadata/md5-cache/app-emacs/thinks-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/thinks-1.9.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=3187dc02b666ec3c67d53769f239f9af
diff --git a/metadata/md5-cache/app-emacs/thumbs-2.0-r1 b/metadata/md5-cache/app-emacs/thumbs-2.0-r1
index 75891f0cb4ab..02553fe97699 100644
--- a/metadata/md5-cache/app-emacs/thumbs-2.0-r1
+++ b/metadata/md5-cache/app-emacs/thumbs-2.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/imagemagick-tools >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/thumbs-2.0.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=59ed0a3153f789077c1ad81dfc262b5c
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.10 b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.10
index c04f6891d1ae..9cba6f446b84 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.10
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/archive/2.0.10.tar.gz -> tuareg-mode-2.0.10.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6cb95f0709d0f461d48fa7852a05db25
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.7 b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.7
index 438db8f98bf7..aabd777b925d 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.7
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1304/tuareg-2.0.7.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=afdf53769bda7c55d8abf03dba8f93ce
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.8 b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.8
index e425a122b73c..5162ebbd297c 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.8
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/releases/download/2.0.8/tuareg-2.0.8.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=074873e1907f2bb1248c5bafd187dc53
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
index b923f7617fce..71c885dc77e6 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-2.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
index 78d7aae3e335..fe3493e72753 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-3.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-9999 b/metadata/md5-cache/app-emacs/twittering-mode-9999
index 80a11a8aca01..7827c4f0365e 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-9999
+++ b/metadata/md5-cache/app-emacs/twittering-mode-9999
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg >=virtual/emacs-23
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/metadata/md5-cache/app-emacs/typing-1.1.4 b/metadata/md5-cache/app-emacs/typing-1.1.4
index efc18572a32c..70a969c2b0e6 100644
--- a/metadata/md5-cache/app-emacs/typing-1.1.4
+++ b/metadata/md5-cache/app-emacs/typing-1.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/typing-1.1.4.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=ef3e908bcaa24c775e4791f433218148
diff --git a/metadata/md5-cache/app-emacs/uboat-1.2 b/metadata/md5-cache/app-emacs/uboat-1.2
index a13d2eb35a4c..95e4b0851336 100644
--- a/metadata/md5-cache/app-emacs/uboat-1.2
+++ b/metadata/md5-cache/app-emacs/uboat-1.2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/uboat-1.2.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=a4edd7440c098542e65aafc1df3ffef6
diff --git a/metadata/md5-cache/app-emacs/undo-tree-0.5.2 b/metadata/md5-cache/app-emacs/undo-tree-0.5.2
index b98ee962f5ee..2fe00a68efb3 100644
--- a/metadata/md5-cache/app-emacs/undo-tree-0.5.2
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.5.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.5.2.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=d809c42aadd46ff17f447d431246d29e
diff --git a/metadata/md5-cache/app-emacs/undo-tree-0.6.4 b/metadata/md5-cache/app-emacs/undo-tree-0.6.4
index 0401ba576c4d..1497aef258b0 100644
--- a/metadata/md5-cache/app-emacs/undo-tree-0.6.4
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.6.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.6.4.el.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=945a2843d5143bc0ecf8745e1db04e26
diff --git a/metadata/md5-cache/app-emacs/uptimes-2.3-r2 b/metadata/md5-cache/app-emacs/uptimes-2.3-r2
index bf64b8b87006..cc1a2124cdbc 100644
--- a/metadata/md5-cache/app-emacs/uptimes-2.3-r2
+++ b/metadata/md5-cache/app-emacs/uptimes-2.3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/uptimes-2.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1011ae0c1861069d51b9571421a282bf
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.34.2 b/metadata/md5-cache/app-emacs/vhdl-mode-3.34.2
index 061335f65709..da223bee079f 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.34.2
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.34.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.34.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=c341e8ba888c2a31a741ed512ea92973
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.35.1 b/metadata/md5-cache/app-emacs/vhdl-mode-3.35.1
index 8031b5ad534b..9c5471970ae9 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.35.1
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.35.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.35.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=f9943ae7c250413f2b77bc5a3eff212a
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1 b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
index a72a3c36196f..26c985c9cc7f 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.1.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=62c3b163113cb5ecc9fe2848a0e99766
diff --git a/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12 b/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
index 18eeb22db40d..47e4aecff8db 100644
--- a/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
+++ b/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.4.12.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=0645a45d338aa208d72d3425f151710b
diff --git a/metadata/md5-cache/app-emacs/vm-8.1.2 b/metadata/md5-cache/app-emacs/vm-8.1.2
index 6f4c3fe366a9..ea737956c3d4 100644
--- a/metadata/md5-cache/app-emacs/vm-8.1.2
+++ b/metadata/md5-cache/app-emacs/vm-8.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=!app-emacs/u-vm-color bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/vm/8.1.x/8.1.2/+download/vm-8.1.2.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=db9380550dd2e066b0b95c55431a4875
diff --git a/metadata/md5-cache/app-emacs/vm-8.2.0_beta b/metadata/md5-cache/app-emacs/vm-8.2.0_beta
index b40e4a4902fb..9463e119da2b 100644
--- a/metadata/md5-cache/app-emacs/vm-8.2.0_beta
+++ b/metadata/md5-cache/app-emacs/vm-8.2.0_beta
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=!app-emacs/u-vm-color bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/vm/8.2.x/8.2.0b/+download/vm-8.2.0b.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae5eef45a17d48b5010526e10cf9bb54
diff --git a/metadata/md5-cache/app-emacs/volume-1.0-r1 b/metadata/md5-cache/app-emacs/volume-1.0-r1
index 25fed87c3413..c8ba2b4e282c 100644
--- a/metadata/md5-cache/app-emacs/volume-1.0-r1
+++ b/metadata/md5-cache/app-emacs/volume-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/volume-1.0.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=0f855b888df369f97e1284f12ab69058
diff --git a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3 b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
index dceec18a30f4..39a14d7893be 100644
--- a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
+++ b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/emacs-w3m >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/w3mnav-0.5.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=336c697e2cbbeba2bbc165d2f5a0d46d
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.14.0-r6 b/metadata/md5-cache/app-emacs/wanderlust-2.14.0-r6
index 71a970d037c9..410075937181 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.14.0-r6
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.14.0-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=ftp://ftp.gohome.org/wl/stable/wl-2.14.0.tar.gz ftp://ftp.gohome.org/wl/beta/wl-2.14.0.tar.gz mirror://gentoo/wanderlust-2.14.0-20050405.patch.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=688a39e7023189cc13e8eed0cfa09eab
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
index 15e537ca47a7..8dc5c21e0616 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/wanderlust-2.15.9_p20130619.tar.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=59ae82792aa7a7f939d6fb612cbaf197
diff --git a/metadata/md5-cache/app-emacs/websocket-1.10 b/metadata/md5-cache/app-emacs/websocket-1.10
new file mode 100644
index 000000000000..85d661d84793
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/websocket-1.10
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-24
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=A websocket implementation in elisp
+EAPI=7
+HOMEPAGE=https://github.com/ahyatt/emacs-websocket
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.10.tar.gz -> websocket-1.10.tar.gz
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=67b7c84697fc173cc3a45d1aa4b19e12
diff --git a/metadata/md5-cache/app-emacs/websocket-1.9 b/metadata/md5-cache/app-emacs/websocket-1.9
index 9402e14001b6..8830b2ec4ec0 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.9
+++ b/metadata/md5-cache/app-emacs/websocket-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.9.tar.gz -> websocket-1.9.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=26faabf678902bfaab8e819b75d7a17f
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.1.10 b/metadata/md5-cache/app-emacs/wgrep-2.1.10
index 0ac25de62300..8030de836035 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.1.10
+++ b/metadata/md5-cache/app-emacs/wgrep-2.1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/wgrep-2.1.10.el.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c3071d842cb38c7f5ae3c8e369d498c
diff --git a/metadata/md5-cache/app-emacs/whine-20091222 b/metadata/md5-cache/app-emacs/whine-20091222
index 0b1d7738bf14..2ad614344580 100644
--- a/metadata/md5-cache/app-emacs/whine-20091222
+++ b/metadata/md5-cache/app-emacs/whine-20091222
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/whine-20091222.tar.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=fdf86ad9c0d6595994973414d7ffb60a
diff --git a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r1 b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r1
index 991ae5124fd1..3790b3d5ab6d 100644
--- a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r1
+++ b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=outline-magic? ( app-emacs/outline-magic ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-mode-0.5.el.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08d9ac28756db02a2c36ff1fa3910d6e
diff --git a/metadata/md5-cache/app-emacs/windows-2.49 b/metadata/md5-cache/app-emacs/windows-2.49
index 9cbe92462306..7c81d4eee5d2 100644
--- a/metadata/md5-cache/app-emacs/windows-2.49
+++ b/metadata/md5-cache/app-emacs/windows-2.49
@@ -8,5 +8,5 @@ LICENSE=yuuji
 RDEPEND=app-emacs/revive >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/windows-2.49.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=9c6a2d43c06f511f5d9069322a3e25b9
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.5.10 b/metadata/md5-cache/app-emacs/with-editor-2.5.10
deleted file mode 100644
index 26a81096d534..000000000000
--- a/metadata/md5-cache/app-emacs/with-editor-2.5.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
-EAPI=5
-HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!!<app-emacs/magit-2.5.0 >=app-emacs/dash-2.13.0 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/with-editor/archive/v2.5.10.tar.gz -> with-editor-2.5.10.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5ffb0311053b3025173d3c153f1a37fa
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.5.8 b/metadata/md5-cache/app-emacs/with-editor-2.5.8
deleted file mode 100644
index 6361d487eca3..000000000000
--- a/metadata/md5-cache/app-emacs/with-editor-2.5.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
-EAPI=5
-HOMEPAGE=https://magit.vc/manual/with-editor/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!!<app-emacs/magit-2.5.0 >=app-emacs/dash-2.13.0 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/with-editor/archive/v2.5.8.tar.gz -> with-editor-2.5.8.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=916bf532a0bcdf18e10285506cae4829
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.6.0 b/metadata/md5-cache/app-emacs/with-editor-2.6.0
index 74d68ce93e85..0475b45a0b83 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.6.0
+++ b/metadata/md5-cache/app-emacs/with-editor-2.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.6.0.tar.gz -> with-editor-2.6.0.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=dc3c2676a35393f51aaf7231721280f6
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.7.2 b/metadata/md5-cache/app-emacs/with-editor-2.7.2
index c3686dc6879a..c9a82b89545a 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.7.2
+++ b/metadata/md5-cache/app-emacs/with-editor-2.7.2
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo >=virtual/emacs-24
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=6
 HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.7.2.tar.gz -> with-editor-2.7.2.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=2c49a44445182efbcb660b1e7dece1e1
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=dc3c2676a35393f51aaf7231721280f6
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.7.3 b/metadata/md5-cache/app-emacs/with-editor-2.7.3
new file mode 100644
index 000000000000..207b3869ec4c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/with-editor-2.7.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-apps/texinfo >=virtual/emacs-24
+DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
+EAPI=6
+HOMEPAGE=https://magit.vc/manual/with-editor
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/magit/with-editor/archive/v2.7.3.tar.gz -> with-editor-2.7.3.tar.gz
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=2c49a44445182efbcb660b1e7dece1e1
diff --git a/metadata/md5-cache/app-emacs/xclip-1.3 b/metadata/md5-cache/app-emacs/xclip-1.3
index 28222ee9b311..563a8eb40749 100644
--- a/metadata/md5-cache/app-emacs/xclip-1.3
+++ b/metadata/md5-cache/app-emacs/xclip-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-misc/xclip >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.3.el.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8da3c8200ce64b7fa2322c2b70402420
diff --git a/metadata/md5-cache/app-emacs/xrdb-mode-3.0 b/metadata/md5-cache/app-emacs/xrdb-mode-3.0
index ddeb3e6d433d..49f010650678 100644
--- a/metadata/md5-cache/app-emacs/xrdb-mode-3.0
+++ b/metadata/md5-cache/app-emacs/xrdb-mode-3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=541145a3b5eb70361e5e41b30fe467c7
diff --git a/metadata/md5-cache/app-emacs/xslide-0.2.2 b/metadata/md5-cache/app-emacs/xslide-0.2.2
index fa18b7c5bb35..a9b673ecc19e 100644
--- a/metadata/md5-cache/app-emacs/xslide-0.2.2
+++ b/metadata/md5-cache/app-emacs/xslide-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.zip
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=a3ebcd4d5cbb38412e32052f6098683a
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
index 758e2d0d8db8..bab03212e0ed 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/v0.0.13.tar.gz -> yaml-mode-0.0.13.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=029b1ca777a1da09d6ec863765f4f768
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.9 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.9
index 779a87540fd3..30d8827fc2e2 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.9
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/release-0.0.9.tar.gz -> yaml-mode-0.0.9.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=6f74d08498ab0bb9fcf670a1a7313371
diff --git a/metadata/md5-cache/app-emacs/yasnippet-0.13.0 b/metadata/md5-cache/app-emacs/yasnippet-0.13.0
new file mode 100644
index 000000000000..3dc15c21090d
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/yasnippet-0.13.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Yet another snippet extension for Emacs
+EAPI=6
+HOMEPAGE=http://joaotavora.github.com/yasnippet/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/joaotavora/yasnippet/archive/0.13.0.tar.gz -> yasnippet-0.13.0.tar.gz
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
+_md5_=bd888dc018b439f9ef025d6d6d9c8afa
diff --git a/metadata/md5-cache/app-emacs/yasnippet-0.5.10 b/metadata/md5-cache/app-emacs/yasnippet-0.5.10
deleted file mode 100644
index bbb1a3ec240c..000000000000
--- a/metadata/md5-cache/app-emacs/yasnippet-0.5.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=app-emacs/dropdown-list-20080316 >=virtual/emacs-23
-DESCRIPTION=Yet another snippet extension for Emacs
-EAPI=0
-HOMEPAGE=https://github.com/capitaomorte/yasnippet
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT GPL-2
-RDEPEND=>=app-emacs/dropdown-list-20080316 >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://yasnippet.googlecode.com/files/yasnippet-0.5.10.tar.bz2 doc? ( https://yasnippet.googlecode.com/files/yasnippet-doc-0.5.10.tar.bz2 )
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=51756e9165f87bcf93d2fe7f184d1e3f
diff --git a/metadata/md5-cache/app-emacs/yasnippet-0.6.0c b/metadata/md5-cache/app-emacs/yasnippet-0.6.0c
deleted file mode 100644
index 880f828fea81..000000000000
--- a/metadata/md5-cache/app-emacs/yasnippet-0.6.0c
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=app-emacs/dropdown-list-20080316 >=virtual/emacs-23
-DESCRIPTION=Yet another snippet extension for Emacs
-EAPI=0
-HOMEPAGE=https://github.com/capitaomorte/yasnippet
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT GPL-2
-RDEPEND=>=app-emacs/dropdown-list-20080316 >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://yasnippet.googlecode.com/files/yasnippet-0.6.0c.tar.bz2 doc? ( https://yasnippet.googlecode.com/files/yasnippet-doc-0.6.0c.tar.bz2 )
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=d1dacb433d0b9636225f182c137d4f90
diff --git a/metadata/md5-cache/app-emacs/yasnippet-0.6.1c b/metadata/md5-cache/app-emacs/yasnippet-0.6.1c
index 6b39bf8f1b88..47519eca7bb5 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-0.6.1c
+++ b/metadata/md5-cache/app-emacs/yasnippet-0.6.1c
@@ -9,5 +9,5 @@ LICENSE=MIT GPL-2
 RDEPEND=>=app-emacs/dropdown-list-20080316 >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://yasnippet.googlecode.com/files/yasnippet-0.6.1c.tar.bz2 doc? ( https://yasnippet.googlecode.com/files/yasnippet-doc-0.6.1c.tar.bz2 )
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=d1dacb433d0b9636225f182c137d4f90
diff --git a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3 b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
new file mode 100644
index 000000000000..32aa89da02fc
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A collection of yasnippet snippets for many languages
+EAPI=7
+HOMEPAGE=https://github.com/AndreaCrotti/yasnippet-snippets
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-emacs/yasnippet >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/AndreaCrotti/yasnippet-snippets/archive/0.3.tar.gz -> yasnippet-snippets-0.3.tar.gz
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=aa9a65c265773043b88e1e4239cd3d42
diff --git a/metadata/md5-cache/app-emacs/yatex-1.76 b/metadata/md5-cache/app-emacs/yatex-1.76
index 5434b6fc4797..44471bb9d980 100644
--- a/metadata/md5-cache/app-emacs/yatex-1.76
+++ b/metadata/md5-cache/app-emacs/yatex-1.76
@@ -9,5 +9,5 @@ LICENSE=YaTeX
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.yatex.org/yatex1.76.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0ffa4e9ef854c73a2e5ffb0894a0ee2b
diff --git a/metadata/md5-cache/app-emacs/yatex-1.77 b/metadata/md5-cache/app-emacs/yatex-1.77
index af031ce5f0e4..1abd361e9258 100644
--- a/metadata/md5-cache/app-emacs/yatex-1.77
+++ b/metadata/md5-cache/app-emacs/yatex-1.77
@@ -9,5 +9,5 @@ LICENSE=YaTeX
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.yatex.org/yatex1.77.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb901f82baba2cc0be06b0ecaa964fc6
diff --git a/metadata/md5-cache/app-emacs/yc-4.0.13 b/metadata/md5-cache/app-emacs/yc-4.0.13
index 417e3b99fb6b..079a4d0f5c73 100644
--- a/metadata/md5-cache/app-emacs/yc-4.0.13
+++ b/metadata/md5-cache/app-emacs/yc-4.0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/canna >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-4.0.13.tar.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=446ae9aa76456fa7f49fe9beeb11b86d
diff --git a/metadata/md5-cache/app-emacs/yc-5.2.1 b/metadata/md5-cache/app-emacs/yc-5.2.1
index 35e78b0cea13..7f065b018a34 100644
--- a/metadata/md5-cache/app-emacs/yc-5.2.1
+++ b/metadata/md5-cache/app-emacs/yc-5.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/canna >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-5.2.1.el.gz
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=7ff94dc4e591171d6ae4df302dd786df
diff --git a/metadata/md5-cache/app-emacs/zenburn-20110907 b/metadata/md5-cache/app-emacs/zenburn-20110907
index 4f26d34bb2f7..34677e6f80f7 100644
--- a/metadata/md5-cache/app-emacs/zenburn-20110907
+++ b/metadata/md5-cache/app-emacs/zenburn-20110907
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-emacs/color-theme >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/zenburn-20110907.el.bz2
-_eclasses_=elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
+_eclasses_=elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
 _md5_=0444710e08f7861c49dbaf7e31af60dc
diff --git a/metadata/md5-cache/app-emacs/zenirc-2.112-r1 b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
index cf93c394af8a..e1bb0a0c4fd5 100644
--- a/metadata/md5-cache/app-emacs/zenirc-2.112-r1
+++ b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=ftp://ftp.zenirc.org/pub/zenirc/zenirc-2.112.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	fbeb298abf384e44df301f04b7709585	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp	12e33ba725e375a938c5997b692a8667	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=73190e220769f4edb81899bc83450855
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index f2433a6d4794..afd59c2f3766 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/containerd-1.0.3_p20180223 b/metadata/md5-cache/app-emulation/containerd-1.0.3_p20180223
index eb1843da5846..19abb9131b30 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.0.3_p20180223
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.3_p20180223
@@ -4,11 +4,11 @@ DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
 IUSE=+btrfs hardened
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc4 ) sys-libs/libseccomp
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac.tar.gz -> containerd-1.0.3_p20180223.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1aa38b2467d1e2e1e12da0cf95ebe84a
+_md5_=f6d2b9d7d4f497baf5bc88bc4f954a1e
diff --git a/metadata/md5-cache/app-emulation/containerd-1.0.3_p20180223-r1 b/metadata/md5-cache/app-emulation/containerd-1.0.3_p20180223-r1
index ee7d486f93ef..d614215def0c 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.0.3_p20180223-r1
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.3_p20180223-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
 IUSE=+btrfs hardened
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc4 ) sys-libs/libseccomp
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac.tar.gz -> containerd-1.0.3_p20180223.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8ed21bb4305783c13efd75e0623fbbd9
+_md5_=4256eb8c4ead4a6436947bf6b6eb8701
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.10.1 b/metadata/md5-cache/app-emulation/cri-o-1.10.1
new file mode 100644
index 000000000000..1d9dcffbfa7a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cri-o-1.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
+EAPI=6
+HOMEPAGE=http://cri-o.io/
+IUSE=btrfs +device-mapper ostree seccomp selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
+SLOT=0
+SRC_URI=https://github.com/kubernetes-incubator/cri-o/archive/v1.10.1.tar.gz -> cri-o-1.10.1.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d2dd1a89462fd4bc5698d2d1440448f9
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.15.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.15.0
deleted file mode 100644
index 3e2877e5eefe..000000000000
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[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(-)]
-DESCRIPTION=Golden Disk Image builder.
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/networkx-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[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=mirror://pypi/d/diskimage-builder/diskimage-builder-2.15.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd8cb5b513a2a43274239b7813b40cd0
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.15.1 b/metadata/md5-cache/app-emulation/diskimage-builder-2.15.1
new file mode 100644
index 000000000000..4ea726a6de7a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[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(-)]
+DESCRIPTION=Golden Disk Image builder.
+EAPI=6
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/networkx-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[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=mirror://pypi/d/diskimage-builder/diskimage-builder-2.15.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd8cb5b513a2a43274239b7813b40cd0
diff --git a/metadata/md5-cache/app-emulation/dlx-1.0.0 b/metadata/md5-cache/app-emulation/dlx-1.0.0
index 1b20c7225e30..c7208a1445fc 100644
--- a/metadata/md5-cache/app-emulation/dlx-1.0.0
+++ b/metadata/md5-cache/app-emulation/dlx-1.0.0
@@ -1,9 +1,9 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=install
 DESCRIPTION=DLX Simulator
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.davidviner.com/dlx.php
 KEYWORDS=x86 ppc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.davidviner.com/dlx/dlx.tar.gz
-_md5_=15d1851e9683a3897c5242e67b2536f5
+_md5_=14962fbc90fa039ad8030da6c447c654
diff --git a/metadata/md5-cache/app-emulation/dlx-1.0.0-r1 b/metadata/md5-cache/app-emulation/dlx-1.0.0-r1
deleted file mode 100644
index a61ace43c46c..000000000000
--- a/metadata/md5-cache/app-emulation/dlx-1.0.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=DLX Simulator
-EAPI=0
-HOMEPAGE=http://www.davidviner.com/dlx.php
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.davidviner.com/dlx/dlx.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d9b9b871edcd3a58563a3867243cddb2
diff --git a/metadata/md5-cache/app-emulation/docker-18.05.0 b/metadata/md5-cache/app-emulation/docker-18.05.0
index 62c030c84294..005be28cf3bb 100644
--- a/metadata/md5-cache/app-emulation/docker-18.05.0
+++ b/metadata/md5-cache/app-emulation/docker-18.05.0
@@ -4,11 +4,11 @@ DESCRIPTION=The core functions you need to create Docker images and run Docker c
 EAPI=6
 HOMEPAGE=https://dockerproject.org
 IUSE=apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.0.3_p20180223 ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180411 container-init? ( >=sys-process/tini-0.16.1[static] )
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz -> docker-18.05.0.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ba5a96e41f00047e64b0b48554b23dc5
+_md5_=b8c0447498cf45d58f7001729f8eef09
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.18.0 b/metadata/md5-cache/app-emulation/docker-compose-1.18.0
deleted file mode 100644
index 8511aeb34054..000000000000
--- a/metadata/md5-cache/app-emulation/docker-compose-1.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-2.6.1[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/docker-py-3.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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[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/mock-1.0.1[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=Multi-container orchestration for Docker
-EAPI=6
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-2.6.1[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/docker-py-3.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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.18.0.tar.gz -> docker-compose-1.18.0.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af84e6be6c4e6e9363d44e84fdb5ce63
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.19.0 b/metadata/md5-cache/app-emulation/docker-compose-1.19.0
index edda0837671d..3d0d662a6bf5 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.19.0
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.19.0
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-container orchestration for Docker
 EAPI=6
 HOMEPAGE=https://www.docker.com/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-2.7.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(-)] <dev-python/docker-py-3.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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.19.0.tar.gz -> docker-compose-1.19.0.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f8efb38ec5b3f5d39b95828e656b3c5
+_md5_=8ef9c0532ce1823a5018ffffa37533c3
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.20.1 b/metadata/md5-cache/app-emulation/docker-compose-1.20.1
deleted file mode 100644
index 4e68f029913f..000000000000
--- a/metadata/md5-cache/app-emulation/docker-compose-1.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-3.1.4[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/docker-py-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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[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/mock-1.0.1[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=Multi-container orchestration for Docker
-EAPI=6
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-3.1.4[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/docker-py-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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.20.1.tar.gz -> docker-compose-1.20.1.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=883d11c2734997b23ce5ae256c76adda
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.21.0 b/metadata/md5-cache/app-emulation/docker-compose-1.21.0
deleted file mode 100644
index 2808e0b6255f..000000000000
--- a/metadata/md5-cache/app-emulation/docker-compose-1.21.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-3.2.1[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/docker-py-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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[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/mock-1.0.1[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=Multi-container orchestration for Docker
-EAPI=6
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-3.2.1[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/docker-py-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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.21.0.tar.gz -> docker-compose-1.21.0.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1a96a6de2af2d15b4cd40d36880b33f
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.21.2 b/metadata/md5-cache/app-emulation/docker-compose-1.21.2
new file mode 100644
index 000000000000..e3b010ebe03e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.21.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-3.2.1[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/docker-py-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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[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/mock-1.0.1[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=Multi-container orchestration for Docker
+EAPI=6
+HOMEPAGE=https://www.docker.com/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[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/cached-property-1.2.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(-)] <dev-python/cached-property-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(-)] >=dev-python/dockerpty-0.4.1[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/dockerpty-0.5[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/docker-py-3.2.1[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/docker-py-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(-)] >=dev-python/docopt-0.6.1[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/docopt-0.7[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/jsonschema-2.5.1[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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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(-)] >=dev-python/pyyaml-3.10[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/pyyaml-4[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/requests-2.11.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(-)] <dev-python/requests-2.19[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/requests-2.6.1[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/six-1.3.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(-)] <dev-python/six-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(-)] >=dev-python/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.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(-)] <dev-python/websocket-client-1.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(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[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(-)]
+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/docker/compose/archive/1.21.2.tar.gz -> docker-compose-1.21.2.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c6227e39f8d30b2ccb53ab47d7bd8b5
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
index 7a492122e4f3..0f4e7f257826 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Docker container networking
 EAPI=6
 HOMEPAGE=https://github.com/docker/libnetwork
-KEYWORDS=amd64 ~arm ~ppc64
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/libnetwork/archive/c15b372ef22125880d378167dde44f4b134e1a77.tar.gz -> docker-proxy-0.8.0_p20180411.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=226861456e366a0cc5107d406264f6ab
+_md5_=4e5c1b68751567fc06a85744abdfe992
diff --git a/metadata/md5-cache/app-emulation/img-0.3.9 b/metadata/md5-cache/app-emulation/img-0.3.9
deleted file mode 100644
index cd8099efb5f7..000000000000
--- a/metadata/md5-cache/app-emulation/img-0.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/img
-IUSE=seccomp
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/img/archive/v0.3.9.tar.gz -> img-0.3.9.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=ffab263027a0f2ad03b892661a45be52
diff --git a/metadata/md5-cache/app-emulation/img-0.4.2 b/metadata/md5-cache/app-emulation/img-0.4.2
deleted file mode 100644
index 218de75cb969..000000000000
--- a/metadata/md5-cache/app-emulation/img-0.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/img
-IUSE=seccomp
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/img/archive/v0.4.2.tar.gz -> img-0.4.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=d8c4bb1f8eb67fc987cec7966f604138
diff --git a/metadata/md5-cache/app-emulation/img-0.4.4 b/metadata/md5-cache/app-emulation/img-0.4.4
new file mode 100644
index 000000000000..491e2cd7e6e5
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/img-0.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
+EAPI=6
+HOMEPAGE=https://github.com/genuinetools/img
+IUSE=seccomp
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/genuinetools/img/archive/v0.4.4.tar.gz -> img-0.4.4.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=ed19737f4db2c7997a1db54a1d867861
diff --git a/metadata/md5-cache/app-emulation/kompose-1.12.0 b/metadata/md5-cache/app-emulation/kompose-1.12.0
deleted file mode 100644
index 1c914622a7e7..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.12.0.tar.gz -> kompose-1.12.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=50d3242fcbdccffd2e9a5f60b8fa9850
diff --git a/metadata/md5-cache/app-emulation/kompose-1.14.0 b/metadata/md5-cache/app-emulation/kompose-1.14.0
new file mode 100644
index 000000000000..f88c166ec9f6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/kompose-1.14.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Tool to move from docker-compose to Kubernetes
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kompose/archive/v1.14.0.tar.gz -> kompose-1.14.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=7943234193c742b2c629e0f5a65fba42
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.1.0-r3 b/metadata/md5-cache/app-emulation/libvirt-4.1.0-r3
index 618c976ee963..572f58708fb1 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.1.0-r3
+++ b/metadata/md5-cache/app-emulation/libvirt-4.1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.1.0
 SRC_URI=http://libvirt.org/sources/libvirt-4.1.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=08be55b52c54b60a20e90106f5940a06
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.2.0 b/metadata/md5-cache/app-emulation/libvirt-4.2.0
index e95ba08ba196..9af8589a005b 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.2.0
+++ b/metadata/md5-cache/app-emulation/libvirt-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.2.0
 SRC_URI=http://libvirt.org/sources/libvirt-4.2.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f6ea3b74509a6555bd876725700417f9
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.3.0 b/metadata/md5-cache/app-emulation/libvirt-4.3.0
index 3f2c21cdfd8f..9739bef3bb0d 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.3.0
+++ b/metadata/md5-cache/app-emulation/libvirt-4.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=6
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.3.0
 SRC_URI=http://libvirt.org/sources/libvirt-4.3.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f6ea3b74509a6555bd876725700417f9
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cd73e5cab9b2f6ee7e047608a721eee5
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index d8d568ad7055..452384465fb2 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=32e1e8dbf89939d3a12a25c414ad7f0a
diff --git a/metadata/md5-cache/app-emulation/lxc-2.1.1 b/metadata/md5-cache/app-emulation/lxc-2.1.1
index 9ff61a8180ce..0b9be3073ef9 100644
--- a/metadata/md5-cache/app-emulation/lxc-2.1.1
+++ b/metadata/md5-cache/app-emulation/lxc-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua?
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-2.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=df657d512ca2a18b553f0959a1614b57
diff --git a/metadata/md5-cache/app-emulation/lxc-3.0.0 b/metadata/md5-cache/app-emulation/lxc-3.0.0
index b3af77257ed0..12f34b66a038 100644
--- a/metadata/md5-cache/app-emulation/lxc-3.0.0
+++ b/metadata/md5-cache/app-emulation/lxc-3.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-3.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a5ed32e1746c2c8cca5173dd95b7c662
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7 b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
index c6f95117a456..c3995a371fc0 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=4.2.7
 SRC_URI=mirror://sourceforge/phpvirtualbox/phpvirtualbox-4.2-7.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
 _md5_=e72c843f8d91a33750ba4aa63128b779
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0 b/metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
index 28439cd422a4..d810b8e50c2a 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=4.3.0
 SRC_URI=mirror://sourceforge/phpvirtualbox/phpvirtualbox-4.3-0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
 _md5_=459034fd2abdb043910ec52ec6ac06fc
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-5.0.3 b/metadata/md5-cache/app-emulation/phpvirtualbox-5.0.3
index 38bc77198baa..cc6b8fe471ff 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-5.0.3
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-5.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=5.0.3
 SRC_URI=mirror://sourceforge/phpvirtualbox/phpvirtualbox-5.0-3.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
 _md5_=2bcb062f9b536edea3b14d660cfbc3ba
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-5.0.5 b/metadata/md5-cache/app-emulation/phpvirtualbox-5.0.5
index 2d6f3efc7322..e8c441827e48 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-5.0.5
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-5.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=5.0.5
 SRC_URI=mirror://sourceforge/phpvirtualbox/phpvirtualbox-5.0-5.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	6ae2395d7f341093c36057cb4f69101a
 _md5_=1647c8745444e590aa6f0b22f9609113
diff --git a/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 b/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
index 9f9b229d1c68..37fcac341db4 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
+++ b/metadata/md5-cache/app-emulation/qemu-2.11.1-r2
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.1-patches-r1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e27eb18af8c87347174df1727f0ea84e
diff --git a/metadata/md5-cache/app-emulation/qemu-2.11.1-r53 b/metadata/md5-cache/app-emulation/qemu-2.11.1-r53
index 71b00ad152d8..a49fba680a7c 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.11.1-r53
+++ b/metadata/md5-cache/app-emulation/qemu-2.11.1-r53
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.1-patches-r2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=cdfc923025c95ac02570632aef70079c
diff --git a/metadata/md5-cache/app-emulation/qemu-2.12.0 b/metadata/md5-cache/app-emulation/qemu-2.12.0
index f75e3d267b85..5b1beb9c7973 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.12.0
+++ b/metadata/md5-cache/app-emulation/qemu-2.12.0
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=284cbeecb51abe0013c4bbfa7b8e24aa
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index a73f93389b6f..253fc41626dc 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=28a8aea4cbdb90c619f919fa9655b4aa
diff --git a/metadata/md5-cache/app-emulation/reg-0.13.1 b/metadata/md5-cache/app-emulation/reg-0.13.1
new file mode 100644
index 000000000000..52367ce8dae6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/reg-0.13.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Docker registry v2 command line client
+EAPI=6
+HOMEPAGE=https://github.com/genuinetools/reg
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/genuinetools/reg/archive/v0.13.1.tar.gz -> reg-0.13.1.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=97dca96112841c26011e05cbcf654c53
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
index 37b7bbe4b558..5f32a835ad26 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=runc container cli tools
 EAPI=6
 HOMEPAGE=http://runc.io
 IUSE=+ambient apparmor hardened +seccomp
-KEYWORDS=amd64 ~arm ~ppc64
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0-rc5.tar.gz -> runc-1.0.0_rc5.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=26347c5ad34e2fe0299dee0726209670
+_md5_=ac29d3474d97bd0823086c36f20408cf
diff --git a/metadata/md5-cache/app-emulation/spice-0.13.3-r2 b/metadata/md5-cache/app-emulation/spice-0.13.3-r2
index 0e7e3ecceb36..a14889b937c6 100644
--- a/metadata/md5-cache/app-emulation/spice-0.13.3-r2
+++ b/metadata/md5-cache/app-emulation/spice-0.13.3-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-0.13.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e1712b431833292eb2bc82d2df155be1
diff --git a/metadata/md5-cache/app-emulation/spice-0.14.0-r1 b/metadata/md5-cache/app-emulation/spice-0.14.0-r1
index e9924eca0913..0f6a698b2791 100644
--- a/metadata/md5-cache/app-emulation/spice-0.14.0-r1
+++ b/metadata/md5-cache/app-emulation/spice-0.14.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.22:2[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-0.14.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4b6449f0262eafa21415f67f42ca124a
diff --git a/metadata/md5-cache/app-emulation/spice-9999 b/metadata/md5-cache/app-emulation/spice-9999
index 2fd2cc2c8a6c..a5d52df56047 100644
--- a/metadata/md5-cache/app-emulation/spice-9999
+++ b/metadata/md5-cache/app-emulation/spice-9999
@@ -7,5 +7,5 @@ IUSE=libressl lz4 sasl smartcard static-libs gstreamer
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.22:2[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=159c1cb0a096de84fda9ba7ec86e183b
diff --git a/metadata/md5-cache/app-emulation/vkd3d-1.0 b/metadata/md5-cache/app-emulation/vkd3d-1.0
index 63387830587c..98ece21d5c28 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-1.0
+++ b/metadata/md5-cache/app-emulation/vkd3d-1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[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(-)?] x11-libs/xcb-util:=[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(-)?] x11-libs/xcb-util-keysyms:=[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(-)?] x11-libs/xcb-util-wm:=[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/spirv-headers || ( dev-util/vulkan-headers <=media-libs/vulkan-loader-1.1.70.0-r999[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(-)?] )
+DEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[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(-)?,X] x11-libs/xcb-util:=[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(-)?] x11-libs/xcb-util-keysyms:=[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(-)?] x11-libs/xcb-util-wm:=[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/spirv-headers || ( dev-util/vulkan-headers <=media-libs/vulkan-loader-1.1.70.0-r999[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(-)?] )
 DESCRIPTION=D3D12 to Vulkan translation library
 EAPI=6
 HOMEPAGE=https://source.winehq.org/git/vkd3d.git/
 IUSE=spirv-tools 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=LGPL-2.1
-RDEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[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(-)?] x11-libs/xcb-util:=[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(-)?] x11-libs/xcb-util-keysyms:=[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(-)?] x11-libs/xcb-util-wm:=[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(-)?]
+RDEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[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(-)?,X] x11-libs/xcb-util:=[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(-)?] x11-libs/xcb-util-keysyms:=[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(-)?] x11-libs/xcb-util-wm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b70d3d16377371c4cf1f3a38b19a4908
+_md5_=1afb38941d7e45c257fabe2c6162ef31
diff --git a/metadata/md5-cache/app-emulation/vkd3d-9999 b/metadata/md5-cache/app-emulation/vkd3d-9999
index 6e873eafb283..223596b9733f 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-9999
+++ b/metadata/md5-cache/app-emulation/vkd3d-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[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(-)?] x11-libs/xcb-util:=[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(-)?] x11-libs/xcb-util-keysyms:=[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(-)?] x11-libs/xcb-util-wm:=[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/spirv-headers || ( dev-util/vulkan-headers <=media-libs/vulkan-loader-1.1.70.0-r999[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-vcs/git-1.8.2.1
+DEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[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(-)?,X] x11-libs/xcb-util:=[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(-)?] x11-libs/xcb-util-keysyms:=[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(-)?] x11-libs/xcb-util-wm:=[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/spirv-headers || ( dev-util/vulkan-headers <=media-libs/vulkan-loader-1.1.70.0-r999[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-vcs/git-1.8.2.1
 DESCRIPTION=D3D12 to Vulkan translation library
 EAPI=6
 HOMEPAGE=https://source.winehq.org/git/vkd3d.git/
 IUSE=spirv-tools 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
 LICENSE=LGPL-2.1
-RDEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[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(-)?] x11-libs/xcb-util:=[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(-)?] x11-libs/xcb-util-keysyms:=[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(-)?] x11-libs/xcb-util-wm:=[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(-)?]
+RDEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[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(-)?,X] x11-libs/xcb-util:=[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(-)?] x11-libs/xcb-util-keysyms:=[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(-)?] x11-libs/xcb-util-wm:=[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
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b70d3d16377371c4cf1f3a38b19a4908
+_md5_=1afb38941d7e45c257fabe2c6162ef31
diff --git a/metadata/md5-cache/app-emulation/winetricks-20180603 b/metadata/md5-cache/app-emulation/winetricks-20180603
new file mode 100644
index 000000000000..b302e719813d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/winetricks-20180603
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst test unpack
+DEPEND=test? ( dev-python/bashate dev-util/checkbashisms dev-util/shellcheck ) >=sys-apps/sed-4
+DESCRIPTION=Easy way to install DLLs needed to work around problems in Wine
+EAPI=6
+HOMEPAGE=https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks
+IUSE=gtk kde rar test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
+SLOT=0
+SRC_URI=https://github.com/Winetricks/winetricks/archive/20180603.tar.gz -> winetricks-20180603.tar.gz gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49eccc815d5cc291901befbec1a71806
diff --git a/metadata/md5-cache/app-emulation/xtrs-4.9d-r4 b/metadata/md5-cache/app-emulation/xtrs-4.9d-r4
index a3fa772158c1..56ff7cf632af 100644
--- a/metadata/md5-cache/app-emulation/xtrs-4.9d-r4
+++ b/metadata/md5-cache/app-emulation/xtrs-4.9d-r4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= x11-libs/libX11
 RESTRICT=ls-dos? ( bindist )
 SLOT=0
 SRC_URI=http://www.tim-mann.org/trs80/xtrs-4.9d.tar.gz ls-dos? ( http://www.tim-mann.org/trs80/ld4-631.zip https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f5323908f54eab7b96ddca892ed35449
diff --git a/metadata/md5-cache/app-emulation/xtrs-4.9d-r5 b/metadata/md5-cache/app-emulation/xtrs-4.9d-r5
index c6c3f5a40669..b90a1c24d1f5 100644
--- a/metadata/md5-cache/app-emulation/xtrs-4.9d-r5
+++ b/metadata/md5-cache/app-emulation/xtrs-4.9d-r5
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= x11-libs/libX11
 RESTRICT=ls-dos? ( bindist )
 SLOT=0
 SRC_URI=http://www.tim-mann.org/trs80/xtrs-4.9d.tar.gz ls-dos? ( http://www.tim-mann.org/trs80/ld4-631.zip https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1e69fdbe07b1509c5b8659cacbc31bc9
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 4c7361d32ee0..2494d40f829c 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-ctags-1.18 b/metadata/md5-cache/app-eselect/eselect-ctags-1.18
index 621f9547be20..12f168eeec69 100644
--- a/metadata/md5-cache/app-eselect/eselect-ctags-1.18
+++ b/metadata/md5-cache/app-eselect/eselect-ctags-1.18
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages ctags implementations
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=!<app-eselect/eselect-emacs-1.18 >=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.18.tar.xz
-_md5_=731f45b71e5350f030a073ef8829752f
+_md5_=0f3f6c7eb2dd87392da799ce526fa760
diff --git a/metadata/md5-cache/app-eselect/eselect-infinality-1 b/metadata/md5-cache/app-eselect/eselect-infinality-1
index 34fa251b598c..3e41ffc1a319 100644
--- a/metadata/md5-cache/app-eselect/eselect-infinality-1
+++ b/metadata/md5-cache/app-eselect/eselect-infinality-1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/yngwin/eselect-infinality/tarball/v1 -> eselect-infinality-1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=8a0933449fd6e9db625fa3fcde1f4651
diff --git a/metadata/md5-cache/app-eselect/eselect-lcdfilter-2 b/metadata/md5-cache/app-eselect/eselect-lcdfilter-2
index f80e290d811f..79b84d7dea84 100644
--- a/metadata/md5-cache/app-eselect/eselect-lcdfilter-2
+++ b/metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -8,5 +8,5 @@ PDEPEND=media-libs/freetype[infinality]
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/yngwin/eselect-lcdfilter/tarball/v2 -> eselect-lcdfilter-2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=1faa612595e4aa348dadb1cb1ef0464b
diff --git a/metadata/md5-cache/app-eselect/eselect-oodict-20100228 b/metadata/md5-cache/app-eselect/eselect-oodict-20100228
index c7a9608a6df4..04702dfb257b 100644
--- a/metadata/md5-cache/app-eselect/eselect-oodict-20100228
+++ b/metadata/md5-cache/app-eselect/eselect-oodict-20100228
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages configuration of dictionaries for OpenOffice.Org
-EAPI=0
+EAPI=6
 HOMEPAGE=https://www.gentoo.org/
 KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2
 SLOT=0
 SRC_URI=mirror://gentoo/oodict.eselect-20100228.bz2
-_md5_=68824ee44369ea9d19b7befc8502b8ae
+_md5_=bbd52e22126267dcd46763e88e12ac01
diff --git a/metadata/md5-cache/app-eselect/eselect-pinentry-0.7 b/metadata/md5-cache/app-eselect/eselect-pinentry-0.7
index fca57b960f13..e0320d63d129 100644
--- a/metadata/md5-cache/app-eselect/eselect-pinentry-0.7
+++ b/metadata/md5-cache/app-eselect/eselect-pinentry-0.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Manage /usr/bin/pinentry symlink
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1
 SLOT=0
-_md5_=fea360a9b16e6142796364621987ada9
+_md5_=b431011284b6edb61bde128d2996b583
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-4 b/metadata/md5-cache/app-eselect/eselect-repository-4
new file mode 100644
index 000000000000..53ca0a05e20f
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-repository-4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DESCRIPTION=Manage repos.conf via eselect
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/eselect-repository
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+RDEPEND=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_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(+)?] app-admin/eselect dev-python/lxml[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(+)?] net-misc/wget
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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/mgorny/eselect-repository/archive/v4.tar.gz -> eselect-repository-4.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b241f99bb7dd46fc8b3b5e1df0c463a6
diff --git a/metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1 b/metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1
index 658d73d8ab76..2afda7422294 100644
--- a/metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1
+++ b/metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages the /usr/bin/sndpeek symlink
-EAPI=0
+EAPI=6
 HOMEPAGE=https://www.gentoo.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/sndpeek.eselect-1.0.1.bz2
-_md5_=50395f08853cd8d72187878d6325da4b
+_md5_=ed2e19eef521c8434e5759bc9b648f04
diff --git a/metadata/md5-cache/app-eselect/eselect-timidity-20110513 b/metadata/md5-cache/app-eselect/eselect-timidity-20110513
index c1e1d1cd41f0..7a3999add7fa 100644
--- a/metadata/md5-cache/app-eselect/eselect-timidity-20110513
+++ b/metadata/md5-cache/app-eselect/eselect-timidity-20110513
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages configuration of TiMidity++ patchsets
-EAPI=0
+EAPI=6
 HOMEPAGE=https://www.gentoo.org/
 KEYWORDS=alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/timidity.eselect-20110513.bz2
-_md5_=c4e70c0a8472e27e287dd55e72292dc3
+_md5_=c3908ee01b6c1f0865f0a5e7e42013d8
diff --git a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9 b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
index 6e8cd1aaf318..7602f8341d07 100644
--- a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
+++ b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages the /usr/bin/vi symlink
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.6
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-vi-1.1.9.tar.xz
-_md5_=2211cb299a353d018f1464ff56a00b81
+_md5_=bdeac3b9c5b61b00f3546de64f688f75
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 88a55a38fe81..b1446fd41ca1 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aide-0.16-r1 b/metadata/md5-cache/app-forensics/aide-0.16-r1
index 5545d79a1957..1226e49c12fc 100644
--- a/metadata/md5-cache/app-forensics/aide-0.16-r1
+++ b/metadata/md5-cache/app-forensics/aide-0.16-r1
@@ -10,5 +10,5 @@ RDEPEND=!static? ( !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash
 REQUIRED_USE=postgres? ( !mhash ) static? ( !audit !curl !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/aide/aide-0.16.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=7c956dc7579ba2b0d6dd7e953936fb1e
diff --git a/metadata/md5-cache/app-forensics/foremost-0.69 b/metadata/md5-cache/app-forensics/foremost-0.69
deleted file mode 100644
index 919f976c8b9a..000000000000
--- a/metadata/md5-cache/app-forensics/foremost-0.69
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A console program to recover files based on their headers and footers
-EAPI=0
-HOMEPAGE=http://foremost.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://foremost.sourceforge.net/pkg/foremost-0.69.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a7a665250ab1e9abb0781111c837317f
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index de8c403d05c9..66e4a6344d67 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-1.5.36 b/metadata/md5-cache/app-i18n/ibus-typing-booster-1.5.36
deleted file mode 100644
index 62e22772e524..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-1.5.36
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[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(+)?] app-i18n/ibus[python(+),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(+)?] dev-libs/m17n-lib dev-python/dbus-python[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(+)?] dev-python/pyenchant[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(+)?] dev-python/pygobject:3[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(+)?] dev-python/pyxdg[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(+)?] >=dev-db/m17n-db-1.7 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Completion input method for IBus
-EAPI=6
-HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[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(+)?] app-i18n/ibus[python(+),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(+)?] dev-libs/m17n-lib dev-python/dbus-python[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(+)?] dev-python/pyenchant[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(+)?] dev-python/pygobject:3[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(+)?] dev-python/pyxdg[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(+)?] >=dev-db/m17n-db-1.7
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/1.5.36/ibus-typing-booster-1.5.36.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=eca50e99a952761fb6b9e3c62a1fbc98
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.0.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.0.0
new file mode 100644
index 000000000000..57cfab4b5142
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[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(+)?] app-i18n/ibus[python(+),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(+)?] dev-libs/m17n-lib dev-python/dbus-python[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(+)?] dev-python/pyenchant[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(+)?] dev-python/pygobject:3[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(+)?] dev-python/pyxdg[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(+)?] >=dev-db/m17n-db-1.7 sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Completion input method for IBus
+EAPI=6
+HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[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(+)?] app-i18n/ibus[python(+),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(+)?] dev-libs/m17n-lib dev-python/dbus-python[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(+)?] dev-python/pyenchant[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(+)?] dev-python/pygobject:3[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(+)?] dev-python/pyxdg[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(+)?] >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.0.0/ibus-typing-booster-2.0.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=eca50e99a952761fb6b9e3c62a1fbc98
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.0 b/metadata/md5-cache/app-i18n/imhangul-2.1.0
index 5b85a25d005f..ccdafdf54b68 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.0
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-i18n/libhangul-0.0.12 >=x11-libs/gtk+-2.2:2 virtual/libintl
 SLOT=0
 SRC_URI=https://imhangul.googlecode.com/files/imhangul-2.1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=531959cf9ed6c278bb869311f8ba8645
diff --git a/metadata/md5-cache/app-i18n/kanjipad-2.0.0 b/metadata/md5-cache/app-i18n/kanjipad-2.0.0
index 63bba6cc1606..bb6e553f3d7f 100644
--- a/metadata/md5-cache/app-i18n/kanjipad-2.0.0
+++ b/metadata/md5-cache/app-i18n/kanjipad-2.0.0
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig
 DESCRIPTION=Japanese handwriting recognition tool
-EAPI=2
-HOMEPAGE=http://fishsoup.net/software/kanjipad/
-KEYWORDS=x86 amd64 ppc64
+EAPI=6
+HOMEPAGE=https://fishsoup.net/software/kanjipad/
+KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
 SLOT=0
-SRC_URI=http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f91c39ba382ccf761699bd9d19f4731
+SRC_URI=https://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8a17b0083fcf760760b1164b40b92c77
diff --git a/metadata/md5-cache/app-i18n/pology-0.11-r1 b/metadata/md5-cache/app-i18n/pology-0.11-r1
deleted file mode 100644
index b6511e8d70b3..000000000000
--- a/metadata/md5-cache/app-i18n/pology-0.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[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(+)] sys-devel/gettext 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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-python/epydoc[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(+)] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A framework for custom processing of PO files
-EAPI=5
-HOMEPAGE=http://pology.nedohodnik.net
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[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(+)] sys-devel/gettext 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://pology.nedohodnik.net//release/pology-0.11.tar.bz2
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f87756dc8b17a7ef70a91888a2e79b5
diff --git a/metadata/md5-cache/app-i18n/pology-0.12 b/metadata/md5-cache/app-i18n/pology-0.12
index eb9ce7fb1b27..89b83b7aae2d 100644
--- a/metadata/md5-cache/app-i18n/pology-0.12
+++ b/metadata/md5-cache/app-i18n/pology-0.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[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(+)] sys-devel/gettext 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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-python/epydoc[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(+)] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A framework for custom processing of PO files
-EAPI=5
+EAPI=6
 HOMEPAGE=http://pology.nedohodnik.net
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[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(+)] sys-devel/gettext 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://pology.nedohodnik.net//release/pology-0.12.tar.bz2
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3309f54c2d5de1750d975ed24d95beb
+_md5_=9d3978f96a05d6c75c55d92adaa985b9
diff --git a/metadata/md5-cache/app-i18n/pology-9999 b/metadata/md5-cache/app-i18n/pology-9999
index 0d82b18d9cde..01692470e540 100644
--- a/metadata/md5-cache/app-i18n/pology-9999
+++ b/metadata/md5-cache/app-i18n/pology-9999
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
 DEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[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(+)] sys-devel/gettext 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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-python/epydoc[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(+)] sys-devel/make >=dev-util/cmake-3.9.6 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=A framework for custom processing of PO files
-EAPI=5
+EAPI=6
 HOMEPAGE=http://pology.nedohodnik.net
 IUSE=python_targets_python2_7
 LICENSE=GPL-3
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[python_targets_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3309f54c2d5de1750d975ed24d95beb
+_md5_=efd598db3def9a4d768869fcbe7f9625
diff --git a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3 b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
index cdcd57ca1a1b..e5112349d50c 100644
--- a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
+++ b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
@@ -10,5 +10,5 @@ RDEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-bridge-0.4.16.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=00e4a2bbd17f845f1bdbb62131d87b6a
diff --git a/metadata/md5-cache/app-i18n/scim-m17n-0.2.3 b/metadata/md5-cache/app-i18n/scim-m17n-0.2.3
index 1f0c465135e9..c0f2c34c780b 100644
--- a/metadata/md5-cache/app-i18n/scim-m17n-0.2.3
+++ b/metadata/md5-cache/app-i18n/scim-m17n-0.2.3
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=postinst
 DEPEND=>=app-i18n/scim-1.4 >=dev-libs/m17n-lib-1.2.0 virtual/pkgconfig
 DESCRIPTION=An input module for Smart Common Input Method (SCIM) which uses m17n as backend
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.scim-im.org/projects/imengines
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-1.4 >=dev-libs/m17n-lib-1.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-m17n-0.2.3.tar.gz
-_md5_=8c1d4a74362a9ec3117929588906647c
+_md5_=c8df4b905b973dde7cfa5a27af6e6fdd
diff --git a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r3 b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r3
deleted file mode 100644
index 5aa6bf05ccd2..000000000000
--- a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Smart Common Input Method (SCIM) Smart Pinyin Input Method
-EAPI=0
-HOMEPAGE=http://www.scim-im.org/
-IUSE=nls
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-pinyin-0.5.91.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d238e054a37d93e2caadf666413b5d02
diff --git a/metadata/md5-cache/app-i18n/scim-tomoe-0.6.0 b/metadata/md5-cache/app-i18n/scim-tomoe-0.6.0
deleted file mode 100644
index 16b83bd06e97..000000000000
--- a/metadata/md5-cache/app-i18n/scim-tomoe-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 ) >=app-i18n/tomoe-gtk-0.6.0
-DESCRIPTION=Japanese input method Tomoe IMEngine for SCIM
-EAPI=0
-HOMEPAGE=http://tomoe.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 ) >=app-i18n/tomoe-gtk-0.6.0
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/scim-tomoe-0.6.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=82cd94d89e8a58d63e459fac30da387a
diff --git a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2 b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
index 66786c3bb2f4..6c62c26b1b2d 100644
--- a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
+++ b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
@@ -4,9 +4,9 @@ DESCRIPTION=An encoding detector library
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/uchardet/
 IUSE=cpu_flags_x86_sse2 static-libs test
-KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f57a270e14ccdaa370c9294530f309a2
+_md5_=582c1d6cc2eccb2eca156e537191b671
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.6-r1 b/metadata/md5-cache/app-i18n/uim-1.8.6-r1
index 6a17da849cc0..46f9652b645e 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.6-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.8.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt4? ( X ) xft? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/uim-1.8.6/uim-1.8.6.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c113a9c318d7b3c664cab3f04c732f3f
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2f40feeaa435c76da60fb8cf7b5c448
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.6-r2 b/metadata/md5-cache/app-i18n/uim-1.8.6-r2
index 90314d55416e..9cef930886d4 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.6-r2
+++ b/metadata/md5-cache/app-i18n/uim-1.8.6-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt4? ( X ) xft? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/uim-1.8.6/uim-1.8.6.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7d8d40cef7e045a4565dcc4b80e186d8
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=196e0a835ff2983dff5faa15b134f795
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
index fa5207d8e7b7..917de61c09c3 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4fd00c22919e72a1c8fcd9f779652891
+_md5_=ecce160da87d58e90ccbbe7455b8abc2
diff --git a/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0 b/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
index e3f55364661b..92c37021c56a 100644
--- a/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
+++ b/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
@@ -1,11 +1,12 @@
-DEFINED_PHASES=install
-DEPEND=|| ( app-i18n/uim app-i18n/uim-svn ) >=app-i18n/tomoe-gtk-0.6.0 virtual/pkgconfig
+DEFINED_PHASES=prepare
+DEPEND=app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Japanese input method Tomoe IMEngine for uim
-EAPI=0
+EAPI=6
 HOMEPAGE=http://tomoe.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=|| ( app-i18n/uim app-i18n/uim-svn ) >=app-i18n/tomoe-gtk-0.6.0
+RDEPEND=app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/uim-tomoe-gtk-0.6.0.tar.gz
-_md5_=764b995c223b549beafe091ede3f32f9
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=db2acd4cbc8e02e10e6f754883d8e08d
diff --git a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108 b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108
index 48dcb545050c..8d546ac7257d 100644
--- a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108
+++ b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=~app-i18n/sunpinyin-2.0.4_pre20130108:= x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	scons-utils	26a3d0e2e380dde78b6e3187ec68fa8d	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca7494a4ada0b6aeee83a522db218471
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index af2f778624fd..c10c246cae10 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203 b/metadata/md5-cache/app-laptop/hdapsd-20141203
index 408c24455d6b..5e4e244904a0 100644
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=libconfig? ( dev-libs/libconfig )
 SLOT=0
 SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a60284b23589bb146d0a4dfd168096c4
diff --git a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3 b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3
deleted file mode 100644
index b775f3b751ea..000000000000
--- a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=macbook? ( sys-libs/libsmbios sys-apps/pciutils ) >=dev-libs/glib-2.6 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Handles power management and special keys on laptops
-EAPI=0
-HOMEPAGE=http://pbbuttons.berlios.de
-IUSE=acpi alsa debug doc ibam macbook oss
-KEYWORDS=~amd64 ppc ~x86
-LICENSE=GPL-2
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0 ) >=dev-libs/glib-2.6
-SLOT=0
-SRC_URI=mirror://sourceforge/pbbuttons/pbbuttonsd-0.8.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c500a84c9d8f00f634a7a596b93d9040
diff --git a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r4 b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r4
deleted file mode 100644
index 42607e1fc3c9..000000000000
--- a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=macbook? ( sys-libs/libsmbios sys-apps/pciutils ) >=dev-libs/glib-2.6 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Handles power management and special keys on laptops
-EAPI=0
-HOMEPAGE=http://pbbuttons.berlios.de
-IUSE=acpi alsa debug doc ibam macbook oss
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0 ) >=dev-libs/glib-2.6
-SLOT=0
-SRC_URI=mirror://sourceforge/pbbuttons/pbbuttonsd-0.8.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ff2542a9048fb027018242ba0361dc6
diff --git a/metadata/md5-cache/app-laptop/thinkfan-0.9.3 b/metadata/md5-cache/app-laptop/thinkfan-0.9.3
index 231e7a159c45..303149add49b 100644
--- a/metadata/md5-cache/app-laptop/thinkfan-0.9.3
+++ b/metadata/md5-cache/app-laptop/thinkfan-0.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=atasmart? ( dev-libs/libatasmart )
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfan/thinkfan-0.9.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c4a48e349cc8591588e4945c68d93c1e
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 9f1e92d00d61..1ad3ad20e007 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.3.0 b/metadata/md5-cache/app-metrics/prometheus-2.3.0
new file mode 100644
index 000000000000..e4f4020184d7
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.10 dev-util/promu >=dev-lang/go-1.9
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.3.0.tar.gz -> prometheus-2.3.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=4686a03360e6e1259e59deb845e88837
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index d69445b626b7..99fbec36785d 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/bfm-1.2-r1 b/metadata/md5-cache/app-misc/bfm-1.2-r1
deleted file mode 100644
index ba5a57228624..000000000000
--- a/metadata/md5-cache/app-misc/bfm-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 >=dev-java/sun-java3d-bin-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=File manager and first person shooter written in Java3D, shoot to remove files
-EAPI=0
-HOMEPAGE=http://bfm.webhop.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/sun-java3d-bin-1.3 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9af0041bab8778d14794dbf2426e109e
diff --git a/metadata/md5-cache/app-misc/digitemp-3.5.0-r2 b/metadata/md5-cache/app-misc/digitemp-3.5.0-r2
index b66675662829..38223e123fe0 100644
--- a/metadata/md5-cache/app-misc/digitemp-3.5.0-r2
+++ b/metadata/md5-cache/app-misc/digitemp-3.5.0-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare
 DEPEND=ds2490? ( virtual/libusb:0 )
 DESCRIPTION=Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol
 EAPI=5
-HOMEPAGE=http://www.digitemp.com/ http://www.ibutton.com/
+HOMEPAGE=https://www.digitemp.com/ https://www.ibutton.com/
 IUSE=ds9097 ds9097u ds2490
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://www.digitemp.com/software/linux/digitemp-3.5.0.tar.gz
+SRC_URI=https://www.digitemp.com/software/linux/digitemp-3.5.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4603216b55af5595cae8fdc325b9299c
+_md5_=a4eeceb38d6f42d738c30ea04d0944e1
diff --git a/metadata/md5-cache/app-misc/digitemp-3.7.1 b/metadata/md5-cache/app-misc/digitemp-3.7.1
index 87133adfd780..15083f93ee58 100644
--- a/metadata/md5-cache/app-misc/digitemp-3.7.1
+++ b/metadata/md5-cache/app-misc/digitemp-3.7.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare
 DEPEND=ds2490? ( virtual/libusb:0 )
 DESCRIPTION=Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol
 EAPI=5
-HOMEPAGE=http://www.digitemp.com/ http://www.ibutton.com/
+HOMEPAGE=https://www.digitemp.com/ https://www.ibutton.com/
 IUSE=ds9097 ds9097u ds2490
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/bcl/digitemp/archive/v3.7.1.tar.gz -> digitemp-3.7.1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2f6dd6d38299fec726bbd864df0035e2
+_md5_=ab03bc9fae8a76123239b93a4d3fd33f
diff --git a/metadata/md5-cache/app-misc/dtach-0.9 b/metadata/md5-cache/app-misc/dtach-0.9
index f1bfad9309d7..5f129c7c3e5f 100644
--- a/metadata/md5-cache/app-misc/dtach-0.9
+++ b/metadata/md5-cache/app-misc/dtach-0.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Emulates the detach feature of screen
 EAPI=6
 HOMEPAGE=http://dtach.sourceforge.net/ https://github.com/crigler/dtach
-KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dtach/dtach-0.9.tar.gz
-_md5_=7dae2e7534cf685e1d3fb3ce6cdacef9
+_md5_=11abbf905984f227d4e791b84a601726
diff --git a/metadata/md5-cache/app-misc/gnote-3.24.1 b/metadata/md5-cache/app-misc/gnote-3.24.1
index 72e5d261e5f6..4dbd05db6302 100644
--- a/metadata/md5-cache/app-misc/gnote-3.24.1
+++ b/metadata/md5-cache/app-misc/gnote-3.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1
 RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gtkspell-3.0:3 >=dev-cpp/glibmm-2.32:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.20:3 gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnote/3.24/gnote-3.24.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=24f5bce254983a50aab65510496b51b8
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.15 b/metadata/md5-cache/app-misc/go-jira-1.0.15
deleted file mode 100644
index 693d6cb0ad7f..000000000000
--- a/metadata/md5-cache/app-misc/go-jira-1.0.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A simple JIRA commandline client in Go
-EAPI=6
-HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.15.tar.gz -> go-jira-1.0.15.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=3892f0fe4447f3c3be8c5e11caeca322
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.16 b/metadata/md5-cache/app-misc/go-jira-1.0.16
deleted file mode 100644
index 30e4e2da4057..000000000000
--- a/metadata/md5-cache/app-misc/go-jira-1.0.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A simple JIRA commandline client in Go
-EAPI=6
-HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.16.tar.gz -> go-jira-1.0.16.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=427b271e39c11ea8e58b838dfdb1a71c
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.17 b/metadata/md5-cache/app-misc/go-jira-1.0.17
index cb6aaf6564aa..b021e9414fcc 100644
--- a/metadata/md5-cache/app-misc/go-jira-1.0.17
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.17
@@ -3,9 +3,9 @@ DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A simple JIRA commandline client in Go
 EAPI=6
 HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.17.tar.gz -> go-jira-1.0.17.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=427b271e39c11ea8e58b838dfdb1a71c
+_md5_=3892f0fe4447f3c3be8c5e11caeca322
diff --git a/metadata/md5-cache/app-misc/goobook-1.9 b/metadata/md5-cache/app-misc/goobook-1.9
index fa27f3e0c31d..9b47ace27682 100644
--- a/metadata/md5-cache/app-misc/goobook-1.9
+++ b/metadata/md5-cache/app-misc/goobook-1.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/goobook/goobook-1.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8ac4935b2e0c67d470acbecabedc27df
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre11 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre11
deleted file mode 100644
index 1267aac93797..000000000000
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre11
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
-EAPI=0
-HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
-KEYWORDS=alpha amd64 ia64 ppc ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre11.tar.bz2
-_md5_=d723abaf4c147ad3f451c7659aab73f0
diff --git a/metadata/md5-cache/app-misc/khal-0.9.9 b/metadata/md5-cache/app-misc/khal-0.9.9
deleted file mode 100644
index d24130588327..000000000000
--- a/metadata/md5-cache/app-misc/khal-0.9.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/freezegun python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A CalDAV based calendar
-EAPI=6
-HOMEPAGE=http://lostpackets.de/khal/
-IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/icalendar-3.11.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.6.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] zsh-completion? ( app-shells/zsh ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khal/khal-0.9.9.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7528f3670cbbc6b75176520e373108fc
diff --git a/metadata/md5-cache/app-misc/khal-0.9.9-r1 b/metadata/md5-cache/app-misc/khal-0.9.9-r1
new file mode 100644
index 000000000000..4273d1e9cab7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khal-0.9.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/freezegun python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A CalDAV based calendar
+EAPI=6
+HOMEPAGE=http://lostpackets.de/khal/
+IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/icalendar-3.11.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/python-dateutil-2.6.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] zsh-completion? ( app-shells/zsh ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/k/khal/khal-0.9.9.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b344b795e67b6a6ccabb4ece49072e9c
diff --git a/metadata/md5-cache/app-misc/mc-4.8.15 b/metadata/md5-cache/app-misc/mc-4.8.15
deleted file mode 100644
index 4a9c73ea2919..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=5
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.15.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52c779bddacda73305c14cd3d42b2038
diff --git a/metadata/md5-cache/app-misc/mc-4.8.18-r1 b/metadata/md5-cache/app-misc/mc-4.8.18-r1
deleted file mode 100644
index 2b73436f89ca..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=6
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.18.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6608c43cc574347ba1f1f149cc59bbaa
diff --git a/metadata/md5-cache/app-misc/mc-4.8.19 b/metadata/md5-cache/app-misc/mc-4.8.19
deleted file mode 100644
index 0004b9326cdd..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=6
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0= ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.19.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49e1e287c82c9b684f87c5311ef39213
diff --git a/metadata/md5-cache/app-misc/mc-4.8.21 b/metadata/md5-cache/app-misc/mc-4.8.21
new file mode 100644
index 000000000000..22bc49f0bf3e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mc-4.8.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst pretend
+DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
+DESCRIPTION=GNU Midnight Commander is a text based file manager
+EAPI=6
+HOMEPAGE=https://www.midnight-commander.org
+IUSE=+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
+REQUIRED_USE=spell? ( edit )
+SLOT=0
+SRC_URI=http://ftp.midnight-commander.org/mc-4.8.21.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4af42b76e974efdf18f801c92ba1096a
diff --git a/metadata/md5-cache/app-misc/pdfpc-3.1.1 b/metadata/md5-cache/app-misc/pdfpc-3.1.1
deleted file mode 100644
index 79067b42bc9d..000000000000
--- a/metadata/md5-cache/app-misc/pdfpc-3.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0 gnome-base/librsvg x11-libs/gtk+:2 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Presenter console with multi-monitor support for PDF files
-EAPI=5
-HOMEPAGE=https://davvil.github.com/pdfpc/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0 gnome-base/librsvg x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://github/davvil/pdfpc/pdfpc-3.1.1.tgz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6563acd4c246b9a1e9df3bc354060d3
diff --git a/metadata/md5-cache/app-misc/pdfpc-4.0.8 b/metadata/md5-cache/app-misc/pdfpc-4.0.8
deleted file mode 100644
index 12ffa8086311..000000000000
--- a/metadata/md5-cache/app-misc/pdfpc-4.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Presenter console with multi-monitor support for PDF files
-EAPI=6
-HOMEPAGE=http://pdfpc.github.io
-IUSE=gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.0.8.tar.gz -> pdfpc-4.0.8.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eef15a6b917c4533711f49fd21ceac43
diff --git a/metadata/md5-cache/app-misc/pdfpc-4.1.1 b/metadata/md5-cache/app-misc/pdfpc-4.1.1
index bae17183b9d1..9ba01d273465 100644
--- a/metadata/md5-cache/app-misc/pdfpc-4.1.1
+++ b/metadata/md5-cache/app-misc/pdfpc-4.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Presenter console with multi-monitor support for PDF files
 EAPI=6
 HOMEPAGE=http://pdfpc.github.io
 IUSE=gstreamer
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.1.1.tar.gz -> pdfpc-4.1.1.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eef15a6b917c4533711f49fd21ceac43
+_md5_=06b0fc2b078a15572027ebfab47580f0
diff --git a/metadata/md5-cache/app-misc/ps3pf_utils-2.1.1 b/metadata/md5-cache/app-misc/ps3pf_utils-2.1.1
deleted file mode 100644
index deca6d4a8853..000000000000
--- a/metadata/md5-cache/app-misc/ps3pf_utils-2.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Utilities to set the ps3 specific features
-EAPI=0
-HOMEPAGE=http://www.playstation.com/ps3-openplatform/index.html
-KEYWORDS=~ppc ~ppc64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/ps3pf_utils-2.1.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=daf15af81f77fd885fd4fb63ec3505df
diff --git a/metadata/md5-cache/app-misc/ps3pf_utils-2.2.0 b/metadata/md5-cache/app-misc/ps3pf_utils-2.2.0
deleted file mode 100644
index 2e04f2c5247a..000000000000
--- a/metadata/md5-cache/app-misc/ps3pf_utils-2.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Utilities to set the ps3 specific features
-EAPI=0
-HOMEPAGE=http://www.playstation.com/ps3-openplatform/index.html
-KEYWORDS=-ppc -ppc64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/ps3-utils-2.2.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f3ba8b5e74debd221c7f6b210ffa84d
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-2.2.1-r1 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-2.2.1-r1
deleted file mode 100644
index 9ec32b008871..000000000000
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-2.2.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=CPU, RAM memory, and load monitor for use with tmux
-EAPI=5
-HOMEPAGE=https://github.com/thewtex/tmux-mem-cpu-load/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/thewtex/tmux-mem-cpu-load/archive/v2.2.1.tar.gz -> tmux-mem-cpu-load-2.2.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aef50e984220bd1329fa049f8c6556e5
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0
index a5d373618ffd..3df5add17596 100644
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0
+++ b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=CPU, RAM memory, and load monitor for use with tmux
 EAPI=6
 HOMEPAGE=https://github.com/thewtex/tmux-mem-cpu-load/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/thewtex/tmux-mem-cpu-load/archive/v3.4.0.tar.gz -> tmux-mem-cpu-load-3.4.0.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ada27af727c607fbce004073a71ab231
+_md5_=ab23875e338deb5b5d820833910e5281
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
index 1a113613244b..fa622241e630 100644
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
+++ b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=CPU, RAM memory, and load monitor for use with tmux
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/thewtex/tmux-mem-cpu-load/
 LICENSE=Apache-2.0
 SLOT=0
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7357137ef3c20a8b6aae79d4a30a94ea
+_md5_=c7728100d5681899f34c5604268b22fb
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 6f2808eff907..8ca36cfe56f1 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/kannel-sqlbox-1.5.0-r1 b/metadata/md5-cache/app-mobilephone/kannel-sqlbox-1.5.0-r1
index a22f5537e7ca..99bbc9bf9067 100644
--- a/metadata/md5-cache/app-mobilephone/kannel-sqlbox-1.5.0-r1
+++ b/metadata/md5-cache/app-mobilephone/kannel-sqlbox-1.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1 GPL-2
 RDEPEND=|| ( ~app-mobilephone/kannel-1.5.0[mysql] ~app-mobilephone/kannel-1.5.0[sqlite] ~app-mobilephone/kannel-1.5.0[postgres] ) net-libs/libnsl:0= ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=http://www.kannel.org/download/1.5.0/gateway-1.5.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af2a1c5944aaf5642f1a18cc78b08cd8
diff --git a/metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1 b/metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1
index 6efe404a787c..f91f0d34f205 100644
--- a/metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1
+++ b/metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://bitbucket.org/michalmotyczko/qtadb/get/ccbb0c86c9eb.zip -> qtadb-0.8.1.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=e1c00c6ee8982a9a2bd4c5950314ebe2
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index c8eae8f77f80..c4296a3a252c 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/calcurse-4.2.1 b/metadata/md5-cache/app-office/calcurse-4.2.1
index fce81ddfb1f0..776e3b791902 100644
--- a/metadata/md5-cache/app-office/calcurse-4.2.1
+++ b/metadata/md5-cache/app-office/calcurse-4.2.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/ncurses:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a text-based calendar and scheduling application
 EAPI=6
-HOMEPAGE=http://calcurse.org/
+HOMEPAGE=https://calcurse.org/
 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 ppc ppc64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
-SRC_URI=http://calcurse.org/files/calcurse-4.2.1.tar.gz
+SRC_URI=https://calcurse.org/files/calcurse-4.2.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7407585d322c55321ea4cabf0bc2c2bf
+_md5_=7e928ddc4b4d79438d60deeef7f72846
diff --git a/metadata/md5-cache/app-office/calcurse-4.2.2 b/metadata/md5-cache/app-office/calcurse-4.2.2
index af4fc12a422f..b6603e2950fb 100644
--- a/metadata/md5-cache/app-office/calcurse-4.2.2
+++ b/metadata/md5-cache/app-office/calcurse-4.2.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/ncurses:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a text-based calendar and scheduling application
 EAPI=6
-HOMEPAGE=http://calcurse.org/
+HOMEPAGE=https://calcurse.org/
 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 ~x86 ~ppc ~ppc64
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
-SRC_URI=http://calcurse.org/files/calcurse-4.2.2.tar.gz
+SRC_URI=https://calcurse.org/files/calcurse-4.2.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=29eeda2643626da2e53eac34518b7348
+_md5_=d501491b514eae26e78b0ed8bdad9fa6
diff --git a/metadata/md5-cache/app-office/calcurse-4.3.0 b/metadata/md5-cache/app-office/calcurse-4.3.0
index c587dbcdcdf4..3f431497c6f0 100644
--- a/metadata/md5-cache/app-office/calcurse-4.3.0
+++ b/metadata/md5-cache/app-office/calcurse-4.3.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install test
 DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=a text-based calendar and scheduling application
 EAPI=6
-HOMEPAGE=http://calcurse.org/
+HOMEPAGE=https://calcurse.org/
 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 ~x86 ~ppc ~ppc64
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0=
 RESTRICT=test
 SLOT=0
-SRC_URI=http://calcurse.org/files/calcurse-4.3.0.tar.gz
+SRC_URI=https://calcurse.org/files/calcurse-4.3.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cccceaf162d472e6784f00058453c35
+_md5_=1a70c313c70a0e3539856eaa78cb365a
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.4.2 b/metadata/md5-cache/app-office/libreoffice-6.0.4.2
index 36667fa02e50..25e33e957359 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java 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 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-6.0*
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=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(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -12,4 +12,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 ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.4//libreoffice-6.0.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.4//libreoffice-help-6.0.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.4.2/src/libreoffice-6.0.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.4.2/src/libreoffice-help-6.0.4.2.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	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18c3b9a3ea20710ca50c51ca355d15e5
+_md5_=bc5768ce0b39ff3180c66c4f3a277586
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.9999 b/metadata/md5-cache/app-office/libreoffice-6.0.9999
index 89a1ba629eb8..ccc08e8627a8 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 ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.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	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18c3b9a3ea20710ca50c51ca355d15e5
+_md5_=bc5768ce0b39ff3180c66c4f3a277586
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.9999 b/metadata/md5-cache/app-office/libreoffice-6.1.9999
index eaadae41e030..9e89d39ccf55 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.1.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.1.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	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ea334b95bfcea0b6ffc7763ef6d3ff5e
+_md5_=b1d301a3612c061364f0e73a2b14b8eb
diff --git a/metadata/md5-cache/app-office/multitalk-1.4-r1 b/metadata/md5-cache/app-office/multitalk-1.4-r1
index 19095cd53c0d..1e15189a29b8 100644
--- a/metadata/md5-cache/app-office/multitalk-1.4-r1
+++ b/metadata/md5-cache/app-office/multitalk-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2.7 >=media-libs/sdl-image-1.2.3 >=media-libs/sdl-ttf-2.0.6 >=media-libs/sdl-gfx-2.0.13 latex? ( virtual/imagemagick-tools virtual/latex-base )
 SLOT=0
 SRC_URI=http://www.srcf.ucam.org/~dmi1000/multitalk/multitalk-1.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f620185614a121945d98bd3e021609fc
diff --git a/metadata/md5-cache/app-office/skrooge-2.12.0 b/metadata/md5-cache/app-office/skrooge-2.12.0
deleted file mode 100644
index af7e52232b85..000000000000
--- a/metadata/md5-cache/app-office/skrooge-2.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.43.0:5 ) kde? ( >=kde-frameworks/krunner-5.43.0:5 ) ofx? ( dev-libs/libofx ) >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 dev-libs/libxslt virtual/pkgconfig x11-misc/shared-mime-info designer? ( >=kde-frameworks/kdesignerplugin-5.43.0:5 >=dev-qt/designer-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
-EAPI=6
-HOMEPAGE=https://skrooge.org/
-IUSE=activities designer kde ofx test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.43.0:5 ) kde? ( >=kde-frameworks/krunner-5.43.0:5 ) ofx? ( dev-libs/libofx ) !app-office/skrooge:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=test? ( designer )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/skrooge/skrooge-2.12.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e55eb751bb847724709c06cef16c177
diff --git a/metadata/md5-cache/app-office/skrooge-2.13.0 b/metadata/md5-cache/app-office/skrooge-2.13.0
index 668f7b9cdffa..4f4eded633b2 100644
--- a/metadata/md5-cache/app-office/skrooge-2.13.0
+++ b/metadata/md5-cache/app-office/skrooge-2.13.0
@@ -4,7 +4,7 @@ DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
 EAPI=6
 HOMEPAGE=https://skrooge.org/
 IUSE=activities designer kde ofx test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwallet-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.43.0:5 ) kde? ( >=kde-frameworks/krunner-5.43.0:5 ) ofx? ( dev-libs/libofx ) !app-office/skrooge:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=test? ( designer )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.13.0.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f44b7ab8bd304a9ae314727aa9ba91c
+_md5_=0a7e0787f94bdfeef0d2a2436d8c9088
diff --git a/metadata/md5-cache/app-office/texmaker-5.0-r1 b/metadata/md5-cache/app-office/texmaker-5.0-r1
index 9b3e627e1b1e..0af18aaa2c0a 100644
--- a/metadata/md5-cache/app-office/texmaker-5.0-r1
+++ b/metadata/md5-cache/app-office/texmaker-5.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=http://www.xm1math.net/texmaker/texmaker-5.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93c3f3099a68ddd406116f940be02555
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 948a761be4a9..881369756b7a 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/ifuse-1.1.3 b/metadata/md5-cache/app-pda/ifuse-1.1.3
index 080975f99165..64eb6c2e2af3 100644
--- a/metadata/md5-cache/app-pda/ifuse-1.1.3
+++ b/metadata/md5-cache/app-pda/ifuse-1.1.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= >=sys-fs/fuse-2.7.0:=
 SLOT=0
 SRC_URI=http://www.libimobiledevice.org/downloads/ifuse-1.1.3.tar.bz2
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=9138fa9ead67672a9ad94edfb1b6222e
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 4c16c4abcada..c2c3733a0a83 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/eclass-manpages-20180607 b/metadata/md5-cache/app-portage/eclass-manpages-20180607
new file mode 100644
index 000000000000..767da4bf55dd
--- /dev/null
+++ b/metadata/md5-cache/app-portage/eclass-manpages-20180607
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20180607.tar.xz
+_md5_=67fa76893182bede29925cbe32215518
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.7-r1 b/metadata/md5-cache/app-portage/elogviewer-2.7-r1
deleted file mode 100644
index 0bb14006de76..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-2.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] || ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,X] ) || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) !dev-python/PyQt5[-gui] !dev-python/PyQt5[-widgets] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=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
-KEYWORDS=amd64 ppc ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] || ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,X] ) || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) !dev-python/PyQt5[-gui] !dev-python/PyQt5[-widgets]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 )
-SLOT=0
-SRC_URI=https://github.com/Synss/elogviewer/archive/v2.7.tar.gz -> elogviewer-2.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0201f7b9a15e61606b88dc52db15c35c
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.7-r2 b/metadata/md5-cache/app-portage/elogviewer-2.7-r2
index a9a10ca7c84f..6869d216029d 100644
--- a/metadata/md5-cache/app-portage/elogviewer-2.7-r2
+++ b/metadata/md5-cache/app-portage/elogviewer-2.7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Elog viewer for Gentoo
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/elogviewer
 IUSE=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
-KEYWORDS=amd64 ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 )
 SLOT=0
 SRC_URI=https://github.com/Synss/elogviewer/archive/v2.7.tar.gz -> elogviewer-2.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff2603738de51b3930b7e8bd25fa1df7
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8b55d736080190ac845e1ce306c7bb39
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.9 b/metadata/md5-cache/app-portage/elogviewer-2.9
index 90406f9372ae..32394d95e6a9 100644
--- a/metadata/md5-cache/app-portage/elogviewer-2.9
+++ b/metadata/md5-cache/app-portage/elogviewer-2.9
@@ -4,11 +4,11 @@ DESCRIPTION=Elog viewer for Gentoo
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/elogviewer
 IUSE=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
-KEYWORDS=~amd64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 )
 SLOT=0
 SRC_URI=https://github.com/Synss/elogviewer/archive/v2.9.tar.gz -> elogviewer-2.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32276f6ee06c41233ab353588a9e29e5
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1df02a6830f4bf39927e4115b27e2f90
diff --git a/metadata/md5-cache/app-portage/gemato-13.0 b/metadata/md5-cache/app-portage/gemato-13.0
deleted file mode 100644
index f479ade2657a..000000000000
--- a/metadata/md5-cache/app-portage/gemato-13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma sha3 test tools python_targets_pypy 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 ~x64-cygwin ~amd64-fbsd
-LICENSE=BSD-2
-RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-13.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=526878edd99c5aa59f46ffc4aa572a40
diff --git a/metadata/md5-cache/app-portage/gemato-13.0-r1 b/metadata/md5-cache/app-portage/gemato-13.0-r1
new file mode 100644
index 000000000000..6e9b88a46e4e
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gemato-13.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Stand-alone Manifest generation & verification tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+blake2 bzip2 +gpg lzma sha3 test tools python_targets_pypy 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 s390 sparc x86 ~x64-cygwin ~amd64-fbsd
+LICENSE=BSD-2
+RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gemato/gemato-13.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f4d5f89252129e6e8cae29de6b3d2bc8
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index 53a409fa74ce..dcb8ea469edc 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -9,4 +9,4 @@ RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ba8430195a34ffd5a8f8aa9aabfea32
+_md5_=d8632b8772f0a97ce329c25d1e330d53
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.3 b/metadata/md5-cache/app-portage/gentoolkit-0.3.3
index 750848c78970..b2305ee2c58c 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.3
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-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=GPL-2
 RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<=app-portage/gentoolkit-dev-0.2.7 sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.3.3.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0842b72459b13dbdf8fa753bd11d656e
+_md5_=65f58c0f927e62d98c3f4947decd1779
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
index 00a3c194d98e..ae462a8aee45 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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=GPL-2
 RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !app-portage/gentoolkit-dev sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/gentoolkit-0.4.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=02f0a2ca8eb42316611a3884919ffd78
+_md5_=964e7fd53ead094c1de5bac146e01488
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64 b/metadata/md5-cache/app-portage/portage-utils-0.64
index 28ac0bcb475b..9c61f3b06224 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.64
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-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=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a3c1cb75cebba933a003b25add0e7c95
+_md5_=6fd7169fdfd567223c15053403844b12
diff --git a/metadata/md5-cache/app-portage/prefix-chain-setup-0.5 b/metadata/md5-cache/app-portage/prefix-chain-setup-0.5
deleted file mode 100644
index c9e64363fe35..000000000000
--- a/metadata/md5-cache/app-portage/prefix-chain-setup-0.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Chained EPREFIX bootstrapping utility
-EAPI=0
-HOMEPAGE=https://dev.gentoo.org/~mduft
-KEYWORDS=~ppc-aix ~x64-cygwin ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-SLOT=0
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=06369e6fe56547d3e8b8bb17133a0b6c
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.3 b/metadata/md5-cache/app-portage/repoman-2.3.3
deleted file mode 100644
index 2b0ccde68545..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-2.3.0_rc[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/lxml-3.6.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=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=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.3.0_rc[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/lxml-3.6.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=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/~dolsen/releases/repoman/repoman-2.3.3.tar.bz2
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=148dc2e3066f7eca6108ceda87600a80
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.4 b/metadata/md5-cache/app-portage/repoman-2.3.4
deleted file mode 100644
index 3ace17bb015a..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-2.3.0_rc[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/lxml-3.6.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=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=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.3.0_rc[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/lxml-3.6.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=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/~dolsen/releases/repoman/repoman-2.3.4.tar.bz2
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae2faf5983bc86b42ef1cf88d7a3b996
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.7 b/metadata/md5-cache/app-portage/repoman-2.3.7
deleted file mode 100644
index b61952603cad..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-2.3.25[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/lxml-3.6.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=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=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.3.25[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/lxml-3.6.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=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/~zmedico/portage/archives/repoman-2.3.7.tar.bz2
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7af4cb3c718f3b52f0ec42ac51b6adde
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.9 b/metadata/md5-cache/app-portage/repoman-2.3.9
index daaaff917cf8..dba72330084d 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.9
+++ b/metadata/md5-cache/app-portage/repoman-2.3.9
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=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 ~ppc-aix ~x64-cygwin ~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 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.27[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/lxml-3.6.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(-)] dev-python/pyyaml[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[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=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/~zmedico/portage/archives/repoman-2.3.9.tar.bz2
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca6ba36273d0b010b2053c252d489ed5
+_md5_=f864e59c90393f2987b01983dd569d59
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 33572e1e0ecc..b08d078dc069 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/bash-4.4_p23 b/metadata/md5-cache/app-shells/bash-4.4_p23
new file mode 100644
index 000000000000..2260b3f50ea0
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-4.4_p23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=6
+HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-013 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-014 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-015 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-016 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-017 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-018 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-019 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-020 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-021 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-022 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-023 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-013 mirror://gnu/bash/bash-4.4-patches/bash44-014 mirror://gnu/bash/bash-4.4-patches/bash44-015 mirror://gnu/bash/bash-4.4-patches/bash44-016 mirror://gnu/bash/bash-4.4-patches/bash44-017 mirror://gnu/bash/bash-4.4-patches/bash44-018 mirror://gnu/bash/bash-4.4-patches/bash44-019 mirror://gnu/bash/bash-4.4-patches/bash44-020 mirror://gnu/bash/bash-4.4-patches/bash44-021 mirror://gnu/bash/bash-4.4-patches/bash44-022 mirror://gnu/bash/bash-4.4-patches/bash44-023
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=58c3d5aab87d164c7d519b6eb4fbeb16
diff --git a/metadata/md5-cache/app-shells/fish-2.7.1 b/metadata/md5-cache/app-shells/fish-2.7.1
index 7f9540ad37bb..c0b131fe2b46 100644
--- a/metadata/md5-cache/app-shells/fish-2.7.1
+++ b/metadata/md5-cache/app-shells/fish-2.7.1
@@ -4,9 +4,9 @@ DESCRIPTION=Friendly Interactive SHell
 EAPI=6
 HOMEPAGE=http://fishshell.com/
 IUSE=nls test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/2.7.1/fish-2.7.1.tar.gz
-_md5_=c65c6b46e1091e10a72a158255b0dfb1
+_md5_=f542400116b7407d6fd7625fcf242ee5
diff --git a/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17 b/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17
new file mode 100644
index 000000000000..5b778f51e125
--- /dev/null
+++ b/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=>=media-video/mpv-0.25.0[cli] !luajit? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:2 )
+DESCRIPTION=Bash completion for the mpv video player
+EAPI=6
+HOMEPAGE=https://2ion.github.io/mpv-bash-completion/
+IUSE=luajit
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=media-video/mpv-0.25.0[cli] >=app-shells/bash-completion-2.3-r1
+SLOT=0
+SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/3.3.17.tar.gz -> mpv-bash-completion-3.3.17.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2140703cf67cdb7b0efae4213ff9f74f
diff --git a/metadata/md5-cache/app-shells/pdsh-2.18-r1 b/metadata/md5-cache/app-shells/pdsh-2.18-r1
deleted file mode 100644
index 8a1f9ec9e949..000000000000
--- a/metadata/md5-cache/app-shells/pdsh-2.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A high-performance, parallel remote shell utility
-EAPI=2
-HOMEPAGE=https://computing.llnl.gov/linux/pdsh.html
-IUSE=crypt readline rsh
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/pdsh/pdsh-2.18.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7302bf84bf5edae36d06c2628f74ba71
diff --git a/metadata/md5-cache/app-shells/pdsh-2.26-r1 b/metadata/md5-cache/app-shells/pdsh-2.26-r1
index 3f793ca36a6d..a21e26bd76c0 100644
--- a/metadata/md5-cache/app-shells/pdsh-2.26-r1
+++ b/metadata/md5-cache/app-shells/pdsh-2.26-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A high-performance, parallel remote shell utility
 EAPI=6
 HOMEPAGE=https://computing.llnl.gov/linux/pdsh.html
 IUSE=crypt readline rsh static-libs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdsh/pdsh-2.26.tar.bz2
-_md5_=30dfda4fa65185b01003f3d7ba7d1416
+_md5_=ad9b9b70066916df1b7f36d6ca88714a
diff --git a/metadata/md5-cache/app-shells/yash-2.47 b/metadata/md5-cache/app-shells/yash-2.47
index 8a3b57b150f4..7f61d975fe55 100644
--- a/metadata/md5-cache/app-shells/yash-2.47
+++ b/metadata/md5-cache/app-shells/yash-2.47
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure
 DEPEND=sys-libs/ncurses:= nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) test? ( sys-apps/ed )
 DESCRIPTION=Yash is a POSIX-compliant command line shell
 EAPI=6
-HOMEPAGE=https://yash.osnd.jp/
+HOMEPAGE=https://yash.osdn.jp/
 IUSE=nls test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/yash/69353/yash-2.47.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55829342abd7157bb468226677055b61
+_md5_=3c474aea4128b198918acf68c30d8bfa
diff --git a/metadata/md5-cache/app-shells/zsh-5.5.1 b/metadata/md5-cache/app-shells/zsh-5.5.1
deleted file mode 100644
index 286954586165..000000000000
--- a/metadata/md5-cache/app-shells/zsh-5.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/groff >=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
-DESCRIPTION=UNIX Shell similar to the Korn shell
-EAPI=6
-HOMEPAGE=https://www.zsh.org/
-IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=ZSH gdbm? ( GPL-2 )
-PDEPEND=examples? ( app-doc/zsh-lovers )
-RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
-SLOT=0
-SRC_URI=https://www.zsh.org/pub/zsh-5.5.1.tar.gz doc? ( https://www.zsh.org/pub/zsh-5.5.1-doc.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=132eabed64c98a42282e332bdbbc1d66
diff --git a/metadata/md5-cache/app-shells/zsh-5.5.1-r1 b/metadata/md5-cache/app-shells/zsh-5.5.1-r1
new file mode 100644
index 000000000000..5eabf257231f
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-5.5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-apps/groff >=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
+DESCRIPTION=UNIX Shell similar to the Korn shell
+EAPI=6
+HOMEPAGE=https://www.zsh.org/
+IUSE=caps debug doc examples gdbm maildir pcre static unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ZSH gdbm? ( GPL-2 )
+PDEPEND=examples? ( app-doc/zsh-lovers )
+RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
+SLOT=0
+SRC_URI=https://www.zsh.org/pub/zsh-5.5.1.tar.gz doc? ( https://www.zsh.org/pub/zsh-5.5.1-doc.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d462a9c8a416ff6ae8b826d5f60c30fc
diff --git a/metadata/md5-cache/app-shells/zsh-9999 b/metadata/md5-cache/app-shells/zsh-9999
index 3fa7b3eac1dd..a5a1a35e7056 100644
--- a/metadata/md5-cache/app-shells/zsh-9999
+++ b/metadata/md5-cache/app-shells/zsh-9999
@@ -9,4 +9,4 @@ PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
 SLOT=0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b884a8f58e477da83ee84c9c53f58a0d
+_md5_=d462a9c8a416ff6ae8b826d5f60c30fc
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index dcaa2a50c6f3..003b72d458cd 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/asciidoc-8.6.10 b/metadata/md5-cache/app-text/asciidoc-8.6.10
index 50f3e2265c7d..e18c81814c80 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.10
@@ -10,5 +10,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev
 REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/asciidoc/asciidoc/archive/8.6.10.tar.gz -> asciidoc-8.6.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=199f68ad6a4ba91904f5d4a56272a489
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.9-r2 b/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
index c07862233db9..9e9e99ab31ff 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( med
 REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=227730f668cd8470dae7a5b8137618e4
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.9-r6 b/metadata/md5-cache/app-text/asciidoc-8.6.9-r6
index 8b6278232dc3..544c96e06ed4 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.9-r6
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.9-r6
@@ -10,5 +10,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev
 REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=45cc2ecc2d9418b70a478d6e47da8b58
diff --git a/metadata/md5-cache/app-text/aspell-0.60.7_rc1 b/metadata/md5-cache/app-text/aspell-0.60.7_rc1
index a400c210057e..0c8cb2b5a5e9 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.7_rc1
+++ b/metadata/md5-cache/app-text/aspell-0.60.7_rc1
@@ -4,11 +4,11 @@ DESCRIPTION=A spell checker replacement for ispell
 EAPI=6
 HOMEPAGE=http://aspell.net/
 IUSE=nls unicode l10n_af l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fi l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_hy l10n_is l10n_it l10n_la l10n_lt l10n_nl l10n_no l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
 RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu-alpha/aspell/aspell-0.60.7-rc1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10c769fecfea34e204fa84f852ceaa54
+_md5_=953cc6f3912f44b6668ec8b7d64983db
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-1.21 b/metadata/md5-cache/app-text/build-docbook-catalog-1.21
index f49b5fd6e522..fa0a211bba45 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-1.21
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-1.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare setup
 DESCRIPTION=DocBook XML catalog auto-updater
 EAPI=5
 HOMEPAGE=https://sources.gentoo.org/gentoo-src/build-docbook-catalog/
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) !<app-text/docbook-xsl-stylesheets-1.73.1 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gentoo/build-docbook-catalog-1.21.tar.xz https://dev.gentoo.org/~haubi/distfiles/build-docbook-catalog-1.21.tar.xz
-_md5_=52bff5f70aff93135c5f4d3d9e75247a
+_md5_=0977f347bd12ef72c76b2440e44b7bed
diff --git a/metadata/md5-cache/app-text/calibre-2.78.0 b/metadata/md5-cache/app-text/calibre-2.78.0
deleted file mode 100644
index 2106e005fe45..000000000000
--- a/metadata/md5-cache/app-text/calibre-2.78.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend 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-4.4:= >=dev-python/apsw-3.7.17[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/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-0.9.9[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.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/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.1.11[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.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/python-dateutil-1.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/PyQt5-5.3.1[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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 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/libX11 x11-libs/libXext x11-libs/libXrender x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) >=dev-python/setuptools-0.6_rc5[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.8.2 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Ebook management application
-EAPI=6
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=+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-4.4:= >=dev-python/apsw-3.7.17[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/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-0.9.9[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.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/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.1.11[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.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/python-dateutil-1.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/PyQt5-5.3.1[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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 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/libX11 x11-libs/libXext x11-libs/libXrender x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/2.78.0/calibre-2.78.0.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06fc06e8058d5243cb5d48af3d4eae11
diff --git a/metadata/md5-cache/app-text/calibre-3.8.0 b/metadata/md5-cache/app-text/calibre-3.8.0
deleted file mode 100644
index e9bc32aa28ed..000000000000
--- a/metadata/md5-cache/app-text/calibre-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend 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-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/qtgui:5 dev-qt/qtwidgets:5 dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] 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/libX11 x11-libs/libXext x11-libs/libXrender x11-misc/shared-mime-info >=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 >=sys-apps/sed-4
-DESCRIPTION=Ebook management application
-EAPI=6
-HOMEPAGE=https://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-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/qtgui:5 dev-qt/qtwidgets:5 dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] 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/libX11 x11-libs/libXext x11-libs/libXrender x11-misc/shared-mime-info >=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=https://download.calibre-ebook.com/3.8.0/calibre-3.8.0.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a8148e08f4cb3294a629dbbf6ccc863
diff --git a/metadata/md5-cache/app-text/convertlit-1.8-r1 b/metadata/md5-cache/app-text/convertlit-1.8-r1
deleted file mode 100644
index 72ab1a17887f..000000000000
--- a/metadata/md5-cache/app-text/convertlit-1.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/libtommath-0.36-r1 app-arch/unzip
-DESCRIPTION=CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)
-EAPI=0
-HOMEPAGE=http://www.convertlit.com/
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libtommath-0.36-r1 !app-text/open_c-lit
-SLOT=0
-SRC_URI=http://www.convertlit.com/clit18src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ece04d007fbdb746bfd0d810cc2c0766
diff --git a/metadata/md5-cache/app-text/dictd-1.12.1-r2 b/metadata/md5-cache/app-text/dictd-1.12.1-r2
index c5b63d8275a0..25c3ae855ea5 100644
--- a/metadata/md5-cache/app-text/dictd-1.12.1-r2
+++ b/metadata/md5-cache/app-text/dictd-1.12.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ISOC-rfc
 RDEPEND=sys-libs/zlib dev-libs/libmaa dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy ) >=sys-apps/coreutils-6.10
 SLOT=0
 SRC_URI=mirror://sourceforge/dict/dictd-1.12.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2cc1d6ba083536ba218572a756fc7892
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.21 b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
index 3aff5ea055f7..a6d3ca72db6f 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.21
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:= ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF
 EAPI=6
-HOMEPAGE=http://ghostscript.com/
+HOMEPAGE=https://ghostscript.com/
 IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=AGPL-3 CPL-1.0
@@ -10,4 +10,4 @@ RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= m
 SLOT=0
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/ghostscript-9.21.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.21-patchset-1.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bd63fe6a4efa71ae94cedee8f0c78ba0
+_md5_=2a31dce8f5fcd14f79ae60e630e39571
diff --git a/metadata/md5-cache/app-text/libepubgen-0.1.1 b/metadata/md5-cache/app-text/libepubgen-0.1.1
new file mode 100644
index 000000000000..f50150081a7e
--- /dev/null
+++ b/metadata/md5-cache/app-text/libepubgen-0.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/librevenge dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit dev-libs/libxml2:2 )
+DESCRIPTION=EPUB generator for librevenge
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/libepubgen/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-libs/librevenge
+SLOT=0
+SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.1.tar.xz
+_md5_=5937d8e6884890d6d02ea95cb0380d0e
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.0.15 b/metadata/md5-cache/app-text/master-pdf-editor-5.0.15
new file mode 100644
index 000000000000..80a476365fda
--- /dev/null
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.0.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Master PDF Editor is a complete solution for viewing and editing PDF files
+EAPI=6
+HOMEPAGE=https://code-industry.net/free-pdf-editor/
+KEYWORDS=~amd64
+LICENSE=master-pdf-editor
+RDEPEND=>=media-gfx/sane-backends-1.0 >=dev-qt/qtsvg-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtprintsupport-5.4.1:5
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://code-industry.net/public/master-pdf-editor-5.0.15_qt5.amd64.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5e49e752aac76a25e1ca62a3d5b81ec7
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r7 b/metadata/md5-cache/app-text/openjade-1.3.2-r7
index ec3083c17a64..32573d80da35 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r7
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML docum
 EAPI=5
 HOMEPAGE=http://openjade.sourceforge.net
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~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=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55a4c8effcd24bee94405893f1302281
+_md5_=10483a1c964acfa0518908e1dc4d128a
diff --git a/metadata/md5-cache/app-text/pdf2htmlEX-9999 b/metadata/md5-cache/app-text/pdf2htmlEX-9999
index dd0f28598d0b..a057fabc5627 100644
--- a/metadata/md5-cache/app-text/pdf2htmlEX-9999
+++ b/metadata/md5-cache/app-text/pdf2htmlEX-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare pretend test unpack
-DEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] <app-text/poppler-0.64.0 app-text/poppler-data ~media-gfx/fontforge-20170731 media-libs/freetype x11-libs/cairo[svg] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
+DEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] app-text/poppler-data ~media-gfx/fontforge-20170731 media-libs/freetype x11-libs/cairo[svg] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A precise PDF to HTML converter (dilfridge fork)
 EAPI=6
 HOMEPAGE=https://github.com/akhuettel/pdf2htmlEX
 LICENSE=GPL-3+
-RDEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] <app-text/poppler-0.64.0 app-text/poppler-data ~media-gfx/fontforge-20170731 media-libs/freetype x11-libs/cairo[svg]
+RDEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] app-text/poppler-data ~media-gfx/fontforge-20170731 media-libs/freetype x11-libs/cairo[svg]
 SLOT=0
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ece94472c0bcd8696e2ceb967bde096
+_md5_=49c295c0ecf747fca15cb85376a47e39
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.0_beta2 b/metadata/md5-cache/app-text/sdcv-0.5.0_beta2
deleted file mode 100644
index f859bab817da..000000000000
--- a/metadata/md5-cache/app-text/sdcv-0.5.0_beta2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib sys-libs/readline:= >=dev-libs/glib-2.6.1 nls? ( >=sys-devel/gettext-0.14.1 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Console version of Stardict program
-EAPI=5
-HOMEPAGE=http://sdcv.sourceforge.net
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib sys-libs/readline:= >=dev-libs/glib-2.6.1
-SLOT=0
-SRC_URI=mirror://sourceforge/sdcv/sdcv-0.5.0-beta2-Source.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b503534b122fdae6d3fc6861a317d32
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.0_beta2-r1 b/metadata/md5-cache/app-text/sdcv-0.5.0_beta2-r1
index 83c2d3cc608c..ba0ced35499c 100644
--- a/metadata/md5-cache/app-text/sdcv-0.5.0_beta2-r1
+++ b/metadata/md5-cache/app-text/sdcv-0.5.0_beta2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Console version of Stardict program
 EAPI=6
 HOMEPAGE=http://sdcv.sourceforge.net
 IUSE=darkterm nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib sys-libs/readline:= >=dev-libs/glib-2.6.1
 SLOT=0
 SRC_URI=mirror://sourceforge/sdcv/sdcv-0.5.0-beta2-Source.tar.bz2
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f46abc63a0e4ac6ca7026cb020720e5f
+_md5_=eb8b900f374b01ba321441ec3b52b934
diff --git a/metadata/md5-cache/app-text/sigil-0.8.7-r1 b/metadata/md5-cache/app-text/sigil-0.8.7-r1
deleted file mode 100644
index 05c8051f2f2b..000000000000
--- a/metadata/md5-cache/app-text/sigil-0.8.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/hunspell-1.3.2 >=dev-libs/boost-1.49[threads] >=dev-libs/libpcre-8.31[pcre16] >=dev-libs/xerces-c-3.1.1[icu] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 >=sys-libs/zlib-1.2.7[minizip] >=sys-devel/gcc-4.8 virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Sigil is a multi-platform WYSIWYG ebook editor for ePub format
-EAPI=5
-HOMEPAGE=https://sigil-ebook.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=app-text/hunspell-1.3.2 >=dev-libs/boost-1.49[threads] >=dev-libs/libpcre-8.31[pcre16] >=dev-libs/xerces-c-3.1.1[icu] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 >=sys-libs/zlib-1.2.7[minizip]
-SLOT=0
-SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/0.8.7.tar.gz -> sigil-0.8.7.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7bed33d46df6a42546716a4dec8fe34
diff --git a/metadata/md5-cache/app-text/sigil-0.9.5-r2 b/metadata/md5-cache/app-text/sigil-0.9.5-r2
deleted file mode 100644
index 7120e57f9577..000000000000
--- a/metadata/md5-cache/app-text/sigil-0.9.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 sys-libs/zlib[minizip] >=sys-devel/gcc-4.8 virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Sigil is a multi-platform WYSIWYG ebook editor for ePub format
-EAPI=6
-HOMEPAGE=https://sigil-ebook.com/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 sys-libs/zlib[minizip]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/Sigil-Ebook/Sigil/releases/download/0.9.5/Sigil-0.9.5-Code.zip
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b335a52fb879d349ae66fcc74fbaec5d
diff --git a/metadata/md5-cache/app-text/sigil-0.9.6 b/metadata/md5-cache/app-text/sigil-0.9.6
deleted file mode 100644
index 3e597f383e87..000000000000
--- a/metadata/md5-cache/app-text/sigil-0.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 sys-libs/zlib[minizip] >=sys-devel/gcc-4.8 virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Sigil is a multi-platform WYSIWYG ebook editor for ePub format
-EAPI=6
-HOMEPAGE=https://sigil-ebook.com/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 sys-libs/zlib[minizip]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/Sigil-Ebook/Sigil/releases/download/0.9.6/Sigil-0.9.6-Code.zip
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b335a52fb879d349ae66fcc74fbaec5d
diff --git a/metadata/md5-cache/app-text/t1utils-1.40 b/metadata/md5-cache/app-text/t1utils-1.40
deleted file mode 100644
index 1607858e709c..000000000000
--- a/metadata/md5-cache/app-text/t1utils-1.40
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Type 1 Font utilities
-EAPI=0
-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.40.tar.gz
-_md5_=90774f711449e0e9c53bebecb56aa2bc
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r3 b/metadata/md5-cache/app-text/texlive-core-2017-r3
index 409c462ce432..a2b0d244b2f7 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r3
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !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.58.0:= <app-text/poppler-0.64.0 >=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 ) <media-libs/freetype-2.9.1-r2 virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170422
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !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.58.0:= <app-text/poppler-0.64.0 >=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 ) <media-libs/freetype-2.9.1-r3 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=https://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
+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/libX11 x11-libs/libXmu ) !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.58.0:= <app-text/poppler-0.64.0 >=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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76f5f8eb83ac3fc60532932a2f12d1a7
+_md5_=c6442251859c778eb676e4db3c5de0a0
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r4 b/metadata/md5-cache/app-text/texlive-core-2017-r4
index 87feb67e2e49..8749bf091da0 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r4
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r4
@@ -4,9 +4,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=https://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/libX11 x11-libs/libXmu ) !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.58.0:= >=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 https://dev.gentoo.org/~dilfridge/distfiles/texlive-20170524-source-freetype.patch.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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d8af38364e80ebb41a65399bb2cae18
+_md5_=62207fb10b610a9ea2604381f9c65222
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.6 b/metadata/md5-cache/app-text/zathura-cb-0.1.6
index f3421052278d..19c766453a64 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.6
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.6
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.1 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf7be3a9334be4d3e21055561ddd9ddb
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.7 b/metadata/md5-cache/app-text/zathura-cb-0.1.7
index 05c587834fe5..ecd4c6e4e356 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.7
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.7
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.8 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db877e64aa53b91fffbb80e6dbd058d5
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index 96d73644583e..de752612dbe6 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.8 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=06aa9a66efe49585aec7a0790da2cef0
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index cbeb38aabc43..6be650394ae4 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/ctrlp-1.80_p20180418 b/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
new file mode 100644
index 000000000000..ded72bc052df
--- /dev/null
+++ b/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support
+EAPI=6
+HOMEPAGE=https://github.com/ctrlpvim/ctrlp.vim
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/4b9e7cac612902a25498cca49f13475fe1a821a4.tar.gz -> ctrlp-1.80_p20180418.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=da750d82482107496eebb862e9161064
diff --git a/metadata/md5-cache/app-vim/genutils-2.5-r1 b/metadata/md5-cache/app-vim/genutils-2.5-r1
new file mode 100644
index 000000000000..2e26ee7887ff
--- /dev/null
+++ b/metadata/md5-cache/app-vim/genutils-2.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: library with various useful functions
+EAPI=6
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=197
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=cf57639880e205715b0aee9b9d0a3569
diff --git a/metadata/md5-cache/app-vim/indentpython-0.3 b/metadata/md5-cache/app-vim/indentpython-0.3
index f7682c1f5a80..08bf55a741de 100644
--- a/metadata/md5-cache/app-vim/indentpython-0.3
+++ b/metadata/md5-cache/app-vim/indentpython-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Indent Python code according to PEP8
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=974
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/vim-scripts/indentpython.vim/archive/0.3.zip -> indentpython-0.3.zip
+SRC_URI=https://github.com/vim-scripts/indentpython.vim/archive/0.3.tar.gz -> indentpython-0.3.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=6a276818c12d8ddc16067d198a6dd3cd
+_md5_=8d4b57d31ef50b13aecdabd2a3541a5e
diff --git a/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530 b/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
new file mode 100644
index 000000000000..77e6f868c55e
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: comment stuff out
+EAPI=6
+HOMEPAGE=https://github.com/tpope/vim-commentary
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tpope/vim-commentary/archive/7f2127b1dfc57811112785985b46ff2289d72334.tar.gz -> vim-commentary-1.3_p20180530.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=bbbf5e12023dd203cd58d2587a656a66
diff --git a/metadata/md5-cache/app-vim/vim-flake8-1.6 b/metadata/md5-cache/app-vim/vim-flake8-1.6
index 5d43a80722a2..62218092369a 100644
--- a/metadata/md5-cache/app-vim/vim-flake8-1.6
+++ b/metadata/md5-cache/app-vim/vim-flake8-1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: runs the currently open file through flake8
 EAPI=6
 HOMEPAGE=https://github.com/nvie/vim-flake8
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flake8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/nvie/vim-flake8/archive/1.6.zip -> vim-flake8-1.6.zip
+SRC_URI=https://github.com/nvie/vim-flake8/archive/1.6.tar.gz -> vim-flake8-1.6.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b339f6a1c6889b2a15593ef503534acf
+_md5_=f9ac2fbf18d73d0c7a5bd51bb810e3f5
diff --git a/metadata/md5-cache/app-vim/vim-go-1.13 b/metadata/md5-cache/app-vim/vim-go-1.13
index f36c766a332c..8fac44bfeeda 100644
--- a/metadata/md5-cache/app-vim/vim-go-1.13
+++ b/metadata/md5-cache/app-vim/vim-go-1.13
@@ -3,11 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Go development plugin for Vim
 EAPI=6
 HOMEPAGE=https://github.com/fatih/vim-go
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/fatih/vim-go/archive/v1.13.zip -> vim-go-1.13.zip
+SRC_URI=https://github.com/fatih/vim-go/archive/v1.13.tar.gz -> vim-go-1.13.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=e09b6f539cf4eefeb174037344c58ebc
+_md5_=7c8a1db2b94e4b929f4f894e5ad2a394
diff --git a/metadata/md5-cache/app-vim/vim-spell-da-20060116 b/metadata/md5-cache/app-vim/vim-spell-da-20060116
deleted file mode 100644
index 2484f33c9018..000000000000
--- a/metadata/md5-cache/app-vim/vim-spell-da-20060116
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Danish (da)
-EAPI=0
-HOMEPAGE=https://www.vim.org
-KEYWORDS=~alpha ~amd64 ~ia64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-da-20060116.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=6c8b48c3c337c5498925fe0f53720363
diff --git a/metadata/md5-cache/app-vim/vim-tmux-3.0.0 b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
index 4a308e3dd94d..865979d3f2cc 100644
--- a/metadata/md5-cache/app-vim/vim-tmux-3.0.0
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
@@ -7,6 +7,6 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-
 LICENSE=vim.org
 RDEPEND=!<app-misc/tmux-2.5-r2 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.zip -> vim-tmux-3.0.0.zip
+SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.tar.gz -> vim-tmux-3.0.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=46c0fe01b5e044a998e08c0645f1a3b3
+_md5_=0f47a9125b9dd2184b26a2e66784c9dc
diff --git a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r2 b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r2
deleted file mode 100644
index 7ac66bd463d2..000000000000
--- a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Clojure syntax highlighting, filetype and indent settings
-EAPI=5
-HOMEPAGE=https://github.com/vim-scripts/VimClojure
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-lang/clojure || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.zip -> vimclojure-2.3.6.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c40c010dedb399610f96231e4cc9cbfd
diff --git a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3 b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
index db9c79bf1995..e2bab4538ad7 100644
--- a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
+++ b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Clojure syntax highlighting, filetype and indent settings
 EAPI=6
 HOMEPAGE=https://github.com/vim-scripts/VimClojure
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-lang/clojure || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.zip -> vimclojure-2.3.6.zip
+SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.tar.gz -> vimclojure-2.3.6.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=f596f01c2e5bb9eb841f1a799a9c5d15
+_md5_=873c22cd71fa602a325078e1399e6ee9
diff --git a/metadata/md5-cache/app-vim/webapi-0.3 b/metadata/md5-cache/app-vim/webapi-0.3
new file mode 100644
index 000000000000..0065f0b64060
--- /dev/null
+++ b/metadata/md5-cache/app-vim/webapi-0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: interface to Web APIs
+EAPI=6
+HOMEPAGE=https://github.com/mattn/webapi-vim
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/mattn/webapi-vim/archive/0.3.tar.gz -> webapi-0.3.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=d57cd303299f860636c95d5c94eb65b8
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 671a4ea8226a..22c566d911a1 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
index 85c4c74f894f..08c619ed7b03 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Google C++ Testing Framework
 EAPI=6
 HOMEPAGE=https://github.com/google/googletest
 IUSE=doc examples test 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80f1dcdb621416b3920919decd787a5c
+_md5_=efae9372a8b4dbda1adc60410334d232
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3
deleted file mode 100644
index 44b28871e0b9..000000000000
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.49.0-r2 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=YAML parser and emitter in C++
-EAPI=6
-HOMEPAGE=https://github.com/jbeder/yaml-cpp
-KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.49.0-r2
-SLOT=0
-SRC_URI=https://github.com/jbeder/yaml-cpp/archive/release-0.5.3.tar.gz -> yaml-cpp-0.5.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9f902d431e6a30337b247efedfb7e03
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3-r1 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3-r1
deleted file mode 100644
index 1ba553d916e0..000000000000
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.49.0-r2:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=YAML parser and emitter in C++
-EAPI=6
-HOMEPAGE=https://github.com/jbeder/yaml-cpp
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.49.0-r2:=
-SLOT=0
-SRC_URI=https://github.com/jbeder/yaml-cpp/archive/release-0.5.3.tar.gz -> yaml-cpp-0.5.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4141035db9f8125c62da66a57353795d
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 3c2a0634d175..9f611931d4f4 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/etcd-3.2.20 b/metadata/md5-cache/dev-db/etcd-3.2.20
deleted file mode 100644
index f8ef7333798e..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.2.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.9
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=6
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v3.2.20.tar.gz -> etcd-3.2.20.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a7e9bc1848cba8c0b59489ab05158782
diff --git a/metadata/md5-cache/dev-db/etcd-3.2.21 b/metadata/md5-cache/dev-db/etcd-3.2.21
deleted file mode 100644
index ceaa600ada17..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.2.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.9
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=6
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v3.2.21.tar.gz -> etcd-3.2.21.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a7e9bc1848cba8c0b59489ab05158782
diff --git a/metadata/md5-cache/dev-db/etcd-3.2.22 b/metadata/md5-cache/dev-db/etcd-3.2.22
new file mode 100644
index 000000000000..4d924cc6cbb3
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.2.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.9
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.2.22.tar.gz -> etcd-3.2.22.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a7e9bc1848cba8c0b59489ab05158782
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.6 b/metadata/md5-cache/dev-db/etcd-3.3.6
deleted file mode 100644
index 937228844e57..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.9
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=6
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=doc +server
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v3.3.6.tar.gz -> etcd-3.3.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c704622a9bd1aecc273e42ab8ac9a802
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.7 b/metadata/md5-cache/dev-db/etcd-3.3.7
new file mode 100644
index 000000000000..31b7cdba3a83
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.9
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc +server
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.3.7.tar.gz -> etcd-3.3.7.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c704622a9bd1aecc273e42ab8ac9a802
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.18 b/metadata/md5-cache/dev-db/lmdb-0.9.18
index a2f82264a732..62620cc1ca50 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.18
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.18
@@ -3,10 +3,10 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=5
 HOMEPAGE=http://symas.com/mdb/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=OPENLDAP
 RDEPEND=!=net-nds/openldap-2.4.40
 SLOT=0/0.9.18
 SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.18.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=843501e219613125273d24b78c7e4623
+_md5_=73feeed2b62e72e8928cfeceb8532e4f
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3
index dbd54cdaa23b..9a78eb5efc8a 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=virtual/mysql-5.1:= dev-libs/boost:0= dev-libs/openssl:0= sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=5
-HOMEPAGE=http://dev.mysql.com/downloads/connector/cpp/
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=debug examples gcov static-libs
 KEYWORDS=amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/mysql-5.1:= dev-libs/boost:0= dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.3.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=743cb690569ea4cee08d759608a325de
+_md5_=97f2a22273bc901d358239fa8cf091b9
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.6 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.6
index cf55a4e16981..db2bbd17b20b 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.6
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=5
-HOMEPAGE=http://dev.mysql.com/downloads/connector/cpp/
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=debug examples gcov static-libs
 KEYWORDS=amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.6.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=608833e875bfd6d56ae01b224859e07d
+_md5_=a1c56a4c1ee8ea5e424fca51f205c88f
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.8 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.8
index d286f5b68b4f..f55e376c75e3 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.8
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.8
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=6
-HOMEPAGE=http://dev.mysql.com/downloads/connector/cpp/
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=debug examples gcov static-libs
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/m
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.8.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76b2f27b761d4dd60f2f7d6019f4be8a
+_md5_=f5a6b7f7282a57257051079bdf5d8706
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
index 1ff399fad57c..3012c594783f 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=6
-HOMEPAGE=http://dev.mysql.com/downloads/connector/cpp/
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=debug examples gcov static-libs
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/m
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.9.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af292e28bc7d63b9dea496973acc6a1e
+_md5_=fbdbb625ac37c4ae81269b5ad5a9087c
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11
index 3d5c5b12da8b..7c5c83335826 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/openssl:0= dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=6
-HOMEPAGE=http://dev.mysql.com/downloads/connector/cpp/
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=+legacy
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.11-src.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4ebb5413ca46ffddff1b53d7477e341
+_md5_=76fae047aa2f74bc74977c96ebab9d5f
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1
deleted file mode 100644
index c01f389f14d3..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 10g client installation for Linux with SDK
-EAPI=0
-HOMEPAGE=http://www.oracle.com/technology/tech/oci/instantclient/index.html
-KEYWORDS=-* amd64 x86
-LICENSE=OTN
-RDEPEND=~virtual/libstdc++-3.3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=amd64? ( instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip ) x86? ( instantclient-basic-linux32-10.2.0.3-20061115.zip instantclient-sdk-linux32-10.2.0.3-20061115.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be2dc13edbcdc4ea1d6a50b2eb9a9de1
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.2 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.2
deleted file mode 100644
index 1eb02f13ac8d..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g client installation for Linux with SDK
-EAPI=0
-HOMEPAGE=http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
-KEYWORDS=-* ~x86 ~amd64
-LICENSE=OTN
-RDEPEND=dev-libs/libaio
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-basic-linux32-11.2.0.2.0.zip instantclient-sdk-linux32-11.2.0.2.0.zip ) amd64? ( instantclient-basic-linux-x86-64-11.2.0.2.0.zip instantclient-sdk-linux-x86-64-11.2.0.2.0.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b2c308c3cf51b8ad3a0b30ae61771e3
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-10.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-10.2.0.3
deleted file mode 100644
index 2f7229febe2c..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-10.2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst setup unpack
-DEPEND=>=dev-db/oracle-instantclient-basic-10.2.0.3 app-arch/unzip
-DESCRIPTION=Oracle 10g client installation for Linux: JDBC supplement
-EAPI=0
-HOMEPAGE=http://www.oracle.com/technology/tech/oci/instantclient/index.html
-KEYWORDS=-* amd64 x86
-LICENSE=OTN
-RDEPEND=>=dev-db/oracle-instantclient-basic-10.2.0.3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=amd64? ( instantclient-jdbc-linux-x86-64-10.2.0.3-20070103.zip ) x86? ( instantclient-jdbc-linux32-10.2.0.3-20061115.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=edc19b3b6ec20a99d84910a83d687190
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.2 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.2
deleted file mode 100644
index 5aaf276a3bc7..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst setup unpack
-DEPEND=>=dev-db/oracle-instantclient-basic-11.2.0.2 app-arch/unzip
-DESCRIPTION=Oracle 11g client installation for Linux: JDBC supplement
-EAPI=0
-HOMEPAGE=http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
-KEYWORDS=~x86 ~amd64
-LICENSE=OTN
-RDEPEND=>=dev-db/oracle-instantclient-basic-11.2.0.2
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-jdbc-linux32-11.2.0.2.0.zip ) amd64? ( instantclient-jdbc-linux-x86-64-11.2.0.2.0.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e88e28e97bf1cebc2a381cf122cf2d27
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1
deleted file mode 100644
index c7fc07d693e4..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g client installation ODBC supplement
-EAPI=0
-HOMEPAGE=http://www.oracle.com/technology/tech/oci/instantclient/index.html
-KEYWORDS=-* ~x86 ~amd64
-LICENSE=OTN
-RDEPEND=dev-db/oracle-instantclient-basic
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-odbc-linux32-11.2.0.2.0.zip ) amd64? ( instantclient-odbc-linux-x86-64-11.2.0.2.0.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bca5c8322de935544469d1e62e545167
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-10.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-10.2.0.3
deleted file mode 100644
index e7367f04fd0b..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-10.2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst setup unpack
-DEPEND=>=dev-db/oracle-instantclient-basic-10.2.0.3 app-arch/unzip
-DESCRIPTION=Oracle 10g client installation for Linux: SQL*Plus
-EAPI=0
-HOMEPAGE=http://www.oracle.com/technology/tech/oci/instantclient/index.html
-KEYWORDS=-* amd64 x86
-LICENSE=OTN
-RDEPEND=>=dev-db/oracle-instantclient-basic-10.2.0.3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=amd64? ( instantclient-sqlplus-linux-x86-64-10.2.0.3-20070103.zip ) x86? ( instantclient-sqlplus-linux32-10.2.0.3-20061115.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a22eedcd6b0e2662702e98de3318eba
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.2 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.2
deleted file mode 100644
index 17feacec1a4c..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst setup unpack
-DEPEND=>=dev-db/oracle-instantclient-basic-11.2.0.2 app-arch/unzip
-DESCRIPTION=Oracle 11g client installation for Linux: SQL*Plus
-EAPI=0
-HOMEPAGE=http://www.oracle.com/technology/tech/oci/instantclient/index.html
-KEYWORDS=~x86 ~amd64
-LICENSE=OTN
-RDEPEND=>=dev-db/oracle-instantclient-basic-11.2.0.2
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-sqlplus-linux32-11.2.0.2.0.zip ) amd64? ( instantclient-sqlplus-linux-x86-64-11.2.0.2.0.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84daad8fca2c9f9d4c60d15b58805302
diff --git a/metadata/md5-cache/dev-db/pgadmin3-1.22.2 b/metadata/md5-cache/dev-db/pgadmin3-1.22.2
index df7a32853971..e5a5e74a544d 100644
--- a/metadata/md5-cache/dev-db/pgadmin3-1.22.2
+++ b/metadata/md5-cache/dev-db/pgadmin3-1.22.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install
 DEPEND=x11-libs/wxGTK:3.0=[X] >=dev-db/postgresql-8.4.0:= >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
 DESCRIPTION=wxWidgets GUI for PostgreSQL
 EAPI=6
-HOMEPAGE=http://www.pgadmin.org/
+HOMEPAGE=https://www.pgadmin.org/
 IUSE=debug +databasedesigner
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=POSTGRESQL
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/wxGTK:3.0=[X] >=dev-db/postgresql-8.4.0:= >=dev-libs/libxml2-2.
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin/pgadmin3/v1.22.2/src/pgadmin3-1.22.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=cf62e5d46b5590062e2bf66d76ae73b2
+_md5_=c36edaf7c734e21845783b05c1e95250
diff --git a/metadata/md5-cache/dev-db/pgadmin4-2.0-r1 b/metadata/md5-cache/dev-db/pgadmin4-2.0-r1
index 01ceff57b9e9..a445a3f00acf 100644
--- a/metadata/md5-cache/dev-db/pgadmin4-2.0-r1
+++ b/metadata/md5-cache/dev-db/pgadmin4-2.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup
 DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] doc? ( dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
 DESCRIPTION=GUI administration and development platform for PostgreSQL
 EAPI=6
-HOMEPAGE=http://www.pgadmin.org/
+HOMEPAGE=https://www.pgadmin.org/
 IUSE=doc python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
 KEYWORDS=amd64 x86
 LICENSE=POSTGRESQL
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v2.0/source/pgadmin4-2.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c95637ab71541adb06a69a93941ecb90
+_md5_=f627831b5cf2a7a1fb5dd21a0748fe79
diff --git a/metadata/md5-cache/dev-db/pgadmin4-2.1 b/metadata/md5-cache/dev-db/pgadmin4-2.1
index b21f238e971b..32bf7036d295 100644
--- a/metadata/md5-cache/dev-db/pgadmin4-2.1
+++ b/metadata/md5-cache/dev-db/pgadmin4-2.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup
 DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] doc? ( dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
 DESCRIPTION=GUI administration and development platform for PostgreSQL
 EAPI=6
-HOMEPAGE=http://www.pgadmin.org/
+HOMEPAGE=https://www.pgadmin.org/
 IUSE=doc python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=POSTGRESQL
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v2.1/source/pgadmin4-2.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1982550ae0de0089e6dbd7d0aa681959
+_md5_=6ff4c0341fd461a6c89cb5f70e06ab0c
diff --git a/metadata/md5-cache/dev-db/pgadmin4-3.0 b/metadata/md5-cache/dev-db/pgadmin4-3.0
index 40fdd01969a6..b3aa3c0ce1b4 100644
--- a/metadata/md5-cache/dev-db/pgadmin4-3.0
+++ b/metadata/md5-cache/dev-db/pgadmin4-3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup
 DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] doc? ( dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
 DESCRIPTION=GUI administration and development platform for PostgreSQL
 EAPI=6
-HOMEPAGE=http://www.pgadmin.org/
+HOMEPAGE=https://www.pgadmin.org/
 IUSE=doc python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=POSTGRESQL
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v3.0/source/pgadmin4-3.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=50c802c3d46e38937d144c3f22bbce35
+_md5_=789ef0336011612eec2eec7ceafcdfdc
diff --git a/metadata/md5-cache/dev-db/pgrouting-2.5.2 b/metadata/md5-cache/dev-db/pgrouting-2.5.2
index eb3f5645b380..fc946f1652c4 100644
--- a/metadata/md5-cache/dev-db/pgrouting-2.5.2
+++ b/metadata/md5-cache/dev-db/pgrouting-2.5.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=doc? ( >=dev-python/sphinx-1.1 ) pdf? ( >=dev-python/sphinx-1.1[latex] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality.
 EAPI=6
-HOMEPAGE=http://pgrouting.org/
+HOMEPAGE=https://pgrouting.org/
 IUSE=+drivingdistance doc pdf html postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MIT Boost-1.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v2.5.2.tar.gz -> pgrouting-2.5.2.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	postgres	c59d58664169a60e232dd018eae69172	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=afcd0516730778ca36489706e937b5ec
+_md5_=54f52629a1a1414f0b260eefed9af87d
diff --git a/metadata/md5-cache/dev-db/pgtap-0.98.0 b/metadata/md5-cache/dev-db/pgtap-0.98.0
index 428d49847889..7b2152a9e54c 100644
--- a/metadata/md5-cache/dev-db/pgtap-0.98.0
+++ b/metadata/md5-cache/dev-db/pgtap-0.98.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) dev-perl/TAP-Parser-SourceHandler-pgTAP
 DESCRIPTION=Unit testing for PostgreSQL
 EAPI=6
-HOMEPAGE=http://pgtap.org/
+HOMEPAGE=https://pgtap.org/
 IUSE=postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=amd64
 LICENSE=POSTGRESQL
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) dev-perl/TAP-Parser-SourceHandler-pgTAP
 SLOT=0
-SRC_URI=http://api.pgxn.org/dist/pgtap/0.98.0/pgtap-0.98.0.zip
+SRC_URI=https://api.pgxn.org/dist/pgtap/0.98.0/pgtap-0.98.0.zip
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=20fa70065680def2a1aa37a56ff3397b
+_md5_=b05803cfaaee6ec4df30020f43aa1dec
diff --git a/metadata/md5-cache/dev-db/postgresql-10.3 b/metadata/md5-cache/dev-db/postgresql-10.3
index a1b203740b9b..e4669199b515 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.3
+++ b/metadata/md5-cache/dev-db/postgresql-10.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm prepare prerm se
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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 ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=10
 SRC_URI=mirror://postgresql/source/v10.3/postgresql-10.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=532da489b2036249afb6dafa4cc43427
+_md5_=91231ec0ab4ab405e334252839f94ec2
diff --git a/metadata/md5-cache/dev-db/postgresql-10.4 b/metadata/md5-cache/dev-db/postgresql-10.4
index 61d68c38f265..71b44169c5bd 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.4
+++ b/metadata/md5-cache/dev-db/postgresql-10.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm prepare prerm se
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=10
 SRC_URI=mirror://postgresql/source/v10.4/postgresql-10.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=687cf47f09e901100a6336efa76fb122
+_md5_=663236e1ab716bf73bc88f007f7393a6
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.22 b/metadata/md5-cache/dev-db/postgresql-9.3.22
index cdfd006644b2..17fb95f9f313 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.22
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.22/postgresql-9.3.22.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b63921f55cf0640f6e1b14f5920eb415
+_md5_=4d6290a256d65d87f457006161579894
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.23 b/metadata/md5-cache/dev-db/postgresql-9.3.23
index 8b025f3127a8..ee49093e69a5 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.23
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.23
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.23/postgresql-9.3.23.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a4d018e9ad44a8a315a13c970a9116ae
+_md5_=9fa2e52836a7d0a395a9631e7a9b0229
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.17 b/metadata/md5-cache/dev-db/postgresql-9.4.17
index e441783cbc59..270e6a001384 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.17
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.17/postgresql-9.4.17.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=77e5bdd69134a3ae537958e285315a36
+_md5_=b2407a41f3f00269f3897617372adbe2
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.18 b/metadata/md5-cache/dev-db/postgresql-9.4.18
index 5d4daf81f8e4..3f855840cc4d 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.18
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.18
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.18/postgresql-9.4.18.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b0f4e9040eefad58e401c8b974b80d24
+_md5_=d086d90eeb3a616a80164f4f8a7f0123
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.12 b/metadata/md5-cache/dev-db/postgresql-9.5.12
index 9afd26a174a2..202d61e1c3fa 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.12
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.12
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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 ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.12/postgresql-9.5.12.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d83ffdd9322d39afb37db766399f19b3
+_md5_=43784dd583275cbce52f3f805283d605
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.13 b/metadata/md5-cache/dev-db/postgresql-9.5.13
index 503e8a6e5d4d..be5e41c31ab7 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.13
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.13
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.13/postgresql-9.5.13.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f514610e9418fe50b6ca6b4118607b5d
+_md5_=26cd0c11f0f5d87db42e55e17df9ec3f
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.8 b/metadata/md5-cache/dev-db/postgresql-9.6.8
index 1d1a024d476f..742fa2a5259d 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.8
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.8
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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 ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.8/postgresql-9.6.8.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f7724fd178fc8be898a5254cceea3ab0
+_md5_=e08a9acb34aa3bb90c8c28bda1d848bc
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.9 b/metadata/md5-cache/dev-db/postgresql-9.6.9
index baa85ffcfc4e..06cddd891657 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.9
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.9
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.9/postgresql-9.6.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ec15587ac0be7f42f3fe99d8b364dd35
+_md5_=3f2057c427eabae393ec320b2dd0774b
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index c4063a67a9d8..2ed047c50377 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
 DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !!<sys-apps/sandbox-2.0 >=dev-lang/perl-5.8 app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:4.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets app-text/openjade dev-libs/libxml2 dev-libs/libxslt sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) 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(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
 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 ) )
 SLOT=11
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fdc69ac8798e78d4e16e8aa0a49e0abb
+_md5_=35a62dab64151ac840e260aecb0e644e
diff --git a/metadata/md5-cache/dev-db/psqlodbc-10.01.0000 b/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
index 4fc77f88c633..4cd92fc4a68d 100644
--- a/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
+++ b/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install
 DEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
 DESCRIPTION=Official ODBC driver for PostgreSQL
 EAPI=6
-HOMEPAGE=http://www.postgresql.org/
+HOMEPAGE=https://www.postgresql.org/
 IUSE=doc iodbc ssl threads
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
 SLOT=0
 SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-10.01.0000.tar.gz
-_md5_=0f116a4fd5e103bdf01297da2d1f3792
+_md5_=d544f5eb52c39104afa9575921239e5c
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 2e4f1398e51f..2e28511ac0af 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/cardpics-0.4-r1 b/metadata/md5-cache/dev-games/cardpics-0.4-r1
index 1a51e8d6c78a..77e11c8e0985 100644
--- a/metadata/md5-cache/dev-games/cardpics-0.4-r1
+++ b/metadata/md5-cache/dev-games/cardpics-0.4-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=set of free cards sets
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/cardpics/
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/cardpics/cardpics-0.4.tar.bz2
-_md5_=9f9812871b5b3820a13ddeda4cf10323
+_md5_=048d29bf453850784f3fd2362cd3a4cc
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
index 83ac665aad98..44cff8c336f5 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Quake4 SDK
 EAPI=6
 HOMEPAGE=https://www.iddevnet.com/quake4/
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=QUAKE4
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
 _eclasses_=unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=56f964b8d02c1ea45ee0b30a8e30853b
+_md5_=f7079bc3d63e41fb824d24bced588b39
diff --git a/metadata/md5-cache/dev-games/simgear-2018.2.1 b/metadata/md5-cache/dev-games/simgear-2018.2.1
new file mode 100644
index 000000000000..6a30a5cc453f
--- /dev/null
+++ b/metadata/md5-cache/dev-games/simgear-2018.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Development library for simulation games
+EAPI=6
+HOMEPAGE=http://www.simgear.org/
+IUSE=+dns debug gdal openmp subversion test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/simgear-2018.2.1.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60f6accf74526053724ca4cabce2ba61
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 22b70eadb3bb..6d476d024b9f 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/goversion-1.0.0_p20180403 b/metadata/md5-cache/dev-go/goversion-1.0.0_p20180403
deleted file mode 100644
index 5767c97a5daa..000000000000
--- a/metadata/md5-cache/dev-go/goversion-1.0.0_p20180403
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Print version used to build Go executables
-EAPI=6
-HOMEPAGE=https://github.com/rsc/goversion https://rsc.io/goversion
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/rsc/goversion/archive/38f6ce479a8bd51821a711abdc8343164d820be4.tar.gz -> goversion-1.0.0_p20180403.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3a00548f8edccbb14fed0660f8355d58
diff --git a/metadata/md5-cache/dev-go/goversion-1.0.0_p20180404 b/metadata/md5-cache/dev-go/goversion-1.0.0_p20180404
deleted file mode 100644
index 0a8773809a4b..000000000000
--- a/metadata/md5-cache/dev-go/goversion-1.0.0_p20180404
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Print version used to build Go executables
-EAPI=6
-HOMEPAGE=https://github.com/rsc/goversion https://rsc.io/goversion
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/rsc/goversion/archive/597212e462da05a7902d6cea0ec895a0d9b8b218.tar.gz -> goversion-1.0.0_p20180404.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3ab58f22183baace7e3ad7f0946389c1
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 14aa7999778d..c3642d58cb59 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.17 b/metadata/md5-cache/dev-haskell/hscolour-1.17
deleted file mode 100644
index 803e21ee4ee6..000000000000
--- a/metadata/md5-cache/dev-haskell/hscolour-1.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test unpack
-DEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=Colourise Haskell code
-EAPI=0
-HOMEPAGE=http://www.cs.york.ac.uk/fp/darcs/hscolour/
-IUSE=doc profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/ghc-6.6.1
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/hscolour/1.17/hscolour-1.17.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e5c43e39e14a923bddd1fd2fb221d5a6
diff --git a/metadata/md5-cache/dev-haskell/language-docker-6.0.1 b/metadata/md5-cache/dev-haskell/language-docker-6.0.1
new file mode 100644
index 000000000000..d8c09c208ee6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-docker-6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/glob dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/language-docker#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/6.0.1
+SRC_URI=mirror://hackage/packages/archive/language-docker/6.0.1/language-docker-6.0.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=50f787553510cf831c5f3096d9c83e6b
diff --git a/metadata/md5-cache/dev-haskell/megaparsec-6.5.0 b/metadata/md5-cache/dev-haskell/megaparsec-6.5.0
new file mode 100644
index 000000000000..940dd9ce5ce1
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/megaparsec-6.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-0.4:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 >=dev-haskell/hspec-expectations-0.5 <dev-haskell/hspec-expectations-0.9 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.12 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monadic parser combinators
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/megaparsec
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-0.4:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/6.5.0
+SRC_URI=mirror://hackage/packages/archive/megaparsec/6.5.0/megaparsec-6.5.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=86ad4e13c3c6bd1b11695cf1054f1e45
diff --git a/metadata/md5-cache/dev-haskell/parser-combinators-0.4.0 b/metadata/md5-cache/dev-haskell/parser-combinators-0.4.0
new file mode 100644
index 000000000000..fa1f78623d90
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/parser-combinators-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lightweight package providing commonly useful parser combinators
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/parser-combinators
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0
+SRC_URI=mirror://hackage/packages/archive/parser-combinators/0.4.0/parser-combinators-0.4.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=51d0415227f936bddff45dde89055d6d
diff --git a/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0 b/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
new file mode 100644
index 000000000000..d6a004a9ac70
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lightweight package providing commonly useful parser combinators
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/parser-combinators
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/1.0.0
+SRC_URI=mirror://hackage/packages/archive/parser-combinators/1.0.0/parser-combinators-1.0.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a826b83739601bc6a2e535f51a13d2c
diff --git a/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.2 b/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.2
new file mode 100644
index 000000000000..ff798d08f1fe
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/doctest-0.10 dev-haskell/hunit >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Translate between binary data and a human-readable collection of words
+EAPI=6
+HOMEPAGE=https://github.com/quchen/pgp-wordlist
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.1.0.2
+SRC_URI=mirror://hackage/packages/archive/pgp-wordlist/0.1.0.2/pgp-wordlist-0.1.0.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=65b397af853e04cc1327ec9c67f18db8
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-1.2.0.1 b/metadata/md5-cache/dev-haskell/prettyprinter-1.2.0.1
new file mode 100644
index 000000000000..05e972db2641
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/prettyprinter-1.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/pgp-wordlist-0.1 >=dev-haskell/semigroups-0.6 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A modern, easy to use, well-documented, extensible prettyprinter
+EAPI=6
+HOMEPAGE=https://github.com/quchen/prettyprinter
+IUSE=doc doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.2.0.1
+SRC_URI=mirror://hackage/packages/archive/prettyprinter/1.2.0.1/prettyprinter-1.2.0.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=06e46946a38ad23cd1273d6c9c22b74c
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index afbf84245ce9..82382f07cddc 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
deleted file mode 100644
index 7c1dd3c89fc9..000000000000
--- a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core =dev-java/commons-cli-1* =dev-java/commons-httpclient-3* dev-java/commons-logging =dev-java/jakarta-oro-2.0* >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Ivy is a free java based dependency manager
-EAPI=0
-HOMEPAGE=https://ant.apache.org/ivy/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/commons-cli-1* =dev-java/commons-httpclient-3* dev-java/commons-logging =dev-java/jakarta-oro-2.0* >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://jayasoft.org/downloads/ivy/1.3.1/ivy-1.3.1-src.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=01154f9724f24506115c26f519da2223
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r4 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r4
new file mode 100644
index 000000000000..811b07a45e8b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 test? ( dev-java/ant-junit:0 dev-java/commons-logging:0 dev-java/commons-collections:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Applies XPath expressions to graphs of objects of all kinds
+EAPI=6
+HOMEPAGE=https://commons.apache.org/jxpath/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz -> commons-jxpath-1.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f2ea76224a3504fc1e3cfbefda21b1e5
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
index b6478edd2094..5dde849bc9d9 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8c7139bfe2bf53f7d6b515d492244d80
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.6.2 b/metadata/md5-cache/dev-java/icedtea-web-1.6.2
index 2dd819722262..0325f8cf746d 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.6.2
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d4599466389f73466b3735491a5fbf74
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r2 b/metadata/md5-cache/dev-java/jdom-1.0-r2
deleted file mode 100644
index 20ce2f83712a..000000000000
--- a/metadata/md5-cache/dev-java/jdom-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java API to manipulate XML data
-EAPI=0
-HOMEPAGE=http://www.jdom.org
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=596cbc74d1ca4b84415205c530d0dd6a
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
deleted file mode 100644
index dfde15b710a6..000000000000
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4.2 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java library to bind object properties with UI components
-EAPI=0
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4.2 examples? ( >=dev-java/jgoodies-looks-1.0.5 ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.0
-SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2c2967fa53a9a137f631b03b3b19a42b
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
deleted file mode 100644
index d9e2cf8ca7f2..000000000000
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4.2 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java library to bind object properties with UI components
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4.2 examples? ( >=dev-java/jgoodies-looks-1.0.5 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.0
-SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=94797ef6f526b52568e1bdaf61516d9b
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.2 b/metadata/md5-cache/dev-java/spice-jndikit-1.2
deleted file mode 100644
index de8f8e336fad..000000000000
--- a/metadata/md5-cache/dev-java/spice-jndikit-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JNDI Kit is a toolkit designed to help with the construction of JNDI providers
-EAPI=0
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~x86
-LICENSE=Spice-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://dist.codehaus.org/spice/distributions/spice-jndikit-1.2-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0b9fd0e855fde915e25448c68edaef5b
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
deleted file mode 100644
index 6aa956f26f73..000000000000
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP
-EAPI=4
-HOMEPAGE=http://xml.apache.org/commons/
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.4
-SRC_URI=https://dev.gentoo.org/~sera/distfiles/xml-commons-external-1.4.01.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=75c86f51b14cd0f0a273e6c34cf6ffd3
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c2062aaef7fe..04ad091c9ea6 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/php-7.1.18 b/metadata/md5-cache/dev-lang/php-7.1.18
new file mode 100644
index 000000000000..afd8e65636dd
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.1.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( 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 ) session-mm? ( 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= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+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 session-mm 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
+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] fpm? ( 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 ) session-mm? ( 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 ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
+SLOT=7.1
+SRC_URI=https://secure.php.net/distributions/php-7.1.18.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ba8cf86a67e671cfc8e1207c49c00767
diff --git a/metadata/md5-cache/dev-lang/php-7.2.6 b/metadata/md5-cache/dev-lang/php-7.2.6
new file mode 100644
index 000000000000..2d52befff17d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) 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 ) 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 ) ) lmdb? ( dev-db/lmdb:= ) 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 ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) 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 ) ) tokyocabinet? ( dev-db/tokyocabinet ) 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= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +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 lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption 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
+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] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) 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 ) 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 ) ) lmdb? ( dev-db/lmdb:= ) 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 ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) 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 ) ) tokyocabinet? ( dev-db/tokyocabinet ) 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= ) zip-encryption? ( >=dev-libs/libzip-1.2.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 ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+SLOT=7.2
+SRC_URI=https://secure.php.net/distributions/php-7.2.6.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=11a0d9b611b58f0cee6804de1dded8b1
diff --git a/metadata/md5-cache/dev-lang/polyml-5.4.1 b/metadata/md5-cache/dev-lang/polyml-5.4.1
index 62a08a254680..c6cf6b96dd50 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.4.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.4.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
-HOMEPAGE=http://www.polyml.org
+HOMEPAGE=https://www.polyml.org
 IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads
 SLOT=0/5.4.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.4.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7da849f632d725bf26eb257da09cf223
+_md5_=7ab4f7e0cba6c8af9ad79a1599d41d4c
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.0 b/metadata/md5-cache/dev-lang/polyml-5.5.0
index dc138a8d88c9..55e416eab72f 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.0
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
-HOMEPAGE=http://www.polyml.org
+HOMEPAGE=https://www.polyml.org
 IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads
 SLOT=0/5.5.0
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0208737505f5d5e116acb2cd58050d85
+_md5_=7ff3d0ab45e01850fc71f6c7ccd2eeb7
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.1 b/metadata/md5-cache/dev-lang/polyml-5.5.1
index d7671b9998bd..153d409493c9 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
-HOMEPAGE=http://www.polyml.org
+HOMEPAGE=https://www.polyml.org
 IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads
 SLOT=0/5.5.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0fe6fad4ad461090d28274e15ae1acff
+_md5_=8f2b67b5d597885fcdf7a2b0d89ae982
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.2 b/metadata/md5-cache/dev-lang/polyml-5.5.2
index d0890d7ca24e..3e69eff1cd9d 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.2
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
-HOMEPAGE=http://www.polyml.org
+HOMEPAGE=https://www.polyml.org
 IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads
 SLOT=0/5.5.2
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5293a4d459fcbcf14728af95b7d4753d
+_md5_=db6bd08d7c7c63533e2992b347ccd85c
diff --git a/metadata/md5-cache/dev-lang/polyml-5.6 b/metadata/md5-cache/dev-lang/polyml-5.6
index 4e8d80ff2e1e..47d8b2160124 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.6
+++ b/metadata/md5-cache/dev-lang/polyml-5.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure prepare test
 DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=6
-HOMEPAGE=http://www.polyml.org
+HOMEPAGE=https://www.polyml.org
 IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads
 SLOT=0/5.6
 SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.6 -> polyml-5.6.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9f9c8a9da7a926eb68d2421219db0b9e
+_md5_=e05c9500294a4bc63ba7765ea0f58a6c
diff --git a/metadata/md5-cache/dev-lang/python-3.4.8 b/metadata/md5-cache/dev-lang/python-3.4.8
index 83f9ee445a8e..1c8b8f3273b9 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.8
+++ b/metadata/md5-cache/dev-lang/python-3.4.8
@@ -4,11 +4,11 @@ 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
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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 )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.6-0.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50b430acebd5b7fd68bf59d555129010
+_md5_=80f90bff9b9991b1d7ec203902906877
diff --git a/metadata/md5-cache/dev-lang/python-3.5.5 b/metadata/md5-cache/dev-lang/python-3.5.5
index a15ed1d6bf5a..c06dedc9c68d 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.5
+++ b/metadata/md5-cache/dev-lang/python-3.5.5
@@ -4,7 +4,7 @@ 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 test +threads tk wininst +xml
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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:0= ) ) 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c6ce66d4fdae0b87276ca3d459f3fe0a
+_md5_=313db0fb762de7ed9282d0341a4d948b
diff --git a/metadata/md5-cache/dev-lang/python-3.6.5 b/metadata/md5-cache/dev-lang/python-3.6.5
index 3bf38176ab62..a6744448b137 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.5
+++ b/metadata/md5-cache/dev-lang/python-3.6.5
@@ -4,7 +4,7 @@ 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 test +threads tk wininst +xml
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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:0= ) ) 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a7215c7f656384cdfdd48c46a305e4d6
+_md5_=45671420aaf89392840cee02da365bbf
diff --git a/metadata/md5-cache/dev-lang/rust-1.26.2 b/metadata/md5-cache/dev-lang/rust-1.26.2
new file mode 100644
index 000000000000..c7cbaa0f1ed0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.26.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=debug doc extended +jemalloc wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore 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 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!extended? ( >=dev-util/cargo-0.27.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=stable/1.26
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.26.2-src.tar.xz -> rustc-1.26.2-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.25.0-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a031ceb8eb1efed5e1b45fb44db3a6c7
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.26.2 b/metadata/md5-cache/dev-lang/rust-bin-1.26.2
new file mode 100644
index 000000000000..cd9df5ed2108
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.26.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm pretend unpack
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=>=dev-util/cargo-0.27.0
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
+SLOT=stable
+SRC_URI=amd64? ( http://static.rust-lang.org/dist/rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( http://static.rust-lang.org/dist/rust-1.26.2-arm-unknown-linux-gnueabi.tar.xz http://static.rust-lang.org/dist/rust-1.26.2-arm-unknown-linux-gnueabihf.tar.xz http://static.rust-lang.org/dist/rust-1.26.2-armv7-unknown-linux-gnueabihf.tar.xz ) x86? ( http://static.rust-lang.org/dist/rust-1.26.2-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e9d4fb370ed498ced3ebc8df1eca4783
diff --git a/metadata/md5-cache/dev-lang/snobol-0.99.4 b/metadata/md5-cache/dev-lang/snobol-0.99.4
deleted file mode 100644
index 6d5765eb36b4..000000000000
--- a/metadata/md5-cache/dev-lang/snobol-0.99.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-devel/gcc sys-devel/m4
-DESCRIPTION=Phil Budne's port of Macro SNOBOL4 in C, for modern machines
-EAPI=0
-HOMEPAGE=http://www.snobol4.org/csnobol4/
-KEYWORDS=~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=mirror://snobol4/snobol-0.99.4.tar.gz
-_md5_=9619bda8520ce9812eee3327d1a1d984
diff --git a/metadata/md5-cache/dev-lang/snobol-0.99.44 b/metadata/md5-cache/dev-lang/snobol-0.99.44
deleted file mode 100644
index 99572f8eb599..000000000000
--- a/metadata/md5-cache/dev-lang/snobol-0.99.44
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-devel/gcc sys-devel/m4
-DESCRIPTION=Phil Budne's port of Macro SNOBOL4 in C, for modern machines
-EAPI=0
-HOMEPAGE=http://www.snobol4.org/csnobol4/
-KEYWORDS=~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=ftp://ftp.snobol4.org/snobol4/beta/snobol4-0.99.44.tar.gz
-_md5_=48723907a85342c5cfc915b016ff469c
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.10 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.10
deleted file mode 100644
index b88ff1a80f7c..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.7.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=5
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fbdf794e60eb8b66575e6fef8fb03453
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.11 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.11
deleted file mode 100644
index ce89696551f9..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.7.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=5
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.11.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fbdf794e60eb8b66575e6fef8fb03453
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.12 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.12
deleted file mode 100644
index 0144a376a804..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.7.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=5
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fbdf794e60eb8b66575e6fef8fb03453
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.14 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.14
new file mode 100644
index 000000000000..d6aa76467ae5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.7.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=6
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.14.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=33f50845f75787c5eae51437002e1951
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.6 b/metadata/md5-cache/dev-lang/tcl-8.6.6
index 7b9db81f188b..91280d3d9d56 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.6
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=Tool Command Language
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +threads 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.6-src.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e196d4096b1f101b73c325c2d1eec90e
+_md5_=26b2c0123307ee158adbf078b0a9b2b7
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c9783f517640..420f7042521d 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/boehm-gc-6.8 b/metadata/md5-cache/dev-libs/boehm-gc-6.8
deleted file mode 100644
index 4aa7d242dc6b..000000000000
--- a/metadata/md5-cache/dev-libs/boehm-gc-6.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
-EAPI=0
-HOMEPAGE=http://www.hboehm.info/gc/
-IUSE=cxx threads
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=boehm-gc
-SLOT=0
-SRC_URI=http://www.hboehm.info/gc/gc_source/gc6.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=665f2e4ebd1f0ab8d13077a1e8c922e6
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.1-r1 b/metadata/md5-cache/dev-libs/boehm-gc-7.1-r1
deleted file mode 100644
index dfa44e870860..000000000000
--- a/metadata/md5-cache/dev-libs/boehm-gc-7.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
-EAPI=0
-HOMEPAGE=http://www.hboehm.info/gc/
-IUSE=cxx threads
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=boehm-gc
-SLOT=0
-SRC_URI=http://www.hboehm.info/gc/gc_source/gc-7.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5ae676870d88a8127414d2912050cd95
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.6.4 b/metadata/md5-cache/dev-libs/boehm-gc-7.6.4
index 45b9b166beba..3b584d077107 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-7.6.4
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.6.4
@@ -4,9 +4,9 @@ DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=6
 HOMEPAGE=http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/
 IUSE=cxx static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=boehm-gc
 SLOT=0
 SRC_URI=https://github.com/ivmai/bdwgc/releases/download/v7.6.4/gc-7.6.4.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d5a97e9f1108a19bb1dd37b1039f7af0
+_md5_=4b9a453ebcd86091d882f6bcb98e0741
diff --git a/metadata/md5-cache/dev-libs/ell-0.5 b/metadata/md5-cache/dev-libs/ell-0.5
new file mode 100644
index 000000000000..af9a163add34
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ell-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=glib? ( dev-libs/glib:2 )
+DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
+EAPI=7
+HOMEPAGE=https://01.org/ell
+IUSE=glib pie 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 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=glib? ( dev-libs/glib:2 )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.5.tar.xz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b7ed708c9e58b0c59f9c046ee5fa515e
diff --git a/metadata/md5-cache/dev-libs/hiredis-0.13.3 b/metadata/md5-cache/dev-libs/hiredis-0.13.3
index 162fd11f2fa6..e2df3d2c11f3 100644
--- a/metadata/md5-cache/dev-libs/hiredis-0.13.3
+++ b/metadata/md5-cache/dev-libs/hiredis-0.13.3
@@ -4,9 +4,9 @@ DESCRIPTION=Minimalistic C client library for the Redis database
 EAPI=6
 HOMEPAGE=https://github.com/redis/hiredis
 IUSE=examples static-libs test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~x64-solaris
 LICENSE=BSD
 SLOT=0/0.13
 SRC_URI=https://github.com/redis/hiredis/archive/v0.13.3.tar.gz -> hiredis-0.13.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d8a86c6336614aeeb45f4bf4d271bd0d
+_md5_=984be699e4854895812a55f55130b461
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.8.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
index e3f97922efc0..2fdb38c365d2 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=6
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz -> jsoncpp-1.8.4.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fefe5ea74a8bfcf834d003bef6501de6
+_md5_=9ff4bdc0feea1b64b7cb8ed8fa3528ea
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.1 b/metadata/md5-cache/dev-libs/libassuan-2.5.1
index c3c09b524c67..02ed79fae63f 100644
--- a/metadata/md5-cache/dev-libs/libassuan-2.5.1
+++ b/metadata/md5-cache/dev-libs/libassuan-2.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=IPC library used by GnuPG and GPGME
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/related_software/libassuan/index.en.html
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.1.tar.bz2
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6c23e1fe6bc99d98ded2950deb940c5d
+_md5_=b036aac9079d8c3cf060ccf7f660ec7c
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-1.1 b/metadata/md5-cache/dev-libs/libatomic_ops-1.1
deleted file mode 100644
index 93e4ff20860f..000000000000
--- a/metadata/md5-cache/dev-libs/libatomic_ops-1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Implementation for atomic memory update operations
-EAPI=0
-HOMEPAGE=http://www.hpl.hp.com/research/linux/atomic_ops/
-KEYWORDS=~amd64 -x86 -x86-fbsd
-LICENSE=MIT boehm-gc GPL-2+
-SLOT=0
-SRC_URI=http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.1.tar.gz
-_md5_=0c0f944607ac1d37461fd7f1dadffcdc
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-1.2 b/metadata/md5-cache/dev-libs/libatomic_ops-1.2
deleted file mode 100644
index d2417798465e..000000000000
--- a/metadata/md5-cache/dev-libs/libatomic_ops-1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Implementation for atomic memory update operations
-EAPI=0
-HOMEPAGE=http://www.hpl.hp.com/research/linux/atomic_ops/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=MIT boehm-gc GPL-2+
-SLOT=0
-SRC_URI=http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2343e9674004e5dfba4e063edd07b8d4
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-1.2-r1 b/metadata/md5-cache/dev-libs/libatomic_ops-1.2-r1
deleted file mode 100644
index 96991957a7bc..000000000000
--- a/metadata/md5-cache/dev-libs/libatomic_ops-1.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Implementation for atomic memory update operations
-EAPI=0
-HOMEPAGE=http://www.hpl.hp.com/research/linux/atomic_ops/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT boehm-gc GPL-2+
-SLOT=0
-SRC_URI=http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e17301c199b603ca97f4299c1c71686
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.4 b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.4
index dbbd8faa919c..c078ae3cbd53 100644
--- a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.4
+++ b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.4
@@ -3,9 +3,9 @@ DESCRIPTION=Implementation for atomic memory update operations
 EAPI=6
 HOMEPAGE=https://github.com/ivmai/libatomic_ops/
 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=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~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
+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 boehm-gc GPL-2+
 SLOT=0
 SRC_URI=https://github.com/ivmai/libatomic_ops/releases/download/v7.6.4/libatomic_ops-7.6.4.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=047e9640091711a0b4bdcff25a29d229
+_md5_=41b880ac81982afd904ea470b316e873
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20180319 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20180319
index 491520ae2d90..3e63d163abd3 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20180319
+++ b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20180319
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure prepare setup unpack
-DEPEND=|| ( sys-devel/clang:6 sys-devel/clang:5 sys-devel/clang:4 >=sys-devel/clang-3.9:0 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=|| ( sys-devel/clang:7 sys-devel/clang:6 sys-devel/clang:5 sys-devel/clang:4 >=sys-devel/clang-3.9:0 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 )
 DESCRIPTION=OpenCL C library
 EAPI=6
 HOMEPAGE=http://libclc.llvm.org/
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( MIT BSD )
-RDEPEND=|| ( sys-devel/clang:6 sys-devel/clang:5 sys-devel/clang:4 >=sys-devel/clang-3.9:0 )
+RDEPEND=|| ( sys-devel/clang:7 sys-devel/clang:6 sys-devel/clang:5 sys-devel/clang:4 >=sys-devel/clang-3.9:0 )
 SLOT=0
 SRC_URI=https://github.com/llvm-mirror/libclc/archive/96d10f2e9ec4c87d6b8d91e01d4d061915413f3e.tar.gz -> libclc-0.2.0_pre20180319.tar.gz
 _eclasses_=llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=3957da0b7e013d35b0e001b714232f67
+_md5_=2b2ecc5316bd6ca4962963d1dce5f57c
diff --git a/metadata/md5-cache/dev-libs/libdshconfig-0.20.12 b/metadata/md5-cache/dev-libs/libdshconfig-0.20.12
deleted file mode 100644
index 51e4a57618c0..000000000000
--- a/metadata/md5-cache/dev-libs/libdshconfig-0.20.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Library for parsing dsh.style configuration files
-EAPI=0
-HOMEPAGE=http://www.netfort.gr.jp/~dancer/software/downloads/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~m68k-mint
-LICENSE=GPL-2
-RDEPEND=virtual/ssh
-SLOT=0
-SRC_URI=http://www.netfort.gr.jp/~dancer/software/downloads/libdshconfig-0.20.12.tar.gz
-_md5_=23e891048b049d98464ff6b148756d26
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.6.5 b/metadata/md5-cache/dev-libs/libdynd-0.6.5
deleted file mode 100644
index 418ed7af4246..000000000000
--- a/metadata/md5-cache/dev-libs/libdynd-0.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/c-blosc:0= cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ dynamic multi-dimensionnal array library with Python exposure
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/libdynd
-IUSE=cuda doc fftw test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-libs/c-blosc:0= cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 )
-SLOT=0/0.6.5
-SRC_URI=https://github.com/ContinuumIO/libdynd/archive/v0.6.5.tar.gz -> libdynd-0.6.5.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d8f29e99132e6b483ab133cfa740cdf
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.6.6 b/metadata/md5-cache/dev-libs/libdynd-0.6.6
deleted file mode 100644
index d1f19e68c678..000000000000
--- a/metadata/md5-cache/dev-libs/libdynd-0.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/c-blosc:0= cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ dynamic multi-dimensionnal array library with Python exposure
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/libdynd
-IUSE=cuda doc fftw test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-libs/c-blosc:0= cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 )
-SLOT=0/0.6.6
-SRC_URI=https://github.com/ContinuumIO/libdynd/archive/v0.6.6.tar.gz -> libdynd-0.6.6.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4d9084a1ea63e35df08c4b396c51e2e
diff --git a/metadata/md5-cache/dev-libs/libgaminggear-0.13.0 b/metadata/md5-cache/dev-libs/libgaminggear-0.13.0
deleted file mode 100644
index 85691bd61a6f..000000000000
--- a/metadata/md5-cache/dev-libs/libgaminggear-0.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Provides functionality for gaming input devices
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/libgaminggear/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib
-SLOT=0
-SRC_URI=mirror://sourceforge/libgaminggear/libgaminggear-0.13.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8fcb83ec0be10a6a7db6a082aa3d6d6f
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.4 b/metadata/md5-cache/dev-libs/libgit2-0.26.4
new file mode 100644
index 000000000000..f9b98b0e9274
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.26.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A linkable library for Git
+EAPI=6
+HOMEPAGE=https://libgit2.github.com/
+IUSE=+curl examples gssapi libressl +ssh test +threads trace
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+SLOT=0/26
+SRC_URI=https://github.com/libgit2/libgit2/archive/v0.26.4.tar.gz -> libgit2-0.26.4.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8aa58509baeda2937e238362846318d4
diff --git a/metadata/md5-cache/dev-libs/libinput-1.11.0 b/metadata/md5-cache/dev-libs/libinput-1.11.0
new file mode 100644
index 000000000000..a119d212ccff
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev virtual/pkgconfig doc? ( >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
+IUSE=doc input_devices_wacom test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.11.0.tar.xz
+_eclasses_=meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=e30d3b13a58a029a72a80a477f79f658
diff --git a/metadata/md5-cache/dev-libs/libksba-1.3.5-r1 b/metadata/md5-cache/dev-libs/libksba-1.3.5-r1
index 31d207323d9f..b907e314f02d 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.3.5-r1
+++ b/metadata/md5-cache/dev-libs/libksba-1.3.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/related_software/libksba
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.3.5.tar.bz2
 _eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=677730c824b584debc97afaaaddc0bd0
+_md5_=157f125b616858c52ff389611dfe88b6
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1 b/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
index 740c2470dc51..f61f0913231e 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=library to smooth charset/localization issues
 EAPI=5
 HOMEPAGE=http://natspec.sourceforge.net/
 IUSE=doc python python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt 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(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1312694a28314971bc9045a382a80e30
+_md5_=af8639ad13c2dff05b17d02f7a41d3f7
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.30 b/metadata/md5-cache/dev-libs/libpcre2-10.30
index 7f4a08a47b8c..8a2c299ef929 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.30
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.30
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=6
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~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 ~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=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.30.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.30.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a07619605a73f26f132d430df42ecab
+_md5_=54551b5f035ebe499d446d94ce29f3db
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.4.2 b/metadata/md5-cache/dev-libs/libpipeline-1.4.2
index 35acffc05ed0..58a70e0c92b0 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.4.2
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.4.2
@@ -4,9 +4,9 @@ DESCRIPTION=a pipeline manipulation library
 EAPI=5
 HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.4.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d41795ecb99d1344e207e57a016c647b
+_md5_=a316c1e349c3a14c192444970f015b69
diff --git a/metadata/md5-cache/dev-libs/libressl-2.6.4 b/metadata/md5-cache/dev-libs/libressl-2.6.4
index 7d85deb4fe51..491c44ecd325 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.6.4
+++ b/metadata/md5-cache/dev-libs/libressl-2.6.4
@@ -4,7 +4,7 @@ DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
 EAPI=6
 HOMEPAGE=https://www.libressl.org/
 IUSE=+asm static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( static-libs )
 SLOT=0/44
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.4.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b849a56569c00973cbca0b5afa40132f
+_md5_=c8b09c6edaee0a577a03973fdcfa4f62
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1 b/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
index 1bdb08ffbe64..e9eeb5ff5a5b 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.12-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Library for handling page faults in user mode
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libsigsegv/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.12.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=386c76e209a324b41f3233d6383bdb17
+_md5_=936226eeed01ffc7a2e9c49aac74dc47
diff --git a/metadata/md5-cache/dev-libs/libuv-1.20.0 b/metadata/md5-cache/dev-libs/libuv-1.20.0
index ea37f8510d3c..c94595b555b2 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.20.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cross-platform asychronous I/O
 EAPI=6
 HOMEPAGE=https://github.com/libuv/libuv
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 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=BSD BSD-2 ISC MIT
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.20.0.tar.gz -> libuv-1.20.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bc35bd81baaeaf285ae829871709c3ce
+_md5_=16346ca778c215b684d99f65bdd9aa0c
diff --git a/metadata/md5-cache/dev-libs/libvolume_id-0.81.0 b/metadata/md5-cache/dev-libs/libvolume_id-0.81.0
deleted file mode 100644
index ec45d6b706ef..000000000000
--- a/metadata/md5-cache/dev-libs/libvolume_id-0.81.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Library to provide file system information
-EAPI=0
-HOMEPAGE=http://www.marcuscom.com
-IUSE=static
-KEYWORDS=~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.marcuscom.com/downloads/libvolume_id-0.81.0.tar.bz2
-_md5_=1c4ae5a78cccd471a33d5e797599b9d2
diff --git a/metadata/md5-cache/dev-libs/log4shib-1.0.1 b/metadata/md5-cache/dev-libs/log4shib-1.0.1
deleted file mode 100644
index 601af8ab26c9..000000000000
--- a/metadata/md5-cache/dev-libs/log4shib-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Internet2 version for OpenSAML of log4cpp logging framework
-EAPI=0
-HOMEPAGE=https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://shibboleth.internet2.edu/downloads/log4shib/1.0.1/log4shib-1.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b263c39132d802b41cb2982ad615d398
diff --git a/metadata/md5-cache/dev-libs/lzo-2.10 b/metadata/md5-cache/dev-libs/lzo-2.10
index bc4916f34894..4cda6fe9c61b 100644
--- a/metadata/md5-cache/dev-libs/lzo-2.10
+++ b/metadata/md5-cache/dev-libs/lzo-2.10
@@ -3,9 +3,9 @@ DESCRIPTION=An extremely fast compression and decompression library
 EAPI=6
 HOMEPAGE=http://www.oberhumer.com/opensource/lzo/
 IUSE=examples 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 ~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 ~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-2
 SLOT=2
 SRC_URI=http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=11459e485f945eb8c5b5b18a0c7b7b2e
+_md5_=73717098e84f2ea27aff410119d70dfd
diff --git a/metadata/md5-cache/dev-libs/npth-1.3 b/metadata/md5-cache/dev-libs/npth-1.3
index bf518c98bb25..d183b45770c5 100644
--- a/metadata/md5-cache/dev-libs/npth-1.3
+++ b/metadata/md5-cache/dev-libs/npth-1.3
@@ -4,9 +4,9 @@ DESCRIPTION=New GNU Portable Threads Library
 EAPI=6
 HOMEPAGE=https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.3.tar.bz2
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=723721f88cfb7158def026b9d152c055
+_md5_=53381c9bcfefcd2742a80ee98d5974e0
diff --git a/metadata/md5-cache/dev-libs/nss-3.37 b/metadata/md5-cache/dev-libs/nss-3.37
deleted file mode 100644
index 6df943f7238a..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.37
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.16[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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=6
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.16[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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_37_RTM/src/nss-3.37.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f5c6aa3e9215c71bba28d6d81f5f0ba
diff --git a/metadata/md5-cache/dev-libs/nss-3.37.1 b/metadata/md5-cache/dev-libs/nss-3.37.1
deleted file mode 100644
index e679bf7f3cdb..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.37.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.16[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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=6
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.16[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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_37_1_RTM/src/nss-3.37.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2bf8243d87196ee057eaf44b18681f79
diff --git a/metadata/md5-cache/dev-libs/nss-3.37.3 b/metadata/md5-cache/dev-libs/nss-3.37.3
new file mode 100644
index 000000000000..e9c0b13c1629
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.37.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.16[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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=6
+HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
+IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.16[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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_37_3_RTM/src/nss-3.37.3.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4f296ca8f3ab1f51a08ede60e43b3274
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.7.1 b/metadata/md5-cache/dev-libs/oniguruma-6.7.1
index dd04554b82f9..75c60c4d9d6a 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.7.1
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.7.1
@@ -3,9 +3,9 @@ DESCRIPTION=Regular expression library for different character encodings
 EAPI=6
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=combination-explosion-check crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+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 ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/4
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.7.1/onig-6.7.1.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dc6a7696b3436d96f348f44a936dce12
+_md5_=a8ebd5ffc7fc8c7b4829d72105198382
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2o b/metadata/md5-cache/dev-libs/openssl-1.0.2o
deleted file mode 100644
index 50be136fd5a7..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2o
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib 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 ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2o.tar.gz mirror://gentoo/openssl-1.0.2-patches-1.2.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e5fa8545ce17472a2b6e245eb8422b3
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2o-r1 b/metadata/md5-cache/dev-libs/openssl-1.0.2o-r1
deleted file mode 100644
index 763d8a8068c1..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2o-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib 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 ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2o.tar.gz mirror://gentoo/openssl-1.0.2-patches-1.3.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0865aed772a9487bc426dba5f33d63d5
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2o-r2 b/metadata/md5-cache/dev-libs/openssl-1.0.2o-r2
deleted file mode 100644
index 6fac57ca929d..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2o-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib 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 ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2o.tar.gz mirror://gentoo/openssl-1.0.2-patches-1.3.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.3.tar.xz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2o_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2o_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2o_ectest.c )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7b0f45d33c42672f2a325abc4bfab16
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2o-r3 b/metadata/md5-cache/dev-libs/openssl-1.0.2o-r3
new file mode 100644
index 000000000000..fb177d2746a7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2o-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=6
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib 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 ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=mirror://openssl/source/openssl-1.0.2o.tar.gz mirror://gentoo/openssl-1.0.2-patches-1.4.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.4.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=42f395f12d896de1fd1a2091d95ed209
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2o-r4 b/metadata/md5-cache/dev-libs/openssl-1.0.2o-r4
new file mode 100644
index 000000000000..a68017f74e80
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2o-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=6
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib 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 ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=mirror://openssl/source/openssl-1.0.2o.tar.gz mirror://gentoo/openssl-1.0.2-patches-1.4.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.4.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.4.tar.xz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2o_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2o_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2o_ectest.c )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a5f88e2b0ec48f4b385a19586f5e6403
diff --git a/metadata/md5-cache/dev-libs/pkcs11-helper-1.23 b/metadata/md5-cache/dev-libs/pkcs11-helper-1.23
new file mode 100644
index 000000000000..cfd8f5c2a3c8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pkcs11-helper-1.23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:= ) libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.4.7 )
+DESCRIPTION=PKCS#11 helper library
+EAPI=6
+HOMEPAGE=https://github.com/OpenSC/pkcs11-helper
+IUSE=doc gnutls libressl nss static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:= ) libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
+SLOT=0
+SRC_URI=https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.23/pkcs11-helper-1.23.tar.bz2
+_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=85d8ecaa01e076a4b35803c7299ef97d
diff --git a/metadata/md5-cache/dev-libs/re2-0.2018.04.01 b/metadata/md5-cache/dev-libs/re2-0.2018.04.01
new file mode 100644
index 000000000000..faeba2ffc4e2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/re2-0.2018.04.01
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=icu? ( dev-libs/icu: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(-)?] ) icu? ( virtual/pkgconfig )
+DESCRIPTION=An efficent, principled regular expression library
+EAPI=6
+HOMEPAGE=https://github.com/google/re2
+IUSE=icu 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 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=icu? ( dev-libs/icu: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/gentoo-2017-03-01
+SRC_URI=https://github.com/google/re2/archive/2018-04-01.tar.gz -> re2-2018-04-01.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d8afe437f889280360182fb4dc1020b0
diff --git a/metadata/md5-cache/dev-libs/sni-qt-0.2.6-r1 b/metadata/md5-cache/dev-libs/sni-qt-0.2.6-r1
deleted file mode 100644
index b377ff5097f8..000000000000
--- a/metadata/md5-cache/dev-libs/sni-qt-0.2.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libdbusmenu-qt[qt4,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-qt/qtcore-4.8.6: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-qt/qtdbus-4.8.6: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-qt/qtgui-4.8.6: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(-)?] test? ( >=dev-qt/qttest-4.8.6: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(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A Qt plugin which turns all QSystemTrayIcon into StatusNotifierItems
-EAPI=5
-HOMEPAGE=https://launchpad.net/sni-qt
-IUSE=test 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 ~arm x86
-LICENSE=LGPL-3
-RDEPEND=dev-libs/libdbusmenu-qt[qt4,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-qt/qtcore-4.8.6: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-qt/qtdbus-4.8.6: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-qt/qtgui-4.8.6: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=0
-SRC_URI=https://launchpad.net/sni-qt/trunk/0.2.6/+download/sni-qt-0.2.6.tar.bz2
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0754c7a48e8a3a0ab5f4db24c4307d9
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2
index 652997f107b9..97fa9544d09e 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Simple and small C++ XML parser
 EAPI=4
 HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
 IUSE=debug doc static-libs +stl
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a46c27dd53e6fbf190dbad368c0da665
+_md5_=94b863a6742aa1c236584c0a11ed4cd2
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
index a79032d6cc37..676e65b82240 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
@@ -4,9 +4,9 @@ DESCRIPTION=Simple and small C++ XML parser
 EAPI=6
 HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
 IUSE=debug doc static-libs +stl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bad9691d69a0eda92638b49564104dcc
+_md5_=ac8d8b096326b18956c1aa880c8eeeed
diff --git a/metadata/md5-cache/dev-libs/wayland-1.15.0 b/metadata/md5-cache/dev-libs/wayland-1.15.0
new file mode 100644
index 000000000000..57c25f292c96
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/wayland-1.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !<media-libs/mesa-18.1.1-r1 doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 sys-apps/grep[pcre] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Wayland protocol libraries
+EAPI=6
+HOMEPAGE=https://wayland.freedesktop.org/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !<media-libs/mesa-18.1.1-r1
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.15.0.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=680ff42259d9ac5b0f0215248db867e0
diff --git a/metadata/md5-cache/dev-libs/wayland-9999 b/metadata/md5-cache/dev-libs/wayland-9999
index 395dde9960a7..c829860f6391 100644
--- a/metadata/md5-cache/dev-libs/wayland-9999
+++ b/metadata/md5-cache/dev-libs/wayland-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 sys-apps/grep[pcre] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !!<media-libs/mesa-18.1.1-r1 doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 sys-apps/grep[pcre] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Wayland protocol libraries
 EAPI=6
 HOMEPAGE=https://wayland.freedesktop.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:=
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:= !!<media-libs/mesa-18.1.1-r1
 SLOT=0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=829cea3a2f5c2072a5702ce1016da26b
+_md5_=393dbe28d6087733959bab80b31531b9
diff --git a/metadata/md5-cache/dev-libs/weston-1.11.0 b/metadata/md5-cache/dev-libs/weston-1.11.0
deleted file mode 100644
index 200d11aa4d78..000000000000
--- a/metadata/md5-cache/dev-libs/weston-1.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.2 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.30 x11-libs/libxkbcommon x11-libs/pixman x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( sys-apps/dbus ) drm? ( media-libs/mesa[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 <net-misc/freerdp-2.0.0_pre20161219 ) rpi? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) systemd? ( sys-auth/pambase[systemd] sys-apps/systemd[pam] ) launch? ( sys-auth/pambase ) unwind? ( sys-libs/libunwind ) X? ( x11-libs/libxcb x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] x11-libs/libxcb x11-libs/libXcursor ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Wayland reference compositor
-EAPI=5
-HOMEPAGE=https://wayland.freedesktop.org/
-IUSE=colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland test
-KEYWORDS=amd64 arm x86 ~arm-linux
-LICENSE=MIT CC-BY-SA-3.0
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.2 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.30 x11-libs/libxkbcommon x11-libs/pixman x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( sys-apps/dbus ) drm? ( media-libs/mesa[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 <net-misc/freerdp-2.0.0_pre20161219 ) rpi? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) systemd? ( sys-auth/pambase[systemd] sys-apps/systemd[pam] ) launch? ( sys-auth/pambase ) unwind? ( sys-libs/libunwind ) X? ( x11-libs/libxcb x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] x11-libs/libxcb x11-libs/libXcursor )
-REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) systemd? ( dbus ) test? ( X ) wayland-compositor? ( gles2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/weston-1.11.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5eef1f78cb84994047322ca691ec341a
diff --git a/metadata/md5-cache/dev-libs/weston-1.9.0 b/metadata/md5-cache/dev-libs/weston-1.9.0
deleted file mode 100644
index 13ce015e5d2c..000000000000
--- a/metadata/md5-cache/dev-libs/weston-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.9.0 media-libs/lcms:2 media-libs/libpng:0= media-libs/libwebp:0= virtual/jpeg:0= >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.30 x11-libs/libxkbcommon x11-libs/pixman x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( sys-apps/dbus ) drm? ( media-libs/mesa[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) rpi? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) systemd? ( sys-auth/pambase[systemd] sys-apps/systemd[pam] ) launch? ( sys-auth/pambase ) unwind? ( sys-libs/libunwind ) X? ( x11-libs/libxcb x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] x11-libs/libxcb x11-libs/libXcursor ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Wayland reference compositor
-EAPI=5
-HOMEPAGE=https://wayland.freedesktop.org/
-IUSE=colord dbus +drm editor examples fbdev +gles2 headless ivi rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland test
-KEYWORDS=amd64 arm x86 ~arm-linux
-LICENSE=MIT CC-BY-SA-3.0
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.9.0 media-libs/lcms:2 media-libs/libpng:0= media-libs/libwebp:0= virtual/jpeg:0= >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.30 x11-libs/libxkbcommon x11-libs/pixman x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( sys-apps/dbus ) drm? ( media-libs/mesa[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) rpi? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) systemd? ( sys-auth/pambase[systemd] sys-apps/systemd[pam] ) launch? ( sys-auth/pambase ) unwind? ( sys-libs/libunwind ) X? ( x11-libs/libxcb x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] x11-libs/libxcb x11-libs/libXcursor )
-REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) test? ( X ) wayland-compositor? ( gles2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/weston-1.9.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=87ae573b28b1540924b6027f491e2589
diff --git a/metadata/md5-cache/dev-libs/weston-3.0.0 b/metadata/md5-cache/dev-libs/weston-3.0.0
index 600f0c89a77b..381aeb1831a9 100644
--- a/metadata/md5-cache/dev-libs/weston-3.0.0
+++ b/metadata/md5-cache/dev-libs/weston-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.12.0 >=dev-libs/wayland-p
 REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) systemd? ( dbus ) test? ( headless xwayland ) wayland-compositor? ( gles2 )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-3.0.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=b883b8c0c0e7d9177e994dcf6eef592a
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index d8b39b8646fe..3047efdb2fee 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -8,5 +8,5 @@ LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.12.0 >=dev-libs/wayland-protocols-1.8 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.30 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( >=sys-apps/dbus-1.6 ) drm? ( media-libs/mesa[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) unwind? ( sys-libs/libunwind ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) systemd? ( dbus ) test? ( headless xwayland ) wayland-compositor? ( gles2 )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=694a20936d75e4a9eefbdeb6ab9752b6
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 5cd21664779d..ede132f2107c 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/flexi-streams-1.0.17 b/metadata/md5-cache/dev-lisp/flexi-streams-1.0.17
new file mode 100644
index 000000000000..dd4321a39a14
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/flexi-streams-1.0.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Flexible bivalent streams for Common Lisp
+EAPI=6
+HOMEPAGE=http://weitz.de/flexi-streams/ http://www.cliki.net/flexi-streams/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=BSD-2
+PDEPEND=virtual/commonlisp
+RDEPEND=!dev-lisp/cl-flexi-streams >=dev-lisp/trivial-gray-streams-20060925
+SLOT=0
+SRC_URI=https://github.com/edicl/flexi-streams/archive/v1.0.17.tar.gz -> flexi-streams-1.0.17.tar.gz
+_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d7a32ca4f7594b9d0e81fa3c9d599298
diff --git a/metadata/md5-cache/dev-perl/Ace-1.920.0-r1 b/metadata/md5-cache/dev-perl/Ace-1.920.0-r1
deleted file mode 100644
index 9acdad95a775..000000000000
--- a/metadata/md5-cache/dev-perl/Ace-1.920.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Digest-MD5 dev-perl/Cache-Cache dev-lang/perl:=[-build(-)]
-DESCRIPTION=Object-Oriented Access to ACEDB Databases
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/AcePerl/
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-MD5 dev-perl/Cache-Cache dev-lang/perl:=[-build(-)]
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LD/LDS/AcePerl-1.92.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6442833ff9160eb6ada8b68de448efdc
diff --git a/metadata/md5-cache/dev-perl/Ace-1.920.0-r2 b/metadata/md5-cache/dev-perl/Ace-1.920.0-r2
deleted file mode 100644
index ad15f1ef90b2..000000000000
--- a/metadata/md5-cache/dev-perl/Ace-1.920.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Digest-MD5 dev-perl/Cache-Cache dev-perl/GD dev-lang/perl:=
-DESCRIPTION=Object-Oriented Access to ACEDB Databases
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/AcePerl/
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-MD5 dev-perl/Cache-Cache dev-perl/GD dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LD/LDS/AcePerl-1.92.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f643ebca5869fa356b5ff306ab60a0f5
diff --git a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.670.0-r1 b/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.670.0-r1
deleted file mode 100644
index 940e591bb264..000000000000
--- a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.670.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X] >=dev-perl/Module-Pluggable-2.600.0 >=virtual/perl-ExtUtils-CBuilder-0.24 >=virtual/perl-File-Spec-1.500.0 >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Building, finding and using wxWidgets binaries
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Alien-wxWidgets/
-IUSE=gstreamer opengl test
-KEYWORDS=amd64 ~ia64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X] >=dev-perl/Module-Pluggable-2.600.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.67.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=08247a7c0edb88c5419471542b0faa80
diff --git a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.680.0 b/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.680.0
deleted file mode 100644
index b52ab4517498..000000000000
--- a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.680.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X] >=dev-perl/Module-Pluggable-2.600.0 >=virtual/perl-ExtUtils-CBuilder-0.24 >=virtual/perl-File-Spec-1.500.0 >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Building, finding and using wxWidgets binaries
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Alien-wxWidgets/
-IUSE=gstreamer opengl test
-KEYWORDS=~amd64 ~ia64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X] >=dev-perl/Module-Pluggable-2.600.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.68.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=9a41e65f4ee4d95bf25846c0d7ea61e4
diff --git a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0 b/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0
deleted file mode 100644
index 9a10257e77a4..000000000000
--- a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X] >=dev-perl/Module-Pluggable-2.600.0 >=virtual/perl-ExtUtils-CBuilder-0.24 >=virtual/perl-File-Spec-1.500.0 >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Building, finding and using wxWidgets binaries
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Alien-wxWidgets/
-IUSE=gstreamer opengl test
-KEYWORDS=~amd64 ~ia64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X] >=dev-perl/Module-Pluggable-2.600.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=49c4271fd1a3abd01c1771295776dce2
diff --git a/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400 b/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
index af506f64dd45..0d56267e636c 100644
--- a/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
+++ b/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
@@ -4,10 +4,10 @@ DESCRIPTION=Get, unpack, build and install modules from CPAN
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/App-cpanminus/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5e327bc520dcd2ce2758183d3634d68a
+_md5_=bde930e2715d3503c299e9b38e116a67
diff --git a/metadata/md5-cache/dev-perl/Array-Compare-3.0.1 b/metadata/md5-cache/dev-perl/Array-Compare-3.0.1
index 55be876f80d4..bfd57574c548 100644
--- a/metadata/md5-cache/dev-perl/Array-Compare-3.0.1
+++ b/metadata/md5-cache/dev-perl/Array-Compare-3.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for comparing arrays
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Array-Compare/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/Type-Tiny dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=462a750842929bb652879922ec373973
+_md5_=ac4663e6b6cae54eb88a82e5733d67d6
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0 b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
index 819441abb9ba..24f113a27f48 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=Execute code after a scope finished compilation
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/B-Hooks-EndOfScope/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Module-Implementation-0.50.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=bc27bb6a725e27552a9716c448248d37
+_md5_=9aa5539e4d89450f01490a504518c0ac
diff --git a/metadata/md5-cache/dev-perl/B-Keywords-1.180.0 b/metadata/md5-cache/dev-perl/B-Keywords-1.180.0
index e660b74f6d52..5b2cb41eea1b 100644
--- a/metadata/md5-cache/dev-perl/B-Keywords-1.180.0
+++ b/metadata/md5-cache/dev-perl/B-Keywords-1.180.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Lists of reserved barewords and symbol names
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/B-Keywords/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=83e9ca223439e6e27f441863e9d1e787
+_md5_=0bc98f9da0e8b332a08a477ef4b15f31
diff --git a/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0 b/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
index e5e2037bf92f..c21166afdf25 100644
--- a/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
+++ b/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=CGI Interface for Fast CGI
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/CGI-Fast/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-if dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=87c24baf114335a56f561cfcf5864182
+_md5_=2ad1cdddd220ac3c580ebb8a61b58c68
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1 b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
index 7b7bba83e7fe..19ae27e22fe8 100644
--- a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
+++ b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d970446bd138ff59c85b3cb631b5bd4a
+_md5_=48c1c57a99ec0d807985438757c22173
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2 b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
new file mode 100644
index 000000000000..fdb82fd3c848
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 >=dev-perl/Module-Build-0.380.0 test? ( virtual/perl-Test-Simple dev-perl/CGI-Simple ) dev-lang/perl:=
+DESCRIPTION=persistent session data in CGI applications
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/CGI-Session/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=dede70f82c368a541a351bd25d4cbf9e
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.560.0 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.560.0
index 93e1ee677087..f16ce7b0a14d 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.560.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.560.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Perl-Releases/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-3.56.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=17f302925c56a02540ed5eaa44d01ab8
+_md5_=878cee8e3687804024894e09586a75b7
diff --git a/metadata/md5-cache/dev-perl/CSS-Packer-2.30.0 b/metadata/md5-cache/dev-perl/CSS-Packer-2.30.0
deleted file mode 100644
index 61d45824edb0..000000000000
--- a/metadata/md5-cache/dev-perl/CSS-Packer-2.30.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Regexp-RegGrp-1.1.1_rc virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Another CSS minifier
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/CSS-Packer/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Regexp-RegGrp-1.1.1_rc dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CSS-Packer-2.03.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=d64cf2cde336aac29b54cb79c6e23597
diff --git a/metadata/md5-cache/dev-perl/Cache-FastMmap-1.460.0 b/metadata/md5-cache/dev-perl/Cache-FastMmap-1.460.0
deleted file mode 100644
index 2836fb59f77d..000000000000
--- a/metadata/md5-cache/dev-perl/Cache-FastMmap-1.460.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
-DESCRIPTION=Uses an mmaped file to act as a shared memory interprocess cache
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Cache-FastMmap/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Storable dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.46.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a394b8f556d2106c1b02314c44423f4d
diff --git a/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0 b/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
index e1b8c4860dd7..04bb6930f209 100644
--- a/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
+++ b/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension to create simple calendars
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Calendar-Simple/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-aix
+KEYWORDS=amd64 ~hppa ~ppc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Time-Local dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Calendar-Simple-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2dfd0b3d0d11e0487955285652f57821
+_md5_=ed8501e5b73329e520bcdd74af41e261
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r1 b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r1
index 32c91aa1fa69..da47d58bc3a6 100644
--- a/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r1
+++ b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f18be3dd14aa782b131377b0c0c4ee8
+_md5_=5606ae8978e61e8eb747b8fad592ccc5
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2 b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2
new file mode 100644
index 000000000000..ad594466e37e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Inheritable, overridable class and instance data accessor creation
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Class-Data-Accessor/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=b080f6599ceaa4790a610fe9097e1e64
diff --git a/metadata/md5-cache/dev-perl/Class-Mix-0.6.0 b/metadata/md5-cache/dev-perl/Class-Mix-0.6.0
index 0627964eaaac..418bd4b544cf 100644
--- a/metadata/md5-cache/dev-perl/Class-Mix-0.6.0
+++ b/metadata/md5-cache/dev-perl/Class-Mix-0.6.0
@@ -10,4 +10,4 @@ RDEPEND=virtual/perl-Carp dev-perl/Params-Classify virtual/perl-Exporter virtual
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2f99784dfa0d6c8286b76cf8f7a5d165
+_md5_=90168774158afca4449a6e356d6a751c
diff --git a/metadata/md5-cache/dev-perl/Class-Virtual-0.60.0-r1 b/metadata/md5-cache/dev-perl/Class-Virtual-0.60.0-r1
deleted file mode 100644
index e3bf41418d8f..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Virtual-0.60.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Data-Inheritable dev-perl/Carp-Assert dev-perl/Class-ISA dev-lang/perl:=[-build(-)]
-DESCRIPTION=Base class for virtual base classes
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Class-Virtual/
-KEYWORDS=amd64 ia64 ~ppc sparc x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Data-Inheritable dev-perl/Carp-Assert dev-perl/Class-ISA dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.06.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6187edee22258df7532099dcc8368d55
diff --git a/metadata/md5-cache/dev-perl/Class-Virtual-0.70.0 b/metadata/md5-cache/dev-perl/Class-Virtual-0.70.0
deleted file mode 100644
index 396ab1b946cb..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Virtual-0.70.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Carp-Assert-0.100.0 >=dev-perl/Class-ISA-0.31 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Base class for virtual base classes
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Class-Virtual/
-IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Carp-Assert-0.100.0 >=dev-perl/Class-ISA-0.31 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.07.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=dc3b5194d95f2f96384427bdb980535c
diff --git a/metadata/md5-cache/dev-perl/Config-Any-0.290.0 b/metadata/md5-cache/dev-perl/Config-Any-0.290.0
deleted file mode 100644
index eb458c2775c5..000000000000
--- a/metadata/md5-cache/dev-perl/Config-Any-0.290.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Pluggable-3.600.0 !minimal? ( >=dev-perl/Config-General-2.470.0 ) minimal? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) json? ( || ( dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Load configuration from different file formats, transparently
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Config-Any/
-IUSE=test minimal +json
-KEYWORDS=amd64 arm ppc x86 ~ppc-aix
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Module-Pluggable-3.600.0 !minimal? ( >=dev-perl/Config-General-2.470.0 ) minimal? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) json? ( || ( dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.29.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=fcbab6b5e24c476620a6970543b70332
diff --git a/metadata/md5-cache/dev-perl/Config-Any-0.300.0 b/metadata/md5-cache/dev-perl/Config-Any-0.300.0
deleted file mode 100644
index f5388d6aba47..000000000000
--- a/metadata/md5-cache/dev-perl/Config-Any-0.300.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Pluggable-3.600.0 !minimal? ( >=dev-perl/Config-General-2.470.0 ) minimal? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) json? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Load configuration from different file formats, transparently
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Config-Any/
-IUSE=test minimal +json
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Module-Pluggable-3.600.0 !minimal? ( >=dev-perl/Config-General-2.470.0 ) minimal? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) json? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.30.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=54f37abe4bbe2fa4dc4e8a0cad59c9c6
diff --git a/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r1 b/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r1
deleted file mode 100644
index a12aef3f1b6c..000000000000
--- a/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Read directives from a configuration file
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/ConfigReader/
-KEYWORDS=amd64 ia64 ~ppc sparc x86
-LICENSE=LGPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AM/AMW/ConfigReader-0.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=394867965458bb4f88c691c1b99c8e6e
diff --git a/metadata/md5-cache/dev-perl/Convert-BinHex-1.124.0 b/metadata/md5-cache/dev-perl/Convert-BinHex-1.124.0
deleted file mode 100644
index 86fd542995b7..000000000000
--- a/metadata/md5-cache/dev-perl/Convert-BinHex-1.124.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurp virtual/perl-File-Temp virtual/perl-autodie virtual/perl-Test-Simple dev-perl/Test-Most ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Extract data from Macintosh BinHex files
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Convert-BinHex/
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/ST/STEPHEN/Convert-BinHex-1.124.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16fa918c30478ad83c6bd02b696ca1d9
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.300 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.300
deleted file mode 100644
index 6b672d5bdc33..000000000000
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.300
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker >=virtual/perl-podlators-2.80.0 dev-lang/perl:=
-DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Cpanel-JSON-XS/
-IUSE=test examples
-KEYWORDS=amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-3.0233.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=b1242f96fc64533d88c4a0fd098c41ab
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
index b4a983eb08dc..7234e6d8a7c9 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
@@ -4,10 +4,10 @@ DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Cpanel-JSON-XS/
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-3.0239.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=dde7eb9b774f1ed6a5372b8937760e07
+_md5_=d8d3b810917e490967bb8d3070010310
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0 b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0
deleted file mode 100644
index ac7a8925d1e2..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Crypt::DES module for perl
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Crypt-DES/
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=DES
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93beeb118b9722deb3eb09e0b347bc4e
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0
index 9ce2362b4f36..38b7caf2416b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=OpenSSL's multiprecision integer arithmetic
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-OpenSSL-Bignum/
 IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=68949e8b4ddb63e4695b8a413008c7b7
+_md5_=37466b55b466e781e451eee07a4f08d9
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.40.0-r2 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.40.0-r2
deleted file mode 100644
index 61a7b0a58c9e..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.40.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Crypt::OpenSSL::Random module for perl
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Crypt-OpenSSL-Random/
-IUSE=libressl
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-0.04.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52f709aee32af8c5fce8c6d5c2b0d906
diff --git a/metadata/md5-cache/dev-perl/Curses-1.360.0 b/metadata/md5-cache/dev-perl/Curses-1.360.0
index 99c8893f1cc4..1fbeb979e7c4 100644
--- a/metadata/md5-cache/dev-perl/Curses-1.360.0
+++ b/metadata/md5-cache/dev-perl/Curses-1.360.0
@@ -4,10 +4,10 @@ DESCRIPTION=Curses interface modules for Perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Curses/
 IUSE=+unicode test examples
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/ncurses-5:0=[unicode?] virtual/perl-Data-Dumper dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=6f5a0db96bd4b972206e8c662da72e98
+_md5_=8752363feeca7be6e6560263852de3c4
diff --git a/metadata/md5-cache/dev-perl/CursesWidgets-1.997.0-r2 b/metadata/md5-cache/dev-perl/CursesWidgets-1.997.0-r2
index e25be94d27d0..f02ffeaf229f 100644
--- a/metadata/md5-cache/dev-perl/CursesWidgets-1.997.0-r2
+++ b/metadata/md5-cache/dev-perl/CursesWidgets-1.997.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Provide high level APIs for rapid user interface design on the conso
 EAPI=6
 HOMEPAGE=http://www.digitalmages.com/perl/CursesWidgets/index.html http://search.cpan.org/dist/CursesWidgets/
 IUSE=examples
-KEYWORDS=~amd64 ~ia64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=amd64 ia64 ~ppc ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5 >=dev-perl/Curses-1.60.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORLISS/CursesWidgets-1.997.tar.gz http://www.digitalmages.com/perl/CursesWidgets/downloads/CursesWidgets-1.997.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=24e6d9ec951d05594d890d63f03537fd
+_md5_=f239ebb4157c28462eeb73dbc9c28be9
diff --git a/metadata/md5-cache/dev-perl/DBD-Pg-3.7.0 b/metadata/md5-cache/dev-perl/DBD-Pg-3.7.0
index 4a8042363519..875ef200cc63 100644
--- a/metadata/md5-cache/dev-perl/DBD-Pg-3.7.0
+++ b/metadata/md5-cache/dev-perl/DBD-Pg-3.7.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* virtual/p
 DESCRIPTION=PostgreSQL database driver for the DBI module
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBD-Pg/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.7.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=73df21a130d66fc233141a518e45ce88
+_md5_=c6d9b700d2eb5e630863febb5e7fe1a7
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0
new file mode 100644
index 000000000000..00ad547b1b31
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=system-sqlite? ( >=dev-db/sqlite-3.21.0[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils >=virtual/perl-ExtUtils-MakeMaker-6.480.0 test? ( >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-Test-Simple-0.420.0 ) dev-lang/perl:=
+DESCRIPTION=Self Contained RDBMS in a DBI Driver
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/DBD-SQLite/
+IUSE=test system-sqlite
+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 ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.21.0[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=fba088bc22e2452f4c19ecae8eabff38
diff --git a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.670.0 b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.670.0
index cc4eedac9608..832b8924e86e 100644
--- a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.670.0
+++ b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.670.0
@@ -4,10 +4,10 @@ DESCRIPTION=Encapsulate SQL queries and rows in simple Perl objects
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBIx-SearchBuilder/
 IUSE=test examples
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Cache-Simple-TimedExpiry-0.210.0 >=dev-perl/capitalization-0.30.0 >=dev-perl/Class-ReturnValue-0.400.0 dev-perl/Class-Accessor dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=virtual/perl-Encode-1.990.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=00e4561c1dd978e6b95cfcd3c0eb061f
+_md5_=f212e629b41f09a1d32c29bfee1b1a22
diff --git a/metadata/md5-cache/dev-perl/Daemon-Generic-0.840.0 b/metadata/md5-cache/dev-perl/Daemon-Generic-0.840.0
deleted file mode 100644
index 64f480e77ec0..000000000000
--- a/metadata/md5-cache/dev-perl/Daemon-Generic-0.840.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/File-Flock dev-perl/File-Slurp dev-perl/AnyEvent test? ( dev-perl/Eval-LineNumbers ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Framework to provide start/stop/reload for a daemon
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Daemon-Generic/
-IUSE=test
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/File-Flock dev-perl/File-Slurp dev-perl/AnyEvent dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Daemon-Generic-0.84.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e16d4c605d85836ee7beba170dfd1b7a
diff --git a/metadata/md5-cache/dev-perl/Data-FormValidator-4.860.0-r1 b/metadata/md5-cache/dev-perl/Data-FormValidator-4.860.0-r1
deleted file mode 100644
index 28d2d990105d..000000000000
--- a/metadata/md5-cache/dev-perl/Data-FormValidator-4.860.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.17 >=dev-perl/MIME-Types-1.005 >=dev-perl/Regexp-Common-0.30.0 dev-perl/Email-Valid virtual/perl-File-Spec virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
-DESCRIPTION=Validates user input (usually from an HTML form) based on input profile
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Data-FormValidator/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.17 >=dev-perl/MIME-Types-1.005 >=dev-perl/Regexp-Common-0.30.0 dev-perl/Email-Valid virtual/perl-File-Spec dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.86.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a9af15a4c5d9a86a164f3d4abbaf3f6b
diff --git a/metadata/md5-cache/dev-perl/Data-GUID-0.49.0 b/metadata/md5-cache/dev-perl/Data-GUID-0.49.0
index 6ee299ef29d6..5a91bb5faecb 100644
--- a/metadata/md5-cache/dev-perl/Data-GUID-0.49.0
+++ b/metadata/md5-cache/dev-perl/Data-GUID-0.49.0
@@ -4,10 +4,10 @@ DESCRIPTION=Simple interface for generating and using globally unique identifier
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Data-GUID/
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Data-UUID-1.148.0 >=dev-perl/Sub-Exporter-0.900.0 >=dev-perl/Sub-Install-0.30.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ebdcf2fcfada0b2980f790d56747aace
+_md5_=8abe4b9a29cdaa491830082689651d89
diff --git a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1 b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
index 2e46d98162f1..513e4c17b5cb 100644
--- a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
+++ b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Base classes wrapping fundamental Perl data types
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Data-Perl/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-macos
+KEYWORDS=amd64 ~hppa ~ppc x86 ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTP/Data-Perl-0.002009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=73b6002ccc11c387063228f16d919bf3
+_md5_=eb55dd0344d87bf220d0ed058f820ba2
diff --git a/metadata/md5-cache/dev-perl/Data-Random-0.120.0 b/metadata/md5-cache/dev-perl/Data-Random-0.120.0
index 8a4b30f8bc80..faf265ccf11c 100644
--- a/metadata/md5-cache/dev-perl/Data-Random-0.120.0
+++ b/metadata/md5-cache/dev-perl/Data-Random-0.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=A module used to generate random data
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Data-Random/
 IUSE=test
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=amd64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Time-Piece-1.160.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BA/BAREFOOT/Data-Random-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ce4fe8ef19989e53fbff92dbc1bff776
+_md5_=0a2f3a7be05f5d98e609e3767403ca15
diff --git a/metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0 b/metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0
index 0397b72de414..ab239db934ee 100644
--- a/metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0
+++ b/metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0
@@ -4,10 +4,10 @@ DESCRIPTION=Change nature of data within a structure
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Data-Structure-Util/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ia64 ~ppc ~ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/Data-Structure-Util-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c8a4073aa15114285f5b4d5810665573
+_md5_=485e3ac3df950df66368cdc6c8a65bb3
diff --git a/metadata/md5-cache/dev-perl/Date-Extract-0.60.0 b/metadata/md5-cache/dev-perl/Date-Extract-0.60.0
index dc83cd086750..21eaf7f838b8 100644
--- a/metadata/md5-cache/dev-perl/Date-Extract-0.60.0
+++ b/metadata/md5-cache/dev-perl/Date-Extract-0.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extract probable dates from strings
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Date-Extract/
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Data-Inheritable >=dev-perl/DateTime-Format-Natural-0.600.0 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=bc8934bcd5591118dd68828ad8a49c8d
+_md5_=8fdf241b23e5cbc292d48310710319d4
diff --git a/metadata/md5-cache/dev-perl/Date-Manip-6.600.0 b/metadata/md5-cache/dev-perl/Date-Manip-6.600.0
index 2bea4da889c4..5905381311a9 100644
--- a/metadata/md5-cache/dev-perl/Date-Manip-6.600.0
+++ b/metadata/md5-cache/dev-perl/Date-Manip-6.600.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl date manipulation routines
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Date-Manip/
 IUSE=elibc_musl test
-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 ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO virtual/perl-Storable elibc_musl? ( sys-libs/timezone-data ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=91ab769516663e557f28af4e590ce98b
+_md5_=d33f7ba2718d78a803d567ad1eacbcfc
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
index 06a5f41847fa..59c99e8fa5b1 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
@@ -4,10 +4,10 @@ DESCRIPTION=Convert between DateTime and RFC2822/822 formats
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-Mail/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.40.0 dev-perl/Params-Validate dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=99f730e77c95c132070d73e66f9386e1
+_md5_=6a1a9ec64e5232ae8e0da95a52f2ae3d
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
index 4fa851cf11c8..ba5027e7c0dc 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse and Format DateTimes using Strptime
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-Strptime/
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-1.50.0 >=dev-perl/DateTime-TimeZone-2.90.0 virtual/perl-Exporter >=dev-perl/Package-DeprecationManager-0.150.0 dev-perl/Params-ValidationCompiler >=dev-perl/Specio-0.330.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.74.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=77377ff467289978f2459108a4e0fd96
+_md5_=b5c031aadc529349f1cd286fa63fe360
diff --git a/metadata/md5-cache/dev-perl/DateTime-Set-0.390.0 b/metadata/md5-cache/dev-perl/DateTime-Set-0.390.0
index c47037b9e194..330decd2ea18 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Set-0.390.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Set-0.390.0
@@ -4,10 +4,10 @@ DESCRIPTION=Datetime sets and set math
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DateTime-Set/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.120.0 >=dev-perl/Set-Infinite-0.590.0 dev-perl/Params-Validate dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3900.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c77fc97f762acada45f200f2b2b88561
+_md5_=57bf1bda0a5ed3dbeee9b337b52f5229
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0 b/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
index 18f83d4038dd..9feefc4a8a1e 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
@@ -4,10 +4,10 @@ DESCRIPTION=check that a command is available
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Devel-CheckBin/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~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 ~mips ppc ~ppc64 s390 ~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=virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.520.0 virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=01d7a893c449fa97d87fc9565bb5142b
+_md5_=78eb0256c86ef2be28188ac7e39702a5
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.50.0 b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.50.0
index 142f5d1588f2..71ac3b0318d1 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.50.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.50.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-CPAN-Meta >=dev-perl/Module-Build-0.380.0 >=virtual/perl-Tes
 DESCRIPTION=Check the compiler's availability
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Devel-CheckCompiler/
-KEYWORDS=amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Temp virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.05.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=886646923a1df8b651c13330f4d2743d
+_md5_=5932d8e156b277e3355c20626a8e0dd9
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0 b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
index ef4c24e153cf..fef6f841c9ac 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
@@ -4,10 +4,10 @@ DESCRIPTION=Check the compiler's availability
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Devel-CheckCompiler/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Temp virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=759d75314439b1e064cf7ca3c56f9e00
+_md5_=8e01522fa2972c4f9044f583ff783780
diff --git a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
index 8a7899ddef13..b1b8187fd33d 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=MD4 message digest algorithm
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Digest-MD4/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4dec2a0409221863ed2b22c3c487f508
+_md5_=cf45fa5edc715e2573b35655955408ea
diff --git a/metadata/md5-cache/dev-perl/EV-4.180.0 b/metadata/md5-cache/dev-perl/EV-4.180.0
deleted file mode 100644
index 657a353145f5..000000000000
--- a/metadata/md5-cache/dev-perl/EV-4.180.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/common-sense virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl interface to libev, a high performance full-featured event loop
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/EV/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/common-sense dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.18.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fe2a622dcc7b4a1580d953fdfab496f
diff --git a/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.16-r1 b/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.16-r1
deleted file mode 100644
index c48c7d673988..000000000000
--- a/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.16-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Build virtual/emacs dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl Develop Environment in Emacs
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Emacs-PDE/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=virtual/emacs dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Y/YE/YEWENBIN/Emacs-PDE-0.2.16.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=081bfdad0595971727662f0d3b1d22ed
diff --git a/metadata/md5-cache/dev-perl/Email-Filter-1.32.0-r1 b/metadata/md5-cache/dev-perl/Email-Filter-1.32.0-r1
deleted file mode 100644
index fbe365e26fe3..000000000000
--- a/metadata/md5-cache/dev-perl/Email-Filter-1.32.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Email-LocalDelivery dev-perl/Class-Trigger dev-perl/IPC-Run dev-perl/Email-Simple test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Simple filtering of RFC2822 message format and headers
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Email-Filter/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Email-LocalDelivery dev-perl/Class-Trigger dev-perl/IPC-Run dev-perl/Email-Simple dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Filter-1.032.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1add98e084f0341f4b1348bcbed247b7
diff --git a/metadata/md5-cache/dev-perl/Encode-JIS2K-0.02 b/metadata/md5-cache/dev-perl/Encode-JIS2K-0.02
deleted file mode 100644
index fb2c1c07c71a..000000000000
--- a/metadata/md5-cache/dev-perl/Encode-JIS2K-0.02
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
-DESCRIPTION=JIS X 0212 (aka JIS 2000) Encodings
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Encode-JIS2K/
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2fad879e98b6a4a11bd532c742bfbfa9
diff --git a/metadata/md5-cache/dev-perl/Exception-Base-0.250.0-r2 b/metadata/md5-cache/dev-perl/Exception-Base-0.250.0-r2
deleted file mode 100644
index 5095e7ad7842..000000000000
--- a/metadata/md5-cache/dev-perl/Exception-Base-0.250.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Build test? ( >=dev-perl/Test-Unit-Lite-0.120.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Error handling with exception class
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Exception-Base/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17e960313290377275a97eac5b4bf82c
diff --git a/metadata/md5-cache/dev-perl/Exception-Died-0.60.0-r1 b/metadata/md5-cache/dev-perl/Exception-Died-0.60.0-r1
deleted file mode 100644
index ea251a4926b3..000000000000
--- a/metadata/md5-cache/dev-perl/Exception-Died-0.60.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/constant-boolean >=dev-perl/Exception-Base-0.22.01 dev-perl/Module-Build dev-lang/perl:=[-build(-)]
-DESCRIPTION=Convert simple die into real exception object
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Exception-Died/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/constant-boolean >=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=561e063d74cf10ca1e8cd8242b24b91b
diff --git a/metadata/md5-cache/dev-perl/Expect-1.350.0 b/metadata/md5-cache/dev-perl/Expect-1.350.0
index 8ef18b4baebf..d46f991e46a1 100644
--- a/metadata/md5-cache/dev-perl/Expect-1.350.0
+++ b/metadata/md5-cache/dev-perl/Expect-1.350.0
@@ -4,10 +4,10 @@ DESCRIPTION=Expect for Perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Expect/
 IUSE=test minimal examples
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO >=dev-perl/IO-Tty-1.110.0 !minimal? ( dev-perl/IO-Stty ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0a1e9b4664cefd5f882e298812bbafe9
+_md5_=76098a03387fb8c8cb384494d0e8eff6
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.90.0 b/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.90.0
deleted file mode 100644
index f048fae35de0..000000000000
--- a/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.90.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Build test? ( dev-perl/Test-Fatal virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Configure-time utilities for using C headers
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/ExtUtils-CChecker/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-ExtUtils-CBuilder dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.09.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1c2044cac566038a13db354b39940f1
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0 b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
index 5b4be2d5f646..9ba3a48ae013 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.30 virtual/perl-Data-Dumper dev-lang
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.007.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9441e208e62fae3887bb3c780cc53ba4
+_md5_=45440725393411872c8b0e8c1965849b
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.200.0-r1 b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.200.0-r1
new file mode 100644
index 000000000000..55def660083f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.200.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-File-Spec virtual/fortran virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Facilitate use of FORTRAN from Perl/XS code
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/ExtUtils-F77/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Spec virtual/fortran dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHM/ExtUtils-F77-1.20.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=1321c336c90c6bf110a0ed8ca92e7e9f
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0 b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
index d1781fc74ab4..4d65ad2f858e 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-Te
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.022.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f816308524c55f4b6c2b68b07115ce4d
+_md5_=fdae582ed84684d95b7e658b20d98f25
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0 b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
index 7efc9b85e41d..2f5d75eb0db8 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-perl/ExtUtils-Config-0.2.0 virtual/perl-File-Spec dev-lang/perl:=[
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.010.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3caaadc6f2d2c41dc7a452c00dba5962
+_md5_=7547b0cdcb7db9da542bdd3fb705a4fc
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.170.0 b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.170.0
deleted file mode 100644
index e532590111ed..000000000000
--- a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.170.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Module-Build-0.400.0 test? ( dev-perl/Test-Differences dev-perl/Test-Base ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=XS for C++
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/ExtUtils-XSpp/
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-ExtUtils-ParseXS-2.22.02 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.1700.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4caf281b329662a8334c87ea8d08b0c2
diff --git a/metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r1 b/metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r1
deleted file mode 100644
index a5e44dba891f..000000000000
--- a/metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Exception-Died >=dev-perl/Exception-Base-0.22.01 dev-perl/Module-Build dev-lang/perl:=[-build(-)]
-DESCRIPTION=Succeed or throw exception
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Fatal-Exception/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Exception-Died >=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e057d54c28d95dacd5a0da0b108e015
diff --git a/metadata/md5-cache/dev-perl/File-BOM-0.140.0-r1 b/metadata/md5-cache/dev-perl/File-BOM-0.140.0-r1
deleted file mode 100644
index 35a7c6407df3..000000000000
--- a/metadata/md5-cache/dev-perl/File-BOM-0.140.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Build test? ( dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Exception ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Utilities for handling Byte Order Marks
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-BOM/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Readonly dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.14.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66357e36baa4a25f1e0514bdf5e426c3
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Link-0.113.0-r1 b/metadata/md5-cache/dev-perl/File-Copy-Link-0.113.0-r1
deleted file mode 100644
index 4e36cba8e786..000000000000
--- a/metadata/md5-cache/dev-perl/File-Copy-Link-0.113.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Build virtual/perl-File-Temp virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl extension for replacing a link by a copy of the linked file
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-Copy-Link/
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RM/RMBARKER/File-Copy-Link-0.113.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cbcf9452d10fc6525c79173d195a448
diff --git a/metadata/md5-cache/dev-perl/File-Grep-0.020.0-r1 b/metadata/md5-cache/dev-perl/File-Grep-0.020.0-r1
deleted file mode 100644
index b43314557873..000000000000
--- a/metadata/md5-cache/dev-perl/File-Grep-0.020.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Find matches to a pattern in a series of files and related functions
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-Grep/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MN/MNEYLON/File-Grep-0.02.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=545be3bf509f30e30d7296e41331e47e
diff --git a/metadata/md5-cache/dev-perl/File-KeePass-2.30.0 b/metadata/md5-cache/dev-perl/File-KeePass-2.30.0
deleted file mode 100644
index 8e659802b883..000000000000
--- a/metadata/md5-cache/dev-perl/File-KeePass-2.30.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Crypt-Rijndael-1 >=virtual/perl-Digest-SHA-1 >=virtual/perl-MIME-Base64-1 dev-perl/XML-Parser virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Interface to KeePass V1 and V2 database files
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-KeePass/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Crypt-Rijndael-1 >=virtual/perl-Digest-SHA-1 >=virtual/perl-MIME-Base64-1 dev-perl/XML-Parser dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/File-KeePass-2.03.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3cf451ea68e6785d9f8bd4e47d8b1f09
diff --git a/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.910.0-r1 b/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.910.0-r1
deleted file mode 100644
index a7b11e944864..000000000000
--- a/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.910.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-antivirus/clamav dev-lang/perl:=[-build(-)]
-DESCRIPTION=Connect to a local Clam Anti-Virus clamd service and send commands
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-Scan-ClamAV/
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=app-antivirus/clamav dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JA/JAMTUR/File-Scan-ClamAV-1.91.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=001088d65891242aee1ef07492db3544
diff --git a/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0 b/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0
deleted file mode 100644
index f82e60db4926..000000000000
--- a/metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
-DESCRIPTION=Connect to a local Clam Anti-Virus clamd service and send commands
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/File-Scan-ClamAV/
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=app-antivirus/clamav dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ES/ESAYM/File-Scan-ClamAV-1.93.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=284a3b5c59d54ee10a847a61706887ee
diff --git a/metadata/md5-cache/dev-perl/File-SearchPath-0.60.0-r1 b/metadata/md5-cache/dev-perl/File-SearchPath-0.60.0-r1
deleted file mode 100644
index 6f522bcb9fab..000000000000
--- a/metadata/md5-cache/dev-perl/File-SearchPath-0.60.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Build dev-lang/perl:=[-build(-)]
-DESCRIPTION=Search for a file in an environment variable path
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-SearchPath/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/File-SearchPath-0.06.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=59fb23c89a028e711a81f3dcbbaa125d
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.90.0 b/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.90.0
deleted file mode 100644
index 51b375ab5e82..000000000000
--- a/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.90.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.110.0 virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=[-build(-)]
-DESCRIPTION=Install shared files
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-ShareDir-Install/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.110.0 virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GW/GWYN/File-ShareDir-Install-0.09.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62658e303697bbd748a6dd31d238d5f9
diff --git a/metadata/md5-cache/dev-perl/Filesys-SmbClient-3.200.0-r2 b/metadata/md5-cache/dev-perl/Filesys-SmbClient-3.200.0-r2
deleted file mode 100644
index 97887f5a072b..000000000000
--- a/metadata/md5-cache/dev-perl/Filesys-SmbClient-3.200.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-fs/samba-4.2[client] virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Provide Perl API for libsmbclient.so
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Filesys-SmbClient/
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=net-fs/samba-4.2[client] dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AL/ALIAN/Filesys-SmbClient-3.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=360347fdd6c7dbac87e94a69f0fa99fb
diff --git a/metadata/md5-cache/dev-perl/Gearman-2.3.2 b/metadata/md5-cache/dev-perl/Gearman-2.3.2
deleted file mode 100644
index 69e333888d61..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-2.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Which virtual/perl-Perl-OSType >=dev-perl/Proc-Guard-0.70.0 dev-perl/Test-Differences dev-perl/Test-Exception virtual/perl-Test-Simple >=dev-perl/Test-TCP-2.170.0 dev-perl/Test-Timer ) dev-lang/perl:=
-DESCRIPTION=Gearman distributed job system, client and worker libraries
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Gearman/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-2.003.002.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f377ae6435b96c681067b044e1ca0dc1
diff --git a/metadata/md5-cache/dev-perl/Gearman-2.4.2 b/metadata/md5-cache/dev-perl/Gearman-2.4.2
deleted file mode 100644
index 55d8e1ea4ace..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-2.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Which virtual/perl-Perl-OSType >=dev-perl/Proc-Guard-0.70.0 dev-perl/Test-Differences dev-perl/Test-Exception virtual/perl-Test-Simple >=dev-perl/Test-TCP-2.170.0 dev-perl/Test-Timer ) dev-lang/perl:=
-DESCRIPTION=Gearman distributed job system, client and worker libraries
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Gearman/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-2.004.002.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=dd6bd02539564ae94978db68c7244d6e
diff --git a/metadata/md5-cache/dev-perl/Gearman-2.4.3 b/metadata/md5-cache/dev-perl/Gearman-2.4.3
deleted file mode 100644
index 6b8a18ae8744..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-2.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Which virtual/perl-Perl-OSType >=dev-perl/Proc-Guard-0.70.0 dev-perl/Test-Differences dev-perl/Test-Exception virtual/perl-Test-Simple >=dev-perl/Test-TCP-2.170.0 dev-perl/Test-Timer ) dev-lang/perl:=
-DESCRIPTION=Gearman distributed job system, client and worker libraries
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Gearman/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-2.004.003.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=975ddf54504d12661b567b625f7de144
diff --git a/metadata/md5-cache/dev-perl/Gearman-2.4.6 b/metadata/md5-cache/dev-perl/Gearman-2.4.6
deleted file mode 100644
index 49e6d94fa8e6..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-2.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Which virtual/perl-Perl-OSType >=dev-perl/Proc-Guard-0.70.0 dev-perl/Test-Differences dev-perl/Test-Exception virtual/perl-Test-Simple >=dev-perl/Test-TCP-2.170.0 dev-perl/Test-Timer ) dev-lang/perl:=
-DESCRIPTION=Gearman distributed job system, client and worker libraries
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Gearman/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-2.004.006.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=46ee2478906f837d15e60c5ac5d61e27
diff --git a/metadata/md5-cache/dev-perl/Gearman-2.4.7 b/metadata/md5-cache/dev-perl/Gearman-2.4.7
deleted file mode 100644
index 98579cee65ee..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-2.4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Which virtual/perl-Perl-OSType >=dev-perl/Proc-Guard-0.70.0 dev-perl/Test-Differences dev-perl/Test-Exception virtual/perl-Test-Simple >=dev-perl/Test-TCP-2.170.0 dev-perl/Test-Timer ) dev-lang/perl:=
-DESCRIPTION=Gearman distributed job system, client and worker libraries
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Gearman/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-2.004.007.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7091642751d9f264e9977c0f00955960
diff --git a/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r1 b/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r1
deleted file mode 100644
index 3e6c1bcc24b9..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Asynchronous client module for Gearman for Danga::Socket applications
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Gearman-Client-Async/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Gearman-1.07 >=dev-perl/Danga-Socket-1.57 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Gearman-Client-Async-0.94.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f3a48628c90545b298f3e475e49b180
diff --git a/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0-r1 b/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0-r1
deleted file mode 100644
index 9843d8659295..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 !!sys-cluster/gearmand virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Gearman distributed job system - worker/client connector
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Gearman-Server/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 !!sys-cluster/gearmand dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Gearman-Server-1.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b8a9b237f421037cfd1616007222b45
diff --git a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.200 b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.200
index f1717d4c70ce..5ccc14914c57 100644
--- a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.200
+++ b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.200
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to merge PRs from the Gentoo Github repository
 EAPI=6
 HOMEPAGE=https://github.com/monsieurp/Gentoo-App-Pram
 IUSE=test
-KEYWORDS=amd64 x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor >=dev-perl/Net-SSLeay-1.490.0 >=dev-perl/IO-Socket-SSL-1.560.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MONSIEURP/Gentoo-App-Pram-0.100200.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=86e9af36c2efa1b1252014cd5d471824
+_md5_=8d21a29edc1882ed2526d6283e13697d
diff --git a/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r1 b/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r1
deleted file mode 100644
index 082c70f27577..000000000000
--- a/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Auto-GUI extending Getopt::Long
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Getopt-GUI-Long/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Temp virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/H/HA/HARDAKER/Getopt-GUI-Long-0.93.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b426ea751c0b6192cadf1419aa30ade
diff --git a/metadata/md5-cache/dev-perl/Getopt-Tabular-0.3 b/metadata/md5-cache/dev-perl/Getopt-Tabular-0.3
deleted file mode 100644
index b3c2e087d7ab..000000000000
--- a/metadata/md5-cache/dev-perl/Getopt-Tabular-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Table-driven argument parsing with help text
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Getopt-Tabular/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GW/GWARD/Getopt-Tabular-0.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b2fe52e1cc626fe2e6900398ce995c9
diff --git a/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.14.0 b/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.14.0
deleted file mode 100644
index ddabac99a0cf..000000000000
--- a/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Class-Load >=dev-perl/Class-Std-Fast-0.0.5 dev-perl/Crypt-OpenSSL-RSA dev-perl/File-HomeDir virtual/perl-File-Spec dev-perl/IO-Socket-SSL dev-perl/JSON-Parse dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/Log-Log4perl >=dev-perl/SOAP-WSDL-2.00.10 virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit dev-perl/URI dev-perl/XML-Simple dev-perl/XML-XPath examples? ( virtual/perl-Digest-SHA virtual/perl-File-Temp dev-perl/HTTP-Server-Simple ) >=dev-perl/Module-Build-0.400.0 test? ( dev-perl/Config-Properties dev-perl/Data-Uniqid virtual/perl-File-Temp dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-MockObject virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Google AdWords API Perl Client Library
-EAPI=6
-HOMEPAGE=https://github.com/googleads/googleads-perl-lib
-IUSE=test examples
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-perl/Class-Load >=dev-perl/Class-Std-Fast-0.0.5 dev-perl/Crypt-OpenSSL-RSA dev-perl/File-HomeDir virtual/perl-File-Spec dev-perl/IO-Socket-SSL dev-perl/JSON-Parse dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/Log-Log4perl >=dev-perl/SOAP-WSDL-2.00.10 virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit dev-perl/URI dev-perl/XML-Simple dev-perl/XML-XPath examples? ( virtual/perl-Digest-SHA virtual/perl-File-Temp dev-perl/HTTP-Server-Simple ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SU/SUNDQUIST/Google-Ads-AdWords-Client-4.14.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3d5f057fc64e2c5835cde5e750fd4b64
diff --git a/metadata/md5-cache/dev-perl/Growl-GNTP-0.200.0 b/metadata/md5-cache/dev-perl/Growl-GNTP-0.200.0
deleted file mode 100644
index fb1cad6c2267..000000000000
--- a/metadata/md5-cache/dev-perl/Growl-GNTP-0.200.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=examples? ( virtual/perl-Encode ) >=dev-perl/Crypt-CBC-2.290.0 >=dev-perl/Data-UUID-0.149.0 >=virtual/perl-Digest-MD5-2.360.0 >=virtual/perl-Digest-SHA-5.450.0 virtual/perl-IO dev-perl/IO-Socket-PortState >=dev-perl/Module-Build-0.380.0 virtual/perl-File-Spec virtual/perl-CPAN-Meta dev-lang/perl:=
-DESCRIPTION=Perl implementation of GNTP Protocol (Client Part)
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Growl-GNTP/
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=examples? ( virtual/perl-Encode ) >=dev-perl/Crypt-CBC-2.290.0 >=dev-perl/Data-UUID-0.149.0 >=virtual/perl-Digest-MD5-2.360.0 >=virtual/perl-Digest-SHA-5.450.0 virtual/perl-IO dev-perl/IO-Socket-PortState dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.20.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ccbae26b61c792ee0fe69dbac9b3eb2a
diff --git a/metadata/md5-cache/dev-perl/Gtk2-AppIndicator-0.150.0 b/metadata/md5-cache/dev-perl/Gtk2-AppIndicator-0.150.0
deleted file mode 100644
index 64b82b5e2425..000000000000
--- a/metadata/md5-cache/dev-perl/Gtk2-AppIndicator-0.150.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Gtk2-1.200.0 dev-libs/libappindicator:2 virtual/perl-ExtUtils-MakeMaker test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl binding for the GTK2 AppIndicator
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Gtk2-AppIndicator/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Gtk2-1.200.0 dev-libs/libappindicator:2 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=878eb87642e2d22716266c75f8bccdfa
diff --git a/metadata/md5-cache/dev-perl/Gtk2-SourceView2-0.100.0 b/metadata/md5-cache/dev-perl/Gtk2-SourceView2-0.100.0
deleted file mode 100644
index d82b5f0d2817..000000000000
--- a/metadata/md5-cache/dev-perl/Gtk2-SourceView2-0.100.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Gtk2 >=dev-perl/glib-perl-1.160.0 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig virtual/perl-ExtUtils-MakeMaker x11-libs/gtksourceview:2.0 dev-lang/perl:=
-DESCRIPTION=Perl binding for the C library gtksourceview
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Gtk2-SourceView2/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2+ Artistic-2 )
-RDEPEND=dev-perl/Gtk2 >=dev-perl/glib-perl-1.160.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PO/POTYL/Gtk2-SourceView2-0.10.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=608bafc78bdef40a80c3ced9eec31f4f
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0-r1
deleted file mode 100644
index bbe7ecae863d..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Converts HTML to text with tables intact
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6475ffd12a665c1e807502de4a2f3959
diff --git a/metadata/md5-cache/dev-perl/HTML-Packer-2.50.0 b/metadata/md5-cache/dev-perl/HTML-Packer-2.50.0
deleted file mode 100644
index fbb79e699ba5..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-Packer-2.50.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/CSS-Packer-2.10.0 >=dev-perl/JavaScript-Packer-2.10.0 >=dev-perl/Regexp-RegGrp-1.1.1_rc virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Another HTML code cleaner
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/HTML-Packer/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/CSS-Packer-2.10.0 >=dev-perl/JavaScript-Packer-2.10.0 >=dev-perl/Regexp-RegGrp-1.1.1_rc dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/HTML-Packer-2.05.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0b2556f75d0e568616a8467b6c8702a3
diff --git a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.190.0 b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.190.0
deleted file mode 100644
index 99e96b39ff5e..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.190.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) >=dev-perl/Module-Build-Tiny-0.35.0 test? ( virtual/perl-File-Spec >=dev-perl/HTTP-Message-6 >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl:=
-DESCRIPTION=PSGI compliant HTTP Entity Parser
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/HTTP-Entity-Parser/
-IUSE=test +xs examples
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.19.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7d141a3f093b80ac635f3e49be0b67c2
diff --git a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0 b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0
index bf733a3f7af6..dfe45c853d5a 100644
--- a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0
+++ b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=139b49cdb67828c93c523261c075e73b
+_md5_=0c777b9756ca6a47ff56a89179222d11
diff --git a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r1 b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r1
new file mode 100644
index 000000000000..3c6afc168e0a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-IO virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Manage IO on many file handles
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Multiplex/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-IO dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=0fa0678be78e2eb4619c5ecafbbe0f05
diff --git a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9 b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
index 346c7a49c8a1..0ed76b3a9e0a 100644
--- a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
+++ b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
@@ -4,10 +4,10 @@ DESCRIPTION=Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/JSON-MaybeXS/
 IUSE=test +xs
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-JSON-PP-2.273.0 virtual/perl-Scalar-List-Utils xs? ( || ( >=dev-perl/Cpanel-JSON-XS-2.331.0 >=dev-perl/JSON-XS-3.0.0 ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.003009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2350ed3e35eadbf3ffa058e7d1330c31
+_md5_=4a5cf70e8e21cc3b6f4eab97649dba4a
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 1e3af44e68f2..e1a1e4b8b2cc 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/Net-DBus-1.1.0 b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
index 8a523733b95f..3360c0d8d17a 100644
--- a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
+++ b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for the DBus message system
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-DBus/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc s390 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/dbus virtual/perl-Time-HiRes dev-perl/XML-Twig dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.1.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7948cd6d8b97c775074f5fa5e4a7d525
+_md5_=991fc87ea45f02ce97681a34d17ae62f
diff --git a/metadata/md5-cache/dev-perl/Path-Class-0.360.0 b/metadata/md5-cache/dev-perl/Path-Class-0.360.0
index 521067ee446e..df227a646d45 100644
--- a/metadata/md5-cache/dev-perl/Path-Class-0.360.0
+++ b/metadata/md5-cache/dev-perl/Path-Class-0.360.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cross-platform path specification manipulation
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Path-Class/
 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 ~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 ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path >=virtual/perl-File-Spec-3.260.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Perl-OSType virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a3f4f96f7d916b163cb9c394b1e6b0a4
+_md5_=5b179c313d97d593b957fb194bd57b91
diff --git a/metadata/md5-cache/dev-perl/Test-LeakTrace-0.150.0 b/metadata/md5-cache/dev-perl/Test-LeakTrace-0.150.0
index ccec74a4a7aa..b977dfaca914 100644
--- a/metadata/md5-cache/dev-perl/Test-LeakTrace-0.150.0
+++ b/metadata/md5-cache/dev-perl/Test-LeakTrace-0.150.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Traces memory leaks
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-LeakTrace/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Test-LeakTrace-0.15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ba986abc117625a79f1e9ac132979d0
+_md5_=b2001039d3a5be08a40418d3b872234b
diff --git a/metadata/md5-cache/dev-perl/Test-LeakTrace-0.160.0 b/metadata/md5-cache/dev-perl/Test-LeakTrace-0.160.0
index 05acf5610533..99df04c0b9e0 100644
--- a/metadata/md5-cache/dev-perl/Test-LeakTrace-0.160.0
+++ b/metadata/md5-cache/dev-perl/Test-LeakTrace-0.160.0
@@ -4,10 +4,10 @@ DESCRIPTION=Traces memory leaks
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-LeakTrace/
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=e6ebe51deb324d759f94ee143dfc42d2
+_md5_=88a64b392607a3b6e2e3022dd2d030a7
diff --git a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20 b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20
index c5056fa520be..077001854b56 100644
--- a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20
+++ b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for emulating troublesome interfaces
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-MockObject/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix
+KEYWORDS=amd64 ~arm ~ppc sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/UNIVERSAL-isa-1.201.106.140 >=dev-perl/UNIVERSAL-can-1.201.106.170 virtual/perl-Test-Simple dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20161202.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=50e937feee29e59f75bbbf5caefe86d3
+_md5_=c425a5934de9c591d35f3a0304167962
diff --git a/metadata/md5-cache/dev-perl/Test-Needs-0.2.5 b/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
index bc4c83465974..9ace4c5019a4 100644
--- a/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
+++ b/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
@@ -4,10 +4,10 @@ DESCRIPTION=Skip tests when modules not available
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Needs/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~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/H/HA/HAARG/Test-Needs-0.002005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=4564b071421e3f452c4bd4128b8e82b9
+_md5_=9e07f225c61e9e90cce68f55d888a504
diff --git a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77 b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
index af879c973714..7fdea5b27b7d 100644
--- a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
+++ b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
@@ -4,10 +4,10 @@ DESCRIPTION=A rich set of tools built upon the Test2 framework
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test2-Suite/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Info-0.1.0 >=dev-perl/Term-Table-0.2.0 >=virtual/perl-Test-Simple-1.302.73 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000077.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0dc67810e8ff74412905f0417f3c2df5
+_md5_=99179cf0b176884e5c776b2ed9ce5344
diff --git a/metadata/md5-cache/dev-perl/Text-Diff-1.440.0 b/metadata/md5-cache/dev-perl/Text-Diff-1.440.0
index 63085ec9e0af..f9d9af466a17 100644
--- a/metadata/md5-cache/dev-perl/Text-Diff-1.440.0
+++ b/metadata/md5-cache/dev-perl/Text-Diff-1.440.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Algorithm-Diff-1.190.0 virtual/perl-Exporter virtual/perl-ExtU
 DESCRIPTION=Perform diffs on files and record sets
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Text-Diff/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-Diff-1.190.0 virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.44.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5bf2e74cbd57cc8ec43acc0106100791
+_md5_=a9b0731d40d74e2ceee1e9a8d57d64b5
diff --git a/metadata/md5-cache/dev-perl/Text-Diff-1.450.0 b/metadata/md5-cache/dev-perl/Text-Diff-1.450.0
index 9100151b9dbf..31cd550ccaac 100644
--- a/metadata/md5-cache/dev-perl/Text-Diff-1.450.0
+++ b/metadata/md5-cache/dev-perl/Text-Diff-1.450.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Algorithm-Diff-1.190.0 virtual/perl-Exporter virtual/perl-ExtU
 DESCRIPTION=Perform diffs on files and record sets
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Text-Diff/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-Diff-1.190.0 virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=075e3b90db556699c84c04ce74038d18
+_md5_=9795e22c8c37d34390c9585e2a62d5f4
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280 b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
index 68e78f0c3d73..03d61b646414 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
@@ -4,10 +4,10 @@ DESCRIPTION=Hack around people calling UNIVERSAL::can() as a function
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/UNIVERSAL-can/
 IUSE=test
-KEYWORDS=amd64 ~arm ppc x86 ~ppc-aix
+KEYWORDS=amd64 ~arm ppc sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e6c9ec879ae939524f4b934a89724cf
+_md5_=710786a1daf5f90b05d493243955883b
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120 b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120
index d39ea0e485ae..4743ce888844 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120
@@ -4,10 +4,10 @@ DESCRIPTION=Attempt to recover from people calling UNIVERSAL::isa as a function
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/UNIVERSAL-isa/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix
+KEYWORDS=amd64 ~arm ~ppc sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7060cc25c17ba31cc6326c47071c7780
+_md5_=f6f7440fd3b2873f757a4c98d25d33aa
diff --git a/metadata/md5-cache/dev-perl/URI-1.710.0 b/metadata/md5-cache/dev-perl/URI-1.710.0
index 5974da798e54..246c7238e1a6 100644
--- a/metadata/md5-cache/dev-perl/URI-1.710.0
+++ b/metadata/md5-cache/dev-perl/URI-1.710.0
@@ -4,10 +4,10 @@ DESCRIPTION=Uniform Resource Identifiers (absolute and relative)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/URI/
 IUSE=test
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 >=virtual/perl-MIME-Base64-2 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/URI-1.71.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f8a5ca22264e04f2cc8ebe7197da65ee
+_md5_=c648eb8b0b51224f8aed5e953a73e471
diff --git a/metadata/md5-cache/dev-perl/URI-1.730.0 b/metadata/md5-cache/dev-perl/URI-1.730.0
index 2a18a53d36e8..fb3cde728c6d 100644
--- a/metadata/md5-cache/dev-perl/URI-1.730.0
+++ b/metadata/md5-cache/dev-perl/URI-1.730.0
@@ -4,10 +4,10 @@ DESCRIPTION=Uniform Resource Identifiers (absolute and relative)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/URI/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-MIME-Base64-2 virtual/perl-Scalar-List-Utils virtual/perl-libnet virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/URI-1.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=b7e608203ac577cade9b2cdea283a853
+_md5_=b2cf035b24b212291f4f8023ba43801f
diff --git a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1 b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
index d391e7dcf4dc..62bf04489169 100644
--- a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl:=
 DESCRIPTION=UAX #14 Unicode Line Breaking Algorithm
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Unicode-LineBreak/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2017.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0aa4d64cbf11f1093b47528ae737dadb
+_md5_=32c0749ba825f6201b1e068425c212ce
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0 b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
index 70e90dd9af28..fb46656e9efb 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
+++ b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Unicode-String-2.06 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Convert between most 8bit encodings
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Unicode-Map8/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Unicode-String-2.06 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Unicode-Map8-0.13.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=256ec112bb50effce55766f5d6c246a6
+_md5_=77eeec7caa584f655d7503a398df7211
diff --git a/metadata/md5-cache/dev-perl/Unicode-String-2.100.0 b/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
index efd036829773..84511f4bcfb4 100644
--- a/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
+++ b/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-MIME-Base64-2.11 dev-lang/perl:=
 DESCRIPTION=String manipulation for Unicode strings
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Unicode-String/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.11 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=300f5664129082eedbc3bc79bb8791f4
+_md5_=31a860b456499be9dc041ba0cc47057d
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.120.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.120.0
index 24e005ff440d..5e85a0b47432 100644
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.120.0
+++ b/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to automate HTML forms
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/WWW-Mechanize-FormFiller/
 IUSE=test
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=amd64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Data-Random-0.50.0 dev-perl/HTML-Form dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/WWW-Mechanize-FormFiller-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9382ac639dec83308cdb1b69e92c2a30
+_md5_=f05a51feca2d6bc92d275cd5b9664e2d
diff --git a/metadata/md5-cache/dev-perl/Wx-0.993.200-r1 b/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
index 4c478af2a5fd..eda2d1ee150e 100644
--- a/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
+++ b/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl bindings for wxGTK
 EAPI=6
 HOMEPAGE=http://wxperl.sourceforge.net/ http://search.cpan.org/dist/Wx/
 IUSE=test test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-wxWidgets-0.690.0-r1 x11-libs/wxGTK:3.0 >=virtual/perl-File-Spec-0.820.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=11332364745a9e5ab328b91c14381a1d
+_md5_=6daa6044ee94a96c3cde40a8d9bcd4b7
diff --git a/metadata/md5-cache/dev-perl/XML-Atom-0.420.0 b/metadata/md5-cache/dev-perl/XML-Atom-0.420.0
index b9c0187a5bee..985de68e96af 100644
--- a/metadata/md5-cache/dev-perl/XML-Atom-0.420.0
+++ b/metadata/md5-cache/dev-perl/XML-Atom-0.420.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/Class-Data-Inheritable >=dev-p
 DESCRIPTION=Atom feed and API implementation
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-Atom/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/Class-Data-Inheritable >=dev-perl/XML-LibXML-1.690.0 dev-perl/XML-XPath dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/Digest-SHA1 dev-perl/HTML-Parser dev-perl/LWP-Authen-Wsse virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/XML-Atom-0.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=66956478a78389e9ac851c91702f7853
+_md5_=bb008e0915d3f6d0df3a0ab0e50ce491
diff --git a/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1 b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
index 7e83bd856918..63c96a12090e 100644
--- a/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module for an DOM Level 1 compliant interface
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-DOM/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl >=dev-perl/XML-Parser-2.300.0 dev-perl/XML-RegExp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=d925accd045b9d83ec74da07bd1bf924
+_md5_=632850427046f5329f6929d81d8994a4
diff --git a/metadata/md5-cache/dev-perl/XML-DOM-XPath-0.140.0-r2 b/metadata/md5-cache/dev-perl/XML-DOM-XPath-0.140.0-r2
index 564ea6e51a28..940c2dbae20e 100644
--- a/metadata/md5-cache/dev-perl/XML-DOM-XPath-0.140.0-r2
+++ b/metadata/md5-cache/dev-perl/XML-DOM-XPath-0.140.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension to add XPath support to XML::DOM, using XML::XPath en
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-DOM-XPath/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-DOM dev-perl/XML-XPathEngine dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-DOM-XPath-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=dfcc83542d0e4fa78f34f1d345f6e5da
+_md5_=a0491a5808b99fa945373aa37fbe639f
diff --git a/metadata/md5-cache/dev-perl/XML-Feed-0.530.0-r1 b/metadata/md5-cache/dev-perl/XML-Feed-0.530.0-r1
index bd0b92123624..130b6b0cdb5c 100644
--- a/metadata/md5-cache/dev-perl/XML-Feed-0.530.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Feed-0.530.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Syndication feed parser and auto-discovery
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-Feed/
 IUSE=test minimal examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/XML-RSS-LibXML ) dev-perl/Class-ErrorHandler dev-perl/Feed-Find dev-perl/URI-Fetch >=dev-perl/XML-RSS-1.470.0 >=dev-perl/XML-Atom-0.380.0 dev-perl/DateTime dev-perl/DateTime-Format-Mail dev-perl/DateTime-Format-W3CDTF dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/Module-Pluggable virtual/perl-Scalar-List-Utils !<dev-perl/XML-LibXML-1.660.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/XML-Feed-0.53.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=53bb73fdaeef5b2b2ea4fad321f27d34
+_md5_=765c7a25d27b1a0c2a90fd71943569e7
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-2.13.200 b/metadata/md5-cache/dev-perl/XML-LibXML-2.13.200
index b3c9c248db84..c316f9d7b333 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-2.13.200
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-2.13.200
@@ -4,10 +4,10 @@ DESCRIPTION=Perl binding for libxml2
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-LibXML/
 IUSE=test minimal examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21 dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.70.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0132.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=46351776df46da639a41b8b341496f98
+_md5_=2f466a025df285b7cbafaaa791f4ba12
diff --git a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.940.0 b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.940.0
index 55f2531e3994..f3a8b95320b8 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.940.0
+++ b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.940.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libxslt-1.1.28 >=dev-perl/XML-LibXML-1.700.0 virtual/pkgconfig dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-libs/libxslt-1.1.32 >=dev-perl/XML-LibXML-1.700.0 virtual/pkgconfig dev-lang/perl:=[-build(-)]
 DESCRIPTION=A Perl module to parse XSL Transformational sheets using gnome's libXSLT
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/XML-LibXSLT/
 KEYWORDS=amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-libs/libxslt-1.1.28 >=dev-perl/XML-LibXML-1.700.0 dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-libs/libxslt-1.1.32 >=dev-perl/XML-LibXML-1.700.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.94.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aed68c245545afaea61f1ba18a4389d1
+_md5_=a30ea412a3bba72820a5ef70bc98558d
diff --git a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.950.0 b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.950.0
index 73ffbdea7333..aa4310e7b1cd 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.950.0
+++ b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.950.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.28 virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:=
+DEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.32 virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:=
 DESCRIPTION=A Perl module to parse XSL Transformational sheets using gnome's libXSLT
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-LibXSLT/
 KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.28 dev-lang/perl:=
+RDEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.32 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.95.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=06202942bc9170c9f99e7774cd1b15b7
+_md5_=56ba70fade9cdb9989b57418e332c574
diff --git a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0 b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
index f5d0e0c7f292..1f5fbd21b394 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
+++ b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.28 virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:=
+DEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.32 virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:=
 DESCRIPTION=A Perl module to parse XSL Transformational sheets using gnome's libXSLT
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-LibXSLT/
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.28 dev-lang/perl:=
+RDEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.32 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.96.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3217ad57b260ea8cfaab812828e79059
+_md5_=39e7d80679f812c41896299d8cebf570
diff --git a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0 b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
index f935c092845d..622ad43f9338 100644
--- a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
+++ b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module that offers a simple to process namespaced XML names
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-NamespaceSupport/
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=211b0158a75bc2ecb50b9fae137b7ab5
+_md5_=8e7d5c19649b3797fd30484e8ccf14d2
diff --git a/metadata/md5-cache/dev-perl/XML-Simple-2.250.0 b/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
index 24df181a14b5..259b709dbc4f 100644
--- a/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
+++ b/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
@@ -4,10 +4,10 @@ DESCRIPTION=An API for simple XML files
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-Simple/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Storable >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-perl/XML-SAX-0.150.0 dev-perl/XML-SAX-Expat dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8606692f08e47ed3e82b7c7dad1e5769
+_md5_=dd789c042b938bb4109a5ceed9267189
diff --git a/metadata/md5-cache/dev-perl/XML-Twig-3.520.0 b/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
index 788e770a976c..4a45b39036de 100644
--- a/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
+++ b/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
@@ -4,10 +4,10 @@ DESCRIPTION=Process huge XML documents in tree mode
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-Twig/
 IUSE=nls 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
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.31 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Encode-2.240.100_rc >=dev-libs/expat-1.95.5 dev-perl/Tie-IxHash dev-perl/XML-XPath >=dev-perl/libwww-perl-6.40.0 >=dev-perl/HTML-Parser-3.690.0 nls? ( >=dev-perl/Text-Iconv-1.2-r1 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0cedc44ff8b7dd97308a55c8235ec0c3
+_md5_=117be991caa181a405e37e199636da15
diff --git a/metadata/md5-cache/dev-perl/autobox-2.860.0 b/metadata/md5-cache/dev-perl/autobox-2.860.0
index 8dffd99081d4..6646345b42d2 100644
--- a/metadata/md5-cache/dev-perl/autobox-2.860.0
+++ b/metadata/md5-cache/dev-perl/autobox-2.860.0
@@ -4,10 +4,10 @@ DESCRIPTION=Call methods on native types
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/autobox/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Scope-Guard-0.210.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.86.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a88f3ed1302e2d86f1fbc3de47690cd9
+_md5_=f4d19ee9cad4a5cf689f4fc6c2eb859b
diff --git a/metadata/md5-cache/dev-perl/autovivification-0.180.0 b/metadata/md5-cache/dev-perl/autovivification-0.180.0
index e5cd07024925..0623712b528c 100644
--- a/metadata/md5-cache/dev-perl/autovivification-0.180.0
+++ b/metadata/md5-cache/dev-perl/autovivification-0.180.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lexically disable autovivification
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/autovivification/
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ed95c6c4559bb0d61cf0afac3be2b746
+_md5_=cd1c62b195a8808f7f189835544fd67a
diff --git a/metadata/md5-cache/dev-perl/enum-1.16.0-r1 b/metadata/md5-cache/dev-perl/enum-1.16.0-r1
deleted file mode 100644
index 3620b370910b..000000000000
--- a/metadata/md5-cache/dev-perl/enum-1.16.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=C style enumerated types and bitmask flags in Perl
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/enum/
-KEYWORDS=~amd64 ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Z/ZE/ZENIN/enum-1.016.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3173ed495bb7fd2f0efeb7467aef288e
diff --git a/metadata/md5-cache/dev-perl/forks-0.360.0 b/metadata/md5-cache/dev-perl/forks-0.360.0
deleted file mode 100644
index 2f12d8144d58..000000000000
--- a/metadata/md5-cache/dev-perl/forks-0.360.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Acme-Damn virtual/perl-Attribute-Handlers dev-perl/Devel-Symdump virtual/perl-File-Spec >=dev-perl/List-MoreUtils-0.150.0 >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-Storable >=dev-perl/Sys-SigAction-0.110.0 virtual/perl-Time-HiRes virtual/perl-if virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Emulate threads with fork
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/forks/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Acme-Damn virtual/perl-Attribute-Handlers dev-perl/Devel-Symdump virtual/perl-File-Spec >=dev-perl/List-MoreUtils-0.150.0 >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-Storable >=dev-perl/Sys-SigAction-0.110.0 virtual/perl-Time-HiRes virtual/perl-if dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RY/RYBSKEJ/forks-0.36.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=018072ef3a287fca1297ea02e9304114
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.150.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.150.0
index e04b78635e33..60832f590157 100644
--- a/metadata/md5-cache/dev-perl/libwww-perl-6.150.0
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.150.0
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of Perl Modules for the WWW
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/libwww-perl/
 IUSE=ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=ssl? ( dev-perl/LWP-Protocol-https )
 RDEPEND=>=dev-perl/File-Listing-6.0.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Daemon-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=dev-perl/Net-HTTP-6.40.0 >=dev-perl/WWW-RobotRules-6.0.0 >=virtual/perl-Digest-MD5-2.120.0 dev-perl/Encode-Locale >=dev-perl/HTML-Parser-3.340.0 >=virtual/perl-MIME-Base64-2.120.0 virtual/perl-libnet >=dev-perl/URI-1.100.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7896ae9bd88b6ff07f2bf0b8cd848714
+_md5_=2a239f7e99164497a0794ffc7728e6cc
diff --git a/metadata/md5-cache/dev-perl/perl-headers-0.0.1 b/metadata/md5-cache/dev-perl/perl-headers-0.0.1
index d902ef429889..56eff532de9b 100644
--- a/metadata/md5-cache/dev-perl/perl-headers-0.0.1
+++ b/metadata/md5-cache/dev-perl/perl-headers-0.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/gentoo-perl/perl-headers/archive/0.0.1.tar.gz -> perl-headers-0.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2fc6dc15eea4188afffd79bcef0b7a0e
diff --git a/metadata/md5-cache/dev-php/File_Iterator-1.3.4 b/metadata/md5-cache/dev-php/File_Iterator-1.3.4
index 1e08381de5bf..30eb96cb0318 100644
--- a/metadata/md5-cache/dev-php/File_Iterator-1.3.4
+++ b/metadata/md5-cache/dev-php/File_Iterator-1.3.4
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst postrm
 DESCRIPTION=FilterIterator implementation that filters files based on a list of suffixes
 EAPI=6
-HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator
+HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de
 KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http:///get/File_Iterator-1.3.4.tgz
 _eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
-_md5_=ac0f59fe38806c7c12ddf2436d6e8cc3
+_md5_=8a2a9c6ed418ed8a65f5ab3ddf10ab6e
diff --git a/metadata/md5-cache/dev-php/File_Iterator-1.4.2 b/metadata/md5-cache/dev-php/File_Iterator-1.4.2
index 77fc92564d5c..6100d4833d31 100644
--- a/metadata/md5-cache/dev-php/File_Iterator-1.4.2
+++ b/metadata/md5-cache/dev-php/File_Iterator-1.4.2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=FilterIterator implementation that filters files based on criteria
 EAPI=6
-HOMEPAGE=http://phpunit.de
+HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-file-iterator/archive/1.4.2.tar.gz -> File_Iterator-1.4.2.tar.gz
-_md5_=21eced32508ddc594b5b255d1586ab0d
+_md5_=a4088244e7f94648dad061061968bc2f
diff --git a/metadata/md5-cache/dev-php/File_Iterator-1.4.3 b/metadata/md5-cache/dev-php/File_Iterator-1.4.3
index 4da39fcc3cca..c79a5315f0c8 100644
--- a/metadata/md5-cache/dev-php/File_Iterator-1.4.3
+++ b/metadata/md5-cache/dev-php/File_Iterator-1.4.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=FilterIterator implementation that filters files based on criteria
 EAPI=6
-HOMEPAGE=https://phpunit.de
+HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-file-iterator/archive/1.4.3.tar.gz -> File_Iterator-1.4.3.tar.gz
-_md5_=5d34510ebf07b76208d3876fa49dfc2b
+_md5_=052d3edc8b89d6ab0de6c100061db739
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 9a147885d8fd..e5d08c09f6f9 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3 b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
new file mode 100644
index 000000000000..4a65a091e7ab
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
@@ -0,0 +1,12 @@
+BDEPEND=test? ( app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception dev-php/phpunit )
+DEFINED_PHASES=install prepare test
+DESCRIPTION=PHP interface to the GNU Privacy Guard (GnuPG)
+EAPI=7
+HOMEPAGE=http://pear.php.net/package/Crypt_GPG
+IUSE=test
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/Crypt_GPG-1.6.3.tgz
+_md5_=135aec0fd89a3955896064f51e1b9e45
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r2 b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r2
deleted file mode 100644
index 9a433703501d..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Miscellaneous HTTP utilities
-EAPI=5
-HOMEPAGE=http://pear.php.net/HTTP
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/HTTP-1.4.1.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	7efef313de5b8b550520eeb909456206	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e592ed27945f6e665ecce70471e844ab
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3 b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
index 2981f9ce42e1..bbe764a185f7 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Miscellaneous HTTP utilities
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTTP
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTTP-1.4.1.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r2	eb6928c33771db74564e814c5ca6c1b3	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1457a521b50bbcd3c9b6b22d4c587ee8
+_md5_=3bb98f96f19ef601ba4d1551fa4568c2
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.2.1 b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.2.1
deleted file mode 100644
index 60ddd201032b..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Provides an easy way to perform HTTP requests
-EAPI=5
-HOMEPAGE=http://pear.php.net/HTTP_Request2
-IUSE=+curl +fileinfo +ssl +zlib
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/php[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.0.0 dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/HTTP_Request2-2.2.1.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	7efef313de5b8b550520eeb909456206	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6453d1ce5fd9ca2cb98c051055b122c8
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
index 5ea468f7d623..a093ccbd6a3e 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Provides an easy way to perform HTTP requests
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTTP_Request2
 IUSE=+curl +fileinfo +ssl test +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTTP_Request2-2.3.0.tgz
 _eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
-_md5_=acf5b7fbe61c6959da0ed045c6ae5c5a
+_md5_=95858d34b676329d8caa816b2e348e80
diff --git a/metadata/md5-cache/dev-php/doctrine-1.2.5 b/metadata/md5-cache/dev-php/doctrine-1.2.5
index 56330951e5de..ab8af64a8552 100644
--- a/metadata/md5-cache/dev-php/doctrine-1.2.5
+++ b/metadata/md5-cache/dev-php/doctrine-1.2.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=>=dev-lang/php-5.2.3:*[cli,pdo]
 DESCRIPTION=An object relational mapper for PHP5
 EAPI=5
-HOMEPAGE=http://www.doctrine-project.org/
+HOMEPAGE=https://www.doctrine-project.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 MIT BSD
 RDEPEND=>=dev-lang/php-5.2.3:*[cli,pdo]
 SLOT=0
 SRC_URI=https://github.com/doctrine/doctrine1/archive/v1.2.5.tar.gz -> doctrine-1.2.5.tar.gz
-_md5_=3d15ad2344b72a6650dfd0e0c0719b4c
+_md5_=aaee163cac291cc4f91083d34984c585
diff --git a/metadata/md5-cache/dev-php/doctrine-2.4.6 b/metadata/md5-cache/dev-php/doctrine-2.4.6
index d00e275eb7e4..6d4e7437bf1e 100644
--- a/metadata/md5-cache/dev-php/doctrine-2.4.6
+++ b/metadata/md5-cache/dev-php/doctrine-2.4.6
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=>=dev-lang/php-5.3.2:*[cli,pdo]
 DESCRIPTION=An object relational mapper for PHP5
 EAPI=5
-HOMEPAGE=http://www.doctrine-project.org/
+HOMEPAGE=https://www.doctrine-project.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 MIT BSD
 RDEPEND=>=dev-lang/php-5.3.2:*[cli,pdo]
 SLOT=2
 SRC_URI=https://github.com/doctrine/doctrine2/archive/v2.4.6.tar.gz -> doctrine-2.4.6.tar.gz
-_md5_=729e2de7f859d0ec13e722e1dc81467e
+_md5_=4abb522e51f1e897e9c329e48629e992
diff --git a/metadata/md5-cache/dev-php/doctrine-2.6.1 b/metadata/md5-cache/dev-php/doctrine-2.6.1
index 53e08da8ad94..46fee12dbdd0 100644
--- a/metadata/md5-cache/dev-php/doctrine-2.6.1
+++ b/metadata/md5-cache/dev-php/doctrine-2.6.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=An object relational mapper for PHP
 EAPI=6
-HOMEPAGE=http://www.doctrine-project.org/
+HOMEPAGE=https://www.doctrine-project.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/php-7.1:*[cli,pdo]
 SLOT=2
 SRC_URI=https://github.com/doctrine/doctrine2/archive/v2.6.1.tar.gz -> doctrine-2.6.1.tar.gz
-_md5_=748ffdbcae8074b3e5317b70badb1505
+_md5_=bb6f2a2a7a131bb9b8cd632592e4e604
diff --git a/metadata/md5-cache/dev-php/phing-2.16.1 b/metadata/md5-cache/dev-php/phing-2.16.1
index c2125ee0fd38..dccefc4528aa 100644
--- a/metadata/md5-cache/dev-php/phing-2.16.1
+++ b/metadata/md5-cache/dev-php/phing-2.16.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DESCRIPTION=PHP project build system based on Apache Ant
 EAPI=6
-HOMEPAGE=http://www.phing.info/
+HOMEPAGE=https://www.phing.info/
 IUSE=doc examples minimal zip
 KEYWORDS=~amd64 ~x86
 LICENSE=FDL-1.3 LGPL-2.1
 RDEPEND=dev-lang/php:*[cli,xml,xslt,zip?] dev-php/symfony-yaml !minimal? ( dev-php/PEAR-HTTP_Request2 dev-php/PEAR-PEAR_PackageFileManager dev-php/PEAR-VersionControl_SVN dev-php/PHP_CodeCoverage dev-php/phpDocumentor dev-php/phpmd dev-php/phpunit dev-php/simpletest dev-php/xdebug )
 SLOT=0
-SRC_URI=http://www.phing.info/get/phing-2.16.1.tgz
-_md5_=5f53a0dbe680de29f4bfa9f7ae0101bc
+SRC_URI=https://www.phing.info/get/phing-2.16.1.tgz
+_md5_=4b1969ef12d00a035e0c35280860d299
diff --git a/metadata/md5-cache/dev-php/smarty-3.1.30 b/metadata/md5-cache/dev-php/smarty-3.1.30
index 2f2050173631..c59305c066e5 100644
--- a/metadata/md5-cache/dev-php/smarty-3.1.30
+++ b/metadata/md5-cache/dev-php/smarty-3.1.30
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst
 DEPEND=doc? ( app-arch/unzip )
 DESCRIPTION=A template engine for PHP
 EAPI=6
-HOMEPAGE=http://www.smarty.net/
+HOMEPAGE=https://www.smarty.net/
 IUSE=doc
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-3
 RDEPEND=dev-lang/php:*[unicode]
 SLOT=0
-SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.30.tar.gz -> smarty-3.1.30.tar.gz doc? ( http://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=6abbfcbec27cb3a77757264bf46e0afa
+SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.30.tar.gz -> smarty-3.1.30.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
+_md5_=a6bcf98c26602fed492eb723d7e97a82
diff --git a/metadata/md5-cache/dev-php/smarty-3.1.31 b/metadata/md5-cache/dev-php/smarty-3.1.31
index 113eccc127d0..97813b5c546a 100644
--- a/metadata/md5-cache/dev-php/smarty-3.1.31
+++ b/metadata/md5-cache/dev-php/smarty-3.1.31
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst
 DEPEND=doc? ( app-arch/unzip )
 DESCRIPTION=A template engine for PHP
 EAPI=6
-HOMEPAGE=http://www.smarty.net/
+HOMEPAGE=https://www.smarty.net/
 IUSE=doc
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=dev-lang/php:*[unicode]
 SLOT=0
-SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.31.tar.gz -> smarty-3.1.31.tar.gz doc? ( http://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=e6cfb6365766a2e3ba27949ae1a72c77
+SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.31.tar.gz -> smarty-3.1.31.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
+_md5_=a36576a188e93b16233776af02b6a5c3
diff --git a/metadata/md5-cache/dev-php/smarty-3.1.32 b/metadata/md5-cache/dev-php/smarty-3.1.32
index 7d581d898066..b2903aa0da02 100644
--- a/metadata/md5-cache/dev-php/smarty-3.1.32
+++ b/metadata/md5-cache/dev-php/smarty-3.1.32
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst
 DEPEND=doc? ( app-arch/unzip )
 DESCRIPTION=A template engine for PHP
 EAPI=6
-HOMEPAGE=http://www.smarty.net/
+HOMEPAGE=https://www.smarty.net/
 IUSE=doc
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=dev-lang/php:*[unicode]
 SLOT=0
-SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.32.tar.gz -> smarty-3.1.32.tar.gz doc? ( http://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=83b89b314e172605142c9de03a44b852
+SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.32.tar.gz -> smarty-3.1.32.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
+_md5_=a36576a188e93b16233776af02b6a5c3
diff --git a/metadata/md5-cache/dev-php/suhosin-0.9.38-r1 b/metadata/md5-cache/dev-php/suhosin-0.9.38-r1
index 09fb84453016..be117d3a4e4e 100644
--- a/metadata/md5-cache/dev-php/suhosin-0.9.38-r1
+++ b/metadata/md5-cache/dev-php/suhosin-0.9.38-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[unicode] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
 DESCRIPTION=Suhosin is an advanced protection system for PHP installations
 EAPI=6
-HOMEPAGE=http://www.suhosin.org/
+HOMEPAGE=https://www.suhosin.org/
 IUSE=php_targets_php5-6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=PHP-3.01
 RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[unicode] ) php_targets_php5-6? ( dev-lang/php:5.6 )
 REQUIRED_USE=|| ( php_targets_php5-6 )
 SLOT=0
-SRC_URI=http://download.suhosin.org/suhosin-0.9.38.tar.gz
+SRC_URI=https://download.suhosin.org/suhosin-0.9.38.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e51f96b3f2da9e199d89c4fda4bce138
+_md5_=e4a0ddbefa672b7c576c6b0afd1db15c
diff --git a/metadata/md5-cache/dev-python/Kivy-1.10.0 b/metadata/md5-cache/dev-python/Kivy-1.10.0
index 0f487268977d..60d9665f0e82 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.10.0
+++ b/metadata/md5-cache/dev-python/Kivy-1.10.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/pillow[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(-)] cairo? ( dev-python/pycairo[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(-)] ) camera? ( media-libs/opencv:0/2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) garden? ( dev-python/kivy-garden[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(-)] ) gstreamer? ( dev-python/gst-python:1.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(-)] ) sdl? ( media-libs/libsdl2 media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-mixer ) !sdl? ( dev-python/pygame[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(-)] ) spell? ( dev-python/pyenchant[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/cython[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/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(-)] doc? ( dev-python/sphinx[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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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=Library for rapid development of hardware-accelerated multitouch applications
 EAPI=6
-HOMEPAGE=http://kivy.org/
+HOMEPAGE=https://kivy.org/
 IUSE=cairo camera doc examples garden gstreamer +sdl spell test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/kivy/Kivy/archive/1.10.0.tar.gz -> Kivy-1.10.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69a6aa68ded9978495216160920f8e17
+_md5_=a17575f08d454a3c78112f677b3f2c04
diff --git a/metadata/md5-cache/dev-python/Kivy-1.9.1 b/metadata/md5-cache/dev-python/Kivy-1.9.1
index 34ed6c457456..c7590914c754 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.9.1
+++ b/metadata/md5-cache/dev-python/Kivy-1.9.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/pillow[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(-)] cairo? ( dev-python/pycairo[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(-)] ) camera? ( media-libs/opencv:0/2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) garden? ( dev-python/kivy-garden[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(-)] ) gstreamer? ( dev-python/gst-python:1.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(-)] ) sdl? ( media-libs/libsdl2 media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-mixer ) !sdl? ( dev-python/pygame[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(-)] ) spell? ( dev-python/pyenchant[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/cython[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/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(-)] doc? ( dev-python/sphinx[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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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=Library for rapid development of hardware-accelerated multitouch applications
 EAPI=6
-HOMEPAGE=http://kivy.org/
+HOMEPAGE=https://kivy.org/
 IUSE=cairo camera doc examples garden gstreamer +sdl spell test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/K/Kivy/kivy-1.9.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6451b524d72ac38186e4dc8de7cdefc4
+_md5_=e5ed7e3217ecbcf9ad05ff08ee07f3c8
diff --git a/metadata/md5-cache/dev-python/Kivy-1.9.1-r1 b/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
index 5dfc8077f704..bd7cb989a5cd 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/pillow[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(-)] cairo? ( dev-python/pycairo[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(-)] ) camera? ( media-libs/opencv:0/2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) garden? ( dev-python/kivy-garden[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(-)] ) gstreamer? ( dev-python/gst-python:1.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(-)] ) sdl? ( media-libs/libsdl2 media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-mixer ) !sdl? ( dev-python/pygame[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(-)] ) spell? ( dev-python/pyenchant[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/cython[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/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(-)] doc? ( dev-python/sphinx[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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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=Library for rapid development of hardware-accelerated multitouch applications
 EAPI=6
-HOMEPAGE=http://kivy.org/
+HOMEPAGE=https://kivy.org/
 IUSE=cairo camera doc examples garden gstreamer +sdl spell test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/K/Kivy/kivy-1.9.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e75950cf51d3ae5585193b00abb07d66
+_md5_=b2c0b5adb84de620ab9c889daad6d9a4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c65a5cc20011..441c4c4ba182 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/PyContracts-1.7.9 b/metadata/md5-cache/dev-python/PyContracts-1.7.9
index 3a8f7c146cac..9857ea0a7293 100644
--- a/metadata/md5-cache/dev-python/PyContracts-1.7.9
+++ b/metadata/md5-cache/dev-python/PyContracts-1.7.9
@@ -4,7 +4,7 @@ DESCRIPTION=Declare constraints on function parameters and return values
 EAPI=5
 HOMEPAGE=https://andreacensi.github.com/contracts/ https://pypi.org/project/PyContracts/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~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=LGPL-2
 RDEPEND=dev-python/decorator[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.7.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19b1161fdbf988c7c16497f6a63584cb
+_md5_=ae536984ccd94ca3118935e044328046
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.39 b/metadata/md5-cache/dev-python/PyGithub-1.39
new file mode 100644
index 000000000000..01ff1084725b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyGithub-1.39
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyjwt[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/setuptools[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(-)]
+DESCRIPTION=Python library to access the Github API v3
+EAPI=6
+HOMEPAGE=https://github.com/PyGithub/PyGithub/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/pyjwt[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://github.com/PyGithub/PyGithub/archive/v1.39.tar.gz -> PyGithub-1.39.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b3123c0f8e7f83af409891cdca4775d
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4 b/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
new file mode 100644
index 000000000000..fafcade7aaef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyjwt[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/setuptools[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(-)]
+DESCRIPTION=Python library to access the Github API v3
+EAPI=6
+HOMEPAGE=https://github.com/PyGithub/PyGithub/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/pyjwt[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://github.com/PyGithub/PyGithub/archive/v1.40a4.tar.gz -> PyGithub-1.40a4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f17abe9c7ef8d271d9687edf7413de9
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.10.1 b/metadata/md5-cache/dev-python/PyQt5-5.10.1
index 8b6eb19554c7..97a660faab65 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.10.1
+++ b/metadata/md5-cache/dev-python/PyQt5-5.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=bluetooth dbus debug declarative designer examples gles2 gui help location multimedia network opengl positioning printsupport sensors serialport sql svg testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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 ) 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(-)] >=dev-python/sip-4.19.6:=[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-qt/qtcore-5.9.3:5 >=dev-qt/qtxml-5.9.3:5 bluetooth? ( >=dev-qt/qtbluetooth-5.9.3:5 ) dbus? ( dev-python/dbus-python[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-qt/qtdbus-5.9.3:5 ) declarative? ( >=dev-qt/qtdeclarative-5.9.3:5[widgets?] ) designer? ( >=dev-qt/designer-5.9.3:5 ) gui? ( >=dev-qt/qtgui-5.9.3:5[gles2=] ) help? ( >=dev-qt/qthelp-5.9.3:5 ) location? ( >=dev-qt/qtlocation-5.9.3:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.3:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.9.3:5 ) opengl? ( >=dev-qt/qtopengl-5.9.3:5 ) positioning? ( >=dev-qt/qtpositioning-5.9.3:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.3:5 ) sensors? ( >=dev-qt/qtsensors-5.9.3:5 ) serialport? ( >=dev-qt/qtserialport-5.9.3:5 ) sql? ( >=dev-qt/qtsql-5.9.3:5 ) svg? ( >=dev-qt/qtsvg-5.9.3:5 ) testlib? ( >=dev-qt/qttest-5.9.3:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.3:5 ) webengine? ( >=dev-qt/qtwebengine-5.9.3:5[widgets?] ) webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.9.3:5 ) widgets? ( >=dev-qt/qtwidgets-5.9.3:5 ) x11extras? ( >=dev-qt/qtx11extras-5.9.3:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.9.3:5 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webengine? ( network widgets? ( printsupport webchannel ) ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt5_gpl-5.10.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=53a1dd348833712623b1ee88456842d3
+_md5_=c59f6dbf9acc47088ba7a003d21018d2
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.9.2 b/metadata/md5-cache/dev-python/PyQt5-5.9.2
index b7ba42f79c25..845fea395ab6 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.9.2
+++ b/metadata/md5-cache/dev-python/PyQt5-5.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=bluetooth dbus debug declarative designer examples gles2 gui help location multimedia network opengl positioning printsupport sensors serialport sql svg testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 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 ) 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(-)] >=dev-python/sip-4.19.6:=[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-qt/qtcore-5.9.3:5 >=dev-qt/qtxml-5.9.3:5 bluetooth? ( >=dev-qt/qtbluetooth-5.9.3:5 ) dbus? ( dev-python/dbus-python[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-qt/qtdbus-5.9.3:5 ) declarative? ( >=dev-qt/qtdeclarative-5.9.3:5[widgets?] ) designer? ( >=dev-qt/designer-5.9.3:5 ) gui? ( >=dev-qt/qtgui-5.9.3:5[gles2=] ) help? ( >=dev-qt/qthelp-5.9.3:5 ) location? ( >=dev-qt/qtlocation-5.9.3:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.3:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.9.3:5 ) opengl? ( >=dev-qt/qtopengl-5.9.3:5 ) positioning? ( >=dev-qt/qtpositioning-5.9.3:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.3:5 ) sensors? ( >=dev-qt/qtsensors-5.9.3:5 ) serialport? ( >=dev-qt/qtserialport-5.9.3:5 ) sql? ( >=dev-qt/qtsql-5.9.3:5 ) svg? ( >=dev-qt/qtsvg-5.9.3:5 ) testlib? ( >=dev-qt/qttest-5.9.3:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.3:5 ) webengine? ( >=dev-qt/qtwebengine-5.9.3:5[widgets?] ) webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.9.3:5 ) widgets? ( >=dev-qt/qtwidgets-5.9.3:5 ) x11extras? ( >=dev-qt/qtx11extras-5.9.3:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.9.3:5 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webengine? ( network widgets? ( printsupport webchannel ) ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt5_gpl-5.9.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f8745d6f35578f2f9aa67b1cce5a03e4
+_md5_=070bf5b701c0c8ab16b97e5e4e980f8b
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.3.0 b/metadata/md5-cache/dev-python/aiohttp-3.3.0
new file mode 100644
index 000000000000..5340d6cabe04
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiohttp-3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=http client/server for asyncio
+EAPI=6
+HOMEPAGE=https://pypi.org/project/aiohttp/
+IUSE=doc test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.3.0.tar.gz -> aiohttp-3.3.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=487ebb22e61057ff46a2219422fc29d6
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0 b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
new file mode 100644
index 000000000000..4af8b0dab25b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-3.2.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-aiohttp-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-capturelog-0.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=jinja2 template renderer for aiohttp.web
+EAPI=6
+HOMEPAGE=https://github.com/aio-libs/aiohttp-jinja2
+IUSE=doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-0.15.0.tar.gz -> aiohttp-jinja2-0.15.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=06c3efa6779b25bf0ebed111d7533336
diff --git a/metadata/md5-cache/dev-python/ansicolor-0.2.6 b/metadata/md5-cache/dev-python/ansicolor-0.2.6
index 21f945dbe5d3..37ab1aef0dff 100644
--- a/metadata/md5-cache/dev-python/ansicolor-0.2.6
+++ b/metadata/md5-cache/dev-python/ansicolor-0.2.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Produce ansi color output and colored highlighting and diffing
 EAPI=6
-HOMEPAGE=https://github.com/numerodix/ansicolor
+HOMEPAGE=https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/a/ansicolor/ansicolor-0.2.6.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b89c3b7f37af357fec17c39402eaab70
+_md5_=c8622492d6f67aa7c79bc13e8f0c4f05
diff --git a/metadata/md5-cache/dev-python/ansicolor-9999 b/metadata/md5-cache/dev-python/ansicolor-9999
index 230f0df62561..4d102e4f85ef 100644
--- a/metadata/md5-cache/dev-python/ansicolor-9999
+++ b/metadata/md5-cache/dev-python/ansicolor-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Produce ansi color output and colored highlighting and diffing
 EAPI=6
-HOMEPAGE=https://github.com/numerodix/ansicolor
+HOMEPAGE=https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eaf920225be037818151f2fe577784c3
+_md5_=6c9e09803e8dc9e3c59ccf432866894b
diff --git a/metadata/md5-cache/dev-python/astroid-1.6.5 b/metadata/md5-cache/dev-python/astroid-1.6.5
new file mode 100644
index 000000000000..1776feeca924
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-1.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/pylint-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=6
+HOMEPAGE=https://github.com/PyCQA/astroid https://pypi.org/project/astroid/
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/astroid/astroid-1.6.5.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a35a3e75382b2e0545d526b9eb2162a
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.0 b/metadata/md5-cache/dev-python/async_timeout-3.0.0
new file mode 100644
index 000000000000..68c4e1944453
--- /dev/null
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-aiohttp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Timeout context manager for asyncio programs
+EAPI=6
+HOMEPAGE=https://github.com/aio-libs/async-timeout
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/async_timeout/async-timeout-3.0.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2764ca90d211db2d45777d422fbfe291
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2 b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
index fc6bfc73dba5..3cd16bc9d83f 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Atomic file writes
 EAPI=6
 HOMEPAGE=https://github.com/untitaker/python-atomicwrites
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 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 ) 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=mirror://pypi/a/atomicwrites/atomicwrites-1.1.5.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=659dcc7095f8f00db61af55047185e93
+_md5_=8d2d88610faa48752555eacc54e545e2
diff --git a/metadata/md5-cache/dev-python/backports-1.0 b/metadata/md5-cache/dev-python/backports-1.0
index 5baebce4ddb5..ace1a66528f2 100644
--- a/metadata/md5-cache/dev-python/backports-1.0
+++ b/metadata/md5-cache/dev-python/backports-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Namespace for backported Python features
 EAPI=5
 HOMEPAGE=https://bitbucket.org/brandon/backports https://pypi.org/project/backports/
 IUSE=python_targets_pypy python_targets_pypy3 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 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=PYTHON
 RDEPEND=!<dev-python/backports-lzma-0.0.2-r1 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/backports-1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=202d7724509c65b5be692f73aef40159
+_md5_=e0f93aa8c9ee057d47a6e5726e0e1468
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.10 b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
index ad61c146271f..37b21e7bbaa9 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.10
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python 3.3's lzma module for XZ/LZMA compressed files
 EAPI=6
 HOMEPAGE=https://github.com/peterjc/backports.lzma/ https://pypi.org/project/backports.lzma/
 IUSE=test python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils:0= dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.10.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d083c6804a7930212e07787b1d6d45aa
+_md5_=61e51c446b9f9a430605de43f5b927a4
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
index 0bab25885704..8fc45e5a1374 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of unittest.mock
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
 IUSE=doc test python_targets_pypy python_targets_pypy3 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 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.3.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f38a03c8f1f599b900751523987e0f8e
+_md5_=3939f1151edc910d99663a24950ce8f9
diff --git a/metadata/md5-cache/dev-python/beaker-1.8.1 b/metadata/md5-cache/dev-python/beaker-1.8.1
index 5c4cf98d1bc1..bd50bd9e21ac 100644
--- a/metadata/md5-cache/dev-python/beaker-1.8.1
+++ b/metadata/md5-cache/dev-python/beaker-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Session and Caching library with WSGI Middleware
 EAPI=5
 HOMEPAGE=https://github.com/bbangert/beaker https://beaker.readthedocs.io/en/latest/ https://pypi.org/project/Beaker/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=virtual/python-funcsigs[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 )
 SLOT=0
 SRC_URI=https://github.com/bbangert/beaker/archive/1.8.1.tar.gz -> beaker-1.8.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41cafa3fcf0aa2a0970ffd923771eede
+_md5_=71018968ab30fee20d4d5909e0456e20
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.0 b/metadata/md5-cache/dev-python/betamax-0.8.0
index 1e23afa47ffc..2f630245330b 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.0
+++ b/metadata/md5-cache/dev-python/betamax-0.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=python-requests HTTP exchanges recorder
 EAPI=6
 HOMEPAGE=https://github.com/sigmavirus24/betamax
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94a758a21d31fd0695bd84eec760da00
+_md5_=b901f07ff618e20a61911a299edac4b7
diff --git a/metadata/md5-cache/dev-python/bz2file-0.98 b/metadata/md5-cache/dev-python/bz2file-0.98
index daadb8e2b02d..b7bf06f6d85d 100644
--- a/metadata/md5-cache/dev-python/bz2file-0.98
+++ b/metadata/md5-cache/dev-python/bz2file-0.98
@@ -4,11 +4,11 @@ DESCRIPTION=Replacement for bz2.BZ2File with features from newest CPython
 EAPI=6
 HOMEPAGE=https://pypi.org/project/bz2file/ https://github.com/nvawda/bz2file
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bz2file/bz2file-0.98.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f29675f739f053e6e368ce4b0f5c0050
+_md5_=cedcbea0074d593d6336e4034a26798d
diff --git a/metadata/md5-cache/dev-python/cached-property-0.1.5 b/metadata/md5-cache/dev-python/cached-property-0.1.5
deleted file mode 100644
index a6f783ff48b5..000000000000
--- a/metadata/md5-cache/dev-python/cached-property-0.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A cached-property for decorating methods in classes
-EAPI=5
-HOMEPAGE=https://github.com/pydanny/cached-property
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cached-property/cached-property-0.1.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a7c4e9369c8c63b21b6e19ef7eac1cfe
diff --git a/metadata/md5-cache/dev-python/cached-property-1.0.0 b/metadata/md5-cache/dev-python/cached-property-1.0.0
deleted file mode 100644
index 19bae345b273..000000000000
--- a/metadata/md5-cache/dev-python/cached-property-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A cached-property for decorating methods in classes
-EAPI=5
-HOMEPAGE=https://github.com/pydanny/cached-property
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cached-property/cached-property-1.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a7c4e9369c8c63b21b6e19ef7eac1cfe
diff --git a/metadata/md5-cache/dev-python/cached-property-1.2.0 b/metadata/md5-cache/dev-python/cached-property-1.2.0
deleted file mode 100644
index 35680a172382..000000000000
--- a/metadata/md5-cache/dev-python/cached-property-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A cached-property for decorating methods in classes
-EAPI=5
-HOMEPAGE=https://github.com/pydanny/cached-property
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cached-property/cached-property-1.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a7c4e9369c8c63b21b6e19ef7eac1cfe
diff --git a/metadata/md5-cache/dev-python/cached-property-1.4.2 b/metadata/md5-cache/dev-python/cached-property-1.4.2
new file mode 100644
index 000000000000..5c83c3a84103
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cached-property-1.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest dev-python/freezegun ) 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 cached-property for decorating methods in classes
+EAPI=6
+HOMEPAGE=https://github.com/pydanny/cached-property
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+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 ) 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=mirror://pypi/c/cached-property/cached-property-1.4.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7fe894c9640edb88e9c88dd502ad64e3
diff --git a/metadata/md5-cache/dev-python/certifi-2017.1.23 b/metadata/md5-cache/dev-python/certifi-2017.1.23
index f2096e4bd473..fe143c5af52c 100644
--- a/metadata/md5-cache/dev-python/certifi-2017.1.23
+++ b/metadata/md5-cache/dev-python/certifi-2017.1.23
@@ -4,11 +4,11 @@ DESCRIPTION=Python package for providing Mozilla's CA Bundle
 EAPI=6
 HOMEPAGE=http://certifi.io/ https://pypi.org/project/certifi/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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=LGPL-2.1
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2017.1.23.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a345340cd11eed0c4f47d688db9c63ca
+_md5_=999bf1a4f6820e115da64a0d48182d1f
diff --git a/metadata/md5-cache/dev-python/certifi-2018.4.16 b/metadata/md5-cache/dev-python/certifi-2018.4.16
index 3a93ce5b8e18..e97fc197bd10 100644
--- a/metadata/md5-cache/dev-python/certifi-2018.4.16
+++ b/metadata/md5-cache/dev-python/certifi-2018.4.16
@@ -10,5 +10,5 @@ RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2018.4.16.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9a61ae9e2d6a1e56e6d25724e002a3e2
diff --git a/metadata/md5-cache/dev-python/cjkwrap-2.2 b/metadata/md5-cache/dev-python/cjkwrap-2.2
new file mode 100644
index 000000000000..8f7165e8f893
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cjkwrap-2.2
@@ -0,0 +1,14 @@
+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(-)] 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=A library for wrapping and filling UTF-8 CJK text
+EAPI=6
+HOMEPAGE=https://fgallaire.github.io/cjkwrap/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=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 )
+SLOT=0
+SRC_URI=https://github.com/fgallaire/cjkwrap/archive/v2.2.tar.gz -> cjkwrap-2.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=492c234adb08b278d96d4d3bf398f016
diff --git a/metadata/md5-cache/dev-python/clang-python-5.0.2 b/metadata/md5-cache/dev-python/clang-python-5.0.2
index 877cdf23f94c..165e2f4ec473 100644
--- a/metadata/md5-cache/dev-python/clang-python-5.0.2
+++ b/metadata/md5-cache/dev-python/clang-python-5.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/cfe-5.0.2.src.tar.xz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8f510b61465166600a3ac7ae8e83be75
+_md5_=e23ba0577b2185a6eef1530ec03f19ab
diff --git a/metadata/md5-cache/dev-python/clang-python-6.0.0 b/metadata/md5-cache/dev-python/clang-python-6.0.0
index e04d9ffac5f2..8430bf24e8b4 100644
--- a/metadata/md5-cache/dev-python/clang-python-6.0.0
+++ b/metadata/md5-cache/dev-python/clang-python-6.0.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=78009c43c6e3cf5f31be5c73b2d3d675
+_md5_=efddccb0ebe9ad50381ae75b34ad74f8
diff --git a/metadata/md5-cache/dev-python/clang-python-6.0.9999 b/metadata/md5-cache/dev-python/clang-python-6.0.9999
index 7f15d71b94e5..6fc4aded7322 100644
--- a/metadata/md5-cache/dev-python/clang-python-6.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-6.0.9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2b675b5ebf90a18bf677363be863abcc
+_md5_=3c12376def77f1ca596877277563f670
diff --git a/metadata/md5-cache/dev-python/clang-python-9999 b/metadata/md5-cache/dev-python/clang-python-9999
index e9586f73fe23..fa9e747e1569 100644
--- a/metadata/md5-cache/dev-python/clang-python-9999
+++ b/metadata/md5-cache/dev-python/clang-python-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e91fe4a312f7d255a4d8286070339307
+_md5_=0486e90ea60cc425b6632a043fd8bd81
diff --git a/metadata/md5-cache/dev-python/coverage-4.2 b/metadata/md5-cache/dev-python/coverage-4.2
index f66b3456b0ca..472f86c0c667 100644
--- a/metadata/md5-cache/dev-python/coverage-4.2
+++ b/metadata/md5-cache/dev-python/coverage-4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Code coverage measurement for Python
 EAPI=5
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~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=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=02d7dd0bd7bf6f50622023a74f2f7ad9
+_md5_=4b9e442203bb6bcd9aa2698e365f9025
diff --git a/metadata/md5-cache/dev-python/cssselect-0.9.1 b/metadata/md5-cache/dev-python/cssselect-0.9.1
index 2621e17f2d0b..a7725b3819b3 100644
--- a/metadata/md5-cache/dev-python/cssselect-0.9.1
+++ b/metadata/md5-cache/dev-python/cssselect-0.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=5
 HOMEPAGE=https://cssselect.readthedocs.io/en/latest/ https://pypi.org/project/cssselect/
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 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 ) 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=mirror://pypi/c/cssselect/cssselect-0.9.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb04e8e93f7d01e9ffb4745734f91749
+_md5_=2397d3e8ba97cfe8c0586d9575d3492f
diff --git a/metadata/md5-cache/dev-python/cython-0.25.2 b/metadata/md5-cache/dev-python/cython-0.25.2
index 00b984241ad7..5174aa72ba6e 100644
--- a/metadata/md5-cache/dev-python/cython-0.25.2
+++ b/metadata/md5-cache/dev-python/cython-0.25.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Python to C compiler
 EAPI=6
 HOMEPAGE=http://cython.org https://pypi.org/project/Cython/
 IUSE=doc emacs test 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_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_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=mirror://pypi/C/Cython/Cython-0.25.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59e19f387b0ae5e37800822d2883ad9f
+_md5_=18646b92319067bc9bc994af2e063ff3
diff --git a/metadata/md5-cache/dev-python/django-evolution-0.7.4 b/metadata/md5-cache/dev-python/django-evolution-0.7.4
deleted file mode 100644
index d66cd9c01a13..000000000000
--- a/metadata/md5-cache/dev-python/django-evolution-0.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[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(-)]
-DESCRIPTION=A Django application that will run cron jobs for other django apps
-EAPI=5
-HOMEPAGE=https://pypi.org/project/django_evolution/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/django[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=http://downloads.reviewboard.org/releases/django-evolution/0.7/django_evolution-0.7.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f33743bafb581b02eef1a326627047ab
diff --git a/metadata/md5-cache/dev-python/django-evolution-0.7.5 b/metadata/md5-cache/dev-python/django-evolution-0.7.5
deleted file mode 100644
index 9d0c369f2f1b..000000000000
--- a/metadata/md5-cache/dev-python/django-evolution-0.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[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(-)]
-DESCRIPTION=A Django application that will run cron jobs for other django apps
-EAPI=5
-HOMEPAGE=https://pypi.org/project/django_evolution/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/django[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=http://downloads.reviewboard.org/releases/django-evolution/0.7/django_evolution-0.7.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79294a5e5b5329dba33ea715c46c653b
diff --git a/metadata/md5-cache/dev-python/django-tagging-0.4.6 b/metadata/md5-cache/dev-python/django-tagging-0.4.6
new file mode 100644
index 000000000000..47bc7f9187ce
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-tagging-0.4.6
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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(-)] doc? ( dev-python/sphinx[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=Generic tagging application for Django
+EAPI=7
+HOMEPAGE=https://pypi.org/project/django-tagging/
+IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.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(-)] 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=mirror://pypi/d/django-tagging/django-tagging-0.4.6.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=36006c6d47b47b32f766658d706b7c9f
diff --git a/metadata/md5-cache/dev-python/docutils-0.12 b/metadata/md5-cache/dev-python/docutils-0.12
index 22f370ad0a82..275d982aeb16 100644
--- a/metadata/md5-cache/dev-python/docutils-0.12
+++ b/metadata/md5-cache/dev-python/docutils-0.12
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=5
 HOMEPAGE=http://docutils.sourceforge.net/ https://pypi.org/project/docutils/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=419bfa629cb1ec38c40bb0cf58c3ac0b
+_md5_=9b8a92737fa4619ede02934a46a9d532
diff --git a/metadata/md5-cache/dev-python/docutils-0.13.1 b/metadata/md5-cache/dev-python/docutils-0.13.1
index 9c8e5ffe3407..4aba1fe306cc 100644
--- a/metadata/md5-cache/dev-python/docutils-0.13.1
+++ b/metadata/md5-cache/dev-python/docutils-0.13.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=6
 HOMEPAGE=http://docutils.sourceforge.net/ https://pypi.org/project/docutils/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.13.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=22f17b252f587a2334dbdf4fe875082f
+_md5_=4cecaf2fed7fdde3a862fba728874df4
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.1 b/metadata/md5-cache/dev-python/docutils-glep-1.1
index ee030cdeda01..f1a431ae0d6c 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.1
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo GLEP support for docutils
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/docutils-glep/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=>=dev-python/docutils-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils_glep/docutils_glep-1.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b7dd9255078a6e5d695d788121ff0aa
+_md5_=01f2e747f4660658d327afb6946e4015
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.6.5 b/metadata/md5-cache/dev-python/dynd-python-0.6.5
deleted file mode 100644
index 7b250f80dd8f..000000000000
--- a/metadata/md5-cache/dev-python/dynd-python-0.6.5
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-libs/libdynd-0.6.5 >=dev-python/numpy-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cython-0.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Python exposure of multidimensionnal array library libdynd
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/dynd-python
-IUSE=doc test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-libs/libdynd-0.6.5 >=dev-python/numpy-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/ContinuumIO/dynd-python/archive/v0.6.5.tar.gz -> dynd-python-0.6.5.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d15bc52e8c519ab2ad04806026b2d308
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.6.6 b/metadata/md5-cache/dev-python/dynd-python-0.6.6
deleted file mode 100644
index 70c9e9d8785c..000000000000
--- a/metadata/md5-cache/dev-python/dynd-python-0.6.6
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-libs/libdynd-0.6.6 >=dev-python/numpy-1.5[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/cython-0.19[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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Python exposure of multidimensionnal array library libdynd
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/dynd-python
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-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(-)] ~dev-libs/libdynd-0.6.6 >=dev-python/numpy-1.5[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=https://github.com/ContinuumIO/dynd-python/archive/v0.6.6.tar.gz -> dynd-python-0.6.6.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e696db62994561f838b641791af450c7
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.10 b/metadata/md5-cache/dev-python/ebuildtester-0.1.10
new file mode 100644
index 000000000000..e078456082e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sphinx[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(-)]
+DESCRIPTION=A dockerized approach to test a Gentoo package within a clean stage3 container
+EAPI=6
+HOMEPAGE=http://ebuildtester.readthedocs.io/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-emulation/docker 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=mirror://pypi/e/ebuildtester/ebuildtester-0.1.10.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=233a1cedf3e0c9f5e146e988a07d809a
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.2 b/metadata/md5-cache/dev-python/ebuildtester-0.1.2
deleted file mode 100644
index 8daad98e0a70..000000000000
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)]
-DESCRIPTION=A dockerized approach to test a Gentoo package within a clean stage3
-EAPI=6
-HOMEPAGE=https://github.com/nicolasbock/ebuildtester
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-emulation/docker 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=mirror://pypi/e/ebuildtester/ebuildtester-0.1.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bca206b5a1386016c408486b82d4fea6
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.3 b/metadata/md5-cache/dev-python/ebuildtester-0.1.3
deleted file mode 100644
index 7d999f68742e..000000000000
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)]
-DESCRIPTION=A dockerized approach to test a Gentoo package within a clean stage3
-EAPI=6
-HOMEPAGE=http://ebuildtester.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-emulation/docker 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=mirror://pypi/e/ebuildtester/ebuildtester-0.1.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45570432ff64dffcd44577047d1782ec
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.4 b/metadata/md5-cache/dev-python/ebuildtester-0.1.4
deleted file mode 100644
index cb3f628f56b1..000000000000
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)]
-DESCRIPTION=A dockerized approach to test a Gentoo package within a clean stage3
-EAPI=6
-HOMEPAGE=http://ebuildtester.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-emulation/docker 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=mirror://pypi/e/ebuildtester/ebuildtester-0.1.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45570432ff64dffcd44577047d1782ec
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.5 b/metadata/md5-cache/dev-python/ebuildtester-0.1.5
deleted file mode 100644
index 9f3894f99525..000000000000
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)]
-DESCRIPTION=A dockerized approach to test a Gentoo package within a clean stage3
-EAPI=6
-HOMEPAGE=http://ebuildtester.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-emulation/docker 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=mirror://pypi/e/ebuildtester/ebuildtester-0.1.5.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45570432ff64dffcd44577047d1782ec
diff --git a/metadata/md5-cache/dev-python/fastparquet-0.1.5 b/metadata/md5-cache/dev-python/fastparquet-0.1.5
new file mode 100644
index 000000000000..6b7ec4308408
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fastparquet-0.1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numba[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/numpy[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/pandas[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/pytest[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/thrift[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(-)] brotli? ( app-arch/brotli[python,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(-)] ) lzo? ( dev-python/python-lzo[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(-)] ) lz4? ( dev-python/lz4[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(-)] ) snappy? ( dev-python/snappy[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(-)] ) zstd? ( dev-python/zstandard[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/cython[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(-)] 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=Python implementation of the parquet columnar file format
+EAPI=6
+HOMEPAGE=https://github.com/dask/fastparquet
+IUSE=brotli lz4 lzo +snappy zstd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/numba[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/numpy[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/pandas[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/pytest[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/thrift[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(-)] brotli? ( app-arch/brotli[python,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(-)] ) lzo? ( dev-python/python-lzo[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(-)] ) lz4? ( dev-python/lz4[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(-)] ) snappy? ( dev-python/snappy[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(-)] ) zstd? ( dev-python/zstandard[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(-)] ) 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 )
+SLOT=0
+SRC_URI=mirror://pypi/f/fastparquet/fastparquet-0.1.5.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c1eb572b374306ca976a7be5291769d8
diff --git a/metadata/md5-cache/dev-python/guessit-3.0.0 b/metadata/md5-cache/dev-python/guessit-3.0.0
new file mode 100644
index 000000000000..915159b6b127
--- /dev/null
+++ b/metadata/md5-cache/dev-python/guessit-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/babelfish-0.5.5[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/rebulk-0.9.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(-)] dev-python/python-dateutil[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/pyyaml[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/setuptools[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/six[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(-)] test? ( >=dev-python/pytest-3.4[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/pytest-runner[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(-)]
+DESCRIPTION=Python library for guessing information from video filenames
+EAPI=6
+HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.org/project/guessit/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-python/babelfish-0.5.5[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/rebulk-0.9.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(-)] dev-python/python-dateutil[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/pyyaml[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/setuptools[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/six[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=mirror://pypi/g/guessit/guessit-3.0.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f55e35f1f2548902c45ab358dd332372
diff --git a/metadata/md5-cache/dev-python/guessit-9999 b/metadata/md5-cache/dev-python/guessit-9999
index f269fb14bcd4..afbdb638b944 100644
--- a/metadata/md5-cache/dev-python/guessit-9999
+++ b/metadata/md5-cache/dev-python/guessit-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/babelfish-0.5.5[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/rebulk-0.9.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(-)] dev-python/python-dateutil[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/pyyaml[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/setuptools[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/six[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(-)] test? ( >=dev-python/pytest-2.7.3[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/pytest-capturelog[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/pytest-runner[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(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-python/babelfish-0.5.5[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/rebulk-0.9.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(-)] dev-python/python-dateutil[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/pyyaml[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/setuptools[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/six[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(-)] test? ( >=dev-python/pytest-3.4[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/pytest-runner[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(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Python library for guessing information from video filenames
 EAPI=6
 HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.org/project/guessit/
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=499e38855a286a03181d85fdc60a634a
+_md5_=eecb1d214a9c63f1cad063b64358b7d8
diff --git a/metadata/md5-cache/dev-python/iconvcodec-1.1.2-r1 b/metadata/md5-cache/dev-python/iconvcodec-1.1.2-r1
deleted file mode 100644
index 4a1ecb738953..000000000000
--- a/metadata/md5-cache/dev-python/iconvcodec-1.1.2-r1
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python Codecs for Iconv Encodings
-EAPI=5
-HOMEPAGE=http://cjkpython.i18n.org/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ia64 x86
-LICENSE=LGPL-2.1
-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=mirror://gentoo/iconvcodec-1.1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aba59b01837a165cc501dc708c11e5fb
diff --git a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2 b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
index a1cfdac5324e..d510feca62fe 100644
--- a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
+++ b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-4.6.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19f3434a741cef4c926d6b92b70bb60d
+_md5_=73df9223e0e5d6bbce4d47287be36d78
diff --git a/metadata/md5-cache/dev-python/ipykernel-4.8.2 b/metadata/md5-cache/dev-python/ipykernel-4.8.2
new file mode 100644
index 000000000000..031f7457292b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-4.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/ipython-4.0.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(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/jupyter_client[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/traitlets-4.1.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(-)] >=www-servers/tornado-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(-)] dev-python/setuptools[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(-)] test? ( dev-python/nose[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/nose_warnings_filters[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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_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_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=6
+HOMEPAGE=https://github.com/ipython/ipykernel
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/ipython-4.0.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(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/jupyter_client[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/traitlets-4.1.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(-)] >=www-servers/tornado-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_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_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=mirror://pypi/i/ipykernel/ipykernel-4.8.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dc7ec6355089cb8c298441a8c2817565
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-1.3.1 b/metadata/md5-cache/dev-python/jaraco-logging-1.3.1
deleted file mode 100644
index 7b33de4240f7..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-logging-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tempora[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/pytest-2.8[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/pytest-runner[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=Additional facilities to supplement Python's stdlib logging module
-EAPI=5
-HOMEPAGE=https://github.com/jaraco/jaraco.logging
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tempora[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 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-1.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4603c112be5c23d7fb1150652a98ed9b
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-1.5.2 b/metadata/md5-cache/dev-python/jaraco-logging-1.5.2
new file mode 100644
index 000000000000..d2c791c998e6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-logging-1.5.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/namespace-jaraco[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tempora[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DESCRIPTION=Additional facilities to supplement Python's stdlib logging module
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.logging
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/namespace-jaraco[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tempora[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-1.5.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4524fa363079c73709d5fede29773907
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-5.1 b/metadata/md5-cache/dev-python/jaraco-packaging-5.1
new file mode 100644
index 000000000000..dc27e3cdba2e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-5.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/setuptools_scm-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] doc? ( >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) test? ( >=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/namespace-jaraco[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] )
+DESCRIPTION=Tools to supplement packaging Python releases
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.packaging
+IUSE=doc test python_targets_pypy python_targets_pypy3 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 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/namespace-jaraco[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-5.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=39484295db3bafd33a2d46f8f88b4691
diff --git a/metadata/md5-cache/dev-python/josepy-1.1.0 b/metadata/md5-cache/dev-python/josepy-1.1.0
index 08ca725609e2..b5d3b2297ee7 100644
--- a/metadata/md5-cache/dev-python/josepy-1.1.0
+++ b/metadata/md5-cache/dev-python/josepy-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=JOSE protocol implementation in Python
 EAPI=6
 HOMEPAGE=https://github.com/jezdez/josepy
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/setuptools-1.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(-)] >=dev-python/cryptography-0.8[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/pyopenssl-0.13[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/six-1.9.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(-)] !<=app-crypt/acme-0.20.0 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=mirror://pypi/j/josepy/josepy-1.1.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebc350abbc3444e005058de890dfa950
+_md5_=ca69fd4d4296963765bc08dc9bcf9792
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.6.0 b/metadata/md5-cache/dev-python/jsonschema-2.6.0
index 17095afebfc9..b0eb5bb926fc 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.6.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of JSON-Schema validation for Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/rfc3987[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/strict-rfc3339[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/webcolors[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.6.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36558be6476e22d778dbd05bab6c226a
+_md5_=a009b898400f06ae660d9dae3cb03d24
diff --git a/metadata/md5-cache/dev-python/kiwi-1.9.39.2 b/metadata/md5-cache/dev-python/kiwi-1.9.39.2
deleted file mode 100644
index bac36eef08a2..000000000000
--- a/metadata/md5-cache/dev-python/kiwi-1.9.39.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Kiwi is a pure Python framework and set of enhanced PyGTK widgets
-EAPI=5
-HOMEPAGE=https://launchpad.net/kiwi https://pypi.org/project/kiwi-gtk/
-IUSE=examples test python_targets_python2_7 test
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/setuptools-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.24[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=mirror://pypi/k/kiwi-gtk/kiwi-gtk-1.9.39.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0addf7918bb76e48531970a8562f08f
diff --git a/metadata/md5-cache/dev-python/kiwi-1.9.40 b/metadata/md5-cache/dev-python/kiwi-1.9.40
deleted file mode 100644
index 7f243f873eef..000000000000
--- a/metadata/md5-cache/dev-python/kiwi-1.9.40
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Kiwi is a pure Python framework and set of enhanced PyGTK widgets
-EAPI=5
-HOMEPAGE=https://launchpad.net/kiwi https://pypi.org/project/kiwi-gtk/
-IUSE=examples test python_targets_python2_7 test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/setuptools-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.24[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=mirror://pypi/k/kiwi-gtk/kiwi-gtk-1.9.40.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b8c7b9fecb3d732c46586c3a4e4f094
diff --git a/metadata/md5-cache/dev-python/libvirt-python-4.3.0-r1 b/metadata/md5-cache/dev-python/libvirt-python-4.3.0-r1
index ceb77fa25459..047c83af5f26 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-4.3.0-r1
+++ b/metadata/md5-cache/dev-python/libvirt-python-4.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=libvirt Python bindings
 EAPI=6
 HOMEPAGE=https://www.libvirt.org
 IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/4.3.0 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://libvirt.org/sources/python/libvirt-python-4.3.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b4d6731eb54a5068aa7041028e46c00
+_md5_=9e94d587ff549b81d857ca4e3efe3977
diff --git a/metadata/md5-cache/dev-python/lit-5.0.2 b/metadata/md5-cache/dev-python/lit-5.0.2
index 834aad638dec..f7bb05a71a92 100644
--- a/metadata/md5-cache/dev-python/lit-5.0.2
+++ b/metadata/md5-cache/dev-python/lit-5.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd
 LICENSE=UoI-NCSA
 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 ) 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://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ba42d51479bd92fcbc29d9d109bc609
+_md5_=e6adbed295a6841ea245f9d97972bf6f
diff --git a/metadata/md5-cache/dev-python/lit-6.0.0 b/metadata/md5-cache/dev-python/lit-6.0.0
index 9567c4f234cd..dbc500d41bed 100644
--- a/metadata/md5-cache/dev-python/lit-6.0.0
+++ b/metadata/md5-cache/dev-python/lit-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd
 LICENSE=UoI-NCSA
 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 ) 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2e61381d72656c053270dd6f15b6f8a
+_md5_=e12f742e382359cd202a6dea89207911
diff --git a/metadata/md5-cache/dev-python/lit-9999 b/metadata/md5-cache/dev-python/lit-9999
index 796676d801ea..9efc4c728dc1 100644
--- a/metadata/md5-cache/dev-python/lit-9999
+++ b/metadata/md5-cache/dev-python/lit-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/psutil[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(-)] sys-devel/llvm ) 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(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/llvm ) 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-vcs/git-1.8.2.1
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=6
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7
 LICENSE=UoI-NCSA
-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 ) 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 )
+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 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=205b15533b87d5a06a440fc06d47a957
+_md5_=548bd796ca629bc01e47fa6927da18e0
diff --git a/metadata/md5-cache/dev-python/lxml-4.1.1 b/metadata/md5-cache/dev-python/lxml-4.1.1
index 236cb42ac2c2..5923b414dcce 100644
--- a/metadata/md5-cache/dev-python/lxml-4.1.1
+++ b/metadata/md5-cache/dev-python/lxml-4.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=6
 HOMEPAGE=http://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
 IUSE=doc examples +threads test python_targets_pypy 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 ~s390 ~sh sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.9.2 >=dev-libs/libxslt-1.1.28 python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-4.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=57e4dced00d1bbe2551154ff7253fab4
+_md5_=a57c58c39e6539e91cc26a8177f1e043
diff --git a/metadata/md5-cache/dev-python/mako-1.0.6 b/metadata/md5-cache/dev-python/mako-1.0.6
index f720f3e86989..4576ee02581a 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.6
+++ b/metadata/md5-cache/dev-python/mako-1.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=A Python templating language
 EAPI=6
 HOMEPAGE=http://www.makotemplates.org/ https://pypi.org/project/Mako/
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb4d51ef96bf6cae8109ba84af2e7289
+_md5_=24679fdd631f885fd5f1639a3a6914c3
diff --git a/metadata/md5-cache/dev-python/multidict-4.3.1 b/metadata/md5-cache/dev-python/multidict-4.3.1
new file mode 100644
index 000000000000..2cbc07bfe3b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/multidict-4.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=multidict implementation
+EAPI=6
+HOMEPAGE=https://github.com/aio-libs/multidict/
+IUSE=doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/aio-libs/multidict/archive/v4.3.1.tar.gz -> multidict-4.3.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e9ad2ed43c18a52e53091375a84283ab
diff --git a/metadata/md5-cache/dev-python/mypy-0.4.5 b/metadata/md5-cache/dev-python/mypy-0.4.5
deleted file mode 100644
index 88a781056a9c..000000000000
--- a/metadata/md5-cache/dev-python/mypy-0.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/flake8[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Optional static typing for Python
-EAPI=5
-HOMEPAGE=http://www.mypy-lang.org/
-IUSE=doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_4? ( !dev-python/typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/JukkaL/mypy/archive/v0.4.5.tar.gz -> mypy-0.4.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23f8191e0c5dbfe668a207a6b53750ab
diff --git a/metadata/md5-cache/dev-python/mypy-0.600 b/metadata/md5-cache/dev-python/mypy-0.600
new file mode 100644
index 000000000000..8e14dfa3eea7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mypy-0.600
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/flake8[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Optional static typing for Python
+EAPI=6
+HOMEPAGE=http://www.mypy-lang.org/
+IUSE=doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=!dev-util/stubgen >=dev-python/psutil-5.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/psutil-5.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/typed-ast-1.1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/typed-ast-1.2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/python/mypy/archive/v0.600.tar.gz -> mypy-0.600.tar.gz https://api.github.com/repos/python/typeshed/tarball/2dc7d39 -> mypy-typeshed-0.600-2dc7d39.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=96cbd5ec6d0f107adb353f6b956809f2
diff --git a/metadata/md5-cache/dev-python/namespace-jaraco-1 b/metadata/md5-cache/dev-python/namespace-jaraco-1
new file mode 100644
index 000000000000..75d87ba69190
--- /dev/null
+++ b/metadata/md5-cache/dev-python/namespace-jaraco-1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+DESCRIPTION=Namespace package declaration for jaraco
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~amd64-fbsd ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=public-domain
+RDEPEND=!<dev-python/jaraco-logging-1.5.2 !<dev-python/jaraco-packaging-5.1 dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=583a2b1f5c3d3ad8d88b4bdee3c17a67
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.21.1 b/metadata/md5-cache/dev-python/oslo-concurrency-3.21.1
deleted file mode 100644
index 75396dc88165..000000000000
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.21.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)] test? ( >=dev-python/oslotest-1.10.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(-)] >=dev-python/coverage-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(-)] !~dev-python/coverage-4.4[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-futures[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/fixtures-3.0.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(-)] >=dev-python/sphinx-1.6.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(-)] >=dev-python/openstackdocstheme-1.16.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(-)] >=dev-python/reno-1.8.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(-)] !~dev-python/reno-2.3.1[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/eventlet-0.18.4[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/eventlet-0.20.1[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/eventlet-0.21.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(-)] ) 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=library for running multi-thread, multi-process applications
-EAPI=6
-HOMEPAGE=https://pypi.org/project/oslo.concurrency/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=virtual/python-enum34[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/oslo-config-4.0.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(-)] !~dev-python/oslo-config-4.3.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(-)] !~dev-python/oslo-config-4.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(-)] >=dev-python/oslo-i18n-2.1.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(-)] !~dev-python/oslo-i18n-3.15.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(-)] >=dev-python/oslo-utils-3.20.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(-)] >=dev-python/six-1.9.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(-)] >=dev-python/fasteners-0.7[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=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.21.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8755522fee1dd5cc8a22087d90f1bdb
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.25.0 b/metadata/md5-cache/dev-python/oslo-concurrency-3.25.0
deleted file mode 100644
index 6e11a785f064..000000000000
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)] test? ( >=dev-python/oslotest-1.10.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(-)] >=dev-python/coverage-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(-)] !~dev-python/coverage-4.4[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-futures[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/fixtures-3.0.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(-)] >=dev-python/sphinx-1.6.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(-)] >=dev-python/openstackdocstheme-1.17.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(-)] >=dev-python/reno-2.5.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(-)] >=dev-python/eventlet-0.18.4[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/eventlet-0.20.1[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/eventlet-0.21.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(-)] >=dev-python/bandit-1.1.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(-)] ) 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=library for running multi-thread, multi-process applications
-EAPI=6
-HOMEPAGE=https://pypi.org/project/oslo.concurrency/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=virtual/python-enum34[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/oslo-config-5.1.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(-)] >=dev-python/oslo-i18n-3.15.3[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/oslo-utils-3.33.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(-)] >=dev-python/six-1.10.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(-)] >=dev-python/fasteners-0.7.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(-)] 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=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.25.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b204b91b9499a21b0293d44f2dd1339
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1 b/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1
index 881f11d4616c..2253ccc2f193 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1
@@ -4,11 +4,11 @@ DESCRIPTION=library for running multi-thread, multi-process applications
 EAPI=6
 HOMEPAGE=https://pypi.org/project/oslo.concurrency/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/python-enum34[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/oslo-config-5.1.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(-)] >=dev-python/oslo-i18n-3.15.3[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/oslo-utils-3.33.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(-)] >=dev-python/six-1.10.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(-)] >=dev-python/fasteners-0.7.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(-)] 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=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.25.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43374bdd8467d18ed002cd984099d48d
+_md5_=2398fb20fb1d900d888edbd10422af06
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.25.1-r1 b/metadata/md5-cache/dev-python/oslo-db-4.25.1-r1
deleted file mode 100644
index ce6892267411..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-4.25.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.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=OpenStack Common DB Code
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.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/alembic-0.8.10[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/debtcollector-1.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(-)] >=dev-python/oslo-i18n-2.1.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/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.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/oslo-config-4.3.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/oslo-config-4.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(-)] >=dev-python/oslo-utils-3.20.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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( || ( dev-python/pymysql[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/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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(-)] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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/sqlalchemy-migrate-0.11.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/stevedore-1.20.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/six-1.9.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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.25.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9bc73acc66fe86377aaeb79b32bcf2c7
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.33.0 b/metadata/md5-cache/dev-python/oslo-db-4.33.0
deleted file mode 100644
index e7e85300cde8..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-4.33.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.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=OpenStack Common DB Code
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.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/alembic-0.8.10[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/debtcollector-1.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(-)] >=dev-python/oslo-i18n-3.15.3[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/oslo-config-5.1.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/oslo-utils-3.33.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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( || ( dev-python/pymysql[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/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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(-)] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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/sqlalchemy-migrate-0.11.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/stevedore-1.20.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/six-1.10.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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.33.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fab6b946acd9fc58cb9aaefd5d5ea89e
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.33.1 b/metadata/md5-cache/dev-python/oslo-db-4.33.1
index 0a003f5f2163..763caae86e96 100644
--- a/metadata/md5-cache/dev-python/oslo-db-4.33.1
+++ b/metadata/md5-cache/dev-python/oslo-db-4.33.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenStack Common DB Code
 EAPI=6
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=+sqlite mysql postgres python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.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/alembic-0.8.10[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/debtcollector-1.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(-)] >=dev-python/oslo-i18n-3.15.3[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/oslo-config-5.1.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/oslo-utils-3.33.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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( || ( dev-python/pymysql[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/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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(-)] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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/sqlalchemy-migrate-0.11.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/stevedore-1.20.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/six-1.10.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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.33.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14da5ce19727a4d1fc753f905b8215a4
+_md5_=fab6b946acd9fc58cb9aaefd5d5ea89e
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.28.2 b/metadata/md5-cache/dev-python/oslo-utils-3.28.2
deleted file mode 100644
index 36c000e78b80..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-3.28.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[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/pbr-2.0.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(-)] !~dev-python/pbr-2.1.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(-)] test? ( >=dev-python/fixtures-3.0.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(-)] >=dev-python/subunit-0.0.18[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/testrepository-0.0.18[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/testscenarios-0.4[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/testtools-1.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(-)] >=dev-python/oslotest-1.10.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(-)] >=dev-python/coverage-4.0.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(-)] !~dev-python/coverage-4.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(-)] >=dev-python/mock-2.0.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(-)] >=dev-python/oslo-config-4.0.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(-)] !~dev-python/oslo-config-4.3.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(-)] !~dev-python/oslo-config-4.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(-)] >=dev-python/bandit-1.1.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(-)] >=dev-python/reno-1.8.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(-)] ) doc? ( >=dev-python/sphinx-1.6.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(-)] >=dev-python/openstackdocstheme-1.16.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(-)] >=dev-python/reno-1.8.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(-)] !~dev-python/reno-2.3.1[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(-)]
-DESCRIPTION=Oslo Utility library
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.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(-)] !~dev-python/pbr-2.1.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(-)] >=dev-python/six-1.9.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-funcsigs[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/iso8601-0.1.11[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/oslo-i18n-2.1.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(-)] !~dev-python/oslo-i18n-3.15.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(-)] >=dev-python/monotonic-0.6[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/pytz-2013.6[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/netaddr-0.7.13[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/netaddr-0.7.16[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/netifaces-0.10.4[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/debtcollector-1.2.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(-)] >=dev-python/pyparsing-2.1.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(-)] 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=mirror://pypi/o/oslo.utils/oslo.utils-3.28.2.tar.gz -> oslo-utils-3.28.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d23302cb9ca8bf4573b114a6e2e73c82
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.35.1 b/metadata/md5-cache/dev-python/oslo-utils-3.35.1
new file mode 100644
index 000000000000..8932e6c53c8b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-utils-3.35.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[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/pbr-2.0.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(-)] !~dev-python/pbr-2.1.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(-)] test? ( >=dev-python/fixtures-3.0.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(-)] >=dev-python/testrepository-0.0.18[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/testscenarios-0.4[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/testtools-2.2.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(-)] >=dev-python/oslotest-3.2.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(-)] >=dev-python/ddt-1.0.1[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/coverage-4.0.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(-)] !~dev-python/coverage-4.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(-)] >=dev-python/mock-2.0.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(-)] >=dev-python/oslo-config-5.1.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(-)] >=dev-python/bandit-1.1.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(-)] ) doc? ( >=dev-python/sphinx-1.6.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(-)] !~dev-python/sphinx-1.6.6[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/openstackdocstheme-1.18.1[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/reno-2.5.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(-)] >=dev-python/fixtures-3.0.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(-)] ) 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=Oslo Utility library
+EAPI=6
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.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(-)] !~dev-python/pbr-2.1.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(-)] >=dev-python/six-1.10.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-funcsigs[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/iso8601-0.1.11[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/oslo-i18n-3.15.3[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/monotonic-0.6[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/pytz-2013.6[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/netaddr-0.7.18[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/netifaces-0.10.4[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/debtcollector-1.2.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(-)] >=dev-python/pyparsing-2.1.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(-)] 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=mirror://pypi/o/oslo.utils/oslo.utils-3.35.1.tar.gz -> oslo-utils-3.35.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0d7a6b003f7bedc8267ab83d57526c2b
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.1 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.1
deleted file mode 100644
index 35d3944fe5f7..000000000000
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.0 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=A library that provides a generic versioned and RPC-friendly object model.
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.0 >=dev-python/six-1.9.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/oslo-concurrency-3.8.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/oslo-config-4.0.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/oslo-config-4.3.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/oslo-config-4.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(-)] >=dev-python/oslo-context-2.14.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/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.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/oslo-serialization-1.10.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/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.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/iso8601-0.1.11[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/oslo-log-3.22.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/oslo-i18n-2.1.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/oslo-i18n-3.15.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/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[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/netaddr-0.7.16[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 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.26.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58a1c899c30122b6f3a64fcab3f566a9
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.2 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.2
deleted file mode 100644
index ec222d0746de..000000000000
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.2
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.0 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=A library that provides a generic versioned and RPC-friendly object model.
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.0 >=dev-python/six-1.10.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/oslo-concurrency-3.20.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/oslo-config-5.1.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/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.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/oslo-serialization-1.18.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/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.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/iso8601-0.1.11[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/oslo-log-3.30.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/oslo-i18n-3.15.3[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/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[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 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.31.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fc2f0cbaa254d0951ceb3b5720fe001
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3
index 282008d1f210..4484bd3ddf78 100644
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3
@@ -4,11 +4,11 @@ DESCRIPTION=A library that provides a generic versioned and RPC-friendly object
 EAPI=6
 HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.0 >=dev-python/six-1.10.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/oslo-concurrency-3.25.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/oslo-config-5.1.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/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.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/oslo-serialization-1.18.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/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.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/iso8601-0.1.11[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/oslo-log-3.36.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/oslo-i18n-3.15.3[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/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[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 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.31.3.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93ba265fb926cc8cddc715c7baadc7b8
+_md5_=fbd139da7305d1b4ae73c400f8816b01
diff --git a/metadata/md5-cache/dev-python/pbr-3.1.1 b/metadata/md5-cache/dev-python/pbr-3.1.1
index bebfd012026b..87ebccd6bded 100644
--- a/metadata/md5-cache/dev-python/pbr-3.1.1
+++ b/metadata/md5-cache/dev-python/pbr-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
 EAPI=6
 HOMEPAGE=https://github.com/openstack-dev/pbr
 IUSE=test python_targets_pypy python_targets_pypy3 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 x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-3.1.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d3e9237435ad8c157aeaf483ba28c03
+_md5_=b7a070a6aafcaef60f1040b59ada4d63
diff --git a/metadata/md5-cache/dev-python/pbr-4.0.2 b/metadata/md5-cache/dev-python/pbr-4.0.2
index acedf0accc2d..6aa69c25de3e 100644
--- a/metadata/md5-cache/dev-python/pbr-4.0.2
+++ b/metadata/md5-cache/dev-python/pbr-4.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
 EAPI=6
 HOMEPAGE=https://github.com/openstack-dev/pbr
 IUSE=test python_targets_pypy python_targets_pypy3 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 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-4.0.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=329b5e44568642d1dba6f5322c888be0
+_md5_=60f34fb24d03dd0d3db1b13078602734
diff --git a/metadata/md5-cache/dev-python/pbr-4.0.3 b/metadata/md5-cache/dev-python/pbr-4.0.3
index c92684636812..cf983e228338 100644
--- a/metadata/md5-cache/dev-python/pbr-4.0.3
+++ b/metadata/md5-cache/dev-python/pbr-4.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
 EAPI=6
 HOMEPAGE=https://github.com/openstack-dev/pbr
 IUSE=test python_targets_pypy python_targets_pypy3 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 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-4.0.3.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=329b5e44568642d1dba6f5322c888be0
+_md5_=60f34fb24d03dd0d3db1b13078602734
diff --git a/metadata/md5-cache/dev-python/pbr-4.0.4 b/metadata/md5-cache/dev-python/pbr-4.0.4
new file mode 100644
index 000000000000..dc44ebf73ca0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pbr-4.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] test? ( >=dev-python/coverage-4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] !~dev-python/coverage-4.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/fixtures-3.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/mock-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/subunit-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/testrepository-0.0.18[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/testresources-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/testscenarios-0.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/testtools-2.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/virtualenv-14.0.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-vcs/git ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
+EAPI=6
+HOMEPAGE=https://github.com/openstack-dev/pbr
+IUSE=test python_targets_pypy python_targets_pypy3 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 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pbr/pbr-4.0.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60f34fb24d03dd0d3db1b13078602734
diff --git a/metadata/md5-cache/dev-python/pip-9.0.1-r1 b/metadata/md5-cache/dev-python/pip-9.0.1-r1
index e5833bd79e63..e00e50695472 100644
--- a/metadata/md5-cache/dev-python/pip-9.0.1-r1
+++ b/metadata/md5-cache/dev-python/pip-9.0.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=6
 HOMEPAGE=https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
 IUSE=python_targets_pypy 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 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-9.0.1.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=750856c027cc3512ea5bfcdf2cdb85e3
+_md5_=2b4497f2ea7e4ee073323fb05e22e850
diff --git a/metadata/md5-cache/dev-python/pip-9.0.1-r2 b/metadata/md5-cache/dev-python/pip-9.0.1-r2
index f8914c7fcacf..12f375cc97fa 100644
--- a/metadata/md5-cache/dev-python/pip-9.0.1-r2
+++ b/metadata/md5-cache/dev-python/pip-9.0.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=6
 HOMEPAGE=https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
 IUSE=-vanilla python_targets_pypy python_targets_pypy3 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 ~amd64-linux ~x86-linux ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-9.0.1.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3bc99739535bf32aa2b807e5e37fabc7
+_md5_=b93e5892016daf443c8329321cc3edea
diff --git a/metadata/md5-cache/dev-python/pluggy-0.5.2 b/metadata/md5-cache/dev-python/pluggy-0.5.2
index c3ff69d606fe..84f0f55f7510 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.5.2
+++ b/metadata/md5-cache/dev-python/pluggy-0.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin and hook calling mechanisms for python
 EAPI=6
 HOMEPAGE=https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.5.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33fcfb0d5e67916d6dad9105412ffa2f
+_md5_=4dfb62addd11bccbf032b5e610873a29
diff --git a/metadata/md5-cache/dev-python/pluggy-0.6.0 b/metadata/md5-cache/dev-python/pluggy-0.6.0
index 0db8ad8d1e23..a34756a91d24 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.6.0
+++ b/metadata/md5-cache/dev-python/pluggy-0.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=plugin and hook calling mechanisms for python
 EAPI=6
 HOMEPAGE=https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/
 IUSE=test python_targets_pypy python_targets_pypy3 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 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.6.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4365587cabe4ae0242077fb449cc5620
+_md5_=39112f70db12cd289ac159134cee6c47
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.2.0 b/metadata/md5-cache/dev-python/prometheus_client-0.2.0
index ca2115e798bc..e0034be25f45 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.2.0
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python client for the Prometheus monitoring system
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prometheus_client/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=|| ( dev-python/twisted[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/twisted-web[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://github.com/prometheus/client_python/archive/v0.2.0.tar.gz -> prometheus_client-0.2.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4f17b3115c933a3c2008582f7ad8691
+_md5_=1061842abe0e6181037c212fbd79013b
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.3 b/metadata/md5-cache/dev-python/psutil-5.4.3
index 63e7b8b2545f..dc03a03f42f3 100644
--- a/metadata/md5-cache/dev-python/psutil-5.4.3
+++ b/metadata/md5-cache/dev-python/psutil-5.4.3
@@ -4,7 +4,7 @@ DESCRIPTION=Retrieve information on running processes and system utilization
 EAPI=6
 HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.4.3.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80c0c494a209cc2ef4cce2470346ccde
+_md5_=ca4a93d5be1edacb2692363446895a11
diff --git a/metadata/md5-cache/dev-python/pyblake2-1.1.2 b/metadata/md5-cache/dev-python/pyblake2-1.1.2
index 75da3e026a0e..26a6432c6c74 100644
--- a/metadata/md5-cache/dev-python/pyblake2-1.1.2
+++ b/metadata/md5-cache/dev-python/pyblake2-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=BLAKE2 hash function extension module
 EAPI=6
 HOMEPAGE=https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2/
 IUSE=python_targets_pypy python_targets_pypy3 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 ~x64-cygwin ~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 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( CC0-1.0 openssl Apache-2.0 )
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyblake2/pyblake2-1.1.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=785c0955a8a351ae19ef5b48d7930391
+_md5_=b5734c94696002dcea0c2da010487615
diff --git a/metadata/md5-cache/dev-python/pychroot-9999 b/metadata/md5-cache/dev-python/pychroot-9999
index 4e8370cddec7..5fed6ca38abd 100644
--- a/metadata/md5-cache/dev-python/pychroot-9999
+++ b/metadata/md5-cache/dev-python/pychroot-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-python/snakeoil-9999[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/setuptools[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(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[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/sphinx[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(-)] >=dev-vcs/git-1.8.2.1
+DEPEND==dev-python/snakeoil-9999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=a python library and cli tool that simplify chroot handling
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pychroot
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=BSD
-RDEPEND==dev-python/snakeoil-9999[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 )
+RDEPEND==dev-python/snakeoil-9999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ddcb4abee0ecac4d31005dd874fa989
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0efc4c6f6180a2509a2743ee65f9671a
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.4.7 b/metadata/md5-cache/dev-python/pycryptodome-3.4.7
index 7a549ce426a4..901b201c8a0e 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.4.7
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.4.7
@@ -4,11 +4,11 @@ DESCRIPTION=A self-contained cryptographic library for Python
 EAPI=6
 HOMEPAGE=https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/
 IUSE=python_targets_pypy python_targets_pypy3 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 ~ppc-aix ~amd64-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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 Unlicense
 RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] !dev-python/pycrypto python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.4.7.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66fc1fb8d7a1807942455cec99e21c8f
+_md5_=78d0c754ad53c210c466f68de335e1a9
diff --git a/metadata/md5-cache/dev-python/pyflann-1.8.4 b/metadata/md5-cache/dev-python/pyflann-1.8.4
deleted file mode 100644
index 7e3920f72f51..000000000000
--- a/metadata/md5-cache/dev-python/pyflann-1.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~sci-libs/flann-1.8.4 test? ( dev-python/nose[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(-)]
-DESCRIPTION=Python bindings for FLANN artificial neural network library
-EAPI=5
-HOMEPAGE=http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~sci-libs/flann-1.8.4 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=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip test? ( https://dev.gentoo.org/~bicatali/distfiles/flann-1.8.4-testdata.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4cb684b028f450028f85c4e9337979ef
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
index 303d63488882..9cf52776d778 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python FTP server library
 EAPI=6
 HOMEPAGE=https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/
 IUSE=doc examples ssl test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~amd64 ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=ssl? ( dev-python/pyopenssl[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[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=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=mirror://pypi/p/pyftpdlib/pyftpdlib-1.5.4.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f649874b642735e609bbed2bc24617fd
+_md5_=f88c5fb0b066cbafb8830162b9477ae2
diff --git a/metadata/md5-cache/dev-python/pygit2-0.27.1 b/metadata/md5-cache/dev-python/pygit2-0.27.1
new file mode 100644
index 000000000000..0336d99d970a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygit2-0.27.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libgit2-0.27* >=dev-python/cffi-1.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(-)] dev-python/six[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(-)]
+DESCRIPTION=Python bindings for libgit2
+EAPI=6
+HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+RDEPEND==dev-libs/libgit2-0.27* >=dev-python/cffi-1.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(-)] dev-python/six[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=mirror://pypi/p/pygit2/pygit2-0.27.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4bc154cfe9c51da6123b6456a5e77670
diff --git a/metadata/md5-cache/dev-python/pygments-2.1.1 b/metadata/md5-cache/dev-python/pygments-2.1.1
index 89fb90b063d7..06efb63e23f8 100644
--- a/metadata/md5-cache/dev-python/pygments-2.1.1
+++ b/metadata/md5-cache/dev-python/pygments-2.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Pygments is a syntax highlighting package written in Python
 EAPI=6
 HOMEPAGE=http://pygments.org/ https://pypi.org/project/Pygments/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~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=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.1.1.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1392f13a38b088ba5f6bf636e06feada
+_md5_=894f0a4120c4a52a969bd6de8dd3f74f
diff --git a/metadata/md5-cache/dev-python/pygments-2.2.0 b/metadata/md5-cache/dev-python/pygments-2.2.0
index 8f12aeeaad1c..76d1f75937bb 100644
--- a/metadata/md5-cache/dev-python/pygments-2.2.0
+++ b/metadata/md5-cache/dev-python/pygments-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Pygments is a syntax highlighting package written in Python
 EAPI=6
 HOMEPAGE=http://pygments.org/ https://pypi.org/project/Pygments/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.2.0.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c47768cc8dc5690ca65d894d8ca74a18
+_md5_=7c97f46de77f4a6199f9f2fd82176485
diff --git a/metadata/md5-cache/dev-python/pylint-1.8.4 b/metadata/md5-cache/dev-python/pylint-1.8.4
new file mode 100644
index 000000000000..3524e101906d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-1.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/isort-4.2.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mccabe[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <dev-python/pytest-3.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python code static checker
+EAPI=6
+HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
+IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/isort-4.2.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mccabe[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pylint/pylint-1.8.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5ac659242df4b82908b7c4bff6f0874
diff --git a/metadata/md5-cache/dev-python/pymediainfo-2.3.0 b/metadata/md5-cache/dev-python/pymediainfo-2.3.0
deleted file mode 100644
index 934341a4366d..000000000000
--- a/metadata/md5-cache/dev-python/pymediainfo-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) test? ( dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] media-libs/libmediainfo dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
-DESCRIPTION=A wrapper around the mediainfo library
-EAPI=6
-HOMEPAGE=https://github.com/sbraz/pymediainfo
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] media-libs/libmediainfo python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-2.3.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27361ea4047b480eb15a1b1e57c5b2e9
diff --git a/metadata/md5-cache/dev-python/pymediainfo-2.3.0-r1 b/metadata/md5-cache/dev-python/pymediainfo-2.3.0-r1
new file mode 100644
index 000000000000..9364351b2a1c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymediainfo-2.3.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) test? ( dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] media-libs/libmediainfo dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+DESCRIPTION=A wrapper around the mediainfo library
+EAPI=6
+HOMEPAGE=https://github.com/sbraz/pymediainfo
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] media-libs/libmediainfo python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-2.3.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=00d3c253288fcadd32d917b904ce99b6
diff --git a/metadata/md5-cache/dev-python/pyotp-2.2.6 b/metadata/md5-cache/dev-python/pyotp-2.2.6
new file mode 100644
index 000000000000..db0b36b94b91
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyotp-2.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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(-)]
+DESCRIPTION=PyOTP is a Python library for generating and verifying one-time passwords.
+EAPI=6
+HOMEPAGE=https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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 ) 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=mirror://pypi/p/pyotp/pyotp-2.2.6.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a9633f305839a96d5bd4f398c66a101e
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1
index 077416f0d0f2..218b290757b5 100644
--- a/metadata/md5-cache/dev-python/pysendfile-2.0.1
+++ b/metadata/md5-cache/dev-python/pysendfile-2.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A python interface to sendfile(2) system call
 EAPI=5
 HOMEPAGE=https://github.com/giampaolo/pysendfile
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysendfile/pysendfile-2.0.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05c4e2621952904693b724d7550f1ba5
+_md5_=8353e30f931aeac2441820b7620f6c45
diff --git a/metadata/md5-cache/dev-python/pysha3-1.0.2-r1 b/metadata/md5-cache/dev-python/pysha3-1.0.2-r1
index 57383b965778..294688cb52e8 100644
--- a/metadata/md5-cache/dev-python/pysha3-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/pysha3-1.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=SHA-3 (Keccak) for Python 2.7 - 3.5
 EAPI=6
 HOMEPAGE=https://github.com/tiran/pysha3 https://pypi.org/project/pysha3/
 IUSE=python_targets_pypy 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 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0 PSF-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysha3/pysha3-1.0.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5207e591abf825ce55ef264823c56aa5
+_md5_=85725c4ec00c17451724ca6f1e73935e
diff --git a/metadata/md5-cache/dev-python/pyside-tools-0.2.15-r1 b/metadata/md5-cache/dev-python/pyside-tools-0.2.15-r1
deleted file mode 100644
index 505fd5ff6ff1..000000000000
--- a/metadata/md5-cache/dev-python/pyside-tools-0.2.15-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)] >=dev-python/pyside-1.2.0:0[X,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/shiboken-1.2.0: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(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 test? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=PySide development tools (lupdate, rcc, uic)
-EAPI=6
-HOMEPAGE=http://wiki.qt.io/PySide
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=amd64 x86
-LICENSE=BSD GPL-2
-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 ) 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(-)] >=dev-python/pyside-1.2.0:0[X,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/shiboken-1.2.0: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(-)] dev-qt/qtcore:4 dev-qt/qtgui:4
-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/PySide/Tools/archive/0.2.15.tar.gz -> pyside-tools-0.2.15.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9da1951a52cc509d6b477c1702e5ab45
diff --git a/metadata/md5-cache/dev-python/pytest-3.2.2 b/metadata/md5-cache/dev-python/pytest-3.2.2
index 874cde4a4413..cbfb0d042de1 100644
--- a/metadata/md5-cache/dev-python/pytest-3.2.2
+++ b/metadata/md5-cache/dev-python/pytest-3.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=6
 HOMEPAGE=http://pytest.org/
 IUSE=doc test python_targets_pypy python_targets_pypy3 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 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/py-1.4.33[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) !<dev-python/logilab-common-1.3.0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.2.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36f681f3763900b88e02a2051d77c125
+_md5_=24569c02b897c4c6eb0dbd5768ede6ee
diff --git a/metadata/md5-cache/dev-python/pytest-3.4.1-r1 b/metadata/md5-cache/dev-python/pytest-3.4.1-r1
index 597f759262b1..44fed2234a75 100644
--- a/metadata/md5-cache/dev-python/pytest-3.4.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-3.4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=6
 HOMEPAGE=http://pytest.org/
 IUSE=doc test python_targets_pypy python_targets_pypy3 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 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/pluggy-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) !<dev-python/logilab-common-1.3.0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.4.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd9beac918e9972987ebc51b101021c9
+_md5_=6e68c707f27e16091b698df1108bc034
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0 b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0
new file mode 100644
index 000000000000..af2e2d720bef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=pytest plugin for aiohttp support
+EAPI=6
+HOMEPAGE=https://github.com/aio-libs/pytest-aiohttp/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/aiohttp-0.22.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.3.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=957a43c5f28b94bbe5b1a44d38015d3d
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-1.7.0 b/metadata/md5-cache/dev-python/pytest-metadata-1.7.0
new file mode 100644
index 000000000000..025f60522ce9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+DESCRIPTION=A plugin for pytest that provides access to test session metadata
+EAPI=6
+HOMEPAGE=https://github.com/davehunt/pytest-metadata/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-metadata/pytest-metadata-1.7.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d1c76a2584c646ec768785688b8c77e
diff --git a/metadata/md5-cache/dev-python/python-ntpdshm-0.2.1 b/metadata/md5-cache/dev-python/python-ntpdshm-0.2.1
new file mode 100644
index 000000000000..a7ee56ce3a72
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-ntpdshm-0.2.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-lang/swig:0
+DESCRIPTION=Python interface to ntpd shared memory driver 28
+EAPI=7
+HOMEPAGE=https://github.com/mjuenema/python-ntpdshm
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mjuenema/python-ntpdshm/archive/0.2.1.tar.gz -> python-ntpdshm-0.2.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e2953e7ee1a171b56f0df1b5fb5f3e47
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-3.14.2 b/metadata/md5-cache/dev-python/python-openstackclient-3.14.2
new file mode 100644
index 000000000000..7dcc68cc3b3a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-openstackclient-3.14.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.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/pbr-2.1.0 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=A client for the OpenStack APIs
+EAPI=6
+HOMEPAGE=https://github.com/openstack/python-openstackclient
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.0 >=dev-python/six-1.10.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/Babel-2.3.4[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/Babel-2.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(-)] >=dev-python/cliff-2.8.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/cliff-2.9.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/keystoneauth-3.3.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/openstacksdk-0.9.19[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/osc-lib-1.8.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/oslo-i18n-3.15.3[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/oslo-utils-3.33.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/python-glanceclient-2.8.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/python-keystoneclient-3.8.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/python-novaclient-9.1.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/python-cinderclient-3.3.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 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-3.14.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b866738e3c913bba423a4582f8af0d20
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.7 b/metadata/md5-cache/dev-python/python-stdnum-1.7
deleted file mode 100644
index 9d8d1c6b9a00..000000000000
--- a/metadata/md5-cache/dev-python/python-stdnum-1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools test? ( dev-python/nose ) 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 module to handle standardized numbers and codes
-EAPI=6
-HOMEPAGE=https://arthurdejong.org/python-stdnum/
-IUSE=vies test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=vies? ( dev-python/suds ) 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=mirror://pypi/p/python-stdnum/python-stdnum-1.7.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5222a9f1ebfe4bf4b749f0c92ba796e0
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.8.1 b/metadata/md5-cache/dev-python/python-stdnum-1.8.1
deleted file mode 100644
index c2996a94eaeb..000000000000
--- a/metadata/md5-cache/dev-python/python-stdnum-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools test? ( dev-python/nose ) 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 module to handle standardized numbers and codes
-EAPI=6
-HOMEPAGE=https://arthurdejong.org/python-stdnum/
-IUSE=vies test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=vies? ( || ( dev-python/zeep dev-python/suds ) ) 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=mirror://pypi/p/python-stdnum/python-stdnum-1.8.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1efdccad7ca97d74d0cbb8f871c2c0e9
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.9 b/metadata/md5-cache/dev-python/python-stdnum-1.9
new file mode 100644
index 000000000000..de45ce2b7507
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-stdnum-1.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools test? ( dev-python/nose ) 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 module to handle standardized numbers and codes
+EAPI=6
+HOMEPAGE=https://arthurdejong.org/python-stdnum/
+IUSE=vies test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=vies? ( || ( dev-python/zeep dev-python/suds ) ) 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=mirror://pypi/p/python-stdnum/python-stdnum-1.9.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8fdbb2f009e2ce45888e15f43f02b030
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0 b/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
index 5954707160bc..84c7fb626440 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=A utility belt for advanced users of python-requests
 EAPI=6
 HOMEPAGE=https://toolbelt.readthedocs.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/requests-3.0.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(-)] 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.8.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=685d3d66961c62acadae237b41861dad
+_md5_=3c18c3151d4c372379448642dca9e4bd
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index 007f8925ebd6..3658eca94bef 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/pbr-0.11[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(-)]
+DEPEND=dev-python/setuptools[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/pbr-2.0.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(-)] 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=Finds the correct path to exceptions in the requests library.
 EAPI=6
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.11[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(-)]
+RDEPEND=>=dev-python/pbr-2.0.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(-)] 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=mirror://pypi/r/requestsexceptions/requestsexceptions-1.4.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cac57607954320a9424d1591af55bfdb
+_md5_=4c79e5c92eb628aa66b72df2bb1b1f46
diff --git a/metadata/md5-cache/dev-python/ropemacs-0.8 b/metadata/md5-cache/dev-python/ropemacs-0.8
index 1f56a6ee0a18..bc585de1f4c5 100644
--- a/metadata/md5-cache/dev-python/ropemacs-0.8
+++ b/metadata/md5-cache/dev-python/ropemacs-0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rope[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ropemacs/ropemacs-0.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1ae24ab01fb5c54ba76e697ddefb2b37
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
index 6998c556cff1..b0f2edd02d00 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Ruamel enhancements to pathlib and pathlib2
 EAPI=6
 HOMEPAGE=https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib
 IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm64
 LICENSE=MIT
 RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/pathlib2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/std.pathlib/get/0.6.3.tar.gz -> ruamel-std-pathlib-0.6.3.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=531481a78d8dc2a91478aea9b9797954
+_md5_=cd00ded8c3031cfbdfa2ed0e4f1cd14d
diff --git a/metadata/md5-cache/dev-python/setuptools-36.7.2 b/metadata/md5-cache/dev-python/setuptools-36.7.2
index f02bb2db918c..c4765c7469b4 100644
--- a/metadata/md5-cache/dev-python/setuptools-36.7.2
+++ b/metadata/md5-cache/dev-python/setuptools-36.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
 IUSE=test python_targets_pypy python_targets_pypy3 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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-36.7.2.zip
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cebff140fa1a5ba168e14b5d2120b014
+_md5_=12f3f8ef15af3130769f44fde6442403
diff --git a/metadata/md5-cache/dev-python/setuptools-38.5.1 b/metadata/md5-cache/dev-python/setuptools-38.5.1
index 38f515c65759..80816789441a 100644
--- a/metadata/md5-cache/dev-python/setuptools-38.5.1
+++ b/metadata/md5-cache/dev-python/setuptools-38.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
 IUSE=test python_targets_pypy python_targets_pypy3 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 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-38.5.1.zip
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d8ad336c4eb8f3d261bf9289ed55136
+_md5_=634f18b8a64afd89b45ddea13c2134f8
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1 b/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1
index a4c4b1ec5ecd..de5759753701 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=package to manage versions by scm tags via setuptools
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/
 IUSE=git mercurial test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.15.6.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3c6be8290f1d92ba95a145b9cb75c09
+_md5_=fe921a991764ed27f10704736de6fc83
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.15.7 b/metadata/md5-cache/dev-python/setuptools_scm-1.15.7
index 393578be682d..a0e28ba6c233 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.15.7
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.15.7
@@ -4,7 +4,7 @@ DESCRIPTION=package to manage versions by scm tags via setuptools
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/
 IUSE=git mercurial test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.15.7.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0b6a2b0d48fe0a1f9e0b6eb3954f969
+_md5_=390ed5d8bcb943d4f3a3b31aae248fae
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.16.1 b/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
index 2751bceb0435..b3034f67db9a 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
@@ -4,11 +4,11 @@ DESCRIPTION=package to manage versions by scm tags via setuptools
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/
 IUSE=git mercurial test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.16.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab9fcdf62bfe5e3a130b651377d5a6e4
+_md5_=93b93f8cd6bdb37c066ee75c08505534
diff --git a/metadata/md5-cache/dev-python/simpleparse-2.1.1-r1 b/metadata/md5-cache/dev-python/simpleparse-2.1.1-r1
deleted file mode 100644
index 643e7e2ec88c..000000000000
--- a/metadata/md5-cache/dev-python/simpleparse-2.1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-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_python2_7(-)]
-DESCRIPTION=A Parser Generator for mxTextTools
-EAPI=5
-HOMEPAGE=http://simpleparse.sourceforge.net https://pypi.org/project/SimpleParse/
-IUSE=doc examples test python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86
-LICENSE=eGenixPublic-1.1 HPND
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/S/SimpleParse/SimpleParse-2.1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8dba1f686bb5a7777b8a890c6abf5c8
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index 4d5e25409e35..4b7bf397e0ae 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/mock[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_python3_4? ( dev-python/cython[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/cython[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/cython[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_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_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=misc common functionality and useful optimizations
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/snakeoil
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_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_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 )
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=30102bb54c957b1c1a16e7fabf865a37
+_md5_=a7f5c62da0b261445f73d3ae4e8475b4
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.4 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.4
index 05269a5ccded..8651a70ab17b 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.4
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=6
 HOMEPAGE=http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=doc examples +sqlite test python_targets_pypy python_targets_pypy3 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+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 ~x64-solaris
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.2.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f64922151d5e19a43e27c83c23d156b1
+_md5_=fb405d0dce0fc256ba929601476577ca
diff --git a/metadata/md5-cache/dev-python/tdaemon-0.1.6 b/metadata/md5-cache/dev-python/tdaemon-0.1.6
deleted file mode 100644
index 360784bca26e..000000000000
--- a/metadata/md5-cache/dev-python/tdaemon-0.1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] coverage? ( dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[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(-)]
-DESCRIPTION=Test Daemon
-EAPI=5
-HOMEPAGE=https://github.com/brunobord/tdaemon
-IUSE=coverage python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] coverage? ( dev-python/coverage[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/tampakrap/tdaemon/archive/v0.1.6.tar.gz -> tdaemon-0.1.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6436fdff276cee0dee03c4798a93ac88
diff --git a/metadata/md5-cache/dev-python/tempora-1.11 b/metadata/md5-cache/dev-python/tempora-1.11
new file mode 100644
index 000000000000..e493dcbb56b2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tempora-1.11
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<=dev-python/jaraco-utils-10.0.2 >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] ) test? ( >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/backports-unittest-mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/freezegun[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] )
+DESCRIPTION=Objects and routines pertaining to date and time
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/tempora
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/t/tempora/tempora-1.11.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=565e2c3547ba94e4aca0006859034e75
diff --git a/metadata/md5-cache/dev-python/tempora-1.6.1 b/metadata/md5-cache/dev-python/tempora-1.6.1
deleted file mode 100644
index 94065ceedfef..000000000000
--- a/metadata/md5-cache/dev-python/tempora-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] !<=dev-python/jaraco-utils-10.0.2 >=dev-python/setuptools_scm-1.9[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(-)] doc? ( dev-python/sphinx[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/rst-linker[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/pytest-2.8[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/pytest-runner[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=Objects and routines pertaining to date and time
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/tempora
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pytz[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/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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/t/tempora/tempora-1.6.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5a43bc6ae92d62f1730c2b2c4ca2e18
diff --git a/metadata/md5-cache/dev-python/texttable-1.2.1 b/metadata/md5-cache/dev-python/texttable-1.2.1
new file mode 100644
index 000000000000..b1a65131f016
--- /dev/null
+++ b/metadata/md5-cache/dev-python/texttable-1.2.1
@@ -0,0 +1,14 @@
+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(-)] test? ( dev-python/pytest[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(-)] cjk? ( dev-python/cjkwrap[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(-)] ) ) 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=Module for creating simple ASCII tables
+EAPI=6
+HOMEPAGE=https://github.com/foutaise/texttable
+IUSE=cjk test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=cjk? ( dev-python/cjkwrap[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(-)] ) 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 )
+SLOT=0
+SRC_URI=https://github.com/foutaise/texttable/archive/v1.2.1.tar.gz -> texttable-1.2.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=01017247406556064c7a9f85d01fbd7a
diff --git a/metadata/md5-cache/dev-python/thrift-0.11.0 b/metadata/md5-cache/dev-python/thrift-0.11.0
new file mode 100644
index 000000000000..bbc875c372e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/thrift-0.11.0
@@ -0,0 +1,14 @@
+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(-)] 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=Python implementation of Thrift
+EAPI=6
+HOMEPAGE=https://thrift.apache.org
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=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 )
+SLOT=0
+SRC_URI=mirror://pypi/t/thrift/thrift-0.11.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c030f054c392de5642a189257ac813ed
diff --git a/metadata/md5-cache/dev-python/tooz-1.58.0-r1 b/metadata/md5-cache/dev-python/tooz-1.58.0-r1
deleted file mode 100644
index 4cd92b2e03f8..000000000000
--- a/metadata/md5-cache/dev-python/tooz-1.58.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] >=dev-python/pbr-1.8[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=Library centralizing the most common distributed primitives
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/tooz/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[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/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.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-enum34[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/voluptuous-0.8.9[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/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(-)] >=dev-python/fasteners-0.7.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/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[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/futurist-0.11.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/futurist-0.15.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/oslo-utils-3.18.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/oslo-serialization-1.10.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 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tooz/tooz-1.58.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e81101c0887d05e25b2621238bd53fe8
diff --git a/metadata/md5-cache/dev-python/tooz-1.60.0-r1 b/metadata/md5-cache/dev-python/tooz-1.60.0-r1
deleted file mode 100644
index b46098c8598a..000000000000
--- a/metadata/md5-cache/dev-python/tooz-1.60.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] >=dev-python/pbr-1.8[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=Library centralizing the most common distributed primitives
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/tooz/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[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/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.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-enum34[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/voluptuous-0.8.9[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/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(-)] >=dev-python/fasteners-0.7.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/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[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/futurist-0.11.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/futurist-0.15.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/oslo-utils-3.18.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/oslo-serialization-1.10.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 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tooz/tooz-1.60.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0274810c20fd4216336782d4c8a01a05
diff --git a/metadata/md5-cache/dev-python/tooz-1.60.1 b/metadata/md5-cache/dev-python/tooz-1.60.1
index 7738772b110d..417aee371610 100644
--- a/metadata/md5-cache/dev-python/tooz-1.60.1
+++ b/metadata/md5-cache/dev-python/tooz-1.60.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library centralizing the most common distributed primitives
 EAPI=6
 HOMEPAGE=http://docs.openstack.org/developer/tooz/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[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/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.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-enum34[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/voluptuous-0.8.9[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/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(-)] >=dev-python/fasteners-0.7.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/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[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/futurist-0.11.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/futurist-0.15.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/oslo-utils-3.18.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/oslo-serialization-1.10.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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tooz/tooz-1.60.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=57a5d8d91ddd5c7199c9249281c80559
+_md5_=0274810c20fd4216336782d4c8a01a05
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.8.2 b/metadata/md5-cache/dev-python/txAMQP-0.8.2
new file mode 100644
index 000000000000..0deea8f1bee3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/txAMQP-0.8.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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(-)] test? ( || ( dev-python/twisted[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/twisted-core[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/six[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(-)] net-misc/rabbitmq-server )
+DESCRIPTION=Python library for communicating with AMQP peers using Twisted
+EAPI=7
+HOMEPAGE=https://github.com/txamqp/txamqp
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=|| ( dev-python/twisted[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/twisted-core[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/six[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[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/txamqp/txamqp/archive/0.8.2.tar.gz -> txamqp-0.8.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a5c04002bf4b7e024918e06369e29af5
diff --git a/metadata/md5-cache/dev-python/unidecode-1.0.22 b/metadata/md5-cache/dev-python/unidecode-1.0.22
index f3beb3f7e9a6..769fa56fb6b9 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.0.22
+++ b/metadata/md5-cache/dev-python/unidecode-1.0.22
@@ -4,11 +4,11 @@ DESCRIPTION=Module providing ASCII transliterations of Unicode text
 EAPI=6
 HOMEPAGE=https://pypi.org/project/Unidecode/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.0.22.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8dae16adb9789e79b702b8dfc450447
+_md5_=e95fce21ad1a61162b3e2f8b053925ae
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.5 b/metadata/md5-cache/dev-python/vobject-0.9.5
index bde56720aa8b..7b709fac96c0 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.5
+++ b/metadata/md5-cache/dev-python/vobject-0.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python package for parsing and generating vCard and vCalendar files
 EAPI=6
 HOMEPAGE=http://eventable.github.io/vobject/ https://pypi.org/project/vobject/ https://github.com/eventable/vobject
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/eventable/vobject/archive/0.9.5.tar.gz -> vobject-0.9.5.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0e811b9a25003f91ffccc1c8da4ce55
+_md5_=24d7d30fa0e08e570fbe43bd459a802c
diff --git a/metadata/md5-cache/dev-python/wheel-0.29.0 b/metadata/md5-cache/dev-python/wheel-0.29.0
index ccb5c55a397a..3fbdd3f43c3d 100644
--- a/metadata/md5-cache/dev-python/wheel-0.29.0
+++ b/metadata/md5-cache/dev-python/wheel-0.29.0
@@ -4,7 +4,7 @@ DESCRIPTION=A built-package format for Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/wheel/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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=MIT
 RDEPEND=dev-python/jsonschema[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/w/wheel/wheel-0.29.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0876a8c11d858425279f3dfe339ff2fa
+_md5_=fe95c93805dc1c460543180319b2cb9f
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.13 b/metadata/md5-cache/dev-python/whisper-0.9.13
index a1fff56e68d9..dfbb6810f115 100644
--- a/metadata/md5-cache/dev-python/whisper-0.9.13
+++ b/metadata/md5-cache/dev-python/whisper-0.9.13
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Fixed size round-robin style database
 EAPI=5
-HOMEPAGE=http://graphite.wikidot.com/
+HOMEPAGE=https://github.com/graphite-project/whisper
 IUSE=python_targets_pypy python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/whisper/whisper-0.9.13.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cab1ee9d084b52af3106fd1139f58d86
+_md5_=3a588883af24073da03885050c86550f
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.15 b/metadata/md5-cache/dev-python/whisper-0.9.15
index eaea30eeb616..9603982e3242 100644
--- a/metadata/md5-cache/dev-python/whisper-0.9.15
+++ b/metadata/md5-cache/dev-python/whisper-0.9.15
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Fixed size round-robin style database
 EAPI=5
-HOMEPAGE=http://graphite.wikidot.com/
+HOMEPAGE=https://github.com/graphite-project/whisper
 IUSE=python_targets_pypy python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~x64-solaris
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/whisper/whisper-0.9.15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9e3d9c26feda62ac297fee7a23ee75a
+_md5_=6f213c8253e319cfe8c728cfc8c348d3
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.3 b/metadata/md5-cache/dev-python/whisper-1.1.3
new file mode 100644
index 000000000000..dd7f36b51c98
--- /dev/null
+++ b/metadata/md5-cache/dev-python/whisper-1.1.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] virtual/python-unittest-mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] )
+DESCRIPTION=Fixed size round-robin style database
+EAPI=7
+HOMEPAGE=https://github.com/graphite-project/whisper
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-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(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.3.tar.gz -> whisper-1.1.3.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=525de17a53281aa4d3dd90a73168991a
diff --git a/metadata/md5-cache/dev-python/yarl-1.2.4 b/metadata/md5-cache/dev-python/yarl-1.2.4
new file mode 100644
index 000000000000..3a811cb0b342
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yarl-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/multidict-4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Yet another URL library
+EAPI=6
+HOMEPAGE=https://github.com/aio-libs/yarl/
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/y/yarl/yarl-1.2.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b2e184f70a0285c6d3371e3211b0a89
diff --git a/metadata/md5-cache/dev-python/zstandard-0.8.1 b/metadata/md5-cache/dev-python/zstandard-0.8.1
index 814c336cfee0..3dc4994c1b82 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.8.1
+++ b/metadata/md5-cache/dev-python/zstandard-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Zstandard Bindings for Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cffi:=[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=mirror://pypi/z/zstandard/zstandard-0.8.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef686a3f31e89456fe92fd3ce9087328
+_md5_=7e2de1d3c629edc84a19d1a5dec8d0f2
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index df03cfa62387..3daea8a9fada 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_rc2 b/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_rc2
index b4fa66dc8686..ffee0c05a9b4 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_rc2
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.11.0_rc2
@@ -4,7 +4,7 @@ DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=geoclue qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:0 )
 RDEPEND=~dev-qt/qtcore-5.11.0_rc2 geoclue? ( ~dev-qt/qtdbus-5.11.0_rc2 ) qml? ( ~dev-qt/qtdeclarative-5.11.0_rc2 ) dev-qt/qtchooser
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc2/submodules/qtlocation-everywhere-src-5.11.0-rc2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=8b644476058f63b2739199a96f6889bf
+_md5_=ff7dec693fe4321f72cca7b352d8bc43
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.9.5 b/metadata/md5-cache/dev-qt/qtpositioning-5.9.5
index 3c076e864528..0d6d23478f13 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.9.5
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.9.5
@@ -4,7 +4,7 @@ DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=geoclue qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:0 )
 RDEPEND=~dev-qt/qtcore-5.9.5 geoclue? ( ~dev-qt/qtdbus-5.9.5 ) qml? ( ~dev-qt/qtdeclarative-5.9.5 ) dev-qt/qtchooser
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.5/submodules/qtlocation-opensource-src-5.9.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=32e60caa19fd41418a7137c0880faaf0
+_md5_=3c0a5e412a148d5b159b7d80557c5d52
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.11.0_rc2 b/metadata/md5-cache/dev-qt/qtsensors-5.11.0_rc2
index d10d80d67dac..970440f846e8 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.11.0_rc2
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.11.0_rc2
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.0_rc2 ~dev-qt/qtdbus-5.11.0_rc2 qml? ( ~dev-qt/qtdeclarative-5.11.0_rc2 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc2/submodules/qtsensors-everywhere-src-5.11.0-rc2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=146be5b8fa4ac5bdc1202ffcc8846e7a
+_md5_=19cc27a106594683e75febf31b99bd56
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.9.5 b/metadata/md5-cache/dev-qt/qtsensors-5.9.5
index 0c287038a6f8..f27bafb9e1c1 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.9.5
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.9.5 ~dev-qt/qtdbus-5.9.5 qml? ( ~dev-qt/qtdeclarative-5.9.5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.5/submodules/qtsensors-opensource-src-5.9.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=146be5b8fa4ac5bdc1202ffcc8846e7a
+_md5_=19cc27a106594683e75febf31b99bd56
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.11.0_rc2 b/metadata/md5-cache/dev-qt/qtserialport-5.11.0_rc2
index 3af6d76b0534..c49a8270137d 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.11.0_rc2
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.11.0_rc2
@@ -4,11 +4,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.0_rc2 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc2/submodules/qtserialport-everywhere-src-5.11.0-rc2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=28799061d0de088a508254da213c4048
+_md5_=6edf3bb120bc793f33520629efa89e74
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.9.5 b/metadata/md5-cache/dev-qt/qtserialport-5.9.5
index b90141b7c1b4..8343d52747ae 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.9.5
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.9.5 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.5/submodules/qtserialport-opensource-src-5.9.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=28799061d0de088a508254da213c4048
+_md5_=6edf3bb120bc793f33520629efa89e74
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_rc2 b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_rc2
index 330d602f8c1e..b92fbaa88299 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_rc2
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.0_rc2
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.0_rc2 qml? ( ~dev-qt/qtdeclarative-5.11.0_rc2 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc2/submodules/qtwebchannel-everywhere-src-5.11.0-rc2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bbad63d1fb759b60dc37e081887099aa
+_md5_=6e7a90249ca184cf597c8976510d7c84
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.5 b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.5
index ce7f32103bcd..2974b2a646be 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.5
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.9.5 qml? ( ~dev-qt/qtdeclarative-5.9.5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.5/submodules/qtwebchannel-opensource-src-5.9.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bbad63d1fb759b60dc37e081887099aa
+_md5_=6e7a90249ca184cf597c8976510d7c84
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
index 425503f5142e..90b758bf687e 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
@@ -4,7 +4,7 @@ DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp debug test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1 dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5[icu] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/fontconfig:1.0 media-libs/libpng:0= >=sys-libs/zlib-1.2.5 virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5 ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.9.1:5 ) webp? ( media-libs/libwebp:0= ) dev-qt/qtchooser
 REQUIRED_USE=?? ( gstreamer multimedia )
@@ -12,4 +12,4 @@ RESTRICT=mirror test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5298df4c52106ff0f546872f6f884a80
+_md5_=64376ca7b3ef9b4b0cd21756e51518de
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_rc2 b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_rc2
index 929167b70a8f..f69ee9fa05ab 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_rc2
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.0_rc2
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.0_rc2 ~dev-qt/qtnetwork-5.11.0_rc2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.0_rc2 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc2/submodules/qtwebsockets-everywhere-src-5.11.0-rc2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7d6ebe1b2d442aac1eb3d7881f0a3518
+_md5_=f67277cf03526b83968e7d2fb842ef08
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.5 b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.5
index 26cbf9d85a3f..1c5c3a69cb89 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.5
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.9.5 ~dev-qt/qtnetwork-5.9.5[ssl=] qml? ( ~dev-qt/qtdeclarative-5.9.5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.5/submodules/qtwebsockets-opensource-src-5.9.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7d6ebe1b2d442aac1eb3d7881f0a3518
+_md5_=f67277cf03526b83968e7d2fb842ef08
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index dab293ebe6dd..4d90463307c2 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/cpp_common-0.6.11 b/metadata/md5-cache/dev-ros/cpp_common-0.6.11
new file mode 100644
index 000000000000..e03a36dc6418
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 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++ code for doing things that are not necessarily ROS related
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/cpp_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge:= 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/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=05049828660b89a2bf45cdcbc3700c10
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.0 b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.0
new file mode 100644
index 000000000000..c84aa1ec12e2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 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=Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/imu_complementary_filter
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf 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/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=133a2c72bb71dddb0ec74036f5e36c1f
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0
new file mode 100644
index 000000000000..2f8c6eedba9c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure dev-libs/boost:=[threads] test? ( dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 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=Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/imu_filter_madgwick
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure 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/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=09803f948c48b24a4f035d5cb62f20cf
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.11 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.11
new file mode 100644
index 000000000000..4ebb12a352d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.9.6 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=Code for serialization
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roscpp_serialization
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits 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/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=753ec8ada57cb481f5f22e8885cc2744
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.11 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.11
new file mode 100644
index 000000000000..ebaffb414565
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.9.6 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=Message traits code
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roscpp_traits
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime 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/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0fffe56e11432b15f1edccb94479829a
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.11 b/metadata/md5-cache/dev-ros/rostime-0.6.11
new file mode 100644
index 000000000000..fc11643207bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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=Time and Duration implementations for C++ libraries
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rostime
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common 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/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1e1b240bb48c3a338606a47948d6ec7
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.0 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.0
new file mode 100644
index 000000000000..14ae8f008012
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 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=RVIZ plugin for IMU visualization
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rviz_imu_plugin
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz 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/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8efcb18cc63537bb1ba1fd66de447be0
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 24590e7be84e..ca591b44b524 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/activemodel-serializers-xml-1.0.2 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
index 54c324bb9f3f..b45b648261b9 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby23] =dev-ruby/activemodel-5*:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby24] =dev-ruby/activemodel-5*:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/activerecord-5*:*[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( =dev-ruby/activerecord-5*:*[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby23] =dev-ruby/activemodel-5*:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby24] =dev-ruby/activemodel-5*:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby25] =dev-ruby/activemodel-5*:*[ruby_targets_ruby25] =dev-ruby/builder-3*:*[ruby_targets_ruby25] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/activerecord-5*:*[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( =dev-ruby/activerecord-5*:*[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( =dev-ruby/activerecord-5*:*[ruby_targets_ruby25] dev-ruby/sqlite3[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=XML serialization for your Active Model objects and Active Record models
 EAPI=6
 HOMEPAGE=https://github.com/rails/activemodel-serializers-xml
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby23] =dev-ruby/activemodel-5*:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby24] =dev-ruby/activemodel-5*:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby23] =dev-ruby/activemodel-5*:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby24] =dev-ruby/activemodel-5*:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/activesupport-5*:*[ruby_targets_ruby25] =dev-ruby/activemodel-5*:*[ruby_targets_ruby25] =dev-ruby/builder-3*:*[ruby_targets_ruby25] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.2.tar.gz -> activemodel-serializers-xml-1.0.2.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=84bc33463c0d8ccd82ade247db842055
+_md5_=b1e18853424299083ebb6f72970d8590
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.10 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.10
deleted file mode 100644
index 980a6ebc0c40..000000000000
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
-EAPI=6
-HOMEPAGE=https://github.com/swanandp/acts_as_list
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86-macos
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/acts_as_list-0.9.10.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e410929b87ed585c910ef4f0185f0fcb
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.14 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.14
new file mode 100644
index 000000000000..c759ca39daf8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/activerecord[ruby_targets_ruby25,sqlite] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
+EAPI=6
+HOMEPAGE=https://github.com/swanandp/acts_as_list
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~x86-macos
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=mirror://rubygems/acts_as_list-0.9.14.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0e99043606d8660f6e27f96470c29bf6
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.9 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.9
deleted file mode 100644
index 7be0a27835b3..000000000000
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
-EAPI=6
-HOMEPAGE=https://github.com/swanandp/acts_as_list
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86-macos
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/acts_as_list-0.9.9.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e410929b87ed585c910ef4f0185f0fcb
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.5.2 b/metadata/md5-cache/dev-ruby/addressable-2.5.2
index 1948a437597e..53ac7a2c572c 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.5.2
+++ b/metadata/md5-cache/dev-ruby/addressable-2.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=A replacement for the URI implementation that is part of Ruby's stan
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby23] <dev-ruby/public_suffix-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby24] <dev-ruby/public_suffix-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.5.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1eab065aaaebeb5c25e3afd687347b8a
+_md5_=104bd33604fcda6389044d38bed767c6
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.1.0.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.1.0.1
deleted file mode 100644
index f564114dc35f..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=8
-SRC_URI=mirror://rubygems/autoprefixer-rails-8.1.0.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=566cd54c6dd1449ef8bb3b88742d8f5a
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.3.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.3.0
deleted file mode 100644
index 4f1eae172b57..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=8
-SRC_URI=mirror://rubygems/autoprefixer-rails-8.3.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=566cd54c6dd1449ef8bb3b88742d8f5a
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.0
new file mode 100644
index 000000000000..a42024a8cdcb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=6
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=8
+SRC_URI=mirror://rubygems/autoprefixer-rails-8.6.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3c4afc443e2099b3baec8002ebb645f9
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.16.1 b/metadata/md5-cache/dev-ruby/bundler-1.16.1
index 45086b54b352..faf94da4c45c 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.16.1
+++ b/metadata/md5-cache/dev-ruby/bundler-1.16.1
@@ -4,11 +4,11 @@ DESCRIPTION=An easy way to vendor gem dependencies
 EAPI=6
 HOMEPAGE=https://github.com/carlhuda/bundler
 IUSE=+doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 ~ppc ~ppc64 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) dev-vcs/git 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-1.16.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=69cbb79e7c2c9782384acb44a2b9d0b7
+_md5_=b800f2ce0bad18de7fbce2dc5aa4c620
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.10.0 b/metadata/md5-cache/dev-ruby/bunny-2.10.0
new file mode 100644
index 000000000000..d78a7d695a59
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bunny-2.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Another synchronous Ruby AMQP client
+EAPI=6
+HOMEPAGE=https://github.com/celldee/bunny
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/bunny-2.10.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ac38b0e23e8f2ca17cf52904b7a7321
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.2.1 b/metadata/md5-cache/dev-ruby/capybara-3.2.1
new file mode 100644
index 000000000000..916b7feaec21
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( www-client/firefox ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] dev-ruby/launchy[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby25] dev-ruby/sinatra[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby23] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby25] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby23] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/xpath-3.1:3[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=mirror://rubygems/capybara-3.2.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=3233fd0c3b88b67e5e2abc74cee706a2
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.1 b/metadata/md5-cache/dev-ruby/dbf-3.1.1
index 9c6910748970..6c68cf96e937 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.1.1
+++ b/metadata/md5-cache/dev-ruby/dbf-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro da
 EAPI=6
 HOMEPAGE=https://github.com/infused/dbf
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-3.1.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=290cceaf8752f5767dc0da9aff5eb931
+_md5_=a4fd594ea94cd08482ac4e37255aed3a
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
new file mode 100644
index 000000000000..f5769de206a5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Library for the Ed25519 public-key signature system
+EAPI=6
+HOMEPAGE=https://github.com/crypto-rb/ed25519
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=1
+SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f9af80216c7f331411b0f1bc36bb2555
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.25 b/metadata/md5-cache/dev-ruby/ffi-1.9.25
new file mode 100644
index 000000000000..7296f7502c6e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libffi ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
+EAPI=6
+HOMEPAGE=https://wiki.github.com/ffi/ffi
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=virtual/libffi 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/ffi/ffi/archive/1.9.25.tar.gz -> ffi-git-1.9.25.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=30dd2dd17ed707a75d2d3f104d50d170
diff --git a/metadata/md5-cache/dev-ruby/gh-0.15.1 b/metadata/md5-cache/dev-ruby/gh-0.15.1
deleted file mode 100644
index 5814050a0e7a..000000000000
--- a/metadata/md5-cache/dev-ruby/gh-0.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=multi-layer client for the github api v3
-EAPI=5
-HOMEPAGE=https://github.com/travis-ci/gh
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/travis-ci/gh/archive/v0.15.1.tar.gz -> gh-0.15.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aaec712591791403e4ecf0591038920f
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.7-r1 b/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
index 52171b88da58..200eaa5c2ea6 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby web page templating engine
 EAPI=5
 HOMEPAGE=http://haml-lang.com/
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby23? ( dev-ruby/tilt:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/tilt:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6ec566a240b102974590e1e090657d72
+_md5_=a4e35fc5136e48f78bb4d867b17d7540
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1 b/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
deleted file mode 100644
index c5ea85fe5d89..000000000000
--- a/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Makes http fun! Also, makes consuming restful web services dead easy
-EAPI=5
-HOMEPAGE=https://jnunemaker.github.com/httparty
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 test test
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/httparty-0.14.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f0c7f3fff2bd28d6cd7c80189cec96ed
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
index f36430a73438..849a9f28931e 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/nahi/httpclient
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e9d024d4c7113ab11bd2be69fb714e64
+_md5_=ef28aa454ee585875d41bd30413c8f03
diff --git a/metadata/md5-cache/dev-ruby/listen-3.1.5-r2 b/metadata/md5-cache/dev-ruby/listen-3.1.5-r2
index 211d1bdf161d..fd5fe48e4337 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.1.5-r2
+++ b/metadata/md5-cache/dev-ruby/listen-3.1.5-r2
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/guard/listen
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby25] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby25] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby25] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.1.5.tar.gz -> listen-3.1.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3ff49466c700c5af389ff0fde9bcdba7
+_md5_=353abeee38c58d49c1ceb4bd741ba15a
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.13-r1 b/metadata/md5-cache/dev-ruby/logue-1.0.13-r1
new file mode 100644
index 000000000000..def3815baf88
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rainbow:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rainbow:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rainbow:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/paramesan[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/paramesan[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/paramesan[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A module that adds logging/trace functionality
+EAPI=6
+HOMEPAGE=https://github.com/jpace/logue
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rainbow:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rainbow:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rainbow:3[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/jpace/logue/archive/v1.0.13.tar.gz -> logue-git-1.0.13.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7cbc2c9fcb2b9f5f718cd0b2d8a0ce5
diff --git a/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1 b/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1
new file mode 100644
index 000000000000..2a9e177c4a39
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Simple mime type detection using magic numbers, filenames, and extensions
+EAPI=6
+HOMEPAGE=https://github.com/basecamp/marcel
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/marcel-0.3.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c33281e52cddf2109c4bc6e4aa1e393e
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.6 b/metadata/md5-cache/dev-ruby/mechanize-2.7.6
new file mode 100644
index 000000000000..0903bfebb307
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby23] test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby24] test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby24] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby24] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby24] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby24] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby24] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A Ruby library used for automating interaction with websites
+EAPI=6
+HOMEPAGE=https://github.com/sparklemotion/mechanize
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby24] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby24] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby24] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby24] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby24] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/mechanize-2.7.6.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7d9930d56d05be8ee5fc605c9d3c01bb
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.10.3 b/metadata/md5-cache/dev-ruby/minitest-5.10.3
index de998a6772ca..dd621c7fc0a8 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.10.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/minitest
 IUSE=doc test elibc_FreeBSD 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
+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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.10.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4d54638418cdea794f2984938763885e
+_md5_=e7b71d066d8af69887a6612a755a4d8e
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
index dcb3d2229b00..27b077a57e21 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of RFC 2617 - Digest Access Authentication
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-digest_auth
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=901def2de2c1677913e2e9f2714971ce
+_md5_=1dcd455901b7538b5d9c353c2ae9719b
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.1 b/metadata/md5-cache/dev-ruby/power_assert-1.1.1
index e7fc0063ef86..dcd191709ee3 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.1
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Shows each value of variables and method calls in the expression
 EAPI=6
 HOMEPAGE=https://github.com/k-tsj/power_assert
 IUSE=elibc_FreeBSD 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby BSD-2 )
 RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.1.tar.gz -> power_assert-1.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0dfabb3c9d83017e160824155f0a87b7
+_md5_=a482b6f463516627678c8e9e1bf419e7
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.0.2 b/metadata/md5-cache/dev-ruby/public_suffix-3.0.2
index ff6a83f496b6..af07008f88ec 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.0.2
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Parse and decompose a domain name into top level domain, domain and
 EAPI=6
 HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=mirror://rubygems/public_suffix-3.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0fdde7f06d3b6a00e4ca0b2b52a2d065
+_md5_=11efc26026fac445df2cf00623c7aba0
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.8.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.8.0
new file mode 100644
index 000000000000..0a137a07cd03
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/maxitest[ruby_targets_ruby25] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby25] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshness info
+EAPI=6
+HOMEPAGE=https://github.com/rtomayko/rack-cache
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~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_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=1.2
+SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.8.0.tar.gz -> rack-cache-1.8.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eb217bc155f3cdf0ea42fa587b6d1abf
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.0.2 b/metadata/md5-cache/dev-ruby/rack-protection-2.0.2
new file mode 100644
index 000000000000..895d004b4bb9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=This gem protects against typical web attacks
+EAPI=6
+HOMEPAGE=https://github.com/rkh/rack-protection
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+KEYWORDS=~amd64 ~arm ~hppa ~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_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=2
+SRC_URI=mirror://rubygems/rack-protection-2.0.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b9f7dcadbc71d940fb96a9041aba5ed1
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.3 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.3
deleted file mode 100644
index 40d75a2aa819..000000000000
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Rash alt version for Hashie's own Rash
-EAPI=6
-HOMEPAGE=https://github.com/shishi/rash_alt
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rash_alt-0.4.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ca52210389d866539d651f316c92a26f
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.4 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.4
deleted file mode 100644
index c01f94b8a74e..000000000000
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hashie-3.5:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.5:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Rash alt version for Hashie's own Rash
-EAPI=6
-HOMEPAGE=https://github.com/shishi/rash_alt
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hashie-3.5:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.5:3[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rash_alt-0.4.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d2ff8d0a0e6b906e63b7756714f5ce9f
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.7 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.7
new file mode 100644
index 000000000000..22f3f736e211
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby23] =dev-ruby/hashie-3.5*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby24] =dev-ruby/hashie-3.5*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby25] =dev-ruby/hashie-3.5*[ruby_targets_ruby25] ) ) 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_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Rash alt version for Hashie's own Rash
+EAPI=6
+HOMEPAGE=https://github.com/shishi/rash_alt
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby23] =dev-ruby/hashie-3.5*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby24] =dev-ruby/hashie-3.5*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby25] =dev-ruby/hashie-3.5*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/rash_alt-0.4.7.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3a2213057ec8921f969a8c780b3605b0
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
index 0cd26265673a..b4da2031b063 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.6.0[graph] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.6.0[graph] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e52eb264680b15864a60d015aea62606
+_md5_=d0de489de93ed4ccf6bd0928adba40c8
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
index fc2e294db478..e9ac8e8e3e32 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.7.0[graph] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.7.0[graph] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.7.0[graph=] ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=~net-analyzer/rrdtool-1.7.0[graph=] ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1214dcce0a62f784fc23029ad9b5590c
+_md5_=e92380941eff4cbaa943b18773358a8b
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.1 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.1
index e563bd1ad46e..aa3fbdeeed31 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.1
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Pure ruby LDAP client implementation
 EAPI=6
 HOMEPAGE=https://github.com/ruby-ldap/ruby-net-ldap
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.16.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=332fac5c6373886e1a760df6256cbeaa
+_md5_=b3fc3dd281a201af1c5a0396cd455365
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
index 90a913f0e53c..31b9db0f02d5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby interface to termios
 EAPI=5
 HOMEPAGE=http://arika.org/ruby/termios
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos
+KEYWORDS=amd64 ~hppa ~mips ~ppc x86 ~x86-macos
 LICENSE=Ruby
 RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-termios-1.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3a70b134995cc89aaeaa400a6f5d2fba
+_md5_=0f1673b17e299789adf44772056d101f
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.7.0 b/metadata/md5-cache/dev-ruby/rubypants-0.7.0
index 27609c63aaf4..9f377381a991 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby port of the SmartyPants PHP library
 EAPI=6
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Ruby
 RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.7.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0c25cb44e3a21be4ff6680e53985fb21
+_md5_=5e781aa82f18bbfb3123c00b8e8a81cf
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.9 b/metadata/md5-cache/dev-ruby/slim-3.0.9
index 740f42fc518e..49057443d666 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.9
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=A template language aiming to reduce the syntax to the essential par
 EAPI=6
 HOMEPAGE=http://slim-lang.com/
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby25] <dev-ruby/tilt-2.1:*[ruby_targets_ruby25] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-3.0.9.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4284f8d7e0e8c67eb1783118f8f08648
+_md5_=96d73f75a3fdd06b2b5e45087167d391
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.2.7 b/metadata/md5-cache/dev-ruby/test-unit-3.2.7
index 96138e29fe28..50d45b353394 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.2.7
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.2.7
@@ -4,11 +4,11 @@ DESCRIPTION=An xUnit family unit testing framework for Ruby
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/test-unit
 IUSE=doc test test elibc_FreeBSD 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 ) PSF-2
 RDEPEND=ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/power_assert[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.2.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ea6221be63e1d310db8c597ac0106af6
+_md5_=e4f0f7ca1913364765f887a973916902
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
index c1ee59e5d24e..47459496f247 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) 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_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Simple library to generate UUIDs
 EAPI=5
 HOMEPAGE=https://github.com/sporkmonger/uuidtools
-IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/uuidtools-2.1.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce390ec24678312832782cc1aea69c30
+_md5_=04b4bbe61186261c6f5dcded6cf7e862
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.5.1 b/metadata/md5-cache/dev-ruby/web-console-3.5.1
deleted file mode 100644
index b9f53140c950..000000000000
--- a/metadata/md5-cache/dev-ruby/web-console-3.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/rails-5.0[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A debugging tool for your Ruby on Rails applications
-EAPI=5
-HOMEPAGE=https://github.com/rails/web-console
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=https://github.com/rails/web-console/archive/v3.5.1.tar.gz -> web-console-3.5.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bac5e56aad88113bcd53e07dd0d37b29
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.6.0 b/metadata/md5-cache/dev-ruby/web-console-3.6.0
deleted file mode 100644
index 0f9bf4ad9372..000000000000
--- a/metadata/md5-cache/dev-ruby/web-console-3.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/rails-5.0[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A debugging tool for your Ruby on Rails applications
-EAPI=5
-HOMEPAGE=https://github.com/rails/web-console
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=https://github.com/rails/web-console/archive/v3.6.0.tar.gz -> web-console-3.6.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bac5e56aad88113bcd53e07dd0d37b29
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.6.2 b/metadata/md5-cache/dev-ruby/web-console-3.6.2
index f7b85558f3a8..e1ea018c5dba 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.6.2
+++ b/metadata/md5-cache/dev-ruby/web-console-3.6.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/rails-5.0[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby25] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby25] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby25] >=dev-ruby/railties-5.0:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/rails-5.0[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/rails-5.0[ruby_targets_ruby25] dev-ruby/sqlite3[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A debugging tool for your Ruby on Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/web-console
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby24] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby24] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby24] >=dev-ruby/railties-5.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby25] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby25] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby25] >=dev-ruby/railties-5.0:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.6.2.tar.gz -> web-console-3.6.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ebdec4e4209a6c49adfd920c407dac76
+_md5_=c1aa56da0b906658edf26370f65503de
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1
new file mode 100644
index 000000000000..9d92dfdf3a81
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/shoulda[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] dev-ruby/vcr[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/shoulda[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/webmock[ruby_targets_ruby25] dev-ruby/vcr[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A library to help write robots.txt compliant web robots
+EAPI=5
+HOMEPAGE=https://github.com/knu/webrobots
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/webrobots-0.1.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b717d446c3e30020e5718edeab015885
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.14 b/metadata/md5-cache/dev-ruby/yard-0.9.14
new file mode 100644
index 000000000000..6b2b23e49dec
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby24? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/kramdown[ruby_targets_ruby24] ) ) ) ruby_targets_ruby25? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby25] dev-ruby/rdiscount[ruby_targets_ruby25] dev-ruby/bluecloth[ruby_targets_ruby25] dev-ruby/kramdown[ruby_targets_ruby25] ) ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby25] ) ) 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_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Documentation generation tool for the Ruby programming language
+EAPI=6
+HOMEPAGE=https://yardoc.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=MIT
+RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/lsegal/yard/archive/v0.9.14.tar.gz -> yard-0.9.14-git.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7c7f9ceb3111f934704479c88a758b86
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 6e1af7910e02..5558d60027cc 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-2.0.14-r3 b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
index cde0d7dded33..af3daa59aaf5 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
+++ b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 SLOT=12/22
 SRC_URI=mirror://gnu/guile/guile-2.0.14.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=38c707a7b133cc086207250cf0a6c0a4
+_md5_=63ea4ebbc1f9e7d835695c69085fc88f
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 3320f2c1806f..cea197ec28fb 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/blt-2.4z-r13 b/metadata/md5-cache/dev-tcltk/blt-2.4z-r13
index 4554f0fdd877..dc18ed9fc289 100644
--- a/metadata/md5-cache/dev-tcltk/blt-2.4z-r13
+++ b/metadata/md5-cache/dev-tcltk/blt-2.4z-r13
@@ -4,10 +4,10 @@ DESCRIPTION=Extension to Tk, adding new widgets, geometry managers, and misc com
 EAPI=5
 HOMEPAGE=http://blt.sourceforge.net/ http://jos.decoster.googlepages.com/bltfortk8.5.2
 IUSE=jpeg static-libs X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-lang/tk:0= jpeg? ( virtual/jpeg:0= ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/blt2.4z-8.5.2.tar.gz http://jos.decoster.googlepages.com/blt2.4z-8.5.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f1cbe41615201b57b80a05e24842438f
+_md5_=f5e48bbbb7d0e6e26f25fb904c79e17e
diff --git a/metadata/md5-cache/dev-tcltk/expect-5.45 b/metadata/md5-cache/dev-tcltk/expect-5.45
index b44047a0e612..19531965b174 100644
--- a/metadata/md5-cache/dev-tcltk/expect-5.45
+++ b/metadata/md5-cache/dev-tcltk/expect-5.45
@@ -4,10 +4,10 @@ DESCRIPTION=tool for automating interactive applications
 EAPI=5
 HOMEPAGE=http://expect.nist.gov/
 IUSE=debug doc threads
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.2:0[threads?]
 SLOT=0
 SRC_URI=mirror://sourceforge/expect/expect5.45.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1af2439cd4c9ede249323360898e3268
+_md5_=e2342c0abcd520cffa14cf3dbd3d2674
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.0.3 b/metadata/md5-cache/dev-tcltk/expect-lite-4.0.3
deleted file mode 100644
index fbac53aca98d..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.0.3.tar.gz
-_md5_=fee372fd56d113aafdcefc4c540fa071
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.1.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.1.0
deleted file mode 100644
index 4295bda7ab30..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.1.0.tar.gz
-_md5_=314fec65d60368d71a8bfff578144651
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.1.2 b/metadata/md5-cache/dev-tcltk/expect-lite-4.1.2
deleted file mode 100644
index 5bafc3155665..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.1.2.tar.gz
-_md5_=314fec65d60368d71a8bfff578144651
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.2.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.2.0
deleted file mode 100644
index f74939babc75..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.2.0.tar.gz
-_md5_=314fec65d60368d71a8bfff578144651
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.2.1 b/metadata/md5-cache/dev-tcltk/expect-lite-4.2.1
deleted file mode 100644
index 546918fc6613..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.2.1.tar.gz
-_md5_=314fec65d60368d71a8bfff578144651
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.2.2 b/metadata/md5-cache/dev-tcltk/expect-lite-4.2.2
deleted file mode 100644
index 237eafcef1a2..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.2.2.tar.gz
-_md5_=314fec65d60368d71a8bfff578144651
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.3.0
deleted file mode 100644
index b5f82e1a8641..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.3.0.tar.gz
-_md5_=fee372fd56d113aafdcefc4c540fa071
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.1 b/metadata/md5-cache/dev-tcltk/expect-lite-4.3.1
deleted file mode 100644
index 6f70cd147872..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.3.1.tar.gz
-_md5_=fee372fd56d113aafdcefc4c540fa071
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.2 b/metadata/md5-cache/dev-tcltk/expect-lite-4.3.2
deleted file mode 100644
index 70abe3815b51..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.3.2.tar.gz
-_md5_=33209fa987047cb6b4b7d143772328d1
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.3 b/metadata/md5-cache/dev-tcltk/expect-lite-4.3.3
deleted file mode 100644
index 1569eb80b2d7..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.3.3.tar.gz
-_md5_=33209fa987047cb6b4b7d143772328d1
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.4.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.4.0
deleted file mode 100644
index c9058fe40576..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.4.0.tar.gz
-_md5_=8cad9402221c564014ba3d56457e3238
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.4.1 b/metadata/md5-cache/dev-tcltk/expect-lite-4.4.1
deleted file mode 100644
index 627df9552a6b..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.4.1.tar.gz
-_md5_=33209fa987047cb6b4b7d143772328d1
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.5.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.5.0
deleted file mode 100644
index 68c892d36435..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.5.0.tar.gz
-_md5_=33209fa987047cb6b4b7d143772328d1
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.6.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.6.0
deleted file mode 100644
index c7c0220729d2..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.6.0.tar.gz
-_md5_=8cad9402221c564014ba3d56457e3238
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.6.2 b/metadata/md5-cache/dev-tcltk/expect-lite-4.6.2
deleted file mode 100644
index a0ee66430214..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.6.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.6.2.tar.gz
-_md5_=33209fa987047cb6b4b7d143772328d1
diff --git a/metadata/md5-cache/dev-tcltk/tix-8.4.3-r1 b/metadata/md5-cache/dev-tcltk/tix-8.4.3-r1
index af43ba7029ab..33700264b515 100644
--- a/metadata/md5-cache/dev-tcltk/tix-8.4.3-r1
+++ b/metadata/md5-cache/dev-tcltk/tix-8.4.3-r1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/tk:0= x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp
 DESCRIPTION=A widget library for Tcl/Tk
 EAPI=5
 HOMEPAGE=http://tix.sourceforge.net/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-lang/tk:0= x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tix/Tix8.4.3-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ab7840be76c65a94f77539575e7cbe8
+_md5_=c161dee410bbf2b51ae922e5749382d8
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 150ce3f5b67d..c1e6d2dfc197 100644
--- a/metadata/md5-cache/dev-texlive/Manifest.gz
+++ b/metadata/md5-cache/dev-texlive/Manifest.gz
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1 b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
index 92216a985a1f..7c06490a513e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Essential programs and files
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc +luajittex
-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
+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-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=!<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !dev-texlive/texlive-documentation-base !<app-text/dvipsk-5.996_p20160523 >=app-text/texlive-core-2015[luajittex?] !<dev-texlive/texlive-latex-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsfonts-2017.tar.xz mirror://gentoo/texlive-module-bibtex-2017.tar.xz mirror://gentoo/texlive-module-cm-2017.tar.xz mirror://gentoo/texlive-module-enctex-2017.tar.xz mirror://gentoo/texlive-module-etex-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg-2017.tar.xz mirror://gentoo/texlive-module-graphics-def-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8-2017.tar.xz mirror://gentoo/texlive-module-ifluatex-2017.tar.xz mirror://gentoo/texlive-module-ifxetex-2017.tar.xz mirror://gentoo/texlive-module-knuth-lib-2017.tar.xz mirror://gentoo/texlive-module-knuth-local-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt-2017.tar.xz mirror://gentoo/texlive-module-luatex-2017.tar.xz mirror://gentoo/texlive-module-makeindex-2017.tar.xz mirror://gentoo/texlive-module-metafont-2017.tar.xz mirror://gentoo/texlive-module-mflogo-2017.tar.xz mirror://gentoo/texlive-module-mfware-2017.tar.xz mirror://gentoo/texlive-module-pdftex-2017.tar.xz mirror://gentoo/texlive-module-plain-2017.tar.xz mirror://gentoo/texlive-module-tex-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files-2017.tar.xz mirror://gentoo/texlive-module-texlive-common-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex-2017.tar.xz mirror://gentoo/texlive-module-texlive-en-2017.tar.xz mirror://gentoo/texlive-module-texlive-msg-translations-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts-2017.tar.xz mirror://gentoo/texlive-module-unicode-data-2017.tar.xz mirror://gentoo/texlive-module-updmap-map-2017.tar.xz mirror://gentoo/texlive-module-collection-basic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtex.doc-2017.tar.xz mirror://gentoo/texlive-module-cm.doc-2017.tar.xz mirror://gentoo/texlive-module-enctex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-def.doc-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.doc-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex.doc-2017.tar.xz mirror://gentoo/texlive-module-makeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo.doc-2017.tar.xz mirror://gentoo/texlive-module-mfware.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-common.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-en.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-data.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsfonts.source-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.source-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.source-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.source-2017.tar.xz mirror://gentoo/texlive-module-mflogo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=426bfcff01d9b51b37b8a788203fd0c0
+_md5_=f3d494e035d0ae2af60da2f8e5fd88bb
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
index 2525dbaa4761..c2d4954526e9 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics and font utilities
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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
+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=Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-psutils !<dev-texlive/texlive-fontsextra-2009 !<app-text/texlive-core-2013 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-accfonts-2017.tar.xz mirror://gentoo/texlive-module-afm2pl-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin-2017.tar.xz mirror://gentoo/texlive-module-epstopdf-2017.tar.xz mirror://gentoo/texlive-module-fontware-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools-2017.tar.xz mirror://gentoo/texlive-module-metatype1-2017.tar.xz mirror://gentoo/texlive-module-ps2pk-2017.tar.xz mirror://gentoo/texlive-module-pstools-2017.tar.xz mirror://gentoo/texlive-module-psutils-2017.tar.xz mirror://gentoo/texlive-module-dvipsconfig-2017.tar.xz mirror://gentoo/texlive-module-fontinst-2017.tar.xz mirror://gentoo/texlive-module-fontools-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1-2017.tar.xz mirror://gentoo/texlive-module-t1utils-2017.tar.xz mirror://gentoo/texlive-module-collection-fontutils-2017.tar.xz doc? ( mirror://gentoo/texlive-module-accfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-afm2pl.doc-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin.doc-2017.tar.xz mirror://gentoo/texlive-module-epstopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-fontware.doc-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools.doc-2017.tar.xz mirror://gentoo/texlive-module-ps2pk.doc-2017.tar.xz mirror://gentoo/texlive-module-pstools.doc-2017.tar.xz mirror://gentoo/texlive-module-psutils.doc-2017.tar.xz mirror://gentoo/texlive-module-fontinst.doc-2017.tar.xz mirror://gentoo/texlive-module-fontools.doc-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1.doc-2017.tar.xz mirror://gentoo/texlive-module-t1utils.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-dosepsbin.source-2017.tar.xz mirror://gentoo/texlive-module-metatype1.source-2017.tar.xz mirror://gentoo/texlive-module-fontinst.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c111b9d26851439688790c90c3ff9c95
+_md5_=6c4fb40acbbdbf27ada55ef886136e3e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 6894e3cc23eb..38375fe0d8f7 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/anjuta-3.22.0 b/metadata/md5-cache/dev-util/anjuta-3.22.0
index d3d78a6afbf5..628b90511113 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.22.0
+++ b/metadata/md5-cache/dev-util/anjuta-3.22.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=600a810138a3227cc0a8f4aaeaf4cc32
diff --git a/metadata/md5-cache/dev-util/bite-9999 b/metadata/md5-cache/dev-util/bite-9999
new file mode 100644
index 000000000000..a37bf741b10c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bite-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=bug, issue, and ticket extraction library and command line tool
+EAPI=6
+HOMEPAGE=https://github.com/bite/bite
+IUSE=doc test python_targets_python3_6
+LICENSE=BSD
+RDEPEND=>=dev-python/requests-2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/multidict[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=da7815820869cdaff699112e22266dbf
diff --git a/metadata/md5-cache/dev-util/buildbot-0.8.12-r3 b/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
index 21a99d42c036..165f96b87025 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
+++ b/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.8.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6c60f2cc8f34700ef1c6777d2dba4fb6
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.12 b/metadata/md5-cache/dev-util/buildbot-0.9.12
index 3b2b21b5ab9d..a825cb8628df 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.12.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40793301200f03ad040bed43f0b30dc0
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.13 b/metadata/md5-cache/dev-util/buildbot-0.9.13
index b5bb2955c961..6df7aa1b3fab 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.9.13
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.13.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9cb02ed6dccc3c0f645215029bc553b8
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.15_p1 b/metadata/md5-cache/dev-util/buildbot-0.9.15_p1
index 2609369dfd98..b5e764739da9 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.9.15_p1
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.15_p1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.15.post1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1d843e87156ffad47a4947864da26863
diff --git a/metadata/md5-cache/dev-util/buildbot-1.1.0 b/metadata/md5-cache/dev-util/buildbot-1.1.0
index b97e07b74a5d..ed25768ccf3f 100644
--- a/metadata/md5-cache/dev-util/buildbot-1.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-1.1.0.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-1.1.0.docs.tar.xz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=19d6e3ad5be8192b96ad26f4a3ca6319
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index 81a65643371b..d7ebb8f9798b 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-2.1[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/twisted-17.9.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(-)] >=dev-python/autobahn-0.16.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(-)] >=dev-python/sqlalchemy-0.8[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/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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(-)] dev-python/pyjwt[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/zope-interface-4.1.1[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-util/buildbot-worker-9999[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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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(-)] dev-python/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=76328a0bfd132024c2db068097a3b6e9
diff --git a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12 b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
index 509b41ee6886..a66448bdee40 100644
--- a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
+++ b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-slave/buildbot-slave-0.8.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=63e712e16dbc7581de6e14af315faee6
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
index a4ff05b60b38..4d0e36d2e624 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.12.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b535303e25ace8053e5941a08dfe9c6a
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.13 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.13
index 3db5761289ac..0e3a8e11cffa 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.13
+++ b/metadata/md5-cache/dev-util/buildbot-worker-0.9.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.13.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7aa0c65daa8801517be309e347e8ed74
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.15_p1 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.15_p1
index 9101287dd88e..d48e66f2101b 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.15_p1
+++ b/metadata/md5-cache/dev-util/buildbot-worker-0.9.15_p1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.15.post1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-1.1.0 b/metadata/md5-cache/dev-util/buildbot-worker-1.1.0
index 5aa6e0e4b7f9..0353981c8869 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.1.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 1ba97c097792..449d05f7f48a 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/setuptools-21.2.1[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/twisted-17.9.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(-)] dev-python/future[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-util/buildbot-0.9.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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/metadata/md5-cache/dev-util/byacc-20170201 b/metadata/md5-cache/dev-util/byacc-20170201
index 92366f980b00..700b291624c6 100644
--- a/metadata/md5-cache/dev-util/byacc-20170201
+++ b/metadata/md5-cache/dev-util/byacc-20170201
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=the best variant of the Yacc parser generator
 EAPI=6
 HOMEPAGE=https://invisible-island.net/byacc/byacc.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=ftp://invisible-island.net/byacc/byacc-20170201.tgz
-_md5_=fcc195b97618bda920bb7c4784bd2aac
+_md5_=bf99bbdb7576660a7056e3697db4bfae
diff --git a/metadata/md5-cache/dev-util/ccache-3.2.4 b/metadata/md5-cache/dev-util/ccache-3.2.4
index 0b691347f6bb..76abc7ebd7e0 100644
--- a/metadata/md5-cache/dev-util/ccache-3.2.4
+++ b/metadata/md5-cache/dev-util/ccache-3.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.2.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5389d037f7c4a8c2374028faa0df6672
diff --git a/metadata/md5-cache/dev-util/ccache-3.3.4 b/metadata/md5-cache/dev-util/ccache-3.3.4
index 2f20438c3b06..a39425242ec6 100644
--- a/metadata/md5-cache/dev-util/ccache-3.3.4
+++ b/metadata/md5-cache/dev-util/ccache-3.3.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0094b2be15078b5bbb9b06c7a3fcade7
diff --git a/metadata/md5-cache/dev-util/ccache-3.3.4-r1 b/metadata/md5-cache/dev-util/ccache-3.3.4-r1
index 226af697994e..540985da5eec 100644
--- a/metadata/md5-cache/dev-util/ccache-3.3.4-r1
+++ b/metadata/md5-cache/dev-util/ccache-3.3.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.xz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=0c417645b7a323b27d0d4ac133d46852
diff --git a/metadata/md5-cache/dev-util/clair-2.0.1 b/metadata/md5-cache/dev-util/clair-2.0.1
deleted file mode 100644
index 57533678f4f7..000000000000
--- a/metadata/md5-cache/dev-util/clair-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Vulnerability Static Analysis for Containers
-EAPI=6
-HOMEPAGE=https://github.com/coreos/clair
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/bzr dev-vcs/git !!sci-visualization/xd3d
-SLOT=0
-SRC_URI=https://github.com/coreos/clair/archive/v2.0.1.tar.gz -> clair-2.0.1.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=570ddb7bc79ceb96c81580216891c4c3
diff --git a/metadata/md5-cache/dev-util/clair-2.0.2 b/metadata/md5-cache/dev-util/clair-2.0.2
deleted file mode 100644
index 267d9e49958d..000000000000
--- a/metadata/md5-cache/dev-util/clair-2.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Vulnerability Static Analysis for Containers
-EAPI=6
-HOMEPAGE=https://github.com/coreos/clair
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/bzr dev-vcs/git !!sci-visualization/xd3d
-SLOT=0
-SRC_URI=https://github.com/coreos/clair/archive/v2.0.2.tar.gz -> clair-2.0.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=632fd048bdf51a4504473a64499dbaa3
diff --git a/metadata/md5-cache/dev-util/cmake-3.11.2 b/metadata/md5-cache/dev-util/cmake-3.11.2
index 86bc7dd4282a..3c6d07af0130 100644
--- a/metadata/md5-cache/dev-util/cmake-3.11.2
+++ b/metadata/md5-cache/dev-util/cmake-3.11.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
 DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs system-jsoncpp ncurses qt5 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
-RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.2.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56b3b321e1620e16b106a3f5d528b394
+_md5_=7fbb566ed1528503fdb7a29cb18bb527
diff --git a/metadata/md5-cache/dev-util/cmake-3.11.3 b/metadata/md5-cache/dev-util/cmake-3.11.3
index f93efd12d8f9..fb733ddc2e12 100644
--- a/metadata/md5-cache/dev-util/cmake-3.11.3
+++ b/metadata/md5-cache/dev-util/cmake-3.11.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
 DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs system-jsoncpp ncurses qt5 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
-RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.3.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56b3b321e1620e16b106a3f5d528b394
+_md5_=7fbb566ed1528503fdb7a29cb18bb527
diff --git a/metadata/md5-cache/dev-util/cmake-3.9.6 b/metadata/md5-cache/dev-util/cmake-3.9.6
index 4709b968bd7e..0780fc98e968 100644
--- a/metadata/md5-cache/dev-util/cmake-3.9.6
+++ b/metadata/md5-cache/dev-util/cmake-3.9.6
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs server system-jsoncpp ncurses qt5 test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=49a7c6e3cfc375cfb363ce7c8ba778a5
+_md5_=69bd47bbbdf8c75aac51b8e76b8ca42f
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.1 b/metadata/md5-cache/dev-util/cmocka-1.1.1
index 01a5682037c5..0a140d73f866 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.1
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.1
@@ -4,9 +4,9 @@ DESCRIPTION=A unit testing framework for C
 EAPI=6
 HOMEPAGE=https://cmocka.org/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.1.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eafcc2132b29930e95b378e509dfb551
+_md5_=11c275da9b72205d1e9ff54c90d3c440
diff --git a/metadata/md5-cache/dev-util/cpuinfo-collection-20060720 b/metadata/md5-cache/dev-util/cpuinfo-collection-20060720
deleted file mode 100644
index 5a92b4e69ca3..000000000000
--- a/metadata/md5-cache/dev-util/cpuinfo-collection-20060720
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=huge collection of /proc/cpuinfo files
-EAPI=0
-HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/test_proc-20July2006.tar.gz
-_md5_=c134261f07720fe5b77ac87f5304ef72
diff --git a/metadata/md5-cache/dev-util/cram-0.7 b/metadata/md5-cache/dev-util/cram-0.7
index 5c3938403275..8c6bbbbfb4dd 100644
--- a/metadata/md5-cache/dev-util/cram-0.7
+++ b/metadata/md5-cache/dev-util/cram-0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Functional testing framework for command line applications
 EAPI=6
 HOMEPAGE=https://bitheap.org/cram/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 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/c/cram/cram-0.7.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94afd601330416f1613cdee7a9405fe1
+_md5_=8a4ce5a00281c06f9ac49f0730b0011a
diff --git a/metadata/md5-cache/dev-util/ctags-20161028 b/metadata/md5-cache/dev-util/ctags-20161028
index 6a6c21433aa0..bc1a1f5e34fa 100644
--- a/metadata/md5-cache/dev-util/ctags-20161028
+++ b/metadata/md5-cache/dev-util/ctags-20161028
@@ -4,9 +4,9 @@ DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=6
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IUSE=json xml yaml
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/vim/ctags-20161028.tar.xz
-_md5_=c62c8412e610aa46a68dd3956eda5d08
+_md5_=c87168bcbd400f59bca1149692c5a347
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.0-r1 b/metadata/md5-cache/dev-util/cucumber-3.1.0-r1
new file mode 100644
index 000000000000..e2659879a02f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby25] >=dev-util/aruba-0.6.1[ruby_targets_ruby25] =dev-util/aruba-0.6*[ruby_targets_ruby25] >=dev-ruby/json-1.7[ruby_targets_ruby25] >=dev-util/cucumber-3[ruby_targets_ruby25] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.0.tar.gz -> cucumber-3.1.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=240e85043e52858a589e54ed9ed9f68c
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.1 b/metadata/md5-cache/dev-util/cucumber-3.1.1
new file mode 100644
index 000000000000..0f1697d308de
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby25] >=dev-util/aruba-0.6.1[ruby_targets_ruby25] =dev-util/aruba-0.6*[ruby_targets_ruby25] >=dev-ruby/json-1.7[ruby_targets_ruby25] >=dev-util/cucumber-3[ruby_targets_ruby25] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:6.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:6.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:6.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:6.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:6.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:6.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.1.tar.gz -> cucumber-3.1.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0fbeb7918dd0cae4dcf2e00ef3d9cff3
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.13 b/metadata/md5-cache/dev-util/cucumber-expressions-5.0.13
deleted file mode 100644
index 20202a9d1e99..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=a simpler alternative to Regular Expressions
-EAPI=6
-HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.0
-SRC_URI=mirror://rubygems/cucumber-expressions-5.0.13.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=07a0791739ab283297fec45bca6c7bbd
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.14 b/metadata/md5-cache/dev-util/cucumber-expressions-5.0.14
deleted file mode 100644
index 9155650b2539..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=a simpler alternative to Regular Expressions
-EAPI=6
-HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=5.0
-SRC_URI=mirror://rubygems/cucumber-expressions-5.0.14.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=35cbe6f0e967493df48158226c99458d
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.7 b/metadata/md5-cache/dev-util/cucumber-expressions-5.0.7
deleted file mode 100644
index e1e5e68adc59..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=a simpler alternative to Regular Expressions
-EAPI=6
-HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.0
-SRC_URI=mirror://rubygems/cucumber-expressions-5.0.7.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=07a0791739ab283297fec45bca6c7bbd
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0
new file mode 100644
index 000000000000..105376abb328
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=6.0
+SRC_URI=mirror://rubygems/cucumber-expressions-6.0.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aa91cd7d7afe54dfbcc9490368a4f782
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.6.0 b/metadata/md5-cache/dev-util/cucumber-rails-1.6.0
new file mode 100644
index 000000000000..c17d6ef767f3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.6.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-4:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-4:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby25] <dev-util/cucumber-4[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby25] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby25] <dev-ruby/capybara-4:*[ruby_targets_ruby25] >=dev-ruby/railties-4:*[ruby_targets_ruby25] <dev-ruby/railties-6:*[ruby_targets_ruby25] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby25] <dev-ruby/mime-types-4:*[ruby_targets_ruby25] ) ) 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_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios for Rails
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-4:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-4:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby25] <dev-util/cucumber-4[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby25] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby25] <dev-ruby/capybara-4:*[ruby_targets_ruby25] >=dev-ruby/railties-4:*[ruby_targets_ruby25] <dev-ruby/railties-6:*[ruby_targets_ruby25] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby25] <dev-ruby/mime-types-4:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=1
+SRC_URI=mirror://rubygems/cucumber-rails-1.6.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=34f30c80a3d3524e946b85758ad4873c
diff --git a/metadata/md5-cache/dev-util/debhelper-11.1.6 b/metadata/md5-cache/dev-util/debhelper-11.1.6
deleted file mode 100644
index dff80f019e5e..000000000000
--- a/metadata/md5-cache/dev-util/debhelper-11.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
-DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
-EAPI=6
-HOMEPAGE=https://tracker.debian.org/pkg/debhelper
-IUSE=test l10n_de l10n_es l10n_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.1.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/metadata/md5-cache/dev-util/debhelper-11.3.2 b/metadata/md5-cache/dev-util/debhelper-11.3.2
new file mode 100644
index 000000000000..567989281635
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-11.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.3.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.100 b/metadata/md5-cache/dev-util/debootstrap-1.0.100
new file mode 100644
index 000000000000..8411dbf41147
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.100
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.100.tar.gz mirror://gentoo/devices.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=92d627779b3299fd0240974f831cf2c9
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.101 b/metadata/md5-cache/dev-util/debootstrap-1.0.101
new file mode 100644
index 000000000000..616e39ec1cf2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.101
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.101.tar.gz mirror://gentoo/devices.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=92d627779b3299fd0240974f831cf2c9
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.98 b/metadata/md5-cache/dev-util/debootstrap-1.0.98
deleted file mode 100644
index f5f719b14e15..000000000000
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.98
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Debian/Ubuntu bootstrap scripts
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.98.tar.gz mirror://gentoo/devices.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92d627779b3299fd0240974f831cf2c9
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.99 b/metadata/md5-cache/dev-util/debootstrap-1.0.99
deleted file mode 100644
index 5fdb014073fa..000000000000
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.99
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Debian/Ubuntu bootstrap scripts
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.99.tar.gz mirror://gentoo/devices.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92d627779b3299fd0240974f831cf2c9
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.5 b/metadata/md5-cache/dev-util/drone-cli-0.8.5
deleted file mode 100644
index 840555c33676..000000000000
--- a/metadata/md5-cache/dev-util/drone-cli-0.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Command-line interface for Drone
-EAPI=6
-HOMEPAGE=https://github.com/drone/drone-cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!<dev-util/drone-0.7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/drone/drone-cli/archive/v0.8.5.tar.gz -> drone-cli-0.8.5.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=1738f6448571ac9583dc5a0f7b28fe8d
diff --git a/metadata/md5-cache/dev-util/dwdiff-2.1.0 b/metadata/md5-cache/dev-util/dwdiff-2.1.0
index 6c97f46c48e8..0e8d8969e4a5 100644
--- a/metadata/md5-cache/dev-util/dwdiff-2.1.0
+++ b/metadata/md5-cache/dev-util/dwdiff-2.1.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
 DESCRIPTION=diff-like program operating at word level instead of line level
 EAPI=5
-HOMEPAGE=http://os.ghalkes.nl/dwdiff.html
+HOMEPAGE=https://os.ghalkes.nl/dwdiff.html
 IUSE=nls
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= sys-apps/diffutils
 SLOT=0
-SRC_URI=http://os.ghalkes.nl/dist/dwdiff-2.1.0.tar.bz2
+SRC_URI=https://os.ghalkes.nl/dist/dwdiff-2.1.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c30e4956aa3d069731b510e6a0bb31df
+_md5_=58d764380ac294dea9ba8f9c3876c618
diff --git a/metadata/md5-cache/dev-util/dwdiff-2.1.0-r1 b/metadata/md5-cache/dev-util/dwdiff-2.1.0-r1
index ab1bd6674313..66da1e350424 100644
--- a/metadata/md5-cache/dev-util/dwdiff-2.1.0-r1
+++ b/metadata/md5-cache/dev-util/dwdiff-2.1.0-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
 DESCRIPTION=diff-like program operating at word level instead of line level
 EAPI=6
-HOMEPAGE=http://os.ghalkes.nl/dwdiff.html
+HOMEPAGE=https://os.ghalkes.nl/dwdiff.html
 IUSE=nls
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= sys-apps/diffutils
 SLOT=0
-SRC_URI=http://os.ghalkes.nl/dist/dwdiff-2.1.0.tar.bz2
+SRC_URI=https://os.ghalkes.nl/dist/dwdiff-2.1.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62b95246646dbbb04d5f414835cfe6a0
+_md5_=4abe909d2e07b2ef15929519894cdbcd
diff --git a/metadata/md5-cache/dev-util/dwdiff-2.1.1 b/metadata/md5-cache/dev-util/dwdiff-2.1.1
index a67de764512f..180d70b892c2 100644
--- a/metadata/md5-cache/dev-util/dwdiff-2.1.1
+++ b/metadata/md5-cache/dev-util/dwdiff-2.1.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
 DESCRIPTION=diff-like program operating at word level instead of line level
 EAPI=6
-HOMEPAGE=http://os.ghalkes.nl/dwdiff.html
+HOMEPAGE=https://os.ghalkes.nl/dwdiff.html
 IUSE=nls
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= sys-apps/diffutils
 SLOT=0
-SRC_URI=http://os.ghalkes.nl/dist/dwdiff-2.1.1.tar.bz2
+SRC_URI=https://os.ghalkes.nl/dist/dwdiff-2.1.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afec74d0430bf6bb59a64155cb58d4a5
+_md5_=4abe909d2e07b2ef15929519894cdbcd
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.24.2-r1 b/metadata/md5-cache/dev-util/gnome-builder-3.24.2-r1
index 84333a97b419..3edf7b580037 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.24.2-r1
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.24.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.24/gnome-builder-3.24.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e3a9bc037c7308e89c57684c7028d8e9
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.25-r1 b/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
index ba98b6280d93..513d78308310 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ Documentation Generator
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
 IUSE=debug doc emacs highlight vim python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 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(+)] >=dev-libs/glib-2.6:2 >=dev-lang/perl-5.18 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( virtual/emacs ) highlight? ( vim? ( || ( app-editors/vim app-editors/gvim ) ) !vim? ( dev-util/source-highlight ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.25/gtk-doc-1.25.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11465901690afae392c45cee4cfd4a03
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1fc252ffc6ada84a03403b33a8421850
diff --git a/metadata/md5-cache/dev-util/idutils-4.2 b/metadata/md5-cache/dev-util/idutils-4.2
deleted file mode 100644
index 8c94e5e222bf..000000000000
--- a/metadata/md5-cache/dev-util/idutils-4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=emacs? ( virtual/emacs ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Fast, high-capacity, identifier database tool
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/idutils/
-IUSE=emacs nls
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=emacs? ( virtual/emacs ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/idutils/idutils-4.2.tar.gz mirror://debian/pool/main/i/id-utils/id-utils_4.2-1.diff.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=986b67abe668a1d5cfe5f16cc1f340cf
diff --git a/metadata/md5-cache/dev-util/idutils-4.5 b/metadata/md5-cache/dev-util/idutils-4.5
deleted file mode 100644
index 5800566f7b57..000000000000
--- a/metadata/md5-cache/dev-util/idutils-4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=emacs? ( virtual/emacs ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Fast, high-capacity, identifier database tool
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/idutils/
-IUSE=emacs nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=emacs? ( virtual/emacs ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/idutils/idutils-4.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ddbd564fc8f0379c3049099d7b9d2c1c
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r3 b/metadata/md5-cache/dev-util/jconfig-2.8-r3
deleted file mode 100644
index 1cf748dc4b42..000000000000
--- a/metadata/md5-cache/dev-util/jconfig-2.8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Utility that provides a simple API for the management of properties
-EAPI=0
-HOMEPAGE=http://www.jconfig.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=70b5903d37aa0d9b895448dbc8e7157f
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3149 b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3149
new file mode 100644
index 000000000000..ab4bd27e89ac
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3149
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/yacc >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
+EAPI=7
+HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3149-src.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=963502c3a05c94efe479335d95ac59d8
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20171020 b/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20171020
deleted file mode 100644
index 2ccf41b46b13..000000000000
--- a/metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20171020
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/yacc >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
-EAPI=6
-HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998_pre20171020-src.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06fb24f45a208be115ded00368ac1a1e
diff --git a/metadata/md5-cache/dev-util/meson-0.46.1 b/metadata/md5-cache/dev-util/meson-0.46.1
index f07fb54382e8..ee3dcac2ea0d 100644
--- a/metadata/md5-cache/dev-util/meson-0.46.1
+++ b/metadata/md5-cache/dev-util/meson-0.46.1
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.46.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ffd9dfc1fd171f4810932cfb2c11125
+_md5_=e7b3171af9aaa4a898e3b40c5d2262db
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
new file mode 100644
index 000000000000..0f36434dd97b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-396.24[uvm] mpi? ( virtual/mpi ) )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=+cuda debug +doc +examples opencl mpi
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-396.24[uvm] mpi? ( virtual/mpi ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ebf1ad155c983ccabb011b7cd850295
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
new file mode 100644
index 000000000000..b8aa2d821434
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/9.2.88
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dc97ac8fcc42be993bb3b418c9f4a306
diff --git a/metadata/md5-cache/dev-util/ostree-2018.5 b/metadata/md5-cache/dev-util/ostree-2018.5
new file mode 100644
index 000000000000..7f80daa9fdb3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ostree-2018.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=app-arch/libarchive:= app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:= net-misc/curl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= grub? ( sys-boot/grub:* ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* ) sys-devel/bison sys-devel/flex
+DESCRIPTION=Operating system and container binary deployment and upgrades
+EAPI=6
+HOMEPAGE=https://ostree.readthedocs.io/en/latest/
+IUSE=grub selinux soup systemd zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=app-arch/libarchive:= app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:= net-misc/curl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= grub? ( sys-boot/grub:* ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2018.5/libostree-2018.5.tar.xz -> ostree-2018.5.tar.xz
+_md5_=0274150ecbc2043e93654da4273d4086
diff --git a/metadata/md5-cache/dev-util/peg-0.1.13 b/metadata/md5-cache/dev-util/peg-0.1.13
deleted file mode 100644
index c73350302b14..000000000000
--- a/metadata/md5-cache/dev-util/peg-0.1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DESCRIPTION=Recursive-descent parser generators for C
-EAPI=5
-HOMEPAGE=http://piumarta.com/software/peg/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=http://piumarta.com/software/peg/peg-0.1.13.tar.gz
-_md5_=e80ec3fde3b9d764693c8e8612b670f6
diff --git a/metadata/md5-cache/dev-util/peg-0.1.15 b/metadata/md5-cache/dev-util/peg-0.1.15
deleted file mode 100644
index 7c5a9230483e..000000000000
--- a/metadata/md5-cache/dev-util/peg-0.1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DESCRIPTION=Recursive-descent parser generators for C
-EAPI=5
-HOMEPAGE=http://piumarta.com/software/peg/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=http://piumarta.com/software/peg/peg-0.1.15.tar.gz
-_md5_=27d5443c13dee5666f51787778630c6c
diff --git a/metadata/md5-cache/dev-util/peg-0.1.18 b/metadata/md5-cache/dev-util/peg-0.1.18
new file mode 100644
index 000000000000..5c8aa64a07cb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/peg-0.1.18
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare test
+DESCRIPTION=Recursive-descent parser generators for C
+EAPI=7
+HOMEPAGE=http://piumarta.com/software/peg/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://piumarta.com/software/peg/peg-0.1.18.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a052fb4b4fd4e30343af474ab8338016
diff --git a/metadata/md5-cache/dev-util/peg-0.1.9 b/metadata/md5-cache/dev-util/peg-0.1.9
deleted file mode 100644
index c6a9f2155a8a..000000000000
--- a/metadata/md5-cache/dev-util/peg-0.1.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DESCRIPTION=Recursive-descent parser generators for C
-EAPI=5
-HOMEPAGE=http://piumarta.com/software/peg/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=http://piumarta.com/software/peg/peg-0.1.9.tar.gz
-_md5_=bbbd280e91d0431be8419583aa9d4f83
diff --git a/metadata/md5-cache/dev-util/perf-4.14.33 b/metadata/md5-cache/dev-util/perf-4.14.33
index 3df17b64a786..a2b3837fda4b 100644
--- a/metadata/md5-cache/dev-util/perf-4.14.33
+++ b/metadata/md5-cache/dev-util/perf-4.14.33
@@ -4,11 +4,11 @@ DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=6
 HOMEPAGE=https://perf.wiki.kernel.org/
 IUSE=audit debug +demangle +doc gtk numa perl python slang unwind python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) 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(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.33.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e5207375300e2d7c4d4b7a8e3a200d82
+_md5_=780b21326c5264724673cc55b8d388e6
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index f6f145b190d5..55d83dcdc432 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND==dev-python/snakeoil-9999[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(-)] =sys-apps/pkgcore-9999[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/lxml[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/setuptools[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/sphinx[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(-)] >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =sys-apps/pkgcore-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=pkgcore-based QA utility
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python3_6
 LICENSE=|| ( BSD GPL-2 )
-RDEPEND==dev-python/snakeoil-9999[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(-)] =sys-apps/pkgcore-9999[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/lxml[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 )
+RDEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =sys-apps/pkgcore-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=868971f4a2b1b4ba852a16bd295d5cbf
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=378b9d2b368ece474f52b55a697e9a05
diff --git a/metadata/md5-cache/dev-util/pretrace-0.4-r1 b/metadata/md5-cache/dev-util/pretrace-0.4-r1
index 28102088822c..93b2a0c22fab 100644
--- a/metadata/md5-cache/dev-util/pretrace-0.4-r1
+++ b/metadata/md5-cache/dev-util/pretrace-0.4-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://dev.inversepath.com/pretrace/libpretrace-0.4.tar.gz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=3e58a3fda80a67003d78d887b2f1894c
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2017.3.3 b/metadata/md5-cache/dev-util/pycharm-community-2017.3.3
deleted file mode 100644
index 03e3cb647b3b..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-community-2017.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=>=virtual/jre-1.8
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2017.3.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79d0975818f1e5f1b0d8a2eb4086a0cc
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2017.3.4 b/metadata/md5-cache/dev-util/pycharm-community-2017.3.4
index 9dce10300c24..f3d922146c91 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-2017.3.4
+++ b/metadata/md5-cache/dev-util/pycharm-community-2017.3.4
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.8
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-community-2017.3.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=79d0975818f1e5f1b0d8a2eb4086a0cc
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.1 b/metadata/md5-cache/dev-util/pycharm-community-2018.1
deleted file mode 100644
index 500ad8517a7d..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-community-2018.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=>=virtual/jre-1.8
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a781754ff9ec8098efa30e11565b00d
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.1.1 b/metadata/md5-cache/dev-util/pycharm-community-2018.1.1
deleted file mode 100644
index 0df5f450b9a9..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-community-2018.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=>=virtual/jre-1.8
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a781754ff9ec8098efa30e11565b00d
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.1.4 b/metadata/md5-cache/dev-util/pycharm-community-2018.1.4
new file mode 100644
index 000000000000..4f04aa8671aa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2018.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.1.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b4d26318673ea6320117067e95f57da5
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3 b/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
deleted file mode 100644
index 702be96dae9f..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=amd64 x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2017.3.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98d273247d43b9be91e5e17041e91086
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2017.3.4 b/metadata/md5-cache/dev-util/pycharm-professional-2017.3.4
index 70de01a8d547..b1e346f7eca1 100644
--- a/metadata/md5-cache/dev-util/pycharm-professional-2017.3.4
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2017.3.4
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.8 dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2017.3.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=98d273247d43b9be91e5e17041e91086
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.1 b/metadata/md5-cache/dev-util/pycharm-professional-2018.1
deleted file mode 100644
index 8474c5364f3d..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-2018.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cb9e489ec7b18af895d6266774de887a
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.1.1 b/metadata/md5-cache/dev-util/pycharm-professional-2018.1.1
deleted file mode 100644
index 69558edf43e7..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-2018.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cb9e489ec7b18af895d6266774de887a
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.1.4 b/metadata/md5-cache/dev-util/pycharm-professional-2018.1.4
new file mode 100644
index 000000000000..589b67d9a6dd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2018.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.1.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cb9e489ec7b18af895d6266774de887a
diff --git a/metadata/md5-cache/dev-util/reswrap-3.2.0 b/metadata/md5-cache/dev-util/reswrap-3.2.0
deleted file mode 100644
index 79d05aad6647..000000000000
--- a/metadata/md5-cache/dev-util/reswrap-3.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Utility to wrap icon resources into C++ code, from the FOX Toolkit
-EAPI=0
-HOMEPAGE=http://www.fox-toolkit.org/
-IUSE=debug doc profile
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.4.12.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fox	7c70615c3c15c50eb1025055fef16df4	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=124e3d5acb80156a8ec8ae8a1feadcc7
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10-r3 b/metadata/md5-cache/dev-util/schroot-1.6.10-r3
deleted file mode 100644
index 1599ffc2c3f3..000000000000
--- a/metadata/md5-cache/dev-util/schroot-1.6.10-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Utility to execute commands in a chroot environment
-EAPI=5
-HOMEPAGE=http://packages.debian.org/source/sid/schroot
-IUSE=btrfs +dchroot debug doc lvm nls pam test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-1.debian.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=edec13fd05143b739c2c1c2d06d669d3
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10-r4 b/metadata/md5-cache/dev-util/schroot-1.6.10-r4
index 10b857a89c61..2afb231fd5d5 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.10-r4
+++ b/metadata/md5-cache/dev-util/schroot-1.6.10-r4
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=>=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Utility to execute commands in a chroot environment
 EAPI=6
-HOMEPAGE=http://packages.debian.org/source/sid/schroot
+HOMEPAGE=https://packages.debian.org/source/sid/schroot
 IUSE=btrfs +dchroot debug doc lvm nls pam test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-2.debian.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98971ee6205eca65d18b4c5515776e77
+_md5_=880939d1ab1916c47f4355756dd2c04c
diff --git a/metadata/md5-cache/dev-util/sel-0.08.4 b/metadata/md5-cache/dev-util/sel-0.08.4
deleted file mode 100644
index e5814be5135e..000000000000
--- a/metadata/md5-cache/dev-util/sel-0.08.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/ncurses-5.1
-DESCRIPTION=A filemanager for shell scripts
-EAPI=0
-HOMEPAGE=http://www.rninet.de/darkstar/sel.html
-KEYWORDS=~amd64 ppc s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.1
-SLOT=0
-SRC_URI=http://www.rninet.de/darkstar/files/sel-0.08.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=61fd31e4cc668c174a22b8c83edf4b5d
diff --git a/metadata/md5-cache/dev-util/sel-0.08.4-r1 b/metadata/md5-cache/dev-util/sel-0.08.4-r1
deleted file mode 100644
index dd3775cc79f7..000000000000
--- a/metadata/md5-cache/dev-util/sel-0.08.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/ncurses-5.1
-DESCRIPTION=A filemanager for shell scripts
-EAPI=4
-HOMEPAGE=http://www.rninet.de/darkstar/sel.html
-KEYWORDS=~amd64 ppc s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.1
-SLOT=0
-SRC_URI=http://www.rninet.de/darkstar/files/sel-0.08.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b8688abab1a2c3bfa17cf9c87d4af1f7
diff --git a/metadata/md5-cache/dev-util/sel-0.08.4-r2 b/metadata/md5-cache/dev-util/sel-0.08.4-r2
index 74be11d79916..32af5c63b0c5 100644
--- a/metadata/md5-cache/dev-util/sel-0.08.4-r2
+++ b/metadata/md5-cache/dev-util/sel-0.08.4-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A filemanager for shell scripts
 EAPI=6
 HOMEPAGE=http://www.rninet.de/darkstar/sel.html
-KEYWORDS=amd64 ppc ~s390 sparc x86
+KEYWORDS=amd64 ppc s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.rninet.de/darkstar/files/sel-0.08.4.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=734fe9a0cb03c70c0dfb8e7d0d654e3f
+_md5_=f0f91488b8bb75fd025b3c4710a31171
diff --git a/metadata/md5-cache/dev-util/shards-0.6.1 b/metadata/md5-cache/dev-util/shards-0.6.1
deleted file mode 100644
index c3f03695a7bb..000000000000
--- a/metadata/md5-cache/dev-util/shards-0.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>dev-lang/crystal-0.11.1[yaml]
-DESCRIPTION=Dependency manager for the Crystal language
-EAPI=6
-HOMEPAGE=https://github.com/ysbaddaden/shards
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>dev-lang/crystal-0.11.1[yaml]
-SLOT=0
-SRC_URI=https://github.com/ysbaddaden/shards/archive/v0.6.1.tar.gz -> shards-0.6.1.tar.gz
-_md5_=16674c8eaa7e2a5cf649d8fd972ab066
diff --git a/metadata/md5-cache/dev-util/shards-0.6.2 b/metadata/md5-cache/dev-util/shards-0.6.2
deleted file mode 100644
index f3cb08fe147b..000000000000
--- a/metadata/md5-cache/dev-util/shards-0.6.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>dev-lang/crystal-0.11.1[yaml]
-DESCRIPTION=Dependency manager for the Crystal language
-EAPI=6
-HOMEPAGE=https://github.com/crystal-lang/shards
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>dev-lang/crystal-0.11.1[yaml]
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/shards/archive/v0.6.2.tar.gz -> shards-0.6.2.tar.gz
-_md5_=dd7de89fa90245f67a1dc5bb38c36c5c
diff --git a/metadata/md5-cache/dev-util/shards-0.6.3 b/metadata/md5-cache/dev-util/shards-0.6.3
deleted file mode 100644
index 5d79d06c13cd..000000000000
--- a/metadata/md5-cache/dev-util/shards-0.6.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>dev-lang/crystal-0.11.1[yaml]
-DESCRIPTION=Dependency manager for the Crystal language
-EAPI=6
-HOMEPAGE=https://github.com/crystal-lang/shards
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>dev-lang/crystal-0.11.1[yaml]
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/shards/archive/v0.6.3.tar.gz -> shards-0.6.3.tar.gz
-_md5_=dd7de89fa90245f67a1dc5bb38c36c5c
diff --git a/metadata/md5-cache/dev-util/shards-0.6.4 b/metadata/md5-cache/dev-util/shards-0.6.4
deleted file mode 100644
index bf3ecf51e978..000000000000
--- a/metadata/md5-cache/dev-util/shards-0.6.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>dev-lang/crystal-0.11.1[yaml]
-DESCRIPTION=Dependency manager for the Crystal language
-EAPI=6
-HOMEPAGE=https://github.com/crystal-lang/shards
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>dev-lang/crystal-0.11.1[yaml]
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/shards/archive/v0.6.4.tar.gz -> shards-0.6.4.tar.gz
-_md5_=dd7de89fa90245f67a1dc5bb38c36c5c
diff --git a/metadata/md5-cache/dev-util/shards-0.7.1 b/metadata/md5-cache/dev-util/shards-0.7.1
deleted file mode 100644
index 12972e7abfa8..000000000000
--- a/metadata/md5-cache/dev-util/shards-0.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>dev-lang/crystal-0.11.1[yaml]
-DESCRIPTION=Dependency manager for the Crystal language
-EAPI=6
-HOMEPAGE=https://github.com/crystal-lang/shards
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>dev-lang/crystal-0.11.1[yaml]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/shards/archive/v0.7.1.tar.gz -> shards-0.7.1.tar.gz
-_md5_=03e1e13ac0b0592545706aa6006c6a17
diff --git a/metadata/md5-cache/dev-util/shards-0.8.0 b/metadata/md5-cache/dev-util/shards-0.8.0
new file mode 100644
index 000000000000..c72976b9b78f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/shards-0.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>dev-lang/crystal-0.11.1[yaml]
+DESCRIPTION=Dependency manager for the Crystal language
+EAPI=6
+HOMEPAGE=https://github.com/crystal-lang/shards
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>dev-lang/crystal-0.11.1[yaml]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/crystal-lang/shards/archive/v0.8.0.tar.gz -> shards-0.8.0.tar.gz
+_md5_=a1457898345c5b249a14423c14977660
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.5.0 b/metadata/md5-cache/dev-util/shellcheck-0.5.0
new file mode 100644
index 000000000000..8c0ed3b641bd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/shellcheck-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Shell script analysis tool
+EAPI=6
+HOMEPAGE=https://www.shellcheck.net/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.5.0
+SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.5.0/ShellCheck-0.5.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3d942b6a1a7c36d75308477a5f16cac5
diff --git a/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1 b/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1
deleted file mode 100644
index 84dbfa6945e3..000000000000
--- a/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
-DESCRIPTION=Graphical front-end to the Valgrind suite of tools
-EAPI=5
-HOMEPAGE=http://www.valgrind.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
-SLOT=0
-SRC_URI=http://www.valgrind.org/downloads/valkyrie-2.0.0.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db81bc33a002adf18f798b6b88e7a98e
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.9 b/metadata/md5-cache/dev-util/visualvm-1.3.9
deleted file mode 100644
index a259b37c6996..000000000000
--- a/metadata/md5-cache/dev-util/visualvm-1.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
-EAPI=6
-HOMEPAGE=https://visualvm.github.io/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=7
-SRC_URI=https://github.com/oracle/visualvm/archive/1.3.9.tar.gz -> visualvm-1.3.9.tar.gz https://github.com/oracle/visualvm/releases/download/1.3.9/nb802_visualvm_02102016.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=810435eceb09ac9065b4dbd66fa750ec
diff --git a/metadata/md5-cache/dev-util/visualvm-1.4.1 b/metadata/md5-cache/dev-util/visualvm-1.4.1
index 915ea5f1f945..0aaf058cb0d4 100644
--- a/metadata/md5-cache/dev-util/visualvm-1.4.1
+++ b/metadata/md5-cache/dev-util/visualvm-1.4.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=7
 SRC_URI=https://github.com/oracle/visualvm/archive/1.4.1.tar.gz -> visualvm-1.4.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a173975dde152d34574be872515ccb0b
+_md5_=ad796a5a588d93961cb30b1069779e4f
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-0_p20180601 b/metadata/md5-cache/dev-util/vulkan-headers-0_p20180601
deleted file mode 100644
index 655b30388219..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-0_p20180601
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=6
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3.tar.gz -> vulkan-headers-0_p20180601.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c47c30362cb286be97b8da9f986e6fb
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-0_pre20180601 b/metadata/md5-cache/dev-util/vulkan-headers-0_pre20180601
new file mode 100644
index 000000000000..207ccef84041
--- /dev/null
+++ b/metadata/md5-cache/dev-util/vulkan-headers-0_pre20180601
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vulkan Header files and API registry
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3.tar.gz -> vulkan-headers-0_pre20180601.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c47c30362cb286be97b8da9f986e6fb
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-0_pre20180601 b/metadata/md5-cache/dev-util/vulkan-tools-0_pre20180601
index 8e74c712cff9..afd2f47347df 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-0_pre20180601
+++ b/metadata/md5-cache/dev-util/vulkan-tools-0_pre20180601
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-util/glslang:=[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/vulkan-headers media-libs/vulkan-loader:=[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(-)?] wayland? ( dev-libs/wayland:=[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(-)?] ) X? ( x11-libs/libX11:=[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(-)?] x11-libs/libXrandr:=[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.9.6
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-util/glslang:=[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/vulkan-headers media-libs/vulkan-loader:=[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(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[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(-)?] ) X? ( x11-libs/libX11:=[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(-)?] x11-libs/libXrandr:=[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.9.6
 DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
@@ -10,4 +10,4 @@ RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/b7940409945face40657080b6074fc5588a0c0ad.tar.gz -> vulkan-tools-0_pre20180601.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6ada5d410d55ae00745aabba18811d3
+_md5_=16585baa712cf7ae2b6244d12021eb87
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-9999 b/metadata/md5-cache/dev-util/vulkan-tools-9999
index 221a7dbbae6a..d0b84a3bbe9e 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-9999
+++ b/metadata/md5-cache/dev-util/vulkan-tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-util/glslang:=[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/vulkan-headers media-libs/vulkan-loader:=[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(-)?] wayland? ( dev-libs/wayland:=[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(-)?] ) X? ( x11-libs/libX11:=[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(-)?] x11-libs/libXrandr:=[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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-util/glslang:=[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/vulkan-headers media-libs/vulkan-loader:=[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(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[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(-)?] ) X? ( x11-libs/libX11:=[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(-)?] x11-libs/libXrandr:=[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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6ada5d410d55ae00745aabba18811d3
+_md5_=16585baa712cf7ae2b6244d12021eb87
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index be71e691920d..e2c8e14eb481 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/cvs-1.12.12-r12 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
index a4595778187a..548533e15741 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
@@ -4,11 +4,11 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=6
 HOMEPAGE=http://cvs.nongnu.org/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f31f8fb2d5c2c4c3f8a28b8660fa326
+_md5_=d48f8d0ce15ea621fc2217953a4f9069
diff --git a/metadata/md5-cache/dev-vcs/cvsd-1.0.7 b/metadata/md5-cache/dev-vcs/cvsd-1.0.7
deleted file mode 100644
index d0b8049b6150..000000000000
--- a/metadata/md5-cache/dev-vcs/cvsd-1.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-DESCRIPTION=CVS pserver daemon
-EAPI=0
-HOMEPAGE=http://ch.tudelft.nl/~arthur/cvsd/
-IUSE=tcpd
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-lang/perl-5.8.0 >=dev-vcs/cvs-1.11.6
-SLOT=0
-SRC_URI=http://ch.tudelft.nl/~arthur/cvsd/cvsd-1.0.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab1a695996bdaf600c66422ac3691980
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.4 b/metadata/md5-cache/dev-vcs/git-2.16.4
index 7a462d4093c2..a723523b067e 100644
--- a/metadata/md5-cache/dev-vcs/git-2.16.4
+++ b/metadata/md5-cache/dev-vcs/git-2.16.4
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( 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=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.16.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.4.tar.xz )
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=58d1f441fe944730ac12ace2d49f2a03
+_md5_=10face2025ec6dc920a92ca12b623d6f
diff --git a/metadata/md5-cache/dev-vcs/git-2.17.1 b/metadata/md5-cache/dev-vcs/git-2.17.1
deleted file mode 100644
index 57b9d37ab12c..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.17.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.17.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.17.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.17.1.tar.xz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d7715ca99ec08a12c3406f2db80921d
diff --git a/metadata/md5-cache/dev-vcs/git-2.17.1-r1 b/metadata/md5-cache/dev-vcs/git-2.17.1-r1
new file mode 100644
index 000000000000..9b284ca9b829
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.17.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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(+)] )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/software/scm/git/git-2.17.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.17.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.17.1.tar.xz )
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=43c63f6c4bc7d64c6a0a3ea94a98b01b
diff --git a/metadata/md5-cache/dev-vcs/git-2.18.0_rc1 b/metadata/md5-cache/dev-vcs/git-2.18.0_rc1
new file mode 100644
index 000000000000..5a2cbfbd0a5e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.18.0_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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(+)] )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/software/scm/git/testing/git-2.18.0.rc1.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.18.0.rc1.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.18.0.rc1.tar.xz )
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3cc41c178a94ac2a1faf6d1931326ca2
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 4bfc1ffd18ce..20558774b7e4 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25b85c15e61ac4e29c47297318e840cb
+_md5_=97b8a4a153bd1b3a09f8c1c289aa2d95
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 4bfc1ffd18ce..20558774b7e4 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25b85c15e61ac4e29c47297318e840cb
+_md5_=97b8a4a153bd1b3a09f8c1c289aa2d95
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index 78754392ce97..31caf844b99b 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5db8f9de43a654661f7fa2133f7a744
+_md5_=f5654d99eddeb5ee8e75f6dd4bc95dca
diff --git a/metadata/md5-cache/dev-vcs/git-cola-2.11 b/metadata/md5-cache/dev-vcs/git-cola-2.11
index f1ff5f11d69f..0a11bbb955a5 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-2.11
+++ b/metadata/md5-cache/dev-vcs/git-cola-2.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v2.11.tar.gz -> git-cola-2.11.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=457e567e8ae0525bdd728d5e73752d57
diff --git a/metadata/md5-cache/dev-vcs/hub-2.2.9 b/metadata/md5-cache/dev-vcs/hub-2.2.9
index 0b2711cded9a..8bc953152794 100644
--- a/metadata/md5-cache/dev-vcs/hub-2.2.9
+++ b/metadata/md5-cache/dev-vcs/hub-2.2.9
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-vcs/git-1.7.3
 SLOT=0
 SRC_URI=https://github.com/github/hub/archive/v2.2.9.tar.gz -> hub-2.2.9.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=e7378094200712e5595699948eaca622
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.6.1 b/metadata/md5-cache/dev-vcs/mercurial-4.6.1
new file mode 100644
index 000000000000..36ffa7c9f928
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Scalable distributed SCM
+EAPI=6
+HOMEPAGE=https://www.mercurial-scm.org/
+IUSE=bugzilla emacs gpg test tk python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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://www.mercurial-scm.org/release/mercurial-4.6.1.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aa5ecc2a0bb964a287a7b11f0908a974
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1 b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
index bafd884e6305..1d5f15ba92d8 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~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 ~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=Subversion GPL-2
 RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-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_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) 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_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.9.7.tar.bz2 https://dev.gentoo.org/~mgorny/dist/subversion-1.8.18-patchset.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a2b8826d0c3f7e07e4f1b6a73c24789
+_md5_=520f14724fee211c4f277ed2687b99da
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.12 b/metadata/md5-cache/dev-vcs/svn2git-1.0.12
new file mode 100644
index 000000000000..d056ceabcb4f
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/svn2git-1.0.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
+DESCRIPTION=Tool for one-time conversion from svn to git
+EAPI=6
+HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.12.tar.gz -> svn2git-1.0.12.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=52837763d5dd358013fbc34e6b3a05d2
diff --git a/metadata/md5-cache/dev-vcs/svn2git-9999 b/metadata/md5-cache/dev-vcs/svn2git-9999
index b8f841c0c3f6..7156bce720b6 100644
--- a/metadata/md5-cache/dev-vcs/svn2git-9999
+++ b/metadata/md5-cache/dev-vcs/svn2git-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=dev-qt/qtcore:5 dev-vcs/subversion >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Tool for one-time conversion from svn to git
 EAPI=6
@@ -7,4 +7,4 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cfd1659a95be5b5b2bd1d88d200afef4
+_md5_=e406737d43cce97595e7f948f7c0c714
diff --git a/metadata/md5-cache/dev-vcs/tig-2.2.2 b/metadata/md5-cache/dev-vcs/tig-2.2.2
deleted file mode 100644
index 8972241ea728..000000000000
--- a/metadata/md5-cache/dev-vcs/tig-2.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
-DESCRIPTION=text mode interface for git
-EAPI=6
-HOMEPAGE=https://jonas.github.io/tig/
-IUSE=unicode
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.2.2/tig-2.2.2.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dc0654c01161f37743859441827dd558
diff --git a/metadata/md5-cache/dev-vcs/tig-2.3.0 b/metadata/md5-cache/dev-vcs/tig-2.3.0
deleted file mode 100644
index 596c89576531..000000000000
--- a/metadata/md5-cache/dev-vcs/tig-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
-DESCRIPTION=A text mode interface for git
-EAPI=6
-HOMEPAGE=https://jonas.github.io/tig/
-IUSE=unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.3.0/tig-2.3.0.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bd52e7a9aadb9dbe68b6b85707052982
diff --git a/metadata/md5-cache/dev-vcs/tig-2.3.2 b/metadata/md5-cache/dev-vcs/tig-2.3.2
deleted file mode 100644
index 35e56049125e..000000000000
--- a/metadata/md5-cache/dev-vcs/tig-2.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
-DESCRIPTION=A text mode interface for git
-EAPI=6
-HOMEPAGE=https://jonas.github.io/tig/
-IUSE=unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.3.2/tig-2.3.2.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bd52e7a9aadb9dbe68b6b85707052982
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index c91401f65905..fb436c8c4969 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/spout-1.3-r1 b/metadata/md5-cache/games-arcade/spout-1.3-r1
index a0722885a1fe..bff4bda26fee 100644
--- a/metadata/md5-cache/games-arcade/spout-1.3-r1
+++ b/metadata/md5-cache/games-arcade/spout-1.3-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/libsdl-1.2.6
 SLOT=0
 SRC_URI=http://rohanpm.net/files/old/spout-unix-1.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=0df36a69309862cf448bb6228ba45327
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 250e7a39528d..2a55364dbe36 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.24.1 b/metadata/md5-cache/games-board/gnome-chess-3.24.1
index f6ec772d2d9f..74c0f1210711 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.24.1
+++ b/metadata/md5-cache/games-board/gnome-chess-3.24.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.19:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e1c6b82ce2f60bfdbfbb11dd9f7543d4
diff --git a/metadata/md5-cache/games-board/gnugo-3.9.1-r2 b/metadata/md5-cache/games-board/gnugo-3.9.1-r2
index 01a5e0157b7d..313d16d62ab7 100644
--- a/metadata/md5-cache/games-board/gnugo-3.9.1-r2
+++ b/metadata/md5-cache/games-board/gnugo-3.9.1-r2
@@ -4,9 +4,9 @@ DESCRIPTION=A Go-playing program
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gnugo/devel.html
 IUSE=readline
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0=
 SLOT=0
 SRC_URI=mirror://gentoo/gnugo-3.9.1.tar.gz
-_md5_=6d197ec2604fe29ddb4ebfa55fd0dcfe
+_md5_=8fe601c3edb8e585a2c158c2f56c4e43
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 62311469ab9d..13b25c41af7b 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/openmsx-0.14.0 b/metadata/md5-cache/games-emulation/openmsx-0.14.0
index 650a82943bd2..d35ee1d4fcdc 100644
--- a/metadata/md5-cache/games-emulation/openmsx-0.14.0
+++ b/metadata/md5-cache/games-emulation/openmsx-0.14.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl[sound,video] >=media-libs/glew-1.3.2:0= media-libs/sdl-image[png] media-libs/sdl-ttf virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/openMSX/openMSX/releases/download/RELEASE_0_14_0/openmsx-0.14.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=c8f8caacb00798694e71ac90a1cd4c68
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 467f2878e982..634615875e4f 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/odamex-0.7.0-r1 b/metadata/md5-cache/games-engines/odamex-0.7.0-r1
index 8fac3d3cfd25..60e34eebe4f1 100644
--- a/metadata/md5-cache/games-engines/odamex-0.7.0-r1
+++ b/metadata/md5-cache/games-engines/odamex-0.7.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dedicated? ( >=net-libs/miniupnpc-1.8:0= ) !dedicated? ( media-libs/libpng:0= >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:3.0[X] ) portmidi? ( media-libs/portmidi ) server? ( >=net-libs/miniupnpc-1.8:0= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/odamex/Odamex/0.7.0/odamex-src-0.7.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=87c82efad1861e7139cf1eba90da1366
diff --git a/metadata/md5-cache/games-engines/openmw-0.43.0-r1 b/metadata/md5-cache/games-engines/openmw-0.43.0-r1
index 6c84596dbe6e..9ed158a62af3 100644
--- a/metadata/md5-cache/games-engines/openmw-0.43.0-r1
+++ b/metadata/md5-cache/games-engines/openmw-0.43.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 MIT BitstreamVera ZLIB
 RDEPEND=dev-games/mygui || ( ( >=dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] dev-games/openscenegraph-qt ) <dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,qt5,sdl,svg,truetype,zlib] ) dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video,X] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86 virtual/opengl qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.43.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0031cf109400b790d3e331e0f79b52b7
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 3a9d614cc6dd..e1a682d1514e 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/doomsday-2.0.3 b/metadata/md5-cache/games-fps/doomsday-2.0.3
index 5c171c3556bd..e5470d8ef826 100644
--- a/metadata/md5-cache/games-fps/doomsday-2.0.3
+++ b/metadata/md5-cache/games-fps/doomsday-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extr
 REQUIRED_USE=|| ( python_targets_python2_7 ) demo? ( doom ) freedoom? ( doom )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/2.0.3/doomsday-2.0.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a1a09408d6e19f3a06c9fc0c03d11d82
diff --git a/metadata/md5-cache/games-fps/freedoom-0.10.1-r1 b/metadata/md5-cache/games-fps/freedoom-0.10.1-r1
index a504221ffcf8..544a1ca4e75a 100644
--- a/metadata/md5-cache/games-fps/freedoom-0.10.1-r1
+++ b/metadata/md5-cache/games-fps/freedoom-0.10.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedoom-0.10.1.zip https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedm-0.10.1.zip
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=8692ada031f3b3a1ef2e1c005621b824
diff --git a/metadata/md5-cache/games-fps/prboom-2.5.0-r1 b/metadata/md5-cache/games-fps/prboom-2.5.0-r1
index 9eb75bb7f042..2646d9b7f126 100644
--- a/metadata/md5-cache/games-fps/prboom-2.5.0-r1
+++ b/metadata/md5-cache/games-fps/prboom-2.5.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/sdl-net !<games-fps/lsdldoom-1.5 virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=mirror://sourceforge/prboom/prboom-2.5.0.tar.gz mirror://gentoo/prboom.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=4b810e04c77b642653282950bec9291b
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 0b6c87a3caa7..fbe5e83d289e 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.26 b/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.26
deleted file mode 100644
index 2cd89c4c7cf3..000000000000
--- a/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.26
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=games-misc/fortune-mod
-DESCRIPTION=Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru
-EAPI=4
-HOMEPAGE=http://fortunes.gentoo.ru
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=fairuse
-RDEPEND=games-misc/fortune-mod
-SLOT=0
-SRC_URI=https://slepnoga.googlecode.com/files/gentoo-ru-0.26.gz http://maryasin.name/fortunes-gentoo-ru/gentoo-ru-0.26.gz
-_md5_=338ff71f91f3f5eafce4f17a34f86e25
diff --git a/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-9999 b/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-9999
deleted file mode 100644
index bb168098c816..000000000000
--- a/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=games-misc/fortune-mod dev-vcs/mercurial
-DESCRIPTION=Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru
-EAPI=4
-HOMEPAGE=http://fortunes.gentoo.ru
-LICENSE=fairuse
-RDEPEND=games-misc/fortune-mod
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=278a0ea8c622a3e12e6da02996375411
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 80726a53f496..3334c466d88e 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/mindless-1.6-r1 b/metadata/md5-cache/games-puzzle/mindless-1.6-r1
index 154532b43719..c9b82f4aa2f2 100644
--- a/metadata/md5-cache/games-puzzle/mindless-1.6-r1
+++ b/metadata/md5-cache/games-puzzle/mindless-1.6-r1
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/mindless/mindless-1.6.tar.gz http://www.wizards.com/dci/oracle/OracleAll_050523.txt http://mindless.sourceforge.net/images/logo.png -> mindless.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=27140614cc9cf4cccdb3d4fe45d8994f
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 8d2a22ba9035..1d5d44cdc6b2 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/freedink-108.4-r1 b/metadata/md5-cache/games-rpg/freedink-108.4-r1
index d27d883c27cf..5e57e7eb9311 100644
--- a/metadata/md5-cache/games-rpg/freedink-108.4-r1
+++ b/metadata/md5-cache/games-rpg/freedink-108.4-r1
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=http://www.freedink.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 ~games-rpg/freedink-data-1.08.20140901
+RDEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 games-rpg/freedink-data
 SLOT=0
 SRC_URI=mirror://gnu/freedink/freedink-108.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bce64860ec13470d3a76e8413118f848
+_md5_=4dfcdcf0eb321f7c65f39bf7313fadce
diff --git a/metadata/md5-cache/games-rpg/freedink-data-1.08.20170409 b/metadata/md5-cache/games-rpg/freedink-data-1.08.20170409
new file mode 100644
index 000000000000..a2ed4e332357
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/freedink-data-1.08.20170409
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedink game data
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB CC-BY-SA-3.0 CC-BY-3.0 FreeArt GPL-2 GPL-3 WTFPL-2 OAL-1.0.1 public-domain
+SLOT=0
+SRC_URI=mirror://gnu/freedink/freedink-data-1.08.20170409.tar.gz
+_md5_=3c19a69e2a994a4244cc9f9945eca270
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 9a99afbc54b6..613db2eee90e 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/flightgear-2018.2.1 b/metadata/md5-cache/games-simulation/flightgear-2018.2.1
new file mode 100644
index 000000000000..3b286465270d
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/flightgear-2018.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.2.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Open Source Flight Simulator
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.2.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2018.2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/flightgear-2018.2.1.tar.bz2
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7dfb2ebb2fe6cdfcedf805df9067c84b
diff --git a/metadata/md5-cache/games-simulation/flightgear-data-2018.2.1 b/metadata/md5-cache/games-simulation/flightgear-data-2018.2.1
new file mode 100644
index 000000000000..e790985c93b7
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/flightgear-data-2018.2.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=FlightGear data files
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!<games-simulation/flightgear-2.10.0
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/FlightGear-2018.2.1-data.tar.bz2
+_md5_=7d7bcb03b285aa0d1ee17c420ba0631f
diff --git a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1 b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
index 84838594fe14..4bf6343c4679 100644
--- a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
+++ b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0= ) )
 SLOT=0
 SRC_URI=http://corewar.co.uk/pihlaja/pmars-sdl/pmars-0.9.2-5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=86ab54130f1149f89e68ccf344797170
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 071f962df4df..d30542da8bb6 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/freesynd-0.7.1-r1 b/metadata/md5-cache/games-strategy/freesynd-0.7.1-r1
index aade7da8d0a8..5dea0bd14ce4 100644
--- a/metadata/md5-cache/games-strategy/freesynd-0.7.1-r1
+++ b/metadata/md5-cache/games-strategy/freesynd-0.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libogg media-libs/libpng:0= media-libs/libsdl[X,sound,video] media-libs/libvorbis media-libs/sdl-mixer[mp3,vorbis] media-libs/sdl-image[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/freesynd/freesynd-0.7.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d33c17c2efaf11789e99f82478063468
diff --git a/metadata/md5-cache/games-strategy/galaxyhack-1.74-r1 b/metadata/md5-cache/games-strategy/galaxyhack-1.74-r1
index 299c91bbd980..f0af945dbe58 100644
--- a/metadata/md5-cache/games-strategy/galaxyhack-1.74-r1
+++ b/metadata/md5-cache/games-strategy/galaxyhack-1.74-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 galaxyhack
 SLOT=0
 SRC_URI=mirror://sourceforge/galaxyhack/galaxyhack-1.74.tar.bz2 mirror://gentoo/galaxyhack.png
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a55687f7b06c1ad126b5116cc553b86
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.8.1-r3 b/metadata/md5-cache/games-strategy/s25rttr-0.8.1-r3
index d8d0c005831e..bcf1b87b324f 100644
--- a/metadata/md5-cache/games-strategy/s25rttr-0.8.1-r3
+++ b/metadata/md5-cache/games-strategy/s25rttr-0.8.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 media-libs/libsamplerate media-libs/libsdl[X,sound,opengl,video] media-libs/libsndfile media-libs/sdl-mixer[vorbis] net-libs/miniupnpc virtual/libiconv virtual/opengl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/s25rttr-0.8.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8296e9cccf827efa1a03220fcfd1f042
diff --git a/metadata/md5-cache/games-strategy/ufo-ai-2.4 b/metadata/md5-cache/games-strategy/ufo-ai-2.4
deleted file mode 100644
index ccc60a970974..000000000000
--- a/metadata/md5-cache/games-strategy/ufo-ai-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=!dedicated? ( virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer virtual/jpeg media-libs/libpng:0 media-libs/libogg media-libs/libvorbis x11-proto/xf86vidmodeproto ) net-misc/curl sys-devel/gettext sys-libs/zlib editor? ( dev-libs/libxml2 virtual/jpeg media-libs/openal x11-libs/gtkglext x11-libs/gtksourceview:2.0 )
-DESCRIPTION=UFO: Alien Invasion - X-COM inspired strategy game
-EAPI=5
-HOMEPAGE=http://ufoai.sourceforge.net/
-IUSE=debug dedicated editor
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/ufoai/ufoai-2.4-source.tar.bz2 mirror://sourceforge/ufoai/ufoai-2.4-data.tar http://mattn.ninex.info/1maps.pk3
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5992038e1c3dd72bf5f9e2f023d689c6
diff --git a/metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603 b/metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603
new file mode 100644
index 000000000000..3bd2d17c4f5e
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=net-misc/curl sys-libs/zlib client? ( media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/xvid virtual/jpeg:0 virtual/opengl ) editor? ( dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libvorbis media-libs/openal virtual/glu virtual/jpeg:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/gtksourceview:2.0 ) server? ( media-libs/libsdl2[threads] ) app-arch/unzip sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=UFO: Alien Invasion - X-COM inspired strategy game
+EAPI=6
+HOMEPAGE=https://ufoai.org/
+IUSE=+client cpu_flags_x86_sse debug editor server
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT
+RDEPEND=net-misc/curl sys-libs/zlib client? ( media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/xvid virtual/jpeg:0 virtual/opengl ) editor? ( dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libvorbis media-libs/openal virtual/glu virtual/jpeg:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/gtksourceview:2.0 ) server? ( media-libs/libsdl2[threads] )
+REQUIRED_USE=|| ( client editor server )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~chewi/distfiles/ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip mirror://sourceforge/ufoai/ufoai-2.5-data.tar editor? ( mirror://sourceforge/ufoai/ufoai-2.5-mappack.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=27aa020fae069b203d11a24b84d3f967
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.12.6 b/metadata/md5-cache/games-strategy/wesnoth-1.12.6
deleted file mode 100644
index 97f29951b6a4..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.12.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=media-libs/libsdl-1.2.7:0[joystick,video,X] media-libs/sdl-net !dedicated? ( >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] fribidi? ( dev-libs/fribidi ) dbus? ( sys-apps/dbus ) sys-libs/zlib x11-libs/pango dev-lang/lua:0 media-libs/fontconfig ) >=dev-libs/boost-1.48:=[nls,threads] virtual/libintl virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=5
-HOMEPAGE=http://www.wesnoth.org/
-IUSE=dbus dedicated doc fribidi nls server
-KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2.7:0[joystick,video,X] media-libs/sdl-net !dedicated? ( >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] fribidi? ( dev-libs/fribidi ) dbus? ( sys-apps/dbus ) sys-libs/zlib x11-libs/pango dev-lang/lua:0 media-libs/fontconfig ) >=dev-libs/boost-1.48:=[nls,threads] virtual/libintl games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.12.6.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9d5503f27c7c76d221c8313df53e8f0
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.2 b/metadata/md5-cache/games-strategy/wesnoth-1.14.2
index 141f2ed202ff..a0080c62fc8d 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.2
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[jo
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.2.tar.gz -> wesnoth-1.14.2.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=38e08f4fc6d86d06565a3473e88ead32
+_md5_=f9b3e44a7d6f241612dc9b74b21200f7
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index fdae628ef28a..874d25b07e97 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/dfarc-3.14 b/metadata/md5-cache/games-util/dfarc-3.14
new file mode 100644
index 000000000000..9fe15b35a0b1
--- /dev/null
+++ b/metadata/md5-cache/games-util/dfarc-3.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X] nls? ( >=dev-util/intltool-0.31 ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Frontend and .dmod installer for GNU FreeDink
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 BZIP2
+RDEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X]
+SLOT=0
+SRC_URI=mirror://gnu/freedink/dfarc-3.14.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0e915a4d883f5d99cd06be204cd7f6ce
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 032c5ea29301..f126754911c9 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gdm-3.24.3 b/metadata/md5-cache/gnome-base/gdm-3.24.3
index 7f35baac2b3a..05524198d270 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.24.3
+++ b/metadata/md5-cache/gnome-base/gdm-3.24.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.24/gdm-3.24.3.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=813e0998afcbcbba8d3d2d1e66e02b80
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.20.4 b/metadata/md5-cache/gnome-base/nautilus-3.20.4
index 3164dc427e18..c2645a308a81 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.20.4
+++ b/metadata/md5-cache/gnome-base/nautilus-3.20.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.45.7:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.20/nautilus-3.20.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=49fa04932be85148edf1d96766bd28fc
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.24.2.1 b/metadata/md5-cache/gnome-base/nautilus-3.24.2.1
index 336a4c7ecab5..f30e4857bcdc 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.24.2.1
+++ b/metadata/md5-cache/gnome-base/nautilus-3.24.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/gnome-autoar-0.2.1 >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=565da9ebcc4f7e194f899783f593adac
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index f3fb2e2e2656..18af483b3d35 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
index 5811c7e95a24..5b62cae27516 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.8:3 >=net-libs/gtk-vnc-0.4.4[gtk3(+)] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bf050d8c1883dcb0c4a41eb53346d877
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
index 46035d641d37..43330782768f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme x11-wm/mutter[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d3c4858f5da64a73aa5a99ebbe50017
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.6.2 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.6.2
index 793a1faaa524..f80af7b7f54d 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.6.2
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.dropbox.com/download?dl=packages/nautilus-dropbox-1.6.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4e4a93108927fc3745425ce25075a45a
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.10-r1 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.10-r1
index ee0c12a817ed..4c63158a3f75 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.10-r1
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=+introspection +gcr +modemmanager selinux teamd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 PDEPEND=virtual/notification-daemon
 RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.10.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13c566624d310bff0d1a9211ba99f425
+_md5_=cf44c99ac3cf4c11521c55086ebac502
diff --git a/metadata/md5-cache/gnome-extra/office-runner-1.0.2 b/metadata/md5-cache/gnome-extra/office-runner-1.0.2
index b2aed3670087..4c51b2615c9d 100644
--- a/metadata/md5-cache/gnome-extra/office-runner-1.0.2
+++ b/metadata/md5-cache/gnome-extra/office-runner-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 >=gnome-base/gnome-settings-daemon-3.0 >=x11-libs/gtk+-3.8:3 >=sys-apps/systemd-190
 SLOT=0
 SRC_URI=mirror://gnome/sources/office-runner/1.0/office-runner-1.0.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8d61b09c5b977e55878bb05f10513d01
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index 784f92feeb85..5733265e9f11 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/pikopixel-1.0_beta9-r3 b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r3
new file mode 100644
index 000000000000..69b47c611725
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a free application for drawing & editing pixel-art images
+EAPI=6
+HOMEPAGE=http://twilightedge.com/mac/pikopixel/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9c.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=492fcbb59c5fe431343912117936177e
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 32137d6f2c87..c3d1531cd597 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-18.04.1
deleted file mode 100644
index 02126f4e78f1..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-18.04.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=6
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-18.04.2
new file mode 100644
index 000000000000..9f1cdfcc3987
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-18.04.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Storage service for PIM data and libraries for PIM apps
+EAPI=6
+HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
+IUSE=+mysql postgres sqlite tools xml test debug designer test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.1
deleted file mode 100644
index 01ab5bc1ccd5..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-calendar-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c50928731851ce14a084e12975333797
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.2
new file mode 100644
index 000000000000..661177454756
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi calendar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-calendar-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c50928731851ce14a084e12975333797
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.1
deleted file mode 100644
index dd69c0ccb999..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi contact integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-contacts-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7aaad4610b1b4d0cae66f4a559db7af2
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.2
new file mode 100644
index 000000000000..cd8b88ee49e9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi contact integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-contacts-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7aaad4610b1b4d0cae66f4a559db7af2
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.1
deleted file mode 100644
index e4a22453a7c9..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-import-wizard-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.2
new file mode 100644
index 000000000000..5ef1a0c5d55b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-import-wizard-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.1
deleted file mode 100644
index 555ee61db38f..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi mime types
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-mime-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ec7321744d40f46ed40df82a5b5dfc9
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.2
new file mode 100644
index 000000000000..8da39132bb5d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi mime types
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-mime-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ec7321744d40f46ed40df82a5b5dfc9
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.1
deleted file mode 100644
index 6212fdb3b1f5..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-apps/akonadi-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi notes integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-notes-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.2
new file mode 100644
index 000000000000..683156971191
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-apps/akonadi-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi notes integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-notes-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.04.1 b/metadata/md5-cache/kde-apps/akonadi-search-18.04.1
deleted file mode 100644
index ffc474e17b6f..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.04.1:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/akonadi-search.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-search-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6a1a367d5ebfa724134134b3c62e845
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-search-18.04.2
new file mode 100644
index 000000000000..d595c434e632
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.04.2:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries and daemons to implement searching in Akonadi
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/akonadi-search.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-search-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d6a1a367d5ebfa724134134b3c62e845
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.1 b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.1
deleted file mode 100644
index f6cb7b7bc4e3..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadiconsole-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcc0069b67079c12d2b96580aee9d23f
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.2 b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.2
new file mode 100644
index 000000000000..5d4bd1f70718
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application for debugging Akonadi Resources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadiconsole-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fcc0069b67079c12d2b96580aee9d23f
diff --git a/metadata/md5-cache/kde-apps/akregator-18.04.1 b/metadata/md5-cache/kde-apps/akregator-18.04.1
deleted file mode 100644
index ca511e845827..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=kde-apps/syndication-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=News feed aggregator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/akregator
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=kde-apps/syndication-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akregator-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd9ad5f7590299b538cae07738413cde
diff --git a/metadata/md5-cache/kde-apps/akregator-18.04.2 b/metadata/md5-cache/kde-apps/akregator-18.04.2
new file mode 100644
index 000000000000..ac95aa60d840
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=kde-apps/syndication-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=News feed aggregator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/akregator
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=kde-apps/syndication-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akregator-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fd9ad5f7590299b538cae07738413cde
diff --git a/metadata/md5-cache/kde-apps/analitza-18.04.1 b/metadata/md5-cache/kde-apps/analitza-18.04.1
deleted file mode 100644
index 5a0591bb44ca..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for mathematical features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/analitza-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/analitza-18.04.2 b/metadata/md5-cache/kde-apps/analitza-18.04.2
new file mode 100644
index 000000000000..0fdb54dec091
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for mathematical features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eigen nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/analitza-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/ark-18.04.1 b/metadata/md5-cache/kde-apps/ark-18.04.1
deleted file mode 100644
index 5a31698f44c7..000000000000
--- a/metadata/md5-cache/kde-apps/ark-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Archiving tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
-IUSE=bzip2 lzma zip test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ark-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4d9e7790a7de94a5d1eccb833b3c368
diff --git a/metadata/md5-cache/kde-apps/ark-18.04.2 b/metadata/md5-cache/kde-apps/ark-18.04.2
new file mode 100644
index 000000000000..5e11acac7039
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Archiving tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
+IUSE=bzip2 lzma zip test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ark-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e4d9e7790a7de94a5d1eccb833b3c368
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.04.1 b/metadata/md5-cache/kde-apps/artikulate-18.04.1
deleted file mode 100644
index b40380c73f06..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/language/artikulate
-IUSE=+gstreamer qtmedia debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/artikulate-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.04.2 b/metadata/md5-cache/kde-apps/artikulate-18.04.2
new file mode 100644
index 000000000000..101ade034f1b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Language learning application that helps improving pronunciation skills
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/language/artikulate
+IUSE=+gstreamer qtmedia debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=|| ( gstreamer qtmedia )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/artikulate-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.1 b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.1
deleted file mode 100644
index 8c2970c23ac6..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.1:5 >=kde-apps/libkcompactdisc-18.04.1:5 >=dev-qt/qtwidgets-5.9.4:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.1:5 >=kde-apps/libkcompactdisc-18.04.1:5 >=dev-qt/qtwidgets-5.9.4:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/audiocd-kio-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.2 b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.2
new file mode 100644
index 000000000000..fb3bc3fec428
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.2:5 >=kde-apps/libkcompactdisc-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslave for accessing audio CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=flac vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.2:5 >=kde-apps/libkcompactdisc-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/audiocd-kio-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.1 b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.1
deleted file mode 100644
index ae330c7618ad..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Widget library for baloo
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/baloo-widgets-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.2 b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.2
new file mode 100644
index 000000000000..7af1dd2120c6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Widget library for baloo
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/baloo-widgets-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/blinken-18.04.1 b/metadata/md5-cache/kde-apps/blinken-18.04.1
deleted file mode 100644
index 4eca8fee57d6..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the Simon Says game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/blinken-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/blinken-18.04.2 b/metadata/md5-cache/kde-apps/blinken-18.04.2
new file mode 100644
index 000000000000..9d2a2b432579
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the Simon Says game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/blinken-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/bomber-18.04.1 b/metadata/md5-cache/kde-apps/bomber-18.04.1
deleted file mode 100644
index 3b930a97a667..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE arcade bombing game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bomber/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/bomber-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bomber-18.04.2 b/metadata/md5-cache/kde-apps/bomber-18.04.2
new file mode 100644
index 000000000000..ce4b98f18935
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE arcade bombing game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bomber/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/bomber-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bovo-18.04.1 b/metadata/md5-cache/kde-apps/bovo-18.04.1
deleted file mode 100644
index 6efb8dfacd16..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bovo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/bovo-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/bovo-18.04.2 b/metadata/md5-cache/kde-apps/bovo-18.04.2
new file mode 100644
index 000000000000..bf7ef4db7093
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Five-in-a-row Board Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bovo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/bovo-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.1 b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.1
deleted file mode 100644
index aa2a4fc2677a..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-calendar-tools-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.2 b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.2
new file mode 100644
index 000000000000..16957e7e53f0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tool to scan calendar data for buggy instances
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-calendar-tools-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.04.1 b/metadata/md5-cache/kde-apps/calendarsupport-18.04.1
deleted file mode 100644
index 1daffbb0d489..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar support library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/calendarsupport-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e62040446efa9635fb2a3ead5b42a78f
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.04.2 b/metadata/md5-cache/kde-apps/calendarsupport-18.04.2
new file mode 100644
index 000000000000..cef2a6ba29d9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar support library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/calendarsupport-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e62040446efa9635fb2a3ead5b42a78f
diff --git a/metadata/md5-cache/kde-apps/cantor-18.04.1 b/metadata/md5-cache/kde-apps/cantor-18.04.1
deleted file mode 100644
index 40b7a2678221..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-18.04.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.04.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) 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_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface for doing mathematics and scientific computing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.04.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) 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_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/cantor-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cantor-18.04.2 b/metadata/md5-cache/kde-apps/cantor-18.04.2
new file mode 100644
index 000000000000..a6f0a4716c2c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-18.04.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.04.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) 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_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface for doing mathematics and scientific computing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
+IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.04.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) 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_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/cantor-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.04.1 b/metadata/md5-cache/kde-apps/cervisia-18.04.1
deleted file mode 100644
index 9f01851e0050..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=CVS frontend by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/cervisia
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/cervisia-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.04.2 b/metadata/md5-cache/kde-apps/cervisia-18.04.2
new file mode 100644
index 000000000000..b838e9c97137
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=CVS frontend by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/cervisia
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/cervisia-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.04.1 b/metadata/md5-cache/kde-apps/dolphin-18.04.1
deleted file mode 100644
index b23f5ceadd38..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma filemanager focusing on usability
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
-IUSE=semantic-desktop thumbnail test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) >=kde-apps/kio-extras-18.04.1:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.04.1:5 >=kde-apps/thumbnailers-18.04.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/dolphin-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=745044d641a71b8cd6420866376cc543
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.04.2 b/metadata/md5-cache/kde-apps/dolphin-18.04.2
new file mode 100644
index 000000000000..c7cdd2459167
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.2:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma filemanager focusing on usability
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
+IUSE=semantic-desktop thumbnail test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.2:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) >=kde-apps/kio-extras-18.04.2:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.04.2:5 >=kde-apps/thumbnailers-18.04.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/dolphin-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71984fd36745203584e3de12d9bd9f4d
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.1
deleted file mode 100644
index 22e70a706785..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Dolphin plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=bazaar dropbox git mercurial subversion debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) >=kde-apps/kompare-18.04.1:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/dolphin-plugins-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.2
new file mode 100644
index 000000000000..0163a9d663cf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra Dolphin plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=bazaar dropbox git mercurial subversion debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) >=kde-apps/kompare-18.04.2:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/dolphin-plugins-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dragon-18.04.1 b/metadata/md5-cache/kde-apps/dragon-18.04.1
deleted file mode 100644
index 26877a1f5139..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A simple video player
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/dragon-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/dragon-18.04.2 b/metadata/md5-cache/kde-apps/dragon-18.04.2
new file mode 100644
index 000000000000..ab2fc9f12448
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A simple video player
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/dragon-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.04.1 b/metadata/md5-cache/kde-apps/eventviews-18.04.1
deleted file mode 100644
index 9036f521bf32..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/eventviews-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.04.2 b/metadata/md5-cache/kde-apps/eventviews-18.04.2
new file mode 100644
index 000000000000..d973c991ee89
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar viewer for KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/eventviews-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.1
deleted file mode 100644
index 23432c4fc216..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libav debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ffmpegthumbs-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.2 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.2
new file mode 100644
index 000000000000..1ed2e34155c6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=FFmpeg based thumbnail generator for video files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libav debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ffmpegthumbs-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/filelight-18.04.1 b/metadata/md5-cache/kde-apps/filelight-18.04.1
deleted file mode 100644
index 7a3e122155c2..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/filelight-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/filelight-18.04.2 b/metadata/md5-cache/kde-apps/filelight-18.04.2
new file mode 100644
index 000000000000..f2e5bff20bae
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/filelight/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/filelight-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/granatier-18.04.1 b/metadata/md5-cache/kde-apps/granatier-18.04.1
deleted file mode 100644
index 4d7c25a59dc0..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bomberman game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/granatier/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/granatier-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/granatier-18.04.2 b/metadata/md5-cache/kde-apps/granatier-18.04.2
new file mode 100644
index 000000000000..7e7b4ac6547d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bomberman game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/granatier/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/granatier-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.1 b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.1
deleted file mode 100644
index b1688dcb5b3f..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/grantlee-editor-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.2 b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.2
new file mode 100644
index 000000000000..d3e41f9809bf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/grantlee-editor-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.04.1 b/metadata/md5-cache/kde-apps/grantleetheme-18.04.1
deleted file mode 100644
index 20208c010f64..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for Grantlee plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/grantleetheme-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.04.2 b/metadata/md5-cache/kde-apps/grantleetheme-18.04.2
new file mode 100644
index 000000000000..11eb2c90136b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for Grantlee plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/grantleetheme-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.04.1 b/metadata/md5-cache/kde-apps/gwenview-18.04.1
deleted file mode 100644
index f8f55c99bcdb..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.1:5= ) raw? ( >=kde-apps/libkdcraw-18.04.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE image viewer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=fits kipi raw semantic-desktop X debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.1:5= ) raw? ( >=kde-apps/libkdcraw-18.04.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.44.0:5 >=dev-qt/qtimageformats-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/gwenview-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.04.2 b/metadata/md5-cache/kde-apps/gwenview-18.04.2
new file mode 100644
index 000000000000..782126bc5f1e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.2:5= ) raw? ( >=kde-apps/libkdcraw-18.04.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE image viewer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
+IUSE=fits kipi raw semantic-desktop X debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.2:5= ) raw? ( >=kde-apps/libkdcraw-18.04.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.44.0:5 >=dev-qt/qtimageformats-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/gwenview-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.1 b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.1
deleted file mode 100644
index a2ad95195f55..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Incidence editor for korganizer
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/incidenceeditor-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.2 b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.2
new file mode 100644
index 000000000000..68239306adf0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Incidence editor for korganizer
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/incidenceeditor-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/juk-18.04.1 b/metadata/md5-cache/kde-apps/juk-18.04.1
deleted file mode 100644
index fc06378a43cb..000000000000
--- a/metadata/md5-cache/kde-apps/juk-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jukebox and music manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/juk-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/juk-18.04.2 b/metadata/md5-cache/kde-apps/juk-18.04.2
new file mode 100644
index 000000000000..07574089d5ab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jukebox and music manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/juk-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/k3b-18.04.1 b/metadata/md5-cache/kde-apps/k3b-18.04.1
deleted file mode 100644
index 93f620346191..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/K3b
-IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/k3b-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/k3b-18.04.2 b/metadata/md5-cache/kde-apps/k3b-18.04.2
new file mode 100644
index 000000000000..53309ebf0fbe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/K3b
+IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FDL-1.2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/k3b-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.1
deleted file mode 100644
index 2331f0a678f2..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.44.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kaccounts-integration-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.2 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.2
new file mode 100644
index 000000000000..008633e103fb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.44.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kaccounts-integration-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.1
deleted file mode 100644
index 14fb1beb0648..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE accounts providers
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kaccounts-providers-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.2 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.2
new file mode 100644
index 000000000000..b7e83f0af6bd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE accounts providers
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kaccounts-providers-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.04.1 b/metadata/md5-cache/kde-apps/kaddressbook-18.04.1
deleted file mode 100644
index 44bd2051a67f..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.04.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kaddressbook-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.04.2 b/metadata/md5-cache/kde-apps/kaddressbook-18.04.2
new file mode 100644
index 000000000000..10382ae4f9e3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.04.2:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kaddressbook-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.04.1 b/metadata/md5-cache/kde-apps/kajongg-18.04.1
deleted file mode 100644
index 5b06bd45ddf3..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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_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(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,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(+)?] >=dev-python/twisted-16.6.0[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(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kajongg/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=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_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(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,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(+)?] >=dev-python/twisted-16.6.0[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(+)?] >=kde-apps/libkmahjongg-18.04.1:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kajongg-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.04.2 b/metadata/md5-cache/kde-apps/kajongg-18.04.2
new file mode 100644
index 000000000000..ac00f2d400ad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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_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(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,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(+)?] >=dev-python/twisted-16.6.0[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(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical Mah Jongg for four players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kajongg/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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_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(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,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(+)?] >=dev-python/twisted-16.6.0[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(+)?] >=kde-apps/libkmahjongg-18.04.2:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kajongg-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.04.1 b/metadata/md5-cache/kde-apps/kalarm-18.04.1
deleted file mode 100644
index a8b94cb7ffd2..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kalarmcal-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kalarmcal-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kalarm-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d5a62ab27ea3ce2d7e639b902449f27
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.04.2 b/metadata/md5-cache/kde-apps/kalarm-18.04.2
new file mode 100644
index 000000000000..5f6e2baf7766
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kalarmcal-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kalarmcal-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kalarm-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d5a62ab27ea3ce2d7e639b902449f27
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.04.1 b/metadata/md5-cache/kde-apps/kalarmcal-18.04.1
deleted file mode 100644
index ffc1aa3f54e9..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kalarmcal-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ff6e9620557fe44bfdb1ebb2434ac8a
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.04.2 b/metadata/md5-cache/kde-apps/kalarmcal-18.04.2
new file mode 100644
index 000000000000..c27bbdc2a550
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Client library to access and handling of KAlarm calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kalarmcal-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ff6e9620557fe44bfdb1ebb2434ac8a
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.04.1 b/metadata/md5-cache/kde-apps/kalgebra-18.04.1
deleted file mode 100644
index 2cc3eb5afc00..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=MathML-based graph calculator by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kalgebra-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.04.2 b/metadata/md5-cache/kde-apps/kalgebra-18.04.2
new file mode 100644
index 000000000000..2f7549e4dbcd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=MathML-based graph calculator by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
+IUSE=readline debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kalgebra-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.04.1 b/metadata/md5-cache/kde-apps/kalzium-18.04.1
deleted file mode 100644
index 7eb932d02462..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.44.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Periodic table of the elements
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.44.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kalzium-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc3707ebf2a891099a3c0771d1cbe181
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.04.2 b/metadata/md5-cache/kde-apps/kalzium-18.04.2
new file mode 100644
index 000000000000..20d55163e36b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.44.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Periodic table of the elements
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
+IUSE=editor solver debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.44.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kalzium-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc3707ebf2a891099a3c0771d1cbe181
diff --git a/metadata/md5-cache/kde-apps/kamera-18.04.1 b/metadata/md5-cache/kde-apps/kamera-18.04.1
deleted file mode 100644
index a6abb7f107fe..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kamera-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kamera-18.04.2 b/metadata/md5-cache/kde-apps/kamera-18.04.2
new file mode 100644
index 000000000000..cff3efe5192b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma integration for gphoto2 cameras
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kamera-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.04.1 b/metadata/md5-cache/kde-apps/kamoso-18.04.1
deleted file mode 100644
index 397d74abd197..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/Kamoso
-IUSE=test debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kamoso-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6146feb9cf4b777333466230bbc986e2
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.04.2 b/metadata/md5-cache/kde-apps/kamoso-18.04.2
new file mode 100644
index 000000000000..02d00ac8f9bb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamoso-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to take pictures and videos from your webcam by KDE
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/Kamoso
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kamoso-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6146feb9cf4b777333466230bbc986e2
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.04.1 b/metadata/md5-cache/kde-apps/kanagram-18.04.1
deleted file mode 100644
index 7c5c62341002..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on anagrams of words
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/kdeedu-data-18.04.1:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kanagram-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.04.2 b/metadata/md5-cache/kde-apps/kanagram-18.04.2
new file mode 100644
index 000000000000..b2ac3803e6e2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on anagrams of words
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
+IUSE=speech debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/kdeedu-data-18.04.2:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kanagram-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kapman-18.04.1 b/metadata/md5-cache/kde-apps/kapman-18.04.1
deleted file mode 100644
index 7f1f48dd73dc..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kapman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kapman-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapman-18.04.2 b/metadata/md5-cache/kde-apps/kapman-18.04.2
new file mode 100644
index 000000000000..67020a3b9f12
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Pac-Man clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kapman/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kapman-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.04.1 b/metadata/md5-cache/kde-apps/kapptemplate-18.04.1
deleted file mode 100644
index 6f9a0a53e936..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kapptemplate-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.04.2 b/metadata/md5-cache/kde-apps/kapptemplate-18.04.2
new file mode 100644
index 000000000000..2d6a2208167a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kapptemplate-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kate-18.04.1 b/metadata/md5-cache/kde-apps/kate-18.04.1
deleted file mode 100644
index 2f8479b6d33c..000000000000
--- a/metadata/md5-cache/kde-apps/kate-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kate is an advanced text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
-IUSE=+addons test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kate-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfaae2d0cb2cfd1e2a96c6e28042bb03
diff --git a/metadata/md5-cache/kde-apps/kate-18.04.2 b/metadata/md5-cache/kde-apps/kate-18.04.2
new file mode 100644
index 000000000000..09635119b27d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kate is an advanced text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
+IUSE=+addons test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kate-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bfaae2d0cb2cfd1e2a96c6e28042bb03
diff --git a/metadata/md5-cache/kde-apps/katomic-18.04.1 b/metadata/md5-cache/kde-apps/katomic-18.04.1
deleted file mode 100644
index 905406dd1344..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/katomic-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/katomic-18.04.2 b/metadata/md5-cache/kde-apps/katomic-18.04.2
new file mode 100644
index 000000000000..e749971ea89e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Atomic Entertainment Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/katomic-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.04.1 b/metadata/md5-cache/kde-apps/kbackup-18.04.1
deleted file mode 100644
index f78cc92dd9bc..000000000000
--- a/metadata/md5-cache/kde-apps/kbackup-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that lets you back up any directories or files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kbackup-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=993ec9361abad4d3a7639df6412f173a
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.04.2 b/metadata/md5-cache/kde-apps/kbackup-18.04.2
new file mode 100644
index 000000000000..ef4f15aab27e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbackup-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that lets you back up any directories or files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kbackup-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=993ec9361abad4d3a7639df6412f173a
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.04.1 b/metadata/md5-cache/kde-apps/kblackbox-18.04.1
deleted file mode 100644
index 2e744631bd4a..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Blackbox Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kblackbox-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.04.2 b/metadata/md5-cache/kde-apps/kblackbox-18.04.2
new file mode 100644
index 000000000000..befac0ac5772
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Blackbox Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kblackbox-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.04.1 b/metadata/md5-cache/kde-apps/kblocks-18.04.1
deleted file mode 100644
index ecd712b2d730..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A single-player Tetris-like KDE game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kblocks/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kblocks-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.04.2 b/metadata/md5-cache/kde-apps/kblocks-18.04.2
new file mode 100644
index 000000000000..78f979d03ee2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A single-player Tetris-like KDE game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kblocks/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kblocks-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblog-18.04.1 b/metadata/md5-cache/kde-apps/kblog-18.04.1
deleted file mode 100644
index 83384e9d9dbb..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/syndication-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing client-side support for web application remote blogging APIs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/syndication-18.04.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kblog-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kblog-18.04.2 b/metadata/md5-cache/kde-apps/kblog-18.04.2
new file mode 100644
index 000000000000..d196a4b5ff5e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/syndication-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing client-side support for web application remote blogging APIs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/syndication-18.04.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kblog-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.04.1 b/metadata/md5-cache/kde-apps/kbounce-18.04.1
deleted file mode 100644
index d556017ff783..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kbounce-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.04.2 b/metadata/md5-cache/kde-apps/kbounce-18.04.2
new file mode 100644
index 000000000000..18d37c8a1ed3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bounce Ball Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kbounce-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.04.1 b/metadata/md5-cache/kde-apps/kbreakout-18.04.1
deleted file mode 100644
index b993798eb0c9..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breakout-like game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kbreakout-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.04.2 b/metadata/md5-cache/kde-apps/kbreakout-18.04.2
new file mode 100644
index 000000000000..3cb334d6dfb7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breakout-like game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kbreakout-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.04.1 b/metadata/md5-cache/kde-apps/kbruch-18.04.1
deleted file mode 100644
index 91a71509e07c..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kbruch-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.04.2 b/metadata/md5-cache/kde-apps/kbruch-18.04.2
new file mode 100644
index 000000000000..013df9a9ef5d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational application to learn calculating with fractions
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kbruch-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.04.1 b/metadata/md5-cache/kde-apps/kcachegrind-18.04.1
deleted file mode 100644
index 729b9e123e62..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcachegrind-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.04.2 b/metadata/md5-cache/kde-apps/kcachegrind-18.04.2
new file mode 100644
index 000000000000..7dbbe5843238
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for Cachegrind by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcachegrind-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.04.1 b/metadata/md5-cache/kde-apps/kcalc-18.04.1
deleted file mode 100644
index 7677a19d554e..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE calculator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcalc-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.04.2 b/metadata/md5-cache/kde-apps/kcalc-18.04.2
new file mode 100644
index 000000000000..8b77df214ca8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE calculator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcalc-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.04.1 b/metadata/md5-cache/kde-apps/kcalcore-18.04.1
deleted file mode 100644
index 058e092814fd..000000000000
--- a/metadata/md5-cache/kde-apps/kcalcore-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcalcore-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.04.2 b/metadata/md5-cache/kde-apps/kcalcore-18.04.2
new file mode 100644
index 000000000000..849775432134
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalcore-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcalcore-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.04.1 b/metadata/md5-cache/kde-apps/kcalutils-18.04.1
deleted file mode 100644
index c938a65883ae..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcalutils-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66aa061c6257be3beef11c05668d21e3
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.04.2 b/metadata/md5-cache/kde-apps/kcalutils-18.04.2
new file mode 100644
index 000000000000..b0d4448de65c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing utility functions for the handling of calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcalutils-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=66aa061c6257be3beef11c05668d21e3
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.04.1 b/metadata/md5-cache/kde-apps/kcharselect-18.04.1
deleted file mode 100644
index b7a5a5f5a9d8..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE character selection utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcharselect-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.04.2 b/metadata/md5-cache/kde-apps/kcharselect-18.04.2
new file mode 100644
index 000000000000..e592572a135d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE character selection utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcharselect-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.1 b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.1
deleted file mode 100644
index 28e9498a9917..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE color selector/editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcolorchooser-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.2 b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.2
new file mode 100644
index 000000000000..480ed3a38cad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE color selector/editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcolorchooser-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.04.1 b/metadata/md5-cache/kde-apps/kcontacts-18.04.1
deleted file mode 100644
index ff2381e936b7..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcontacts-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d76ea0ff094b31e51891250dcd41b6a
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.04.2 b/metadata/md5-cache/kde-apps/kcontacts-18.04.2
new file mode 100644
index 000000000000..1f503df1a466
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcontacts-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcontacts-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d76ea0ff094b31e51891250dcd41b6a
diff --git a/metadata/md5-cache/kde-apps/kcron-18.04.1 b/metadata/md5-cache/kde-apps/kcron-18.04.1
deleted file mode 100644
index a4a6031d5010..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Task Scheduler
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kcron-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kcron-18.04.2 b/metadata/md5-cache/kde-apps/kcron-18.04.2
new file mode 100644
index 000000000000..d1fd4fe9d7f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Task Scheduler
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcron-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kdav-18.04.1 b/metadata/md5-cache/kde-apps/kdav-18.04.1
deleted file mode 100644
index 07b9aa65fca7..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdav-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kdav-18.04.2 b/metadata/md5-cache/kde-apps/kdav-18.04.2
new file mode 100644
index 000000000000..e4f677e74ae7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdav-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdav-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.1
deleted file mode 100644
index aed965d19511..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Applications collection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=accessibility pim sdk
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kate-18.04.1 >=kde-apps/kdeadmin-meta-18.04.1 >=kde-apps/kdecore-meta-18.04.1 >=kde-apps/kdeedu-meta-18.04.1 >=kde-apps/kdegames-meta-18.04.1 >=kde-apps/kdegraphics-meta-18.04.1 >=kde-apps/kdemultimedia-meta-18.04.1 >=kde-apps/kdenetwork-meta-18.04.1 >=kde-apps/kdeutils-meta-18.04.1 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.04.1 ) pim? ( >=kde-apps/kdepim-meta-18.04.1 ) sdk? ( >=kde-apps/kdesdk-meta-18.04.1 ) !kde-apps/kde-apps-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.2 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.2
new file mode 100644
index 000000000000..2b519e66de18
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for the KDE Applications collection
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=accessibility pim sdk
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kate-18.04.2 >=kde-apps/kdeadmin-meta-18.04.2 >=kde-apps/kdecore-meta-18.04.2 >=kde-apps/kdeedu-meta-18.04.2 >=kde-apps/kdegames-meta-18.04.2 >=kde-apps/kdegraphics-meta-18.04.2 >=kde-apps/kdemultimedia-meta-18.04.2 >=kde-apps/kdenetwork-meta-18.04.2 >=kde-apps/kdeutils-meta-18.04.2 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.04.2 ) pim? ( >=kde-apps/kdepim-meta-18.04.2 ) sdk? ( >=kde-apps/kdesdk-meta-18.04.2 ) !kde-apps/kde-apps-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.1
deleted file mode 100644
index 7e1c7efbd0b8..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kde-dev-scripts-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.2 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.2
new file mode 100644
index 000000000000..ee0247b7f8ed
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kde-dev-scripts-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.1
deleted file mode 100644
index d09334854412..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Utilities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kde-dev-utils-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.2 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.2
new file mode 100644
index 000000000000..232e2ecf5caa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Utilities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kde-dev-utils-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.04.1 b/metadata/md5-cache/kde-apps/kde-meta-18.04.1
deleted file mode 100644
index eaad1130b42a..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-18.04.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kde-apps-meta-18.04.1 >=kde-plasma/plasma-meta-5.11.5 !kde-apps/kde-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.04.2 b/metadata/md5-cache/kde-apps/kde-meta-18.04.2
new file mode 100644
index 000000000000..954531b69db5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-18.04.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kde-apps-meta-18.04.2 >=kde-plasma/plasma-meta-5.11.5 !kde-apps/kde-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.1
deleted file mode 100644
index 56c7839b5e7b..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kmag-18.04.1 >=kde-apps/kmousetool-18.04.1 >=kde-apps/kmouth-18.04.1 !kde-apps/kdeaccessibility-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.2
new file mode 100644
index 000000000000..a93dfda11596
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kmag-18.04.2 >=kde-apps/kmousetool-18.04.2 >=kde-apps/kmouth-18.04.2 !kde-apps/kdeaccessibility-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.1
deleted file mode 100644
index 93abbd75c9c0..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+cron
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-18.04.1 cron? ( >=kde-apps/kcron-18.04.1 ) !kde-apps/kdeadmin-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.2
new file mode 100644
index 000000000000..ffbf992c62e6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+cron
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ksystemlog-18.04.2 cron? ( >=kde-apps/kcron-18.04.2 ) !kde-apps/kdeadmin-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.1
deleted file mode 100644
index 10c51391d6be..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-18.04.1 >=kde-plasma/plasma-meta-5.11.5 !kde-apps/kdebase-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.2
new file mode 100644
index 000000000000..f3420ca8cd42
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdecore-meta-18.04.2 >=kde-plasma/plasma-meta-5.11.5 !kde-apps/kdebase-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.1 b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.1
deleted file mode 100644
index 45f9a6917e58..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to enable/disable qCDebug
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdebugsettings-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.2 b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.2
new file mode 100644
index 000000000000..30cc6b5671dc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to enable/disable qCDebug
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdebugsettings-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.1
deleted file mode 100644
index 7e0fa0aae6d7..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-18.04.1 >=kde-apps/kdialog-18.04.1 >=kde-apps/keditbookmarks-18.04.1 >=kde-apps/kfind-18.04.1 || ( www-client/falkon www-client/qupzilla >=kde-apps/konqueror-18.04.1 ) >=kde-apps/konsole-18.04.1 >=kde-apps/kwrite-18.04.1 handbook? ( >=kde-apps/khelpcenter-18.04.1 ) !kde-apps/kdecore-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9bae73c549428796596a722374cb8938
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.2
new file mode 100644
index 000000000000..66015b4ad861
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdecore - merge this to pull in the most basic applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-18.04.2 >=kde-apps/kdialog-18.04.2 >=kde-apps/keditbookmarks-18.04.2 >=kde-apps/kfind-18.04.2 || ( www-client/falkon www-client/qupzilla >=kde-apps/konqueror-18.04.2 ) >=kde-apps/konsole-18.04.2 >=kde-apps/kwrite-18.04.2 handbook? ( >=kde-apps/khelpcenter-18.04.2 ) !kde-apps/kdecore-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9bae73c549428796596a722374cb8938
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.1 b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.1
deleted file mode 100644
index eacaa11004ff..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdeedu-data-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.2 b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.2
new file mode 100644
index 000000000000..d9d794f9da32
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Shared icons, artwork and data files for educational applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdeedu-data-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.1
deleted file mode 100644
index ec26f492c40e..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=6
-HOMEPAGE=https://edu.kde.org
-IUSE=+webengine
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-18.04.1 >=kde-apps/artikulate-18.04.1 >=kde-apps/blinken-18.04.1 >=kde-apps/cantor-18.04.1 >=kde-apps/kalzium-18.04.1 >=kde-apps/kanagram-18.04.1 >=kde-apps/kbruch-18.04.1 >=kde-apps/kdeedu-data-18.04.1 >=kde-apps/kgeography-18.04.1 >=kde-apps/khangman-18.04.1 >=kde-apps/kig-18.04.1 >=kde-apps/kiten-18.04.1 >=kde-apps/klettres-18.04.1 >=kde-apps/kmplot-18.04.1 >=kde-apps/kqtquickcharts-18.04.1 >=kde-apps/ktouch-18.04.1 >=kde-apps/kturtle-18.04.1 >=kde-apps/kwordquiz-18.04.1 >=kde-apps/libkeduvocdocument-18.04.1 >=kde-apps/marble-18.04.1 >=kde-apps/minuet-18.04.1 >=kde-apps/rocs-18.04.1 >=kde-apps/step-18.04.1 webengine? ( >=kde-apps/kalgebra-18.04.1 >=kde-apps/parley-18.04.1 ) !kde-apps/kdeedu-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=916f4ff673e41d1868eff4da4ada06e0
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.2
new file mode 100644
index 000000000000..77c9901de735
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=6
+HOMEPAGE=https://edu.kde.org
+IUSE=+webengine
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-18.04.2 >=kde-apps/artikulate-18.04.2 >=kde-apps/blinken-18.04.2 >=kde-apps/cantor-18.04.2 >=kde-apps/kalzium-18.04.2 >=kde-apps/kanagram-18.04.2 >=kde-apps/kbruch-18.04.2 >=kde-apps/kdeedu-data-18.04.2 >=kde-apps/kgeography-18.04.2 >=kde-apps/khangman-18.04.2 >=kde-apps/kig-18.04.2 >=kde-apps/kiten-18.04.2 >=kde-apps/klettres-18.04.2 >=kde-apps/kmplot-18.04.2 >=kde-apps/kqtquickcharts-18.04.2 >=kde-apps/ktouch-18.04.2 >=kde-apps/kturtle-18.04.2 >=kde-apps/kwordquiz-18.04.2 >=kde-apps/libkeduvocdocument-18.04.2 >=kde-apps/marble-18.04.2 >=kde-apps/minuet-18.04.2 >=kde-apps/rocs-18.04.2 >=kde-apps/step-18.04.2 webengine? ( >=kde-apps/kalgebra-18.04.2 >=kde-apps/parley-18.04.2 ) !kde-apps/kdeedu-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=916f4ff673e41d1868eff4da4ada06e0
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.1
deleted file mode 100644
index 14b3f011a494..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=6
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-18.04.1 >=kde-apps/bovo-18.04.1 >=kde-apps/granatier-18.04.1 >=kde-apps/kapman-18.04.1 >=kde-apps/katomic-18.04.1 >=kde-apps/kblackbox-18.04.1 >=kde-apps/kblocks-18.04.1 >=kde-apps/kbounce-18.04.1 >=kde-apps/kbreakout-18.04.1 >=kde-apps/kdiamond-18.04.1 >=kde-apps/kfourinline-18.04.1 >=kde-apps/kgoldrunner-18.04.1 >=kde-apps/kigo-18.04.1 >=kde-apps/killbots-18.04.1 >=kde-apps/kiriki-18.04.1 >=kde-apps/kjumpingcube-18.04.1 >=kde-apps/klickety-18.04.1 >=kde-apps/klines-18.04.1 >=kde-apps/kmahjongg-18.04.1 >=kde-apps/kmines-18.04.1 >=kde-apps/knavalbattle-18.04.1 >=kde-apps/knetwalk-18.04.1 >=kde-apps/kolf-18.04.1 >=kde-apps/kollision-18.04.1 >=kde-apps/konquest-18.04.1 >=kde-apps/kpat-18.04.1 >=kde-apps/kreversi-18.04.1 >=kde-apps/kshisen-18.04.1 >=kde-apps/ksirk-18.04.1 >=kde-apps/ksnakeduel-18.04.1 >=kde-apps/kspaceduel-18.04.1 >=kde-apps/ksquares-18.04.1 >=kde-apps/ktuberling-18.04.1 >=kde-apps/libkdegames-18.04.1 >=kde-apps/libkmahjongg-18.04.1 >=kde-apps/lskat-18.04.1 >=kde-apps/palapeli-18.04.1 >=kde-apps/picmi-18.04.1 opengl? ( >=kde-apps/ksudoku-18.04.1 >=kde-apps/kubrick-18.04.1 ) python? ( >=kde-apps/kajongg-18.04.1 ) !kde-apps/kdegames-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.2
new file mode 100644
index 000000000000..fa2029bb27ca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
+EAPI=6
+HOMEPAGE=https://games.kde.org/
+IUSE=opengl python
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/bomber-18.04.2 >=kde-apps/bovo-18.04.2 >=kde-apps/granatier-18.04.2 >=kde-apps/kapman-18.04.2 >=kde-apps/katomic-18.04.2 >=kde-apps/kblackbox-18.04.2 >=kde-apps/kblocks-18.04.2 >=kde-apps/kbounce-18.04.2 >=kde-apps/kbreakout-18.04.2 >=kde-apps/kdiamond-18.04.2 >=kde-apps/kfourinline-18.04.2 >=kde-apps/kgoldrunner-18.04.2 >=kde-apps/kigo-18.04.2 >=kde-apps/killbots-18.04.2 >=kde-apps/kiriki-18.04.2 >=kde-apps/kjumpingcube-18.04.2 >=kde-apps/klickety-18.04.2 >=kde-apps/klines-18.04.2 >=kde-apps/kmahjongg-18.04.2 >=kde-apps/kmines-18.04.2 >=kde-apps/knavalbattle-18.04.2 >=kde-apps/knetwalk-18.04.2 >=kde-apps/kolf-18.04.2 >=kde-apps/kollision-18.04.2 >=kde-apps/konquest-18.04.2 >=kde-apps/kpat-18.04.2 >=kde-apps/kreversi-18.04.2 >=kde-apps/kshisen-18.04.2 >=kde-apps/ksirk-18.04.2 >=kde-apps/ksnakeduel-18.04.2 >=kde-apps/kspaceduel-18.04.2 >=kde-apps/ksquares-18.04.2 >=kde-apps/ktuberling-18.04.2 >=kde-apps/libkdegames-18.04.2 >=kde-apps/libkmahjongg-18.04.2 >=kde-apps/lskat-18.04.2 >=kde-apps/palapeli-18.04.2 >=kde-apps/picmi-18.04.2 opengl? ( >=kde-apps/ksudoku-18.04.2 >=kde-apps/kubrick-18.04.2 ) python? ( >=kde-apps/kajongg-18.04.2 ) !kde-apps/kdegames-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.1
deleted file mode 100644
index 57f270056907..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/
-IUSE=scanner
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-18.04.1 >=kde-apps/kamera-18.04.1 >=kde-apps/kcolorchooser-18.04.1 >=kde-apps/kdegraphics-mobipocket-18.04.1 >=kde-apps/kolourpaint-18.04.1 >=kde-apps/kruler-18.04.1 >=kde-apps/libkdcraw-18.04.1 >=kde-apps/libkexiv2-18.04.1 >=kde-apps/libkipi-18.04.1 >=kde-apps/okular-18.04.1 >=kde-apps/spectacle-18.04.1 >=kde-apps/svgpart-18.04.1 >=kde-apps/thumbnailers-18.04.1 scanner? ( >=kde-apps/libksane-18.04.1 ) !kde-apps/kdegraphics-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.2
new file mode 100644
index 000000000000..fddc9a10af9e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/
+IUSE=scanner
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/gwenview-18.04.2 >=kde-apps/kamera-18.04.2 >=kde-apps/kcolorchooser-18.04.2 >=kde-apps/kdegraphics-mobipocket-18.04.2 >=kde-apps/kolourpaint-18.04.2 >=kde-apps/kruler-18.04.2 >=kde-apps/libkdcraw-18.04.2 >=kde-apps/libkexiv2-18.04.2 >=kde-apps/libkipi-18.04.2 >=kde-apps/okular-18.04.2 >=kde-apps/spectacle-18.04.2 >=kde-apps/svgpart-18.04.2 >=kde-apps/thumbnailers-18.04.2 scanner? ( >=kde-apps/libksane-18.04.2 ) !kde-apps/kdegraphics-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.1
deleted file mode 100644
index f6567794f5cd..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdegraphics-mobipocket-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.2
new file mode 100644
index 000000000000..a81f01c4987e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to support mobipocket ebooks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+thumbnail debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdegraphics-mobipocket-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.1
deleted file mode 100644
index 03112d81a726..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-18.04.1 >=kde-apps/juk-18.04.1 >=kde-apps/kdenlive-18.04.1 >=kde-apps/kmix-18.04.1 >=kde-apps/kwave-18.04.1 >=kde-apps/libkcddb-18.04.1 cdrom? ( >=kde-apps/audiocd-kio-18.04.1 >=kde-apps/k3b-18.04.1 >=kde-apps/libkcompactdisc-18.04.1 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.04.1 ) gstreamer? ( >=kde-apps/kamoso-18.04.1 ) !kde-apps/kdemultimedia-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=19533069cf8a831929fa766cdc8d0381
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.2
new file mode 100644
index 000000000000..dfab3f2f62cd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
+IUSE=+cdrom +ffmpeg gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-18.04.2 >=kde-apps/juk-18.04.2 >=kde-apps/kdenlive-18.04.2 >=kde-apps/kmix-18.04.2 >=kde-apps/kwave-18.04.2 >=kde-apps/libkcddb-18.04.2 cdrom? ( >=kde-apps/audiocd-kio-18.04.2 >=kde-apps/k3b-18.04.2 >=kde-apps/libkcompactdisc-18.04.2 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.04.2 ) gstreamer? ( >=kde-apps/kamoso-18.04.2 ) !kde-apps/kdemultimedia-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=19533069cf8a831929fa766cdc8d0381
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.1
deleted file mode 100644
index 02c221343016..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kcontrol filesharing config module for SMB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdenetwork-filesharing-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.2
new file mode 100644
index 000000000000..843f8fac4227
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kcontrol filesharing config module for SMB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdenetwork-filesharing-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.1
deleted file mode 100644
index 9f8f219c594f..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+telepathy
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-18.04.1 >=kde-apps/kget-18.04.1 >=kde-apps/krdc-18.04.1 >=kde-apps/kopete-18.04.1 >=kde-apps/krfb-18.04.1 >=kde-apps/zeroconf-ioslave-18.04.1 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.04.1 ) !kde-apps/kdenetwork-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=65b9dc7995b65aef238a474de1947348
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.2
new file mode 100644
index 000000000000..a1167926de1c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+telepathy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-18.04.2 >=kde-apps/kget-18.04.2 >=kde-apps/krdc-18.04.2 >=kde-apps/kopete-18.04.2 >=kde-apps/krfb-18.04.2 >=kde-apps/zeroconf-ioslave-18.04.2 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.04.2 ) !kde-apps/kdenetwork-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=65b9dc7995b65aef238a474de1947348
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.04.1 b/metadata/md5-cache/kde-apps/kdenlive-18.04.1
deleted file mode 100644
index 9e2b54bd0165..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.44.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=6
-HOMEPAGE=https://www.kdenlive.org/
-IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.44.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdenlive-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=331c0a95d4c773f960e4dac5bfea076b
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.04.2 b/metadata/md5-cache/kde-apps/kdenlive-18.04.2
new file mode 100644
index 000000000000..59d2599a2a0d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.44.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Non-linear video editing suite by KDE
+EAPI=6
+HOMEPAGE=https://www.kdenlive.org/
+IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.44.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdenlive-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=331c0a95d4c773f960e4dac5bfea076b
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.1 b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.1
deleted file mode 100644
index c1da9b36c6a0..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/libktnef-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.1:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=importwizard test debug examples test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/libktnef-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.1:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdepim-addons-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb11701765a3f2d12b844674c5d568f4
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.2 b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.2
new file mode 100644
index 000000000000..a5666d22f86b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/libktnef-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.2:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plugins for KDE Personal Information Management Suite
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=importwizard test debug examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/libktnef-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.2:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdepim-addons-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eb11701765a3f2d12b844674c5d568f4
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.1
deleted file mode 100644
index 0fae482ba0fb..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdepim-apps-libs-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.2 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.2
new file mode 100644
index 000000000000..d7f0de1a0e24
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdepim-apps-libs-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.1
deleted file mode 100644
index 1e45d0bc9103..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-18.04.1 >=kde-apps/akonadiconsole-18.04.1 >=kde-apps/akonadi-calendar-18.04.1 >=kde-apps/akonadi-contacts-18.04.1 >=kde-apps/akonadi-import-wizard-18.04.1 >=kde-apps/akonadi-mime-18.04.1 >=kde-apps/akonadi-notes-18.04.1 >=kde-apps/akonadi-search-18.04.1 >=kde-apps/akregator-18.04.1 >=kde-apps/calendarjanitor-18.04.1 >=kde-apps/calendarsupport-18.04.1 >=kde-apps/eventviews-18.04.1 >=kde-apps/grantlee-editor-18.04.1 >=kde-apps/grantleetheme-18.04.1 >=kde-apps/incidenceeditor-18.04.1 >=kde-apps/kaddressbook-18.04.1 >=kde-apps/kalarm-18.04.1 >=kde-apps/kalarmcal-18.04.1 >=kde-apps/kcalcore-18.04.1 >=kde-apps/kcalutils-18.04.1 >=kde-apps/kcontacts-18.04.1 >=kde-apps/kdepim-addons-18.04.1 >=kde-apps/kdepim-apps-libs-18.04.1 >=kde-apps/kdepim-runtime-18.04.1 >=kde-apps/kidentitymanagement-18.04.1 >=kde-apps/kimap-18.04.1 >=kde-apps/kldap-18.04.1 >=kde-apps/kleopatra-18.04.1 >=kde-apps/kmail-18.04.1 >=kde-apps/kmail-account-wizard-18.04.1 >=kde-apps/kmailtransport-18.04.1 >=kde-apps/kmbox-18.04.1 >=kde-apps/kmime-18.04.1 >=kde-apps/knotes-18.04.1 >=kde-apps/konsolekalendar-18.04.1 >=kde-apps/kontact-18.04.1 >=kde-apps/kontactinterface-18.04.1 >=kde-apps/korganizer-18.04.1 >=kde-apps/kpimtextedit-18.04.1 >=kde-apps/ksmtp-18.04.1 >=kde-apps/libgravatar-18.04.1 >=kde-apps/libkdepim-18.04.1 >=kde-apps/libkgapi-18.04.1 >=kde-apps/libkleo-18.04.1 >=kde-apps/libksieve-18.04.1 >=kde-apps/libktnef-18.04.1 >=kde-apps/mailcommon-18.04.1 >=kde-apps/mailimporter-18.04.1 >=kde-apps/mbox-importer-18.04.1 >=kde-apps/messagelib-18.04.1 >=kde-apps/pim-data-exporter-18.04.1 >=kde-apps/pim-sieve-editor-18.04.1 >=kde-apps/pimcommon-18.04.1 >=kde-apps/syndication-18.04.1 !kde-apps/kdepim-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9ea783cb1933ae875cbc0c2d03777e26
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.2
new file mode 100644
index 000000000000..6172dbd1326a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/akonadi-18.04.2 >=kde-apps/akonadiconsole-18.04.2 >=kde-apps/akonadi-calendar-18.04.2 >=kde-apps/akonadi-contacts-18.04.2 >=kde-apps/akonadi-import-wizard-18.04.2 >=kde-apps/akonadi-mime-18.04.2 >=kde-apps/akonadi-notes-18.04.2 >=kde-apps/akonadi-search-18.04.2 >=kde-apps/akregator-18.04.2 >=kde-apps/calendarjanitor-18.04.2 >=kde-apps/calendarsupport-18.04.2 >=kde-apps/eventviews-18.04.2 >=kde-apps/grantlee-editor-18.04.2 >=kde-apps/grantleetheme-18.04.2 >=kde-apps/incidenceeditor-18.04.2 >=kde-apps/kaddressbook-18.04.2 >=kde-apps/kalarm-18.04.2 >=kde-apps/kalarmcal-18.04.2 >=kde-apps/kcalcore-18.04.2 >=kde-apps/kcalutils-18.04.2 >=kde-apps/kcontacts-18.04.2 >=kde-apps/kdepim-addons-18.04.2 >=kde-apps/kdepim-apps-libs-18.04.2 >=kde-apps/kdepim-runtime-18.04.2 >=kde-apps/kidentitymanagement-18.04.2 >=kde-apps/kimap-18.04.2 >=kde-apps/kldap-18.04.2 >=kde-apps/kleopatra-18.04.2 >=kde-apps/kmail-18.04.2 >=kde-apps/kmail-account-wizard-18.04.2 >=kde-apps/kmailtransport-18.04.2 >=kde-apps/kmbox-18.04.2 >=kde-apps/kmime-18.04.2 >=kde-apps/knotes-18.04.2 >=kde-apps/konsolekalendar-18.04.2 >=kde-apps/kontact-18.04.2 >=kde-apps/kontactinterface-18.04.2 >=kde-apps/korganizer-18.04.2 >=kde-apps/kpimtextedit-18.04.2 >=kde-apps/ksmtp-18.04.2 >=kde-apps/libgravatar-18.04.2 >=kde-apps/libkdepim-18.04.2 >=kde-apps/libkgapi-18.04.2 >=kde-apps/libkleo-18.04.2 >=kde-apps/libksieve-18.04.2 >=kde-apps/libktnef-18.04.2 >=kde-apps/mailcommon-18.04.2 >=kde-apps/mailimporter-18.04.2 >=kde-apps/mbox-importer-18.04.2 >=kde-apps/messagelib-18.04.2 >=kde-apps/pim-data-exporter-18.04.2 >=kde-apps/pim-sieve-editor-18.04.2 >=kde-apps/pimcommon-18.04.2 >=kde-apps/syndication-18.04.2 !kde-apps/kdepim-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9ea783cb1933ae875cbc0c2d03777e26
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.1
deleted file mode 100644
index 746a691abfc0..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/kalarmcal-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdav-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmbox-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkgapi-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.04.1:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/kalarmcal-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdav-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmbox-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkgapi-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdepim-runtime-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0ba1ec34207bfec38db44f3d5950500c
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.2 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.2
new file mode 100644
index 000000000000..2f7b5b28a515
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/kalarmcal-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdav-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmbox-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkgapi-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.04.2:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/kalarmcal-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdav-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmbox-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkgapi-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdepim-runtime-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ba1ec34207bfec38db44f3d5950500c
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.1
deleted file mode 100644
index a3e6870e338e..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdesdk-kioslaves-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.2
new file mode 100644
index 000000000000..455c833889d6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslaves from kdesdk package
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdesdk-kioslaves-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.1
deleted file mode 100644
index 4ec40751529a..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-IUSE=cvs
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-plugins-18.04.1 >=kde-apps/kapptemplate-18.04.1 >=kde-apps/kcachegrind-18.04.1 >=kde-apps/kde-dev-scripts-18.04.1 >=kde-apps/kde-dev-utils-18.04.1 >=kde-apps/kdesdk-kioslaves-18.04.1 >=kde-apps/kdesdk-thumbnailers-18.04.1 >=kde-apps/kompare-18.04.1 >=kde-apps/kross-interpreters-18.04.1 >=kde-apps/libkomparediff2-18.04.1 >=kde-apps/lokalize-18.04.1 >=kde-apps/poxml-18.04.1 >=kde-apps/umbrello-18.04.1 cvs? ( >=kde-apps/cervisia-18.04.1 ) !kde-apps/kdesdk-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ecdbdfbfef966e8bf2000c3e1d12667e
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.2
new file mode 100644
index 000000000000..71e9e7f5be0a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development
+IUSE=cvs
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-plugins-18.04.2 >=kde-apps/kapptemplate-18.04.2 >=kde-apps/kcachegrind-18.04.2 >=kde-apps/kde-dev-scripts-18.04.2 >=kde-apps/kde-dev-utils-18.04.2 >=kde-apps/kdesdk-kioslaves-18.04.2 >=kde-apps/kdesdk-thumbnailers-18.04.2 >=kde-apps/kompare-18.04.2 >=kde-apps/kross-interpreters-18.04.2 >=kde-apps/libkomparediff2-18.04.2 >=kde-apps/lokalize-18.04.2 >=kde-apps/poxml-18.04.2 >=kde-apps/umbrello-18.04.2 cvs? ( >=kde-apps/cervisia-18.04.2 ) !kde-apps/kdesdk-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ecdbdfbfef966e8bf2000c3e1d12667e
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.1
deleted file mode 100644
index 9e0070acc705..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdesdk-thumbnailers-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.2
new file mode 100644
index 000000000000..c6af2aababd4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generator for PO files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdesdk-thumbnailers-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.1
deleted file mode 100644
index c84bcc7e8758..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
-IUSE=cups floppy
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ark-18.04.1 >=kde-apps/filelight-18.04.1 >=kde-apps/kbackup-18.04.1 >=kde-apps/kcalc-18.04.1 >=kde-apps/kcharselect-18.04.1 >=kde-apps/kdebugsettings-18.04.1 >=kde-apps/kdf-18.04.1 >=kde-apps/kgpg-18.04.1 >=kde-apps/kimagemapeditor-18.04.1 >=kde-apps/kteatime-18.04.1 >=kde-apps/ktimer-18.04.1 >=kde-apps/kwalletmanager-18.04.1 >=kde-apps/sweeper-18.04.1 cups? ( >=kde-apps/print-manager-18.04.1 ) floppy? ( >=kde-apps/kfloppy-18.04.1 ) !kde-apps/kdeutils-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43fac0da81f9d8d20e482aa8d349d94c
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.2
new file mode 100644
index 000000000000..de1ab0864cc6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
+IUSE=cups floppy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ark-18.04.2 >=kde-apps/filelight-18.04.2 >=kde-apps/kbackup-18.04.2 >=kde-apps/kcalc-18.04.2 >=kde-apps/kcharselect-18.04.2 >=kde-apps/kdebugsettings-18.04.2 >=kde-apps/kdf-18.04.2 >=kde-apps/kgpg-18.04.2 >=kde-apps/kimagemapeditor-18.04.2 >=kde-apps/kteatime-18.04.2 >=kde-apps/ktimer-18.04.2 >=kde-apps/kwalletmanager-18.04.2 >=kde-apps/sweeper-18.04.2 cups? ( >=kde-apps/print-manager-18.04.2 ) floppy? ( >=kde-apps/kfloppy-18.04.2 ) !kde-apps/kdeutils-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=43fac0da81f9d8d20e482aa8d349d94c
diff --git a/metadata/md5-cache/kde-apps/kdf-18.04.1 b/metadata/md5-cache/kde-apps/kdf-18.04.1
deleted file mode 100644
index 03af59a97946..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE free disk space utility
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/kdf
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdf-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdf-18.04.2 b/metadata/md5-cache/kde-apps/kdf-18.04.2
new file mode 100644
index 000000000000..081ca7256ccf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE free disk space utility
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/kdf
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdf-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.04.1 b/metadata/md5-cache/kde-apps/kdialog-18.04.1
deleted file mode 100644
index b5b712dd8075..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdialog-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.04.2 b/metadata/md5-cache/kde-apps/kdialog-18.04.2
new file mode 100644
index 000000000000..c79ace4ddcc1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdialog-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.04.1 b/metadata/md5-cache/kde-apps/kdiamond-18.04.1
deleted file mode 100644
index 569d7ef531d6..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE three-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdiamond-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.04.2 b/metadata/md5-cache/kde-apps/kdiamond-18.04.2
new file mode 100644
index 000000000000..ef865589ef99
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE three-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdiamond-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.1 b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.1
deleted file mode 100644
index d716cfd2968a..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bookmarks editor based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/keditbookmarks-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.2 b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.2
new file mode 100644
index 000000000000..c039db9287fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Bookmarks editor based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/keditbookmarks-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/kfind-18.04.1 b/metadata/md5-cache/kde-apps/kfind-18.04.1
deleted file mode 100644
index ca54a509f6fa..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kfind-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cdf5b5647d714aae0431751f0704625d
diff --git a/metadata/md5-cache/kde-apps/kfind-18.04.2 b/metadata/md5-cache/kde-apps/kfind-18.04.2
new file mode 100644
index 000000000000..c5de11ab8b92
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=File finder utility based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kfind-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cdf5b5647d714aae0431751f0704625d
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.04.1 b/metadata/md5-cache/kde-apps/kfloppy-18.04.1
deleted file mode 100644
index 9d87c10f6788..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kfloppy-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.04.2 b/metadata/md5-cache/kde-apps/kfloppy-18.04.2
new file mode 100644
index 000000000000..85cfa56ec529
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kfloppy-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.04.1 b/metadata/md5-cache/kde-apps/kfourinline-18.04.1
deleted file mode 100644
index 56e49d2aa566..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE four-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kfourinline-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.04.2 b/metadata/md5-cache/kde-apps/kfourinline-18.04.2
new file mode 100644
index 000000000000..b6cb1df91347
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE four-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kfourinline-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.04.1 b/metadata/md5-cache/kde-apps/kgeography-18.04.1
deleted file mode 100644
index 67501fc58198..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Geography learning tool
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kgeography-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.04.2 b/metadata/md5-cache/kde-apps/kgeography-18.04.2
new file mode 100644
index 000000000000..ad791092f7e9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Geography learning tool
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kgeography-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kget-18.04.1 b/metadata/md5-cache/kde-apps/kget-18.04.1
deleted file mode 100644
index 7af24352df53..000000000000
--- a/metadata/md5-cache/kde-apps/kget-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.11.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced download manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kget/
-IUSE=bittorrent gpg kde mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.11.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kget-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7392a0cf28ee9e04f8dbaead57cb8ebe
diff --git a/metadata/md5-cache/kde-apps/kget-18.04.2 b/metadata/md5-cache/kde-apps/kget-18.04.2
new file mode 100644
index 000000000000..d8b8fd51fda1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.11.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced download manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kget/
+IUSE=bittorrent gpg kde mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.11.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kget-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7392a0cf28ee9e04f8dbaead57cb8ebe
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.1 b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.1
deleted file mode 100644
index f9e146c66847..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kgoldrunner-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.2 b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.2
new file mode 100644
index 000000000000..4be54bcf2287
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game of action and puzzle solving by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kgoldrunner-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.04.1 b/metadata/md5-cache/kde-apps/kgpg-18.04.1
deleted file mode 100644
index b12aeecf6aee..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kgpg-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.04.2 b/metadata/md5-cache/kde-apps/kgpg-18.04.2
new file mode 100644
index 000000000000..5fba6fedb3cf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kgpg-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/khangman-18.04.1 b/metadata/md5-cache/kde-apps/khangman-18.04.1
deleted file mode 100644
index 9be20489b2e8..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical hangman game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.04.1:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/khangman-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khangman-18.04.2 b/metadata/md5-cache/kde-apps/khangman-18.04.2
new file mode 100644
index 000000000000..4a4aaa7d4af8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical hangman game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.04.2:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/khangman-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.04.1 b/metadata/md5-cache/kde-apps/khelpcenter-18.04.1
deleted file mode 100644
index fa06d535dc0d..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=The KDE Help Center
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/khelpcenter-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.04.2 b/metadata/md5-cache/kde-apps/khelpcenter-18.04.2
new file mode 100644
index 000000000000..15b95abc5206
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=The KDE Help Center
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/khelpcenter-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.1
deleted file mode 100644
index d8eb19569441..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for managing identitites
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kidentitymanagement-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.2 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.2
new file mode 100644
index 000000000000..9fd3f50b0fd5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for managing identitites
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kidentitymanagement-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kig-18.04.1 b/metadata/md5-cache/kde-apps/kig-18.04.1
deleted file mode 100644
index 73bbe66abaa2..000000000000
--- a/metadata/md5-cache/kde-apps/kig-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-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(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,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(+)] ) >=kde-frameworks/ktexteditor-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
-IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
-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(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,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(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kig-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kig-18.04.2 b/metadata/md5-cache/kde-apps/kig-18.04.2
new file mode 100644
index 000000000000..c89060de4d12
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+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(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,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(+)] ) >=kde-frameworks/ktexteditor-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
+IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
+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(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,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(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=python_targets_python2_7
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kig-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kigo-18.04.1 b/metadata/md5-cache/kde-apps/kigo-18.04.1
deleted file mode 100644
index 0e7baf660bac..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Go game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kigo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kigo-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/kigo-18.04.2 b/metadata/md5-cache/kde-apps/kigo-18.04.2
new file mode 100644
index 000000000000..963239416b79
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Go game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kigo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kigo-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/killbots-18.04.1 b/metadata/md5-cache/kde-apps/killbots-18.04.1
deleted file mode 100644
index c01e77872a75..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/killbots/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/killbots-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/killbots-18.04.2 b/metadata/md5-cache/kde-apps/killbots-18.04.2
new file mode 100644
index 000000000000..99fbddb00cd8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kill the bots or they kill you!
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/killbots/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/killbots-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.1
deleted file mode 100644
index 9ff586d6507f..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Generator of HTML image maps
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kimagemapeditor-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.2 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.2
new file mode 100644
index 000000000000..f53a806b895f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Generator of HTML image maps
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kimagemapeditor-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimap-18.04.1 b/metadata/md5-cache/kde-apps/kimap-18.04.1
deleted file mode 100644
index 749c224060a8..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kimap-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kimap-18.04.2 b/metadata/md5-cache/kde-apps/kimap-18.04.2
new file mode 100644
index 000000000000..80c4a69c4a2b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with IMAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kimap-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.04.1 b/metadata/md5-cache/kde-apps/kio-extras-18.04.1
deleted file mode 100644
index ec84d9cbe1f9..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kio-extras-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=15a6a04d537ae88f28f205bf262c0dfe
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.04.2 b/metadata/md5-cache/kde-apps/kio-extras-18.04.2
new file mode 100644
index 000000000000..9769fd51fc2d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kio-extras.git
+IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp taglib test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kio-extras-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=15a6a04d537ae88f28f205bf262c0dfe
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.04.1 b/metadata/md5-cache/kde-apps/kiriki-18.04.1
deleted file mode 100644
index 316986150eef..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An addictive and fun dice game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kiriki-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.04.2 b/metadata/md5-cache/kde-apps/kiriki-18.04.2
new file mode 100644
index 000000000000..f8f267caeae4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An addictive and fun dice game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kiriki-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiten-18.04.1 b/metadata/md5-cache/kde-apps/kiten-18.04.1
deleted file mode 100644
index 5d43bc9a4eab..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kiten-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kiten-18.04.2 b/metadata/md5-cache/kde-apps/kiten-18.04.2
new file mode 100644
index 000000000000..c4078d078e90
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Japanese dictionary and reference
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kiten-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.1 b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.1
deleted file mode 100644
index 058a01675a19..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tactical one or two player game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kjumpingcube-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.2 b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.2
new file mode 100644
index 000000000000..7a0d7d6b96d6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tactical one or two player game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kjumpingcube-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kldap-18.04.1 b/metadata/md5-cache/kde-apps/kldap-18.04.1
deleted file mode 100644
index 6734556ba77f..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kldap-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kldap-18.04.2 b/metadata/md5-cache/kde-apps/kldap-18.04.2
new file mode 100644
index 000000000000..2be81c510d7b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with LDAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kldap-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.04.1 b/metadata/md5-cache/kde-apps/kleopatra-18.04.1
deleted file mode 100644
index bfca2b6a817b..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kleopatra-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.04.2 b/metadata/md5-cache/kde-apps/kleopatra-18.04.2
new file mode 100644
index 000000000000..3e41fbecd04e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kleopatra-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/klettres-18.04.1 b/metadata/md5-cache/kde-apps/klettres-18.04.1
deleted file mode 100644
index 9c5fd5b63c12..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Alphabet learning application
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/klettres-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klettres-18.04.2 b/metadata/md5-cache/kde-apps/klettres-18.04.2
new file mode 100644
index 000000000000..c8ae694ed70f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Alphabet learning application
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/klettres-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klickety-18.04.1 b/metadata/md5-cache/kde-apps/klickety-18.04.1
deleted file mode 100644
index 0c056ad5d849..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/klickety-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klickety-18.04.2 b/metadata/md5-cache/kde-apps/klickety-18.04.2
new file mode 100644
index 000000000000..0cb70c6e0bf6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/klickety-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klines-18.04.1 b/metadata/md5-cache/kde-apps/klines-18.04.1
deleted file mode 100644
index 30a4bef92654..000000000000
--- a/metadata/md5-cache/kde-apps/klines-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/klines-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/klines-18.04.2 b/metadata/md5-cache/kde-apps/klines-18.04.2
new file mode 100644
index 000000000000..67ce3de52114
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A little KDE game about balls and how to get rid of them
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/klines-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/kmag-18.04.1 b/metadata/md5-cache/kde-apps/kmag-18.04.1
deleted file mode 100644
index 52cc83e5627e..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE screen magnifier
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmag-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmag-18.04.2 b/metadata/md5-cache/kde-apps/kmag-18.04.2
new file mode 100644
index 000000000000..9536a5663eac
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE screen magnifier
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
+IUSE=keyboardfocus debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmag-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.04.1 b/metadata/md5-cache/kde-apps/kmahjongg-18.04.1
deleted file mode 100644
index 3a496e8e4eeb..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=kde-apps/libkmahjongg-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A tile matching game for one or two players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=kde-apps/libkmahjongg-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmahjongg-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.04.2 b/metadata/md5-cache/kde-apps/kmahjongg-18.04.2
new file mode 100644
index 000000000000..8fd02331c2cb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=kde-apps/libkmahjongg-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A tile matching game for one or two players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=kde-apps/libkmahjongg-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmahjongg-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmail-18.04.1 b/metadata/md5-cache/kde-apps/kmail-18.04.1
deleted file mode 100644
index 15b733238bd6..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/libktnef-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kldap-18.04.1:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.04.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kmail/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/libktnef-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-18.04.1:5 >=kde-apps/kmail-account-wizard-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmail-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09eb9f1e5bc1c02edc857e32049a277a
diff --git a/metadata/md5-cache/kde-apps/kmail-18.04.2 b/metadata/md5-cache/kde-apps/kmail-18.04.2
new file mode 100644
index 000000000000..4c4b4bd094d7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/libktnef-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kldap-18.04.2:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.04.2:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kmail/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/libktnef-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-apps/kmail-account-wizard-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmail-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=09eb9f1e5bc1c02edc857e32049a277a
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.1
deleted file mode 100644
index 4596272abf86..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmail-account-wizard-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.2 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.2
new file mode 100644
index 000000000000..3a9fecf9a030
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for KMail accounts configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmail-account-wizard-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.04.1 b/metadata/md5-cache/kde-apps/kmailtransport-18.04.1
deleted file mode 100644
index f1915481495f..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/ksmtp-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mail transport service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/ksmtp-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmailtransport-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb8a598ce1385111ccedfdd54a58ffbd
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.04.2 b/metadata/md5-cache/kde-apps/kmailtransport-18.04.2
new file mode 100644
index 000000000000..ab10c59d0a71
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/ksmtp-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mail transport service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/ksmtp-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmailtransport-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bb8a598ce1385111ccedfdd54a58ffbd
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.04.1 b/metadata/md5-cache/kde-apps/kmbox-18.04.1
deleted file mode 100644
index 4c99c9cf4c0d..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmbox-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.04.2 b/metadata/md5-cache/kde-apps/kmbox-18.04.2
new file mode 100644
index 000000000000..59f3edbbbd50
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing MBox format mail storages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-apps/kmime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmbox-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmime-18.04.1 b/metadata/md5-cache/kde-apps/kmime-18.04.1
deleted file mode 100644
index 6d467a31e0af..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmime-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmime-18.04.2 b/metadata/md5-cache/kde-apps/kmime-18.04.2
new file mode 100644
index 000000000000..647401765410
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libary for handling mail messages and newsgroup articles
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmime-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmines-18.04.1 b/metadata/md5-cache/kde-apps/kmines-18.04.1
deleted file mode 100644
index 3856654c254f..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classic mine sweeper game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmines-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmines-18.04.2 b/metadata/md5-cache/kde-apps/kmines-18.04.2
new file mode 100644
index 000000000000..ee16823c94c8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classic mine sweeper game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmines-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmix-18.04.1 b/metadata/md5-cache/kde-apps/kmix-18.04.1
deleted file mode 100644
index d6e392e7ac64..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma mixer gui
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
-IUSE=alsa pulseaudio debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmix-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmix-18.04.2 b/metadata/md5-cache/kde-apps/kmix-18.04.2
new file mode 100644
index 000000000000..5984798e640c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma mixer gui
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
+IUSE=alsa pulseaudio debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmix-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.04.1 b/metadata/md5-cache/kde-apps/kmousetool-18.04.1
deleted file mode 100644
index 2dad5359fe60..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmousetool-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fa056f331b3d4cfc01afb0ad49ad9bc
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.04.2 b/metadata/md5-cache/kde-apps/kmousetool-18.04.2
new file mode 100644
index 000000000000..24132885ae37
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE program that clicks the mouse for you
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmousetool-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3fa056f331b3d4cfc01afb0ad49ad9bc
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.04.1 b/metadata/md5-cache/kde-apps/kmouth-18.04.1
deleted file mode 100644
index 513e9febe421..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmouth-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.04.2 b/metadata/md5-cache/kde-apps/kmouth-18.04.2
new file mode 100644
index 000000000000..95502e5d2e5a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Text-to-speech synthesizer front end
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmouth-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.04.1 b/metadata/md5-cache/kde-apps/kmplot-18.04.1
deleted file mode 100644
index 0769edd7f5e7..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mathematical function plotter
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kmplot-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.04.2 b/metadata/md5-cache/kde-apps/kmplot-18.04.2
new file mode 100644
index 000000000000..4279751b9f0c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mathematical function plotter
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmplot-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.04.1 b/metadata/md5-cache/kde-apps/knavalbattle-18.04.1
deleted file mode 100644
index f2b793a2ac04..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Battleship clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/knavalbattle-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.04.2 b/metadata/md5-cache/kde-apps/knavalbattle-18.04.2
new file mode 100644
index 000000000000..720032855e5c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Battleship clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/knavalbattle-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.04.1 b/metadata/md5-cache/kde-apps/knetwalk-18.04.1
deleted file mode 100644
index bfc5f21f15e5..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the popular NetWalk game for system administrators
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/knetwalk-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.04.2 b/metadata/md5-cache/kde-apps/knetwalk-18.04.2
new file mode 100644
index 000000000000..62d70a7c3f54
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the popular NetWalk game for system administrators
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/knetwalk-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knotes-18.04.1 b/metadata/md5-cache/kde-apps/knotes-18.04.1
deleted file mode 100644
index 0bd0a58c9b09..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Note taking application
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/knotes-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/knotes-18.04.2 b/metadata/md5-cache/kde-apps/knotes-18.04.2
new file mode 100644
index 000000000000..034b57c8b389
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Note taking application
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/knotes-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/kolf-18.04.1 b/metadata/md5-cache/kde-apps/kolf-18.04.1
deleted file mode 100644
index 1bbafd3ef8a8..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Minigolf game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kolf-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kolf-18.04.2 b/metadata/md5-cache/kde-apps/kolf-18.04.2
new file mode 100644
index 000000000000..6fc6dfc332db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Minigolf game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kolf-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kollision-18.04.1 b/metadata/md5-cache/kde-apps/kollision-18.04.1
deleted file mode 100644
index dea71504e07f..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple ball dodging game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kollision-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kollision-18.04.2 b/metadata/md5-cache/kde-apps/kollision-18.04.2
new file mode 100644
index 000000000000..ef87d48692fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple ball dodging game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kollision-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.04.1 b/metadata/md5-cache/kde-apps/kolourpaint-18.04.1
deleted file mode 100644
index 106828d62f0e..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.1:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Paint Program by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
-IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kolourpaint-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.04.2 b/metadata/md5-cache/kde-apps/kolourpaint-18.04.2
new file mode 100644
index 000000000000..8a9171f2bd71
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.2:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Paint Program by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
+IUSE=scanner debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kolourpaint-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kompare-18.04.1 b/metadata/md5-cache/kde-apps/kompare-18.04.1
deleted file mode 100644
index c1b9781ed70e..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A program to view the differences between files
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kompare-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/kompare-18.04.2 b/metadata/md5-cache/kde-apps/kompare-18.04.2
new file mode 100644
index 000000000000..a1d9aa6cb60f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A program to view the differences between files
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kompare-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.1 b/metadata/md5-cache/kde-apps/konqueror-18.04.1
deleted file mode 100644
index 9703930d9c71..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) activities? ( >=kde-frameworks/kactivities-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
-IUSE=activities speech tidy +webengine X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-apps/kfind-18.04.1:5 >=kde-plasma/kde-cli-tools-5.11.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/konqueror-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be9e90af9cff929ca88471f10b10f5d4
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.2 b/metadata/md5-cache/kde-apps/konqueror-18.04.2
new file mode 100644
index 000000000000..7d0f59cdbe4d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) activities? ( >=kde-frameworks/kactivities-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
+IUSE=activities speech tidy +webengine X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-apps/kfind-18.04.2:5 >=kde-plasma/kde-cli-tools-5.11.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/konqueror-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be9e90af9cff929ca88471f10b10f5d4
diff --git a/metadata/md5-cache/kde-apps/konquest-18.04.1 b/metadata/md5-cache/kde-apps/konquest-18.04.1
deleted file mode 100644
index 8260c77a97f0..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/konquest-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konquest-18.04.2 b/metadata/md5-cache/kde-apps/konquest-18.04.2
new file mode 100644
index 000000000000..41e0e41b3293
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Galactic Strategy KDE Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/konquest-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konsole-18.04.1 b/metadata/md5-cache/kde-apps/konsole-18.04.1
deleted file mode 100644
index 58c7c30b048f..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE's terminal emulator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/konsole-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0540bff7faa536bab397e34be690a6c8
diff --git a/metadata/md5-cache/kde-apps/konsole-18.04.2 b/metadata/md5-cache/kde-apps/konsole-18.04.2
new file mode 100644
index 000000000000..baef930f4d23
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE's terminal emulator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/konsole-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0540bff7faa536bab397e34be690a6c8
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.1 b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.1
deleted file mode 100644
index cbb0e137f52f..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/akonadi-calendar-tools-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.2 b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.2
new file mode 100644
index 000000000000..0cb6ce63af76
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Command line interface to KDE calendars
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-calendar-tools-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/kontact-18.04.1 b/metadata/md5-cache/kde-apps/kontact-18.04.1
deleted file mode 100644
index d5e2c950f529..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kontact-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontact-18.04.2 b/metadata/md5-cache/kde-apps/kontact-18.04.2
new file mode 100644
index 000000000000..f3ac061caf15
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Container application to unify several major PIM applications within one
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kontact-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.04.1 b/metadata/md5-cache/kde-apps/kontactinterface-18.04.1
deleted file mode 100644
index 67568b28b642..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kontactinterface-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.04.2 b/metadata/md5-cache/kde-apps/kontactinterface-18.04.2
new file mode 100644
index 000000000000..7368cc01650b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for embedding KParts in a Kontact component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kontactinterface-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kopete-18.04.1 b/metadata/md5-cache/kde-apps/kopete-18.04.1
deleted file mode 100644
index a4b3efb67dbe..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.1:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
-IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp yahoo zeroconf debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.1:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kopete-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=580bfaabdbbe4c4a403891ed6f6e0a73
diff --git a/metadata/md5-cache/kde-apps/kopete-18.04.2 b/metadata/md5-cache/kde-apps/kopete-18.04.2
new file mode 100644
index 000000000000..ec6eca251275
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kopete-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
+IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp yahoo zeroconf debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kopete-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c2ee379934babbaf3377d21352899efa
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.04.1 b/metadata/md5-cache/kde-apps/korganizer-18.04.1
deleted file mode 100644
index a2d8ee4f6082..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-apps/kldap-18.04.1:5 >=dev-qt/designer-5.9.4:5 test? ( >=kde-apps/akonadi-18.04.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/korganizer/
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-calendar-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/akonadi-notes-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/eventviews-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kontactinterface-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/korganizer-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ffe3b147734d6dc51ca296778c8ba5e
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.04.2 b/metadata/md5-cache/kde-apps/korganizer-18.04.2
new file mode 100644
index 000000000000..1f987d4dfa58
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-apps/kldap-18.04.2:5 >=dev-qt/designer-5.9.4:5 test? ( >=kde-apps/akonadi-18.04.2:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/korganizer/
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/korganizer-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7ffe3b147734d6dc51ca296778c8ba5e
diff --git a/metadata/md5-cache/kde-apps/kpat-18.04.1 b/metadata/md5-cache/kde-apps/kpat-18.04.1
deleted file mode 100644
index 2cc045ad2134..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE patience game
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=kpat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kpat-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpat-18.04.2 b/metadata/md5-cache/kde-apps/kpat-18.04.2
new file mode 100644
index 000000000000..da7a1ce5cce2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpat-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE patience game
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=kpat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kpat-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.1 b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.1
deleted file mode 100644
index 921d2cd16cde..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A textedit with PIM-specific features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kpimtextedit-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.2 b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.2
new file mode 100644
index 000000000000..80cb9e8a46c6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A textedit with PIM-specific features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kpimtextedit-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.1
deleted file mode 100644
index 825773bcfeb8..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kqtquickcharts-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.2
new file mode 100644
index 000000000000..589806182163
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kqtquickcharts-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/krdc-18.04.1 b/metadata/md5-cache/kde-apps/krdc-18.04.1
deleted file mode 100644
index cb78b3b7ff97..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/krdc/
-IUSE=+rdp vnc debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/krdc-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/krdc-18.04.2 b/metadata/md5-cache/kde-apps/krdc-18.04.2
new file mode 100644
index 000000000000..15bbc18a1d75
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Remote desktop connection (RDP and VNC) client
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/krdc/
+IUSE=+rdp vnc debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/krdc-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.04.1 b/metadata/md5-cache/kde-apps/kreversi-18.04.1
deleted file mode 100644
index 970d7740b477..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Board game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kreversi-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.04.2 b/metadata/md5-cache/kde-apps/kreversi-18.04.2
new file mode 100644
index 000000000000..1915ce6cec9e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Board game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kreversi-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/krfb-18.04.1 b/metadata/md5-cache/kde-apps/krfb-18.04.1
deleted file mode 100644
index d98c4a2a1b2b..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/krfb/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/krfb-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/krfb-18.04.2 b/metadata/md5-cache/kde-apps/krfb-18.04.2
new file mode 100644
index 000000000000..d0904d985413
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=VNC-compatible server to share Plasma desktops
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/krfb/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/krfb-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.1 b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.1
deleted file mode 100644
index 0409b6a4711c..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+python ruby debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kross-interpreters-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=badf17c8bb40cd4709c3dd10a2346903
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.2 b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.2
new file mode 100644
index 000000000000..fd5f793024d4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+python ruby debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kross-interpreters-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=badf17c8bb40cd4709c3dd10a2346903
diff --git a/metadata/md5-cache/kde-apps/kruler-18.04.1 b/metadata/md5-cache/kde-apps/kruler-18.04.1
deleted file mode 100644
index 047250dc501e..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen ruler for Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kruler-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kruler-18.04.2 b/metadata/md5-cache/kde-apps/kruler-18.04.2
new file mode 100644
index 000000000000..4603a08bbe3c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screen ruler for Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kruler-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.04.1 b/metadata/md5-cache/kde-apps/kshisen-18.04.1
deleted file mode 100644
index 4c02c99c1cd6..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=kde-apps/libkmahjongg-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE game similiar to Mahjongg
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=kde-apps/libkmahjongg-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kshisen-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.04.2 b/metadata/md5-cache/kde-apps/kshisen-18.04.2
new file mode 100644
index 000000000000..978b3884528c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=kde-apps/libkmahjongg-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE game similiar to Mahjongg
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=kde-apps/libkmahjongg-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kshisen-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.04.1 b/metadata/md5-cache/kde-apps/ksirk-18.04.1
deleted file mode 100644
index 1a47cca9e934..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Port of the board game risk
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksirk-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60a888a869dd513e1502869a2d5d0786
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.04.2 b/metadata/md5-cache/kde-apps/ksirk-18.04.2
new file mode 100644
index 000000000000..f096cd3a7bca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Port of the board game risk
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksirk-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60a888a869dd513e1502869a2d5d0786
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.04.1 b/metadata/md5-cache/kde-apps/ksmtp-18.04.1
deleted file mode 100644
index b81d72f7b0e5..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Job-based library to send email through an SMTP server
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.1:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksmtp-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.04.2 b/metadata/md5-cache/kde-apps/ksmtp-18.04.2
new file mode 100644
index 000000000000..e51b4c2f8be9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Job-based library to send email through an SMTP server
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksmtp-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.1 b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.1
deleted file mode 100644
index f12c9280c22e..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Tron game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksnakeduel-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.2 b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.2
new file mode 100644
index 000000000000..5bcf3874853a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Tron game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksnakeduel-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.04.1 b/metadata/md5-cache/kde-apps/kspaceduel-18.04.1
deleted file mode 100644
index 90be5148616a..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Space Game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kspaceduel-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.04.2 b/metadata/md5-cache/kde-apps/kspaceduel-18.04.2
new file mode 100644
index 000000000000..5f7a087cbc82
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Space Game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kspaceduel-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.04.1 b/metadata/md5-cache/kde-apps/ksquares-18.04.1
deleted file mode 100644
index c9e6c3eb457d..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE clone of the game squares
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksquares-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.04.2 b/metadata/md5-cache/kde-apps/ksquares-18.04.2
new file mode 100644
index 000000000000..334380bb9b6c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE clone of the game squares
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksquares-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.04.1 b/metadata/md5-cache/kde-apps/ksudoku-18.04.1
deleted file mode 100644
index 0ec4b157bdc5..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
-IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksudoku-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.04.2 b/metadata/md5-cache/kde-apps/ksudoku-18.04.2
new file mode 100644
index 000000000000..036decdc438e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Logic-based symbol placement puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
+IUSE=opengl debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksudoku-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.04.1 b/metadata/md5-cache/kde-apps/ksystemlog-18.04.1
deleted file mode 100644
index 08e2a7e67628..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System log viewer by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
-IUSE=systemd test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ksystemlog-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.04.2 b/metadata/md5-cache/kde-apps/ksystemlog-18.04.2
new file mode 100644
index 000000000000..4ddfb4b6c541
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System log viewer by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
+IUSE=systemd test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksystemlog-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.04.1 b/metadata/md5-cache/kde-apps/kteatime-18.04.1
deleted file mode 100644
index 6bdb30925327..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kteatime
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kteatime-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.04.2 b/metadata/md5-cache/kde-apps/kteatime-18.04.2
new file mode 100644
index 000000000000..6b43c3d2ba6f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE timer for making a fine cup of tea
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kteatime
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kteatime-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.04.1 b/metadata/md5-cache/kde-apps/ktimer-18.04.1
deleted file mode 100644
index 9b7a76cf2ca1..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Timer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktimer-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.04.2 b/metadata/md5-cache/kde-apps/ktimer-18.04.2
new file mode 100644
index 000000000000..94b36758783d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Timer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktimer-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.04.1 b/metadata/md5-cache/kde-apps/ktouch-18.04.1
deleted file mode 100644
index f87e1a8ff552..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/ktouch/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktouch-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.04.2 b/metadata/md5-cache/kde-apps/ktouch-18.04.2
new file mode 100644
index 000000000000..bfe99374da89
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that helps to learn and practice touch typing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/ktouch/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktouch-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.1
deleted file mode 100644
index ef5863729a45..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-util/intltool net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=experimental debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.04.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-accounts-kcm-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3422cd549ae8e2b24860e5f4cc7b1f2
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.2 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.2
new file mode 100644
index 000000000000..274720990b44
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-util/intltool net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy account management kcm
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=experimental debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.04.2:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-accounts-kcm-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3422cd549ae8e2b24860e5f4cc7b1f2
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.04.1 b/metadata/md5-cache/kde-apps/ktp-approver-18.04.1
deleted file mode 100644
index f5d9e7df38ce..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-approver-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.04.2 b/metadata/md5-cache/kde-apps/ktp-approver-18.04.2
new file mode 100644
index 000000000000..0aaffd3d0eea
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy notification handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-approver-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.1
deleted file mode 100644
index 195df5b69ef0..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.1:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-auth-handler-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3ff45856fe8e0cdf15f0959283ba2da0
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.2
new file mode 100644
index 000000000000..bf96ecfc2762
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy authentication handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-auth-handler-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3ff45856fe8e0cdf15f0959283ba2da0
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.1
deleted file mode 100644
index 24055ebcb621..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy audio/video conferencing ui
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-call-ui-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.2 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.2
new file mode 100644
index 000000000000..17255b6af90a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy audio/video conferencing ui
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-call-ui-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.1
deleted file mode 100644
index ed3b13916b1b..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-18.04.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtnetwork-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy common library
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-18.04.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-common-internals-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.2 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.2
new file mode 100644
index 000000000000..daa2a72930d9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-18.04.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtnetwork-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy common library
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=otr +sso debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-18.04.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-common-internals-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.1
deleted file mode 100644
index e29a644089f3..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact list
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-contact-list-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.2 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.2
new file mode 100644
index 000000000000..f7e5d71ed57d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact list
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-contact-list-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.1
deleted file mode 100644
index 48d7a1aa92d1..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-contact-runner-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.2
new file mode 100644
index 000000000000..a51a49c5c258
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy krunner plugin
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-contact-runner-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.1
deleted file mode 100644
index e4d4b1a0e7cf..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-desktop-applets-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.2
new file mode 100644
index 000000000000..37b47dba780a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-desktop-applets-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.1
deleted file mode 100644
index 91990bffae23..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-filetransfer-handler-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.2
new file mode 100644
index 000000000000..df90ebd15b32
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file transfer handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-filetransfer-handler-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.1
deleted file mode 100644
index 9460738a8ebf..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-kded-module-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.2
new file mode 100644
index 000000000000..41a3c6abe7e1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy workspace integration
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-kded-module-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.1 b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.1
deleted file mode 100644
index 89cc6bc4a3ce..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.1:5 >=kde-apps/ktp-filetransfer-handler-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-send-file-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.2 b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.2
new file mode 100644
index 000000000000..15cc7c7e7dcb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.2:5 >=kde-apps/ktp-filetransfer-handler-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-send-file-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.1
deleted file mode 100644
index cedaded52d3a..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=speech debug
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.1:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/ktp-contact-list-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktp-text-ui-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.2 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.2
new file mode 100644
index 000000000000..08680107cf63
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy text chat window
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=speech debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/ktp-contact-list-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-text-ui-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.04.1 b/metadata/md5-cache/kde-apps/ktuberling-18.04.1
deleted file mode 100644
index c43626b42a65..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Potato game for kids by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktuberling-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.04.2 b/metadata/md5-cache/kde-apps/ktuberling-18.04.2
new file mode 100644
index 000000000000..32d0e10fc028
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Potato game for kids by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktuberling-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.04.1 b/metadata/md5-cache/kde-apps/kturtle-18.04.1
deleted file mode 100644
index 677fd219aca4..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kturtle-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.04.2 b/metadata/md5-cache/kde-apps/kturtle-18.04.2
new file mode 100644
index 000000000000..ba0f8119d462
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational programming environment using the Logo programming language
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kturtle-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.04.1 b/metadata/md5-cache/kde-apps/kubrick-18.04.1
deleted file mode 100644
index ad84def22abe..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kubrick/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kubrick-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.04.2 b/metadata/md5-cache/kde-apps/kubrick-18.04.2
new file mode 100644
index 000000000000..761fc3452dbd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kubrick/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kubrick-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.1 b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.1
deleted file mode 100644
index 5d7d07aacb5e..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Wallet management tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kwalletmanager-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.2 b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.2
new file mode 100644
index 000000000000..03439de6d062
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Wallet management tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kwalletmanager-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwave-18.04.1 b/metadata/md5-cache/kde-apps/kwave-18.04.1
deleted file mode 100644
index e590a5ecd50d..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-18.04.1:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=6
-HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kwave-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwave-18.04.2 b/metadata/md5-cache/kde-apps/kwave-18.04.2
new file mode 100644
index 000000000000..fa0d7582cc3c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
+EAPI=6
+HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
+IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kwave-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.04.1 b/metadata/md5-cache/kde-apps/kwordquiz-18.04.1
deleted file mode 100644
index 6ca93fe0d2e4..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A powerful flashcard and vocabulary learning program
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kwordquiz-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.04.2 b/metadata/md5-cache/kde-apps/kwordquiz-18.04.2
new file mode 100644
index 000000000000..ae7231c233fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A powerful flashcard and vocabulary learning program
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kwordquiz-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.04.1 b/metadata/md5-cache/kde-apps/kwrite-18.04.1
deleted file mode 100644
index 02cdc3864816..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE simple text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kate-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.04.2 b/metadata/md5-cache/kde-apps/kwrite-18.04.2
new file mode 100644
index 000000000000..d8ff3996d757
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE simple text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kate-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.04.1 b/metadata/md5-cache/kde-apps/libgravatar-18.04.1
deleted file mode 100644
index 85d7af7e30e2..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for gravatar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libgravatar-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.04.2 b/metadata/md5-cache/kde-apps/libgravatar-18.04.2
new file mode 100644
index 000000000000..ce08c2310c99
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for gravatar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libgravatar-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.04.1 b/metadata/md5-cache/kde-apps/libkcddb-18.04.1
deleted file mode 100644
index e8d94c948e61..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for CDDB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkcddb-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.04.2 b/metadata/md5-cache/kde-apps/libkcddb-18.04.2
new file mode 100644
index 000000000000..a1ca9485d6f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for CDDB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=musicbrainz debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkcddb-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.1
deleted file mode 100644
index b6533c17a0e2..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=alsa debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkcompactdisc-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.2 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.2
new file mode 100644
index 000000000000..34250ccddea6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for playing & ripping CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=alsa debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkcompactdisc-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.04.1 b/metadata/md5-cache/kde-apps/libkdcraw-18.04.1
deleted file mode 100644
index 6b3c738cde95..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-libs/libraw-0.16:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkdcraw-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.04.2 b/metadata/md5-cache/kde-apps/libkdcraw-18.04.2
new file mode 100644
index 000000000000..13678cf7f746
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-libs/libraw-0.16:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Digital camera raw image library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkdcraw-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.04.1 b/metadata/md5-cache/kde-apps/libkdegames-18.04.1
deleted file mode 100644
index 8c874dbc8f2d..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Base library common to many KDE games
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkdegames-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.04.2 b/metadata/md5-cache/kde-apps/libkdegames-18.04.2
new file mode 100644
index 000000000000..8c88bad5043c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Base library common to many KDE games
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkdegames-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.04.1 b/metadata/md5-cache/kde-apps/libkdepim-18.04.1
deleted file mode 100644
index f953ce6545d6..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-search-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkdepim-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.04.2 b/metadata/md5-cache/kde-apps/libkdepim-18.04.2
new file mode 100644
index 000000000000..53643b1316cb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkdepim-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.1
deleted file mode 100644
index 3fbe380283a5..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for reading/writing KVTML
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkeduvocdocument-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.2 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.2
new file mode 100644
index 000000000000..0f16a5aa0239
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for reading/writing KVTML
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkeduvocdocument-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.04.1 b/metadata/md5-cache/kde-apps/libkexiv2-18.04.1
deleted file mode 100644
index c9fd798428b2..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+xmp debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkexiv2-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.04.2 b/metadata/md5-cache/kde-apps/libkexiv2-18.04.2
new file mode 100644
index 000000000000..4848fda570a0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+xmp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkexiv2-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.04.1 b/metadata/md5-cache/kde-apps/libkgapi-18.04.1
deleted file mode 100644
index e2600499e690..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/libkgapi.git
-IUSE=nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkgapi-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.04.2 b/metadata/md5-cache/kde-apps/libkgapi-18.04.2
new file mode 100644
index 000000000000..b26344bd04c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing Google calendar and contact resources
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/libkgapi.git
+IUSE=nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkgapi-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.04.1 b/metadata/md5-cache/kde-apps/libkgeomap-18.04.1
deleted file mode 100644
index 0152d81b61fb..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.1:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
-EAPI=6
-HOMEPAGE=https://www.digikam.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.1:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkgeomap-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.04.2 b/metadata/md5-cache/kde-apps/libkgeomap-18.04.2
new file mode 100644
index 000000000000..2888df6905ca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgeomap-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.2:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
+EAPI=6
+HOMEPAGE=https://www.digikam.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.2:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkgeomap-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.04.1 b/metadata/md5-cache/kde-apps/libkipi-18.04.1
deleted file mode 100644
index 3631bf0647af..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkipi-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.04.2 b/metadata/md5-cache/kde-apps/libkipi-18.04.2
new file mode 100644
index 000000000000..ee9a4cd8e6e7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A library for image plugins accross KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5/32
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkipi-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.04.1 b/metadata/md5-cache/kde-apps/libkleo-18.04.1
deleted file mode 100644
index 8ab6e645dfdc..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for encryption handling
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkleo-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.04.2 b/metadata/md5-cache/kde-apps/libkleo-18.04.2
new file mode 100644
index 000000000000..53dc76cf8a0f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for encryption handling
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkleo-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.1 b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.1
deleted file mode 100644
index 4d58a607fb1b..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkmahjongg-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.2 b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.2
new file mode 100644
index 000000000000..76096d1579e3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkmahjongg-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.1 b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.1
deleted file mode 100644
index d4ff465fd402..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library to compare files and strings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libkomparediff2-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.2 b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.2
new file mode 100644
index 000000000000..28e5a0d26e89
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library to compare files and strings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkomparediff2-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libksane-18.04.1 b/metadata/md5-cache/kde-apps/libksane-18.04.1
deleted file mode 100644
index cb2632188497..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kwallet debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libksane-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=664e3e3594d4876781098b28c1af630a
diff --git a/metadata/md5-cache/kde-apps/libksane-18.04.2 b/metadata/md5-cache/kde-apps/libksane-18.04.2
new file mode 100644
index 000000000000..0e011a71c8ff
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=SANE Library interface based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kwallet debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libksane-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=664e3e3594d4876781098b28c1af630a
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.04.1 b/metadata/md5-cache/kde-apps/libksieve-18.04.1
deleted file mode 100644
index db42ddbf4465..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/libksieve-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.04.2 b/metadata/md5-cache/kde-apps/libksieve-18.04.2
new file mode 100644
index 000000000000..dccc487d4b65
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/libksieve-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.04.1 b/metadata/md5-cache/kde-apps/libktnef-18.04.1
deleted file mode 100644
index 1993185c2615..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling TNEF data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcalutils-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/ktnef-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.04.2 b/metadata/md5-cache/kde-apps/libktnef-18.04.2
new file mode 100644
index 000000000000..2de0a613c724
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling TNEF data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktnef-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.04.1 b/metadata/md5-cache/kde-apps/lokalize-18.04.1
deleted file mode 100644
index 11dc912741d9..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/lokalize https://l10n.kde.org/tools
-IUSE=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 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/lokalize-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a6fb43682a57a747af2678e0e1f3300
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.04.2 b/metadata/md5-cache/kde-apps/lokalize-18.04.2
new file mode 100644
index 000000000000..a82ad9cb3bff
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Applications 5 translation tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/lokalize https://l10n.kde.org/tools
+IUSE=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 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) 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 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/lokalize-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a6fb43682a57a747af2678e0e1f3300
diff --git a/metadata/md5-cache/kde-apps/lskat-18.04.1 b/metadata/md5-cache/kde-apps/lskat-18.04.1
deleted file mode 100644
index 29d95c5b083d..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Skat game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/lskat-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/lskat-18.04.2 b/metadata/md5-cache/kde-apps/lskat-18.04.2
new file mode 100644
index 000000000000..209c9069cb9e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Skat game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/lskat-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.04.1 b/metadata/md5-cache/kde-apps/mailcommon-18.04.1
deleted file mode 100644
index 4bd25f85516f..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common mail library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=kde-apps/messagelib-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/mailcommon-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.04.2 b/metadata/md5-cache/kde-apps/mailcommon-18.04.2
new file mode 100644
index 000000000000..cf6711182f4c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common mail library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/mailcommon-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.04.1 b/metadata/md5-cache/kde-apps/mailimporter-18.04.1
deleted file mode 100644
index 7e3b01d8e83f..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to import mail from various sources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/mailimporter-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.04.2 b/metadata/md5-cache/kde-apps/mailimporter-18.04.2
new file mode 100644
index 000000000000..ab489624243d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to import mail from various sources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/mailimporter-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/marble-18.04.1 b/metadata/md5-cache/kde-apps/marble-18.04.1
deleted file mode 100644
index eea205629498..000000000000
--- a/metadata/md5-cache/kde-apps/marble-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
-EAPI=6
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5/18.04
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/marble-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/marble-18.04.2 b/metadata/md5-cache/kde-apps/marble-18.04.2
new file mode 100644
index 000000000000..87b36d04676b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
+EAPI=6
+HOMEPAGE=https://marble.kde.org/
+IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5/18.04
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/marble-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.04.1 b/metadata/md5-cache/kde-apps/mbox-importer-18.04.1
deleted file mode 100644
index 33fe7a8c3a8e..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/mailimporter-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/mbox-importer-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.04.2 b/metadata/md5-cache/kde-apps/mbox-importer-18.04.2
new file mode 100644
index 000000000000..7dec679e19a0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Import mbox email archives from various sources into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/mbox-importer-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.04.1 b/metadata/md5-cache/kde-apps/messagelib-18.04.1
deleted file mode 100644
index a511857e1aaf..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmbox-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for messaging functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/grantleetheme-18.04.1:5 >=kde-apps/incidenceeditor-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kdepim-apps-libs-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kldap-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmbox-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libgravatar-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/libkleo-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/messagelib-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.04.2 b/metadata/md5-cache/kde-apps/messagelib-18.04.2
new file mode 100644
index 000000000000..22b3ea17c660
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmbox-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for messaging functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmbox-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/messagelib-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/minuet-18.04.1 b/metadata/md5-cache/kde-apps/minuet-18.04.1
deleted file mode 100644
index 643a39a721fd..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE Software for Music Education
-EAPI=6
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/minuet-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/minuet-18.04.2 b/metadata/md5-cache/kde-apps/minuet-18.04.2
new file mode 100644
index 000000000000..864b2a8dc6f1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE Software for Music Education
+EAPI=6
+HOMEPAGE=https://minuet.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/minuet-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/okular-18.04.1 b/metadata/md5-cache/kde-apps/okular-18.04.1
deleted file mode 100644
index 910c6711da7d..000000000000
--- a/metadata/md5-cache/kde-apps/okular-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.1:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
-IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.1:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.44.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/okular-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6dcb7fb101c93f990cc929dc1a5adb9
diff --git a/metadata/md5-cache/kde-apps/okular-18.04.2 b/metadata/md5-cache/kde-apps/okular-18.04.2
new file mode 100644
index 000000000000..17d88f8a664b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.2:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Universal document viewer based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
+IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.2:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.44.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/okular-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a6dcb7fb101c93f990cc929dc1a5adb9
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.04.1 b/metadata/md5-cache/kde-apps/palapeli-18.04.1
deleted file mode 100644
index ec0d43e96a18..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/palapeli/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/palapeli-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.04.2 b/metadata/md5-cache/kde-apps/palapeli-18.04.2
new file mode 100644
index 000000000000..edd0e9d7e11e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jigsaw puzzle game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/palapeli/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/palapeli-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/parley-18.04.1 b/metadata/md5-cache/kde-apps/parley-18.04.1
deleted file mode 100644
index 9b07ae6c8530..000000000000
--- a/metadata/md5-cache/kde-apps/parley-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/libkeduvocdocument-18.04.1:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/libkeduvocdocument-18.04.1:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.04.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/parley-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/parley-18.04.2 b/metadata/md5-cache/kde-apps/parley-18.04.2
new file mode 100644
index 000000000000..4584dbbbae30
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/libkeduvocdocument-18.04.2:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A vocabulary trainer to help you memorize things
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-apps/libkeduvocdocument-18.04.2:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/parley-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/picmi-18.04.1 b/metadata/md5-cache/kde-apps/picmi-18.04.1
deleted file mode 100644
index 5eee9836a69c..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Nonogram logic game by KDE
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=picmi
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.1:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/picmi-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/picmi-18.04.2 b/metadata/md5-cache/kde-apps/picmi-18.04.2
new file mode 100644
index 000000000000..864a5b15517a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Nonogram logic game by KDE
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=picmi
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/picmi-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.1
deleted file mode 100644
index be5826286564..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kidentitymanagement-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/kmime-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=kde-apps/mailcommon-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/pim-data-exporter-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d079eec90f0277247561f36175046cf0
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.2 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.2
new file mode 100644
index 000000000000..fd0c9092b7db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to backup and archive PIM data and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/pim-data-exporter-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d079eec90f0277247561f36175046cf0
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.1
deleted file mode 100644
index 364af8f13042..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/akonadi-mime-18.04.1:5 >=kde-apps/calendarsupport-18.04.1:5 >=kde-apps/kcalcore-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kmailtransport-18.04.1:5 >=kde-apps/libksieve-18.04.1:5 >=kde-apps/pimcommon-18.04.1:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/pim-sieve-editor-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.2 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.2
new file mode 100644
index 000000000000..b8c2fe36fb41
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for editing IMAP Sieve filters
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/pim-sieve-editor-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.04.1 b/metadata/md5-cache/kde-apps/pimcommon-18.04.1
deleted file mode 100644
index 1354104fa63b..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.44.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.04.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.1:5 >=kde-apps/akonadi-contacts-18.04.1:5 >=kde-apps/kcontacts-18.04.1:5 >=kde-apps/kimap-18.04.1:5 >=kde-apps/kpimtextedit-18.04.1:5 >=kde-apps/libkdepim-18.04.1:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/pimcommon-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca596193de7d85f965eb6c36048be753
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.04.2 b/metadata/md5-cache/kde-apps/pimcommon-18.04.2
new file mode 100644
index 000000000000..93af6dc8dde7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.44.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.04.2:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/pimcommon-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca596193de7d85f965eb6c36048be753
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.1
deleted file mode 100644
index a46f80f4f377..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
-RDEPEND=>=kde-apps/ktp-accounts-kcm-18.04.1 >=kde-apps/ktp-approver-18.04.1 >=kde-apps/ktp-auth-handler-18.04.1 >=kde-apps/ktp-common-internals-18.04.1 >=kde-apps/ktp-contact-list-18.04.1 >=kde-apps/ktp-contact-runner-18.04.1 >=kde-apps/ktp-desktop-applets-18.04.1 >=kde-apps/ktp-filetransfer-handler-18.04.1 >=kde-apps/ktp-kded-module-18.04.1 >=kde-apps/ktp-send-file-18.04.1 >=kde-apps/ktp-text-ui-18.04.1 gstreamer? ( >=kde-apps/ktp-call-ui-18.04.1 ) !kde-apps/plasma-telepathy-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.2 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.2
new file mode 100644
index 000000000000..2e392e94c3c3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Plasma Telepathy client
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
+RDEPEND=>=kde-apps/ktp-accounts-kcm-18.04.2 >=kde-apps/ktp-approver-18.04.2 >=kde-apps/ktp-auth-handler-18.04.2 >=kde-apps/ktp-common-internals-18.04.2 >=kde-apps/ktp-contact-list-18.04.2 >=kde-apps/ktp-contact-runner-18.04.2 >=kde-apps/ktp-desktop-applets-18.04.2 >=kde-apps/ktp-filetransfer-handler-18.04.2 >=kde-apps/ktp-kded-module-18.04.2 >=kde-apps/ktp-send-file-18.04.2 >=kde-apps/ktp-text-ui-18.04.2 gstreamer? ( >=kde-apps/ktp-call-ui-18.04.2 ) !kde-apps/plasma-telepathy-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	4ce79372b29a17b31866a72503108458	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/poxml-18.04.1 b/metadata/md5-cache/kde-apps/poxml-18.04.1
deleted file mode 100644
index 4875207a82c0..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/poxml-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/poxml-18.04.2 b/metadata/md5-cache/kde-apps/poxml-18.04.2
new file mode 100644
index 000000000000..41e382e76f26
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/poxml-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.04.1 b/metadata/md5-cache/kde-apps/print-manager-18.04.1
deleted file mode 100644
index 7606566596ca..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+gtk debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups >=kde-plasma/kde-cli-tools-5.11.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/print-manager-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.04.2 b/metadata/md5-cache/kde-apps/print-manager-18.04.2
new file mode 100644
index 000000000000..b74aa205436f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Manage print jobs and printers in Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+gtk debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups >=kde-plasma/kde-cli-tools-5.11.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/print-manager-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/rocs-18.04.1 b/metadata/md5-cache/kde-apps/rocs-18.04.1
deleted file mode 100644
index 954a240943dc..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-18.04.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface to work with Graph Theory
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/rocs-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/rocs-18.04.2 b/metadata/md5-cache/kde-apps/rocs-18.04.2
new file mode 100644
index 000000000000..807419426046
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-18.04.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface to work with Graph Theory
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/rocs-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.1
deleted file mode 100644
index c6e51a41fbef..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet extension for signond
-EAPI=6
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/signon-kwallet-extension-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.2
new file mode 100644
index 000000000000..5e2ffdcae3f3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KWallet extension for signond
+EAPI=6
+HOMEPAGE=https://01.org/gsso/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/signon-kwallet-extension-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.1 b/metadata/md5-cache/kde-apps/spectacle-18.04.1
deleted file mode 100644
index 0d3168fb5b1a..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.1:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screenshot capture utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kipi share debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.1:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/spectacle-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11ecff6534c5e15b7f408d050ad7694c
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.2 b/metadata/md5-cache/kde-apps/spectacle-18.04.2
new file mode 100644
index 000000000000..364575a85b41
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.2:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screenshot capture utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kipi share debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.2:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/spectacle-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=11ecff6534c5e15b7f408d050ad7694c
diff --git a/metadata/md5-cache/kde-apps/step-18.04.1 b/metadata/md5-cache/kde-apps/step-18.04.1
deleted file mode 100644
index 95edb145d976..000000000000
--- a/metadata/md5-cache/kde-apps/step-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interactive physics simulator
-EAPI=6
-HOMEPAGE=https://edu.kde.org/step
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/step-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3daf02a171516c0be2aa1791d7e620d
diff --git a/metadata/md5-cache/kde-apps/step-18.04.2 b/metadata/md5-cache/kde-apps/step-18.04.2
new file mode 100644
index 000000000000..458bdd300986
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interactive physics simulator
+EAPI=6
+HOMEPAGE=https://edu.kde.org/step
+IUSE=+gsl nls +qalculate debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/step-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3daf02a171516c0be2aa1791d7e620d
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.04.1 b/metadata/md5-cache/kde-apps/svgpart-18.04.1
deleted file mode 100644
index 592a9bb2eab8..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/svgpart-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.04.2 b/metadata/md5-cache/kde-apps/svgpart-18.04.2
new file mode 100644
index 000000000000..f8b130c1a97b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kpart for viewing SVGs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/svgpart-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.04.1 b/metadata/md5-cache/kde-apps/sweeper-18.04.1
deleted file mode 100644
index 8249a924c2fc..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/sweeper-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.04.2 b/metadata/md5-cache/kde-apps/sweeper-18.04.2
new file mode 100644
index 000000000000..a614d37d771e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/sweeper-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/syndication-18.04.1 b/metadata/md5-cache/kde-apps/syndication-18.04.1
deleted file mode 100644
index b1e6b1654426..000000000000
--- a/metadata/md5-cache/kde-apps/syndication-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/syndication-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/syndication-18.04.2 b/metadata/md5-cache/kde-apps/syndication-18.04.2
new file mode 100644
index 000000000000..c7a7a2405b4a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/syndication-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/syndication-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.04.1 b/metadata/md5-cache/kde-apps/thumbnailers-18.04.1
deleted file mode 100644
index e1feefba2013..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.1:5 >=kde-apps/libkexiv2-18.04.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=raw debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.1:5 >=kde-apps/libkexiv2-18.04.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/kdegraphics-thumbnailers-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.04.2 b/metadata/md5-cache/kde-apps/thumbnailers-18.04.2
new file mode 100644
index 000000000000..29a0ce9e4787
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.2:5 >=kde-apps/libkexiv2-18.04.2:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=raw debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.2:5 >=kde-apps/libkexiv2-18.04.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdegraphics-thumbnailers-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.04.1 b/metadata/md5-cache/kde-apps/umbrello-18.04.1
deleted file mode 100644
index 35b055917046..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE UML Modeller
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/umbrello-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.04.2 b/metadata/md5-cache/kde-apps/umbrello-18.04.2
new file mode 100644
index 000000000000..9e13cfa3eca2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE UML Modeller
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/umbrello-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.1
deleted file mode 100644
index 033ef59eb673..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.1/src/zeroconf-ioslave-18.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.2 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.2
new file mode 100644
index 000000000000..432b8ffecf68
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.2/src/zeroconf-ioslave-18.04.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index fbae57101a24..56c5b4bb6189 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0
index 306802677fed..16d4449003ee 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0
@@ -9,4 +9,4 @@ LICENSE=LGPL-3
 SLOT=5/5.46
 SRC_URI=mirror://kde/stable/frameworks/5.46/breeze-icons-5.46.0.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a65c889131faef7c026bac6f66f0f86e
+_md5_=ea6334f0f7c09082d60e2d2abc43d2f2
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0
index 16c7fe102515..41983b0594b3 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0
@@ -9,4 +9,4 @@ LICENSE=LGPL-3
 SLOT=5/5.46
 SRC_URI=mirror://kde/stable/frameworks/5.46/breeze-icons-5.46.0.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b671feb97e59218633840d7c85ec2cb
+_md5_=c3fb699ecfc8263366a5bd7df11f76c0
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0
index 06f8ebbd3c4d..04b3af0f185e 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-qt/qtcore-5.9.4:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-en
 SLOT=5/5.46
 SRC_URI=mirror://kde/stable/frameworks/5.46/kcoreaddons-5.46.0.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3ba2cc372c57a11be136c3a842492075
+_md5_=66aedfa6b90dfbfb751df16593bef757
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1
new file mode 100644
index 000000000000..e0e7d6e30369
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/sonnet-5.46:5 >=kde-frameworks/syntax-highlighting-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.9.4:5 test? ( >=kde-frameworks/kservice-5.46:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46:5 doc? ( >=dev-qt/qthelp-5.9.4:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing a full text editor component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-frameworks/kcompletion-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kguiaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-frameworks/kiconthemes-5.46:5 >=kde-frameworks/kio-5.46:5 >=kde-frameworks/kitemviews-5.46:5 >=kde-frameworks/kjobwidgets-5.46:5 >=kde-frameworks/kparts-5.46:5 >=kde-frameworks/ktextwidgets-5.46:5 >=kde-frameworks/kwidgetsaddons-5.46:5 >=kde-frameworks/kxmlgui-5.46:5 >=kde-frameworks/sonnet-5.46:5 >=kde-frameworks/syntax-highlighting-5.46:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
+RESTRICT=test
+SLOT=5/5.46
+SRC_URI=mirror://kde/stable/frameworks/5.46/ktexteditor-5.46.0.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c728a71dcad4203c6242d3d42fb7b66
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0
index 73e74d3d1c02..e99f16964221 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-en
 SLOT=5/5.46
 SRC_URI=mirror://kde/stable/frameworks/5.46/kwidgetsaddons-5.46.0.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e7545ad957b5c067fcddf25a3eb9915
+_md5_=6081a7d623bdcf24f93f175f8b10a66e
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0
index 2f546baf92e2..f77b9dde238d 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46:5 >
 SLOT=5/5.46
 SRC_URI=mirror://kde/stable/frameworks/5.46/kxmlgui-5.46.0.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fae82fca6ec0d524a047b813152be6cf
+_md5_=8dd673d81fdf9cff1e16ba011c108f8b
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index b809c6038e15..173c71d7ea00 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/kdeconnect-1.2.1-r2 b/metadata/md5-cache/kde-misc/kdeconnect-1.2.1-r2
deleted file mode 100644
index c80417bcfd88..000000000000
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.2.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst app? ( >=kde-frameworks/kdeclarative-5.42.0:5 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Adds communication between KDE Plasma and your smartphone
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://community.kde.org/KDEConnect
-IUSE=app wayland debug +handbook test selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst app? ( >=kde-frameworks/kdeclarative-5.42.0:5 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) app? ( >=kde-frameworks/kirigami-5.42.0:5 ) wayland? ( >=kde-plasma/kwin-5.11.5:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-kdeconnect ) >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdeconnect/1.2.1/src/kdeconnect-kde-v1.2.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8258af9b73e893bc12d5b71924f8d03
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.3.0 b/metadata/md5-cache/kde-misc/kdeconnect-1.3.0
deleted file mode 100644
index 899576ecd80b..000000000000
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst app? ( >=kde-frameworks/kdeclarative-5.42.0:5 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Adds communication between KDE Plasma and your smartphone
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://community.kde.org/KDEConnect
-IUSE=app wayland debug +handbook test selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst app? ( >=kde-frameworks/kdeclarative-5.42.0:5 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) app? ( >=kde-frameworks/kirigami-5.42.0:5 ) wayland? ( >=kde-plasma/kwin-5.11.5:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-kdeconnect ) >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdeconnect/1.3.0/src/kdeconnect-kde-1.3.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96cf0c461f901b095edc0434555cf4da
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.3.1 b/metadata/md5-cache/kde-misc/kdeconnect-1.3.1
index 65ab50f31a86..f78f2370d6e4 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.3.1
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Adds communication between KDE Plasma and your smartphone
 EAPI=6
 HOMEPAGE=https://www.kde.org/ https://community.kde.org/KDEConnect
 IUSE=app mousepad wayland debug +handbook test selinux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kdbusaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.43.0:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.43.0:5 ) app? ( >=kde-frameworks/kirigami-5.43.0:5 ) wayland? ( >=kde-plasma/kwin-5.11.5:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-kdeconnect ) >=dev-qt/qtcore-5.9.4:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdeconnect/1.3.1/src/kdeconnect-kde-1.3.1.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a576511edba2fe69d6696076bfe78a1d
+_md5_=4f00412fafeec2a36ed119ef43ced77d
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.1.2 b/metadata/md5-cache/kde-misc/kdirstat-3.1.2
deleted file mode 100644
index 3601a80fa01a..000000000000
--- a/metadata/md5-cache/kde-misc/kdirstat-3.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=GUI equivalent to the du command based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://bitbucket.org/jeromerobert/k4dirstat/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.1.2.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=302bc7103360e7d387d38ad6fcf8e43b
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.1.3 b/metadata/md5-cache/kde-misc/kdirstat-3.1.3
index 6c8d6862c67f..35b3d04817df 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.1.3
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=GUI equivalent to the du command based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://bitbucket.org/jeromerobert/k4dirstat/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.1.3.tar.bz2
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6c1be369a68fabead30854db766014b5
+_md5_=0fe247d1b7bc6ce9f946a58d58fbf2e2
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2
index adbd013ee549..290e8c03c992 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=KPart for rendering Markdown content
 EAPI=6
 HOMEPAGE=https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/
 IUSE=webkit debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=!webkit? ( BSD ) LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmarkdownwebview/0.5.2/src/kmarkdownwebview-0.5.2.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf0efb0fadbf910899d63d911342c972
+_md5_=f515837293d08233052ce0455d764d57
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
new file mode 100644
index 000000000000..7d1bae5cc47b
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KPart for rendering Markdown content
+EAPI=6
+HOMEPAGE=https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/
+IUSE=webkit debug
+KEYWORDS=~amd64
+LICENSE=!webkit? ( BSD ) LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kmarkdownwebview/0.5.3/src/kmarkdownwebview-0.5.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bf0efb0fadbf910899d63d911342c972
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.0.1 b/metadata/md5-cache/kde-misc/skanlite-2.0.1
deleted file mode 100644
index 486cc8e1f85a..000000000000
--- a/metadata/md5-cache/kde-misc/skanlite-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libksane-14.12.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libpng:0= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE image scanning application
-EAPI=6
-HOMEPAGE=http://www.kde.org/applications/graphics/skanlite/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libksane-14.12.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/skanlite/2.0/skanlite-2.0.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b05897343ce28a222251698a0d0d16d9
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1 b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
index 7b233996051e..1f433d0c8217 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
+++ b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=KDE image scanning application
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/graphics/skanlite
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-apps/libksane-14.12.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.1/skanlite-2.1.0.1.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2244e5702ba13ace2570f3c2efc65fed
+_md5_=15f11a9cbc29f2e9e6a52e991fa0973c
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 0c870c2a6a67..7610b25fc828 100644
--- a/metadata/md5-cache/lxde-base/Manifest.gz
+++ b/metadata/md5-cache/lxde-base/Manifest.gz
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.9.2 b/metadata/md5-cache/lxde-base/lxpanel-0.9.2
index 99a11e8dd6f3..d4a068cae7f8 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.9.2
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/keybinder:0= x11-libs/gtk+:2 >=x11-libs/libfm-1.2.0[gtk] x11-libs/libwnck:1 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxpanel-0.9.2.tar.xz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=de944deba055263433f936ca5cab319d
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.9.3 b/metadata/md5-cache/lxde-base/lxpanel-0.9.3
index b47920f862fc..1977aa31ea29 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.9.3
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/keybinder:0= x11-libs/gtk+:2 >=x11-libs/libfm-1.2.0[gtk] x11-libs/libwnck:1 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxpanel-0.9.3.tar.xz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=18deaa446ad3602003666dbaf642a7ef
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.9.3-r1 b/metadata/md5-cache/lxde-base/lxpanel-0.9.3-r1
index f06f35914810..d31fc08a5352 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.9.3-r1
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.9.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/keybinder:0= x11-libs/gtk+:2 >=x11-libs/libfm-1.2.0[gtk] x11-libs/libwnck:1 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxpanel-0.9.3.tar.xz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=6ecb837b2de7694f2451056b82bdd0fe
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 3245951f3fed..98243aa43ac5 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/evolution-3.22.4 b/metadata/md5-cache/mail-client/evolution-3.22.4
index 991755912dc1..b6e0fd7f3a1c 100644
--- a/metadata/md5-cache/mail-client/evolution-3.22.4
+++ b/metadata/md5-cache/mail-client/evolution-3.22.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.22.4:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.22/evolution-3.22.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=27899c32a12d511fa39cd1e654835513
diff --git a/metadata/md5-cache/mail-client/evolution-3.24.6 b/metadata/md5-cache/mail-client/evolution-3.24.6
index 3bac7a97f98f..155fe82474f9 100644
--- a/metadata/md5-cache/mail-client/evolution-3.24.6
+++ b/metadata/md5-cache/mail-client/evolution-3.24.6
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.24.6:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.24/evolution-3.24.6.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ce8d96b8f262aa1c00d1bbeeda80ef5b
diff --git a/metadata/md5-cache/mail-client/kube-0.5.0-r1 b/metadata/md5-cache/mail-client/kube-0.5.0-r1
deleted file mode 100644
index 64e907243ad5..000000000000
--- a/metadata/md5-cache/mail-client/kube-0.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/breeze-icons-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtdeclarative-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtquickcontrols-5.9:5 >=dev-qt/qtquickcontrols2-5.9:5 >=dev-qt/qttest-5.9:5 >=dev-qt/qtwebengine-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync >=dev-libs/sink-0.5.0 test? ( >=dev-qt/qttest-5.9:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 test? ( >=dev-qt/qttest-5.9:5 ) >=dev-qt/qtcore-5.9:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A mail client by KDE
-EAPI=6
-HOMEPAGE=https://kube.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/breeze-icons-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtdeclarative-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtquickcontrols-5.9:5 >=dev-qt/qtquickcontrols2-5.9:5 >=dev-qt/qttest-5.9:5 >=dev-qt/qtwebengine-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync >=dev-libs/sink-0.5.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9:5
-RESTRICT=test
-SLOT=5
-SRC_URI=https://github.com/KDE/kube/archive/v0.5.0.tar.gz -> kube-0.5.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27c48bf64b7f70c6003e05bb4fe71d5f
diff --git a/metadata/md5-cache/mail-client/kube-0.5.0-r2 b/metadata/md5-cache/mail-client/kube-0.5.0-r2
new file mode 100644
index 000000000000..01151d1f274e
--- /dev/null
+++ b/metadata/md5-cache/mail-client/kube-0.5.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/breeze-icons-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync >=dev-libs/sink-0.5.0 test? ( >=dev-qt/qttest-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A mail client by KDE
+EAPI=6
+HOMEPAGE=https://kube.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/breeze-icons-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync >=dev-libs/sink-0.5.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=https://github.com/KDE/kube/archive/v0.5.0.tar.gz -> kube-0.5.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e13a823fd983109b3cce65f5ffa689d5
diff --git a/metadata/md5-cache/mail-client/neomutt-20171208 b/metadata/md5-cache/mail-client/neomutt-20171208
deleted file mode 100644
index c2b4a97640c9..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20171208
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171208.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=784242e02ea228d211f462ea78474609
diff --git a/metadata/md5-cache/mail-client/neomutt-20171215 b/metadata/md5-cache/mail-client/neomutt-20171215
deleted file mode 100644
index 7e734ae79754..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20171215
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171215.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=67e208e5346e40c65e647a2ac5a6f012
diff --git a/metadata/md5-cache/mail-client/neomutt-20171215-r1 b/metadata/md5-cache/mail-client/neomutt-20171215-r1
deleted file mode 100644
index bd3e65822e5c..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20171215-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171215.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e45c2c5e1b3e18839ea5e45fdc079a7
diff --git a/metadata/md5-cache/mail-client/neomutt-20171215-r2 b/metadata/md5-cache/mail-client/neomutt-20171215-r2
deleted file mode 100644
index 41b6e36da0b3..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20171215-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171215.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2fc10e2eb1698cf974cac6505bb871c
diff --git a/metadata/md5-cache/mail-client/neomutt-20180512 b/metadata/md5-cache/mail-client/neomutt-20180512
new file mode 100644
index 000000000000..f1e60253edc4
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20180512
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=https://neomutt.org/
+IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20180512.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dfd03257f24b99a41a6cf88be7dfc609
diff --git a/metadata/md5-cache/mail-client/neomutt-99999999 b/metadata/md5-cache/mail-client/neomutt-99999999
index 9161f8173a9f..50ce70a575a6 100644
--- a/metadata/md5-cache/mail-client/neomutt-99999999
+++ b/metadata/md5-cache/mail-client/neomutt-99999999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install postinst unpack
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=dev-vcs/git-1.8.2.1
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
+HOMEPAGE=https://neomutt.org/
+IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl tokyocabinet
 LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2fc10e2eb1698cf974cac6505bb871c
+_md5_=01dea4741716cd1be4de6949783412c4
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 84f99eee7c95..d18641c201df 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/assp-1.9.4.7 b/metadata/md5-cache/mail-filter/assp-1.9.4.7
deleted file mode 100644
index 4167e222f965..000000000000
--- a/metadata/md5-cache/mail-filter/assp-1.9.4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Anti-Spam SMTP Proxy written in Perl
-EAPI=0
-HOMEPAGE=http://assp.sourceforge.net/
-IUSE=ipv6 ldap sasl spf srs ssl syslog
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( virtual/perl-Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/assp/ASSP_1.9.4.7-Install.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=238d53bc38c15557c2df2c5697fa3d0f
diff --git a/metadata/md5-cache/mail-filter/assp-1.9.4.8 b/metadata/md5-cache/mail-filter/assp-1.9.4.8
deleted file mode 100644
index e83c6be55918..000000000000
--- a/metadata/md5-cache/mail-filter/assp-1.9.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Anti-Spam SMTP Proxy written in Perl
-EAPI=0
-HOMEPAGE=http://assp.sourceforge.net/
-IUSE=ipv6 ldap sasl spf srs ssl syslog
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( virtual/perl-Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/assp/ASSP_1.9.4.8-Install.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=238d53bc38c15557c2df2c5697fa3d0f
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 03d6aaa0889b..0c9a412b94e3 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/mini-qmail-1.05 b/metadata/md5-cache/mail-mta/mini-qmail-1.05
deleted file mode 100644
index fc4c99fe1d68..000000000000
--- a/metadata/md5-cache/mail-mta/mini-qmail-1.05
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=sys-apps/groff >=sys-apps/sed-4
-DESCRIPTION=a small null client that forwards mail via QMQP to a full qmail server
-EAPI=0
-HOMEPAGE=http://www.qmail.org/ http://cr.yp.to/qmail/mini.html
-KEYWORDS=amd64 arm hppa ~mips ppc x86
-LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd
-SLOT=0
-SRC_URI=mirror://qmail/netqmail-1.05.tar.gz http://www.din.or.jp/~ushijima/mini-qmail-kit/mini-qmail-kit-0.52.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fce7b4a2cec1ea20c6860754e222d13
diff --git a/metadata/md5-cache/mail-mta/mini-qmail-1.05-r1 b/metadata/md5-cache/mail-mta/mini-qmail-1.05-r1
deleted file mode 100644
index 9be7188b9654..000000000000
--- a/metadata/md5-cache/mail-mta/mini-qmail-1.05-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=sys-apps/groff >=sys-apps/sed-4
-DESCRIPTION=a small null client that forwards mail via QMQP to a full qmail server
-EAPI=0
-HOMEPAGE=http://www.qmail.org/ http://cr.yp.to/qmail/mini.html
-KEYWORDS=amd64 arm hppa ~mips ppc x86
-LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd
-SLOT=0
-SRC_URI=mirror://qmail/netqmail-1.05.tar.gz http://www.din.or.jp/~ushijima/mini-qmail-kit/mini-qmail-kit-0.52.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=94a8f8f2828746accbb3cbd1567416c4
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index c420531236e2..1ebed6ce5eff 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.12.0-r1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.12.0-r1
index 42c2e126b884..7c22451d4f50 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.12.0-r1
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-session-manager-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-screensaver-1.12.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=78879a2a454d0e85ecdffaa56552bf46
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.14.1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.14.1
index eacdac84f9bf..f1c16b961068 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.14.1
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.14.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=mate-base/mate-session-manager-1.6
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-screensaver-1.14.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c26175736477020a8a2e9b6fea7306b0
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1
index 9a01485111e1..66e3fda848fd 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=mate-base/mate-session-manager-1.6
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-screensaver-1.16.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c26175736477020a8a2e9b6fea7306b0
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2 b/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2
index 1ad25c0c870c..fff1b7268058 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.10.0 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 >=x11-libs/gtk+-3.14:3 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=mate-base/mate-session-manager-1.6
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-screensaver-1.18.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b5648d52bcd88b15592675706a38f97c
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index ce1972e8f552..f3f4e19273d6 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
index aac7a7a584e4..f28ba60045d5 100644
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
@@ -3,9 +3,9 @@ DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 >=app-portage/elt-p
 DESCRIPTION=X.Org font aliases
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.3.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=96378354bc95181069dc4a3051d9b80c
+_md5_=40ffa8893c8e6ada56012f7010dd9add
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.1 b/metadata/md5-cache/media-fonts/font-util-1.3.1
index a69ab8f27893..3cbef47ee981 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.3.1
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.1
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=X.Org font utilities
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-util-1.3.1.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=868e63d4109730fff9f7ff3238e03688
+_md5_=591d6a7cf866dec9e6f9c6f4af4697f0
diff --git a/metadata/md5-cache/media-fonts/sil-abyssinica-1.500 b/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
index 203932744d2f..a1f53b7fdc79 100644
--- a/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
+++ b/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
@@ -4,9 +4,9 @@ DESCRIPTION=SIL Opentype Unicode fonts for Ethiopic languages
 EAPI=6
 HOMEPAGE=https://software.sil.org/abyssinica
 IUSE=doc X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-1.500.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfe5fef5e9ed5b61150865f3e643fc03
+_md5_=f54c571dcd79370d6858c8bf5429890d
diff --git a/metadata/md5-cache/media-fonts/sil-arabicfonts-2.100 b/metadata/md5-cache/media-fonts/sil-arabicfonts-2.100
index 73e1237201b8..2b76fa5abb3e 100644
--- a/metadata/md5-cache/media-fonts/sil-arabicfonts-2.100
+++ b/metadata/md5-cache/media-fonts/sil-arabicfonts-2.100
@@ -4,9 +4,9 @@ DESCRIPTION=SIL Opentype Unicode fonts for Arabic Languages
 EAPI=6
 HOMEPAGE=http://scripts.sil.org/ArabicFonts
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/scheherazade/Scheherazade-2.100.zip https://software.sil.org/downloads/r/lateef/LateefGR-1.200.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ee89ef334953c6580521cbcc7b5efc0
+_md5_=753c6b58fbdb72c2d0614add09c60081
diff --git a/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46 b/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
index 43acea72f79c..f00dd2ea70fa 100644
--- a/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
+++ b/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-font-exception
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/wqy/wqy-zenhei-snapshot/0.9.46-May/wqy-zenhei-0.9.46-May.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68ee7a97820282b8ee0b2777bf80fb2e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index dd950bd3c77e..e1106da2ee91 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/darktable-2.4.1 b/metadata/md5-cache/media-gfx/darktable-2.4.1
deleted file mode 100644
index efbd523e7b45..000000000000
--- a/metadata/md5-cache/media-gfx/darktable-2.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
-DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A virtual lighttable and darkroom for photographers
-EAPI=6
-HOMEPAGE=https://www.darktable.org/
-IUSE=colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-REQUIRED_USE=cpu_flags_x86_sse3
-SLOT=0
-SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.1/darktable-2.4.1.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe1d726f88635cdd8a671df6e594ab84
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.2 b/metadata/md5-cache/media-gfx/darktable-2.4.2
deleted file mode 100644
index 62fbd43a3313..000000000000
--- a/metadata/md5-cache/media-gfx/darktable-2.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
-DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A virtual lighttable and darkroom for photographers
-EAPI=6
-HOMEPAGE=https://www.darktable.org/
-IUSE=colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-REQUIRED_USE=cpu_flags_x86_sse3
-SLOT=0
-SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.2/darktable-2.4.2.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.4.0/darktable-usermanual.pdf -> darktable-usermanual-2.4.0.pdf )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=427b4ae3b313c363312118f9c8218068
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.4 b/metadata/md5-cache/media-gfx/darktable-2.4.4
new file mode 100644
index 000000000000..09a3a5410d34
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/darktable-2.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
+DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A virtual lighttable and darkroom for photographers
+EAPI=6
+HOMEPAGE=https://www.darktable.org/
+IUSE=colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 CC-BY-3.0
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+REQUIRED_USE=cpu_flags_x86_sse3
+SLOT=0
+SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.4/darktable-2.4.4.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.4.0/darktable-usermanual.pdf -> darktable-usermanual-2.4.0.pdf )
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=427b4ae3b313c363312118f9c8218068
diff --git a/metadata/md5-cache/media-gfx/dcraw-9.27.0 b/metadata/md5-cache/media-gfx/dcraw-9.27.0
index 69105934ecb6..ace164aeb91e 100644
--- a/metadata/md5-cache/media-gfx/dcraw-9.27.0
+++ b/metadata/md5-cache/media-gfx/dcraw-9.27.0
@@ -9,5 +9,5 @@ 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	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33beb6908515848105f28fa01733463e
diff --git a/metadata/md5-cache/media-gfx/enblend-4.1.3-r1 b/metadata/md5-cache/media-gfx/enblend-4.1.3-r1
deleted file mode 100644
index f93cb5a4e5de..000000000000
--- a/metadata/md5-cache/media-gfx/enblend-4.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.31.0:= media-libs/glew >=media-libs/lcms-2.5:2 >=media-libs/libpng-1.2.43:0= >=media-libs/openexr-1.0:= media-libs/plotutils[X] media-libs/tiff:= >=media-libs/vigra-1.8.0[openexr] sci-libs/gsl:= virtual/jpeg:0= debug? ( dev-libs/dmalloc ) gpu? ( media-libs/freeglut ) media-gfx/imagemagick sys-apps/help2man virtual/pkgconfig doc? ( media-gfx/transfig sci-visualization/gnuplot[gd] virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Image Blending with Multiresolution Splines
-EAPI=5
-HOMEPAGE=http://enblend.sourceforge.net/
-IUSE=debug doc gpu image-cache openmp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 VIGRA
-RDEPEND=>=dev-libs/boost-1.31.0:= media-libs/glew >=media-libs/lcms-2.5:2 >=media-libs/libpng-1.2.43:0= >=media-libs/openexr-1.0:= media-libs/plotutils[X] media-libs/tiff:= >=media-libs/vigra-1.8.0[openexr] sci-libs/gsl:= virtual/jpeg:0= debug? ( dev-libs/dmalloc ) gpu? ( media-libs/freeglut )
-REQUIRED_USE=openmp? ( !image-cache )
-SLOT=0
-SRC_URI=mirror://sourceforge/enblend/enblend-enfuse-4.1.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fb8f036f757c8f1c8678023bb5a11877
diff --git a/metadata/md5-cache/media-gfx/enblend-4.1.3-r2 b/metadata/md5-cache/media-gfx/enblend-4.1.3-r2
deleted file mode 100644
index d86def7369dc..000000000000
--- a/metadata/md5-cache/media-gfx/enblend-4.1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= media-libs/lcms:2 media-libs/openexr:= media-libs/tiff:= media-libs/vigra[openexr] sci-libs/gsl:= debug? ( dev-libs/dmalloc ) gpu? ( media-libs/freeglut media-libs/glew:* virtual/glu virtual/opengl ) media-libs/libpng:0 sys-apps/help2man virtual/jpeg:0 virtual/pkgconfig doc? ( media-gfx/transfig sci-visualization/gnuplot[gd] virtual/imagemagick-tools virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Image Blending with Multiresolution Splines
-EAPI=6
-HOMEPAGE=http://enblend.sourceforge.net/
-IUSE=debug doc gpu openmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 VIGRA
-RDEPEND=dev-libs/boost:= media-libs/lcms:2 media-libs/openexr:= media-libs/tiff:= media-libs/vigra[openexr] sci-libs/gsl:= debug? ( dev-libs/dmalloc ) gpu? ( media-libs/freeglut media-libs/glew:* virtual/glu virtual/opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/enblend/enblend-enfuse-4.1.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ecc3700342625242f00c8feb4226aa8
diff --git a/metadata/md5-cache/media-gfx/feh-2.26.3 b/metadata/md5-cache/media-gfx/feh-2.26.3
new file mode 100644
index 000000000000..9f2adcacc30d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/feh-2.26.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command ) >=sys-apps/sed-4
+DESCRIPTION=A fast, lightweight imageviewer using imlib2
+EAPI=6
+HOMEPAGE=https://feh.finalrewind.org/
+IUSE=debug curl exif test xinerama
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=feh
+RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
+SLOT=0
+SRC_URI=https://feh.finalrewind.org/feh-2.26.3.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d5a25568585bce010cae28fd29a5096
diff --git a/metadata/md5-cache/media-gfx/freepv-0.3.0-r4 b/metadata/md5-cache/media-gfx/freepv-0.3.0-r4
deleted file mode 100644
index 88cb85e25fcc..000000000000
--- a/metadata/md5-cache/media-gfx/freepv-0.3.0-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 media-libs/libpng:0= media-libs/freeglut sys-libs/zlib virtual/jpeg x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)
-EAPI=5
-HOMEPAGE=http://freepv.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 media-libs/libpng:0= media-libs/freeglut sys-libs/zlib virtual/jpeg x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=mirror://sourceforge/freepv/freepv-0.3.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4ac2ce148301a3c1e2d100434ef11ba
diff --git a/metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0 b/metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0
index 0f0c04f27819..6e5aeddf7ed5 100644
--- a/metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0
+++ b/metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.35.1:2[dbus] >=media-libs/libcanberra-0.26-r2[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.0.3:3 x11-libs/libX11 x11-libs/libXext >=gnome-base/gsettings-desktop-schemas-0.1.0 !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=251aaabfa3531cfcc5f59b2a9755d9ae
diff --git a/metadata/md5-cache/media-gfx/ipe-7.1.2 b/metadata/md5-cache/media-gfx/ipe-7.1.2
deleted file mode 100644
index f4056a1f56e4..000000000000
--- a/metadata/md5-cache/media-gfx/ipe-7.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=app-text/texlive-core dev-lang/lua media-libs/freetype:2 x11-libs/cairo dev-qt/qtcore:4 dev-qt/qtgui:4 virtual/pkgconfig
-DESCRIPTION=Drawing editor for creating figures in PDF or PS formats
-EAPI=4
-HOMEPAGE=http://ipe7.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/texlive-core dev-lang/lua media-libs/freetype:2 x11-libs/cairo dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/ipe7/ipe/7.1.0/ipe-7.1.2-src.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0886ef0c4b7e9991ffd779bcfaa0c61d
diff --git a/metadata/md5-cache/media-gfx/ipe-7.1.3 b/metadata/md5-cache/media-gfx/ipe-7.1.3
deleted file mode 100644
index d1418acda48c..000000000000
--- a/metadata/md5-cache/media-gfx/ipe-7.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=app-text/texlive-core dev-lang/lua media-libs/freetype:2 x11-libs/cairo dev-qt/qtcore:4 dev-qt/qtgui:4 virtual/pkgconfig
-DESCRIPTION=Drawing editor for creating figures in PDF or PS formats
-EAPI=5
-HOMEPAGE=http://ipe7.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/texlive-core dev-lang/lua media-libs/freetype:2 x11-libs/cairo dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/ipe7/ipe/7.1.0/ipe-7.1.3-src.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56f0287a252564ec22fb18e5ceec9466
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.3-r2 b/metadata/md5-cache/media-gfx/librecad-2.1.3-r2
index f8c808330b6e..e5425851a249 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.1.3-r2
+++ b/metadata/md5-cache/media-gfx/librecad-2.1.3-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
 DESCRIPTION=Generic 2D CAD program
 EAPI=5
-HOMEPAGE=http://www.librecad.org/
+HOMEPAGE=https://www.librecad.org/
 IUSE=3d debug doc tools
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/
 SLOT=0
 SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.zip -> librecad-2.1.3.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e65756bed736b8c85ad140a6c86da43
+_md5_=cc6b3c8b21b337466e306eb58abf9d42
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.3-r3 b/metadata/md5-cache/media-gfx/librecad-2.1.3-r3
index ea5a70d3e6b5..bc938caed62d 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.1.3-r3
+++ b/metadata/md5-cache/media-gfx/librecad-2.1.3-r3
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
 DESCRIPTION=Generic 2D CAD program
 EAPI=5
-HOMEPAGE=http://www.librecad.org/
+HOMEPAGE=https://www.librecad.org/
 IUSE=3d debug doc tools
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/
 SLOT=0
 SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.zip -> librecad-2.1.3.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=734470f13ebbb7aade088b37b406fe52
+_md5_=7df53a78037128b99c2e4cd351c8bb06
diff --git a/metadata/md5-cache/media-gfx/librecad-9999 b/metadata/md5-cache/media-gfx/librecad-9999
index 5b444c9bb5d8..877df3692cd9 100644
--- a/metadata/md5-cache/media-gfx/librecad-9999
+++ b/metadata/md5-cache/media-gfx/librecad-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare unpack
 DEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Generic 2D CAD program
 EAPI=5
-HOMEPAGE=http://www.librecad.org/
+HOMEPAGE=https://www.librecad.org/
 IUSE=3d debug doc tools
 LICENSE=GPL-2
 RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1ea29dc9c64481f54c38abfa4414014
+_md5_=aa99decf018bbeaec4e73de32ad66785
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1 b/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1
deleted file mode 100644
index c1207375078e..000000000000
--- a/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebengine:5 >=media-gfx/exiv2-0.14:0= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libraw-0.13.4:= media-libs/ilmbase:= >=media-libs/openexr-1.2.2-r2:= >=media-libs/tiff-3.8.2-r2:0 sci-libs/fftw:3.0[threads] fits? ( sci-libs/cfitsio ) sci-libs/gsl virtual/jpeg:0 dev-qt/linguist-tools:5 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Graphical user interface that provides a workflow for HDR imaging
-EAPI=6
-HOMEPAGE=http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR
-IUSE=cpu_flags_x86_sse2 fits openmp test l10n_cs l10n_de l10n_es l10n_fi l10n_fr l10n_hi l10n_hu l10n_id l10n_it l10n_pl l10n_ro l10n_ru l10n_sk l10n_tr l10n_zh
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebengine:5 >=media-gfx/exiv2-0.14:0= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libraw-0.13.4:= media-libs/ilmbase:= >=media-libs/openexr-1.2.2-r2:= >=media-libs/tiff-3.8.2-r2:0 sci-libs/fftw:3.0[threads] fits? ( sci-libs/cfitsio ) sci-libs/gsl virtual/jpeg:0
-SLOT=0
-SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.5.1.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=85662c0e1ed96fefe3544742e380c96d
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1-r1 b/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1-r1
new file mode 100644
index 000000000000..25d1a3720c2a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebengine:5[widgets] >=media-gfx/exiv2-0.14:0= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libraw-0.13.4:= media-libs/ilmbase:= >=media-libs/openexr-1.2.2-r2:= >=media-libs/tiff-3.8.2-r2:0 sci-libs/fftw:3.0=[threads] fits? ( sci-libs/cfitsio:= ) sci-libs/gsl virtual/jpeg:0 dev-qt/linguist-tools:5 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Graphical user interface that provides a workflow for HDR imaging
+EAPI=6
+HOMEPAGE=http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR
+IUSE=cpu_flags_x86_sse2 fits openmp test l10n_cs l10n_de l10n_es l10n_fi l10n_fr l10n_hi l10n_hu l10n_id l10n_it l10n_pl l10n_ro l10n_ru l10n_sk l10n_tr l10n_zh
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebengine:5[widgets] >=media-gfx/exiv2-0.14:0= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libraw-0.13.4:= media-libs/ilmbase:= >=media-libs/openexr-1.2.2-r2:= >=media-libs/tiff-3.8.2-r2:0 sci-libs/fftw:3.0=[threads] fits? ( sci-libs/cfitsio:= ) sci-libs/gsl virtual/jpeg:0
+SLOT=0
+SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.5.1.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cea9f03958d9a774cfb690c37b784f7a
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.6.1 b/metadata/md5-cache/media-gfx/nomacs-3.6.1
deleted file mode 100644
index 9a1dae13c96b..000000000000
--- a/metadata/md5-cache/media-gfx/nomacs-3.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt-based image viewer
-EAPI=6
-HOMEPAGE=https://nomacs.org/
-IUSE=+jpeg opencv raw tiff zip
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
-SLOT=0
-SRC_URI=https://github.com/nomacs/nomacs/archive/3.6.1.tar.gz -> nomacs-3.6.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94f9775006535aacc36a7836853c0e6a
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.6.1-r1 b/metadata/md5-cache/media-gfx/nomacs-3.6.1-r1
deleted file mode 100644
index 03f042ad5c0a..000000000000
--- a/metadata/md5-cache/media-gfx/nomacs-3.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt-based image viewer
-EAPI=6
-HOMEPAGE=https://nomacs.org/
-IUSE=+jpeg opencv raw tiff zip
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
-SLOT=0
-SRC_URI=https://github.com/nomacs/nomacs/archive/3.6.1.tar.gz -> nomacs-3.6.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=78c287812dc6a1e3a32d4ee2f1843dad
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.8.0 b/metadata/md5-cache/media-gfx/nomacs-3.8.0
deleted file mode 100644
index 5d57eda8224e..000000000000
--- a/metadata/md5-cache/media-gfx/nomacs-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt-based image viewer
-EAPI=6
-HOMEPAGE=https://nomacs.org/
-IUSE=+jpeg opencv raw tiff zip
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
-SLOT=0
-SRC_URI=https://github.com/nomacs/nomacs/archive/3.8.0.tar.gz -> nomacs-3.8.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5871ed243923110c3dce309ce7b33c4
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.8.1 b/metadata/md5-cache/media-gfx/nomacs-3.8.1
index c43875a8e35c..c706d656d244 100644
--- a/metadata/md5-cache/media-gfx/nomacs-3.8.1
+++ b/metadata/md5-cache/media-gfx/nomacs-3.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Qt-based image viewer
 EAPI=6
 HOMEPAGE=https://nomacs.org/
 IUSE=+jpeg +opencv raw tiff zip
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
 REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
 SLOT=0
 SRC_URI=https://github.com/nomacs/nomacs/archive/3.8.1.tar.gz -> nomacs-3.8.1.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ead2accd613421778e8f270d3c0fb6f6
+_md5_=5868c98a7f7b36b16c78910e7293ffcd
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1 b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
index 5623e2508c17..295077d76dcc 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz -> povray-3.7.0.0.tar.gz https://dev.gentoo.org/~soap/distfiles/povray-3.7.0.0_p20160914-fix-c++14.patch.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=aa917a95fb43a20e215f83097049b676
+_md5_=a742e7431656e46cc0074f2f277d8c7d
diff --git a/metadata/md5-cache/media-gfx/qrencode-4.0.2 b/metadata/md5-cache/media-gfx/qrencode-4.0.2
new file mode 100644
index 000000000000..fd032ad544e9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/qrencode-4.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install test
+DEPEND=media-libs/libpng:0= virtual/pkgconfig
+DESCRIPTION=C library for encoding data in a QR Code symbol
+EAPI=6
+HOMEPAGE=https://fukuchi.org/works/qrencode/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=media-libs/libpng:0=
+SLOT=0/4
+SRC_URI=https://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.bz2
+_md5_=8617af4cbda256ac3197dde041d36252
diff --git a/metadata/md5-cache/media-gfx/slic3r-1.3.0 b/metadata/md5-cache/media-gfx/slic3r-1.3.0
new file mode 100644
index 000000000000..a27661ce9ac5
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/slic3r-1.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-Encode virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-Unicode-Normalize virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-perl/Devel-CheckLib >=dev-perl/ExtUtils-CppGuess-0.70.0 >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 >=dev-perl/ExtUtils-XSpp-0.170.0 >=dev-perl/Module-Build-0.380.0 >=dev-perl/Module-Build-WithXSpp-0.140.0 >=virtual/perl-ExtUtils-MakeMaker-6.800.0 >=virtual/perl-ExtUtils-ParseXS-3.220.0 test? ( virtual/perl-Test-Harness virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)
+EAPI=6
+HOMEPAGE=http://slic3r.org
+IUSE=+gui test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3 CC-BY-3.0
+RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-Encode virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-Unicode-Normalize virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/alexrj/slic3r/archive/1.3.0.tar.gz -> slic3r-1.3.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a765ee133d9aa193b783a7953387dfcd
diff --git a/metadata/md5-cache/media-gfx/structure-synth-1.5.0 b/metadata/md5-cache/media-gfx/structure-synth-1.5.0
deleted file mode 100644
index 9e06f980b53b..000000000000
--- a/metadata/md5-cache/media-gfx/structure-synth-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/opengl dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtscript:4 app-arch/unzip
-DESCRIPTION=A program to generate 3D structures by specifying a design grammar
-EAPI=4
-HOMEPAGE=http://structuresynth.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-2.1 GPL-3 )
-RDEPEND=virtual/opengl dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtscript:4
-SLOT=0
-SRC_URI=mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f3caa93b7c81ae9238d5811e501c6a5
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.7 b/metadata/md5-cache/media-gfx/wings-2.1.7
new file mode 100644
index 000000000000..6643f6782159
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/wings-2.1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/erlang-18.1[smp,wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+DESCRIPTION=Wings 3D is an advanced subdivision modeler
+EAPI=6
+HOMEPAGE=http://www.wings3d.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/erlang-18.1[smp,wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/wings/wings-2.1.7.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d49940da27dbc235750fca773c7ff522
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 9e17552efa91..77bb7072c660 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/aften-0.0.8-r2 b/metadata/md5-cache/media-libs/aften-0.0.8-r2
index 1dac5b0783c9..c9866a930d97 100644
--- a/metadata/md5-cache/media-libs/aften-0.0.8-r2
+++ b/metadata/md5-cache/media-libs/aften-0.0.8-r2
@@ -4,9 +4,9 @@ DESCRIPTION=An A/52 (AC-3) audio encoder
 EAPI=6
 HOMEPAGE=http://aften.sourceforge.net/
 IUSE=cxx
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1 BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/aften/aften-0.0.8.tar.bz2
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=874478accefa9552b6dfa9ba2f446b83
+_md5_=85d7b9dbdfc523cf3de152a4939f4105
diff --git a/metadata/md5-cache/media-libs/bcg729-1.0.4 b/metadata/md5-cache/media-libs/bcg729-1.0.4
index 49f99d9f779d..c9eb7a797ab8 100644
--- a/metadata/md5-cache/media-libs/bcg729-1.0.4
+++ b/metadata/md5-cache/media-libs/bcg729-1.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=encoder and decoder of the ITU G729 Annex A/B speech codec
 EAPI=6
 HOMEPAGE=https://github.com/BelledonneCommunications/bcg729
 IUSE=static-libs
-KEYWORDS=amd64 ~hppa ia64 ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ia64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=!media-plugins/mediastreamer-bcg729
 SLOT=0
 SRC_URI=https://github.com/BelledonneCommunications/bcg729/archive/1.0.4.tar.gz -> bcg729-1.0.4.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=adce0ed49f681b3b8594459fc557133b
+_md5_=178eb31f92cbb7601656f64f40d7af46
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.2 b/metadata/md5-cache/media-libs/chromaprint-1.2
deleted file mode 100644
index 7fec5e8d6651..000000000000
--- a/metadata/md5-cache/media-libs/chromaprint-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=libav? ( media-video/libav:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) test? ( dev-cpp/gtest dev-libs/boost ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A client-side library that implements a custom algorithm for extracting fingerprints
-EAPI=5
-HOMEPAGE=https://acoustid.org/chromaprint
-IUSE=libav test tools
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86 ~amd64-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=libav? ( media-video/libav:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= )
-SLOT=0
-SRC_URI=https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c802d0ddea306a3d658f1a93da41dc3c
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.2-r1 b/metadata/md5-cache/media-libs/chromaprint-1.2-r1
deleted file mode 100644
index 779bdb9b21ac..000000000000
--- a/metadata/md5-cache/media-libs/chromaprint-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=libav? ( >=media-video/libav-11: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(-)?] ) !libav? ( >=media-video/ffmpeg-2.6: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(-)?] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost[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.9.6
-DESCRIPTION=A client-side library that implements a custom algorithm for extracting fingerprints
-EAPI=5
-HOMEPAGE=https://acoustid.org/chromaprint
-IUSE=libav test tools 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=libav? ( >=media-video/libav-11: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(-)?] ) !libav? ( >=media-video/ffmpeg-2.6: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
-SRC_URI=https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.2.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e36041719808567a08dc6d8e102c9b79
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.3.2 b/metadata/md5-cache/media-libs/chromaprint-1.3.2
deleted file mode 100644
index d85e7a7656c9..000000000000
--- a/metadata/md5-cache/media-libs/chromaprint-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=libav? ( >=media-video/libav-11: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(-)?] ) !libav? ( >=media-video/ffmpeg-2.6: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(-)?] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost[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.9.6
-DESCRIPTION=A client-side library that implements a custom algorithm for extracting fingerprints
-EAPI=6
-HOMEPAGE=https://acoustid.org/chromaprint
-IUSE=libav test tools 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=libav? ( >=media-video/libav-11: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(-)?] ) !libav? ( >=media-video/ffmpeg-2.6: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
-SRC_URI=https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.3.2.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f19099da0bcd55aa71a90bba32552fe
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.4.1 b/metadata/md5-cache/media-libs/chromaprint-1.4.1
deleted file mode 100644
index bb92d773f7d5..000000000000
--- a/metadata/md5-cache/media-libs/chromaprint-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=libav? ( >=media-video/libav-11: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(-)?] ) !libav? ( >=media-video/ffmpeg-2.6: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(-)?] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost[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.9.6
-DESCRIPTION=A client-side library that implements a custom algorithm for extracting fingerprints
-EAPI=6
-HOMEPAGE=https://acoustid.org/chromaprint
-IUSE=libav test tools 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=libav? ( >=media-video/libav-11: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(-)?] ) !libav? ( >=media-video/ffmpeg-2.6: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
-SRC_URI=https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.4.1.tar.gz test? ( https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a437867c69fa82ea4dba3a4c44ce7e34
diff --git a/metadata/md5-cache/media-libs/exiftool-10.88 b/metadata/md5-cache/media-libs/exiftool-10.88
deleted file mode 100644
index c434c3ee033c..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-10.88
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl:=
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=6
-HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
-IUSE=doc
-KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.88.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=aca8243ed57ffba961cf90220fcd7194
diff --git a/metadata/md5-cache/media-libs/exiftool-10.93 b/metadata/md5-cache/media-libs/exiftool-10.93
deleted file mode 100644
index f2f576b08009..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-10.93
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl:=
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=6
-HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.93.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=20d25e5adbde45b4c4c9e8f4871dd23a
diff --git a/metadata/md5-cache/media-libs/exiftool-10.94 b/metadata/md5-cache/media-libs/exiftool-10.94
deleted file mode 100644
index 14efe3316860..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-10.94
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl:=
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=6
-HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.94.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=20d25e5adbde45b4c4c9e8f4871dd23a
diff --git a/metadata/md5-cache/media-libs/exiftool-10.95 b/metadata/md5-cache/media-libs/exiftool-10.95
index 662faff8d253..ccab182f8862 100644
--- a/metadata/md5-cache/media-libs/exiftool-10.95
+++ b/metadata/md5-cache/media-libs/exiftool-10.95
@@ -4,10 +4,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
 EAPI=6
 HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.95.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=20d25e5adbde45b4c4c9e8f4871dd23a
+_md5_=aca8243ed57ffba961cf90220fcd7194
diff --git a/metadata/md5-cache/media-libs/exiftool-10.99 b/metadata/md5-cache/media-libs/exiftool-10.99
new file mode 100644
index 000000000000..78702a78c15b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-10.99
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=6
+HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.99.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=20d25e5adbde45b4c4c9e8f4871dd23a
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.6 b/metadata/md5-cache/media-libs/fontconfig-2.12.6
index 0076820a7098..139fd86a6792 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.6
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.6
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=6
 HOMEPAGE=http://fontconfig.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.7.1[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.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.12.6.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b49bb4cfbb5ba41a53ba3442c42febd7
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=18dc2d65c0f26c2664e7dc771c630567
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.13.0-r4 b/metadata/md5-cache/media-libs/fontconfig-2.13.0-r4
index a5a995f29dac..c8648f09bef6 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.13.0-r4
+++ b/metadata/md5-cache/media-libs/fontconfig-2.13.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9[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(-)?] !elibc_Darwin? ( sys-apps/util-linux[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(-)?] ) elibc_Darwin? ( sys-libs/libuuid ) virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* app-text/docbook-sgml-utils[jadetex] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9[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(-)?] !elibc_Darwin? ( sys-apps/util-linux[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(-)?] ) elibc_Darwin? ( sys-libs/native-uuid ) virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* app-text/docbook-sgml-utils[jadetex] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A library for configuring and customizing font access
 EAPI=6
 HOMEPAGE=https://fontconfig.org/
@@ -7,8 +7,8 @@ IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
-RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9[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(-)?] !elibc_Darwin? ( sys-apps/util-linux[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(-)?] ) elibc_Darwin? ( sys-libs/libuuid ) virtual/libintl[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(-)?]
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9[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(-)?] !elibc_Darwin? ( sys-apps/util-linux[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(-)?] ) elibc_Darwin? ( sys-libs/native-uuid ) virtual/libintl[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.0
 SRC_URI=https://fontconfig.org/release/fontconfig-2.13.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=84d614cdf59508d49afc111eb7bcbd2b
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d234e571dae3418332f1672b82c12b25
diff --git a/metadata/md5-cache/media-libs/fontconfig-infinality-20130404 b/metadata/md5-cache/media-libs/fontconfig-infinality-20130404
index 947ff04e893e..0e6d977a2f03 100644
--- a/metadata/md5-cache/media-libs/fontconfig-infinality-20130404
+++ b/metadata/md5-cache/media-libs/fontconfig-infinality-20130404
@@ -9,5 +9,5 @@ PDEPEND=media-libs/freetype:2[infinality] >=x11-libs/libXft-2.3.0 nyx? ( media-f
 RDEPEND=app-eselect/eselect-fontconfig app-eselect/eselect-infinality app-eselect/eselect-lcdfilter
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/fontconfig-infinality-20130404.tar.xz nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-2.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4779ff1cf987f9fc059358369de788b2
diff --git a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04 b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
index beaf8938d26d..de9030e8f574 100644
--- a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
+++ b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-eselect/eselect-infinality app-eselect/eselect-lcdfilter media-libs/fontconfig-infinality media-libs/freetype:2[infinality]
 SLOT=0
 SRC_URI=https://github.com/bohoomil/fontconfig-ultimate/archive/2015-04.tar.gz -> fontconfig-ultimate-2015.04.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f1292697cc987a69e2cf18ab760c3b5f
diff --git a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01 b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01
index 88b42005c8eb..a02544921e00 100644
--- a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01
+++ b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-eselect/eselect-infinality app-eselect/eselect-lcdfilter media-libs/fontconfig-infinality media-libs/freetype:2[infinality]
 SLOT=0
 SRC_URI=https://github.com/bohoomil/fontconfig-ultimate/archive/2015-08-01.tar.gz -> fontconfig-ultimate-2015.08.01.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f1292697cc987a69e2cf18ab760c3b5f
diff --git a/metadata/md5-cache/media-libs/glu-9.0.0-r1 b/metadata/md5-cache/media-libs/glu-9.0.0-r1
index 687d3e699068..a2453566accb 100644
--- a/metadata/md5-cache/media-libs/glu-9.0.0-r1
+++ b/metadata/md5-cache/media-libs/glu-9.0.0-r1
@@ -1,8 +1,8 @@
-DEFINED_PHASES=compile configure install prepare test unpack
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422
 DESCRIPTION=The OpenGL Utility Library
 EAPI=5
-HOMEPAGE=https://cgit.freedesktop.org/mesa/glu/
+HOMEPAGE=https://gitlab.freedesktop.org/mesa/glu
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=SGI-B-2.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/glu/glu-9.0.0.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c138c22865b9074708845b2a84563e8b
+_md5_=33b9c87a49d771de2ffb76d0fb13c2de
diff --git a/metadata/md5-cache/media-libs/glu-9999 b/metadata/md5-cache/media-libs/glu-9999
index 68d171c5c9b9..9466c0eda0d5 100644
--- a/metadata/md5-cache/media-libs/glu-9999
+++ b/metadata/md5-cache/media-libs/glu-9999
@@ -1,11 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The OpenGL Utility Library
-EAPI=5
-HOMEPAGE=https://cgit.freedesktop.org/mesa/glu/
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/mesa/glu
 IUSE=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
 LICENSE=SGI-B-2.0
 RDEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<media-libs/mesa-9
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20d7151915ce49bc3cc5826dc4c9dccc
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=37f6b07890dca3542d5ebee39342f1cf
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.7.5 b/metadata/md5-cache/media-libs/harfbuzz-1.7.5
deleted file mode 100644
index afdf92772d39..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-1.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[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(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An OpenType text shaping engine
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[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(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-SLOT=0/0.9.18
-SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6dd9c4998a9e767cc5d29ba15d5e2c35
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.8.0 b/metadata/md5-cache/media-libs/harfbuzz-1.8.0
new file mode 100644
index 000000000000..f341cff0706f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[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(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422
+DESCRIPTION=An OpenType text shaping engine
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[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(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.8.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2c1d78a9b4736d637017c142d0f57cb0
diff --git a/metadata/md5-cache/media-libs/jpeg-9c b/metadata/md5-cache/media-libs/jpeg-9c
index 31e6de5f0f34..80d5b4edd43d 100644
--- a/metadata/md5-cache/media-libs/jpeg-9c
+++ b/metadata/md5-cache/media-libs/jpeg-9c
@@ -4,10 +4,10 @@ DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=6
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
 IUSE=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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v9c.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4c2f8e5b00070ac99145b0d147b8153d
+_md5_=d85a4add81593a818314c066f05a9083
diff --git a/metadata/md5-cache/media-libs/libclthreads-2.2.1 b/metadata/md5-cache/media-libs/libclthreads-2.2.1
deleted file mode 100644
index d4ce4fd34b35..000000000000
--- a/metadata/md5-cache/media-libs/libclthreads-2.2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>
-EAPI=0
-HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/index.html
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-2.2.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=081cbd3c3b12256c35ecff353823773f
diff --git a/metadata/md5-cache/media-libs/libclthreads-2.4.0 b/metadata/md5-cache/media-libs/libclthreads-2.4.0
deleted file mode 100644
index 70732030c38c..000000000000
--- a/metadata/md5-cache/media-libs/libclthreads-2.4.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>
-EAPI=0
-HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/index.html
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-2.4.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca787e095d95eb9d74550ca68e74e093
diff --git a/metadata/md5-cache/media-libs/libclxclient-1.0.1 b/metadata/md5-cache/media-libs/libclxclient-1.0.1
deleted file mode 100644
index 10a05acf286b..000000000000
--- a/metadata/md5-cache/media-libs/libclxclient-1.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>
-EAPI=0
-HOMEPAGE=http://users.skynet.be/solaris/linuxaudio
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 >=media-libs/libclthreads-1.0.1
-SLOT=0
-SRC_URI=http://users.skynet.be/solaris/linuxaudio/downloads/clxclient-1.0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3dd3f06c1a4d1b7b7a9c40e4e8bdf056
diff --git a/metadata/md5-cache/media-libs/libclxclient-3.3.2 b/metadata/md5-cache/media-libs/libclxclient-3.3.2
deleted file mode 100644
index 576a090d5a8e..000000000000
--- a/metadata/md5-cache/media-libs/libclxclient-3.3.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>
-EAPI=0
-HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/index.html
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=LGPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXft >=media-libs/libclthreads-2.2.1
-SLOT=0
-SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-3.3.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=688384679237d5f6c6b7bd9acb0e0ade
diff --git a/metadata/md5-cache/media-libs/libclxclient-3.6.1 b/metadata/md5-cache/media-libs/libclxclient-3.6.1
deleted file mode 100644
index f13de91a7ed6..000000000000
--- a/metadata/md5-cache/media-libs/libclxclient-3.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXft >=media-libs/freetype-2 >=media-libs/libclthreads-2.4.0
-DESCRIPTION=An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>
-EAPI=0
-HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/index.html
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXft >=media-libs/freetype-2 >=media-libs/libclthreads-2.4.0
-SLOT=0
-SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-3.6.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=af79d8fc013c7a2992b4ad167fe58a6b
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.2 b/metadata/md5-cache/media-libs/libepoxy-1.5.2
index 1ad301a2f86c..3b997b476eec 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.2
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management f
 EAPI=6
 HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.2.tar.gz -> libepoxy-1.5.2.tar.gz
 _eclasses_=meson	eb124b9e9d7a5f1ebc89589fe73c816f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=17a956cb3b4815acfa7255c4227b5983
+_md5_=02a9c0d2f3ccc8754dfd0a209662dfc2
diff --git a/metadata/md5-cache/media-libs/liblingoteach-0.2.3 b/metadata/md5-cache/media-libs/liblingoteach-0.2.3
index 4ef9b1c18158..21c1169bd830 100644
--- a/metadata/md5-cache/media-libs/liblingoteach-0.2.3
+++ b/metadata/md5-cache/media-libs/liblingoteach-0.2.3
@@ -1,7 +1,7 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure
 DEPEND=zlib? ( sys-libs/zlib ) dev-libs/libxml2 virtual/pkgconfig
 DESCRIPTION=A library to support lingoteach-ui and for generic lesson development
-EAPI=2
+EAPI=6
 HOMEPAGE=http://lingoteach.sourceforge.net
 IUSE=debug zlib
 KEYWORDS=amd64 ~ppc ~x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib ) dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://sourceforge/lingoteach/liblingoteach-0.2.3.tar.gz
-_md5_=d816689ec201b806d0332a70a8391659
+_md5_=c042d3e8cfaf92fc3dc396362c4df6ef
diff --git a/metadata/md5-cache/media-libs/libmediainfo-17.12 b/metadata/md5-cache/media-libs/libmediainfo-17.12
deleted file mode 100644
index 85416f26634c..000000000000
--- a/metadata/md5-cache/media-libs/libmediainfo-17.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MediaInfo libraries
-EAPI=6
-HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
-IUSE=curl doc mms static-libs
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://mediaarea.net/download/source/libmediainfo/17.12/libmediainfo_17.12.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=028ff906348adb0f695b6a7c45f3f72b
diff --git a/metadata/md5-cache/media-libs/libmediainfo-18.03 b/metadata/md5-cache/media-libs/libmediainfo-18.03
index a9c618a99a45..6a94c25c5113 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-18.03
+++ b/metadata/md5-cache/media-libs/libmediainfo-18.03
@@ -4,11 +4,11 @@ DESCRIPTION=MediaInfo libraries
 EAPI=6
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
 IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/libmediainfo/18.03/libmediainfo_18.03.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5280a855bc6827fa950ca5462f8a466d
+_md5_=028ff906348adb0f695b6a7c45f3f72b
diff --git a/metadata/md5-cache/media-libs/libmediainfo-18.05 b/metadata/md5-cache/media-libs/libmediainfo-18.05
new file mode 100644
index 000000000000..936268391745
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmediainfo-18.05
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=MediaInfo libraries
+EAPI=6
+HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
+IUSE=curl doc mms static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://mediaarea.net/download/source/libmediainfo/18.05/libmediainfo_18.05.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3234ef6f196b63e9b256fe5126a0f175
diff --git a/metadata/md5-cache/media-libs/liboggz-1.1.1 b/metadata/md5-cache/media-libs/liboggz-1.1.1
index 3f39f0aba46d..56ff42bb8174 100644
--- a/metadata/md5-cache/media-libs/liboggz-1.1.1
+++ b/metadata/md5-cache/media-libs/liboggz-1.1.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=>=media-libs/libogg-1.2.0 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-text/docbook-sgml-utils ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Oggz provides a simple programming interface for reading and writing Ogg files and streams
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.xiph.org/oggz/
 IUSE=doc static-libs test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.2.0
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/liboggz/liboggz-1.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ade8ee57e4c9ed144552238380e61622
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f247b8ab2384c83f5d205c0a7565e98e
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.34 b/metadata/md5-cache/media-libs/libpng-1.6.34
index 26b72bf824e9..9a5e2b3702b8 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.34
+++ b/metadata/md5-cache/media-libs/libpng-1.6.34
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.34.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.34-apng.patch.gz )
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=83017ef57546fe28361c58ae55c0d6e4
+_md5_=eebb5d34c3a983cc1a6ee9f89a21ab26
diff --git a/metadata/md5-cache/media-libs/libprojectm-qt-2.1.0-r1 b/metadata/md5-cache/media-libs/libprojectm-qt-2.1.0-r1
deleted file mode 100644
index 7702083e2450..000000000000
--- a/metadata/md5-cache/media-libs/libprojectm-qt-2.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libprojectm-2.1.0 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A graphical music visualization plugin similar to milkdrop
-EAPI=5
-HOMEPAGE=http://projectm.sourceforge.net
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libprojectm-2.1.0 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4
-SLOT=0
-SRC_URI=mirror://sourceforge/projectm/projectM-qt-2.1.0-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f3082ef72024f080595236615f7b670
diff --git a/metadata/md5-cache/media-libs/mesa-17.3.9 b/metadata/md5-cache/media-libs/mesa-17.3.9
index 2843c3c2e9bd..810e8d71817b 100644
--- a/metadata/md5-cache/media-libs/mesa-17.3.9
+++ b/metadata/md5-cache/media-libs/mesa-17.3.9
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.3.9.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c7996a8f80aef78b0e9def9a53e1e35d
+_md5_=6150937d5ffe84d81a631542227073c4
diff --git a/metadata/md5-cache/media-libs/mesa-18.0.4 b/metadata/md5-cache/media-libs/mesa-18.0.4
deleted file mode 100644
index e4c0643703b5..000000000000
--- a/metadata/md5-cache/media-libs/mesa-18.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.9.3:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.89[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=6
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.9.3:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.89[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) )
-REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.0.4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=781bd532b35b55224b6c9b8b074842b2
diff --git a/metadata/md5-cache/media-libs/mesa-18.0.5 b/metadata/md5-cache/media-libs/mesa-18.0.5
new file mode 100644
index 000000000000..4bb026384119
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-18.0.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.9.3:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.89[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.9.3:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.89[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.0.5.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=152f9ce949a47935eebeafe56844ff69
diff --git a/metadata/md5-cache/media-libs/mesa-18.1.0 b/metadata/md5-cache/media-libs/mesa-18.1.0
deleted file mode 100644
index 819c63e6787e..000000000000
--- a/metadata/md5-cache/media-libs/mesa-18.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=6
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) )
-REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.1.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e99950a6afe9caef57deac304e17bb65
diff --git a/metadata/md5-cache/media-libs/mesa-18.1.0-r1 b/metadata/md5-cache/media-libs/mesa-18.1.0-r1
deleted file mode 100644
index 0a7816baa5bc..000000000000
--- a/metadata/md5-cache/media-libs/mesa-18.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=6
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) )
-REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.1.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3e3d8392df33cd1b9baa893c90c99244
diff --git a/metadata/md5-cache/media-libs/mesa-18.1.1 b/metadata/md5-cache/media-libs/mesa-18.1.1
index 3385b231c34b..5f5ed1e4f098 100644
--- a/metadata/md5-cache/media-libs/mesa-18.1.1
+++ b/metadata/md5-cache/media-libs/mesa-18.1.1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.1.1.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3e3d8392df33cd1b9baa893c90c99244
+_md5_=2361d2d5175d636d28772071a41c9407
diff --git a/metadata/md5-cache/media-libs/mesa-18.1.1-r1 b/metadata/md5-cache/media-libs/mesa-18.1.1-r1
new file mode 100644
index 000000000000..61db742389cd
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-18.1.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.1.1.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=c21c3f60a159dbccae91dd8eab45f3a1
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 3426367c1c52..0a01fc1710e1 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) sys-devel/bison sys-devel/flex || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install postinst prerm setup test unpack
+DEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:= ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors +nptl opencl osmesa pax_kernel openmax pic selinux test unwind vaapi valgrind vdpau vulkan wayland xvmc xa 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
 LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[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-libs/zlib-1.2.8[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(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:= ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.91[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.91[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.91[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:7[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/clang:6[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/clang:5[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/clang: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(-)?] >=sys-devel/clang-3.9.0: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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:6[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:5[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:7[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/llvm:6[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/llvm:5[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/llvm: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(-)?] >=sys-devel/llvm-3.9.0: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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
-RESTRICT=!bindist? ( bindist )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3e3d8392df33cd1b9baa893c90c99244
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7425927d488b6e644946dadecae59a92
diff --git a/metadata/md5-cache/media-libs/mlt-6.6.0 b/metadata/md5-cache/media-libs/mlt-6.6.0
index fcdb152b5ec7..bd4258e748e2 100644
--- a/metadata/md5-cache/media-libs/mlt-6.6.0
+++ b/metadata/md5-cache/media-libs/mlt-6.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) 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/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) sdl2? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
+DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) 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/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) sdl2? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
 DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=6
 HOMEPAGE=https://www.mltframework.org/
 IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl sdl2 vdpau xine xml kernel_linux python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) 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/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) sdl2? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) !media-libs/mlt++
+RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) 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/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) sdl2? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) !media-libs/mlt++
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/archive/v6.6.0.tar.gz -> mlt-6.6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=599227e3f953bd1ba05f50c5841b5d2f
+_md5_=5ad56f899a6f9bff55af9a44cfab9d00
diff --git a/metadata/md5-cache/media-libs/skstream-0.3.9 b/metadata/md5-cache/media-libs/skstream-0.3.9
index f4a0dcbd6eb3..913edf8e9bb6 100644
--- a/metadata/md5-cache/media-libs/skstream-0.3.9
+++ b/metadata/md5-cache/media-libs/skstream-0.3.9
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure
 DEPEND=test? ( dev-util/cppunit )
 DESCRIPTION=FreeSockets - Portable C++ classes for IP (sockets) applications
 EAPI=6
-HOMEPAGE=http://www.worldforge.org/
+HOMEPAGE=https://www.worldforge.org/
 IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/skstream-0.3.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=066122f1196898eb09d3ba966738adaf
+_md5_=79d55fdeb54171419ab8d7b311c7dfae
diff --git a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1 b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
index 687e205642f1..e2c9ed18579d 100644
--- a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
+++ b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Unofficial taglib plugins maintained by the Amarok team
-EAPI=5
+EAPI=6
 HOMEPAGE=https://websvn.kde.org/trunk/kdesupport/taglib-extras/
 IUSE=debug
 KEYWORDS=amd64 ppc ~ppc64 x86
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/taglib-1.6
 SLOT=0
 SRC_URI=mirror://kde/stable/taglib-extras/1.0.1/src/taglib-extras-1.0.1.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e8150561631f358d836d150c7e29940
+_md5_=bb95b49aaf6d0ad1e36699eeca332e81
diff --git a/metadata/md5-cache/media-libs/vigra-1.11.1 b/metadata/md5-cache/media-libs/vigra-1.11.1
index f81d1aae2db0..e5a41143c1e7 100644
--- a/metadata/md5-cache/media-libs/vigra-1.11.1
+++ b/metadata/md5-cache/media-libs/vigra-1.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=C++ computer vision library emphasizing customizable algorithms and
 EAPI=6
 HOMEPAGE=https://ukoethe.github.io/vigra/
 IUSE=doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind python_targets_python2_7
-KEYWORDS=~amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/python:2.7 >=dev-libs/boost-1.52.0-r6:=[python?,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] fftw? ( sci-libs/fftw:3.0 ) hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tiff? ( media-libs/tiff:0= ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=doc? ( hdf5 fftw ) python? ( hdf5 || ( python_targets_python2_7 ) ) test? ( hdf5 python fftw )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc5cbf5da47fae82ac5c5a2d0820e057
+_md5_=a612160845df4f5e570aaa569ce0c216
diff --git a/metadata/md5-cache/media-libs/vigra-1.9.0 b/metadata/md5-cache/media-libs/vigra-1.9.0
deleted file mode 100644
index 1d08c575c142..000000000000
--- a/metadata/md5-cache/media-libs/vigra-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-lang/python:2.7 >=dev-libs/boost-1.52.0-r6:=[python?,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(+)] fftw? ( sci-libs/fftw:3.0 ) hdf5? ( sci-libs/hdf5:= ) jpeg? ( virtual/jpeg ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) >=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(+)] ) tiff? ( media-libs/tiff:0= ) doc? ( app-doc/doxygen python? ( >=dev-python/sphinx-1.1.3-r5[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(+)] ) ) test? ( python? ( >=dev-python/nose-1.1.2-r1[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(+)] ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=a C++ computer vision library with emphasis on customizability of algorithms and data structures
-EAPI=5
-HOMEPAGE=https://ukoethe.github.io/vigra/
-IUSE=doc +fftw +hdf5 +jpeg openexr +png +python test +tiff python_targets_python2_7
-KEYWORDS=amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-lang/python:2.7 >=dev-libs/boost-1.52.0-r6:=[python?,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(+)] fftw? ( sci-libs/fftw:3.0 ) hdf5? ( sci-libs/hdf5:= ) jpeg? ( virtual/jpeg ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) >=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(+)] ) tiff? ( media-libs/tiff:0= )
-REQUIRED_USE=doc? ( hdf5 fftw ) python? ( hdf5 python_targets_python2_7 ) test? ( hdf5 python fftw )
-SLOT=0
-SRC_URI=http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.9.0-src.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a3ec01600b17bde29e4eaa3e86b235d
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-9999 b/metadata/md5-cache/media-libs/vulkan-layers-9999
index 653c7cf57ed5..ed4369b5c758 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-9999
+++ b/metadata/md5-cache/media-libs/vulkan-layers-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19796ee4c1bfca3e04c8147253989187
+_md5_=8a98c9801a482307626dfd368000babe
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index b632c3386ded..8a61e618d38a 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/imlib2_loaders-1.5.1 b/metadata/md5-cache/media-plugins/imlib2_loaders-1.5.1
new file mode 100644
index 000000000000..de39a963211b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/imlib2_loaders-1.5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=media-libs/imlib2-1.5.1 eet? ( dev-libs/efl[eet] ) virtual/pkgconfig
+DESCRIPTION=Additional image loaders for Imlib2
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/
+IUSE=eet xcf
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=>=media-libs/imlib2-1.5.1 eet? ( dev-libs/efl[eet] )
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/enlightenment/imlib2_loaders-1.5.1.tar.gz
+_md5_=f348e7cf8d583661a2b15ab59eb3630c
diff --git a/metadata/md5-cache/media-plugins/imlib2_loaders-9999 b/metadata/md5-cache/media-plugins/imlib2_loaders-9999
deleted file mode 100644
index b5c6f3230b40..000000000000
--- a/metadata/md5-cache/media-plugins/imlib2_loaders-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 doc? ( app-doc/doxygen )
-DESCRIPTION=image loader plugins for Imlib 2
-EAPI=5
-HOMEPAGE=https://www.enlightenment.org/pages/imlib2.html
-IUSE=eet xcf nls doc
-LICENSE=BSD
-RDEPEND=>=media-libs/imlib2-9999 eet? ( dev-libs/efl ) nls? ( sys-devel/gettext )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	e2ebae76ba56501855712c5fd3c4c77c	epatch	9a5f039771f143195164a15a4faa41a1	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cc66786f3fc0c5d7bff8b88756f36d1
diff --git a/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204 b/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
index a8e9d806df96..d573375a4dec 100644
--- a/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
+++ b/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=configure install prepare
 DEPEND==sci-libs/fftw-3* >=media-libs/libxtract-0.6.6 media-libs/vamp-plugin-sdk
 DESCRIPTION=Vamp plugin encapsulating many of the functions of the LibXtract library
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.vamp-plugins.org/
 KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND==sci-libs/fftw-3* >=media-libs/libxtract-0.6.6 media-libs/vamp-plugin-sdk
 SLOT=0
 SRC_URI=http://code.soundsoftware.ac.uk/attachments/download/618/vamp-libxtract-plugins-0.6.6.20121204.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63b42b66ccd63d77d8a4a725cd3e050b
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9be4a9d9216f25fe9b0e28911c6781b4
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ccbe662f2cb3..9a69c0b11901 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-1.3.1_p20180523 b/metadata/md5-cache/media-sound/clementine-1.3.1_p20180523
new file mode 100644
index 000000000000..dab8d7577ccc
--- /dev/null
+++ b/metadata/md5-cache/media-sound/clementine-1.3.1_p20180523
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+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 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 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.1.0_pre20150206 ) 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-libs/boost dev-qt/linguist-tools:5 dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml: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.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+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
+KEYWORDS=~amd64 ~x86
+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/qtwidgets: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 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.1.0_pre20150206 ) 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/clementine-player/Clementine/archive/4619a4c1ab3b17b13d4b2327ad477912917eaf36.tar.gz -> clementine-1.3.1_p20180523.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0fcfeac581703d95a889ee3611de1d3a
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.2.5 b/metadata/md5-cache/media-sound/cmusfm-0.2.5
index 56c8d55ec1af..c0993ddd05a7 100644
--- a/metadata/md5-cache/media-sound/cmusfm-0.2.5
+++ b/metadata/md5-cache/media-sound/cmusfm-0.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-misc/curl dev-libs/openssl libnotify? ( x11-libs/libnotify ) media-sound/cmus
 SLOT=0
 SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.2.5.tar.gz -> cmusfm-0.2.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdd300a5cf8e9bd57ec0275f86b43d0e
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.3.1 b/metadata/md5-cache/media-sound/cmusfm-0.3.1
index 2ee87ab017ae..0540a9e7d6f3 100644
--- a/metadata/md5-cache/media-sound/cmusfm-0.3.1
+++ b/metadata/md5-cache/media-sound/cmusfm-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( >=x11-libs/libnotify-0.7 ) media-sound/cmus
 SLOT=0
 SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.3.1.tar.gz -> cmusfm-0.3.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=2db3d13609d730138e60ca3e567e8e11
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.3.3 b/metadata/md5-cache/media-sound/cmusfm-0.3.3
index bdeff62c3c6a..d827f756fb4c 100644
--- a/metadata/md5-cache/media-sound/cmusfm-0.3.3
+++ b/metadata/md5-cache/media-sound/cmusfm-0.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( >=x11-libs/libnotify-0.7 ) media-sound/cmus
 SLOT=0
 SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.3.3.tar.gz -> cmusfm-0.3.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=f4df7693086be9d2bc4d9fa52aaadf04
diff --git a/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1 b/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1
index ae16f09cedd4..214e064f747a 100644
--- a/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1
+++ b/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch
-EAPI=2
+EAPI=6
 HOMEPAGE=http://panteltje.com/panteltje/dvd/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://panteltje.com/panteltje/dvd/combine_wave-0.3.1.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=96fc5760cdfcb2cc0beef242716ae424
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0d10177f44f4336861bd923518f259de
diff --git a/metadata/md5-cache/media-sound/dir2ogg-0.11.8-r1 b/metadata/md5-cache/media-sound/dir2ogg-0.11.8-r1
index f2fa0587532a..84ba70d54467 100644
--- a/metadata/md5-cache/media-sound/dir2ogg-0.11.8-r1
+++ b/metadata/md5-cache/media-sound/dir2ogg-0.11.8-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=Converts mp3, m4a, wma, and wav files to Ogg Vorbis format
-EAPI=2
+EAPI=7
 HOMEPAGE=http://jak-linux.org/projects/dir2ogg/
 IUSE=aac cdparanoia flac mac mp3 musepack wavpack wma
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
@@ -8,5 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.5 dev-python/pyid3lib media-sound/vorbis-tools[ogg123] >=media-libs/mutagen-1.11 aac? ( || ( media-libs/faad2 media-video/mplayer ) ) cdparanoia? ( || ( dev-libs/libcdio-paranoia media-sound/cdparanoia ) ) flac? ( || ( media-libs/flac media-video/mplayer ) ) mac? ( || ( media-sound/mac media-video/mplayer ) ) mp3? ( || ( media-sound/mpg123 media-sound/lame media-video/mplayer media-sound/mpg321 ) ) musepack? ( || ( >=media-sound/musepack-tools-444 media-video/mplayer ) ) wavpack? ( || ( media-sound/wavpack media-video/mplayer ) ) wma? ( media-video/mplayer )
 SLOT=0
 SRC_URI=http://jak-linux.org/projects/dir2ogg/0.11/dir2ogg-0.11.8.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f63ec052711457c15f69be65e7837d4e
+_md5_=0fc687cde44f7318601580b69fc25a7d
diff --git a/metadata/md5-cache/media-sound/murmur-1.2.19 b/metadata/md5-cache/media-sound/murmur-1.2.19
index e4386ef97574..f9c38e888816 100644
--- a/metadata/md5-cache/media-sound/murmur-1.2.19
+++ b/metadata/md5-cache/media-sound/murmur-1.2.19
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= sys-apps/lsb-release >=sys-libs/libcap-2.15 dev-qt/qtcore:4[ssl] || ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] ) dev-qt/qtxmlpatterns:4 dbus? ( dev-qt/qtdbus:4 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
 SRC_URI=https://mumble.info/snapshot/mumble-1.2.19.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82e913f7f4af0ef5e6ccf9b017661c61
diff --git a/metadata/md5-cache/media-sound/murmur-9999 b/metadata/md5-cache/media-sound/murmur-9999
index 6e6efe8e76e4..3d130124c481 100644
--- a/metadata/md5-cache/media-sound/murmur-9999
+++ b/metadata/md5-cache/media-sound/murmur-9999
@@ -7,5 +7,5 @@ IUSE=+dbus debug +ice pch zeroconf
 LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=5b4ad67298ac31bda885bd36dcb20ae7
diff --git a/metadata/md5-cache/media-sound/picard-2.0.0_beta3 b/metadata/md5-cache/media-sound/picard-2.0.0_beta3
index a359efeaf822..1cbb6a6c5dac 100644
--- a/metadata/md5-cache/media-sound/picard-2.0.0_beta3
+++ b/metadata/md5-cache/media-sound/picard-2.0.0_beta3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/metabrainz/picard/archive/2.0.0dev6.tar.gz -> picard-2.0.0_beta3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c6f0784a1a0122df4395e163f81fbca8
diff --git a/metadata/md5-cache/media-sound/picard-9999 b/metadata/md5-cache/media-sound/picard-9999
index ecc6915b8c84..bad3164b1438 100644
--- a/metadata/md5-cache/media-sound/picard-9999
+++ b/metadata/md5-cache/media-sound/picard-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c70cd86e12d3a72f9173a859d3bd7ca
diff --git a/metadata/md5-cache/media-sound/playerctl-0.6.0 b/metadata/md5-cache/media-sound/playerctl-0.6.0
index 44fd001b6b38..d0e282b30f01 100644
--- a/metadata/md5-cache/media-sound/playerctl-0.6.0
+++ b/metadata/md5-cache/media-sound/playerctl-0.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=A CLI utility to control media players over MPRIS
 EAPI=6
 HOMEPAGE=https://github.com/acrisci/playerctl
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v0.6.0.tar.gz -> playerctl-0.6.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54c70de042fc012b38351f9ce68e81ca
+_md5_=d78623fd960ea200cd64b8f433b16c55
diff --git a/metadata/md5-cache/media-sound/projectm-jack-2.0.1 b/metadata/md5-cache/media-sound/projectm-jack-2.0.1
deleted file mode 100644
index 7d10ce62873d..000000000000
--- a/metadata/md5-cache/media-sound/projectm-jack-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-sound/jack-audio-connection-kit >=media-libs/libprojectm-qt-2.0.1 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A Qt based GUI for projectM that visualizes your JACK output
-EAPI=5
-HOMEPAGE=http://projectm.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-sound/jack-audio-connection-kit >=media-libs/libprojectm-qt-2.0.1
-SLOT=0
-SRC_URI=mirror://sourceforge/projectm/projectM-jack-2.0.1-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5bf59d7e792a66b9b6a7ef2e56c05b8
diff --git a/metadata/md5-cache/media-sound/projectm-jack-2.1.0 b/metadata/md5-cache/media-sound/projectm-jack-2.1.0
deleted file mode 100644
index 0a5e9335b1e0..000000000000
--- a/metadata/md5-cache/media-sound/projectm-jack-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-sound/jack-audio-connection-kit >=media-libs/libprojectm-qt-2.1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A Qt based GUI for projectM that visualizes your JACK output
-EAPI=5
-HOMEPAGE=http://projectm.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-sound/jack-audio-connection-kit >=media-libs/libprojectm-qt-2.1.0
-SLOT=0
-SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0243982e746c7f630ed0572c8858d3c
diff --git a/metadata/md5-cache/media-sound/projectm-pulseaudio-2.1.0 b/metadata/md5-cache/media-sound/projectm-pulseaudio-2.1.0
deleted file mode 100644
index 983173099051..000000000000
--- a/metadata/md5-cache/media-sound/projectm-pulseaudio-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-sound/pulseaudio media-libs/ftgl >=media-libs/libprojectm-2.1.0 >=media-libs/libprojectm-qt-2.1.0 virtual/opengl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A Qt GUI for projectM that visualizes your pulseaudio output
-EAPI=5
-HOMEPAGE=http://projectm.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-sound/pulseaudio media-libs/ftgl >=media-libs/libprojectm-2.1.0 >=media-libs/libprojectm-qt-2.1.0 virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a16a96159eabe3b95dde64eaafc534dd
diff --git a/metadata/md5-cache/media-sound/pulseaudio-11.1-r1 b/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
new file mode 100644
index 000000000000..5abdcedb772d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[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(-)?] X? ( >=x11-libs/libX11-1.4.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(-)?] >=x11-libs/libxcb-1.6[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(-)?] x11-libs/libSM[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(-)?] x11-libs/libICE[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(-)?] x11-libs/libXtst[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(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[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(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[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(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd: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(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) sys-devel/m4 doc? ( app-doc/doxygen ) test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto >=x11-libs/libXtst-1.0.99.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libatomic_ops virtual/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool >=sys-devel/gettext-0.18.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A networked sound server with an advanced plugin system
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
+IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )
+PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,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(-)?] ) )
+RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[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(-)?] X? ( >=x11-libs/libX11-1.4.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(-)?] >=x11-libs/libxcb-1.6[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(-)?] x11-libs/libSM[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(-)?] x11-libs/libICE[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(-)?] x11-libs/libXtst[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(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[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(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[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(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd: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(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) )
+REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) udev? ( || ( alsa oss ) )
+SLOT=0
+SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-11.1.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0fcdda1dd18f1cfa0a8fba72a171f966
diff --git a/metadata/md5-cache/media-sound/pulseaudio-11.99.1 b/metadata/md5-cache/media-sound/pulseaudio-11.99.1
new file mode 100644
index 000000000000..8fb185fa8497
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseaudio-11.99.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[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(-)?] X? ( >=x11-libs/libX11-1.4.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(-)?] >=x11-libs/libxcb-1.6[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(-)?] x11-libs/libSM[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(-)?] x11-libs/libICE[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(-)?] x11-libs/libXtst[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(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[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(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) gsettings? ( >=dev-libs/glib-2.26.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[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(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=media-libs/speex-1.2.0 media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd: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(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) sys-devel/m4 doc? ( app-doc/doxygen ) test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto >=x11-libs/libXtst-1.0.99.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libatomic_ops virtual/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool >=sys-devel/gettext-0.18.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A networked sound server with an advanced plugin system
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
+IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome gsettings gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
+PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,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(-)?] ) )
+RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[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(-)?] X? ( >=x11-libs/libX11-1.4.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(-)?] >=x11-libs/libxcb-1.6[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(-)?] x11-libs/libSM[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(-)?] x11-libs/libICE[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(-)?] x11-libs/libXtst[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(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[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(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) gsettings? ( >=dev-libs/glib-2.26.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[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(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=media-libs/speex-1.2.0 media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd: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(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) )
+REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) gsettings? ( !gnome )
+SLOT=0
+SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-11.99.1.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c1af835fff579270daf3548f67be00be
diff --git a/metadata/md5-cache/media-sound/qmmp-1.2.0 b/metadata/md5-cache/media-sound/qmmp-1.2.0
deleted file mode 100644
index e9ba9ad78add..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
-EAPI=6
-HOMEPAGE=http://qmmp.ylsoftware.com
-IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.2.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab8bc1c61cb8501aad0cdc582dd2efc0
diff --git a/metadata/md5-cache/media-sound/qmmp-1.2.2 b/metadata/md5-cache/media-sound/qmmp-1.2.2
new file mode 100644
index 000000000000..94f9cb91c112
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmmp-1.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
+EAPI=6
+HOMEPAGE=http://qmmp.ylsoftware.com
+IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.2.2.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=827a0d3246b3b49b38982dcf4a3bb218
diff --git a/metadata/md5-cache/media-sound/quodlibet-3.7.1 b/metadata/md5-cache/media-sound/quodlibet-3.7.1
deleted file mode 100644
index 149ac81c84e0..000000000000
--- a/metadata/md5-cache/media-sound/quodlibet-3.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/intltool 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(-)] >=sys-apps/sed-4
-DESCRIPTION=audio library tagger, manager, and player for GTK+
-EAPI=5
-HOMEPAGE=http://quodlibet.readthedocs.org
-IUSE=+dbus gstreamer ipod +udev python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-libs/mutagen-1.32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-libs/libsoup x11-libs/gtk+[introspection] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( media-libs/xine-lib ) dbus? ( app-misc/media-player-info dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ipod? ( media-libs/libgpod[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) udev? ( virtual/udev ) !media-plugins/quodlibet-plugins 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=ipod? ( dbus ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-3.7.1.tar.gz -> quodlibet-3.7.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d0995608c52e2e10b4a482496c9fc9a1
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.0.2 b/metadata/md5-cache/media-sound/quodlibet-4.0.2
deleted file mode 100644
index 0d12220e1cee..000000000000
--- a/metadata/md5-cache/media-sound/quodlibet-4.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/intltool 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=audio library tagger, manager, and player for GTK+
-EAPI=6
-HOMEPAGE=http://quodlibet.readthedocs.org
-IUSE=+dbus gstreamer +udev python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/mutagen-1.32[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-libs/libsoup[introspection] x11-libs/gtk+[introspection] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( media-libs/xine-lib ) dbus? ( app-misc/media-player-info dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) udev? ( virtual/udev ) !media-plugins/quodlibet-plugins 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.0.2.tar.gz -> quodlibet-4.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cadbf4351ca11ff25d7b6e10b73b585
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.1.0 b/metadata/md5-cache/media-sound/quodlibet-4.1.0
new file mode 100644
index 000000000000..598c5ed45bde
--- /dev/null
+++ b/metadata/md5-cache/media-sound/quodlibet-4.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/intltool 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=audio library tagger, manager, and player for GTK+
+EAPI=6
+HOMEPAGE=http://quodlibet.readthedocs.org
+IUSE=+dbus gstreamer +udev python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/mutagen-1.32[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-libs/libsoup[introspection] x11-libs/gtk+[introspection] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( media-libs/xine-lib ) dbus? ( app-misc/media-player-info dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) udev? ( virtual/udev ) !media-plugins/quodlibet-plugins 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.1.0.tar.gz -> quodlibet-4.1.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0cadbf4351ca11ff25d7b6e10b73b585
diff --git a/metadata/md5-cache/media-sound/redoflacs-0.19 b/metadata/md5-cache/media-sound/redoflacs-0.19
index 59c0732d8c2c..f22d3fc88319 100644
--- a/metadata/md5-cache/media-sound/redoflacs-0.19
+++ b/metadata/md5-cache/media-sound/redoflacs-0.19
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-shells/bash-4 media-libs/flac sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/sirjaren/redoflacs/tarball/v0.19 -> redoflacs-0.19.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=fcfb196198b96c2d14c94908170f839c
diff --git a/metadata/md5-cache/media-sound/redoflacs-0.30 b/metadata/md5-cache/media-sound/redoflacs-0.30
index 8fb65762c16b..ae654efeb7d0 100644
--- a/metadata/md5-cache/media-sound/redoflacs-0.30
+++ b/metadata/md5-cache/media-sound/redoflacs-0.30
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-shells/bash-4 media-libs/flac sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/sirjaren/redoflacs/tarball/v0.30 -> redoflacs-0.30.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=fcfb196198b96c2d14c94908170f839c
diff --git a/metadata/md5-cache/media-sound/supercollider-3.8.0-r1 b/metadata/md5-cache/media-sound/supercollider-3.8.0-r1
index ae80175554a9..146d4a964ac2 100644
--- a/metadata/md5-cache/media-sound/supercollider-3.8.0-r1
+++ b/metadata/md5-cache/media-sound/supercollider-3.8.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( jack portaudio )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.8.0/SuperCollider-3.8.0-Source-linux.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a11c1b16219404537afbb05f3b9b0114
diff --git a/metadata/md5-cache/media-sound/umurmur-0.2.16a-r1 b/metadata/md5-cache/media-sound/umurmur-0.2.16a-r1
index 920b7a8dce29..fd6089f41c79 100644
--- a/metadata/md5-cache/media-sound/umurmur-0.2.16a-r1
+++ b/metadata/md5-cache/media-sound/umurmur-0.2.16a-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/protobuf-c-1.0.0_rc2 dev-libs/libconfig gnutls? ( >=net-libs/gnutls-3.0.0 ) libressl? ( !gnutls? ( dev-libs/libressl ) ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/umurmur/umurmur/archive/0.2.16a.tar.gz -> umurmur-0.2.16a.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=62b9a8b1e064321b68b29eed35760d93
diff --git a/metadata/md5-cache/media-sound/umurmur-0.2.17-r1 b/metadata/md5-cache/media-sound/umurmur-0.2.17-r1
index 6a7cbd07c9ef..094cb112523b 100644
--- a/metadata/md5-cache/media-sound/umurmur-0.2.17-r1
+++ b/metadata/md5-cache/media-sound/umurmur-0.2.17-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/protobuf-c-1.0.0_rc2 dev-libs/libconfig gnutls? ( >=net-libs/gnutls-3.0.0 ) libressl? ( !gnutls? ( dev-libs/libressl ) ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/umurmur/umurmur/archive/0.2.17.tar.gz -> umurmur-0.2.17.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b84c28b6e928306cafc33dc6d43b6cf
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.2.3.5 b/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
index 0a5d02bf5175..c7d1c364d5c8 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
+++ b/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=alsa? ( media-libs/alsa-lib ) media-sound/timidity-freepats
 SLOT=0
 SRC_URI=mirror://sourceforge/wildmidi/wildmidi-0.2.3.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=524a23617dbc72b9e93da4c6b0bfb053
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.3.6 b/metadata/md5-cache/media-sound/wildmidi-0.3.6
index dfe84270ca50..0d27c4073901 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.3.6
+++ b/metadata/md5-cache/media-sound/wildmidi-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) )
 REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
 SLOT=0
 SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.3.6.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9709e22a98d40eebe411fbe114d494bd
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.3.7 b/metadata/md5-cache/media-sound/wildmidi-0.3.7
index 8ce5e3f4e219..b7c3b8f965aa 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.3.7
+++ b/metadata/md5-cache/media-sound/wildmidi-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) )
 REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
 SLOT=0
 SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.3.7.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=477801f772d20b56ff77df98491284d4
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.3.8 b/metadata/md5-cache/media-sound/wildmidi-0.3.8
index cce40b10c081..b7a1c6827e76 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.3.8
+++ b/metadata/md5-cache/media-sound/wildmidi-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) )
 REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
 SLOT=0
 SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.3.8.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d6b5380bce4806de7c2fc7f56abb0a9a
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index c2f9de61b540..aa12367434b9 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r3 b/metadata/md5-cache/media-tv/kodi-17.6-r3
new file mode 100644
index 000000000000..554eb995dda4
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 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-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi is a free and open source media-player and entertainment hub
+EAPI=6
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 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-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
+REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f735121cb35b8ddab15390625d3e2882
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index cd2b59b46c04..7afe0ef27162 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=python_targets_python2_7 gbm? ( gles ) || ( gles opengl ) ^^ ( gbm
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.1-Leia-Alpha-1.tar.gz -> libdvdcss-1.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdread-6.0.0-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-1.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0-Leia-Alpha-1.tar.gz -> ffmpeg-kodi-4.0-Leia-Alpha-1.tar.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e0fe706bb0517ccd724ca2ef2e1cd26
+_md5_=46ac7ebb59c6528ce7cbd0f9d35ef9c2
diff --git a/metadata/md5-cache/media-tv/mythtv-0.28.1-r4 b/metadata/md5-cache/media-tv/mythtv-0.28.1-r4
index fe62a03f4cc5..efd80f11e9f5 100644
--- a/metadata/md5-cache/media-tv/mythtv-0.28.1-r4
+++ b/metadata/md5-cache/media-tv/mythtv-0.28.1-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qt
 REQUIRED_USE=python_targets_python2_7 bluray? ( xml ) theora? ( vorbis )
 SLOT=0/0.28.1
 SRC_URI=https://github.com/MythTV/mythtv/archive/03f44039848bd09444ff4baa8dc158bd61454079.tar.gz -> mythtv-0.28.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=935fd747b6c52ecc093be7a82b745e13
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 54e68adac950..d2660fdeba5a 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/aravis-0.5.10 b/metadata/md5-cache/media-video/aravis-0.5.10
new file mode 100644
index 000000000000..c957d9b5f99d
--- /dev/null
+++ b/metadata/md5-cache/media-video/aravis-0.5.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.26 dev-libs/libxml2 X? ( >=x11-libs/gtk+-3.12:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libnotify ) caps? ( sys-libs/libcap-ng sys-process/audit ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) virtual/pkgconfig dev-libs/gobject-introspection dev-util/gtk-doc dev-util/intltool
+DESCRIPTION=Library for video acquisition using Genicam cameras
+EAPI=7
+HOMEPAGE=https://live.gnome.org/Aravis
+IUSE=X gstreamer caps
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.26 dev-libs/libxml2 X? ( >=x11-libs/gtk+-3.12:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libnotify ) caps? ( sys-libs/libcap-ng sys-process/audit ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/aravis/0.5/aravis-0.5.10.tar.xz
+_md5_=e176b5da63b6df1209eee9ea4148dfcc
diff --git a/metadata/md5-cache/media-video/aravis-9999 b/metadata/md5-cache/media-video/aravis-9999
index acf345b5c882..93c3eca21651 100644
--- a/metadata/md5-cache/media-video/aravis-9999
+++ b/metadata/md5-cache/media-video/aravis-9999
@@ -1,11 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-base:0.10 media-plugins/gst-plugins-xvideo:0.10 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) virtual/pkgconfig dev-libs/gobject-introspection dev-util/gtk-doc dev-util/intltool dev-vcs/git >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.26 dev-libs/libxml2 X? ( >=x11-libs/gtk+-3.12:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libnotify ) caps? ( sys-libs/libcap-ng sys-process/audit ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) virtual/pkgconfig dev-libs/gobject-introspection >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for video acquisition using Genicam cameras
-EAPI=4
+EAPI=7
 HOMEPAGE=https://live.gnome.org/Aravis
-IUSE=X gstreamer
+IUSE=X gstreamer caps
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-base:0.10 media-plugins/gst-plugins-xvideo:0.10 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+RDEPEND=>=dev-libs/glib-2.26 dev-libs/libxml2 X? ( >=x11-libs/gtk+-3.12:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libnotify ) caps? ( sys-libs/libcap-ng sys-process/audit ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8b4c1f696efda242bf56c4d64072e8d8
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e176b5da63b6df1209eee9ea4148dfcc
diff --git a/metadata/md5-cache/media-video/get_flash_videos-1.24-r1 b/metadata/md5-cache/media-video/get_flash_videos-1.24-r1
index 850528336c85..ccfa9360315c 100644
--- a/metadata/md5-cache/media-video/get_flash_videos-1.24-r1
+++ b/metadata/md5-cache/media-video/get_flash_videos-1.24-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-perl/WWW-Mechanize virtual/perl-Module-CoreList dev-perl/HTML-TokeParser-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/monsieurvideo/get-flash-videos/archive/v1.24.tar.gz -> get_flash_videos-1.24.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3bdaf04caf985ffaf06e0777c966d71b
diff --git a/metadata/md5-cache/media-video/jubler-5.1 b/metadata/md5-cache/media-video/jubler-5.1
index 5ee035b86dcc..a93b377b2a64 100644
--- a/metadata/md5-cache/media-video/jubler-5.1
+++ b/metadata/md5-cache/media-video/jubler-5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mplayer? ( media-video/mplayer[libass] ) spell? ( app-text/aspell ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jubler/Jubler-source-5.1.tar.bz2 -> jubler-5.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=69b073150efdc6aedd66497f4e07f3b6
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ff59976a03d14cfa2a13c0fae8f208ae
diff --git a/metadata/md5-cache/media-video/kino-1.3.4 b/metadata/md5-cache/media-video/kino-1.3.4
deleted file mode 100644
index 94df77b701af..000000000000
--- a/metadata/md5-cache/media-video/kino-1.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.6.0:2 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2:2 x11-libs/libXv dev-libs/libxml2:2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l alsa? ( >=media-libs/alsa-lib-1.0.9 ) virtual/ffmpeg quicktime? ( >=media-libs/libquicktime-0.9.5 ) dev-util/intltool >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Kino is a non-linear DV editor for GNU/Linux
-EAPI=5
-HOMEPAGE=http://www.kinodv.org/
-IUSE=alsa dvdr gpac lame gstreamer quicktime sox vorbis
-KEYWORDS=amd64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.6.0:2 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2:2 x11-libs/libXv dev-libs/libxml2:2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l alsa? ( >=media-libs/alsa-lib-1.0.9 ) virtual/ffmpeg quicktime? ( >=media-libs/libquicktime-0.9.5 ) media-video/mjpegtools media-sound/rawrec dvdr? ( media-video/dvdauthor app-cdr/dvd+rw-tools ) gpac? ( media-video/gpac ) lame? ( media-sound/lame ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) sox? ( media-sound/sox ) vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=mirror://sourceforge/kino/kino-1.3.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76df0668a9e42bc1554ebba606554d1a
diff --git a/metadata/md5-cache/media-video/mediainfo-17.12 b/metadata/md5-cache/media-video/mediainfo-17.12
deleted file mode 100644
index c09be2566b3b..000000000000
--- a/metadata/md5-cache/media-video/mediainfo-17.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.12[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MediaInfo supplies technical and tag information about media files
-EAPI=6
-HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
-IUSE=curl mms wxwidgets
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.12[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-SLOT=0
-SRC_URI=https://mediaarea.net/download/source/mediainfo/17.12/mediainfo_17.12.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=780095202c66fad653d308e0dcc69c5a
diff --git a/metadata/md5-cache/media-video/mediainfo-18.03 b/metadata/md5-cache/media-video/mediainfo-18.03
index d520ef27fff2..6b437c0065ef 100644
--- a/metadata/md5-cache/media-video/mediainfo-18.03
+++ b/metadata/md5-cache/media-video/mediainfo-18.03
@@ -4,10 +4,10 @@ DESCRIPTION=MediaInfo supplies technical and tag information about media files
 EAPI=6
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
 IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-18.03[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/18.03/mediainfo_18.03.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=192464ab6738f01edeefdf1853aeea2a
+_md5_=32dd0965c7a9e72b8e450b64b81aa018
diff --git a/metadata/md5-cache/media-video/mediainfo-18.05 b/metadata/md5-cache/media-video/mediainfo-18.05
new file mode 100644
index 000000000000..565759a73355
--- /dev/null
+++ b/metadata/md5-cache/media-video/mediainfo-18.05
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-18.05[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=MediaInfo supplies technical and tag information about media files
+EAPI=6
+HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
+IUSE=curl mms wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-18.05[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+SLOT=0
+SRC_URI=https://mediaarea.net/download/source/mediainfo/18.05/mediainfo_18.05.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=192464ab6738f01edeefdf1853aeea2a
diff --git a/metadata/md5-cache/media-video/motion-4.0.1-r1 b/metadata/md5-cache/media-video/motion-4.0.1-r1
index c664b81a0b5c..bf61224c8aee 100644
--- a/metadata/md5-cache/media-video/motion-4.0.1-r1
+++ b/metadata/md5-cache/media-video/motion-4.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) virtual/jpeg:= mmal? ( media-libs/raspberrypi-userland ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= )
 SLOT=0
 SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=86f2cdb034d99b5299e4525b4ce2d6fc
diff --git a/metadata/md5-cache/media-video/motion-4.0.1-r2 b/metadata/md5-cache/media-video/motion-4.0.1-r2
index 349f330caec3..5176b54bc85b 100644
--- a/metadata/md5-cache/media-video/motion-4.0.1-r2
+++ b/metadata/md5-cache/media-video/motion-4.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) virtual/jpeg:= mmal? ( media-libs/raspberrypi-userland ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= )
 SLOT=0
 SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6b5bde357ce990f54a9572cdca0076ac
diff --git a/metadata/md5-cache/media-video/motion-4.1.1 b/metadata/md5-cache/media-video/motion-4.1.1
index 5403650563f9..538399534295 100644
--- a/metadata/md5-cache/media-video/motion-4.1.1
+++ b/metadata/md5-cache/media-video/motion-4.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:= ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= )
 SLOT=0
 SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.1.1.tar.gz -> motion-release-4.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=01c723295b67dfdb93055db6b2db5d17
diff --git a/metadata/md5-cache/media-video/motion-4.1.1-r1 b/metadata/md5-cache/media-video/motion-4.1.1-r1
index a085eaa14ceb..9d76b0eaef45 100644
--- a/metadata/md5-cache/media-video/motion-4.1.1-r1
+++ b/metadata/md5-cache/media-video/motion-4.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:= ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= )
 SLOT=0
 SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.1.1.tar.gz -> motion-release-4.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=50c8a5ad64912655fb8bdc9de70e4394
diff --git a/metadata/md5-cache/media-video/mpv-0.27.2 b/metadata/md5-cache/media-video/mpv-0.27.2
index a671cd941154..143d4bc23217 100644
--- a/metadata/md5-cache/media-video/mpv-0.27.2
+++ b/metadata/md5-cache/media-video/mpv-0.27.2
@@ -4,11 +4,11 @@ DESCRIPTION=Media player based on MPlayer and mplayer2
 EAPI=6
 HOMEPAGE=https://mpv.io/
 IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux
 LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
 RDEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13_pre20171219:0 ) x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13_pre20171219:0 ) x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_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_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.27.2.tar.gz -> mpv-0.27.2.tar.gz https://dev.gentoo.org/~kensington/distfiles/mpv-0.27.2-patches-r0.tar.xz https://waf.io/waf-1.9.8
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=878d252c9df3cfd8eb30a0756da77b90
+_md5_=b847debd15978a0ab61da538cab0d52f
diff --git a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r5 b/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r5
index 913a2c52b842..a76511ebd8ba 100644
--- a/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r5
+++ b/metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r5
@@ -4,10 +4,10 @@ DESCRIPTION=A desktop session recorder producing Ogg video/audio files
 EAPI=6
 HOMEPAGE=http://recordmydesktop.sourceforge.net/
 IUSE=alsa jack
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
 SLOT=0
 SRC_URI=mirror://sourceforge/recordmydesktop/recordmydesktop-0.3.8.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3c752a87ec919899394ceb03ae9550e
+_md5_=4ad26626feab9b12a13befcb8cd5b117
diff --git a/metadata/md5-cache/media-video/ushare-1.1a-r6 b/metadata/md5-cache/media-video/ushare-1.1a-r6
index 99ebaaef4dc0..400378a12d28 100644
--- a/metadata/md5-cache/media-video/ushare-1.1a-r6
+++ b/metadata/md5-cache/media-video/ushare-1.1a-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libupnp-1.6.14:0
 SLOT=0
 SRC_URI=http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4fd0951b933756c9445f8524f2239dbc
diff --git a/metadata/md5-cache/media-video/ushare-1.1a-r8 b/metadata/md5-cache/media-video/ushare-1.1a-r8
index 56a073e51d81..bcdd2d687804 100644
--- a/metadata/md5-cache/media-video/ushare-1.1a-r8
+++ b/metadata/md5-cache/media-video/ushare-1.1a-r8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libupnp-1.6.14:0
 SLOT=0
 SRC_URI=http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=593994fa498ccdce6f6c4f1526a08ccd
diff --git a/metadata/md5-cache/media-video/vcsi-7 b/metadata/md5-cache/media-video/vcsi-7
new file mode 100644
index 000000000000..4ede3b9eadaf
--- /dev/null
+++ b/metadata/md5-cache/media-video/vcsi-7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jinja-2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Create thumbnail sheets from video files
+EAPI=6
+HOMEPAGE=https://github.com/amietn/vcsi
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/parsedatetime[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/texttable-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/dejavu media-video/ffmpeg 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/amietn/vcsi/archive/v7.tar.gz -> vcsi-7.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=59c21323d1ae5ed6e97ce8ceca780e50
diff --git a/metadata/md5-cache/media-video/xvid4conf-1.12 b/metadata/md5-cache/media-video/xvid4conf-1.12
index 511c291a62c5..48d341ddc7f9 100644
--- a/metadata/md5-cache/media-video/xvid4conf-1.12
+++ b/metadata/md5-cache/media-video/xvid4conf-1.12
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
 DEPEND=>=x11-libs/gtk+-2.2.4:2 virtual/pkgconfig
 DESCRIPTION=GTK2-configuration dialog for xvid4
-EAPI=2
+EAPI=6
 HOMEPAGE=http://cvs.exit1.org/cgi-bin/viewcvs.cgi/xvid4conf/
 KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.2.4:2
 SLOT=0
 SRC_URI=mirror://gentoo/xvid4conf-1.12.tar.gz
-_md5_=a1639cadb57953c7c799bf55314fd747
+_md5_=83417cd51e4f4c3564f202df8c6ba971
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 5d8aa7ac1947..b6bf67048325 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/arpon-2.7.2 b/metadata/md5-cache/net-analyzer/arpon-2.7.2
index 6c5781896b30..10416842dea1 100644
--- a/metadata/md5-cache/net-analyzer/arpon-2.7.2
+++ b/metadata/md5-cache/net-analyzer/arpon-2.7.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/arpon/ArpON-2.7.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e83a7b3611eaee74cf5c4865ca4ff2c9
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.16 b/metadata/md5-cache/net-analyzer/etherape-0.9.16
deleted file mode 100644
index d2c21f21f9f7..000000000000
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=gnome-base/libglade-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap >=sys-devel/gettext-0.11.5 app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A graphical network monitor for Unix modeled after etherman
-EAPI=6
-HOMEPAGE=http://etherape.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/libglade-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/etherape/etherape-0.9.16.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5a2350fd61a70b03175f6429db41b01
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.17 b/metadata/md5-cache/net-analyzer/etherape-0.9.17
index cc4eeb9bb8b8..b9a96491bcdf 100644
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.17
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.17
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=gnome-base/libglade-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap >=sys-devel/gettext-0.11.5 app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=gnome-base/libglade-2.0 dev-libs/popt gnome-base/libgnomecanvas[glade] net-libs/libpcap >=sys-devel/gettext-0.11.5 app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A graphical network monitor for Unix modeled after etherman
 EAPI=6
 HOMEPAGE=http://etherape.sourceforge.net/
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=gnome-base/libglade-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap
+RDEPEND=>=gnome-base/libglade-2.0 dev-libs/popt gnome-base/libgnomecanvas[glade] net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/etherape/etherape-0.9.17.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5a2350fd61a70b03175f6429db41b01
+_md5_=6745893708f438f11c11a6902849d3b0
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.18 b/metadata/md5-cache/net-analyzer/etherape-0.9.18
new file mode 100644
index 000000000000..43f3f0b8e063
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.18
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0 >=sys-devel/gettext-0.11.5 app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools virtual/pkgconfig
+DESCRIPTION=A graphical network monitor for Unix modeled after etherman
+EAPI=6
+HOMEPAGE=http://etherape.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0
+SLOT=0
+SRC_URI=mirror://sourceforge/etherape/etherape-0.9.18.tar.gz
+_md5_=5a37dae41cdf8ff4e8ed0ee3c8ff6e70
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.33 b/metadata/md5-cache/net-analyzer/munin-2.0.33
deleted file mode 100644
index 106fc102bad9..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-2.0.33
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=6
-HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !<sys-apps/openrc-0.11.8 java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
-SLOT=0
-SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.33.tar.gz -> munin-2.0.33.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.33-gentoo-1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2e333435e1a365c1d2042f25cda8bbaa
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.33-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.33-r1
deleted file mode 100644
index 4ac941caff33..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-2.0.33-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=6
-HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !<sys-apps/openrc-0.11.8 java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
-SLOT=0
-SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.33.tar.gz -> munin-2.0.33.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.33-gentoo-2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4af554d30a10f38c99f1a2da622f4cfb
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.37 b/metadata/md5-cache/net-analyzer/munin-2.0.37
new file mode 100644
index 000000000000..85310a7963b6
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.37
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=6
+HOMEPAGE=http://munin-monitoring.org/
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !<sys-apps/openrc-0.11.8 java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+SLOT=0
+SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.37.tar.gz -> munin-2.0.37.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.37-gentoo-1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d01214cc6b8e08ae77680f0eca13ed6f
diff --git a/metadata/md5-cache/net-analyzer/ntopng-2.4 b/metadata/md5-cache/net-analyzer/ntopng-2.4
index 43ee2de8eb10..c4f0e544c5f5 100644
--- a/metadata/md5-cache/net-analyzer/ntopng-2.4
+++ b/metadata/md5-cache/net-analyzer/ntopng-2.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap net-misc/curl virtual/libmysqlclient !net-libs/nDPI >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Network traffic analyzer with web interface
 EAPI=5
-HOMEPAGE=http://www.ntop.org/
+HOMEPAGE=https://www.ntop.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap net-misc/curl virtual/libmysqlclient !net-libs/nDPI dev-db/redis
 SLOT=0
 SRC_URI=mirror://sourceforge/ntop/ntopng/ntopng-2.4-stable.tar.gz -> ntopng-2.4.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8bb42bc3d0ca56d74dc348a9786c387
+_md5_=f94a6509e1c9dae893405507a8221b7d
diff --git a/metadata/md5-cache/net-analyzer/ntopng-3.0-r2 b/metadata/md5-cache/net-analyzer/ntopng-3.0-r2
index 03c8def599c4..d65eef8a2380 100644
--- a/metadata/md5-cache/net-analyzer/ntopng-3.0-r2
+++ b/metadata/md5-cache/net-analyzer/ntopng-3.0-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst prepare setup
 DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap =net-libs/nDPI-2.0 net-misc/curl sys-libs/binutils-libs virtual/libmysqlclient >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Network traffic analyzer with web interface
 EAPI=6
-HOMEPAGE=http://www.ntop.org/
+HOMEPAGE=https://www.ntop.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap =net-libs/nDPI-2.0 net-misc/curl sys-libs/binutils-libs virtual/libmysqlclient dev-db/redis
 SLOT=0
 SRC_URI=https://github.com/ntop/ntopng/archive/3.0.tar.gz -> ntopng-3.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c846b67f6393c1851812685b34aaab6c
+_md5_=3703f2fa3eb5e247b607d348a44e642c
diff --git a/metadata/md5-cache/net-analyzer/nuttcp-8.1.4 b/metadata/md5-cache/net-analyzer/nuttcp-8.1.4
index 05e64e7516d7..fcdc4b43e96a 100644
--- a/metadata/md5-cache/net-analyzer/nuttcp-8.1.4
+++ b/metadata/md5-cache/net-analyzer/nuttcp-8.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://nuttcp.net/nuttcp/nuttcp-8.1.4.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=f4642d7e09b6797bc777256a5b85f22d
diff --git a/metadata/md5-cache/net-analyzer/openvas-8.0.5-r1 b/metadata/md5-cache/net-analyzer/openvas-8.0.5-r1
index ced8d37d0b01..9e4e3d092044 100644
--- a/metadata/md5-cache/net-analyzer/openvas-8.0.5-r1
+++ b/metadata/md5-cache/net-analyzer/openvas-8.0.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-db/redis >=net-analyzer/openvas-libraries-8.0.5 >=net-analyzer/openvas-scanner-5.0.4 >=net-analyzer/openvas-manager-6.0.6 >=net-analyzer/openvas-cli-1.4.3 net-analyzer/openvas-tools pdf? ( app-text/htmldoc dev-texlive/texlive-latexextra virtual/latex-base )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=67e16ed19be1a6e851b9c9268ca8ca86
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.3.3 b/metadata/md5-cache/net-analyzer/scapy-2.3.3
deleted file mode 100644
index 58ac26043336..000000000000
--- a/metadata/md5-cache/net-analyzer/scapy-2.3.3
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Python interactive packet manipulation program for mastering the network
-EAPI=5
-HOMEPAGE=http://www.secdev.org/projects/scapy/
-IUSE=gnuplot pyx crypt graphviz imagemagick visual tcpreplay python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-analyzer/tcpdump gnuplot? ( dev-python/gnuplot-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pyx? ( dev-python/pyx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) crypt? ( || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) graphviz? ( media-gfx/graphviz ) imagemagick? ( virtual/imagemagick-tools ) visual? ( dev-python/visual ) tcpreplay? ( net-analyzer/tcpreplay ) 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/secdev/scapy/archive/v2.3.3.tar.gz -> scapy-2.3.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b30a8afd2cc0e16a304e5634130e046c
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.0 b/metadata/md5-cache/net-analyzer/scapy-2.4.0
new file mode 100644
index 000000000000..6a8288e482c6
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/scapy-2.4.0
@@ -0,0 +1,14 @@
+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 Python interactive packet manipulation program for mastering the network
+EAPI=6
+HOMEPAGE=http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-analyzer/tcpdump 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/secdev/scapy/archive/v2.4.0.tar.gz -> scapy-2.4.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be0e899d37521b378b5c1d0b87248057
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.0_rc4 b/metadata/md5-cache/net-analyzer/scapy-2.4.0_rc4
deleted file mode 100644
index 58a35c05028d..000000000000
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.0_rc4
+++ /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 Python interactive packet manipulation program for mastering the network
-EAPI=6
-HOMEPAGE=http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-analyzer/tcpdump 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/secdev/scapy/archive/v2.4.0rc4.tar.gz -> scapy-2.4.0_rc4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10c0a794504fda56824bfb0fd9052ff6
diff --git a/metadata/md5-cache/net-analyzer/scapy-9999 b/metadata/md5-cache/net-analyzer/scapy-9999
index cc431276dc8a..f9d7e27db3ff 100644
--- a/metadata/md5-cache/net-analyzer/scapy-9999
+++ b/metadata/md5-cache/net-analyzer/scapy-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-analyzer/tcpdump 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
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5e0b9256ada42603fd7bf89b456a0ca
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e7d1ceee4f4a1f2baaab76b2cd467934
diff --git a/metadata/md5-cache/net-analyzer/suricata-4.0.3 b/metadata/md5-cache/net-analyzer/suricata-4.0.3
index dc364f861d22..d64bddfd3219 100644
--- a/metadata/md5-cache/net-analyzer/suricata-4.0.3
+++ b/metadata/md5-cache/net-analyzer/suricata-4.0.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
 EAPI=5
-HOMEPAGE=http://suricata-ids.org/
+HOMEPAGE=https://suricata-ids.org/
 IUSE=+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng
 SLOT=0
-SRC_URI=http://www.openinfosecfoundation.org/download/suricata-4.0.3.tar.gz
+SRC_URI=https://www.openinfosecfoundation.org/download/suricata-4.0.3.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce599d7322b036aa71c439d1c8442477
+_md5_=271b339805cfa39c5e389b15c15f4cc7
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.6.1 b/metadata/md5-cache/net-analyzer/wireshark-2.6.1
index 6019f6c3e426..e068c392b13d 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.6.1
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
-KEYWORDS=amd64 ~arm ~hppa ia64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm hppa ia64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 SLOT=0/2.6.1
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.6.1.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd82508df823060ecf37db65b54d6920
+_md5_=f0595423081711e0a89a7ac5fc34b2bf
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index a3bc04df61be..975069c2b066 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
-IUSE=adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
+IUSE=adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 SLOT=0/99999999
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bcdc275c4048d99a23047412cad4c90f
+_md5_=1def3722ead894496bd111727e2a30fd
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 915709513383..c92beac4bb8a 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/picocom-3.0 b/metadata/md5-cache/net-dialup/picocom-3.0
index 947cd27448fe..38c5c33f7a6d 100644
--- a/metadata/md5-cache/net-dialup/picocom-3.0
+++ b/metadata/md5-cache/net-dialup/picocom-3.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=minimal dumb-terminal emulation program
 EAPI=6
 HOMEPAGE=https://github.com/npat-efault/picocom
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/npat-efault/picocom/archive/3.0.tar.gz -> picocom-3.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=831d5058ccb1230bbfcf1d5181966222
+_md5_=122506019d73a169154f5145e82c64c1
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.11-r3 b/metadata/md5-cache/net-dialup/rp-pppoe-3.11-r3
index 1da43e423798..2b64f5b8efd7 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.11-r3
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.11-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp:= tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://www.roaringpenguin.com/files/download/rp-pppoe-3.11.tar.gz https://www.samba.org/ftp/pub/ppp/ppp-2.4.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6fbd9155a790278a9f2bb617d02c1242
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1 b/metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1
index b17bd64ede27..3b75b5e6ecf7 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp:= tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=http://www.roaringpenguin.com/files/download/rp-pppoe-3.12.tar.gz https://www.samba.org/ftp/pub/ppp/ppp-2.4.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=87a19d8f893d0ad534bcfa7547b0aedc
diff --git a/metadata/md5-cache/net-dialup/wvdial-1.61 b/metadata/md5-cache/net-dialup/wvdial-1.61
index 71642080cfc5..aa60152f2655 100644
--- a/metadata/md5-cache/net-dialup/wvdial-1.61
+++ b/metadata/md5-cache/net-dialup/wvdial-1.61
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=net-libs/wvstreams-4.4 net-dialup/ppp:=
 SLOT=0
 SRC_URI=https://wvstreams.googlecode.com/files/wvdial-1.61.tar.gz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=c1ca1fa0d6bcbd4b25321e884cddf18f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index aac1499962aa..8fa25cdf0c23 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/djbdns-1.05-r32 b/metadata/md5-cache/net-dns/djbdns-1.05-r32
index 8f0316a22838..869592621356 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r32
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r32
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test27.diff.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08a90fe57ad244b228dcf60bf8f1138f
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r33 b/metadata/md5-cache/net-dns/djbdns-1.05-r33
index 47cf45ba8cae..6eba514554cc 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r33
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r33
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test28.diff.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af3e743656fde4a4ff9a4c764f743bec
diff --git a/metadata/md5-cache/net-dns/dnscap-20130814 b/metadata/md5-cache/net-dns/dnscap-20130814
index c8168b0c10f0..5137be87f7f6 100644
--- a/metadata/md5-cache/net-dns/dnscap-20130814
+++ b/metadata/md5-cache/net-dns/dnscap-20130814
@@ -1,12 +1,11 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=-
 DEPEND=net-libs/libpcap
-DESCRIPTION=dnscap is a network capture utility designed specifically for DNS traffic
-EAPI=5
-HOMEPAGE=http://dnscap.dns-oarc.net/
+DESCRIPTION=network capture utility designed specifically for DNS traffic
+EAPI=7
+HOMEPAGE=https://dnscap.dns-oarc.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/verisign/dnscap/tarball/727ed7d5e46625abc2c8d988689a300589e948b6 -> dnscap-20130814.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b0ae41ad15fbf89efcb4313ed834968
+_md5_=cbd5b29163039305fd7aa248ae76b231
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-1.9.5-r1 b/metadata/md5-cache/net-dns/dnscrypt-proxy-1.9.5-r1
deleted file mode 100644
index cfffe59e69b3..000000000000
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-1.9.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=dev-libs/libsodium:= net-libs/ldns ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A tool for securing communications between a client and a DNS resolver
-EAPI=6
-HOMEPAGE=https://dnscrypt.org
-IUSE=hardened libressl +plugins ssl systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ISC
-RDEPEND=dev-libs/libsodium:= net-libs/ldns ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-1.9.5.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=83de93c14dbce946c83124f54a4b49ec
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.14 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.14
index 5bfc99e19303..7854c9c08ace 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.14
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.14
@@ -9,4 +9,4 @@ LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.14.tar.gz -> dnscrypt-proxy-2.0.14.tar.gz
 _eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e4517c5e2b113a3e0446fb169dee143f
+_md5_=916564b72e2b4bef07127d0b884bb926
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.15 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.15
new file mode 100644
index 000000000000..7bd805d35ec1
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test
+DEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
+EAPI=6
+HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
+IUSE=+filecaps
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.15.tar.gz -> dnscrypt-proxy-2.0.15.tar.gz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=916564b72e2b4bef07127d0b884bb926
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1 b/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
index 61048b0382be..2288c4208ce3 100644
--- a/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
+++ b/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
 SLOT=0
 SRC_URI=https://www.dnssec-tools.org/download/dnssec-tools-2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=7dcf1b138206796c38e73751078291a1
diff --git a/metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3 b/metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
index c79d8b7dc505..6f6cb5bfcae1 100644
--- a/metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
+++ b/metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8.orig.tar.gz mirror://debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-13.3.diff.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b9e435095a6780a1f8af30f43b783f4a
diff --git a/metadata/md5-cache/net-dns/knot-2.6.7 b/metadata/md5-cache/net-dns/knot-2.6.7
new file mode 100644
index 000000000000..4ea11d6f335d
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-2.6.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu dev-python/lmdb net-libs/gnutls caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( net-dns/libidn2 ) ) systemd? ( sys-apps/systemd ) virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=6
+HOMEPAGE=https://www.knot-dns.cz/
+IUSE=doc caps +fastparser idn libidn2 systemd +utils +dnsproxy dnstap +noudp +onlinesign rosedb +rrl +stats +synthrecord +whoami
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu dev-python/lmdb net-libs/gnutls caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( net-dns/libidn2 ) ) systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.6.7.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b9ff11e73ec11667a0353cc204a79f95
diff --git a/metadata/md5-cache/net-dns/unbound-1.7.1 b/metadata/md5-cache/net-dns/unbound-1.7.1
new file mode 100644
index 000000000000..00bcae138270
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21: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(-)?] libressl? ( >=dev-libs/libressl-2.2.4: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(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) dnscrypt? ( dev-libs/libsodium[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(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) 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(+)] ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=5
+HOMEPAGE=http://unbound.net/
+IUSE=debug dnscrypt dnstap +ecdsa gost libressl python selinux static-libs systemd test threads 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 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21: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(-)?] libressl? ( >=dev-libs/libressl-2.2.4: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(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) dnscrypt? ( dev-libs/libsodium[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(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) 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(+)] ) selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://unbound.net/downloads/unbound-1.7.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4baf6cd205b58b9166323bf623332c32
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index c98d162ad5a4..9c991a51b8c2 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.1e b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.1e
index 9ae95e18a116..843b8486e944 100644
--- a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.1e
+++ b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.1e
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables || ( <sys-apps/coreutils-8.20 >sys-apps/coreutils-8.20-r1 ) sys-apps/iproute2 plugins? ( net-dns/bind-tools )
 SLOT=0
 SRC_URI=http://rocky.eld.leidenuniv.nl/arno-iptables-firewall/arno-iptables-firewall_2.0.1e.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17ac356a7ef3fcaf74d4298608ca485e
diff --git a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.2a b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.2a
index a378f85bb43c..4c81e9555601 100644
--- a/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.2a
+++ b/metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.2a
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/ipset net-firewall/iptables >=sys-apps/coreutils-8.21 sys-apps/iproute2 plugins? ( net-dns/bind-tools )
 SLOT=0
 SRC_URI=https://github.com/arno-iptables-firewall/aif/archive/2.0.2a.tar.gz -> arno-iptables-firewall-2.0.2a.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=fe0a25d430ebfc9d66e0cce839fd0540
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1 b/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
index 2dc8ec3735a4..6bba65d514b5 100644
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
@@ -10,5 +10,5 @@ RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[pytho
 REQUIRED_USE=nfqueue? ( server ) python? ( || ( python_targets_python2_7 ) ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
 SLOT=0
 SRC_URI=https://github.com/mrash/fwknop/archive/2.6.9.tar.gz -> fwknop-2.6.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1d9e83c155161ee8f12af2545ca8230e
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.12.4 b/metadata/md5-cache/net-firewall/shorewall-5.1.12.4
deleted file mode 100644
index 1c1e79ddcf98..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-core-5.1.12.4.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-5.1.12.4.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall6-5.1.12.4.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-lite-5.1.12.4.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall6-lite-5.1.12.4.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-init-5.1.12.4.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-docs-html-5.1.12.4.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=eed4fdc369ac0fb546feecf95a73db4e
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.0.2 b/metadata/md5-cache/net-firewall/shorewall-5.2.0.2
deleted file mode 100644
index c8757a7852c8..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-core-5.2.0.2.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-5.2.0.2.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-5.2.0.2.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-lite-5.2.0.2.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-lite-5.2.0.2.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-init-5.2.0.2.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-docs-html-5.2.0.2.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=035b86132f05d41c34ff6a7066b3d954
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.0.3 b/metadata/md5-cache/net-firewall/shorewall-5.2.0.3
deleted file mode 100644
index dd93ba3c1dbd..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-core-5.2.0.3.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-5.2.0.3.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-5.2.0.3.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-lite-5.2.0.3.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-lite-5.2.0.3.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-init-5.2.0.3.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-docs-html-5.2.0.3.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=035b86132f05d41c34ff6a7066b3d954
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.0.4 b/metadata/md5-cache/net-firewall/shorewall-5.2.0.4
index b7fd10e2f5e4..8e4a920a8300 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.0.4
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=6
 HOMEPAGE=http://www.shorewall.net/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
 SRC_URI=http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-core-5.2.0.4.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-5.2.0.4.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-5.2.0.4.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-lite-5.2.0.4.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall6-lite-5.2.0.4.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-init-5.2.0.4.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.0/shorewall-docs-html-5.2.0.4.tar.bz2 )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=035b86132f05d41c34ff6a7066b3d954
+_md5_=fa7a39ed24d6bb5cf35533a498669df3
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index c87d7f599c6b..91f9bded4a73 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/libnfs-2.0.0 b/metadata/md5-cache/net-fs/libnfs-2.0.0
index 6a02f84ab709..fb62b1263474 100644
--- a/metadata/md5-cache/net-fs/libnfs-2.0.0
+++ b/metadata/md5-cache/net-fs/libnfs-2.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=Client library for accessing NFS shares over a network
 EAPI=5
 HOMEPAGE=https://github.com/sahlberg/libnfs
 IUSE=examples static-libs
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh x86
 LICENSE=LGPL-2.1 GPL-3
 SLOT=0/11
 SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-2.0.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de5a31bacf354a27c3a40f3cef50e58f
+_md5_=ac8c669d356a51700b15f68860340ffb
diff --git a/metadata/md5-cache/net-fs/minio-0_pre20180209 b/metadata/md5-cache/net-fs/minio-0_pre20180209
deleted file mode 100644
index 97e9071b0971..000000000000
--- a/metadata/md5-cache/net-fs/minio-0_pre20180209
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/289457568c2c812604484ae9b4efeca0f33aac2c.tar.gz -> minio-0_pre20180209.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9cbe68f8ceb92e027afd9a055eceb39d
diff --git a/metadata/md5-cache/net-fs/minio-0_pre20180330 b/metadata/md5-cache/net-fs/minio-0_pre20180330
deleted file mode 100644
index 8ff56e03857a..000000000000
--- a/metadata/md5-cache/net-fs/minio-0_pre20180330
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/804a4f9c159ecef7093585a5b577e03a382af50e.tar.gz -> minio-0_pre20180330.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d535af8ed18a7ecd42e93d97b8313cb4
diff --git a/metadata/md5-cache/net-fs/minio-0_pre20180412 b/metadata/md5-cache/net-fs/minio-0_pre20180412
deleted file mode 100644
index b0e3287c0efc..000000000000
--- a/metadata/md5-cache/net-fs/minio-0_pre20180412
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/f60765ac93013a554af1b55660764b49cc9b3221.tar.gz -> minio-0_pre20180412.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=75c2af2992db0a52c4bff883dd5844c2
diff --git a/metadata/md5-cache/net-fs/minio-0_pre20180419 b/metadata/md5-cache/net-fs/minio-0_pre20180419
deleted file mode 100644
index 6ddb6189581a..000000000000
--- a/metadata/md5-cache/net-fs/minio-0_pre20180419
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/5a16671f721f4e8f320bc25f60ce4e601ab544e3.tar.gz -> minio-0_pre20180419.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=cd604469a7022f5a29152098a27a5559
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.3.1-r3 b/metadata/md5-cache/net-fs/nfs-utils-2.3.1-r3
index 212642e4bdbf..ecc33921e45e 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.3.1-r3
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.3.1-r3
@@ -4,7 +4,7 @@ DESCRIPTION=NFS client and server daemons
 EAPI=6
 HOMEPAGE=http://linux-nfs.org/
 IUSE=caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid
-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=GPL-2
 RDEPEND=net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
 REQUIRED_USE=kerberos? ( nfsv4 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.3.1.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=42cc099e0f742740e818370dbb2e83fa
+_md5_=9c1c2e011fc3b78af17b85ddfd7df1f5
diff --git a/metadata/md5-cache/net-fs/smbnetfs-0.6.0-r1 b/metadata/md5-cache/net-fs/smbnetfs-0.6.0-r1
index f689717b320c..1a513e6bab03 100644
--- a/metadata/md5-cache/net-fs/smbnetfs-0.6.0-r1
+++ b/metadata/md5-cache/net-fs/smbnetfs-0.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/fuse-2.3 >=net-fs/samba-4.2 >=dev-libs/glib-2.30 gnome? ( gnome-base/libgnome-keyring )
 SLOT=0
 SRC_URI=mirror://sourceforge/smbnetfs/smbnetfs-0.6.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2205274076fe46d8bb9932e1dabd1be6
diff --git a/metadata/md5-cache/net-fs/smbnetfs-0.6.1 b/metadata/md5-cache/net-fs/smbnetfs-0.6.1
index c23616fb8abc..7f4377ffe11f 100644
--- a/metadata/md5-cache/net-fs/smbnetfs-0.6.1
+++ b/metadata/md5-cache/net-fs/smbnetfs-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/fuse-2.3 >=net-fs/samba-4.2 >=dev-libs/glib-2.30 gnome-keyring? ( app-crypt/libsecret )
 SLOT=0
 SRC_URI=mirror://sourceforge/smbnetfs/smbnetfs-0.6.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=00b3e308dd2084182037ceaf60eb610a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 5d01492f75fc..ffd08ac089cd 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/prosody-0.9.14 b/metadata/md5-cache/net-im/prosody-0.9.14
index e3ed350bc330..72d81bd25791 100644
--- a/metadata/md5-cache/net-im/prosody-0.9.14
+++ b/metadata/md5-cache/net-im/prosody-0.9.14
@@ -4,10 +4,10 @@ DESCRIPTION=Prosody is a flexible communications server for Jabber/XMPP written
 EAPI=5
 HOMEPAGE=http://prosody.im/
 IUSE=ipv6 libevent mysql postgres sqlite ssl zlib jit libressl
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=net-im/jabber-base !jit? ( >=dev-lang/lua-5.1:0 ) jit? ( dev-lang/luajit:2 ) >=net-dns/libidn-1.1 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) >=dev-lua/luaexpat-1.3.0 dev-lua/luafilesystem ipv6? ( >=dev-lua/luasocket-3 ) !ipv6? ( dev-lua/luasocket ) libevent? ( >=dev-lua/luaevent-0.4.3 ) mysql? ( dev-lua/luadbi[mysql] ) postgres? ( dev-lua/luadbi[postgres] ) sqlite? ( dev-lua/luadbi[sqlite] ) ssl? ( <dev-lua/luasec-0.6 ) zlib? ( dev-lua/lua-zlib )
 SLOT=0
 SRC_URI=http://prosody.im/tmp/0.9.14/prosody-0.9.14.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d419e5b55dc80857b8d0ad08c8f25064
+_md5_=c9013b0bb5f2330f6f9dc349a460d088
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.15.0.4 b/metadata/md5-cache/net-im/skypeforlinux-8.15.0.4
deleted file mode 100644
index 07365ff5e1e0..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.15.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Instant messaging client, with support for audio and video
-EAPI=6
-HOMEPAGE=https://www.skype.com/
-IUSE=pax_kernel abi_x86_64
-KEYWORDS=~amd64 -*
-LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.15.0.4-1.x86_64.rpm
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba8418b71f52ce9ff95fc668698d3769
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.22.0.2 b/metadata/md5-cache/net-im/skypeforlinux-8.22.0.2
new file mode 100644
index 000000000000..3893ffaa7636
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.22.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=6
+HOMEPAGE=https://www.skype.com/
+IUSE=pax_kernel abi_x86_64
+KEYWORDS=~amd64 -*
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.22.0.2-1.x86_64.rpm
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=537e099203c10ef79ed30f15a8604541
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.2.14 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.2.14
deleted file mode 100644
index 7283031a255e..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.2.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=6
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=~amd64 ~x86
-LICENSE=telegram
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.2.14.tar.gz -> tdesktop-1.2.14.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.2.14.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.2.14.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65d33808da524f29af032f2831776f5d
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.3.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.3.0
new file mode 100644
index 000000000000..c107bb88e332
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=6
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=~amd64 ~x86
+LICENSE=telegram
+RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.3.0.tar.gz -> tdesktop-1.3.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.3.0.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.3.0.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65d33808da524f29af032f2831776f5d
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 3c3e7f68bbb3..eee59e1b503d 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/emech-3.0.3-r1 b/metadata/md5-cache/net-irc/emech-3.0.3-r1
index a76db4050505..a74da6ec9de4 100644
--- a/metadata/md5-cache/net-irc/emech-3.0.3-r1
+++ b/metadata/md5-cache/net-irc/emech-3.0.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.energymech.net/files/emech-3.0.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e23a4e74e44d836414f3e1f1b6b4cddd
diff --git a/metadata/md5-cache/net-irc/emech-3.0.99_p3 b/metadata/md5-cache/net-irc/emech-3.0.99_p3
index 14b82f5ca014..a3720d90bfa5 100644
--- a/metadata/md5-cache/net-irc/emech-3.0.99_p3
+++ b/metadata/md5-cache/net-irc/emech-3.0.99_p3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.energymech.net/files/emech-3.0.99p3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=4fe629a06694f423a134068560621ebc
diff --git a/metadata/md5-cache/net-irc/znc-1.6.5 b/metadata/md5-cache/net-irc/znc-1.6.5
index 3e86ade4ee7a..f6dff9eeaf1d 100644
--- a/metadata/md5-cache/net-irc/znc-1.6.5
+++ b/metadata/md5-cache/net-irc/znc-1.6.5
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) perl? ( >=dev-lang/perl-5.10:= ) python? ( pytho
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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=http://znc.in/releases/archive/znc-1.6.5.tar.gz test? ( https://github.com/google/googletest/archive/release-1.7.0.tar.gz -> googletest-release-1.7.0.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=06e053287af2c0f8697761a931a3fe7e
diff --git a/metadata/md5-cache/net-irc/znc-1.6.6 b/metadata/md5-cache/net-irc/znc-1.6.6
index 6183dabcef85..16bab18844b1 100644
--- a/metadata/md5-cache/net-irc/znc-1.6.6
+++ b/metadata/md5-cache/net-irc/znc-1.6.6
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) perl? ( >=dev-lang/perl-5.10:= ) python? ( pytho
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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=http://znc.in/releases/archive/znc-1.6.6.tar.gz test? ( https://github.com/google/googletest/archive/release-1.7.0.tar.gz -> googletest-release-1.7.0.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6da83d21f366f1f6a9772f74d930fd91
diff --git a/metadata/md5-cache/net-irc/znc-1.7.0 b/metadata/md5-cache/net-irc/znc-1.7.0
index 38247b820197..10912a5e7272 100644
--- a/metadata/md5-cache/net-irc/znc-1.7.0
+++ b/metadata/md5-cache/net-irc/znc-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lan
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 ) icu )
 SLOT=0
 SRC_URI=https://znc.in/releases/archive/znc-1.7.0.tar.gz test? ( https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c8e1e0ee8dae9e0796d4ca541210af5d
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index 03fa58dc7dd6..ddd6103eb9fa 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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_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(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 ) icu )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c8e1e0ee8dae9e0796d4ca541210af5d
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c0b6395a98bd..1db833c5d1b6 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/ldns-1.7.0-r2 b/metadata/md5-cache/net-libs/ldns-1.7.0-r2
index 4ab4abd8b752..32ed579c04ac 100644
--- a/metadata/md5-cache/net-libs/ldns-1.7.0-r2
+++ b/metadata/md5-cache/net-libs/ldns-1.7.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=a library with the aim to simplify DNS programming in C
 EAPI=5
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane doc +ecdsa gost libressl python static-libs vim-syntax 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 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=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(+)] ) ecdsa? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0[-bindist,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(-)?] ) ) !libressl? ( >=dev-libs/openssl-1.0.1e: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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d88fa6afeb74625582663870aa58d050
+_md5_=ca8d024e7744fe18c12856ec0c931f15
diff --git a/metadata/md5-cache/net-libs/liba53-9999 b/metadata/md5-cache/net-libs/liba53-9999
index 3e6817eaa1d2..332f81c4978b 100644
--- a/metadata/md5-cache/net-libs/liba53-9999
+++ b/metadata/md5-cache/net-libs/liba53-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install unpack
-DEPEND=dev-vcs/git
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=A5/3 Call encryption library
 EAPI=5
 HOMEPAGE=https://github.com/RangeNetworks/liba53
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=git-2	45ff482316b52b3f96ff6b7309b77f03
-_md5_=b05a0c4b21c91d06133d28da51048ed0
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8
+_md5_=c69cd0bd7332aa3336e0d3bf958cc513
diff --git a/metadata/md5-cache/net-libs/libhackrf-2014.04.1 b/metadata/md5-cache/net-libs/libhackrf-2014.04.1
deleted file mode 100644
index 24bb7e1d48c5..000000000000
--- a/metadata/md5-cache/net-libs/libhackrf-2014.04.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=library for communicating with HackRF SDR platform
-EAPI=5
-HOMEPAGE=http://greatscottgadgets.com/hackrf/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND=virtual/libusb:1
-SLOT=0/2014.04.1
-SRC_URI=mirror://sourceforge/hackrf/hackrf-2014.04.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=289a11d1c1ceee93dd1e8577a3f18127
diff --git a/metadata/md5-cache/net-libs/libhackrf-2014.08.1 b/metadata/md5-cache/net-libs/libhackrf-2014.08.1
deleted file mode 100644
index eca2864428d1..000000000000
--- a/metadata/md5-cache/net-libs/libhackrf-2014.08.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=library for communicating with HackRF SDR platform
-EAPI=5
-HOMEPAGE=http://greatscottgadgets.com/hackrf/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND=virtual/libusb:1
-SLOT=0/2014.08.1
-SRC_URI=mirror://sourceforge/hackrf/hackrf-2014.08.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1993654fb1830bf7109337993bd086e0
diff --git a/metadata/md5-cache/net-libs/libhackrf-2015.07.2 b/metadata/md5-cache/net-libs/libhackrf-2015.07.2
deleted file mode 100644
index 6ec04b563793..000000000000
--- a/metadata/md5-cache/net-libs/libhackrf-2015.07.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=library for communicating with HackRF SDR platform
-EAPI=5
-HOMEPAGE=http://greatscottgadgets.com/hackrf/
-IUSE=+udev
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND=virtual/libusb:1
-SLOT=0/2015.07.2
-SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2015.07.2/hackrf-2015.07.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d3b2d5af4a6299e36e7741dc93b45f6
diff --git a/metadata/md5-cache/net-libs/libmirisdr-9999 b/metadata/md5-cache/net-libs/libmirisdr-9999
index e31357a5fbc1..9de001b2883b 100644
--- a/metadata/md5-cache/net-libs/libmirisdr-9999
+++ b/metadata/md5-cache/net-libs/libmirisdr-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/libusb:1 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 dev-vcs/git
+DEPEND=virtual/libusb:1 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Software for the Mirics MSi2500 + MSi001 SDR platform
 EAPI=5
 HOMEPAGE=http://cgit.osmocom.org/libmirisdr/
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0/9999
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27840417783f40662c04bf0c392a902b
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c6ca18b2d0aaf93c336985063651adc6
diff --git a/metadata/md5-cache/net-libs/libnsl-1.2.0 b/metadata/md5-cache/net-libs/libnsl-1.2.0
index 3b3be4ea28b2..2c61dae176b8 100644
--- a/metadata/md5-cache/net-libs/libnsl-1.2.0
+++ b/metadata/md5-cache/net-libs/libnsl-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Public client interface for NIS(YP) and NIS+ in a IPv6 ready version
 EAPI=6
 HOMEPAGE=https://github.com/thkukuk/libnsl
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=net-libs/libtirpc[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-libs/glibc-2.26
 SLOT=0/2
 SRC_URI=https://github.com/thkukuk/libnsl/archive/v1.2.0.tar.gz -> libnsl-1.2.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=726933bf4d3741e50abab3b7d7ba325a
+_md5_=153e53beee18a0cd46887d821affde63
diff --git a/metadata/md5-cache/net-libs/libosmo-abis-9999 b/metadata/md5-cache/net-libs/libosmo-abis-9999
index 6d0efd437d75..f0a72037ff98 100644
--- a/metadata/md5-cache/net-libs/libosmo-abis-9999
+++ b/metadata/md5-cache/net-libs/libosmo-abis-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=net-libs/ortp >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=net-libs/ortp >=net-libs/libosmocore-0.11.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Osmocom library for A-bis interface
-EAPI=5
+EAPI=6
 HOMEPAGE=http://openbsc.osmocom.org/trac/wiki/libosmo-abis
 LICENSE=GPL-2 LGPL-3
-RDEPEND=net-libs/ortp
+RDEPEND=net-libs/ortp >=net-libs/libosmocore-0.11.0
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9e9373291668c25ff3e004b26346fec8
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=78cc6c138cd23499c2910c21c3de1dbe
diff --git a/metadata/md5-cache/net-libs/libosmo-dsp-0.3 b/metadata/md5-cache/net-libs/libosmo-dsp-0.3
index 510669651827..ba56583aeacb 100644
--- a/metadata/md5-cache/net-libs/libosmo-dsp-0.3
+++ b/metadata/md5-cache/net-libs/libosmo-dsp-0.3
@@ -10,4 +10,4 @@ RDEPEND=sci-libs/fftw
 SLOT=0/0.3
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/libosmo-dsp-0.3.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e83c40f29e58fb0c2dd8025930c8c9df
+_md5_=02522873bcff427b6dbe7d48719f5832
diff --git a/metadata/md5-cache/net-libs/libosmo-dsp-9999 b/metadata/md5-cache/net-libs/libosmo-dsp-9999
index fa3c428436cb..9e64794316cf 100644
--- a/metadata/md5-cache/net-libs/libosmo-dsp-9999
+++ b/metadata/md5-cache/net-libs/libosmo-dsp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=sci-libs/fftw doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=sci-libs/fftw doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A library with SDR DSP primitives
 EAPI=5
 HOMEPAGE=http://git.osmocom.org/libosmo-dsp/
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=GPL-2
 RDEPEND=sci-libs/fftw
 SLOT=0/9999
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e83c40f29e58fb0c2dd8025930c8c9df
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=02522873bcff427b6dbe7d48719f5832
diff --git a/metadata/md5-cache/net-libs/libosmo-netif-9999 b/metadata/md5-cache/net-libs/libosmo-netif-9999
index b1dbb81891f2..5a070b10903a 100644
--- a/metadata/md5-cache/net-libs/libosmo-netif-9999
+++ b/metadata/md5-cache/net-libs/libosmo-netif-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=net-libs/libosmocore net-libs/libosmo-abis >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=net-libs/libosmocore net-libs/libosmo-abis >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Utility functions for OsmocomBB, OpenBSC and related projects
 EAPI=5
 HOMEPAGE=http://bb.osmocom.org/trac/wiki/
 LICENSE=GPL-2
 RDEPEND=net-libs/libosmocore net-libs/libosmo-abis
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0b5dcb6a46ae77ceb5033d5ee784724
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cca543f29275f01c31c4cf1147b09722
diff --git a/metadata/md5-cache/net-libs/libosmocore-0.8.0 b/metadata/md5-cache/net-libs/libosmocore-0.8.0
index 8e9384864f4d..7ba2a914f901 100644
--- a/metadata/md5-cache/net-libs/libosmocore-0.8.0
+++ b/metadata/md5-cache/net-libs/libosmocore-0.8.0
@@ -10,4 +10,4 @@ RDEPEND=embedded? ( sys-libs/talloc ) pcsc-lite? ( sys-apps/pcsc-lite )
 SLOT=0
 SRC_URI=http://cgit.osmocom.org/cgit/libosmocore/snapshot/libosmocore-0.8.0.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9134ccf16b818730caf70e9aa3de8662
+_md5_=92c9a0df21380dc282955d82a884216e
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1 b/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
index 0c9aa69b497f..aa28a7fc7fb4 100644
--- a/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
+++ b/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
 EAPI=5
 HOMEPAGE=http://libtirpc.sourceforge.net/
 IUSE=ipv6 kerberos static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 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=GPL-2
 RDEPEND=kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.0.2.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5774ae39e5802b7f8f2cd07672131d33
+_md5_=3a6a89e56cb5d5a1213579c888b677ea
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.0.3 b/metadata/md5-cache/net-libs/libtirpc-1.0.3
index 1118023a56ff..7b73975e3962 100644
--- a/metadata/md5-cache/net-libs/libtirpc-1.0.3
+++ b/metadata/md5-cache/net-libs/libtirpc-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
 EAPI=6
 HOMEPAGE=http://libtirpc.sourceforge.net/
 IUSE=ipv6 kerberos static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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=GPL-2
 RDEPEND=kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.0.3.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f0f107be9596a37850742b3c7dbeca0b
+_md5_=5236ad3c40bec53c894d86bfd5749d11
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.10.0 b/metadata/md5-cache/net-libs/mbedtls-2.10.0
new file mode 100644
index 000000000000..ace1da82a294
--- /dev/null
+++ b/metadata/md5-cache/net-libs/mbedtls-2.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cryptographic library for embedded systems
+EAPI=6
+HOMEPAGE=https://tls.mbed.org/
+IUSE=cpu_flags_x86_sse2 doc havege libressl programs test threads zlib 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 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/10
+SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.10.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b78e1baabe5a48b9a0fdbb27d64ef59e
diff --git a/metadata/md5-cache/net-libs/nodejs-10.1.0 b/metadata/md5-cache/net-libs/nodejs-10.1.0
deleted file mode 100644
index 3c8b05b6ffe7..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-10.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v10.1.0/node-v10.1.0.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c93a3e56c8567a2cf58b709d5ebc2537
diff --git a/metadata/md5-cache/net-libs/nodejs-10.4.0 b/metadata/md5-cache/net-libs/nodejs-10.4.0
new file mode 100644
index 000000000000..aae380e2b29a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-10.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.20.3:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.20.3:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v10.4.0/node-v10.4.0.tar.xz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=874aae4600392f391dcaa49bbc238dd6
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0
deleted file mode 100644
index 9407eff6a221..000000000000
--- a/metadata/md5-cache/net-libs/rabbitmq-c-0.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=RabbitMQ C client
-EAPI=5
-HOMEPAGE=https://github.com/alanxz/rabbitmq-c
-IUSE=tools
-KEYWORDS=amd64 ~arm hppa x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.5.0.zip -> rabbitmq-c-v0.5.0.zip
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cdac5c2c527006f9493cafa43dd6ae0
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-0 b/metadata/md5-cache/net-libs/rpcsvc-proto-0
index f4cf13bd8050..ab72af64a8f4 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-0
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-0
@@ -3,8 +3,8 @@ DEPEND=elibc_glibc? ( sys-libs/glibc[rpc(-)] )
 DESCRIPTION=rpcsvc protocol definitions from glibc
 EAPI=6
 HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
-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=LGPL-2.1+ BSD
 RDEPEND=elibc_glibc? ( sys-libs/glibc[rpc(-)] )
 SLOT=0
-_md5_=02a808b43a0d19255f30e9401c98544b
+_md5_=8433ed63fc7f981141a8636441be57b0
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
index f028c4f7f502..b5f3fbbc655e 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=rpcsvc protocol definitions from glibc
 EAPI=6
 HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
-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=LGPL-2.1+ BSD
 RDEPEND=!<sys-libs/glibc-2.26
 SLOT=0
 SRC_URI=https://github.com/thkukuk/rpcsvc-proto/archive/v1.3.1.tar.gz -> rpcsvc-proto-1.3.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=053f14947ef16b13be28ff143a4f9d75
+_md5_=1377a71da7f3119f5dabefb61ea34ab7
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 9e132c14046d..be8de3029f29 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/email-2.5.0 b/metadata/md5-cache/net-mail/email-2.5.0
deleted file mode 100644
index d5ccecf05c17..000000000000
--- a/metadata/md5-cache/net-mail/email-2.5.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst
-DESCRIPTION=Advanced CLI tool for sending email
-EAPI=0
-HOMEPAGE=http://email.cleancode.org
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://email.cleancode.org/download/email-2.5.0.tar.bz2
-_md5_=18590f04a64060727315a98e8a3a70ab
diff --git a/metadata/md5-cache/net-mail/email-3.0.5 b/metadata/md5-cache/net-mail/email-3.0.5
deleted file mode 100644
index f5e4865df35f..000000000000
--- a/metadata/md5-cache/net-mail/email-3.0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup
-DESCRIPTION=Advanced CLI tool for sending email
-EAPI=0
-HOMEPAGE=http://www.cleancode.org/projects/email
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.cleancode.org/downloads/email/email-3.0.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16b0d8d91a1c575e561e473079926c15
diff --git a/metadata/md5-cache/net-mail/email-3.1.2 b/metadata/md5-cache/net-mail/email-3.1.2
deleted file mode 100644
index 0031182c0e1f..000000000000
--- a/metadata/md5-cache/net-mail/email-3.1.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst
-DESCRIPTION=Advanced CLI tool for sending email
-EAPI=0
-HOMEPAGE=http://www.cleancode.org/projects/email
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.cleancode.org/downloads/email/email-3.1.2.tar.bz2
-_md5_=b1cef6f57eadd961a56681626d1d0692
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0
deleted file mode 100644
index 1b900189eda8..000000000000
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=sys-apps/sed-4
-DESCRIPTION=Simple yet powerful mailing list manager for qmail
-EAPI=0
-HOMEPAGE=http://www.ezmlm.org
-IUSE=mysql postgres
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) virtual/qmail
-SLOT=0
-SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4f1b503a773c5d71ddae958098d5139
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1
deleted file mode 100644
index cb7d6f99e837..000000000000
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=sys-apps/sed-4
-DESCRIPTION=Simple yet powerful mailing list manager for qmail
-EAPI=0
-HOMEPAGE=http://www.ezmlm.org
-IUSE=mysql postgres
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) virtual/qmail
-SLOT=0
-SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2c552c98f4b06d60a8adae80244d26c
diff --git a/metadata/md5-cache/net-mail/getmail-5.4 b/metadata/md5-cache/net-mail/getmail-5.4
index abfb2784c8e4..956785050251 100644
--- a/metadata/md5-cache/net-mail/getmail-5.4
+++ b/metadata/md5-cache/net-mail/getmail-5.4
@@ -8,7 +8,7 @@ KEYWORDS=amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=4
+SLOT=0
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.4.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbef4a75ac4700e63f7245a75ffecce7
+_md5_=e69aa9c0d17a1fd1e6d6ae4ecc120ff2
diff --git a/metadata/md5-cache/net-mail/getmail-5.6 b/metadata/md5-cache/net-mail/getmail-5.6
new file mode 100644
index 000000000000..126cbd2089c0
--- /dev/null
+++ b/metadata/md5-cache/net-mail/getmail-5.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A mail retriever with reliable Maildir and mbox delivery
+EAPI=6
+HOMEPAGE=http://pyropus.ca/software/getmail/
+IUSE=ssl python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.6.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f626750aabf5e3a6d62a40175ecd12c9
diff --git a/metadata/md5-cache/net-mail/mailbase-1 b/metadata/md5-cache/net-mail/mailbase-1
deleted file mode 100644
index 97c233738331..000000000000
--- a/metadata/md5-cache/net-mail/mailbase-1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=MTA layout package
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/
-IUSE=pam
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=pam? ( virtual/pam )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63028bca7666cef408cbc788bef232d3
diff --git a/metadata/md5-cache/net-mail/mailbase-1.2 b/metadata/md5-cache/net-mail/mailbase-1.2
deleted file mode 100644
index 6da8f30454db..000000000000
--- a/metadata/md5-cache/net-mail/mailbase-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=MTA layout package
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/
-IUSE=pam
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=pam? ( virtual/pam )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ac54addf8ecec3f356f9b7efe06b69d7
diff --git a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1 b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1
deleted file mode 100644
index 6347f4268e2c..000000000000
--- a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pam
-DESCRIPTION=Password change daemon with PAM support
-EAPI=0
-HOMEPAGE=http://echelon.pl/pubs/poppassd.html
-IUSE=cracklib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/pam sys-apps/xinetd cracklib? ( sys-libs/cracklib )
-SLOT=0
-SRC_URI=http://echelon.pl/pubs/poppassd-1.8.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a162117aee815814c94ba821ee59574
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.10 b/metadata/md5-cache/net-mail/qmailadmin-1.2.10
deleted file mode 100644
index e9f59e503234..000000000000
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 )
-DESCRIPTION=A web interface for managing a qmail system with virtual domains
-EAPI=0
-HOMEPAGE=http://www.inter7.com/qmailadmin.html
-IUSE=maildrop
-KEYWORDS=amd64 arm ~hppa ppc s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 )
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78477b83bd8c01e613b601365a548175
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.12 b/metadata/md5-cache/net-mail/qmailadmin-1.2.12
deleted file mode 100644
index 5777274dd9cf..000000000000
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prerm setup unpack
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A web interface for managing a qmail system with virtual domains
-EAPI=0
-HOMEPAGE=http://www.inter7.com/qmailadmin.html
-IUSE=maildrop vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=54cb5de708160b65bb5ae4910aff724a
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15
deleted file mode 100644
index 3d15143c5def..000000000000
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prerm setup unpack
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=sys-apps/sed-4 >=app-admin/webapp-config-1.50.15 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A web interface for managing a qmail system with virtual domains
-EAPI=0
-HOMEPAGE=http://www.inter7.com/qmailadmin.html
-IUSE=maildrop vhosts
-KEYWORDS=amd64 arm ~hppa ppc s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=9158232fdd6059a25a8cf1494bf01bd7
diff --git a/metadata/md5-cache/net-mail/qmhandle-1.2.0-r1 b/metadata/md5-cache/net-mail/qmhandle-1.2.0-r1
deleted file mode 100644
index e64575a39ec5..000000000000
--- a/metadata/md5-cache/net-mail/qmhandle-1.2.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Qmail message queue tool
-EAPI=0
-HOMEPAGE=http://qmhandle.sourceforge.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail dev-lang/perl sys-process/psmisc
-SLOT=0
-SRC_URI=mirror://sourceforge/qmhandle/qmhandle-1.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=129cb6e0f4a20c89df168967ca57bdc5
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33
index 80f029e1550b..a3d31b41ca8b 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
-DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers
+DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
 EAPI=4
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
 IUSE=clearpasswd ipalias maildrop mysql spamassassin
@@ -10,4 +10,4 @@ RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54ff53813fc61a0c8186f66fae1f347d
+_md5_=ea8118dba1c9975ce89af3d23ca3abae
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
index 53a6199223be..c869e2b1f2ce 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
-DESCRIPTION=A collection of programs to manage virtual email domains and accounts on your Qmail mail servers
+DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
+DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
 EAPI=5
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
 IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) spamassassin? ( mail-filter/spamassassin )
+RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin )
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7159b4c06d8d78b03efbbfe70a48ac41
+_md5_=2a1b6e5ee036004f9366761a20a219e1
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r2 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r2
new file mode 100644
index 000000000000..433868da85c9
--- /dev/null
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=sys-apps/sed-4
+DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
+EAPI=6
+HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
+IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin )
+REQUIRED_USE=mysql? ( !postgres )
+SLOT=0
+SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=42b6c1db336288a09afa11a726ba29e6
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 40c960453270..18b9747f4864 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/bird-1.6.3 b/metadata/md5-cache/net-misc/bird-1.6.3
deleted file mode 100644
index 86cfaa281c48..000000000000
--- a/metadata/md5-cache/net-misc/bird-1.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
-DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
-EAPI=6
-HOMEPAGE=http://bird.network.cz
-IUSE=debug ipv6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline
-SLOT=0
-SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.3.tar.gz
-_md5_=dc47d2a79021d6668ee543caabfd4655
diff --git a/metadata/md5-cache/net-misc/bird-1.6.4 b/metadata/md5-cache/net-misc/bird-1.6.4
new file mode 100644
index 000000000000..6611e9933526
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-1.6.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
+EAPI=6
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug ipv6
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.4.tar.gz
+_md5_=4b8cf262256087f8739f5254ad67e6fb
diff --git a/metadata/md5-cache/net-misc/bird-2.0.2 b/metadata/md5-cache/net-misc/bird-2.0.2
new file mode 100644
index 000000000000..968424dc0825
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-2.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
+EAPI=6
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.0.2.tar.gz
+_md5_=f66b6ecf6b35ea61e3f233ce752e5add
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-63.0.3239.17-r1 b/metadata/md5-cache/net-misc/chrome-remote-desktop-63.0.3239.17-r1
index 0820adc9937c..09113782f796 100644
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-63.0.3239.17-r1
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-63.0.3239.17-r1
@@ -3,11 +3,11 @@ DESCRIPTION=access remote computers via Chrome!
 EAPI=5
 HOMEPAGE=https://support.google.com/chrome/answer/1649523 https://chrome.google.com/remotedesktop
 IUSE=python_targets_python2_7
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=google-chrome
 RDEPEND=app-admin/sudo 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(+)] >=dev-libs/expat-2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-python/psutil gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype:2 sys-devel/gcc sys-libs/glibc sys-libs/pam x11-apps/xdpyinfo x11-apps/setxkbmap x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXtst x11-libs/pango x11-base/xorg-server[xvfb]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_63.0.3239.17_amd64.deb )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52b65c083bdfa1bb98fea718d24ec6e0
+_md5_=fd97f6f88cf75863fcd1d7ac4154504c
diff --git a/metadata/md5-cache/net-misc/curl-7.60.0 b/metadata/md5-cache/net-misc/curl-7.60.0
index f4d0168ff4ca..e3b7ec6ba293 100644
--- a/metadata/md5-cache/net-misc/curl-7.60.0
+++ b/metadata/md5-cache/net-misc/curl-7.60.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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=MIT
 RDEPEND=ldap? ( net-nds/openldap[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(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls: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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] dev-libs/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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(-)?] ) sys-libs/zlib[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(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.60.0.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f22ed90008b18b2a60f40b53b1653978
+_md5_=715374492299fe27ce4dc44a955438fa
diff --git a/metadata/md5-cache/net-misc/dahdi-2.11.1-r1 b/metadata/md5-cache/net-misc/dahdi-2.11.1-r1
new file mode 100644
index 000000000000..de92e0938f12
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dahdi-2.11.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Kernel modules for Digium compatible hardware (formerly known as Zaptel)
+EAPI=6
+HOMEPAGE=http://www.asterisk.org
+IUSE=flash kernel_linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=kernel_linux? ( virtual/modutils )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.11.1.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.2.4.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=108c6f99b356cf8b7a17362a1780c640
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.11.3 b/metadata/md5-cache/net-misc/dhcpcd-6.11.3
index 4ccd88787a26..a5c08df3e425 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.3
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.11.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst
 DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
 DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
-HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
-SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-6.11.3.tar.xz
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-6.11.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49ea9dcecd326ad12a04671922d41144
+_md5_=b299801c9570ca083dc364b1616313bd
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.11.5 b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
index b80153206cfa..fbc28b98bd29 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.5
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst
 DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
 DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
-HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
-SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-6.11.5.tar.xz
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-6.11.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0bf55148fd3f0349299323b66558f459
+_md5_=409ffc38dbc8f67e8ae7066cee99559a
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.0 b/metadata/md5-cache/net-misc/dhcpcd-7.0.0
index 74f80d5b913d..d58c7125e140 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.0
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst
 DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
 DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
-HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
-SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.0.tar.xz
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3818a57e387e63034ce980999665afb1
+_md5_=ead144924dc4e7a30f13ab009d95bc16
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.1 b/metadata/md5-cache/net-misc/dhcpcd-7.0.1
index 171df3fcd94d..9d8c2ed50ebb 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.1
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst
 DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
 DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
-HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
-SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.1.tar.xz
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb61968abc425fb79340ba7635f06b56
+_md5_=0b1521614a4f32d27e1462db371ca732
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.2 b/metadata/md5-cache/net-misc/dhcpcd-7.0.2
index c522be8c45db..ceb78a5e623f 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.2
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst
 DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
 DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
-HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
-SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.2.tar.xz
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe5806965ee6941d23dae3ba65a6747a
+_md5_=e02ede7b1c50064073390a52416b8077
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.3 b/metadata/md5-cache/net-misc/dhcpcd-7.0.3
index 7e797f6a1a72..4eb15c8a814a 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.3
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst
 DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
 DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
-HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
-SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.3.tar.xz
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe5806965ee6941d23dae3ba65a6747a
+_md5_=e02ede7b1c50064073390a52416b8077
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.4 b/metadata/md5-cache/net-misc/dhcpcd-7.0.4
index 46e8d2d0201d..20060a39d26e 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.4
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.4
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst
 DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
 DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
-HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
-SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.4.tar.xz
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe5806965ee6941d23dae3ba65a6747a
+_md5_=e02ede7b1c50064073390a52416b8077
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.5 b/metadata/md5-cache/net-misc/dhcpcd-7.0.5
new file mode 100644
index 000000000000..014bb3255a1f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=6
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
+IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=udev? ( virtual/udev )
+SLOT=0
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.5.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e02ede7b1c50064073390a52416b8077
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.5b b/metadata/md5-cache/net-misc/dhcpcd-7.0.5b
new file mode 100644
index 000000000000..259b3db52dfc
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.5b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=6
+HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=udev? ( virtual/udev )
+SLOT=0
+SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.5b.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fe5806965ee6941d23dae3ba65a6747a
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9999 b/metadata/md5-cache/net-misc/dhcpcd-9999
index a32edf00fa3d..cbf44b418aad 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9999
+++ b/metadata/md5-cache/net-misc/dhcpcd-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install postinst unpack
 DEPEND=udev? ( virtual/udev ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
 DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
-HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe5806965ee6941d23dae3ba65a6747a
+_md5_=e02ede7b1c50064073390a52416b8077
diff --git a/metadata/md5-cache/net-misc/dibbler-1.0.1 b/metadata/md5-cache/net-misc/dibbler-1.0.1
index 6b628b1d4c59..1d5375c40ce3 100644
--- a/metadata/md5-cache/net-misc/dibbler-1.0.1
+++ b/metadata/md5-cache/net-misc/dibbler-1.0.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 hppa ~mips x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://klub.com.pl/dhcpv6/dibbler/dibbler-1.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=958c8599cd0a8aa98baa8cb76f5e6b8e
diff --git a/metadata/md5-cache/net-misc/dropbear-2018.76 b/metadata/md5-cache/net-misc/dropbear-2018.76
index 73a2a5bf9f9f..f03bd85f885a 100644
--- a/metadata/md5-cache/net-misc/dropbear-2018.76
+++ b/metadata/md5-cache/net-misc/dropbear-2018.76
@@ -11,4 +11,4 @@ REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2018.76.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2018.76.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a58298ca7c5e7328bd6ef9eb1f09cdc
+_md5_=66063e79eee02498bb5589030aa38bcc
diff --git a/metadata/md5-cache/net-misc/felix-3.0.1 b/metadata/md5-cache/net-misc/felix-3.0.1
deleted file mode 100644
index de29e572ef62..000000000000
--- a/metadata/md5-cache/net-misc/felix-3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/felix
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectcalico/felix/archive/3.0.1.tar.gz -> felix-3.0.1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz -> github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.tar.gz -> github.com-go-ini-ini-32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/48d644b006ba26f1793bffc46396e981801078e3.tar.gz -> github.com-ipfs-go-log-48d644b006ba26f1793bffc46396e981801078e3.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz -> github.com-onsi-ginkgo-f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz https://github.com/onsi/gomega/archive/c893efa28eb45626cdaa76c9f653b62488858837.tar.gz -> github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz -> github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz https://github.com/projectcalico/typha/archive/0bba94171368573d2a936e02454b1762ff7fba7f.tar.gz -> github.com-projectcalico-typha-0bba94171368573d2a936e02454b1762ff7fba7f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz -> github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/3ff4c2196115d804aa1c747781ad2b2a5c73e140.tar.gz -> github.com-vishvananda-netlink-3ff4c2196115d804aa1c747781ad2b2a5c73e140.tar.gz https://github.com/vishvananda/netns/archive/be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz -> github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz -> github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz https://github.com/golang/net/archive/3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz -> github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz -> github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz -> github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz https://github.com/grpc/grpc-go/archive/8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz -> github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz -> github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz https://github.com/kubernetes/apimachinery/archive/5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz -> github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=2d3ea63c7483e43e17dc195ee2e17c2d
diff --git a/metadata/md5-cache/net-misc/felix-3.0.2 b/metadata/md5-cache/net-misc/felix-3.0.2
deleted file mode 100644
index c835470941d5..000000000000
--- a/metadata/md5-cache/net-misc/felix-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/felix
-IUSE=+bird
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectcalico/felix/archive/3.0.2.tar.gz -> felix-3.0.2.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.tar.gz -> github.com-go-ini-ini-32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/0e2a17b81af445147a78d94a45d4398c4008c219.tar.gz -> github.com-ipfs-go-log-0e2a17b81af445147a78d94a45d4398c4008c219.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz -> github.com-onsi-ginkgo-f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/opentracing/opentracing-go/archive/db37fa5964ade72399b2ac8201123b8623256d75.tar.gz -> github.com-opentracing-opentracing-go-db37fa5964ade72399b2ac8201123b8623256d75.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz -> github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz https://github.com/projectcalico/typha/archive/4308ae102ebdfd52d38ac7a267b5494be1079d05.tar.gz -> github.com-projectcalico-typha-4308ae102ebdfd52d38ac7a267b5494be1079d05.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz -> github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/6e453822d85ef5721799774b654d4d02fed62afb.tar.gz -> github.com-vishvananda-netlink-6e453822d85ef5721799774b654d4d02fed62afb.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz -> github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz -> github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz -> github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/389dfa299845bcf399c16af89987e8775718ea48.tar.gz -> github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz https://github.com/kubernetes/apimachinery/archive/4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz -> github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=227e311b97538eef96e7ed657faf90c3
diff --git a/metadata/md5-cache/net-misc/htpdate-1.0.7 b/metadata/md5-cache/net-misc/htpdate-1.0.7
index 7575ea3f1437..ca8a7019f4f2 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.0.7
+++ b/metadata/md5-cache/net-misc/htpdate-1.0.7
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 sh x86 ~amd64-linux ~
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.0.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d13f70f55565aacbee28a5046b5b5942
diff --git a/metadata/md5-cache/net-misc/htpdate-1.1.3 b/metadata/md5-cache/net-misc/htpdate-1.1.3
index 0f2ef1b1d607..1d1593e85a30 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.1.3
+++ b/metadata/md5-cache/net-misc/htpdate-1.1.3
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.1.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=34138806a767c35c8874bdac2e968e90
diff --git a/metadata/md5-cache/net-misc/htpdate-1.2.0 b/metadata/md5-cache/net-misc/htpdate-1.2.0
index 6c857c85cb41..392471292f95 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.2.0
+++ b/metadata/md5-cache/net-misc/htpdate-1.2.0
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.2.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=8f40dd4e95943f8a778d3415e66ac213
diff --git a/metadata/md5-cache/net-misc/jwhois-3.2.3-r1 b/metadata/md5-cache/net-misc/jwhois-3.2.3-r1
deleted file mode 100644
index af49d98169bc..000000000000
--- a/metadata/md5-cache/net-misc/jwhois-3.2.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Advanced Internet Whois client capable of recursive queries
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/jwhois/
-IUSE=nls
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu/jwhois/jwhois-3.2.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c78027b255174b539f83ae43510a074b
diff --git a/metadata/md5-cache/net-misc/jwhois-4.0 b/metadata/md5-cache/net-misc/jwhois-4.0
deleted file mode 100644
index ef39c93b70db..000000000000
--- a/metadata/md5-cache/net-misc/jwhois-4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=idn? ( net-dns/libidn )
-DESCRIPTION=Advanced Internet Whois client capable of recursive queries
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/jwhois/
-IUSE=idn nls
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn )
-SLOT=0
-SRC_URI=mirror://gnu/jwhois/jwhois-4.0.tar.gz
-_md5_=1c117a1127b066b35021dce1a2ebe5e1
diff --git a/metadata/md5-cache/net-misc/lcr-9999 b/metadata/md5-cache/net-misc/lcr-9999
index ec580e394bad..9a10099dfb23 100644
--- a/metadata/md5-cache/net-misc/lcr-9999
+++ b/metadata/md5-cache/net-misc/lcr-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure postinst prepare unpack
-DEPEND=media-libs/opencore-amr asterisk? ( net-misc/asterisk ) ssl? ( dev-libs/openssl ) gsm-bs? ( net-wireless/openbsc ) sip? ( net-libs/sofia-sip ) gsm-ms? ( net-wireless/osmocom-bb ) dev-vcs/git >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/opencore-amr asterisk? ( net-misc/asterisk ) ssl? ( dev-libs/openssl ) gsm-bs? ( net-wireless/openbsc ) sip? ( net-libs/sofia-sip ) gsm-ms? ( net-wireless/osmocom-bb ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Linux Call Router
 EAPI=5
 HOMEPAGE=http://isdn.eversberg.eu/
@@ -7,5 +7,5 @@ IUSE=asterisk +ssl +gsm-bs +gsm-ms ss5 +sip gsmhr misdn
 LICENSE=GPL-2
 RDEPEND=media-libs/opencore-amr asterisk? ( net-misc/asterisk ) ssl? ( dev-libs/openssl ) gsm-bs? ( net-wireless/openbsc ) sip? ( net-libs/sofia-sip ) gsm-ms? ( net-wireless/osmocom-bb )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d3047444a5b1c0dbd5b7ee472e0991b1
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5bfc29897655f9fb37d3485e236dde01
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.6.12 b/metadata/md5-cache/net-misc/modemmanager-1.6.12
index 080ad36ed8c1..0233e5db7068 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.6.12
+++ b/metadata/md5-cache/net-misc/modemmanager-1.6.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=virtual/libgudev-230:= introspection? ( >=dev
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.6.12.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=580a14acb263935cd9af32d917b32802
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.6.4 b/metadata/md5-cache/net-misc/modemmanager-1.6.4
index 9160957dd66b..559ce398736c 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.6.4
+++ b/metadata/md5-cache/net-misc/modemmanager-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=virtual/libgudev-230:= introspection? ( >=dev
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.6.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cd9b89f37ad36f49b0464d9e26d1c9a1
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.10.0 b/metadata/md5-cache/net-misc/networkmanager-1.10.0
index ca693f93d601..75590a52d9ba 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.10.0
+++ b/metadata/md5-cache/net-misc/networkmanager-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.10/NetworkManager-1.10.0.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eb2c79c2c1bc8e1083c460e3d1420b0b
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.10.2 b/metadata/md5-cache/net-misc/networkmanager-1.10.2
index efbd69a5dd0c..05f9b78b8c7e 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.10.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.10.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.10/NetworkManager-1.10.2.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eb2c79c2c1bc8e1083c460e3d1420b0b
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.10.6 b/metadata/md5-cache/net-misc/networkmanager-1.10.6
index 18832d0a9284..501654f4af26 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.10.6
+++ b/metadata/md5-cache/net-misc/networkmanager-1.10.6
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.10/NetworkManager-1.10.6.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cf308bac9807d6e7d13d274733897153
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1 b/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
index 105de3ba5209..d0b1d7cf406b 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.4/NetworkManager-1.4.4.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0961436b60da6e21fa1eaaf68dddc173
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.8.0 b/metadata/md5-cache/net-misc/networkmanager-1.8.0
index 0d5a55626f17..3e27b9bcbb9f 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.8.0
+++ b/metadata/md5-cache/net-misc/networkmanager-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.8/NetworkManager-1.8.0.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=49b74c5237b0e4b1fd121d62cefd5a18
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.8.2 b/metadata/md5-cache/net-misc/networkmanager-1.8.2
index 38ac7d8fb711..a92d5c348cae 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.8.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.8/NetworkManager-1.8.2.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2a7d0c99f621818e57640e7e7bfd1e47
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.8.4 b/metadata/md5-cache/net-misc/networkmanager-1.8.4
index 2a0b58b225bd..d9a2e69f7e5e 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.8.4
+++ b/metadata/md5-cache/net-misc/networkmanager-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.8/NetworkManager-1.8.4.tar.xz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d26edf6f1ac838f04213956dc957e42c
diff --git a/metadata/md5-cache/net-misc/openssh-7.7_p1-r4 b/metadata/md5-cache/net-misc/openssh-7.7_p1-r4
new file mode 100644
index 000000000000..23ea043c17f4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.7_p1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend test
+DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=6
+HOMEPAGE=https://www.openssh.com/
+IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509
+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=BSD GPL-2
+RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.7p1.tar.gz https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-patches-1.1.tar.xz sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-sctp-1.0.patch.xz ) hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-hpnssh14v15-gentoo1.patch.xz ) X509? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-x509-11.3.1.patch.xz )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=19ef38b95749593e9539b5f34ee2869f
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.4 b/metadata/md5-cache/net-misc/quagga-1.2.4
index 1e06b2fc84ec..ec1a13278d7a 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.4
+++ b/metadata/md5-cache/net-misc/quagga-1.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.4.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=049e8252a80effaca5eadb3198ed8101
diff --git a/metadata/md5-cache/net-misc/radvd-2.14 b/metadata/md5-cache/net-misc/radvd-2.14
index 79e999ff4d17..a71b3683c4fa 100644
--- a/metadata/md5-cache/net-misc/radvd-2.14
+++ b/metadata/md5-cache/net-misc/radvd-2.14
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.14.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=391495b8880d9a025851b5368b490bd0
diff --git a/metadata/md5-cache/net-misc/radvd-2.17-r1 b/metadata/md5-cache/net-misc/radvd-2.17-r1
index 203369633f86..0bfe0b7dfa3c 100644
--- a/metadata/md5-cache/net-misc/radvd-2.17-r1
+++ b/metadata/md5-cache/net-misc/radvd-2.17-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.17.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cca52ea4b8997fa2e3f138dd6d4d79f6
diff --git a/metadata/md5-cache/net-misc/rancid-2.3.8 b/metadata/md5-cache/net-misc/rancid-2.3.8
index 0374daf5ac59..8e0234aecce0 100644
--- a/metadata/md5-cache/net-misc/rancid-2.3.8
+++ b/metadata/md5-cache/net-misc/rancid-2.3.8
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( cvs subversion )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/r/rancid/rancid_2.3.8.orig.tar.gz -> rancid-2.3.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=523c8c91f0c16726210bc0f580efde03
diff --git a/metadata/md5-cache/net-misc/rancid-git-2.3.8 b/metadata/md5-cache/net-misc/rancid-git-2.3.8
index cec14cc70793..3493a04cfba1 100644
--- a/metadata/md5-cache/net-misc/rancid-git-2.3.8
+++ b/metadata/md5-cache/net-misc/rancid-git-2.3.8
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( git cvs subversion )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/dotwaffle/rancid-git/archive/2.3.8.tar.gz -> rancid-git-2.3.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aa6a89c5750c8c8d930a024c32811411
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.30.1 b/metadata/md5-cache/net-misc/remmina-1.2.30.1
new file mode 100644
index 000000000000..1d0236c34321
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.2.30.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
+EAPI=6
+HOMEPAGE=https://remmina.org/
+IUSE=ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.30.1.tar.gz -> Remmina-1.2.30.1.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f8fcef83407452a0587bcb8386b4e85
diff --git a/metadata/md5-cache/net-misc/scponly-4.8-r5 b/metadata/md5-cache/net-misc/scponly-4.8-r5
index 38132b943d9e..1432bdd688bb 100644
--- a/metadata/md5-cache/net-misc/scponly-4.8-r5
+++ b/metadata/md5-cache/net-misc/scponly-4.8-r5
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/sed net-misc/openssh quota? ( sys-fs/quota ) rsync? ( net-misc/
 REQUIRED_USE=|| ( sftp scp winscp rsync unison subversion )
 SLOT=0
 SRC_URI=mirror://sourceforge/scponly/scponly-4.8.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd3210e8d2cf1c2a3dabf3abb9023ee6
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r2 b/metadata/md5-cache/net-misc/sks-1.1.6-r2
index 78f5fed2eb6a..abfc31e25d76 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r2
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/findlib dev-ml/camlp4 dev-ml/cryptokit:0/1.10 sys-libs/db:5.3
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=5e74300c68d8a6ddfb354fe2d8e43134
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r4 b/metadata/md5-cache/net-misc/sks-1.1.6-r4
index 69255b5f8686..a29b15a53e14 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r4
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.3
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=f0cf4fbb2fe0124e2262e6a2f8307577
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r5 b/metadata/md5-cache/net-misc/sks-1.1.6-r5
index 9199d0c49425..d5d1b30b4281 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r5
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.3
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d2a77c6e7e33223517d52c9898d97879
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.33-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.33-r2
index 1e6c8dc9aede..7f13b3669c14 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.33-r2
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.33-r2
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pu
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.33.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4f2ebcbedcd3ecadcc4a8dc561ead3c9
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.34-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.34-r2
index 3c92b2abe23e..13c4a2d639ea 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.34-r2
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.34-r2
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pu
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.34.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dbe01d21410dc84a9378c802ad930e8d
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.34-r3 b/metadata/md5-cache/net-misc/spice-gtk-0.34-r3
index e298a4d931be..740d618a0387 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.34-r3
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.34-r3
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pu
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.34.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0f039d1b4ec68cee3c02902415e1291c
diff --git a/metadata/md5-cache/net-misc/spice-gtk-9999 b/metadata/md5-cache/net-misc/spice-gtk-9999
index 9fc6767158ce..d7f58adb4cf0 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-9999
+++ b/metadata/md5-cache/net-misc/spice-gtk-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 )
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=778ae97b35fbb3bd35da77a897a9d3fd
diff --git a/metadata/md5-cache/net-misc/ttytter-2.1.00 b/metadata/md5-cache/net-misc/ttytter-2.1.00
index 9cca283ed115..cdfa82a800ea 100644
--- a/metadata/md5-cache/net-misc/ttytter-2.1.00
+++ b/metadata/md5-cache/net-misc/ttytter-2.1.00
@@ -7,5 +7,5 @@ LICENSE=FFSL
 RDEPEND=>=dev-lang/perl-5.8 || ( net-misc/curl www-client/lynx )
 SLOT=0
 SRC_URI=http://www.floodgap.com/software/ttytter/dist2/2.1.00.txt -> ttytter-2.1.00.txt
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=410e252c6b550a9fd63cd0f72c0b3867
diff --git a/metadata/md5-cache/net-misc/wicd-1.7.4-r3 b/metadata/md5-cache/net-misc/wicd-1.7.4-r3
index e24cfb7c20ae..c1a0c3b3b75d 100644
--- a/metadata/md5-cache/net-misc/wicd-1.7.4-r3
+++ b/metadata/md5-cache/net-misc/wicd-1.7.4-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?,xml]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/wicd/1.7/1.7.4/+download/wicd-1.7.4.tar.gz mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz ) ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ecbe890493a07dca7bd4c053d2d754d4
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.05.09 b/metadata/md5-cache/net-misc/youtube-dl-2018.05.09
deleted file mode 100644
index 8b3a03a10fb1..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.05.09
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
-EAPI=6
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/setuptools[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://youtube-dl.org/downloads/2018.05.09/youtube-dl-2018.05.09.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31e1b5039d70c0829fe39d5512ab45ea
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.05.18 b/metadata/md5-cache/net-misc/youtube-dl-2018.05.18
index f95815d51ece..6fe7db5ca152 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.05.18
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.05.18
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2018.05.18/youtube-dl-2018.05.18.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=31e1b5039d70c0829fe39d5512ab45ea
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.06.04 b/metadata/md5-cache/net-misc/youtube-dl-2018.06.04
new file mode 100644
index 000000000000..3b38e192451d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.06.04
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/setuptools[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://youtube-dl.org/downloads/2018.06.04/youtube-dl-2018.06.04.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31e1b5039d70c0829fe39d5512ab45ea
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 31e1f770b231..1c4b432612ba 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.44 b/metadata/md5-cache/net-nds/openldap-2.4.44
index 20b5b2816fea..8acd90a22ef3 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.44
+++ b/metadata/md5-cache/net-nds/openldap-2.4.44
@@ -4,11 +4,11 @@ DESCRIPTION=LDAP suite of application and development tools
 EAPI=5
 HOMEPAGE=http://www.OpenLDAP.org/
 IUSE=crypt samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs smbkrb5passwd kerberos kinit -cxx 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 ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris
 LICENSE=OPENLDAP GPL-2
 RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libgcrypt-1.5.3: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(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) berkdb? ( <sys-libs/db-6.0:= || ( 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 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap )
 REQUIRED_USE=cxx? ( sasl ) ?? ( gnutls libressl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.44.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ca69b3a152a94323923ba437c991c458
+_md5_=22570e4c764a267ee4a39bcb26ef9510
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 2428bfc8d915..f41333202215 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/slrn-1.0.3 b/metadata/md5-cache/net-nntp/slrn-1.0.3
index 0af15277a414..189f34114e0c 100644
--- a/metadata/md5-cache/net-nntp/slrn-1.0.3
+++ b/metadata/md5-cache/net-nntp/slrn-1.0.3
@@ -4,9 +4,9 @@ DESCRIPTION=A s-lang based newsreader
 EAPI=6
 HOMEPAGE=http://slrn.sourceforge.net/
 IUSE=canlock libressl nls ssl uudeview
-KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-arch/sharutils >=sys-libs/slang-2.2.3 virtual/mta canlock? ( net-libs/canlock ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) uudeview? ( dev-libs/uulib )
 SLOT=0
 SRC_URI=https://jedsoft.org/releases/slrn/slrn-1.0.3a.tar.bz2
-_md5_=4729831aa8602f05f6c87fafd8e35a91
+_md5_=f7f0d5f66837b52e97cc95c476d764fe
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 6592e032c90a..0c2d4dd3ff8a 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/resilio-sync-2.5.12 b/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
index f787e59cde0e..a491f9e00af3 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.5.12-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.5.12-1_i386.deb )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=630950300abc8cdddaaf066acc01d470
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 92943ca5af21..48a082ef94e9 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=dev-libs/libb64:0= >=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3dd350da0511ba2af5a26af92b9cef0e
diff --git a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1 b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
index a0871d2a072a..07d46c4e2c89 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
+++ b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.8.1.2
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.40 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 >=dev-java/swt-3.7.2-r1:3.7[cairo] >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_4812/Vuze_4812_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=29098e2ad0dd30e6f9e15d567611fea2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=116c2afce6beb73290c3e0a680e7123c
diff --git a/metadata/md5-cache/net-p2p/vuze-5.7.2.0 b/metadata/md5-cache/net-p2p/vuze-5.7.2.0
index ffa3677a700b..45bbee8f72a0 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.7.2.0
+++ b/metadata/md5-cache/net-p2p/vuze-5.7.2.0
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-5.7.2.0
 RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5720/Vuze_5720_source.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a63e7baf5cb47e3aa8719129e5408bad
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b5f7164ba64c37a748618f68a7478560
diff --git a/metadata/md5-cache/net-p2p/vuze-5.7.2.0-r1 b/metadata/md5-cache/net-p2p/vuze-5.7.2.0-r1
index d680bf354afd..2a9500e557eb 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.7.2.0-r1
+++ b/metadata/md5-cache/net-p2p/vuze-5.7.2.0-r1
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-5.7.2.0
 RDEPEND=dev-java/log4j:0 dev-java/swt:3.8[cairo] dev-java/commons-cli:1 dev-java/json-simple:0 dev-java/commons-lang:2.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5720/Vuze_5720_source.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e2001810ea65ff09ef7bbdc62c2a00e2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=77ef5f29a51118321bad030637cc8637
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 87c6ef3fb361..599c7c5c7ee9 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/cups-2.1.4 b/metadata/md5-cache/net-print/cups-2.1.4
deleted file mode 100644
index a469e2d856d6..000000000000
--- a/metadata/md5-cache/net-print/cups-2.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=dev-libs/libgcrypt-1.5.3: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(-)?] >=net-libs/gnutls-2.12.23-r6[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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=The Common Unix Printing System
-EAPI=6
-HOMEPAGE=https://www.cups.org/
-IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf 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 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
-LICENSE=GPL-2
-PDEPEND=>=net-print/cups-filters-1.0.43
-RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=dev-libs/libgcrypt-1.5.3: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(-)?] >=net-libs/gnutls-2.12.23-r6[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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/apple/cups/archive/release-2.1.4.tar.gz -> cups-2.1.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d60e46a5bd0148534bed0931cc9e0978
diff --git a/metadata/md5-cache/net-print/cups-2.2.6 b/metadata/md5-cache/net-print/cups-2.2.6
deleted file mode 100644
index 6ca046f7b0eb..000000000000
--- a/metadata/md5-cache/net-print/cups-2.2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=The Common Unix Printing System
-EAPI=6
-HOMEPAGE=https://www.cups.org/
-IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf 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 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
-LICENSE=GPL-2
-PDEPEND=>=net-print/cups-filters-1.0.43
-RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/apple/cups/archive/v2.2.6.tar.gz -> cups-2.2.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=380c139367fefa146d9547c88dfc638b
diff --git a/metadata/md5-cache/net-print/cups-2.2.8 b/metadata/md5-cache/net-print/cups-2.2.8
new file mode 100644
index 000000000000..5474bd625b58
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-2.2.8
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=The Common Unix Printing System
+EAPI=6
+HOMEPAGE=https://www.cups.org/
+IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf 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 python_targets_python2_7 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
+LICENSE=GPL-2
+PDEPEND=>=net-print/cups-filters-1.0.43
+RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=62a7e09d720078f347f7ccc15f7fcd00
diff --git a/metadata/md5-cache/net-print/cups-2.3_beta4 b/metadata/md5-cache/net-print/cups-2.3_beta4
deleted file mode 100644
index baac42af2736..000000000000
--- a/metadata/md5-cache/net-print/cups-2.3_beta4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=The Common Unix Printing System
-EAPI=6
-HOMEPAGE=https://www.cups.org/
-IUSE=acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf 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 python_targets_python2_7
-LICENSE=Apache-2.0
-PDEPEND=>=net-print/cups-filters-1.0.43
-RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) selinux? ( sec-policy/selinux-cups )
-REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/apple/cups/releases/download/v2.3b4/cups-2.3b4-source.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0ef29f0d3dded57b4d6821ee56d5e42
diff --git a/metadata/md5-cache/net-print/cups-2.3_beta5 b/metadata/md5-cache/net-print/cups-2.3_beta5
new file mode 100644
index 000000000000..02dafd12faf9
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-2.3_beta5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=The Common Unix Printing System
+EAPI=6
+HOMEPAGE=https://www.cups.org/
+IUSE=acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf 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
+LICENSE=Apache-2.0
+PDEPEND=>=net-print/cups-filters-1.0.43
+RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) selinux? ( sec-policy/selinux-cups )
+REQUIRED_USE=usb? ( threads )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/apple/cups/releases/download/v2.3b5/cups-2.3b5-source.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5bd985407fad06b6c58cbfe1f880172e
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 41b26c6163cf..ae6317ccb0db 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=The Common Unix Printing System
 EAPI=6
 HOMEPAGE=https://www.cups.org/
-IUSE=acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf 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 python_targets_python2_7
+IUSE=acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf 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
 LICENSE=Apache-2.0
 PDEPEND=>=net-print/cups-filters-1.0.43
-RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) selinux? ( sec-policy/selinux-cups )
-REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
+RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) selinux? ( sec-policy/selinux-cups )
+REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0ef29f0d3dded57b4d6821ee56d5e42
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5bd985407fad06b6c58cbfe1f880172e
diff --git a/metadata/md5-cache/net-print/cups-pdf-2.6.1 b/metadata/md5-cache/net-print/cups-pdf-2.6.1
index 3f3d45c2ec7f..3ca929e5b446 100644
--- a/metadata/md5-cache/net-print/cups-pdf-2.6.1
+++ b/metadata/md5-cache/net-print/cups-pdf-2.6.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst
 DEPEND=net-print/cups app-text/ghostscript-gpl
 DESCRIPTION=Provides a virtual printer for CUPS to produce PDF files
 EAPI=4
-HOMEPAGE=http://www.cups-pdf.de/
+HOMEPAGE=https://www.cups-pdf.de/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups app-text/ghostscript-gpl
 SLOT=0
-SRC_URI=http://www.cups-pdf.de/src/cups-pdf_2.6.1.tar.gz
+SRC_URI=https://www.cups-pdf.de/src/cups-pdf_2.6.1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3ae040a0d0642cc35355a280684512f5
+_md5_=fb92eb208283aa9845ea5d8aaefd45dd
diff --git a/metadata/md5-cache/net-print/cups-pdf-3.0.0 b/metadata/md5-cache/net-print/cups-pdf-3.0.0
index bb10dbfdacd2..6e3eae3a67d2 100644
--- a/metadata/md5-cache/net-print/cups-pdf-3.0.0
+++ b/metadata/md5-cache/net-print/cups-pdf-3.0.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install
 DEPEND=net-print/cups app-text/ghostscript-gpl
 DESCRIPTION=Provides a virtual printer for CUPS to produce PDF files
 EAPI=6
-HOMEPAGE=http://www.cups-pdf.de/
+HOMEPAGE=https://www.cups-pdf.de/
 IUSE=+ppds
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=net-print/cups app-text/ghostscript-gpl
 SLOT=0
-SRC_URI=http://www.cups-pdf.de/src/cups-pdf_3.0.0.tar.gz
+SRC_URI=https://www.cups-pdf.de/src/cups-pdf_3.0.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3e6ee67c5af52489fb73126c5c88ceec
+_md5_=590f7ce91bd4201a73af077077cfd8ca
diff --git a/metadata/md5-cache/net-print/cups-pdf-3.0.1 b/metadata/md5-cache/net-print/cups-pdf-3.0.1
index 4ace0d22dc3d..fedef00f8a0e 100644
--- a/metadata/md5-cache/net-print/cups-pdf-3.0.1
+++ b/metadata/md5-cache/net-print/cups-pdf-3.0.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install
 DEPEND=net-print/cups app-text/ghostscript-gpl
 DESCRIPTION=Provides a virtual printer for CUPS to produce PDF files
 EAPI=6
-HOMEPAGE=http://www.cups-pdf.de/
+HOMEPAGE=https://www.cups-pdf.de/
 IUSE=+ppds
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=net-print/cups app-text/ghostscript-gpl
 SLOT=0
-SRC_URI=http://www.cups-pdf.de/src/cups-pdf_3.0.1.tar.gz
+SRC_URI=https://www.cups-pdf.de/src/cups-pdf_3.0.1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3e6ee67c5af52489fb73126c5c88ceec
+_md5_=590f7ce91bd4201a73af077077cfd8ca
diff --git a/metadata/md5-cache/net-print/gtklp-1.3.1 b/metadata/md5-cache/net-print/gtklp-1.3.1
index 2073f3a80869..345e071e5cda 100644
--- a/metadata/md5-cache/net-print/gtklp-1.3.1
+++ b/metadata/md5-cache/net-print/gtklp-1.3.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=x11-libs/gtk+:2 net-print/cups nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A GUI for cupsd
 EAPI=6
-HOMEPAGE=http://gtklp.sirtobi.com/
+HOMEPAGE=https://gtklp.sirtobi.com/
 IUSE=nls ssl
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/gtk+:2 net-print/cups nls? ( sys-devel/gettext ) ssl? ( dev-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/gtklp/gtklp-1.3.1.src.tar.gz mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb0c5879180f609005c1ade333f2b050
+_md5_=bca1d5c99b5c3adc308e39eb27920036
diff --git a/metadata/md5-cache/net-print/hplip-3.17.10 b/metadata/md5-cache/net-print/hplip-3.17.10
index a83d82174dd1..ab6554f0e8be 100644
--- a/metadata/md5-cache/net-print/hplip-3.17.10
+++ b/metadata/md5-cache/net-print/hplip-3.17.10
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( 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=mirror://sourceforge/hplip/hplip-3.17.10.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.17.9-patches-1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=652b2320da3d9ce23b96fd7814566395
diff --git a/metadata/md5-cache/net-print/hplip-3.18.4 b/metadata/md5-cache/net-print/hplip-3.18.4
index 601ab20e51c2..86d9c2f38e4c 100644
--- a/metadata/md5-cache/net-print/hplip-3.18.4
+++ b/metadata/md5-cache/net-print/hplip-3.18.4
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( 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=mirror://sourceforge/hplip/hplip-3.18.4.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.3-patches-2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4818315439d10c9328b25f4f9f201aa0
diff --git a/metadata/md5-cache/net-print/hplip-3.18.5 b/metadata/md5-cache/net-print/hplip-3.18.5
index 6beb38d1082a..57636aa1744a 100644
--- a/metadata/md5-cache/net-print/hplip-3.18.5
+++ b/metadata/md5-cache/net-print/hplip-3.18.5
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( 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=mirror://sourceforge/hplip/hplip-3.18.5.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.3-patches-2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=1ea7b810c01d701e312eded98416fce5
diff --git a/metadata/md5-cache/net-proxy/3proxy-0.5.3k b/metadata/md5-cache/net-proxy/3proxy-0.5.3k
deleted file mode 100644
index da0297decbf2..000000000000
--- a/metadata/md5-cache/net-proxy/3proxy-0.5.3k
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=really tiny cross-platform proxy servers set
-EAPI=0
-HOMEPAGE=http://www.security.nnov.ru/soft/3proxy/
-KEYWORDS=amd64 ppc x86
-LICENSE=3proxy
-SLOT=0
-SRC_URI=http://www.security.nnov.ru/soft/3proxy/0.5.3k/3proxy-0.5.3k.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48905b135a6a9ae362483bb3a470c152
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 4a6ae108eedc..b9d1e4701279 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.7.11 b/metadata/md5-cache/net-proxy/haproxy-1.7.11
new file mode 100644
index 000000000000..39956e5ae740
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.7.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=6
+HOMEPAGE=http://haproxy.1wt.eu
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.7/src/haproxy-1.7.11.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=512f025ee4a7e6657f838b44c540dfc7
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.9 b/metadata/md5-cache/net-proxy/haproxy-1.8.9
new file mode 100644
index 000000000000..9052c34842e8
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=6
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.9.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b84c8d95972675fd4b84c28a701ffa45
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index d29fb6f2b4d5..a8ceaaf71840 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.06-r1 b/metadata/md5-cache/net-vpn/openconnect-7.06-r1
index a7e3b009e3ac..6e80e51432d5 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.06-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=eeaf34990dfc7114301c432f13de6932
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.06-r4 b/metadata/md5-cache/net-vpn/openconnect-7.06-r4
index f146c976631b..6f130eef7791 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.06-r4
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06-r4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=52dadf5a1766b7724409308b185fe966
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614 b/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
index 2fe6b8e4d442..8d33f5bce241 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=https://dev.gentoo.org/~williamh/dist/openconnect-7.06_p20160614.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=68fd9dad3a62d2492aa79db0db313cf3
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.07-r1 b/metadata/md5-cache/net-vpn/openconnect-7.07-r1
index cf653c807d36..61d6086e03ae 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.07.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20160829.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e21174e993036ca5d099389edd0530f3
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.07-r2 b/metadata/md5-cache/net-vpn/openconnect-7.07-r2
index e8e3a73166f7..6ead01921ce6 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r2
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.07.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20160829.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b0f19eda0e1d1d326ef4db0feb7123a0
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.07-r3 b/metadata/md5-cache/net-vpn/openconnect-7.07-r3
index fc582b05462e..d7e645ecaf96 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r3
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.07.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20160829.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4b2df63397dff05e4339d2972b877c94
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.08 b/metadata/md5-cache/net-vpn/openconnect-7.08
index 9a2aa58fe801..e3ec46174df4 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.08
+++ b/metadata/md5-cache/net-vpn/openconnect-7.08
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20160829.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=3117f3542b802805c4e56b72f69470ab
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.08-r1 b/metadata/md5-cache/net-vpn/openconnect-7.08-r1
index da4273e6f4f6..906efccc94db 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.08-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.08-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20180227.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=00b773f86cbf55118872b54bdd2c6bc1
diff --git a/metadata/md5-cache/net-vpn/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index e842b890023c..d22b7a5b236f 100644
--- a/metadata/md5-cache/net-vpn/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20180227.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=00b773f86cbf55118872b54bdd2c6bc1
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6 b/metadata/md5-cache/net-vpn/openvpn-2.4.6
index abd2958a8924..61fec7b9509a 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=6
 HOMEPAGE=https://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.6.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.6/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=334e40d7a7cb8b760ab6d0ef65fe851e
+_md5_=818aa609ab2c26a6d7dc75985c839d8c
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.1.10 b/metadata/md5-cache/net-vpn/tor-0.3.1.10
index 3519da7776c5..8b9e96913274 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.1.10
+++ b/metadata/md5-cache/net-vpn/tor-0.3.1.10
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.3.1.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.1.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=420fcbffbb37c6a94767c26aa19067ec
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.2.10 b/metadata/md5-cache/net-vpn/tor-0.3.2.10
index d67ecf0d625a..3bc901a13402 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.2.10
+++ b/metadata/md5-cache/net-vpn/tor-0.3.2.10
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.3.2.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.2.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8658d1c480a2eb9a536e869b2fad3f8d
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.3.6 b/metadata/md5-cache/net-vpn/tor-0.3.3.6
index 8a6dae509ec4..16512f841383 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.3.6
+++ b/metadata/md5-cache/net-vpn/tor-0.3.3.6
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.3.3.6.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.3.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=003fc87c3b9c0df7ef3fbb812c32ab96
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.4.1_alpha b/metadata/md5-cache/net-vpn/tor-0.3.4.1_alpha
index 3ab85edd33dd..6bf81905b2d6 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.4.1_alpha
+++ b/metadata/md5-cache/net-vpn/tor-0.3.4.1_alpha
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.3.4.1-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.4.1-alpha.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=d9aaa1f572f41d8e3f2141e8810ed9e1
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 21ca9001352f..33f548abe92f 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/bluez-5.47-r1 b/metadata/md5-cache/net-wireless/bluez-5.47-r1
index cc83af3d2843..5e3a470341ee 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.47-r1
+++ b/metadata/md5-cache/net-wireless/bluez-5.47-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.47.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6381f7e668e4c4d06e169467ebe4284e
diff --git a/metadata/md5-cache/net-wireless/bluez-5.49 b/metadata/md5-cache/net-wireless/bluez-5.49
index df284b7c5ea1..3ed2e288b4d1 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.49
+++ b/metadata/md5-cache/net-wireless/bluez-5.49
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.49.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=11744af939c287ac0e9192571370b7b4
diff --git a/metadata/md5-cache/net-wireless/bluez-5.49-r1 b/metadata/md5-cache/net-wireless/bluez-5.49-r1
index e6ef05448070..fa7879970ab3 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.49-r1
+++ b/metadata/md5-cache/net-wireless/bluez-5.49-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.49.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=07961e8e83385ad5f1eb42a3b4571202
diff --git a/metadata/md5-cache/net-wireless/bluez-5.50 b/metadata/md5-cache/net-wireless/bluez-5.50
new file mode 100644
index 000000000000..c8fd1582dba3
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bluez-5.50
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) btpclient? ( >=dev-libs/ell-0.3 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.3 dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) virtual/pkgconfig test? ( 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(+)] >=dev-python/dbus-python-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/pygobject: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(+)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Bluetooth Tools and System Daemons for Linux
+EAPI=6
+HOMEPAGE=http://www.bluez.org
+IUSE=alsa +btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session python_targets_python2_7 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 ~hppa ~mips ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) btpclient? ( >=dev-libs/ell-0.3 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.3 dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( 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(+)] >=dev-python/dbus-python-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/pygobject: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(+)] )
+REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
+SLOT=0/3
+SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.50.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=85b0e86636eaf6400d901c5c24ae2c46
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r2 b/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r2
index 8a9beee8aad8..9a41f18fba8c 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r2
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r2
@@ -9,6 +9,6 @@ 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(+)] >=dev-lang/orc-0.4.12 dev-libs/boost: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-libs/boost-1.52.0-r6:0/1.52 dev-util/cppunit sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib[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(+)] ) grc? ( dev-python/lxml[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/numpy[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/pygtk: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(+)] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( dev-python/PyQt4[X,opengl,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/pyqwt:5 dev-qt/qtgui:4 ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[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(+)] ) wavelet? ( sci-libs/gsl )
 REQUIRED_USE=python_targets_python2_7 analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog )
 SLOT=0/3.6.5.1
-SRC_URI=http://gnuradio.org/releases/gnuradio/gnuradio-3.6.5.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f9cd5997a9004758094900e4a067c96
+SRC_URI=https://www.gnuradio.org/releases/gnuradio/gnuradio-3.6.5.1.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=555ce77c5d5f13ee18e01b7382df47c4
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3 b/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3
index 0ac6467985f4..6892a63895ad 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3
@@ -10,6 +10,6 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 RESTRICT=test
 SLOT=0/3.7.11
-SRC_URI=http://gnuradio.org/releases/gnuradio/gnuradio-3.7.11.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6356090b087f69d51f014314a3a80d49
+SRC_URI=https://www.gnuradio.org/releases/gnuradio/gnuradio-3.7.11.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c1b9710effbaa7eccf72c58bea48bed
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999 b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
index 98a170114752..f25369157bb9 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
@@ -8,5 +8,5 @@ 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(+)] >=dev-lang/orc-0.4.12 dev-libs/boost: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-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[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[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/pygtk-2.10: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(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,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/pyqwt-5.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-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(-)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[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(+)] ) utils? ( dev-python/matplotlib[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(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[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/numpy[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/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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/3.7.9999
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1d4d33eb57b5d7f92de0da55ac1a142
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=75a6295bf5b3013e6729ac111182c136
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.9999 b/metadata/md5-cache/net-wireless/gnuradio-3.8.9999
index d863196a4680..2490377be6de 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.8.9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.9999
@@ -8,5 +8,5 @@ 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(+)] >=dev-lang/orc-0.4.12 dev-libs/boost: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-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[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/six[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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/pygobject:*[cairo(+),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/pyyaml[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/mako[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(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( dev-python/PyQt5[opengl,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/qtgui:5 x11-libs/qwt:6[qt5(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[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(+)] ) utils? ( dev-python/matplotlib[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(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/3.8.9999
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a577e7debc1c9431a50ecf5791ae5119
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a1dda9ca2d8d997d43d261ce2bb86609
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index 999b728a84de..d95cf25d439b 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -8,5 +8,5 @@ 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(+)] >=dev-lang/orc-0.4.12 dev-libs/boost: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-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[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[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/pygtk-2.10: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(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,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/pyqwt-5.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-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6[qt4(-)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[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(+)] ) utils? ( dev-python/matplotlib[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(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[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/numpy[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/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(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/9999
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1d4d33eb57b5d7f92de0da55ac1a142
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=75a6295bf5b3013e6729ac111182c136
diff --git a/metadata/md5-cache/net-wireless/gr-air-modes-9999 b/metadata/md5-cache/net-wireless/gr-air-modes-9999
index 86ea0ed9e0dc..3f08504f1d0b 100644
--- a/metadata/md5-cache/net-wireless/gr-air-modes-9999
+++ b/metadata/md5-cache/net-wireless/gr-air-modes-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr dev-python/pyzmq[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(+)] fgfs? ( sci-libs/scipy games-simulation/flightgear ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 ) 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(+)] sys-devel/make >=dev-util/cmake-3.9.6 dev-vcs/git
+DEPEND=>=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr dev-python/pyzmq[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(+)] fgfs? ( sci-libs/scipy games-simulation/flightgear ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 ) 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(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=This module implements a complete Mode S and ADS-B receiver for Gnuradio
 EAPI=5
 HOMEPAGE=https://www.cgran.org/wiki/gr-air-modes
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr dev-python/pyzmq[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(+)] fgfs? ( sci-libs/scipy games-simulation/flightgear ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 ) 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
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0b6a390eb9eb005d35156a1af1c88ab
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c252edc736a5a696e004fb12f20d3d7
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20150730 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20150730
deleted file mode 100644
index 4bd5cf702e61..000000000000
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20150730
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,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(+)] bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[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(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= ) uhd? ( net-wireless/uhd:=[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/cheetah sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
-EAPI=5
-HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-IUSE=bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~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(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,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(+)] bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[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(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= ) uhd? ( net-wireless/uhd:=[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/0.1.4_p20150730
-SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-0.1.4_p20150730.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51d71150ec913efdb562ffca101fb82a
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20170612 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20170612
index 46e58cbb5a76..2ea60a506fe7 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20170612
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20170612
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=6
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
 IUSE=bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~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(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,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(+)] bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[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(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= ) soapy? ( net-wireless/soapysdr ) uhd? ( net-wireless/uhd:=[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/0.1.4_p20170612
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-0.1.4_p20170612.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9966cd55823097752fcea4c4b522428d
+_md5_=84a160efcf9946a7c8617ac6486d975d
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2015.07.2-r1 b/metadata/md5-cache/net-wireless/hackrf-tools-2015.07.2-r1
deleted file mode 100644
index aca1f311e3b3..000000000000
--- a/metadata/md5-cache/net-wireless/hackrf-tools-2015.07.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==net-libs/libhackrf-2015.07.2:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=tools for communicating with HackRF SDR platform
-EAPI=5
-HOMEPAGE=http://greatscottgadgets.com/hackrf/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND==net-libs/libhackrf-2015.07.2:=
-SLOT=0
-SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2015.07.2/hackrf-2015.07.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cac5dc73bff88b4f3b4e558febbb3ede
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.6-r5 b/metadata/md5-cache/net-wireless/hostapd-2.6-r5
new file mode 100644
index 000000000000..72a51917eb55
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/hostapd-2.6-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend
+DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
+DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
+EAPI=6
+HOMEPAGE=http://w1.fi
+IUSE=internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda savedconfig
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
+LICENSE=BSD
+RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
+SLOT=0
+SRC_URI=http://w1.fi/releases/hostapd-2.6.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.6-r5_extras.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=aba5d07dcda9154b7d6d514b85ae47c4
diff --git a/metadata/md5-cache/net-wireless/inspectrum-0.1.1 b/metadata/md5-cache/net-wireless/inspectrum-0.1.1
deleted file mode 100644
index 6d9000291c6f..000000000000
--- a/metadata/md5-cache/net-wireless/inspectrum-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=a tool for analysing captured signals from software-defined radio receivers
-EAPI=5
-HOMEPAGE=https://github.com/miek/inspectrum
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=https://github.com/miek/inspectrum/archive/v0.1.1.tar.gz -> inspectrum-0.1.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=352964b116918443b9e96992010dc2ba
diff --git a/metadata/md5-cache/net-wireless/inspectrum-0.2 b/metadata/md5-cache/net-wireless/inspectrum-0.2
deleted file mode 100644
index b9b8424d3684..000000000000
--- a/metadata/md5-cache/net-wireless/inspectrum-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig dev-qt/qtconcurrent:5 sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=a tool for analysing captured signals from software-defined radio receivers
-EAPI=6
-HOMEPAGE=https://github.com/miek/inspectrum
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp
-SLOT=0
-SRC_URI=https://github.com/miek/inspectrum/archive/v0.2.tar.gz -> inspectrum-0.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=034736427a143e3b51d78f16232d7c2b
diff --git a/metadata/md5-cache/net-wireless/inspectrum-0.2.2 b/metadata/md5-cache/net-wireless/inspectrum-0.2.2
new file mode 100644
index 000000000000..e352ee79ca9c
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/inspectrum-0.2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig dev-qt/qtconcurrent:5 sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=a tool for analysing captured signals from software-defined radio receivers
+EAPI=6
+HOMEPAGE=https://github.com/miek/inspectrum
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp
+SLOT=0
+SRC_URI=https://github.com/miek/inspectrum/archive/v0.2.2.tar.gz -> inspectrum-0.2.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c9384862b18c69d3feddc15921959486
diff --git a/metadata/md5-cache/net-wireless/ndiswrapper-1.61 b/metadata/md5-cache/net-wireless/ndiswrapper-1.61
index a1ac1994c106..aa1e28ddd161 100644
--- a/metadata/md5-cache/net-wireless/ndiswrapper-1.61
+++ b/metadata/md5-cache/net-wireless/ndiswrapper-1.61
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils net-wireless/wireless-tools kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/ndiswrapper/stable/ndiswrapper-1.61.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=bffe44db2103aeec80eda5c1542f2ec9
diff --git a/metadata/md5-cache/net-wireless/openbsc-9999 b/metadata/md5-cache/net-wireless/openbsc-9999
index c043ede6c975..e735dc95adab 100644
--- a/metadata/md5-cache/net-wireless/openbsc-9999
+++ b/metadata/md5-cache/net-wireless/openbsc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=gprs? ( net-wireless/openggsn ) net-libs/libosmocore net-libs/libosmo-abis net-libs/libosmo-netif dev-db/libdbi >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=gprs? ( net-wireless/openggsn ) net-libs/libosmocore net-libs/libosmo-abis net-libs/libosmo-netif dev-db/libdbi >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=OpenBSC, OsmoSGSN, OsmoBSC and other programs
 EAPI=5
 HOMEPAGE=http://openbsc.osmocom.org/trac/wiki/OpenBSC
@@ -7,5 +7,5 @@ IUSE=+gprs
 LICENSE=GPL-2
 RDEPEND=gprs? ( net-wireless/openggsn ) net-libs/libosmocore net-libs/libosmo-abis net-libs/libosmo-netif dev-db/libdbi dev-db/libdbi-drivers[sqlite] dev-db/sqlite:3
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=686f8d8ff14fe587c5a78eca7c8f383c
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=867ff3bb05577bdcd1ca188ad5cc6812
diff --git a/metadata/md5-cache/net-wireless/openggsn-9999 b/metadata/md5-cache/net-wireless/openggsn-9999
index 3f341aad0468..5063f7bc5724 100644
--- a/metadata/md5-cache/net-wireless/openggsn-9999
+++ b/metadata/md5-cache/net-wireless/openggsn-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=dev-vcs/git >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Gateway GPRS Support Node
 EAPI=5
 HOMEPAGE=http://openbsc.osmocom.org/trac/wiki/OpenBSC_GPRS
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ae4e3311f544a6b50369202e2f16d22e
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=61e1add03cbafb633c8a91e43650c5e2
diff --git a/metadata/md5-cache/net-wireless/osmobts-9999 b/metadata/md5-cache/net-wireless/osmobts-9999
index 73b69de0c53a..98fd5e57e1dd 100644
--- a/metadata/md5-cache/net-wireless/osmobts-9999
+++ b/metadata/md5-cache/net-wireless/osmobts-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=net-libs/libosmocore net-libs/libosmo-abis >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=net-libs/libosmocore net-libs/libosmo-abis >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Osmocom BTS-Side code (Abis, scheduling)
 EAPI=5
 HOMEPAGE=http://openbsc.osmocom.org/trac/wiki/OsmoBTS
 LICENSE=GPL-2
 RDEPEND=net-libs/libosmocore net-libs/libosmo-abis
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=64848840f17c2b16ede985897d5553b2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4a832c71dfafaa8c2c0622fcea7dea81
diff --git a/metadata/md5-cache/net-wireless/osmocom-bb-9999 b/metadata/md5-cache/net-wireless/osmocom-bb-9999
index a5a1b5977ec0..ae1010f85b58 100644
--- a/metadata/md5-cache/net-wireless/osmocom-bb-9999
+++ b/metadata/md5-cache/net-wireless/osmocom-bb-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=net-libs/libosmocore dev-vcs/git >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=net-libs/libosmocore >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=OsmocomBB MS-side GSM Protocol stack (L1, L2, L3) excluding firmware
 EAPI=5
 HOMEPAGE=http://bb.osmocom.org
@@ -7,5 +7,5 @@ IUSE=+transmit
 LICENSE=GPL-2
 RDEPEND=net-libs/libosmocore
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48fe8456fbbf544be7e9db10ffcc9022
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=799df63b1f7b6c197630e1919de01470
diff --git a/metadata/md5-cache/net-wireless/rfcat-9999 b/metadata/md5-cache/net-wireless/rfcat-9999
index 95614a6d4c68..0a78a8352f36 100644
--- a/metadata/md5-cache/net-wireless/rfcat-9999
+++ b/metadata/md5-cache/net-wireless/rfcat-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-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_python2_7(-)] dev-vcs/mercurial
+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_python2_7(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=The swiss army knife of subGHz
 EAPI=6
 HOMEPAGE=https://bitbucket.org/atlas0fd00m/rfcat/
@@ -8,5 +8,5 @@ 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
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7053349cb32f2b873534aca77466961d
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c4065c4a91e61f91a10681b7e625f8ae
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20150730 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20150730
deleted file mode 100644
index ff3b61574a4b..000000000000
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20150730
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
-EAPI=5
-HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.3_p20150730.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75273e7f16fb0af723a18175623400f5
diff --git a/metadata/md5-cache/net-wireless/uhd-3.12.0.0 b/metadata/md5-cache/net-wireless/uhd-3.12.0.0
new file mode 100644
index 000000000000..e396d28d784e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/uhd-3.12.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+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(+)] e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] doc? ( app-doc/doxygen ) dev-python/mako app-arch/unzip app-arch/gzip >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
+EAPI=6
+HOMEPAGE=https://kb.ettus.com
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~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(+)] e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
+REQUIRED_USE=python_targets_python2_7 b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+SLOT=0/3.12
+SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.12.0.0.tar.gz -> EttusResearch-UHD-3.12.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.12.0.0/uhd-images_3.12.0.0.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c77a8584e45df109c75e0c87a8ae95c9
diff --git a/metadata/md5-cache/net-wireless/uhd-3.9.6 b/metadata/md5-cache/net-wireless/uhd-3.9.6
deleted file mode 100644
index 96734fa6043d..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-3.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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(+)] virtual/libusb:1 dev-lang/orc dev-libs/boost:= sys-libs/ncurses:0 dev-python/mako dev-python/cheetah app-arch/unzip >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=5
-HOMEPAGE=http://code.ettus.com/redmine/ettus/projects/uhd/wiki
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~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(+)] virtual/libusb:1 dev-lang/orc dev-libs/boost:= sys-libs/ncurses:0
-REQUIRED_USE=python_targets_python2_7
-SLOT=0/1
-SRC_URI=https://github.com/EttusResearch/uhd/archive/release_003_009_006.tar.gz -> EttusResearch-UHD-3.9.6.tar.gz http://files.ettus.com/binaries/images/uhd-images_003.009.006-release.zip
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8c375817b03937a7b56a4f42d749206
diff --git a/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2 b/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2
index 2bfd75587dcb..f3a4b1733482 100644
--- a/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2
+++ b/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://wifi-radar.tuxfamily.org/pub/wifi-radar-2.0.s08.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=2ee50971660a9baf4c27f614a6a1e851
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r3 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r3
index 76b53341559f..3cceaa3ded4c 100644
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r3
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r3
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/cr
 REQUIRED_USE=fasteap? ( !ssl ) smartcard? ( ssl )
 SLOT=0
 SRC_URI=https://w1.fi/releases/wpa_supplicant-2.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c562690be3782a6bf7754da17b6e5d4a
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r5 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r5
index 6f1c55bbe6e2..8334d08e1226 100644
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r5
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r5
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/cr
 REQUIRED_USE=smartcard? ( ssl )
 SLOT=0
 SRC_URI=https://w1.fi/releases/wpa_supplicant-2.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=34e4983744eb53c9b3b60103690240bd
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r6 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r6
index 736959bb57ce..4241d33bb10f 100644
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r6
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r6
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/cr
 REQUIRED_USE=smartcard? ( ssl )
 SLOT=0
 SRC_URI=https://w1.fi/releases/wpa_supplicant-2.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afc55d2ae697f18b9b93cdd19dcef6fd
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r8 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r8
index fb6e250eb7cf..19d2551337b6 100644
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r8
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r8
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/cr
 REQUIRED_USE=smartcard? ( ssl )
 SLOT=0
 SRC_URI=https://w1.fi/releases/wpa_supplicant-2.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a65c42a3b183413d25b4157381b9cfd8
diff --git a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0 b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
index a8ba1744ee5b..29bd8567fec3 100644
--- a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
+++ b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
@@ -9,4 +9,4 @@ RDEPEND=virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-Tiny-0.043.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b0b32f1e1a49ce92b30b1c0c984fb57
+_md5_=de17efc86f0566b80059c6fb1868b3b2
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index ec274e7ab275..89305fe71ba3 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index a81e269dd657..6ca456b8aea5 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/imu_tools-1.2.0 b/metadata/md5-cache/ros-meta/imu_tools-1.2.0
new file mode 100644
index 000000000000..82f0305cb861
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/imu_tools-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin sys-devel/make >=dev-util/cmake-3.9.6 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=Various tools for IMU devices
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/imu_tools
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin 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/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e9cb19be5295720e4e42305ce9933ea0
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.6.11 b/metadata/md5-cache/ros-meta/roscpp_core-0.6.11
new file mode 100644
index 000000000000..4aa00b097c35
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.6.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization sys-devel/make >=dev-util/cmake-3.9.6 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=Underlying data libraries for roscpp messages
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/roscpp_core
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization 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/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=13bb679b63620a008e46fe65b53a5203
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index cfc9ff672eb5..644d19679d16 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/kstars-17.08.3 b/metadata/md5-cache/sci-astronomy/kstars-17.08.3
deleted file mode 100644
index 38b24dc23916..000000000000
--- a/metadata/md5-cache/sci-astronomy/kstars-17.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kplotting-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.4.0 ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) xplanet? ( x11-misc/xplanet ) >=dev-qt/qtconcurrent-5.9.4:5 dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Desktop Planetarium
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars
-IUSE=fits indi raw wcs xplanet debug +handbook python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kplotting-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.4.0 ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) xplanet? ( x11-misc/xplanet ) 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(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=indi? ( fits ) python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=089b9e1752e5b2ff8ea0ec885a4f4337
diff --git a/metadata/md5-cache/sci-astronomy/kstars-2.9.5 b/metadata/md5-cache/sci-astronomy/kstars-2.9.5
index 764f5d087bd9..9272b9c76363 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-2.9.5
+++ b/metadata/md5-cache/sci-astronomy/kstars-2.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Desktop Planetarium
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars
 IUSE=fits indi raw wcs xplanet debug +handbook python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kplotting-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.4.0 ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) xplanet? ( x11-misc/xplanet ) 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(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-2.9.5.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f47b89412931683ec88aed845079378f
+_md5_=2510b6d18250a2311c3c478edacdba9a
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 3acd31d41fac..056493d5fd55 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/emboss-6.6.0-r1 b/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
index 22b950add78d..2a54f94f0c80 100644
--- a/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
+++ b/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
@@ -10,5 +10,5 @@ PDEPEND=!minimal? ( sci-biology/aaindex sci-biology/cutg sci-biology/primer3 sci
 RDEPEND=!games-action/xbomber !sys-devel/cons dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( virtual/mysql ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt )
 SLOT=0
 SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	emboss-r2	e6c8236c06e1e543b4feef45c31dd618	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	emboss-r2	e6c8236c06e1e543b4feef45c31dd618	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99a47266a2a8f2fd0a874111491146e2
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index a30942918f2b..67b87e7f3ddc 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016 b/metadata/md5-cache/sci-chemistry/gromacs-2016
deleted file mode 100644
index ac37904de20e..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2016
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ed1ecc5849b8530b69accbe7e9ba0be
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.1 b/metadata/md5-cache/sci-chemistry/gromacs-2016.1
deleted file mode 100644
index 0f3897a1d126..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-libs/tinyxml2 dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2016.1
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.1.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3495d5feff978b22807c08c0c4c8c03c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.2 b/metadata/md5-cache/sci-chemistry/gromacs-2016.2
index 5895aa625aae..c1bee67e26dc 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2016.2
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2016.2
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.2.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.2.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=73270c55dd4f7113d1e8e278cf4be737
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.3 b/metadata/md5-cache/sci-chemistry/gromacs-2016.3
deleted file mode 100644
index 7ea70f020457..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-libs/tinyxml2 dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2016.3
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.3.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.3.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8bedfa440ad7a933b1fc095e3b4d4f39
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.4 b/metadata/md5-cache/sci-chemistry/gromacs-2016.4
deleted file mode 100644
index 84f18ef41db5..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-libs/tinyxml2 dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2016.4
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.4.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.4.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3495d5feff978b22807c08c0c4c8c03c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.5 b/metadata/md5-cache/sci-chemistry/gromacs-2016.5
index 65553c2b9559..96b4f98c0952 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.5
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2016.5
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2016.5
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.5.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.5.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=73069a3501e9bd0cc41da4d01fe91c59
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2016.9999
index caf0d044e388..a073a1fdf5c7 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2016.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2016.9999
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3495d5feff978b22807c08c0c4c8c03c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018 b/metadata/md5-cache/sci-chemistry/gromacs-2018
deleted file mode 100644
index dbcc3a879e47..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2018
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48c913af6e554e0dce78bff52433778a
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.1 b/metadata/md5-cache/sci-chemistry/gromacs-2018.1
new file mode 100644
index 000000000000..f2d3819395b5
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=6
+HOMEPAGE=http://www.gromacs.org/
+IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
+KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
+SLOT=0/2018.1
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018.1.tar.gz )
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=48c913af6e554e0dce78bff52433778a
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
index adba888946d4..357b92e685c7 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2018.9999
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=19ce149cec8b7da6545d6175fa517c2f
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018_rc1 b/metadata/md5-cache/sci-chemistry/gromacs-2018_rc1
deleted file mode 100644
index ca786e082bdd..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2018_rc1
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018-rc1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018-rc1.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19ce149cec8b7da6545d6175fa517c2f
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999 b/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999
index a7f73c3449a3..20d917b36fd8 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/4.6.9999
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=88c3797b1c0d776df583435ac1199f8d
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.0.4 b/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
index a4b9a99c90ed..01b816e36e5e 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.0.4
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-5.0.4.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-5.0.4.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0977dfc51fd4bef012cbea7072c49d1a
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999 b/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999
index f6583be60b40..2b42802c9b67 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.0.9999
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3badc4fa6539107c36fe98256bfcae90
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.1.3 b/metadata/md5-cache/sci-chemistry/gromacs-5.1.3
index 4b6a6a5baedf..aba1f1568197 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.1.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.1.3
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.1.3
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-5.1.3.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-5.1.3.tar.gz )
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7cdd305e135195a36cbccdcab09c4699
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999 b/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999
index f33188d73db5..1aeae4b32dc3 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.1.9999
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7cdd305e135195a36cbccdcab09c4699
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index ea8956ce8efe..394e82f4abc8 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/9999
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b85be5a83f00ecdf56154f19c818e6aa
diff --git a/metadata/md5-cache/sci-chemistry/modeller-9.20 b/metadata/md5-cache/sci-chemistry/modeller-9.20
new file mode 100644
index 000000000000..166cdd9e93ae
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/modeller-9.20
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/swig-1.3 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(-)]
+DESCRIPTION=Homology or comparative modeling of protein three-dimensional structures
+EAPI=6
+HOMEPAGE=http://salilab.org/modeller/
+IUSE=doc examples python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=modeller
+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 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://salilab.org/modeller/9.20/modeller-9.20.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9222aa6838b224fb9c8e8a22bccfdc2e
diff --git a/metadata/md5-cache/sci-chemistry/molsketch-0.3.0 b/metadata/md5-cache/sci-chemistry/molsketch-0.3.0
deleted file mode 100644
index 365402112c13..000000000000
--- a/metadata/md5-cache/sci-chemistry/molsketch-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sci-chemistry/openbabel-2.2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=A drawing tool for 2D molecular structures
-EAPI=5
-HOMEPAGE=http://molsketch.sourceforge.net/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=sci-chemistry/openbabel-2.2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=mirror://sourceforge/project/molsketch/Molsketch/Lithium%200.3.0/Molsketch-0.3.0-src.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39c157d9ece2da36ace1b1017ab44f6f
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index c51ebb7bd4a4..03558c76dc2f 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/gazebo-8.2.0-r1 b/metadata/md5-cache/sci-electronics/gazebo-8.2.0-r1
deleted file mode 100644
index 3fc864e3d12e..000000000000
--- a/metadata/md5-cache/sci-electronics/gazebo-8.2.0-r1
+++ /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-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.9.6
-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: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	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e43408281116c04bdf579d0c17ff4d41
diff --git a/metadata/md5-cache/sci-electronics/gazebo-9.1.0 b/metadata/md5-cache/sci-electronics/gazebo-9.1.0
new file mode 100644
index 000000000000..4cb3f64a97d5
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gazebo-9.1.0
@@ -0,0 +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-6.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:1= sci-libs/ignition-math:4= net-libs/ignition-transport:4= 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.9.6
+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-6.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:1= sci-libs/ignition-math:4= net-libs/ignition-transport:4= x11-libs/qwt:6=[qt5]
+SLOT=0/9
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-9.1.0.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=38dc3047d5771b37260541949bddda8b
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.9.62 b/metadata/md5-cache/sci-electronics/xcircuit-3.9.62
deleted file mode 100644
index c25d8f6daf72..000000000000
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.9.62
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/ghostscript-gpl dev-lang/tk:0 media-libs/fontconfig:1.0 sys-libs/zlib x11-libs/cairo x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Circuit drawing and schematic capture program
-EAPI=5
-HOMEPAGE=http://opencircuitdesign.com/xcircuit
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/tk:0 media-libs/fontconfig:1.0 sys-libs/zlib x11-libs/cairo x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE
-RESTRICT=test
-SLOT=0
-SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.9.62.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bca59ed4fdbe60002335b9008ebeb332
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 228a5898d763..04eef6802320 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/cminpack-1.3.4 b/metadata/md5-cache/sci-libs/cminpack-1.3.4
deleted file mode 100644
index 16f933d53883..000000000000
--- a/metadata/md5-cache/sci-libs/cminpack-1.3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C implementation of the MINPACK nonlinear optimization library
-EAPI=5
-HOMEPAGE=http://devernay.free.fr/hacks/cminpack/
-IUSE=doc test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=minpack
-SLOT=0/1
-SRC_URI=http://devernay.free.fr/hacks/cminpack//cminpack-1.3.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad560b1c60eaa73e5a0a200ad633b5fb
diff --git a/metadata/md5-cache/sci-libs/cxsparse-2.2.1 b/metadata/md5-cache/sci-libs/cxsparse-2.2.1
deleted file mode 100644
index 2866b9fe1abc..000000000000
--- a/metadata/md5-cache/sci-libs/cxsparse-2.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=sci-libs/ufconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Extended sparse matrix package
-EAPI=0
-HOMEPAGE=http://www.cise.ufl.edu/research/sparse/CXSparse/
-KEYWORDS=amd64 hppa ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b4a330f22dfe7e4f982c74f1ae82f2e5
diff --git a/metadata/md5-cache/sci-libs/flann-1.8.4-r1 b/metadata/md5-cache/sci-libs/flann-1.8.4-r1
deleted file mode 100644
index 3010cae39536..000000000000
--- a/metadata/md5-cache/sci-libs/flann-1.8.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 ) app-arch/unzip doc? ( dev-tex/latex2html ) test? ( dev-cpp/gtest cuda? ( sci-libs/hdf5 ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fast approximate nearest neighbor searches in high dimensional spaces
-EAPI=5
-HOMEPAGE=http://www.cs.ubc.ca/research/flann/
-IUSE=cuda doc examples mpi openmp octave static-libs test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
-SLOT=0
-SRC_URI=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip test? ( https://dev.gentoo.org/~bicatali/distfiles/flann-1.8.4-testdata.tar.xz )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23a3672cd8a279f96b43007b69f5dd4e
diff --git a/metadata/md5-cache/sci-libs/flann-9999 b/metadata/md5-cache/sci-libs/flann-9999
index 5d286a5e3723..9e46c1404519 100644
--- a/metadata/md5-cache/sci-libs/flann-9999
+++ b/metadata/md5-cache/sci-libs/flann-9999
@@ -1,12 +1,11 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 ) app-arch/unzip doc? ( dev-tex/latex2html ) test? ( dev-cpp/gtest cuda? ( sci-libs/hdf5 ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 ) app-arch/unzip doc? ( dev-tex/latex2html ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Fast approximate nearest neighbor searches in high dimensional spaces
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.cs.ubc.ca/research/flann/
-IUSE=cuda doc examples mpi openmp octave static-libs test
+IUSE=cuda doc examples mpi openmp octave static-libs
 LICENSE=BSD
-RDEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
+RDEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
 SLOT=0
-SRC_URI=test? ( https://dev.gentoo.org/~bicatali/distfiles/flann-1.8.4-testdata.tar.xz )
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0cf273bd1951e67b37fb7be007eda1a
+_md5_=09288d67b3a919b0489bc7cd96f9a7e7
diff --git a/metadata/md5-cache/sci-libs/gaul-devel-0.1849-r1 b/metadata/md5-cache/sci-libs/gaul-devel-0.1849-r1
deleted file mode 100644
index 03f4c9942705..000000000000
--- a/metadata/md5-cache/sci-libs/gaul-devel-0.1849-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-apps/sed slang? ( sys-libs/slang )
-DESCRIPTION=Genetic Algorithm Utility Library
-EAPI=0
-HOMEPAGE=http://GAUL.sourceforge.net/
-IUSE=debug slang
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=sys-apps/sed slang? ( sys-libs/slang )
-SLOT=0
-SRC_URI=mirror://sourceforge/gaul/gaul-devel-0.1849-0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e30a9e56bf8ab81fcf07c78becec55ad
diff --git a/metadata/md5-cache/sci-libs/indilib-1.6.0 b/metadata/md5-cache/sci-libs/indilib-1.6.0
index 420449a5f140..8a91870175fa 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.6.0
+++ b/metadata/md5-cache/sci-libs/indilib-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=INDI Astronomical Control Protocol library
 EAPI=6
 HOMEPAGE=http://www.indilib.org/
 IUSE=ogg test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/gsl:= sci-libs/libnova sys-libs/zlib:= virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/releases/download/v1.6.0/libindi_1.6.0.tar.gz -> indilib-1.6.0.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=81560326337fbd63eaf730a1943253e4
+_md5_=43046ef73049d0972c111b5aadfe3cb5
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0 b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
index 48c1f28990ef..600476e1e6b1 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:1
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.1.0.tar.gz firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=95894bc38bf1120ca7edcc52cc0e8796
diff --git a/metadata/md5-cache/sci-libs/mathgl-2.3.4-r1 b/metadata/md5-cache/sci-libs/mathgl-2.3.4-r1
deleted file mode 100644
index 6a735dd467e2..000000000000
--- a/metadata/md5-cache/sci-libs/mathgl-2.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=!sci-visualization/udav virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2 ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg:0 ) lua? ( >=dev-lang/lua-5.1:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) python? ( dev-python/numpy[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(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) zlib? ( sys-libs/zlib ) doc? ( app-text/texi2html virtual/texi2dvi ) octave? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Math Graphics Library
-EAPI=5
-HOMEPAGE=http://mathgl.sourceforge.net/
-IUSE=doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf png python qt5 static-libs threads wxwidgets zlib l10n_ru python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=!sci-visualization/udav virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2 ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg:0 ) lua? ( >=dev-lang/lua-5.1:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) python? ( dev-python/numpy[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(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=mpi? ( hdf5 ) openmp? ( !threads ) png? ( zlib ) pdf? ( png ) python? ( python_targets_python2_7 )
-SLOT=0/7.4.1
-SRC_URI=mirror://sourceforge/mathgl/mathgl-2.3.4.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b03dc0ca5f750504cebe438ea1412aec
diff --git a/metadata/md5-cache/sci-libs/ogdi-3.1.5-r1 b/metadata/md5-cache/sci-libs/ogdi-3.1.5-r1
deleted file mode 100644
index 12315e1b5883..000000000000
--- a/metadata/md5-cache/sci-libs/ogdi-3.1.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=<sci-libs/proj-4.8.0 sys-libs/zlib dev-libs/expat
-DESCRIPTION=Open Geographical Datastore Interface, a GIS support library
-EAPI=0
-HOMEPAGE=http://ogdi.sourceforge.net/
-LICENSE=GPL-2
-RDEPEND=<sci-libs/proj-4.8.0 sys-libs/zlib dev-libs/expat
-SLOT=0
-SRC_URI=mirror://sourceforge/ogdi/ogdi-3.1.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c07cd15717da87268c2fea24db3ac24
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 085de451f7ae..83c219395f69 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/alt-ergo-1.30 b/metadata/md5-cache/sci-mathematics/alt-ergo-1.30
index e4917d1465bf..908493e08145 100644
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-1.30
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-1.30
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=>=dev-lang/ocaml-3.12.1[ocamlopt?] dev-ml/zarith gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] ) dev-ml/camlzip dev-ml/ocplib-simplex
 DESCRIPTION=Automatic theorem prover
 EAPI=6
-HOMEPAGE=http://alt-ergo.ocamlpro.com
+HOMEPAGE=https://alt-ergo.ocamlpro.com
 IUSE=examples gtk +ocamlopt
 KEYWORDS=~amd64
 LICENSE=CeCILL-C
 RDEPEND=>=dev-lang/ocaml-3.12.1[ocamlopt?] dev-ml/zarith gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] ) dev-ml/camlzip dev-ml/ocplib-simplex
 SLOT=0
 SRC_URI=https://alt-ergo.ocamlpro.com/http/alt-ergo-1.30/alt-ergo-1.30.tar.gz
-_md5_=c9eb17b95972846ff9ce2b78bf9dcb31
+_md5_=f42028ae405598be416d3529a3d5596f
diff --git a/metadata/md5-cache/sci-mathematics/calc-2.12.2.2 b/metadata/md5-cache/sci-mathematics/calc-2.12.2.2
deleted file mode 100644
index df89d7c29010..000000000000
--- a/metadata/md5-cache/sci-mathematics/calc-2.12.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.2
-DESCRIPTION=An arbitrary precision C-like arithmetic system
-EAPI=0
-HOMEPAGE=http://www.isthe.com/chongo/tech/comp/calc/
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.2 >=sys-apps/less-348
-SLOT=0
-SRC_URI=mirror://sourceforge/calc/calc-2.12.2.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ed7422745f131b46471e11a13ce6eeb
diff --git a/metadata/md5-cache/sci-mathematics/gimps-28.10-r1 b/metadata/md5-cache/sci-mathematics/gimps-28.10-r1
index f0694e9eb768..67d616954169 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-28.10-r1
+++ b/metadata/md5-cache/sci-mathematics/gimps-28.10-r1
@@ -8,5 +8,5 @@ LICENSE=GIMPS
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v2810.linux64.tar.gz ) x86? ( ftp://mersenne.org/gimps/p95v2810.linux32.tar.gz )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=ac90d9dde2f1adb111b07612081b2cd0
diff --git a/metadata/md5-cache/sci-mathematics/gimps-29.4.7 b/metadata/md5-cache/sci-mathematics/gimps-29.4.7
index 36dd261851b9..8010370c5092 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-29.4.7
+++ b/metadata/md5-cache/sci-mathematics/gimps-29.4.7
@@ -8,5 +8,5 @@ LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v294b7.linux64.tar.gz ) x86? ( ftp://mersenne.org/gimps/p95v294b7.linux32.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5ee9e6d080d3d6a3adc36688e112c93f
diff --git a/metadata/md5-cache/sci-mathematics/gimps-29.4.8 b/metadata/md5-cache/sci-mathematics/gimps-29.4.8
index b92c4c115983..3946a634d797 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-29.4.8
+++ b/metadata/md5-cache/sci-mathematics/gimps-29.4.8
@@ -8,5 +8,5 @@ LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v294b8.linux64.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=fabc35efa1b3a651b1e93fef37bed314
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index a8cfed28d2f0..385b80acf7d0 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-r3 b/metadata/md5-cache/sci-physics/lightspeed-1.2a-r3
index 4a5fef249bc2..fc1518579192 100644
--- a/metadata/md5-cache/sci-physics/lightspeed-1.2a-r3
+++ b/metadata/md5-cache/sci-physics/lightspeed-1.2a-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=media-libs/libpng:0= media-libs/tiff:0 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	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=d215b10e2c024422da6a0be6f6cd0ae3
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 2e85a9c9ba25..43f071e9bf32 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.0.7 b/metadata/md5-cache/sci-visualization/gnuplot-5.0.7
index e3d14ceff16c..ca0d367bc6c1 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.0.7
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.0.7
@@ -9,5 +9,5 @@ LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.0.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=3b18edeb388355f042fdde124a3f7039
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.2.2 b/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
index c42b290c9bd3..88754e1a6365 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
@@ -9,5 +9,5 @@ LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.2.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=c9faf271347e7207e40073085c4d1e73
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.2.9999 b/metadata/md5-cache/sci-visualization/gnuplot-5.2.9999
index 34ac93e0cff7..2b0ce67763ab 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.2.9999
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.2.9999
@@ -7,5 +7,5 @@ IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5
 LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=52ab1c4eb2669e04fda0799711018c8d
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.3.9999 b/metadata/md5-cache/sci-visualization/gnuplot-5.3.9999
index e613e8776991..2b8ed6dec83a 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.3.9999
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.3.9999
@@ -7,5 +7,5 @@ IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5
 LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
 _md5_=9ceaf2e0a1565e80129b4ee1afaaaa9d
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index f2a8e1675da8..0f6897db3b6e 100644
--- a/metadata/md5-cache/sec-policy/Manifest.gz
+++ b/metadata/md5-cache/sec-policy/Manifest.gz
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r1
deleted file mode 100644
index 6d79b1d1839f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for abrt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d7caf447f8c38166380a4d85f6bfaab8
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r2
deleted file mode 100644
index 691924fcf6fb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for abrt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=eccb9a4d6cee6691dadd10cb5603e3ef
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r3
deleted file mode 100644
index 73751d3d2135..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for abrt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=eccb9a4d6cee6691dadd10cb5603e3ef
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r4
deleted file mode 100644
index faabc021ed72..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for abrt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=eccb9a4d6cee6691dadd10cb5603e3ef
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r2
index a15234c755e4..6cfb4eb50eac 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=eccb9a4d6cee6691dadd10cb5603e3ef
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r3
index c68df91fb73c..f402559e9cf4 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=eccb9a4d6cee6691dadd10cb5603e3ef
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r4
deleted file mode 100644
index 34d40c711550..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for abrt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d7caf447f8c38166380a4d85f6bfaab8
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r1
index 38047c1bee12..c7672e574d8d 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b32d2b78f6132c11c872970dc3f88420
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r2
index c03130bfab89..056f523a3342 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c9b6d889b30341995eba6be1c804a4b8
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r3
new file mode 100644
index 000000000000..b4d7b0451f12
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for abrt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c9b6d889b30341995eba6be1c804a4b8
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-9999 b/metadata/md5-cache/sec-policy/selinux-abrt-9999
index d19748bf685e..2bfbfd40f346 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c9b6d889b30341995eba6be1c804a4b8
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r1
deleted file mode 100644
index 125a7da5de88..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for accountsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=99e17a77fb4360401949f272f30af412
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r2
deleted file mode 100644
index ad052f8136d3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for accountsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=68067037c8278f4f44923fb25f84397a
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r3
deleted file mode 100644
index dfe4c456ec5e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for accountsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=68067037c8278f4f44923fb25f84397a
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r4
deleted file mode 100644
index 00252403a16c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for accountsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=68067037c8278f4f44923fb25f84397a
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r2
index ada78fa2e830..5742953714cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=68067037c8278f4f44923fb25f84397a
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r3
index 33877b24a0a4..9606b49d9c07 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=68067037c8278f4f44923fb25f84397a
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r4
deleted file mode 100644
index 223de2e08398..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for accountsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=99e17a77fb4360401949f272f30af412
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r1
index 635acfcc5ef2..b3a75ebb5743 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ca21bdd547ee5ada8b474b430afb4c2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r2
index fb80053125d9..f4df5cc28fd3 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aac6aff598a6428960f93798b7c604d2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r3
new file mode 100644
index 000000000000..31db5eaf4fbe
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for accountsd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=aac6aff598a6428960f93798b7c604d2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-9999 b/metadata/md5-cache/sec-policy/selinux-accountsd-9999
index 6ffd9b73e6e2..7e70fcb5dfde 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aac6aff598a6428960f93798b7c604d2
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r1
deleted file mode 100644
index ba7e3d156da1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9bc199b9c3a2e094326eefffe942fea9
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r2
deleted file mode 100644
index bae8bde7be05..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=75a7db9874bf5dc9cfe357361569f8ae
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r3
deleted file mode 100644
index 61179255faeb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=75a7db9874bf5dc9cfe357361569f8ae
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r4
deleted file mode 100644
index 68a6e597fe75..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=75a7db9874bf5dc9cfe357361569f8ae
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r2
index ae16b610ad65..8fe97aa32282 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=75a7db9874bf5dc9cfe357361569f8ae
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r3
index ef543e9bd967..432ea17ac3f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=75a7db9874bf5dc9cfe357361569f8ae
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r4
deleted file mode 100644
index fed5ab6e7334..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9bc199b9c3a2e094326eefffe942fea9
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r1
index a0c7816716b5..fe99178fd413 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=433cf64df5c17c2619eabe672020d603
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r2
index 256530990582..2e412743d56c 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b3bb8870357316b44bcbce46eca05114
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r3
new file mode 100644
index 000000000000..638a7887c7cd
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for acct
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b3bb8870357316b44bcbce46eca05114
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-9999 b/metadata/md5-cache/sec-policy/selinux-acct-9999
index 0cf2d87b82f8..cb73ca3e601c 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-9999
+++ b/metadata/md5-cache/sec-policy/selinux-acct-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b3bb8870357316b44bcbce46eca05114
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r1
deleted file mode 100644
index 1beef8447664..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ada
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e7c4b94bb7c8da4f1875ca96dae74c99
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r2
deleted file mode 100644
index cfb14bec7767..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ada
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=020c85651c629f65f072dcf008e23cce
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r3
deleted file mode 100644
index 1c1dcbe6ea9d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ada
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=020c85651c629f65f072dcf008e23cce
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r4
deleted file mode 100644
index 74438f17aa26..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ada
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=020c85651c629f65f072dcf008e23cce
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r2
index 27455241150a..206d9fb04b49 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=020c85651c629f65f072dcf008e23cce
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r3
index b9a3d677fdff..ba0b4178f8c2 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=020c85651c629f65f072dcf008e23cce
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r4
deleted file mode 100644
index 89216db90177..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ada
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e7c4b94bb7c8da4f1875ca96dae74c99
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r1
index 64f9565de1df..7f81e807368a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0235f86ca6ff93c2087925c74239203a
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r2
index b751eac29668..3a59a9aa5e85 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=25fe9e2b2fb73b1edf6631159d0c846d
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r3
new file mode 100644
index 000000000000..5d624c8dce9e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ada
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=25fe9e2b2fb73b1edf6631159d0c846d
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-9999 b/metadata/md5-cache/sec-policy/selinux-ada-9999
index d00cc5f19b46..c805f8fe29cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ada-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=25fe9e2b2fb73b1edf6631159d0c846d
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r1
deleted file mode 100644
index ad5251bded09..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for afs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3e5d2a6f3d37dfd06c047d94b204d5e8
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r2
deleted file mode 100644
index 0f8b58894473..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for afs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=31dcb8619e4493917cbb49741363752b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r3
deleted file mode 100644
index e6cdf81d5554..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for afs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=31dcb8619e4493917cbb49741363752b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r4
deleted file mode 100644
index ae4816cbc934..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for afs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=31dcb8619e4493917cbb49741363752b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r2
index f75fde182a0c..a3e74f4735d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=31dcb8619e4493917cbb49741363752b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r3
index 3a9fab70f425..3b7257b017d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=31dcb8619e4493917cbb49741363752b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r4
deleted file mode 100644
index 39c1d9c749fa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for afs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3e5d2a6f3d37dfd06c047d94b204d5e8
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r1
index 1b67732f5fe2..83a309c0e59a 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e6290f7e7086c0b9aad8cce7f21b6536
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r2
index 5c012a6b3f7f..f620a77635da 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=29c34d5da8168c34ab966d05165b8e0b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r3
new file mode 100644
index 000000000000..abf3007b1e98
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for afs
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=29c34d5da8168c34ab966d05165b8e0b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-9999 b/metadata/md5-cache/sec-policy/selinux-afs-9999
index 48a33fffae1d..1ba4739e027b 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-afs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=29c34d5da8168c34ab966d05165b8e0b
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r1
deleted file mode 100644
index a6b2d6de12e6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for aide
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=700aad7e15d2aec12fb32d3eab40fb60
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r2
deleted file mode 100644
index 41f874216231..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for aide
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8184619c670badca20be906c0c653f55
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r3
deleted file mode 100644
index bc2e84eb7b6d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for aide
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8184619c670badca20be906c0c653f55
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r4
deleted file mode 100644
index edc01596db96..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for aide
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8184619c670badca20be906c0c653f55
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r2
index 74cf645a1586..4063d7538b82 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8184619c670badca20be906c0c653f55
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r3
index e4c8eda470a2..c0bbe4372072 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8184619c670badca20be906c0c653f55
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r4
deleted file mode 100644
index 162fb95a0437..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for aide
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=700aad7e15d2aec12fb32d3eab40fb60
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r1
index b03e9676379d..51621c59af46 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a1bc79b92c1cc4b9a0670c9f41dc5016
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r2
index 222caae9cec7..37b9f8346c7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=548f200303bedea66e857e013d2fb067
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r3
new file mode 100644
index 000000000000..2ac202b0a773
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for aide
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=548f200303bedea66e857e013d2fb067
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-9999 b/metadata/md5-cache/sec-policy/selinux-aide-9999
index 9e973c526663..c0367362f4cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-9999
+++ b/metadata/md5-cache/sec-policy/selinux-aide-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=548f200303bedea66e857e013d2fb067
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r1
deleted file mode 100644
index 80badb9da479..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for alsa
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee7eb5494be4d54b8ccc983a443410c9
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r2
deleted file mode 100644
index 6815a8aa9b17..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for alsa
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fee12ed6cf0f127a0c8ed85e2391fde7
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r3
deleted file mode 100644
index cf2fd4964bb6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for alsa
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fee12ed6cf0f127a0c8ed85e2391fde7
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r4
deleted file mode 100644
index a2fbc59853ab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for alsa
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fee12ed6cf0f127a0c8ed85e2391fde7
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r2
index 9cf43fa582fc..2972588b127c 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fee12ed6cf0f127a0c8ed85e2391fde7
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r3
index 47acdd12b5ed..618870051896 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fee12ed6cf0f127a0c8ed85e2391fde7
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r4
deleted file mode 100644
index 6b384242c788..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for alsa
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee7eb5494be4d54b8ccc983a443410c9
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r1
index 0a856273191b..3f5c676871d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b33d94abbfc16d87de3fe0ab0f593ff4
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r2
index afa7307fb33e..cf9f7cbecae7 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b351f22af25989728c9450c85b0dceaa
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r3
new file mode 100644
index 000000000000..a8aa50a56c2a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for alsa
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b351f22af25989728c9450c85b0dceaa
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-9999 b/metadata/md5-cache/sec-policy/selinux-alsa-9999
index 01a041ece9de..fc9f27206ae8 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-9999
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b351f22af25989728c9450c85b0dceaa
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r1
deleted file mode 100644
index 2b3028d04224..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amanda
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bf2854ab26e8e20e6da87cf6c4032227
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r2
deleted file mode 100644
index 72e9be55590c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amanda
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd2912c5bfd0bd1aa4c3649d1ffc446e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r3
deleted file mode 100644
index dffe27f2b494..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amanda
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd2912c5bfd0bd1aa4c3649d1ffc446e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r4
deleted file mode 100644
index bc9bbe9bae44..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amanda
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd2912c5bfd0bd1aa4c3649d1ffc446e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r2
index dabbb4328920..939a3978190e 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd2912c5bfd0bd1aa4c3649d1ffc446e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r3
index dbf81a5a10c8..bd166f1dc8ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd2912c5bfd0bd1aa4c3649d1ffc446e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r4
deleted file mode 100644
index 653b3b1cbf63..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amanda
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bf2854ab26e8e20e6da87cf6c4032227
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r1
index a01fed285a09..b0d184b2ea67 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fdcbbc2f138b69e75c0ed0abca6c6dd1
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r2
index 2f7a34456070..b14ef35dec74 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6f7db71314c55a0cb296245a7d1f424e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r3
new file mode 100644
index 000000000000..9e807380e96b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for amanda
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6f7db71314c55a0cb296245a7d1f424e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-9999 b/metadata/md5-cache/sec-policy/selinux-amanda-9999
index 2c54de3b35a5..c913f046c219 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-9999
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6f7db71314c55a0cb296245a7d1f424e
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r1
deleted file mode 100644
index 8c29da4e302f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amavis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3ebcc469e0e5206c38de570842da3b97
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r2
deleted file mode 100644
index eb42bcf99bdb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amavis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d5d5ddc511e2bd8bbc93fd0273286a7f
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r3
deleted file mode 100644
index a393eafa8c3c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amavis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d5d5ddc511e2bd8bbc93fd0273286a7f
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r4
deleted file mode 100644
index 3f860b095ac8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amavis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d5d5ddc511e2bd8bbc93fd0273286a7f
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r2
index 9406d8449cad..6bac10087b65 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d5d5ddc511e2bd8bbc93fd0273286a7f
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r3
index f956155be4c5..e0fd977f997a 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d5d5ddc511e2bd8bbc93fd0273286a7f
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r4
deleted file mode 100644
index a99957488c37..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amavis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3ebcc469e0e5206c38de570842da3b97
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r1
index fb4419f98e61..18e964943040 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3d77dee1dfbbec73730a91f9bc775096
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r2
index dafc9fad9272..dc6eae6a7403 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f7059b7d970603a5fd937b27f96f1d4d
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r3
new file mode 100644
index 000000000000..3ec5909e0598
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for amavis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f7059b7d970603a5fd937b27f96f1d4d
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-9999 b/metadata/md5-cache/sec-policy/selinux-amavis-9999
index e087e9113b78..e91be2039bd9 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f7059b7d970603a5fd937b27f96f1d4d
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r1
deleted file mode 100644
index a2219601e286..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for android
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d5a1639498b992b44621ab10fa686d21
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r2
deleted file mode 100644
index 4565fa7cf38d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for android
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5152b0fee09e462a5e16de2387644b4b
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r3
deleted file mode 100644
index d5938f45889c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for android
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5152b0fee09e462a5e16de2387644b4b
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r4
deleted file mode 100644
index 00f85eebb97d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for android
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5152b0fee09e462a5e16de2387644b4b
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r2
index 493a477acd7c..699681e96c7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5152b0fee09e462a5e16de2387644b4b
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r3
index d45f17b87bea..8bfdce9d7ec1 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5152b0fee09e462a5e16de2387644b4b
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r4
deleted file mode 100644
index f2859a9043e1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for android
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d5a1639498b992b44621ab10fa686d21
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r1
index e1f0cbacdd3f..8cb0e99c4883 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4f872b9506a7a33b4e77b05a7b0b610e
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r2
index 2131d3c24ea4..58e3b76f5fbc 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2d294c6f0a5a92cd7d96ac7746f47d2d
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r3
new file mode 100644
index 000000000000..5a457249711d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for android
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2d294c6f0a5a92cd7d96ac7746f47d2d
diff --git a/metadata/md5-cache/sec-policy/selinux-android-9999 b/metadata/md5-cache/sec-policy/selinux-android-9999
index 1cd02615053a..f8c3e136dbe9 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-9999
+++ b/metadata/md5-cache/sec-policy/selinux-android-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2d294c6f0a5a92cd7d96ac7746f47d2d
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r1
deleted file mode 100644
index 935352af94c5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apache
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ba5c9268e3d2cb2d67211945d7b0dc1b
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r2
deleted file mode 100644
index 4d67571eec81..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apache
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c45ffd150ac0c5f580dc3475cc98b294
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r3
deleted file mode 100644
index ce664f63f2b9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apache
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c45ffd150ac0c5f580dc3475cc98b294
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r4
deleted file mode 100644
index d392f0477408..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apache
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c45ffd150ac0c5f580dc3475cc98b294
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r2
index e039368e0dc0..b9c9bbfe0673 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c45ffd150ac0c5f580dc3475cc98b294
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r3
index 534bf79d4530..271a912159f3 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c45ffd150ac0c5f580dc3475cc98b294
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r4
deleted file mode 100644
index fa515094c76d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apache
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ba5c9268e3d2cb2d67211945d7b0dc1b
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r1
index dc3490ab7362..c03c135cc97a 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=30f3c100de98a26fa9a7523fdcc81148
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r2
index d82bf9ebad77..24119ef3bdab 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=48b4126b0df72dc981f8a5364fd7846c
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r3
new file mode 100644
index 000000000000..742a10126ad7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for apache
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=48b4126b0df72dc981f8a5364fd7846c
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-9999 b/metadata/md5-cache/sec-policy/selinux-apache-9999
index 8a99adfd6dc9..553290d6d7a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apache-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=48b4126b0df72dc981f8a5364fd7846c
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r1
deleted file mode 100644
index 84c1cba59690..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apcupsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0b94f2920562d3942f5496fc9b2eb1b9
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r2
deleted file mode 100644
index 5067941731d9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apcupsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4c392ce2c96ebddef76a524456f78ebf
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r3
deleted file mode 100644
index d88707b78486..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apcupsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4c392ce2c96ebddef76a524456f78ebf
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r4
deleted file mode 100644
index bdba478fa304..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apcupsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4c392ce2c96ebddef76a524456f78ebf
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r2
index eccc7e12c567..7858bc863ca4 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4c392ce2c96ebddef76a524456f78ebf
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r3
index 27f0b764bc5e..71d181b682d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4c392ce2c96ebddef76a524456f78ebf
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r4
deleted file mode 100644
index 42135aa0dd7f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apcupsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0b94f2920562d3942f5496fc9b2eb1b9
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r1
index 2995474ee1f2..cd00b8ab7d22 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=59b19adaca883f8c7d74dabcf0b77954
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r2
index aea99806c89c..d40abed9f4c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d676814bfbfdf1eef411fee37afde19e
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r3
new file mode 100644
index 000000000000..62e54ecae55c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for apcupsd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d676814bfbfdf1eef411fee37afde19e
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-9999 b/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
index a4e35fa3d0b5..ffe50ae3bdcf 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d676814bfbfdf1eef411fee37afde19e
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r1
deleted file mode 100644
index aacb620e0c0b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=81caee136d913a10fa5dff0efa02cac0
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r2
deleted file mode 100644
index 5dee5b72832b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e2f850537e5a5dc0c7ffb9547fb3a274
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r3
deleted file mode 100644
index dc93406eeab8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e2f850537e5a5dc0c7ffb9547fb3a274
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r4
deleted file mode 100644
index 68defba68fbe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acpi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7301ffe3c7df3bcc0deea1417eaa6cce
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r2
index 36b8bc56e1d9..7e8c5e75e250 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7301ffe3c7df3bcc0deea1417eaa6cce
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r3
index d0b6c0c8e341..21439de764a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7301ffe3c7df3bcc0deea1417eaa6cce
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r4
deleted file mode 100644
index cf8899af8caf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acpi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c029f4410aa158f757e8854671e9921
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r1
index 5cf185be7650..52fad723be12 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=58a6c97395120cc27e65dc7f95942afe
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r2
index 1f3fd5a69694..7797cd3568c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0972244da4acefa37d77a271256e6b74
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r3
new file mode 100644
index 000000000000..c2900f0d2fef
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for acpi
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=0972244da4acefa37d77a271256e6b74
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-9999 b/metadata/md5-cache/sec-policy/selinux-apm-9999
index 6d92221e4567..97d069360fed 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0972244da4acefa37d77a271256e6b74
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r1
deleted file mode 100644
index 7bbba7cabc54..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for arpwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2027f095e1f8a7f468489b413bacf4b7
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r2
deleted file mode 100644
index c2c9949f8666..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for arpwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=440b9a4eb2484df11a70f14a7b4eac2f
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r3
deleted file mode 100644
index 94ea4a212a63..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for arpwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=440b9a4eb2484df11a70f14a7b4eac2f
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r4
deleted file mode 100644
index 247e52e8e934..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for arpwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=440b9a4eb2484df11a70f14a7b4eac2f
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r2
index aa4903cbd217..1fc78be76a38 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=440b9a4eb2484df11a70f14a7b4eac2f
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r3
index 8b4d156f5fdf..63f8cd4ea68e 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=440b9a4eb2484df11a70f14a7b4eac2f
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r4
deleted file mode 100644
index 91c59347d9bd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for arpwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2027f095e1f8a7f468489b413bacf4b7
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r1
index 7836cc142832..a2f1e88bd989 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=26e167f5aaaa71f4e98cff47fb763414
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r2
index 7e6694bfda47..8b36da4a4f70 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=46aaccaf3b7e46d22ec5ba86ec1dd4a0
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r3
new file mode 100644
index 000000000000..49985b4a6c0f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for arpwatch
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=46aaccaf3b7e46d22ec5ba86ec1dd4a0
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-9999 b/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
index 38fa270bf949..a8cda7d25c70 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=46aaccaf3b7e46d22ec5ba86ec1dd4a0
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r1
deleted file mode 100644
index 3779421743e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for asterisk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=14d28ad53a98235efa3cbe054f02b4d3
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r2
deleted file mode 100644
index 384735bfa2fc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for asterisk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cfec5879b0bf2dbfc4f298eaba151c11
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r3
deleted file mode 100644
index f352c021386a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for asterisk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cfec5879b0bf2dbfc4f298eaba151c11
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r4
deleted file mode 100644
index 1947ffb86bdd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for asterisk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cfec5879b0bf2dbfc4f298eaba151c11
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r2
index e5cde341bdcb..240359ec264d 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cfec5879b0bf2dbfc4f298eaba151c11
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r3
index 0be0a6b1a34f..ea3fb554b76b 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cfec5879b0bf2dbfc4f298eaba151c11
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r4
deleted file mode 100644
index 2f29ccb5321f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for asterisk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=14d28ad53a98235efa3cbe054f02b4d3
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r1
index 73092b01aded..067e97306e03 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0bb200fb53be5f5bf35c6066be222b38
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r2
index 9df8a07ec7b2..ca178da73cd6 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=27f1376aafa58b1565261f9e43bbd345
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r3
new file mode 100644
index 000000000000..e09c7db7f6ea
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for asterisk
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=27f1376aafa58b1565261f9e43bbd345
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-9999 b/metadata/md5-cache/sec-policy/selinux-asterisk-9999
index b63b9ed3416f..065bd6343bfe 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=27f1376aafa58b1565261f9e43bbd345
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r1
deleted file mode 100644
index f929d4ef383b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for at
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5bf86abc9f43128af2e5a9d1aa5bfec2
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r2
deleted file mode 100644
index 2f19446c6802..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for at
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b2e1d7caeacef680ba2434e78a094490
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r3
deleted file mode 100644
index 9b1107dcab70..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for at
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b2e1d7caeacef680ba2434e78a094490
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r4
deleted file mode 100644
index a49c6aa8a6db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for at
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b2e1d7caeacef680ba2434e78a094490
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r2
index 2b14e8498ba1..df9dd2377c7a 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b2e1d7caeacef680ba2434e78a094490
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r3
index 0a1600f8f026..716e3a754976 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b2e1d7caeacef680ba2434e78a094490
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r4
deleted file mode 100644
index f4c863ac8663..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for at
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5bf86abc9f43128af2e5a9d1aa5bfec2
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r1
index 40ec00b49937..27e38e59e794 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a78e86d63bcf6b974699df4aee14e77e
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r2
index f22b5c0e0f1a..7ca8be2f0c9f 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a74095393e04e926bf07e7e46b33c5ce
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r3
new file mode 100644
index 000000000000..a0101c571546
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for at
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a74095393e04e926bf07e7e46b33c5ce
diff --git a/metadata/md5-cache/sec-policy/selinux-at-9999 b/metadata/md5-cache/sec-policy/selinux-at-9999
index 557c0219bc13..08d5eaad0a80 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-9999
+++ b/metadata/md5-cache/sec-policy/selinux-at-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a74095393e04e926bf07e7e46b33c5ce
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r1
deleted file mode 100644
index 69e4a812deab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for automount
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6f5ca532b2a304e45a260227149c2441
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r2
deleted file mode 100644
index d6cdc33da92c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for automount
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ae52002a8018cf6e89235547775b1399
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r3
deleted file mode 100644
index c329f5ae5d9b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for automount
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ae52002a8018cf6e89235547775b1399
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r4
deleted file mode 100644
index 0ab51f825086..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for automount
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ae52002a8018cf6e89235547775b1399
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r2
index dd1f24d09dac..3b1a7dd18f8d 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ae52002a8018cf6e89235547775b1399
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r3
index 0c40df11f220..c65b1d6f9f96 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ae52002a8018cf6e89235547775b1399
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r4
deleted file mode 100644
index a89bf7949d64..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for automount
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6f5ca532b2a304e45a260227149c2441
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r1
index 083aec2a5261..db8955c8174b 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f3833cacbceee40c672c4cb8650ca2d6
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r2
index 383e6545c9d3..3f4f5c46fcd8 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c90750f7be87598be3911381e431df7c
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r3
new file mode 100644
index 000000000000..30e36d4be38a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for automount
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c90750f7be87598be3911381e431df7c
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-9999 b/metadata/md5-cache/sec-policy/selinux-automount-9999
index 502d17d63c61..153460febc63 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-9999
+++ b/metadata/md5-cache/sec-policy/selinux-automount-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c90750f7be87598be3911381e431df7c
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r1
deleted file mode 100644
index 37fce9505e7b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for avahi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d3422aa2f8e3168e957dde2409bc6ace
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r2
deleted file mode 100644
index 064ef0d39824..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for avahi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e131fb429de95dd314c310e4326c3889
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r3
deleted file mode 100644
index 7915c56134f8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for avahi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e131fb429de95dd314c310e4326c3889
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r4
deleted file mode 100644
index 07f4dd9340b5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for avahi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e131fb429de95dd314c310e4326c3889
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r2
index 9c875c5190f9..c2f52906c806 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e131fb429de95dd314c310e4326c3889
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r3
index bb1d9c556931..51e2c6a45658 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e131fb429de95dd314c310e4326c3889
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r4
deleted file mode 100644
index 6356f27b2278..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for avahi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d3422aa2f8e3168e957dde2409bc6ace
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r1
index b6de9da98a78..e4d26c06bb97 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5b30a5a9373d384f92c0e66747ec0820
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r2
index f26b59c8f466..16c6869e2442 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=973de877a6b33934c0878bc6f0c1107f
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r3
new file mode 100644
index 000000000000..514e8bab551d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for avahi
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=973de877a6b33934c0878bc6f0c1107f
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-9999 b/metadata/md5-cache/sec-policy/selinux-avahi-9999
index 420ffdfc86e1..aee8ada1195f 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-9999
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=973de877a6b33934c0878bc6f0c1107f
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r1
deleted file mode 100644
index c5a93e58e86b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for awstats
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b73df71e1658105562ec349e8e18556d
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r2
deleted file mode 100644
index 2cfafbfa1752..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for awstats
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f26836c42e671890aaa9921a902aca3a
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r3
deleted file mode 100644
index 1c8b0e4f97a1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for awstats
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f26836c42e671890aaa9921a902aca3a
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r4
deleted file mode 100644
index 708cee82eff9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for awstats
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f26836c42e671890aaa9921a902aca3a
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r2
index 111a18f2ce6a..26b3ae043dee 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f26836c42e671890aaa9921a902aca3a
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r3
index 53f31578ce50..e96e45a6fbe0 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f26836c42e671890aaa9921a902aca3a
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r4
deleted file mode 100644
index 1dbf25ec20e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for awstats
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b73df71e1658105562ec349e8e18556d
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r1
index 4ad83cc11a58..6c4ba01b7c97 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7ffe511de95de1af4f247af28f981fe2
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r2
index 5fd7d9430674..fa823ad3cb13 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1856d797f9d145635e0233819079d917
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r3
new file mode 100644
index 000000000000..6fde5ac3082a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for awstats
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1856d797f9d145635e0233819079d917
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-9999 b/metadata/md5-cache/sec-policy/selinux-awstats-9999
index b05bcf65fb5b..6f13e96de661 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-9999
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1856d797f9d145635e0233819079d917
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r1
deleted file mode 100644
index 347b734506e0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for generic backup apps
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8b7e8a786c059a63c0d502d91fd443c4
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r2
deleted file mode 100644
index a4704c8764cc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for generic backup apps
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=51ad2598f3ae2103dc028922cff61277
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r3
deleted file mode 100644
index e07864569945..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for generic backup apps
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=51ad2598f3ae2103dc028922cff61277
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r4
deleted file mode 100644
index dd55a073851f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for generic backup apps
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=51ad2598f3ae2103dc028922cff61277
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r2
index a0f53327e7a9..5da0b8d7ece4 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=51ad2598f3ae2103dc028922cff61277
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r3
index 9e306307f94f..17c959ff3632 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=51ad2598f3ae2103dc028922cff61277
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r4
deleted file mode 100644
index cecd54ca2c53..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for generic backup apps
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8b7e8a786c059a63c0d502d91fd443c4
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r1
index 4fe4b659c1d1..67e4d4594eb9 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=70dece5011be318b1c6ee04936a34838
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r2
index c0c02c246782..3209bf7bce1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3bb466ad28f1e20fc3f3e87bd664f508
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r3
new file mode 100644
index 000000000000..e6b03f40381c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for generic backup apps
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3bb466ad28f1e20fc3f3e87bd664f508
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-9999 b/metadata/md5-cache/sec-policy/selinux-backup-9999
index 05bd681cc3db..89eddafe1e52 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-backup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3bb466ad28f1e20fc3f3e87bd664f508
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r1
deleted file mode 100644
index 76cb820eb545..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bacula
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2a9c966d73c626d64be3b933c3585cda
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r2
deleted file mode 100644
index 44c26ae738d1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bacula
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09c785b6b1eef505a9c793d0983cda8
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r3
deleted file mode 100644
index 50d435b0b611..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bacula
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09c785b6b1eef505a9c793d0983cda8
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r4
deleted file mode 100644
index d74ddd840b41..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bacula
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09c785b6b1eef505a9c793d0983cda8
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r2
index faeede0e52c5..b9fb222c52d4 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a09c785b6b1eef505a9c793d0983cda8
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r3
index 461cd1500f1e..093e42c12e3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a09c785b6b1eef505a9c793d0983cda8
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r4
deleted file mode 100644
index da219a509b7c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bacula
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2a9c966d73c626d64be3b933c3585cda
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r1
index b5ae90ef5efe..8c7a2f467626 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7209213498b279bf05c98231308b6735
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r2
index 7dfaac22980f..8f88003f9bce 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ec36167210d970a8bce0bbfac92b88f
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r3
new file mode 100644
index 000000000000..0f242478dfc3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bacula
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2ec36167210d970a8bce0bbfac92b88f
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-9999 b/metadata/md5-cache/sec-policy/selinux-bacula-9999
index 6eb39036cf35..0b8b8183c5bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ec36167210d970a8bce0bbfac92b88f
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r1
deleted file mode 100644
index 9d307a7f1305..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.3
-DESCRIPTION=Gentoo base policy for SELinux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_md5_=efc40e6d31023295bb6eb58d9c2e38c4
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r2
deleted file mode 100644
index 95b527fabed5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.3
-DESCRIPTION=Gentoo base policy for SELinux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_md5_=3bc2d1df69f38b307cd2a929adddba1a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r3
deleted file mode 100644
index 6ff41fea3ebe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.3
-DESCRIPTION=Gentoo base policy for SELinux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_md5_=3bc2d1df69f38b307cd2a929adddba1a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r4
deleted file mode 100644
index 3a9c17834636..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.3
-DESCRIPTION=Gentoo base policy for SELinux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_md5_=3bc2d1df69f38b307cd2a929adddba1a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r4
deleted file mode 100644
index 65ebe15a386b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.3
-DESCRIPTION=Gentoo base policy for SELinux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_md5_=53df40742a21844d2646db32162f83c8
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-base-2.20180114-r3
new file mode 100644
index 000000000000..3b0abcb5016e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-base-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=sys-apps/policycoreutils-2.7 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.7
+DESCRIPTION=Gentoo base policy for SELinux
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.7 virtual/udev
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_md5_=5d5c9667f836f85f655074a21bb8af6a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r1
deleted file mode 100644
index 565171b3a1d7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND==sec-policy/selinux-base-2.20170204-r1[systemd?]
-DESCRIPTION=SELinux policy for core modules
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=systemd +unconfined
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_md5_=30ba7702ca5ec1a7d2ccf87aaa75ec85
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r2
deleted file mode 100644
index 7d7b364e5480..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND==sec-policy/selinux-base-2.20170204-r2[systemd?]
-DESCRIPTION=SELinux policy for core modules
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=systemd +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_md5_=9b42040829f9aa2df9f3997c5d68086a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r3
deleted file mode 100644
index 203684467cb8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND==sec-policy/selinux-base-2.20170204-r3[systemd?]
-DESCRIPTION=SELinux policy for core modules
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=systemd +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_md5_=9b42040829f9aa2df9f3997c5d68086a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r4
deleted file mode 100644
index 71a9e29e51dd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND==sec-policy/selinux-base-2.20170204-r4[systemd?]
-DESCRIPTION=SELinux policy for core modules
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=systemd +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_md5_=9b42040829f9aa2df9f3997c5d68086a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r4
deleted file mode 100644
index 2ca45c3c8103..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND==sec-policy/selinux-base-2.20170805-r4[systemd?]
-DESCRIPTION=SELinux policy for core modules
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=systemd +unconfined
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_md5_=281dd0bb4a8c9610189b393145c2601c
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180114-r2
index 1874f60d66c7..b6e29ad43cec 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180114-r2
@@ -7,6 +7,7 @@ IUSE=systemd +unconfined
 KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
+RDEPEND==sec-policy/selinux-base-2.20180114-r2[systemd?]
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_md5_=281dd0bb4a8c9610189b393145c2601c
+_md5_=ec3c456181d6588001a7d82ac223c6c8
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180114-r3
new file mode 100644
index 000000000000..fb582ecad538
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180114-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare pretend setup
+DEPEND==sec-policy/selinux-base-2.20180114-r3[systemd?]
+DESCRIPTION=SELinux policy for core modules
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=systemd +unconfined
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
+RDEPEND==sec-policy/selinux-base-2.20180114-r3[systemd?]
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_md5_=ec3c456181d6588001a7d82ac223c6c8
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-9999 b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
index 26b6d9d038ca..2ccf59b03056 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=systemd +unconfined
 LICENSE=GPL-2
 PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
+RDEPEND==sec-policy/selinux-base-9999[systemd?]
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8
-_md5_=281dd0bb4a8c9610189b393145c2601c
+_md5_=ec3c456181d6588001a7d82ac223c6c8
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r1
deleted file mode 100644
index 4eb13ee1e58b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=32d525ce9ddcedad8744b53f6e238554
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r2
deleted file mode 100644
index 00a537312a6d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a67c60cd4460a559747d96be07c47a20
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r3
deleted file mode 100644
index d12c6f3fce2e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a67c60cd4460a559747d96be07c47a20
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r4
deleted file mode 100644
index 35c720b6647f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a67c60cd4460a559747d96be07c47a20
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r2
index a03c55d623ff..0bc930f55745 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a67c60cd4460a559747d96be07c47a20
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r3
index c2eebf1aca26..566468f9bcf5 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a67c60cd4460a559747d96be07c47a20
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r4
deleted file mode 100644
index 755304cf74f8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=32d525ce9ddcedad8744b53f6e238554
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r1
index 4645030a3df0..4bdce6cc70fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=82db06962ab4c11d3ee47aff15692e00
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r2
index 240403a33e58..390e124a3b8b 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=56ca81f2e52d34e990a86a9a18d5d7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r3
new file mode 100644
index 000000000000..5abf8cb2c69a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bind
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=56ca81f2e52d34e990a86a9a18d5d7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-9999 b/metadata/md5-cache/sec-policy/selinux-bind-9999
index 59b94b5cb6d6..3455863a561f 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bind-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=56ca81f2e52d34e990a86a9a18d5d7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r1
deleted file mode 100644
index ae0a04e94dff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitcoin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c841c334a402c91e1a56658387350aaa
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r2
deleted file mode 100644
index 8f0fe88dd106..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitcoin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d8961c3044b30cb12571fd05d2e8df32
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r3
deleted file mode 100644
index 6abea3247a50..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitcoin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d8961c3044b30cb12571fd05d2e8df32
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r4
deleted file mode 100644
index 23399f7369e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitcoin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d8961c3044b30cb12571fd05d2e8df32
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r2
index 19228837b670..d8f1f94e8e12 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d8961c3044b30cb12571fd05d2e8df32
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r3
index caafa457ccd4..bbdaa905d8d9 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d8961c3044b30cb12571fd05d2e8df32
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r4
deleted file mode 100644
index 69011102c4a3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitcoin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c841c334a402c91e1a56658387350aaa
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r1
index 573a138bd69f..3511981ac051 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5dc314ff55eb3cc52c911df1e443e5f1
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r2
index 85b3f24aad6b..4d6781c5d6a9 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c96736a007cbcb61ef48e7e04a194fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r3
new file mode 100644
index 000000000000..dbb7205bf199
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bitcoin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c96736a007cbcb61ef48e7e04a194fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-9999 b/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
index e17d2838f7e2..314377330614 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c96736a007cbcb61ef48e7e04a194fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r1
deleted file mode 100644
index 91b372126f8f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitlbee
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8b77fd68afaf8faef19af8e3fe7673c5
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r2
deleted file mode 100644
index c466f2d53d1f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitlbee
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=408057c025876c3b3692f831077a8dd9
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r3
deleted file mode 100644
index 99a20c11d3db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitlbee
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=408057c025876c3b3692f831077a8dd9
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r4
deleted file mode 100644
index 7b83abacb33a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitlbee
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=408057c025876c3b3692f831077a8dd9
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r2
index 3ff4dd5096c8..55e1a61a41d9 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=408057c025876c3b3692f831077a8dd9
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r3
index 9aed791d7634..a020b9ba1e5f 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=408057c025876c3b3692f831077a8dd9
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r4
deleted file mode 100644
index c0340e9b8367..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitlbee
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8b77fd68afaf8faef19af8e3fe7673c5
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r1
index 6382f29df6ab..093e4d685e89 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9dbf55178fc2f3e6b4cbfeeb193fe882
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r2
index 5ca093faa32f..8eaa858c7ca7 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=229d5b182553dcc9c914553b07270431
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r3
new file mode 100644
index 000000000000..899afb39339f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bitlbee
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=229d5b182553dcc9c914553b07270431
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-9999 b/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
index 169a4bee4900..210150490fc8 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=229d5b182553dcc9c914553b07270431
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r1
deleted file mode 100644
index b12856b53843..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bluetooth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1015abd062e5dd1768d2bab321c19e70
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r2
deleted file mode 100644
index 4a2e8a458d95..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bluetooth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=03a3820b224288d4643b1d47fe0fba47
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r3
deleted file mode 100644
index 1638b3a48e39..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bluetooth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=03a3820b224288d4643b1d47fe0fba47
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r4
deleted file mode 100644
index 18c8dbf32021..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bluetooth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=03a3820b224288d4643b1d47fe0fba47
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r2
index c06fbe2f68c6..a5bc81adbdb7 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=03a3820b224288d4643b1d47fe0fba47
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r3
index ac54bcb56e77..987cd04576f0 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=03a3820b224288d4643b1d47fe0fba47
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r4
deleted file mode 100644
index 7421063ed66a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bluetooth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1015abd062e5dd1768d2bab321c19e70
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r1
index 4f5cc623c865..20e1d0018d75 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9cf9317b38aa4ad14d4f99a91d376b25
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r2
index deeae30ac5e8..a1817887c481 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=673558fcfd0a3b72c9c45d8d11d7a949
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r3
new file mode 100644
index 000000000000..7076f89f3733
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bluetooth
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=673558fcfd0a3b72c9c45d8d11d7a949
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-9999 b/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
index f730f7290ac7..c7977a2557d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=673558fcfd0a3b72c9c45d8d11d7a949
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r1
deleted file mode 100644
index 7a164dda993c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for brctl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=37659edb215bfd50cb9dcc350fe20ce9
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r2
deleted file mode 100644
index 05b4648fb1ba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for brctl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=06bb460617bae94d3547480331dc732d
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r3
deleted file mode 100644
index 6b04307814e8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for brctl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=06bb460617bae94d3547480331dc732d
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r4
deleted file mode 100644
index fbf9e0c28021..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for brctl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=06bb460617bae94d3547480331dc732d
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r2
index 3e9c74c8f9d1..fad1d1793391 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=06bb460617bae94d3547480331dc732d
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r3
index fcf3f2dd355f..d6d84e12049f 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=06bb460617bae94d3547480331dc732d
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r4
deleted file mode 100644
index 5235c90fd351..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for brctl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=37659edb215bfd50cb9dcc350fe20ce9
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r1
index 9bba9c355ac2..bcea9d21b917 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8a25d670116c4d785b75800523d2e916
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r2
index 46aa58ffb996..d0c5e588d95d 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=92d641643aab6f44f1a1f8ed004ca1e5
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r3
new file mode 100644
index 000000000000..0f8ea512d1db
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for brctl
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=92d641643aab6f44f1a1f8ed004ca1e5
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-9999 b/metadata/md5-cache/sec-policy/selinux-brctl-9999
index 2384690dd61e..56373af2466e 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=92d641643aab6f44f1a1f8ed004ca1e5
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r1
deleted file mode 100644
index 665cf8d175e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cachefilesd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0e437bce9dc934ac344b60deeabc2017
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r2
deleted file mode 100644
index a9bd4701cfb1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cachefilesd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=01abe3d2507c2c53faefc8549b240376
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r3
deleted file mode 100644
index 013f86b266c2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cachefilesd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=01abe3d2507c2c53faefc8549b240376
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r4
deleted file mode 100644
index 174d6a491541..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cachefilesd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=01abe3d2507c2c53faefc8549b240376
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r2
index 81fc7195b41e..818542865b67 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=01abe3d2507c2c53faefc8549b240376
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r3
index c5ff5f74cc61..c1ae31c172e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=01abe3d2507c2c53faefc8549b240376
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r4
deleted file mode 100644
index 407cb684db96..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cachefilesd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0e437bce9dc934ac344b60deeabc2017
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r1
index e5778136a9c8..67e121c38fa3 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ca7bdc63fbf7686c930e9735a4d56cdc
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r2
index ecc3f4cd6ea5..398e92c4982c 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d1b26738e3edb719175126355d608017
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r3
new file mode 100644
index 000000000000..d51fd09a9e49
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cachefilesd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d1b26738e3edb719175126355d608017
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
index 825f53b54f3a..aba6f8e6f774 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d1b26738e3edb719175126355d608017
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r1
deleted file mode 100644
index fd8e7d420788..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for calamaris
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=93546710d2d01a6f569be6842797675b
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r2
deleted file mode 100644
index 7fb7a8d2ca6c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for calamaris
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7f47e54dc9221025b76a6dcb17128e92
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r3
deleted file mode 100644
index a691ea99f6a7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for calamaris
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7f47e54dc9221025b76a6dcb17128e92
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r4
deleted file mode 100644
index 8181bd132630..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for calamaris
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7f47e54dc9221025b76a6dcb17128e92
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r2
index 83ebbe1ebcd2..f0efd1dbcdb6 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7f47e54dc9221025b76a6dcb17128e92
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r3
index 942ebd6382e2..781284f6aac0 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7f47e54dc9221025b76a6dcb17128e92
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r4
deleted file mode 100644
index 32d5d30db0b4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for calamaris
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=93546710d2d01a6f569be6842797675b
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r1
index 316518bcd9bf..6a16dac67e5b 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a0e6633fc25dd1b42ef5d909db8ef295
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r2
index 37a88a2bd5cb..b195bd9506fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=043088fe9b8d2927d9c328d3384b0c40
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r3
new file mode 100644
index 000000000000..e6e283039354
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for calamaris
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=043088fe9b8d2927d9c328d3384b0c40
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-9999 b/metadata/md5-cache/sec-policy/selinux-calamaris-9999
index da10796b04ae..28b0cede1b5b 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-9999
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=043088fe9b8d2927d9c328d3384b0c40
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r1
deleted file mode 100644
index 7c6afcc9da4c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for canna
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=927ec273a460d2de5df4e1e2cb86d8e8
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r2
deleted file mode 100644
index 4bc661891f06..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for canna
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c46e582668f237b257d47405c02b43fd
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r3
deleted file mode 100644
index ca0b0aa5d11f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for canna
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c46e582668f237b257d47405c02b43fd
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r4
deleted file mode 100644
index 65565ad4b743..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for canna
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c46e582668f237b257d47405c02b43fd
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r2
index 051c883fc74f..a7ee78910656 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c46e582668f237b257d47405c02b43fd
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r3
index 1dd9e84dc5da..4e211c4f63ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c46e582668f237b257d47405c02b43fd
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r4
deleted file mode 100644
index 2c9dea357b21..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for canna
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=927ec273a460d2de5df4e1e2cb86d8e8
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r1
index 10f1dfa64400..10b6d9d357e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4509fcea12c807629014769696d19cd9
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r2
index 4ce3b448356a..a8caae24c199 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fb000b799f6f4c1e62e20ae2797df7ef
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r3
new file mode 100644
index 000000000000..b782f08e166e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for canna
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=fb000b799f6f4c1e62e20ae2797df7ef
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-9999 b/metadata/md5-cache/sec-policy/selinux-canna-9999
index bf5b2908599f..2b5b049dbd38 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-9999
+++ b/metadata/md5-cache/sec-policy/selinux-canna-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fb000b799f6f4c1e62e20ae2797df7ef
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r1
deleted file mode 100644
index 00438c162030..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ccs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0c90036dc18f1eedd8299e31247c7b01
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r2
deleted file mode 100644
index 3e57f8f16ead..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ccs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a862f3fdb0ad27458ec79244c7a5643f
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r3
deleted file mode 100644
index f59ba3849b0a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ccs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a862f3fdb0ad27458ec79244c7a5643f
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r4
deleted file mode 100644
index e23816a6fa67..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ccs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a862f3fdb0ad27458ec79244c7a5643f
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r2
index 363c5f5a90c5..10f1f9069374 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a862f3fdb0ad27458ec79244c7a5643f
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r3
index 348d0f3f8905..8d706cdcfa5a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a862f3fdb0ad27458ec79244c7a5643f
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r4
deleted file mode 100644
index 027477d1c2bb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ccs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0c90036dc18f1eedd8299e31247c7b01
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r1
index eeffe4675208..1bd89afe7610 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=234de119aa34f40a900e85145b761aac
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r2
index 6a59cfec6349..f37c4221232d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5cb2fe604adfebbcff489cc2eaa0f87b
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r3
new file mode 100644
index 000000000000..b666487e4157
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ccs
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=5cb2fe604adfebbcff489cc2eaa0f87b
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-9999 b/metadata/md5-cache/sec-policy/selinux-ccs-9999
index 972b16cf413b..cec3a0aca9b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5cb2fe604adfebbcff489cc2eaa0f87b
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r1
deleted file mode 100644
index 8fc8314850f0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cdrecord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6859c901bbf1d6d114c03c1bdb0c9b2f
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r2
deleted file mode 100644
index e480c355f995..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cdrecord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f0a88a3f11286fa4e127fca0df2152db
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r3
deleted file mode 100644
index d2b54b17ad56..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cdrecord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f0a88a3f11286fa4e127fca0df2152db
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r4
deleted file mode 100644
index bde961b281de..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cdrecord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f0a88a3f11286fa4e127fca0df2152db
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r2
index 5242a9ed6a7c..c1c95e84be84 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f0a88a3f11286fa4e127fca0df2152db
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r3
index 6daf78268672..0e519cbbeb25 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f0a88a3f11286fa4e127fca0df2152db
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r4
deleted file mode 100644
index 6f7ac5b596d3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cdrecord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6859c901bbf1d6d114c03c1bdb0c9b2f
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r1
index ab050571d512..d8f29eb17aa0 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b4ac2190bf09c73a89d25a46b5f10650
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r2
index c119386a48b5..100a9944347e 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7210013d3ec91eb6074ec6bc197325a9
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r3
new file mode 100644
index 000000000000..5062d5e22e44
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cdrecord
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=7210013d3ec91eb6074ec6bc197325a9
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-9999 b/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
index 0ea94e384513..d215b0ed0d63 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7210013d3ec91eb6074ec6bc197325a9
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r1
deleted file mode 100644
index a9abc78263e8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ceph
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f286fa56e8f4e20696d1496e81837108
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r2
deleted file mode 100644
index 7a862ca62552..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ceph
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0ecc842dc5d7c9df1d861923578bf81d
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r3
deleted file mode 100644
index 695a229860e8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ceph
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0ecc842dc5d7c9df1d861923578bf81d
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r4
deleted file mode 100644
index 0621a60e4d3a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ceph
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0ecc842dc5d7c9df1d861923578bf81d
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r2
index 23b27c6e5f66..61bd4cbce2a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0ecc842dc5d7c9df1d861923578bf81d
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r3
index 2047bc19f12f..a4ae52294e1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0ecc842dc5d7c9df1d861923578bf81d
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r4
deleted file mode 100644
index f94eeb91904b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ceph
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f286fa56e8f4e20696d1496e81837108
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r1
index 3ff5e1b6d8a5..6010ed0cc3b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=358773d7e49e8fe232d4845b9445b916
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r2
index 58a26e3dd69f..36e25f3118df 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e7184c33d1b867efb62f93304e8bd6b0
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r3
new file mode 100644
index 000000000000..5cd8a2852fef
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ceph
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=e7184c33d1b867efb62f93304e8bd6b0
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-9999 b/metadata/md5-cache/sec-policy/selinux-ceph-9999
index d57b7cbed47a..a44725386b1f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e7184c33d1b867efb62f93304e8bd6b0
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r1
deleted file mode 100644
index 8642ede17e7c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e1abb020fe000f6919056df54aa86e8d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r2
deleted file mode 100644
index f071f51cb354..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=44fd88c97f05d1bc1e5572ac78025f83
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r3
deleted file mode 100644
index 21d6c697d2de..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=44fd88c97f05d1bc1e5572ac78025f83
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r4
deleted file mode 100644
index 68f4105455db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=44fd88c97f05d1bc1e5572ac78025f83
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r2
index af890c5d08ba..ae59197cedbd 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=44fd88c97f05d1bc1e5572ac78025f83
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r3
index 05fe6f973411..5cd45a5fe0c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=44fd88c97f05d1bc1e5572ac78025f83
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r4
deleted file mode 100644
index 1df3a64c3ad8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e1abb020fe000f6919056df54aa86e8d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r1
index 003e1555b843..b0a6f7781cae 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0f4dbc0f949ddb7543b8471ed38b1d27
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r2
index 038eee0e7115..9c1b72703970 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2f959b3a8442ae8f6d38619a18851d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r3
new file mode 100644
index 000000000000..1915bf03f75f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cgmanager
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2f959b3a8442ae8f6d38619a18851d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-9999 b/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
index 99b8d5af38c5..a985b028bf24 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2f959b3a8442ae8f6d38619a18851d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r1
deleted file mode 100644
index 01aa69ea839e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgroup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a60f7640e3fd31c160a34109280bd05a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r2
deleted file mode 100644
index c1e0d94fb4fd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgroup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4a2cb48d0b407a80ad5bc17747a0e7a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r3
deleted file mode 100644
index 41b9bc6bd50d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgroup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4a2cb48d0b407a80ad5bc17747a0e7a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r4
deleted file mode 100644
index d4d2d9da49a6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgroup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4a2cb48d0b407a80ad5bc17747a0e7a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r2
index 4e0e9e9e770a..fb5160e578b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d4a2cb48d0b407a80ad5bc17747a0e7a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r3
index 7801adcb8f5a..3728b4bb0661 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d4a2cb48d0b407a80ad5bc17747a0e7a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r4
deleted file mode 100644
index 00661cb8a9b8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgroup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a60f7640e3fd31c160a34109280bd05a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r1
index b86e70c6c335..4b788b71e7bd 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0eec56d7da43ac546e14af46af296970
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r2
index 122dd1d847e1..0814d5ff6bf0 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6a3f172227d14106b8ba5419274cb7e0
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r3
new file mode 100644
index 000000000000..17c06025bbb3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cgroup
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6a3f172227d14106b8ba5419274cb7e0
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-9999 b/metadata/md5-cache/sec-policy/selinux-cgroup-9999
index 731601e1a861..f333c30906f8 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6a3f172227d14106b8ba5419274cb7e0
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r1
deleted file mode 100644
index 22b01d89e747..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chromium
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1bf27b0083faf34dcbeb1ba0702d5b04
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r2
deleted file mode 100644
index 0f430d5373f2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chromium
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f5b806028121e1200e759e89f08c0a91
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r3
deleted file mode 100644
index b61a8cd6a3bf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chromium
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f5b806028121e1200e759e89f08c0a91
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r4
deleted file mode 100644
index 45d2a7953c7e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170204-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chromium
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f5b806028121e1200e759e89f08c0a91
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r2
index cefb3461ddc8..067a0e628910 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f5b806028121e1200e759e89f08c0a91
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r3
index 2da8112c9e3a..9bb3276fade9 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f5b806028121e1200e759e89f08c0a91
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r4
deleted file mode 100644
index 2a827437fdce..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chromium
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1bf27b0083faf34dcbeb1ba0702d5b04
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r1
index fccc472aa71c..8be8b7ecba4c 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ae467b1e75b7b1f70680c14fc5a57ad5
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r2
index fb67f6006bbe..b372de8e4acc 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d831bee44baa51613d09e3c5d934dc1a
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r3
new file mode 100644
index 000000000000..d36f8ffc8034
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for chromium
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d831bee44baa51613d09e3c5d934dc1a
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-9999 b/metadata/md5-cache/sec-policy/selinux-chromium-9999
index 7d5ed3143502..8d508cbb7afb 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-9999
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d831bee44baa51613d09e3c5d934dc1a
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r1
deleted file mode 100644
index e5379722f163..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chronyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=545ea049c402fd72b3c624a599da5cf7
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r2
deleted file mode 100644
index fc104fedb453..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chronyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a730b182839d29856cc1d239f496c25e
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r3
deleted file mode 100644
index da24df1a1656..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chronyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a730b182839d29856cc1d239f496c25e
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r4
deleted file mode 100644
index f0e75c59e52d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chronyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a730b182839d29856cc1d239f496c25e
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r2
index 9e5e2b3f4529..3f5307a5e230 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a730b182839d29856cc1d239f496c25e
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r3
index b872dde53b0a..8490742a4ed6 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a730b182839d29856cc1d239f496c25e
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r4
deleted file mode 100644
index 633b6074f98a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chronyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=545ea049c402fd72b3c624a599da5cf7
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r1
index 9fb18d23d216..7d1912fa392a 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd9637b367aad9f7a65e0519f9275141
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r2
index 009c01aad7b1..1097e67c5edf 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d86f3bf2a78c99d43a7929ff511b49d6
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r3
new file mode 100644
index 000000000000..57d2c5a38f86
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for chronyd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d86f3bf2a78c99d43a7929ff511b49d6
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-9999 b/metadata/md5-cache/sec-policy/selinux-chronyd-9999
index c1ae27336dae..d25cca2bd7f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d86f3bf2a78c99d43a7929ff511b49d6
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r1
deleted file mode 100644
index 3900df0a5511..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clamav
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=eb30bc7dd10a844c34c1c0a29449a443
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r2
deleted file mode 100644
index 533cd36e3427..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clamav
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d33014abded666b71fba97be4ab3129b
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r3
deleted file mode 100644
index 5f4c2f8d00e3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clamav
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d33014abded666b71fba97be4ab3129b
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r4
deleted file mode 100644
index 2b9fb672aa13..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clamav
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d33014abded666b71fba97be4ab3129b
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r2
index e9c97c9ad58f..fb3bb2d91fa6 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d33014abded666b71fba97be4ab3129b
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r3
index dcc3e00b41ee..258a799fbde2 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d33014abded666b71fba97be4ab3129b
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r4
deleted file mode 100644
index bb3039af905d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clamav
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=eb30bc7dd10a844c34c1c0a29449a443
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r1
index cbe47c7160d6..0409ce4cca6f 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6b52ffdf9b1c0a8cc74c4b9246e66b72
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r2
index c8f34caf0dad..d3f2f3f95c28 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b51f8750ca8b19c12ae980ea99b09d1e
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r3
new file mode 100644
index 000000000000..ff9eba4c1327
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for clamav
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b51f8750ca8b19c12ae980ea99b09d1e
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-9999 b/metadata/md5-cache/sec-policy/selinux-clamav-9999
index f29f6bc80de3..c70b6dcdc4c2 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-9999
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b51f8750ca8b19c12ae980ea99b09d1e
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r1
deleted file mode 100644
index 11fb38cb9191..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clockspeed
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=df540935f5e5e733917f689fc605d219
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r2
deleted file mode 100644
index 8eaabb6262dc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clockspeed
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bafc5e7719da48a03588e79826b13238
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r3
deleted file mode 100644
index 1b3375454364..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clockspeed
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bafc5e7719da48a03588e79826b13238
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r4
deleted file mode 100644
index 17d4bda25d6b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clockspeed
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bafc5e7719da48a03588e79826b13238
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r2
index ac119a51a633..6f8487d5aa76 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bafc5e7719da48a03588e79826b13238
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r3
index 4bbebe74daa3..9c38890cf5c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bafc5e7719da48a03588e79826b13238
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r4
deleted file mode 100644
index b23b5ba49608..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clockspeed
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=df540935f5e5e733917f689fc605d219
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r1
index 4598b00c60e3..d03ef56fef74 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4fd9944a753ac4d37f9a005bfb87d345
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r2
index e1091b874244..491e3f0a853e 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2b402a30d9fb5f9d8bd0ed03b1b0568
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r3
new file mode 100644
index 000000000000..f0633a01f018
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for clockspeed
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c2b402a30d9fb5f9d8bd0ed03b1b0568
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-9999 b/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
index 57ba31f172ed..42d6ca9d7d40 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2b402a30d9fb5f9d8bd0ed03b1b0568
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r1
deleted file mode 100644
index 583036bfeb1d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for collectd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fce65372dd595301a012bf95e4fb157d
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r2
deleted file mode 100644
index a0c7fa7652fd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for collectd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=169eda9ab17e8fb922178c90361b6896
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r3
deleted file mode 100644
index 7f60cab2f336..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for collectd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=169eda9ab17e8fb922178c90361b6896
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r4
deleted file mode 100644
index 606f2b9b0b23..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for collectd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=169eda9ab17e8fb922178c90361b6896
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r2
index c58e360bb121..369f7aceaed9 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=169eda9ab17e8fb922178c90361b6896
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r3
index 14f393aa6049..b431b29d9382 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=169eda9ab17e8fb922178c90361b6896
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r4
deleted file mode 100644
index de4334a1e664..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for collectd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fce65372dd595301a012bf95e4fb157d
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r1
index efe4063b7827..19021747870b 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=13ea83fce42eb8ff4834d83006893c1a
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r2
index dfd54586faf8..daee01d8a8e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f5b66d8894949bf0781834660ca83f28
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r3
new file mode 100644
index 000000000000..96480892396d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for collectd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f5b66d8894949bf0781834660ca83f28
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-9999 b/metadata/md5-cache/sec-policy/selinux-collectd-9999
index 74bebec62f33..4df8f3feac92 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f5b66d8894949bf0781834660ca83f28
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r1
deleted file mode 100644
index 6c56e30e344d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for consolekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a834354a9da90325f5a7a3593075704e
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r2
deleted file mode 100644
index 72b81ad5852c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for consolekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a0c4e9456c5fa99f5f9f238e7e02e889
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r3
deleted file mode 100644
index a83dea4585a5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for consolekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a0c4e9456c5fa99f5f9f238e7e02e889
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r4
deleted file mode 100644
index 9374884c5ca0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for consolekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a0c4e9456c5fa99f5f9f238e7e02e889
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r2
index b5c68b588112..154e19ac2012 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a0c4e9456c5fa99f5f9f238e7e02e889
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r3
index a9c6723400cf..2f4160b12282 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a0c4e9456c5fa99f5f9f238e7e02e889
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r4
deleted file mode 100644
index 6b0ac5e7288d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for consolekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a834354a9da90325f5a7a3593075704e
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r1
index cfdbde2ca6ba..ed55fbf0b6fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2f362248fdc6005989115ce8e54f4697
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r2
index 1c9093a6fde2..4c1935e998b7 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=eba1ea8502b23a7b9cc10ca49bc66fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r3
new file mode 100644
index 000000000000..9fe0052139c3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for consolekit
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=eba1ea8502b23a7b9cc10ca49bc66fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-9999 b/metadata/md5-cache/sec-policy/selinux-consolekit-9999
index 7b6a2f13d60b..90e668a05a7a 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=eba1ea8502b23a7b9cc10ca49bc66fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r1
deleted file mode 100644
index 65159cefb223..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for corosync
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1a1a929951bfec0c0773b2bbd3f9b2e3
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r2
deleted file mode 100644
index 03ecef7bfd34..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for corosync
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=23c0672cb0e209bf899cda58295a26d6
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r3
deleted file mode 100644
index 68883f6266e1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for corosync
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=23c0672cb0e209bf899cda58295a26d6
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r4
deleted file mode 100644
index bcd95dcbf916..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for corosync
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=23c0672cb0e209bf899cda58295a26d6
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r2
index 63610fb2538a..e354e9d2e312 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=23c0672cb0e209bf899cda58295a26d6
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r3
index 79a6558967a5..9e9eb811fa80 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=23c0672cb0e209bf899cda58295a26d6
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r4
deleted file mode 100644
index 8257782ebd69..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for corosync
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1a1a929951bfec0c0773b2bbd3f9b2e3
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r1
index 68e8d8186ea5..18bf414deb19 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2336c28c79721939be55a8a7e1a7170
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r2
index 0231aaed55c8..5be6de87b5cc 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a9b2631f1f6282c9998acbd77cd95616
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r3
new file mode 100644
index 000000000000..8b0998c7fdda
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for corosync
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a9b2631f1f6282c9998acbd77cd95616
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-9999 b/metadata/md5-cache/sec-policy/selinux-corosync-9999
index 0365980d46ca..57e09793c910 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-9999
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a9b2631f1f6282c9998acbd77cd95616
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r1
deleted file mode 100644
index 161891dafe80..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for couchdb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f5d4315c136d4bba01a3d2159da7a3eb
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r2
deleted file mode 100644
index 575dc74f9675..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for couchdb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3ad1e1bd8c49b0128cd068413e0e4fcf
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r3
deleted file mode 100644
index d69edd4445e6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for couchdb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3ad1e1bd8c49b0128cd068413e0e4fcf
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r4
deleted file mode 100644
index 4b0b5bbf8d27..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for couchdb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3ad1e1bd8c49b0128cd068413e0e4fcf
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r2
index ea7cf5fd1fd8..0340e4bcf4aa 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3ad1e1bd8c49b0128cd068413e0e4fcf
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r3
index 3230b53c30b8..d3ec1fc967a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3ad1e1bd8c49b0128cd068413e0e4fcf
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r4
deleted file mode 100644
index af4ab769f11f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for couchdb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f5d4315c136d4bba01a3d2159da7a3eb
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r1
index c0098163afe5..082ab4de22ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=76491dca02be51639f903f2a1639186c
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r2
index c15377a8781a..1d7d3cf27941 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6bdb0e08cf91e268994b2481a2ea79ab
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r3
new file mode 100644
index 000000000000..d79d817d36ed
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for couchdb
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6bdb0e08cf91e268994b2481a2ea79ab
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-9999 b/metadata/md5-cache/sec-policy/selinux-couchdb-9999
index 269b5e3092dd..96a83505d894 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-9999
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6bdb0e08cf91e268994b2481a2ea79ab
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r1
deleted file mode 100644
index 016721d83f23..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for courier
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8b85702593ab85ef1e7ea361948eb1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r2
deleted file mode 100644
index 5183c46e1094..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for courier
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ff29334da0263ed29cae52b1f20cf647
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r3
deleted file mode 100644
index 23a4ab69c56b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for courier
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ff29334da0263ed29cae52b1f20cf647
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r4
deleted file mode 100644
index 53db41f7de19..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for courier
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ff29334da0263ed29cae52b1f20cf647
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r2
index a77216b13257..4b2e52af4b9e 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ff29334da0263ed29cae52b1f20cf647
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r3
index e8db24ed88c9..cf5a47a2f243 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ff29334da0263ed29cae52b1f20cf647
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r4
deleted file mode 100644
index 6aeff6cf02b9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for courier
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8b85702593ab85ef1e7ea361948eb1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r1
index 5ed9f1a64730..845bbed55785 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2c3785ca7752158349712a551d15f5e2
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r2
index ea3b7e69def2..cc542411c2c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cc8c57b9c7bc73f2871bbfb1cacd3cdd
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r3
new file mode 100644
index 000000000000..99722e708dbf
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for courier
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=cc8c57b9c7bc73f2871bbfb1cacd3cdd
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-9999 b/metadata/md5-cache/sec-policy/selinux-courier-9999
index 9ea4204a50ba..568b40fd2908 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-9999
+++ b/metadata/md5-cache/sec-policy/selinux-courier-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cc8c57b9c7bc73f2871bbfb1cacd3cdd
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r1
deleted file mode 100644
index c87efa02b623..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpucontrol
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7a57ef79042564a8afabf311dcb9c6a7
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r2
deleted file mode 100644
index 3150f406f03f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpucontrol
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a7310120c1f2d25a937a886ad7f3994b
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r3
deleted file mode 100644
index 56e5b436004e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpucontrol
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a7310120c1f2d25a937a886ad7f3994b
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r4
deleted file mode 100644
index 097d97175553..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpucontrol
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a7310120c1f2d25a937a886ad7f3994b
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r2
index 30b9fddb9603..715625ccf3a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a7310120c1f2d25a937a886ad7f3994b
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r3
index 5217255bdf88..6956a6848d66 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a7310120c1f2d25a937a886ad7f3994b
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r4
deleted file mode 100644
index 85f14de3719e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpucontrol
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7a57ef79042564a8afabf311dcb9c6a7
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r1
index 5ebf16c904a1..f4404924f4e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a0aa980b0e837d4c3d1f9892d66e840e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r2
index 249ba21c8d7e..ce7140002e6e 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bac3a81d604cd6678b66faf2edd61534
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r3
new file mode 100644
index 000000000000..a5d4c3d44ef1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cpucontrol
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=bac3a81d604cd6678b66faf2edd61534
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
index 1fa82ca6b69a..b5d9322891c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bac3a81d604cd6678b66faf2edd61534
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r1
deleted file mode 100644
index 1a4c40c5214f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpufreqselector
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3b3df3e6b2ff15054a199274cb235f0c
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r2
deleted file mode 100644
index 3ea8780efbec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpufreqselector
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a8cb82bf6edf0fc76d1655eac1036b4e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r3
deleted file mode 100644
index d74f81dd19fa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpufreqselector
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a8cb82bf6edf0fc76d1655eac1036b4e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r4
deleted file mode 100644
index 95df0e6e7b31..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpufreqselector
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a8cb82bf6edf0fc76d1655eac1036b4e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r2
index e76bfcd78164..19da7e16e5c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a8cb82bf6edf0fc76d1655eac1036b4e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r3
index fd92fb962766..5587537b4ac0 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a8cb82bf6edf0fc76d1655eac1036b4e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r4
deleted file mode 100644
index ecfad299b9f3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpufreqselector
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3b3df3e6b2ff15054a199274cb235f0c
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r1
index 5af5b7570e3a..97b03fab0d6a 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4b8812850c02cd23d91270b39dc05f8a
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r2
index 5023a5fbb973..ff7988cdeb3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bc6281b3a9c94a3392df4c161354a676
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r3
new file mode 100644
index 000000000000..2c9db0aedb95
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cpufreqselector
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=bc6281b3a9c94a3392df4c161354a676
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
index a1f70a16dac3..fcc0ddbe3588 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bc6281b3a9c94a3392df4c161354a676
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r1
deleted file mode 100644
index 508929fb10bf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cups
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=209941d548d525e2af74dc4292a419e3
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r2
deleted file mode 100644
index e2dff678ba90..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cups
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bbaa70d7c9bc588d28d81dd98b098c9b
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r3
deleted file mode 100644
index ddcfa7ea03d0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cups
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bbaa70d7c9bc588d28d81dd98b098c9b
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r4
deleted file mode 100644
index eb861230dace..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cups
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bbaa70d7c9bc588d28d81dd98b098c9b
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r2
index fcb13605c789..ec7e13d8f9a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bbaa70d7c9bc588d28d81dd98b098c9b
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r3
index 1008d83e8148..867725842f37 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bbaa70d7c9bc588d28d81dd98b098c9b
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r4
deleted file mode 100644
index bff610319162..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cups
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=209941d548d525e2af74dc4292a419e3
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r1
index 161005c85e12..cc796d2e2b39 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b00642f4e226a41a220bd045d005ea8f
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r2
index 316c8946dd8c..929b725137b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ed59ab933d1f2038aaaacf4330cf909f
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r3
new file mode 100644
index 000000000000..31929b5d8d45
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cups
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ed59ab933d1f2038aaaacf4330cf909f
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-9999 b/metadata/md5-cache/sec-policy/selinux-cups-9999
index 4999af5684e2..e4682571fd90 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cups-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ed59ab933d1f2038aaaacf4330cf909f
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r1
deleted file mode 100644
index feb6814815fe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cvs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c8f75d391e84434a5eae690cd869c61b
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r2
deleted file mode 100644
index dcae3d2b029c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cvs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=90f94d283dd2bb3e8e70b5d68203cdde
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r3
deleted file mode 100644
index 40932d0b64ca..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cvs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=90f94d283dd2bb3e8e70b5d68203cdde
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r4
deleted file mode 100644
index 264248d5d454..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cvs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=90f94d283dd2bb3e8e70b5d68203cdde
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r2
index 7eb817f5c1d7..87aa68ff1634 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=90f94d283dd2bb3e8e70b5d68203cdde
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r3
index 5c7b14371658..312412821b94 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=90f94d283dd2bb3e8e70b5d68203cdde
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r4
deleted file mode 100644
index 1b9b21a17e73..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cvs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c8f75d391e84434a5eae690cd869c61b
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r1
index 55e2d593db9c..5c164cda57a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5dab34abd92ef3c1c89059e17e09dd89
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r2
index 4905d9a4f7e9..af1adb41bf20 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=600e9d4e0e92bb3016960dc55955f96a
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r3
new file mode 100644
index 000000000000..b7338cb23f03
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cvs
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=600e9d4e0e92bb3016960dc55955f96a
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-9999 b/metadata/md5-cache/sec-policy/selinux-cvs-9999
index bc8bb03f5323..518dbd37ec99 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=600e9d4e0e92bb3016960dc55955f96a
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r1
deleted file mode 100644
index 1a04aa6784c5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cyphesis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3e342e437c5118cf01657ead8e15f826
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r2
deleted file mode 100644
index f40df68c7fd9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cyphesis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=24533dc5ea7388d0e8a7c3530372a935
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r3
deleted file mode 100644
index 3554626b6e53..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cyphesis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=24533dc5ea7388d0e8a7c3530372a935
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r4
deleted file mode 100644
index fd947ebe55f0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cyphesis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=24533dc5ea7388d0e8a7c3530372a935
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r2
index a8f68ada6669..fd3a520351a3 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=24533dc5ea7388d0e8a7c3530372a935
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r3
index caba97f1978e..87d0d849ba79 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=24533dc5ea7388d0e8a7c3530372a935
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r4
deleted file mode 100644
index e86c1a1972ef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cyphesis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3e342e437c5118cf01657ead8e15f826
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r1
index 6a081c474c9f..4d54f681f628 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a203cf864ba3d5060dae7ce0fb08653d
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r2
index 5aba7bc04aa6..7a133181129b 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a04c18a0974badfef5e35c236b61b87c
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r3
new file mode 100644
index 000000000000..ca3a50f3caae
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cyphesis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a04c18a0974badfef5e35c236b61b87c
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-9999 b/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
index 8607910465cd..3c95aa27af40 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a04c18a0974badfef5e35c236b61b87c
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r1
deleted file mode 100644
index 0c206fbcef21..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for daemontools
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8cf4c0699bd5afc42edbe3cf4866395d
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r2
deleted file mode 100644
index d2c18c0bfe85..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for daemontools
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd77a7c1ae74120ab56f6359a1ab2d2e
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r3
deleted file mode 100644
index 3fc5ed29ffac..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for daemontools
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd77a7c1ae74120ab56f6359a1ab2d2e
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r4
deleted file mode 100644
index b1119ca55e10..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for daemontools
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd77a7c1ae74120ab56f6359a1ab2d2e
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r2
index f5959246cd33..84903c3de146 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd77a7c1ae74120ab56f6359a1ab2d2e
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r3
index 80a2e599582b..05aefdcaf3b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd77a7c1ae74120ab56f6359a1ab2d2e
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r4
deleted file mode 100644
index 97763463e99a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for daemontools
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8cf4c0699bd5afc42edbe3cf4866395d
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r1
index 92509ee657b6..86344a915115 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d190f559c2493439264deba5bd9f3a86
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r2
index e8bd7f535bab..27113752779c 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f92f902fcd22781fbca6d6b9aaca237a
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r3
new file mode 100644
index 000000000000..20466bf682b1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for daemontools
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f92f902fcd22781fbca6d6b9aaca237a
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-9999 b/metadata/md5-cache/sec-policy/selinux-daemontools-9999
index 6af824f0d8cd..c00e3a3a0685 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-9999
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f92f902fcd22781fbca6d6b9aaca237a
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r1
deleted file mode 100644
index d8b75fd3260a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dante
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=58a473b3f5e2bd71f931c8768b9dea73
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r2
deleted file mode 100644
index 647e6221557a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dante
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=19da747291039ecc2d490e7c89a05924
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r3
deleted file mode 100644
index 27b847d37ff9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dante
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=19da747291039ecc2d490e7c89a05924
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r4
deleted file mode 100644
index cecc59d6bad1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dante
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=19da747291039ecc2d490e7c89a05924
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r2
index 98c8bcedb850..72cefe8abef4 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=19da747291039ecc2d490e7c89a05924
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r3
index 976e53c4dc56..d6c7eeb31bcb 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=19da747291039ecc2d490e7c89a05924
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r4
deleted file mode 100644
index ce2984df0558..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dante
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=58a473b3f5e2bd71f931c8768b9dea73
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r1
index 2635081703cd..ee17bad5475a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5095ec4c18e0235dc363120a1c59f5d0
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r2
index 58c7d1e54c9b..687fdcb01796 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=21fed5f77fb3857903358ed0d7174574
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r3
new file mode 100644
index 000000000000..b2dc38fccddb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dante
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=21fed5f77fb3857903358ed0d7174574
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-9999 b/metadata/md5-cache/sec-policy/selinux-dante-9999
index 4f317deef151..a4edae780a73 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dante-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=21fed5f77fb3857903358ed0d7174574
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r1
deleted file mode 100644
index 103296a6beef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbadm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bdefc1901eccd3d8b729f3afac493e69
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r2
deleted file mode 100644
index 1b00a5e69614..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbadm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f8bf71e32f9c7362270ceae2799714a3
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r3
deleted file mode 100644
index c8d9616c313d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbadm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f8bf71e32f9c7362270ceae2799714a3
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r4
deleted file mode 100644
index 5c3b47dc084e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbadm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f8bf71e32f9c7362270ceae2799714a3
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r2
index 6b7ce058c8ff..ea959e3505cc 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f8bf71e32f9c7362270ceae2799714a3
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r3
index dd798046afea..6a4304637162 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f8bf71e32f9c7362270ceae2799714a3
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r4
deleted file mode 100644
index 84d92068ff73..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbadm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bdefc1901eccd3d8b729f3afac493e69
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r1
index 3b2e80a0f272..d89030c3ef91 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=da270ffb723c8bde4e2eb3899a2c2210
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r2
index 784d27fd86e0..35f4a0606442 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=19a8b60bf07619f01e23bfb5ec48bba8
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r3
new file mode 100644
index 000000000000..851f811c73fb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbadm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=19a8b60bf07619f01e23bfb5ec48bba8
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-9999 b/metadata/md5-cache/sec-policy/selinux-dbadm-9999
index 58271d6c8b6e..27c68f35ce1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=19a8b60bf07619f01e23bfb5ec48bba8
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r1
deleted file mode 100644
index 7f3ee9fa9f80..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbskk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1d98e22e18fe3edf5948d314b8a00769
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r2
deleted file mode 100644
index 596f3d8113c4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbskk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=42da6e0f30c255c6d46d8e8a3ec56b7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r3
deleted file mode 100644
index 3e9b9a84757c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbskk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=42da6e0f30c255c6d46d8e8a3ec56b7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r4
deleted file mode 100644
index 8df7a21adac6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbskk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=42da6e0f30c255c6d46d8e8a3ec56b7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r2
index fb343efc06a0..d4e11d692e2a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=42da6e0f30c255c6d46d8e8a3ec56b7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r3
index 7d4f85b6bda7..a31ba6bafac7 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=42da6e0f30c255c6d46d8e8a3ec56b7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r4
deleted file mode 100644
index 96f0b73eab3d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbskk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1d98e22e18fe3edf5948d314b8a00769
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r1
index b89eac2a1838..1dfce1c89d0d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bb5b4550998fcb639bddbb057c82e477
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r2
index 6e83242f6d13..d71e165e9da3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e674fda7afc279cf04870415d69b1444
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r3
new file mode 100644
index 000000000000..6bb3b3dde51d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbskk
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=e674fda7afc279cf04870415d69b1444
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-9999 b/metadata/md5-cache/sec-policy/selinux-dbskk-9999
index d8bdd671578e..28f9d9ec25c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e674fda7afc279cf04870415d69b1444
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r1
deleted file mode 100644
index 1424b4cb098d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3518bbc9be2f804efb49cf53539c3f35
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r2
deleted file mode 100644
index 7b3198b0d7c1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=40afa27f03be9d71aae25894762a8577
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r3
deleted file mode 100644
index d2a634d224cf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=40afa27f03be9d71aae25894762a8577
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r4
deleted file mode 100644
index c92e974db40e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=40afa27f03be9d71aae25894762a8577
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r2
index 8b07feea7ce0..50e871a6f39e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=40afa27f03be9d71aae25894762a8577
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r3
index d9626671867a..6cdfdf23a9a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=40afa27f03be9d71aae25894762a8577
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r4
deleted file mode 100644
index 741ff15262fb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3518bbc9be2f804efb49cf53539c3f35
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r1
index 35554a2be32e..71485d568154 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fea71d6db2d44a9be7309f175e1ef889
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r2
index 39ee3ba1a02a..b89b34a83996 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9f7bfcd307ce625af5fc33f13cf484a7
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r3
new file mode 100644
index 000000000000..db7b41015447
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbus
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=9f7bfcd307ce625af5fc33f13cf484a7
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-9999 b/metadata/md5-cache/sec-policy/selinux-dbus-9999
index bb51d4874cfe..1bf5cf55097b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9f7bfcd307ce625af5fc33f13cf484a7
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r1
deleted file mode 100644
index e0f65629da28..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ef99cbf7e755f9e9c271eb64539dda44
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r2
deleted file mode 100644
index 13f3f8ccf03b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=310cad115fee2d54e1c4c106ab1d79c5
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r3
deleted file mode 100644
index 7ea0b707a672..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=310cad115fee2d54e1c4c106ab1d79c5
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r4
deleted file mode 100644
index d32ff5557dcb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=310cad115fee2d54e1c4c106ab1d79c5
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r2
index 36b6306632a9..3190b496316d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=310cad115fee2d54e1c4c106ab1d79c5
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r3
index bfd237bbb087..13de7591adbc 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=310cad115fee2d54e1c4c106ab1d79c5
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r4
deleted file mode 100644
index 5f25415f2281..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ef99cbf7e755f9e9c271eb64539dda44
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r1
index 3b70bcbc8a0a..fbbe21b2a32d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bac44007bdbe30c64c3d20ad39c6b468
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r2
index 4238dbe22390..be8135eb9758 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e479ec6a8613a581d17fd3379c8cdfd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r3
new file mode 100644
index 000000000000..25e73f17d0ec
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dcc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=e479ec6a8613a581d17fd3379c8cdfd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-9999 b/metadata/md5-cache/sec-policy/selinux-dcc-9999
index 5b29a2899bd5..20e5a67a0b35 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e479ec6a8613a581d17fd3379c8cdfd0
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r1
deleted file mode 100644
index aa91d221e35c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddclient
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0957b79b56bf4ee9971fb1d2aec1867a
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r2
deleted file mode 100644
index ec9e284858ed..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddclient
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c3fab2289dc4784db080dedd1795cc08
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r3
deleted file mode 100644
index 7e841b42b43c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddclient
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c3fab2289dc4784db080dedd1795cc08
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r4
deleted file mode 100644
index fb3d01b9748d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddclient
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c3fab2289dc4784db080dedd1795cc08
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r2
index 3ab64c0b6414..fb00824dc546 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c3fab2289dc4784db080dedd1795cc08
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r3
index 3f0c640b1798..448fa515f901 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c3fab2289dc4784db080dedd1795cc08
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r4
deleted file mode 100644
index ebe16ff54ac9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddclient
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0957b79b56bf4ee9971fb1d2aec1867a
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r1
index 6b851c47ebdc..6d7e07be1e16 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0667727599f961e451a7aa89d34e7191
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r2
index bc03db0f7740..0c1a70643c8f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=50c0f7501d8451dda9e5e9373acb7f4f
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r3
new file mode 100644
index 000000000000..8a98c1c8d6d9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ddclient
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=50c0f7501d8451dda9e5e9373acb7f4f
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-9999 b/metadata/md5-cache/sec-policy/selinux-ddclient-9999
index 07b8af3222c8..c607eba73846 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=50c0f7501d8451dda9e5e9373acb7f4f
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r1
deleted file mode 100644
index 8f649f35cfec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddcprobe
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=47b9594ca5660334c7f19064a66cf3dc
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r2
deleted file mode 100644
index a21d47ca753c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddcprobe
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d0a3b0e6526e205eeca1c47fedecfadf
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r3
deleted file mode 100644
index a2ffb3b25e48..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddcprobe
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d0a3b0e6526e205eeca1c47fedecfadf
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r4
deleted file mode 100644
index fce5560859b1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddcprobe
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d0a3b0e6526e205eeca1c47fedecfadf
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r2
index 4d4198dd04b0..88256c2b9949 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d0a3b0e6526e205eeca1c47fedecfadf
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r3
index c1716ad5160b..8e9d4eb003fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d0a3b0e6526e205eeca1c47fedecfadf
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r4
deleted file mode 100644
index 3f9563361a50..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddcprobe
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=47b9594ca5660334c7f19064a66cf3dc
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r1
index 82072838cded..6c4df8047f6b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3176db9a9cc716335ab5ef7f981c505e
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r2
index 719cff3d1760..46728cfb1142 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b69209937601cc7a4351de0421e4a0ec
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r3
new file mode 100644
index 000000000000..204ddfad3bed
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ddcprobe
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b69209937601cc7a4351de0421e4a0ec
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
index dd0d47b1328c..34117243971d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b69209937601cc7a4351de0421e4a0ec
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r1
deleted file mode 100644
index 0fdd2a402713..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for denyhosts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=387a61d0f8c45c4f9dc4ef968580d680
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r2
deleted file mode 100644
index 91187956c510..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for denyhosts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=31f288f849e806e5ef4dec1f56df0d02
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r3
deleted file mode 100644
index a36c338f83b4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for denyhosts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=31f288f849e806e5ef4dec1f56df0d02
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r4
deleted file mode 100644
index 3b384a2876d6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for denyhosts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=31f288f849e806e5ef4dec1f56df0d02
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r2
index 2403124782ff..74393d140775 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=31f288f849e806e5ef4dec1f56df0d02
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r3
index 3ca9ef963b1a..5208d3113f76 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=31f288f849e806e5ef4dec1f56df0d02
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r4
deleted file mode 100644
index 21c978d3ee2f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for denyhosts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=387a61d0f8c45c4f9dc4ef968580d680
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r1
index 7fe4b420720c..70b26482e41d 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aad7295292c9a69c9b29df280ef98b3d
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r2
index bb071b1abd18..89139f4872ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a20cc2defc7711dbb5b227904f2634a4
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r3
new file mode 100644
index 000000000000..e2424b2aa7ae
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for denyhosts
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a20cc2defc7711dbb5b227904f2634a4
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-9999 b/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
index 2d0a40777272..797c877f4def 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a20cc2defc7711dbb5b227904f2634a4
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r1
deleted file mode 100644
index 63a0579ee167..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for devicekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a1af8c15f9f14e142a70ccd405de9a61
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r2
deleted file mode 100644
index 3f2aa835971a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for devicekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b9404817c8be4f237bcfe079483e93ca
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r3
deleted file mode 100644
index 1900b454541f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for devicekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b9404817c8be4f237bcfe079483e93ca
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r4
deleted file mode 100644
index ba27b27a3cc1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for devicekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b9404817c8be4f237bcfe079483e93ca
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r2
index 1a310313c6ab..a459594a575b 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b9404817c8be4f237bcfe079483e93ca
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r3
index 8382636ac532..d94f3f81e3d9 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b9404817c8be4f237bcfe079483e93ca
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r4
deleted file mode 100644
index 6f7785938aa5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for devicekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a1af8c15f9f14e142a70ccd405de9a61
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r1
index c8db62898c70..e7cef50d9321 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b810de882ef4a0878eb58c07e6f62d3d
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r2
index 8754797db61f..18ed63db4513 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3472ebfd1d55ecd1ef1051cb76d76f77
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r3
new file mode 100644
index 000000000000..901fa499b643
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for devicekit
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3472ebfd1d55ecd1ef1051cb76d76f77
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-9999 b/metadata/md5-cache/sec-policy/selinux-devicekit-9999
index e3ce5d168976..5fd84c84ca48 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3472ebfd1d55ecd1ef1051cb76d76f77
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r1
deleted file mode 100644
index 4955254bbd14..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dhcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2f8f89e5eb693e71ad9bbc3bc0f76d1c
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r2
deleted file mode 100644
index a54ebbaf2ac7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dhcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7558f078acb6c8b35a30ec3c62be810e
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r3
deleted file mode 100644
index 23d78aef3ba1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dhcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7558f078acb6c8b35a30ec3c62be810e
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r4
deleted file mode 100644
index 1723de87d025..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dhcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7558f078acb6c8b35a30ec3c62be810e
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r2
index 7ef1faaaa246..617ed72e3580 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7558f078acb6c8b35a30ec3c62be810e
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r3
index 2f353ee6932f..4a2a57ff6ade 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7558f078acb6c8b35a30ec3c62be810e
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r4
deleted file mode 100644
index e8c914e08d09..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dhcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2f8f89e5eb693e71ad9bbc3bc0f76d1c
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r1
index 6667dadd2814..8b06ff9e3c39 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=33086cc3a4fabacf0e6587518ee22de2
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r2
index 21ade8e58fb2..d82d231fdc65 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0c000734cdc03f5f48396432d3eefbd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r3
new file mode 100644
index 000000000000..8af8e54939e6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dhcp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=0c000734cdc03f5f48396432d3eefbd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-9999 b/metadata/md5-cache/sec-policy/selinux-dhcp-9999
index eb2104e0a62d..c26c6ce2e4f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0c000734cdc03f5f48396432d3eefbd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r1
deleted file mode 100644
index 25ee23c41de7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dictd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=15602106db5ccb849a9f61240726964f
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r2
deleted file mode 100644
index ca975c6eb550..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dictd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1cdc34c51b1912670890c9f23289fca4
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r3
deleted file mode 100644
index ff10596ec6f2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dictd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1cdc34c51b1912670890c9f23289fca4
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r4
deleted file mode 100644
index 71bdf1ba1da1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dictd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1cdc34c51b1912670890c9f23289fca4
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r2
index adff082857e0..c3835ee5f5bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1cdc34c51b1912670890c9f23289fca4
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r3
index bc8d35049e57..990d2c62cacd 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1cdc34c51b1912670890c9f23289fca4
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r4
deleted file mode 100644
index 7d5f5d93cdb4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dictd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=15602106db5ccb849a9f61240726964f
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r1
index 7c1242eaddca..14966c3bf7d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ecee7ebc63a3e52e92a07771fcc3467
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r2
index 7d0f0174ec53..67c59978fd62 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6805124de202098a796f5b9d312937f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r3
new file mode 100644
index 000000000000..d32907d7a2c0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dictd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6805124de202098a796f5b9d312937f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-9999 b/metadata/md5-cache/sec-policy/selinux-dictd-9999
index ac72ef6f31f5..0047b2747a4e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6805124de202098a796f5b9d312937f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20170805-r4
deleted file mode 100644
index a7c14ee96349..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirmngr
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a25163fa822707960470495e2ea466f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r1
index 125410ffc73c..e887d4743d99 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b07f684924df75f49c6770fd568b02cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r2
index f8762a1d3db6..6c50ef8a9f81 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aeb7d8b51cfca2a6666e40c2fa1f4b99
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r3
new file mode 100644
index 000000000000..12dc0b160d64
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dirmngr
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=aeb7d8b51cfca2a6666e40c2fa1f4b99
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-9999 b/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
index 5080663760b3..5dabf405a498 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aeb7d8b51cfca2a6666e40c2fa1f4b99
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r1
deleted file mode 100644
index 40078a3a28bc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirsrv
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d53a87de9488239b25ee29839758263f
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r2
deleted file mode 100644
index 0ddff276fd0e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirsrv
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=adf9fd5ed7e2255013c96da8f20351d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r3
deleted file mode 100644
index 036d154c7c18..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirsrv
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=adf9fd5ed7e2255013c96da8f20351d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r4
deleted file mode 100644
index 6d60d575b83c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirsrv
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=adf9fd5ed7e2255013c96da8f20351d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r2
index 5772f4353e61..cf2a68bfb0e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=adf9fd5ed7e2255013c96da8f20351d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r3
index 19f74cd75190..eb788d5a5da2 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=adf9fd5ed7e2255013c96da8f20351d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r4
deleted file mode 100644
index b33bb2e6f1ba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirsrv
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d53a87de9488239b25ee29839758263f
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r1
index 2b712ee51942..b9f9e9ad5711 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=db0461c229ca574ff165c77777934540
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r2
index 60ae233499ed..118f2c6a69a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8340c8c49a2eb477b2eac7bd04cc378a
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r3
new file mode 100644
index 000000000000..ac4d38317c38
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dirsrv
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=8340c8c49a2eb477b2eac7bd04cc378a
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-9999 b/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
index e9ca53694422..6bc34914d713 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8340c8c49a2eb477b2eac7bd04cc378a
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r1
deleted file mode 100644
index f6be3e5c6e18..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for distcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9b1a6b7fdb287f805b21dfd15b98479b
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r2
deleted file mode 100644
index 49f6ac6bb444..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for distcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d15c00417daf62611516398f74eec6d4
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r3
deleted file mode 100644
index aebaccddb1a3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for distcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d15c00417daf62611516398f74eec6d4
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r4
deleted file mode 100644
index 30379f7ff356..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for distcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d15c00417daf62611516398f74eec6d4
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r2
index cffa9bbafabc..a9c62a53804a 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d15c00417daf62611516398f74eec6d4
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r3
index c4893d7170f0..d710a1e292d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d15c00417daf62611516398f74eec6d4
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r4
deleted file mode 100644
index 596e41218a73..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for distcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9b1a6b7fdb287f805b21dfd15b98479b
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r1
index a3936f8736f2..d1df0ae3c842 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=baaa0a6f43da8ad51e22ff84e3ed7d2a
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r2
index fc6c1520aab5..8e18e568a617 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f95ec299de8231f1614a197143f4f230
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r3
new file mode 100644
index 000000000000..9fc9d85ffb08
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for distcc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f95ec299de8231f1614a197143f4f230
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-9999 b/metadata/md5-cache/sec-policy/selinux-distcc-9999
index d8e5faa80f68..f318afcb6106 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f95ec299de8231f1614a197143f4f230
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r1
deleted file mode 100644
index 5e3f9d620a68..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for djbdns
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=34206c19dd086ab83a3e09d9770f1b6b
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r2
deleted file mode 100644
index 68b0194dfdaa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for djbdns
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cb6e8f3acd440905edeff9253ed560f2
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r3
deleted file mode 100644
index 594eaf41dbe7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for djbdns
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cb6e8f3acd440905edeff9253ed560f2
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r4
deleted file mode 100644
index d5f4959a8805..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for djbdns
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cb6e8f3acd440905edeff9253ed560f2
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r2
index 5c3d7e49a52d..da781a1d8769 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cb6e8f3acd440905edeff9253ed560f2
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r3
index 314e5cffc1cc..aa35355bafdf 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cb6e8f3acd440905edeff9253ed560f2
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r4
deleted file mode 100644
index 3c03e147376d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for djbdns
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=34206c19dd086ab83a3e09d9770f1b6b
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r1
index aaaacfe241e2..9ebe10b2343b 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=97b600c736a4a0e5d5bc8632150aa35b
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r2
index 89f4692f07dc..a7914288e73c 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e2f70fd197165d47a605fa7563a041d5
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r3
new file mode 100644
index 000000000000..a47eab66fef2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for djbdns
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=e2f70fd197165d47a605fa7563a041d5
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-9999 b/metadata/md5-cache/sec-policy/selinux-djbdns-9999
index 2e93019923bf..0128ba9aca79 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-9999
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e2f70fd197165d47a605fa7563a041d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r1
deleted file mode 100644
index 632349736b5a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dkim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=78d95704c742940a1421878df0ca34ef
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r2
deleted file mode 100644
index 6e5b72d67803..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dkim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=77ef644657faf5cde5bb17c4ac0f7689
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r3
deleted file mode 100644
index 3c60eb2243e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dkim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=77ef644657faf5cde5bb17c4ac0f7689
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r4
deleted file mode 100644
index 1b2d7d860ee9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dkim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=77ef644657faf5cde5bb17c4ac0f7689
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r2
index 2a3110f47604..7846eb96d736 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=77ef644657faf5cde5bb17c4ac0f7689
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r3
index cd1939eab70a..a02068313d03 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=77ef644657faf5cde5bb17c4ac0f7689
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r4
deleted file mode 100644
index 7cf24c33544a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dkim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=78d95704c742940a1421878df0ca34ef
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r1
index cbf000b18265..2fddf80900bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0a30fc3e6300aa1c9159310f919897f4
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r2
index 910961280792..91c90bff05bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cb2fbed69e0a70a028f66739d5e04928
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r3
new file mode 100644
index 000000000000..7e382986c96a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dkim
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=cb2fbed69e0a70a028f66739d5e04928
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-9999 b/metadata/md5-cache/sec-policy/selinux-dkim-9999
index e71aefc653ef..9dfa2f3ec72e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cb2fbed69e0a70a028f66739d5e04928
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r1
deleted file mode 100644
index f0e6611701b4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dmidecode
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1fa4567a27f132f1db37571570ecce6f
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r2
deleted file mode 100644
index 142e8be7d92b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dmidecode
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2a00086cf9335b49bdb06227b54fa900
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r3
deleted file mode 100644
index ab0f709753e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dmidecode
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2a00086cf9335b49bdb06227b54fa900
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r4
deleted file mode 100644
index b2fd209b7b3c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dmidecode
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2a00086cf9335b49bdb06227b54fa900
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r2
index cdeb7d184b56..a1ae1e832570 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2a00086cf9335b49bdb06227b54fa900
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r3
index 6dba1f40a1e9..deb099481644 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2a00086cf9335b49bdb06227b54fa900
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r4
deleted file mode 100644
index 932e12a5d705..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dmidecode
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1fa4567a27f132f1db37571570ecce6f
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r1
index 749d854ee427..3a7e30a95251 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=10c990ea38c3a1f9098f24a12961a521
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r2
index d9d48d756f74..8040e1226b43 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=de146b39383d84aef2be71f7b1964a7b
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r3
new file mode 100644
index 000000000000..765b54c8593a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dmidecode
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=de146b39383d84aef2be71f7b1964a7b
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-9999 b/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
index 2814ad6f3db6..c51a6b9ee9da 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=de146b39383d84aef2be71f7b1964a7b
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r1
deleted file mode 100644
index 6ee3e1a4c0c5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dnsmasq
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=509631a454fa2b44ba5c651e06e4bd02
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r2
deleted file mode 100644
index 00904462f8f1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dnsmasq
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=698fa5f422d3d9ab4625f281cb150bbc
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r3
deleted file mode 100644
index 35ab1db04fbe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dnsmasq
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=698fa5f422d3d9ab4625f281cb150bbc
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r4
deleted file mode 100644
index 6a301f5bb931..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dnsmasq
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=698fa5f422d3d9ab4625f281cb150bbc
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r2
index 5d475396fa7b..11bbf23575c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=698fa5f422d3d9ab4625f281cb150bbc
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r3
index 1f623b8e8052..ebbeed10e1c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=698fa5f422d3d9ab4625f281cb150bbc
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r4
deleted file mode 100644
index 0e56ef2c7e27..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dnsmasq
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=509631a454fa2b44ba5c651e06e4bd02
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r1
index 2400776de1ed..becad0d24634 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=be2367865cd759d9d9711a80656756e0
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r2
index 1664c4cfbf28..dc53e1fda945 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bee8766bfeaffdb551573149d02275cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r3
new file mode 100644
index 000000000000..80b6653809bf
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dnsmasq
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=bee8766bfeaffdb551573149d02275cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
index dd084c2cf918..496c4071e20a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bee8766bfeaffdb551573149d02275cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r1
deleted file mode 100644
index c1e0abca6135..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dovecot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=19374545cd4261a37208f059491642de
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r2
deleted file mode 100644
index 69b97bceb1bf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dovecot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=67eb9d16dce460a456d2c3cc5ecc1c58
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r3
deleted file mode 100644
index 8d956737ecec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dovecot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=67eb9d16dce460a456d2c3cc5ecc1c58
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r4
deleted file mode 100644
index 7d0003bd9602..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dovecot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=67eb9d16dce460a456d2c3cc5ecc1c58
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r2
index 0a22a7c578e7..072105ea225b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=67eb9d16dce460a456d2c3cc5ecc1c58
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r3
index e75d6593018d..5c030d484865 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=67eb9d16dce460a456d2c3cc5ecc1c58
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r4
deleted file mode 100644
index bb019fd11e04..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dovecot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=19374545cd4261a37208f059491642de
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r1
index cb9b180b0872..0bc387d24e60 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=985a71d4a5d23589308d13e6049363c6
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r2
index 92cebb89041c..a311fce4567e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3e08f1b1a30f3feaf89bb34245b4a138
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r3
new file mode 100644
index 000000000000..32bc6347a618
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dovecot
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3e08f1b1a30f3feaf89bb34245b4a138
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-9999 b/metadata/md5-cache/sec-policy/selinux-dovecot-9999
index c52c797d2113..139c69292296 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3e08f1b1a30f3feaf89bb34245b4a138
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r1
deleted file mode 100644
index faf8553f1ddc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dpkg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1f4754eeb842da78ad3fcd602040bedf
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r2
deleted file mode 100644
index 522f2d01b62c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dpkg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9affb9c1aa561177068ffaef260d7941
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r3
deleted file mode 100644
index aa640ec23909..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dpkg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9affb9c1aa561177068ffaef260d7941
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r4
deleted file mode 100644
index 60b80add2afa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dpkg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9affb9c1aa561177068ffaef260d7941
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r2
index 9bdaeef9d4e0..5cc942439e6c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9affb9c1aa561177068ffaef260d7941
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r3
index fb1943aebe11..b614df3f4ca5 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9affb9c1aa561177068ffaef260d7941
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r4
deleted file mode 100644
index 7f67ec497f29..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dpkg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1f4754eeb842da78ad3fcd602040bedf
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r1
index 5553e4415fc7..3cf254aaa32c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=71746682835c4f9953872179cc00487f
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r2
index 537aa2f2c6e3..edbc85c72f39 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2fc6ea29cec83b9ba99ee455a53f62dc
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r3
new file mode 100644
index 000000000000..1022bf23bbde
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dpkg
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2fc6ea29cec83b9ba99ee455a53f62dc
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-9999 b/metadata/md5-cache/sec-policy/selinux-dpkg-9999
index 72f4240c82e4..1a9ec1f461d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2fc6ea29cec83b9ba99ee455a53f62dc
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r1
deleted file mode 100644
index a161c2d0bd0c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dracut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fdb757de347a3b9220800e2d63eb60ef
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r2
deleted file mode 100644
index 99865494f31b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dracut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=17696c048424b5c69b002bdc1530a41e
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r3
deleted file mode 100644
index c78de011de5f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dracut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=17696c048424b5c69b002bdc1530a41e
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r4
deleted file mode 100644
index 005a15c3d7df..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dracut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=17696c048424b5c69b002bdc1530a41e
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r2
index 978f4c499ff8..9f7e56118709 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=17696c048424b5c69b002bdc1530a41e
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r3
index 6e7840b4556e..8c9e193460d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=17696c048424b5c69b002bdc1530a41e
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r4
deleted file mode 100644
index 9f47588cfe0b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dracut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fdb757de347a3b9220800e2d63eb60ef
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r1
index 0a53e05ad1b4..f465479f24b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=18d363f14765f65bb91d64919940af87
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r2
index b8ef263eacf4..6f0b17f2a25d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c1d19bf0d4f3f884467e5da805ad49b3
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r3
new file mode 100644
index 000000000000..7d0c8e5bc7f5
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dracut
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c1d19bf0d4f3f884467e5da805ad49b3
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-9999 b/metadata/md5-cache/sec-policy/selinux-dracut-9999
index 5e4a029b79bf..363b6ad25bb6 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c1d19bf0d4f3f884467e5da805ad49b3
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r1
deleted file mode 100644
index d8dd9013cfda..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dropbox
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=980ca4d4584c9b0ef74961c8de340241
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r2
deleted file mode 100644
index 314e786508a9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dropbox
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0e24af57fb3f20ba5ae8ccbe4b44cbcc
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r3
deleted file mode 100644
index 05521c3ee0c2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dropbox
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0e24af57fb3f20ba5ae8ccbe4b44cbcc
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r4
deleted file mode 100644
index 5b1edb36badd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dropbox
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0e24af57fb3f20ba5ae8ccbe4b44cbcc
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r2
index d2ff2599bad6..73064d558ec3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0e24af57fb3f20ba5ae8ccbe4b44cbcc
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r3
index 55d7c494a3b9..aa7969d5602a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0e24af57fb3f20ba5ae8ccbe4b44cbcc
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r4
deleted file mode 100644
index d4e045c663db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dropbox
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=980ca4d4584c9b0ef74961c8de340241
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r1
index a03d459a806a..869aaba0fe06 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5a5aed343fcff4466efe93ca2fd33a1f
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r2
index ba88d1a822fb..d45415be19b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=37c3b4936f46741524f45f3542017908
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r3
new file mode 100644
index 000000000000..23378813aca0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dropbox
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=37c3b4936f46741524f45f3542017908
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-9999 b/metadata/md5-cache/sec-policy/selinux-dropbox-9999
index 9fe814421395..500637334586 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=37c3b4936f46741524f45f3542017908
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r1
deleted file mode 100644
index d29fd988c6b9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for entropyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2b5412189316de88a072793e3b1fa143
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r2
deleted file mode 100644
index 40cd2a0e016e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for entropyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9b802412aba3f696eabce781e5b593fa
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r3
deleted file mode 100644
index cb6073893757..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for entropyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9b802412aba3f696eabce781e5b593fa
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r4
deleted file mode 100644
index c0a3d28c8988..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for entropyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9b802412aba3f696eabce781e5b593fa
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r2
index 0c5c8bb786e5..bfca6f7dd801 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9b802412aba3f696eabce781e5b593fa
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r3
index ebd6d5939f10..cfc7b57b5aea 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9b802412aba3f696eabce781e5b593fa
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r4
deleted file mode 100644
index 191283015dc9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for entropyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2b5412189316de88a072793e3b1fa143
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r1
index 231fe6bd54d1..2ad759ea794c 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cf51a455cac7caf83cb7a60554db0823
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r2
index bc5019b585f5..602873400b55 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ec95a57b284dfb497abe1b16ed679c81
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r3
new file mode 100644
index 000000000000..fbda8d248bcd
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for entropyd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ec95a57b284dfb497abe1b16ed679c81
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-9999 b/metadata/md5-cache/sec-policy/selinux-entropyd-9999
index 150c9adb0aa5..81c8ab8279f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ec95a57b284dfb497abe1b16ed679c81
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r1
deleted file mode 100644
index 75f6b5246382..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for evolution
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=abbfefbe5f3a381c358ae3703086c3b7
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r2
deleted file mode 100644
index c9c98293dd17..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for evolution
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=be8061378d0014f9c00b492382a98249
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r3
deleted file mode 100644
index c16b5046f0e5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for evolution
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=be8061378d0014f9c00b492382a98249
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r4
deleted file mode 100644
index 82ded3b034c2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for evolution
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=be8061378d0014f9c00b492382a98249
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r2
index 6b7d53736c30..64132ee06065 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=be8061378d0014f9c00b492382a98249
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r3
index db01902201d8..ca4d1d32fdce 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=be8061378d0014f9c00b492382a98249
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r4
deleted file mode 100644
index 3cf24cfa6985..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for evolution
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=abbfefbe5f3a381c358ae3703086c3b7
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r1
index ded66094519a..000a9a8f88b9 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ced170eb2125566505c6617c21df80d9
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r2
index 5463e092695c..77e66dd852fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=15b4036d07b8d94c95fb56f31ea5bda6
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r3
new file mode 100644
index 000000000000..5b1ad28a5770
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for evolution
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=15b4036d07b8d94c95fb56f31ea5bda6
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-9999 b/metadata/md5-cache/sec-policy/selinux-evolution-9999
index 2ce711cf41aa..b19fcb5e5122 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-9999
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=15b4036d07b8d94c95fb56f31ea5bda6
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r1
deleted file mode 100644
index 436b5a5ce258..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for exim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3c0c43ae5c3840ebfbe72965eef337a0
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r2
deleted file mode 100644
index def3dc6ce6b1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for exim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=aba717ee10dc6621c75bcfb25d4c670a
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r3
deleted file mode 100644
index 162d0450a295..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for exim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=aba717ee10dc6621c75bcfb25d4c670a
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r4
deleted file mode 100644
index 222a6ed3d42e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for exim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=aba717ee10dc6621c75bcfb25d4c670a
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r2
index e0bb76f3b407..647babccf463 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aba717ee10dc6621c75bcfb25d4c670a
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r3
index f01ebe649750..c95a3a9a86ea 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aba717ee10dc6621c75bcfb25d4c670a
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r4
deleted file mode 100644
index 6df0f884b86e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for exim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3c0c43ae5c3840ebfbe72965eef337a0
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r1
index 16a50411c59a..e2648306aa16 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=900546d4b5abfea36088a96374dabf91
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r2
index 86196be606f2..3cd254da91d4 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dac426e919560161d269ac8c8e9340aa
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r3
new file mode 100644
index 000000000000..cc06519afbfe
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for exim
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=dac426e919560161d269ac8c8e9340aa
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-9999 b/metadata/md5-cache/sec-policy/selinux-exim-9999
index 9343a3a583e0..157c61dbbcfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-9999
+++ b/metadata/md5-cache/sec-policy/selinux-exim-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dac426e919560161d269ac8c8e9340aa
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r1
deleted file mode 100644
index 4f000f743c41..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fail2ban
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3f2267e0a0937e71e91ab281608e9edb
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r2
deleted file mode 100644
index 48751d8b2c25..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fail2ban
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a64abda4b4ae124717ff16ea8c919563
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r3
deleted file mode 100644
index 6b97fec7b98f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fail2ban
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a64abda4b4ae124717ff16ea8c919563
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r4
deleted file mode 100644
index e816cdb984e8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fail2ban
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a64abda4b4ae124717ff16ea8c919563
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r2
index c117027adce5..1f8242fdb0d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a64abda4b4ae124717ff16ea8c919563
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r3
index 15359852dcfa..dcba4c208c57 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a64abda4b4ae124717ff16ea8c919563
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r4
deleted file mode 100644
index 9f4f14e1b372..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fail2ban
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3f2267e0a0937e71e91ab281608e9edb
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r1
index ea515e1def93..9ca760bb46a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c634c708e6386f8d226cb506813dbccd
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r2
index 27d338a9bda7..815cf27c9ec6 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8713f8597ddc8563a6745b7352742f69
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r3
new file mode 100644
index 000000000000..30276d67c762
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fail2ban
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=8713f8597ddc8563a6745b7352742f69
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-9999 b/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
index 877a621146a2..744988516ccf 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8713f8597ddc8563a6745b7352742f69
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r1
deleted file mode 100644
index 16741290906f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fetchmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bd98d69bf7a40b8f6f590b0854431f62
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r2
deleted file mode 100644
index 2a8e15441b83..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fetchmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3154cf2616c26e963795a1e06d0afdf8
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r3
deleted file mode 100644
index 0d6462c5549a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fetchmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3154cf2616c26e963795a1e06d0afdf8
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r4
deleted file mode 100644
index 1d8dac7d350d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fetchmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3154cf2616c26e963795a1e06d0afdf8
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r2
index ce84fda7319f..03bb6f2e6c21 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3154cf2616c26e963795a1e06d0afdf8
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r3
index 855fc2bf69ed..06cd8c5c829c 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3154cf2616c26e963795a1e06d0afdf8
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r4
deleted file mode 100644
index 73c84430e6f4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fetchmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bd98d69bf7a40b8f6f590b0854431f62
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r1
index 61091dbfb000..180c1ab83b67 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3eab8e876d7893f9720c0d7834b57137
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r2
index 0c6c741470ef..0687aed5ba1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3d27259ac599d9a06d76e26c9682dd80
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r3
new file mode 100644
index 000000000000..1b9a699c758b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fetchmail
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3d27259ac599d9a06d76e26c9682dd80
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-9999 b/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
index bd69aca6a1eb..13e97910c0df 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3d27259ac599d9a06d76e26c9682dd80
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r1
deleted file mode 100644
index e4df1027e4da..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for finger
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1cdc30846f98f2675506f890e3ed5b04
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r2
deleted file mode 100644
index 0df5b7ba5456..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for finger
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f6fa12d3b5c06ddc964798a80d8b4949
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r3
deleted file mode 100644
index 14d38050e4e2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for finger
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f6fa12d3b5c06ddc964798a80d8b4949
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r4
deleted file mode 100644
index 80518cc1514b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for finger
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f6fa12d3b5c06ddc964798a80d8b4949
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r2
index 2f248ca33b8c..ce5ef8efa476 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f6fa12d3b5c06ddc964798a80d8b4949
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r3
index f894a7718b3c..a0ed4ac8d548 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f6fa12d3b5c06ddc964798a80d8b4949
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r4
deleted file mode 100644
index 346ade11f495..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for finger
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1cdc30846f98f2675506f890e3ed5b04
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r1
index 43f74ea9cba7..b70b7dbae64f 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9e40d578e9dbc1030c46f312a94203b4
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r2
index 40de39049a89..806990fbe379 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=065b41adc2f4a4261eaa3f7ae9a3c7fe
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r3
new file mode 100644
index 000000000000..7a3628f8c7db
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for finger
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=065b41adc2f4a4261eaa3f7ae9a3c7fe
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-9999 b/metadata/md5-cache/sec-policy/selinux-finger-9999
index 9a9a25ea3697..7f68d4b03f56 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-9999
+++ b/metadata/md5-cache/sec-policy/selinux-finger-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=065b41adc2f4a4261eaa3f7ae9a3c7fe
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r1
deleted file mode 100644
index c4624e1c6ab9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for flash
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=778dbbcf9cc2bdedf16d8499ac1af48e
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r2
deleted file mode 100644
index 72deb02f7fd6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for flash
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f6da9ca0b2b1323b16220bcde79f4094
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r3
deleted file mode 100644
index 938369bf78ba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for flash
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f6da9ca0b2b1323b16220bcde79f4094
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r4
deleted file mode 100644
index 4d7ec7c36fc5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for flash
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f6da9ca0b2b1323b16220bcde79f4094
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r2
index 3e52aa84eae2..821c3fb5a661 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f6da9ca0b2b1323b16220bcde79f4094
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r3
index 1305c07dfe88..3fec57dc3410 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f6da9ca0b2b1323b16220bcde79f4094
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r4
deleted file mode 100644
index 68c5b4bc4c7f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for flash
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=778dbbcf9cc2bdedf16d8499ac1af48e
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r1
index acd3705bf6ec..4da92702aa47 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=15c256b7d965e58e73419a50f416b346
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r2
index 8226db68638f..2082cf3cf1bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0bbb275099e2eb98f4f1037a13127187
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r3
new file mode 100644
index 000000000000..7e41b6f014d9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for flash
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=0bbb275099e2eb98f4f1037a13127187
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-9999 b/metadata/md5-cache/sec-policy/selinux-flash-9999
index 58e1ffb70d32..9b693536b048 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-9999
+++ b/metadata/md5-cache/sec-policy/selinux-flash-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0bbb275099e2eb98f4f1037a13127187
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r1
deleted file mode 100644
index c917d4fb1e04..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fprintd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7068cf8e61c9a7d2c201c398380bc17b
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r2
deleted file mode 100644
index 89a25b625f83..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fprintd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2991fb89640a831c8a2a93a0dc0de9ec
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r3
deleted file mode 100644
index b23da40ca8fd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fprintd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2991fb89640a831c8a2a93a0dc0de9ec
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r4
deleted file mode 100644
index 89d744358ce3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fprintd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2991fb89640a831c8a2a93a0dc0de9ec
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r2
index 49fcbedc5f34..3f04e302b60c 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2991fb89640a831c8a2a93a0dc0de9ec
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r3
index f338ec5c3166..04e2bb7c506b 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2991fb89640a831c8a2a93a0dc0de9ec
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r4
deleted file mode 100644
index 3ac8ae4b0028..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fprintd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7068cf8e61c9a7d2c201c398380bc17b
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r1
index e83ef46192b4..e6dbde33a64f 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a05891ee3959752ca36a9d0894577a57
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r2
index ae0dbb3ce19b..e902356e4c41 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9d0c5b63e5707d085809b28c19c55ecb
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r3
new file mode 100644
index 000000000000..378413e1f711
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fprintd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=9d0c5b63e5707d085809b28c19c55ecb
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-9999 b/metadata/md5-cache/sec-policy/selinux-fprintd-9999
index 4b78714e7419..c1213cd939a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9d0c5b63e5707d085809b28c19c55ecb
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r1
deleted file mode 100644
index b32a3d3c8715..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=691f51b7f4dbb54f17992e416ceed67e
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r2
deleted file mode 100644
index c4555da87713..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a7317511a6861f22dd7ce14520799f77
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r3
deleted file mode 100644
index 45fcddccd2df..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a7317511a6861f22dd7ce14520799f77
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r4
deleted file mode 100644
index 08aa96b5dc33..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a7317511a6861f22dd7ce14520799f77
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r2
index 34f61879d147..4764af587106 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a7317511a6861f22dd7ce14520799f77
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r3
index 34401eee54d0..62060093c4bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a7317511a6861f22dd7ce14520799f77
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r4
deleted file mode 100644
index 87b748ed2f05..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=691f51b7f4dbb54f17992e416ceed67e
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r1
index c917becbf04e..c43093740dad 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8311f4b8418656d59282e3281bd49a40
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r2
index 40d49f23b923..28677228d15e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=01bb3f55cfbdb27f32b197fe1eabdf8b
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r3
new file mode 100644
index 000000000000..62510cebbc8a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ftp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=01bb3f55cfbdb27f32b197fe1eabdf8b
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-9999 b/metadata/md5-cache/sec-policy/selinux-ftp-9999
index 3b8b8105c06d..adc718a240a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=01bb3f55cfbdb27f32b197fe1eabdf8b
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r1
deleted file mode 100644
index f8e9ea83836d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for games
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2436c2439cc8317187892e354f76a139
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r2
deleted file mode 100644
index d06968480fc2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for games
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c230ee293240d58175c21920898d01fe
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r3
deleted file mode 100644
index b76978952720..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for games
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c230ee293240d58175c21920898d01fe
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r4
deleted file mode 100644
index 445dc019ffd9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for games
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c230ee293240d58175c21920898d01fe
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r2
index bcf3a3271910..df16024b5257 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c230ee293240d58175c21920898d01fe
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r3
index 69c110f26c81..98a14c1af742 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c230ee293240d58175c21920898d01fe
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r4
deleted file mode 100644
index b28e926aa132..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for games
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2436c2439cc8317187892e354f76a139
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r1
index 17a4e2a1e8a5..dcd079e3b521 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6088ed3e1e4ce2d247b4b8fbaf249a36
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r2
index e2bd4d671583..401760c9450d 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=92942c4e520676a59d1dec32de035cb1
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r3
new file mode 100644
index 000000000000..4c920986d136
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for games
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=92942c4e520676a59d1dec32de035cb1
diff --git a/metadata/md5-cache/sec-policy/selinux-games-9999 b/metadata/md5-cache/sec-policy/selinux-games-9999
index 0608752918fe..e986dedfdf0c 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-9999
+++ b/metadata/md5-cache/sec-policy/selinux-games-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=92942c4e520676a59d1dec32de035cb1
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r1
deleted file mode 100644
index 0b1cc754f07c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gatekeeper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3347df380957faea4343f8ba6809c498
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r2
deleted file mode 100644
index 3ab85621c708..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gatekeeper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=93e0f2b3d070dbf84dec6f591bd609a0
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r3
deleted file mode 100644
index 141565e97076..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gatekeeper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=93e0f2b3d070dbf84dec6f591bd609a0
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r4
deleted file mode 100644
index 96fe5d193b3e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gatekeeper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=93e0f2b3d070dbf84dec6f591bd609a0
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r2
index 7d437605520f..3816fef4ef65 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=93e0f2b3d070dbf84dec6f591bd609a0
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r3
index 3ff5a93ad444..ac525d5926d0 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=93e0f2b3d070dbf84dec6f591bd609a0
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r4
deleted file mode 100644
index a3dd32e7435b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gatekeeper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3347df380957faea4343f8ba6809c498
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r1
index 72a261a36043..5a484e63cbc2 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5452472920c2e145747feb846423368c
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r2
index 0c9a03675561..722c991f4589 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ca55524df9a98c2dcee6e5bb34543a7c
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r3
new file mode 100644
index 000000000000..11dce79c2ed0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gatekeeper
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ca55524df9a98c2dcee6e5bb34543a7c
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
index 1b2b451a3dee..c97741d6fcb9 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ca55524df9a98c2dcee6e5bb34543a7c
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r1
deleted file mode 100644
index eaca3b5b450c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for git
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6869addb745d57401b0e0eaaed3b6ac2
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r2
deleted file mode 100644
index d909d173ded2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for git
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=35146e6fe995bbdc475e9bb96de88d76
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r3
deleted file mode 100644
index 11c8e71b2d4c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for git
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=35146e6fe995bbdc475e9bb96de88d76
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r4
deleted file mode 100644
index 67d277f81c08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for git
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=35146e6fe995bbdc475e9bb96de88d76
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r2
index 213ec8d77f6c..e9f4ffa37196 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=35146e6fe995bbdc475e9bb96de88d76
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r3
index bca3b63048ca..e31d2fd9081d 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=35146e6fe995bbdc475e9bb96de88d76
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r4
deleted file mode 100644
index 6670cad90a1e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for git
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6869addb745d57401b0e0eaaed3b6ac2
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r1
index 2907d46a4bb1..09cecb927a24 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9f964a4d219b71290e9c4a8f250f4364
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r2
index e53d9c1a828d..da85699d26ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ccaa3811c64cc90355b99c67d9f9e32
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r3
new file mode 100644
index 000000000000..ff228d4dd6de
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for git
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2ccaa3811c64cc90355b99c67d9f9e32
diff --git a/metadata/md5-cache/sec-policy/selinux-git-9999 b/metadata/md5-cache/sec-policy/selinux-git-9999
index 423cbece03e6..c25be29bc3d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-9999
+++ b/metadata/md5-cache/sec-policy/selinux-git-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ccaa3811c64cc90355b99c67d9f9e32
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r1
deleted file mode 100644
index 4661fdcbf053..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gitosis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=47e158e6fd29fee76df856e1409e69dd
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r2
deleted file mode 100644
index db0684b44bac..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gitosis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8f37cd66d39870e443655c71d9f5b30f
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r3
deleted file mode 100644
index 84c64acd32e8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gitosis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8f37cd66d39870e443655c71d9f5b30f
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r4
deleted file mode 100644
index fe6879339ec1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gitosis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8f37cd66d39870e443655c71d9f5b30f
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r2
index 879f275f3aca..369555f44cba 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8f37cd66d39870e443655c71d9f5b30f
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r3
index 12c4d259e442..936a1525eb88 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8f37cd66d39870e443655c71d9f5b30f
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r4
deleted file mode 100644
index 65b33842ca0d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gitosis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=47e158e6fd29fee76df856e1409e69dd
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r1
index de1338ae04d0..4da14d94fa78 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c5ad1f470a2a05a23bb5558631ef9513
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r2
index d4e3a163fab5..3c704f4be407 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3144f7dad228b9ed82491143420a0f63
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r3
new file mode 100644
index 000000000000..a99e1152c080
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gitosis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3144f7dad228b9ed82491143420a0f63
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-9999 b/metadata/md5-cache/sec-policy/selinux-gitosis-9999
index ef73d5f8ea56..5ab94d4d7146 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3144f7dad228b9ed82491143420a0f63
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r1
deleted file mode 100644
index bcc20425767d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gnome
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=16b3aa67c380cdf35314a38d76b3e40d
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r2
deleted file mode 100644
index db07b5293ac7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gnome
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3c5345c8cea8429cc1978557da4e3623
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r3
deleted file mode 100644
index f3a461e8aad9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gnome
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3c5345c8cea8429cc1978557da4e3623
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r4
deleted file mode 100644
index 60e8f71538fc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gnome
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3c5345c8cea8429cc1978557da4e3623
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r2
index e840fbb88b9e..8080f0d0d526 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3c5345c8cea8429cc1978557da4e3623
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r3
index c8c335a681d7..3b880576e057 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3c5345c8cea8429cc1978557da4e3623
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r4
deleted file mode 100644
index 6353e24dc935..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gnome
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=16b3aa67c380cdf35314a38d76b3e40d
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r1
index 489f1d57b5a7..6bc247f8adb8 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5ecdef093d8f02ac1a07450e8f1fb72b
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r2
index d5be5b4fa534..44242622f09a 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6c73d42e4cd3156a1b86b0f012c62abf
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r3
new file mode 100644
index 000000000000..ab24cce2434a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gnome
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6c73d42e4cd3156a1b86b0f012c62abf
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-9999 b/metadata/md5-cache/sec-policy/selinux-gnome-9999
index 275a13fba831..2f5ae78191ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6c73d42e4cd3156a1b86b0f012c62abf
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r1
deleted file mode 100644
index eac4c2177463..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for googletalk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fd68004964420bab16264dbe5913e102
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r2
deleted file mode 100644
index b8610e1b5358..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for googletalk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=062aafc5859ac988384f3d6431266e49
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r3
deleted file mode 100644
index c65684655dbe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for googletalk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=062aafc5859ac988384f3d6431266e49
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r4
deleted file mode 100644
index 9741ff57c726..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170204-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for googletalk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=062aafc5859ac988384f3d6431266e49
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r2
index 3b8d91e8ba77..70f912501b20 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=062aafc5859ac988384f3d6431266e49
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r3
index 20a1ad8271dd..e4b8449d2dff 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=062aafc5859ac988384f3d6431266e49
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r4
deleted file mode 100644
index 9b08b0e24c1f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for googletalk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fd68004964420bab16264dbe5913e102
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r1
index da3eaaa90e34..295602b0b6ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aba00bb2ce16d5bc0b89d88bf17adad5
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r2
index a3383d8389ca..512407db5402 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f65ad8b8522c09b51eff558e6080d1cd
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r3
new file mode 100644
index 000000000000..08055eb9913b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for googletalk
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f65ad8b8522c09b51eff558e6080d1cd
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-9999 b/metadata/md5-cache/sec-policy/selinux-googletalk-9999
index 6e3d152a0a39..f6c643aa207f 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f65ad8b8522c09b51eff558e6080d1cd
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r1
deleted file mode 100644
index 2faaf930f004..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gorg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e081710d4f2d8b4b933af91f72e2e90b
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r2
deleted file mode 100644
index b503eb38ded2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gorg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c54056b294a59b2ef106e7f606c80cc2
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r3
deleted file mode 100644
index 9c30e17d7bc9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gorg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c54056b294a59b2ef106e7f606c80cc2
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r4
deleted file mode 100644
index 0ebc4e55612f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gorg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c54056b294a59b2ef106e7f606c80cc2
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r2
index b589093896e8..b195414e1a85 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c54056b294a59b2ef106e7f606c80cc2
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r3
index e8a9e3cf7f79..86cdf980d487 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c54056b294a59b2ef106e7f606c80cc2
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r4
deleted file mode 100644
index 0cd777244766..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gorg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e081710d4f2d8b4b933af91f72e2e90b
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r1
index 074e77a079e2..59646e796aec 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f83dea73b635e85b66c5a3e16dccb500
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r2
index b4206ebda520..bc6432cc7d00 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9e7433ee2aa06e239cb50ebe76f364e3
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r3
new file mode 100644
index 000000000000..d5afa00e8809
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gorg
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=9e7433ee2aa06e239cb50ebe76f364e3
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-9999 b/metadata/md5-cache/sec-policy/selinux-gorg-9999
index 46187d5c7984..2115ea6d9e17 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9e7433ee2aa06e239cb50ebe76f364e3
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r1
deleted file mode 100644
index a1bc4021361a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=43d8e0e1adf4e4bb221f43ac900d28bd
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r2
deleted file mode 100644
index 990d165b4e8a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=83edb934f9204b78ebb3915f2c5d7a91
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r3
deleted file mode 100644
index 7a21d519a2d6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=83edb934f9204b78ebb3915f2c5d7a91
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r4
deleted file mode 100644
index bcf37485a447..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=83edb934f9204b78ebb3915f2c5d7a91
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r2
index f0eee8fff167..11a376b8ce53 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=83edb934f9204b78ebb3915f2c5d7a91
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r3
index 0b7a6e353c42..7d7cac2ee8d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=83edb934f9204b78ebb3915f2c5d7a91
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r4
deleted file mode 100644
index 4212e90231d9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ffee6d0691ba8a6bffed39e276b70989
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r1
index 2aa524e1b8f9..a6149571b894 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c066576734fcf3607aa54d9e38357f5b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r2
index ac7d16ccbe5c..2981df569b8c 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=14fb4248078e83fac196685d197b977b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r3
new file mode 100644
index 000000000000..dd92b0b06b6e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpg
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=14fb4248078e83fac196685d197b977b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-9999 b/metadata/md5-cache/sec-policy/selinux-gpg-9999
index 74ec7459dbf4..ff5cffd2fd47 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=14fb4248078e83fac196685d197b977b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r1
deleted file mode 100644
index 44d804775164..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6362bfa6a7ea8eb7eaad94f0cabc3d86
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r2
deleted file mode 100644
index e8fca1a86b39..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=480d9643d19bac0799c7100d8bcf6c2a
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r3
deleted file mode 100644
index fce521c9a27b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=480d9643d19bac0799c7100d8bcf6c2a
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r4
deleted file mode 100644
index 42e786c3dbdd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=480d9643d19bac0799c7100d8bcf6c2a
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r2
index 7a633a8c8e1a..b6f22d357cb9 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=480d9643d19bac0799c7100d8bcf6c2a
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r3
index 64c367b6bba8..47bc3f824728 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=480d9643d19bac0799c7100d8bcf6c2a
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r4
deleted file mode 100644
index 5769b1827306..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6362bfa6a7ea8eb7eaad94f0cabc3d86
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r1
index ef8edc35993c..00285666c901 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=47e7117ff5963f6ef0dae7b79386b857
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r2
index 40257ba6acf8..0e26af46d29e 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=97b272e2127cb3138af8be6ef3218e71
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r3
new file mode 100644
index 000000000000..44f92b4e5f15
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=97b272e2127cb3138af8be6ef3218e71
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-9999 b/metadata/md5-cache/sec-policy/selinux-gpm-9999
index e92ee9ce634f..33bb37cd42f1 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=97b272e2127cb3138af8be6ef3218e71
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r1
deleted file mode 100644
index 9424158588d9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=13f06164a3dd2e033c4a2bdb9be7089e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r2
deleted file mode 100644
index c479f4a0124f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b14d7210912d0dda0f863a120a7f3d8e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r3
deleted file mode 100644
index 8728942e1bab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b14d7210912d0dda0f863a120a7f3d8e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r4
deleted file mode 100644
index 3b1b6f3c6838..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b14d7210912d0dda0f863a120a7f3d8e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r2
index 0fd33a8b7e47..e447419e1e13 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b14d7210912d0dda0f863a120a7f3d8e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r3
index 5d9353762f76..51f1e7a2107a 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b14d7210912d0dda0f863a120a7f3d8e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r4
deleted file mode 100644
index 87391e40c30d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=13f06164a3dd2e033c4a2bdb9be7089e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r1
index 39813fab7803..a44cca05b1c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3b976754e0ddd95cc0f2508452c9a8e4
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r2
index 9a483568c64e..4a9ba31e7480 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=84ae7deabd5b83808eea7949c928d6da
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r3
new file mode 100644
index 000000000000..d8e7c36ca24e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpsd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=84ae7deabd5b83808eea7949c928d6da
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-9999 b/metadata/md5-cache/sec-policy/selinux-gpsd-9999
index 67b0b04cc66c..6839a14f8aaa 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=84ae7deabd5b83808eea7949c928d6da
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r3
index 43687c42ada3..7f58d96d93dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7f29e9196764bef2443994c348ce59e4
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r4
deleted file mode 100644
index 8e0a6228e86a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gssproxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e13558a3ece36c7ee8e338d361a2419d
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r1
index c5a05ff3ce6b..156fc19faa2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=38162a9a97ce82da8280b93945e2b433
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r2
index 505435fabaef..df0db0ab4bc9 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1c7c7971be4ca81d566ea190ee8e2826
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r3
new file mode 100644
index 000000000000..8c6cd97e9128
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gssproxy
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1c7c7971be4ca81d566ea190ee8e2826
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-9999 b/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
index 13f046028df5..c38258412ba9 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1c7c7971be4ca81d566ea190ee8e2826
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r1
deleted file mode 100644
index 35c69d13cd44..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for hddtemp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6e974ed76c96d4dfca25ef54e0b833f5
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r2
deleted file mode 100644
index b37544c1aca1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for hddtemp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3885a13bc180c6d57dc8b0b1b2510f94
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r3
deleted file mode 100644
index 15b08cc255c7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for hddtemp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3885a13bc180c6d57dc8b0b1b2510f94
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r4
deleted file mode 100644
index 31d206a3fa99..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for hddtemp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3885a13bc180c6d57dc8b0b1b2510f94
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r2
index 5270b36c9bdc..0132a20f675e 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3885a13bc180c6d57dc8b0b1b2510f94
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r3
index 924a285eb3c4..ea5600bbe1c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3885a13bc180c6d57dc8b0b1b2510f94
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r4
deleted file mode 100644
index ffeb57de4b76..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for hddtemp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6e974ed76c96d4dfca25ef54e0b833f5
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r1
index e286a99d83e8..39f0977b27ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a53316eb8f0605cada3ad70b138f56c3
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r2
index 60c60804b0e7..ca86f9ff92af 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b341134f7f23b798ad50f304cd74bbe0
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r3
new file mode 100644
index 000000000000..2ec47d73f52f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for hddtemp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b341134f7f23b798ad50f304cd74bbe0
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-9999 b/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
index 14c85bcc7e8d..f70167882fab 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b341134f7f23b798ad50f304cd74bbe0
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r1
deleted file mode 100644
index a61259dec4bf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for howl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c55a6e9884de0be18260a6228ae00075
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r2
deleted file mode 100644
index 2c655a097091..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for howl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f8c5cd036dcba43813321e8817163bcb
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r3
deleted file mode 100644
index d455f9e22489..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for howl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f8c5cd036dcba43813321e8817163bcb
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r4
deleted file mode 100644
index 14191c520567..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for howl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f8c5cd036dcba43813321e8817163bcb
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r2
index 16f3a5361b7c..5de0dfdd3e5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f8c5cd036dcba43813321e8817163bcb
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r3
index fd2b750e7918..70fed73f7607 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f8c5cd036dcba43813321e8817163bcb
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r4
deleted file mode 100644
index 90959b79943a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for howl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c55a6e9884de0be18260a6228ae00075
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r1
index 1ac8050ddb26..cf4105b38d3a 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6e389e23fbf78f00f0dd060a93f27de5
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r2
index 0e9fec1a2faa..2f0a820ef500 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4ea3579a40c14cedaab4c9df9e778dac
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r3
new file mode 100644
index 000000000000..3e1022273d08
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for howl
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=4ea3579a40c14cedaab4c9df9e778dac
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-9999 b/metadata/md5-cache/sec-policy/selinux-howl-9999
index 707de2135dc4..f2258ef5cd5c 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-howl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4ea3579a40c14cedaab4c9df9e778dac
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r1
deleted file mode 100644
index 2e6a1a6a1334..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for icecast
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3b277e25279e105792794c0e5fd859ba
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r2
deleted file mode 100644
index 05bdba02cdab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for icecast
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=900bddeca736d1025e66d4b675215298
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r3
deleted file mode 100644
index 909641c99349..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for icecast
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=900bddeca736d1025e66d4b675215298
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r4
deleted file mode 100644
index 8b862fafd6a2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for icecast
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=900bddeca736d1025e66d4b675215298
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r2
index e6e902a3775b..2e5603fc0a2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=900bddeca736d1025e66d4b675215298
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r3
index 48bb558f5bf5..3fc164a78a7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=900bddeca736d1025e66d4b675215298
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r4
deleted file mode 100644
index 640ee251208e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for icecast
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3b277e25279e105792794c0e5fd859ba
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r1
index 80fd52079339..ecb2cedc9048 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8d4cca57f5273f668fec15252848562b
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r2
index 6a59e42eac10..1bde90737226 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ebf0f3ccc6dd5e0c0c9aeac66a92629b
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r3
new file mode 100644
index 000000000000..9e83ceb49be8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for icecast
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ebf0f3ccc6dd5e0c0c9aeac66a92629b
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-9999 b/metadata/md5-cache/sec-policy/selinux-icecast-9999
index 6e202f061e1a..1f8aaab2f29a 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-9999
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ebf0f3ccc6dd5e0c0c9aeac66a92629b
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r1
deleted file mode 100644
index aa9906e398bb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ifplugd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=32f29d3fe53066f964fcc2806ceb907e
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r2
deleted file mode 100644
index 0576454d9ab2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ifplugd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=528774474da99306245cd326228fb7c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r3
deleted file mode 100644
index b9d758456360..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ifplugd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=528774474da99306245cd326228fb7c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r4
deleted file mode 100644
index fe3617b66301..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ifplugd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=528774474da99306245cd326228fb7c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r2
index b31a8ebe2fa0..1c0176987bb3 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=528774474da99306245cd326228fb7c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r3
index 2dcdaee07d21..0ca57ac3163e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=528774474da99306245cd326228fb7c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r4
deleted file mode 100644
index 1bdd9c96c85a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ifplugd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=32f29d3fe53066f964fcc2806ceb907e
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r1
index a763e947dddc..e8ff5e2f9cfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=efa258d7c669f807475e511e835cf554
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r2
index e9e282de8336..11f0d998140b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=90bc06855704fe846b0d34fbdee2e085
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r3
new file mode 100644
index 000000000000..868698b31c35
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ifplugd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=90bc06855704fe846b0d34fbdee2e085
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-9999 b/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
index 7834eddaaa01..16ca3f41961c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=90bc06855704fe846b0d34fbdee2e085
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r1
deleted file mode 100644
index 3624c5eebe98..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for imaze
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=538a11b427eb60eba386afea09e59172
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r2
deleted file mode 100644
index 7dafa7ba15e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for imaze
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a723771263beeabc3d533cf6eced5d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r3
deleted file mode 100644
index 1d7e8cac5a32..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for imaze
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a723771263beeabc3d533cf6eced5d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r4
deleted file mode 100644
index 83feb6ae4a7f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for imaze
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a723771263beeabc3d533cf6eced5d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r2
index 9ffb6921da53..6f126f24900a 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a723771263beeabc3d533cf6eced5d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r3
index 86fdabbfe38c..f15057a4f8e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a723771263beeabc3d533cf6eced5d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r4
deleted file mode 100644
index 6853bc87a2b8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for imaze
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=538a11b427eb60eba386afea09e59172
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r1
index a5465113fb25..3f1b8fd9b0c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6c8d2073656d76f4b9bfee56d2939221
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r2
index 73b49a4c40e1..d3bef03d51b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=34af9bb0f008427666b01e1113ad95e8
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r3
new file mode 100644
index 000000000000..dba404a7a2db
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for imaze
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=34af9bb0f008427666b01e1113ad95e8
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-9999 b/metadata/md5-cache/sec-policy/selinux-imaze-9999
index ab297b7410d3..c8b2fc97cc4a 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-9999
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=34af9bb0f008427666b01e1113ad95e8
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r1
deleted file mode 100644
index 204aa4280029..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inetd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5c70b5400a1821b99e6edcff17616fef
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r2
deleted file mode 100644
index e59831a0e010..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inetd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e9c9272bdc2f5d3acf5dfa1a543b018b
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r3
deleted file mode 100644
index b1fe705bb47a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inetd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e9c9272bdc2f5d3acf5dfa1a543b018b
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r4
deleted file mode 100644
index 2d2477141756..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inetd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e9c9272bdc2f5d3acf5dfa1a543b018b
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r2
index 3b524c9e0eed..34acbfdb9913 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e9c9272bdc2f5d3acf5dfa1a543b018b
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r3
index 378929992637..741a3ed35c32 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e9c9272bdc2f5d3acf5dfa1a543b018b
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r4
deleted file mode 100644
index 29da240f7c00..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inetd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5c70b5400a1821b99e6edcff17616fef
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r1
index fe0f36662c90..b7f35b4c9781 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=12906d51910cc2731bce8e56cf7d02ed
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r2
index 734a7b4534b4..883ddbeb3b58 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8684b31777c04fb863d22f9f23dd8793
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r3
new file mode 100644
index 000000000000..8e9ba369ef8f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for inetd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=8684b31777c04fb863d22f9f23dd8793
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-9999 b/metadata/md5-cache/sec-policy/selinux-inetd-9999
index c20c038b9a91..2bb9c10058db 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8684b31777c04fb863d22f9f23dd8793
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r1
deleted file mode 100644
index 40d607167d18..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9562662b20ae8177785481f5d8de2e13
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r2
deleted file mode 100644
index ede2605b34fc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a908b912cee40f8f8b87c52d650e3468
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r3
deleted file mode 100644
index ba10d929983b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a908b912cee40f8f8b87c52d650e3468
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r4
deleted file mode 100644
index 02c26f3e5f8d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a908b912cee40f8f8b87c52d650e3468
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r2
index 63742a9d35fe..d63ebe1b1a18 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a908b912cee40f8f8b87c52d650e3468
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r3
index fbe2a2a17009..6f944ee6b719 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a908b912cee40f8f8b87c52d650e3468
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r4
deleted file mode 100644
index f689eabc6753..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9562662b20ae8177785481f5d8de2e13
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r1
index 006a8350c778..4a31424b39d9 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f180a4b738bac41a0e6e463f3c278dd3
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r2
index fc0a1fbfa506..8dc6134f734e 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=763bc3633051da1d0262d0ee77f4dd49
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r3
new file mode 100644
index 000000000000..314baeeb1cbe
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for inn
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=763bc3633051da1d0262d0ee77f4dd49
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-9999 b/metadata/md5-cache/sec-policy/selinux-inn-9999
index b8b37ef02721..b42a6c2caff4 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-inn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=763bc3633051da1d0262d0ee77f4dd49
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r1
deleted file mode 100644
index 82f971513404..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ipsec
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c60388a40a396959fb515479da92beb4
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r2
deleted file mode 100644
index 45cb3d49f0ab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ipsec
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bfe9d293cc86de93721f7fa2c82fe9cc
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r3
deleted file mode 100644
index dbbe25d00d0b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ipsec
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bfe9d293cc86de93721f7fa2c82fe9cc
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r4
deleted file mode 100644
index 7882436b3134..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ipsec
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bfe9d293cc86de93721f7fa2c82fe9cc
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r2
index 527653fd9f70..8d7855ee81bd 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bfe9d293cc86de93721f7fa2c82fe9cc
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r3
index a20593de168c..950e2e5fcc1f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bfe9d293cc86de93721f7fa2c82fe9cc
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r4
deleted file mode 100644
index 24e4d6bc59a7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ipsec
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c60388a40a396959fb515479da92beb4
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r1
index 69f4295a759c..9c70c733b8ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5ed37bbef290b31ccd0925508e997595
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r2
index 00f331b46905..47b87bf7375a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1686be44c8c33378dfc6b087a09be4b6
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r3
new file mode 100644
index 000000000000..ca1e91629f5e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ipsec
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1686be44c8c33378dfc6b087a09be4b6
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-9999 b/metadata/md5-cache/sec-policy/selinux-ipsec-9999
index 5e99c38e0eef..9fd678f6d427 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1686be44c8c33378dfc6b087a09be4b6
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r1
deleted file mode 100644
index 457189390355..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=87d1070e161b4bb95d6ea14fb38a1e61
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r2
deleted file mode 100644
index e1bf23915978..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=63873181b1bed0ef2d5ec85a163e9118
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r3
deleted file mode 100644
index c644b6235572..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=63873181b1bed0ef2d5ec85a163e9118
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r4
deleted file mode 100644
index 5a374122ff1a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=63873181b1bed0ef2d5ec85a163e9118
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r2
index 605b5813c4db..4c4fdf9b8bff 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=63873181b1bed0ef2d5ec85a163e9118
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r3
index 7e5cf6f13ade..19da8887181a 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=63873181b1bed0ef2d5ec85a163e9118
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r4
deleted file mode 100644
index a194ee58d413..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=87d1070e161b4bb95d6ea14fb38a1e61
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r1
index d1eacdb21930..067ff4e2f371 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4b1d67b75d8f313576eec31f7280d381
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r2
index 1289c6cdb8f5..f28daed28e26 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=70314fea9b4e61f44ada705fd260644e
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r3
new file mode 100644
index 000000000000..54d371defd39
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for irc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=70314fea9b4e61f44ada705fd260644e
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-9999 b/metadata/md5-cache/sec-policy/selinux-irc-9999
index 328fc3e7875c..a58e3a02ad59 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-irc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=70314fea9b4e61f44ada705fd260644e
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r1
deleted file mode 100644
index fcc5d92b8346..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2eb6505f796ff5ef384aedc78a7249c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r2
deleted file mode 100644
index 5ab12043f73e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d78ed71728172102ec5a6451b97d1762
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r3
deleted file mode 100644
index 45df9813f28f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d78ed71728172102ec5a6451b97d1762
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r4
deleted file mode 100644
index fcdaacd0e196..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d78ed71728172102ec5a6451b97d1762
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r2
index db5596f36e21..58f40c3ca173 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d78ed71728172102ec5a6451b97d1762
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r3
index 85e8f7710625..ee3cb413c54c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d78ed71728172102ec5a6451b97d1762
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r4
deleted file mode 100644
index 09a1d14098ef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2eb6505f796ff5ef384aedc78a7249c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r1
index b481c2e4eb10..b1f4db6507be 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ce9a4e49560cccc0fd1ce8d96a2c1e6a
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r2
index fd82f0135877..91bb67307be4 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2e9084a79607964c845941de92d7d71d
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r3
new file mode 100644
index 000000000000..585d6013a7a5
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ircd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2e9084a79607964c845941de92d7d71d
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-9999 b/metadata/md5-cache/sec-policy/selinux-ircd-9999
index 90b8a28c58e3..3a593a3d50b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2e9084a79607964c845941de92d7d71d
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r1
deleted file mode 100644
index 9b6c2f267257..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irqbalance
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bf61854dd00d8a7e204fb96d07fb26e2
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r2
deleted file mode 100644
index 2a014c3647a2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irqbalance
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a27bb1d164ada91a58f746ed5f6f5d57
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r3
deleted file mode 100644
index fbfb174aa2a8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irqbalance
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a27bb1d164ada91a58f746ed5f6f5d57
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r4
deleted file mode 100644
index 5e0ff18fcd19..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irqbalance
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a27bb1d164ada91a58f746ed5f6f5d57
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r2
index 85bf69809e53..0b499087d47b 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a27bb1d164ada91a58f746ed5f6f5d57
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r3
index c69e54d0bc71..50ccb847a2d8 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a27bb1d164ada91a58f746ed5f6f5d57
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r4
deleted file mode 100644
index 70bfef8e49a4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irqbalance
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bf61854dd00d8a7e204fb96d07fb26e2
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r1
index 43214d68ae55..6afbcb1cecfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3c916239c1270ad52d4b6ac3ce33d294
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r2
index 85e508739d87..e0bc241f45da 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=af3b8db5f278f03507e5137cb3340b4c
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r3
new file mode 100644
index 000000000000..6f186a0fdfb7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for irqbalance
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=af3b8db5f278f03507e5137cb3340b4c
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-9999 b/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
index 4ff30305d56a..142269f4669a 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=af3b8db5f278f03507e5137cb3340b4c
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r1
deleted file mode 100644
index 5125ad3a9938..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for jabber
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=798eebd56d31c714d50a3fd50f06fced
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r2
deleted file mode 100644
index cce4dbef9867..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for jabber
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=feeb3adf2aed060e61021b1b8d4fe486
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r3
deleted file mode 100644
index c564db9a7158..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for jabber
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=feeb3adf2aed060e61021b1b8d4fe486
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r4
deleted file mode 100644
index 268b9a51a710..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for jabber
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=feeb3adf2aed060e61021b1b8d4fe486
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r2
index 64b88f6c985d..3325584186cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=feeb3adf2aed060e61021b1b8d4fe486
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r3
index 26c66e17e37b..6c1fcbe17ca7 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=feeb3adf2aed060e61021b1b8d4fe486
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r4
deleted file mode 100644
index 73be19e2c50d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for jabber
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=798eebd56d31c714d50a3fd50f06fced
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r1
index f9e038e8d563..12915c4017d8 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=34758749f35dc4796ad05b476890a2b5
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r2
index 87564e10b2a7..40add546fe6a 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c52127cdd3ec4cc51af324923f5f2e99
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r3
new file mode 100644
index 000000000000..6630495a9d59
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for jabber
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c52127cdd3ec4cc51af324923f5f2e99
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-9999 b/metadata/md5-cache/sec-policy/selinux-jabber-9999
index 38f75ac31e79..4c2320b4cb98 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-9999
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c52127cdd3ec4cc51af324923f5f2e99
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r1
deleted file mode 100644
index 1f53739a9276..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8992a9fc5c893740b568a26b20a65406
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r2
deleted file mode 100644
index e4325bec0120..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fff7767d9afab9952412bfb1eadfea0d
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r3
deleted file mode 100644
index 7a2467c7e1b3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fff7767d9afab9952412bfb1eadfea0d
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r4
deleted file mode 100644
index 749b774cdcbc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170204-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fff7767d9afab9952412bfb1eadfea0d
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r2
index 58b21ea7577c..1d4ef22dc55d 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fff7767d9afab9952412bfb1eadfea0d
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r3
index c1cc49c54bcb..50d700b18204 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fff7767d9afab9952412bfb1eadfea0d
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r4
deleted file mode 100644
index 10ddb55686a3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8992a9fc5c893740b568a26b20a65406
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r1
index e3478c08f96d..aab6facaa61d 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=59007a0909d3f136d900b63f3fffd425
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r2
index d2ab53d5bea9..036af4b0652d 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d89c1a6702a8c294e7ae2c5e0017767e
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r3
new file mode 100644
index 000000000000..47af2a63ff54
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for java
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d89c1a6702a8c294e7ae2c5e0017767e
diff --git a/metadata/md5-cache/sec-policy/selinux-java-9999 b/metadata/md5-cache/sec-policy/selinux-java-9999
index 556c38af3890..5022fcba7357 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-9999
+++ b/metadata/md5-cache/sec-policy/selinux-java-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d89c1a6702a8c294e7ae2c5e0017767e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r1
deleted file mode 100644
index 0958d6560aa3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdeconnect
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9f2a8c2ea4fc739030bd344d9856cc8d
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r2
deleted file mode 100644
index 5118c8dc5251..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdeconnect
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=47173376aaa8db77c37cd88e89e6df7e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r3
deleted file mode 100644
index 24558ba04b9b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdeconnect
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=47173376aaa8db77c37cd88e89e6df7e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r4
deleted file mode 100644
index 7c4481deda43..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdeconnect
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=47173376aaa8db77c37cd88e89e6df7e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r2
index 2a21b0b91bfc..77cd24ebdf11 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=47173376aaa8db77c37cd88e89e6df7e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r3
index a2ec6aa2935e..b1173f20ec57 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=47173376aaa8db77c37cd88e89e6df7e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r4
deleted file mode 100644
index 05e1457ea558..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdeconnect
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9f2a8c2ea4fc739030bd344d9856cc8d
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r1
index cf337801635f..ab8fec39fa1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=651ef1f5ece84e1685394ad34ec8f3c3
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r2
index 15b13d3f16f0..8cd149f75473 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fd051d625715e0a5b1f18baca3bd2b1b
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r3
new file mode 100644
index 000000000000..b970aac5338e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kdeconnect
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=fd051d625715e0a5b1f18baca3bd2b1b
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
index 88a7c7e43957..824da44a190d 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fd051d625715e0a5b1f18baca3bd2b1b
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r1
deleted file mode 100644
index 41e7d7532ab5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdump
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd451450de6edefa1eacf81522c71a46
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r2
deleted file mode 100644
index 35fb05abc642..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdump
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66d8d30142876aa65de0db9dd9b56e38
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r3
deleted file mode 100644
index 71fe5e385dbd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdump
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66d8d30142876aa65de0db9dd9b56e38
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r4
deleted file mode 100644
index f15b2ed67b37..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdump
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66d8d30142876aa65de0db9dd9b56e38
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r2
index 9380f3cef4a5..8505dc0fdece 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=66d8d30142876aa65de0db9dd9b56e38
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r3
index 87c3a57005bf..25f334b80335 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=66d8d30142876aa65de0db9dd9b56e38
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r4
deleted file mode 100644
index 88c544bdf8e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdump
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd451450de6edefa1eacf81522c71a46
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r1
index 16215598bcf8..4d9413f3b446 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f91889e09fd5527f5ced50f1bfa5e437
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r2
index f6162464b981..0a8a99674406 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=def43a861057305a3b980b6e7bac9897
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r3
new file mode 100644
index 000000000000..18c56699ab1f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kdump
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=def43a861057305a3b980b6e7bac9897
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-9999 b/metadata/md5-cache/sec-policy/selinux-kdump-9999
index 11bac96480c1..bcd36c20f705 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=def43a861057305a3b980b6e7bac9897
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r1
deleted file mode 100644
index e38e42f8b57d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerberos
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d775e92c92c2e4d5c1be67c8253e38e2
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r2
deleted file mode 100644
index 20bcc25b81eb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerberos
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=70b6e2280c4e0c84428b1d6be192eed8
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r3
deleted file mode 100644
index 7d98ab52851a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerberos
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=70b6e2280c4e0c84428b1d6be192eed8
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r4
deleted file mode 100644
index 883f4ecf6a0f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerberos
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=70b6e2280c4e0c84428b1d6be192eed8
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r2
index ad5be9b8c3ab..5ff91577838f 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=70b6e2280c4e0c84428b1d6be192eed8
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r3
index 31832701cac4..afa5676f2066 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=70b6e2280c4e0c84428b1d6be192eed8
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r4
deleted file mode 100644
index 4fb6c3d5e0da..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerberos
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d775e92c92c2e4d5c1be67c8253e38e2
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r1
index 67123b6d8eb5..98e7fa49820c 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0b51410542cee82130dc4a336712b04f
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r2
index e95dd7a0bcfd..87ad290595c0 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0b321567d5abb46b12244614e8c4bd4a
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r3
new file mode 100644
index 000000000000..86a58480d232
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kerberos
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=0b321567d5abb46b12244614e8c4bd4a
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-9999 b/metadata/md5-cache/sec-policy/selinux-kerberos-9999
index 536a710039a4..6be8924eaaf7 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0b321567d5abb46b12244614e8c4bd4a
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r1
deleted file mode 100644
index 54629e357d00..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerneloops
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ec0307eb3619ea61d51146fa0fee26f7
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r2
deleted file mode 100644
index fe5dd172de78..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerneloops
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f276f52da59ed5734254ddaaecadd680
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r3
deleted file mode 100644
index 896496514652..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerneloops
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f276f52da59ed5734254ddaaecadd680
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r4
deleted file mode 100644
index 2137b6c91503..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerneloops
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f276f52da59ed5734254ddaaecadd680
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r2
index c23733f9d19d..d5341d6f70c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f276f52da59ed5734254ddaaecadd680
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r3
index 245eb510d044..fec543f2bac2 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f276f52da59ed5734254ddaaecadd680
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r4
deleted file mode 100644
index a6eaded6576e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerneloops
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ec0307eb3619ea61d51146fa0fee26f7
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r1
index 31728131b777..94dddfdfbca0 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=919a9750c5c2631dac2fe956025e2379
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r2
index 2279d4313db2..07fc3c85d547 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=da940ff2bce48ddf5601dfce609c4871
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r3
new file mode 100644
index 000000000000..f8d1a81ca4fa
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kerneloops
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=da940ff2bce48ddf5601dfce609c4871
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-9999 b/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
index 6d018f106601..6d9ec17674ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=da940ff2bce48ddf5601dfce609c4871
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r1
deleted file mode 100644
index 912b1b945286..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kismet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=90a795cc550afeb033220ef8f622cec7
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r2
deleted file mode 100644
index 017e8db7cf0c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kismet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0b1149aec3465dbcdd60a08265cd917
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r3
deleted file mode 100644
index 689f9019b3ea..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kismet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0b1149aec3465dbcdd60a08265cd917
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r4
deleted file mode 100644
index d1feba53b094..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kismet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0b1149aec3465dbcdd60a08265cd917
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r2
index 54d048f159dc..b3e1d14a9494 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e0b1149aec3465dbcdd60a08265cd917
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r3
index a3cd98e94753..16ba8c9868e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e0b1149aec3465dbcdd60a08265cd917
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r4
deleted file mode 100644
index 2296ab853ac1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kismet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=90a795cc550afeb033220ef8f622cec7
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r1
index fa9a3230c854..9a599c0cb509 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3e77f01e5e871ca0415b92813c3fbcc4
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r2
index b5a41c581345..544fb7a89a75 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=29dfc361044ea542d6168237837092e0
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r3
new file mode 100644
index 000000000000..0982fca29f47
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kismet
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=29dfc361044ea542d6168237837092e0
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-9999 b/metadata/md5-cache/sec-policy/selinux-kismet-9999
index 9dbfd4e33bc6..a67c6d830833 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=29dfc361044ea542d6168237837092e0
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r1
deleted file mode 100644
index d5553dd5dc66..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ksmtuned
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c704dd3489905787c2365d008caecfb8
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r2
deleted file mode 100644
index e058a843db02..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ksmtuned
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0a48b5a322f8c23add0461f35aca9ceb
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r3
deleted file mode 100644
index af9ed31325ef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ksmtuned
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0a48b5a322f8c23add0461f35aca9ceb
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r4
deleted file mode 100644
index 554b073a71eb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ksmtuned
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0a48b5a322f8c23add0461f35aca9ceb
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r2
index 540250ad71af..e8614b642dfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0a48b5a322f8c23add0461f35aca9ceb
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r3
index 9df81abf630f..aa1928a96b08 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0a48b5a322f8c23add0461f35aca9ceb
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r4
deleted file mode 100644
index c59de93fb2ca..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ksmtuned
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c704dd3489905787c2365d008caecfb8
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r1
index 2d7f417d5b7f..dac33103aa5f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a9be2f58cb9c42de31456de507e6dff7
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r2
index ed55707904ec..a84655a1ec38 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6b5ee2ab24f2b625c0c1386458be011b
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r3
new file mode 100644
index 000000000000..c6c6150dfce1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ksmtuned
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6b5ee2ab24f2b625c0c1386458be011b
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
index 4765129366aa..be0b96776390 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6b5ee2ab24f2b625c0c1386458be011b
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r1
deleted file mode 100644
index efe198ea391a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kudzu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4cb4299d624bbb0d78b472059b07113e
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r2
deleted file mode 100644
index 208a613cbaa9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kudzu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b6c05c39d2c83ed6ff219a1dc8249959
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r3
deleted file mode 100644
index 74fd019668ee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kudzu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b6c05c39d2c83ed6ff219a1dc8249959
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r4
deleted file mode 100644
index a9e41d417382..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kudzu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b6c05c39d2c83ed6ff219a1dc8249959
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r2
index 6aeae3292e4a..3938c978e969 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b6c05c39d2c83ed6ff219a1dc8249959
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r3
index e519a8bc83b4..6e76cacb710e 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b6c05c39d2c83ed6ff219a1dc8249959
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r4
deleted file mode 100644
index 97a92f157cdf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kudzu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4cb4299d624bbb0d78b472059b07113e
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r1
index 2a8284c70cbb..487ca8a41b25 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=311539ff8d916f158f8abf7372f76641
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r2
index 66cdaf1befd8..7452f19827c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=eb0352c8b6e442dda020748f068b414f
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r3
new file mode 100644
index 000000000000..02bebf9f0381
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kudzu
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=eb0352c8b6e442dda020748f068b414f
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-9999 b/metadata/md5-cache/sec-policy/selinux-kudzu-9999
index e66b3efc172f..bec20dc82d6f 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=eb0352c8b6e442dda020748f068b414f
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r1
deleted file mode 100644
index 0690bb29a441..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ldap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9aac58b874d328abc03cd78ea998e7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r2
deleted file mode 100644
index 0f24a6c07bbf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ldap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9dc8124d25474f761b45e0bde89b3c33
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r3
deleted file mode 100644
index 8d99101bda88..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ldap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9dc8124d25474f761b45e0bde89b3c33
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r4
deleted file mode 100644
index 7232e917fbf3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ldap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9dc8124d25474f761b45e0bde89b3c33
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r2
index bca26401d571..38507acfa873 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9dc8124d25474f761b45e0bde89b3c33
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r3
index c4abdad78b03..5574c8f1d8e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9dc8124d25474f761b45e0bde89b3c33
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r4
deleted file mode 100644
index 4743e1192489..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ldap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9aac58b874d328abc03cd78ea998e7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r1
index d6c17e4d6863..46893fc212f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=98a86b4bca43020cdff8260ef234faa2
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r2
index ea8c9d66ac95..a95b77ac35b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cf737ef75b7329a9358db73af259c306
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r3
new file mode 100644
index 000000000000..da021d92c58d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ldap
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=cf737ef75b7329a9358db73af259c306
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-9999 b/metadata/md5-cache/sec-policy/selinux-ldap-9999
index e4926628814b..de91dd2269f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cf737ef75b7329a9358db73af259c306
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r1
deleted file mode 100644
index f1c8e3d4c26c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for links
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b318c16c508f0f37bcae89ff81dd5b05
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r2
deleted file mode 100644
index af2515df4a7c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for links
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=270e53f02e92c17d14a9197e01fa34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r3
deleted file mode 100644
index 28c51a96d3a2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for links
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=270e53f02e92c17d14a9197e01fa34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r4
deleted file mode 100644
index 39702c6240aa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for links
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=270e53f02e92c17d14a9197e01fa34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r2
index eef0c4be0d0a..7f78ec60d1fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=270e53f02e92c17d14a9197e01fa34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r3
index e42bb5f99d76..dca5a76f217a 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=270e53f02e92c17d14a9197e01fa34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r4
deleted file mode 100644
index 095350ced22b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for links
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b318c16c508f0f37bcae89ff81dd5b05
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r1
index 4d28b376302b..63d3dfcd5554 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=503fe00e40af900174dc71617206626e
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r2
index 471c8212a24c..b5dbf30b07fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e4d0045a7bf5430674049b2b755f82b3
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r3
new file mode 100644
index 000000000000..fa99eb3e391d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for links
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=e4d0045a7bf5430674049b2b755f82b3
diff --git a/metadata/md5-cache/sec-policy/selinux-links-9999 b/metadata/md5-cache/sec-policy/selinux-links-9999
index 3efffe742d06..c5d4a5a9dfbc 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-9999
+++ b/metadata/md5-cache/sec-policy/selinux-links-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e4d0045a7bf5430674049b2b755f82b3
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r1
deleted file mode 100644
index 9533104f921b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f455d7ea2879878163094f5c0fbf0782
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r2
deleted file mode 100644
index e0dc31560788..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c67e625e78657d923290935a8b912e73
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r3
deleted file mode 100644
index 9ae97a6bcfbe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c67e625e78657d923290935a8b912e73
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r4
deleted file mode 100644
index 3c86fedf8664..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c67e625e78657d923290935a8b912e73
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r2
index 002af3860fca..e609da072f37 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c67e625e78657d923290935a8b912e73
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r3
index 21134ef5a08f..a4b2e00a3344 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c67e625e78657d923290935a8b912e73
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r4
deleted file mode 100644
index 15e7efb45a7b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f455d7ea2879878163094f5c0fbf0782
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r1
index 7e324d4ff170..06b1b7c2f0bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=242fd5451b277eb2e2bb4195b72e66a3
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r2
index 4e07c9320ec4..7902db3cafd2 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0360cb65ebeccfcd36244b9bc2f188cc
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r3
new file mode 100644
index 000000000000..4eb10a7278d4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lircd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=0360cb65ebeccfcd36244b9bc2f188cc
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-9999 b/metadata/md5-cache/sec-policy/selinux-lircd-9999
index 417b2289108f..9e5e17b4e91f 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0360cb65ebeccfcd36244b9bc2f188cc
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r1
deleted file mode 100644
index 12de9ce64cfa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for loadkeys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f0b6d3c01376a65728834473f1b721c2
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r2
deleted file mode 100644
index b298cc82a34e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for loadkeys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=991ae45b1c52a2bfccc4ba1299ecb877
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r3
deleted file mode 100644
index 71efdbb20b48..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for loadkeys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=991ae45b1c52a2bfccc4ba1299ecb877
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r4
deleted file mode 100644
index ee8d0293145f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for loadkeys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=991ae45b1c52a2bfccc4ba1299ecb877
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r2
index 3c5c34f81e73..4c7c7b77cfc1 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=991ae45b1c52a2bfccc4ba1299ecb877
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r3
index 0b714830acf5..9a0bf02021f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=991ae45b1c52a2bfccc4ba1299ecb877
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r4
deleted file mode 100644
index 96f5b20ac71f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for loadkeys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f0b6d3c01376a65728834473f1b721c2
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r1
index e40a45d437b6..f61b155d01ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bf18e03cc8fb1577ee42ddb59a3a9fed
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r2
index 5c49f87d820f..191cc04f4448 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1d931e63ce8090e4fc06ca3680343039
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r3
new file mode 100644
index 000000000000..4ef6d86ae30f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for loadkeys
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1d931e63ce8090e4fc06ca3680343039
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-9999 b/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
index b737a54bb5cb..ad8c7169e80e 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1d931e63ce8090e4fc06ca3680343039
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r1
deleted file mode 100644
index e5ec0259a0ad..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lockdev
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=19768f43bbd08b373a080e20e863213c
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r2
deleted file mode 100644
index 3cec5e195dde..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lockdev
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1ba8a28ce302d95127d13dc29e91b073
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r3
deleted file mode 100644
index 0f99bf0a5360..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lockdev
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1ba8a28ce302d95127d13dc29e91b073
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r4
deleted file mode 100644
index 4579eaa80a8b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lockdev
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1ba8a28ce302d95127d13dc29e91b073
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r2
index f6fbdfa5bc3f..415e7bf21c0a 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1ba8a28ce302d95127d13dc29e91b073
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r3
index bbbd357e58b2..ec984b45c776 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1ba8a28ce302d95127d13dc29e91b073
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r4
deleted file mode 100644
index 34942fb20f22..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lockdev
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=19768f43bbd08b373a080e20e863213c
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r1
index c0334963c6a2..c5393890bbca 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ae50a874e0fe261bb3b2ece1f0277984
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r2
index 947de696cd68..508dbd13d3ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=540c3fe58eab97f94cc12d529496207d
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r3
new file mode 100644
index 000000000000..5bdcbaa15803
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lockdev
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=540c3fe58eab97f94cc12d529496207d
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-9999 b/metadata/md5-cache/sec-policy/selinux-lockdev-9999
index 1dc5322cca1e..5c77e266d879 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=540c3fe58eab97f94cc12d529496207d
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r1
deleted file mode 100644
index 9b9af3d9f290..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logrotate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ab157ac549819214f3a9b06bf8658134
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r2
deleted file mode 100644
index 89a5990add20..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logrotate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=24f73669ab90c6398493a1e690744a43
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r3
deleted file mode 100644
index 69b584478f70..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logrotate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=24f73669ab90c6398493a1e690744a43
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r4
deleted file mode 100644
index 958175a07892..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logrotate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=24f73669ab90c6398493a1e690744a43
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r2
index a193ae848650..b7110ace5718 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=24f73669ab90c6398493a1e690744a43
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r3
index af6662076455..7bd0b6fe05e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=24f73669ab90c6398493a1e690744a43
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r4
deleted file mode 100644
index c46812dd729a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logrotate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ab157ac549819214f3a9b06bf8658134
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r1
index 89bc050e0ff0..4d64a35d8e96 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3b2b40af51310cac1005c47d9cc66f45
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r2
index d518d9d1e59c..415188eb94e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a4064aa954d2c75e342af3bddbdf64d8
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r3
new file mode 100644
index 000000000000..250556e0811f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logrotate
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a4064aa954d2c75e342af3bddbdf64d8
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-9999 b/metadata/md5-cache/sec-policy/selinux-logrotate-9999
index 0323ab5ddcd4..241cf6294c72 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a4064aa954d2c75e342af3bddbdf64d8
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r1
deleted file mode 100644
index 17f5bf3ef669..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logsentry
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e3d0f2f80f24e06db96d61cc4166699d
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r2
deleted file mode 100644
index d0e112f0915c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logsentry
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e2608afb6bdb2f15517fd3ef7d46eb72
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r3
deleted file mode 100644
index 9f0eb318faf3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logsentry
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e2608afb6bdb2f15517fd3ef7d46eb72
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r4
deleted file mode 100644
index 03a0179fb8f2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logsentry
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e2608afb6bdb2f15517fd3ef7d46eb72
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r2
index 9b775d086181..0d18d4c3e7db 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e2608afb6bdb2f15517fd3ef7d46eb72
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r3
index 470d27bc5940..3d2eea09b71b 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e2608afb6bdb2f15517fd3ef7d46eb72
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r4
deleted file mode 100644
index 3dd1e214d7a6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logsentry
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e3d0f2f80f24e06db96d61cc4166699d
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r1
index 781cac3833dd..06643d94cb44 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=60da0ea7a8d59fc0b21de04fd2b234ab
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r2
index 75aff5d8db0e..da4c043a7a9c 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=af8f279f7769dd6ecafa2d579f3c84ee
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r3
new file mode 100644
index 000000000000..e7fd604ed6d6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logsentry
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=af8f279f7769dd6ecafa2d579f3c84ee
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-9999 b/metadata/md5-cache/sec-policy/selinux-logsentry-9999
index 386bc13cb96b..f8ff3dc4a062 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=af8f279f7769dd6ecafa2d579f3c84ee
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r1
deleted file mode 100644
index bc6c057b3e45..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cbef200142bc165e79526c94a6ba7558
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r2
deleted file mode 100644
index f79e417e322a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f3907fcadadd35acc3a92cfb74152a31
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r3
deleted file mode 100644
index e30fa8eaf29d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f3907fcadadd35acc3a92cfb74152a31
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r4
deleted file mode 100644
index 2149de20214d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f3907fcadadd35acc3a92cfb74152a31
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r2
index 59d8c3bea0e7..6fc2a99b17ef 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f3907fcadadd35acc3a92cfb74152a31
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r3
index 3df87f6e70b1..162cbcfb55ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f3907fcadadd35acc3a92cfb74152a31
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r4
deleted file mode 100644
index 3e063eb2e793..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cbef200142bc165e79526c94a6ba7558
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r1
index 858227021382..2da1abdf9ef2 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=25f70d1d207a11270fa25d64fdc8cea1
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r2
index 57ea4c1d7b3c..feb65ce7dc15 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=72b84f4747d4fe0c37aa9d86e00c8048
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r3
new file mode 100644
index 000000000000..52bbfd169ee8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logwatch
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=72b84f4747d4fe0c37aa9d86e00c8048
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-9999 b/metadata/md5-cache/sec-policy/selinux-logwatch-9999
index e1ed92c41c56..49aa396cf1d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=72b84f4747d4fe0c37aa9d86e00c8048
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r1
deleted file mode 100644
index 24e67f2fb5b8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=68d7047c0b5c7fcc7990d0b47d3de1eb
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r2
deleted file mode 100644
index b9edda19b887..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66721998d2059f3439efabb0924c6e4e
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r3
deleted file mode 100644
index d19db2b9c738..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66721998d2059f3439efabb0924c6e4e
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r4
deleted file mode 100644
index e0e413d84560..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66721998d2059f3439efabb0924c6e4e
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r2
index 924e75c03c45..26405e10ac93 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=66721998d2059f3439efabb0924c6e4e
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r3
index 03a1746fea13..fe33c35dee13 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=66721998d2059f3439efabb0924c6e4e
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r4
deleted file mode 100644
index df5e35856a41..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=68d7047c0b5c7fcc7990d0b47d3de1eb
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r1
index 1fa3a3483588..5e5839c75895 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fbf4b9650376f4a9992ee855516dc888
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r2
index e9979c91783e..213e3d80c622 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=23d06c12705d6ecdddfffb4f7d3e4223
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r3
new file mode 100644
index 000000000000..912ab1c7d234
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lpd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=23d06c12705d6ecdddfffb4f7d3e4223
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-9999 b/metadata/md5-cache/sec-policy/selinux-lpd-9999
index 96fd47af6b2c..5339ade82d39 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=23d06c12705d6ecdddfffb4f7d3e4223
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r1
deleted file mode 100644
index bca75b63a1b4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mailman
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d283b8ec21f0a93b819dc5898747c320
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r2
deleted file mode 100644
index 1594e708e49f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mailman
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c1d42bd3a89eb5b3f56ddc354af515e
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r3
deleted file mode 100644
index d1897f50fee9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mailman
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c1d42bd3a89eb5b3f56ddc354af515e
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r4
deleted file mode 100644
index 8824889320a7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mailman
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c1d42bd3a89eb5b3f56ddc354af515e
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r2
index ec717009ff0b..f91895b7c834 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7c1d42bd3a89eb5b3f56ddc354af515e
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r3
index 90c4b8186145..1db7642ad887 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7c1d42bd3a89eb5b3f56ddc354af515e
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r4
deleted file mode 100644
index d1e5c3dec1e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mailman
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d283b8ec21f0a93b819dc5898747c320
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r1
index f31f4e8939c1..0f41dd6a6ff2 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ab099a73e64e87d1b10d1b51dfa85692
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r2
index 94e8a1736cdc..34e907d58d5a 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b053cda2d6e2149f78b55d86fe7526f6
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r3
new file mode 100644
index 000000000000..cd418d6a1228
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mailman
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b053cda2d6e2149f78b55d86fe7526f6
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-9999 b/metadata/md5-cache/sec-policy/selinux-mailman-9999
index b4222795715c..225700a2814f 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b053cda2d6e2149f78b55d86fe7526f6
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r1
deleted file mode 100644
index 309b9a794e90..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for makewhatis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a7168f9cc497882e2c94cf0ec5c0be02
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r2
deleted file mode 100644
index 3f824048617c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for makewhatis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3584f37b568898e0a2a66221187574b5
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r3
deleted file mode 100644
index 504853d49709..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for makewhatis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3584f37b568898e0a2a66221187574b5
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r4
deleted file mode 100644
index 1d82f74419cc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for makewhatis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3584f37b568898e0a2a66221187574b5
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r2
index 2f944a9cb3c3..d7730475bcc9 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3584f37b568898e0a2a66221187574b5
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r3
index 4f44af415447..2d25ae594618 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3584f37b568898e0a2a66221187574b5
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r4
deleted file mode 100644
index 3a9d412379f6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for makewhatis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a7168f9cc497882e2c94cf0ec5c0be02
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r1
index 8ced499957fa..259ccdf627e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a91eea9058e94cc475fc36bbc884fd00
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r2
index 88f9cc4d6854..ed54d39e28c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9e43e906a6f5b319d4c77b6c7aebe387
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r3
new file mode 100644
index 000000000000..91ecd7721f98
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for makewhatis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=9e43e906a6f5b319d4c77b6c7aebe387
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-9999 b/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
index 728ffdde0086..82df28905ed0 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9e43e906a6f5b319d4c77b6c7aebe387
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r1
deleted file mode 100644
index 2830277d88a9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mandb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fd7e1add790828838f8499c997f34101
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r2
deleted file mode 100644
index 6218185c0d55..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mandb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=785ceb7693121b04004b0dc21becb399
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r3
deleted file mode 100644
index 81c7f75deb1f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mandb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=785ceb7693121b04004b0dc21becb399
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r4
deleted file mode 100644
index f74891a091ba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mandb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=785ceb7693121b04004b0dc21becb399
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r2
index 749d9c819a51..55e2fbe582ea 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=785ceb7693121b04004b0dc21becb399
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r3
index df1f93acc4ae..1b65bad5beb1 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=785ceb7693121b04004b0dc21becb399
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r4
deleted file mode 100644
index fb1a721f1ba9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mandb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fd7e1add790828838f8499c997f34101
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r1
index 6ebb6aeaae8a..1a89cf6b0adc 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9ec7537e7c70edf403eb8345d7d3824a
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r2
index 7b719925191b..14bce9703180 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8240c2210d6a4504a5863c70b0f5e042
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r3
new file mode 100644
index 000000000000..0c9533d1371c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mandb
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=8240c2210d6a4504a5863c70b0f5e042
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-9999 b/metadata/md5-cache/sec-policy/selinux-mandb-9999
index 93846ddce4f7..447d79248300 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8240c2210d6a4504a5863c70b0f5e042
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r1
deleted file mode 100644
index f60940b7f601..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mcelog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=39f6b2c3268e865a72fee6684d54c585
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r2
deleted file mode 100644
index b0817bbb357b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mcelog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d0084a5493553ba99bdbf47a7e96302f
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r3
deleted file mode 100644
index e889c8ada56f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mcelog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d0084a5493553ba99bdbf47a7e96302f
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r4
deleted file mode 100644
index af4bd3b01bd3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mcelog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d0084a5493553ba99bdbf47a7e96302f
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r2
index 93cb8cb0f44e..c8f9e37db1c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d0084a5493553ba99bdbf47a7e96302f
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r3
index c401c8208e46..29fccc049a89 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d0084a5493553ba99bdbf47a7e96302f
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r4
deleted file mode 100644
index efcdc857bbe4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mcelog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=39f6b2c3268e865a72fee6684d54c585
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r1
index f747c9510fc6..3421e40fe2a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=390ee64dd6b889bf9793436f01ecda54
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r2
index 30a43e86c406..43890b476eb8 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b7ea0b8e3accd00cc9dfffa319837ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r3
new file mode 100644
index 000000000000..e34f550ce30e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mcelog
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b7ea0b8e3accd00cc9dfffa319837ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-9999 b/metadata/md5-cache/sec-policy/selinux-mcelog-9999
index 5818dc54efc0..6f200d555450 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b7ea0b8e3accd00cc9dfffa319837ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r1
deleted file mode 100644
index be3076248d93..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for memcached
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=25ce6a2591ddc5b6f16ead2f6188a528
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r2
deleted file mode 100644
index 678e8376dfd3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for memcached
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0b136c57886a9b86b99d9d9623a273b
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r3
deleted file mode 100644
index 24277d7fcb44..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for memcached
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0b136c57886a9b86b99d9d9623a273b
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r4
deleted file mode 100644
index 9fa53efad5a2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for memcached
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0b136c57886a9b86b99d9d9623a273b
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r2
index d68a6560d822..57cd89fa391a 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e0b136c57886a9b86b99d9d9623a273b
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r3
index 49a39579712d..c27547f87f69 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e0b136c57886a9b86b99d9d9623a273b
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r4
deleted file mode 100644
index 0910405667d7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for memcached
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=25ce6a2591ddc5b6f16ead2f6188a528
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r1
index 5b30a434d855..da7182413a88 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=07e7115aa10f24a66447e045e08d9fd4
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r2
index 7e1275c92263..404776fa02ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c21960e4ec5eaf04977b1016b49b3231
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r3
new file mode 100644
index 000000000000..3ce30a506342
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for memcached
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c21960e4ec5eaf04977b1016b49b3231
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-9999 b/metadata/md5-cache/sec-policy/selinux-memcached-9999
index 7daee44c77b2..4fbe4d5c6e33 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-9999
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c21960e4ec5eaf04977b1016b49b3231
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r1
deleted file mode 100644
index f02a51475bef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for milter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=00424756bc6d4605508da65fdec13418
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r2
deleted file mode 100644
index cac5d1385e02..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for milter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ce92d19be9e1a9db38889fe0b8dc2131
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r3
deleted file mode 100644
index 8b1dd717df73..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for milter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ce92d19be9e1a9db38889fe0b8dc2131
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r4
deleted file mode 100644
index ea03d9407f13..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for milter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ce92d19be9e1a9db38889fe0b8dc2131
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r2
index 3e030e6f462e..b39c8cdc557b 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ce92d19be9e1a9db38889fe0b8dc2131
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r3
index d3f5e7f3a7d9..f2960aa5394e 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ce92d19be9e1a9db38889fe0b8dc2131
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r4
deleted file mode 100644
index 4f9ad10eb0a2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for milter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=00424756bc6d4605508da65fdec13418
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r1
index e572a370fb00..2bcbd6392de5 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=29d18c21855843dc5997498335610804
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r2
index eb45cb0c801a..c4af58b11f2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fcde88de4669f1600ef3c4ab9dc0044a
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r3
new file mode 100644
index 000000000000..5a3243b0b819
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for milter
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=fcde88de4669f1600ef3c4ab9dc0044a
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-9999 b/metadata/md5-cache/sec-policy/selinux-milter-9999
index 8a5f73d4ecb0..b4e76ff590e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-9999
+++ b/metadata/md5-cache/sec-policy/selinux-milter-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fcde88de4669f1600ef3c4ab9dc0044a
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r1
deleted file mode 100644
index 76829859b293..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for modemmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8c12882cb459d6c343ae8d5fad4496ea
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r2
deleted file mode 100644
index 5a2fe1273827..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for modemmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=079ca7c7f97dbf45a7bda414f2c13a80
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r3
deleted file mode 100644
index 38481d4dbfbd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for modemmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=079ca7c7f97dbf45a7bda414f2c13a80
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r4
deleted file mode 100644
index bf77a64c5c4e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for modemmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=079ca7c7f97dbf45a7bda414f2c13a80
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r2
index 4aa56c8b1579..eae6446b972f 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=079ca7c7f97dbf45a7bda414f2c13a80
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r3
index dd2c2d3f1234..450fb853a7f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=079ca7c7f97dbf45a7bda414f2c13a80
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r4
deleted file mode 100644
index 5e8957cc649b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for modemmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8c12882cb459d6c343ae8d5fad4496ea
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r1
index 7124d2a845ff..154094f4b419 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=918676dbb5d5bd3653ebba8984440ef0
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r2
index 5943778b2c42..1cf97d147025 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=62d09d10e094c215f561e9f6f53ef5a2
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r3
new file mode 100644
index 000000000000..73fba63266ea
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for modemmanager
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=62d09d10e094c215f561e9f6f53ef5a2
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-9999 b/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
index 9393b43666e2..22447f6e484e 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=62d09d10e094c215f561e9f6f53ef5a2
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r1
deleted file mode 100644
index 2a9cabfce178..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mono
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0f1d99af0cefdbbb85ce8ed82e763d0c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r2
deleted file mode 100644
index b14b68acc3cf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mono
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f80cc5fedaf3064849f66d2a077dfd1c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r3
deleted file mode 100644
index 33232e885a87..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mono
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f80cc5fedaf3064849f66d2a077dfd1c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r4
deleted file mode 100644
index e31ba1ae87e5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mono
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f80cc5fedaf3064849f66d2a077dfd1c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r2
index 5e7c2fe4900c..fc9373c95730 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f80cc5fedaf3064849f66d2a077dfd1c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r3
index 92f950da0a51..d0413902cf0c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f80cc5fedaf3064849f66d2a077dfd1c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r4
deleted file mode 100644
index 740e3ac75dee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mono
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0f1d99af0cefdbbb85ce8ed82e763d0c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r1
index 4a509d6e9924..957f3c8f3b0a 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=663ab77a74869b35729e29d6d181cc85
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r2
index 1f13e15732d9..cffd076335a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=30bed760aebba0c1cb2f5130edc50dc4
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r3
new file mode 100644
index 000000000000..304b85ca1784
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mono
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=30bed760aebba0c1cb2f5130edc50dc4
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-9999 b/metadata/md5-cache/sec-policy/selinux-mono-9999
index 5418174c52f2..33ca97055a80 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mono-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=30bed760aebba0c1cb2f5130edc50dc4
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r1
deleted file mode 100644
index b11d82c9894e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mozilla
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ff2475d9b1ffe822e6b7883b2b37b3a6
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r2
deleted file mode 100644
index 130b53349717..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mozilla
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=30aa93e21e5e4d5f73f0c66ef0914cb0
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r3
deleted file mode 100644
index 4324641a0f6a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mozilla
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=30aa93e21e5e4d5f73f0c66ef0914cb0
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r4
deleted file mode 100644
index c689f0a98582..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170204-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mozilla
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=30aa93e21e5e4d5f73f0c66ef0914cb0
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r2
index f1d67f2dd7ed..61d60ce0976c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=30aa93e21e5e4d5f73f0c66ef0914cb0
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r3
index 5ee14d703af6..eb69a2d89178 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=30aa93e21e5e4d5f73f0c66ef0914cb0
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r4
deleted file mode 100644
index b2d7324f42ac..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mozilla
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ff2475d9b1ffe822e6b7883b2b37b3a6
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r1
index b41ff318b904..5e07d26d0889 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c98091bf5cacd947b2defe71d95cc747
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r2
index 9a679018c280..5f925f5a0541 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5c41088792ccce3bc0e5403d32b70c10
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r3
new file mode 100644
index 000000000000..4d1b1158d395
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mozilla
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=5c41088792ccce3bc0e5403d32b70c10
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-9999 b/metadata/md5-cache/sec-policy/selinux-mozilla-9999
index 29fa28871a0a..a2db737cd5cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5c41088792ccce3bc0e5403d32b70c10
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r1
deleted file mode 100644
index f7ac525bca50..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=809b6eb113d92388433caa5b6968dd51
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r2
deleted file mode 100644
index 9b5443ee0096..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f58be8f0885e5b3e7f0f9c5b0e7e0fa5
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r3
deleted file mode 100644
index cc63298390b0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f58be8f0885e5b3e7f0f9c5b0e7e0fa5
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r4
deleted file mode 100644
index 51c159b2c55c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f58be8f0885e5b3e7f0f9c5b0e7e0fa5
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r2
index d27bd43965b3..dd7500bf590c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f58be8f0885e5b3e7f0f9c5b0e7e0fa5
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r3
index 360137620b1b..f13cc8f9f556 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f58be8f0885e5b3e7f0f9c5b0e7e0fa5
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r4
deleted file mode 100644
index 3e7f53a5b158..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=809b6eb113d92388433caa5b6968dd51
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r1
index fb2d00ed7260..5e4f447c58c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=17b7f2030f3c3c7afcd9daa2aa3afdee
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r2
index 63c077cf8c77..52042faacb58 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6fad9b58892effd16c8c9f09f3ce0931
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r3
new file mode 100644
index 000000000000..d6339107a55e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mpd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6fad9b58892effd16c8c9f09f3ce0931
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-9999 b/metadata/md5-cache/sec-policy/selinux-mpd-9999
index f2559ff61d94..1cb992e90f15 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6fad9b58892effd16c8c9f09f3ce0931
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r1
deleted file mode 100644
index 6f44b0c82ca1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mplayer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4779be40d9212e063144cf3f7228f2c9
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r2
deleted file mode 100644
index ddffc7845f40..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mplayer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c32892e1a9454d5100f67568b45a4c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r3
deleted file mode 100644
index 5a218c5c4397..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mplayer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c32892e1a9454d5100f67568b45a4c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r4
deleted file mode 100644
index 3193baeeb12c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170204-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mplayer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c32892e1a9454d5100f67568b45a4c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r2
index 905e11586377..1e6cfbd26a22 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7c32892e1a9454d5100f67568b45a4c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r3
index fe97cf16e017..2c087922be3a 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7c32892e1a9454d5100f67568b45a4c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r4
deleted file mode 100644
index 97769ccb07e3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mplayer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4779be40d9212e063144cf3f7228f2c9
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r1
index ced454bdfef9..4dc306df12cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0ba424bbb9d289f45b92025ccb9cf5ad
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r2
index 6562a4eed5e9..f9def7a3d285 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bedc188a84f066ce2f8296a0e0552080
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r3
new file mode 100644
index 000000000000..a7a65286802e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mplayer
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=bedc188a84f066ce2f8296a0e0552080
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-9999 b/metadata/md5-cache/sec-policy/selinux-mplayer-9999
index 8f2687913dfe..9143b1c9e826 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bedc188a84f066ce2f8296a0e0552080
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r1
deleted file mode 100644
index 85ac7a76c301..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mrtg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=77f0ba89c0979e28703fdbfbb99f19a5
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r2
deleted file mode 100644
index f6fd371355e5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mrtg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f5744d781869170fbca215b5f40ae8b6
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r3
deleted file mode 100644
index 7fb116f6c6ad..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mrtg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f5744d781869170fbca215b5f40ae8b6
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r4
deleted file mode 100644
index 3f2d688c9a34..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mrtg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f5744d781869170fbca215b5f40ae8b6
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r2
index a6b1cad5a8c6..d91af4744427 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f5744d781869170fbca215b5f40ae8b6
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r3
index e58698b266f3..0bc442bc6b27 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f5744d781869170fbca215b5f40ae8b6
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r4
deleted file mode 100644
index e34f0bdddd16..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mrtg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=77f0ba89c0979e28703fdbfbb99f19a5
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r1
index 3355aa98c2f6..8251c712c4ea 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a0a78a0ede9ec2ec73251040cf6d136a
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r2
index 0a1234f3df1a..6bda04f7bcf1 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d2ada5497f9a36ce81c96551f6ab00ab
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r3
new file mode 100644
index 000000000000..7194c0276f28
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mrtg
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d2ada5497f9a36ce81c96551f6ab00ab
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-9999 b/metadata/md5-cache/sec-policy/selinux-mrtg-9999
index 45a98121d5d2..007baf271e54 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d2ada5497f9a36ce81c96551f6ab00ab
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r1
deleted file mode 100644
index 9c2ed7de7182..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for munin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1a9481b10383ec746fd97fcb60ca002f
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r2
deleted file mode 100644
index 6ddb2eab148d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for munin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0417c4c119b7c6779d29105162249c15
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r3
deleted file mode 100644
index 1f92ebe38e5c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for munin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0417c4c119b7c6779d29105162249c15
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r4
deleted file mode 100644
index 266f916fc8ec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for munin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0417c4c119b7c6779d29105162249c15
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r2
index 5e471848115c..eb1732552eb3 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0417c4c119b7c6779d29105162249c15
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r3
index 021f9a5df3e2..59f5152f4b71 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0417c4c119b7c6779d29105162249c15
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r4
deleted file mode 100644
index 0400f66920c1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for munin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1a9481b10383ec746fd97fcb60ca002f
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r1
index 54aa979e4a6a..48b76c81a42a 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d3a04b37493428ba2b218b07b122280c
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r2
index a7e6691a461f..c6f8f983bf00 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6fd29fa43f603e772ab942da82094229
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r3
new file mode 100644
index 000000000000..56515542bc50
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for munin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6fd29fa43f603e772ab942da82094229
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-9999 b/metadata/md5-cache/sec-policy/selinux-munin-9999
index aa2da96273ae..9382ddd8d68c 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-munin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6fd29fa43f603e772ab942da82094229
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r1
deleted file mode 100644
index d91e5589120f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mutt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8fbe67fdcf9345397cad8c54461dfe99
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r2
deleted file mode 100644
index 0338eea38e30..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mutt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a0f577d89e133fd991d52839b2514c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r3
deleted file mode 100644
index 3d2a2dc2cb40..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mutt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a0f577d89e133fd991d52839b2514c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r4
deleted file mode 100644
index 991ffe3ec760..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mutt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a0f577d89e133fd991d52839b2514c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r2
index 71ecee3086dc..f46e0fd9c7f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a0f577d89e133fd991d52839b2514c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r3
index e0e967f802d9..d1ad8c4b227b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a0f577d89e133fd991d52839b2514c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r4
deleted file mode 100644
index e0c0440e78bb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mutt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8fbe67fdcf9345397cad8c54461dfe99
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r1
index 35b3c002b6b0..69d9c35c0a3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5193ba41111a2b19cf428e307b77d836
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r2
index b963b89b0014..92652f0f69e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6249658f45fa8072f2bbf5656d3ac8c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r3
new file mode 100644
index 000000000000..97fd91a00393
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mutt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6249658f45fa8072f2bbf5656d3ac8c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-9999 b/metadata/md5-cache/sec-policy/selinux-mutt-9999
index cdefc2cf0dbe..cb408b393878 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6249658f45fa8072f2bbf5656d3ac8c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r1
deleted file mode 100644
index 026ca6c6c3d8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mysql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=935c7bc07b2fce21fcd76e4701853cf5
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r2
deleted file mode 100644
index e43178286365..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mysql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4d38cd6464f081b9099d1570f821312
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r3
deleted file mode 100644
index 4315b6fcdf6f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mysql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4d38cd6464f081b9099d1570f821312
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r4
deleted file mode 100644
index ed0f67f08c89..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mysql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4d38cd6464f081b9099d1570f821312
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r2
index 35af34c6bb1a..f8dc4b1f384c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d4d38cd6464f081b9099d1570f821312
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r3
index 1e5922bc5399..7e50932c803f 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d4d38cd6464f081b9099d1570f821312
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r4
deleted file mode 100644
index d319607b3c45..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mysql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=935c7bc07b2fce21fcd76e4701853cf5
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r1
index 5c81c50bbfde..ef8a48046747 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3caa5c1ca848aeb4d0e717e736271b67
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r2
index 55b266231a65..114e842ca7ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ee9fad3bdc49d5afcfe334655ef4c702
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r3
new file mode 100644
index 000000000000..eb14238ae0b8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mysql
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ee9fad3bdc49d5afcfe334655ef4c702
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-9999 b/metadata/md5-cache/sec-policy/selinux-mysql-9999
index e06e9d9531a0..29ef82e960c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ee9fad3bdc49d5afcfe334655ef4c702
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r1
deleted file mode 100644
index b7173ec749c7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nagios
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=77b2a9d037b34032388882144090df91
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r2
deleted file mode 100644
index 8b0d44a83e39..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nagios
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=73eb9c6763a4fc07a27d95cae67f1b86
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r3
deleted file mode 100644
index 3e2f5d63d88e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nagios
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=73eb9c6763a4fc07a27d95cae67f1b86
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r4
deleted file mode 100644
index c8d880eb5831..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nagios
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=73eb9c6763a4fc07a27d95cae67f1b86
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r2
index a8016e1f59e5..36dadfed412a 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=73eb9c6763a4fc07a27d95cae67f1b86
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r3
index 05f8b30cac01..0076a56ff71c 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=73eb9c6763a4fc07a27d95cae67f1b86
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r4
deleted file mode 100644
index c4ef7c22247f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nagios
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=77b2a9d037b34032388882144090df91
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r1
index 08f3a1e17a32..fdebe38ed82f 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f9545cdcac26cb140b7f5ae9a7086d13
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r2
index 98b4327a5fd7..0148385b3524 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2283fe78d63c9f12487940533f9f2305
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r3
new file mode 100644
index 000000000000..11ce011aa1d9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nagios
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2283fe78d63c9f12487940533f9f2305
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-9999 b/metadata/md5-cache/sec-policy/selinux-nagios-9999
index 4acba3719f16..686c7d5ea7e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2283fe78d63c9f12487940533f9f2305
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r1
deleted file mode 100644
index 973ee174bf0c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ncftool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3f5ceab38c2814f5676d709141142d14
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r2
deleted file mode 100644
index 3d9e8ee72851..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ncftool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=988cae489d29920e06a3b44f96fce612
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r3
deleted file mode 100644
index 7d7c30bbba08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ncftool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=988cae489d29920e06a3b44f96fce612
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r4
deleted file mode 100644
index a07799326fb1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ncftool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=988cae489d29920e06a3b44f96fce612
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r2
index fc5082497043..b9614562b262 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=988cae489d29920e06a3b44f96fce612
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r3
index 1361c67af31b..d82b2970bf3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=988cae489d29920e06a3b44f96fce612
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r4
deleted file mode 100644
index a3dbbb159ec2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ncftool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3f5ceab38c2814f5676d709141142d14
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r1
index 76607026f0f5..e31058fec8f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=48f5dee22a4d14eb2c8b714bdf7b41f2
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r2
index eb3c8c78b011..93f99aaff6a3 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=495a6aff7397f4078e208fc0cf2953b0
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r3
new file mode 100644
index 000000000000..a2bf25fc655c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ncftool
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=495a6aff7397f4078e208fc0cf2953b0
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-9999 b/metadata/md5-cache/sec-policy/selinux-ncftool-9999
index 473c2f6844c7..6e1d0a20ebb4 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=495a6aff7397f4078e208fc0cf2953b0
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r1
deleted file mode 100644
index a7dfc694657b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fc997c4e5c750432955d01c3afb7d388
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r2
deleted file mode 100644
index 3d0490f8bc73..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3b67850db3423fc1218028b39366942c
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r3
deleted file mode 100644
index f852d7a4d69f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3b67850db3423fc1218028b39366942c
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r4
deleted file mode 100644
index d8dfc9e0ec33..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3b67850db3423fc1218028b39366942c
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r2
index b0bf6c008c82..04608efc5f80 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3b67850db3423fc1218028b39366942c
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r3
index 9da415456b22..e3912abad981 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3b67850db3423fc1218028b39366942c
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r4
deleted file mode 100644
index f2231627e4a3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fc997c4e5c750432955d01c3afb7d388
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1
index 446443b066db..471e65e953fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8befb8f2d28a7925d288d8a5afb1e2c5
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2
index 0a1c965ef50c..2840787d7398 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f3bcb4c88505aa365d6a35e1b358a6a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3
new file mode 100644
index 000000000000..b19b51f09942
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nessus
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f3bcb4c88505aa365d6a35e1b358a6a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-9999 b/metadata/md5-cache/sec-policy/selinux-nessus-9999
index 7045e9be2f7a..1f4d0fcc9f9d 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f3bcb4c88505aa365d6a35e1b358a6a3
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r1
deleted file mode 100644
index 7cb79d9d2e3b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for networkmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8a056dc738994751542df4bcc6098720
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r2
deleted file mode 100644
index 680c11878ee7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for networkmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=46262ce9eb57c7158b717b6dc2f174a6
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r3
deleted file mode 100644
index 53ca4475916d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for networkmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=46262ce9eb57c7158b717b6dc2f174a6
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r4
deleted file mode 100644
index defc90ef07d7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for networkmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=46262ce9eb57c7158b717b6dc2f174a6
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r2
index 66c8ef0229a3..3c01e4c0b83d 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=46262ce9eb57c7158b717b6dc2f174a6
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r3
index 2b6fd8ec941b..01d8a8f04bab 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=46262ce9eb57c7158b717b6dc2f174a6
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r4
deleted file mode 100644
index 36ed5068ee42..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for networkmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8a056dc738994751542df4bcc6098720
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r1
index 4316b1c9003f..16d677d32bc7 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8bc7ae25d6813f6995f242ae5beaef9f
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r2
index 799249163afe..3023c5791a3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=afac6d957c45eade26bb7970bcbb29d8
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r3
new file mode 100644
index 000000000000..d142a537f9e9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for networkmanager
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=afac6d957c45eade26bb7970bcbb29d8
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-9999 b/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
index 92ecb7ac5f8b..5d06e9dad15c 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=afac6d957c45eade26bb7970bcbb29d8
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r1
deleted file mode 100644
index 50b6dcb895a3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nginx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8f11d034890b6792a1433804f91e16e4
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r2
deleted file mode 100644
index 46a4d5f92c12..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nginx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a8cf95949ea5f5c634b716f97d0c98a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r3
deleted file mode 100644
index 9974cb58e3e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nginx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a8cf95949ea5f5c634b716f97d0c98a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r4
deleted file mode 100644
index c677dc70d7b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nginx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a8cf95949ea5f5c634b716f97d0c98a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r2
index a236fcaeae7d..7015d8f2b45b 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a8cf95949ea5f5c634b716f97d0c98a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r3
index e9629e0df363..91750f14d523 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a8cf95949ea5f5c634b716f97d0c98a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r4
deleted file mode 100644
index 6c265e8f595f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nginx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8f11d034890b6792a1433804f91e16e4
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r1
index 6257e8183209..f61066993d3e 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=07158cfc6cba437e2e96820e76bc8a9d
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r2
index 2090e1a22870..60e7c5c588d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2e8b1ecba3b962095d92ac80c08b05dc
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r3
new file mode 100644
index 000000000000..af192eb7b47d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nginx
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2e8b1ecba3b962095d92ac80c08b05dc
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-9999 b/metadata/md5-cache/sec-policy/selinux-nginx-9999
index ec4665e156b5..d2603fa88063 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2e8b1ecba3b962095d92ac80c08b05dc
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r1
deleted file mode 100644
index b0908c1c532e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nslcd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f8158f50596fd1ceb689f2299f71c501
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r2
deleted file mode 100644
index 386b3f3cb72f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nslcd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e57adeb2b36865fa2517aed9122c8027
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r3
deleted file mode 100644
index 3fb5649b0747..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nslcd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e57adeb2b36865fa2517aed9122c8027
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r4
deleted file mode 100644
index 5605ee4af0d8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nslcd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e57adeb2b36865fa2517aed9122c8027
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r2
index 03f6fcdd97b1..d5524906da75 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e57adeb2b36865fa2517aed9122c8027
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r3
index b38991f85cf5..bbf7f8efca3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e57adeb2b36865fa2517aed9122c8027
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r4
deleted file mode 100644
index 52d2940fbdcc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nslcd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f8158f50596fd1ceb689f2299f71c501
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r1
index f7005fa94731..84c046f041ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e8f3440ae3c171e31f0981154b80ef4c
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r2
index c93a891ede9e..4793a85be174 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=400c09df7ef43996be4acd6f09ca8ed8
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r3
new file mode 100644
index 000000000000..fecfe272b960
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nslcd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=400c09df7ef43996be4acd6f09ca8ed8
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-9999 b/metadata/md5-cache/sec-policy/selinux-nslcd-9999
index fe202e65d5e2..9fe6e571e9d0 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=400c09df7ef43996be4acd6f09ca8ed8
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r1
deleted file mode 100644
index 2f3aa651ae51..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=dc0e7a4a2d60e8e788cc3852e449a6fb
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r2
deleted file mode 100644
index 01819e9bec65..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee21d1422bcb821ebf2ae6fd5111740c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r3
deleted file mode 100644
index c6ab7e1fe73d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee21d1422bcb821ebf2ae6fd5111740c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r4
deleted file mode 100644
index a2d58e7236a8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee21d1422bcb821ebf2ae6fd5111740c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r2
index 1bbed54d53f8..74ffec15d62f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ee21d1422bcb821ebf2ae6fd5111740c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r3
index 69e2d47a3a24..447a9fd75dcb 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ee21d1422bcb821ebf2ae6fd5111740c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r4
deleted file mode 100644
index 66c44652deb2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=dc0e7a4a2d60e8e788cc3852e449a6fb
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r1
index 96aff2894e10..9a38ab8ad713 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6af8712042364f42527a0791e848c001
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r2
index 470c13428434..bdcdf4f8780e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b15dd63a5af14d7e0864936aba9df9f5
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r3
new file mode 100644
index 000000000000..c3378808c403
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ntop
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b15dd63a5af14d7e0864936aba9df9f5
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-9999 b/metadata/md5-cache/sec-policy/selinux-ntop-9999
index a921968e897d..86ffbc948b26 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b15dd63a5af14d7e0864936aba9df9f5
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r1
deleted file mode 100644
index c7852cf4ab93..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c3bdd190276e4d0226dc8b9a7b9f5c5f
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r2
deleted file mode 100644
index cb3a3b44011d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5a391977cf8586bdd89b145ab11a1cde
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r3
deleted file mode 100644
index 7fe30be24a40..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5a391977cf8586bdd89b145ab11a1cde
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r4
deleted file mode 100644
index 2d6d55c338b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5a391977cf8586bdd89b145ab11a1cde
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r2
index 37f8cea15ebd..42292c75943a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5a391977cf8586bdd89b145ab11a1cde
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r3
index 03895f73800e..9a01b89d5e87 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5a391977cf8586bdd89b145ab11a1cde
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r4
deleted file mode 100644
index ed37ea62ed82..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c3bdd190276e4d0226dc8b9a7b9f5c5f
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r1
index 11fd4b4b69bd..c9d5a724df24 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fb140c5b09c21348b1d112542bbdaa6a
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r2
index 61eb8d732efb..932916f10bb8 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=37b9d936d3cd91d3834f211048090945
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r3
new file mode 100644
index 000000000000..d44baf3960c9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ntp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=37b9d936d3cd91d3834f211048090945
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-9999 b/metadata/md5-cache/sec-policy/selinux-ntp-9999
index d8cc4c141a4c..0146fe4d2cd9 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=37b9d936d3cd91d3834f211048090945
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r1
deleted file mode 100644
index 767585b1e44f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2d72d11c2cf2cd1031df9b515347b413
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r2
deleted file mode 100644
index a6f60e80667b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=81889595da7c01fce6212db20c733927
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r3
deleted file mode 100644
index 86957916865e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=81889595da7c01fce6212db20c733927
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r4
deleted file mode 100644
index c9617af27636..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=81889595da7c01fce6212db20c733927
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r2
index a4d0e6c32661..7bf867727767 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=81889595da7c01fce6212db20c733927
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r3
index 96b02a6e5a9e..be61db2d360e 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=81889595da7c01fce6212db20c733927
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r4
deleted file mode 100644
index 514d7e3d8fa4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2d72d11c2cf2cd1031df9b515347b413
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r1
index 608e65a228bf..e6acae3967a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=52ca5c03e472d148ec8bf53a65d3120c
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r2
index 0dee10a5cd05..d018e011b838 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7b4f7bce8bb6b4a25f8faf96a4d5d333
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r3
new file mode 100644
index 000000000000..cd255ed4dbfc
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nut
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=7b4f7bce8bb6b4a25f8faf96a4d5d333
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-9999 b/metadata/md5-cache/sec-policy/selinux-nut-9999
index e21ccfe461d4..cc7eaa500acd 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nut-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7b4f7bce8bb6b4a25f8faf96a4d5d333
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r1
deleted file mode 100644
index 92ba7332a4f5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f596f101216c8be676c36fb14224f6c6
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r2
deleted file mode 100644
index 4f4e68df1dab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5cb12a458b775f2bec0420875e76ed7f
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r3
deleted file mode 100644
index 299c800e674f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5cb12a458b775f2bec0420875e76ed7f
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r4
deleted file mode 100644
index faab95492c02..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5cb12a458b775f2bec0420875e76ed7f
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r2
index 604c4c80adf9..6c391d2df307 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5cb12a458b775f2bec0420875e76ed7f
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r3
index ef86a13f0120..9700f8c6d842 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5cb12a458b775f2bec0420875e76ed7f
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r4
deleted file mode 100644
index 5662bfdf3c98..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f596f101216c8be676c36fb14224f6c6
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r1
index 711ea37b96da..fa150626a4e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3cef6fcc5b4ff3db68a30899e517d924
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r2
index ec2c4b3be3ce..bc8fb65c05f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=08ac0dea04d3b73191ab7d7ff535e825
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r3
new file mode 100644
index 000000000000..9c9fd735eb19
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nx
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=08ac0dea04d3b73191ab7d7ff535e825
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-9999 b/metadata/md5-cache/sec-policy/selinux-nx-9999
index 61fe9ab5513c..addd946d3cb4 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nx-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=08ac0dea04d3b73191ab7d7ff535e825
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r1
deleted file mode 100644
index a1f25d853b9b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oddjob
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a23eb776282c150ecb0097e40802fe69
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r2
deleted file mode 100644
index 2ac6d330e635..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oddjob
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=54d228be470d4d2ddb52d194e9d1a714
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r3
deleted file mode 100644
index aaff39de5c24..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oddjob
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=54d228be470d4d2ddb52d194e9d1a714
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r4
deleted file mode 100644
index 63e858b8340a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oddjob
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=54d228be470d4d2ddb52d194e9d1a714
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r2
index 47c63810cadb..8e7c15f1a7af 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=54d228be470d4d2ddb52d194e9d1a714
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r3
index cb0a9cb1f714..f4ba1375c80a 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=54d228be470d4d2ddb52d194e9d1a714
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r4
deleted file mode 100644
index d136274d8455..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oddjob
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a23eb776282c150ecb0097e40802fe69
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r1
index 5932811644dc..6666a1946140 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2227b4a5cfe003485d500f633f98a369
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r2
index 9e9519a50331..8c4814a43b94 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=19f4b43aabb8845fbaaed0ef11e23234
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r3
new file mode 100644
index 000000000000..37eda612de79
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for oddjob
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=19f4b43aabb8845fbaaed0ef11e23234
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-9999 b/metadata/md5-cache/sec-policy/selinux-oddjob-9999
index 3e89cf338538..db5ad2301432 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-9999
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=19f4b43aabb8845fbaaed0ef11e23234
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r1
deleted file mode 100644
index d5582eaed40c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oident
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4f204c731f22cfc6072f5888db649b54
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r2
deleted file mode 100644
index 60f8273a14d0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oident
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=57e1c619155c4164f4b84d1d161ae8e0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r3
deleted file mode 100644
index 804962aa84cf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oident
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=57e1c619155c4164f4b84d1d161ae8e0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r4
deleted file mode 100644
index 35505c3c9b8c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oident
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=57e1c619155c4164f4b84d1d161ae8e0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r2
index ffd86a10e977..cf382d3b649b 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=57e1c619155c4164f4b84d1d161ae8e0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r3
index 03ed80de330d..2efa701f87da 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=57e1c619155c4164f4b84d1d161ae8e0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r4
deleted file mode 100644
index 2e70389d4fa4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oident
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4f204c731f22cfc6072f5888db649b54
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r1
index 91ee2b9fece4..254808a72a1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dcf303e613f0f7a1c259dd80823bb780
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r2
index 520d42603588..35b3e863aeb3 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ca4a3999304e06478f728acdd8a5a455
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r3
new file mode 100644
index 000000000000..7f8afdbc61a7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for oident
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ca4a3999304e06478f728acdd8a5a455
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-9999 b/metadata/md5-cache/sec-policy/selinux-oident-9999
index c6ad8e7b791e..cab402723160 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-9999
+++ b/metadata/md5-cache/sec-policy/selinux-oident-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ca4a3999304e06478f728acdd8a5a455
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r1
deleted file mode 100644
index e6ca53a3ca54..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=127612a30e701ba61451e190bc11e02f
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r2
deleted file mode 100644
index 9281448def7a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d14be6ccf4964c1e67605046805a34bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r3
deleted file mode 100644
index feb91ad4a01e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d14be6ccf4964c1e67605046805a34bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r4
deleted file mode 100644
index 66c96f5ac317..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d14be6ccf4964c1e67605046805a34bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r2
index a39f8d209acb..4cd859ba2b4c 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d14be6ccf4964c1e67605046805a34bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r3
index 5b14763b9363..ceb03a575e05 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d14be6ccf4964c1e67605046805a34bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r4
deleted file mode 100644
index 2fcc0a1e2064..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=127612a30e701ba61451e190bc11e02f
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r1
index c7a9e5781286..f026f29527a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a4ce6f02dafa04dcb09df28ecfaa3735
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r2
index 58601b9554c5..674a19803d17 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b99c7fc3c33229da0072d76984ab5115
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r3
new file mode 100644
index 000000000000..6932441f9491
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openct
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b99c7fc3c33229da0072d76984ab5115
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-9999 b/metadata/md5-cache/sec-policy/selinux-openct-9999
index fabd033d9da2..687e878f1552 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openct-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b99c7fc3c33229da0072d76984ab5115
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r1
deleted file mode 100644
index fba2d3356efa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openrc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bf2870d99c1aec209c7a9e93a6c48699
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r2
deleted file mode 100644
index 7a6df1ce47da..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openrc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2ef1378be7c9ed9238e15f071aee79bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r3
deleted file mode 100644
index 447b537436b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openrc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2ef1378be7c9ed9238e15f071aee79bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r4
deleted file mode 100644
index 18f9031130b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openrc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2ef1378be7c9ed9238e15f071aee79bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r2
index 78ec4b729bb8..3b0509473077 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ef1378be7c9ed9238e15f071aee79bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r3
index a0986ee635d4..b2c74414e5a5 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ef1378be7c9ed9238e15f071aee79bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r4
deleted file mode 100644
index 810d5b2da7e3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openrc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bf2870d99c1aec209c7a9e93a6c48699
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r1
index 2b1df41461c8..6351863b4bb6 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=70bcc83131cd0b2e53764ad9d5331a37
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r2
index cf7b090f3188..b1f53c901cdd 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6071f5d601fd8acac400bba39e19c31e
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r3
new file mode 100644
index 000000000000..1e9181797648
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openrc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6071f5d601fd8acac400bba39e19c31e
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-9999 b/metadata/md5-cache/sec-policy/selinux-openrc-9999
index c3caf22fa362..bad0bb9f3a8a 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6071f5d601fd8acac400bba39e19c31e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r1
deleted file mode 100644
index 68db9152a3df..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openvpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=db9efe742e5f0e44b8758109c6fe34d3
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r2
deleted file mode 100644
index 3c2c8c2243df..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openvpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9a76456d66ec97f4a4d599dda92b5a6e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r3
deleted file mode 100644
index 9f895e6fc01d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openvpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9a76456d66ec97f4a4d599dda92b5a6e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r4
deleted file mode 100644
index 8fda6d62286d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openvpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9a76456d66ec97f4a4d599dda92b5a6e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r2
index 1b646301598a..3c295c565fbb 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9a76456d66ec97f4a4d599dda92b5a6e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r3
index c6f72032f558..4375ca5598fb 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9a76456d66ec97f4a4d599dda92b5a6e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r4
deleted file mode 100644
index c1a9528e7482..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openvpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=db9efe742e5f0e44b8758109c6fe34d3
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r1
index f1120dd8ad82..ef1dbb8d988f 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=322d29f368abc5ce28c016b5256e7d0b
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r2
index 0bbd1047e5ce..95b7e82635e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=611e863a2e3bce1f1ce82f8cad8f00e9
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r3
new file mode 100644
index 000000000000..5d4b760125b8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openvpn
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=611e863a2e3bce1f1ce82f8cad8f00e9
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-9999 b/metadata/md5-cache/sec-policy/selinux-openvpn-9999
index 3cf7e25a8e27..8b97a4ba738a 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=611e863a2e3bce1f1ce82f8cad8f00e9
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r1
deleted file mode 100644
index 379b991cecf0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pan
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5fda1658acd59847df7aeff9f851d0db
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r2
deleted file mode 100644
index 2a71824da859..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pan
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e91e2d9f8819ae116f8d8731d2c06cec
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r3
deleted file mode 100644
index 7abfbdefdec3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pan
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e91e2d9f8819ae116f8d8731d2c06cec
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r4
deleted file mode 100644
index c55b3a8b8865..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pan
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e91e2d9f8819ae116f8d8731d2c06cec
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r2
index 7608e723925c..c4e21ac8426c 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e91e2d9f8819ae116f8d8731d2c06cec
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r3
index a638d0fb8f8e..a4ff15f819af 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e91e2d9f8819ae116f8d8731d2c06cec
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r4
deleted file mode 100644
index 7944073660b6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pan
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5fda1658acd59847df7aeff9f851d0db
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r1
index 88655917fe37..d1171e310319 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f1626d93dbe556ccdddac1250afed73e
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r2
index fc53a1deba31..0b943357f8c5 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=062cad6cd2fbee94b96401b92a0edd9b
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r3
new file mode 100644
index 000000000000..a4e3920edafe
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pan
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=062cad6cd2fbee94b96401b92a0edd9b
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-9999 b/metadata/md5-cache/sec-policy/selinux-pan-9999
index 15a230aeda91..a5bb7810a78f 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pan-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=062cad6cd2fbee94b96401b92a0edd9b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r1
deleted file mode 100644
index 4491539b4508..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a6f19cff2e854f11b91475e486018fa2
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r2
deleted file mode 100644
index edc727170928..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a165eab02b87d1e945e723441476f7ca
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r3
deleted file mode 100644
index e8538a401b07..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a165eab02b87d1e945e723441476f7ca
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r4
deleted file mode 100644
index c4d188c5c852..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a165eab02b87d1e945e723441476f7ca
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r2
index 87bfb0ff458f..de889642b13a 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a165eab02b87d1e945e723441476f7ca
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r3
index 4cf88e1a2e73..ffeb1e787360 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a165eab02b87d1e945e723441476f7ca
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r4
deleted file mode 100644
index 879bd68639d2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a6f19cff2e854f11b91475e486018fa2
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r1
index 253b9ca96423..8e0874ac10fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8f44a8e01aae81749191df25b5e6a592
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r2
index b98e9b63cc63..5c5da8cce451 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=450602904241cbc7df59e61795749e8b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r3
new file mode 100644
index 000000000000..91b84cee4241
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pcmcia
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=450602904241cbc7df59e61795749e8b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-9999 b/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
index 14f4415f875b..0bbd65f78384 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=450602904241cbc7df59e61795749e8b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r1
deleted file mode 100644
index 4839f7899697..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcscd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d1b6d68fc45c00fc2623ffc98b3a8e6b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r2
deleted file mode 100644
index 5f15f0379dd4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcscd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=060328425b60fa83c9ec7ff198c98adf
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r3
deleted file mode 100644
index dbd5d0691638..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcscd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=060328425b60fa83c9ec7ff198c98adf
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r4
deleted file mode 100644
index addf7896a297..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcscd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=060328425b60fa83c9ec7ff198c98adf
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r2
index f531752cd09b..351f86028bb4 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=060328425b60fa83c9ec7ff198c98adf
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r3
index 2d6dadbe5579..0f357c4b2039 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=060328425b60fa83c9ec7ff198c98adf
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r4
deleted file mode 100644
index 9863211623db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcscd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d1b6d68fc45c00fc2623ffc98b3a8e6b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r1
index 90ee483fc819..5cd69de46a37 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=188b72483f881830dc3a599343a0f141
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r2
index ee028e801044..ec5fe756aeaa 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d4bbed6482cc6fd250e63311ec8e963e
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r3
new file mode 100644
index 000000000000..720a5a6111e3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pcscd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d4bbed6482cc6fd250e63311ec8e963e
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-9999 b/metadata/md5-cache/sec-policy/selinux-pcscd-9999
index 98af77bbe818..32c089771551 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d4bbed6482cc6fd250e63311ec8e963e
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r1
deleted file mode 100644
index 9277e87a61b8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ab3fc7b54c7a84f9df1bc8766620b900
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r2
deleted file mode 100644
index 18ebf047b405..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=74b0ec50ffff1a6340ec34c2235b4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r3
deleted file mode 100644
index 4c8b0800b912..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=74b0ec50ffff1a6340ec34c2235b4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r4
deleted file mode 100644
index 4afa8246c48a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=74b0ec50ffff1a6340ec34c2235b4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r2
index 8d6d043fa220..6d9931b200dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=74b0ec50ffff1a6340ec34c2235b4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r3
index 52da20e4dff5..e21814bfcc06 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=74b0ec50ffff1a6340ec34c2235b4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r4
deleted file mode 100644
index e56326eb3cb0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ab3fc7b54c7a84f9df1bc8766620b900
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1
index 85c117272395..9829adf015e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6b5a699a1048ac9decc7b92c0a74076f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2
index d494261cc76f..f6dd84172b67 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c85192d9deae2521b9203a9302b31509
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3
new file mode 100644
index 000000000000..9ac755586b83
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for perdition
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c85192d9deae2521b9203a9302b31509
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-9999 b/metadata/md5-cache/sec-policy/selinux-perdition-9999
index 5e05d0458a4d..79a27bcd014d 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-9999
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c85192d9deae2521b9203a9302b31509
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r1
deleted file mode 100644
index 68bd7a648467..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for phpfpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f29c22d7b50812e9dc197caabafe44cb
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r2
deleted file mode 100644
index faa5cebca276..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for phpfpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=72a4d9183479a22fc7eecf2dc9e7ccc9
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r3
deleted file mode 100644
index cddc04de3063..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for phpfpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=72a4d9183479a22fc7eecf2dc9e7ccc9
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r4
deleted file mode 100644
index b23bb7dac6b1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for phpfpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=72a4d9183479a22fc7eecf2dc9e7ccc9
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r2
index 3d81ddf569bd..7ca7de580d08 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=72a4d9183479a22fc7eecf2dc9e7ccc9
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r3
index 0775f6dbe7e2..6254229ebb63 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=72a4d9183479a22fc7eecf2dc9e7ccc9
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r4
deleted file mode 100644
index ad4ba241f17a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for phpfpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f29c22d7b50812e9dc197caabafe44cb
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r1
index 12268f886c3f..e12ad07c1764 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bdc2fa5832917634136f0fbec3b947ac
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r2
index 2671e17f4849..4c58442adedb 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1940f6c846e1240ac3ed479c1508cab1
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r3
new file mode 100644
index 000000000000..9a51104e0963
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for phpfpm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1940f6c846e1240ac3ed479c1508cab1
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-9999 b/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
index 2b4996eab11f..39afab49e457 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1940f6c846e1240ac3ed479c1508cab1
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r1
deleted file mode 100644
index 85b24ed00e1b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for plymouthd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=aeee5e038c2b79d763d4bf3d4124484b
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r2
deleted file mode 100644
index a88163b68779..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for plymouthd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b773502ca8131faffd96967b5d0383eb
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r3
deleted file mode 100644
index bc18ebbecc7d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for plymouthd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b773502ca8131faffd96967b5d0383eb
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r4
deleted file mode 100644
index c725f7f45d09..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for plymouthd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b773502ca8131faffd96967b5d0383eb
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r2
index c023e8c5a181..5272a63fee5b 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b773502ca8131faffd96967b5d0383eb
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r3
index 85988297faa3..5bbad2c4dfa0 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b773502ca8131faffd96967b5d0383eb
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r4
deleted file mode 100644
index 9369f4f1d89a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for plymouthd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=aeee5e038c2b79d763d4bf3d4124484b
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r1
index e027f6414782..32c1a87131fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d6f443724471cac38159e20113ef7952
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r2
index f6246edb3e3f..4e4e65d04bb9 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c082f353132b5b9abd9354e18adf9206
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r3
new file mode 100644
index 000000000000..34de3daea079
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for plymouthd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c082f353132b5b9abd9354e18adf9206
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-9999 b/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
index b28204232e0f..14edf02a8494 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c082f353132b5b9abd9354e18adf9206
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r1
deleted file mode 100644
index 8d35112a95ff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e5b5b654061d3460f69c157e3fea852c
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r2
deleted file mode 100644
index eb30920ccee5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=18e00216631fb29b01bb518d81297d79
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r3
deleted file mode 100644
index ca014a2086ac..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=18e00216631fb29b01bb518d81297d79
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r4
deleted file mode 100644
index 37a306911dc9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=18e00216631fb29b01bb518d81297d79
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r2
index 92ceba272af0..30928aaa64ff 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=18e00216631fb29b01bb518d81297d79
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r3
index 5335cfbecbf5..a6685025cb71 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=18e00216631fb29b01bb518d81297d79
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r4
deleted file mode 100644
index 347c4e97e829..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e5b5b654061d3460f69c157e3fea852c
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r1
index 8366c6aeaaeb..2786ce55e38f 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c69941bb4020c1416cdb047d7b444993
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r2
index 2f0960b29a26..5db9543d6309 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=38629b51730a5bc7895c26c8644e5534
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r3
new file mode 100644
index 000000000000..8d900491baf7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for podsleuth
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=38629b51730a5bc7895c26c8644e5534
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-9999 b/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
index 726ecc678b66..581c564005fb 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=38629b51730a5bc7895c26c8644e5534
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r1
deleted file mode 100644
index 141519d56057..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for policykit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=82f5af0e8e9e9f349843dbc87aac346e
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r2
deleted file mode 100644
index 69eda3c2a894..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for policykit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6d71c3bd020dd29292637b1f85fa792d
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r3
deleted file mode 100644
index d1ff3edae1d4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for policykit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6d71c3bd020dd29292637b1f85fa792d
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r4
deleted file mode 100644
index 75edc0405138..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for policykit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6d71c3bd020dd29292637b1f85fa792d
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r2
index 529c3766c4ae..6caff8a23fe8 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6d71c3bd020dd29292637b1f85fa792d
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r3
index 3994e5f4a3dd..61e50fff1dc9 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6d71c3bd020dd29292637b1f85fa792d
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r4
deleted file mode 100644
index 049ec04b0c5a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for policykit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=82f5af0e8e9e9f349843dbc87aac346e
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r1
index ed0230654723..7829ec5b441d 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6aa0aaf70d6386a935da8289a142af1c
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r2
index 1aad47f55515..80a1d868668d 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6fa7319895fc508f6fe1a1c15e7ab393
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r3
new file mode 100644
index 000000000000..1457f378a073
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for policykit
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6fa7319895fc508f6fe1a1c15e7ab393
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-9999 b/metadata/md5-cache/sec-policy/selinux-policykit-9999
index 16ffa89e837a..12d85d5b161d 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6fa7319895fc508f6fe1a1c15e7ab393
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r1
deleted file mode 100644
index 80616b9840b3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for portmap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=148b833c0031a230192985b128b9a6e9
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r2
deleted file mode 100644
index 8ff14d343738..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for portmap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ca4865a1af4d6df33233c8e4a52cb611
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r3
deleted file mode 100644
index 17fbc6eaec7e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for portmap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ca4865a1af4d6df33233c8e4a52cb611
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r4
deleted file mode 100644
index 8aee71a0a6be..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for portmap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ca4865a1af4d6df33233c8e4a52cb611
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r2
index 82350b8d7579..d51720626429 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ca4865a1af4d6df33233c8e4a52cb611
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r3
index 583f26748cd1..9516752025c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ca4865a1af4d6df33233c8e4a52cb611
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r4
deleted file mode 100644
index 3fd800063ba7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for portmap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=148b833c0031a230192985b128b9a6e9
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r1
index 80f7a58d13a7..523dba3db4f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f3dfd06019ee4723d0f313e0d83cb3d7
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r2
index 7a00d938f9fc..c29e2bc1d18a 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d00dd55591db67d154b738e235cc9ece
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r3
new file mode 100644
index 000000000000..52854e21bde8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for portmap
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d00dd55591db67d154b738e235cc9ece
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-9999 b/metadata/md5-cache/sec-policy/selinux-portmap-9999
index 6bc319da4517..9e2c088f1c85 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d00dd55591db67d154b738e235cc9ece
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r1
deleted file mode 100644
index b578b20b5201..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postfix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c1825412bb6e6c36c7630b6e87b4bbb0
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r2
deleted file mode 100644
index 824da8419e28..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postfix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09070b893831a0d0b33c9866a022ed7
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r3
deleted file mode 100644
index e482e8ef9159..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postfix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09070b893831a0d0b33c9866a022ed7
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r4
deleted file mode 100644
index a6d5850bac34..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postfix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09070b893831a0d0b33c9866a022ed7
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r2
index 068198da05f6..33a5819c6cdd 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a09070b893831a0d0b33c9866a022ed7
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r3
index 3fb7160ebbcc..25d9477a40ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a09070b893831a0d0b33c9866a022ed7
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r4
deleted file mode 100644
index 0817c04b0e5d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postfix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c1825412bb6e6c36c7630b6e87b4bbb0
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r1
index 9fc6b83e753b..0cb7bae1f2a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3a879a0c2bc62c59088fdeb6abbe0f2b
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r2
index 2bc25e04f626..4ef272030b62 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3da710cfa0d4d59f867dc70a46bd8adf
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r3
new file mode 100644
index 000000000000..882806137e06
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postfix
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3da710cfa0d4d59f867dc70a46bd8adf
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-9999 b/metadata/md5-cache/sec-policy/selinux-postfix-9999
index aded2baad416..adab0271b75d 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3da710cfa0d4d59f867dc70a46bd8adf
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r1
deleted file mode 100644
index 8738ba63b4ee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgresql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f33833c46a1f75c03754ef58525fa2c1
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r2
deleted file mode 100644
index 82eb807ec69d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgresql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0a62e7127f65b94555ff0a57db15aea0
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r3
deleted file mode 100644
index 6be02f306db6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgresql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0a62e7127f65b94555ff0a57db15aea0
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r4
deleted file mode 100644
index ec810f2c1329..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgresql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0a62e7127f65b94555ff0a57db15aea0
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r2
index b40835a0b23b..8e6cd68c1295 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0a62e7127f65b94555ff0a57db15aea0
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r3
index 8858259a0ce3..9d9939053fef 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0a62e7127f65b94555ff0a57db15aea0
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r4
deleted file mode 100644
index 4d2cfe6184f5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgresql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f33833c46a1f75c03754ef58525fa2c1
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r1
index 97a65e83fcb6..28705eccac19 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=87317edffdb160bbf8f991733ff94d4a
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r2
index 2b53e0119995..8700d52a51b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=48c12f43943558e5fc158710bd26f983
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r3
new file mode 100644
index 000000000000..4c4ae87a7cbe
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postgresql
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=48c12f43943558e5fc158710bd26f983
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-9999 b/metadata/md5-cache/sec-policy/selinux-postgresql-9999
index 4b7c25aa35f4..1c18b5be87a3 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=48c12f43943558e5fc158710bd26f983
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r1
deleted file mode 100644
index bff9a84be6b4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgrey
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e265907254d713692d17f95acfcc62ab
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r2
deleted file mode 100644
index 9d48fad7fda1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgrey
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=73e139d6f4c8e6e973b8305385a07a76
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r3
deleted file mode 100644
index 7ece5c14fc65..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgrey
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=73e139d6f4c8e6e973b8305385a07a76
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r4
deleted file mode 100644
index 7d69cc745c20..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgrey
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=73e139d6f4c8e6e973b8305385a07a76
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r2
index 67f99d0d4e01..79f7f6581d9c 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=73e139d6f4c8e6e973b8305385a07a76
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r3
index 7e4031d3d16f..ff982f348cc1 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=73e139d6f4c8e6e973b8305385a07a76
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r4
deleted file mode 100644
index bfd4bd1f139a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgrey
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e265907254d713692d17f95acfcc62ab
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r1
index 61eafeb45356..17536ff74e71 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3565390ad4d307b6c768e6a6850ae18f
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r2
index 3ae1274efc18..3d9de4576519 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d39be12b93a37f0441569a3765453ecf
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r3
new file mode 100644
index 000000000000..9d1dd29df4dc
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postgrey
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d39be12b93a37f0441569a3765453ecf
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-9999 b/metadata/md5-cache/sec-policy/selinux-postgrey-9999
index cd0c0886bcff..88676e6ed3ff 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d39be12b93a37f0441569a3765453ecf
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r1
deleted file mode 100644
index 5ab106192374..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ppp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=659cd684ff24fbd830903da6e4e14562
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r2
deleted file mode 100644
index 8003d3331d51..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ppp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bb77d76d44e5a6cfaee28372d411fa11
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r3
deleted file mode 100644
index bac1c8c72dad..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ppp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bb77d76d44e5a6cfaee28372d411fa11
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r4
deleted file mode 100644
index 66d25e1631b7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ppp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bb77d76d44e5a6cfaee28372d411fa11
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r2
index 898aaa876bea..031dc89725e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bb77d76d44e5a6cfaee28372d411fa11
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r3
index 5640f58584c7..f465f16972ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bb77d76d44e5a6cfaee28372d411fa11
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r4
deleted file mode 100644
index ba15aaf9bbac..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ppp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=659cd684ff24fbd830903da6e4e14562
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r1
index a06860a967bb..91762ff12f33 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7c207ad7e6a1a03b0d441f0877b3fc78
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r2
index 6d369406f5f8..fdcd7cd6f854 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7d175c9d114b0e0d3b8f9681d3fad1ea
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r3
new file mode 100644
index 000000000000..5ce11b3a99f6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ppp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=7d175c9d114b0e0d3b8f9681d3fad1ea
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-9999 b/metadata/md5-cache/sec-policy/selinux-ppp-9999
index 79b8e99f7c38..a240378d4c9e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7d175c9d114b0e0d3b8f9681d3fad1ea
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r1
deleted file mode 100644
index 2f16cdd3c734..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelink
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a60e9926947ffb8771d8acdce7984056
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r2
deleted file mode 100644
index a981866cceb5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelink
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a31fb9221737c1282d91dcd52609996c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r3
deleted file mode 100644
index b7c46da992b8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelink
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a31fb9221737c1282d91dcd52609996c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r4
deleted file mode 100644
index 64f5ce63ee5d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelink
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a31fb9221737c1282d91dcd52609996c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r2
index 7340bbd1dc89..f7a1c636a1da 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a31fb9221737c1282d91dcd52609996c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r3
index dbd4c8b70792..d21256a9892d 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a31fb9221737c1282d91dcd52609996c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r4
deleted file mode 100644
index 0804eb5c16c9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelink
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a60e9926947ffb8771d8acdce7984056
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r1
index 2ce13c6d41c9..acd92bb0cef8 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1f8efe344b8b1eecb042864c83bd0417
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r2
index 650717192e30..cead14c603e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2746ebb94069f4e04eb86b359e5ae59
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r3
new file mode 100644
index 000000000000..4de2167f567a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for prelink
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c2746ebb94069f4e04eb86b359e5ae59
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-9999 b/metadata/md5-cache/sec-policy/selinux-prelink-9999
index a9a186e64c6b..98be86990047 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-9999
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2746ebb94069f4e04eb86b359e5ae59
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r1
deleted file mode 100644
index f8ae9f91aeaa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelude
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3a63ee6297bddf8b72945f421c150617
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r2
deleted file mode 100644
index 5954c37eb071..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelude
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=191e56e47a9f53366909a51b1ccfd73d
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r3
deleted file mode 100644
index 6a1d6c527ec4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelude
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=191e56e47a9f53366909a51b1ccfd73d
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r4
deleted file mode 100644
index 701c88a5dc54..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelude
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=191e56e47a9f53366909a51b1ccfd73d
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r2
index 995756e81408..d50f8b294ce7 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=191e56e47a9f53366909a51b1ccfd73d
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r3
index 09fdca99c343..4ac53fd2ddc4 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=191e56e47a9f53366909a51b1ccfd73d
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r4
deleted file mode 100644
index 6e68baa21107..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelude
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3a63ee6297bddf8b72945f421c150617
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r1
index 9f626712e46e..f54e6bb8747c 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f8fd2534f0db852992d90e21407f559c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r2
index 204834dc08f8..268818177b3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b1938bd2f11047c6293189caaa4400eb
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r3
new file mode 100644
index 000000000000..311e1d0c2d82
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for prelude
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b1938bd2f11047c6293189caaa4400eb
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-9999 b/metadata/md5-cache/sec-policy/selinux-prelude-9999
index 5e47345e1a32..9bb527ff5fea 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-9999
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b1938bd2f11047c6293189caaa4400eb
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r1
deleted file mode 100644
index a42b49498ccf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for privoxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0563e0e3d3cfcf035398cae75d9eac09
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r2
deleted file mode 100644
index d3abbd7592b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for privoxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=240134a933f508577b71077a81bb3c3a
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r3
deleted file mode 100644
index 2b9d42af8b8f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for privoxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=240134a933f508577b71077a81bb3c3a
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r4
deleted file mode 100644
index 7848bbb115be..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for privoxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=240134a933f508577b71077a81bb3c3a
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r2
index 171e445ed793..fe5d9fb1e49d 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=240134a933f508577b71077a81bb3c3a
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r3
index 22dc326bd176..e7b7aa63d7cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=240134a933f508577b71077a81bb3c3a
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r4
deleted file mode 100644
index 1c6a42f941e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for privoxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0563e0e3d3cfcf035398cae75d9eac09
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r1
index b0225a48f0cc..5e20bf74616e 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9f55adc2224719f68b6cf08b55b684dc
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r2
index 0d7b697354b1..7802a1e051fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b67863098515cf01447eb1061f2f5d74
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r3
new file mode 100644
index 000000000000..0cf6b3b17830
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for privoxy
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b67863098515cf01447eb1061f2f5d74
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-9999 b/metadata/md5-cache/sec-policy/selinux-privoxy-9999
index fbd426b4be09..e149e61038a5 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b67863098515cf01447eb1061f2f5d74
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r1
deleted file mode 100644
index eb814b372c0f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for procmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a83932f5ea80d79b71a825326d638264
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r2
deleted file mode 100644
index 4c254bb366b3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for procmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09d5a721b3389e60fba997074c9805f
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r3
deleted file mode 100644
index 21ac14a6ad9e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for procmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09d5a721b3389e60fba997074c9805f
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r4
deleted file mode 100644
index 74668f554011..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for procmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a09d5a721b3389e60fba997074c9805f
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r2
index d3d96e228a58..bb12ae0f8698 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a09d5a721b3389e60fba997074c9805f
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r3
index efaedd1a93ca..0698893ffac5 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a09d5a721b3389e60fba997074c9805f
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r4
deleted file mode 100644
index 19d864a9ff48..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for procmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a83932f5ea80d79b71a825326d638264
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r1
index 049508eeedf5..b8821eb008b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2b1de288e47df4657d06ef69a5db9385
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r2
index ed25caa54251..4383d73f78d0 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a5c3deceea5f9853ded289be0e60f785
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r3
new file mode 100644
index 000000000000..4c70e055fd9b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for procmail
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a5c3deceea5f9853ded289be0e60f785
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-9999 b/metadata/md5-cache/sec-policy/selinux-procmail-9999
index 4b052786a6d4..f1d9efbcabb5 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a5c3deceea5f9853ded289be0e60f785
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r1
deleted file mode 100644
index 94e87cb293d8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for psad
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4a92405f3fe6df51b8abb5645f9452d6
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r2
deleted file mode 100644
index 81b5301eb3e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for psad
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2fc248a62ae90fa83e2a9b5e2b6bb682
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r3
deleted file mode 100644
index ce8609598f64..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for psad
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2fc248a62ae90fa83e2a9b5e2b6bb682
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r4
deleted file mode 100644
index 569f6f627a0d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for psad
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2fc248a62ae90fa83e2a9b5e2b6bb682
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r2
index 3e466a57e085..9cf3d5ae9e40 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2fc248a62ae90fa83e2a9b5e2b6bb682
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r3
index f88631af8d96..18df8e032836 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2fc248a62ae90fa83e2a9b5e2b6bb682
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r4
deleted file mode 100644
index 48fce7ea8796..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for psad
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4a92405f3fe6df51b8abb5645f9452d6
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r1
index 36e1938ece1c..23673cbd91fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd3d3e73fe92b3eb9ca78ed2f2eac50a
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r2
index 5f9bd26ac2e8..8096a967e97c 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6b2490f9885a1e588d2df173df31f7d1
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r3
new file mode 100644
index 000000000000..8608a0202fe0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for psad
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6b2490f9885a1e588d2df173df31f7d1
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-9999 b/metadata/md5-cache/sec-policy/selinux-psad-9999
index 17164afa4446..161c3506d63f 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-9999
+++ b/metadata/md5-cache/sec-policy/selinux-psad-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6b2490f9885a1e588d2df173df31f7d1
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r1
deleted file mode 100644
index 94320a0407c1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for publicfile
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6ab7fe76e81a6bf2937f44c0fb9b8763
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r2
deleted file mode 100644
index 6c25ff50ba16..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for publicfile
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0108464fa164ce4367f83ad3dbb5a47d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r3
deleted file mode 100644
index b790081efb07..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for publicfile
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0108464fa164ce4367f83ad3dbb5a47d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r4
deleted file mode 100644
index 987829cc7be6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for publicfile
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0108464fa164ce4367f83ad3dbb5a47d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r2
index 97aadb2d698c..cb761e8994b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0108464fa164ce4367f83ad3dbb5a47d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r3
index ce2531fa9cab..611a369d5577 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0108464fa164ce4367f83ad3dbb5a47d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r4
deleted file mode 100644
index b8df858c12a4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for publicfile
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6ab7fe76e81a6bf2937f44c0fb9b8763
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r1
index fef512643a52..fccb7369405b 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7b4aa6533e9a2672240f63771ac5641e
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r2
index 67ce7fbe140f..669cf3c22e7c 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=29b6ec5e315cd15264fff89b0f0abc2d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r3
new file mode 100644
index 000000000000..dd0ab5ca4313
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for publicfile
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=29b6ec5e315cd15264fff89b0f0abc2d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-9999 b/metadata/md5-cache/sec-policy/selinux-publicfile-9999
index b5684abb3be6..5419a4492c02 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-9999
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=29b6ec5e315cd15264fff89b0f0abc2d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r1
deleted file mode 100644
index d9bb21d47824..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pulseaudio
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4aecbeb08151c2af32ebe364837b7cc
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r2
deleted file mode 100644
index 04cf5ce85d1c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pulseaudio
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a4792e5dd7752df401bda04e624edb1d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r3
deleted file mode 100644
index 8fce8a005e87..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pulseaudio
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a4792e5dd7752df401bda04e624edb1d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r4
deleted file mode 100644
index 323e455f22af..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pulseaudio
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a4792e5dd7752df401bda04e624edb1d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r2
index 70b9f87e9f4a..74cb411571e0 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a4792e5dd7752df401bda04e624edb1d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r3
index 231c023c56dc..feb8766cda88 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a4792e5dd7752df401bda04e624edb1d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r4
deleted file mode 100644
index 66cd5cca8446..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pulseaudio
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4aecbeb08151c2af32ebe364837b7cc
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r1
index a1a1a2020cbb..ad1ec2a4cdce 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=20724df85c7f6cc3d57aaea68dbb834e
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r2
index ecb85d191149..14a0eaeb7f05 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1d15b5da2b1a3b5f3ae1d41811b981e8
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r3
new file mode 100644
index 000000000000..d75320a85f37
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pulseaudio
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1d15b5da2b1a3b5f3ae1d41811b981e8
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
index 3b10791e8ffd..6e310e8babd9 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1d15b5da2b1a3b5f3ae1d41811b981e8
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r1
deleted file mode 100644
index 8a6cdd09a92a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for puppet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=90c8d696a850469457277d7ac772d811
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r2
deleted file mode 100644
index 72d607af97dc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for puppet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=562b9d71944c5ed4edc6f95f1038fe6f
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r3
deleted file mode 100644
index 6eecc85dbc17..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for puppet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=562b9d71944c5ed4edc6f95f1038fe6f
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r4
deleted file mode 100644
index 534692eef438..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for puppet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=562b9d71944c5ed4edc6f95f1038fe6f
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r2
index 19a93a75ef92..44290c6431d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=562b9d71944c5ed4edc6f95f1038fe6f
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r3
index a0f0339b830a..90e0d963b966 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=562b9d71944c5ed4edc6f95f1038fe6f
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r4
deleted file mode 100644
index 70336496b1b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for puppet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=90c8d696a850469457277d7ac772d811
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r1
index 0b5bbe539713..69f185870c26 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dcc24da867a3c5b8067100e634074b10
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r2
index cd456e041d58..21dd859fba87 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=73af616de69b208615f056b3e98b8977
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r3
new file mode 100644
index 000000000000..0c5f8aeb1ed4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for puppet
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=73af616de69b208615f056b3e98b8977
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-9999 b/metadata/md5-cache/sec-policy/selinux-puppet-9999
index b0818c501ca5..5a841b3fc5df 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=73af616de69b208615f056b3e98b8977
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r1
deleted file mode 100644
index f9712544120b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyicqt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c5dd348d18ff4f1793b9a37da112ff51
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r2
deleted file mode 100644
index c16ca2da8902..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyicqt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=761fa96c12c55526eba467507d236899
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r3
deleted file mode 100644
index b1dc0270e7cb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyicqt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=761fa96c12c55526eba467507d236899
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r4
deleted file mode 100644
index 10070c0bd358..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyicqt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=761fa96c12c55526eba467507d236899
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r2
index 9a5c26d48747..9bee2abe3b81 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=761fa96c12c55526eba467507d236899
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r3
index fb2201935aa2..3a33182fc8b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=761fa96c12c55526eba467507d236899
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r4
deleted file mode 100644
index 7e6b8377df57..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyicqt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c5dd348d18ff4f1793b9a37da112ff51
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r1
index dbabc6cde31e..eeeb06889a0e 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6c49fd878aa92d01ad23aec3b3dfda52
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r2
index c6605abaac35..4b2b511e13c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6e8534324a9f8b7c75a8f21247ad7e03
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r3
new file mode 100644
index 000000000000..0577ef411d43
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pyicqt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6e8534324a9f8b7c75a8f21247ad7e03
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-9999 b/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
index c20e847ac154..1114b197b6d0 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6e8534324a9f8b7c75a8f21247ad7e03
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r1
deleted file mode 100644
index 58395ca2e6a4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyzor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8a23b7a3ba1ec3fc6eaf924874911586
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r2
deleted file mode 100644
index c6fbd4ce826c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyzor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=65ec43a6edcc89311acb941b016eef4d
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r3
deleted file mode 100644
index 5eb69e9fd4fe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyzor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=65ec43a6edcc89311acb941b016eef4d
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r4
deleted file mode 100644
index a9507aad2371..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyzor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=65ec43a6edcc89311acb941b016eef4d
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r2
index 37e060b4fb5e..623f7db8f6ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=65ec43a6edcc89311acb941b016eef4d
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r3
index 7f718c93c7ca..be1a85078ef4 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=65ec43a6edcc89311acb941b016eef4d
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r4
deleted file mode 100644
index 5dc3af234982..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyzor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8a23b7a3ba1ec3fc6eaf924874911586
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r1
index d5406b60de15..43df6dc3292c 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9d17c8d7402bd6e3230b50744b72a596
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r2
index 340f1316e25c..f9b2369f9350 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5c1eacc44f675d8b75557a703c670279
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r3
new file mode 100644
index 000000000000..169661eea108
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pyzor
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=5c1eacc44f675d8b75557a703c670279
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-9999 b/metadata/md5-cache/sec-policy/selinux-pyzor-9999
index 84a4ceaf0d0d..b75d54220810 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5c1eacc44f675d8b75557a703c670279
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r1
deleted file mode 100644
index 4035ea391120..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qemu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3628a495b2345ad5d280f1a1dd0d37ba
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r2
deleted file mode 100644
index 8d836ae131f0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qemu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=029ae1cc76068e811c00ed70ddb4038d
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r3
deleted file mode 100644
index dac550f9f5b9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qemu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=029ae1cc76068e811c00ed70ddb4038d
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r4
deleted file mode 100644
index e0208a994cef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qemu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=029ae1cc76068e811c00ed70ddb4038d
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r2
index 66fe2e4fd25a..e26f16f24a80 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=029ae1cc76068e811c00ed70ddb4038d
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r3
index c421a9df908d..b17e557d635f 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=029ae1cc76068e811c00ed70ddb4038d
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r4
deleted file mode 100644
index f4d62bb17d88..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qemu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3628a495b2345ad5d280f1a1dd0d37ba
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r1
index 30fe7a99c026..70e0fba5ddbb 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fe39597e2cefc3b11e17f08228b0a1b5
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r2
index 00c47bc58f5b..0b02376bbb0c 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0755be996584033e2dad5b792542580a
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r3
new file mode 100644
index 000000000000..b67d663fa5c8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for qemu
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=0755be996584033e2dad5b792542580a
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-9999 b/metadata/md5-cache/sec-policy/selinux-qemu-9999
index bed4bf147026..2ec145fd353a 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-9999
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0755be996584033e2dad5b792542580a
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r1
deleted file mode 100644
index ed2d460b1bbd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d02ebd2e008f7898d08f91031ae5b9e3
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r2
deleted file mode 100644
index acfcdbc9b1d1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8d70952c0a33110de5d15354136243f5
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r3
deleted file mode 100644
index 2b61fbbc2c92..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8d70952c0a33110de5d15354136243f5
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r4
deleted file mode 100644
index cfe8626b6b88..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8d70952c0a33110de5d15354136243f5
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r2
index e1d95d8b550a..da0ac897795b 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8d70952c0a33110de5d15354136243f5
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r3
index 7ae10698be16..73336425a64e 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8d70952c0a33110de5d15354136243f5
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r4
deleted file mode 100644
index 3ac3f63c4d52..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d02ebd2e008f7898d08f91031ae5b9e3
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r1
index 3371a4166d9d..3f0657fd3c5d 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6d3ec472217da0ba2c3a1f2e3a2ac5e7
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r2
index 527a08513c90..78f51f6ee165 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=76657c68437144dd051ffcb4b5b08371
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r3
new file mode 100644
index 000000000000..e67bbfb677a7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for qmail
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=76657c68437144dd051ffcb4b5b08371
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-9999 b/metadata/md5-cache/sec-policy/selinux-qmail-9999
index 6d587e2c2406..97714b27a159 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=76657c68437144dd051ffcb4b5b08371
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r1
deleted file mode 100644
index 5997a6e4708b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for quota
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=79f0fcb2f5b9859cffc878ad572863cf
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r2
deleted file mode 100644
index 4ab01b8eff47..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for quota
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1c3d94e14cdfcd0df398e42730301c40
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r3
deleted file mode 100644
index 400dd43ce58a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for quota
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1c3d94e14cdfcd0df398e42730301c40
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r4
deleted file mode 100644
index 1493efb4249d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for quota
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1c3d94e14cdfcd0df398e42730301c40
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r2
index 239b888afff5..d1f73e165c1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1c3d94e14cdfcd0df398e42730301c40
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r3
index 8674d21bb518..fc5be2c2fd01 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1c3d94e14cdfcd0df398e42730301c40
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r4
deleted file mode 100644
index 7a1f0be884f9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for quota
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=79f0fcb2f5b9859cffc878ad572863cf
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r1
index 68e5d86d733b..19a908103082 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9717966f0713836bb0ad272f00264e5f
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r2
index 693733a6d9ba..ca2ebc5b3536 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d812cddd2d2ea7feb3f87e76856a8e39
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r3
new file mode 100644
index 000000000000..985c49c25a5c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for quota
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d812cddd2d2ea7feb3f87e76856a8e39
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-9999 b/metadata/md5-cache/sec-policy/selinux-quota-9999
index 905cfba1029c..1cbd91cf9d24 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-9999
+++ b/metadata/md5-cache/sec-policy/selinux-quota-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d812cddd2d2ea7feb3f87e76856a8e39
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r1
deleted file mode 100644
index 23ae52bfcca0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radius
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=59f6602a80264f359189126dd755b85e
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r2
deleted file mode 100644
index 0b7802bda98a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radius
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f9aff985239c3d1db6b34bd14165b948
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r3
deleted file mode 100644
index 3e6bb7793cb2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radius
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f9aff985239c3d1db6b34bd14165b948
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r4
deleted file mode 100644
index 111ad77d18c2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radius
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f9aff985239c3d1db6b34bd14165b948
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r2
index fa31caf6c2d1..dc79b57d2eeb 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f9aff985239c3d1db6b34bd14165b948
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r3
index 6d5e92b8c3d4..dd734a6c921d 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f9aff985239c3d1db6b34bd14165b948
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r4
deleted file mode 100644
index f1831ba1ca62..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radius
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=59f6602a80264f359189126dd755b85e
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r1
index bfc713187b2b..bd943d52cadc 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7ec35108fd174c3cd644f705eb86af6c
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r2
index fbcc74f41fe7..782df6055396 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=05ae7470f1e2e5ee552d12d03fc369c7
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r3
new file mode 100644
index 000000000000..8c17d68ce0a9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for radius
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=05ae7470f1e2e5ee552d12d03fc369c7
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-9999 b/metadata/md5-cache/sec-policy/selinux-radius-9999
index dd306e853960..49baf1663563 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-9999
+++ b/metadata/md5-cache/sec-policy/selinux-radius-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=05ae7470f1e2e5ee552d12d03fc369c7
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r1
deleted file mode 100644
index 5388c0543129..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radvd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6f684ab1c00be3f217de7a6c446ef135
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r2
deleted file mode 100644
index 26b7198d64d2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radvd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0cc358d41d3ef5d724512b7a04ebabd0
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r3
deleted file mode 100644
index 674612d3df3d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radvd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0cc358d41d3ef5d724512b7a04ebabd0
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r4
deleted file mode 100644
index 4a6b04bf281d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radvd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0cc358d41d3ef5d724512b7a04ebabd0
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r2
index d449dc309f95..fa8746b71749 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0cc358d41d3ef5d724512b7a04ebabd0
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r3
index 3bb8950538b0..779da40b4bfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0cc358d41d3ef5d724512b7a04ebabd0
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r4
deleted file mode 100644
index 77960539d15f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radvd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6f684ab1c00be3f217de7a6c446ef135
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r1
index d30b9ed1ab51..0eb1ae810252 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3dfd1874f5836500b114c401a9f56d5c
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r2
index 59c389cae176..43c86063e55b 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b205ee9f64ddd3b3452cb43e3d867b2d
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r3
new file mode 100644
index 000000000000..0129f085069b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for radvd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b205ee9f64ddd3b3452cb43e3d867b2d
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-9999 b/metadata/md5-cache/sec-policy/selinux-radvd-9999
index cd6f173f92ba..7770e8fe4d13 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b205ee9f64ddd3b3452cb43e3d867b2d
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r1
deleted file mode 100644
index cc3f70ba655e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for razor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c962e7a904398c97800f2b219d30b0a6
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r2
deleted file mode 100644
index 857111ae8ab4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for razor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=513f3d4853c5b2259fd9bce562092086
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r3
deleted file mode 100644
index 65d3693c414d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for razor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=513f3d4853c5b2259fd9bce562092086
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r4
deleted file mode 100644
index 88938b798c9d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for razor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=513f3d4853c5b2259fd9bce562092086
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r2
index 438441d12074..9a9f7dc741df 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=513f3d4853c5b2259fd9bce562092086
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r3
index 8bb1dffc7b9b..e301cb6384c2 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=513f3d4853c5b2259fd9bce562092086
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r4
deleted file mode 100644
index 27e2d63c409d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for razor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c962e7a904398c97800f2b219d30b0a6
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r1
index 024d1c5572b8..2f9b023ec53d 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dfb374e312569e17dd63d419f28e5c1b
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r2
index dc9542b460f5..8ec63f75dc04 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dc40eb30405d30aec2f6b5cdd29b9228
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r3
new file mode 100644
index 000000000000..389fb9b2960f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for razor
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=dc40eb30405d30aec2f6b5cdd29b9228
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-9999 b/metadata/md5-cache/sec-policy/selinux-razor-9999
index 7e0f71134d0c..f18aea2df938 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-razor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dc40eb30405d30aec2f6b5cdd29b9228
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2
index 735d8f3b3c1b..f09e64f0e123 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ad46b468b0d1e59bd4337029e8f6da89
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r3
new file mode 100644
index 000000000000..307cb6c452af
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for redis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ad46b468b0d1e59bd4337029e8f6da89
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-9999 b/metadata/md5-cache/sec-policy/selinux-redis-9999
index c9d265d59540..5447e74d80f6 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-redis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ad46b468b0d1e59bd4337029e8f6da89
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r1
deleted file mode 100644
index 0c98f9c7435c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for remotelogin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=37f4aca2ed73fb1facfd22109f9503c1
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r2
deleted file mode 100644
index 5a5d803f45bd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for remotelogin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3637d36dd1f2865db66d599ed02f0a8a
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r3
deleted file mode 100644
index 53e4e281fbb2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for remotelogin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3637d36dd1f2865db66d599ed02f0a8a
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r4
deleted file mode 100644
index d29e0d927b94..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for remotelogin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3637d36dd1f2865db66d599ed02f0a8a
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r2
index 6e1ea29d12ce..01f247f58cbf 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3637d36dd1f2865db66d599ed02f0a8a
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r3
index 6c4631d26193..5f2a9c56ae62 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3637d36dd1f2865db66d599ed02f0a8a
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r4
deleted file mode 100644
index 849f1d658e81..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for remotelogin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=37f4aca2ed73fb1facfd22109f9503c1
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r1
index 0f1ff2158018..513217fb1791 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=09403cdb14b543d3b5e4c8cc481c813d
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r2
index b833a5d07c8a..17ff413da265 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1fc35a6d58bcc6de2dcfe005cce75720
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r3
new file mode 100644
index 000000000000..217dbae467e1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for remotelogin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1fc35a6d58bcc6de2dcfe005cce75720
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-9999 b/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
index 5af928846d70..c367478b6ad3 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1fc35a6d58bcc6de2dcfe005cce75720
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r1
deleted file mode 100644
index 860d146cbb0c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for resolvconf
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d3dba8f68cde7d125ed0f84da033c0b8
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r2
deleted file mode 100644
index 769d324b2420..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for resolvconf
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2da736ae1b02582dd51bd2dba986f186
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r3
deleted file mode 100644
index e920a0b16907..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for resolvconf
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2da736ae1b02582dd51bd2dba986f186
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r4
deleted file mode 100644
index f710a851eb4f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for resolvconf
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2da736ae1b02582dd51bd2dba986f186
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r2
index 784303ba0ca7..4046dc62e6c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2da736ae1b02582dd51bd2dba986f186
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r3
index 67c94af6b4f3..9fee98157c26 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2da736ae1b02582dd51bd2dba986f186
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r4
deleted file mode 100644
index f92ac98e927a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for resolvconf
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d3dba8f68cde7d125ed0f84da033c0b8
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r1
index 2d2ed8072881..ee1127d57927 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=91bf8eb7f5b18ae49eed0d39062dede6
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r2
index f4bd37a189a0..0dedad25a296 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dcd4ba631abd836d40ef4f2d01cc155d
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r3
new file mode 100644
index 000000000000..a1cf5f87ba0e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for resolvconf
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=dcd4ba631abd836d40ef4f2d01cc155d
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-9999 b/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
index a803a5891169..973585b89bd1 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dcd4ba631abd836d40ef4f2d01cc155d
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r1
deleted file mode 100644
index b40f4fa2e9e2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6c05711b3fea07836bcc64cd228595cf
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r2
deleted file mode 100644
index ef9fbf66135e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bef0ecf67f67b374501ac75327bd881b
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r3
deleted file mode 100644
index 320c126b56a7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bef0ecf67f67b374501ac75327bd881b
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r4
deleted file mode 100644
index 6ecd6b785c6d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=bef0ecf67f67b374501ac75327bd881b
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r2
index 80ea560ca829..33dc5f39dd0e 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bef0ecf67f67b374501ac75327bd881b
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r3
index 10b70e11946e..8ec8c14e122e 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bef0ecf67f67b374501ac75327bd881b
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r4
deleted file mode 100644
index c0a7e0809e13..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6c05711b3fea07836bcc64cd228595cf
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r1
index 0444d8bd2c57..478c7a742be4 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3cffa2e67e2b3f447d023d0ab271acdf
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r2
index d9c9873611bd..818dbf0b646d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=731224149419904beff577f86713c5ea
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r3
new file mode 100644
index 000000000000..b0ad16ef6f13
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rgmanager
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=731224149419904beff577f86713c5ea
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-9999 b/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
index 805305105670..4c8f271cb517 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=731224149419904beff577f86713c5ea
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r1
deleted file mode 100644
index 6f6213b4e7d7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rngd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=efc518a3085234e1fa60eb540141d562
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r2
deleted file mode 100644
index 948f2a78a848..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rngd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=be6fd3d2510233613c27922433ebe688
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r3
deleted file mode 100644
index 8aa98289d1a8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rngd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=be6fd3d2510233613c27922433ebe688
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r4
deleted file mode 100644
index e1aaf84c0ebb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rngd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=be6fd3d2510233613c27922433ebe688
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r2
index 291d9e0c03b6..aa400230c5db 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=be6fd3d2510233613c27922433ebe688
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r3
index d4779481dbef..1ea1a59d98b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=be6fd3d2510233613c27922433ebe688
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r4
deleted file mode 100644
index 48d6b9e48625..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rngd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=efc518a3085234e1fa60eb540141d562
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r1
index cff6e7ac4095..f9c7ef8ed96c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8f10787c865e90dbe2caf6e6a444c9b2
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r2
index b24f3372206e..d03769e906e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fdc895b59b4c1267d58fcaed6d57e031
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r3
new file mode 100644
index 000000000000..27a0e5b3e055
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rngd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=fdc895b59b4c1267d58fcaed6d57e031
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-9999 b/metadata/md5-cache/sec-policy/selinux-rngd-9999
index b9459f517d5c..d5455a84cf77 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fdc895b59b4c1267d58fcaed6d57e031
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r1
deleted file mode 100644
index b7181398b491..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for roundup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=26c0ee91c0845137889b024358b8350a
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r2
deleted file mode 100644
index d6b78a6e2274..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for roundup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=83c7d1340be140807fe8d7062875d95d
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r3
deleted file mode 100644
index 738a82c26d04..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for roundup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=83c7d1340be140807fe8d7062875d95d
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r4
deleted file mode 100644
index 460545f58d39..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for roundup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=83c7d1340be140807fe8d7062875d95d
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r2
index c9b1ef3b628c..e9ad44e386f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=83c7d1340be140807fe8d7062875d95d
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r3
index 5d7278a5134d..aae647ff4c1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=83c7d1340be140807fe8d7062875d95d
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r4
deleted file mode 100644
index 498cc5068286..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for roundup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=26c0ee91c0845137889b024358b8350a
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r1
index 544139e94b91..1d53f1f5ffba 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1c274383b55f0584ab8f404361414df8
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r2
index 3e7a0c9d1aa1..b8af1db9ee26 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9c1aaf53e8331d858f14bccf50e76923
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r3
new file mode 100644
index 000000000000..96831cb3468c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for roundup
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=9c1aaf53e8331d858f14bccf50e76923
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-9999 b/metadata/md5-cache/sec-policy/selinux-roundup-9999
index 4adce5ab5395..ba19412d031e 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9c1aaf53e8331d858f14bccf50e76923
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r1
deleted file mode 100644
index b2f5d9abfe08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=91ac6bc6da11a056ccb35b15c72bef70
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r2
deleted file mode 100644
index 2d8d5c6c6304..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7af5cb6d3dc650e449238c1fe78bd512
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r3
deleted file mode 100644
index 89cda2c3985d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7af5cb6d3dc650e449238c1fe78bd512
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r4
deleted file mode 100644
index 1b4ad52d7feb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7af5cb6d3dc650e449238c1fe78bd512
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r2
index dab7d6488531..0191d5806560 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7af5cb6d3dc650e449238c1fe78bd512
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r3
index eb885136a3f2..98f10f8e9740 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7af5cb6d3dc650e449238c1fe78bd512
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r4
deleted file mode 100644
index 3e731af310f9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=91ac6bc6da11a056ccb35b15c72bef70
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r1
index e2e42df0f8ba..cd9b0f9b2b45 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fe288ea46536cd3059d764f4e522c97e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r2
index 244305dd6279..13325742c27e 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=076d5eb57feaf8fc180626de06a9c5dd
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r3
new file mode 100644
index 000000000000..295a8519236c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=076d5eb57feaf8fc180626de06a9c5dd
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-9999 b/metadata/md5-cache/sec-policy/selinux-rpc-9999
index aabec4660be0..29ece6e0f9b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=076d5eb57feaf8fc180626de06a9c5dd
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r1
deleted file mode 100644
index 7858d14a28cd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpcbind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1dd6ae1d8660fd68ab57e5616a66866c
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r2
deleted file mode 100644
index c09622bc7a3a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpcbind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e847f6603ddff1dd93e9868e8714157b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r3
deleted file mode 100644
index 9e694717386a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpcbind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e847f6603ddff1dd93e9868e8714157b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r4
deleted file mode 100644
index 035bf6324f02..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpcbind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e847f6603ddff1dd93e9868e8714157b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r2
index 1a18d468ea87..b90ffca5a659 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e847f6603ddff1dd93e9868e8714157b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r3
index ca3bc4d8c6d1..c95baab11c58 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e847f6603ddff1dd93e9868e8714157b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r4
deleted file mode 100644
index e937278743cf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpcbind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1dd6ae1d8660fd68ab57e5616a66866c
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r1
index 19168fead942..b9ff719444a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=76c2505387acec71cfcac8b1cd807f73
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r2
index 134a6579d096..a9fda2c5256f 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f51469e60e69592f1cde006f8924b50e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r3
new file mode 100644
index 000000000000..8e63ac70f090
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpcbind
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f51469e60e69592f1cde006f8924b50e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-9999 b/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
index 4368ab65f6e6..3917c9c5c8c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f51469e60e69592f1cde006f8924b50e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r1
deleted file mode 100644
index 4f12aa275704..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d57579da9301f251cdc2071c884813a8
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r2
deleted file mode 100644
index d66e100e2e44..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd2e0983ad26ba4f55c996fbdadca59b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r3
deleted file mode 100644
index b85859a83e10..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd2e0983ad26ba4f55c996fbdadca59b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r4
deleted file mode 100644
index b4404ceedc83..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cd2e0983ad26ba4f55c996fbdadca59b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r2
index 798d07145f6f..855e776ae072 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd2e0983ad26ba4f55c996fbdadca59b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r3
index 17fe4e795abe..7b534c488f80 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd2e0983ad26ba4f55c996fbdadca59b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r4
deleted file mode 100644
index 79605d1c2a8a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d57579da9301f251cdc2071c884813a8
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r1
index 7e61044f1ce4..6f2806ff7bd6 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=87e6134a683c8e4e80fa4a11e048c5c5
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r2
index 682b86215097..e427f7b604fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=646412944e29d54d5f950613a1ae5f51
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r3
new file mode 100644
index 000000000000..a7013f5c92c0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=646412944e29d54d5f950613a1ae5f51
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-9999 b/metadata/md5-cache/sec-policy/selinux-rpm-9999
index 69c1c8d59669..564b14f03fd3 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=646412944e29d54d5f950613a1ae5f51
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r1
deleted file mode 100644
index f21956060b0d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rssh
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=12cb75a2e0a846705ada07311b2fbc25
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r2
deleted file mode 100644
index e66f8f60e977..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rssh
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=516d904c2bd0115c013bb42f41410d01
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r3
deleted file mode 100644
index 2cdf593b4680..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rssh
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=516d904c2bd0115c013bb42f41410d01
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r4
deleted file mode 100644
index a79d94fb7ac3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rssh
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=516d904c2bd0115c013bb42f41410d01
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r2
index db4f5eb47560..76e0fcbf07e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=516d904c2bd0115c013bb42f41410d01
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r3
index 6ac201c661d1..a109e8a53ed2 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=516d904c2bd0115c013bb42f41410d01
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r4
deleted file mode 100644
index 81bd4417f4b6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rssh
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=12cb75a2e0a846705ada07311b2fbc25
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r1
index 244913f5ad74..142835a3cd1f 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7f99fc64864d3267f1f239449ef2e11b
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r2
index d39122a89bb9..8756cf79a3f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4d24b9ef9ff76fe2d7584ed192ba814c
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r3
new file mode 100644
index 000000000000..35836e800a4a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rssh
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=4d24b9ef9ff76fe2d7584ed192ba814c
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-9999 b/metadata/md5-cache/sec-policy/selinux-rssh-9999
index 140e44b42610..7c5cce32ccf2 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4d24b9ef9ff76fe2d7584ed192ba814c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r1
deleted file mode 100644
index d0f3e6ff1117..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtkit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8f73be4266e3788bbff990e89d844cb8
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r2
deleted file mode 100644
index 4cf6ce347dbd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtkit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9251dad1cb171051dd56c030ded0751c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r3
deleted file mode 100644
index e36b68da0232..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtkit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9251dad1cb171051dd56c030ded0751c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r4
deleted file mode 100644
index bade245c4c58..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtkit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9251dad1cb171051dd56c030ded0751c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r2
index 22a7ad8bdaf0..f9a53e11fe2b 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9251dad1cb171051dd56c030ded0751c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r3
index da9ecd8a7d10..8854a4be1fcc 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9251dad1cb171051dd56c030ded0751c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r4
deleted file mode 100644
index e0ab01905ad9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtkit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8f73be4266e3788bbff990e89d844cb8
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r1
index 2844eab7b35d..f5888eb0e135 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=85dc4588d2038ff77277b0ce579d7190
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r2
index de50369fcf97..d36a3749a496 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c6ff9bb14b58114041d60c8fb17808f1
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r3
new file mode 100644
index 000000000000..bf126058fc60
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rtkit
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c6ff9bb14b58114041d60c8fb17808f1
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-9999 b/metadata/md5-cache/sec-policy/selinux-rtkit-9999
index b4e8ed1b788e..0c2276e3e48c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c6ff9bb14b58114041d60c8fb17808f1
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r1
deleted file mode 100644
index bb25c27c097c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtorrent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=736f327bd9760179ff81a3c88005a581
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r2
deleted file mode 100644
index 92ef92d76aff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtorrent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=42d604590bfa512ce9db484c2b1be79c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r3
deleted file mode 100644
index 675b0c3ce525..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtorrent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=42d604590bfa512ce9db484c2b1be79c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r4
deleted file mode 100644
index 0fc2bc1765ba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtorrent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=42d604590bfa512ce9db484c2b1be79c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r2
index 0f9cb0f20e33..c91f410046d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=42d604590bfa512ce9db484c2b1be79c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r3
index 06b3c2830ac7..5915733e8c69 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=42d604590bfa512ce9db484c2b1be79c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r4
deleted file mode 100644
index ef611c5b56b6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtorrent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=736f327bd9760179ff81a3c88005a581
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r1
index 4fd752e5f946..c98f0268d474 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0fe6ecb268d26d5460c39897f3ce434a
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r2
index 346c1cf17aba..d521d739c0f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a1a743c969abe00ecb27677be782147e
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r3
new file mode 100644
index 000000000000..4fbc1704f901
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rtorrent
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a1a743c969abe00ecb27677be782147e
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-9999 b/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
index 7d5c8e041040..c9d74d7dfee3 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a1a743c969abe00ecb27677be782147e
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r1
deleted file mode 100644
index 9f0730d066ef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for salt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=11182de6d1af86c11e7cd27ae7fc2a3b
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r2
deleted file mode 100644
index 5571f4ca3bcc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for salt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9c9c76b04cb69a0d0db9948f2ef77a74
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r3
deleted file mode 100644
index a884943da0b4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for salt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9c9c76b04cb69a0d0db9948f2ef77a74
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r4
deleted file mode 100644
index c4c48d10a516..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for salt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9c9c76b04cb69a0d0db9948f2ef77a74
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r2
index 52017bac6ccc..c3f23f72ee82 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9c9c76b04cb69a0d0db9948f2ef77a74
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r3
index 14f683ff7b28..2a64253727a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9c9c76b04cb69a0d0db9948f2ef77a74
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r4
deleted file mode 100644
index 46af89a84a53..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for salt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=11182de6d1af86c11e7cd27ae7fc2a3b
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r1
index be73a82db078..f25d9b46c234 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=60c40e51e23acd4df3709d318673d6b8
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r2
index e3526fc53c67..36345d101dd7 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=64aca4a988a80ebfe988749d9512ffa9
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r3
new file mode 100644
index 000000000000..9f0f85249ac1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for salt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=64aca4a988a80ebfe988749d9512ffa9
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-9999 b/metadata/md5-cache/sec-policy/selinux-salt-9999
index 0dc11468c0e3..c695b70cf510 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-salt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=64aca4a988a80ebfe988749d9512ffa9
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r1
deleted file mode 100644
index b6fed8d52759..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for samba
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee55334e5b87efc78c933b1fc302ec12
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r2
deleted file mode 100644
index 956825655e16..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for samba
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8e0815ba9782af9533bf1ff6bae770c5
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r3
deleted file mode 100644
index c471ffb908b0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for samba
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8e0815ba9782af9533bf1ff6bae770c5
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r4
deleted file mode 100644
index d620016160b4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for samba
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8e0815ba9782af9533bf1ff6bae770c5
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r2
index 588fce31bab7..271579abe291 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8e0815ba9782af9533bf1ff6bae770c5
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r3
index 2b57534b4571..6f4b2faaefd8 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8e0815ba9782af9533bf1ff6bae770c5
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r4
deleted file mode 100644
index bc9cab33f52f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for samba
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee55334e5b87efc78c933b1fc302ec12
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r1
index 5c5180c0ed38..5d1737ea1218 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9898b5d8fa513744d0427fd1372b4646
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r2
index 840e9b39f4c8..57574aa4e2a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6713342dd181257405ca7af8e014a94b
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r3
new file mode 100644
index 000000000000..ee5f14d72c33
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for samba
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6713342dd181257405ca7af8e014a94b
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-9999 b/metadata/md5-cache/sec-policy/selinux-samba-9999
index 1be332340221..5302b9e102eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-9999
+++ b/metadata/md5-cache/sec-policy/selinux-samba-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6713342dd181257405ca7af8e014a94b
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r1
deleted file mode 100644
index c062473353f9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sasl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9497fe1e2f9e8936566bf3de850315b0
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r2
deleted file mode 100644
index 269fc838d2c7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sasl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0830f456cdef9e887b466e402757c385
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r3
deleted file mode 100644
index dbd939bd3a33..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sasl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0830f456cdef9e887b466e402757c385
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r4
deleted file mode 100644
index 73253e842a6e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sasl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0830f456cdef9e887b466e402757c385
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r2
index 4ef89410cc5f..bb5813a5e520 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0830f456cdef9e887b466e402757c385
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r3
index 71a9bd412fa8..94a466231839 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0830f456cdef9e887b466e402757c385
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r4
deleted file mode 100644
index fb40e71c2a64..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sasl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9497fe1e2f9e8936566bf3de850315b0
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r1
index dacbe5d98c1a..89c8a6572002 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=66979307f1e91c6b64e8c133a41cc262
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r2
index 083c046aaecf..fa354a147b83 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ce9b231ae8160c8a469139f792561b12
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r3
new file mode 100644
index 000000000000..23b1f390f3c2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sasl
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ce9b231ae8160c8a469139f792561b12
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-9999 b/metadata/md5-cache/sec-policy/selinux-sasl-9999
index a04c52ba2230..a4a0b06d9490 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ce9b231ae8160c8a469139f792561b12
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r1
deleted file mode 100644
index 2416400ed370..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for screen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8346a38fd6ff4ea32cc2d6a90db44659
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r2
deleted file mode 100644
index 29bf44b679f7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for screen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4e2b32622f203938ebc17d10a0de98e
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r3
deleted file mode 100644
index 8d8c75085170..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for screen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4e2b32622f203938ebc17d10a0de98e
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r4
deleted file mode 100644
index 3ab8b4fbd81f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for screen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d4e2b32622f203938ebc17d10a0de98e
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r2
index 38a3c9edf2a9..5e5779b2c17b 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d4e2b32622f203938ebc17d10a0de98e
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r3
index 472bf613a520..9dec50f63a63 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d4e2b32622f203938ebc17d10a0de98e
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r4
deleted file mode 100644
index 4181e7aba790..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for screen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8346a38fd6ff4ea32cc2d6a90db44659
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r1
index acd28c0ea1e0..3f1dd36f407a 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7b50bc175c58b7038ac22cb1f63f1e54
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r2
index 31f9bcb28378..e218548a499b 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=58f5e5955a1f4f38f988fd2e2c41da22
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r3
new file mode 100644
index 000000000000..014097fe9eda
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for screen
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=58f5e5955a1f4f38f988fd2e2c41da22
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-9999 b/metadata/md5-cache/sec-policy/selinux-screen-9999
index 6bd285819006..02876dcc4475 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-9999
+++ b/metadata/md5-cache/sec-policy/selinux-screen-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=58f5e5955a1f4f38f988fd2e2c41da22
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r1
deleted file mode 100644
index 2cb29e1e36ad..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sendmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d7af0e971e0f0904793170baf9c39de6
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r2
deleted file mode 100644
index 1a93441447ae..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sendmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee1134920ee3452f757b1bce59088f5d
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r3
deleted file mode 100644
index e9071b1dba76..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sendmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee1134920ee3452f757b1bce59088f5d
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r4
deleted file mode 100644
index 5a2b680f831c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sendmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee1134920ee3452f757b1bce59088f5d
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r2
index ac306caed568..30d8c1b3a90a 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ee1134920ee3452f757b1bce59088f5d
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r3
index 732232a07f4f..03c8325af439 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ee1134920ee3452f757b1bce59088f5d
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r4
deleted file mode 100644
index 284989d0020f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sendmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d7af0e971e0f0904793170baf9c39de6
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r1
index d61c6651d513..a6b687f6ba26 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=383c253b227f9c5ce8b508cb9920e8f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r2
index 6a175ef2cb5a..d1ffd51cd9a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=33bc136f1abf60a62ffb996cc72c1d91
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r3
new file mode 100644
index 000000000000..3cd19efd5d66
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sendmail
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=33bc136f1abf60a62ffb996cc72c1d91
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-9999 b/metadata/md5-cache/sec-policy/selinux-sendmail-9999
index a8bd3a282e06..a2436085ccc0 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=33bc136f1abf60a62ffb996cc72c1d91
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r1
deleted file mode 100644
index 4d657da117b4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sensord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=913d939c3ef77a8023e6b7a7b3c232c1
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r2
deleted file mode 100644
index db7f2301d145..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sensord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c88550ae1259c528e8227abef7fcdcc
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r3
deleted file mode 100644
index 3844f516e0c5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sensord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c88550ae1259c528e8227abef7fcdcc
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r4
deleted file mode 100644
index 80cb2c71aaae..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sensord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7c88550ae1259c528e8227abef7fcdcc
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r2
index 823baeaa4889..966093c8f949 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7c88550ae1259c528e8227abef7fcdcc
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r3
index 8cc5a46394c8..95a9c1eff25c 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7c88550ae1259c528e8227abef7fcdcc
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r4
deleted file mode 100644
index 8817a192cd57..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sensord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=913d939c3ef77a8023e6b7a7b3c232c1
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r1
index 3e7fed3c8611..e57097809001 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d18042d0aeecda6513fead29c7a3c9c5
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r2
index 69b6bb66ceaf..ee4a3c5da82c 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dc4f7b9575f6c2e7bffefe1536b79f22
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r3
new file mode 100644
index 000000000000..7ec9f8a85389
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sensord
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=dc4f7b9575f6c2e7bffefe1536b79f22
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-9999 b/metadata/md5-cache/sec-policy/selinux-sensord-9999
index 96cb7234df32..cc5467d5f30e 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=dc4f7b9575f6c2e7bffefe1536b79f22
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r1
deleted file mode 100644
index 0094dc34bbf3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shorewall
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0933ca9fc18a8b08eac14e7dba5a528c
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r2
deleted file mode 100644
index 59f0f968dc2c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shorewall
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4302eecb2e56387d071885ec09fa21f9
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r3
deleted file mode 100644
index ac731a562439..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shorewall
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4302eecb2e56387d071885ec09fa21f9
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r4
deleted file mode 100644
index 1afc6a965f07..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shorewall
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4302eecb2e56387d071885ec09fa21f9
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r2
index 1535d4358682..60fdbb7e0873 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4302eecb2e56387d071885ec09fa21f9
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r3
index bcc4607684eb..1c62468bc212 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4302eecb2e56387d071885ec09fa21f9
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r4
deleted file mode 100644
index 68fedc609da2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shorewall
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0933ca9fc18a8b08eac14e7dba5a528c
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r1
index f44b5c80259d..393d0f715eae 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e3621196877235cf52c3d53a77e34132
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r2
index 2126cfdf8f22..8b237c3edf81 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5179a6ea11058d2bb82cb3a2311caf56
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r3
new file mode 100644
index 000000000000..9a1019a91bc0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for shorewall
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=5179a6ea11058d2bb82cb3a2311caf56
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-9999 b/metadata/md5-cache/sec-policy/selinux-shorewall-9999
index 1f043e78391c..d1a2c6a2f53a 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-9999
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5179a6ea11058d2bb82cb3a2311caf56
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r1
deleted file mode 100644
index 58f695f07dc3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shutdown
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2d19463e1133816f8632be12498f2215
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r2
deleted file mode 100644
index 5b174bc8c94f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shutdown
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=881a28963443bec4268ed559b291c4f3
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r3
deleted file mode 100644
index ca69cadb5923..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shutdown
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=881a28963443bec4268ed559b291c4f3
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r4
deleted file mode 100644
index 7ad347669529..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shutdown
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=881a28963443bec4268ed559b291c4f3
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r2
index 01fae15540d1..5308e6436386 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=881a28963443bec4268ed559b291c4f3
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r3
index 5e4f651f12a1..4a821a0aa483 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=881a28963443bec4268ed559b291c4f3
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r4
deleted file mode 100644
index 4e7fb394bab5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shutdown
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2d19463e1133816f8632be12498f2215
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r1
index fdc8c1ec340a..479715cc1f2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=060ffdb8b972332283082cf9dee7c7a8
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r2
index 65881ddfc578..8eb824c12e50 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=32cb7bd5f6e8459373e54679f44c2ce5
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r3
new file mode 100644
index 000000000000..bad7ef62dbde
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for shutdown
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=32cb7bd5f6e8459373e54679f44c2ce5
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-9999 b/metadata/md5-cache/sec-policy/selinux-shutdown-9999
index 82513a4c7020..b1892f08adb5 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-9999
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=32cb7bd5f6e8459373e54679f44c2ce5
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r1
deleted file mode 100644
index 6e281f3f04d9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for skype
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=60d80857be8756bebf2b13c6b8601c96
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r2
deleted file mode 100644
index 7ef7e2ab8daa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for skype
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a216e36cd5d2df8961dcb3923a18e732
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r3
deleted file mode 100644
index 5505352d22c7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for skype
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a216e36cd5d2df8961dcb3923a18e732
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r4
deleted file mode 100644
index 4f1246fc39b6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170204-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for skype
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a216e36cd5d2df8961dcb3923a18e732
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r2
index bb92784473c6..a9be0a2382e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a216e36cd5d2df8961dcb3923a18e732
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r3
index b4cd932768ef..3cd11eee0835 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a216e36cd5d2df8961dcb3923a18e732
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r4
deleted file mode 100644
index 7aaf92c7667c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for skype
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=60d80857be8756bebf2b13c6b8601c96
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r1
index 0ed9cf0713e6..3d8ac1b2a54f 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=aad8135769888af34d570c44c0b3ff0d
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r2
index 394a8a971ae4..55533f7cca36 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd8460ca52793fa58618ccf2f8737612
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r3
new file mode 100644
index 000000000000..6b46d28ae792
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for skype
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=cd8460ca52793fa58618ccf2f8737612
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-9999 b/metadata/md5-cache/sec-policy/selinux-skype-9999
index c16e8d74312d..b09ee0d22b95 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-9999
+++ b/metadata/md5-cache/sec-policy/selinux-skype-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cd8460ca52793fa58618ccf2f8737612
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r1
deleted file mode 100644
index 42dc322e4e33..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slocate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=28521e055b37b3d7697c091e25424547
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r2
deleted file mode 100644
index ebe845f4df9c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slocate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=87ccade69f59ebac6f539f52a6543efe
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r3
deleted file mode 100644
index 674b227edcf9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slocate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=87ccade69f59ebac6f539f52a6543efe
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r4
deleted file mode 100644
index b14abcd52d30..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slocate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=87ccade69f59ebac6f539f52a6543efe
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r2
index d566187ad3f4..eeb11b00ecb3 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=87ccade69f59ebac6f539f52a6543efe
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r3
index a61b30737411..4278068db1ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=87ccade69f59ebac6f539f52a6543efe
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r4
deleted file mode 100644
index 4ebedef1dd5c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slocate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=28521e055b37b3d7697c091e25424547
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r1
index d36fcc23fd32..26ce70e04598 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9f3a1282da161ee487743be07beab547
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r2
index 9602da307532..10454fe06a94 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8e46fcc7a50547c303273596f9a8f560
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r3
new file mode 100644
index 000000000000..4436ba925e78
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for slocate
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=8e46fcc7a50547c303273596f9a8f560
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-9999 b/metadata/md5-cache/sec-policy/selinux-slocate-9999
index 83a9b476b27e..2e2aecd31f8a 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-9999
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8e46fcc7a50547c303273596f9a8f560
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r1
deleted file mode 100644
index 9c2a3921098f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slrnpull
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=718f4dffb6b2fffa1558b0157b1eed7a
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r2
deleted file mode 100644
index f81444209ef8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slrnpull
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9cc2400b0b5902a127d570ce3417b768
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r3
deleted file mode 100644
index 2b438950666e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slrnpull
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9cc2400b0b5902a127d570ce3417b768
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r4
deleted file mode 100644
index 7f621f0d77d8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slrnpull
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9cc2400b0b5902a127d570ce3417b768
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r2
index 4796736577ec..f640e137fac7 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9cc2400b0b5902a127d570ce3417b768
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r3
index 69ce1ee44966..73e41d423b8b 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9cc2400b0b5902a127d570ce3417b768
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r4
deleted file mode 100644
index 5edc8b15f8da..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slrnpull
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=718f4dffb6b2fffa1558b0157b1eed7a
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r1
index 958106955110..6c5af2ccb832 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c73b4c486c209f42b3af8d8ae7664da2
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r2
index 3353c3d729f2..3d00b72945e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=20a301e086a2daaf265e024d8dfbb22e
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r3
new file mode 100644
index 000000000000..6a37028c0ac1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for slrnpull
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=20a301e086a2daaf265e024d8dfbb22e
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-9999 b/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
index e5adced3b467..5860702e84d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=20a301e086a2daaf265e024d8dfbb22e
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r1
deleted file mode 100644
index 795017f618fa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smartmon
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c95a0ff50b5bea989693d9e84c74872c
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r2
deleted file mode 100644
index 0f6217a3e39f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smartmon
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f04d989dc1e250b3d5285219630fcf76
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r3
deleted file mode 100644
index 1c52ed8fbc68..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smartmon
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f04d989dc1e250b3d5285219630fcf76
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r4
deleted file mode 100644
index e5542990f161..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smartmon
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f04d989dc1e250b3d5285219630fcf76
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r2
index 8632e6b708a0..690bc7a2492b 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f04d989dc1e250b3d5285219630fcf76
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r3
index 82c4d45a11f5..c1e8dbab8d01 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f04d989dc1e250b3d5285219630fcf76
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r4
deleted file mode 100644
index e1bfb1a75d56..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smartmon
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c95a0ff50b5bea989693d9e84c74872c
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r1
index 6ceb4f9fecd6..e5aa15a07737 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=47a3106a44266f954adc5594c84f8ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r2
index fcf56d0042c1..9baf571f95b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=25bccb090018c96da80c272ff68afc08
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r3
new file mode 100644
index 000000000000..68edeaeb436d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for smartmon
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=25bccb090018c96da80c272ff68afc08
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-9999 b/metadata/md5-cache/sec-policy/selinux-smartmon-9999
index a89490640227..576b30cdae26 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-9999
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=25bccb090018c96da80c272ff68afc08
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r1
deleted file mode 100644
index 8d4a9350d690..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smokeping
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d146b3cc337dd238e225366452c17588
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r2
deleted file mode 100644
index 3ad6b8ecbe52..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smokeping
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=58b991441122636d1483375af6441cc8
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r3
deleted file mode 100644
index 287525fd252d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smokeping
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=58b991441122636d1483375af6441cc8
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r4
deleted file mode 100644
index 3151e87f75a5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smokeping
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=58b991441122636d1483375af6441cc8
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r2
index c88967d567b4..ec6f8e273c2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=58b991441122636d1483375af6441cc8
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r3
index 431938789ebc..923ded5ab835 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=58b991441122636d1483375af6441cc8
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r4
deleted file mode 100644
index 66719cc7f5f5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smokeping
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d146b3cc337dd238e225366452c17588
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r1
index f0ab9a464ff0..d18462765c71 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8a35e10e6e7b52ded673145c9a3a355a
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r2
index 88bb3c932933..a514b618afcf 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8a551a15dbc3d346fae62ca0cc8d89a3
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r3
new file mode 100644
index 000000000000..f8d35de66c38
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for smokeping
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=8a551a15dbc3d346fae62ca0cc8d89a3
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-9999 b/metadata/md5-cache/sec-policy/selinux-smokeping-9999
index f834ff500bff..cbf8ca9d8989 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-9999
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8a551a15dbc3d346fae62ca0cc8d89a3
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r1
deleted file mode 100644
index 451cd990407b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snmp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=79d28c4e95467bfc8a3314f76f679544
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r2
deleted file mode 100644
index 7fcf81fb09b8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snmp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=99ebcf7f4e906050deb03592cca792d0
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r3
deleted file mode 100644
index 36b84363e8b0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snmp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=99ebcf7f4e906050deb03592cca792d0
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r4
deleted file mode 100644
index e134d06c8c00..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snmp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=99ebcf7f4e906050deb03592cca792d0
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r2
index 8f305e664e9c..17980992a3b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=99ebcf7f4e906050deb03592cca792d0
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r3
index ba7acdc27e33..69e97eb687ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=99ebcf7f4e906050deb03592cca792d0
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r4
deleted file mode 100644
index 2e58f8d208e5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snmp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=79d28c4e95467bfc8a3314f76f679544
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r1
index be2856b627ff..924ebe9f50fc 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=51d59da6b3cef8d65acafce89643d729
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r2
index 335b7736306f..a26b71f98564 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2e94ad0c17c333334fa04e5069d1d084
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r3
new file mode 100644
index 000000000000..5e4c00f7d441
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for snmp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2e94ad0c17c333334fa04e5069d1d084
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-9999 b/metadata/md5-cache/sec-policy/selinux-snmp-9999
index 3049a250529e..4a1f993f0d54 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2e94ad0c17c333334fa04e5069d1d084
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r1
deleted file mode 100644
index 7a3d4c719628..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snort
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=25f42475c88e2cc8237d77c41a4b0885
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r2
deleted file mode 100644
index dffdb4fee3e3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snort
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=944984c7f80c22bb0f3be55342583148
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r3
deleted file mode 100644
index 484b52197749..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snort
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=944984c7f80c22bb0f3be55342583148
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r4
deleted file mode 100644
index 9c66093515d2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snort
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=944984c7f80c22bb0f3be55342583148
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r2
index fb3788937270..e9e1e6a4bef2 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=944984c7f80c22bb0f3be55342583148
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r3
index 196162270378..be43097e39d0 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=944984c7f80c22bb0f3be55342583148
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r4
deleted file mode 100644
index dd9f4e919787..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snort
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=25f42475c88e2cc8237d77c41a4b0885
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r1
index 38057f5a411c..1e191df52c5c 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7ac3bf7df27f1adfeeee4078bbbfc33b
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r2
index f509c531d739..8ae4053830f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ed455a8df68c7b06b87d64aa74163938
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r3
new file mode 100644
index 000000000000..5fb4e3eabd8e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for snort
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ed455a8df68c7b06b87d64aa74163938
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-9999 b/metadata/md5-cache/sec-policy/selinux-snort-9999
index b82cb0680261..7877df57e48b 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-9999
+++ b/metadata/md5-cache/sec-policy/selinux-snort-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ed455a8df68c7b06b87d64aa74163938
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r1
deleted file mode 100644
index eb6ae4e829dd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for soundserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e4405675ef1343d585e6f9a754f09d5b
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r2
deleted file mode 100644
index 2b21829d6005..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for soundserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b7c2e24fe7e43aad63471f6c20bd42c1
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r3
deleted file mode 100644
index cd7047ca3f5d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for soundserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b7c2e24fe7e43aad63471f6c20bd42c1
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r4
deleted file mode 100644
index fe7c56b5bcbf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for soundserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b7c2e24fe7e43aad63471f6c20bd42c1
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r2
index 448d99b96667..eb51acdebacb 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b7c2e24fe7e43aad63471f6c20bd42c1
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r3
index b70b44b04992..e15be71d8bad 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b7c2e24fe7e43aad63471f6c20bd42c1
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r4
deleted file mode 100644
index ae7de2b32489..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for soundserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e4405675ef1343d585e6f9a754f09d5b
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r1
index dd0ebc803bce..2fb29a66612a 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=20cabb32606530bed7e7f96eff0d1492
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r2
index 68ac13bdc42f..42932e11738a 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=902baff11a6dd6500a08e1a9c02f3a5f
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r3
new file mode 100644
index 000000000000..1aed8cd5d970
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for soundserver
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=902baff11a6dd6500a08e1a9c02f3a5f
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-9999 b/metadata/md5-cache/sec-policy/selinux-soundserver-9999
index e98e2841b8a8..132b473e226b 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=902baff11a6dd6500a08e1a9c02f3a5f
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r1
deleted file mode 100644
index 118c167de927..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for spamassassin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee0bac5718ff95182d4a65a5555dd027
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r2
deleted file mode 100644
index e9a9ade5268b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for spamassassin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=445ad377da6952e04740b39a085371fd
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r3
deleted file mode 100644
index f3a362cd96c8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for spamassassin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=445ad377da6952e04740b39a085371fd
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r4
deleted file mode 100644
index c005c3ec0be5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for spamassassin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=445ad377da6952e04740b39a085371fd
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r2
index e539009c951f..ac3567de4db2 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=445ad377da6952e04740b39a085371fd
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r3
index ca94b7340885..ac8beba0482e 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=445ad377da6952e04740b39a085371fd
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r4
deleted file mode 100644
index c765401262a9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for spamassassin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=ee0bac5718ff95182d4a65a5555dd027
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r1
index 767351885752..2fb9d81df73e 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3b3d1207f6ade0896145e76bc4bba3f6
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r2
index 27a884010786..c53d158a91db 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e02095dc4ff4d5dd3826b57f90b05d11
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r3
new file mode 100644
index 000000000000..747bf4a51d89
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for spamassassin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=e02095dc4ff4d5dd3826b57f90b05d11
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-9999 b/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
index 4e46ce1f6d49..aca442a85293 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e02095dc4ff4d5dd3826b57f90b05d11
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r1
deleted file mode 100644
index a1c56ff61908..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=82677409e2c70a1a7f56d23ba7b8a2ee
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r2
deleted file mode 100644
index 69539c8247af..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7461b9e0a3cf24b2ce0ea42c6fc5e0f7
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r3
deleted file mode 100644
index f055e9ead40e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7461b9e0a3cf24b2ce0ea42c6fc5e0f7
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r4
deleted file mode 100644
index 26b9721d9713..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7461b9e0a3cf24b2ce0ea42c6fc5e0f7
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r2
index fcb9b891c570..9786765c3f2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7461b9e0a3cf24b2ce0ea42c6fc5e0f7
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r3
index d4751bad9375..cadf4b8b5223 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7461b9e0a3cf24b2ce0ea42c6fc5e0f7
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r4
deleted file mode 100644
index cd6032290bb8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=82677409e2c70a1a7f56d23ba7b8a2ee
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r1
index c6ea7f3db427..09ce3b8eda6c 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b38c2eed40c892fc8ae9dc89865c871e
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r2
index ba51e5683d1f..4f43f9bbf6d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cde969522459b9639437d6da9fb352db
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r3
new file mode 100644
index 000000000000..2c6887565881
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for speedtouch
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=cde969522459b9639437d6da9fb352db
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-9999 b/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
index 8ef6e59b0658..93337eab19c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cde969522459b9639437d6da9fb352db
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r1
deleted file mode 100644
index 4a56e8ebbc2d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for squid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a71134ce4b0702303117cc6fba6a222d
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r2
deleted file mode 100644
index feea1bbaa483..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for squid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=240154e90a0a93a45c72b4fcd1af7536
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r3
deleted file mode 100644
index 68ac5f9a61cf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for squid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=240154e90a0a93a45c72b4fcd1af7536
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r4
deleted file mode 100644
index b32a5892de92..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for squid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=240154e90a0a93a45c72b4fcd1af7536
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r2
index e67ba5dc3632..c27fbdbfc559 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=240154e90a0a93a45c72b4fcd1af7536
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r3
index afb6593f90e4..b2a9e680104a 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=240154e90a0a93a45c72b4fcd1af7536
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r4
deleted file mode 100644
index abe27447f24b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for squid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a71134ce4b0702303117cc6fba6a222d
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r1
index 51960541b276..89f807826f11 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0590c23cb4c3823ce2092029aac3fbeb
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r2
index 6f2fc0ba82a5..2f3c8e112c99 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2cd27caa1e4a9471fceb304894d5d69
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r3
new file mode 100644
index 000000000000..aa55076cf4a4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for squid
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c2cd27caa1e4a9471fceb304894d5d69
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-9999 b/metadata/md5-cache/sec-policy/selinux-squid-9999
index 286c3606981d..8747bb90b5a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-9999
+++ b/metadata/md5-cache/sec-policy/selinux-squid-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2cd27caa1e4a9471fceb304894d5d69
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r1
deleted file mode 100644
index b6dc07eb2af2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sssd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6ece8ae06136742e3d3ae9a816a8f761
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r2
deleted file mode 100644
index 150e2c93ea3a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sssd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f70d335c134b388f0c6ae9a40a24a1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r3
deleted file mode 100644
index 57618e5eb758..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sssd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f70d335c134b388f0c6ae9a40a24a1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r4
deleted file mode 100644
index 58ecd0e6229d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sssd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f70d335c134b388f0c6ae9a40a24a1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r2
index 84cf1e04c006..2098bac83b84 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f70d335c134b388f0c6ae9a40a24a1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r3
index 1dc9abfaf2a3..4c7f6ea27183 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f70d335c134b388f0c6ae9a40a24a1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r4
deleted file mode 100644
index 1e2fa091937d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sssd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6ece8ae06136742e3d3ae9a816a8f761
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r1
index 41b4019274b0..e0b9807654da 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e3e0908b01b9744f24706c14d1d8099f
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r2
index d008efc15743..77e1df81a8fc 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5935965151b1cf877b3ac2b924e99b72
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r3
new file mode 100644
index 000000000000..246b5bf4c3af
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sssd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=5935965151b1cf877b3ac2b924e99b72
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-9999 b/metadata/md5-cache/sec-policy/selinux-sssd-9999
index 5a3a2497abed..4507160759c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5935965151b1cf877b3ac2b924e99b72
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r1
deleted file mode 100644
index 5df9b48a0168..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for stunnel
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4992b1f7e2dce42dbf6b53e6323faab1
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r2
deleted file mode 100644
index 36f11a0084cf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for stunnel
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=563bcba7c74ccc2b27024eb1e61b1c3c
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r3
deleted file mode 100644
index 576b72f1369d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for stunnel
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=563bcba7c74ccc2b27024eb1e61b1c3c
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r4
deleted file mode 100644
index ae690971ab40..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for stunnel
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=563bcba7c74ccc2b27024eb1e61b1c3c
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r2
index 7b3a4b33a6e1..bec3d20d32b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=563bcba7c74ccc2b27024eb1e61b1c3c
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r3
index 7d955bb89965..ab3bfee4c00b 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=563bcba7c74ccc2b27024eb1e61b1c3c
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r4
deleted file mode 100644
index fca85dd1a876..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for stunnel
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4992b1f7e2dce42dbf6b53e6323faab1
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r1
index 166f1304fd21..25c81a394c63 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a5c031c66c1b14689f2b45ba32c8fb1b
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r2
index 8efcfb0facad..2143a36ad616 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c5b05354c7be95fa5568bff0366beddd
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r3
new file mode 100644
index 000000000000..c0d32a4b94c3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for stunnel
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c5b05354c7be95fa5568bff0366beddd
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-9999 b/metadata/md5-cache/sec-policy/selinux-stunnel-9999
index ade39fee9b57..ac75231c4429 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-9999
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c5b05354c7be95fa5568bff0366beddd
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r1
deleted file mode 100644
index 8dfd7ac72afd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for subsonic
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d93eed4d6c299bc9108e4e6159c53e22
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r2
deleted file mode 100644
index f8a488b92add..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for subsonic
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9c72eced34821c2a445ad00410726f15
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r3
deleted file mode 100644
index 19afd1d2de9d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for subsonic
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9c72eced34821c2a445ad00410726f15
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r4
deleted file mode 100644
index 286d4156994a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for subsonic
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9c72eced34821c2a445ad00410726f15
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r2
index d49037483a59..77160ed1be5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9c72eced34821c2a445ad00410726f15
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r3
index b78b1d9dd5df..996d0b336530 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9c72eced34821c2a445ad00410726f15
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r4
deleted file mode 100644
index 7c60afdeb98e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for subsonic
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d93eed4d6c299bc9108e4e6159c53e22
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r1
index e8c02c7a2edc..45e7b1297cc9 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f78706ef1c72abaa2b91a117e43eb3af
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r2
index b1767f702c5c..1d051b717d35 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2c9f3411e18ebe4203ad7d66e7188f89
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r3
new file mode 100644
index 000000000000..4b0d1eac8037
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for subsonic
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2c9f3411e18ebe4203ad7d66e7188f89
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-9999 b/metadata/md5-cache/sec-policy/selinux-subsonic-9999
index d634585be4b4..73c7aebb386d 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-9999
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2c9f3411e18ebe4203ad7d66e7188f89
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r1
deleted file mode 100644
index 031aa9a6ed2f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sudo
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8305ac300133721264635019c2187ede
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r2
deleted file mode 100644
index 08f1650f5b43..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sudo
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b20f6a398f2e032144ba410fec1eb7f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r3
deleted file mode 100644
index 7eec62fda995..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sudo
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b20f6a398f2e032144ba410fec1eb7f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r4
deleted file mode 100644
index 5d6d269183ff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sudo
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b20f6a398f2e032144ba410fec1eb7f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r2
index 6446b7912a1c..f0f5abf8a17d 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b20f6a398f2e032144ba410fec1eb7f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r3
index 23ac31f8d27d..c7482df5e789 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b20f6a398f2e032144ba410fec1eb7f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r4
deleted file mode 100644
index 334b298b2d6e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sudo
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8305ac300133721264635019c2187ede
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r1
index 16041859a636..83c741801617 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=18bb1566bdf6283862bb40c40974639c
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r2
index 4c6ad00079bf..2941c0aad35a 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=beb4da03b2f538dd0ec6e92d4d1197e9
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r3
new file mode 100644
index 000000000000..51005fba2369
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sudo
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=beb4da03b2f538dd0ec6e92d4d1197e9
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-9999 b/metadata/md5-cache/sec-policy/selinux-sudo-9999
index 5dc0f2699f9d..48884353b13f 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=beb4da03b2f538dd0ec6e92d4d1197e9
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r1
deleted file mode 100644
index d80f04a1d649..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sxid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=73ccbd47311c67fa3b5dc35a58a35b38
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r2
deleted file mode 100644
index 3bb990c1568d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sxid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=210cfcd5798d4a21af8c2827c3438b10
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r3
deleted file mode 100644
index f3197cfe747b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sxid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=210cfcd5798d4a21af8c2827c3438b10
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r4
deleted file mode 100644
index d108bf357b21..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sxid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=210cfcd5798d4a21af8c2827c3438b10
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r2
index 5ead63a8d6ca..e8f06db767d7 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=210cfcd5798d4a21af8c2827c3438b10
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r3
index f79684e3a211..381b393ef00d 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=210cfcd5798d4a21af8c2827c3438b10
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r4
deleted file mode 100644
index 1851992d8baa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sxid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=73ccbd47311c67fa3b5dc35a58a35b38
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r1
index 2c441851a6d1..7fbb8f1c7e56 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2aafb61b7ab53c405155fecd275cdd0c
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r2
index 35432440924a..af20f05b25d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4e7efacbeb22fb75f55e26b99059877c
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r3
new file mode 100644
index 000000000000..d284d4ebd1b3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sxid
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=4e7efacbeb22fb75f55e26b99059877c
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-9999 b/metadata/md5-cache/sec-policy/selinux-sxid-9999
index 1ca4af3e3918..f73f5d99846a 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4e7efacbeb22fb75f55e26b99059877c
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r1
deleted file mode 100644
index 566f550079ee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for syncthing
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f7cec412facf37b63353104e67e919c9
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r2
deleted file mode 100644
index 5abdd9cd57e0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for syncthing
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6457fb0b0120094fc3188b161eabc82b
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r3
deleted file mode 100644
index c40f021544b1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for syncthing
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6457fb0b0120094fc3188b161eabc82b
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r4
deleted file mode 100644
index 3b648b621ee8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for syncthing
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6457fb0b0120094fc3188b161eabc82b
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r2
index f4ed5cebf705..9bde2997bd82 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6457fb0b0120094fc3188b161eabc82b
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r3
index 8dd033489afb..b8ab9e977657 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6457fb0b0120094fc3188b161eabc82b
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r4
deleted file mode 100644
index ceae72b9b5d6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for syncthing
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f7cec412facf37b63353104e67e919c9
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r1
index fc35a6acbf43..b76f5cc36cf9 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bedba4baa12a60c8e9ee3ae628593a45
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r2
index 1029a4583d73..a69f93ff1bc7 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=05dc0dd1b4e6466759ffae74a6f9b957
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r3
new file mode 100644
index 000000000000..c17d27dbc367
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for syncthing
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=05dc0dd1b4e6466759ffae74a6f9b957
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-9999 b/metadata/md5-cache/sec-policy/selinux-syncthing-9999
index 443c28095407..68396a926e3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-9999
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=05dc0dd1b4e6466759ffae74a6f9b957
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r1
deleted file mode 100644
index cc6e55824c1c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sysstat
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a1e7c8f95625754f06e043ac39bd780b
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r2
deleted file mode 100644
index 17dbf13b194d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sysstat
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=02b251426fb84968f2dd5e71d4a58ba4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r3
deleted file mode 100644
index ef4414751107..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sysstat
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=02b251426fb84968f2dd5e71d4a58ba4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r4
deleted file mode 100644
index b91dc408e56c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sysstat
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=02b251426fb84968f2dd5e71d4a58ba4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r2
index 3e9a33b88325..30ef5298a2b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=02b251426fb84968f2dd5e71d4a58ba4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r3
index ec9eb71c32d8..9488990c960f 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=02b251426fb84968f2dd5e71d4a58ba4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r4
deleted file mode 100644
index 475e8faef69c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sysstat
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a1e7c8f95625754f06e043ac39bd780b
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r1
index 346debd145a4..e2b8b285e09a 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3205a54af6cb642b29b05b1f5a694fcb
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r2
index 085cb216a90f..6ea7f1f80b13 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8f0f8634a158581163550c4978f51265
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r3
new file mode 100644
index 000000000000..094eb4dde41c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sysstat
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=8f0f8634a158581163550c4978f51265
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-9999 b/metadata/md5-cache/sec-policy/selinux-sysstat-9999
index d011068e2680..59d0ec406e78 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8f0f8634a158581163550c4978f51265
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r1
deleted file mode 100644
index da388b8b61ab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tboot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e68999c9577050165f67807e31c849e9
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r2
deleted file mode 100644
index b88fd3e421d8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tboot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7ed5397bbbedacc83ac28d052207799c
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r3
deleted file mode 100644
index c630e03a47db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tboot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7ed5397bbbedacc83ac28d052207799c
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r4
deleted file mode 100644
index bd05d3e5ac9f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tboot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7ed5397bbbedacc83ac28d052207799c
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r2
index 6c0ff624116a..e84d68f86220 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7ed5397bbbedacc83ac28d052207799c
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r3
index 9f081c0b6906..1af66fe9d24c 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7ed5397bbbedacc83ac28d052207799c
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r4
deleted file mode 100644
index c37c4b32b57b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tboot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e68999c9577050165f67807e31c849e9
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r1
index 48e5fb9911c5..87104552eec3 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8ad75ae42a5232b72aaedd0c849260a3
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r2
index 1d8b6dd7dac0..0a429ba385b9 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2f98e85a1e1b995a79e49411f81f22b
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r3
new file mode 100644
index 000000000000..deb69a994ada
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tboot
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c2f98e85a1e1b995a79e49411f81f22b
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-9999 b/metadata/md5-cache/sec-policy/selinux-tboot-9999
index 9bf4ed2da0a7..c69bc371872a 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c2f98e85a1e1b995a79e49411f81f22b
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r1
deleted file mode 100644
index d4dd93e82471..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=93280fc42ca20d41f99c009780040e21
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r2
deleted file mode 100644
index 9ae2666c99d1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66f63b8343c30fdf6d848710cb5c5ec8
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r3
deleted file mode 100644
index 0ae018391c3d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66f63b8343c30fdf6d848710cb5c5ec8
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r4
deleted file mode 100644
index d7976c000b3c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=66f63b8343c30fdf6d848710cb5c5ec8
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r2
index 233ed4110826..bf8fb4ce32f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=66f63b8343c30fdf6d848710cb5c5ec8
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r3
index 91b49841ce9b..4e0a1f88bded 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=66f63b8343c30fdf6d848710cb5c5ec8
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r4
deleted file mode 100644
index 41d0f96f6c48..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=93280fc42ca20d41f99c009780040e21
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r1
index 8fdda8d6e30a..8a0fdcb6481a 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=10435c54e4cd1198d1b058498e0b213d
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r2
index 3e22b9594d46..29910291c378 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2087cde4172974fa87b347f6803c1f7e
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r3
new file mode 100644
index 000000000000..6595fb086ccb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tcpd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2087cde4172974fa87b347f6803c1f7e
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-9999 b/metadata/md5-cache/sec-policy/selinux-tcpd-9999
index c840fe08fdc6..58f66a3dc3e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2087cde4172974fa87b347f6803c1f7e
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r1
deleted file mode 100644
index 9ef3afcba7a1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=dcb17a522fc4bbfa75ca539f069a9098
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r2
deleted file mode 100644
index 2d0916add9c1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=db518a2816de59e4254144c41ca5efe1
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r3
deleted file mode 100644
index a4016a0e2ab3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=db518a2816de59e4254144c41ca5efe1
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r4
deleted file mode 100644
index 18a2e8f1d26e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=db518a2816de59e4254144c41ca5efe1
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r2
index ab93fc5b9e81..48cd2dcf7e93 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=db518a2816de59e4254144c41ca5efe1
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r3
index e9e72ec84176..f747ed6ae6e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=db518a2816de59e4254144c41ca5efe1
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r4
deleted file mode 100644
index d27b93ea7ab8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=dcb17a522fc4bbfa75ca539f069a9098
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r1
index 99df4445196c..d4519042c873 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=04b269b8d30d8b31105717c0e4e496ee
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r2
index 74c74ec90148..ebe93afd148b 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=52116ede59c4a8ce2f56086a22cdb3e9
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r3
new file mode 100644
index 000000000000..6b875a0bf487
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tcsd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=52116ede59c4a8ce2f56086a22cdb3e9
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-9999 b/metadata/md5-cache/sec-policy/selinux-tcsd-9999
index 1c4071355d44..bde9f752e843 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=52116ede59c4a8ce2f56086a22cdb3e9
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r1
deleted file mode 100644
index b5b7de96304c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for telnet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e73fc0580c9df06114f3ee7473a2adc2
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r2
deleted file mode 100644
index a5c1a5435c28..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for telnet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e5cf5ef22afadba7fff618898a57e68f
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r3
deleted file mode 100644
index c2688a86cd08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for telnet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e5cf5ef22afadba7fff618898a57e68f
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r4
deleted file mode 100644
index 7233a9da9905..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for telnet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e5cf5ef22afadba7fff618898a57e68f
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r2
index 7abcee09bef8..b21b6da9fb30 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e5cf5ef22afadba7fff618898a57e68f
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r3
index c17a6ddb8b82..73e9b3be76ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e5cf5ef22afadba7fff618898a57e68f
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r4
deleted file mode 100644
index f8165e496061..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for telnet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e73fc0580c9df06114f3ee7473a2adc2
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r1
index 9c151ba5ae3d..acb49cf32633 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bb0658ff7657a8e92ee3125edf7642eb
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r2
index 56e932ab2f1e..a7def6ee8cc6 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ec02cf15526d3ad7ceb948a7b01abfb
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r3
new file mode 100644
index 000000000000..fa0ae726fe29
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for telnet
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=2ec02cf15526d3ad7ceb948a7b01abfb
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-9999 b/metadata/md5-cache/sec-policy/selinux-telnet-9999
index 273f07db6dd6..6ef76ee559b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ec02cf15526d3ad7ceb948a7b01abfb
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r1
deleted file mode 100644
index 6e96226ce69e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a19887a6122c182b82e7599f6237ad35
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r2
deleted file mode 100644
index efcb016a1d03..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e03ab91ad8bbc7b389a5804f093bd7a4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r3
deleted file mode 100644
index 3de411a386a6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e03ab91ad8bbc7b389a5804f093bd7a4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r4
deleted file mode 100644
index ee1622184a33..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e03ab91ad8bbc7b389a5804f093bd7a4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r2
index b9efcb69458c..89783c2383df 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e03ab91ad8bbc7b389a5804f093bd7a4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r3
index 2dff7c80cdbd..49ec61af3b29 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e03ab91ad8bbc7b389a5804f093bd7a4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r4
deleted file mode 100644
index 5d1a3f02b593..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a19887a6122c182b82e7599f6237ad35
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r1
index eb734cfebb7d..86e8bff05583 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1ae17d445e874adc210a72f82080bed4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r2
index de6dcdaa0101..a5cc575caf56 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=36968fefd7636d95db21fef3f31a2fa1
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r3
new file mode 100644
index 000000000000..4aad90ed0761
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tftp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=36968fefd7636d95db21fef3f31a2fa1
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-9999 b/metadata/md5-cache/sec-policy/selinux-tftp-9999
index 13772ce8be09..a5ffcc811770 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=36968fefd7636d95db21fef3f31a2fa1
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r1
deleted file mode 100644
index 4dd1f5c11e18..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tgtd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b1dd515bd435556abe09c87b4394b383
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r2
deleted file mode 100644
index f504ac44ab12..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tgtd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=963964622483f98eb753ed3305bbcb96
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r3
deleted file mode 100644
index 5eb198cfee96..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tgtd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=963964622483f98eb753ed3305bbcb96
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r4
deleted file mode 100644
index 7f97c55b8aa3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tgtd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=963964622483f98eb753ed3305bbcb96
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r2
index 0d98f3e2a3bf..2f663b3a89e0 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=963964622483f98eb753ed3305bbcb96
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r3
index 92badb645481..2644ad68ab43 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=963964622483f98eb753ed3305bbcb96
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r4
deleted file mode 100644
index fec48548d0e0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tgtd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b1dd515bd435556abe09c87b4394b383
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r1
index c337855d29fa..2805d16be7e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bfb1bc97f0fd872e3ae809d5a11005f6
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r2
index 81119fb92ba5..daebf2af5684 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6261fc6849868d691f74a74625aeae00
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r3
new file mode 100644
index 000000000000..dc39a7ef7992
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tgtd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=6261fc6849868d691f74a74625aeae00
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-9999 b/metadata/md5-cache/sec-policy/selinux-tgtd-9999
index c4cf897d8962..9a6da07c87bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6261fc6849868d691f74a74625aeae00
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r1
deleted file mode 100644
index 698219208b0d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for thunderbird
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1c3d462479daa66a1f11a64c116120d9
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r2
deleted file mode 100644
index e2de0f473401..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for thunderbird
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4b0d5e21bb2a069fcc1c8aeaa2a9492e
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r3
deleted file mode 100644
index 1268a5a94b34..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for thunderbird
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4b0d5e21bb2a069fcc1c8aeaa2a9492e
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r4
deleted file mode 100644
index 2fa8a6c77f77..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for thunderbird
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4b0d5e21bb2a069fcc1c8aeaa2a9492e
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r2
index 20a6bc2e03b2..c26c81f99b77 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4b0d5e21bb2a069fcc1c8aeaa2a9492e
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r3
index de1045aa147d..b17b16b10345 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4b0d5e21bb2a069fcc1c8aeaa2a9492e
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r4
deleted file mode 100644
index c58bc08cdfa4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for thunderbird
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1c3d462479daa66a1f11a64c116120d9
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r1
index fbcc442f346e..0560c99071aa 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=357d98672948b971e2f2ec27cfb493e3
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r2
index d1e5050ddc34..e0154ce12fdb 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8be24b813a34de4bbf8953a267306d3f
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r3
new file mode 100644
index 000000000000..e9737b41dacb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for thunderbird
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=8be24b813a34de4bbf8953a267306d3f
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-9999 b/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
index 84ed4ad50608..b677a292d853 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8be24b813a34de4bbf8953a267306d3f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r1
deleted file mode 100644
index 1a374b9c0ec6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for timidity
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5d7bde800fa3812b9bc590c76f867ed5
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r2
deleted file mode 100644
index daef7d1f9a94..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for timidity
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c49564453769c96edf12270ba74daa6f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r3
deleted file mode 100644
index 8a5b00ed203b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for timidity
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c49564453769c96edf12270ba74daa6f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r4
deleted file mode 100644
index 07935799eac1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for timidity
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c49564453769c96edf12270ba74daa6f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r2
index ddfeab0af6d0..b52c6f7366f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c49564453769c96edf12270ba74daa6f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r3
index 32397584b38f..76e02d740778 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c49564453769c96edf12270ba74daa6f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r4
deleted file mode 100644
index 1d8a8901acba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for timidity
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5d7bde800fa3812b9bc590c76f867ed5
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r1
index 90ac2333fb6e..ea227fd5bae3 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a133d2823e517dcb26e6b8a2c9ec8dbe
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r2
index 0bf03e875aca..a55cf9f6dfa2 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=14d6017b234b823f9aef4293fc1c24e4
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r3
new file mode 100644
index 000000000000..0e3553e3cc89
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for timidity
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=14d6017b234b823f9aef4293fc1c24e4
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-9999 b/metadata/md5-cache/sec-policy/selinux-timidity-9999
index 6fad6c77ae16..b88e9f8b27fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-9999
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=14d6017b234b823f9aef4293fc1c24e4
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r1
deleted file mode 100644
index 87c1359164f1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tmpreaper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6e4a224726f92cff8865279d5fb4b05f
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r2
deleted file mode 100644
index 407db1beaf9b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tmpreaper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e3229da878ec8cfd613de3ccc5a57e70
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r3
deleted file mode 100644
index c79ac1d548c4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tmpreaper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e3229da878ec8cfd613de3ccc5a57e70
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r4
deleted file mode 100644
index 8f011d0fb885..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tmpreaper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e3229da878ec8cfd613de3ccc5a57e70
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r2
index 9f506e465a66..713e8a9b24ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e3229da878ec8cfd613de3ccc5a57e70
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r3
index 8431f02b05cd..7b3112b7cc1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e3229da878ec8cfd613de3ccc5a57e70
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r4
deleted file mode 100644
index 7f3651e81e97..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tmpreaper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6e4a224726f92cff8865279d5fb4b05f
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r1
index 08d64ea2c6d4..1ce3b7941f40 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5b8c31a24289068c1822903bf63e79e2
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r2
index 38802104cf6b..aa05d79f8025 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e42c742c78a43b8a4c3f4a0298ca06ce
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r3
new file mode 100644
index 000000000000..1e1abeb38f4b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tmpreaper
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=e42c742c78a43b8a4c3f4a0298ca06ce
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
index 4916fc09030b..618157c47012 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e42c742c78a43b8a4c3f4a0298ca06ce
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r1
deleted file mode 100644
index df07ef17cae7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c0c7a17900a6ad6fac9a833bfa2bad2c
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r2
deleted file mode 100644
index 1d6428186b5c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=af3a7a4e370278711c9f13de679d80dc
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r3
deleted file mode 100644
index 9bc3e3b5781f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=af3a7a4e370278711c9f13de679d80dc
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r4
deleted file mode 100644
index 76c8cd8b60fc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=af3a7a4e370278711c9f13de679d80dc
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r2
index ad5b44e533ac..5c6fc47ce1e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=af3a7a4e370278711c9f13de679d80dc
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r3
index 70ebdf89fb05..3bee47935896 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=af3a7a4e370278711c9f13de679d80dc
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r4
deleted file mode 100644
index e6cd2e77ce4f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c0c7a17900a6ad6fac9a833bfa2bad2c
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r1
index c849094704e4..26b0f3ff6853 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=68e050c308ef42de5f086b23fee4b428
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r2
index c2a73811d92c..dee8ecc2bb06 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b4b6ac45072bbcfbd8963ee243df78f1
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r3
new file mode 100644
index 000000000000..6cecc7b04570
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tor
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b4b6ac45072bbcfbd8963ee243df78f1
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-9999 b/metadata/md5-cache/sec-policy/selinux-tor-9999
index c3645e78ad00..2f967927f346 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b4b6ac45072bbcfbd8963ee243df78f1
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r1
deleted file mode 100644
index 5de12f353b6e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tripwire
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=75678fc80c769ec296e56937be982067
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r2
deleted file mode 100644
index 4d594c866604..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tripwire
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2dfedb66de6b577f1534ec1f66a58ff3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r3
deleted file mode 100644
index be21fb3c749d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tripwire
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2dfedb66de6b577f1534ec1f66a58ff3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r4
deleted file mode 100644
index 830baea4895a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tripwire
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2dfedb66de6b577f1534ec1f66a58ff3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r2
index 7fb89a4fea29..fc5794d7586d 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2dfedb66de6b577f1534ec1f66a58ff3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r3
index f8ce16e2b9a6..d970779b647c 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2dfedb66de6b577f1534ec1f66a58ff3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r4
deleted file mode 100644
index 8b69a59d948a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tripwire
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=75678fc80c769ec296e56937be982067
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r1
index 3b296687aef9..1a8e73304332 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=018fbe3d8d2607d26775feacc5d5d9b1
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r2
index 6cee578d75aa..c01fae6c8d55 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7fa0607e948b381c25cd0133f31fb053
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r3
new file mode 100644
index 000000000000..924d73aaed40
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tripwire
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=7fa0607e948b381c25cd0133f31fb053
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-9999 b/metadata/md5-cache/sec-policy/selinux-tripwire-9999
index 2650d46ce911..5444f8163531 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7fa0607e948b381c25cd0133f31fb053
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r1
deleted file mode 100644
index 7f9ae063fc09..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ucspitcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=686f16957fca2d4bd3cfb07d80b2e108
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r2
deleted file mode 100644
index 701c3d92490f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ucspitcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6777ad927727b9726bacddd38bcb85d6
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r3
deleted file mode 100644
index 2ecfc4928a68..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ucspitcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6777ad927727b9726bacddd38bcb85d6
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r4
deleted file mode 100644
index bb80307b33e3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ucspitcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=6777ad927727b9726bacddd38bcb85d6
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r2
index 16b0414e44d4..0336c7d6c039 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6777ad927727b9726bacddd38bcb85d6
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r3
index 5619b15f0229..3dc4d580e35b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=6777ad927727b9726bacddd38bcb85d6
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r4
deleted file mode 100644
index a87cd7cb626c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ucspitcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=686f16957fca2d4bd3cfb07d80b2e108
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r1
index dc1662eb0ba4..0ee2ec34027e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=99f83b452ca6e1b206df89f2042d10e7
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r2
index 17efc84f48ca..2aaab491eb8a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3d98b16ebbda94b80367f18637b6095f
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r3
new file mode 100644
index 000000000000..0bac6a1d43ee
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ucspitcp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3d98b16ebbda94b80367f18637b6095f
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
index 65af8a7fdf62..c9aa44245b5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3d98b16ebbda94b80367f18637b6095f
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r1
deleted file mode 100644
index 584cf72f6068..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ulogd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=86b083b99bcb36d29c99640e32cf9f4b
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r2
deleted file mode 100644
index 617a8e549de3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ulogd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1b19285eb02dffdf6ad57a9236b0f953
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r3
deleted file mode 100644
index f9669908e324..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ulogd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1b19285eb02dffdf6ad57a9236b0f953
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r4
deleted file mode 100644
index fffafc71476d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ulogd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=1b19285eb02dffdf6ad57a9236b0f953
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r2
index 0d9fd6a45a60..de18387ff192 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1b19285eb02dffdf6ad57a9236b0f953
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r3
index c1256c491c74..4ae7bffcd307 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1b19285eb02dffdf6ad57a9236b0f953
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r4
deleted file mode 100644
index b315cbc1b66b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ulogd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=86b083b99bcb36d29c99640e32cf9f4b
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r1
index 3a2b3668d404..510621c35f8c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=60d43ed612fe9148797b12afc5e1eb97
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r2
index 5dd6b3abbe36..9b2016004c8d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3374a3ab5963540511a285b2ed1bc7e6
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r3
new file mode 100644
index 000000000000..72a806ac343a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ulogd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3374a3ab5963540511a285b2ed1bc7e6
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-9999 b/metadata/md5-cache/sec-policy/selinux-ulogd-9999
index aa8493738ccd..093c6c5b78f8 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3374a3ab5963540511a285b2ed1bc7e6
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r1
deleted file mode 100644
index 402b4759651a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uml
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=de1567b91dab27acfc7c700ebfd00eeb
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r2
deleted file mode 100644
index 921b264a41c5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uml
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=78fa17ad1c34669d3197052202a640ca
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r3
deleted file mode 100644
index 4ea10300ecef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uml
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=78fa17ad1c34669d3197052202a640ca
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r4
deleted file mode 100644
index 4b0f8d9839dd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uml
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=78fa17ad1c34669d3197052202a640ca
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r2
index 9e485b104493..ba19b536be65 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=78fa17ad1c34669d3197052202a640ca
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r3
index 2abe32d420d1..74ef46f07638 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=78fa17ad1c34669d3197052202a640ca
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r4
deleted file mode 100644
index 4a4f5dcaa846..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uml
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=de1567b91dab27acfc7c700ebfd00eeb
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r1
index 88b5f94fc147..4ea98e705797 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8e88deeb20f728a12d627a2043fc4616
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r2
index 8f4ee31bab34..92b1db161760 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a08d83d838bf3032c07e9cc3c924eb1c
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r3
new file mode 100644
index 000000000000..78cf81820cc4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uml
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a08d83d838bf3032c07e9cc3c924eb1c
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-9999 b/metadata/md5-cache/sec-policy/selinux-uml-9999
index 3f994eb22484..25f2caa65779 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uml-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a08d83d838bf3032c07e9cc3c924eb1c
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r1
deleted file mode 100644
index e2fb1362d106..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for unconfined
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cef27e967e92949fa04ada84b96b45e4
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r2
deleted file mode 100644
index fdac74834260..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for unconfined
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=992f8e4e22fa14ba11e787ef857176e9
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r3
deleted file mode 100644
index 07a872a1830f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for unconfined
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=992f8e4e22fa14ba11e787ef857176e9
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r4
deleted file mode 100644
index b48e5e61d221..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for unconfined
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=992f8e4e22fa14ba11e787ef857176e9
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r2
index af9d82f474b8..a2ca839f55be 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=992f8e4e22fa14ba11e787ef857176e9
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r3
index c49fb11ce57e..1c9ddf24fab0 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=992f8e4e22fa14ba11e787ef857176e9
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r4
deleted file mode 100644
index 7f38918c534a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for unconfined
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=cef27e967e92949fa04ada84b96b45e4
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r1
index be4f0059a56e..975c67c0f8e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f8eb09f61cf6bc06f0b83fa89d089480
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r2
index 18cbf7860d38..f245ac03e7f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d16eac578d8fa4a8aef39ad926d8d18a
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r3
new file mode 100644
index 000000000000..1e87cf229d6e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for unconfined
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d16eac578d8fa4a8aef39ad926d8d18a
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-9999 b/metadata/md5-cache/sec-policy/selinux-unconfined-9999
index 7f2e19df27b8..a77d4a47c014 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-9999
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d16eac578d8fa4a8aef39ad926d8d18a
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r1
deleted file mode 100644
index 111863a75da1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uptime
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fa54c3c7ab73fa70673611b99ade1a30
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r2
deleted file mode 100644
index 866e83fe7b8f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uptime
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=30026f5ae64f96e4af896bcb8cc23973
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r3
deleted file mode 100644
index 729ef136c16d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uptime
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=30026f5ae64f96e4af896bcb8cc23973
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r4
deleted file mode 100644
index d92ef502e06d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uptime
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=30026f5ae64f96e4af896bcb8cc23973
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r2
index 623bb4967ba7..0076ba83cc36 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=30026f5ae64f96e4af896bcb8cc23973
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r3
index 3feb5c41ba21..e76890627aad 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=30026f5ae64f96e4af896bcb8cc23973
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r4
deleted file mode 100644
index 6fa0b37678e4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uptime
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fa54c3c7ab73fa70673611b99ade1a30
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r1
index db0cce13daeb..f4822c29ba14 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9e8470ad91c80390d6ac1da86a186b49
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r2
index afbfafabb230..b8d5ae0fa91e 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a2fd007f14764d281189fb6eecd8e9f0
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r3
new file mode 100644
index 000000000000..f82a0de88d5c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uptime
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=a2fd007f14764d281189fb6eecd8e9f0
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-9999 b/metadata/md5-cache/sec-policy/selinux-uptime-9999
index 04b22a16360c..b3bffcdb804c 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a2fd007f14764d281189fb6eecd8e9f0
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r1
deleted file mode 100644
index 80dde0f19543..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for usbmuxd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f51b7d5ed8c62d272ad7f16373d7291e
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r2
deleted file mode 100644
index 38ce5aacecc2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for usbmuxd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=33996a6f754d3e6f9154aa1b685cb2ac
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r3
deleted file mode 100644
index 4ddd758267f7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for usbmuxd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=33996a6f754d3e6f9154aa1b685cb2ac
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r4
deleted file mode 100644
index bf9feefb03ea..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for usbmuxd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=33996a6f754d3e6f9154aa1b685cb2ac
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r2
index 296676c2eb10..ccd93b27e3cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=33996a6f754d3e6f9154aa1b685cb2ac
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r3
index 1285720cd85b..e10b3620fd9b 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=33996a6f754d3e6f9154aa1b685cb2ac
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r4
deleted file mode 100644
index 13ece8991789..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for usbmuxd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f51b7d5ed8c62d272ad7f16373d7291e
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r1
index 8654b968b36d..0ac22cf394a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a49bac21a65b4b19d8e35ac85ae9ce06
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r2
index 65b82cbe141d..a7684c554877 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=195b1d757507ef7aa6dacb494fcc3533
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r3
new file mode 100644
index 000000000000..2d2d76fa4624
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for usbmuxd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=195b1d757507ef7aa6dacb494fcc3533
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
index 4aa278cd4802..18aee2e17e09 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=195b1d757507ef7aa6dacb494fcc3533
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r1
deleted file mode 100644
index a5d922a1c675..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uucp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=aaf8f574184f4f2b107cf419e6cddd3e
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r2
deleted file mode 100644
index f9ce16486d5f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uucp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=723669456e171dd75ba53e31f8810924
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r3
deleted file mode 100644
index fc2711f75126..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uucp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=723669456e171dd75ba53e31f8810924
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r4
deleted file mode 100644
index 9241f47cb7f1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uucp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=723669456e171dd75ba53e31f8810924
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r2
index 87eafb5f6f29..4b76930e5af8 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=723669456e171dd75ba53e31f8810924
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r3
index f463c76e34e3..b556c905e27e 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=723669456e171dd75ba53e31f8810924
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r4
deleted file mode 100644
index a45ddede2d06..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uucp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=aaf8f574184f4f2b107cf419e6cddd3e
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r1
index 71031a61783b..94553858ab3a 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a5ea22be37a69fcecdcb67f75579a5eb
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r2
index b544c3a0eb19..166cea73b2b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1cae4a8786c5515b523907d01f41f126
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r3
new file mode 100644
index 000000000000..1ad658983a3a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uucp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1cae4a8786c5515b523907d01f41f126
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-9999 b/metadata/md5-cache/sec-policy/selinux-uucp-9999
index 2b9476906be0..db6df1cec09e 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1cae4a8786c5515b523907d01f41f126
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r1
deleted file mode 100644
index 961b3f971b0f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uwimap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a94f6a3c5c4789e6b953e7252274e27a
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r2
deleted file mode 100644
index 43b4042d16f3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uwimap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=45b039b06f29fc51361bf0cb42a70727
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r3
deleted file mode 100644
index 8f4cb81d170c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uwimap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=45b039b06f29fc51361bf0cb42a70727
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r4
deleted file mode 100644
index f618b24d8bb6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uwimap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=45b039b06f29fc51361bf0cb42a70727
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r2
index 25d57ebb6331..bfae01008f98 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=45b039b06f29fc51361bf0cb42a70727
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r3
index 691d62a0571c..36e00a379ff8 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=45b039b06f29fc51361bf0cb42a70727
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r4
deleted file mode 100644
index 10a43650db9a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uwimap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a94f6a3c5c4789e6b953e7252274e27a
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r1
index a4d70798544f..be610fe86ba7 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2d5fbc5d19a4dc7c01685a470c8761a8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r2
index 54d6f2be63d7..91ea05a956bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=48f8fd888b19c4504a48875f25791d8c
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r3
new file mode 100644
index 000000000000..ad0a2846a95b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uwimap
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=48f8fd888b19c4504a48875f25791d8c
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-9999 b/metadata/md5-cache/sec-policy/selinux-uwimap-9999
index 57e2ace8b828..33d816ba18bd 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=48f8fd888b19c4504a48875f25791d8c
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r1
deleted file mode 100644
index 4c82f6032dac..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uWSGI
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c7b6b44c2e77109a8192cb0f5a20b5b8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r2
deleted file mode 100644
index 2a4dbdf3ccac..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uWSGI
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0e9d87148e12b8f8a701f2c39a54a57
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r3
deleted file mode 100644
index 59c17396b46b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uWSGI
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0e9d87148e12b8f8a701f2c39a54a57
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r4
deleted file mode 100644
index d960817eec55..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uWSGI
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=e0e9d87148e12b8f8a701f2c39a54a57
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r2
index 9456aee73b6f..3d335a2b5fa4 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e0e9d87148e12b8f8a701f2c39a54a57
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r3
index f94677436dc6..32cc44513bd4 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e0e9d87148e12b8f8a701f2c39a54a57
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r4
deleted file mode 100644
index 02da9bba1d93..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uWSGI
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c7b6b44c2e77109a8192cb0f5a20b5b8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r1
index 234fabf9e929..1a6133793ee1 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=338efaf879a5143a696bfef6d465cfb9
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r2
index 2063fe184e59..30181a7c6fbc 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=faeda3a0505e659893d03f30a168acb8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r3
new file mode 100644
index 000000000000..5a67795fe9b2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uWSGI
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=faeda3a0505e659893d03f30a168acb8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-9999 b/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
index 67c104933c39..100e7bf09cf1 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=faeda3a0505e659893d03f30a168acb8
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r1
deleted file mode 100644
index 237bc8caa5f4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for varnishd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8c3c578fa03f789b7e5b26d36f3ab025
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r2
deleted file mode 100644
index 35b93b069abf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for varnishd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fe15cab3d68b23d184753ca5c6b0e681
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r3
deleted file mode 100644
index 86f9cf5b691f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for varnishd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fe15cab3d68b23d184753ca5c6b0e681
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r4
deleted file mode 100644
index d2e31debcd6a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for varnishd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fe15cab3d68b23d184753ca5c6b0e681
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r2
index 0e3f6f72da43..abbe7279c9a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fe15cab3d68b23d184753ca5c6b0e681
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r3
index 43cd1eab494a..3928b40e6880 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fe15cab3d68b23d184753ca5c6b0e681
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r4
deleted file mode 100644
index de510619ca71..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for varnishd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=8c3c578fa03f789b7e5b26d36f3ab025
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r1
index 18d1376814d9..3247464f48b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8065ea09e1c55f37cfbde9133e826afe
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r2
index fcf70e2767cc..fa6636026d05 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f56703b25180d75c53cde6644a55c17e
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r3
new file mode 100644
index 000000000000..38c8d7588c7c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for varnishd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f56703b25180d75c53cde6644a55c17e
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-9999 b/metadata/md5-cache/sec-policy/selinux-varnishd-9999
index 55b883ebeb9d..974ddaaf713b 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f56703b25180d75c53cde6644a55c17e
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r1
deleted file mode 100644
index cf60f7a779be..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vbetool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b25eec235a966ee96cd953ae91dfc3dc
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r2
deleted file mode 100644
index 4b129fb75d47..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vbetool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4f57ec4ad3f4916d71c1d112d30b0878
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r3
deleted file mode 100644
index 476baf5f58dc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vbetool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4f57ec4ad3f4916d71c1d112d30b0878
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r4
deleted file mode 100644
index 77020f635fc3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vbetool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4f57ec4ad3f4916d71c1d112d30b0878
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r2
index f84741fd4c6c..4063b3bf326b 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4f57ec4ad3f4916d71c1d112d30b0878
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r3
index 5e0136208931..67586263dbb0 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=4f57ec4ad3f4916d71c1d112d30b0878
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r4
deleted file mode 100644
index b1f2265b7fb2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vbetool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b25eec235a966ee96cd953ae91dfc3dc
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r1
index ab882779921a..d7a8f8917c13 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=80c3eec7180096c0a960edd106aa3a76
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r2
index ff16e4003594..c1561d46c367 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c0d63f31b846cd046894e5d5778ec430
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r3
new file mode 100644
index 000000000000..7e5a15235bdc
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vbetool
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=c0d63f31b846cd046894e5d5778ec430
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-9999 b/metadata/md5-cache/sec-policy/selinux-vbetool-9999
index 844eed72bd6b..69ac7d488a7f 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c0d63f31b846cd046894e5d5778ec430
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r1
deleted file mode 100644
index 541bc1aa97ed..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vdagent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=960dbe9530f102e9abfb8f2ca7018d4c
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r2
deleted file mode 100644
index 296b5282588f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vdagent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a5cdba7ef5f0f4641b22acc724814b9f
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r3
deleted file mode 100644
index b5e7ba421a4e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vdagent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a5cdba7ef5f0f4641b22acc724814b9f
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r4
deleted file mode 100644
index 86314a9db93c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vdagent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=a5cdba7ef5f0f4641b22acc724814b9f
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r2
index 6f145590dbbb..bfd460a875cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a5cdba7ef5f0f4641b22acc724814b9f
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r3
index 28c29e337657..78db89698b22 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=a5cdba7ef5f0f4641b22acc724814b9f
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r4
deleted file mode 100644
index 755d93d141da..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vdagent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=960dbe9530f102e9abfb8f2ca7018d4c
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r1
index 78e6a3d51223..47061ba0d049 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=8dba1b76264d76451ddeb81e7bea2442
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r2
index 13ca3094bae2..7f6f5294acf9 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=912761f8da712c34a762b437692eb45d
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r3
new file mode 100644
index 000000000000..5871de11aebb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vdagent
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=912761f8da712c34a762b437692eb45d
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-9999 b/metadata/md5-cache/sec-policy/selinux-vdagent-9999
index 575a1fbe81d2..ede30f6c9940 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=912761f8da712c34a762b437692eb45d
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r1
deleted file mode 100644
index 77f444cf8ec8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vde
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=58a4987f750a5aed6f31b01956ecb221
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r2
deleted file mode 100644
index 6a0c67970cdc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vde
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=95a8ff7af90a0dd90801c101ded71449
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r3
deleted file mode 100644
index ef526b29cd7d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vde
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=95a8ff7af90a0dd90801c101ded71449
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r4
deleted file mode 100644
index 9bffd215d013..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vde
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=95a8ff7af90a0dd90801c101ded71449
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r2
index 9b4b7445e97a..d8abd5766aec 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=95a8ff7af90a0dd90801c101ded71449
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r3
index 383895b60645..a8e45a9e81c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=95a8ff7af90a0dd90801c101ded71449
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r4
deleted file mode 100644
index 8a44c0d36794..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vde
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=58a4987f750a5aed6f31b01956ecb221
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r1
index 074743a68539..f88b39793f0c 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=63452846420096e0cff9901bb8181c1d
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r2
index 0fefc1b2cc85..adde0b42fb6e 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b4b41f45db34d4accc2dd7108b166729
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r3
new file mode 100644
index 000000000000..5c4e470484b1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vde
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=b4b41f45db34d4accc2dd7108b166729
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-9999 b/metadata/md5-cache/sec-policy/selinux-vde-9999
index 2c0f8ab8ab71..2a9c19838707 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vde-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b4b41f45db34d4accc2dd7108b166729
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r1
deleted file mode 100644
index e58505a6ec62..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for virt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5523f0b9ca2249a1d6460c5d24c355fa
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r2
deleted file mode 100644
index 7f2b6e86ee29..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for virt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b5b142140239a85b1df152f393e7112b
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r3
deleted file mode 100644
index ea8ffb72e31a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for virt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b5b142140239a85b1df152f393e7112b
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r4
deleted file mode 100644
index f629ac5eaa6c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for virt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b5b142140239a85b1df152f393e7112b
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r2
index 5dba11fc12ed..4f70a2951127 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b5b142140239a85b1df152f393e7112b
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r3
index 013d6ebae07b..589a421c79d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b5b142140239a85b1df152f393e7112b
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r4
deleted file mode 100644
index 51d0a8fd101b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for virt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5523f0b9ca2249a1d6460c5d24c355fa
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r1
index c1d8882e21ed..38ac2099967b 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=248bfd7e4eedafe36ca1e420b7f9354d
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r2
index 0d2c8304c980..41b8ce2cc9e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bfedd578d18d225fe95738c783c2c59e
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r3
new file mode 100644
index 000000000000..58d60d3cce03
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for virt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=bfedd578d18d225fe95738c783c2c59e
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-9999 b/metadata/md5-cache/sec-policy/selinux-virt-9999
index cb1b91649b07..a3d83bee13bd 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-virt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bfedd578d18d225fe95738c783c2c59e
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r1
deleted file mode 100644
index 4c368d345377..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vlock
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9c7c2f072e0f30a20f82fadfdd709f1c
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r2
deleted file mode 100644
index 8fef9a8dccca..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vlock
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d1b7626de2f7da83e11082bb203118e8
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r3
deleted file mode 100644
index 21344888af87..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vlock
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d1b7626de2f7da83e11082bb203118e8
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r4
deleted file mode 100644
index 4e844f06e769..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vlock
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d1b7626de2f7da83e11082bb203118e8
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r2
index b9130e6cb190..364b14059fcf 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d1b7626de2f7da83e11082bb203118e8
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r3
index 6881d234be35..6d770c9f417a 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d1b7626de2f7da83e11082bb203118e8
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r4
deleted file mode 100644
index 4288f77e8d06..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vlock
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=9c7c2f072e0f30a20f82fadfdd709f1c
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r1
index 89aae00325b3..5b91c8a1821e 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b54928a3f9daf3efa42d776aba92e134
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r2
index 87ed4f29057d..b5c39b4d90c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=99d1d8a439b349f16429e4f93975d00d
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r3
new file mode 100644
index 000000000000..e52927554778
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vlock
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=99d1d8a439b349f16429e4f93975d00d
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-9999 b/metadata/md5-cache/sec-policy/selinux-vlock-9999
index f7ef0b0e895d..bf30144fc15c 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=99d1d8a439b349f16429e4f93975d00d
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r1
deleted file mode 100644
index 9a72356bc869..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vmware
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=40dd1f83b397eaf0e152e4db21705288
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r2
deleted file mode 100644
index 4890e5ea6992..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vmware
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=46ae649937a98ab21481cf99b3a4505f
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r3
deleted file mode 100644
index dde2156072a9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vmware
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=46ae649937a98ab21481cf99b3a4505f
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r4
deleted file mode 100644
index 19f6c0c5526e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vmware
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=46ae649937a98ab21481cf99b3a4505f
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r2
index b6e7bb4c8dc3..712c4e791280 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=46ae649937a98ab21481cf99b3a4505f
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r3
index fd9abd80032f..3e01a0c75d6f 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=46ae649937a98ab21481cf99b3a4505f
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r4
deleted file mode 100644
index 501b48b7896c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vmware
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=40dd1f83b397eaf0e152e4db21705288
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r1
index a1ed502b22ac..14a95ced1e6f 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=7eff20d7250ace3864c4096b8a49bce3
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r2
index 3490b3a90ddb..d093700723d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cab09bfa6b583dab36cf1e2bde3c3fae
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r3
new file mode 100644
index 000000000000..c477451c7f70
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vmware
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=cab09bfa6b583dab36cf1e2bde3c3fae
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-9999 b/metadata/md5-cache/sec-policy/selinux-vmware-9999
index bd3f38c1bc96..4f2f464b0392 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=cab09bfa6b583dab36cf1e2bde3c3fae
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r1
deleted file mode 100644
index 3c5e0bc1f721..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vnstatd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b4e9b73988dcf80cdc847f26c118dd6f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r2
deleted file mode 100644
index a4dc0a03c3c8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vnstatd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=512c7e52acc6c4813259780b484e360f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r3
deleted file mode 100644
index ba95817fa906..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vnstatd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=512c7e52acc6c4813259780b484e360f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r4
deleted file mode 100644
index 281f37a5d5fe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vnstatd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=512c7e52acc6c4813259780b484e360f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r2
index 3abdf29b58fa..1c1d1a25b774 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=512c7e52acc6c4813259780b484e360f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r3
index cbee208982e3..99851e85a053 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=512c7e52acc6c4813259780b484e360f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r4
deleted file mode 100644
index e4c5af9fbcf3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vnstatd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b4e9b73988dcf80cdc847f26c118dd6f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r1
index 4eaab83a5168..ae6ac8d9fbe6 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=36a7fb1d09f71465bf77fb6b039b1370
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r2
index 79f94fd573ab..e32fc6aef583 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=17c44f9f3b04f2af51fba615ef4c6655
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r3
new file mode 100644
index 000000000000..95671778b416
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vnstatd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=17c44f9f3b04f2af51fba615ef4c6655
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-9999 b/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
index 99993d9040c3..fa5e811b51b1 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=17c44f9f3b04f2af51fba615ef4c6655
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r1
deleted file mode 100644
index f2f3503d282e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3ce1839fb1923798508bcf33aac4391f
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r2
deleted file mode 100644
index bb4f8be8ec25..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fb6109966101dbdde720be22478bde6d
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r3
deleted file mode 100644
index 9bc21c266ed6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fb6109966101dbdde720be22478bde6d
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r4
deleted file mode 100644
index 8e0865d21832..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=fb6109966101dbdde720be22478bde6d
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r2
index 95ae6e61900f..5cb4aeb97d9b 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fb6109966101dbdde720be22478bde6d
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r3
index 153ac6995d3c..2cefe75cf02f 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fb6109966101dbdde720be22478bde6d
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r4
deleted file mode 100644
index d15036807c92..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=3ce1839fb1923798508bcf33aac4391f
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r1
index fe77af0d7e81..8fdc1de2c093 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=9a870e0f1e5c9911be75a5142030ce66
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r2
index 0a54f238454b..6bf8d7f1943f 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5280af600a23b9fe6fddfdbac80cd084
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r3
new file mode 100644
index 000000000000..42160485ac6b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vpn
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=5280af600a23b9fe6fddfdbac80cd084
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-9999 b/metadata/md5-cache/sec-policy/selinux-vpn-9999
index de672dcaa111..2354850b64c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5280af600a23b9fe6fddfdbac80cd084
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r1
deleted file mode 100644
index 53f7f82bae7a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for watchdog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=31980077b99b80589c10c8d1e4619da7
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r2
deleted file mode 100644
index d81aa84f4ae2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for watchdog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c0c816040d223c82cc4015ddb97fe7fc
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r3
deleted file mode 100644
index 6ada6c287ce0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for watchdog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c0c816040d223c82cc4015ddb97fe7fc
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r4
deleted file mode 100644
index 7f3a9c5bd6df..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for watchdog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=c0c816040d223c82cc4015ddb97fe7fc
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r2
index 8f9b5bd9c8c2..ee5c242ddc4a 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c0c816040d223c82cc4015ddb97fe7fc
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r3
index 5a6e2aaa8f76..7d0e72fd640f 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=c0c816040d223c82cc4015ddb97fe7fc
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r4
deleted file mode 100644
index 13541ed22c5a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for watchdog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=31980077b99b80589c10c8d1e4619da7
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r1
index 8cffc28d3cda..8bdf78643a4a 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=183548edba137fae99e1cf01ff7b9afb
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r2
index a29fd062d35a..8db8f7660621 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fa00f5fae9525d91bc1782efa8feab6d
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r3
new file mode 100644
index 000000000000..7d9abcc8bb55
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for watchdog
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=fa00f5fae9525d91bc1782efa8feab6d
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-9999 b/metadata/md5-cache/sec-policy/selinux-watchdog-9999
index b6188ed69f0a..6f5be62bbe74 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-9999
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=fa00f5fae9525d91bc1782efa8feab6d
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r1
deleted file mode 100644
index e236e8d42168..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for webalizer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=62def558a5ecd7ee9a384129b6fd3642
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r2
deleted file mode 100644
index 1990df1c91cc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for webalizer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=038e661730e50c3cfcceeae5ae73fd14
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r3
deleted file mode 100644
index 96b5dec62779..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for webalizer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=038e661730e50c3cfcceeae5ae73fd14
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r4
deleted file mode 100644
index 24a1e3e0283b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for webalizer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=038e661730e50c3cfcceeae5ae73fd14
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r2
index 05a1de730f67..71bf35b2893a 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=038e661730e50c3cfcceeae5ae73fd14
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r3
index 216207a083c8..fa1614c63e12 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=038e661730e50c3cfcceeae5ae73fd14
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r4
deleted file mode 100644
index 9168204eed54..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for webalizer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=62def558a5ecd7ee9a384129b6fd3642
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r1
index 9153bc7255a9..870af0403c5b 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=25638ab68242a0db0ea3fac7895db64b
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r2
index 98eaf2b4ce9a..14a9db99e81a 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f3dafd4d9c9a637b3a00c599a24462e5
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r3
new file mode 100644
index 000000000000..1c15f7da1de2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for webalizer
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=f3dafd4d9c9a637b3a00c599a24462e5
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-9999 b/metadata/md5-cache/sec-policy/selinux-webalizer-9999
index 2e66aaa400ca..2098ba73720a 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-9999
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f3dafd4d9c9a637b3a00c599a24462e5
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r1
deleted file mode 100644
index f49e4192feb7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wine
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7b69e3f5bea75e79461354d6e4fc9f86
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r2
deleted file mode 100644
index 10ec3e04dd54..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wine
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d886b4e076502036aa174615569a36eb
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r3
deleted file mode 100644
index db4f8134242d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wine
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d886b4e076502036aa174615569a36eb
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r4
deleted file mode 100644
index 49345add6e38..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wine
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=d886b4e076502036aa174615569a36eb
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r2
index c95396e082dc..895224a95b83 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d886b4e076502036aa174615569a36eb
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r3
index b5be1e3b57a6..c87ce1ac7f8e 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d886b4e076502036aa174615569a36eb
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r4
deleted file mode 100644
index 25d81c6c7326..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wine
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7b69e3f5bea75e79461354d6e4fc9f86
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r1
index 17e9b5df2aba..19bab92ec7b7 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=04710e2a3cc5698a3df01d039a6c4d1a
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r2
index 0ba113cb5bc5..0e7720803021 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1cdfe30ea1368ac6638dac65bf11f9cd
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r3
new file mode 100644
index 000000000000..fcc16bc1185d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wine
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=1cdfe30ea1368ac6638dac65bf11f9cd
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-9999 b/metadata/md5-cache/sec-policy/selinux-wine-9999
index 481547b2c7b4..bc1fc1a958d0 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wine-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=1cdfe30ea1368ac6638dac65bf11f9cd
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r1
deleted file mode 100644
index f52b91a55903..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wireshark
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=57769c59d9c4106a62205fdaee70f5dd
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r2
deleted file mode 100644
index 5b2e43f2dcc8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wireshark
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=521526236d1c543cad578129c3acf25e
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r3
deleted file mode 100644
index daaced4fcac0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wireshark
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=521526236d1c543cad578129c3acf25e
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r4
deleted file mode 100644
index 378fbe8e1a16..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wireshark
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=521526236d1c543cad578129c3acf25e
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r2
index a5e0c577808f..a901539818eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=521526236d1c543cad578129c3acf25e
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r3
index 22970bff1992..2680126bfb2b 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=521526236d1c543cad578129c3acf25e
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r4
deleted file mode 100644
index affa8edf7adf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wireshark
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=57769c59d9c4106a62205fdaee70f5dd
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r1
index 07c536ddc484..4d003aa5263b 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b4ec2e731a4cfd04a3defe6f4a84c188
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r2
index d711677f458f..3c4c44f876d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ce0f6315d5ab917dd57b1ea9653e4081
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r3
new file mode 100644
index 000000000000..7d19dcb503d0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wireshark
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ce0f6315d5ab917dd57b1ea9653e4081
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-9999 b/metadata/md5-cache/sec-policy/selinux-wireshark-9999
index 5aa97fee6e5f..e397ef1ef140 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ce0f6315d5ab917dd57b1ea9653e4081
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r1
deleted file mode 100644
index 64fb39270cef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4adf1323abe27486e6f5da7dd83ecec8
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r2
deleted file mode 100644
index ce80b7d994bf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=22ae60ee07b23c3db23d75d030072dce
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r3
deleted file mode 100644
index 24ca6441844f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=22ae60ee07b23c3db23d75d030072dce
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r4
deleted file mode 100644
index ece695727233..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=22ae60ee07b23c3db23d75d030072dce
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r2
index a4b4317bc6fb..36bc95895efd 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=22ae60ee07b23c3db23d75d030072dce
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r3
index 56915ed0c91a..9a528b9f4662 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=22ae60ee07b23c3db23d75d030072dce
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r4
deleted file mode 100644
index d6d010a518d2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=4adf1323abe27486e6f5da7dd83ecec8
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r1
index 7648b346e007..2733018142c5 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=f592ee913380e439017dd50429ca2e51
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r2
index 24a3a4af59b4..338320c36f6c 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3054e6df1fec59f8648bf78436bacae4
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r3
new file mode 100644
index 000000000000..82cb477bcda8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=3054e6df1fec59f8648bf78436bacae4
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-9999 b/metadata/md5-cache/sec-policy/selinux-wm-9999
index 735f9e9aba39..28a345be280a 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=3054e6df1fec59f8648bf78436bacae4
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r1
deleted file mode 100644
index 69e8673f666b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0c23b4f7137f8bb11d555fa8de143820
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r2
deleted file mode 100644
index b9444007066c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=541f70379a54cf96d89cd9c1571bbc6e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r3
deleted file mode 100644
index 32a720f8b760..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=541f70379a54cf96d89cd9c1571bbc6e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r4
deleted file mode 100644
index a4b35ca01250..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=541f70379a54cf96d89cd9c1571bbc6e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r2
index de3a0989c35d..5e967a89347c 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=541f70379a54cf96d89cd9c1571bbc6e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r3
index 83020a1bbe0f..4580aeaff366 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=541f70379a54cf96d89cd9c1571bbc6e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r4
deleted file mode 100644
index d459ab20e959..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0c23b4f7137f8bb11d555fa8de143820
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r1
index 423bec861170..c53a2016d008 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=bb7eb4b63283d8f3429bcab1ade852f7
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r2
index 95373f8d7168..46abdd127240 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d708be8254c84d64feb1f1629c34ab71
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r3
new file mode 100644
index 000000000000..3a999c2cadce
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xen
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=d708be8254c84d64feb1f1629c34ab71
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-9999 b/metadata/md5-cache/sec-policy/selinux-xen-9999
index a3ba96e765bc..71aa523c0895 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xen-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=d708be8254c84d64feb1f1629c34ab71
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r1
deleted file mode 100644
index 0e3843232026..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xfs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0659a7052ba2a7e7de3e2b05ad51ce0c
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r2
deleted file mode 100644
index 9b2125c4eb03..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xfs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b507f218aa29f17085029fece0ea8237
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r3
deleted file mode 100644
index 50bbfafb92cc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xfs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b507f218aa29f17085029fece0ea8237
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r4
deleted file mode 100644
index 5db0955d1761..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xfs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b507f218aa29f17085029fece0ea8237
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r2
index 6fab67d51782..8d082fa80fea 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b507f218aa29f17085029fece0ea8237
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r3
index dede503e2a15..053f7e15bebf 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b507f218aa29f17085029fece0ea8237
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r4
deleted file mode 100644
index 7b63a5fda5c6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xfs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=0659a7052ba2a7e7de3e2b05ad51ce0c
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r1
index 1af94ef0041a..5d492c7da5ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ba40b0b0d8b32de31c3f96c086b65f8f
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r2
index 0d156fc97143..10d8b3a82e2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0fcd8259afda1cef89cb3bf824edd6f5
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r3
new file mode 100644
index 000000000000..05be9b0d65b4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xfs
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=0fcd8259afda1cef89cb3bf824edd6f5
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-9999 b/metadata/md5-cache/sec-policy/selinux-xfs-9999
index 1a3074b54f2b..8912417c57e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=0fcd8259afda1cef89cb3bf824edd6f5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r1
deleted file mode 100644
index 399144e915e5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xprint
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f70fb3280676760a2fbc36646065d140
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r2
deleted file mode 100644
index f70ac80bf268..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xprint
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b5d92a29da8e0e5f1dc6a1cd473502d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r3
deleted file mode 100644
index cecbe6297ecc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xprint
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b5d92a29da8e0e5f1dc6a1cd473502d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r4
deleted file mode 100644
index d5dd22659a21..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xprint
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=b5d92a29da8e0e5f1dc6a1cd473502d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r2
index 14b958529a61..65d8cabc48be 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b5d92a29da8e0e5f1dc6a1cd473502d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r3
index 2baae1d19092..d9086d947b34 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=b5d92a29da8e0e5f1dc6a1cd473502d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r4
deleted file mode 100644
index de85bd141914..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xprint
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=f70fb3280676760a2fbc36646065d140
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r1
index f85b91e36938..990d30cea6ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=e8e74be5bcc129cf987b4c566756b320
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r2
index ff2d3292af54..e759a1c95984 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ea59eeca20d494f83411f75e5fffd3d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r3
new file mode 100644
index 000000000000..29379b8ee832
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xprint
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=ea59eeca20d494f83411f75e5fffd3d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-9999 b/metadata/md5-cache/sec-policy/selinux-xprint-9999
index 680089455c9c..3b8355459b79 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=ea59eeca20d494f83411f75e5fffd3d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r1
deleted file mode 100644
index 6a84c1d9362e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xscreensaver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=18671c8ce9c13c8105e690ab55ae4878
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r2
deleted file mode 100644
index e7d5aa6e1249..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xscreensaver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5fd7800afabb16291a604e0b1520bea8
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r3
deleted file mode 100644
index 04a58ffe50f7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xscreensaver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5fd7800afabb16291a604e0b1520bea8
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r4
deleted file mode 100644
index f4f09f25df2c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xscreensaver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=5fd7800afabb16291a604e0b1520bea8
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r2
index 5d0a0c1d390f..cb82721135f0 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5fd7800afabb16291a604e0b1520bea8
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r3
index 9631dff3c06c..d8c07e219664 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=5fd7800afabb16291a604e0b1520bea8
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r4
deleted file mode 100644
index 55f69d2a0779..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xscreensaver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=18671c8ce9c13c8105e690ab55ae4878
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r1
index 1c8fae97994f..68f221d67bcc 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=355355eee8effa6a24efcdd15007da62
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r2
index ca4ec1f1ad6a..1e3aaf0f2d25 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=51cb5d02087042cee35b9b7ed422fc8b
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r3
new file mode 100644
index 000000000000..6396a372b725
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xscreensaver
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=51cb5d02087042cee35b9b7ed422fc8b
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
index bd6f0abd512b..b1949207298f 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=51cb5d02087042cee35b9b7ed422fc8b
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r1
deleted file mode 100644
index 2e72bb804eb8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7f76041550674f12eca7b5dbcdc1d75b
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r2
deleted file mode 100644
index 7a649f971cf1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=daaa30887ef97b80f69ecbffd1b2aace
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r3
deleted file mode 100644
index de1831f2becd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=daaa30887ef97b80f69ecbffd1b2aace
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r4
deleted file mode 100644
index feddbe43d0e0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=daaa30887ef97b80f69ecbffd1b2aace
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r2
index 278100525188..8095c0d84b5a 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=daaa30887ef97b80f69ecbffd1b2aace
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r3
index 66327048b95c..83dea375ee1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=daaa30887ef97b80f69ecbffd1b2aace
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r4
deleted file mode 100644
index c4e51e88a8e2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=7f76041550674f12eca7b5dbcdc1d75b
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r1
index a367fcc66bb1..18bb0c9dd369 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=109011428b70ad9fda0e766ecbeed035
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r2
index 72c660b9f627..ec675d910868 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=18d6c0a97cd9de911fbc7364fc72072a
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r3
new file mode 100644
index 000000000000..5c68d7237353
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xserver
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=18d6c0a97cd9de911fbc7364fc72072a
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-9999 b/metadata/md5-cache/sec-policy/selinux-xserver-9999
index 44f15e28fe62..403f36d5de48 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=18d6c0a97cd9de911fbc7364fc72072a
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r1 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r1
deleted file mode 100644
index a084bcb1b4ba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for zabbix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=165611fad7d2ce48a39cee5052b37799
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r2 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r2
deleted file mode 100644
index 1a7f234c193f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for zabbix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2ba64b52850ce934d0570499d15db3fe
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r3 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r3
deleted file mode 100644
index 4dc517078d98..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for zabbix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2ba64b52850ce934d0570499d15db3fe
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r4 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r4
deleted file mode 100644
index 3699ef24b073..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170204-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for zabbix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170204-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170204.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=2ba64b52850ce934d0570499d15db3fe
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r2
index 5dffb1bdd376..ba2957106f83 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r2
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ba64b52850ce934d0570499d15db3fe
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r3
index 459b5f9fabc5..1b7795e29163 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r3
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=2ba64b52850ce934d0570499d15db3fe
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r4 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r4
deleted file mode 100644
index 1c66d03548bc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for zabbix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r4
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
-_md5_=165611fad7d2ce48a39cee5052b37799
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r1
index 149c2bb0aaaa..9ed3fdaa5edc 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=881a91f5285a8989d1e7b6cd43303aef
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r2
index cb2425594efc..4947371adc64 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=af6aae69b03bae0dcd08e5d0d62b1760
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r3
new file mode 100644
index 000000000000..198c3100d793
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for zabbix
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_md5_=af6aae69b03bae0dcd08e5d0d62b1760
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-9999 b/metadata/md5-cache/sec-policy/selinux-zabbix-9999
index 7483e86e21d1..4f11a0f661ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-9999
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	426dde83b8cbb78f4bf8e9edf7715355
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
 _md5_=af6aae69b03bae0dcd08e5d0d62b1760
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 892bb0e86845..8531d88247a1 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/baselayout-java-0.1.0 b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0
index 3a0378e21a4d..734ec117e857 100644
--- a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0
+++ b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<dev-java/java-config-2.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/baselayout-java-0.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c41ad95a377b91f28bb450e9b509967d
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=da634a742bfa64f1116272a7da325bff
diff --git a/metadata/md5-cache/sys-apps/busybox-1.28.0 b/metadata/md5-cache/sys-apps/busybox-1.28.0
index 0c28da2d3db3..e8d1f53ff771 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.28.0
+++ b/metadata/md5-cache/sys-apps/busybox-1.28.0
@@ -4,7 +4,7 @@ DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=5
 HOMEPAGE=https://www.busybox.net/
 IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-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=GPL-2
 RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev? ( !<sys-apps/openrc-0.13 )
 REQUIRED_USE=pam? ( !static )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.28.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a0d353d8a519b80718f47e62f94ae5d8
+_md5_=18d826a5a1171d25355518a4cb20e9fd
diff --git a/metadata/md5-cache/sys-apps/cpint-1.1.6 b/metadata/md5-cache/sys-apps/cpint-1.1.6
deleted file mode 100644
index daf19801bec9..000000000000
--- a/metadata/md5-cache/sys-apps/cpint-1.1.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Linux/390 Interface to z/VM's Control Program
-EAPI=0
-HOMEPAGE=http://linuxvm.org/Patches/index.html
-KEYWORDS=s390
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linuxvm.org/Patches/s390/cpint116.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d87346d59662da2d159c35f9b8eab11a
diff --git a/metadata/md5-cache/sys-apps/dbus-1.10.18 b/metadata/md5-cache/sys-apps/dbus-1.10.18
index 32fd1709c0a2..33099412c97f 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.10.18
+++ b/metadata/md5-cache/sys-apps/dbus-1.10.18
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.18.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9dad147109f78ed6b3e3badbd075b5ff
diff --git a/metadata/md5-cache/sys-apps/dbus-1.10.24 b/metadata/md5-cache/sys-apps/dbus-1.10.24
index 9a7b31dbe2ef..69a04c0aaaa0 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.10.24
+++ b/metadata/md5-cache/sys-apps/dbus-1.10.24
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/
 REQUIRED_USE=?? ( elogind systemd ) test? ( debug )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.24.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5d23450c883d39dcb1861505b78cca1e
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.6 b/metadata/md5-cache/sys-apps/dbus-1.12.6
index b5f4f51b2830..3e1343d8ac72 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.6
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.1.0 selinux? ( sys-libs/libselinux ) elogind? ( sys-a
 REQUIRED_USE=?? ( elogind systemd ) test? ( debug )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=396249f1984e9cafa323e04a3e6c1b57
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.8 b/metadata/md5-cache/sys-apps/dbus-1.12.8
index 40cb51cff83e..e37ce96ec918 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.8
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.1.0 selinux? ( sys-libs/libselinux ) elogind? ( sys-a
 REQUIRED_USE=?? ( elogind systemd ) test? ( debug )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=396249f1984e9cafa323e04a3e6c1b57
diff --git a/metadata/md5-cache/sys-apps/ed-1.13 b/metadata/md5-cache/sys-apps/ed-1.13
index d91911aa4b01..8162002e5ee3 100644
--- a/metadata/md5-cache/sys-apps/ed-1.13
+++ b/metadata/md5-cache/sys-apps/ed-1.13
@@ -3,9 +3,9 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Your basic line editor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/ed/
-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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://fossies.org/linux/privat/ed-1.13.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ff2997433db5c20e5e7546aa8a3b4d6c
+_md5_=12ad0437145dba299f8d41f649acce5f
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.22 b/metadata/md5-cache/sys-apps/fakeroot-1.22
index fd44f96f79ff..b543ce7d14b2 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.22
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.22
@@ -4,9 +4,9 @@ DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP)
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 IUSE=acl debug static-libs test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.22.orig.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=94cfe350e9f56ba4868ed6a612d19b24
+_md5_=ba5c2a4d9a2f393b49099bb5bf54f2b0
diff --git a/metadata/md5-cache/sys-apps/file-5.32 b/metadata/md5-cache/sys-apps/file-5.32
deleted file mode 100644
index 7f64653ed83e..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=identify a file's format by scanning binary data for patterns
-EAPI=6
-HOMEPAGE=https://www.darwinsys.com/file/
-IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.32.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4a40ac352752532cd712afec68b9865
diff --git a/metadata/md5-cache/sys-apps/file-5.32-r1 b/metadata/md5-cache/sys-apps/file-5.32-r1
new file mode 100644
index 000000000000..02ac546a6567
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/file-5.32-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422
+DESCRIPTION=identify a file's format by scanning binary data for patterns
+EAPI=6
+HOMEPAGE=https://www.darwinsys.com/file/
+IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
+REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/file/file-5.32.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4dcef8de1a1b52f1e3de5e7320ab49bd
diff --git a/metadata/md5-cache/sys-apps/file-5.33 b/metadata/md5-cache/sys-apps/file-5.33
deleted file mode 100644
index 5dbe1221aee8..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.33
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=identify a file's format by scanning binary data for patterns
-EAPI=6
-HOMEPAGE=https://www.darwinsys.com/file/
-IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.33.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=92ff82554945c1aeeebab580e54b0b26
diff --git a/metadata/md5-cache/sys-apps/file-5.33-r1 b/metadata/md5-cache/sys-apps/file-5.33-r1
new file mode 100644
index 000000000000..794290479f86
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/file-5.33-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422
+DESCRIPTION=identify a file's format by scanning binary data for patterns
+EAPI=6
+HOMEPAGE=https://www.darwinsys.com/file/
+IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
+REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/file/file-5.33.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=57381e3d601b39649e7b19e06eefb3ca
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 262e26ebefe4..9919d7eff163 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -9,4 +9,4 @@ RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_py
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a9c54c77147ce0f0c5ec2510d34ca35
+_md5_=c3dc0750468299a2f34a583fe4b95dfd
diff --git a/metadata/md5-cache/sys-apps/guix-0.13.0-r1 b/metadata/md5-cache/sys-apps/guix-0.13.0-r1
index 7990169ca437..ef4cf53b8c2e 100644
--- a/metadata/md5-cache/sys-apps/guix-0.13.0-r1
+++ b/metadata/md5-cache/sys-apps/guix-0.13.0-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2:=[regex,networking,threads] d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu-alpha/guix/guix-0.13.0.tar.gz mirror://gnu-alpha/guix/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz -> guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=83b7fdaebf395aa02e0da0ffb8c1f490
diff --git a/metadata/md5-cache/sys-apps/guix-0.14.0 b/metadata/md5-cache/sys-apps/guix-0.14.0
index 5d6952d23150..62af26cfebf0 100644
--- a/metadata/md5-cache/sys-apps/guix-0.14.0
+++ b/metadata/md5-cache/sys-apps/guix-0.14.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2:=[regex,networking,threads] d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu-alpha/guix/guix-0.14.0.tar.gz mirror://gnu-alpha/guix/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz -> guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b3a6c0d859733f15b11d899a145842b6
diff --git a/metadata/md5-cache/sys-apps/habitat-0.28.0 b/metadata/md5-cache/sys-apps/habitat-0.28.0
deleted file mode 100644
index 6ea7205b4713..000000000000
--- a/metadata/md5-cache/sys-apps/habitat-0.28.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-util/cargo >=dev-lang/rust-1.11 >=net-libs/zeromq-3.2 virtual/pkgconfig
-DESCRIPTION=Application automation framework
-EAPI=6
-HOMEPAGE=https://github.com/habitat-sh/habitat https://habitat.sh
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/habitat-sh/habitat/archive/0.28.0.tar.gz -> habitat-0.28.0.tar.gz https://dev.gentoo.org/~mrueg/files/habitat-cargo-0.28.0.tar.xz
-_md5_=7855246ebd6f3e1aadc2b17d3ccf83bd
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.4 b/metadata/md5-cache/sys-apps/help2man-1.47.4
index b27b91253255..35ae2fc97eeb 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.47.4
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~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=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.47.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c0d8a35b2f2a131ec9bdc820e3f812c1
+_md5_=f13e22b6c06e02794281a8b3291bbb71
diff --git a/metadata/md5-cache/sys-apps/ipmiutil-3.1.1 b/metadata/md5-cache/sys-apps/ipmiutil-3.1.1
new file mode 100644
index 000000000000..ff514af4e14f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ipmiutil-3.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/openssl-1:0= virtual/os-headers >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=IPMI Management Utilities
+EAPI=6
+HOMEPAGE=http://ipmiutil.sourceforge.net/
+IUSE=static-libs
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/openssl-1:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/ipmiutil/ipmiutil-3.1.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=76ac2d36e542af455de27753f3303ece
diff --git a/metadata/md5-cache/sys-apps/memtest86+-2.01 b/metadata/md5-cache/sys-apps/memtest86+-2.01
deleted file mode 100644
index c001008e3862..000000000000
--- a/metadata/md5-cache/sys-apps/memtest86+-2.01
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm unpack
-DESCRIPTION=Memory tester based on memtest86
-EAPI=0
-HOMEPAGE=http://www.memtest.org/
-IUSE=serial
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.memtest.org/download/2.01/memtest86+-2.01.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f1772fc4e290bbab4fdc7721f6ccf46a
diff --git a/metadata/md5-cache/sys-apps/memtest86+-4.00 b/metadata/md5-cache/sys-apps/memtest86+-4.00
deleted file mode 100644
index ad3c1e7e9d82..000000000000
--- a/metadata/md5-cache/sys-apps/memtest86+-4.00
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm unpack
-DEPEND=floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )
-DESCRIPTION=Memory tester based on memtest86
-EAPI=0
-HOMEPAGE=http://www.memtest.org/
-IUSE=floppy serial
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RDEPEND=floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.memtest.org/download/4.00/memtest86+-4.00.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41df28d43e1bfa3fcef6a8a0173a2bf3
diff --git a/metadata/md5-cache/sys-apps/nix-1.11.15 b/metadata/md5-cache/sys-apps/nix-1.11.15
deleted file mode 100644
index 671c20bb3900..000000000000
--- a/metadata/md5-cache/sys-apps/nix-1.11.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium ) dev-lang/perl:= dev-perl/DBD-SQLite dev-perl/WWW-Curl dev-perl/DBI >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 virtual/perl-ExtUtils-ParseXS >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A purely functional package manager
-EAPI=6
-HOMEPAGE=https://nixos.org/nix
-IUSE=+etc_profile +gc doc sodium
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium ) dev-lang/perl:= dev-perl/DBD-SQLite dev-perl/WWW-Curl dev-perl/DBI
-SLOT=0
-SRC_URI=http://nixos.org/releases/nix/nix-1.11.15/nix-1.11.15.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc82928ac40dd101f85310591d7cd493
diff --git a/metadata/md5-cache/sys-apps/nix-1.11.16 b/metadata/md5-cache/sys-apps/nix-1.11.16
deleted file mode 100644
index cfcc4b15bac5..000000000000
--- a/metadata/md5-cache/sys-apps/nix-1.11.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium ) dev-lang/perl:= dev-perl/DBD-SQLite dev-perl/WWW-Curl dev-perl/DBI >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 virtual/perl-ExtUtils-ParseXS >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A purely functional package manager
-EAPI=6
-HOMEPAGE=https://nixos.org/nix
-IUSE=+etc_profile +gc doc sodium
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium ) dev-lang/perl:= dev-perl/DBD-SQLite dev-perl/WWW-Curl dev-perl/DBI
-SLOT=0
-SRC_URI=http://nixos.org/releases/nix/nix-1.11.16/nix-1.11.16.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc82928ac40dd101f85310591d7cd493
diff --git a/metadata/md5-cache/sys-apps/nix-2.0 b/metadata/md5-cache/sys-apps/nix-2.0
deleted file mode 100644
index ddf7aabe82d4..000000000000
--- a/metadata/md5-cache/sys-apps/nix-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= ) >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A purely functional package manager
-EAPI=6
-HOMEPAGE=https://nixos.org/nix
-IUSE=+etc_profile +gc doc sodium
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= )
-SLOT=0
-SRC_URI=http://nixos.org/releases/nix/nix-2.0/nix-2.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ae7810a8aff0cc1bc15ccf7afec5227
diff --git a/metadata/md5-cache/sys-apps/nix-2.0.1 b/metadata/md5-cache/sys-apps/nix-2.0.1
deleted file mode 100644
index b9352deffccf..000000000000
--- a/metadata/md5-cache/sys-apps/nix-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= ) >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A purely functional package manager
-EAPI=6
-HOMEPAGE=https://nixos.org/nix
-IUSE=+etc_profile +gc doc sodium
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= )
-SLOT=0
-SRC_URI=http://nixos.org/releases/nix/nix-2.0.1/nix-2.0.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ae7810a8aff0cc1bc15ccf7afec5227
diff --git a/metadata/md5-cache/sys-apps/nix-2.0.2 b/metadata/md5-cache/sys-apps/nix-2.0.2
index 06a66cc7c14a..738f145623ee 100644
--- a/metadata/md5-cache/sys-apps/nix-2.0.2
+++ b/metadata/md5-cache/sys-apps/nix-2.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= )
 SLOT=0
 SRC_URI=http://nixos.org/releases/nix/nix-2.0.2/nix-2.0.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ae7810a8aff0cc1bc15ccf7afec5227
diff --git a/metadata/md5-cache/sys-apps/nix-2.0.4 b/metadata/md5-cache/sys-apps/nix-2.0.4
new file mode 100644
index 000000000000..ffb1f0b4a0cc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nix-2.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= ) >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A purely functional package manager
+EAPI=6
+HOMEPAGE=https://nixos.org/nix
+IUSE=+etc_profile +gc doc sodium
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= )
+SLOT=0
+SRC_URI=http://nixos.org/releases/nix/nix-2.0.4/nix-2.0.4.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6ae7810a8aff0cc1bc15ccf7afec5227
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20180531 b/metadata/md5-cache/sys-apps/osinfo-db-20180531
new file mode 100644
index 000000000000..a5dd29ffd5d9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20180531
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=sys-apps/osinfo-db-tools
+DESCRIPTION=osinfo database files
+EAPI=6
+HOMEPAGE=http://libosinfo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20180531.tar.xz
+_md5_=be12560bf2655cd433a98d20a27e75b7
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index 4bce8cc24801..57b2b8e1595b 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) =dev-python/snakeoil-9999[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/sphinx[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/setuptools[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/pyparsing[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(-)] test? ( python_targets_python2_7? ( dev-python/mock[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(-)] >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=a framework for package management
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python3_6
 LICENSE=|| ( BSD GPL-2 )
-RDEPEND=python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) =dev-python/snakeoil-9999[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 )
+RDEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11e11ccc26c581313e297ffd4f97754d
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=de33831ce50ac4bf6a5bbfe9359af99e
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.40 b/metadata/md5-cache/sys-apps/portage-2.3.40
deleted file mode 100644
index 51b60db5e2e7..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.40
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy 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 ~amd64-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-12.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.40.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.40.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d0e5827d9dd8d1879560cab78e194386
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.40-r1 b/metadata/md5-cache/sys-apps/portage-2.3.40-r1
new file mode 100644
index 000000000000..f90443ad2794
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.40-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy 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 s390 ~sparc x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-12.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.40.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.40.tar.bz2 https://github.com/gentoo/portage/compare/b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0...937d0156aa060bdba9095313dedbb62e0a993aea.patch -> portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch https://github.com/gentoo/portage/compare/937d0156aa060bdba9095313dedbb62e0a993aea...1fc628eead43fa5da4b142479aa004ded8acceab.patch -> portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17cd3d6360743736fc6e677bb04b04ed
diff --git a/metadata/md5-cache/sys-apps/rename-1.3 b/metadata/md5-cache/sys-apps/rename-1.3
deleted file mode 100644
index 25a27b9f8c9e..000000000000
--- a/metadata/md5-cache/sys-apps/rename-1.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=tool for easily renaming files
-EAPI=0
-HOMEPAGE=http://rename.sourceforge.net/
-KEYWORDS=amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://rename/sourceforge.net/rename-1.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=441fa2a6d31681480150ff80a4b1a5d3
diff --git a/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.29 b/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.29
deleted file mode 100644
index 3838c586f0b2..000000000000
--- a/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.29
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Script to rescan the SCSI bus without rebooting
-EAPI=0
-HOMEPAGE=http://www.garloff.de/kurt/linux/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/sg3_utils-1.24 virtual/modutils app-shells/bash
-SLOT=0
-SRC_URI=http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh-1.29
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17c38a8fff0707022433bc7a288fd57f
diff --git a/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.56 b/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.56
deleted file mode 100644
index 41d17ad57b4b..000000000000
--- a/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.56
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Script to rescan the SCSI bus without rebooting
-EAPI=0
-HOMEPAGE=http://www.garloff.de/kurt/linux/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/sg3_utils-1.24 virtual/modutils app-shells/bash
-SLOT=0
-SRC_URI=http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh-1.56
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3adf4cc71ee2cd4834930dddf14cae5e
diff --git a/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57 b/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57
deleted file mode 100644
index e045ce042187..000000000000
--- a/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Script to rescan the SCSI bus without rebooting
-EAPI=5
-HOMEPAGE=http://www.garloff.de/kurt/linux/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/sg3_utils-1.24 virtual/modutils app-shells/bash
-SLOT=0
-SRC_URI=http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh-1.57
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5d90ddb5590c7c0c37ccaf4a6caa269
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.1.1 b/metadata/md5-cache/sys-apps/roccat-tools-5.1.1
deleted file mode 100644
index e4878287f70b..000000000000
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==dev-libs/libgaminggear-0.13* x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= || ( dev-lang/lua:5.1 dev-lang/lua:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Utility for advanced configuration of Roccat devices
-EAPI=5
-HOMEPAGE=http://roccat.sourceforge.net/
-IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kiro input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepuremilitary input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_konextdoptical input_devices_roccat_kovaplus input_devices_roccat_kova2016 input_devices_roccat_lua input_devices_roccat_nyth input_devices_roccat_pyra input_devices_roccat_ryosmk input_devices_roccat_ryostkl input_devices_roccat_savu input_devices_roccat_tyon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-libs/libgaminggear-0.13* x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= || ( dev-lang/lua:5.1 dev-lang/lua:0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.1.1.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fc23127cb93072d6ea901b223050409
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.7.0 b/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
index 99a8ce281c4f..9c62bc4bc4db 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libgudev:= virtual/libusb:1 input_devices_roccat_ryosmk? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryosmkfx? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryostkl? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.7.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d15d32def03a3cbf7584e913604289e3
diff --git a/metadata/md5-cache/sys-apps/servicelog-1.1.11 b/metadata/md5-cache/sys-apps/servicelog-1.1.11
deleted file mode 100644
index deba54cd0f01..000000000000
--- a/metadata/md5-cache/sys-apps/servicelog-1.1.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/libservicelog
-DESCRIPTION=Provides utilities for logging service-related events
-EAPI=0
-HOMEPAGE=http://linux-diag.sourceforge.net/servicelog/
-KEYWORDS=~ppc ~ppc64
-LICENSE=IBM
-RDEPEND=sys-libs/libservicelog virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-diag/servicelog-1.1.11.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68dde41ab284c8ceae718f1a9b760259
diff --git a/metadata/md5-cache/sys-apps/servicelog-1.1.13 b/metadata/md5-cache/sys-apps/servicelog-1.1.13
deleted file mode 100644
index 2eb1a241137b..000000000000
--- a/metadata/md5-cache/sys-apps/servicelog-1.1.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/libservicelog
-DESCRIPTION=Provides utilities for logging service-related events
-EAPI=0
-HOMEPAGE=http://linux-diag.sourceforge.net/servicelog/
-KEYWORDS=~ppc ~ppc64
-LICENSE=IBM
-RDEPEND=sys-libs/libservicelog virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-diag/servicelog-1.1.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68dde41ab284c8ceae718f1a9b760259
diff --git a/metadata/md5-cache/sys-apps/syslog-notify-0.2 b/metadata/md5-cache/sys-apps/syslog-notify-0.2
index 1acecffee193..7161425b2470 100644
--- a/metadata/md5-cache/sys-apps/syslog-notify-0.2
+++ b/metadata/md5-cache/sys-apps/syslog-notify-0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libnotify-0.7 || ( app-admin/syslog-ng app-admin/rsyslog )
 SLOT=0
 SRC_URI=mirror://github/jtniehof/syslog-notify/syslog-notify-0.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f30efafbb447a8184da9f83c74f8a640
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0 b/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
index 5892c1ef1504..4e97852b5eaf 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A code-searching tool similar to ack, but faster
 EAPI=6
 HOMEPAGE=https://github.com/ggreer/the_silver_searcher
 IUSE=lzma test zlib
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/ggreer/the_silver_searcher/archive/2.1.0.tar.gz -> the_silver_searcher-2.1.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fab771281601d47efb6b6d8fa9c41ee5
+_md5_=aa571dcd6a1b7875fe16ba30317f5424
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r17 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r17
deleted file mode 100644
index ab23942b9f46..000000000000
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=sys-apps/sed-4 >=sys-apps/sed-4
-DESCRIPTION=Collection of tools for managing UNIX services
-EAPI=0
-HOMEPAGE=http://cr.yp.to/ucspi-tcp.html
-IUSE=qmail-spp selinux
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=public-domain
-RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28a1a83dbab62b08eadea94dff6c864d
diff --git a/metadata/md5-cache/sys-apps/ucspi-unix-0.36-r2 b/metadata/md5-cache/sys-apps/ucspi-unix-0.36-r2
deleted file mode 100644
index fc2e2c867e20..000000000000
--- a/metadata/md5-cache/sys-apps/ucspi-unix-0.36-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/bglibs-1.019-r1
-DESCRIPTION=A ucspi implementation for unix sockets
-EAPI=0
-HOMEPAGE=http://untroubled.org/ucspi-unix/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/bglibs-1.019-r1
-SLOT=0
-SRC_URI=http://untroubled.org/ucspi-unix/archive/ucspi-unix-0.36.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e0b3cd9dd0cefa5a2d34637c88aa64b
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15.3 b/metadata/md5-cache/sys-apps/xinetd-2.3.15.3
index f8cf6997ca31..5378098a24be 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15.3
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15.3
@@ -4,10 +4,10 @@ DESCRIPTION=powerful replacement for inetd
 EAPI=6
 HOMEPAGE=https://github.com/openSUSE/xinetd
 IUSE=perl selinux tcpd
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=selinux? ( sys-libs/libselinux ) kernel_linux? ( net-libs/libtirpc:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/xinetd/releases/download/2.3.15.3/xinetd-2.3.15.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e851bf745e9101cf2f2ac950ec8a4286
+_md5_=cc4e074d5ae209dada0f8dbb37b05c59
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index f3f53cedcab0..a7f7a8220de9 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/docker_auth-1.3-r2 b/metadata/md5-cache/sys-auth/docker_auth-1.3-r2
deleted file mode 100644
index d23202df2a55..000000000000
--- a/metadata/md5-cache/sys-auth/docker_auth-1.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Docker Registry 2 authentication server
-EAPI=6
-HOMEPAGE=https://github.com/cesanta/docker_auth
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cesanta/docker_auth/archive/1.3.tar.gz -> docker_auth-1.3.tar.gz https://github.com/dchest/uniuri/archive/8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz -> github.com-dchest-uniuri-8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz https://github.com/deckarep/golang-set/archive/fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz -> github.com-deckarep-golang-set-fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz https://github.com/docker/distribution/archive/0700fa570d7bcc1b3e46ee127c4489fd25f4daa3.tar.gz -> github.com-docker-distribution-0700fa570d7bcc1b3e46ee127c4489fd25f4daa3.tar.gz https://github.com/docker/libtrust/archive/aabc10ec26b754e797f9028f4589c5b7bd90dc20.tar.gz -> github.com-docker-libtrust-aabc10ec26b754e797f9028f4589c5b7bd90dc20.tar.gz https://github.com/facebookgo/httpdown/archive/a3b1354551a26449fbe05f5d855937f6e7acbd71.tar.gz -> github.com-facebookgo-httpdown-a3b1354551a26449fbe05f5d855937f6e7acbd71.tar.gz https://github.com/facebookgo/clock/archive/600d898af40aa09a7a93ecb9265d87b0504b6f03.tar.gz -> github.com-facebookgo-clock-600d898af40aa09a7a93ecb9265d87b0504b6f03.tar.gz https://github.com/facebookgo/stats/archive/1b76add642e42c6ffba7211ad7b3939ce654526e.tar.gz -> github.com-facebookgo-stats-1b76add642e42c6ffba7211ad7b3939ce654526e.tar.gz https://github.com/go-ldap/ldap/archive/13cedcf58a1ea124045dea529a66c849d3444c8e.tar.gz -> github.com-go-ldap-ldap-13cedcf58a1ea124045dea529a66c849d3444c8e.tar.gz https://github.com/cesanta/glog/archive/22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz -> github.com-cesanta-glog-22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz https://github.com/schwarmco/go-cartesian-product/archive/c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz -> github.com-schwarmco-go-cartesian-product-c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz https://github.com/syndtr/goleveldb/archive/3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz -> github.com-syndtr-goleveldb-3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz https://github.com/golang/snappy/archive/553a641470496b2327abcac10b36396bd98e45c9.tar.gz -> github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz -> github.com-go-asn1-ber-asn1-ber-4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/go-mgo/mgo/archive/3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz -> github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz https://github.com/go-yaml/yaml/archive/a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz -> github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz https://github.com/golang/crypto/archive/e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz -> github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz https://github.com/golang/sys/archive/493114f68206f85e7e333beccfabc11e98cba8dd.tar.gz -> github.com-golang-sys-493114f68206f85e7e333beccfabc11e98cba8dd.tar.gz https://github.com/golang/net/archive/859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz -> github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz https://github.com/google/google-api-go-client/archive/39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz -> github.com-google-google-api-go-client-39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz https://github.com/grpc/grpc-go/archive/35170916ff58e89ae03f52e778228e18207e0e02.tar.gz -> github.com-grpc-grpc-go-35170916ff58e89ae03f52e778228e18207e0e02.tar.gz https://github.com/golang/protobuf/archive/11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz -> github.com-golang-protobuf-11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz https://github.com/golang/oauth2/archive/13449ad91cb26cb47661c1b080790392170385fd.tar.gz -> github.com-golang-oauth2-13449ad91cb26cb47661c1b080790392170385fd.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/bbf380d59635bf267fc8a8df03d6d261c448ee3c.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-bbf380d59635bf267fc8a8df03d6d261c448ee3c.tar.gz https://github.com/golang/text/archive/ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49.tar.gz -> github.com-golang-text-ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49.tar.gz https://github.com/googleapis/gax-go/archive/8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.gz -> github.com-googleapis-gax-go-8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.gz https://github.com/google/go-genproto/archive/595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz -> github.com-google-go-genproto-595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=28eede4160051c4d7a5e203cb1c778b7
diff --git a/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1 b/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
index 8fd11760e247..ef1573abdcd1 100644
--- a/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
+++ b/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-crypt/qca[qt5(+)] dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 sys-auth/libfprint sys-auth/polkit-qt[qt5(+)] sys-libs/pam x11-libs/libX11 x11-libs/libfakekey dev-libs/libusb !sys-auth/thinkfinger
 SLOT=0
 SRC_URI=https://github.com/maksbotan/fingerprint-gui/archive/v1.09-qt5.tar.gz -> fingerprint-gui-1.09.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=850533891b3eb0d29c844c65f672f461
diff --git a/metadata/md5-cache/sys-auth/pam_blue-0.9.0 b/metadata/md5-cache/sys-auth/pam_blue-0.9.0
deleted file mode 100644
index ecdace2fafa0..000000000000
--- a/metadata/md5-cache/sys-auth/pam_blue-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/pam net-wireless/bluez >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=PAM module providing ability to authenticate via a bluetooth compatible device
-EAPI=0
-HOMEPAGE=http://pam.0xdef.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/pam net-wireless/bluez
-SLOT=0
-SRC_URI=http://pam.0xdef.net/source/pam_blue-0.9.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a74e1a3ac86c77820d15b637a3c5480b
diff --git a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1 b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
deleted file mode 100644
index 254ca0c514d7..000000000000
--- a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=virtual/pam doc? ( www-client/lynx ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=pam module to allow password-storing in $HOME/dotfiles
-EAPI=0
-HOMEPAGE=http://0pointer.de/lennart/projects/pam_dotfile/
-IUSE=doc
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/pam
-SLOT=0
-SRC_URI=http://0pointer.de/lennart/projects/pam_dotfile/pam_dotfile-0.7.tar.gz http://digilander.libero.it/dgp85/gentoo/pam_dotfile-patches-1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5461afe6b7be2a8930c9a10c0d444d7
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-183 b/metadata/md5-cache/sys-auth/pam_ldap-183
deleted file mode 100644
index 410831c64745..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ldap-183
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=PAM LDAP Module
-EAPI=0
-HOMEPAGE=http://www.padl.com/OSS/pam_ldap.html
-IUSE=ssl sasl
-KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 sparc x86
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=http://www.padl.com/download/pam_ldap-183.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5851e6e083733ce80cac74129c12c129
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-184 b/metadata/md5-cache/sys-auth/pam_ldap-184
deleted file mode 100644
index 6cd280251194..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ldap-184
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=PAM LDAP Module
-EAPI=0
-HOMEPAGE=http://www.padl.com/OSS/pam_ldap.html
-IUSE=ssl sasl
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=http://www.padl.com/download/pam_ldap-184.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f837f08d6f9d953384bea9a7fe1f679
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-186 b/metadata/md5-cache/sys-auth/pam_ldap-186
deleted file mode 100644
index 5e49d39c8504..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ldap-186
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=|| ( >=sys-libs/glibc-2.1.3 >=sys-freebsd/freebsd-lib-9.1 ) virtual/pam >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
-DESCRIPTION=PAM LDAP Module
-EAPI=0
-HOMEPAGE=http://www.padl.com/OSS/pam_ldap.html
-IUSE=ssl sasl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=|| ( >=sys-libs/glibc-2.1.3 >=sys-freebsd/freebsd-lib-9.1 ) virtual/pam >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=http://www.padl.com/download/pam_ldap-186.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b3a95339c1e9813d43e45f93c1fe5bd
diff --git a/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.4 b/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.4
deleted file mode 100644
index 769ed3979dc1..000000000000
--- a/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/pam
-DESCRIPTION=Password strength checking for PAM aware password changing programs
-EAPI=0
-HOMEPAGE=http://www.openwall.com/passwdqc/
-KEYWORDS=alpha ~amd64 arm ~hppa m68k ~mips ppc s390 sh ~sparc x86
-LICENSE=Openwall BSD public-domain
-RDEPEND=virtual/pam
-SLOT=0
-SRC_URI=http://www.openwall.com/pam/modules/pam_passwdqc/pam_passwdqc-1.0.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d23a230183bf39f66bdcbf5b0f1ebf4b
diff --git a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r5 b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r5
index 7b4c2a0a7117..f1b9c00c79c7 100644
--- a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r5
+++ b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libnsl:0= >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 SLOT=0
 SRC_URI=http://dkorunic.net/tarballs/pam_skey-1.1.5.tar.gz mirror://gentoo/pam_skey-1.1.5-patches-6.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=205d689168f2dc1986a6f87935e5ff84
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-1.98 b/metadata/md5-cache/sys-auth/pam_ssh-1.98
index 1408fed31bfe..3f7c56ee2d2d 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-1.98
+++ b/metadata/md5-cache/sys-auth/pam_ssh-1.98
@@ -3,10 +3,10 @@ DEPEND=sys-libs/pam net-misc/openssh sys-devel/libtool
 DESCRIPTION=Uses ssh-agent to provide single sign-on
 EAPI=5
 HOMEPAGE=http://pam-ssh.sourceforge.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD ISC
 RDEPEND=sys-libs/pam net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-1.98.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f78074a9e538e6c284ca77b790fc31d4
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0d273191c6c1bbf7b53e203f5a14908c
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-2.1 b/metadata/md5-cache/sys-auth/pam_ssh-2.1
index 721bd6ac491d..d8d33edd77ce 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-2.1
+++ b/metadata/md5-cache/sys-auth/pam_ssh-2.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2 BSD ISC
 RDEPEND=virtual/pam dev-libs/openssl:0= net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-2.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=367ff6b6fc5d58531c635818e89c1c1f
diff --git a/metadata/md5-cache/sys-auth/skey-1.1.5-r11 b/metadata/md5-cache/sys-auth/skey-1.1.5-r11
index e516cd224f04..d4e0d8060623 100644
--- a/metadata/md5-cache/sys-auth/skey-1.1.5-r11
+++ b/metadata/md5-cache/sys-auth/skey-1.1.5-r11
@@ -4,10 +4,10 @@ DESCRIPTION=Linux Port of OpenBSD Single-key Password System
 EAPI=6
 HOMEPAGE=http://www.openbsd.org/faq/faq8.html#SKey
 IUSE=static-libs
-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=BSD MIT RSA BEER-WARE
 RDEPEND=dev-lang/perl virtual/perl-Time-Local sys-libs/cracklib
 SLOT=0
 SRC_URI=mirror://gentoo/skey-1.1.5.tar.bz2 https://dev.gentoo.org/~ulm/distfiles/skey-1.1.5-patches-6.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=840d78a57be6ececb552b5b51215d331
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7e09278e5e883450d32686a4a961815a
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index bba81cb96b6b..ff1e4b66ca25 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/tw_cli-10.1 b/metadata/md5-cache/sys-block/tw_cli-10.1
deleted file mode 100644
index 21a4eaadc55f..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-10.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=https://www.3ware.com/3warekb/article.aspx?id=14847
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=3ware
-RESTRICT=strip fetch
-SLOT=0
-SRC_URI=kernel_linux? ( http://www.lsi.com/DistributionSystem/AssetDocument/cli_linux_10.1.zip ) kernel_FreeBSD? ( http://www.lsi.com/DistributionSystem/AssetDocument/cli_freebsd_10.1.zip )
-_md5_=2a7ca74ce54ab61b9772500eb7a1ea18
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.2.1.1 b/metadata/md5-cache/sys-block/tw_cli-9.2.1.1
deleted file mode 100644
index c41a64274e33..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.2.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware Command Line Interface Tool
-EAPI=0
-HOMEPAGE=http://www.3ware.com/
-KEYWORDS=-* x86 amd64
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9000Series/9.2.1.1/tw_cli-linux-x86-9.2.1.1.tgz ) amd64? ( http://www.3ware.com/download/Escalade9000Series/9.2.1.1/tw_cli-linux-x86_64-9.2.1.1.tgz )
-_md5_=960607f43b331c33cecdf4af03c53cd6
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.3.0.4 b/metadata/md5-cache/sys-block/tw_cli-9.3.0.4
deleted file mode 100644
index 63c5ab642f40..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.3.0.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=http://www.3ware.com/
-KEYWORDS=-* ~x86 ~amd64
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade7000Series/9.3.0.4/tw_cli-linux-x86-9.3.0.4.tgz ) amd64? ( http://www.3ware.com/download/Escalade7000Series/9.3.0.4/tw_cli-linux-x86_64-9.3.0.4.tgz )
-_md5_=81c6f672de0fa8d81c52f7c9dfdd7430
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.4.1.2 b/metadata/md5-cache/sys-block/tw_cli-9.4.1.2
deleted file mode 100644
index 22b4508d833c..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.4.1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=https://www.3ware.com/3warekb/article.aspx?id=14847
-KEYWORDS=-* amd64 x86
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9650SE-Series/9.4.1.2/tw_cli-linux-x86-9.4.1.2.tgz ) amd64? ( http://www.3ware.com/download/Escalade9650SE-Series/9.4.1.2/tw_cli-linux-x86_64-9.4.1.2.tgz )
-_md5_=062463c1cbb950272258825f548e6aa8
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.4.2 b/metadata/md5-cache/sys-block/tw_cli-9.4.2
deleted file mode 100644
index 9082e4af7526..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.4.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=https://www.3ware.com/3warekb/article.aspx?id=14847
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=3ware
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9650SE-Series/9.4.2/tw_cli-linux-x86-9.4.2.tgz ) amd64? ( http://www.3ware.com/download/Escalade9650SE-Series/9.4.2/tw_cli-linux-x86_64-9.4.2.tgz )
-_md5_=070f59c23a16c2d424d4562762140cac
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.5.2 b/metadata/md5-cache/sys-block/tw_cli-9.5.2
deleted file mode 100644
index c6d4a2c0f9bf..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.5.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=https://www.3ware.com/3warekb/article.aspx?id=14847
-KEYWORDS=-* amd64 x86 ~x86-fbsd
-LICENSE=3ware
-RESTRICT=strip
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.2/tw_cli-linux-x86-9.5.2.tgz ) amd64? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.2/tw_cli-linux-x86_64-9.5.2.tgz ) x86-fbsd? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.2/tw_cli-freebsd-x86-9.5.2.tgz )
-_md5_=b908fdae4757e661f82379961a540005
diff --git a/metadata/md5-cache/sys-block/tw_cli-9.5.3 b/metadata/md5-cache/sys-block/tw_cli-9.5.3
deleted file mode 100644
index 1d55e92394d0..000000000000
--- a/metadata/md5-cache/sys-block/tw_cli-9.5.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch setup unpack
-DESCRIPTION=3ware SATA+PATA RAID controller Command Line Interface tool
-EAPI=0
-HOMEPAGE=https://www.3ware.com/3warekb/article.aspx?id=14847
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=3ware
-RESTRICT=strip
-SLOT=0
-SRC_URI=x86? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.3/tw_cli-linux-x86-9.5.3.tgz ) amd64? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.3/tw_cli-linux-x86_64-9.5.3.tgz ) x86-fbsd? ( http://www.3ware.com/download/Escalade9690SA-Series/9.5.3/tw_cli-freebsd-x86-9.5.3.tgz )
-_md5_=95a7072aebdaa4a92f5ba14c57940d9f
diff --git a/metadata/md5-cache/sys-block/zram-init-2.7-r1 b/metadata/md5-cache/sys-block/zram-init-2.7-r1
deleted file mode 100644
index 0caa83adb060..000000000000
--- a/metadata/md5-cache/sys-block/zram-init-2.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Scripts to support compressed swap devices or ramdisks with zram
-EAPI=5
-HOMEPAGE=https://github.com/vaeth/zram-init/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/vaeth/zram-init/archive/2.7.tar.gz -> zram-init-2.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb7c5350acdb133eb2ae2d9e70c52fe5
diff --git a/metadata/md5-cache/sys-block/zram-init-3.0 b/metadata/md5-cache/sys-block/zram-init-3.0
deleted file mode 100644
index 2de6563aab19..000000000000
--- a/metadata/md5-cache/sys-block/zram-init-3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Scripts to support compressed swap devices or ramdisks with zram
-EAPI=5
-HOMEPAGE=https://github.com/vaeth/zram-init/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/vaeth/zram-init/archive/3.0.tar.gz -> zram-init-3.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1fc5a99152e74da966aac1d803b186fd
diff --git a/metadata/md5-cache/sys-block/zram-init-3.4 b/metadata/md5-cache/sys-block/zram-init-3.4
deleted file mode 100644
index 0d50f3d18c5b..000000000000
--- a/metadata/md5-cache/sys-block/zram-init-3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Scripts to support compressed swap devices or ramdisks with zram
-EAPI=5
-HOMEPAGE=https://github.com/vaeth/zram-init/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!<sys-apps/openrc-0.13
-SLOT=0
-SRC_URI=https://github.com/vaeth/zram-init/archive/v3.4.tar.gz -> zram-init-3.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=40a34bcb85fa6706b7f9d4fb5c01d650
diff --git a/metadata/md5-cache/sys-block/zram-init-3.6 b/metadata/md5-cache/sys-block/zram-init-3.6
deleted file mode 100644
index dbf397afb5b9..000000000000
--- a/metadata/md5-cache/sys-block/zram-init-3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Scripts to support compressed swap devices or ramdisks with zram
-EAPI=6
-HOMEPAGE=https://github.com/vaeth/zram-init/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!<sys-apps/openrc-0.13
-SLOT=0
-SRC_URI=https://github.com/vaeth/zram-init/archive/v3.6.tar.gz -> zram-init-3.6.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b19ba2a866255d54ba98920481a5b639
diff --git a/metadata/md5-cache/sys-block/zram-init-3.8 b/metadata/md5-cache/sys-block/zram-init-3.8
index 355db4438c7f..47c2253f04d9 100644
--- a/metadata/md5-cache/sys-block/zram-init-3.8
+++ b/metadata/md5-cache/sys-block/zram-init-3.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.13
 SLOT=0
 SRC_URI=https://github.com/vaeth/zram-init/archive/v3.8.tar.gz -> zram-init-3.8.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=c7cc8cbef173d461aba70238be257bb4
diff --git a/metadata/md5-cache/sys-block/zram-init-7.1-r1 b/metadata/md5-cache/sys-block/zram-init-7.1-r1
new file mode 100644
index 000000000000..a0b718683582
--- /dev/null
+++ b/metadata/md5-cache/sys-block/zram-init-7.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Scripts to support compressed swap devices or ramdisks with zram
+EAPI=6
+HOMEPAGE=https://github.com/vaeth/zram-init/
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-shells/push-2.0 !<sys-apps/openrc-0.13
+SLOT=0
+SRC_URI=https://github.com/vaeth/zram-init/archive/v7.1.tar.gz -> zram-init-7.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=249380c1f12b66aa5ffddb719294050b
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 5246be75f10f..029fb065ab5f 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/grub-static-0.96-r1 b/metadata/md5-cache/sys-boot/grub-static-0.96-r1
deleted file mode 100644
index 8943680a6973..000000000000
--- a/metadata/md5-cache/sys-boot/grub-static-0.96-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!<sys-boot/grub-2
-DESCRIPTION=Static GNU GRUB boot loader
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/grub/
-KEYWORDS=-* amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!<sys-boot/grub-2
-SLOT=0
-SRC_URI=mirror://gentoo/grub-static-0.96.tar.bz2
-_md5_=696993d2fddc84a72eec6cc76fc4c107
diff --git a/metadata/md5-cache/sys-boot/grub-static-0.97 b/metadata/md5-cache/sys-boot/grub-static-0.97
deleted file mode 100644
index 318554896814..000000000000
--- a/metadata/md5-cache/sys-boot/grub-static-0.97
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prerm
-DEPEND=!<sys-boot/grub-2
-DESCRIPTION=Static GNU GRUB boot loader
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/grub/
-KEYWORDS=-* amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!<sys-boot/grub-2
-SLOT=0
-SRC_URI=mirror://gentoo/grub-static-0.97.tar.bz2
-_eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=04018c7076c73dedc391c9571b5303dd
diff --git a/metadata/md5-cache/sys-boot/grub-static-0.97-r6 b/metadata/md5-cache/sys-boot/grub-static-0.97-r6
deleted file mode 100644
index 2c2d0ed0a67d..000000000000
--- a/metadata/md5-cache/sys-boot/grub-static-0.97-r6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prerm
-DEPEND=!<sys-boot/grub-2
-DESCRIPTION=GNU GRUB Legacy boot loader (static build)
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/grub/
-KEYWORDS=-* amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!<sys-boot/grub-2
-SLOT=0
-SRC_URI=mirror://gentoo/grub-static-0.97-r6.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00dde9090604f3a622eb41472fcd6466
diff --git a/metadata/md5-cache/sys-boot/os-prober-1.76-r1 b/metadata/md5-cache/sys-boot/os-prober-1.76-r1
index 9fe50e3cc27d..d9ea518cc347 100644
--- a/metadata/md5-cache/sys-boot/os-prober-1.76-r1
+++ b/metadata/md5-cache/sys-boot/os-prober-1.76-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=sys-boot/grub:2[mount]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/os-prober/os-prober_1.76.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=32a9fa6413a9508e1b0fb43b7eeabe57
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.2-r1 b/metadata/md5-cache/sys-boot/plymouth-0.9.2-r1
index d29f64e1ff07..931fea20580c 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.2-r1
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=66f63937d61f96d17b330cebe8c6f1da
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.3 b/metadata/md5-cache/sys-boot/plymouth-0.9.3
index 42fce1f57b3f..ea3859fe2612 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.3
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=e6298490b4f3d90ba1c7e94b62db7a22
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1 b/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
index 8bc805bb443a..7e7a6783e96f 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=8a17a65a636b90a31c0ea9eb57af7320
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.3-r2 b/metadata/md5-cache/sys-boot/plymouth-0.9.3-r2
index 3d5b96350dc6..54eb3bc24ce9 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.3-r2
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4f5511382a2873b9f255503b4c887e65
diff --git a/metadata/md5-cache/sys-boot/plymouth-9999 b/metadata/md5-cache/sys-boot/plymouth-9999
index b8e38b15ff57..a7bbdd7bcbce 100644
--- a/metadata/md5-cache/sys-boot/plymouth-9999
+++ b/metadata/md5-cache/sys-boot/plymouth-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4f5511382a2873b9f255503b4c887e65
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160209 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160209
index 6e5f5c347bd5..95d13b205ee7 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160209
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160209
@@ -7,5 +7,5 @@ LICENSE=GPL-2 raspberrypi-videocore-bin
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20160209.tar.gz -> raspberrypi-firmware-1.20160209.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdd9061744b8221238a3a79e8dc3e841
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160309 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160309
index 80c0e54e7131..e472d854ad56 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160309
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20160309
@@ -7,5 +7,5 @@ LICENSE=GPL-2 raspberrypi-videocore-bin
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20160309.tar.gz -> raspberrypi-firmware-1.20160309.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdd9061744b8221238a3a79e8dc3e841
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1_pre20130807 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1_pre20130807
index 4ae8c3e90c13..dffb644433e9 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1_pre20130807
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1_pre20130807
@@ -8,5 +8,5 @@ RDEPEND=!sys-boot/raspberrypi-loader
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/firmware/raw/b2dbc04508/boot/bootcode.bin -> raspberrypi-firmware-b2dbc04508-bootcode.bin https://github.com/raspberrypi/firmware/raw/b2dbc04508/boot/fixup.dat -> raspberrypi-firmware-b2dbc04508-fixup.dat https://github.com/raspberrypi/firmware/raw/b2dbc04508/boot/fixup_cd.dat -> raspberrypi-firmware-b2dbc04508-fixup_cd.dat https://github.com/raspberrypi/firmware/raw/b2dbc04508/boot/fixup_x.dat -> raspberrypi-firmware-b2dbc04508-fixup_x.dat https://github.com/raspberrypi/firmware/raw/b2dbc04508/boot/start.elf -> raspberrypi-firmware-b2dbc04508-start.elf https://github.com/raspberrypi/firmware/raw/b2dbc04508/boot/start_cd.elf -> raspberrypi-firmware-b2dbc04508-start_cd.elf https://github.com/raspberrypi/firmware/raw/b2dbc04508/boot/start_x.elf -> raspberrypi-firmware-b2dbc04508-start_x.elf
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b359a7df87e68b5d8596bc992550685
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
index f3ae1bd8d2bf..f45a47e83e49 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2 raspberrypi-videocore-bin
 RDEPEND=!sys-boot/raspberrypi-loader
 RESTRICT=binchecks strip
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fed2a18b5817953ebac94fa7cc1c729e
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index f7c285d3e823..c2ae779099d7 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/ceph-10.2.10-r1 b/metadata/md5-cache/sys-cluster/ceph-10.2.10-r1
index 5fc209c6add0..c66e91d94821 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.10-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.10-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=9731a70911cc24dbcea57c83af1082ac
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2 b/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
index 5413b25bc947..2f0bfc8ebe7c 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=d670b5355b15cca9aae5c8e20b38e6bc
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2 b/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
index 010182c87aac..44439a3122f5 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=205ae1a12997ff69f67c08cb2075538e
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.7-r1 b/metadata/md5-cache/sys-cluster/ceph-10.2.7-r1
index b0b67925c141..21530508acd8 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.7-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a3db5bd0d100a8c8afb36f51fb4f66bf
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.9 b/metadata/md5-cache/sys-cluster/ceph-10.2.9
index 9867f557e5a2..5c759793ade5 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.9
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.9
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=9f151f67910ba266952b95fbe86ee251
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.9-r1 b/metadata/md5-cache/sys-cluster/ceph-10.2.9-r1
index 943bc3e7a22b..e69f0458b92a 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.9-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=7c889ac5feea3e03d066a7e73273453e
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.9-r2 b/metadata/md5-cache/sys-cluster/ceph-10.2.9-r2
index 271f96b6286c..77742e25e1e2 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.9-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.9-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=28fd8d76ab5cc81c2ab0ec08157569a3
diff --git a/metadata/md5-cache/sys-cluster/ceph-10.2.9-r3 b/metadata/md5-cache/sys-cluster/ceph-10.2.9-r3
index 0ebcfae2cd35..68da6eb39008 100644
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.9-r3
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.9-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-10.2.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=9104cb3c22ef5949551cb8db2840be28
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.1 b/metadata/md5-cache/sys-cluster/ceph-12.2.1
index 9a4a97c6b627..d2aa6cd8212a 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.1
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.1.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6a2165f558f48cf8a0e45a298f968d01
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.2 b/metadata/md5-cache/sys-cluster/ceph-12.2.2
index ca20444809d1..6d82cacfbe51 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.2
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.2.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=85cd8155787aea56e32b698e7c37f1bd
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.2-r1 b/metadata/md5-cache/sys-cluster/ceph-12.2.2-r1
index 3fd592952b42..42e66913a412 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.2-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.2.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dc856144aa429179168fee1fccbc1588
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.4-r2 b/metadata/md5-cache/sys-cluster/ceph-12.2.4-r2
index 3bc72294d5d7..85e23906c5c2 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.4-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.4.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=957cb69894145ab903a6e1ff4e805e82
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.5 b/metadata/md5-cache/sys-cluster/ceph-12.2.5
index accca31dc333..5d3b4174a248 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.5
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.5.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d435ba678a2f37bdebee42b6bee8ded3
diff --git a/metadata/md5-cache/sys-cluster/cinder-12.0.2 b/metadata/md5-cache/sys-cluster/cinder-12.0.2
new file mode 100644
index 000000000000..41894902b591
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-12.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.0 app-admin/sudo 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(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
+EAPI=6
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.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/pbr-2.1.0 >=dev-python/Babel-2.3.4[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/Babel-2.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(-)] >=dev-python/decorator-3.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(-)] >=dev-python/defusedxml-0.5.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/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[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/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.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/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[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/jsonschema-2.6.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/jsonschema-3.0.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-ipaddress[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/keystoneauth-3.3.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/keystonemiddleware-4.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/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.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/oauth2client-1.5.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/oslo-config-5.1.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/oslo-concurrency-3.25.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/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.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/oslo-log-3.36.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/oslo-messaging-5.29.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/oslo-middleware-3.31.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/oslo-policy-1.30.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/oslo-privsep-1.23.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/oslo-reports-1.18.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/oslo-rootwrap-5.8.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/oslo-serialization-2.18.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/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.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/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.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/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.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(-)] >=dev-python/paramiko-2.0.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/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.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/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[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/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyparsing-2.1.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/python-barbicanclient-4.0.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/python-barbicanclient-4.5.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/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.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/python-keystoneclient-3.8.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/python-novaclient-9.1.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/python-swiftclient-3.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(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/retrying-1.2.3[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/retrying-1.3.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/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.16.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/rtslib-fb-2.1.43[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/rtslib-fb-2.1.60[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/rtslib-fb-2.1.61[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/rtslib-fb-2.1.64[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/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[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/pymysql-0.7.7[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/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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(-)] ) postgres? ( >=dev-python/psycopg-2.5.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/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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/sqlalchemy-migrate-0.11.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/stevedore-1.20.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/suds-0.6[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/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[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/oslo-vmware-2.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/os-brick-2.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(-)] >=dev-python/os-win-3.0.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/tooz-1.58.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/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.16.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/cryptography-1.9[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/cryptography-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(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils 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=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample https://tarballs.openstack.org/cinder/cinder-12.0.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a01bb947b1609ec95bf609bfa3d683d8
diff --git a/metadata/md5-cache/sys-cluster/cman-lib-2.03.09 b/metadata/md5-cache/sys-cluster/cman-lib-2.03.09
deleted file mode 100644
index 44c216cebcb3..000000000000
--- a/metadata/md5-cache/sys-cluster/cman-lib-2.03.09
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!sys-cluster/cman-headers !sys-cluster/cman-kernel !=sys-cluster/cman-1*
-DESCRIPTION=A library for cluster management common to the various pieces of Cluster Suite
-EAPI=0
-HOMEPAGE=https://sourceware.org/cluster/wiki/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!sys-cluster/cman-headers !sys-cluster/cman-kernel !=sys-cluster/cman-1*
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/cluster/releases/cluster-2.03.09.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ec946193ccacc12f278306fd32230134
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.21-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.21-r1
deleted file mode 100644
index dd1583b9aba1..000000000000
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.21-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=>=sys-libs/ncurses-5.2
-DESCRIPTION=utility to administer the IP virtual server services
-EAPI=0
-HOMEPAGE=http://linuxvirtualserver.org
-KEYWORDS=~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2
-SLOT=0
-SRC_URI=http://www.linuxvirtualserver.org/software/kernel-2.4/ipvsadm-1.21-11.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a3fdb359f563fbc01ae80d603a1df0e1
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.24 b/metadata/md5-cache/sys-cluster/ipvsadm-1.24
deleted file mode 100644
index 21936ffdd349..000000000000
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.24
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=>=sys-libs/ncurses-5.2
-DESCRIPTION=utility to administer the IP virtual server services offered by the Linux kernel
-EAPI=0
-HOMEPAGE=http://linuxvirtualserver.org/
-KEYWORDS=amd64 ia64 ~ppc64 s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2
-SLOT=0
-SRC_URI=http://www.linuxvirtualserver.org/software/kernel-2.5/ipvsadm-1.24.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f2058287cd8a690937bf63f00722de4
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.2
deleted file mode 100644
index 51deb13c4f62..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3
deleted file mode 100644
index f1f83f43c549..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.4 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.4
new file mode 100644
index 000000000000..44a8fb3c5f1c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
deleted file mode 100644
index 0703d455b0a1..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.7
deleted file mode 100644
index 360465fce9e3..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.2
deleted file mode 100644
index 523b3448dcc6..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3
deleted file mode 100644
index 621eeb8daf37..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.4 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.4
new file mode 100644
index 000000000000..359f03abb852
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
deleted file mode 100644
index 3c5ea533ea11..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.7 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.7
deleted file mode 100644
index 41f28af7f92a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.2
deleted file mode 100644
index 618d568748bd..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3
deleted file mode 100644
index e80b20b13b5a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.4 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.4
new file mode 100644
index 000000000000..64a82d2e1dd3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
deleted file mode 100644
index cec92510f0d3..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.7 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.7
deleted file mode 100644
index 515ac85a577a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.2
deleted file mode 100644
index 4ca6f291a618..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d388863db97db759634e4973f6ce604b
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3
deleted file mode 100644
index 09ca1c010d11..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d388863db97db759634e4973f6ce604b
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.4 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.4
new file mode 100644
index 000000000000..edf2c9606cec
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Scheduler
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d388863db97db759634e4973f6ce604b
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
deleted file mode 100644
index ead1189059a5..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.7 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.7
deleted file mode 100644
index 5878bc0e8434..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.2 b/metadata/md5-cache/sys-cluster/kubectl-1.10.2
deleted file mode 100644
index f22e8854e500..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.3 b/metadata/md5-cache/sys-cluster/kubectl-1.10.3
deleted file mode 100644
index af82831904e0..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.4 b/metadata/md5-cache/sys-cluster/kubectl-1.10.4
new file mode 100644
index 000000000000..2d2f53d0a5b6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.10.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.6 b/metadata/md5-cache/sys-cluster/kubectl-1.9.6
deleted file mode 100644
index fcc6a54ccd9c..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.7 b/metadata/md5-cache/sys-cluster/kubectl-1.9.7
deleted file mode 100644
index b2017dc06113..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.2 b/metadata/md5-cache/sys-cluster/kubelet-1.10.2
deleted file mode 100644
index a81e9d22bf66..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.3 b/metadata/md5-cache/sys-cluster/kubelet-1.10.3
deleted file mode 100644
index b598664c0b99..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.10.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.4 b/metadata/md5-cache/sys-cluster/kubelet-1.10.4
new file mode 100644
index 000000000000..b2602fe98ce2
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.10.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.6 b/metadata/md5-cache/sys-cluster/kubelet-1.9.6
deleted file mode 100644
index a45f6eee2d77..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.7 b/metadata/md5-cache/sys-cluster/kubelet-1.9.7
deleted file mode 100644
index 64982989483c..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.9.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/neutron-11.0.3 b/metadata/md5-cache/sys-cluster/neutron-11.0.3
deleted file mode 100644
index c132532ae543..000000000000
--- a/metadata/md5-cache/sys-cluster/neutron-11.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo 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(-)]
-DESCRIPTION=A virtual network service for Openstack
-EAPI=6
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0 dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/neutron-lib-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ryu-4.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-privsep-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovs-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovsdbapp-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyroute2-0.4.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/weakrefmethod-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-9.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-xenapi-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-11.0.3.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-11.0.3.tar.gz https://tarballs.openstack.org/neutron/neutron-11.0.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=78bfbe2f9f1d3e3f43d1f80079879887
diff --git a/metadata/md5-cache/sys-cluster/neutron-11.0.4 b/metadata/md5-cache/sys-cluster/neutron-11.0.4
index f6687ac7c5c9..de3a3daa818a 100644
--- a/metadata/md5-cache/sys-cluster/neutron-11.0.4
+++ b/metadata/md5-cache/sys-cluster/neutron-11.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=A virtual network service for Openstack
 EAPI=6
 HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0 dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/neutron-lib-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ryu-4.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-privsep-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovs-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovsdbapp-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyroute2-0.4.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/weakrefmethod-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-9.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-xenapi-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-11.0.4.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-11.0.4.tar.gz https://tarballs.openstack.org/neutron/neutron-11.0.4.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc180deadec750e922c40f9d1935cc07
+_md5_=78bfbe2f9f1d3e3f43d1f80079879887
diff --git a/metadata/md5-cache/sys-cluster/neutron-12.0.1 b/metadata/md5-cache/sys-cluster/neutron-12.0.1
deleted file mode 100644
index f22e5dea93fe..000000000000
--- a/metadata/md5-cache/sys-cluster/neutron-12.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A virtual network service for Openstack
-EAPI=6
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/neutron-lib-1.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ryu-4.14[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ovs-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ovsdbapp-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pyroute2-0.4.21[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/weakrefmethod-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-12.0.1.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-12.0.1.tar.gz https://tarballs.openstack.org/neutron/neutron-12.0.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67fcfc613d4bddd4f71cd3d434c70467
diff --git a/metadata/md5-cache/sys-cluster/neutron-12.0.2 b/metadata/md5-cache/sys-cluster/neutron-12.0.2
index feb525facc55..e1aa3da23b42 100644
--- a/metadata/md5-cache/sys-cluster/neutron-12.0.2
+++ b/metadata/md5-cache/sys-cluster/neutron-12.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=A virtual network service for Openstack
 EAPI=6
 HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pecan-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/neutron-lib-1.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ryu-4.14[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ovs-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/ovsdbapp-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pyroute2-0.4.21[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/weakrefmethod-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( <=net-misc/openvswitch-2.8.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-12.0.2.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-12.0.2.tar.gz https://tarballs.openstack.org/neutron/neutron-12.0.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a3169eebc2feeb6b76e9f982e741859
+_md5_=67fcfc613d4bddd4f71cd3d434c70467
diff --git a/metadata/md5-cache/sys-cluster/nova-16.1.4 b/metadata/md5-cache/sys-cluster/nova-16.1.4
new file mode 100644
index 000000000000..a7d661ab780e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-16.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-16.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/setuptools-24.0.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/setuptools-34.0.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/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[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/setuptools-34.1.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/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.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(-)] !~dev-python/setuptools-34.3.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/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.0 app-admin/sudo 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=Cloud computing fabric controller (main part of an IaaS system) in Python
+EAPI=6
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-16.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/setuptools-24.0.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/setuptools-34.0.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/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[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/setuptools-34.1.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/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.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(-)] !~dev-python/setuptools-34.3.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/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[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/pymysql-0.7.7[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/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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(-)] ) postgres? ( >=dev-python/psycopg-2.5.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/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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/decorator-3.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(-)] >=dev-python/eventlet-0.18.4[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/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.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/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.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/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[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/keystonemiddleware-4.12.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/lxml-2.3[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/lxml-3.7.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/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.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/cryptography-2.0.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/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[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/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[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/sqlalchemy-migrate-0.11.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/netaddr-0.7.13[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/netaddr-0.7.16[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/netifaces-0.10.4[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/paramiko-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(-)] >=dev-python/Babel-2.3.4[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/Babel-2.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(-)] >=dev-python/iso8601-0.1.11[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/jsonschema-2.0.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/jsonschema-2.5.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/jsonschema-3.0.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/python-cinderclient-3.1.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/keystoneauth-3.1.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/python-neutronclient-6.3.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/python-glanceclient-2.8.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/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.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/stevedore-1.20.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/websockify-0.8.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/oslo-cache-1.5.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/oslo-concurrency-3.8.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/oslo-config-4.0.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/oslo-config-4.3.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/oslo-config-4.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(-)] >=dev-python/oslo-context-2.14.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/oslo-log-3.22.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/oslo-reports-0.6.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/oslo-serialization-1.10.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/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.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/oslo-db-4.24.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/oslo-rootwrap-5.0.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/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.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/oslo-policy-1.23.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/oslo-privsep-1.9.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/oslo-privsep-1.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/oslo-i18n-2.1.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/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.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/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.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/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.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/os-brick-1.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.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/os-win-2.0.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/castellan-0.7.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/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.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(-)] >=dev-python/tooz-1.47.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/cursive-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.6[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/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) 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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-16.1.4 https://tarballs.openstack.org/nova/nova-16.1.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1eca314ecd8e66d88032e7dc45b7ef1f
diff --git a/metadata/md5-cache/sys-cluster/nova-17.0.5 b/metadata/md5-cache/sys-cluster/nova-17.0.5
new file mode 100644
index 000000000000..b21c5c22b5a9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-17.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-16.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/setuptools-24.0.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/setuptools-34.0.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/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[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/setuptools-34.1.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/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.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(-)] !~dev-python/setuptools-34.3.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/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.0 app-admin/sudo 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=Cloud computing fabric controller (main part of an IaaS system) in Python
+EAPI=6
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-16.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/setuptools-24.0.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/setuptools-34.0.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/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[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/setuptools-34.1.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/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.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(-)] !~dev-python/setuptools-34.3.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/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.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(-)] >=dev-python/pbr-2.0.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/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[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/pymysql-0.7.7[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/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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(-)] ) postgres? ( >=dev-python/psycopg-2.5.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/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[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/sqlalchemy-1.1.6[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/sqlalchemy-1.1.7[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/sqlalchemy-1.1.8[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/decorator-3.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(-)] >=dev-python/eventlet-0.18.4[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/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.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/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.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/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[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/keystonemiddleware-4.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/lxml-2.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.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/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.9.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/cryptography-2.0.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/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.4.10[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/pastedeploy-1.5.0-r1[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/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[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/sqlalchemy-migrate-0.11.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/netaddr-0.7.18[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/netifaces-0.10.4[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/paramiko-2.0.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/Babel-2.3.4[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/Babel-2.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-enum34[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/iso8601-0.1.11[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/jsonschema-2.6.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/jsonschema-3.0.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/python-cinderclient-3.3.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/keystoneauth-3.3.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/python-neutronclient-6.3.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/python-glanceclient-2.8.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/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.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/stevedore-1.20.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/websockify-0.8.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/oslo-cache-1.26.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/oslo-concurrency-3.25.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/oslo-config-5.1.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/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.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/oslo-reports-1.18.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/oslo-serialization-1.18.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/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.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/oslo-db-4.27.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/oslo-rootwrap-5.8.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/oslo-messaging-5.29.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/oslo-policy-1.30.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/oslo-privsep-1.23.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/oslo-i18n-3.15.3[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/oslo-service-1.24.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/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.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/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-2.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(-)] >=dev-python/os-traits-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(-)] >=dev-python/os-vif-1.7.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/os-vif-1.8.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/os-win-3.0.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/castellan-0.16.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/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.58.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/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.10[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/os-service-types-1.1.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/taskflow-2.16.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/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) 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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-17.0.5 https://tarballs.openstack.org/nova/nova-17.0.5.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f8cc839283356b980ee3e7cb5428d7bc
diff --git a/metadata/md5-cache/sys-cluster/openmpi-3.0.1 b/metadata/md5-cache/sys-cluster/openmpi-3.0.1
deleted file mode 100644
index 68724f07b42f..000000000000
--- a/metadata/md5-cache/sys-cluster/openmpi-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[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(-)?,threads] dev-libs/libltdl: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(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A high-performance message passing library (MPI)
-EAPI=6
-HOMEPAGE=http://www.open-mpi.org
-IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[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(-)?,threads] dev-libs/libltdl: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(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-SLOT=0
-SRC_URI=http://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.1.tar.bz2
-_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=84223b6d07cf4916fe2b62e2a6c2400c
diff --git a/metadata/md5-cache/sys-cluster/openmpi-3.0.2 b/metadata/md5-cache/sys-cluster/openmpi-3.0.2
new file mode 100644
index 000000000000..a7c416204eae
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[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(-)?,threads] dev-libs/libltdl: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(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A high-performance message passing library (MPI)
+EAPI=6
+HOMEPAGE=http://www.open-mpi.org
+IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[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(-)?,threads] dev-libs/libltdl: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(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+SLOT=0
+SRC_URI=http://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.2.tar.bz2
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=84223b6d07cf4916fe2b62e2a6c2400c
diff --git a/metadata/md5-cache/sys-cluster/rgmanager-2.03.09 b/metadata/md5-cache/sys-cluster/rgmanager-2.03.09
deleted file mode 100644
index 1b18c1ca0fb9..000000000000
--- a/metadata/md5-cache/sys-cluster/rgmanager-2.03.09
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND==sys-cluster/ccs-2.03.09* =sys-cluster/dlm-lib-2.03.09* =sys-cluster/cman-lib-2.03.09* dev-libs/libxml2 =sys-libs/slang-2*
-DESCRIPTION=Clustered resource group manager
-EAPI=0
-HOMEPAGE=https://sourceware.org/cluster/wiki/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND==sys-cluster/ccs-2.03.09* =sys-cluster/dlm-lib-2.03.09* =sys-cluster/cman-lib-2.03.09*
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/cluster/releases/cluster-2.03.09.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2181b46acf47e410553429e2b43634c5
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1 b/metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
index 38e87e2543de..3bcf5e75bec8 100644
--- a/metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=shared storage lock manager
 EAPI=6
 HOMEPAGE=https://pagure.io/sanlock
 IUSE=python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+ GPL-2 GPL-2+
 RDEPEND=dev-libs/libaio sys-apps/util-linux 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 ) >=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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://git.fedorahosted.org/cgit/sanlock.git/snapshot/sanlock-3.4.0.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=991dcf4ffa39c615705f1e58d45dcd64
+_md5_=16b93e91d8549ebfb4a9fa78724b8899
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 6d391d39864c..aa0ef0c08727 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/binutils-2.25.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
index 905518ffbd5e..ad9210db775c 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 zlib? ( sys-libs/zlib )
 SLOT=2.25.1
 SRC_URI=mirror://gnu/binutils/binutils-2.25.1.tar.bz2 mirror://gentoo/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.25.1-patches-1.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=2620a73e812a3571d5ae12f3c99a619d
diff --git a/metadata/md5-cache/sys-devel/binutils-2.26.1 b/metadata/md5-cache/sys-devel/binutils-2.26.1
index ed5161dd5414..dd4e4070929b 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.26.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.26.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.26.1
 SRC_URI=mirror://gnu/binutils/binutils-2.26.1.tar.bz2 mirror://gentoo/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.26.1-patches-1.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=748753349c21446e54e161c7c90e1313
diff --git a/metadata/md5-cache/sys-devel/binutils-2.27-r1 b/metadata/md5-cache/sys-devel/binutils-2.27-r1
index 09f7c2101477..0985a6a34337 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.27-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.27-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.27
 SRC_URI=mirror://gnu/binutils/binutils-2.27.tar.bz2 mirror://gentoo/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.27-patches-1.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=22bf9ba2542cb6513941873b9fdfd6b4
diff --git a/metadata/md5-cache/sys-devel/binutils-2.28.1 b/metadata/md5-cache/sys-devel/binutils-2.28.1
index 5a714d597aeb..65ba0dd92e6f 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.28.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.28.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.28.1
 SRC_URI=mirror://gnu/binutils/binutils-2.28.1.tar.bz2 mirror://gentoo/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.28.1-patches-1.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=748753349c21446e54e161c7c90e1313
diff --git a/metadata/md5-cache/sys-devel/binutils-2.29.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
index c866fc829f38..68638e4ef43d 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29.1
 SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29.1-patches-3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=63caa4f6c6d10749dde5b4a4e97e3820
diff --git a/metadata/md5-cache/sys-devel/binutils-2.30-r2 b/metadata/md5-cache/sys-devel/binutils-2.30-r2
index ed8a054b3bfb..4c42f8b66181 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.30-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.30-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=+cxx doc multitarget +nls static-libs test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.30
 SRC_URI=mirror://gnu/binutils/binutils-2.30.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.30-patches-2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cee22afe431b6060c1998d98f42be734
+_md5_=fbe807d77e5ced99603cc5802d99f55c
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.25.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.25.1
index 160f07c548dd..954d4b849a81 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.25.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.25.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 zlib? ( sys-libs/zlib )
 SLOT=2.25.1
 SRC_URI=mirror://gnu/binutils/binutils-2.25.1.tar.bz2 mirror://gentoo/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.25.1-patches-1.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=faf68591e084ac41b42c9f420c7685b6
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1
index 42984faea730..ec53c79f5c10 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.26.1
 SRC_URI=mirror://gnu/binutils/binutils-2.26.1.tar.bz2 mirror://gentoo/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.26.1-patches-1.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=0cd6f8a52610c7ad4a8db0d1e0bbf6ae
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.27 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.27
index f3a6a1b21ca7..e5b9b2afd889 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.27
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.27
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.27
 SRC_URI=mirror://gnu/binutils/binutils-2.27.tar.bz2 mirror://gentoo/binutils-2.27-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.27-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.27-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.27-patches-1.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=23217789675b39ef377be7f996e78555
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.28 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.28
index 2310765820c4..9785915dc177 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.28
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.28
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.28
 SRC_URI=mirror://gnu/binutils/binutils-2.28.tar.bz2 mirror://gentoo/binutils-2.28-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.28-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.28-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.28-patches-1.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=6a05fb20ef45b058aae9bd3127680f72
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.28.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.28.1
index 79eea5b44b35..cbcfdb368fdd 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.28.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.28.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.28.1
 SRC_URI=mirror://gnu/binutils/binutils-2.28.1.tar.bz2 mirror://gentoo/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.28.1-patches-1.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=3137c45cb0ff34c6ea36699bd0c0224c
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29
index 1e58af35bdcb..c7f3866e352e 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29
 SRC_URI=mirror://gnu/binutils/binutils-2.29.tar.bz2 mirror://gentoo/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29-patches-1.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=3137c45cb0ff34c6ea36699bd0c0224c
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1
index 29210b76d8be..d956066ff60e 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29.1
 SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29-patches-1.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f3a4b5b240d93491f92e5233f3331669
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1
index 7ea7e3442a36..82c22cf03f3d 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29.1
 SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29.1-patches-2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	9d01287cdc91cc924fa2d1a62d719cf1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	088cd0dda01a22d675c91be6e037c282	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c8658314da9477b12013499054069cb7
diff --git a/metadata/md5-cache/sys-devel/bison-1.875d b/metadata/md5-cache/sys-devel/bison-1.875d
deleted file mode 100644
index 989cb029bbf8..000000000000
--- a/metadata/md5-cache/sys-devel/bison-1.875d
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=sys-devel/m4 nls? ( sys-devel/gettext )
-DESCRIPTION=A yacc-compatible parser generator
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/bison/bison.html
-IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/m4 nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=ftp://alpha.gnu.org/pub/gnu/bison/bison-1.875d.tar.bz2 https://dev.gentoo.org/~mgorny/dist/bison-1.875d-patchset.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1962e7d832339f9cce1f5edb7902705f
diff --git a/metadata/md5-cache/sys-devel/bison-2.4.3 b/metadata/md5-cache/sys-devel/bison-2.4.3
deleted file mode 100644
index 487a9e725c4e..000000000000
--- a/metadata/md5-cache/sys-devel/bison-2.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-devel/m4 nls? ( sys-devel/gettext )
-DESCRIPTION=A yacc-compatible parser generator
-EAPI=2
-HOMEPAGE=https://www.gnu.org/software/bison/bison.html
-IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-devel/m4
-SLOT=0
-SRC_URI=mirror://gnu/bison/bison-2.4.3.tar.bz2 https://dev.gentoo.org/~mgorny/dist/bison-2.4.3-patchset.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2e81e9450433962e365e9094fd58578
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.2 b/metadata/md5-cache/sys-devel/clang-5.0.2
index 145a678b4ba8..a7f8788666c3 100644
--- a/metadata/md5-cache/sys-devel/clang-5.0.2
+++ b/metadata/md5-cache/sys-devel/clang-5.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore 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 python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 PDEPEND=~sys-devel/clang-runtime-5.0.2 default-compiler-rt? ( =sys-libs/compiler-rt-5.0.2* ) default-libcxx? ( >=sys-libs/libcxx-5.0.2 )
 RDEPEND=~sys-devel/llvm-5.0.2:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,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(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.2/cfe-5.0.2.src.tar.xz https://releases.llvm.org/5.0.2/clang-tools-extra-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=88165652f530aef2078c1e1d4d4870e3
+_md5_=8398cf8e7b43834cb35f87f0daf0fe10
diff --git a/metadata/md5-cache/sys-devel/clang-6.0.0-r1 b/metadata/md5-cache/sys-devel/clang-6.0.0-r1
index f114b82f6cf2..2880b9964b20 100644
--- a/metadata/md5-cache/sys-devel/clang-6.0.0-r1
+++ b/metadata/md5-cache/sys-devel/clang-6.0.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore 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 python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-6.0.0 default-compiler-rt? ( =sys-libs/compiler-rt-6.0.0* ) default-libcxx? ( >=sys-libs/libcxx-6.0.0 )
 RDEPEND=~sys-devel/llvm-6.0.0:6=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,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(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz https://releases.llvm.org/6.0.0/clang-tools-extra-6.0.0.src.tar.xz test? ( https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.0-manpages.tar.bz2 )
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7d4d8f1581861b78035d4138d9b68cd
+_md5_=39dc6064e3bdb8c2816ab050e44ea869
diff --git a/metadata/md5-cache/sys-devel/clang-common-6.0.0 b/metadata/md5-cache/sys-devel/clang-common-6.0.0
index d92b888286ea..494d6c4c9db1 100644
--- a/metadata/md5-cache/sys-devel/clang-common-6.0.0
+++ b/metadata/md5-cache/sys-devel/clang-common-6.0.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Common files shared between multiple slots of clang
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=17ccdf550ff816f5f0fec4be85da07e8
+_md5_=ef8b42a259076e53709ad59424042241
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-5.0.2 b/metadata/md5-cache/sys-devel/clang-runtime-5.0.2
index d677116a0949..46f7dee0102b 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-5.0.2
+++ b/metadata/md5-cache/sys-devel/clang-runtime-5.0.2
@@ -3,10 +3,10 @@ DESCRIPTION=Meta-ebuild for clang runtime libraries
 EAPI=6
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt crt libcxx openmp +sanitize 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 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-5.0.2:5.0.2 sanitize? ( ~sys-libs/compiler-rt-sanitizers-5.0.2:5.0.2 ) ) crt? ( || ( sys-libs/netbsd-csu[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-freebsd/freebsd-lib[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(-)?] ) ) libcxx? ( >=sys-libs/libcxx-5.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-5.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=5.0.2
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=093a79e2a2984049787334c616822104
+_md5_=87ad5b51e3d4129da9c9a3d166fa1179
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-6.0.0-r1 b/metadata/md5-cache/sys-devel/clang-runtime-6.0.0-r1
index 0fe60f122984..a6af588aae8a 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-6.0.0-r1
+++ b/metadata/md5-cache/sys-devel/clang-runtime-6.0.0-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Meta-ebuild for clang runtime libraries
 EAPI=6
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt crt libcxx openmp +sanitize 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 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-6.0.0:6.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-6.0.0:6.0.0 ) ) crt? ( || ( sys-libs/netbsd-csu[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-freebsd/freebsd-lib[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(-)?] ) ) libcxx? ( >=sys-libs/libcxx-6.0.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(-)?] ) openmp? ( >=sys-libs/libomp-6.0.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(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=6.0.0
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=093a79e2a2984049787334c616822104
+_md5_=4d5d746488ec0c5201600ab3f2c80300
diff --git a/metadata/md5-cache/sys-devel/gdb-7.10.1 b/metadata/md5-cache/sys-devel/gdb-7.10.1
index 6657d64642cd..9f9968b5ace2 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.10.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.10.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.10.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-7.10.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a72e1ce769524e33e984e6dddbbff4cf
+_md5_=a8c30b32f1de97cbcfacebdbc87de47c
diff --git a/metadata/md5-cache/sys-devel/gdb-7.12.1 b/metadata/md5-cache/sys-devel/gdb-7.12.1
index 0482e07a5549..080a7f9bb270 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.12.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.12.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-7.12.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91cc58fac5c342808bb5d35220647009
+_md5_=75b70ede9d3d7bc84a834c78bbad4730
diff --git a/metadata/md5-cache/sys-devel/gdb-7.9.1 b/metadata/md5-cache/sys-devel/gdb-7.9.1
index 381cb0c046dc..9467115254e5 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.9.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.9.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-7.9.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=304156f60a49d5a299a37bc240106351
+_md5_=f69c8840053a9b5d6059ac06dab12723
diff --git a/metadata/md5-cache/sys-devel/heirloom-devtools-070527-r2 b/metadata/md5-cache/sys-devel/heirloom-devtools-070527-r2
index 16c4d3d0ff19..3a8255899fee 100644
--- a/metadata/md5-cache/sys-devel/heirloom-devtools-070527-r2
+++ b/metadata/md5-cache/sys-devel/heirloom-devtools-070527-r2
@@ -8,5 +8,5 @@ LICENSE=BSD BSD-4 CDDL
 RDEPEND=app-shells/heirloom-sh
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/heirloom/heirloom-devtools/070527/heirloom-devtools-070527.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88b08a6784fb1107a883bc4a070ede56
diff --git a/metadata/md5-cache/sys-devel/heirloom-devtools-999999 b/metadata/md5-cache/sys-devel/heirloom-devtools-999999
index 38db6b6c5522..6c486e4c86df 100644
--- a/metadata/md5-cache/sys-devel/heirloom-devtools-999999
+++ b/metadata/md5-cache/sys-devel/heirloom-devtools-999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://heirloom.sourceforge.net/devtools.html
 LICENSE=BSD BSD-4 CDDL
 RDEPEND=app-shells/heirloom-sh
 SLOT=0
-_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c472c24fd3286190529c5e1fb2b5ca8c
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.2 b/metadata/md5-cache/sys-devel/llvm-5.0.2
index 48f8b88f10f0..3856bca105b7 100644
--- a/metadata/md5-cache/sys-devel/llvm-5.0.2
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc gold libedit +libffi ncurses test kernel_Darwin kernel_linux llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore 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 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-5 )
 RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-patchset.tar.bz2 !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9eb0b23f035c8c32e55572938a7b2dc
+_md5_=6e35b180594e9b8fc3712e4c32090d9f
diff --git a/metadata/md5-cache/sys-devel/llvm-6.0.0-r1 b/metadata/md5-cache/sys-devel/llvm-6.0.0-r1
index a2f22e9622e6..dde9a8a4e85a 100644
--- a/metadata/md5-cache/sys-devel/llvm-6.0.0-r1
+++ b/metadata/md5-cache/sys-devel/llvm-6.0.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc gold libedit +libffi ncurses test xar xml kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore 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 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-6 )
 RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.0-manpages.tar.bz2 )
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=828da4ae2a6c9e3e5bcf976629ffe1fe
+_md5_=b2423d76377d47b24b34e00e1e3d762e
diff --git a/metadata/md5-cache/sys-devel/llvm-common-5.0.2 b/metadata/md5-cache/sys-devel/llvm-common-5.0.2
index b2a1072cb797..406a9a25645e 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-5.0.2
+++ b/metadata/md5-cache/sys-devel/llvm-common-5.0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
-_md5_=5d05b8cd54fff66fff4ad033eb980c26
+_md5_=3ccff6f625171aa89fd20e364b1a59ed
diff --git a/metadata/md5-cache/sys-devel/llvm-common-6.0.0 b/metadata/md5-cache/sys-devel/llvm-common-6.0.0
index 375592755b77..efafcee7ec55 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-6.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-6.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz
-_md5_=5d05b8cd54fff66fff4ad033eb980c26
+_md5_=7af924f2f33c7af683eaa2f5fe40fc0b
diff --git a/metadata/md5-cache/sys-devel/remake-3.81.0.2 b/metadata/md5-cache/sys-devel/remake-3.81.0.2
deleted file mode 100644
index 1b6312785ad6..000000000000
--- a/metadata/md5-cache/sys-devel/remake-3.81.0.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
-EAPI=0
-HOMEPAGE=http://bashdb.sourceforge.net/remake/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-1
-SLOT=0
-SRC_URI=mirror://sourceforge/bashdb/remake-3.81+dbg-0.2.tar.bz2
-_md5_=4a217a3e6ec0e554e18481c66b262e7a
diff --git a/metadata/md5-cache/sys-devel/remake-3.81.0.3 b/metadata/md5-cache/sys-devel/remake-3.81.0.3
deleted file mode 100644
index cab5d387538b..000000000000
--- a/metadata/md5-cache/sys-devel/remake-3.81.0.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
-EAPI=0
-HOMEPAGE=http://bashdb.sourceforge.net/remake/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-1
-SLOT=0
-SRC_URI=mirror://sourceforge/bashdb/remake-3.81+dbg-0.3.tar.bz2
-_md5_=c3824ead2f36e63a88dbb199ac189d52
diff --git a/metadata/md5-cache/sys-devel/remake-3.82.0.4 b/metadata/md5-cache/sys-devel/remake-3.82.0.4
deleted file mode 100644
index 58e789a8bcfc..000000000000
--- a/metadata/md5-cache/sys-devel/remake-3.82.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=readline? ( sys-libs/readline )
-DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
-EAPI=0
-HOMEPAGE=http://bashdb.sourceforge.net/remake/
-IUSE=readline
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-1
-RDEPEND=readline? ( sys-libs/readline )
-SLOT=0
-SRC_URI=mirror://sourceforge/bashdb/remake-3.82+dbg-0.4.tar.bz2
-_md5_=5ee2e96daa9b7396508dac6801f5f02d
diff --git a/metadata/md5-cache/sys-devel/smatch-1.57 b/metadata/md5-cache/sys-devel/smatch-1.57
index 99f5c5603ff9..537247af9a36 100644
--- a/metadata/md5-cache/sys-devel/smatch-1.57
+++ b/metadata/md5-cache/sys-devel/smatch-1.57
@@ -9,4 +9,4 @@ RDEPEND=dev-db/sqlite
 SLOT=0
 SRC_URI=mirror://gentoo/smatch-1.57.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=539b65fe894f1f428120cd09a0c3ddc0
+_md5_=06ab60d2644b0e4a979c0464a3e13fa1
diff --git a/metadata/md5-cache/sys-devel/smatch-1.57-r1 b/metadata/md5-cache/sys-devel/smatch-1.57-r1
index 12d239223bd2..045b616816e7 100644
--- a/metadata/md5-cache/sys-devel/smatch-1.57-r1
+++ b/metadata/md5-cache/sys-devel/smatch-1.57-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-db/sqlite
 SLOT=0
 SRC_URI=mirror://gentoo/smatch-1.57.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26391e6f270a37845fc37ee6be69b0ea
+_md5_=510e3b225bda071dfd0fbf4ed90e26c0
diff --git a/metadata/md5-cache/sys-devel/smatch-1.59 b/metadata/md5-cache/sys-devel/smatch-1.59
index c76e8759e4fd..8ea2c571cba3 100644
--- a/metadata/md5-cache/sys-devel/smatch-1.59
+++ b/metadata/md5-cache/sys-devel/smatch-1.59
@@ -9,4 +9,4 @@ RDEPEND=dev-db/sqlite
 SLOT=0
 SRC_URI=http://repo.or.cz/w/smatch.git/snapshot/1.59.tar.gz -> smatch-1.59.tar.gz mirror://gentoo/smatch-1.59.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ed62fc7c26e2380bd4ab416bb773ec55
+_md5_=56543250af4c114a7bbb389c4ddaab5c
diff --git a/metadata/md5-cache/sys-devel/smatch-9999 b/metadata/md5-cache/sys-devel/smatch-9999
index d4aa8686c1bd..5cf81260d28f 100644
--- a/metadata/md5-cache/sys-devel/smatch-9999
+++ b/metadata/md5-cache/sys-devel/smatch-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-db/sqlite dev-vcs/git
+DEPEND=dev-db/sqlite >=dev-vcs/git-1.8.2.1
 DESCRIPTION=static analysis tool for C
 EAPI=4
 HOMEPAGE=http://smatch.sourceforge.net/
 LICENSE=OSL-1.1
 RDEPEND=dev-db/sqlite
 SLOT=0
-_eclasses_=git-2	45ff482316b52b3f96ff6b7309b77f03	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ed62fc7c26e2380bd4ab416bb773ec55
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=56543250af4c114a7bbb389c4ddaab5c
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 483183d2bec8..8a847dd2914f 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211 b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
index 40c801df952f..0245210378ac 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_p20180211-bin.tar.xz ) !binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_p20180211.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0a741e74eb539b44eeaa8afa027eb874
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1 b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1
index 61bf205c7f9e..9a1d17302e5c 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_pre20170505-bin.tar.xz ) !binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_pre20170505.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=efa6a9467bbabf95085c5bcf8652b118
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-9999 b/metadata/md5-cache/sys-firmware/edk2-ovmf-9999
index 8887113a621f..ee37f2977e26 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-9999
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/tianocore/edk2
 LICENSE=BSD-2 MIT
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=692329e3c4a299152da515b5749240d1
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180527-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20180527-r1
index 3ebbcf130381..6c1e01adce30 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20180527-r1
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20180527-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Intel IA32/IA64 microcode update data
 EAPI=6
 HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27776
 IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=intel-ucode
 RDEPEND=!<sys-apps/microcode-ctl-1.17-r2 hostonly? ( sys-apps/iucode_tool )
 REQUIRED_USE=|| ( initramfs split-ucode )
 SLOT=0
 SRC_URI=https://downloadmirror.intel.com/27776/eng/microcode-20180425.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20180527.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3b82df03716c79894a7cb65a737117ba
+_md5_=7fe985ff5c647cc7e14f271a26f7b897
diff --git a/metadata/md5-cache/sys-freebsd/Manifest.gz b/metadata/md5-cache/sys-freebsd/Manifest.gz
index e7b3888d1273..7aa94c264a3b 100644
--- a/metadata/md5-cache/sys-freebsd/Manifest.gz
+++ b/metadata/md5-cache/sys-freebsd/Manifest.gz
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.1
deleted file mode 100644
index 048fe1d824d9..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND==sys-freebsd/freebsd-sources-9.1* =sys-freebsd/freebsd-mk-defs-9.1* virtual/pmake virtual/pmake
-DESCRIPTION=Contributed sources for FreeBSD
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=profile
-KEYWORDS=~amd64-fbsd ~x86-fbsd
-LICENSE=BSD GPL-2+ libodialog
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-gnu-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d51a3206e7be446c772c2fc22592c5f4
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1
deleted file mode 100644
index aecdd5435846..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 ) =sys-freebsd/freebsd-mk-defs-9.1* =sys-freebsd/freebsd-sources-9.1* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD's PAM authentication modules
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=kerberos nis profile
-KEYWORDS=~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 )
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-lib-9.1.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a8f1914ee68c5fb16a27b506ac0e314d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pf-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-pf-9.1
deleted file mode 100644
index 72f3de7566ad..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-pf-9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=net-libs/libpcap dev-libs/libevent =sys-freebsd/freebsd-mk-defs-9.1* =sys-freebsd/freebsd-sources-9.1* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD's base system libraries
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=profile
-KEYWORDS=~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-sbin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6beb2b1b50def4c0307c175b082dc8e9
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-share-9.1
deleted file mode 100644
index a03c63874765..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND==sys-freebsd/freebsd-mk-defs-9.1* =sys-freebsd/freebsd-sources-9.1* virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD shared tools/files
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=doc profile
-KEYWORDS=~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=sys-apps/miscfiles
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://gentoo/freebsd-share-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-gnu-9.1.tar.bz2 mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-sbin-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e54c5c29de54356eb2d6311f3dc704de
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r3 b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r3
deleted file mode 100644
index ae70848e3d7c..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD kernel sources
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=symlink profile
-KEYWORDS=~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND==sys-freebsd/freebsd-mk-defs-9.1*
-RESTRICT=strip binchecks
-SLOT=9.1
-SRC_URI=mirror://gentoo/freebsd-sys-9.1.tar.bz2
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e9b508378de6a4de44065ffc30b9ea1a
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9 b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
deleted file mode 100644
index fe3e2be0da13..000000000000
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/pmake virtual/pmake
-DESCRIPTION=FreeBSD kernel sources
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/
-IUSE=symlink profile
-KEYWORDS=~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND==sys-freebsd/freebsd-mk-defs-9.1*
-RESTRICT=strip binchecks
-SLOT=9.1
-SRC_URI=mirror://gentoo/freebsd-sys-9.1.tar.bz2 https://dev.gentoo.org/~naota/patch/freebsd-sources-9.1-en-13-03.patch
-_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b530124164b2835cde3b02e918a75e4f
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 97349ed58c4f..b575944f274c 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/aufs3-3_p20160219 b/metadata/md5-cache/sys-fs/aufs3-3_p20160219
index a5b282bec532..feba7490f897 100644
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20160219
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20160219
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160219.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=3c8083b40daa017b12e8dcdabe8f4c84
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20160223 b/metadata/md5-cache/sys-fs/aufs3-3_p20160223
index 5a14ab6e4d70..e11b23808341 100644
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20160223
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20160223
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160223.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ebef3aadf41515230184b7b826f5236d
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20160627 b/metadata/md5-cache/sys-fs/aufs3-3_p20160627
index d36f3ad75071..9cc478801aa7 100644
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20160627
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20160627
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160627.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ebef3aadf41515230184b7b826f5236d
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20160815 b/metadata/md5-cache/sys-fs/aufs3-3_p20160815
index f58fa6fb7d3f..fa462a09c832 100644
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20160815
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20160815
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160815.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ebef3aadf41515230184b7b826f5236d
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20160822 b/metadata/md5-cache/sys-fs/aufs3-3_p20160822
index 5f207f200f48..524a0e1e5239 100644
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20160822
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20160822
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160822.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ebef3aadf41515230184b7b826f5236d
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20160219 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160219
index 4dce625ce07d..3679f2823cb3 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20160219
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20160219
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160219.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4f1b5103553a2f0f790f8d57f0a06072
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20160223 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160223
index e2fed6003099..0a8add5861fc 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20160223
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20160223
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160223.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=4f1b5103553a2f0f790f8d57f0a06072
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20160627 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160627
index 043933351e45..4f8a5501856a 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20160627
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20160627
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160627.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=98c349b76d7f3592cddd33e7c3e3d22b
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20160815 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160815
index 979f55b9f3ea..65a49b8d98d3 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20160815
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20160815
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160815.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=98c349b76d7f3592cddd33e7c3e3d22b
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20161010 b/metadata/md5-cache/sys-fs/aufs4-0_pre20161010
index 222526d9bce5..aef28bcbcd77 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20161010
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20161010
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20161010.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8d474e64639fc04554e35f70f6e6b49d
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20161219 b/metadata/md5-cache/sys-fs/aufs4-0_pre20161219
index c26173fd9273..e5f49bc5c157 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20161219
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20161219
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20161219.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8d474e64639fc04554e35f70f6e6b49d
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20170130 b/metadata/md5-cache/sys-fs/aufs4-0_pre20170130
index 19c00db3dd73..6632565e06ec 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20170130
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20170130
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20170130.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c0aa3ee0c5c1116600c878d6d64a3b28
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20170220 b/metadata/md5-cache/sys-fs/aufs4-0_pre20170220
index 2e0de816147a..834609a3093d 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20170220
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20170220
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20170220.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=c0aa3ee0c5c1116600c878d6d64a3b28
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20170313 b/metadata/md5-cache/sys-fs/aufs4-0_pre20170313
index 4a9f19890d87..2bb68f29ec65 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20170313
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20170313
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20170313.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=28959786fac728f2e95db6a57d534e73
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20170612 b/metadata/md5-cache/sys-fs/aufs4-0_pre20170612
index 5d8005dd70e4..3181988637a8 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20170612
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20170612
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20170612.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=2659f9cbb5a65f380e27993c20dffc00
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20171002 b/metadata/md5-cache/sys-fs/aufs4-0_pre20171002
index c5135b44e29a..4209d96e07be 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20171002
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20171002
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20171002.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a6b8c3f58d520db3d582f39dec3d87fd
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20171106 b/metadata/md5-cache/sys-fs/aufs4-0_pre20171106
index f942a5139413..b5f0e93a5b2b 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20171106
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20171106
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20171106.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a6b8c3f58d520db3d582f39dec3d87fd
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20180219 b/metadata/md5-cache/sys-fs/aufs4-0_pre20180219
index 6f0650900def..41754c48da3e 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20180219
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20180219
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20180219.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=10b9c08416512bbc7cf1c03082de4e35
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20180312 b/metadata/md5-cache/sys-fs/aufs4-0_pre20180312
index 4079085ce743..8c7aeda3c398 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20180312
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20180312
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20180312.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ed981493fceee16b31e7ed84b97b4f2a
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.10 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.10
new file mode 100644
index 000000000000..3694762fef9b
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cachefilesd-0.10.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Provides a caching directory on an already mounted filesystem
+EAPI=6
+HOMEPAGE=https://people.redhat.com/~dhowells/fscache/
+IUSE=doc selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=selinux? ( sec-policy/selinux-cachefilesd )
+SLOT=0
+SRC_URI=https://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.10.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=38c3bfdad77a1f822179fea87df243df
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4
deleted file mode 100644
index 862c7c627f29..000000000000
--- a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Provides a caching directory on an already mounted filesystem
-EAPI=5
-HOMEPAGE=https://people.redhat.com/~dhowells/fscache/
-IUSE=doc selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=selinux? ( sec-policy/selinux-cachefilesd )
-SLOT=0
-SRC_URI=https://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.5.tar.bz2 -> cachefilesd-0.10.5.tar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6aad6bebf7564f894f1359855414640c
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.9 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.9
index a4b70a09242e..4398bc1f5f84 100644
--- a/metadata/md5-cache/sys-fs/cachefilesd-0.10.9
+++ b/metadata/md5-cache/sys-fs/cachefilesd-0.10.9
@@ -4,10 +4,10 @@ DESCRIPTION=Provides a caching directory on an already mounted filesystem
 EAPI=6
 HOMEPAGE=https://people.redhat.com/~dhowells/fscache/
 IUSE=doc selinux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=selinux? ( sec-policy/selinux-cachefilesd )
 SLOT=0
 SRC_URI=https://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6ff6fad7007adef720db63bf7db5e74
+_md5_=2daec643cf2d92f1795dd1fbcc4dc09c
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14
deleted file mode 100644
index 1f74af633c7b..000000000000
--- a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
-EAPI=0
-HOMEPAGE=http://opendarwin.org
-KEYWORDS=-amd64 ~ppc ~x86
-LICENSE=APSL-2
-SLOT=0
-SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64b58cbf41307000122f4ea5f507f542
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.6 b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.6
index 59f556bf37c7..5e4135a74ae4 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.6
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.6
@@ -4,10 +4,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=fuse nls static-libs elibc_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
 LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.43.6 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.43.6.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.6/e2fsprogs-1.43.6.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64b9eba3e64d76e6ccdfdcbaf09ff99d
+_md5_=b26fc8b40029813fd5edcb354809ac4b
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9 b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
index 50269b175b8e..0e7768ec72df 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
@@ -4,10 +4,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=fuse nls static-libs elibc_FreeBSD
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
 LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.43.9 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.43.9.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.9/e2fsprogs-1.43.9.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78fc306b82434a744058a9123f5f2620
+_md5_=b8076b157548a83d945834ed7c268a7f
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201 b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
index 5df42d92937d..1880cf3dc70b 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= >=dev-libs/boost-1.42:= sys-fs/e2fsprogs sys-process/audit[static-libs(+)] sys-process/lsof
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/e4rat/e4rat-0.2.4_pre20141201.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e14eaadd0d8e9dff6cebca5994b4137
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1 b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
index 28368a529be9..a4e9b9d4818b 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= >=dev-libs/boost-1.42:= sys-fs/e2fsprogs sys-process/audit[static-libs(+)] sys-process/lsof
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/e4rat/e4rat-0.2.4_pre20141201.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=949a917657c58040bae72561802a36ed
diff --git a/metadata/md5-cache/sys-fs/fuse-3.2.3 b/metadata/md5-cache/sys-fs/fuse-3.2.3
new file mode 100644
index 000000000000..44f239f7bf6a
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-3.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.6 dev-python/pytest[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pytest[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pytest[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=An interface for filesystems implemented in userspace
+EAPI=6
+HOMEPAGE=https://github.com/libfuse/libfuse
+IUSE=test 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
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=sys-fs/fuse-common
+SLOT=3
+SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.3/fuse-3.2.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=68ade9b2bd36d430ab98b3cdeb3eb253
diff --git a/metadata/md5-cache/sys-fs/fuse4bsd-0.3.0 b/metadata/md5-cache/sys-fs/fuse4bsd-0.3.0
deleted file mode 100644
index d5088b790672..000000000000
--- a/metadata/md5-cache/sys-fs/fuse4bsd-0.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-freebsd/freebsd-sources-6.2 virtual/pmake
-DESCRIPTION=Fuse for FreeBSD
-EAPI=0
-HOMEPAGE=http://fuse4bsd.creo.hu/
-KEYWORDS=~x86-fbsd
-LICENSE=BSD
-RDEPEND=sys-fs/fuse
-SLOT=0
-SRC_URI=http://fuse4bsd.creo.hu/downloads/fuse4bsd-0.3.0.tar.gz mirror://gentoo/freebsd-sbin-6.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=496c518f7d8b6833dddfbd07d11aad92
diff --git a/metadata/md5-cache/sys-fs/lessfs-1.5.13 b/metadata/md5-cache/sys-fs/lessfs-1.5.13
index 88c926e91946..3a4913c39cfa 100644
--- a/metadata/md5-cache/sys-fs/lessfs-1.5.13
+++ b/metadata/md5-cache/sys-fs/lessfs-1.5.13
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/lessfs/lessfs/lessfs-1.5.13/lessfs-1.5.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2d4a5e64d7594a459384502f586dbfe
diff --git a/metadata/md5-cache/sys-fs/lessfs-1.7.0 b/metadata/md5-cache/sys-fs/lessfs-1.7.0
index 109bcfbab128..7fe96be52357 100644
--- a/metadata/md5-cache/sys-fs/lessfs-1.7.0
+++ b/metadata/md5-cache/sys-fs/lessfs-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=berkdb? ( sys-libs/db ) crypt? ( dev-libs/openssl ) lzo? ( dev-libs/lzo ) snappy? ( app-arch/snappy ) >=dev-db/tokyocabinet-1.4.42 app-crypt/mhash >=sys-fs/fuse-2.8.0
 SLOT=0
 SRC_URI=mirror://sourceforge/lessfs/lessfs/lessfs-1.7.0/lessfs-1.7.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f4f75bef42a6cfb7dcc122289bcde683
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.166 b/metadata/md5-cache/sys-fs/lvm2-2.02.166
index 5262a8808833..9356c53e4a99 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.166
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.166
@@ -11,4 +11,4 @@ REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initr
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.166.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.166.tgz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2c77c9cc5d37055dd95249e373749891
+_md5_=db1248412ef35963b9d8e5f538986080
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
index a039d81a0e85..4e20af0b7277 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
@@ -4,11 +4,11 @@ DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=6
 HOMEPAGE=https://sourceware.org/lvm2/
 IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.166.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.166.tgz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=adef6da27475f2753e012169d47b2870
+_md5_=bf1e12d6212c3b25cf546bad26c65cfe
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.171 b/metadata/md5-cache/sys-fs/lvm2-2.02.171
index 2dc8e5f9a9d7..3b2a92538c94 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.171
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.171
@@ -4,11 +4,11 @@ DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=6
 HOMEPAGE=https://sourceware.org/lvm2/
 IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.171.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.171.tgz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c01de511c827d959b57a0dec3c74911f
+_md5_=7f948f6f44d61e4e5c9327186ee0c2f4
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.172 b/metadata/md5-cache/sys-fs/lvm2-2.02.172
index 61a605bd3cf6..aa46301868e7 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.172
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.172
@@ -4,11 +4,11 @@ DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=6
 HOMEPAGE=https://sourceware.org/lvm2/
 IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.172.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.172.tgz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=87ef6016a230bdd19a97fe440d3a3a0c
+_md5_=f2e4f6212f4ec716d5f9ccedd7f0ea2a
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.173 b/metadata/md5-cache/sys-fs/lvm2-2.02.173
index 1d7ca2280547..5ee7cad31240 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.173
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.173
@@ -4,11 +4,11 @@ DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=6
 HOMEPAGE=https://sourceware.org/lvm2/
 IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=87ef6016a230bdd19a97fe440d3a3a0c
+_md5_=f2e4f6212f4ec716d5f9ccedd7f0ea2a
diff --git a/metadata/md5-cache/sys-fs/rar2fs-1.27.0 b/metadata/md5-cache/sys-fs/rar2fs-1.27.0
new file mode 100644
index 000000000000..2bd61daf4aab
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/rar2fs-1.27.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=app-arch/unrar-5:= sys-fs/fuse:0
+DESCRIPTION=A FUSE based filesystem that can mount one or multiple RAR archive(s)
+EAPI=6
+HOMEPAGE=https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/unrar-5:= sys-fs/fuse:0
+SLOT=0
+SRC_URI=https://github.com/hasse69/rar2fs/releases/download/v1.27.0/rar2fs-1.27.0.tar.gz
+_md5_=8ee178cbfbf25bb077a0b78e30685e4a
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-32 b/metadata/md5-cache/sys-fs/udev-init-scripts-32
index 959639219aa8..c3f9074913e4 100644
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-32
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-32
@@ -2,10 +2,10 @@ DEFINED_PHASES=postinst
 DESCRIPTION=udev startup scripts for openrc
 EAPI=6
 HOMEPAGE=https://www.gentoo.org
-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=>=virtual/udev-217 !<sys-apps/openrc-0.14
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~williamh/dist/udev-init-scripts-32.tar.gz
-_md5_=40e2da010348982e122bb140bc317fc4
+_md5_=77cd36357f84bfa670c6265d2e2c5e0f
diff --git a/metadata/md5-cache/sys-fs/udftools-2.0-r1 b/metadata/md5-cache/sys-fs/udftools-2.0-r1
deleted file mode 100644
index ed63bcac8c81..000000000000
--- a/metadata/md5-cache/sys-fs/udftools-2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
-EAPI=6
-HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/pali/udftools/releases/download/2.0/udftools-2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5856b25890b7c219f3f9f3da17adecb
diff --git a/metadata/md5-cache/sys-fs/udftools-2.0-r2 b/metadata/md5-cache/sys-fs/udftools-2.0-r2
new file mode 100644
index 000000000000..ad4e656323ea
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udftools-2.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/readline:0=
+DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
+EAPI=6
+HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:0=
+SLOT=0
+SRC_URI=https://github.com/pali/udftools/releases/download/2.0/udftools-2.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=49becdb2086e6a9ac00e4d39149a5326
diff --git a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4 b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
index c9202b0f5123..b6dd46548ea6 100644
--- a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
+++ b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-fs/zfs virtual/cron
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs-auto-snapshot/archive/upstream/1.2.4.tar.gz -> zfs-auto-snapshot-upstream-1.2.4.tar.gz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=38ee8a0fd1a8ae8428fe25fe197e58d6
diff --git a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999 b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
index ac637ded92e8..4ee40c9b7e99 100644
--- a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
+++ b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
@@ -7,5 +7,5 @@ IUSE=+default-exclude
 LICENSE=GPL-2+
 RDEPEND=sys-fs/zfs virtual/cron
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=38ee8a0fd1a8ae8428fe25fe197e58d6
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 8191dd4e5876..2244e64cb388 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/aufs-sources-4.14.26 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.26
deleted file mode 100644
index f5e1e607d493..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.26
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.26
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-31.base.tar.xz mirror://gentoo/genpatches-4.14-31.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-31.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=06b3a24783fb87b2ef9dd4603b71578d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.27 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.27
deleted file mode 100644
index cff27c4d518f..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.27
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.27
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-32.base.tar.xz mirror://gentoo/genpatches-4.14-32.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-32.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3a84a09835d1d6cf65bd06f5ebc3a67c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.28 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.28
deleted file mode 100644
index 482e9e28e672..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.28
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.28
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-33.base.tar.xz mirror://gentoo/genpatches-4.14-33.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-33.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bc3635a3eff3b4d7543ce3c5869c8f97
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.29 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.29
deleted file mode 100644
index 194bd4c607e5..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.29
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.29
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-34.base.tar.xz mirror://gentoo/genpatches-4.14-34.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-34.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e41ebb5a9a35a5847f65878de62d73df
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.30 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.30
deleted file mode 100644
index 9f74dbfe489b..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.30
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.30
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-35.base.tar.xz mirror://gentoo/genpatches-4.14-35.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-35.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=570f387a44be5e16e5c722b14d7e62c2
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.31 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.31
deleted file mode 100644
index eaba4f9a9319..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.31
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.31
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-36.base.tar.xz mirror://gentoo/genpatches-4.14-36.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-36.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e9d0527c94202889d878e67ea7d923af
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.34 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.34
new file mode 100644
index 000000000000..aabf6e37dd76
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.34
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.34
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-39.base.tar.xz mirror://gentoo/genpatches-4.14-39.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-39.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5d8d7f9ddc22614da71924844aff1694
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.35 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.35
new file mode 100644
index 000000000000..e17815c657df
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.35
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.35
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-40.base.tar.xz mirror://gentoo/genpatches-4.14-40.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-40.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a1289178c9d78b7ef368444c3b0f01fc
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.36 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.36
new file mode 100644
index 000000000000..df27e9697670
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.36
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.36
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-41.base.tar.xz mirror://gentoo/genpatches-4.14-41.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-41.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=da9e584b4ef8240242017830028eb0ec
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.37 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.37
new file mode 100644
index 000000000000..24341299e529
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.37
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.37
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-42.base.tar.xz mirror://gentoo/genpatches-4.14-42.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-42.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9b47ddfdc0b2250fce420218fa3f5147
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.38 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.38
new file mode 100644
index 000000000000..2f1bed7de93c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.38
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.38
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-43.base.tar.xz mirror://gentoo/genpatches-4.14-43.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-43.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a7bdf969df51c06e38679cfd63a130a1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.39 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.39
new file mode 100644
index 000000000000..fa5c7fb7b889
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.39
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.39
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-44.base.tar.xz mirror://gentoo/genpatches-4.14-44.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-44.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ae43028ba76ebce5c40d648ebbd7bf43
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.40 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.40
new file mode 100644
index 000000000000..6f06ac0c74da
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.40
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.40
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-45.base.tar.xz mirror://gentoo/genpatches-4.14-45.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-45.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7add86d7a6849906d78da937947b53f9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.41 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.41
new file mode 100644
index 000000000000..01251b04b5fe
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.41
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.41
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-46.base.tar.xz mirror://gentoo/genpatches-4.14-46.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-46.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=afbcc1770455515ea6802017571ae944
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.42 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.42
new file mode 100644
index 000000000000..5c2829be8d98
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.42
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.42
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-47.base.tar.xz mirror://gentoo/genpatches-4.14-47.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-47.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ae6cfc8c54543839a1ea8d6b621eb758
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.43 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.43
new file mode 100644
index 000000000000..e4756dbb43d7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.43
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.43
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-48.base.tar.xz mirror://gentoo/genpatches-4.14-48.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-48.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=597b89274251c52be448d1f7832357c0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.44 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.44
new file mode 100644
index 000000000000..faeed1c9f9d0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.44
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.44
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-49.base.tar.xz mirror://gentoo/genpatches-4.14-49.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-49.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=24edf26a1f318fc46e49f0c9897403b1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.47 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.47
new file mode 100644
index 000000000000..7a096ccaa2d6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.47
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.47
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-51.base.tar.xz mirror://gentoo/genpatches-4.14-51.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-51.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=df3117ed493c5a6c1b0353dfb1cc0138
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.48 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.48
new file mode 100644
index 000000000000..8e87497bc6d0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.48
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.48
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-52.base.tar.xz mirror://gentoo/genpatches-4.14-52.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-52.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=168cd447a9bf02e77e5890a58c786478
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.0 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.0
deleted file mode 100644
index d0f55a0e2b00..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.0
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-1.base.tar.xz mirror://gentoo/genpatches-4.15-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-1.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f3a4d0b6543ad28149085a1c01aaffb
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.1
deleted file mode 100644
index 6eea944f37ee..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-2.base.tar.xz mirror://gentoo/genpatches-4.15-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-2.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=307d3146d0a26e98017c0a527fc36a21
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.10 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.10
deleted file mode 100644
index ed38948d8542..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.10
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-13.base.tar.xz mirror://gentoo/genpatches-4.15-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-13.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6b167262282fc8ae4982bc9f3bb915f4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.11 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.11
deleted file mode 100644
index 1f5f39fad35b..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.11
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-14.base.tar.xz mirror://gentoo/genpatches-4.15-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-14.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a42a83f9b92b4fe55e77f256c74ac432
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.12
deleted file mode 100644
index f830cb0ed1c1..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-15.base.tar.xz mirror://gentoo/genpatches-4.15-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-15.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ffc62cacae3818454b89517ae02750ce
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.13
deleted file mode 100644
index a0f0d2b6887d..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-16.base.tar.xz mirror://gentoo/genpatches-4.15-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-16.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=41e463d4a0f50f12956fc2cbcbfb3036
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.14
deleted file mode 100644
index 88ac7feb6f00..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-17.base.tar.xz mirror://gentoo/genpatches-4.15-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-17.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f70492d05894fd80d238a0cda4ca97fe
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.16 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.16
new file mode 100644
index 000000000000..e51ed5402086
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.15.16
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-19.base.tar.xz mirror://gentoo/genpatches-4.15-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-19.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d902a2c8a2b7f65ca3003d7891fe4f33
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.17 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.17
new file mode 100644
index 000000000000..f3f62aa63a94
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.17
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.15.17
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-20.base.tar.xz mirror://gentoo/genpatches-4.15-20.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-20.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f2244fc43f4a0668fabac43b0fb25080
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.18 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.18
new file mode 100644
index 000000000000..9dea4f9c763b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.15.18
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-21.base.tar.xz mirror://gentoo/genpatches-4.15-21.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-21.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c09565a85b426b70fdbe51e758002df7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.2 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.2
deleted file mode 100644
index c02257b27c42..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.2
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-3.base.tar.xz mirror://gentoo/genpatches-4.15-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-3.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0d197ed89c1d0363aecdc5be45b67e6c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.3 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.3
deleted file mode 100644
index 5e98a680ce69..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-4.base.tar.xz mirror://gentoo/genpatches-4.15-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-4.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=df919cde9a5ad9999085b9a4671b1ec6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.4
deleted file mode 100644
index 64e6212ade19..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.4
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-5.base.tar.xz mirror://gentoo/genpatches-4.15-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-5.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6e5641a56b221f28eb48218b7d49edd3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.5 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.5
deleted file mode 100644
index f155fa7b2637..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.5
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-6.base.tar.xz mirror://gentoo/genpatches-4.15-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-6.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e1e37894c39e291b098b89541d14f80f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.6 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.6
deleted file mode 100644
index 4971e31c2a8c..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-7.base.tar.xz mirror://gentoo/genpatches-4.15-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-7.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f0701356c258fa017954d5a1863566cc
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.7-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.7-r1
deleted file mode 100644
index dfd809e36843..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.7-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-9.base.tar.xz mirror://gentoo/genpatches-4.15-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-9.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0c4ec980fc093cc7ea4eba00eca8f956
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.8 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.8
deleted file mode 100644
index 4821267de8bb..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.8
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-11.base.tar.xz mirror://gentoo/genpatches-4.15-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-11.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d0fdc7690b6295e9f9470a4fd1e5f6ba
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.9 b/metadata/md5-cache/sys-kernel/aufs-sources-4.15.9
deleted file mode 100644
index fbdd45cbed1f..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.15.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.15_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.15-12.base.tar.xz mirror://gentoo/genpatches-4.15-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-12.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cf78bda79bad360f3d2553d33fd7fe12
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.10 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.10
new file mode 100644
index 000000000000..04836ed15c6b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.10
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-11.base.tar.xz mirror://gentoo/genpatches-4.16-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-11.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a66672ab8ecffab83433224ef9c8eb1d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.11 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.11
new file mode 100644
index 000000000000..0c7390c0e6bb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.11
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-12.base.tar.xz mirror://gentoo/genpatches-4.16-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-12.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=288f20e66163495a66dc3ef25a0312f6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.12
new file mode 100644
index 000000000000..8f820b2e19cc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.12
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.12
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-13.base.tar.xz mirror://gentoo/genpatches-4.16-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-13.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=588a5e68c12f3911b43b51c27580c3ad
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.13
new file mode 100644
index 000000000000..3f779f776326
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.13
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-14.base.tar.xz mirror://gentoo/genpatches-4.16-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-14.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aa75d6e37bbc93cec81c18093bd3b893
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.14
new file mode 100644
index 000000000000..98b47517bdda
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-15.base.tar.xz mirror://gentoo/genpatches-4.16-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-15.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=233322512a17eae2c45ac9c80ef0491f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.3 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.3
new file mode 100644
index 000000000000..30d03dde0085
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-4.base.tar.xz mirror://gentoo/genpatches-4.16-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-4.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c41aeea0f345be7fe2293031b2e4d89b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.4
new file mode 100644
index 000000000000..919751745d01
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.4
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-5.base.tar.xz mirror://gentoo/genpatches-4.16-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-5.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=30834946c3187fe38f73f9df310ec983
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.5 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.5
new file mode 100644
index 000000000000..2c80521590a8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.5
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-6.base.tar.xz mirror://gentoo/genpatches-4.16-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-6.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a39a6a45f6607e4c937472a2197131fa
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.6 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.6
new file mode 100644
index 000000000000..7c23eed5b063
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.6
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-7.base.tar.xz mirror://gentoo/genpatches-4.16-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-7.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=143325804932286f08a1d174881d0a1e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.7 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.7
new file mode 100644
index 000000000000..7de8dbd3fa9f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-8.base.tar.xz mirror://gentoo/genpatches-4.16-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-8.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3200250306c2fd30786402fee1a9bfb9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.8 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.8
new file mode 100644
index 000000000000..74edd5f806bb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-9.base.tar.xz mirror://gentoo/genpatches-4.16-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-9.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7f8c66eae280c611c94d214e632b187b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.16.9 b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.9
new file mode 100644
index 000000000000..1048195dbad4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.16.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.9
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.16_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.16-10.base.tar.xz mirror://gentoo/genpatches-4.16-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-10.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2055e6ec82fb7776e7c26340dc03ac29
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.104 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.104
deleted file mode 100644
index 2e9726271e46..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.104
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.104
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-107.base.tar.xz mirror://gentoo/genpatches-4.4-107.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-107.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=835e0a017af42dedf5b53b0b19523f96
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.105 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.105
deleted file mode 100644
index 70d799da8aba..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.105
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.105
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-108.base.tar.xz mirror://gentoo/genpatches-4.4-108.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-108.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=49537c5bc932257dfca25c99106aa54a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.106 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.106
deleted file mode 100644
index 25fb9826e6c2..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.106
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.106
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-109.base.tar.xz mirror://gentoo/genpatches-4.4-109.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-109.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=91894117a01f6cce45f4295ad2e3019d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.107 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.107
deleted file mode 100644
index c8f262bd5255..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.107
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.107
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-110.base.tar.xz mirror://gentoo/genpatches-4.4-110.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-110.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f5c33b1db889e5ea1116d07304b1077f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.108 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.108
deleted file mode 100644
index eecfd78fefb0..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.108
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.108
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-111.base.tar.xz mirror://gentoo/genpatches-4.4-111.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-111.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=16244e12ad722c4669e2e34657a7f3f0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.109 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.109
deleted file mode 100644
index f95ccee3f77a..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.109
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.109
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-112.base.tar.xz mirror://gentoo/genpatches-4.4-112.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-112.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=22809cadd49c81b7e3bd8dd168478e6c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.110 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.110
deleted file mode 100644
index f8aa7ecf6988..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.110
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.110
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-113.base.tar.xz mirror://gentoo/genpatches-4.4-113.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-113.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f824d424b91098aeebc6e17c1312d743
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111
deleted file mode 100644
index a50c3254b28a..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.111
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-114.base.tar.xz mirror://gentoo/genpatches-4.4-114.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-114.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c318e6b6724ed97c2023d9686583ed6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1
index 70ee1332b307..d6c3295597b6 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.4.111-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-115.base.tar.xz mirror://gentoo/genpatches-4.4-115.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-115.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=88db5891b051a7de239b5de0ce1d9806
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.112 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.112
deleted file mode 100644
index 470d94e5eec6..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.112
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.112
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-116.base.tar.xz mirror://gentoo/genpatches-4.4-116.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-116.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4b529931b89ec9936e556399d23f00da
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.113 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.113
deleted file mode 100644
index 354c7b56ecd1..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.113
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.113
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-117.base.tar.xz mirror://gentoo/genpatches-4.4-117.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-117.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=599dae2419c9d4ce47d1d8ef2fac9d86
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.114 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.114
deleted file mode 100644
index f8e855d2156b..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.114
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.114
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-118.base.tar.xz mirror://gentoo/genpatches-4.4-118.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-118.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=eaf28695a79e9b63ae434155e2ed2596
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.115 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.115
deleted file mode 100644
index 9f595a86e88a..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.115
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.115
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-119.base.tar.xz mirror://gentoo/genpatches-4.4-119.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-119.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b776762308d35a2c40a199138e7e0cad
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.116 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.116
deleted file mode 100644
index ce479280fcd8..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.116
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.116
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-120.base.tar.xz mirror://gentoo/genpatches-4.4-120.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-120.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fe869f8109e476054ee41bf4d49ddf87
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.117 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.117
deleted file mode 100644
index 6ec369a623eb..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.117
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.117
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-121.base.tar.xz mirror://gentoo/genpatches-4.4-121.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-121.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3d8ace20459029fa199ad5e738a1f5d6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.118 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.118
deleted file mode 100644
index a60e3eb49fc5..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.118
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.118
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-122.base.tar.xz mirror://gentoo/genpatches-4.4-122.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-122.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=05ecee9d4dd686d29333a02aca23c314
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.119 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.119
deleted file mode 100644
index efb5d4a1072d..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.119
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.119
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-123.base.tar.xz mirror://gentoo/genpatches-4.4-123.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-123.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=51135391d100add0cd3648315fccb6d3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.120 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.120
deleted file mode 100644
index 4f32c074daa4..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.120
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.120
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-124.base.tar.xz mirror://gentoo/genpatches-4.4-124.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-124.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=897a370463cad48ce2c7a3dccc79e248
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.121 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.121
deleted file mode 100644
index 2326706bbb80..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.121
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.121
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-125.base.tar.xz mirror://gentoo/genpatches-4.4-125.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-125.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e52277e44d5985effd8582bab162dd41
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.123 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.123
deleted file mode 100644
index 8553eb854097..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.123
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.123
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-126.base.tar.xz mirror://gentoo/genpatches-4.4-126.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-126.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0adf01a45bae4ea5a2e8a09d168d6e1d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.124 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.124
deleted file mode 100644
index 93cf81f86180..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.124
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.124
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-127.base.tar.xz mirror://gentoo/genpatches-4.4-127.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-127.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c1ddb4059caedeeb68e0f5e68759b071
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.128 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.128
new file mode 100644
index 000000000000..5b20f69ad89e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.128
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.128
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-130.base.tar.xz mirror://gentoo/genpatches-4.4-130.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-130.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ce734061a4e5aede108c9f235c304ed
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.129 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.129
new file mode 100644
index 000000000000..068578330f39
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.129
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.129
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-131.base.tar.xz mirror://gentoo/genpatches-4.4-131.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-131.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c41471d0173081cc256bbf412211c090
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.130 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.130
new file mode 100644
index 000000000000..084243d97cb5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.130
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.130
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-132.base.tar.xz mirror://gentoo/genpatches-4.4-132.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-132.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4c2e7b814cf890600637228687e43df0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.131 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.131
new file mode 100644
index 000000000000..8749bf5c97cf
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.131
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.131
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-133.base.tar.xz mirror://gentoo/genpatches-4.4-133.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-133.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bcc64c6d08992b9ca3c1080424485ba0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.132 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.132
new file mode 100644
index 000000000000..ec41b8db383f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.132
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.132
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-134.base.tar.xz mirror://gentoo/genpatches-4.4-134.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-134.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f6e0d614af2342b87fa871dfa2c921b7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.133 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.133
new file mode 100644
index 000000000000..5218dff44f22
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.133
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.133
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-135.base.tar.xz mirror://gentoo/genpatches-4.4-135.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-135.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=81f30981023afd9aa290a3ba7692d0a0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.135 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.135
new file mode 100644
index 000000000000..30a38f9d1464
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.135
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.135
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-137.base.tar.xz mirror://gentoo/genpatches-4.4-137.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-137.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=130b71e40f8f95362c80de9995691c7b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1
index 14fc90be9bf0..a5fbec64ae75 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.4.87-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-91.base.tar.xz mirror://gentoo/genpatches-4.4-91.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-91.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=da960c4172a9c1ab906edc2e661c1334
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.100 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.100
new file mode 100644
index 000000000000..8285893b169e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.100
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.100
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-103.base.tar.xz mirror://gentoo/genpatches-4.9-103.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-103.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5171fa91e2d8468b5e059e4711811ba8
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.101 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.101
new file mode 100644
index 000000000000..877235b539ce
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.101
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.101
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-104.base.tar.xz mirror://gentoo/genpatches-4.9-104.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-104.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8b554d8fc3305a573559c5136c797840
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.102 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.102
new file mode 100644
index 000000000000..2432f68bb8ef
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.102
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.102
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-105.base.tar.xz mirror://gentoo/genpatches-4.9-105.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-105.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0575696afd1106977b50786059c7651a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.103 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.103
new file mode 100644
index 000000000000..4f2553c1d10a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.103
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.103
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-106.base.tar.xz mirror://gentoo/genpatches-4.9-106.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-106.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4bb64ac34fbdfb3ef85a0b505feccc5e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.105 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.105
new file mode 100644
index 000000000000..a2b1a3ae78b9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.105
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.105
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-108.base.tar.xz mirror://gentoo/genpatches-4.9-108.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-108.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a7abe54bdbd6c0badb1354044cf9f187
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.106 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.106
new file mode 100644
index 000000000000..28ee54d53f2d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.106
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.106
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-109.base.tar.xz mirror://gentoo/genpatches-4.9-109.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-109.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bd16e911d351eccc68b91231c7e4209b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.107 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.107
new file mode 100644
index 000000000000..0fca10c29a23
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.107
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.107
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-110.base.tar.xz mirror://gentoo/genpatches-4.9-110.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-110.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f292df1c7d44c82d759c4b20cc6a82e6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
index 43929c515293..d48be19e20cb 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.9.49-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-51.base.tar.xz mirror://gentoo/genpatches-4.9-51.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-51.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=578b0af3a35a12512dcb7014d9f1fabb
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.67 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.67
deleted file mode 100644
index 06728b7f1cec..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.67
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.67
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-69.base.tar.xz mirror://gentoo/genpatches-4.9-69.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-69.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c6a3860bda2ccf48bc9b78a1cddbcc71
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.68 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.68
deleted file mode 100644
index e13b5eaccbc5..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.68
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.68
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-70.base.tar.xz mirror://gentoo/genpatches-4.9-70.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-70.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1c1d30099587118c131f0dd261ad4a4a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.69 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.69
deleted file mode 100644
index 45733c2a4017..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.69
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.69
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-71.base.tar.xz mirror://gentoo/genpatches-4.9-71.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-71.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7c9d2d45eb6c8efe51c9b9105ec359c9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.70 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.70
deleted file mode 100644
index e0f81b188790..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.70
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.70
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-72.base.tar.xz mirror://gentoo/genpatches-4.9-72.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-72.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=72913873d3f76dde981b9fa6d9e37038
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.71 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.71
deleted file mode 100644
index 8f8b262e35ca..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.71
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.71
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-73.base.tar.xz mirror://gentoo/genpatches-4.9-73.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-73.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ff5dea0e5d3459c74112fb96da1556f1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.72 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.72
index 104035c0b3cf..6647c0669042 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.72
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.72
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.9.72
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-74.base.tar.xz mirror://gentoo/genpatches-4.9-74.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-74.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a24cadb0366ce77093ad745959c8109e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.73 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.73
deleted file mode 100644
index 61f2348d9fc2..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.73
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.73
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-75.base.tar.xz mirror://gentoo/genpatches-4.9-75.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-75.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f01cf96deaac62b828f14c6365f3ccda
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.74 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.74
deleted file mode 100644
index 912fea8c4057..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.74
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.74
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-76.base.tar.xz mirror://gentoo/genpatches-4.9-76.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-76.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=41c7c2e5104460eef46979195092c371
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.75 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.75
deleted file mode 100644
index 71583dc26815..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.75
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.75
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-77.base.tar.xz mirror://gentoo/genpatches-4.9-77.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-77.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=efac43659a453b3a6b1d58219fdaee5e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76
deleted file mode 100644
index 40e2da5b1a9f..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.76
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-78.base.tar.xz mirror://gentoo/genpatches-4.9-78.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-78.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2f4dfc1d0b3063a1867d3f347cf71f7a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1
index 294290d9e16f..bcd765bd8cfa 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.9.76-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-79.base.tar.xz mirror://gentoo/genpatches-4.9-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-79.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e613d81ca19d8608cf0d7aa774cb4bad
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.77 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.77
deleted file mode 100644
index c67b7ed246e2..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.77
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.77
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-80.base.tar.xz mirror://gentoo/genpatches-4.9-80.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-80.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=20079cd208ecfe486e32ebfd78b98009
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.78 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.78
deleted file mode 100644
index a89a2829acd2..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.78
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.78
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-81.base.tar.xz mirror://gentoo/genpatches-4.9-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-81.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5bbcf3cea8d7f60e7e0dc9c12b5d49b5
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.79 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.79
deleted file mode 100644
index 9f4e74f9de85..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.79
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.79
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-82.base.tar.xz mirror://gentoo/genpatches-4.9-82.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-82.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6125e10f1d526df1a07442171a67de54
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.80 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.80
deleted file mode 100644
index 9c64ee412168..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.80
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.80
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-83.base.tar.xz mirror://gentoo/genpatches-4.9-83.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-83.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a7ce44f0e642c2ff216b756b545b8b63
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.81 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.81
deleted file mode 100644
index 6b3bb0f7ddf8..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.81
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.81
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-84.base.tar.xz mirror://gentoo/genpatches-4.9-84.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-84.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aab058e1ae6b5e19badb5a278abadd06
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.82 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.82
deleted file mode 100644
index 251a8da76279..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.82
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.82
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-85.base.tar.xz mirror://gentoo/genpatches-4.9-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-85.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=191d2e8404f548580dbbe08af172c2dc
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.83 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.83
deleted file mode 100644
index f48e1e0b232e..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.83
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.83
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-86.base.tar.xz mirror://gentoo/genpatches-4.9-86.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-86.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=69b060eed6b7d53cccdb4ceebd3f7b0d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.84 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.84
deleted file mode 100644
index 2ed1dbafcb44..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.84
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.84
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-87.base.tar.xz mirror://gentoo/genpatches-4.9-87.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-87.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=634009c315b5c3780b8d2065752a6fad
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.85 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.85
index 92984b5d226a..335ba24094fd 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.85
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.85
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.9.85
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-88.base.tar.xz mirror://gentoo/genpatches-4.9-88.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-88.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=171a9a7ec12032a6ff17cb4bc8aa93b7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.86 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.86
deleted file mode 100644
index 0af7295070e6..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.86
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.86
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-89.base.tar.xz mirror://gentoo/genpatches-4.9-89.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-89.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a04e0203fb88d0076d273a094db3bba3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.87 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.87
deleted file mode 100644
index 4c767c94402b..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.87
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.87
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-90.base.tar.xz mirror://gentoo/genpatches-4.9-90.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-90.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e6f4bf0d621ae5bec0c2665734b7c678
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.88 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.88
deleted file mode 100644
index a9817e62752d..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.88
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.88
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-91.base.tar.xz mirror://gentoo/genpatches-4.9-91.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-91.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=79053be0e62c141c560dcf12295947d9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.89 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.89
deleted file mode 100644
index 4672cf55e9e3..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.89
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.89
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-92.base.tar.xz mirror://gentoo/genpatches-4.9-92.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-92.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5fe7f9dfde54c851f5b8a7e0d128b51a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.90 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.90
deleted file mode 100644
index a1284f6c54d6..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.90
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.90
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-93.base.tar.xz mirror://gentoo/genpatches-4.9-93.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-93.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cc27abe4b38e10b5cdb203cb931df82f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.91 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.91
deleted file mode 100644
index 403a3caae5a9..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.91
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 linux-firmware
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.91
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180312.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-94.base.tar.xz mirror://gentoo/genpatches-4.9-94.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-94.experimental.tar.xz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8373f5be1de18730107b572a5a437404
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.95 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.95
new file mode 100644
index 000000000000..52d1a8120a73
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.95
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.95
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-98.base.tar.xz mirror://gentoo/genpatches-4.9-98.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-98.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b3791633cb2fe5154e57c8cca3531a3a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.96 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.96
new file mode 100644
index 000000000000..85786385ffbd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.96
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.96
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-99.base.tar.xz mirror://gentoo/genpatches-4.9-99.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-99.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=df1f21b3f5ef1c656395bbf17c578c4d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.97 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.97
new file mode 100644
index 000000000000..46e6320b724b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.97
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.97
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-100.base.tar.xz mirror://gentoo/genpatches-4.9-100.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-100.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bc1b8c42ae052817b3af989d2fcf3bc0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.98 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.98
new file mode 100644
index 000000000000..5e453b16c342
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.98
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.98
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-101.base.tar.xz mirror://gentoo/genpatches-4.9-101.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-101.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b2fd927d1c9351a8edd946861f829bd1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.99 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.99
new file mode 100644
index 000000000000..2aacf5b5a3c0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.99
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.99
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20180409.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-102.base.tar.xz mirror://gentoo/genpatches-4.9-102.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-102.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=137a4c3d182fc3f7ed72de9cbdf1ef86
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.48 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.48
new file mode 100644
index 000000000000..3e5dbd57db60
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.48
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.14
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.48
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-52.base.tar.xz mirror://gentoo/genpatches-4.14-52.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-52.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a9c367b2537da6e2a3be1e33915d2d04
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.16.14 b/metadata/md5-cache/sys-kernel/ck-sources-4.16.14
new file mode 100644
index 000000000000..240ed13eeffb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.16.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.16
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.16-gnu/deblob-4.16 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://gentoo/genpatches-4.16-15.base.tar.xz mirror://gentoo/genpatches-4.16-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-15.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.16/4.16-ck1/patch-4.16-ck1.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b58cbdc80e4bcb58dd74eeb8fdb985a9
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.107 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.107
new file mode 100644
index 000000000000..d46948951e89
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.107
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.107
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-110.base.tar.xz mirror://gentoo/genpatches-4.9-110.extras.tar.xz mirror://gentoo/genpatches-4.9-110.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed1e034cc51699d9fcffe9cb2989963c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.48 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.48
new file mode 100644
index 000000000000..7155f49cda11
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.48
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.48
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-52.base.tar.xz mirror://gentoo/genpatches-4.14-52.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-52.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8750d105d2a7d9e10e9d9bb444ce89bb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.16
deleted file mode 100644
index eca119222723..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.15 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.16
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz mirror://gentoo/genpatches-4.15-19.base.tar.xz mirror://gentoo/genpatches-4.15-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-19.experimental.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8dea9791e02837a9360f6204604a0575
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.17 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.17
deleted file mode 100644
index bafa1ed724f2..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.15 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.17
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz mirror://gentoo/genpatches-4.15-20.base.tar.xz mirror://gentoo/genpatches-4.15-20.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-20.experimental.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=731cc6c5a0d31258c8cfb984a2e0d6e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.18 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.18
deleted file mode 100644
index ee7db8b539ff..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.15 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.18
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz mirror://gentoo/genpatches-4.15-21.base.tar.xz mirror://gentoo/genpatches-4.15-21.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-21.experimental.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce2ae20b06d954ce27323826b1543e08
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.14
new file mode 100644
index 000000000000..2816d547643f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.16 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz mirror://gentoo/genpatches-4.16-15.base.tar.xz mirror://gentoo/genpatches-4.16-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-15.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=01d22d9319c6e5c79889fcf6ef400c51
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.0
new file mode 100644
index 000000000000..d55bc3982b34
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.17 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.17.0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-1.base.tar.xz mirror://gentoo/genpatches-4.17-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-1.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=64f95520f10539239587c226bc507508
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.136 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.136
new file mode 100644
index 000000000000..1f62d4e48ac8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.136
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.136
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-138.base.tar.xz mirror://gentoo/genpatches-4.4-138.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-138.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c530e64fc82244c5f5d0eb3092efadda
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.106 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.106
new file mode 100644
index 000000000000..9b290f4102bb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.106
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.106
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-109.base.tar.xz mirror://gentoo/genpatches-4.9-109.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-109.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c60bdb63bb5a683081e8865885e8a5e5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.107 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.107
new file mode 100644
index 000000000000..a09274f700a6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.107
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.107
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-110.base.tar.xz mirror://gentoo/genpatches-4.9-110.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-110.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4abdfb4d926b8fb5c5f531469c6fdf64
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20180606 b/metadata/md5-cache/sys-kernel/linux-firmware-20180606
new file mode 100644
index 000000000000..286bbdf8584f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20180606
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst preinst prepare unpack
+DESCRIPTION=Linux firmware files
+EAPI=6
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=savedconfig savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
+RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
+SLOT=0
+SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-d1147327232ec4616a66ab898df84f9700c816c1.tar.gz -> linux-firmware-20180606.tar.gz
+_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
+_md5_=2dde3a3188dc275c7d0ebbb84254d261
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3 b/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
index 004687c4b28e..5e65ad17ed4f 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.10_p3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.10.tar.xz https://pf.natalenko.name/sources/4.10/patch-4.10-pf3.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3 b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
index 5faba706b035..6159fb02074f 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.11_p3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz https://pf.natalenko.name/sources/4.11/patch-4.11-pf3.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
index f2204a4cb07a..f4030a84a280 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.11_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz https://pf.natalenko.name/sources/4.11/patch-4.11-pf4.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
index 4a9262ff0858..8c29c47401b8 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.13_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://pf.natalenko.name/sources/4.13/patch-4.13-pf4.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8 b/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
index ff0f2d7d6397..dbf2f7670db0 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.4_p8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://pf.natalenko.name/sources/4.4/patch-4.4-pf8.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
index f8a9601386b0..9ff768df3cb2 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.5_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.5.tar.xz https://pf.natalenko.name/sources/4.5/patch-4.5-pf4.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8 b/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
index 3754d0878f54..294d8612f30b 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.8_p8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://pf.natalenko.name/sources/4.8/patch-4.8-pf8.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.17_p20160209 b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.17_p20160209
index dc8ec566bbe4..9d98ee68c337 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.17_p20160209
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.17_p20160209
@@ -6,5 +6,5 @@ KEYWORDS=~arm -*
 LICENSE=GPL-2 raspberrypi-videocore-bin
 SLOT=4.1.17_p20160209
 SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20160209 -> raspberrypi-firmware-1.20160209.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3f0645492d2e24508f250f4e05e3d2c1
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.19_p20160309 b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.19_p20160309
index 36967532982a..ca6c71fc7c03 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.19_p20160309
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.19_p20160309
@@ -6,5 +6,5 @@ KEYWORDS=~arm -*
 LICENSE=GPL-2 raspberrypi-videocore-bin
 SLOT=4.1.19_p20160309
 SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20160309 -> raspberrypi-firmware-1.20160309.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17cd132f5d82ebd292c45d1f18448e90
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-9999 b/metadata/md5-cache/sys-kernel/raspberrypi-image-9999
index 36199513ed97..25449511e0fd 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/raspberrypi/firmware
 LICENSE=GPL-2 raspberrypi-videocore-bin
 RESTRICT=binchecks strip
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=5b0a124149e969eab5a32c029eeb1731
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.109_p102 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.109_p102
new file mode 100644
index 000000000000..292d57163b78
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.109_p102
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 3.18 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.18.109_p102
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.109.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.109-rt102.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.109-rt102.patch.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cb3c840816e44246c1a6459de8cde1d9
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.91_p98 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.91_p98
deleted file mode 100644
index ca59f7b6421a..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.91_p98
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.18 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=3.18.91_p98
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.91.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.91-rt98.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.91-rt98.patch.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cb3c840816e44246c1a6459de8cde1d9
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.29_p25 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.29_p25
deleted file mode 100644
index c204405a5526..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.29_p25
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.29_p25
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.29.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.29-rt25.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.29-rt25.patch.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=175fbf54f3a05c771dc5d3487a9f75e3
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.34_p27 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.34_p27
deleted file mode 100644
index ccc8289e582c..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.34_p27
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.34_p27
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.34.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.34-rt27.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.34-rt27.patch.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=175fbf54f3a05c771dc5d3487a9f75e3
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.16.12_p5 b/metadata/md5-cache/sys-kernel/rt-sources-4.16.12_p5
new file mode 100644
index 000000000000..4cefc134312e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.16.12_p5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.16 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.12_p5
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.16-gnu/deblob-4.16 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://kernel/linux/kernel/projects/rt/4.16/patch-4.16.12-rt5.patch.xz mirror://kernel/linux/kernel/projects/rt/4.16/older/patch-4.16.12-rt5.patch.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=175fbf54f3a05c771dc5d3487a9f75e3
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.126_p141 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.126_p141
deleted file mode 100644
index 92fcf9ccf028..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.126_p141
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( linux-firmware )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.126_p141
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.126.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-4.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.126-rt141.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.126-rt141.patch.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cb3c840816e44246c1a6459de8cde1d9
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.101 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.101
deleted file mode 100644
index cf3e985f189a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.101
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=3.2.101
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.101.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.102 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.102
new file mode 100644
index 000000000000..17ac287f4bff
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.102
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.2.102
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.102.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.47 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.47
deleted file mode 100644
index ebc6098a3890..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.47
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.47
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.47.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.48 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.48
new file mode 100644
index 000000000000..fbad73319503
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.48
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.48
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.48.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.13
deleted file mode 100644
index 1712c5260eb5..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.16.13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.13.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.14 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.14
new file mode 100644
index 000000000000..f1377da4937c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.14.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.0
new file mode 100644
index 000000000000..51d1a44a365a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.17.0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.105 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.105
deleted file mode 100644
index a564a617e72d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.105
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.105
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.105.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.106 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.106
new file mode 100644
index 000000000000..9854a881cc40
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.106
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.106
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.106.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	f8c4ddcbde73d086d3a2824743eab8ae	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 35f8ecb9da74..0fa0c9754744 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/binutils-libs-2.30-r2 b/metadata/md5-cache/sys-libs/binutils-libs-2.30-r2
index 2feb1b5dacf9..efaf07293521 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.30-r2
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.30-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls 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 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[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/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.30
 SRC_URI=mirror://gnu/binutils/binutils-2.30.tar.xz mirror://gentoo/binutils-2.30-patches-2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad361f8d17be8760b4755c07f358d473
+_md5_=24e012646468ea81f168399deadb36e9
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
index 5b832eacd544..31092289b6f0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 SLOT=5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98227eaf9bfb011277d5b54f3417ca22
+_md5_=cf306ab79e82e1e310441e78889afacf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-6.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-6.0.0
index cef2e321754b..da06b9dab345 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-6.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-6.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.0
 SRC_URI=https://releases.llvm.org/6.0.0/compiler-rt-6.0.0.src.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64af8d78e8d047a12291b920e8da38c4
+_md5_=15e453ad2cdf396e591aa2b7d8c73b4c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
index 88fc6041a0d6..b78608317a04 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test elibc_glibc
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 SLOT=5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz )
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e2ae45abc528b39ca97757231213c4c
+_md5_=021f40b88a2928351f359fb8d9526a5e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.0
index bb538356971c..1c7bcdbdf070 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test elibc_glibc
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.0
 SRC_URI=https://releases.llvm.org/6.0.0/compiler-rt-6.0.0.src.tar.xz test? ( https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz )
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a13e06c77ec664302ec294d977c7ad3
+_md5_=d8d7361283753044eecb18707bdf30eb
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
index 05aff0474009..42acf7d6b395 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=nls 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.6.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.6/e2fsprogs-libs-1.43.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17b7f2adf93ee8902c270fb577881e15
+_md5_=adaf93180c0db9e86e95b8ebe94a279f
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
index 6f47293df770..85aa5765f1ea 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=nls 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.9.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.9/e2fsprogs-libs-1.43.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=022576527aa6a4d4d0521e9f13772605
+_md5_=746ccd94861276dc4182e91da3c7c3b5
diff --git a/metadata/md5-cache/sys-libs/glibc-2.18-r1 b/metadata/md5-cache/sys-libs/glibc-2.18-r1
deleted file mode 100644
index 54c27ac9716f..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup test unpack
-DEPEND=>=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) >=sys-devel/binutils-2.20 >=sys-devel/gcc-4.3 virtual/os-headers !vanilla? ( >=sys-libs/timezone-data-2012c ) sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc6 (also called glibc2) C library
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-IUSE=debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.18.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.18.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.18.tar.xz mirror://gentoo/glibc-2.18.tar.xz mirror://gentoo/glibc-2.18-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.18-patches-4.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.18-patches-4.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6536b58d31641ac732f3824fbda3c608
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r1 b/metadata/md5-cache/sys-libs/glibc-2.19-r1
index 3d7664677f26..e3b05f3a370e 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.19-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-d
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.19.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.19.tar.xz mirror://gentoo/glibc-2.19.tar.xz mirror://gentoo/glibc-2.19-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.19-patches-3.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.19-patches-3.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8cba2f153de122df53bacabefd7a0458
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	2c8bd4294e48b6d4e6cd4568d318bb5e	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9312ce15735358bb0fe9fea162052eee
diff --git a/metadata/md5-cache/sys-libs/glibc-2.20-r2 b/metadata/md5-cache/sys-libs/glibc-2.20-r2
index 6a92f009f164..8f7a52f31b8f 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.20-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.20-r2
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/li
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.20.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.20.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.20.tar.xz mirror://gentoo/glibc-2.20.tar.xz mirror://gentoo/glibc-2.20-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.20-patches-5.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.20-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/glibc/glibc-2.20-patches-5.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~blueness/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e6147849498c6daeb27b750c7bc21f03
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	2c8bd4294e48b6d4e6cd4568d318bb5e	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bc329e3bc5bad48b35cc22e60a7a7a6e
diff --git a/metadata/md5-cache/sys-libs/glibc-2.21-r2 b/metadata/md5-cache/sys-libs/glibc-2.21-r2
index 12f76f06ca37..cc8ebff0f10c 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.21-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.21-r2
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/li
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.21.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.21.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.21.tar.xz mirror://gentoo/glibc-2.21.tar.xz mirror://gentoo/glibc-2.21-patches-7.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.21-patches-7.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.21-patches-7.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d3a4a78265eec2d24682cd7be90b0cd1
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	2c8bd4294e48b6d4e6cd4568d318bb5e	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c2150cc01fad9ba36da4d56861f08049
diff --git a/metadata/md5-cache/sys-libs/glibc-2.22-r4 b/metadata/md5-cache/sys-libs/glibc-2.22-r4
index 707465ecbfb9..1837e7b3a00b 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.22-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.22-r4
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/li
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.22.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.22.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.22.tar.xz mirror://gentoo/glibc-2.22.tar.xz mirror://gentoo/glibc-2.22-patches-13.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.22-patches-13.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.22-patches-13.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2c4cd0326494e91e5f5bccc862dfa56d
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	2c8bd4294e48b6d4e6cd4568d318bb5e	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=314f44bd56dcafe6b5891c7f4c3a4094
diff --git a/metadata/md5-cache/sys-libs/glibc-2.23-r4 b/metadata/md5-cache/sys-libs/glibc-2.23-r4
index d508eaa78d77..584be81794ed 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.23-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.23-r4
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.23-patches-8.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b608ef413c4f073f7f787fa5d8b43707
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	2c8bd4294e48b6d4e6cd4568d318bb5e	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9b3a334bbd3d6992795cf1c883a5767c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.24-r4 b/metadata/md5-cache/sys-libs/glibc-2.24-r4
index 4aa1c449b647..7d2c188a1389 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.24-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.24-r4
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.24-patches-10.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=106c7cef0a5ccd988f9206420182391c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	2c8bd4294e48b6d4e6cd4568d318bb5e	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=36c80b1f5798debe5a5cb207889f0888
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
index 3268d470c120..8795a5f25807 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d1f10865e5242e844404644ab7d8438f
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	2c8bd4294e48b6d4e6cd4568d318bb5e	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d79e920063ca7e9c46ac4d783fe0ddb3
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r7 b/metadata/md5-cache/sys-libs/glibc-2.26-r7
index 506d0cb84b6f..52b113d26a45 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r7
@@ -4,12 +4,12 @@ DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only
-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=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-7.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0c42fb14cba311efd7f642477d05e1d1
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	toolchain-glibc	2c8bd4294e48b6d4e6cd4568d318bb5e	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a17fe9f9bfc20400b17201b6dda1a7b8
diff --git a/metadata/md5-cache/sys-libs/glibc-2.27-r2 b/metadata/md5-cache/sys-libs/glibc-2.27-r2
deleted file mode 100644
index 1402ff17ec13..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.27-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 !<sys-devel/bison-2.7 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc C library
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libc/
-IUSE=audit caps compile-locales debug doc gd hardened headers-only multilib nscd profile selinux suid systemtap vanilla
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.27.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.27-patches-1.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b3031a69ce4e472fdf873ab886089b77
diff --git a/metadata/md5-cache/sys-libs/glibc-2.27-r3 b/metadata/md5-cache/sys-libs/glibc-2.27-r3
index d7ae04f99f80..fe2c9e32df86 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.27-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.27-r3
@@ -4,6 +4,7 @@ DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps compile-locales doc gd hardened headers-only multilib nscd profile selinux suid systemtap vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
@@ -11,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.27.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.27-patches-2.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3e69c850d327c2e7e31bcb65a3b29619
+_md5_=85aeb5e0773be3416e096ddef247e187
diff --git a/metadata/md5-cache/sys-libs/libavc1394-0.5.3 b/metadata/md5-cache/sys-libs/libavc1394-0.5.3
deleted file mode 100644
index 59096b0339b3..000000000000
--- a/metadata/md5-cache/sys-libs/libavc1394-0.5.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-libs/libraw1394-0.8 virtual/pkgconfig
-DESCRIPTION=library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set
-EAPI=0
-HOMEPAGE=https://sourceforge.net/projects/libavc1394/
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-libs/libraw1394-0.8
-SLOT=0
-SRC_URI=mirror://sourceforge/libavc1394/libavc1394-0.5.3.tar.gz
-_md5_=7c0baede1cc52d4b0b0c8aebd9b0ce20
diff --git a/metadata/md5-cache/sys-libs/libavc1394-0.5.4 b/metadata/md5-cache/sys-libs/libavc1394-0.5.4
deleted file mode 100644
index c7d54af74228..000000000000
--- a/metadata/md5-cache/sys-libs/libavc1394-0.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/libraw1394-0.8 virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/libavc1394/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-libs/libraw1394-0.8
-SLOT=0
-SRC_URI=mirror://sourceforge/libavc1394/libavc1394-0.5.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56bb979adb5dc786b394180c8b3d62f0
diff --git a/metadata/md5-cache/sys-libs/libcxx-5.0.2 b/metadata/md5-cache/sys-libs/libcxx-5.0.2
index 33a9b9e2e81e..ea8cb73cc2d3 100644
--- a/metadata/md5-cache/sys-libs/libcxx-5.0.2
+++ b/metadata/md5-cache/sys-libs/libcxx-5.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=New implementation of the C++ standard library, targeting C++11
 EAPI=6
 HOMEPAGE=https://libcxx.llvm.org/
 IUSE=elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test 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 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-5.0.2[libunwind=,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(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,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(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/libcxx-5.0.2.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=daf155acfa08e6303eeef50557db3aa0
+_md5_=fb227156aaff905a18b6222b0d8e427a
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-5.0.2 b/metadata/md5-cache/sys-libs/libcxxabi-5.0.2
index 63623773d155..09ecaed320d0 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-5.0.2
+++ b/metadata/md5-cache/sys-libs/libcxxabi-5.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Low level support for a standard C++ library
 EAPI=6
 HOMEPAGE=https://libcxxabi.llvm.org/
 IUSE=+libunwind +static-libs test elibc_musl 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 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[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(-)?] ) )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/libcxxabi-5.0.2.src.tar.xz https://releases.llvm.org/5.0.2/libcxx-5.0.2.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83cb7dcd1c25661f7468de96dc8f451a
+_md5_=61462aa731df90cdbdc2d66ed7cccf72
diff --git a/metadata/md5-cache/sys-libs/libfaketime-0.9.6-r2 b/metadata/md5-cache/sys-libs/libfaketime-0.9.6-r2
index e7a760c24008..106803109bed 100644
--- a/metadata/md5-cache/sys-libs/libfaketime-0.9.6-r2
+++ b/metadata/md5-cache/sys-libs/libfaketime-0.9.6-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Report faked system time to programs
 EAPI=6
 HOMEPAGE=http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime
 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 arm ~arm64 hppa sparc x86
+KEYWORDS=amd64 arm arm64 hppa sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.code-wizards.com/projects/libfaketime/libfaketime-0.9.6.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=95daf7d46ea27b9451b51222f4d23d03
+_md5_=e71be86b2e780fe83a563156970646a7
diff --git a/metadata/md5-cache/sys-libs/libomp-5.0.2 b/metadata/md5-cache/sys-libs/libomp-5.0.2
index 46ea4faca215..fb6ca668f91e 100644
--- a/metadata/md5-cache/sys-libs/libomp-5.0.2
+++ b/metadata/md5-cache/sys-libs/libomp-5.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
 HOMEPAGE=https://openmp.llvm.org
 IUSE=hwloc kernel_linux ompt test 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 ~arm64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/openmp-5.0.2.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e86fe14fafee29815be5fa0d1bb3502b
+_md5_=3616e9bb0a2656b2540169e8849e117a
diff --git a/metadata/md5-cache/sys-libs/libomp-6.0.0 b/metadata/md5-cache/sys-libs/libomp-6.0.0
index 0c3c9acb89ae..4e593a01c7d2 100644
--- a/metadata/md5-cache/sys-libs/libomp-6.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
 HOMEPAGE=https://openmp.llvm.org
 IUSE=cuda hwloc kernel_linux offload ompt test 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 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libffi:=[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(-)?] cuda? ( dev-util/nvidia-cuda-sdk:= ) )
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/openmp-6.0.0.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ad84de53b5d3922efaba687317c90cd
+_md5_=9c04adf2ed5035a985a8f2a2f8fd2604
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.3.0 b/metadata/md5-cache/sys-libs/libseccomp-2.3.0
deleted file mode 100644
index daa108ad5077..000000000000
--- a/metadata/md5-cache/sys-libs/libseccomp-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-kernel/linux-headers-4.3
-DESCRIPTION=high level interface to Linux seccomp filter
-EAPI=5
-HOMEPAGE=https://github.com/seccomp/libseccomp
-IUSE=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=-* amd64 arm arm64 ~mips ppc ppc64 s390 x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.3.0/libseccomp-2.3.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ba7769427d076b9754351c11ae8e9c86
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.3.1 b/metadata/md5-cache/sys-libs/libseccomp-2.3.1
deleted file mode 100644
index b53b16953740..000000000000
--- a/metadata/md5-cache/sys-libs/libseccomp-2.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-kernel/linux-headers-4.3
-DESCRIPTION=high level interface to Linux seccomp filter
-EAPI=5
-HOMEPAGE=https://github.com/seccomp/libseccomp
-IUSE=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=-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.3.1/libseccomp-2.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=051480aa4c37a17729f5818c70fd1cd6
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.3.3 b/metadata/md5-cache/sys-libs/libseccomp-2.3.3
index 15745df797a9..a5aef26c1bbb 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.3.3
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.3.3
@@ -4,9 +4,9 @@ DESCRIPTION=high level interface to Linux seccomp filter
 EAPI=5
 HOMEPAGE=https://github.com/seccomp/libseccomp
 IUSE=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=-* amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux
+KEYWORDS=-* amd64 arm arm64 ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.3.3/libseccomp-2.3.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64eb6ca356c9aa005afd32025a926628
+_md5_=c065e31ca6ccfed6f54b51dd955fd3cb
diff --git a/metadata/md5-cache/sys-libs/libservicelog-1.1.11 b/metadata/md5-cache/sys-libs/libservicelog-1.1.11
deleted file mode 100644
index 29e5e7097015..000000000000
--- a/metadata/md5-cache/sys-libs/libservicelog-1.1.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-db/sqlite >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Provides a library for logging service-related events
-EAPI=0
-HOMEPAGE=http://linux-diag.sourceforge.net/servicelog/
-KEYWORDS=~ppc ~ppc64
-LICENSE=IBM
-RDEPEND=dev-db/sqlite virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-diag/libservicelog-1.1.11.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5946fdfbee2aad8f4345afa0f8f39281
diff --git a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r2 b/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r2
deleted file mode 100644
index b2d8c4ffd378..000000000000
--- a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Compatibility package for old termcap-based programs
-EAPI=0
-HOMEPAGE=http://www.catb.org/~esr/terminfo/
-KEYWORDS=alpha amd64 hppa ppc sparc x86
-LICENSE=GPL-2 LGPL-2 BSD
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/terminfo/termtypes.tc.gz mirror://gentoo/termcap-2.0.8.tar.bz2 mirror://gentoo/termcap-2.0.8-patches-1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c0c7a0ffd4ef90f4e9702b695c3a86e5
diff --git a/metadata/md5-cache/sys-libs/libuuid-1.0.3 b/metadata/md5-cache/sys-libs/libuuid-1.0.3
index 34b681b178aa..cf8d42c0a01a 100644
--- a/metadata/md5-cache/sys-libs/libuuid-1.0.3
+++ b/metadata/md5-cache/sys-libs/libuuid-1.0.3
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422
 DESCRIPTION=Portable uuid C library
 EAPI=6
 HOMEPAGE=http://libuuid.sourceforge.net/
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~x64-solaris ~x86-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/libuuid/libuuid-1.0.3.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=145282a033615b1e0f862f5c4d1bd451
+_md5_=74319531548b0f47752a726c46637607
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-2.0 b/metadata/md5-cache/sys-libs/libxcrypt-2.0
deleted file mode 100644
index 52029dcfe586..000000000000
--- a/metadata/md5-cache/sys-libs/libxcrypt-2.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A replacement for libcrypt with DES, MD5 and blowfish support
-EAPI=0
-HOMEPAGE=http://www.suse.de/us/private/products/suse_linux/i386/packages_personal/libxcrypt.html
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/libxcrypt-2.0.tar.bz2
-_md5_=d404f031699572e6358e0378fada149e
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.2 b/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.2
index 52baaf001bd4..dafa5b8e495c 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.2
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=6
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
 IUSE=debug +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=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/libunwind-5.0.2.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35fd6dce7489fa88365a6065571aa26b
+_md5_=824e7478480b4e8fa7ca72e6d475ef07
diff --git a/metadata/md5-cache/sys-libs/native-uuid-1.0 b/metadata/md5-cache/sys-libs/native-uuid-1.0
new file mode 100644
index 000000000000..67ac9b0214d3
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/native-uuid-1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=!!sys-libs/libuuid !!sys-apps/util-linux
+DESCRIPTION=.pc file for uuid
+EAPI=6
+HOMEPAGE=https://prefix.gentoo.org/
+KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=!!sys-libs/libuuid !!sys-apps/util-linux
+SLOT=0
+_md5_=0d9e26d5a10c5fa19b4d015f9ff103e3
diff --git a/metadata/md5-cache/sys-libs/readline-7.0_p5 b/metadata/md5-cache/sys-libs/readline-7.0_p5
new file mode 100644
index 000000000000..c3c3d4208c9d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/readline-7.0_p5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=>=sys-libs/ncurses-5.9-r3:0=[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(-)?] virtual/pkgconfig
+DESCRIPTION=Another cute console display library
+EAPI=6
+HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[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(-)?]
+SLOT=0/7
+SRC_URI=mirror://gnu/readline/readline-7.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-001 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-002 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-003 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-004 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-005 mirror://gnu/readline/readline-7.0-patches/readline70-001 mirror://gnu/readline/readline-7.0-patches/readline70-002 mirror://gnu/readline/readline-7.0-patches/readline70-003 mirror://gnu/readline/readline-7.0-patches/readline70-004 mirror://gnu/readline/readline-7.0-patches/readline70-005
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7e3b2c20b8306860e27368afcec0ad32
diff --git a/metadata/md5-cache/sys-libs/rvm-1.12 b/metadata/md5-cache/sys-libs/rvm-1.12
deleted file mode 100644
index 2aea95ace5f6..000000000000
--- a/metadata/md5-cache/sys-libs/rvm-1.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-libs/lwp-2.0 sys-apps/grep sys-devel/libtool sys-devel/gcc
-DESCRIPTION=Recoverable Virtual Memory (used by Coda)
-EAPI=0
-HOMEPAGE=http://www.coda.cs.cmu.edu/
-KEYWORDS=~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-libs/lwp-2.0
-SLOT=1
-SRC_URI=http://www.coda.cs.cmu.edu/pub/rvm/src/rvm-1.12.tar.gz
-_md5_=0e4980247b74101172f15c3fda8e97b1
diff --git a/metadata/md5-cache/sys-libs/slang-2.3.2 b/metadata/md5-cache/sys-libs/slang-2.3.2
index 35c9b05b195c..8e74b27b8c74 100644
--- a/metadata/md5-cache/sys-libs/slang-2.3.2
+++ b/metadata/md5-cache/sys-libs/slang-2.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Multi-platform library designed to allow a developer to create robus
 EAPI=6
 HOMEPAGE=http://www.jedsoft.org/slang/
 IUSE=cjk pcre png readline static-libs zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+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 ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= cjk? ( >=dev-libs/oniguruma-5.9.5:=[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(-)?] ) pcre? ( >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.jedsoft.org/releases/slang/slang-2.3.2.tar.bz2 http://www.jedsoft.org/releases/slang/old/slang-2.3.2.tar.bz2
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bae60a9f7c297effd169d00e52fb22f8
+_md5_=a013e3c4889a1541c0c87f81f81ae1fb
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 5b2ec18eac74..9591856d74fc 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/acpi-1.7-r1 b/metadata/md5-cache/sys-power/acpi-1.7-r1
index e11895d2c306..9b61bfb18779 100644
--- a/metadata/md5-cache/sys-power/acpi-1.7-r1
+++ b/metadata/md5-cache/sys-power/acpi-1.7-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Displays information about ACPI devices
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/acpiclient/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/acpiclient/acpi-1.7.tar.gz
-_md5_=73bd1a588e127d8a4b4597badfe27243
+_md5_=b90c1f9b7b74a55b6ecbe938c9ae3915
diff --git a/metadata/md5-cache/sys-power/powertop-2.9 b/metadata/md5-cache/sys-power/powertop-2.9
index 8b1241d69db9..4e92a1d21e9f 100644
--- a/metadata/md5-cache/sys-power/powertop-2.9
+++ b/metadata/md5-cache/sys-power/powertop-2.9
@@ -4,10 +4,10 @@ DESCRIPTION=tool that helps you find what software is using the most power
 EAPI=6
 HOMEPAGE=https://01.org/powertop/
 IUSE=nls unicode X
-KEYWORDS=amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/powertop/powertop-v2.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9c9fc9a249262ddfcc2cc0819fe5a238
+_md5_=c129433cf277cd7da3f1439c93d084a7
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 58a1ab020b80..3cea9b7f262f 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/acct-6.6.4-r1 b/metadata/md5-cache/sys-process/acct-6.6.4-r1
index fba4094e37df..b72d1c387091 100644
--- a/metadata/md5-cache/sys-process/acct-6.6.4-r1
+++ b/metadata/md5-cache/sys-process/acct-6.6.4-r1
@@ -3,9 +3,9 @@ DEPEND=sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0
 DESCRIPTION=GNU system accounting utilities
 EAPI=6
 HOMEPAGE=https://savannah.gnu.org/projects/acct/
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/acct/acct-6.6.4.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=74a1efedf80e071be474abb26f70262d
+_md5_=1f9dbfd023b20bbac802ed7918f81d7f
diff --git a/metadata/md5-cache/sys-process/atop-2.3.0-r1 b/metadata/md5-cache/sys-process/atop-2.3.0-r1
index 0f10c062db85..a1532c8f532f 100644
--- a/metadata/md5-cache/sys-process/atop-2.3.0-r1
+++ b/metadata/md5-cache/sys-process/atop-2.3.0-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1 virtual/pkgconfig virtual
 DESCRIPTION=Resource-specific view of processes
 EAPI=6
 HOMEPAGE=https://www.atoptool.nl/ https://github.com/Atoptool/atop
-KEYWORDS=~alpha amd64 ~arm hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.3.0.tar.gz -> atop-2.3.0.tar.gz https://github.com/Atoptool/atop/commit/42e86fcc42ce60f8c92f3c7d5f3a6ccde47c0b33.patch -> atop-2.3.0-version_h.patch https://github.com/Atoptool/atop/commit/a8d850d06efc8d70a19f55ec93fe83df51e99077.patch -> atop-2.3.0-version_c.patch https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd672631b6033c36c1.patch -> atop-2.3.0-netatop_h.patch
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=74aea44d53501bb2625772d12757e11c
+_md5_=188bb80ee3cc4491e42cda9ac2dc1774
diff --git a/metadata/md5-cache/sys-process/audit-2.7.1 b/metadata/md5-cache/sys-process/audit-2.7.1
index b8b178dd573a..0fbec5436db8 100644
--- a/metadata/md5-cache/sys-process/audit-2.7.1
+++ b/metadata/md5-cache/sys-process/audit-2.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=6
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python 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 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 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng 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(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.7.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1583c6d99f0e1d65946f48a43cae2c21
+_md5_=5d9a12d763961c1ae6845c096d0f9d07
diff --git a/metadata/md5-cache/sys-process/audit-2.8.3 b/metadata/md5-cache/sys-process/audit-2.8.3
new file mode 100644
index 000000000000..15a570ee732d
--- /dev/null
+++ b/metadata/md5-cache/sys-process/audit-2.8.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng 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(-)] ) >=sys-kernel/linux-headers-2.6.34 python? ( dev-lang/swig:0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Userspace utilities for storing and processing auditing records
+EAPI=6
+HOMEPAGE=https://people.redhat.com/sgrubb/audit/
+IUSE=gssapi ldap python 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 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 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng 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(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.3.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=284e8e9902e7b3b551200cb751b1170a
diff --git a/metadata/md5-cache/sys-process/glances-2.11.1 b/metadata/md5-cache/sys-process/glances-2.11.1
index 4979dd085015..2274cbc4f2b1 100644
--- a/metadata/md5-cache/sys-process/glances-2.11.1
+++ b/metadata/md5-cache/sys-process/glances-2.11.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=doc? ( dev-python/sphinx[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/sphinx_rtd_theme[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/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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=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=doc? ( dev-python/sphinx[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/sphinx_rtd_theme[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/setuptools[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[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=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=CLI curses based monitoring tool
 EAPI=6
 HOMEPAGE=https://github.com/nicolargo/glances
-IUSE=+doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=+doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=doc? ( dev-python/sphinx[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/sphinx_rtd_theme[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/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(-)] >=dev-python/psutil-2.0.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[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=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=doc? ( dev-python/sphinx[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/sphinx_rtd_theme[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/setuptools[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/psutil-2.0.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=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=mirror://pypi/G/Glances/Glances-2.11.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de7f04c9eeacc9e4d6bb3e8e6d857414
+_md5_=4014b319ce19f210458e18c5c8657ae1
diff --git a/metadata/md5-cache/sys-process/htop-2.0.2 b/metadata/md5-cache/sys-process/htop-2.0.2
index 01930a99dade..0e8f55608ab1 100644
--- a/metadata/md5-cache/sys-process/htop-2.0.2
+++ b/metadata/md5-cache/sys-process/htop-2.0.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure prepare setup
 DEPEND=sys-libs/ncurses:0=[unicode?] virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=interactive process viewer
 EAPI=6
-HOMEPAGE=http://hisham.hm/htop/
+HOMEPAGE=https://hisham.hm/htop/
 IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
-SRC_URI=http://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz
+SRC_URI=https://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9801d6e42878a0866b2625aafb689b40
+_md5_=acc944bfb62e451ec9d3387e9302b3c8
diff --git a/metadata/md5-cache/sys-process/htop-2.1.0-r1 b/metadata/md5-cache/sys-process/htop-2.1.0-r1
index 1a62e971ba86..2ebfa5210036 100644
--- a/metadata/md5-cache/sys-process/htop-2.1.0-r1
+++ b/metadata/md5-cache/sys-process/htop-2.1.0-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure prepare setup
 DEPEND=sys-libs/ncurses:0=[unicode?] 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(+)?] virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=interactive process viewer
 EAPI=6
-HOMEPAGE=http://hisham.hm/htop/
+HOMEPAGE=https://hisham.hm/htop/
 IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 REQUIRED_USE=^^ ( 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=http://hisham.hm/htop/releases/2.1.0/htop-2.1.0.tar.gz
+SRC_URI=https://hisham.hm/htop/releases/2.1.0/htop-2.1.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c2c5f8b526179b1e9c06b42b144b2976
+_md5_=8ea63887ad529e0eb5cf358f1dbb967e
diff --git a/metadata/md5-cache/sys-process/htop-2.2.0 b/metadata/md5-cache/sys-process/htop-2.2.0
index 2b8d98768efb..7147ab1a2ee5 100644
--- a/metadata/md5-cache/sys-process/htop-2.2.0
+++ b/metadata/md5-cache/sys-process/htop-2.2.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure prepare setup
 DEPEND=sys-libs/ncurses:0=[unicode?] 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(+)?] virtual/pkgconfig
 DESCRIPTION=interactive process viewer
 EAPI=6
-HOMEPAGE=http://hisham.hm/htop/
+HOMEPAGE=https://hisham.hm/htop/
 IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 REQUIRED_USE=^^ ( 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=http://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz
+SRC_URI=https://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=23efd727161991e849ed3d5c34fb3ab0
+_md5_=a1c9982eb5600d35f13d7f959d6aa52b
diff --git a/metadata/md5-cache/sys-process/htop-3.0.0_beta4 b/metadata/md5-cache/sys-process/htop-3.0.0_beta4
index 7089e4424020..506b809a1672 100644
--- a/metadata/md5-cache/sys-process/htop-3.0.0_beta4
+++ b/metadata/md5-cache/sys-process/htop-3.0.0_beta4
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure prepare setup
 DEPEND=sys-libs/ncurses:0=[unicode?] 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(+)?] virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=interactive process viewer
 EAPI=6
-HOMEPAGE=http://hisham.hm/htop/
+HOMEPAGE=https://hisham.hm/htop/
 IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver 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=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=https://github.com/hishamhm/htop/archive/3.0.0beta4.tar.gz -> htop-3.0.0_beta4.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f0c68c6a199e337c465295698fe4222
+_md5_=082d9487b5810cd56c2d40078104fd7c
diff --git a/metadata/md5-cache/sys-process/tini-0.18.0 b/metadata/md5-cache/sys-process/tini-0.18.0
index 6ed34813d9be..bcddfef62fec 100644
--- a/metadata/md5-cache/sys-process/tini-0.18.0
+++ b/metadata/md5-cache/sys-process/tini-0.18.0
@@ -4,9 +4,9 @@ DESCRIPTION=A tiny but valid init for containers
 EAPI=6
 HOMEPAGE=https://github.com/krallin/tini
 IUSE=+args +static
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/krallin/tini/archive/v0.18.0.tar.gz -> tini-0.18.0.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d66dbea44ce79f1c5c0642906fa9156
+_md5_=e2e58bce5de81b12bc7f3aa1d9e96441
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 2f2930e6a624..31897a1702c8 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/os-headers-0-r1 b/metadata/md5-cache/virtual/os-headers-0-r1
index 2e976c831d77..d989736923e3 100644
--- a/metadata/md5-cache/virtual/os-headers-0-r1
+++ b/metadata/md5-cache/virtual/os-headers-0-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for operating system headers
 EAPI=6
 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
-RDEPEND=|| ( kernel_linux? ( sys-kernel/linux-headers:0 ) kernel_Winnt? ( elibc_mingw? ( dev-util/mingw64-runtime ) ) !prefix? ( sys-freebsd/freebsd-lib ) )
+RDEPEND=!prefix-guest? ( || ( kernel_linux? ( sys-kernel/linux-headers:0 ) kernel_Winnt? ( elibc_mingw? ( dev-util/mingw64-runtime ) ) !prefix? ( sys-freebsd/freebsd-lib ) ) )
 SLOT=0
-_md5_=5d8c039f1aab15f9056126b92ef9b2e5
+_md5_=e203631242038bf8627bdc9fa8fa8076
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.400.0-r1 b/metadata/md5-cache/virtual/perl-Carp-1.400.0-r1
index ad512ddc5808..49d4af4a233f 100644
--- a/metadata/md5-cache/virtual/perl-Carp-1.400.0-r1
+++ b/metadata/md5-cache/virtual/perl-Carp-1.400.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Carp
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/Carp-1.400.0 ) dev-lang/perl:= !<perl-core/Carp-1.400.0 !>perl-core/Carp-1.400.0-r999
 SLOT=0
-_md5_=3326514a08827b8bb5d7a7517f475904
+_md5_=2f17f18aa45e257f9fb99194eedab151
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.69.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.69.0-r1
index 08eb0ec72c88..848383a08365 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.69.0-r1
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.69.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=6
-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
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/Compress-Raw-Zlib-2.69.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.69.0 !>perl-core/Compress-Raw-Zlib-2.69.0-r999
 SLOT=0
-_md5_=b7361db78f18bffcd7f1b4a3da526f3d
+_md5_=23e58b5703362921d6778c85792223b7
diff --git a/metadata/md5-cache/virtual/perl-Encode-2.800.100_rc-r4 b/metadata/md5-cache/virtual/perl-Encode-2.800.100_rc-r4
index ad9752a75a54..c23ac821a5cc 100644
--- a/metadata/md5-cache/virtual/perl-Encode-2.800.100_rc-r4
+++ b/metadata/md5-cache/virtual/perl-Encode-2.800.100_rc-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Encode
 EAPI=6
-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
 RDEPEND=|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/Encode-2.800.100_rc ) dev-lang/perl:= !<perl-core/Encode-2.800.100_rc !>perl-core/Encode-2.800.100_rc-r999
 SLOT=0
-_md5_=ea5d2e8f230700d162744f74efd66cf0
+_md5_=7f93c32a9f7e8e8d9d57ad6bc0571b74
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.720.0-r3 b/metadata/md5-cache/virtual/perl-Exporter-5.720.0-r3
index 292d6461f295..7c47beb1dc7e 100644
--- a/metadata/md5-cache/virtual/perl-Exporter-5.720.0-r3
+++ b/metadata/md5-cache/virtual/perl-Exporter-5.720.0-r3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Exporter
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/Exporter-5.720.0 ) dev-lang/perl:= !<perl-core/Exporter-5.720.0 !>perl-core/Exporter-5.720.0-r999
 SLOT=0
-_md5_=70045ad209290ed680d43a54b85c247f
+_md5_=2f7b2a10a821b4605db1444f12ef277f
diff --git a/metadata/md5-cache/virtual/perl-IO-1.360.100_rc-r4 b/metadata/md5-cache/virtual/perl-IO-1.360.100_rc-r4
index c24c39482378..3f496e064bbc 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.360.100_rc-r4
+++ b/metadata/md5-cache/virtual/perl-IO-1.360.100_rc-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/IO-1.360.100_rc ) dev-lang/perl:= !<perl-core/IO-1.360.100_rc !>perl-core/IO-1.360.100_rc-r999
 SLOT=0
-_md5_=e801bb2e65b939e90882e41dea96a350
+_md5_=3948b6246e219343650e9c385150b7db
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.69.1_rc-r4 b/metadata/md5-cache/virtual/perl-IO-Compress-2.69.1_rc-r4
index cb7d18da2f18..bfb583206697 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.69.1_rc-r4
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.69.1_rc-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=6
-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
 RDEPEND=|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/IO-Compress-2.69.1_rc ) dev-lang/perl:= !<perl-core/IO-Compress-2.69.1_rc !>perl-core/IO-Compress-2.69.1_rc-r999 >=virtual/perl-Compress-Raw-Zlib-2.69.0 >=virtual/perl-Compress-Raw-Bzip2-2.69.0
 SLOT=0
-_md5_=3fbe827cec29ec195ed6f6657705f452
+_md5_=7489cf5b46b1b95ee3b71b96848501ad
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.420.200_rc-r1 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.420.200_rc-r1
index 2efb5e327ce5..b303a2c266d8 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.420.200_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.420.200_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils
 EAPI=6
-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
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/Scalar-List-Utils-1.420.200_rc ) dev-lang/perl:= !<perl-core/Scalar-List-Utils-1.420.200_rc !>perl-core/Scalar-List-Utils-1.420.200_rc-r999
 SLOT=0
-_md5_=58687ec7a99fb8ec1cfe6e2ebad81ae4
+_md5_=092dd40084937d000fd34f269b67dcd3
diff --git a/metadata/md5-cache/virtual/perl-Storable-2.560.100_rc-r4 b/metadata/md5-cache/virtual/perl-Storable-2.560.100_rc-r4
index c44423ee045f..b91f4a00e934 100644
--- a/metadata/md5-cache/virtual/perl-Storable-2.560.100_rc-r4
+++ b/metadata/md5-cache/virtual/perl-Storable-2.560.100_rc-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Storable
 EAPI=6
-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
 RDEPEND=|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/Storable-2.560.100_rc ) dev-lang/perl:= !<perl-core/Storable-2.560.100_rc !>perl-core/Storable-2.560.100_rc-r999
 SLOT=0
-_md5_=ea5d2e8f230700d162744f74efd66cf0
+_md5_=7f93c32a9f7e8e8d9d57ad6bc0571b74
diff --git a/metadata/md5-cache/virtual/perl-Test-1.280.100_rc-r4 b/metadata/md5-cache/virtual/perl-Test-1.280.100_rc-r4
index ba1b52f08dce..392dbf74c9de 100644
--- a/metadata/md5-cache/virtual/perl-Test-1.280.100_rc-r4
+++ b/metadata/md5-cache/virtual/perl-Test-1.280.100_rc-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/Test-1.280.100_rc ) dev-lang/perl:= !<perl-core/Test-1.280.100_rc !>perl-core/Test-1.280.100_rc-r999
 SLOT=0
-_md5_=e801bb2e65b939e90882e41dea96a350
+_md5_=3948b6246e219343650e9c385150b7db
diff --git a/metadata/md5-cache/virtual/perl-XSLoader-0.220.0-r4 b/metadata/md5-cache/virtual/perl-XSLoader-0.220.0-r4
index ea927116b1a1..e158ab479aec 100644
--- a/metadata/md5-cache/virtual/perl-XSLoader-0.220.0-r4
+++ b/metadata/md5-cache/virtual/perl-XSLoader-0.220.0-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for XSLoader
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/XSLoader-0.220.0 ) dev-lang/perl:= !<perl-core/XSLoader-0.220.0 !>perl-core/XSLoader-0.220.0-r999
 SLOT=0
-_md5_=e801bb2e65b939e90882e41dea96a350
+_md5_=3948b6246e219343650e9c385150b7db
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.600-r2 b/metadata/md5-cache/virtual/perl-if-0.60.600-r2
index 4fffdbea9e8f..6b79fd3e4ae1 100644
--- a/metadata/md5-cache/virtual/perl-if-0.60.600-r2
+++ b/metadata/md5-cache/virtual/perl-if-0.60.600-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for if
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/if-0.60.600 ) dev-lang/perl:= !<perl-core/if-0.60.600 !>perl-core/if-0.60.600-r999
 SLOT=0
-_md5_=f4ed4eab49177177a19011228f4bce4b
+_md5_=2f7b2a10a821b4605db1444f12ef277f
diff --git a/metadata/md5-cache/virtual/perl-libnet-3.80.100_rc-r4 b/metadata/md5-cache/virtual/perl-libnet-3.80.100_rc-r4
index 4d4e18ce8f0b..67081d7b654b 100644
--- a/metadata/md5-cache/virtual/perl-libnet-3.80.100_rc-r4
+++ b/metadata/md5-cache/virtual/perl-libnet-3.80.100_rc-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libnet
 EAPI=6
-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
 RDEPEND=|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/libnet-3.80.100_rc ) dev-lang/perl:= !<perl-core/libnet-3.80.100_rc !>perl-core/libnet-3.80.100_rc-r999
 SLOT=0
-_md5_=ea5d2e8f230700d162744f74efd66cf0
+_md5_=7f93c32a9f7e8e8d9d57ad6bc0571b74
diff --git a/metadata/md5-cache/virtual/perl-parent-0.234.0-r1 b/metadata/md5-cache/virtual/perl-parent-0.234.0-r1
index f39e34bab512..afecf9460ddf 100644
--- a/metadata/md5-cache/virtual/perl-parent-0.234.0-r1
+++ b/metadata/md5-cache/virtual/perl-parent-0.234.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for parent
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/parent-0.234.0 ) dev-lang/perl:= !<perl-core/parent-0.234.0 !>perl-core/parent-0.234.0-r999
 SLOT=0
-_md5_=3326514a08827b8bb5d7a7517f475904
+_md5_=2f17f18aa45e257f9fb99194eedab151
diff --git a/metadata/md5-cache/virtual/rust-1.26.2 b/metadata/md5-cache/virtual/rust-1.26.2
new file mode 100644
index 000000000000..c39a534eb498
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.26.2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=6
+KEYWORDS=~amd64 ~arm64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.26.2* =dev-lang/rust-bin-1.26.2* )
+SLOT=0
+_md5_=c10f1e7aa361c9436f1b692dda62dca5
diff --git a/metadata/md5-cache/virtual/w3m-0 b/metadata/md5-cache/virtual/w3m-0
index 4f2c11cbea37..b437d74b7e4e 100644
--- a/metadata/md5-cache/virtual/w3m-0
+++ b/metadata/md5-cache/virtual/w3m-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the w3m web browser
 EAPI=6
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 RDEPEND=|| ( www-client/w3m www-client/w3mmee )
 SLOT=0
-_md5_=c9abf4fd5011d1494acbe4786e935c62
+_md5_=22ff6d7109ca8166f78fdf97e9ca6374
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 81cd8f705eb0..9f1136bd74e2 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.42 b/metadata/md5-cache/www-apache/mod_jk-1.2.42
index d5bacef40e67..badbfedcc3bb 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.42
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.42
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=2172363acfc09e49266a84195e4758c7
diff --git a/metadata/md5-cache/www-apache/modsec-flameeyes-20130216 b/metadata/md5-cache/www-apache/modsec-flameeyes-20130216
index 1dab55b39d62..76ee5d8bfb96 100644
--- a/metadata/md5-cache/www-apache/modsec-flameeyes-20130216
+++ b/metadata/md5-cache/www-apache/modsec-flameeyes-20130216
@@ -7,5 +7,5 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=>=www-apache/mod_security-2.5.1
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/modsec-flameeyes/archive/20130216.tar.gz -> modsec-flameeyes-20130216.tar.gz
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=36128a6f73fe78bca98f196139a59f98
diff --git a/metadata/md5-cache/www-apache/modsec-flameeyes-99999999 b/metadata/md5-cache/www-apache/modsec-flameeyes-99999999
index 538ab343e239..ba84097b660a 100644
--- a/metadata/md5-cache/www-apache/modsec-flameeyes-99999999
+++ b/metadata/md5-cache/www-apache/modsec-flameeyes-99999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.flameeyes.eu/projects/modsec
 LICENSE=CC-BY-SA-3.0
 RDEPEND=>=www-apache/mod_security-2.5.1
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=36128a6f73fe78bca98f196139a59f98
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 687f562cc924..fe0057c7eb8d 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/cvsweb-1.112 b/metadata/md5-cache/www-apps/cvsweb-1.112
deleted file mode 100644
index 21ca0177ed28..000000000000
--- a/metadata/md5-cache/www-apps/cvsweb-1.112
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=WWW interface to a CVS tree
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/projects/cvsweb.html
-KEYWORDS=x86 sparc ~ppc
-LICENSE=BSD
-RDEPEND=>=dev-lang/perl-5 >=dev-vcs/rcs-5.7
-SLOT=0
-SRC_URI=mirror://gentoo/cvsweb-1.112.tar.gz
-_md5_=f843f1879b0998e4fa8d6a7c3da5e770
diff --git a/metadata/md5-cache/www-apps/cvsweb-3.0.5 b/metadata/md5-cache/www-apps/cvsweb-3.0.5
deleted file mode 100644
index e9dd06511fa5..000000000000
--- a/metadata/md5-cache/www-apps/cvsweb-3.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=WWW interface to a CVS tree
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/projects/cvsweb.html
-IUSE=vhosts
-KEYWORDS=~x86 ~sparc ~ppc
-LICENSE=BSD
-RDEPEND=>=dev-lang/perl-5.8 >=dev-vcs/cvs-1.11 >=dev-vcs/rcs-5.7 >=dev-perl/URI-1.28 dev-perl/IPC-Run dev-perl/MIME-Types dev-perl/String-Ediff >=dev-vcs/cvsgraph-1.4.0 >=app-text/enscript-1.6.3 >=app-admin/webapp-config-1.50.15
-SLOT=3.0.5
-SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/cvsweb-3.0.5.tar.gz
-_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=e4d73b0d1662a9b814a97155126a8167
diff --git a/metadata/md5-cache/www-apps/cvsweb-3.0.6 b/metadata/md5-cache/www-apps/cvsweb-3.0.6
deleted file mode 100644
index 30bc65bb4c93..000000000000
--- a/metadata/md5-cache/www-apps/cvsweb-3.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=WWW interface to a CVS tree
-EAPI=0
-HOMEPAGE=http://www.freebsd.org/projects/cvsweb.html
-IUSE=vhosts
-KEYWORDS=~amd64 ~ppc sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/perl-5.8 >=dev-vcs/cvs-1.11 >=dev-vcs/rcs-5.7 >=dev-perl/URI-1.28 dev-perl/IPC-Run dev-perl/MIME-Types dev-perl/String-Ediff >=dev-vcs/cvsgraph-1.4.0 >=app-text/enscript-1.6.3 >=app-admin/webapp-config-1.50.15
-SLOT=3.0.6
-SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/cvsweb-3.0.6.tar.gz
-_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=b8e997ac6bee70a181df265ff1b47257
diff --git a/metadata/md5-cache/www-apps/phpBB-3.1.10-r1 b/metadata/md5-cache/www-apps/phpBB-3.1.10-r1
index 45a4650974ec..b577fb8c5074 100644
--- a/metadata/md5-cache/www-apps/phpBB-3.1.10-r1
+++ b/metadata/md5-cache/www-apps/phpBB-3.1.10-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst prerm setup
 DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
 DESCRIPTION=An open-source bulletin board package
 EAPI=6
-HOMEPAGE=http://www.phpbb.com/
+HOMEPAGE=https://www.phpbb.com/
 IUSE=ftp gd imagemagick mssql mysqli postgres sqlite xml zlib vhosts
 KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND==virtual/httpd-php-5*:* =dev-lang/php-5*:*[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml?,zlib?] imagemagick? ( virtual/imagemagick-tools ) >=app-admin/webapp-config-1.50.15
 SLOT=3.1.10-r1
-SRC_URI=http://download.phpbb.com/pub/release/3.1/3.1.10/phpBB-3.1.10.tar.bz2
+SRC_URI=https://download.phpbb.com/pub/release/3.1/3.1.10/phpBB-3.1.10.tar.bz2
 _eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=b61f9a55032e6eff458ac7ae1e98492a
+_md5_=2ea6407e4834f999c1605fc0e9492c74
diff --git a/metadata/md5-cache/www-apps/phpwebsite-0.10.2 b/metadata/md5-cache/www-apps/phpwebsite-0.10.2
deleted file mode 100644
index 4994ee0cb02d..000000000000
--- a/metadata/md5-cache/www-apps/phpwebsite-0.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=phpWebSite Content Management System
-EAPI=0
-HOMEPAGE=http://phpwebsite.appstate.edu
-IUSE=vhosts
-KEYWORDS=ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=0.10.2
-SRC_URI=mirror://sourceforge/phpwebsite/phpwebsite-0.10.2-full.tar.gz http://phpwebsite.appstate.edu/downloads/security/phpws_patch_20060419.2.tgz
-_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=0d7feaeb93822d3291040d616cb630e2
diff --git a/metadata/md5-cache/www-apps/sitebar-3.3.9-r1 b/metadata/md5-cache/www-apps/sitebar-3.3.9-r1
deleted file mode 100644
index 2af44fd03c8d..000000000000
--- a/metadata/md5-cache/www-apps/sitebar-3.3.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Bookmark Server for Personal and Team Use
-EAPI=0
-HOMEPAGE=http://sitebar.sourceforge.net/
-IUSE=vhosts
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=3.3.9-r1
-SRC_URI=mirror://sourceforge/sitebar/SiteBar-3.3.9.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=7c02ee2d5ddc12790e2e93d7e4f7b637
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 489c57b87f07..f31dfa6020b0 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-66.0.3359.170 b/metadata/md5-cache/www-client/chromium-66.0.3359.170
index a6bf3106ff3b..d47203cd93d0 100644
--- a/metadata/md5-cache/www-client/chromium-66.0.3359.170
+++ b/metadata/md5-cache/www-client/chromium-66.0.3359.170
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3359.170.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0a19c9688108c89a39ef47bb897ae27a
diff --git a/metadata/md5-cache/www-client/chromium-66.0.3359.181 b/metadata/md5-cache/www-client/chromium-66.0.3359.181
index d4f3299e172a..6ef08ad4c816 100644
--- a/metadata/md5-cache/www-client/chromium-66.0.3359.181
+++ b/metadata/md5-cache/www-client/chromium-66.0.3359.181
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3359.181.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1aeb7b089db63d9cbc71716a2df9613c
diff --git a/metadata/md5-cache/www-client/chromium-67.0.3396.56 b/metadata/md5-cache/www-client/chromium-67.0.3396.56
index e9365a72e4e5..035d046052f6 100644
--- a/metadata/md5-cache/www-client/chromium-67.0.3396.56
+++ b/metadata/md5-cache/www-client/chromium-67.0.3396.56
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-67.0.3396.56.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c073c9bc90a44e5b9db615fd5ccf322b
diff --git a/metadata/md5-cache/www-client/chromium-67.0.3396.62 b/metadata/md5-cache/www-client/chromium-67.0.3396.62
index 99376d5291f6..a2508c041be5 100644
--- a/metadata/md5-cache/www-client/chromium-67.0.3396.62
+++ b/metadata/md5-cache/www-client/chromium-67.0.3396.62
@@ -4,11 +4,11 @@ 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 ~arm64 ~x86
+KEYWORDS=amd64 ~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.26:= >=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-4:= || ( 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-67.0.3396.62.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=728168e576e9831cd5000ec3d88d2101
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4c53c3e93e2b81a83b5161bb15529160
diff --git a/metadata/md5-cache/www-client/chromium-68.0.3409.2 b/metadata/md5-cache/www-client/chromium-68.0.3409.2
index 0d596f67eaa4..16f9e5f336a2 100644
--- a/metadata/md5-cache/www-client/chromium-68.0.3409.2
+++ b/metadata/md5-cache/www-client/chromium-68.0.3409.2
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-68.0.3409.2.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=043c2c671cde18264b1d8c598d79f0fb
diff --git a/metadata/md5-cache/www-client/chromium-68.0.3438.3 b/metadata/md5-cache/www-client/chromium-68.0.3438.3
index efe559e7b07b..6c17cc90161b 100644
--- a/metadata/md5-cache/www-client/chromium-68.0.3438.3
+++ b/metadata/md5-cache/www-client/chromium-68.0.3438.3
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-68.0.3438.3.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5bd62204b75ab6c2479b4687ad08b858
diff --git a/metadata/md5-cache/www-client/falkon-3.0.0 b/metadata/md5-cache/www-client/falkon-3.0.0
deleted file mode 100644
index 05603da2a586..000000000000
--- a/metadata/md5-cache/www-client/falkon-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.43.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= ) >=dev-qt/linguist-tools-5.9.2:5 >=dev-qt/qtconcurrent-5.9.2:5 gnome-keyring? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 test? ( >=dev-qt/qttest-5.9.2:5 ) >=dev-qt/qtcore-5.9.2:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Cross-platform web browser using QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.falkon.org/
-IUSE=dbus gnome-keyring kwallet libressl +X test debug test
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.43.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= ) !www-client/qupzilla >=dev-qt/qtsvg-5.9.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.2:5
-SLOT=0
-SRC_URI=mirror://kde/stable/falkon/3.0/src/falkon-3.0.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e2b0d3ed34e0a3ed31b54a1e7adebd7
diff --git a/metadata/md5-cache/www-client/falkon-3.0.1 b/metadata/md5-cache/www-client/falkon-3.0.1
index ca96a7fb1f89..b919d6a1d513 100644
--- a/metadata/md5-cache/www-client/falkon-3.0.1
+++ b/metadata/md5-cache/www-client/falkon-3.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Cross-platform web browser using QtWebEngine
 EAPI=6
 HOMEPAGE=https://www.falkon.org/
 IUSE=dbus gnome-keyring kwallet libressl +X test debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.43.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) !www-client/qupzilla >=dev-qt/qtsvg-5.9.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.2:5
 SLOT=0
 SRC_URI=mirror://kde/stable/falkon/3.0.1/falkon-3.0.1.tar.xz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e7d2af5767ef67ceb1bb2acbb594cfb
+_md5_=806f138a063a57ca74eb98f7ef0160d8
diff --git a/metadata/md5-cache/www-client/google-chrome-67.0.3396.62 b/metadata/md5-cache/www-client/google-chrome-67.0.3396.62
deleted file mode 100644
index 99d3671748ce..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-67.0.3396.62
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +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
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_67.0.3396.62-1_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6355ad1cb841d12c53bf5dd5a19ebe9
diff --git a/metadata/md5-cache/www-client/google-chrome-67.0.3396.79 b/metadata/md5-cache/www-client/google-chrome-67.0.3396.79
new file mode 100644
index 000000000000..e253b0e78043
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-67.0.3396.79
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +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
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_67.0.3396.79-1_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=68b08095e99b5f5d01c927fddbc798c1
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.62 b/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.62
deleted file mode 100644
index 78e51662b88b..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.62
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +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
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_67.0.3396.62-1_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a2fdea3123145b076af657b483bb997
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.17 b/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.17
new file mode 100644
index 000000000000..3c4534815361
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +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
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_68.0.3440.17-1_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e09ca174a2430e8444d73b4834cbab6d
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3440.15 b/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3440.15
new file mode 100644
index 000000000000..19cb76de556f
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3440.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +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
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_68.0.3440.15-1_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e892955c892f70a2d811c95bd23b4b3
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3440.7 b/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3440.7
deleted file mode 100644
index 03004fbfb2ed..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-68.0.3440.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +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
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_68.0.3440.7-1_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f3bf237a83ecd802a636b64a7996448
diff --git a/metadata/md5-cache/www-client/links-2.14-r1 b/metadata/md5-cache/www-client/links-2.14-r1
index 252dc2c8acfa..6c8ad3a9e786 100644
--- a/metadata/md5-cache/www-client/links-2.14-r1
+++ b/metadata/md5-cache/www-client/links-2.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and lightweight web browser running in both graphics and text
 EAPI=6
 HOMEPAGE=http://links.twibright.com/
 IUSE=bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X 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 ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.14.tar.bz2 mirror://debian/pool/main/l/links2/links2_2.10-2.debian.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc68b5af99fa4cef1862e4f009e28ec5
+_md5_=5f98060d5839b5711499ea57ba5e7d88
diff --git a/metadata/md5-cache/www-client/opera-beta-54.0.2952.17 b/metadata/md5-cache/www-client/opera-beta-54.0.2952.17
new file mode 100644
index 000000000000..958eb5da798e
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-54.0.2952.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/54.0.2952.17/linux/opera-beta_54.0.2952.17_amd64.deb http://download2.operacdn.com/pub/opera-beta/54.0.2952.17/linux/opera-beta_54.0.2952.17_amd64.deb http://download3.operacdn.com/pub/opera-beta/54.0.2952.17/linux/opera-beta_54.0.2952.17_amd64.deb http://download4.operacdn.com/pub/opera-beta/54.0.2952.17/linux/opera-beta_54.0.2952.17_amd64.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=70606416ac2911b0691c3d0d0018e07a
diff --git a/metadata/md5-cache/www-client/opera-beta-54.0.2952.8 b/metadata/md5-cache/www-client/opera-beta-54.0.2952.8
deleted file mode 100644
index 14ea0004fae0..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-54.0.2952.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/54.0.2952.8/linux/opera-beta_54.0.2952.8_amd64.deb http://download2.operacdn.com/pub/opera-beta/54.0.2952.8/linux/opera-beta_54.0.2952.8_amd64.deb http://download3.operacdn.com/pub/opera-beta/54.0.2952.8/linux/opera-beta_54.0.2952.8_amd64.deb http://download4.operacdn.com/pub/opera-beta/54.0.2952.8/linux/opera-beta_54.0.2952.8_amd64.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70606416ac2911b0691c3d0d0018e07a
diff --git a/metadata/md5-cache/www-client/opera-developer-55.0.2955.0 b/metadata/md5-cache/www-client/opera-developer-55.0.2955.0
deleted file mode 100644
index 37ff1b88d9e1..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-55.0.2955.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/55.0.2955.0/linux/opera-developer_55.0.2955.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/55.0.2955.0/linux/opera-developer_55.0.2955.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/55.0.2955.0/linux/opera-developer_55.0.2955.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/55.0.2955.0/linux/opera-developer_55.0.2955.0_amd64.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/www-client/opera-developer-55.0.2976.0 b/metadata/md5-cache/www-client/opera-developer-55.0.2976.0
new file mode 100644
index 000000000000..b5ea433916e9
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-55.0.2976.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/55.0.2976.0/linux/opera-developer_55.0.2976.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/55.0.2976.0/linux/opera-developer_55.0.2976.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/55.0.2976.0/linux/opera-developer_55.0.2976.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/55.0.2976.0/linux/opera-developer_55.0.2976.0_amd64.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index fc6f95d76347..c30b17bb732b 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r3 b/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r3
deleted file mode 100644
index 8da048b36914..000000000000
--- a/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=sys-libs/zlib-1.1.3 app-arch/unzip ssl? ( dev-libs/openssl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=HTTP/HTML indexing and searching system
-EAPI=0
-HOMEPAGE=http://www.htdig.org
-IUSE=ssl
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.1.3 app-arch/unzip ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://www.htdig.org/files/htdig-3.2.0b6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9e40bd8acca56e838342601624550d1
diff --git a/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r4 b/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r4
deleted file mode 100644
index 3f887f63e7f7..000000000000
--- a/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/zlib-1.1.3 app-arch/unzip ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=HTTP/HTML indexing and searching system
-EAPI=5
-HOMEPAGE=http://www.htdig.org
-IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.htdig.org/files/htdig-3.2.0b6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=40bd8d7f726ba3ad762ed00c8e033b66
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.11 b/metadata/md5-cache/www-misc/urlwatch-2.11
deleted file mode 100644
index 048554936ebb..000000000000
--- a/metadata/md5-cache/www-misc/urlwatch-2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/appdirs[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycodestyle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A tool for monitoring webpages for updates
-EAPI=6
-HOMEPAGE=https://thp.io/2008/urlwatch/
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.11.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eba5c24f502232105755a85ec119692f
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.13 b/metadata/md5-cache/www-misc/urlwatch-2.13
new file mode 100644
index 000000000000..ba73c15c3d52
--- /dev/null
+++ b/metadata/md5-cache/www-misc/urlwatch-2.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/appdirs[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycodestyle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A tool for monitoring webpages for updates
+EAPI=6
+HOMEPAGE=https://thp.io/2008/urlwatch/
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/appdirs[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.13.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa75d4773a74e869c440aad41f6fb48b
diff --git a/metadata/md5-cache/www-misc/zoneminder-1.30.4 b/metadata/md5-cache/www-misc/zoneminder-1.30.4
index c893722acce4..d5f44f06e0b3 100644
--- a/metadata/md5-cache/www-misc/zoneminder-1.30.4
+++ b/metadata/md5-cache/www-misc/zoneminder-1.30.4
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-php[apache2] dev-lang/perl:= dev-lang/php:*[apache2,
 REQUIRED_USE=|| ( ssl gnutls )
 SLOT=0
 SRC_URI=https://github.com/ZoneMinder/ZoneMinder/archive/1.30.4.tar.gz -> zoneminder-1.30.4.tar.gz https://github.com/FriendsOfCake/crud/archive/v3.1.0.tar.gz -> Crud-3.1.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eb3797f0cc1e44df5e35d6a31d39d8ac
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 20ca25cef8c7..ed89c78b3458 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.62 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.62
deleted file mode 100644
index 8a4d7eccfc37..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.62
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_67.0.3396.62-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=f63bdf2c0494694fd4c4ea6c6f2a143f
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.62_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.62_beta
deleted file mode 100644
index 81776a4d9468..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.62_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_67.0.3396.62-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=af88fcb905f586fa4bf5adc077702ee1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.79 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.79
new file mode 100644
index 000000000000..ee8eb93e9903
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.79
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_67.0.3396.79-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=f63bdf2c0494694fd4c4ea6c6f2a143f
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.15_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.15_alpha
new file mode 100644
index 000000000000..9218e79c93bc
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.15_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_68.0.3440.15-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=af88fcb905f586fa4bf5adc077702ee1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.17_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.17_beta
new file mode 100644
index 000000000000..a9ac3371ed18
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.17_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_68.0.3440.17-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=af88fcb905f586fa4bf5adc077702ee1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.7_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.7_alpha
deleted file mode 100644
index 4d99a1132e90..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.7_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_68.0.3440.7-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=af88fcb905f586fa4bf5adc077702ee1
diff --git a/metadata/md5-cache/www-plugins/passff-1.1 b/metadata/md5-cache/www-plugins/passff-1.1
deleted file mode 100644
index 947c0623c573..000000000000
--- a/metadata/md5-cache/www-plugins/passff-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DESCRIPTION=zx2c4 pass manager extension for Firefox (Host Binary)
-EAPI=6
-HOMEPAGE=https://github.com/passff/passff
-IUSE=python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/passff/passff/releases/download/1.1/passff.json -> passff-1.1.json https://github.com/passff/passff/releases/download/1.1/passff.py -> passff-1.1.py
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=edc4c4bb2b1559da5772f708b4621e40
diff --git a/metadata/md5-cache/www-plugins/passff-1.3 b/metadata/md5-cache/www-plugins/passff-1.3
new file mode 100644
index 000000000000..77a8166cd0bd
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/passff-1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=zx2c4 pass manager extension for Firefox
+EAPI=6
+HOMEPAGE=https://github.com/passff/passff
+IUSE=firefox firefox-bin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=www-plugins/passff-host[firefox]
+REQUIRED_USE=|| ( firefox firefox-bin )
+SLOT=0
+SRC_URI=https://addons.mozilla.org/firefox/downloads/file/914592/passff-1.3-an+fx-linux.xpi
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6ff8b0a4172ec584c57608a3f968f340
diff --git a/metadata/md5-cache/www-plugins/passff-host-1.0.1 b/metadata/md5-cache/www-plugins/passff-host-1.0.1
new file mode 100644
index 000000000000..88e3e1dffc13
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/passff-host-1.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=Host app for the PassFF WebExtension
+EAPI=6
+HOMEPAGE=https://github.com/passff/passff-host
+IUSE=chrome chromium firefox vivaldi python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+REQUIRED_USE=|| ( chrome chromium firefox vivaldi )
+SLOT=0
+SRC_URI=https://github.com/passff/passff-host/raw/1.0.1/src/passff.py -> passff-host-1.0.1.py https://github.com/passff/passff-host/raw/1.0.1/src/passff.json -> passff-host-1.0.1.json
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8d27c2207eda1b2fd6a0d254e212f876
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 7ad023ad2d6e..8579b5c69622 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.45-r1 b/metadata/md5-cache/www-servers/lighttpd-1.4.45-r1
index d7cf35cd9d8b..e8d97dff271f 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.45-r1
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.45-r1
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) l
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.45.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=50bee2a811b43e947662d8b994b7ec20
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.49 b/metadata/md5-cache/www-servers/lighttpd-1.4.49
index f61417547572..e103b2522f66 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.49
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.49
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gd
 REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.49.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3cfec1b163a2e14d79c47a9ba79c519
diff --git a/metadata/md5-cache/www-servers/lighttpd-9999 b/metadata/md5-cache/www-servers/lighttpd-9999
index 379de372c086..a8d4759e68c5 100644
--- a/metadata/md5-cache/www-servers/lighttpd-9999
+++ b/metadata/md5-cache/www-servers/lighttpd-9999
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d39a08a263c0b420c5b8c650f11c2f1b
diff --git a/metadata/md5-cache/www-servers/nginx-1.15.0 b/metadata/md5-cache/www-servers/nginx-1.15.0
new file mode 100644
index 000000000000..3be3da9ed430
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.15.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170422 virtual/pkgconfig
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=6
+HOMEPAGE=https://nginx.org
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_javascript nginx_modules_http_spdy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.15.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz -> ngx_brotli-37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.1.tar.gz -> njs-0.2.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.13.tar.gz -> ngx_http_lua-0.10.13.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.1.16.tar.gz -> ngx_http_vhost_traffic_status-0.1.16.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.1.tar.gz -> njs-0.2.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=196b20c052dee49f46c4fecf1d109535
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 7a9c8b322dfb..66594bd461c3 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/bdftopcf-1.1 b/metadata/md5-cache/x11-apps/bdftopcf-1.1
index 26ff842a2201..9ea0317f860e 100644
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.1
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.1
@@ -3,9 +3,9 @@ DEPEND=x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettex
 DESCRIPTION=X.Org bdftopcf application
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/bdftopcf-1.1.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=3e249ed85cc5d5adbaaa938ec42ef272
+_md5_=6e032ccf06388eddca5f55223f853abf
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.4.2 b/metadata/md5-cache/x11-apps/xkbcomp-1.4.2
new file mode 100644
index 000000000000..c55692b7b763
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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=compile XKB keyboard description
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xkbcomp-1.4.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
+_md5_=8b71524270941c38dd5f3f021c3c5da0
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 34e20f0a011a..bac5ec36e167 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.20 b/metadata/md5-cache/x11-base/xorg-drivers-1.20
index 5968fcf9bc71..ac2ad8da50c4 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.20
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.20
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Meta package containing deps on all xorg drivers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.gentoo.org/
 IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tdfx video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=metapackage
-PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo x11-drivers/xf86-video-virtualbox ) ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-fbdev-0.5.0 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-virtualbox-5.1.14 !<x11-drivers/xf86-video-vmware-13.3.0
+PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.7 ) video_cards_tegra? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-1.20[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo >=x11-drivers/xf86-video-virtualbox-5.1.14 ) ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4
 SLOT=0
-_md5_=44e48f16485de6cbf9f93c13ac70d9cc
+_md5_=4db0b4d4fb22b64c4824df1ba6742987
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-9999 b/metadata/md5-cache/x11-base/xorg-drivers-9999
index 865a50071206..bcde9e1895b8 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-9999
+++ b/metadata/md5-cache/x11-base/xorg-drivers-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Meta package containing deps on all xorg drivers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.gentoo.org/
 IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tdfx video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 LICENSE=metapackage
-PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo x11-drivers/xf86-video-virtualbox ) ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4 !<x11-drivers/xf86-input-joystick-1.6.3 !<x11-drivers/xf86-input-libinput-0.20.0 !<x11-drivers/xf86-input-wacom-0.34.0 !<x11-drivers/xf86-video-amdgpu-1.2.0 !<x11-drivers/xf86-video-ati-7.8.0 !<x11-drivers/xf86-video-fbdev-0.5.0 !<x11-drivers/xf86-video-glint-1.2.9 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-mga-1.6.5 !<x11-drivers/xf86-video-nouveau-1.0.13 !<x11-drivers/xf86-video-nv-2.1.21 !<x11-drivers/xf86-video-omap-0.4.5 !<x11-drivers/xf86-video-r128-6.10.2 !<x11-drivers/xf86-video-siliconmotion-1.7.9 !<x11-drivers/xf86-video-tdfx-1.4.7 !<x11-drivers/xf86-video-virtualbox-5.1.14 !<x11-drivers/xf86-video-vmware-13.3.0
+PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.7 ) video_cards_tegra? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-9999[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo >=x11-drivers/xf86-video-virtualbox-5.1.14 ) ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-apm !x11-drivers/xf86-video-ark !x11-drivers/xf86-video-chips !x11-drivers/xf86-video-cirrus !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-i128 !x11-drivers/xf86-video-i740 !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-mach64 !x11-drivers/xf86-video-neomagic !x11-drivers/xf86-video-newport !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-rendition !x11-drivers/xf86-video-s3 !x11-drivers/xf86-video-s3virge !x11-drivers/xf86-video-savage !x11-drivers/xf86-video-sis !x11-drivers/xf86-video-sisusb !x11-drivers/xf86-video-sunbw2 !x11-drivers/xf86-video-suncg14 !x11-drivers/xf86-video-suncg3 !x11-drivers/xf86-video-suncg6 !x11-drivers/xf86-video-sunffb !x11-drivers/xf86-video-sunleo !x11-drivers/xf86-video-suntcx !x11-drivers/xf86-video-tga !x11-drivers/xf86-video-trident !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4
 SLOT=0
-_md5_=e89368aea657d9db7385bb45aedce45f
+_md5_=957e8a2715b7264e2a96975a36e9fb0d
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2018.4 b/metadata/md5-cache/x11-base/xorg-proto-2018.4
index 8f83fb72447c..5b7ba5524afe 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2018.4
+++ b/metadata/md5-cache/x11-base/xorg-proto-2018.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
 DESCRIPTION=X.Org combined protocol headers
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/xorg/proto/xorgproto/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.gz
 _eclasses_=meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c5125e074dca97e3b2d748f708622fe9
+_md5_=23e50629f5f20366be27a5b443f6331f
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.19.5-r2 b/metadata/md5-cache/x11-base/xorg-server-1.19.5-r2
index acd3686a0ca5..2d568cb4e708 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.19.5-r2
+++ b/metadata/md5-cache/x11-base/xorg-server-1.19.5-r2
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity static-libs doc
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.19 )
 RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xeph
 SLOT=0/1.19.5
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.19.5.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=c6836eb4d4fdba7ffaf57b5a4fefaefa
+_md5_=d8b204a4e1e04ff8f88fba0455259761
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 02a5449be4cf..d6abf0487c53 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
index 940e2a2eff43..0537e754f949 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/304
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/304.137/NVIDIA-FreeBSD-x86_64-304.137.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/304.137/NVIDIA-FreeBSD-x86-304.137.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/304.137/NVIDIA-Linux-x86-304.137.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.137.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=7ec94060af11f5885817d92edf73f502
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.106 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.106
index 7589f625c9ab..804c258d1eaf 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.106
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.106
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X )
 RESTRICT=bindist mirror
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/340.106/NVIDIA-FreeBSD-x86_64-340.106.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/340.106/NVIDIA-Linux-x86_64-340.106.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/340.106/NVIDIA-FreeBSD-x86-340.106.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/340.106/NVIDIA-Linux-x86-340.106.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.106.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=98517f42773d53ece1682c021565858b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82 b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
index ea799b0c3099..04bd59ae6cd0 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/375
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/375.82/NVIDIA-FreeBSD-x86_64-375.82.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/375.82/NVIDIA-Linux-x86_64-375.82.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/375.82/NVIDIA-Linux-armv7l-gnueabihf-375.82.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/375.82/NVIDIA-FreeBSD-x86-375.82.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/375.82/NVIDIA-Linux-x86-375.82.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/375.82.tar.gz -> nvidia-settings-375.82.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=eca9bbce7a93d15b7b1fd6e608543d51
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
index 12eb0248e8e7..dcb907dd4758 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/378
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/378.13/NVIDIA-FreeBSD-x86_64-378.13.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/378.13/NVIDIA-Linux-x86_64-378.13.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/378.13/NVIDIA-Linux-armv7l-gnueabihf-378.13.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/378.13/NVIDIA-FreeBSD-x86-378.13.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/378.13/NVIDIA-Linux-x86-378.13.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/378.13.tar.gz -> nvidia-settings-378.13.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=0ff214d1d95e6defd3396a748c5db633
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
index d442871001ee..211d0b42d535 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/381
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/381.22/NVIDIA-FreeBSD-x86_64-381.22.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.22.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/381.22/NVIDIA-Linux-armv7l-gnueabihf-381.22.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/381.22/NVIDIA-FreeBSD-x86-381.22.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.22.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/381.22.tar.gz -> nvidia-settings-381.22.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=5ddc5b4831b973495a8b6e3df9ce03fb
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130 b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
index a7bda8e15a60..e76384ff802b 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/384
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/384.130/NVIDIA-FreeBSD-x86_64-384.130.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/384.130/NVIDIA-Linux-x86_64-384.130.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-32bit-ARM/384.130/NVIDIA-Linux-armv7l-gnueabihf-384.130.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/384.130/NVIDIA-FreeBSD-x86-384.130.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/384.130/NVIDIA-Linux-x86-384.130.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-384.130.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=086dc6aac5e3c22454f3adf0d615c20c
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34 b/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
index 6fcebb3064c9..e2da7d175efb 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/387
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/387.34/NVIDIA-FreeBSD-x86_64-387.34.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/387.34/NVIDIA-Linux-x86_64-387.34.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/387.34/NVIDIA-Linux-armv7l-gnueabihf-387.34.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/387.34/NVIDIA-FreeBSD-x86-387.34.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/387.34/NVIDIA-Linux-x86-387.34.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/387.34.tar.gz -> nvidia-settings-387.34.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=34b517e7faa3080d75eab05d8a7d84ab
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.42 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.42
deleted file mode 100644
index 4d05eb7cd5f0..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.42
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=6
-HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
-IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux 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 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[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(-)?] ) X? ( <x11-base/xorg-server-1.19.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.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(-)?] sys-libs/zlib[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(-)?] ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X ) static-libs? ( tools )
-RESTRICT=bindist mirror
-SLOT=0/390
-SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/390.42/NVIDIA-FreeBSD-x86_64-390.42.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/390.42/NVIDIA-Linux-x86_64-390.42.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/390.42/NVIDIA-Linux-armv7l-gnueabihf-390.42.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/390.42/NVIDIA-FreeBSD-x86-390.42.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/390.42/NVIDIA-Linux-x86-390.42.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.42.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c1bd17e250b731120ec32e248c25d2b6
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.48 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.48
index 967a4bb0b4ae..0c39107d20b7 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.48
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.48
@@ -4,12 +4,12 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=6
 HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
 IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux 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 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[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(-)?] ) X? ( <x11-base/xorg-server-1.19.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.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(-)?] sys-libs/zlib[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(-)?] ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.48/NVIDIA-FreeBSD-x86_64-390.48.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/390.48/NVIDIA-Linux-x86_64-390.48.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-32bit-ARM/390.48/NVIDIA-Linux-armv7l-gnueabihf-390.48.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/390.48/NVIDIA-FreeBSD-x86-390.48.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/390.48/NVIDIA-Linux-x86-390.48.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.48.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ae7657db3cc4b127f77f181a12eea4b7
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9a3bf190942e0420af17e3882f220fe5
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.59 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.59
new file mode 100644
index 000000000000..ae6d0887c45d
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.59
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=6
+HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux 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 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.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(-)?] sys-libs/zlib[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(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror
+SLOT=0/390
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.59/NVIDIA-FreeBSD-x86_64-390.59.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/390.59/NVIDIA-Linux-x86_64-390.59.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.59/NVIDIA-Linux-armv7l-gnueabihf-390.59.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/390.59/NVIDIA-FreeBSD-x86-390.59.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/390.59/NVIDIA-Linux-x86-390.59.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.59.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aecc345c97b89cc591d5b638b5b12c00
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24 b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24
deleted file mode 100644
index 6e87d2b8c654..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=6
-HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
-IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux 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 ~amd64-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.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(-)?] sys-libs/zlib[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(-)?] ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X ) static-libs? ( tools )
-RESTRICT=bindist mirror
-SLOT=0/396
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/396.24/NVIDIA-FreeBSD-x86_64-396.24.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/396.24/NVIDIA-Linux-x86_64-396.24.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-396.24.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f545ded8460f599e008758a2bd61689e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24-r1
new file mode 100644
index 000000000000..78a925ad6021
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.24-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=6
+HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux 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 ~amd64-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[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(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.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(-)?] sys-libs/zlib[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(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror
+SLOT=0/396
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/396.24/NVIDIA-FreeBSD-x86_64-396.24.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/396.24/NVIDIA-Linux-x86_64-396.24.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-396.24.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	aedb720bff5a5dec9b87edd351382bfc	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bc223bc418b25e1055be7db7433aa67c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r1
deleted file mode 100644
index ebdb90370d23..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 x11-base/xorg-proto x11-base/xorg-server[xorg]
-DESCRIPTION=Driver for Wacom tablets and drawing devices
-EAPI=5
-HOMEPAGE=http://linuxwacom.sourceforge.net/
-IUSE=debug
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.36.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=436f2512a9c09bab5e525259fc1ffc8d
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
new file mode 100644
index 000000000000..acd065c4c0ef
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-proto virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 x11-base/xorg-proto x11-base/xorg-server[xorg]
+DESCRIPTION=Driver for Wacom tablets and drawing devices
+EAPI=5
+HOMEPAGE=http://linuxwacom.sourceforge.net/
+IUSE=debug
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
+SLOT=0
+SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.36.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	linux-info	aedb720bff5a5dec9b87edd351382bfc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	811a80d4e90bbf83e68c204ee75316ef
+_md5_=38de417953d7cc723e05ae4f97893cf2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 38460816c4bd..275b9abaeec1 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1
index a28e630c3982..897472982b17 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=xinerama? ( !aqua )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.31.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f02f5c301922f672cad6c6710643af0
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.32 b/metadata/md5-cache/x11-libs/gtk+-2.24.32
index 5d00e57619e5..e197d6599cfa 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.32
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.32
@@ -12,5 +12,5 @@ REQUIRED_USE=xinerama? ( !aqua )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk+-2.24.32-patchset.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f637fcefa4f20b77df743e437aad118
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.5-r1 b/metadata/md5-cache/x11-libs/libX11-1.6.5-r1
index ad5440d85e86..9209586469c1 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.6.5-r1
+++ b/metadata/md5-cache/x11-libs/libX11-1.6.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X11 library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=ipv6 test 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 static-libs doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1[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(-)?] x11-libs/xtrans
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.6.5.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=3fc4de39172ca91b187b5272af424ae2
+_md5_=9635faab4b1e582e704f0fe7a06f6067
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.8-r1 b/metadata/md5-cache/x11-libs/libXau-1.0.8-r1
index 80437ba76afc..c5a4dfdb6641 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.8-r1
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X authorization library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 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 static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXau-1.0.8.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=3e29f4e922400176ed52dd9def8ef4bd
+_md5_=1dfbfbec1759ae7ef51b467829698511
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1 b/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1
index 13009930ec2c..e64877873578 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xaw library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=deprecated 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 static-libs doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.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=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXaw-1.0.13.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=3cbba1675d9aefd2a519244f507eb5f1
+_md5_=70a24152f044567c948b1eb6a9eebe14
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r2 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r2
index c0c338287813..77ac67ddaac6 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r2
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X Display Manager Control Protocol library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 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 static-libs doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto elibc_glibc? ( dev-libs/libbsd )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXdmcp-1.1.2.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=4536c19138da94fb9ee40f31409665e9
+_md5_=6f472fc587d3dd66788276aefc1b06ce
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.5-r1 b/metadata/md5-cache/x11-libs/libXt-1.1.5-r1
index 6532624aeaf5..e9cbcb63410e 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.5-r1
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X Toolkit Intrinsics library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=test 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 static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXt-1.1.5.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=927f773668a67d18a8bbcb00e407022b
+_md5_=529207b18f158409c2cd031e740eea50
diff --git a/metadata/md5-cache/x11-libs/pixman-9999 b/metadata/md5-cache/x11-libs/pixman-9999
index df1b443cbed2..78ccd1be8cb2 100644
--- a/metadata/md5-cache/x11-libs/pixman-9999
+++ b/metadata/md5-cache/x11-libs/pixman-9999
@@ -7,4 +7,4 @@ IUSE=altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_
 LICENSE=MIT
 SLOT=0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=c368b43da1d9855ae7603ff2166f269d
+_md5_=9bfe72740c7e5fba5eebb8159d008b96
diff --git a/metadata/md5-cache/x11-libs/qwt-6.1.3-r2 b/metadata/md5-cache/x11-libs/qwt-6.1.3-r2
index 08527d8b30e6..7e5d507781e4 100644
--- a/metadata/md5-cache/x11-libs/qwt-6.1.3-r2
+++ b/metadata/md5-cache/x11-libs/qwt-6.1.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=2D plotting library for Qt5
 EAPI=6
 HOMEPAGE=http://qwt.sourceforge.net/
 IUSE=designer doc examples mathml opengl static-libs svg
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) opengl? ( dev-qt/qtopengl:5 virtual/opengl ) svg? ( dev-qt/qtsvg:5 ) !<x11-libs/qwt-5.2.3 !x11-libs/qwt:5[doc] doc? ( !<media-libs/coin-3.1.3[doc] )
 SLOT=6/1.3
 SRC_URI=mirror://sourceforge/project/qwt/qwt/6.1.3/qwt-6.1.3.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0b6cdd9a4776d4f7813b68cc82544059
+_md5_=b9e9a8b95c4d294e99c5889a56545a1d
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.3.5 b/metadata/md5-cache/x11-libs/xtrans-1.3.5
index a97e29d64792..4e3b6127a22a 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.3.5
+++ b/metadata/md5-cache/x11-libs/xtrans-1.3.5
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org xtrans library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/xtrans-1.3.5.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
-_md5_=b049377652af833c3957f15696d490e5
+_md5_=76d5d4807519bf6fba8d3550d444e7a9
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index d028ea8ab6ce..05855bb9407a 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/bumblebee-3.2.1 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1
index 81b981f320a7..b3fb17c01294 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libbsd virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
 SRC_URI=https://bumblebee-project.org/bumblebee-3.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=91ff6729d86abfc1e377ee89f7bd1e23
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170123 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170123
index 2247eb84ae98..d97e25f2dfe1 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170123
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170123
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/op
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/Bumblebee/archive/c322bd849aabe6e48b4304b8d13cc4aadc36a30d.tar.gz -> bumblebee-3.2.1_p20170123.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=03092d8adb461eca5ec2f3b4fe793ca6
diff --git a/metadata/md5-cache/x11-misc/bumblebee-9999 b/metadata/md5-cache/x11-misc/bumblebee-9999
index acf2a51efa14..d35e59f2d7d8 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-9999
+++ b/metadata/md5-cache/x11-misc/bumblebee-9999
@@ -9,5 +9,5 @@ PDEPEND=|| ( x11-misc/primus x11-misc/virtualgl )
 RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch )
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=03092d8adb461eca5ec2f3b4fe793ca6
diff --git a/metadata/md5-cache/x11-misc/gigolo-0.4.2-r1 b/metadata/md5-cache/x11-misc/gigolo-0.4.2-r1
index 0fb6a388faf1..01080e2703ae 100644
--- a/metadata/md5-cache/x11-misc/gigolo-0.4.2-r1
+++ b/metadata/md5-cache/x11-misc/gigolo-0.4.2-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=postinst postrm prepare
 DEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2 dev-util/intltool virtual/pkgconfig
 DESCRIPTION=a frontend to easily manage connections to remote filesystems using GIO/GVfs
 EAPI=6
-HOMEPAGE=http://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo
+HOMEPAGE=https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/gigolo/0.4/gigolo-0.4.2.tar.bz2
 _eclasses_=xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a7d184adb2b39091f04c93a4b0b3fd2b
+_md5_=33b97de7df58f4e6a19fb721abd566f8
diff --git a/metadata/md5-cache/x11-misc/i3blocks-1.4-r1 b/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
index 306e217884e4..f11190fb2df2 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
+++ b/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
@@ -3,9 +3,9 @@ DEPEND=app-text/ronn
 DESCRIPTION=highly flexible status line for the i3 window manager
 EAPI=6
 HOMEPAGE=https://github.com/vivien/i3blocks
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=app-admin/sysstat media-sound/playerctl sys-apps/lm_sensors sys-power/acpi || ( x11-wm/i3 x11-wm/i3-gaps )
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks/archive/1.4.tar.gz -> i3blocks-1.4.tar.gz
-_md5_=6db2e66cae8c84b7655b8f9ca1cc95e4
+_md5_=ad5b3270a9e3750d31d21a6fcfab1ee2
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.10 b/metadata/md5-cache/x11-misc/i3lock-2.10
index 41f685901518..d4990d0fb9f1 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.10
+++ b/metadata/md5-cache/x11-misc/i3lock-2.10
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cair
 DESCRIPTION=Simple screen locker
 EAPI=6
 HOMEPAGE=https://i3wm.org/i3lock/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util
 SLOT=0
 SRC_URI=https://i3wm.org/i3lock/i3lock-2.10.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cb6589883851d66119f710328075f096
+_md5_=0066342a0d3ed625979c824eeb743c65
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.4 b/metadata/md5-cache/x11-misc/kapow-1.5.4
deleted file mode 100644
index ea9722460b04..000000000000
--- a/metadata/md5-cache/x11-misc/kapow-1.5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
-DESCRIPTION=A punch clock program designed to easily keep track of your hours
-EAPI=6
-HOMEPAGE=https://gottcode.org/kapow/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gottcode.org/kapow/kapow-1.5.4-src.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9a907502fd97d445924343024025bf81
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.6 b/metadata/md5-cache/x11-misc/kapow-1.5.6
new file mode 100644
index 000000000000..c83ef8043201
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/kapow-1.5.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A punch clock program designed to easily keep track of your hours
+EAPI=6
+HOMEPAGE=https://gottcode.org/kapow/
+IUSE=l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_en l10n_es l10n_fr l10n_it l10n_lt l10n_nl l10n_no l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_sv l10n_tr l10n_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/kapow/kapow-1.5.6-src.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b0a6e27d9d24f9c1c4e5335416cb178
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1 b/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1
index 71aa312b3880..a31ffc157469 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 g
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/lightdm/1.18/1.18.3/+download/lightdm-1.18.3.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fa9903ee7b7639fef6ce63d399460412
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1
index 56059e113b62..03d8ee96ccac 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/lightdm/1.24/1.24.0/+download/lightdm-1.24.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=74dd4aab78cbddf5e1a2ab25f13954cd
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.26.0 b/metadata/md5-cache/x11-misc/lightdm-1.26.0
index ff43dbc75875..63704aef2edf 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.26.0
+++ b/metadata/md5-cache/x11-misc/lightdm-1.26.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.26.0/lightdm-1.26.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a319e9603fa633eac3af0290d0a97a2f
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
index 84e96e28f8d8..717d9ae49c17 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.26.0/lightdm-1.26.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d063230160657509b0328b3caaea2c10
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.2.3 b/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
index b6a1d4ff2192..2f8b4ab3044d 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-1.2.3:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-1.2.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f856f90425adfc92e3bfa915c98ffe97
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.2.5 b/metadata/md5-cache/x11-misc/pcmanfm-1.2.5
index 1f6a74ed878b..ed2f5ba87e1e 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.2.5
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-1.2.5:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=mirror://sourceforge/pcmanfm/pcmanfm-1.2.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=279585149184a3acc74cdc5cac973e19
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-9999 b/metadata/md5-cache/x11-misc/pcmanfm-9999
index 4658f7196258..3f6b9ddddb47 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-9999
+++ b/metadata/md5-cache/x11-misc/pcmanfm-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-9999:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f3eadd2a1bd95c655bbd4b546c45abcd
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.10.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.10.0
index cb80916f2ccd..587b74d46d49 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.10.0
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.10.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.18:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-0.4.1 >=x11-libs/libfm-1.2.0 x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/pcmanfm-qt/0.10.0/pcmanfm-qt-0.10.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7abc1c766839ecd98d627328b4aac31c
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.1 b/metadata/md5-cache/x11-misc/rofi-1.5.1
index 0e978ce6fd66..2b1550dc04d1 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.5.1
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=A window switcher, run dialog and dmenu replacement
 EAPI=6
 HOMEPAGE=https://github.com/DaveDavenport/rofi/
 IUSE=test windowmode
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 SLOT=0
 SRC_URI=https://github.com/DaveDavenport/rofi//releases/download/1.5.1/rofi-1.5.1.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2ca6e9c84f8eea99226df012b1da4cbd
+_md5_=25d023d6f52914e89968e3238f8c9134
diff --git a/metadata/md5-cache/x11-misc/sddm-0.17.0-r2 b/metadata/md5-cache/x11-misc/sddm-0.17.0-r2
deleted file mode 100644
index 60ad1a3ab61b..000000000000
--- a/metadata/md5-cache/x11-misc/sddm-0.17.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) dev-python/docutils >=dev-qt/linguist-tools-5.6:5 kde-frameworks/extra-cmake-modules virtual/pkgconfig test? ( >=dev-qt/qttest-5.6:5 ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Simple Desktop Display Manager
-EAPI=6
-HOMEPAGE=https://github.com/sddm/sddm
-IUSE=consolekit elogind +pam systemd test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
-RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=https://github.com/sddm/sddm/releases/download/v0.17.0/sddm-0.17.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd3717d0b3467bdf1f8040a491fec33d
diff --git a/metadata/md5-cache/x11-misc/sddm-0.17.0-r4 b/metadata/md5-cache/x11-misc/sddm-0.17.0-r4
new file mode 100644
index 000000000000..6fc0896dd66e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/sddm-0.17.0-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) dev-python/docutils >=dev-qt/linguist-tools-5.6:5 kde-frameworks/extra-cmake-modules virtual/pkgconfig test? ( >=dev-qt/qttest-5.6:5 ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Simple Desktop Display Manager
+EAPI=6
+HOMEPAGE=https://github.com/sddm/sddm
+IUSE=consolekit elogind +pam systemd test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
+RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://github.com/sddm/sddm/releases/download/v0.17.0/sddm-0.17.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6936f0057a480531d599f65f9c783c65
diff --git a/metadata/md5-cache/x11-misc/viewglob-2.0.4-r1 b/metadata/md5-cache/x11-misc/viewglob-2.0.4-r1
index 20cffea057b8..847e3903f173 100644
--- a/metadata/md5-cache/x11-misc/viewglob-2.0.4-r1
+++ b/metadata/md5-cache/x11-misc/viewglob-2.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 || ( app-shells/bash:* app-shells/zsh )
 SLOT=0
 SRC_URI=mirror://sourceforge/viewglob/viewglob-2.0.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=425905fecb9ed6c14fc2f0ca61af0bb4
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.4.1-r3 b/metadata/md5-cache/x11-misc/virtualgl-2.4.1-r3
deleted file mode 100644
index 0e989803dd90..000000000000
--- a/metadata/md5-cache/x11-misc/virtualgl-2.4.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl: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(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[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(-)?] x11-libs/libX11[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(-)?] x11-libs/libXext[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(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[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(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
-EAPI=5
-HOMEPAGE=http://www.virtualgl.org/
-IUSE=libressl ssl 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 x86
-LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl: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(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[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(-)?] x11-libs/libX11[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(-)?] x11-libs/libXext[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(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[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(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/virtualgl/files/2.4.1/VirtualGL-2.4.1.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e1a8faca9c24c05d883afe5b58f37cca
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.5.1 b/metadata/md5-cache/x11-misc/virtualgl-2.5.1
deleted file mode 100644
index 4cd8e4a66776..000000000000
--- a/metadata/md5-cache/x11-misc/virtualgl-2.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl: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(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) ) media-libs/libjpeg-turbo[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(-)?] x11-libs/libX11[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(-)?] x11-libs/libXext[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(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[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(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
-EAPI=6
-HOMEPAGE=http://www.virtualgl.org/
-IUSE=libressl ssl 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 ~x86
-LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl: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(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) ) media-libs/libjpeg-turbo[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(-)?] x11-libs/libX11[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(-)?] x11-libs/libXext[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(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[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(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/virtualgl/files/2.5.1/VirtualGL-2.5.1.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aaba324f41d42271fc904287f88e16e1
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10
index 13ed282537a9..7f538d7ab3d7 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.10/xdg-user-dirs-gtk-0.10.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=ab44a99642646c90663716553e15f4b1
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
index 184ec07d26c9..ea7e1fc77f61 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.10/xdg-user-dirs-gtk-0.10.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=771ab7295b496ba345bebe48f60fb963
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.24 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.24
new file mode 100644
index 000000000000..660d02eed35f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.24
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=sys-devel/gettext dev-util/intltool >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 keyboard configuration database
+EAPI=5
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!<x11-apps/xkbcomp-1.2.3 !<x11-libs/libX11-1.4.3
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	811a80d4e90bbf83e68c204ee75316ef
+_md5_=7ffec320288b9c596cd34b93af6e8d31
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 7360e2cc5212..81c6d942491f 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.0.6.1 b/metadata/md5-cache/x11-plugins/enigmail-2.0.6.1
new file mode 100644
index 000000000000..176014814ff4
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.0.6.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=6
+HOMEPAGE=http://www.enigmail.net/
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
+SLOT=0
+SRC_URI=http://www.enigmail.net/download/source/enigmail-2.0.6.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f5513e8258e634026f1a988f350dfc31
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 6f23937bf520..87ee6cbf3d49 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/gnome-terminal-3.24.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
index 4cb4e1073619..49305051eab0 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/vte-0.48.3:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-terminal-notify-open-title-transparency.patch.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=204f6d0b78e6fb191c2a8af5453c9a47
diff --git a/metadata/md5-cache/x11-terms/kitty-0.10.1 b/metadata/md5-cache/x11-terms/kitty-0.10.1
new file mode 100644
index 000000000000..b4b513b9fb01
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
+EAPI=6
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug imagemagick wayland python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) 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/kovidgoyal/kitty/archive/v0.10.1.tar.gz -> kitty-0.10.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f2e56008f2353eb0364fe5d85e45778c
diff --git a/metadata/md5-cache/x11-terms/kitty-0.8.2-r1 b/metadata/md5-cache/x11-terms/kitty-0.8.2-r1
deleted file mode 100644
index 2f7ca697a517..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.8.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) virtual/pkgconfig
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=6
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug imagemagick wayland python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) 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/kovidgoyal/kitty/archive/v0.8.2.tar.gz -> kitty-0.8.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a55b23f9224ba1a4e9d8dee5090c48fc
diff --git a/metadata/md5-cache/x11-terms/kitty-0.8.3 b/metadata/md5-cache/x11-terms/kitty-0.8.3
deleted file mode 100644
index 9fc286e1e52a..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) virtual/pkgconfig
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=6
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug imagemagick wayland python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) 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/kovidgoyal/kitty/archive/v0.8.3.tar.gz -> kitty-0.8.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a55b23f9224ba1a4e9d8dee5090c48fc
diff --git a/metadata/md5-cache/x11-terms/kitty-0.8.4 b/metadata/md5-cache/x11-terms/kitty-0.8.4
deleted file mode 100644
index 4e09d655028a..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) virtual/pkgconfig
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=6
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug imagemagick wayland python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) 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/kovidgoyal/kitty/archive/v0.8.4.tar.gz -> kitty-0.8.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a55b23f9224ba1a4e9d8dee5090c48fc
diff --git a/metadata/md5-cache/x11-terms/sakura-3.3.4 b/metadata/md5-cache/x11-terms/sakura-3.3.4
deleted file mode 100644
index 0f31a7830848..000000000000
--- a/metadata/md5-cache/x11-terms/sakura-3.3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3[X] x11-libs/vte:2.91 >=dev-lang/perl-5.10.1 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=sakura is a terminal emulator based on GTK and VTE
-EAPI=5
-HOMEPAGE=http://www.pleyades.net/david/projects/sakura/
-KEYWORDS=amd64 x86 ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3[X] x11-libs/vte:2.91
-SLOT=0
-SRC_URI=https://launchpad.net/sakura/trunk/3.3.4/+download/sakura-3.3.4.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84015d17a1c2fa5206aec33a26565afb
diff --git a/metadata/md5-cache/x11-terms/sakura-3.4.0 b/metadata/md5-cache/x11-terms/sakura-3.4.0
deleted file mode 100644
index 16102fdb81b8..000000000000
--- a/metadata/md5-cache/x11-terms/sakura-3.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/vte:2.91 >=dev-lang/perl-5.10.1 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=sakura is a terminal emulator based on GTK and VTE
-EAPI=6
-HOMEPAGE=http://www.pleyades.net/david/projects/sakura/
-KEYWORDS=~amd64 ~x86 ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/vte:2.91
-SLOT=0
-SRC_URI=https://launchpad.net/sakura/trunk/3.4.0/+download/sakura-3.4.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9d837c0cc35dabd41183b56e670f261
diff --git a/metadata/md5-cache/x11-terms/sakura-3.5.0 b/metadata/md5-cache/x11-terms/sakura-3.5.0
index fb17b12fc839..6542103db3e4 100644
--- a/metadata/md5-cache/x11-terms/sakura-3.5.0
+++ b/metadata/md5-cache/x11-terms/sakura-3.5.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/vte:2.
 DESCRIPTION=sakura is a terminal emulator based on GTK and VTE
 EAPI=6
 HOMEPAGE=http://www.pleyades.net/david/projects/sakura/
-KEYWORDS=~amd64 ~x86 ~arm-linux ~x86-linux
+KEYWORDS=amd64 x86 ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/vte:2.91
 SLOT=0
 SRC_URI=https://launchpad.net/sakura/trunk/3.5.0/+download/sakura-3.5.0.tar.bz2
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21db6b921104e65d6d16a41b7afca62b
+_md5_=39607a8790db408d889146db1eed5d7e
diff --git a/metadata/md5-cache/x11-terms/st-0.8.1 b/metadata/md5-cache/x11-terms/st-0.8.1
index e4d339761554..62ef91a4388b 100644
--- a/metadata/md5-cache/x11-terms/st-0.8.1
+++ b/metadata/md5-cache/x11-terms/st-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=simple terminal implementation for X
 EAPI=6
 HOMEPAGE=https://st.suckless.org/
 IUSE=savedconfig savedconfig
-KEYWORDS=~amd64 ~arm ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
 LICENSE=MIT-with-advertising
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://dl.suckless.org/st/st-0.8.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=96eb2b163e128264da696ab1fee87072
+_md5_=7041ca0e8e55ee28b18c18e519ef532d
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 062dda54a0dd..25f84caab9cf 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/fvwm-crystal-3.4.1-r1 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r1
index e0519c89ec81..7f93d0af8b5c 100644
--- a/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r1
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r1
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d613ef0da119ce49687134447cbda88a
diff --git a/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r2 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r2
index 9e5dfe5c5d7a..950d93356388 100644
--- a/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r2
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r2
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1958e243888dae7c79af8cffb38e7f78
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4
index 0dd40318c7c4..44b6ba201365 100644
--- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4
+++ b/metadata/md5-cache/x11-themes/silver-xcursors-0.4
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 hppa ia64 ~mips ppc sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/5533-Silver-XCursors-3D-0.4.tar.bz2
-_eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
 _md5_=9910df1ae0fd8d97f6ac117071a87efb
diff --git a/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4 b/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4
deleted file mode 100644
index 07d8114d7714..000000000000
--- a/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Style neutral scalable cursor theme
-EAPI=0
-HOMEPAGE=http://jimmac.musichall.cz/themes.php?skin=7
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://jimmac.musichall.cz/zip/vanilla-dmz-aa-0.4.tar.bz2
-_md5_=52c8ec2a52fc2c79f119a392863930af
diff --git a/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5 b/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5
index d8eba1a12cf7..2712ceafc66b 100644
--- a/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5
+++ b/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5
@@ -3,8 +3,8 @@ DEPEND=x11-apps/xcursorgen
 DESCRIPTION=Style neutral scalable cursor theme (black version)
 EAPI=6
 HOMEPAGE=http://jimmac.musichall.cz/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_0.4.5.tar.xz
-_md5_=55edd8cf1e9eb0290b6efdf2acd6ee40
+_md5_=c0bb3d26892f50ca994d83c6104dcb57
diff --git a/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4 b/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4
deleted file mode 100644
index aa61fb036ba4..000000000000
--- a/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Style neutral scalable cursor theme
-EAPI=0
-HOMEPAGE=http://jimmac.musichall.cz/themes.php?skin=7
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://jimmac.musichall.cz/zip/vanilla-dmz-0.4.tar.bz2
-_md5_=d7cf50db958c6d2f45d6a55d841e0a60
diff --git a/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5 b/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5
index 6fb20b02c59f..57e8dcf66d50 100644
--- a/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5
+++ b/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5
@@ -3,8 +3,8 @@ DEPEND=x11-apps/xcursorgen
 DESCRIPTION=Style neutral scalable cursor theme (white version)
 EAPI=6
 HOMEPAGE=http://jimmac.musichall.cz/
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_0.4.5.tar.xz
-_md5_=66d4ef12027db09e1e85dc37d1a47e24
+_md5_=8bbcd602d1b812e0be9e9328dc0180d1
diff --git a/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1 b/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
index f2e5af9571a3..81eab8a2977d 100644
--- a/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
+++ b/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=x11-themes/hicolor-icon-theme >=sys-apps/sed-4
 DESCRIPTION=Xfce Gant Icon Theme
 EAPI=6
-HOMEPAGE=http://www.xfce-look.org/content/show.php/GANT?content=23297
+HOMEPAGE=https://www.xfce-look.org/content/show.php/GANT?content=23297
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=x11-themes/hicolor-icon-theme
@@ -10,4 +10,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://overlay.uberpenguin.net/icons-xfce-gant-3.9-6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=793a36d33e04d424f54ecda608310cf6
+_md5_=40f283a88d6c3fb5827975ddbd1542c8
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index dd3de7c63180..fcef6df2c914 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/enlightenment-0.21.11 b/metadata/md5-cache/x11-wm/enlightenment-0.21.11
index f75d5ebe1112..544d55c632ba 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.21.11
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.21.11
@@ -4,10 +4,10 @@ DESCRIPTION=Enlightenment window manager
 EAPI=6
 HOMEPAGE=https://www.enlightenment.org/
 IUSE=acpi doc egl nls pam static-libs systemd udisks wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_battery +enlightenment_modules_bluez4 +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_packagekit +enlightenment_modules_pager +enlightenment_modules_pager-plain +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_time +enlightenment_modules_winlist +enlightenment_modules_wireless +enlightenment_modules_wizard +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.17.0[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) egl? ( >=dev-libs/efl-1.18.0[egl,wayland] ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.18.0[drm,wayland] >=dev-libs/wayland-1.11.0 x11-libs/libxkbcommon x11-libs/pixman )
 SLOT=0.17/0.21.11
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.21.11.tar.xz
 _eclasses_=xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=232696d29a779d6da883dca571fa1849
+_md5_=65c0c38e6079e69422bf6f4bf333a249
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.3 b/metadata/md5-cache/x11-wm/enlightenment-0.22.3
index 8ba7ced3c8b6..f35cdb10a0b8 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.3
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.22.3
@@ -4,10 +4,10 @@ DESCRIPTION=Enlightenment DR17 window manager
 EAPI=6
 HOMEPAGE=https://www.enlightenment.org/
 IUSE=doc nls pam systemd udisks wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_battery +enlightenment_modules_bluez4 +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_luncher +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_packagekit +enlightenment_modules_pager +enlightenment_modules_pager-plain +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_sysinfo +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_time +enlightenment_modules_vkbd +enlightenment_modules_winlist +enlightenment_modules_wireless +enlightenment_modules_wizard +enlightenment_modules_wl-buffer +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( dev-libs/efl[drm,wayland] >=dev-libs/wayland-1.12.0 x11-libs/libxkbcommon x11-libs/pixman )
 SLOT=0.17/0.22.3
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.3.tar.xz
 _eclasses_=meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=045f45edf0faa6efbb33434a696769ac
+_md5_=453a0081d2bc40f32eb4cae0d7e62402
diff --git a/metadata/md5-cache/x11-wm/i3-4.15 b/metadata/md5-cache/x11-wm/i3-4.15
index e203d1002b87..98c7a1b173d4 100644
--- a/metadata/md5-cache/x11-wm/i3-4.15
+++ b/metadata/md5-cache/x11-wm/i3-4.15
@@ -4,7 +4,7 @@ DESCRIPTION=An improved dynamic tiling window manager
 EAPI=6
 HOMEPAGE=https://i3wm.org/
 IUSE=doc debug test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config >=x11-libs/cairo-1.14.4[X,xcb] >=x11-libs/pango-1.30.0[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 REQUIRED_USE=test? ( debug )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.15.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	out-of-source	a3c199a333bdfa25e7c84f4ef0616759	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=d2d21659a434d19e791376890fc3642c
+_md5_=1b37e4b192fffeb0b63fca5120201602
diff --git a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r1 b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r1
index 6fcbc66d49a9..4aed39118991 100644
--- a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r1
+++ b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=xrandr? ( xinerama )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/raboof/notion/archive/3-2015061300.tar.gz -> notion-3_p2015061300.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=858f87dddc33f7886d66de4f41d217c1
diff --git a/metadata/md5-cache/x11-wm/notion-9999 b/metadata/md5-cache/x11-wm/notion-9999
index 348ff5f929a1..f073b3939f97 100644
--- a/metadata/md5-cache/x11-wm/notion-9999
+++ b/metadata/md5-cache/x11-wm/notion-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/lua-5.1:0= x11-libs/libSM x11-libs/libX11 x11-libs/libXext nl
 REQUIRED_USE=xrandr? ( xinerama )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e69bb4d5213a1c1a17f9af0b5842b849
diff --git a/metadata/md5-cache/x11-wm/page-1.9.9-r2 b/metadata/md5-cache/x11-wm/page-1.9.9-r2
index a4c3a7768020..46b20f5e040b 100644
--- a/metadata/md5-cache/x11-wm/page-1.9.9-r2
+++ b/metadata/md5-cache/x11-wm/page-1.9.9-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X,xcb] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2 >=x11-base/xcb-proto-1.12-r2 x11-base/xorg-proto
 DESCRIPTION=A mouse friendly tiling window manager
 EAPI=6
-HOMEPAGE=http://www.hzog.net/index.php/Main_Page
+HOMEPAGE=https://www.hzog.net/index.php/Main_Page
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X,xcb] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2
 SLOT=0
 SRC_URI=http://www.hzog.net/pub/page-1.9.9-r1.tar.gz
-_md5_=e40b861421f98a8ec4edd308d90d51c4
+_md5_=1888b32b303d525720d6639d0ff30172
diff --git a/metadata/md5-cache/x11-wm/windowlab-1.34 b/metadata/md5-cache/x11-wm/windowlab-1.34
deleted file mode 100644
index 873a0dda402c..000000000000
--- a/metadata/md5-cache/x11-wm/windowlab-1.34
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=small and simple window manager of novel design
-EAPI=0
-HOMEPAGE=http://www.nickgravgaard.com/windowlab/
-IUSE=truetype
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext
-SLOT=0
-SRC_URI=http://www.nickgravgaard.com/windowlab/windowlab-1.34.tar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bb9e46030bd978cf6a930f6fb138a777
diff --git a/metadata/md5-cache/x11-wm/windowlab-1.40-r1 b/metadata/md5-cache/x11-wm/windowlab-1.40-r1
index 2a2e86c32f9b..3e397364d094 100644
--- a/metadata/md5-cache/x11-wm/windowlab-1.40-r1
+++ b/metadata/md5-cache/x11-wm/windowlab-1.40-r1
@@ -4,10 +4,10 @@ DESCRIPTION=small and simple window manager of novel design
 EAPI=6
 HOMEPAGE=http://www.nickgravgaard.com/windowlab/
 IUSE=truetype
-KEYWORDS=~amd64 ~mips ~ppc ~x86
+KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.nickgravgaard.com/windowlab/windowlab-1.40.tar
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ec282475af5b65713e00498793d9df60
+_md5_=197f787714a415f955c9e4782c3e1476
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 7a44ff171bf8..56098791df23 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/thunar-1.8.0 b/metadata/md5-cache/xfce-base/thunar-1.8.0
new file mode 100644
index 000000000000..cd75ed34697c
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm test
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) 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/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=exif introspection 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
+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+-3.22:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) 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 trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+SLOT=0
+SRC_URI=mirror://xfce/src/xfce/thunar/1.8/Thunar-1.8.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=328aca5972107793132bf6c0b9bdf3ce
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index f5e7ecf69a84..914664266438 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/xfce4-taskmanager-1.2.1 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.1
new file mode 100644
index 000000000000..4fffe273ae17
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=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= ) dev-util/intltool sys-devel/gettext >=x11-libs/gtk+-2.12:2 virtual/pkgconfig >=sys-apps/sed-4
+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
+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.1.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=653b0ff4c76f8ec43305b6e42312acca
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 114f3c083668..91b2f8e8e816 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19761 BLAKE2B 851bd0e17305c38a177a42b80b1a89b0ca99add42dad8fa975ce0752b34aea6ad1a6bad714f0de316d8dd42cd1abbc45a7e7ea98aa182d7c527c7ced227ed9db SHA512 c4661dd0996945ee8bec7e333266902c18e9c534f4e79ebde22e80dffcea1351164ef9712b507585819b758cd1acd788423441e091bdaab31f0b7ee4681eeacd
-TIMESTAMP 2018-06-02T15:38:31Z
+TIMESTAMP 2018-06-09T07:38:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsSufdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsbhABfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBmUw/+LSS4210Euf52nfuPFwfrWhLHaiY0kHkVXucbbXqwwv9rZITMKAqNnOj6
-mECCiucnzEgQ8V5iD0OaOKly7gXLxOBxI3hhq0IWqvP1Zd4cG9MaicU2/4v4ByR0
-pMSJG1YlD9/PtsSisJhhe6gEurG1hcxcu1xph8nNwL+Wk9GVT8eeB97N+ZaCVPb+
-sAhu/8/vwNjUisBD2GNzfmAa2A3CjPzQ4kFw1fo0a4VhboGiIiNyg9kvPD1fHMGM
-Nx0hFJajgs1kQ9Wdl4B/ExqCRvzWCFgd8QX7VPdymgPlKIzNAK/z0vwaVpX9aPyk
-JnZx4vvzDeOljHr55jtIPFDrdrD6RkQcJMEYxnrtfy6Vs/x+tZEvR8As2d9pj8WC
-kIYoII5LMdXroJOY0J01fFMTwarDyAu50KdII5ObzT4QXPi0BJtjoXc3UvmqyNrw
-JK/SvSe7yCUVsR2hbPzOGc6jZ26f4MsaUnGoWZr1KasjqCmE4NHyuF2wpMEpPI9d
-0uLFZpf1ip6ncIdNsX2HkK9f2sWKEn2uAbVC1xhCWvKY9jWXemVmaCSHeZ0hPqG3
-5IXnfECeGO64BjQniIuaRq+W0UAaBUJx5BbW0X2IGBGQw2RC+K/hNYRSQvFV2uza
-N9AVWUc5KUDG6Qr5Ykd0EBHjRNqi2GwVpi64sz1wMQUgZAy4L4Q=
-=TPH9
+klA08w//S914JjrIjDZb5Zxtx+CmT474vcD63A0w49VEQWl0YD4hDfIfean2LcoU
+8Tm6vI+9ruQbBtE3cRA2eKStExNpMqSLTZTuwdGgxGnSI7lbU4eF3yC4oF8Dex/G
+OQBc5oZqMaJVaBgfu+7ZDj9tMqP0cR3A6i5loHjrngN4bUF6YH7TmwpMpCjm2TlO
+YwWYbnMV9YptXLqzNRlWbLl/01QdtWsiEmi76DThtl1KoIPOKtkezKWpMkAxQ6GY
+CMs0cullVWnnVxCP4s8sraqrCF205NT3ysbmselSOEMf9CVHqR0IvCT70ysQfV1n
+hWck72x4aHEBdpNs+qnPPvJUqLQEYUlJ9jtbkywdkXMe4/B4Yw7M/UzN8W4ZDxFB
+cR2lLTROi5Y/eXM2ZGF06Scg3iVH7myX50N3XpS+nlqJm9qmcepy2hEAnu8qPry4
+gT/BgTN+dQFoVqPW6tQ2n7OlqNGCnDHt1KU1/lcTSkPLGlbcDAMVUkL6xsgiAoMg
+sGzC6D1niUunP3B8shovd3/5jUvpLMs+HTCFx9fO9/WY8b3ffeAXzuT6K1Q6tq4c
+Nq37ZERIJto4q9JLQtF6BtwbOAxgqWyKdfRSAp5Xd6+tAs1T9Bw5hgoCaAe8q5Yz
+PwG7OoQw4DVN7KElsACMxwddsuT5yS5fZiIn+Me4CPfqI/k5EXE=
+=HHC3
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ba6790ebd908..2f9edffac363 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jun 2018 15:38:28 +0000
+Sat, 09 Jun 2018 07:38:36 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 1796c87b2279..5c86f1d158a3 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -4120,6 +4120,10 @@ developers and volunteer mentors.</description>
       <email>tamiko@gentoo.org</email>
       <name>Matthias Maier</name>
     </member>
+    <member>
+      <email>vdupras@gentoo.org</email>
+      <name>Virgil Dupras</name>
+    </member>
   </project>
   <project>
     <email>vmware@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index bdff1cc994cd..ed0643faec1d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jun  2 15:08:29 UTC 2018
+Sat Jun  9 07:38:36 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f2ba7f3c0b68..39a2c2eef21c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jun 2018 15:15:01 +0000
+Sat, 09 Jun 2018 07:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index faa5e4f4f549..80562b1a0061 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-145742c5aba8d7b88cff2db081da28d7b9fc810c 1527951892 2018-06-02T15:04:52+00:00
+aff1af8e4bca8bdc6b3dd078b3bd4e9ed0ad6e73 1528528697 2018-06-09T07:18:17+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 34547b07d9da..0076c57de945 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1527951901 Sat 02 Jun 2018 03:05:01 PM UTC
+1528529701 Sat 09 Jun 2018 07:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ba6790ebd908..2f9edffac363 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jun 2018 15:38:28 +0000
+Sat, 09 Jun 2018 07:38:36 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1b09638049ba..74af8abb5504 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 258af4792d84..51c0fd56394f 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,7 +1,7 @@
 DIST etherape-0.9.14.tar.gz 1438255 BLAKE2B a34ca77cc8862b3de50ca0405d7de083653fb984de85feb7c575b6eb0f340d386add9c851cdd54d8cf5d3d1c3cdddb1c7522673687d94b30f2ab0f91d4251613 SHA512 26e018e49bbea9baf8b4056798e2acab1ad1aba51022ab1258d31499d612a7b12567c4d671da45f79785fbe3c1eda6698b4fe201b055e71e13c9f9b0275c91e3
-DIST etherape-0.9.16.tar.gz 1435235 BLAKE2B af6d0ba7d9532b383322546a42126fd456a2695ec7332cd082addc6ed72bb8e11d058854881157775e767c37c0ca3984074bdbe2f8a098622f48d38e9aa99281 SHA512 0c0b5e04cf1628fe22cfa35ee85b4ab4736265d071c9d179c0dc52e2894f022da7648f236e7ab29e28049a4afc8728ba639a6654da82e299938259fbe01e0d57
 DIST etherape-0.9.17.tar.gz 1436276 BLAKE2B 3ac9496238d5a3653129822c6d21643a5e65afd93ff278532bcad623a0c4dc05b553711dd6f7047774cb758a6f65113a3381a08154001a6c2058415d35f2cd1d SHA512 65f039cd98826fee9a5988235dbdface00e2f17e5bd83eb28339d5bdb9d2b5f8ffe84e071c36418617d68add32e39866eb393f23b008b35fe36662453a02c57a
+DIST etherape-0.9.18.tar.gz 1436265 BLAKE2B b9f3fd625369fdf6790bef75cc97effd3e1a6eec0635472752daf420c890d4a5231bd1baff6ee58937ad27e1d96eaae5b79cc2f9a2b6eeeb7c957d08cbc8f667 SHA512 0ed19966451f9e9b5f5754018d485e7dc59005657ceddf8a75e790c4b7fbf3c8eea56354cf490ec27e18c4bc14c5b3fe648c90facc471dfb14b52ea68abc37d3
 EBUILD etherape-0.9.14.ebuild 611 BLAKE2B 028a91b19cc57e075b974bc1f80c39ce42ba0bac4f89e5afb1e48742e4d44816f5b5ab5e7236cf7a59aebc87a677b11391ebb6294b504dbf45333aa6fb52a142 SHA512 2aff3a594f3e24192554249bb6ebcc5002f47a76cd1c74b4913f33cc08bd824c78e89038d8d7a52a241a382479f8057102689be565544c1e96a0c880ef332ed5
-EBUILD etherape-0.9.16.ebuild 587 BLAKE2B 864c1f5317b245c009e7ee0111e33e91524452455df52a9d9d3fbbc165a41d9aa8d79b01abb4bcc040be763916f1fb0292cac7f51d2c0e571d3a6d30d815221f SHA512 74b56e34c907dd1020dbab8df0a11ada2031d5814d2bfecfd5634e479f5add007e8388ec9b81cb3c04e5d52363ba909df218d3c0ea56661abf27b0219af3ae68
-EBUILD etherape-0.9.17.ebuild 587 BLAKE2B 864c1f5317b245c009e7ee0111e33e91524452455df52a9d9d3fbbc165a41d9aa8d79b01abb4bcc040be763916f1fb0292cac7f51d2c0e571d3a6d30d815221f SHA512 74b56e34c907dd1020dbab8df0a11ada2031d5814d2bfecfd5634e479f5add007e8388ec9b81cb3c04e5d52363ba909df218d3c0ea56661abf27b0219af3ae68
+EBUILD etherape-0.9.17.ebuild 604 BLAKE2B a4ed8fe466630bfa884ea32bbd7c244a5fb16e4bff3ce0031d081b8beaf246563937d542056743aaf4d45c5bd41da724bfd4a92003d5f3948c7d1af9fcd855ac SHA512 fb24c1a48cf6a96d7b000995c18c96e97551f611b15e1e601682f4815164c2283ed69ed55611d04c387eb271f54fa874e5ccc15b46be167b25fcee43934495c8
+EBUILD etherape-0.9.18.ebuild 564 BLAKE2B 093ec296766b484fa508462b6f65d8b56af5884f0c98dda915e60bc69ee5be7936236a4456a5b1dafec25a33ff981383742c197df8f12d0bd1d3db2943268dc7 SHA512 94e51eca55f371dff53d6dd0a4ecc88495edda31374fee272a3eb8af173e1837d114b26c1bac2597877c84af4bbb187bd5e57ec73caeaa4c64ff0ce820482289
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.16.ebuild b/net-analyzer/etherape/etherape-0.9.16.ebuild
deleted file mode 100644
index 4f8df6a0aae4..000000000000
--- a/net-analyzer/etherape/etherape-0.9.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
-HOMEPAGE="http://etherape.sourceforge.net/"
-SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=gnome-base/libglade-2.0
-	gnome-base/libgnomecanvas[glade]
-	net-libs/libpcap
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.11.5
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
-	virtual/pkgconfig
-"
diff --git a/net-analyzer/etherape/etherape-0.9.17.ebuild b/net-analyzer/etherape/etherape-0.9.17.ebuild
index 4f8df6a0aae4..74efaf843ce3 100644
--- a/net-analyzer/etherape/etherape-0.9.17.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.17.ebuild
@@ -14,10 +14,12 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=gnome-base/libglade-2.0
+	dev-libs/popt
 	gnome-base/libgnomecanvas[glade]
 	net-libs/libpcap
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=sys-devel/gettext-0.11.5
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
diff --git a/net-analyzer/etherape/etherape-0.9.18.ebuild b/net-analyzer/etherape/etherape-0.9.18.ebuild
new file mode 100644
index 000000000000..1cfcbd672427
--- /dev/null
+++ b/net-analyzer/etherape/etherape-0.9.18.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
+HOMEPAGE="http://etherape.sourceforge.net/"
+SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/popt
+	net-libs/libpcap
+	x11-libs/goocanvas:2.0
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/gettext-0.11.5
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	virtual/pkgconfig
+"
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 888e1efc1cef..2614ee46d858 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -14,13 +14,11 @@ AUX munin-node_init.d_2.0.19 598 BLAKE2B a6442b2873a01d3846ae502314bbdee4ac08ce9
 AUX munin-node_init.d_2.0.7 745 BLAKE2B 069f730d947991d9ecbc75dfa038dcc5ef089ad1759dbea8d15c40a4fef7b5b33a1bc9dea2d916c0e4dd88285015a7aa714f3fd900c7724e3d3e620b84a4cdd2 SHA512 e6652707c539afef01e7cd777acec2c639edf66fb9bf1f126711d19f166eb3ef69d5ed8e895e77e4fb0b7f5a4c8788eb6532f4e09d13693d164e6edbde55e5d0
 AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa209c776aced2d2a0916ff4b61c195393f19355a6460bf2bde8baf41892e4f41905332996afde32e99397ea SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
-DIST munin-2.0.33-gentoo-1.tar.xz 11024 BLAKE2B 60170b0e25143f56c6663394ae08b7323c4371111c7faf35b9fdfe0849860ecfdb1fbd50c0400e950d3330c5d0b3a309ab09c1f5724805c759a2e6078efd2dfe SHA512 c1f49f01fd641e157145d9710a091696c09380887a374ee845e516d40384ee6bc576019f3510ac322436b1f10ee1b675ae512b9f677a6a0fa2ef022cbb7269b8
-DIST munin-2.0.33-gentoo-2.tar.xz 11288 BLAKE2B 3e39e7ad1f7ed39f8ba1f5eef4183f94dc6010f31c05ee3e1c60e44450f932f677d0d2ecac40c1255959afb0069b9332f82397c7be3225acb3f1400cd720eb3f SHA512 4d185529199377e85fb3e7d0a8c38de2ae500d2f992292e6ae016d11e81642833725987ac006b5f535963593c7698c676d28091805691e8b46c016fc2580917d
-DIST munin-2.0.33.tar.gz 1349546 BLAKE2B e2604c1ea492df6d6bc801bab664483b63186010c0a5cb021c355ad5bffb6ccac738d8462351e795704f7305ac752c8efa342d6ad20a43d7db96729c1d05fb5d SHA512 33c56fcb347396f29662f304aa50f0e3dfc909b067ea49809762bbbb4dd2cd7e95789c318adcef64923e6d0248dcf9ea6fe933c49d920b6b7856d85511d40d67
 DIST munin-2.0.34-gentoo-1.tar.xz 11920 BLAKE2B 19cb949b8712ad57544b424de0cb09f9eb33d4c8fe5f680bd3655efb5f0adce53ba4a839258e0324bf734f7367819abc8c6a4b859a48b36b015ea80c0b1f4a29 SHA512 706f8dd1ba49eadb5e89f821f52d4c691b0270885a4167639b6417f9516bb2b0b8b212a82f50fb892e03b57817d650b3552754ecb437718c7e7ef3cdfaf83b2b
 DIST munin-2.0.34.tar.gz 1349842 BLAKE2B 641a780cd42d07c1a4f370dbf3a2647c99d3d69b5226a50f198ef561ff36e362fe397a55102ce57ef70a4a730ed14e02cb3a4f3043cac1874f36670535e0968e SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc
-EBUILD munin-2.0.33-r1.ebuild 12312 BLAKE2B f99f25c18c642166cb877f49aa9885227c6da17d7c98030719c956154cba0911c9dfe63f7547fcbced685a6e40868005e938c7fd4720db8150ec4005c3f96834 SHA512 1978ba10bc17d82979b000cdf6983510d173609471a14ae8a7a9d005db94d75c214c32da8cd57e314eb15df53dd5f2b6069d3a098dfe4287dfc5c2aeced08beb
-EBUILD munin-2.0.33.ebuild 12178 BLAKE2B e53b9a9c58c03152f832024532ecfdd78fd0f5489556fb0e36c85fcfe28a7a891f1b5a296cad5038d30d9233b5205c7881e3f8001b9f5addb732869b2cda3be1 SHA512 264679112c768409b98d058c9ffbac595b9c947a7eca496038c9c4e8a366ed3ec80f7a3d937ad21341be3879e7e15dee7d8f77bed1516f294b811ea85e202c8e
+DIST munin-2.0.37-gentoo-1.tar.xz 5572 BLAKE2B 5f6371b2fd7e4933e3f19435e74773d2f74d6d909d65aac1f26e334239af2de4f7f78f81ae58c763024a30a15c9eaf9324c5a3a4ccc5b086951c1a49ddf8a2c9 SHA512 9ab47db4c98bc68a32e63aaf44fad83661efa316ff8f19967a886e3c5e268288d7b25503639c89e851edd57a50d215d8dd46b8e9b985feac9d367d56eb21610b
+DIST munin-2.0.37.tar.gz 2249145 BLAKE2B 430a89e6ec5920885abdd09779e61df1365ba132527ac156803a2b71d1a10d716658135a34820083b55ed843f8c6bd502c0f078493ab995df39b0afe4ee5d86e SHA512 22a87fe17a3674464e0cb242c27db57eb97a2b23e5f1fc7044de1b1b8187fbdb2ee5dbab51df42c87dfd8640194fbde23332998bff707368997421c61098d07f
 EBUILD munin-2.0.34.ebuild 12222 BLAKE2B 2a807d7d83ae99af03812a00bebb78d6089a4a94f7fae417b99afa0b07a0ea53ec633334b682c839ee018bb56b6b8e6fb043ec038930bcd89fa04e151f22d70d SHA512 20b6ee28055cb652d231046d1725ca75160d274b41da1fbc9e67bdbe276948013a7376ca9563b3dac71195f4cbd460644db1db0daa00f89c8302603976553a9c
+EBUILD munin-2.0.37.ebuild 12383 BLAKE2B 3da162ea89c907034b757ffed960bf651e04a7268e98d6830868b44b1b45ab00daf77675cc0e16b0e4aea40edeeb9ad66994506d30f17e97a9ac20cbb6900902 SHA512 8ff80be8cd3d11976ddbf9d9748c8a4156a2c0005852ab8f490ea5dc96a37e36d54866b367e0a6b10a1fca77fde3bcb0b6703da2a74b3dc301674164796bd690
 EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5
 MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3
diff --git a/net-analyzer/munin/munin-2.0.33-r1.ebuild b/net-analyzer/munin/munin-2.0.33-r1.ebuild
deleted file mode 100644
index e8bec20e1080..000000000000
--- a/net-analyzer/munin/munin-2.0.33-r1.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCHSET=2
-
-inherit eutils user java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat6 net-analyzer/netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )
-		!<sys-apps/openrc-0.11.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/sh /var/spool/munin-async
-	esethome munin-async /var/spool/munin-async
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/patches/*.patch
-	eapply "${FILESDIR}/${P}"-perl526.patch
-	eapply "${FILESDIR}/${P}"-nogitversion.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.33.ebuild b/net-analyzer/munin/munin-2.0.33.ebuild
deleted file mode 100644
index 71e21e8175b7..000000000000
--- a/net-analyzer/munin/munin-2.0.33.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCHSET=1
-
-inherit eutils user java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="asterisk irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
-REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat6 net-analyzer/netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )
-		!<sys-apps/openrc-0.11.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/sh /var/spool/munin-async
-	esethome munin-async /var/spool/munin-async
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.37.ebuild b/net-analyzer/munin/munin-2.0.37.ebuild
new file mode 100644
index 000000000000..b2d7e64c0b8b
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.37.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET=1
+
+inherit user java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat6 net-analyzer/netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )
+		!<sys-apps/openrc-0.11.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+	enewuser munin-async -1 /bin/sh /var/spool/munin-async
+	esethome munin-async /var/spool/munin-async
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	rm -f "${WORKDIR}"/patches/0001-ipmi_-replace-the-ipmitool-based-plugin-with-one-bas.patch
+	rm -f "${WORKDIR}"/patches/0008-netstat-plugin-active-connections.patch
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	dodir /usr/lib/tmpfiles.d
+	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index b9da3c956352..36a3943d40a3 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -8,6 +8,6 @@ AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
-EBUILD ntopng-2.4.ebuild 1723 BLAKE2B 349113c042d144ffc60e4cda0aa7714af23506c5e88d3b0f6dd70e21de1d4f5b3835d6fccef9f2893705d60190d637b6153299a25974dec37cfb29fe8b629368 SHA512 f17de8331ace1f50eddf367bf25c1619edcb3d1a391f63adb2c205fc74f324135c010322e9f9c30ce25a72bd6f59730612d5fc6019a109ec1a785250e2161ddd
-EBUILD ntopng-3.0-r2.ebuild 1628 BLAKE2B 5b9486c8c37cfe852366819fc6324b8fa6bd2bb058f9619cec00bde8259415f15a46ca898f4f1e60432c30a0def885a0d0322709faa757bce9a1f169189c9b87 SHA512 72af23df5efdf0655e38ab305987c93fe27c0e09d3404e8c5482c68138b9e4eb5887a48deb0da88c5d1742eec527d532f335ef42749a960f56630dfacc1b0e07
+EBUILD ntopng-2.4.ebuild 1724 BLAKE2B bfa8ed23ce2b4a5e7b0de83cda74a0211f89868e718cfe027f4c282db9e939b5efd6b48dd8d68cef4714dd238e8126e2a5716cdc939f04511599abaa5b7e2a0d SHA512 4c0298162c77666ee7ec2b3fa139468f5fc61e25baef6f7a55f5057dee1238e951e6d6b6ab7b824e31791172912bd106ae28ccafcf42fd89622676400a8132b1
+EBUILD ntopng-3.0-r2.ebuild 1629 BLAKE2B cc4f109a79f52d93416db7d10e7c3d7291d2d286ca9eec38dbe990691e5c5bd236bb264c76dfd0063cd2e31de2c9682e6247131a1b668d47051f9553a86d1124 SHA512 90ae9cc4bc63818a48056685a256596b19a049d6812bb4fac534408587c31602f33e03f3ab0217cf8681bceeddaed17826b0b1cc4551c46ee9b55a65fb619794
 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996
diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 0e383ae5ce4d..d024ad1f63db 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-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=5
 inherit autotools eutils user toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/"
+HOMEPAGE="https://www.ntop.org/"
 SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
index 0fc8da9c6326..bbf5c8da9375 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools user toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="http://www.ntop.org/"
+HOMEPAGE="https://www.ntop.org/"
 SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index d66784fa8d3f..edd217788483 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,8 +1,6 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
-DIST scapy-2.3.3.tar.gz 1459132 BLAKE2B 442e13853cfd4bac4984571367990ce03a2fc1a634564ed7e05641130d435818f161687c530f17280a20f1063aafeeeea35cb867fc2f7d78a4f3ae257dbb6f90 SHA512 47ca2eceafe7b693c569a92c106782037d869c323aaaec41cace07dfdeb3c6a7e9f7bc8ca1150b3c0daea54e6665f93eb1dfc3c511419cfa28eb2e0753bf9ba4
-DIST scapy-2.4.0_rc4.tar.gz 2472251 BLAKE2B 720777e7d19ae1a312ccd78c6d005cf6f1f42fcac8f11956b2fb5521dac17ef477106cef2ee9a9384f764dd1aef337b010faed61f2fb34c3458b3a9c836eb4ed SHA512 003d573fb8ec83029eca93fa9f6333f9a4b4a166ab355a19339194b6a7b8a772d692afeed8d19e0f9422caae326167f1acf819319327f3495dc389fc9a2ea811
+DIST scapy-2.4.0.tar.gz 3182131 BLAKE2B af591b103c90736a5e62801f4c0ebd495e2e71c79ee81f04fdd194739b460c9940b8fcf0c6e279701095979144eff25ca4734926c0251721b37dc63fe8dd9e89 SHA512 0fe80150cd83db7735c9d0b70ec832a4e68eb5160ad8559e9b1bd79c52a9950ef7c9555ea2a1ee1dc8df1f055a885c52552c29e304faf40250ce9c502a5f870a
 EBUILD scapy-2.3.2-r1.ebuild 897 BLAKE2B 6c39e33ab0c611135c34362038461e51e8adaef9828538782b35639a452704892d6ea6d6d1759f475bdf2a35f9b397b5ece3b390a21d73f46ef9964354e8de51 SHA512 c3dff0a0ce1e5929bde3cdecd85654f7f1e070bdff3735359714c3d5d427ca4ae9a339642573274dda1ba13ae041b483fcaf3c46b8ea70c4100685cfee7d89c8
-EBUILD scapy-2.3.3.ebuild 899 BLAKE2B af30ed756c47235b49aa1a20f89e9f9f0d4fe306cc999f11e2ecc55a79bd52342ec85a743dd47b8c76d9f118cb482aa875bc057e4455a4c5b19002b16f8b77fa SHA512 85cd0bb71df5e99fd737753d13f5e33a1811c8d23e38b6bcca2493b78d27e69deb393d0e363ce43d5de4fb0d8ef042768fae5a20b117d9d7befd2052de99825a
-EBUILD scapy-2.4.0_rc4.ebuild 1033 BLAKE2B a153a3ce37f760d3d25b04039df1214b25608f423abb372ecd9d8850d95d3acace29ecce60679f27754525395323b71d3d60ebb928ffc6985fc9199764647c18 SHA512 906406ecdd04d2d0dbd63c23f9fd4f7b264085b99ce695ccf1b63f59c4cc3f0d8733b64b2e327ca6cb3660324d34dc3c827b0d189f476e4ca16991283dd10700
-EBUILD scapy-9999.ebuild 995 BLAKE2B 10bced8b1549478cb7d91214e349f6352f85efec8297153b112e022c513d90933246f014d3a19979fb3bc2bc74c80e40cea4accb1dcfcb2160b0035d79e51767 SHA512 19720ee0a89e9f4b7ee6a3f7f3d3e3cf2744f44e9eea9dcc3e6cdd2ddcb8d51fda73f36c01e9216489c37e138cb81b6af8599389defb72b3a98ce6da8e05d33d
+EBUILD scapy-2.4.0.ebuild 1037 BLAKE2B f3ef7f4a91c9ac52dc34df1b07512cce0193255c0a4c4ef3f7c2888e4108d79977371e408206ad4002eec60f459ff4b473999307bbd98efff1462289325dd668 SHA512 771dd160785c597009bc490cfabbd076f43833bf6f2a350496fa976024caf2b7f2f8457869062e0a35784a4d88aedffebfbd8cbea978198c4d0f3085b81ebd0a
+EBUILD scapy-9999.ebuild 999 BLAKE2B 2c61522bc128d74c8acd148c942eeb0dbbd85482a58c5544dccf7af13aa9d85d0900334e254e38fa373fec380956a2e85d5ce76d241f8b12fc99dce48f706c45 SHA512 3fad60f8813012d4152a7648cd631a9f06f7068d223e30a306c9b32404bb2665e5b0af5f3baf91f0a1342d78173978821137218a8538e5dcf6aa9fd55959a7a9
 MISC metadata.xml 747 BLAKE2B bdfb12b918fe2bd88cac770277ef69fd3bc2d1ef74f6176edbfaed9c9c6bdaa8495bb78f557e24eee8f3b47f7f487a668c76a8d9e532749a9221da0227f3cec8 SHA512 5ee06d7b6cccd1b5939a6f7bd3cbe043285bf630db8f992f627fcd04b929abf70eab31aca5d1270cb1c33e51f1c2460d89b3963af20363122be7f56e1c10ffea
diff --git a/net-analyzer/scapy/scapy-2.3.3.ebuild b/net-analyzer/scapy/scapy-2.3.3.ebuild
deleted file mode 100644
index 391396815ff9..000000000000
--- a/net-analyzer/scapy/scapy-2.3.3.ebuild
+++ /dev/null
@@ -1,29 +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 distutils-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/"
-SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
-
-RDEPEND="
-	net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] )
-	pyx? ( dev-python/pyx[${PYTHON_USEDEP}] )
-	crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}]
-	              dev-python/pycrypto[${PYTHON_USEDEP}] ) )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( virtual/imagemagick-tools )
-	visual? ( dev-python/visual )
-	tcpreplay? ( net-analyzer/tcpreplay )
-"
diff --git a/net-analyzer/scapy/scapy-2.4.0.ebuild b/net-analyzer/scapy/scapy-2.4.0.ebuild
new file mode 100644
index 000000000000..87c9eb983d6f
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.4.0.ebuild
@@ -0,0 +1,42 @@
+# 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,5,6}} )
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RDEPEND="
+	net-analyzer/tcpdump
+"
+S=${WORKDIR}/${P/_/}
+DOC_CONTENTS="
+Scapy has optional support for the following packages:
+
+	dev-python/cryptography
+	dev-python/gnuplot-py
+	dev-python/ipython
+	dev-python/pyx
+	media-gfx/graphviz
+	net-analyzer/tcpreplay
+	virtual/imagemagick-tools
+
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
+"
+
+src_prepare() {
+	echo ${PV/_/} > ${PN}/VERSION
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc -r doc/${PN}/*
+	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
+}
diff --git a/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild b/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild
deleted file mode 100644
index 8d3d643afa10..000000000000
--- a/net-analyzer/scapy/scapy-2.4.0_rc4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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,5,6}} )
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy"
-SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RDEPEND="
-	net-analyzer/tcpdump
-"
-S=${WORKDIR}/${P/_/}
-DOC_CONTENTS="
-Scapy has optional support for the following packages:
-
-	dev-python/cryptography
-	dev-python/gnuplot-py
-	dev-python/ipython
-	dev-python/pyx
-	media-gfx/graphviz
-	net-analyzer/tcpreplay
-	virtual/imagemagick-tools
-
-	See also ${EPREFIX}/usr/share/doc/${PF}/installation.rst
-"
-
-src_prepare() {
-	echo ${PV/_/} > ${PN}/VERSION
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc -r doc/${PN}/*
-	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
-}
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index ce815cfb2f7f..37900e5421fc 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -27,7 +27,7 @@ Scapy has optional support for the following packages:
 	net-analyzer/tcpreplay
 	virtual/imagemagick-tools
 
-	See also ${EPREFIX}/usr/share/doc/${PF}/installation.rst
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
 "
 
 src_prepare() {
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 10ca0cd26495..8a7208a4ceb3 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -2,5 +2,5 @@ AUX suricata-4.0.3-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62
 AUX suricata-4.0.3-init 5499 BLAKE2B c2aece3a386d0ecf821e9d0e6bcb74efd97b90a71bad59a3e86f0f6a30702c711e7a287d1065745e73521c6f6cfaf5444b50b064fc06052dc33d8a6bc690f2da SHA512 ac407c70751a3610d9082b0736e76dfe04bd82014a5ac850b581c2e3c5806bb9d8fd59788cfaeabf51a856861a4568e31f9f1e33687623cc380ce226c0e06b92
 AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
 DIST suricata-4.0.3.tar.gz 12392388 BLAKE2B 9b6338b343ff85f070d61608ff9dc7f25df868fdffbc13b5a8d245cb3db5cd757cb1785c827c388653b2f8a7977129259671900bc1abfebeb878a668b4058bdf SHA512 aa6b6d1ae86efad0184ba4fa06375f34334e07c22b7b1f82bf17fcb0ae48ad7f867bced57ab4f713de01583965e1260cb82e1355f78002071b689dddd3b53892
-EBUILD suricata-4.0.3.ebuild 4559 BLAKE2B adf2d05e0a605e7539edc6e89895b8da8d05ee7fa3e8f2c1a86557785dae0f69f9a98138d82e2496303d03642416cc3620f72507cfe4a9925112a366eeb87d52 SHA512 c57ab35bfd25ed6321c4abdce2fd32bab1e8a3a89ce1513f6464bb766850edcfa03ffef52c5aaf69edcaffcf143ce19cb0b8a51e1cfd98dc1c94bcb8ad166003
+EBUILD suricata-4.0.3.ebuild 4561 BLAKE2B d1b439fa196eb3e7e3d8b2eae0a3114d0db584d3d80ee914e10e62a245049b42f614432a8139a274091200fe485ed7e48eccf11f5de070751b82f977e7fe8021 SHA512 e21acd789dd6e45ba0b0afc0912a7d22a6cd3014329031a5662022d6af5032b5fc42ccb6c59e51db8a55386d90f7596865979526953ed8d9835182ab2b040394
 MISC metadata.xml 775 BLAKE2B faf442e43b5388b3a24b57ee3aa73ea22eb0f230bd7bfbdee98bc4ec0be260f52f47cf7caa67d44d3498cdba58e18c487741a295149c64cf2b4631a141537e8a SHA512 e9407a4c043553a31b1a66c6b45d352444368567eef3bfa4af26e64bb84a70a81bcc7a21e48dba7e532a3115c7086932e22b75a05b00ba1f84b59d4d7ec187c6
diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild
index 19c4e17ebb26..501a7c7a03ac 100644
--- a/net-analyzer/suricata/suricata-4.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-4.0.3.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit autotools eutils user
 
 DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+HOMEPAGE="https://suricata-ids.org/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ba19980b5827..1b91db39b374 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,12 +5,16 @@ AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfb
 AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c6faff9b0aeb08ed0097be31b6dfa5335aedfb53c6d18768848c18f20ef3af47fb1299ec498b3386f5c25ee07153d03ef29d7d0986 SHA512 26f99d8abedf60ec590331bffbef14de59ef6581e70a098b5b93b264c7bfce7ad9208c3037b11d2477ab3a5e7fdb87ff401d759fb665dc078a075cf296a7a034
 AUX wireshark-2.6.0-qtsvg.patch 800 BLAKE2B 767fdc6f54ad226b5b55333bfeb9a0c79d989a274b430a582f7a79406ac424474af2b723ade963a8d52428dfc66686aeb71366d133cdf2b0e714efdde549628a SHA512 fe326b15364ce139ac616ba9e6799d2519b00d67fb6e770c5294e15c8141fcf6d9fb4462e31d609bd98ac15c3a67dedd9e37a2eec42f47c95861aba7dee20f31
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
+AUX wireshark-2.6.1-Qt-5.11.patch 1968 BLAKE2B 74c96bfdec9540b7ea91dd71c9420ac735e9f9b7d2ebccafad5447252d7f6768184ce3af16628e966634473687f8da92e300b47c01ab2ce974a475e8796886b9 SHA512 a079b03d35733f837e73c5d2bd6860ccc3dc185f4488ac4768b3cf081bde15e86a562c7c5e445775e2618f993e8286d5bde9b0617f9d3f30e94d1802d4d75a63
+AUX wireshark-99999999-androiddump-wsutil.patch 772 BLAKE2B 061dc2253d10dd088ebf7cacbe6a1afadf2b5b41d37ad1de07e6c3985feb13934f743c3c303dab0548d4df4b762afd876ace6f522a3d0d750ed1d77b823402b7 SHA512 181683e22a2b694c28e49915d2b00e7c3261dc9eabc1893892d0c62f73b4aa28f3811a5b69ff496e2c166e2fa958f0a54776d63489337ccd4851d4eafddc0f0a
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
+AUX wireshark-99999999-qtsvg.patch 792 BLAKE2B 88a51d38d3854ff6488a5b3042866f9dba4a94009e241c1ec1838b008af7c006433d59b550a289bc132a01ee873838c22bc478f780d5e930afdb04de295426f0 SHA512 7cc0d21d5689fdae0714799f6b2ba3711a44eb353e55d4f367b5fd1974688be517d9629a8b68537edad8545ce5f5149109a5af3392d1c70e6d76734b7bae1822
+AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a SHA512 171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
 DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
 EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
-EBUILD wireshark-2.6.1.ebuild 6751 BLAKE2B 6b16e6dde3cfd158c8802b8de6bfcd41ec3f3c8fb8fc40d240023b30f80e2103c792d764996741abca06e0daae1bc5309955e368f231fcec5680f8dca31561d7 SHA512 42b51e4dcd87f05ea632005168f7eaa50b16cfe64f80b35c7ed9d7f43f52cee989f9fc7d739cea45f0697e2d6281fb252395853e9723f502bd418b8c21ba9499
-EBUILD wireshark-99999999.ebuild 6599 BLAKE2B 88bd901752d603d201d8f5cedaa986b70c19f934f3998003d8f14039eb9b86dfda8983a5a987f70efdb32fec3a2075e0059492d82b66f8ae9510a2475a434f43 SHA512 8b3d5fae3df5f2ca4cfcdd9fcfd110dbe88e7b9a283f2574242ccd7ef39aac44f3957d1488dc944166af7445aef6dff2d6f0c7371a5694a67ca877806371fc5f
+EBUILD wireshark-2.6.1.ebuild 6790 BLAKE2B 430b730aee91af383d262f5900ef4ff12250f24e2054f3a1a2d1592b3a0a8f8caba6f223ad55d2a6144c588fe79d474981d7c4c77fbb7dd0790d5442dd580a6c SHA512 7e696dc58ba80acf94afddada8f63660f03023a18dc654daf541b2aa7b98fc902f70c25b72050afa3456e0ab95b07491a514538309705a0de34a31dc59818441
+EBUILD wireshark-99999999.ebuild 6391 BLAKE2B a97356a1ffeafe735cad35e35d7633dc34c97239f7a0f47542da28d2912ca8eff0f9e5172d37efdc157d921026ddd6a92bb22d45b628cdecfdd485b0369552d4 SHA512 56818a23c3cd32a9553b4e7ca77ca21f99546a0a2bbab5fd8c3311d4c564c7e634fb19da5587609386ceb3c925150031b1c296753e89be68626b0f1e137903d8
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
new file mode 100644
index 000000000000..c8d8bb9ce9c2
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
@@ -0,0 +1,54 @@
+From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001
+From: Roland Knall <rknall@gmail.com>
+Date: Wed, 25 Apr 2018 10:28:30 +0200
+Subject: [PATCH] Qt: Fix various missing header includes
+
+Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing
+
+Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976
+Reviewed-on: https://code.wireshark.org/review/27145
+Petri-Dish: Roland Knall <rknall@gmail.com>
+Tested-by: Petri Dish Buildbot
+Reviewed-by: Roland Knall <rknall@gmail.com>
+---
+ ui/qt/packet_format_group_box.cpp | 1 +
+ ui/qt/time_shift_dialog.cpp       | 1 +
+ ui/qt/wireless_frame.cpp          | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
+index a80a71aaaddfce2798ececcbb27a4d9e75382c1b..3c0fff28aa4cd91d344f2e70db1e66123bc17f41 100644
+--- a/ui/qt/packet_format_group_box.cpp
++++ b/ui/qt/packet_format_group_box.cpp
+@@ -10,6 +10,7 @@
+ #include <ui_packet_format_group_box.h>
+ 
+ #include <QStyle>
++#include <QStyleOption>
+ 
+ PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
+     QGroupBox(parent),
+diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
+index 93882c09a377a5630e8bb09b4e80d7f6a84f7293..8460db2e966a0f572478de7430b8b63f4473dd16 100644
+--- a/ui/qt/time_shift_dialog.cpp
++++ b/ui/qt/time_shift_dialog.cpp
+@@ -14,6 +14,7 @@
+ #include <ui/time_shift.h>
+ #include <ui/qt/utils/tango_colors.h>
+ 
++#include <QStyleOption>
+ 
+ TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
+     QDialog(parent),
+diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
+index bd9076abcf4a5d7b6fd73d2bc0b63b4fff8c256a..46fb2dd2f3054f66380239106fb2e27058196447 100644
+--- a/ui/qt/wireless_frame.cpp
++++ b/ui/qt/wireless_frame.cpp
+@@ -23,6 +23,7 @@
+ #include <wsutil/frequency-utils.h>
+ 
+ #include <QProcess>
++#include <QAbstractItemView>
+ 
+ // To do:
+ // - Disable or hide invalid channel types.
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
new file mode 100644
index 000000000000..8ceb3ba54882
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
@@ -0,0 +1,34 @@
+--- a/extcap/CMakeLists.txt
++++ b/extcap/CMakeLists.txt
+@@ -68,6 +68,8 @@
+ 		if(HAVE_LIBPCAP)
+ 			set(androiddump_LIBS
+ 				ui
++				wiretap
++				wsutil
+ 				${GLIB2_LIBRARIES}
+ 				${PCAP_LIBRARIES}
+ 			)
+@@ -78,6 +80,7 @@
+ 		set(androiddump_LIBS
+ 			ui
+ 			wiretap
++			wsutil
+ 			${GLIB2_LIBRARIES}
+ 			${ZLIB_LIBRARIES}
+ 			${CMAKE_DL_LIBS}
+@@ -89,7 +92,6 @@
+ 	)
+ 
+ 	add_executable(androiddump WIN32 ${androiddump_FILES})
+-	# XXX Shouldn't we add wsutil to androiddump_LIBS instead?
+ 	set_extcap_executable_properties(androiddump)
+ 	target_link_libraries(androiddump ${androiddump_LIBS})
+ 	install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR})
+@@ -212,4 +214,4 @@
+ 	${androiddump_FILES}
+ 	${sshdump_FILES}
+ 	${ciscodump_FILES}
+-)
+\ No newline at end of file
++)
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
new file mode 100644
index 000000000000..4f151dbba21b
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -910,14 +910,12 @@
+ 		Qt5LinguistTools
+ 		Qt5Multimedia
+ 		Qt5PrintSupport
+-		Qt5Svg
+ 		Qt5Widgets
+ 	)
+ 	set(Qt5Core_OPTIONS REQUIRED)
+ 	set(Qt5LinguistTools_OPTIONS REQUIRED)
+ 	set(Qt5Multimedia_OPTIONS REQUIRED)
+ 	set(Qt5PrintSupport_OPTIONS REQUIRED)
+-	set(Qt5Svg_OPTIONS REQUIRED)
+ 	set(Qt5Widgets_OPTIONS REQUIRED)
+ 	if (APPLE)
+ 		set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+@@ -1187,11 +1185,6 @@
+ 		# That's the name autotools used
+ 		set(QT_MULTIMEDIA_LIB 1)
+ 	endif()
+-	if(Qt5Svg_FOUND)
+-		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
+-		# That's the name autotools used
+-		set(QT_SVG_LIB 1)
+-	endif()
+ 	if(Qt5MacExtras_FOUND)
+ 		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+ 		# That's the name autotools used
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch
new file mode 100644
index 000000000000..c0bfc3acd5a6
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch
@@ -0,0 +1,11 @@
+--- a/ui/CMakeLists.txt
++++ b/ui/CMakeLists.txt
+@@ -76,6 +76,8 @@
+ 
+ add_library(ui STATIC ${UI_SRC})
+ 
++set(ui_LIBS wiretap)
++
+ set_target_properties(ui PROPERTIES
+ 	LINK_FLAGS "${WS_LINK_FLAGS}"
+ 	FOLDER "UI"
diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index 0303f97755a3..c5eea4d2e6e9 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~hppa ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm hppa ia64 ~ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
 	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
@@ -91,6 +91,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
 	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.6.1-Qt-5.11.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump.patch
 )
 
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 7ca08d8b9246..d1a9875cba39 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,8 +13,8 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc
-	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
+	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux
 	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
 	zlib
 "
@@ -28,12 +28,6 @@ CDEPEND="
 	adns? ( >=net-dns/c-ares-1.5 )
 	bcg729? ( media-libs/bcg729 )
 	caps? ( sys-libs/libcap )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
 	kerberos? ( virtual/krb5 )
 	sshdump? ( >=net-libs/libssh-0.6 )
 	ciscodump? ( >=net-libs/libssh-0.6 )
@@ -43,7 +37,6 @@ CDEPEND="
 	maxminddb? ( dev-libs/libmaxminddb )
 	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -81,15 +74,15 @@ DEPEND="
 "
 RDEPEND="
 	${CDEPEND}
-	gtk? ( virtual/freedesktop-icon-theme )
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
 )
 
 pkg_setup() {
@@ -142,7 +135,6 @@ src_configure() {
 		-DBUILD_tshark=$(usex tshark)
 		-DBUILD_udpdump=$(usex udpdump)
 		-DBUILD_wireshark=$(usex qt5)
-		-DBUILD_wireshark_gtk=$(usex gtk)
 		-DDISABLE_WERROR=yes
 		-DENABLE_BCG729=$(usex bcg729)
 		-DENABLE_CAP=$(usex caps)
@@ -155,7 +147,6 @@ src_configure() {
 		-DENABLE_NETLINK=$(usex netlink)
 		-DENABLE_NGHTTP2=$(usex nghttp2)
 		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PORTAUDIO=$(usex portaudio)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
 		-DENABLE_SNAPPY=$(usex snappy)
@@ -205,7 +196,7 @@ src_install() {
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk || use qt5; then
+	if use qt5; then
 		local s
 		for s in 16 32 48 64 128 256 512 1024; do
 			insinto /usr/share/icons/hicolor/${s}x${s}/apps
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index e135c30e7ca9..9b93a3c66902 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/picocom/Manifest b/net-dialup/picocom/Manifest
index b67d59a8afbe..ecc2113f7d19 100644
--- a/net-dialup/picocom/Manifest
+++ b/net-dialup/picocom/Manifest
@@ -1,5 +1,5 @@
 DIST picocom-2.2.tar.gz 88670 BLAKE2B 47ba36e08e0c45b81a88a4eb66044e69814581c278193c228f83f1e0161c87d450997d26252b70bc66106ee1667d24da07f8a2451c6ae03df62ca86100a26824 SHA512 21495af30b81dfd1b3f4fea1ecf93c3a9252be1ae2ba94c7a2a07ceb75f562bc2ebc6ef6a8ae61f810ff5c121d4ab572a6f8ba75283e2cb28cf9886f834df0fa
 DIST picocom-3.0.tar.gz 116478 BLAKE2B 7c6b6518b1c687c60a34c8146eeaeed1bbbb9aeb5d3b09cfac524dab2c0ac8064471daeea32de3d3fabbe9afbd7dd066ea817c7c2c4942033808b02ec782afbe SHA512 3c22a7638be63cffcc3191479bd442a142e9b3d85815a000fa7ad7e04a4314f07331931d8f240f226ddb02dd15c79cd4fda98fc907629ad34820d481eb690bf0
 EBUILD picocom-2.2.ebuild 788 BLAKE2B f0f15d7a0231c40df08fc73b7a5ee6617145f22213af099d75873f852eb0c7589c2de4807154d46854d3172e911ec00ebe5b20b3660f3b3b8e6c7b5390124026 SHA512 422a9e110619df5f6f8141831afcd642f01e112935e11b7b1e0e7b0b7d822d2f048517081a16cdcb6496077a8e2d0ed1efbdca52bb70357e28a917fc2d65d8ec
-EBUILD picocom-3.0.ebuild 790 BLAKE2B c3e667af5ac0da2f5f70d6757169fcdd7aef3fa3d744f502517e45e7c234d98edc099d05d761a29bc24367266c0de397dc9831aeefcc89d9f316c2eee43414de SHA512 a267000c5c4646c6fbafdc24a3cd15e9e7bcbc207c4e9bb078c8821ea19c21ccddf04c71eeb9a29f0e4fa5cf3aadfb5f47851cbfb1e654d2cc9a9ce7bee0c989
+EBUILD picocom-3.0.ebuild 795 BLAKE2B 2a11fb5139e342cc8744918d4b3a586f8673cc11cdfa9fe2a7e1e51ae5bd0012f9c6b06b082eef2efc7183ee62d375c09c22f03f7c1c5c3aa8cd56454e14d483 SHA512 72653914bb0474b4c57b7d2f2cad4e997a4148814228bfeb4e04c9bf9cb43088a1ac28d1ad732c8265ef4c2c518448a5c98e9601b6d2085fbaa458dd279c2668
 MISC metadata.xml 335 BLAKE2B 0520f99d98b1ecfa11b8f25a5b371ac54eb9bf1e42df147902dbc284ac9062d3d30c8dc22081981dd2e79fde536262f967173cf052b866f980fe361cefe667d9 SHA512 9e039f41b69e370ca12ada0240ac7d9a2977cdc3bc1f2384c85cb14ae169b344272e9cb9705081e455a2a381533d488027f8a3e283e518d9ca23eac087e83bc4
diff --git a/net-dialup/picocom/picocom-3.0.ebuild b/net-dialup/picocom/picocom-3.0.ebuild
index 0e9387304c39..e5d52e872d4f 100644
--- a/net-dialup/picocom/picocom-3.0.ebuild
+++ b/net-dialup/picocom/picocom-3.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/npat-efault/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 src_compile() {
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 2040c3f510cb..d5a8f88fd1b4 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnscap/Manifest b/net-dns/dnscap/Manifest
index 74156ef8f711..9e590cfa8c5d 100644
--- a/net-dns/dnscap/Manifest
+++ b/net-dns/dnscap/Manifest
@@ -1,4 +1,4 @@
 AUX dnscap-20130814.install.patch 853 BLAKE2B 5f237bc91ee0e83d498d8df525d81aa137f520d484fbb05df29084669be611574bc53ad5258d3ccbc8068ff574c14126a19e22bf6a27cbf99cfc20b70565cc50 SHA512 03bda20b9034e2a594ae08824306583f1591ddc9b3fe5542d84e4a4534100a8b09f70b34db89a7a3edc97e4b4c9219a6586ca7b0f79878206efa8407bd44d23a
 DIST dnscap-20130814.tar.gz 99615 BLAKE2B e663349e4acc20b88f7aee14676736534746c54072a4bf5d9ab9aa9935781a39f4a94d0d718108aba6b4035390214d76caf62f9cd71b364507ec55c7e93fd07d SHA512 1969d8cc47c6206369a02b29064dbb7f663a2187203ab1f49d862082bfb6e44c9fccf90fb63d65a523c7a5cf4d24815a74b9dd18d81267b4447252d7a04f33dd
-EBUILD dnscap-20130814.ebuild 692 BLAKE2B ceeae01e50d031c0ee05b40211a8ac0aa645b30352d9ed454feb720bd2344be4c15346aca31b674ad5bbecf5fdbce22bd8a923be43f2a4c5b925a03713063cf0 SHA512 78bad3b0062972efc800b64d4233e3665551d192c444ee94e633a651738a14709ef1ff2dd1ef9716f50452d0ef1322403dc11b3252f9d4cb0cb118e99882c8d4
+EBUILD dnscap-20130814.ebuild 616 BLAKE2B ae959b4432e505f41d0e7b72b280c56d82739aae617717fd0a41ba70bb77ca920f384c3528483945d169bed646b4cd4a53e58c6f12f1ffde64a027ce21aca597 SHA512 17d2ac3dde251af82c60c5776fb920d3e0dd2fb97acd1a52b326059afc3a298855c0e1384eaa4bc0cfc74ea3cbb33a27d5e8373a00a5e5aeba6c9834b0c0de61
 MISC metadata.xml 340 BLAKE2B af2248099e5cbe707247fd010762031ae94faa37ce99b5c5a2dbf6cd64cc9efb50013041161c73128f95da3af02bb8b19624597439fb17a41ea08154e2e7be20 SHA512 b530daf6ee3fe2b034e019a2fa4d68cc43970bc2564702d5cbdb1af645dd155cd6733b882215990cfe365002422ed3c0fba50a5bf99815790b583a822f12d04c
diff --git a/net-dns/dnscap/dnscap-20130814.ebuild b/net-dns/dnscap/dnscap-20130814.ebuild
index baed5d542660..229ade9c0a25 100644
--- a/net-dns/dnscap/dnscap-20130814.ebuild
+++ b/net-dns/dnscap/dnscap-20130814.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
-
-DESCRIPTION="dnscap is a network capture utility designed specifically for DNS traffic"
-HOMEPAGE="http://dnscap.dns-oarc.net/"
+DESCRIPTION="network capture utility designed specifically for DNS traffic"
+HOMEPAGE="https://dnscap.dns-oarc.net/"
 
 ## github commit tarball
 MY_GIT_COMMIT="727ed7d5e46625abc2c8d988689a300589e948b6"
@@ -23,7 +21,4 @@ IUSE=""
 RDEPEND="net-libs/libpcap"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	## adds DESTDIR to install target
-	epatch "${FILESDIR}/${P}.install.patch"
-}
+PATCHES=( "${FILESDIR}/${P}.install.patch" )
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 5c0c9d0fc35c..a28c6bc76cd8 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,15 +1,10 @@
 AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
-AUX dnscrypt-proxy-2.confd 148 BLAKE2B 064ea4c9fc7f63091d4c20e9d978a3c8863711176c84707b99438a1caa29865eb1739e7ec4ae492f7e4e37c7834b8e20250fadd2483ad0267645ea636f70b22e SHA512 cacf0553e24b8adbe013133adbc5c77c98c5b8f4253497ffe986ceb8501f9b697ed773994e852dd8d9ea394f7a0fb4405f4297b48186f77f31dd1b597a46d4aa
-AUX dnscrypt-proxy-2.initd 646 BLAKE2B 3ede3fd925b6fad6f42ce4b52184ebdaa9c9cc881886e2b18d45f10476a7957ea09037ba2faf8d9ff12f4a0352e982f5d267410a9f3531f1d0ad8f5558d6576d SHA512 faa119b18765eb59ddacad1340752f1bbd9d10acf59f6b79bc4c31fcbe9f0e5f08bf6cd214ce2a5bdafe13c5d1a116aacea2e09a181699f8f06f3ec34fb9dcaa
-AUX dnscrypt-proxy-2.service 1204 BLAKE2B 879571cc00eab424b10f6ed79d9d52ba1ee835fd3ad7ef295d113b21afed075b3670066cf5dbdf0647c02853bb242c6d037f6ad962e0e6a7225b86fe88a3c9ab SHA512 3ae8f2dbe93169a6ddf71db85103a297210287006a63c71e9837ddfb62cecf6de28dd3ead6028e2f239edc4dab5a16d27c3c84fd2fcc23e41ba71b7b8fbf8b1f
-AUX dnscrypt-proxy-2.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
-AUX dnscrypt-proxy.conf 8912 BLAKE2B ea1b196528dae0c9536c12e3ed6b9839830ae4f89203ea19332d8238cbeba599a202557c75de1d77e2e4f306db1d2a1dd2bc352891bbc2f8a3595c8aa253fa6d SHA512 1e45f38a46383af14695cd44531335801ae315d819e9593e931be0fd513059c87ddfc9128158a532c6bc26cf113635c9630d8694764dff5a46a6a98c5ea8b42a
-AUX dnscrypt-proxy.confd-r1 41 BLAKE2B e73624ac07b382c9dd66970e12da3e00a669d548a32b16aec6e4227a0af73980f294444507c86fa0ae26e8f9f19c6d533f83ecdcbdcf9d8c28a8c47439844d77 SHA512 2f381c21e92a8f74d47f6c5d3d18bcc32a2713d3b7d82f260d8e2770bfb6aea0a46f8d957796c64d02e6a0445f92c31b83b29724b8004ba9fcc7f6fcc93afaf3
-AUX dnscrypt-proxy.initd-r1 258 BLAKE2B 86ceff0c2affc0508cafa782803498be680f46520a380eb64eb2fde026c65cd349a4a5f995e5a285c35db1514a77e95b5067c96cd41905f253e101bffa453f41 SHA512 700849b9a0b8a3a224d0c149091937f751461bb42c7ac4a4bccecf28d9a7b64dd2f47601bee1f8d5c08bdfad2defdcab0c0bc22c7393873612f56d78cd0edc6a
-AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589abbb6e5e214253fdc4f6d6686484e22dc24f45f05b23223bb8ada91e594bd0d015d35ed4850ce47e90d778a7867 SHA512 ff226e1f6416de04b42828ab89a0df48b4eac1385f489ccad594b5e07cbceb57249006951f25237a55effdd2acaf8ce7e0fb2c36fc17799f963d506696b0cb4f
-AUX dnscrypt-proxy.socket-r1 152 BLAKE2B e4eb7875f749646f77675b39c7c74f57d5674d825329891b0f128e190ac3625d28f81df8004975828080c6eb9665a8c0825826b5ccf305694c03c2e196da3dd7 SHA512 920014c202344726e645f3bfa5def0f194c215cc0ce6e45750e82cee3434399497b9ad3fb5268afb1823689ced0fa8d177d6411b3153661b97fbd55984752a87
-DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
+AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
+AUX dnscrypt-proxy.initd 646 BLAKE2B 3ede3fd925b6fad6f42ce4b52184ebdaa9c9cc881886e2b18d45f10476a7957ea09037ba2faf8d9ff12f4a0352e982f5d267410a9f3531f1d0ad8f5558d6576d SHA512 faa119b18765eb59ddacad1340752f1bbd9d10acf59f6b79bc4c31fcbe9f0e5f08bf6cd214ce2a5bdafe13c5d1a116aacea2e09a181699f8f06f3ec34fb9dcaa
+AUX dnscrypt-proxy.service 1204 BLAKE2B 879571cc00eab424b10f6ed79d9d52ba1ee835fd3ad7ef295d113b21afed075b3670066cf5dbdf0647c02853bb242c6d037f6ad962e0e6a7225b86fe88a3c9ab SHA512 3ae8f2dbe93169a6ddf71db85103a297210287006a63c71e9837ddfb62cecf6de28dd3ead6028e2f239edc4dab5a16d27c3c84fd2fcc23e41ba71b7b8fbf8b1f
+AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
 DIST dnscrypt-proxy-2.0.14.tar.gz 2876583 BLAKE2B f93b2ba8991668691d503a5c039c4bb8eee0f474893c99ebd68067faa2a530832434c08654f61482a9d5b876ecf10329117b76a20b837fde00d72521170a1d86 SHA512 2574f900b6e2f75eeeee2f634e22df41145243c23cd9a890fcfa73f13b7d032bc2b029cbb6498f5c2cd33e212392ca2298a1dce6bb369be5c9afccc21a706613
-EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-EBUILD dnscrypt-proxy-2.0.14.ebuild 2876 BLAKE2B 1d8617576f87525d517f7a32be2d4f044fdcfc865cc11278a4469c1c2ff9c6f550f8d244adc97852ca48d03388845259335f9d837e5e40d2893bbe74cf7e47d3 SHA512 f77bb0d9cb3bea881c4bb15cf027564937bfbde26fbcaad3e58ceefc39dfb935dc165428b9365810af1e4df7a7d00526a41d6b2d749ad357fcab1273d0006cbf
-MISC metadata.xml 941 BLAKE2B 234421b342985e6980a870bc0f7e4dc96e2867d89aa589ac23723a7a7cc4767109de7f046c817c3a21ea1bab23d352210941dc092b002dd3a7374be6c459877c SHA512 6bad822978132f7467756a88695e9e87a3ec2c007af04b423496f7befc1fc4de781a78bac17167b6de6682688e3ef445e5dce7f6f3f3e9c25a632e6222268918
+DIST dnscrypt-proxy-2.0.15.tar.gz 2887764 BLAKE2B 7c4dd36f8305494566cb8548e478d9b89eed799dab124e574c0840c606f6c51cafb73818a07b18928a6457756a122d7bceabc108b1114b2b546d3db707d2ef3a SHA512 4517ab7b7eb1474f8c9e133a289caf6c02f472b51b910f1fbe1e5ffd6d389943626c8878e68f7f27a47b00301a427dfe9c563bc82b67cafab32f4ab3bc4c84b9
+EBUILD dnscrypt-proxy-2.0.14.ebuild 2868 BLAKE2B aa4eb4cf21e09fdb4926f6dc7f8047f3c107ab8dbcb892d3f3f791f898f24ed0b0e6e3b79cbed09661c069e2c090378ec03efd7b5d02c12c8df1763513542656 SHA512 4d9cdee6adc23292c4e9b9f66ef936875915c82f1d5b94991052b41873a4c7d5a7996e2ccd0e3aad6096579e0662601e8e7ddca4abc178182157bf31ff1e9fb6
+EBUILD dnscrypt-proxy-2.0.15.ebuild 2868 BLAKE2B aa4eb4cf21e09fdb4926f6dc7f8047f3c107ab8dbcb892d3f3f791f898f24ed0b0e6e3b79cbed09661c069e2c090378ec03efd7b5d02c12c8df1763513542656 SHA512 4d9cdee6adc23292c4e9b9f66ef936875915c82f1d5b94991052b41873a4c7d5a7996e2ccd0e3aad6096579e0662601e8e7ddca4abc178182157bf31ff1e9fb6
+MISC metadata.xml 741 BLAKE2B 301593e47c2511e5160a1fa8729df605be436feb3e1b1e14de5cbceb584c89c856c2af3081a1325c354919fbf691dcdc94773f5596ba13598f451ab55b6b09f8 SHA512 f1eaeede9bb33d5341ef874b344fc9f34be7111c2e789c6088386d75ae864e68cb658246dc939ca0a0adda3898cdf88cdc321ccf1af3d8a5579cddf259852cb0
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5-r1.ebuild
deleted file mode 100644
index f72136ca55b0..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="https://dnscrypt.org"
-SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="hardened libressl +plugins ssl systemd"
-
-RDEPEND="
-	dev-libs/libsodium:=
-	net-libs/ldns
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable hardened pie) \
-		$(use_enable plugins) \
-		$(use_enable ssl openssl) \
-		$(use_with systemd)
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README* THANKS *txt )
-
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-	systemd_newunit "${FILESDIR}"/${PN}.socket-r1 ${PN}.socket
-	insinto /etc
-	doins "${FILESDIR}"/${PN}.conf /etc
-}
-
-pkg_preinst() {
-	# ship working default configuration for systemd users
-	if use systemd; then
-		sed -i 's/Daemonize yes/Daemonize no/g' "${D}"/etc/${PN}.conf
-	fi
-}
-
-pkg_postinst() {
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	use systemd && elog "with systemd dnscrypt-proxy ignores LocalAddress setting in the config file"
-	use systemd && elog "edit dnscrypt-proxy.socket if you need to change the defaults"
-	elog
-	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
-}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
index 0b64d8b992e3..5b04253b9c9b 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
@@ -42,10 +42,10 @@ src_install() {
 	insinto "/usr/share/dnscrypt-proxy"
 	doins -r "utils/generate-domains-blacklists/."
 
-	newinitd "${FILESDIR}"/dnscrypt-proxy-2.initd dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy-2.confd dnscrypt-proxy
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy-2.service dnscrypt-proxy.service
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy-2.socket dnscrypt-proxy.socket
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
 
 	einstalldocs
 }
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
new file mode 100644
index 000000000000..5b04253b9c9b
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt-proxy
+	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
+}
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto "/usr/share/dnscrypt-proxy"
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			elog "Version 2 is a complete rewrite of ${PN}"
+			elog "please clean up old config/log files"
+			elog
+		fi
+		if [[ ${v} == 2.* ]] ; then
+			elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
+			elog "you can remove obsolete 'dnscrypt' accounts from the system"
+			elog
+		fi
+	done
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
deleted file mode 100644
index 492b2fc22940..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#DNSCRYPT_PROXY_OPTS="-config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
-#DNSCRYPT_PROXY_USER="dnscrypt-proxy"
-#DNSCRYPT_PROXY_GROUP="dnscrypt-proxy"
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf
deleted file mode 100644
index 52487c09c878..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.conf
+++ /dev/null
@@ -1,242 +0,0 @@
-######################################################
-#                                                    #
-#    Sample configuration file for dnscrypt-proxy    #
-#                                                    #
-######################################################
-
-
-############## Resolver settings ##############
-
-## [CHANGE THIS] Short name of the resolver to use
-## Usually the only thing you need to change in this configuration file.
-## This corresponds to the first column in the dnscrypt-resolvers.csv file.
-## Alternatively, "random" (without quotes) picks a random random resolver
-## accessible over IPv4, that doesn't log and supports DNSSEC.
-
-ResolverName random
-
-
-## Full path to the list of available DNSCrypt resolvers (dnscrypt-resolvers.csv)
-## An up-to-date list is available here:
-## https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv
-## and the dnscrypt-update-resolvers.sh script can be used in order to
-## automatically download and verify updates.
-
-ResolversList /usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv
-
-
-## Manual settings, only for a custom resolver not present in the CSV file
-
-#ProviderName    2.dnscrypt.some.provider.name.tld
-#ProviderKey     0000:1111:2222:3333:4444:5555:6666:7777:8888:9999:AAAA:BBBB:CCCC:DDDD:EEEE:FFFF
-#ResolverAddress 111.222.333.444:56789
-
-
-
-############## Process options ##############
-
-## [NOT AVAILABLE ON WINDOWS] Run the proxy as a background process.
-## Unless you are using systemd, you probably want to change this to "yes"
-## after having verified that the rest of the configuration works as expected.
-
-Daemonize yes
-
-
-## Write the PID number to a file
-
-PidFile /run/dnscrypt-proxy.pid
-
-
-## [NOT AVAILABLE ON WINDOWS] Start the process, bind the required ports, and
-## run the server as a less-privileged system user.
-## The value for this parameter is a user name.
-
-User dnscrypt
-
-
-############## Network/protocol settings ##############
-
-## Local address and port to listen to.
-## A 127.0.0.x address is recommended for local use, but 0.0.0.0 or
-## a specific interface address can be used on a router, or to
-## configure a single machine to act as a DNS proxy for different
-## devices.
-## If the socket is created by systemd, the proxy cannot change the address
-## using this option. You should edit systemd's dnscrypt-proxy.socket file
-## instead.
-
-LocalAddress 127.0.0.1:53
-
-
-## Cache DNS responses to avoid outgoing traffic when the same queries
-## are repeated multiple times in a row.
-
-LocalCache on
-
-
-## Creates a new key pair for every query.
-## This prevents logging servers from correlating client public keys with
-## IP addresses. However, this option implies extra CPU load, and is not
-## very useful with trusted/non-logging servers.
-
-EphemeralKeys off
-
-
-## Maximum number of active requests waiting for a response.
-## Keep it reasonable relative to the expected number of clients.
-
-# MaxActiveRequests 250
-
-
-## This is the maximum payload size allowed when using the UDP protocol.
-## The default is safe, and rarely needs to be changed.
-
-# EDNSPayloadSize 1252
-
-
-## Ignore the time stamps when checking the certificates
-## Do not enable this option ever, unless you know that you need it.
-
-# IgnoreTimestamps no
-
-
-## Do not send queries using UDP. Only use TCP.
-## Even if some resolvers mitigate this, DNS over TCP is almost always slower
-## than UDP and doesn't offer additional security.
-## Only enable this option if UDP doesn't work on your network.
-
-# TCPOnly no
-
-
-## Forward queries for specific zones to one or more non-DNSCrypt resolvers.
-## For instance, this can be used to redirect queries for local domains to
-## the router, or queries for an internal domain to an internal DNS server.
-## Multiple whitespace-delimited zones and IP addresses can be specified.
-## Do not enable this unless you absolutely know you need it.
-## If you see useless queries to these zones, you'd better block them with
-## the BlackList feature instead of sending them in clear text to the router.
-## This uses a plugin that requires dnscrypt-proxy to be compiled with
-## the ldns library.
-
-#Forward domains:"localdomain" to:"192.168.0.1"
-
-
-############## Logging ##############
-
-## Log the received DNS queries to a file, so you can watch in real-time what
-## is happening on the network.
-## The value for this parameter is a full path to the log file.
-## The file name can be prefixed with ltsv: in order to store logs using the
-## LTSV format (ex: ltsv:/tmp/dns-queries.log).
-
-# QueryLogFile /tmp/dns-queries.log
-
-
-## Log file to write server errors and information to.
-## If you use this tool for privacy, keeping logs of any kind is usually not
-## a good idea.
-
-# LogFile /var/log/dnscrypt-proxy.log
-
-
-## Don't log events with priority above this log level after the service has
-## been started up. Default is 6.
-## Valid values are between 0 (critical) to 7 (debug-level messages).
-
-# LogLevel 6
-
-
-## [NOT AVAILABLE ON WINDOWS] Send server logs to the syslog daemon
-## Log entries can optionally be prefixed with a string.
-
-Syslog       on
-# SyslogPrefix dnscrypt
-
-
-
-############## Local filtering ##############
-
-## If your network doesn't support IPv6, chances are that your
-## applications are still constantly trying to resolve IPv6 addresses,
-## causing unnecessary slowdowns.
-## This causes the proxy to immediately reply to IPv6 requests,
-## without having to send a useless request to upstream resolvers, and
-## having to wait for a response.
-## This uses a plugin that requires dnscrypt-proxy to be compiled with
-## the ldns library.
-
-BlockIPv6 no
-
-
-## Want to filter ads, malware, sensitive or inappropriate websites and
-## domain names? This feature can block lists of IP addresses and names
-## matching a list of patterns. The list of rules remains private, and
-## the filtering process directly happens on your own network. In order
-## to filter IP addresses, the list of IPs has to be put into a text
-## file, with one IP address per line. Lists of domain names can also be
-## blocked as well. Put the list into a text file, one domain per line.
-## Domains can include wildcards (*) in order to match patterns. For
-## example *sex* will match any name that contains the sex substring, and
-## ads.* will match anything starting with ads. The Internet has plenty
-## of free feeds of IP addresses and domain names used for malware,
-## phishing and spam that you can use with this feature.
-##
-## This uses a plugin that requires dnscrypt-proxy to be compiled with
-## the ldns library.
-##
-## To enable, uncomment one of the following definitions:
-
-## Block query names matching the rules stored in that file:
-# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt"
-
-## Block responses whose IP addresses match IPs stored in that file:
-# BlackList ips:"/etc/dnscrypt-blacklist-ips.txt"
-
-## Block both domain names and IP addresses:
-# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" ips:"/etc/dnscrypt-blacklist-ips.txt"
-
-## Same as the above + log the blocked queries in a file.
-## The log file can be prefixed with ltsv: (ex: ltsv:/tmp/log.txt) in order to
-## store logs using the LTSV format.
-# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" logfile:"/var/log/dnscrypt-blocked.log"
-# BlackList ips:"/etc/dnscrypt-blacklist-ips.txt" logfile:"/var/log/dnscrypt-blocked.log"
-# BlackList domains:"/etc/dnscrypt-blacklist-domains.txt" ips:"/etc/dnscrypt-blacklist-ips.txt" logfile:"/var/log/dnscrypt-blocked.log"
-
-
-
-############## User identification ##############
-
-## Use a client public key for identification
-## By default, the client uses a randomized key pair in order to make tracking
-## more difficult. This option does the opposite and uses a static key pair, so
-## that DNS providers can offer premium services to queries signed with a known
-## set of public keys. A client cannot decrypt the received responses without
-## also knowing the secret key.
-## The value for this property is the path to a file containing the secret key,
-## encoded as a hexadecimal string. The corresponding public key is computed
-## automatically.
-
-# ClientKey /etc/dnscrypt-client-secret.key
-
-
-
-############## Monitoring ##############
-
-## Do not actually start the proxy, but check that a valid certificate can be
-## retrieved from the server and that it will remain valid for the specified
-## time period. The process exit code is 0 if a valid certificate can be used,
-## 2 if no valid certificates can be used, 3 if a timeout occurred, and 4 if a
-## currently valid certificate is going to expire before the given margin.
-## Useful in a cron job to monitor your own dnscrypt-servers.
-## The margin is specified in minutes.
-
-# Test 2880
-
-
-
-############## Recursive configuration ##############
-
-## A configuration file can include other configuration files by inserting
-## the `Include` directive anywhere (the full path required, no quotes):
-
-# Include /etc/dnscrypt-proxy-common.conf
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
new file mode 100644
index 000000000000..a8db66a6ecd5
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
@@ -0,0 +1,4 @@
+#rc_use="tor"
+#DNSCRYPT_PROXY_OPTS="-config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
+#DNSCRYPT_PROXY_USER="dnscrypt-proxy"
+#DNSCRYPT_PROXY_GROUP="dnscrypt-proxy"
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1
deleted file mode 100644
index 9137e1836fe0..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r1
+++ /dev/null
@@ -1 +0,0 @@
-DNSCRYPT_OPTS="/etc/dnscrypt-proxy.conf"
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index 4a46acdc4bb3..4a46acdc4bb3 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
deleted file mode 100644
index 08196ff1a7c9..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/dnscrypt-proxy"
-command_args="${DNSCRYPT_OPTS}"
-pidfile="/run/${SVCNAME}.pid"
-
-depend() {
-	use net dns logger
-}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
index ed02955621ba..ed02955621ba 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.service
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1
deleted file mode 100644
index 8cbf5f1a4143..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=DNSCrypt client proxy
-Documentation=man:dnscrypt-proxy(8)
-Requires=dnscrypt-proxy.socket
-After=network.target
-Before=nss-lookup.target
-
-[Install]
-Also=dnscrypt-proxy.socket
-WantedBy=multi-user.target
-
-[Service]
-Type=simple
-NonBlocking=true
-
-# Edit the configuration file appropriately, or the service will not start.
-# See https://dnscrypt.org for more information.
-ExecStart=/usr/sbin/dnscrypt-proxy /etc/dnscrypt-proxy.conf
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.socket b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket
index ea38c90e8a5d..ea38c90e8a5d 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.socket
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1
deleted file mode 100644
index 5ee0e4502cf1..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.socket-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=dnscrypt-proxy listening socket
-
-[Socket]
-ListenStream=127.0.0.53:53
-ListenDatagram=127.0.0.53:53
-
-[Install]
-WantedBy=sockets.target
diff --git a/net-dns/dnscrypt-proxy/metadata.xml b/net-dns/dnscrypt-proxy/metadata.xml
index c1a85090aac5..d67745d93d23 100644
--- a/net-dns/dnscrypt-proxy/metadata.xml
+++ b/net-dns/dnscrypt-proxy/metadata.xml
@@ -12,15 +12,9 @@
 	<longdescription lang="en">
 		dnscrypt-proxy provides local service which can be used directly as your
 		local resolver or as a DNS forwarder, encrypting and authenticating
-		requests using the DNSCrypt protocol and passing them to upstream
-		servers.
+		requests using the DNSCrypt or DNS-over-HTTPS protocol and passing them
+		to upstream servers.
 	</longdescription>
-	<use>
-		<flag name="plugins">Enable plugin support to inspect and modify
-			queries and responses</flag>
-		<flag name="systemd">Use systemd's socket activation instead of
-			creating the sockets itself</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">jedisct1/dnscrypt-proxy</remote-id>
 	</upstream>
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 6ebc06e96f40..c895124c4746 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -3,6 +3,8 @@ AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc3
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.5.7.tar.xz 1084656 BLAKE2B c2d583625a19f6a61248b3b42cdf14f5bb2bdbafdb20be6b0813744095a4016a4be2eb5e2dfaff0628238c60153480175a86706db0b88569d76156f86ba33968 SHA512 96e375f556309bb89cea982dda169cef70c23d03c48282110e47a44849c1102cd37d98aa7650781b399f5d932b724b8a935f0b9e55e4920465ae7b74a0d1d55a
 DIST knot-2.6.6.tar.xz 1120340 BLAKE2B 374d9b78f2ef2143d1221fced29184a52ee3773abd7cb08b6b48910f6ffc0f7c4f07c00d17d28344c93d71a709363bdf855d20587f87da622153c44d08d85fd8 SHA512 bd7a36decc74041f12971045cd69b8cc9e7ecce68f8d2b4cddc9b5f23ee96e8ed290d98fe9e6c441d6727ad4395bea615cbd9ec19cc641abce19ef8da6371972
+DIST knot-2.6.7.tar.xz 1121120 BLAKE2B c3000a08a8d873efc5a120d0f0154bcd16be0162ce3c21d74041181183c5f6f1600eeab3546737591ccd1522c8119202dc1f7dd576b70d4c006c0619b904f54a SHA512 021810b396e9aaca140c6df858c8dcb9a4be6ac8d64a413195b88d8073d39e1de0604058343bff7534d39f32de27b0e0bc2271a0e545bb9f809adfe1bfaec9a9
 EBUILD knot-2.5.7.ebuild 1913 BLAKE2B df4f8dba2d9cf3b2a2905eee881bd57ec81d3086682c1791ea3c1a3a14df72997346873ff1f4bbaa08a70584123c260d27e4e436e76cf04840e379a58e3a143a SHA512 62e40fe7b3ddd94544cb1435f448ee3e9ed0175a1b68211ee0328c34163a52127d35fec146168a1846c4da44cca3098fe562828b8c62fef7238bfed3713596ed
 EBUILD knot-2.6.6.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
+EBUILD knot-2.6.7.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
 MISC metadata.xml 1539 BLAKE2B c07704f4bbf249b7953403a33c71d7565ef2219b019dbccdc15d9d459ff57f0aa200ed5ae9ab74b07e352d8dcd12f62f5d7bb392b064dbeedad3257ced653675 SHA512 8b39c687fb8b9fb4bf25e0baa8c851ffb4980c0028bf0f64a3c642146139429e292c6ca3fbd01b7bb311ecbbe7bf1df128885b53971b836f541fe97bedf6f056
diff --git a/net-dns/knot/knot-2.6.7.ebuild b/net-dns/knot/knot-2.6.7.ebuild
new file mode 100644
index 000000000000..2c624d4be58a
--- /dev/null
+++ b/net-dns/knot/knot-2.6.7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+dnsproxy"
+	"dnstap"
+	"+noudp"
+	"+onlinesign"
+	"rosedb"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu
+	dev-python/lmdb
+	net-libs/gnutls
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	idn? (
+		!libidn2? ( net-dns/libidn )
+		libidn2? ( net-dns/libidn2 )
+	)
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	rmdir "${D}var/run/${PN}" "${D}var/run/" || die
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	enewgroup knot 53
+	enewuser knot 53 -1 /var/lib/knot knot
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index c0174410c388..8f2c442dd45b 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -15,6 +15,7 @@ DIST unbound-1.6.6.tar.gz 5460482 BLAKE2B af0d9ca0e5eeaebc3a2023dc7179a3bc80952d
 DIST unbound-1.6.7.tar.gz 5466931 BLAKE2B 57a051d5ac6d7fbc3d51613305651987670d0f50fbebf661505b42b6c8980543b34b52a4f9ca9e6ee4dbad59d9acf547b78cf35a691d0c00884da979ae22d8c4 SHA512 6e3d1a057081252183343d0d1b8ace742ab15e8f5244e61287340f49289d7449bed93fbfdaa3194c0e99ca23948f4b33038f75af5c5b26c938004d06fc3031e0
 DIST unbound-1.6.8.tar.gz 5467536 BLAKE2B 06caffbd905c339b3d0667382114bb3e5d5da90988402c8f488f789f9bf6ab87377e6a26aa083a7e9ba3d023f37d3eeba1e069adf8a8a266b23fb8361aeb6e26 SHA512 653d88d5dbc8cf25f7261e4a9869b6591843c7ff27b5d63f979a94505daafbbb61e05d46bedd2d01230355d5f08dd9fe14ed04c5c7340f3f27581b61ad6edfa3
 DIST unbound-1.7.0.tar.gz 5538228 BLAKE2B a825e2cbef74b3a78f9802056d6f0992f77e0d40d4d28889c98b9ffa224ec3281b6873eab59134dcca8dc56bdd17202b3817dd28ab30d0a0bb72d749426b7675 SHA512 49b07643da2a89d8ceedce1295f550f74a76f4f11c2df54df55e9c42f03bad1b133789c7b36fb3c4f37d6b331ac302ecfd1249e8ebaaa4333beda8fa250b61d9
+DIST unbound-1.7.1.tar.gz 5565938 BLAKE2B 423dde8a13ea3539d86eade96507e6cdb4ac816393e99f58b4e0dc74a79c31bae57c87924ef737a567cc338d02d672f6c059c86d2f28a634f06e5f9a339f4260 SHA512 99a68abf1f60f6ea80cf2973906df44da9c577d8cac969824af1ce9ca385a2e84dd684937480da87cb73c7dc41ad5c00b0013ec74103eadb8fd7dc6f98a89255
 EBUILD unbound-1.5.1-r2.ebuild 3427 BLAKE2B 193c35ecb00ae6303e6ab97852f79dffdf2bef64ce0b7c6e961370eb87d9506569e8aadfa6386624ce121162380b24fde713b36865b18bf228aacb3651defde8 SHA512 d3630f81fd44b40f5deb155473dc5835cc68e444be26afd0207fa734f285b566694b92dc073185cb24c9588a0ca5cb9ebf9c9268c2725c24a6c61d7ca73d1bcf
 EBUILD unbound-1.5.10.ebuild 3465 BLAKE2B 765d3f8f6a987a22195a235e515fb4fd29005a8e2b8d2eeadc9328993ba41d95655db10e1f8426b449311b08516b8dbd4abae382bf6d9b2f3608716c7f57f30c SHA512 28fb9da2c9bf08fbdd8e440c7c0f61da5ef25f7ca179b18e7c189e5c23f70dea295e1dd9b0fa289c75f5a4ee24ed9e1b3248f62fb0dc05d78068f22c00d100a7
 EBUILD unbound-1.6.3.ebuild 3689 BLAKE2B 8bdfd0f5b48ed66d7eb167e187cac4c64c3c0a044f0523662f253514717a273671fa15e6e931ec03f3ea16a6f2f727701811f41a10ecd49326a9c855f694a2d1 SHA512 15d464ec999b6c98e05d5904e52af977036c2c7ea2bf1d54cebf05f6841f8c28adda1b5d6fa9f344d12ea8417f512a1f0c0487aad62627a7761e97e71f3b018c
@@ -24,4 +25,5 @@ EBUILD unbound-1.6.7.ebuild 3696 BLAKE2B 224feff7eaac4169dcd877ce794df745a5e67c7
 EBUILD unbound-1.6.8-r2.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
 EBUILD unbound-1.6.8.ebuild 3696 BLAKE2B 2b520948c09e02bba9a1685e25a46b94280d9ef65fc69091b0a6a33b176b8538033d3347aa828e6bb66df85383d1b33f343085f52b3a1e3150e6aa1bf8808c37 SHA512 06c2a8cc24f9ef503eacfcc0a6dd19c63651163dc7b6523f75360f6902deb8f74b616d370c3f93b4633cc823a93be7dc833d8427c70c1b5530cf96a77b056ee9
 EBUILD unbound-1.7.0.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
+EBUILD unbound-1.7.1.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
 MISC metadata.xml 1008 BLAKE2B 1852e514f97f9305848144ae0f9aaf8fb49546cd9afcd873ab67dcefee0503d5047809dc8c650006ccdb236c9ba9ff02cc5ecf726d61c25e17167409f91d3fb1 SHA512 f6654d6d254a4d51a8c454c542f1fbbff16bfeaa1cb681f110b9ae99a4231cdb7c073a5d42faba71168079330f9e01781df7a5b3e1bd70d771c874a5bbe9742a
diff --git a/net-dns/unbound/unbound-1.7.1.ebuild b/net-dns/unbound/unbound-1.7.1.ebuild
new file mode 100644
index 000000000000..9edf230ed88d
--- /dev/null
+++ b/net-dns/unbound/unbound-1.7.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="http://unbound.net/"
+SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa gost libressl python selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# To avoid below error messages, set 'trust-anchor-file' to same value in
+	# 'auto-trust-anchor-file'.
+	# [23109:0] error: Could not open autotrust file for writing,
+	# /etc/dnssec/root-anchors.txt: Permission denied
+	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--with-libevent="${EPREFIX}"/usr \
+		--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound.initd unbound
+	newconfd "${FILESDIR}"/unbound.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' "${ED}/etc/unbound/unbound.conf"
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${ROOT}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${ROOT}/etc/unbound/var"
+	fi
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: /etc/unbound/var/root-anchors.txt' in /etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '/usr/sbin/unbound-anchor -a /etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index ed0fc3e2b3fb..9f0c87703f07 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 78fdfdb950b2..e4da1124cbde 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -4,47 +4,20 @@ AUX shorewall-init.initd 4357 BLAKE2B 192e36a9e488c510783454852e65e2963e400fcabc
 AUX shorewall-init.readme 1233 BLAKE2B a0603996cba908f3ff101ea82761c5acc279ee590311e7a8cb911bbfc59b6736b74fbf515f65b75eb5c5337fdbc7f23a484b1b5eee3f07964778753b7ceaca03 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a
 AUX shorewall-init.systemd 389 BLAKE2B fe2ba4c0be798fb994643ff050bb3fdce5c97f43dd38d5c1e38eae010c32df80bbf065b654721ceb98c344a67d59324545b5155e16d01ce1f8e94b2bff768732 SHA512 458c5fb5d894f307cec27fd42d05a1b16f10d556afd11a7b73f75be8eb072aa5256ba6095b4e3454694b9bc3e6cf80d7f40314bbe368ebfd4646074a12669f4c
 AUX shorewall-lite.confd-r1 197 BLAKE2B efd61f07ee3b601e7f2510e19a9ea065cf30fa414c23eb0d6e036b9bea6cff72ea5fa606033dfad4bd2f08db6d1a2a28b60ba3018e64e8f9d75366ed9f32d5bd SHA512 fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b
-AUX shorewall-lite.initd-r2 2236 BLAKE2B 2ab64ec540c4ea32e8e696d1f0773d3663cc2b077e72a58a7a3012d28b552a1774a1e89cb4ad5e6b5ad1baaee29ad073842762f11c8902c4a1b6bfa3a12ebe86 SHA512 3277922dd65ea573ddc210f07f42831b18275157a595c95517e7306cccd75e2884d30acd36288b2082becf3879977a85efdd0456fc27466d2acff3cd921f6d0f
 AUX shorewall-lite.initd-r3 2238 BLAKE2B 4a1c559589a9e0f6a332879cc8c61228cc65f1fe6d648452009348a6b2a6578028a03e764518ed63b7994615149cec0524cffe66daa13b1805e0d155addf2352 SHA512 215a33cf378a12b6d1563b0b9fa95d372e069aa1cf7904a067c12cdfef80f1ba46910d37ba1be8f4ea6a272e5bf4d7ad37563257139d014f7f12ad91021b599b
 AUX shorewall-lite.systemd 603 BLAKE2B 527572f0d110ee94d8398789fb1d55acd6d91fbaf4ddf4c0bd8e606679beef5d9a3ce382cde1c5424813f04df14e98f9c71b0d0ef941826132c66143ca3d5361 SHA512 b9ac8ca1f31d29dfbd6a3e9387932ebf954e18c634df7e6118c55e3eaaf20a835e47e0bad07bb4ae1c47e76cda91bb3d03cd59f61805e48c194833b86d14a54d
 AUX shorewall.confd-r1 197 BLAKE2B efd61f07ee3b601e7f2510e19a9ea065cf30fa414c23eb0d6e036b9bea6cff72ea5fa606033dfad4bd2f08db6d1a2a28b60ba3018e64e8f9d75366ed9f32d5bd SHA512 fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b
-AUX shorewall.initd-r2 2652 BLAKE2B 67ec5b68284e7524a9fd03e552af2b51b11a5ff1aec7bab87f5a1e7f5d1fd894173a24f8676aafbae26d0ea6ee5c3a0187c309f7a797a46c44670c04b145858f SHA512 aee8747282dd8e7ecc7cd50ce358d8701f7bff3e5325d3da474aaa31edbf0833345338774fa51648498e398672f9a0ddefc49f3c2c09f5bf075571d9247c6858
 AUX shorewall.initd-r3 2394 BLAKE2B af8d12c9eac3e0f9fbdfeb44b125bfdd949c8310307ad52334f51b89865c02dd843fc850e2784bc8a56af5656e22e00b226563be02df2508debacbb6c363c063 SHA512 4cf71fd8087fa6c81a2ef4845da108df08f03c63f5a1312e79ec7f32cdae0d14d4d21a2af2ab696cc9be3c6d9215f097461b46b398db2a18067987cac00e5771
 AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b3966eadd971d5927310cf251dc706687e1af26938bed049074495f57b566c47ee82fbc32ca5bcf957b26 SHA512 eee635ce7818c416f3563fa8453d580a77451bc87bf12a285649ab22eb68c8d001ce54a8ba70742f46c7b1104acc3e2b9aba4878267992ad84f9042b625b0634
 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
-AUX shorewallrc-r2 2035 BLAKE2B e130d1d45427f5d5fba36e75e88ce9cafd3d3a207e63e006ed869c4b9cabc37e0ee1573f89ba8a1c4879a701baccba1a8c6c45c051b4ddd1043a0afac534aa03 SHA512 0a446beabc540bead854c141cc0e19ded5da548f7cbb83f99cbcce58227311579c7f03f3b94f51851ed689b8c904085a2fd32478f18729f34c1aabfc1ea9b577
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
-DIST shorewall-5.1.12.4.tar.bz2 555854 BLAKE2B 697fb7dbe4217b3a8d7230b3d79cec94f33ff69975b9f52477def8424e2ed9c79614e5aff4a40e31c2c0c69bc32f88c40810b7b1e5381037df1cf225b8bf97ec SHA512 25038865df0b3a4d1bcdb14b58108cd0f42e8738c3415ef2ce6fcbf3b15fc651fa90ce6adcfc3c67d6e0dd18709c4862a3ca18f1976e6c96567db6cdae86e000
-DIST shorewall-5.2.0.2.tar.bz2 537374 BLAKE2B 650b3f23307be51b3a4ce75dcdfb3024ab476b5b5a2119b92181a8fc304ea6c4d1bdad342163eff4ea797d6dd18de0c0f1cf26d4de1e48f5fb0b384c25c85edf SHA512 e80525599956316fbd1421fce95e2e6adc0a2992ef1791b3d4d5a339100859c34396e19ee4f00f430f5808fc160c09e6f7a7f4f619bbbe21422524f1daaa1849
-DIST shorewall-5.2.0.3.tar.bz2 538053 BLAKE2B 1488177b2151c90790cc3f1d9dd186e502189cc483a908e477adf878d52feb423e4a64c7a39470555ac06329124f01fd5918dd4d0b404f0435ab3ad34be0bd18 SHA512 37ae7d0ea9ebb86f75cf9a4572ee84118aba87b2690c76457f76313502a3abd96b5f5b700d7c650d98db7f0655d8f2ba0a0fece269613bb153fa3a2f6158b05b
 DIST shorewall-5.2.0.4.tar.bz2 538938 BLAKE2B 1df68e166f5f443f120b9f45010da005b3d86a51d09c059d0886a2735c6d27c1568ae0422998f001deb48c512cb9fed23cbad423754682b06e9a4b5176b45cef SHA512 b44622972d4b4ffcde9d7da57d3994279f3962bb2d2e13892d7d77453da502527ab89cb59fb6692341b5d166cb7a3e31909df31dc21c758707eff29f3ab2c9a0
-DIST shorewall-core-5.1.12.4.tar.bz2 86548 BLAKE2B 8384c2f8ec673db3f0fed04af702e1967d41133f3a066ba09cbd58199654878d4d6c73730a933525304d68f7834c80d5c2a2452a4dd6faa71e2580deadf3189e SHA512 f77ae4080fa81a3259ab620ba7615c4188e6bec0244e898702dc641aacd8ac54160331e270b3708d818bfa9452cf96014868199a48c28f15c50d128365cb62e6
-DIST shorewall-core-5.2.0.2.tar.bz2 75108 BLAKE2B 2523d3fbdb0755c9c14195dedd0a4db2329b96a1ac5bde1eed1f0bb5623f89e18fab641d84074999b3058f73da75c9d306d372e02fac0bd735b0247256dad123 SHA512 1a6b94d25a09eeb464e4e35dee6e10a505d9fe271f034bc92763bed5c7bae44f88de68321f4b21bef4ef6e199d746d24fb4be077c676f96d9c84d8dfd453f370
-DIST shorewall-core-5.2.0.3.tar.bz2 75625 BLAKE2B fd8ae63da974088958ffb4a0a9b3d740556f60e1f73b50614af1fd337cf0c715cbd79f003085df1d6a2e1ad1203b8f322aea56e4808dbc920c3c09ef7011a4d5 SHA512 c67f0c64272c03650d4c3a727bcc0f9fc5771eb10e8b914e0c4709b4fda5ee1bea98a6e2a84eb43ee44a41005d8b05bf869ec7c61be582d3b82936f33a6d3d0a
 DIST shorewall-core-5.2.0.4.tar.bz2 76022 BLAKE2B 58602e01f7a7b6e6853c847fa38bfff2fbeb57ea68ffd124f9e556b0137bef65bfe25c8b7c70f0d6fc7b21dab7e82401985a08f0a1a8c4ca6159cbfd1862712c SHA512 bfd21f249fa3b7a952bf9aeead91eac0f7db6c2f3c386e9d2aca9645916b8a799ce58ac7b6edb93d0b934d224824f9cd94b8db63a0b35a260051209613561bf4
-DIST shorewall-docs-html-5.1.12.4.tar.bz2 4281202 BLAKE2B 51624bf6a36766fa8f1aad9600885dc2b92f656ef3a7bc6cf3704a33d2e014af590bbe1621793bd77d291baa3441a0f493c27f838159ccbb15b0684ab26f4bef SHA512 e1592137013b463a7cbd28c7354f51b36460c054d55e1819198b72c600ccbdc8b3fee4bab33d7a71466397338bd38e0aa6312f1c182e79052f249c51d1017dc1
-DIST shorewall-docs-html-5.2.0.2.tar.bz2 4294083 BLAKE2B 3ce667e656359f7d2f27bd03a47f2eae9f407a04f7b2921ad7099729164c40b3a88b2651052c3b28a3ab404953bef811da499f6acd4eb432648bf6d727124a20 SHA512 751f2c426e8abe9a5af396df39d4b67ccf674113b4b595916c6d44c14ace67f82ae2ffc84500b25d2876f0356b02c96383068d54fa97804afe464d2d5eccba31
-DIST shorewall-docs-html-5.2.0.3.tar.bz2 4295064 BLAKE2B a4913ac5138a2ee1c0c8640a7e2ea4e40bd4324aee0ffd6d4b228b41065d4d4e9e55ef0d600fd93dca8cb3ee73aeb2df196496d68dd11b40b23ce7c96ec0f9d6 SHA512 1e887b7eb0c4d0a78be7857a537f7cfa1307b43feed6396c5db289de5a2ea13547e25311bdd1e1dd48cd460e12ff71ce1520f1ec0feab87753f10cfeb45873c1
 DIST shorewall-docs-html-5.2.0.4.tar.bz2 4294681 BLAKE2B b6e975ddefae5dc7fd0a9be58c6fd231e828ed8e18e2405202766068b37796c075785c2cc05f25bc9decc50fbdfc01bad8d8f929b90592aa2e8cc040719e3cf1 SHA512 2685161f9d25cf745831f603129c4e9a33a264118698392f589e481a76bcb082dad14c9be6dc57c29441eb9807d842e5f08b3483e1e03099f0059f10ea907d91
-DIST shorewall-init-5.1.12.4.tar.bz2 41541 BLAKE2B 149b31b2ffd37c64cfc69de7d2d3a39824ce427a98a84f4e96af02aad9e04f0973f862ea0b158245a1d806504dc0dac9a5a554776d9533a7c88dbf6c096d4d07 SHA512 971f0a7a25f49c289e9c9d6d564e05b7f2675d271ef95c15b06a4a4e878a74c5b13a1ea80411014a5130f53267df6691042b313c423db193b9cd6cde172ed359
-DIST shorewall-init-5.2.0.2.tar.bz2 29749 BLAKE2B c70067951d458bc54434214dc2b4764c0c52aca457a21c4c77d3ae6cc0586fc5ce325549f7a5df9c18c255113e7d71a4f687a6a72fc81528b7611a3edacab864 SHA512 1fef0feea7e36d2f12373e64d898129e2e49c66f3f182fad950f5aced6615ff2b59cea66c1d2c475e9a781c0faf50541642c71e69dda68fa41ab86509134b511
-DIST shorewall-init-5.2.0.3.tar.bz2 30209 BLAKE2B 93e80935fd659b073e85ea0281f749a8bfebcc752e8fb1134af21a0bf262c7a7ba0f96ed8ce2aba37b592cd4bfef0a8e714dce25c3e1af9529c4acafe52502cd SHA512 988342ba1755373ecc89bf139eb6ca7a3fb78081a84e510a2827d174129bb24e06cb36fb474f9cce1056879997bc641152da18d8feb57429686a88e8cc1c8b9d
 DIST shorewall-init-5.2.0.4.tar.bz2 30526 BLAKE2B a8ac5bf7e650a58d87b608321e0ed40d8b73ed675d5b5b64ff5859149f04aca507d7a83ff6ca9c7801c84fb416d22fdc930199731a9134ef529b29cf1ec01a67 SHA512 c4e2bcf5a2f7b8fae30773a930ac7433cc8678f7bb52958ecd92a4ce5f0a78041e45578bd47e01ad72fe9fc1a3cbcda2995bd9379cc90917a31b3f676c12beb6
-DIST shorewall-lite-5.1.12.4.tar.bz2 47209 BLAKE2B ca39daa7a864b86cd9075f8604d053984ef8c451285520c568b83171163513bdbe7f910b21638f4f69e716d4bdbb4f148856b02dbe83392789d8b962669374e1 SHA512 1bcdb90fccc634103ff190be9a058abf1b5158d562702c8c1ad51e8edebc2939271f3279bcb0fd8ff7389ea175387ce5a090a0d9e5655524a11203b5c0d55604
-DIST shorewall-lite-5.2.0.2.tar.bz2 35577 BLAKE2B 462480b73a4cb70e2c09f7b1c4607cc748d1ff5d6ca511b2076edd7872865442ede343e3b26be2c46665a1c6beed5290584ccf0da6f93bc62ea1da1faf90abb3 SHA512 eb68b4b2b92a87c80f80b950bb5c2fc4f035f7650d786e4999d262bb21e2a5ee439e804aee4b3b0fb187b086ba4d899725a031f38d4138bec151969f9a874663
-DIST shorewall-lite-5.2.0.3.tar.bz2 36011 BLAKE2B 42e362eb8a17c8115ae3afd5985a367b51abda853466d204de033a064b7cdf9967596d10eb064fa61378c5292661bc884face83ab1f54cf30526e978c562346f SHA512 d76a63e8a1ab7701c91d5344f7dbe29f3cc3f10ca7b5f7886573e41f828f53e5a50af94004abbe01ab2a52551a86b25f4bce74f867cc8b5a0d9b28ec10ba7ae4
 DIST shorewall-lite-5.2.0.4.tar.bz2 36307 BLAKE2B ad95e4f640ae1f05936dd5dbc87e4acaf6dd576bd6704f650c8bfdc437284f0c121563427f89dbe5de4e19f543f3e182ff0d5a333da8c8416aae24994ac52ed0 SHA512 55bb514d9446c953de0453b8016105ed2471420d2ca6346cbd986f03cec5e713a1d27d5e08ddc6cf54cd6e5f936cf9a826eac622596480374929f41c062e8803
-DIST shorewall6-5.1.12.4.tar.bz2 197179 BLAKE2B 1c120388d0b8eafdbf6ec2fb64a8cc3e1e301dd109bb03f5dcfce60c534489210f669327eaa07bac5fbc7497e39c9167586f02017318ce9a2b054b4a39e4ae50 SHA512 9ff09b093f641452d3c5d615163336c903c74d4133cd620982760df6b8ee3acc704c460adb5db52b109f768d623152e47617c7d05742c2e6f19527c34eec9a61
-DIST shorewall6-5.2.0.2.tar.bz2 186161 BLAKE2B 97414d6c8d3c6cf9100330ff6d9be9808f9aa354ab4c535429b8593dba0d5f328469bd42e928f33f66ba40a0e91dfcc45d47d2b405a6ccdc814fb1e2c9a977dc SHA512 ec551998f04cd9b1ac0c791cbdc45068b402d5be89e2fd0e1a6eb95b288b339ed49c23bac73e81f324e8c277b66772d2ef5b11aed7a4b085a5ed0047fb96b1da
-DIST shorewall6-5.2.0.3.tar.bz2 185097 BLAKE2B dcbb3d42f257a2ed4c9f8e1f5185651700a7735d509c0f2a213608fb4c854c50c7330969f370449df62d5c95c9bbff609f955aafe472208940f83ddfe4da50db SHA512 ef14ac0759afe95a27c0a3a6217d884c0d95636cbee342c24c49ccc77f4538c2175a91866f96d7e79c992ab062d9a7a3e005a4580aaf4ccfe5ff524062bde8df
 DIST shorewall6-5.2.0.4.tar.bz2 186267 BLAKE2B 4076c94596e462d4f150d734700d400db90ca1d0bd788152e5421d581890cf28d7e6546d2ac0c604625cdf25771415229b2a3324153ec5439cddfcab73464ae5 SHA512 e8989b5c6fcc1162f42e884cdb0fff47baed61b69c39b8bbdaf78b246f95ee0bf6690fce3a6ae14eff2bf48d64b762b170d67462dc685f594dfd70a2e3720a01
-DIST shorewall6-lite-5.1.12.4.tar.bz2 46902 BLAKE2B 6e9bad615833beacbb0d4b779dc8479cad73c1964bc2220541419b99a7fc8dd1b57ca42d61d6ef708460beffa65106166dbd5c60a90ce7f4cdf60ce3a879defb SHA512 95b5b96b3744bd1a499d00b4f98d71b264369752e6fd9ede21717657785833d1124b97434fe33457bc6f80026b204eb9306d73af9eb8abf23840291ecc1caf32
-DIST shorewall6-lite-5.2.0.2.tar.bz2 35311 BLAKE2B bb25abc719c776571273219df6a3ba89ffe2553efbb4e93755b3deabce9f34851024f72d5ab328ee9caa55ab3744e35f08013ae8fda19c480e6d907e7257f8fe SHA512 2c39805d17cd8d9710d175d583958cc25ac0f78351a36c36ff57e7a9c8db87bd64ddf5c27352c916d42db2a26864cb9e96f83e5b1677e24964e67315dc2fb086
-DIST shorewall6-lite-5.2.0.3.tar.bz2 35704 BLAKE2B bad1f19cb53258a33bb8bc15cc4bab24c00a2fe1d63b95859565466ef549726efa70ce8ba9e8aa6317eaae3106e32c0ad41bc92d34e111011b66382476a2dda6 SHA512 272f47172267d5b31a2fe46fdae20cf18215a2ec9833eb634eced80d3f0e40a99d7dff8ae856f536bce425392ab9b4aaa7f7e19eb55958224f9f1c0769c72069
 DIST shorewall6-lite-5.2.0.4.tar.bz2 36035 BLAKE2B edbdee2b979c0d2144e358b6e8b52808578923498c0da4f906ed6aa8460153879dd5f8b4cf98da4bcecc90a6a776d39ef17492881c093a018ccdc5b86e0c0bab SHA512 c212ba3f6bacab1b26bbc5c13a2bac2f1f796c7fa3d442f398c91ff367f242a9562ff2191b9b678e82d07a96c2dc39a0109d30417154e6cfd4f2c4c6e31b616f
-EBUILD shorewall-5.1.12.4.ebuild 16274 BLAKE2B ec3a48d6ca7da8e553c0771bff4ffad54ff2ddaf61dda8a5d781d59f53075f637303eead6ffdcdba940a7db38e6099a3a070dcfcfd3bec0167af369e082b6cf7 SHA512 7ac1aa7e32c815499a49c0a97427359db8fed3fc135026593ff724d53e42a566a5ec023bdd760ad9959768a84ad453df1a88973c018b7f45b543efa6bfa0e969
-EBUILD shorewall-5.2.0.2.ebuild 16276 BLAKE2B 6b78da523533371e05294702605bc2cfeaaccb9b4ded2a88d4188585bc25894c55865e756108b9640f517aa69835fae55157a766ad05ab6401c4531a4f185807 SHA512 b4bf98d37de2983523d4b78a1b3de6297d38f696fb0d3125d121d8fc0fa56b53d954a4ea387ba44d96e1f7ebd432aefddbd50fb17e45c74467caa17cb9c153a4
-EBUILD shorewall-5.2.0.3.ebuild 16276 BLAKE2B 6b78da523533371e05294702605bc2cfeaaccb9b4ded2a88d4188585bc25894c55865e756108b9640f517aa69835fae55157a766ad05ab6401c4531a4f185807 SHA512 b4bf98d37de2983523d4b78a1b3de6297d38f696fb0d3125d121d8fc0fa56b53d954a4ea387ba44d96e1f7ebd432aefddbd50fb17e45c74467caa17cb9c153a4
-EBUILD shorewall-5.2.0.4.ebuild 16276 BLAKE2B 6b78da523533371e05294702605bc2cfeaaccb9b4ded2a88d4188585bc25894c55865e756108b9640f517aa69835fae55157a766ad05ab6401c4531a4f185807 SHA512 b4bf98d37de2983523d4b78a1b3de6297d38f696fb0d3125d121d8fc0fa56b53d954a4ea387ba44d96e1f7ebd432aefddbd50fb17e45c74467caa17cb9c153a4
+EBUILD shorewall-5.2.0.4.ebuild 16269 BLAKE2B adc880388fa1d11dd869b31a7299f81081da532c610d5444f57c08446d49aa5b9381a3c623553c0a064db4885c1cdd8a816d69522bbfb1c4ebcc5582de4a35af SHA512 6c3d7998ea7f549847e52e7745355f53ed9590157fd49f1e454452215f3d0e108cd68a3980fff3aca5531ebf2e16696f50a73a26f395d4506136528e1916de66
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/files/shorewall-lite.initd-r2 b/net-firewall/shorewall/files/shorewall-lite.initd-r2
deleted file mode 100644
index b319a0e7af2b..000000000000
--- a/net-firewall/shorewall/files/shorewall-lite.initd-r2
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${RC_SVCNAME}" = "shorewall6-lite" ]; then
-	PRODUCT_NAME="Shorewall6-Lite"
-	command="/usr/sbin/shorewall6-lite"
-else
-	PRODUCT_NAME="Shorewall-Lite"
-	command="/usr/sbin/shorewall-lite"
-fi
-
-description="The Shoreline Firewall Lite, more commonly known as \"${PRODUCT_NAME}\", is"
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reload reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} ${PRODUCT_NAME}. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
-description_reload="${description_reload} that the firewall is already started."
-description_reload="${description_reload} Existing connections are maintained."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	provide firewall
-	after ulogd
-}
-
-clear() {
-	ebegin "Clearing all ${RC_SVCNAME} rules and setting policy to ACCEPT"
-	${command} ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME}"
-	${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
-	eend $?
-}
-
-reset() {
-	ebegin "Resetting the packet and byte counters in ${RC_SVCNAME}"
-	${command} ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-restart() {
-	local _retval
-	ebegin "Restarting ${RC_SVCNAME}"
-	${command} status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		svc_start
-	else
-		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-start() {
-	ebegin "Starting ${RC_SVCNAME}"
-	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $?
-}
-
-status() {
-	local _retval
-	${command} status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-stop() {
-	ebegin "Stopping ${RC_SVCNAME}"
-	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall/files/shorewall.initd-r2 b/net-firewall/shorewall/files/shorewall.initd-r2
deleted file mode 100644
index 4826610e2216..000000000000
--- a/net-firewall/shorewall/files/shorewall.initd-r2
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${RC_SVCNAME}" = "shorewall6" ]; then
-	PRODUCT_NAME="Shorewall6"
-	command="/usr/sbin/shorewall6"
-else
-	PRODUCT_NAME="Shorewall"
-	command="/usr/sbin/shorewall"
-fi
-
-description="The Shoreline Firewall, more commonly known as \"${PRODUCT_NAME}\", is"
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reload reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} ${PRODUCT_NAME}. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
-description_reload="${description_reload} that the firewall is already started."
-description_reload="${description_reload} Existing connections are maintained."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	provide firewall
-	after ulogd
-}
-
-check() {
-	ebegin "Checking ${RC_SVCNAME} configuration"
-	${command} ${OPTIONS} check 1>/dev/null
-	eend $?
-}
-
-clear() {
-	ebegin "Clearing all ${RC_SVCNAME} rules and setting policy to ACCEPT"
-	${command} ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-refresh() {
-	ebegin "Refreshing ${RC_SVCNAME} rules"
-	${command} ${OPTIONS} refresh 1>/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME}"
-	${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
-	eend $?
-}
-
-reset() {
-	ebegin "Resetting the packet and byte counters in ${RC_SVCNAME}"
-	${command} ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-restart() {
-	local _retval
-	ebegin "Restarting ${RC_SVCNAME}"
-	${command} status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		svc_start
-	else
-		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-start() {
-	ebegin "Starting ${RC_SVCNAME}"
-	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $?
-}
-
-status() {
-	local _retval
-	${command} status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-stop() {
-	ebegin "Stopping ${RC_SVCNAME}"
-	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall/files/shorewallrc-r2 b/net-firewall/shorewall/files/shorewallrc-r2
deleted file mode 100644
index ecc21a23875a..000000000000
--- a/net-firewall/shorewall/files/shorewallrc-r2
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Gentoo Shorewall 5.1 rc file
-#
-BUILD=gentoo                            #Default is to detect the build system
-HOST=gentoo                             #Gentoo GNU Linux
-PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
-SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
-LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
-PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
-CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
-SBINDIR=${PREFIX}/sbin                  #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
-INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
-INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SERVICEDIR=tbs          #Directory where .service files are installed (systems running systemd only)
-SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
-SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
-DEFAULT_PAGER=${PAGER}                  #Pager to use if none specified in shorewall[6].conf
diff --git a/net-firewall/shorewall/shorewall-5.1.12.4.ebuild b/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
deleted file mode 100644
index d7c5285f28b0..000000000000
--- a/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	if use ipv4 || use lite4; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-	fi
-
-	if use ipv6 || use lite6; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r2 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-	sed -i \
-		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
-		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-		keepdir /var/lib/shorewall
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-		keepdir /var/lib/shorewall6
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-		keepdir /var/lib/shorewall-lite
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-		keepdir /var/lib/shorewall6-lite
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.2.0.2.ebuild b/net-firewall/shorewall/shorewall-5.2.0.2.ebuild
deleted file mode 100644
index a7f7766988aa..000000000000
--- a/net-firewall/shorewall/shorewall-5.2.0.2.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	if use ipv4 || use lite4; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-	fi
-
-	if use ipv6 || use lite6; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-	sed -i \
-		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
-		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-		keepdir /var/lib/shorewall
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-		keepdir /var/lib/shorewall6
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-		keepdir /var/lib/shorewall-lite
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-		keepdir /var/lib/shorewall6-lite
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idm214"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.2.0.3.ebuild b/net-firewall/shorewall/shorewall-5.2.0.3.ebuild
deleted file mode 100644
index a7f7766988aa..000000000000
--- a/net-firewall/shorewall/shorewall-5.2.0.3.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	if use ipv4 || use lite4; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-	fi
-
-	if use ipv6 || use lite6; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-	sed -i \
-		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
-		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-		keepdir /var/lib/shorewall
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-		keepdir /var/lib/shorewall6
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-		keepdir /var/lib/shorewall-lite
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-		keepdir /var/lib/shorewall6-lite
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idm214"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild b/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
index a7f7766988aa..041ddab407e0 100644
--- a/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.0.4.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index f416de9c73af..e6a5d39789ca 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index a7594ba498ea..a7115eb33cb8 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -11,6 +11,6 @@ EBUILD libnfs-1.11.0.ebuild 1052 BLAKE2B da8eca951aa39bd50fac9d48e053dba897ee279
 EBUILD libnfs-1.9.5.ebuild 1080 BLAKE2B 979dc8ea7561b25e73b96f65b54e43df96732adb9bd1a5950342652e2dbd07e525169e1f9edbdba53a7d3f8cd5e7dfe4f8463c1d92956d512e86247fba14c3f7 SHA512 5df2f8f18480e6501fea9fa5299d3738e06191b248e24a687a9083fce1e236583e570f70ffa2c66f54465993ffcb25643f0f983e111ec1a086cc6b2916cd86e3
 EBUILD libnfs-1.9.7.ebuild 1041 BLAKE2B c10d98df553a00f89ae4ae30219067ff16ec308f69d25d91b34a58b9be5d13155d58c309af6f66b7b1854cbc59075b07a79349105f7dddd3b9e756f059dc8e1b SHA512 bcec2c0c325e1ebad33b62caa1891176fed02c40f962ea047d4366d0427c0920e242c90d54502d8a216774c3c083ab4e0a80aab92c4aabc1e83a3a7ec8e698af
 EBUILD libnfs-1.9.8.ebuild 1052 BLAKE2B da8eca951aa39bd50fac9d48e053dba897ee279efa49cbb411436ee416873536c4f49eeb5290b5dec0e6aebae35c0b434a44e9e17410fed08907a02e50ee3d8b SHA512 a7f2532df004e6fc9d08744accb24c687879127e8762b8469ca1f07e87d1195aec9d85f0d4ecd9eca789d3f39a61fdcb379ebcd97d850358c5ec671c490f660d
-EBUILD libnfs-2.0.0.ebuild 1111 BLAKE2B 731f565f24ac188dd0d75574517e7a8e4561be9d80fbdf9dd59d8d72f0ba6b72de2d1eb2b6029e21f50687eb42751ec93ac9205221ee045d7da6b06d9121e75e SHA512 dceec737b101b78191899bdae19bdcad5e0a38d69e1df18b1767b7a75c579bc66cb699977e6bae9587d8ac881480fe052997dbf294d4225759e8ab1c5eb22835
+EBUILD libnfs-2.0.0.ebuild 1110 BLAKE2B fb8098132e10496fd160092eb5b0eaa207b9fce499a97d19ed9f2c0562ec138d6237f49f5061c0eaec3d0b5c2224462f91c2858b5269cd402fcd48aded422d85 SHA512 31fe7ef50c243c033501d310e0d7bf995ff4c84895403caf94251a9793ec9e1404b1e1ca4d19dbfdb3dc48ff86fc49b0013e81242b541e81aac6a3a600454425
 EBUILD libnfs-9999.ebuild 1119 BLAKE2B 9fe63f7ce7f0655b0dc3cfbacb25a4452a48bcd896ac9bda398633571ce1cc3f4148d63837df3a2fe8ac492ab72dd468f8a842900c7c38471511ae5f2802bfac SHA512 428d18f519a27d687d9c6b80b2769e66459cb6d5e4a9de5a491e62afb40ff02939d5c42c8adf22005046b673cced347089fc58ed0e2595514fec253310d946bc
 MISC metadata.xml 337 BLAKE2B 0e7e5918d79634937e9d1ad6289fab93b11ff6330b554c52e76148120974b58cf586669ccfa579daef54d8b8b23a51b623582c50839ca8f6182619c1987ac368 SHA512 aabcd286aba9ba93d7e64759ef0fb49b4d5ac99182453b2bf68727d0f41638640d312355465b8862b4f070f5bd47b1debbca635a07d7e44dde841da99405206d
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
index 7867c42fb6f1..d5c0961b9ee8 100644
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh x86"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 8bed630e2fc2..32bc36cdc8b1 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -1,12 +1,4 @@
 AUX minio.initd 410 BLAKE2B bedce560151142afc4961569f6fb803c9d7bb4263d56061191e3dc7e867dccd62fa1a363d41c16afa931d0ad138bd8cd858d7dc636851c6a0130bb1405396e3b SHA512 01610c5dd7e5887f85b1246d475e5b5c23cf3fbaa0de21e9579bfa929f3634cccbab1b7a7b8e66fa9bec41ed3feaae033c4380cc3911a7af6f64286c4ed0cf78
-DIST minio-0_pre20180209.tar.gz 7521636 BLAKE2B af76c858c3afc97067b2f69025c3e3623179e80c93d537e1f90b27b078379c4e3485399f0d30a3b4c196629dd78fed969a3d0da150e79757d58fc6db74b9fce1 SHA512 1c654a40fc809ae010643451c504cc61f5343c9fa210d3e00ceeeeb0917865bed8e07759293853d195f414dbcbb99ed34dfb2f913a6e607659ab6646492598fe
-DIST minio-0_pre20180330.tar.gz 7542469 BLAKE2B 3aae4daab1357fa5ae7e42f12768c15de133c7ffa49568657c1f7b5d38e7881e948ccab9e9fdbd22e90269ded903345f3278d12b817be7fa2a92259ee1999ee6 SHA512 34b9e330e60e58099744f2216c677f2bdcff82741a926b8c1fbf93eabf654f806e7b8df89440a477f787726d909e82a1eefd5d9c8f9ed70560ca17832708f9c3
-DIST minio-0_pre20180412.tar.gz 7638430 BLAKE2B 698e0d5f5fd176f6b1dbc520d52474ce3d0e44ce5caf1345f2c6afaad3766e88e77a1c6722afa073b7b5f7176e266d00cb88d1847152f3a20b991f7819918d42 SHA512 4ef4964ec5a4b228116995b660724d404e04a132c10094c0a62974c2febaa0db7e035d93e6db4f1978ef418cc331a80db8cf3d0c6a191c57295016f1016f79e8
-DIST minio-0_pre20180419.tar.gz 7761662 BLAKE2B 7ff62d0a04149a38dea6a361298f401f1ab479b90c342cb9386323f95da676eec73b34ddd098bed60e691db1920cb7b895ac5873b9ae625964e6de9bb82262a4 SHA512 a955e4177f605cf3bee5204c139de90162bb73df282c61d848004a0d8e2d7bc9ff192bf4b75694c9102c6f9df2f1553ada470993d6a2c46f5d6cc8beefa90526
 DIST minio-0_pre20180516.tar.gz 7795495 BLAKE2B d14fcbcbf4fa3b9a85bfa1f42d1069b14d4eceb4b99c2e7619d463a1fcdb941183146102da7ac38351fdf332b4bf7a141ede5469b57fc2157be19ff7ecde3e73 SHA512 6f5811500010f6e309e3918883c2127a46ba003dc43ece2c6d8a5da9e8d5aa6c2e6e4ca9dfdb4128b11327e035dcdde607b5e4ace045df1fa073d674d8b97e5a
-EBUILD minio-0_pre20180209.ebuild 1319 BLAKE2B 71a1c48dc34cdd6f6c79cddd56566f476e4da211f3643ca0427671e2f0c1bbb36376cdc045956601e8513cb9a818bc52fe384843fc65df68732a5d30c619187a SHA512 213ad23adfbe038d28c0158cd05787c087034ff698624bfa0b507e753b24f1613635211f3790196bd23411d24f6e0efad43c54a1ffffbbe60826d6b50d64ac5a
-EBUILD minio-0_pre20180330.ebuild 1319 BLAKE2B 8908a732710a0fb77892aa5dafa22b251a1563420997be660d88bbcfbfa901e6a10db192a855ffcfbca189ba26ba08bfaeb3b1277a5de7d3cbea0092a04ce3c5 SHA512 a8f507f1987bc30adcfaf4d5b70c0bf5687c1abde9ccd54bb02c3a7fc8992874c89d51f754d93401783840a0e5241fd2e55219377f42482e160a30d73b9d55db
-EBUILD minio-0_pre20180412.ebuild 1319 BLAKE2B 108ec3fef90b317a748fb6e3159cfbc8b235ad205fb500840042524fce0a6d108cc93ef00fbe52e2e6375a2df0085103b9d890b197615a7ad7822828ee0c680f SHA512 dbcbb2731e79bec28d85cf8b265c730fbba67cf28c59f48540782c88236d80bc4d4c14b81307b8a89b7be1345e01380a6bcafd690844e2a35f808d07eca284ee
-EBUILD minio-0_pre20180419.ebuild 1319 BLAKE2B 707f0da5dfacd955186455b019375e9a9e0d987739d411a09a1f69a9fcd7b040de833917b757bedbdc6513cfc94877f37ddde6acde53e2d5a070eb14e2ea4ff4 SHA512 7cc553a42ed1bb73f4e745717414820612d519a92c8e53a324a839ddfe377c7e0338a01b5a49d177a56b885610a939193590c469b1c14837cb9d44b4610aaf3c
 EBUILD minio-0_pre20180516.ebuild 1319 BLAKE2B 192bc1fde1b2178b9c2d345de0e3ec8972af76d1cf0ae24e40b9d45de244b4bb25c39b73b93093a5fb4008ed3f2af875137fdbbbd882b159428c8171b5383699 SHA512 b0fc2c4bcad2cddc98dd0fa5a8142ed5a256fdadc53cd79234b636d8e0225ac3d67f55a7a5c74d755b9f8236e350711b1e97a029af01ba393a0958c4f4cbc593
 MISC metadata.xml 321 BLAKE2B 7e012bd9c28f71a0c8ccecc85f4ba3a18e5d4d20f7ad6d0f493d228118ecef3412886a8adbf5585aee9e22c8141a9065b06f980d40588e1db408e9d0f7ac715c SHA512 b44c2fe36086faa97355cc6d55571ceca91836e6874530529d13d909974795a553bf1701eadd85a461da1f2f53c885230cce33589d1527117d7232ff959171b0
diff --git a/net-fs/minio/minio-0_pre20180209.ebuild b/net-fs/minio/minio-0_pre20180209.ebuild
deleted file mode 100644
index 121c8905500a..000000000000
--- a/net-fs/minio/minio-0_pre20180209.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/minio/minio"
-VERSION="2018-02-09T22-40-05Z"
-EGIT_COMMIT="289457568c2c812604484ae9b4efeca0f33aac2c"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${VERSION}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-0_pre20180330.ebuild b/net-fs/minio/minio-0_pre20180330.ebuild
deleted file mode 100644
index 987586d83485..000000000000
--- a/net-fs/minio/minio-0_pre20180330.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/minio/minio"
-VERSION="2018-03-30T00-38-44Z"
-EGIT_COMMIT="804a4f9c159ecef7093585a5b577e03a382af50e"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${VERSION}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-0_pre20180412.ebuild b/net-fs/minio/minio-0_pre20180412.ebuild
deleted file mode 100644
index 734cafb6aff8..000000000000
--- a/net-fs/minio/minio-0_pre20180412.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/minio/minio"
-VERSION="2018-04-12T23-41-09Z"
-EGIT_COMMIT="f60765ac93013a554af1b55660764b49cc9b3221"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${VERSION}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-0_pre20180419.ebuild b/net-fs/minio/minio-0_pre20180419.ebuild
deleted file mode 100644
index 53c259b5e9bc..000000000000
--- a/net-fs/minio/minio-0_pre20180419.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/minio/minio"
-VERSION="2018-04-19T22-54-58Z"
-EGIT_COMMIT="5a16671f721f4e8f320bc25f60ce4e601ab544e3"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${VERSION}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ec6d31c228d7..611067fe7525 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -20,6 +20,6 @@ DIST nfs-utils-1.3.4.tar.bz2 814545 BLAKE2B 4b8c5fa4c1c21858e19d05f973c6d94185cf
 DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3
 DIST nfs-utils-2.3.2.tar.bz2 884068 BLAKE2B c4133cc12c5c1cd33346408e2d1286cf50880a89ec97cb8ce4453266ba5b145eb1ca7a4362ac1a91ea5c1ebddd4fcd1d6a4cd12f45637cd5d845cc6d8d5f139d SHA512 4b948d92f515e9340163f53ab26dd7189fa8b13909f5c668b7c66ae13f181ed778967edc0a20753763540b5a3f93a41a2de38a7276ffbfadfd866c5ed422520c
 EBUILD nfs-utils-1.3.4-r1.ebuild 5139 BLAKE2B 8c2504911449d130588e6293c0691ddaa881630e01b390e4f7cd891e02ebcf137984565867b21ad59261d38d5ae5bad89ce7d5a3684bc9ae6f3b8a0787d08d06 SHA512 828f39b3f7f117e5930b42c62908b9f6f5ba7cefacaf2a2149108b428b03da8ca1f1ca993a86264876f1103d6118ef6be62ec25babb4d6aff0270b24a4fe4e0a
-EBUILD nfs-utils-2.3.1-r3.ebuild 5295 BLAKE2B 3c66d0cf51aa3fd7e1de5ae0b6c353604c41515f8cb2287f356aaf0df9f37e455f27fb4f857e094165a69b8ef6d6205186e0b8d35a40b1a925311d0077478676 SHA512 e76e03f2abed280a62728fe12d88c08bffe05e39097d46dc6e3ad91c2217eea1dc6f219965e2e0fb4c477b1e5d1701a3999e146be79f64b437b112731b9ec334
+EBUILD nfs-utils-2.3.1-r3.ebuild 5294 BLAKE2B 3c04d19a98bd620de460ae07bca7a609bc57c1de39ac621c7cf9404a5297b79d8f3e2d9d5ec2c2fb14754dcd6cb5b0e4e39d1c5f54cb3568e70ae95b266e76ef SHA512 342f97daba6c64b74da49617024c659e3be6f50b698564958a171b222502911369b87f2d18e7770c3fe5f0869d89a5db6d15c1624a62fe1d311de581e1fe137f
 EBUILD nfs-utils-2.3.2.ebuild 5342 BLAKE2B f6c9ef2b8cbcdf74a9d2e34a8ef1af8978bad08a7e9c6bf933cac587dd30a91baf3f9928ae27e6b441c0152d9259933133e44b503e8ea656de80e9f1bdcaaa2d SHA512 30509c92f9e39f4591c0cf541bfb9280e25c52346c9d98a7d037d87e42b9e8f139fefe5f077e7ee744792656f6ba5e211dd0581105f8329af4bd4a5ad2870852
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
index 3d68614db314..ff490a255b5b 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	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"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 14f45e192d8e..d9036fd03bd2 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index faa327a7b0e2..b04cc918a397 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -10,5 +10,5 @@ DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf0
 EBUILD prosody-0.10.2.ebuild 2484 BLAKE2B 39490d068e3554d75d8651258c8cee1307f419bd3b3b2f1f597bd9ef3adf0a59c879818d91e4652ce43c19a3c3e391339711409b5b58af748025004db8dfa39a SHA512 45bc465b096e0f2083c3b36faa3ddcabfa65b100014abc020efb8d81e7939be7d52c9d80defe58bcc51139021dfd8ed1205a8d0a0d82b641ed8b870ea0236505
 EBUILD prosody-0.9.11.ebuild 2482 BLAKE2B 71683b6194e6921a129a4a18901685c03f5e9ffbc8d7cc532621bc87503762efff6561d2ea2d7bde636a5432cfae18a0d6a85b642650af9ab065c963d563c2be SHA512 c2cf0947fd2119f7266b7fdc60a9596704083f4d61ab6b1d316605e87016f02e03627b8281c1a42172462f6a9f716ab6a8a19ed8c20d7d0500683fb5146bb003
 EBUILD prosody-0.9.12.ebuild 2482 BLAKE2B 58f0a66e6291ea1bb82048c7bf34c184beaaae5dfc0000de3ffb705bc99a0e376e9a1e8d0501958748aa79f407326d48c65da488a8824395493ae9862a0c93e8 SHA512 8eafff7f0e472ddc9aca7f3bfd572cfab1544a7e3380f7d9a23f1b76ad4966b73cedc3571dbddbf2f85a5fca3c1b737ceb6ef3c4e00c1b2246d165bda09f88d4
-EBUILD prosody-0.9.14.ebuild 2490 BLAKE2B db50b64ee2ddc2e3f7475243f9d1569e9a43749e05f3b26e4265775fab69dea588e2e6269b34625dced8fb8fc6500343002c653d0bd6832e23dbd44854e67dec SHA512 37c8fd84dd91167de9a65b1b5ac243b5b675a5573734e239d1b704edf99ca200eedf27e5eb6fdcb263e3cbcf2557179af31134ab47e5d564195100b3c3339a69
+EBUILD prosody-0.9.14.ebuild 2488 BLAKE2B b7795a212f077fd733cc7c1f6a6fcea37051738dfd314cf261de6ce1a68ed29bbc73423fdf8798cbe94a148ecd73cfdfd8ba0fe9ea806fbcf7b6a447200a3033 SHA512 45aec8a3630428d770cc890ec8c221aaa76acebbae734d6de16d332db40bc7820c02600ec530685b993f7da3e3101cf852846a9af97e4384d8d36e378c6aa26b
 MISC metadata.xml 624 BLAKE2B 57704d2f82f7b7daa34d7114d375591cffe12a3cfd396a95ea61c76f644750cd92567d5619133bebd56ff2f302c3f576aca22abcc954641c89757e85e35ae0b6 SHA512 0410e3372d04163cc8b5e03d95f5c0c7e7e6da4e6034adfd86700455c6662d844e8da5590dbd5a633179dd8c3da15760b49d3068787ed61833c9031cec341a24
diff --git a/net-im/prosody/prosody-0.9.14.ebuild b/net-im/prosody/prosody-0.9.14.ebuild
index 32be3fa64499..2a27e8cdf22b 100644
--- a/net-im/prosody/prosody-0.9.14.ebuild
+++ b/net-im/prosody/prosody-0.9.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
 
 DEPEND="net-im/jabber-base
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index bcb996dcec33..29697ae32940 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,11 +1,11 @@
-DIST skypeforlinux_8.15.0.4-1.x86_64.rpm 104944478 BLAKE2B 6a490eb49e1887a6e4aa97c644d840dd5daf085212db431ade92232f354d7f6f707b596055f4fd2b74922c071de7179de7be570dc9fa8c08e536ada8abecc0e2 SHA512 5a70ef2395b9d37b4d6417de9a3211b64f0fc7f6bc92b93abace51da911a79e559d1c4f590f1ee830a56e186a91ab713ee8e3327dfae260635ae9005341fcb1c
 DIST skypeforlinux_8.16.0.4-1.x86_64.rpm 105226365 BLAKE2B 377c4d646740c29efb10e7379b37e4661dd5e4f438e31895b4b32e2dacb922fcde8d6713790266f4532dbd6818a8ffefc5749ead0b495deafa0e85b00a8f4f00 SHA512 e499a3d9bb50695989ad629256a1e974bd9ccb3cfeeb5090cdc4986fca58fcdeb9dd9e969caacc0b42945481fc0f26b91353a0a0c60fe57a44581f6c3e27b1bb
 DIST skypeforlinux_8.17.0.2-1.x86_64.rpm 101588489 BLAKE2B 0a92756c403ae8a8b7f9aa4769cecc518988904d3b9cdc5e3cfc11518e2c369816df1c9e9c71e973cbef8200de3ca5be0ea18daa5e75432a0267f2dd09f9ce6c SHA512 121907e15b6b52d3ba35be7162ff0ba66b183d76fc929ca238a698d5035b625fcdf4efb93f2dbfd92fb18dc2aaf0b5bfbebac9fc96bd408478e4549d7e47454a
 DIST skypeforlinux_8.18.0.6-1.x86_64.rpm 101968899 BLAKE2B 2aa2ed9d290f2f9307cb8db124b407b509a7b8f869805f25293df343978cc4911476a1734563325063bd1e3ef0e9044bc12d864edff838855af1f1b731dd4b39 SHA512 0917875b21b9d77f2299260ea2152b3c14c0b332343cb9832be2a613c875025b77ca782f60987f638d430d005d1bf78f1763fe82b7d91c3146c39e7fafbf1c11
 DIST skypeforlinux_8.20.0.9-1.x86_64.rpm 115781688 BLAKE2B 24f197afeb034e0de6930af40508ada51dd3dc7a24d0a20bc05e65591bbdd8630d767bafcaf739cf70da5531f60ba52f8f51d53fb6f28e6974c4ca1be304585a SHA512 c39c672f03ac340ddd31641e80a780e2e5d624ba60aab3991f96611daedc93b1893fb44155b3895a84b21c04fa9498ba6dc158a40041b17ffc14f3b272eb72e3
-EBUILD skypeforlinux-8.15.0.4.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
+DIST skypeforlinux_8.22.0.2-1.x86_64.rpm 96073264 BLAKE2B d5d85ac5ba852ef50286894a4a3ff830e3763eb962f8e40cf4d2b9a9511394113991bd0de6cfe54fb8286c5bbe25ce516a640097f9240a947c7e70c97c7bcec9 SHA512 c628bcde1a467bf69e66bd8fc134bba18a2489d857659d386addb0659492bdc7884c29087411d5728074ae7f108f98be876b6330b1178e8ffe9792662bc9105f
 EBUILD skypeforlinux-8.16.0.4.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
 EBUILD skypeforlinux-8.17.0.2.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
 EBUILD skypeforlinux-8.18.0.6.ebuild 3678 BLAKE2B bf717c61439733f94edb07332df57f42eb3b399e3996e6eace9fec071a637a2fa9565a6af386d26f07ae96bb5b2e66775b6608c4f62d392426d11cbae868ab3b SHA512 68a96a0939ccb7e5e0540f2c02b426d996217aa173cee2750b4edae70b87e22ed5d3a26c1cde219be8e0dde641877a22226d4dc85b022ec2e7369068d40c5cf5
 EBUILD skypeforlinux-8.20.0.9.ebuild 3742 BLAKE2B 01cacb48e6ead708ce6212c8e0f1fccf6e0089101c184956da28ec159b510ec21bad7a020c3017640280471875f77b6837aedd9907ba9b186cdbf31f2bbeec0c SHA512 92738e89e73a59bebc846fc7ff3ce74a786595ba8a6be0ed57e2a1955b70a16208005705f44aefb8e4a191e3373f6f8e8c01b1df937d8de15ad1303a26bc05b8
+EBUILD skypeforlinux-8.22.0.2.ebuild 3743 BLAKE2B 0406a1696fe28e4ff35c8378aa27dfb8c072e524ebe8d71be309bac8aa14734c32cee773aa3e6587f60d65faa53439c0cac1a424d2584ee13e111eb85ce0deb4 SHA512 fe9de873c1eabfa01203430f29d7cad5b86eaf4bcd439b6095ebc6e2ba7f12d75de25dd6266a2bde2ef03d2269c5d74110753c582912ef9706cfdd9596729685
 MISC metadata.xml 684 BLAKE2B 90b427ff6ed13fb5046a188fc8476d45989bdb717c1a930e81270164d72b565942ecfd4f08821bcf265ef17fa79f515c205b314abd21b2e7335387ab10e7f93a SHA512 8a7481d0a0b8d453f7748491ebf12d34e1deeb2f0bfc618e27e15a1029bf04814afadc3ca169c12f1e7d199ec0deebcdf6369ccc6c6a41a2add78209c257f8c6
diff --git a/net-im/skypeforlinux/skypeforlinux-8.15.0.4.ebuild b/net-im/skypeforlinux/skypeforlinux-8.15.0.4.ebuild
deleted file mode 100644
index d5e5dfdff41c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.15.0.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit eutils gnome2-utils pax-utils rpm multilib-build xdg-utils
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
-		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${D}"/opt || die
-
-	into /opt
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${P} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	# compat symlink for the autostart desktop file
-	dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	if use pax_kernel; then
-		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
new file mode 100644
index 000000000000..b29bf79dd34f
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.22.0.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop gnome2-utils pax-utils rpm multilib-build xdg-utils
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="pax_kernel"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+# See bug 642054 about app-crypt/libsecret and MULTILIB_USEDEP.
+RDEPEND="
+	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libv4l[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
+		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-e "/^OnlyShowIn=/d" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	dodir /opt
+	cp -a usr/share/skypeforlinux "${D}"/opt || die
+
+	into /opt
+	dobin usr/bin/skypeforlinux
+
+	dodoc usr/share/skypeforlinux/*.html
+	dodoc -r usr/share/doc/skypeforlinux/.
+	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
+	dosym ${P} usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	# compat symlink for the autostart desktop file
+	dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	if use pax_kernel; then
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+		ewarn "You have set USE=pax_kernel meaning that you intend to run"
+		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
+		ewarn "you suspect that ${PN} is being broken by this modification,"
+		ewarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 949f0a48760b..c18593990ee1 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,13 +1,13 @@
-DIST tdesktop-1.2.14.tar.gz 16914390 BLAKE2B b687fef01123d7bb7ee0f6e7fab7a4900a217da1aafa2fd35c15950a90c9bd7c0927b395db1238c9cdde676432c7222c8f22ad336a26546704e1a85a7c403a51 SHA512 57f4c6ff4edffc24f2a7e5054c799ffe7bbabaa9dc90b0906452ba884555e10f5cea34d204534f3c249903a2d619cef20e7d0ea5d85d60d1fc95cd0bbb8b96b5
 DIST tdesktop-1.2.15.tar.gz 16916025 BLAKE2B c78c42875cdc159762ba95f6debdf10a0e2693ed5706f9b7274f284a77dd43bf3a07d8685032c8d07913ce3d85514561db3d88fcd52b2c92c967ec86af23274f SHA512 9b73a7029790feaed2b044df81251bf3c09e7ce3485669cbb9dd304b7adca29c29991e1d3f8e40873e0e6200ed47b27a4cacaee2c4f6bad407d86650ed642f77
 DIST tdesktop-1.2.17.tar.gz 16916625 BLAKE2B 6400ab396e6a8f37b294e6d0fec28d6d97dffbd2cdb8f2154492cb39dd961bf463393ec33520e790f50e5e20b02ed6055cfb51af241c1302fe837f12b3b679e5 SHA512 fb7fe4b63ab08ff51889ce357c998f50b84f805f71662370345b2c7bda79ddb958ad29e4b92bb9a91774239dc13591d8a467ead82dcda9935d0b637ee3826b75
-DIST tsetup.1.2.14.tar.xz 33389376 BLAKE2B efb41707a47facd5f330677f638920ef9e262159ee3e1358ecf90da2c558b66322b27a6fa9a7137520efd501610145758d4f0e16debf992feff206849e7f5f57 SHA512 b187cdf74fb41f0e3d0e96248b0f2552c728f414f556d999fe3734970ddc653f9adac54ec6dd221a3464154feae9c294d73b7fe2e34c181637021c70e8173f9d
+DIST tdesktop-1.3.0.tar.gz 16974902 BLAKE2B 8a6d4a964e4b487c6a833eddd419bc50ab5056a37345b27676cc5b9e1bea72ecc53c93e33a890095396eabda3d792269eddf5d8d15e9840dff64483f58cf9396 SHA512 06118de30393c611b4e2194eb897ef425c2722b571df5f2cb9ae05191474c53d812f7b0a5df4f52d18a58485cd70a4e92b994d9ec7e21c83538fc447fecad313
 DIST tsetup.1.2.15.tar.xz 33391864 BLAKE2B 8631022e27d11fa1003d3a0d7f6359e67c2a504f0362fefa380471189fcc6d2c736e530b1f5044e0d30fc6a5290e206ce534f1e0843c1778cdc4740148333b0a SHA512 d13649cf52702f2abcfb62bdb2ea8000f6087f26dd8ecb2f4663cb609b50095c9f36bdf0aac2ddef39824a9d4c7ca637448ea4749cc709c40d5af736f18d20cb
 DIST tsetup.1.2.17.tar.xz 33238980 BLAKE2B d755c1353a6f5f7fc560614138aa867199df63683bd8ca48936431771a62a9a0efa4e85b40c6725fea6a83f25adb9b79ce5f45760442af5ab3c64f86128d2067 SHA512 02e69ed77eacb28ecf9141ae671bde9bf7f701bc7c77f654a87325694f1dd45ac65efa806120db6463b1f3b3212113f819969453738312ec81b334b56642e1cf
-DIST tsetup32.1.2.14.tar.xz 35557656 BLAKE2B 15bb265377fcac2b53d03bfa486ae43a1033ed3771922e202a48b8d566b3dfb59abfcd6fbd5f7910daf95d72806edc6c745e85c86635346df1cd700a085b36b0 SHA512 bfa1de5341b166c365e7806b2283df11244d0445618e62c3abedc1d16db6b002cb5a5cb4cdfa2111073cb29424255628de3f64815044f42b920f5ef489d2a702
+DIST tsetup.1.3.0.tar.xz 33542536 BLAKE2B 81f0361e89a8c92153277288ad74c469baffa0c9f75cbfea6bf387ef23a0c5a57443e90f57f9cadde9df847bed761e9e57f46e8d28ed176b1f6c48c562d3b943 SHA512 735592a09ca6e86bdd2d7375043a61fecf4ae7d768d2e7b177e60579fa56154d56046ae890317111c1d91a222a9a96b9549497efd5018938e0ca711e67439424
 DIST tsetup32.1.2.15.tar.xz 35562536 BLAKE2B 3d5977bb64a3f62b2442563fbcc430c7603288e75d1e63fb594e14b034bc06ba3c85529215e2ed03f276f7776f2d9ac8139e0f4ae5d4feb8e6a7805aa5f6b215 SHA512 7000489a8ccef45b226858af707cb167dff346e10e33f0ecf745c0b26eae8cb7df9d5bf1604eda5865611aae324b5da6f7b1975371257dec34065cd2e3399833
 DIST tsetup32.1.2.17.tar.xz 34845244 BLAKE2B 31b0394fd3f74d211acf3aa4aab0181036fd3226b9d5e8721447b245d846b18bd499b96e8c916956b5d294b670309c305f1229758e23b0f231306bfcdf67d67f SHA512 0fb8cb39bf93f49d4cab794c1e9588e4bcf370a7659d6a84d34c2cada64f527bcee9847edd667563a451c74d4191e5070dfe615d913985dd3c6bc37070869ea1
-EBUILD telegram-desktop-bin-1.2.14.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
+DIST tsetup32.1.3.0.tar.xz 35710316 BLAKE2B 68c5d3cd0c286d261cd090c34ebf6c8eedfd29cdbd579c38b65256f2c2dea0196450e06a91944bede2bf9319d9a6e6966178c49da0e8ac19093744cccd56c1a9 SHA512 437e5bdfd11673c5a85933da23f082ff51d4c7366d1aa6e115c9a8f5a6c63987a9102b891525887c27f31c293a8ed167790a6bcd9cb55aa338bbd4e8b870b159
 EBUILD telegram-desktop-bin-1.2.15.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
 EBUILD telegram-desktop-bin-1.2.17.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
+EBUILD telegram-desktop-bin-1.3.0.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
 MISC metadata.xml 696 BLAKE2B 2a62c1ee8392d2445fca65138a2af2d6aea5231214075bd816a7349b6df32b7f5e743f1b642e25c63e4c93e1cd610ce97802a490d60e75aab1fae4aa65d53ff1 SHA512 0b9a6a3ab2e542aa46a8bf8704db8fb7a4132b5c49a91df8515a0c2e5dd9be7f0df69c8670cbc2850115a4c87c973e1356adcfc4d19c0659ae4cfe6598874bd8
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.2.14.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.0.ebuild
index 6522d0b976f6..6522d0b976f6 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.2.14.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.0.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 174595608d41..7bb315aafaf4 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index d4c9e48f5727..da2607937631 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.0-CVE-2017-1000231.patch 396 BLAKE2B 60225693e684ce9b7850fa416da879b91543b08573b36eaa1da40cb26c6726930d0d0c31a68b7aa99852859ae4554cc7b111c8318ffa832c7140a1a9cae80668 SHA512 c9119730ef74aaa89a362fa5354267da7e0336873a66a9e68b1d634946ab7938ac8833a8b1dbd27d51add226008b0b9336e4e4e06f20d714b225e35cb3efcbcd
 AUX ldns-1.7.0-CVE-2017-1000232.patch 469 BLAKE2B 4e17f4d13928081cef5093b51db1b1b1f393d151a5822ad4d40f385620fd7f78168e581a6e2d50164240ffe368d4926687a860f5555432d2a9b5b389a3287ea7 SHA512 2eaddaa4ab7ecf8e54a7fef341406e1f8bdb278a2caca3d8cafdebcfc349c7e3ba1247f194a5fc0fd50074c8836f29b4e5427b2ce7c3b8513191aa1b4b08c681
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-1.7.0-r2.ebuild 2250 BLAKE2B f39a9af93e5e1b759824203b25d58861197b5a0cb783ade47ef1e2cde182f89bba869fed308e09ce7721e45ae80e3b1825f36296312e48b5a4deaf44a2a125f6 SHA512 3006861462b80aeb942b791a08e8a1cea3e3947d03777137b92d7a379fd5c07ff4425eb34d8c8d9ffba4bc30ad822b23bced00df444106309a5b9ae0db4ea1f1
+EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B d062305d7326af8b6d945f83163af65be20d3db24f4564973308055efe0af48e1e3258c704c57988109defedb5bba27723ce11b31c9bce53c61965efc8670828 SHA512 50f01f2baac2ce3e6ba676ffc6c9475865164f5decae3574581625300ccd3df19dcfdde83da78c7dfe3ae22a91eb99800786a6e5b611daeda95000c90bdbdc36
 MISC metadata.xml 743 BLAKE2B 31fe371130dca55cc2950a0892ddf2e97f1c7260b57e893932c14d2af254b1c9272a678a4365762247b5fd7a6e2e6c1a58dd326f3837e0e12389bb08f493562a SHA512 b8d5c5fd107fb7dd7dc2d7d19fbb91a07a2a619b6c9ddd9146d9359c06ed96059c87d169b7c2022760e4117283372c01b6f5231edf975bbab9c72a3ee8347f35
diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
index d42a8c87f9db..3a6c156757c0 100644
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.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="5"
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/liba53/Manifest b/net-libs/liba53/Manifest
index a8f9c900e9ca..88d123ab0b1f 100644
--- a/net-libs/liba53/Manifest
+++ b/net-libs/liba53/Manifest
@@ -1,2 +1,2 @@
-EBUILD liba53-9999.ebuild 433 BLAKE2B acaa66685fa99355dbbbc766bd190866eae849f964565eef9c659a12a4f68470e137e675a1acd027cbf54da21d246d66ff859e90f740c8410074bd610c7f7231 SHA512 27731b011de4712d5ecb7e63ff1d7bf96bbea64babfc0e950156daa05e454c66bf79eeaf18001c0766181d0b9e57aec4319e6a68e3173d80bbab60454328afb2
+EBUILD liba53-9999.ebuild 434 BLAKE2B 78f8c543a83c0184368e8709e1c6e0405cc27b7bf7d4ba9a6d12ea37a1b39462d114d86cd382548823c407b2a494fac13d70707be6572b0a9cfc6560e3155fcb SHA512 11e70dd5500e4cb1d7ddd8c7ae1a0f53f47426d6e43430aceae4971e5efdfe3e12afd0e40be09f8d5b74702de3b1dcf00152495364ab8e46a5aa853c54703c9c
 MISC metadata.xml 323 BLAKE2B 15cef51763586565faf1d8c4a090289b05a972ef40ba4a5aa3229fd9402b8c5c296b3a10ea59f4a727885fae673d8f029342f669fd5dde048ce41697a8ab8b03 SHA512 e8c544b1f06b9d2527f39d1b259b3d373d6d6b78d2c96e213d9209f4f8a65d332b5d3223ba93e5a6e4df5c10eb74fe0b4e43de491f8f8346db1042147e07fcd1
diff --git a/net-libs/liba53/liba53-9999.ebuild b/net-libs/liba53/liba53-9999.ebuild
index 30b03d7b29d2..72fe4d1689a6 100644
--- a/net-libs/liba53/liba53-9999.ebuild
+++ b/net-libs/liba53/liba53-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION="A5/3 Call encryption library"
 HOMEPAGE="https://github.com/RangeNetworks/liba53"
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index e160c479c942..c11fa7a7d68e 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,11 +1,5 @@
-DIST hackrf-2014.04.1.tar.xz 14375500 BLAKE2B 9bf73bb331ee73b60d3e6ec0c0a4ebd11ef0c361960c68a16395c94b74f76351c98f8d78c817c6ae7cec385d1570963a8fff2bec37c6bf7de6835c9abf97eae5 SHA512 1929c7af1de0c9ad1afcf56d53c5db13ef362f3ef896f3549841eeea87aec5e1133c63da740688739278b13e772b70d510a4a1035440b5b6aad2e9438a694892
-DIST hackrf-2014.08.1.tar.xz 14376904 BLAKE2B 6ff096dc3e3072811dcb324c71b56fd2023e8e7bb39f8977ee783edc835b588935f1afb1a26ebcdd16c1e6727be3f82e59d2c34e2f193aff43638c22f3956905 SHA512 2bb2e9398479f635fc4cb73875d9728c689f5d29bfbdcaae661d98ecafe51d38ac8768dd4f38b87766195d9ed08757e76d790030edf6f6f572d547146287c073
-DIST hackrf-2015.07.2.tar.xz 14415212 BLAKE2B c9ef83e7a4c1c0cca9ea592c02cc1fe9fc5f42203d177f15b36893e719cf3c269cdb8c3d0e13ed5c51826b8e346b58d572b96c3d197c615e58f9d4464a306c14 SHA512 a4f7b7800ece9b260d5c8c374f5544aa55cd2e97e10c6a0b33cf476e2ad4811321ffb1308d9dfb2168b2624cd3af616d1c314ad86bcd6f4c3fd0897319fa2cbd
 DIST hackrf-2017.02.1.tar.xz 15409352 BLAKE2B 930c6d30cbcadd366f889add7cd8f9756edf7a6b82a478353ea94662e9d2e0b612ca5ec0473eb0083dcbec761f2d5385eea31608f50f81543449ffa4bc31d277 SHA512 7cd6ad9aa8fef8afed41c48a3358bff18c6b2a9a112b13daabda87726e0e3ca4cf1e0c0c6ff9689bdd49f854e2e5887a84ccd7975abef43a43b75ecf8a5236ce
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
-EBUILD libhackrf-2014.04.1.ebuild 671 BLAKE2B a909955f757c406e2f41942b0810b3bad641c0eb5e7ce36af0519145b216abf992cd4d3f64cd82d90fde7873b4b26c747a01509c368c0250af0250e9e0a22837 SHA512 739ee11926e00ce289b5a80cb39b0f9c0061b99382364c3f8084ef7a9c2092dd19d7a8d0908d07dc03024e677e47f03d7b322615aabb744552efeb8f3d8ea76f
-EBUILD libhackrf-2014.08.1.ebuild 878 BLAKE2B 258be0028e9a87fec2b2ca34e97245e3c9b4af3f4187a2be58d8f1a7d1a625d4fef8f17816eed9e6777de7054ea1349a1ab35f165b7cde66521355fa3fc353ce SHA512 09937011ec15856fd3a0bac7c11f3c8e7ca2fff6a5cbc072ad9a08695982330231ee5c132d98fe72244b19aa46a46e0b46071375882f36cf5125f42198fdf309
-EBUILD libhackrf-2015.07.2.ebuild 1026 BLAKE2B c71be2515b07ae92aebcaba336ddfecabf5bf0c92e170e82b0d76ead28a481e40fe8e5590956fc10e1f6807058c1d030ce072979a2c0f33e3459824b6a1bf079 SHA512 f0edc37331a90968939a1cb0891e37d8ca9f5ccaa7e934a082d3235548cc235563443abcf92bc8d39839c7177bfefcbeababc6bae5a22ac9c218bd2cd494f8eb
 EBUILD libhackrf-2017.02.1.ebuild 1023 BLAKE2B 71fbd223d93a52da2aa85660529a5ef82a65c9150482a58ae648bf3ba6a30750f9a95f87e5bd41aa7871b79a5cc22b3723bc7d35b8e5121f2b4c50580eec4fab SHA512 294a3c13016822a75531d8bde30e9bb1f3832494d0f944f77975dd817be573e332f709f4aa8f20599424396c6e2ba32f122a50822fc344e669d9b5014006ff59
 EBUILD libhackrf-2018.01.1.ebuild 1023 BLAKE2B deb0d52f8c263d439ca72b1351aca7b7413fc14c8c13cb934d52cd113c4b7c2a3b9ad47a61700f1a8ab9fe216bc790df1255449db23ac7ba19f830868270b905 SHA512 b160bc4cd6034f4f423d271f2c07ca851e41471e4ddec39692ea8705f3b527d5047a28af58f521160e9d336ca63318cebf80a4da3d202097376ff763d75e36a2
 EBUILD libhackrf-9999.ebuild 1023 BLAKE2B 71fbd223d93a52da2aa85660529a5ef82a65c9150482a58ae648bf3ba6a30750f9a95f87e5bd41aa7871b79a5cc22b3723bc7d35b8e5121f2b4c50580eec4fab SHA512 294a3c13016822a75531d8bde30e9bb1f3832494d0f944f77975dd817be573e332f709f4aa8f20599424396c6e2ba32f122a50822fc344e669d9b5014006ff59
diff --git a/net-libs/libhackrf/libhackrf-2014.04.1.ebuild b/net-libs/libhackrf/libhackrf-2014.04.1.ebuild
deleted file mode 100644
index d674575992fc..000000000000
--- a/net-libs/libhackrf/libhackrf-2014.04.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="library for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/libhackrf"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libhackrf/libhackrf-2014.08.1.ebuild b/net-libs/libhackrf/libhackrf-2014.08.1.ebuild
deleted file mode 100644
index fc72fea1fd62..000000000000
--- a/net-libs/libhackrf/libhackrf-2014.08.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils udev
-
-DESCRIPTION="library for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/libhackrf"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i 's#plugdev#usb#' 53-hackrf.rules
-}
-
-src_install() {
-	cmake-utils_src_install
-	udev_dorules 53-hackrf.rules
-}
-
-pkg_postinst() {
-	einfo "Users in the usb group can use hackrf."
-}
diff --git a/net-libs/libhackrf/libhackrf-2015.07.2.ebuild b/net-libs/libhackrf/libhackrf-2015.07.2.ebuild
deleted file mode 100644
index 5eccf9765911..000000000000
--- a/net-libs/libhackrf/libhackrf-2015.07.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils udev
-
-DESCRIPTION="library for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/libhackrf"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="+udev"
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_configure(){
-	mycmakeargs=(
-		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	use udev && einfo "Users in the usb group can use hackrf."
-}
diff --git a/net-libs/libmirisdr/Manifest b/net-libs/libmirisdr/Manifest
index 9e8aaf19e568..7584dcb5d284 100644
--- a/net-libs/libmirisdr/Manifest
+++ b/net-libs/libmirisdr/Manifest
@@ -1,2 +1,2 @@
-EBUILD libmirisdr-9999.ebuild 558 BLAKE2B 7a57c02fe0f4897762a90d1007024a22f9755db332a3f8290da582829556b5f884d8ce4618bc2bc29e421984d8e5dc15dff54cb91a6668aa09dda8eea596d37f SHA512 d6f7b4c4cd1e69f6712b3506e8cbcb268ccc9e721567f3349d795ab60e777d566851da32ea793f51431cd5b0a65d2db3bc0cd31c8f708a8a75a075b74215ed93
+EBUILD libmirisdr-9999.ebuild 559 BLAKE2B 431fa6a5a6ab8820246da0703a1bfb3b8520890a98ead1d046c17c4bdcf2981a2d5baa0ce8bdc98712c5389da1dd4f859091ac1b4145c5a408c112d597153041 SHA512 601028c89afdae89d2419ef6d2bf305748a303e9b35e4a2629799b4e12ff481113ffbcd49a061425909647635197c4cb88ec9d646dae1b1caad3eada97125a24
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-libs/libmirisdr/libmirisdr-9999.ebuild b/net-libs/libmirisdr/libmirisdr-9999.ebuild
index a1f29a9d951b..be4afd7f3f97 100644
--- a/net-libs/libmirisdr/libmirisdr-9999.ebuild
+++ b/net-libs/libmirisdr/libmirisdr-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit cmake-utils git-2 multilib
+inherit cmake-utils git-r3 multilib
 
 DESCRIPTION="Software for the Mirics MSi2500 + MSi001 SDR platform"
 HOMEPAGE="http://cgit.osmocom.org/libmirisdr/"
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index c69268e9fad0..44583c5218bd 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -2,5 +2,5 @@ DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
 EBUILD libnsl-0-r1.ebuild 578 BLAKE2B 1ad99a98bb11433c7040daffccb5697f3984af7206b7e796a43337d0e1ec2a52c7bbd9dca4f33842b72030ed9576aaba86f4192eb4bf5e506dff0e2be5402f07 SHA512 05da30d3ad8120ee9e710e16edf3d44921e7a40bb2922ef017c9832e8413dd9c59ed40d20612e3897f13619a6c2726fb7638dd4697e82e5e7073abd995571ada
 EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
-EBUILD libnsl-1.2.0.ebuild 910 BLAKE2B 415ef94be97fd29ffa1896127e2305a5d9c09cc34356ab5b62b0af437e38482f830405c80593200c9a0802138a749b86df9b673ed6eddf760c51f57f905ebebd SHA512 29fa40468e080863124f088e70c828e9bba02ff2fb64b39ebf6c47e03122d9526f627759a06ed8d9d6a47b4b106f5235efbbd41f8c92335ee5e13b6fd97a9a65
+EBUILD libnsl-1.2.0.ebuild 903 BLAKE2B c2c7fb6d0a73b2e0f07bde1f3f7c397101a1940803d6dac7e22bdad354959f4dbb9660e1af40f67d73e140bbdb2f502517807c112b5c88472087e97fbed2793b SHA512 6b308d50d2e962bcfb7731f5739b9bdfe6ecc3eab65fa8eed7abb93c2473a08fe45f7476ab2a30c43e7918ddc31d38ee7cae344594bf66ec1c67c94d81191f35
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 016c30ac64d5..3d2e8430509b 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest
index d7c4af1bc71a..46f0bb800176 100644
--- a/net-libs/libosip/Manifest
+++ b/net-libs/libosip/Manifest
@@ -1,4 +1,4 @@
-AUX libosip-3.3.0-out-source-build.patch 522 BLAKE2B f4b7b002a4f606b2531cfbda557d33da249ef822de23062a06a699676de58176fe1706a603c70ce41fc4fdbd8a73f6aeabe959838059d9111d0f6cb29d5e788b SHA512 ca4911303c290f635befa93c465ed25cef85c182c6645c1a3700ed6c68da9f268c52fdf07473e116f1a06daa477c4c1aa8803cec3cb151b45cdc1b504f705f4e
+AUX libosip-3.3.0-out-source-build.patch 526 BLAKE2B 096d07ea4cf6c49793eaa4f8fa796626fbfa064020bd41f59b53a638b7bba823e1292bf665c89056aba5ea0e94123288769a2a5bdc8c02d65320e1b075e02e2b SHA512 772d88b7d18bba6112679411afd93be9473b17e808cc5987f582a43877fec9f288597cd0cc2555b45b04d631764bcd9d90350e712d028c9cca58629831b589b2
 DIST libosip2-3.6.0.tar.gz 598496 BLAKE2B 734242e556306eebbd1ca7f1c9dec3db5be9bc97453a71c3803ae4ee6e02e6426b1ff3a00caa8244369ac61857433b7a6976fc76908543429ef5a3bb3386f191 SHA512 58109fdc643673e811ce576374194d6d33b930ecec3221f31834471f52f5f2b2b30e5e331e245e33b2aafbff1aaa411d3a7657c25f3bb0b9d6cda0ae766fd538
 DIST libosip2-4.0.0.tar.gz 644958 BLAKE2B 78dc5477b3f7ea8a750478804d0486a16dcf99101f1c38c4532f18f2dfd3b7c844728115973f8afcd42e384547c38de28660970b020b3df6dbcf854928573057 SHA512 995fc67c9a7536628ebaec9f4500bafa8a2f88081531bbae5194372b51102d556de28aea7d121e20cfda82b302a8a4ceb6488dbad61676930fdc13accb12b961
 EBUILD libosip-3.6.0.ebuild 653 BLAKE2B 9b125b674bf8cb53545a9f4937c810d6069733952f70b56963988736da52423c9e5136e01b8a37029b9d3e8c8d89400334d577dc990161d87d840f1cabfc57bf SHA512 1ed7156a84235c329a296dbbf785934157d83171ca2a0a9090ec17ff14507f1104bacd2e12bc717ee08ac2102baaefb8175e3fbb8d378c765d34262062545dd1
diff --git a/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch b/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
index 04a64ed39446..fa87b19d0e2a 100644
--- a/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
+++ b/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
@@ -2,8 +2,8 @@ Fixed upstream:
 
 http://www.atosc.org/pipermail/osip/2010-February/009864.html
 
---- src/test/Makefile.am	2010-02-11 17:51:43 +0000
-+++ src/test/Makefile.am	2010-02-11 17:52:09 +0000
+--- a/src/test/Makefile.am	2010-02-11 17:51:43 +0000
++++ b/src/test/Makefile.am	2010-02-11 17:52:09 +0000
 @@ -49,7 +49,7 @@
  	@echo " *******************************"
  	@echo " ****** starting tests! ********"
diff --git a/net-libs/libosmo-abis/Manifest b/net-libs/libosmo-abis/Manifest
index 5aedac6d2a45..b609387b5a92 100644
--- a/net-libs/libosmo-abis/Manifest
+++ b/net-libs/libosmo-abis/Manifest
@@ -1,2 +1,2 @@
-EBUILD libosmo-abis-9999.ebuild 429 BLAKE2B cf3223ccdbdc2aacaca0042c0190718840e9badfd580e30b4b1585a743772b84d9a65ab72e2eb14119f93b1e281ef8358323fde6c7a49da5295a12f9ce2dc627 SHA512 49a925a221e7f943ef60fc1dcfc55fb3ef522e11caf218bf4e52723e3c23cc8612c584770fc37760195f57c1dbe612a1750d6fdd79e71502dc0796afebe62fc3
+EBUILD libosmo-abis-9999.ebuild 470 BLAKE2B f67deca8e992f0701d5d3bd34a57bb56783e3ce2e6bd52fa2a38cb210a46ea70b351c17ff525e97c447edb79a6b059f1693ed87d95a41b2ef73e3dd3fff9de8a SHA512 bf886f9acfd03e63f197a21ba83e36cbd51f40fdf7a4e5147a7e42494c2856cff9c8d863b0c77b5ee01aaf1c6100baf1a0323ffa2bf95f3e51ce8d9add8488c6
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild b/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
index 00d1ef07ca50..3574747f1b9d 100644
--- a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
+++ b/net-libs/libosmo-abis/libosmo-abis-9999.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
+EAPI=6
 
-inherit autotools git-2
+inherit autotools git-r3
 
 DESCRIPTION="Osmocom library for A-bis interface"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/libosmo-abis"
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="net-libs/ortp"
+DEPEND="net-libs/ortp
+	>=net-libs/libosmocore-0.11.0"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
diff --git a/net-libs/libosmo-dsp/Manifest b/net-libs/libosmo-dsp/Manifest
index 4814bd196910..9b78ffb43abd 100644
--- a/net-libs/libosmo-dsp/Manifest
+++ b/net-libs/libosmo-dsp/Manifest
@@ -1,4 +1,4 @@
 DIST libosmo-dsp-0.3.tar.xz 106792 BLAKE2B 8ba4c06abda550383ff349d11456890062da606f553c4b0eccc3e8b5d70c4a31ec2dd82ec90ff0ef29284ef13702d3d949720b218e7374cbe7553492faeee719 SHA512 079316bb882859787ee26143e3b105aa260c89022b81a38b29713cde39093dc430abea406468774649dd14232c969b2806c47634b64f940f78fa20cb90ffade5
-EBUILD libosmo-dsp-0.3.ebuild 813 BLAKE2B 1392225b388c9e0b3579736b1fe22bc3e967b5a9189adbacca8f0b9e74db8f2b46244e1f9e7ff8b2d803c61079ffe38edfaf1524126c665346609303ad1c46bb SHA512 1c0b5762a8dc2965766a22862f4eca3ebca1a1f45b958f70ef07df7d3608d13bc22ae3a89304fc99ef43a53a7c5cdbc823c59747149adf11d7851e98e6b184d3
-EBUILD libosmo-dsp-9999.ebuild 813 BLAKE2B 1392225b388c9e0b3579736b1fe22bc3e967b5a9189adbacca8f0b9e74db8f2b46244e1f9e7ff8b2d803c61079ffe38edfaf1524126c665346609303ad1c46bb SHA512 1c0b5762a8dc2965766a22862f4eca3ebca1a1f45b958f70ef07df7d3608d13bc22ae3a89304fc99ef43a53a7c5cdbc823c59747149adf11d7851e98e6b184d3
+EBUILD libosmo-dsp-0.3.ebuild 814 BLAKE2B 8aa61c9d25e2749a87c3f41bbeee3ac6850b7b55eec0f90eb8c810fed934a5a6312bf21fb380f873f63649d32fa3fdbeb1461a89bb363feb400e56e6078d9dcc SHA512 9bad89b2dbf29b526d64f3c102dcccd7d772ced4b3c6f0c22c0ae7cadcbeb4fc716eb1cecbc3dc17ddb291aeda8cdd989b48fe8900bb8cff584a833a0f0b1d08
+EBUILD libosmo-dsp-9999.ebuild 814 BLAKE2B 8aa61c9d25e2749a87c3f41bbeee3ac6850b7b55eec0f90eb8c810fed934a5a6312bf21fb380f873f63649d32fa3fdbeb1461a89bb363feb400e56e6078d9dcc SHA512 9bad89b2dbf29b526d64f3c102dcccd7d772ced4b3c6f0c22c0ae7cadcbeb4fc716eb1cecbc3dc17ddb291aeda8cdd989b48fe8900bb8cff584a833a0f0b1d08
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
index ef65572ce883..b49e28335ba6 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-0.3.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 @@ DESCRIPTION="A library with SDR DSP primitives"
 HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
 	KEYWORDS=""
 else
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
index ef65572ce883..b49e28335ba6 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-9999.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 @@ DESCRIPTION="A library with SDR DSP primitives"
 HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
 	KEYWORDS=""
 else
diff --git a/net-libs/libosmo-netif/Manifest b/net-libs/libosmo-netif/Manifest
index 0f80020a9fc9..10f5d9a6c117 100644
--- a/net-libs/libosmo-netif/Manifest
+++ b/net-libs/libosmo-netif/Manifest
@@ -1,2 +1,2 @@
-EBUILD libosmo-netif-9999.ebuild 468 BLAKE2B ed7f73b8a4dfa65ff9aafcb6fb63a9ec8cb0151eae7af8cace0acd8af6bad390950d6ee2cfb9beb338fe3f2bae0b469164cbaca6978d07ceeff40265adcc53fc SHA512 00e2e90a7e9aef3eded853234e6072bffd43204debfe27ca73ebf9a53f249b8a8b46f53873b146dd757afca9ef27a294ae438de18a94f60b6b7db2d57d10c1f2
+EBUILD libosmo-netif-9999.ebuild 469 BLAKE2B befc32dd75b81387007d294f9933cfb1022e7589191972691c0a7d92898930464ac76b59528c22840d5379aa5e5c2014d4f9b83feb9ad412e3edee143829b4a1 SHA512 12d0842931ce28a00531889f6d2e2c08b15bf4182603ce5c19c00d56b5855cfc50d2851f62105b916223d97dc32af8236d9ab7c0614bca1f215da410614b08d0
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild b/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
index 7ecc9bb91e45..d2b2772d8afa 100644
--- a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
+++ b/net-libs/libosmo-netif/libosmo-netif-9999.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
 
-inherit autotools eutils git-2
+inherit autotools eutils git-r3
 
 DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/"
diff --git a/net-libs/libosmocore/Manifest b/net-libs/libosmocore/Manifest
index 1a82dab6280d..6fbc63caf0a9 100644
--- a/net-libs/libosmocore/Manifest
+++ b/net-libs/libosmocore/Manifest
@@ -2,6 +2,6 @@ AUX libosmocore-0.6.0-automake-1.13.patch 245 BLAKE2B 776b88a297b1ad6edaaff357bf
 DIST libosmocore-0.10.2.tar.bz2 646555 BLAKE2B 62dbabdbb8a397662b618863aade394ef4638dd266e059ef4c6fa54364aba60db29cce1fc6c2692af095f32b3ce186ee5b788598595fe2128f0d04caad9d83d2 SHA512 a42db3467faec9c814efe40ae8cf4a41e610b97cac04c1da30c211f116e1f7907117aaab89aca8af3dcd8aedc2be73c9e1c194b9062d33856de02feddf4bda22
 DIST libosmocore-0.8.0.tar.bz2 439320 BLAKE2B 2614ddb8a1f7a0a72bae888d601264d90836daf2067716f2a264f0632699929db9b0a3d3f353629c08aaaecc84f429d6fa2c36481c8bd27ecb078f4447c937c8 SHA512 4ffd5943807440f80f70e381e477631a592fef41a3485819d94e7ce9523785e20057759aec6cac7abe57ba21b7d48e38164b7272c5bcd89882a3a8e213d89361
 EBUILD libosmocore-0.10.2.ebuild 906 BLAKE2B 17533a7fba36cf814bde7fb4a6407e919b6f85773dd830013f3e7d11675db8d4d128448755357b2212dbf1db7143c638b1d3e98172b09189a22c6b2f9b44f42e SHA512 21fca38c83177653078fc20df1ae876ce6f91d2e6e3e7e726cd3cc68c5e3248fa9270a64ff9ed03a741f1d933448083b1a566877128ab9effb2b571b264b7ef3
-EBUILD libosmocore-0.8.0.ebuild 1072 BLAKE2B 345c0dcc9366551db87ced603a17ba986680e4da4a7f7ab75a039be268a6926bb8096a20f981c50789e2abf539fd166c5016d3e65cdc25d1c14c28153c48ffc8 SHA512 05f3d6e1d672e9b4bf259a4c4c0523d25d5eff267a93b504b23a96fa1d3ac60b690d9abbb2d2c0151171a646a46a82fe08873e9b705ff41bfa3d859ec8bf6206
+EBUILD libosmocore-0.8.0.ebuild 1073 BLAKE2B da9541dff2ae947ca5846516239d2a35697b942b4d6aa790dcb8f306052d2526e3ecb3c4a0e51c2243d2e61b93a8da187bbc04ccdd2acc58a968373635f37df2 SHA512 366616aa4ac0e675f2f431236ee2fec3cfc11fdee4bd8c75118e4d5595e2c1f544b5b96b869a6dd317efe2fe7ff4659b18f729485949ff5a526e525f3d1cd9df
 EBUILD libosmocore-9999.ebuild 906 BLAKE2B 17533a7fba36cf814bde7fb4a6407e919b6f85773dd830013f3e7d11675db8d4d128448755357b2212dbf1db7143c638b1d3e98172b09189a22c6b2f9b44f42e SHA512 21fca38c83177653078fc20df1ae876ce6f91d2e6e3e7e726cd3cc68c5e3248fa9270a64ff9ed03a741f1d933448083b1a566877128ab9effb2b571b264b7ef3
 MISC metadata.xml 432 BLAKE2B 955701be1bdd728ec1ff6851f1bb84c281a65c63a28c47e4a4328794e26381ec709cbd9dbb2b99f3bdcaaf77793c849b5d30a232edfe5a7866b3b4b927860ddd SHA512 3b4c9d8e510a658b9e1d5ea30042a45aefcd128429d45665b152b238b216bdd8a245479c54ef0842fda7937830b38d33cef6e12b802b7ce525ced80d38951157
diff --git a/net-libs/libosmocore/libosmocore-0.8.0.ebuild b/net-libs/libosmocore/libosmocore-0.8.0.ebuild
index ea57bb86c30e..1154c80eb2a3 100644
--- a/net-libs/libosmocore/libosmocore-0.8.0.ebuild
+++ b/net-libs/libosmocore/libosmocore-0.8.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
@@ -9,7 +9,7 @@ DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 else
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 8c54513401c5..9da035485b46 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -5,6 +5,6 @@ AUX libtirpc-1.0.2-glibc-2.26.patch 276 BLAKE2B 8e557e3c40c4c12339d90c238b26ee39
 DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec
 DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B 3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e SHA512 1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.0.2-r1.ebuild 1629 BLAKE2B 4d4421e028d91d99d299356d21b4c3dac5ff685523fe181896bb5432a4c83d963bb48aeded711411c1d57870705609d2ec0433999dc06c8eb1d45cb7fb016560 SHA512 a901d84990e99b490243b3e2500541d096c854bc79866d596c53cde1695926ddc906798222f5fb94e9a0cc8ad4b014f169cee5a1325ce30c21cde2ad2eda86c8
-EBUILD libtirpc-1.0.3.ebuild 1556 BLAKE2B 02d80480f8ff502134da6ca8a5643da74af2eb60f41dbc1c9db259000cf5e7d6230bf92fc1cabd69cf81c2d7f857eeef3b4634b3cf1a7fa97bc918bff2ea975a SHA512 7b10e7c06b7057738975899deb03559a955739ddd2cd1a08f9b511a1e991a8297729e782134c1ee1010d1f47f06f124c5ec9b87a7aed6b73ca67f534dc59f16b
+EBUILD libtirpc-1.0.2-r1.ebuild 1634 BLAKE2B 1a95787b197965383fbab8f5c7c475df2ced8d21b331c11fc351bda1e17b864ba74bff204d140776a1c1384fce42ae580fc6403ce1b88e946716b4d2274f7881 SHA512 8cb2e688bb9b1b4a8cdfd48ef19e608f68588af6f4d4bb2a1c8d770d44a9909db5634507f664ad305d4ba2e71402fd52a32a3f01096a50d84d32e34f5cf3beaa
+EBUILD libtirpc-1.0.3.ebuild 1562 BLAKE2B 544ee8a721fc1e7f04e41ac1ce778b9d5c13093782282679aa58e16c3fe10dca06fcd7c4deffb99cd7c5b7d46655a4bf036e2233e434a1374c690bca9bc69f38 SHA512 769c5e2666f6621aef826d8b4a2364d8038627004e96e1979029cff0dbae83d22398e031284ad3896490d8fececd4eba9ccc9223ce0861636c4e68a6d6d2b797
 MISC metadata.xml 335 BLAKE2B 57eb0cadaa82d4fefb0adcbc01bc19d720ebd10256a7188a70e7ae69f147acba7370fcc07813352a067a181bb77321677713cd3ed4cf77f0c815a88a30abbf20 SHA512 d6dd857293827907e545dc6e8631d06682d20e13442f8ce6cbd2e2a789d885c8a788f4ed1d062a8c54c4165d22eb096279d4c2f598e462a57faaf8bec1e9777b
diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
index 4921db42f157..e299ad562072 100644
--- a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtirpc/libtirpc-1.0.3.ebuild b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
index 68d0e2e63358..355ad74c14ae 100644
--- a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index d32f5313a01b..2599004b382e 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,7 +1,9 @@
+DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
 DIST mbedtls-2.7.2.tar.gz 2127772 BLAKE2B d66c65f0d974baf97ae361e64db5028af6c402ea248a785009b422d993deaa4facee98dd338ee4b5d36087fd07e679069fc4fb57cce548097d1f788cedb825fa SHA512 52455b68744a3c220aed7346d19c7b9bebd3a065406242b446816a3b02325d72005b5c381b158bfff90e2fe5854064629b297fbec95fea3ad203bfae51a15cab
 DIST mbedtls-2.7.3.tar.gz 2145554 BLAKE2B 442d840f7046ae63508528fe76e9a12d438f14eb0468a2617cc18df8223105aa696c0b676193891359c8fbd56771acc2690760259a9ab6345883c63cc634c6dd SHA512 f1eb1ec4d4cdbe26434df6d17d4af72ef5bd2f370177f5ce787ab86ae6bcf200f221ddfdc5948f87e7da9f9e04ffddf8b68e83e203de2f8c0dca8c8594414b23
 DIST mbedtls-2.8.0.tar.gz 2132562 BLAKE2B ac0a67c51e4aeb59e947d16039b20de680ccd7daf372652c0a7d1a6694ce8fe213f959b47a4335cda236575d8f491c84a413ae2f408e86600519ac66a31f8c1a SHA512 baa2024e26cb1d772a525348cdcc84e2b5eabf58642d8c792fe88cf6c539b36f14e80d592e85bc474f6be036513ed4b8bc86f5808ad4f5b08f25ca7e43dc3921
 DIST mbedtls-2.9.0.tar.gz 2163543 BLAKE2B b47e6242b5bad4f571bd900960e20ec0266e6f9f25c96df85c7d983dfa3d71f8b842b90f112eb69a09bf99ed3ef7c059c2c2d522ba66e92f4c9097754985323a SHA512 5490822aae18dfb3eb2cc94e673a575daf0cdaf9a4867ff84f0df9749376ea5c54a3f67902b4b86e2a853508af0585684618f9edac8bd92352cd3ca4461bda1c
+EBUILD mbedtls-2.10.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
 EBUILD mbedtls-2.7.2.ebuild 2416 BLAKE2B e9f164316f072fe0648fc77391f78b14bd25fca8aac75172f086678592be85266236ae28e252d0595b52165016153f363f0b5af2ab799c544b9531070136031e SHA512 3ea0c78f51c759d556e68c51a5006d09004c98e04c7fe331b01b586dea921e39079cf00e7a6399a175c0b51bf07dec05c6a08ee54e622c35602fe5aed1f7f1cc
 EBUILD mbedtls-2.7.3.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
 EBUILD mbedtls-2.8.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
new file mode 100644
index 000000000000..a992986693d0
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/10" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 9621696c58ec..6a99a9c5865c 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,8 +1,8 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 705ba235f707c750971a64ea3d631925ba457b3914b0cdb2582236c07a44ca060430336948fdada8153a9f5af9ebc5a7a4e948231a0a2c4412326c7188f4204a SHA512 6af7daccd660bfffefe5c155c364feb6cfd2044f1c230a31f138a20830833657c3c5a029d459dbf565ebf3ed5a356d006003693c7112cd37757977781f513eeb
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
-DIST node-v10.1.0.tar.xz 19363748 BLAKE2B 931349d204764472706f44473b2ea0e1399dad84d0595cecfc2cbd71670df25f05c2c2ac77e4c18852f523d5b0cf853ca83739fc96a46e1f5e76ae51cab006c9 SHA512 f98da47849de8a50d9986d0176c39914f3993e579a3d482153cb0fceb64d7c79443fd230a80946361008e4fac58b7b99292c906961fb57ef14ccecfd1da07156
 DIST node-v10.3.0.tar.xz 19464004 BLAKE2B 3bd88c231402728874c9c2916225d995a64e79e311d45869910192b6c46d450e12c4b20c9045bead85de24d3e46eb65793a9a886df87545836c0875c88a98cd1 SHA512 c52c798f16b69c0266014e9f53d5243d49e71af9fb411400d526a054995f0d2d2a150d31842160af0feffbd240e36dd97b870eb8c1fbacd3a7b18a143746df7e
+DIST node-v10.4.0.tar.xz 19659232 BLAKE2B 71f78aa5f652abd8ed06d995efa56e503722c8405ca0fea1a862255f5e266836ad788840a04f568fd06b65cf65f40ec89e8e5c89c8c1162aed654c0caee63441 SHA512 8c94d2686c0b4d0e9d5079469daccc3b8287f7040c35eb0bdb8d45950e09044d5fb5bf20f31fc5856049a528fa5e4adfd507877741101cf8bf57d790fdd80f92
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
@@ -12,8 +12,8 @@ DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951b
 DIST node-v8.11.2.tar.xz 18318444 BLAKE2B 04041462526dbcd6c4b852f9ca1dd1ed868a1afef51f6560eecf0c58a659c0cb5adb54e4b791655948ffadd6be4e53a07ca02baffc997c9b2f1b2cd9492b314a SHA512 b1aa109d0c1e498b840d14c91d6c268ed0f11e214a0dd9469ba10c06712909ceb7c38eed56c564a7b262f414ecda399074785c2f757b46827914cda2791102f5
 DIST node-v9.11.1.tar.xz 18500884 BLAKE2B ac086b59144ed7393a7c0293616c1ef2b149e23ac67ba8ccf324c2c1f97b18435889e4fb2f1c205834e3309728853dcdbf34d00cc319a10bfed7cbea9fdf01e3 SHA512 6e5ed333ebb678c08fca8f567708874a50bd9311e326196bf86ca77db3046dd196b50208bcffb7f3435f0c031d47dff5471465c840be12903f3c683802000a1e
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.1.0.ebuild 6333 BLAKE2B 552ecbfaf9e2c973d3673ebd93df67821c55ba41896fbeeda4386572f8a33a23a39ead9ff04b449c1224bef3f6fd212c94cbb6f08f4b55bae8db6ea78245b005 SHA512 6d43a12494acea5d298517d41dc93abb3b863020fecf0696aee6b4cfa7147696807eeaeaa90ea3e538563bc6311e052ff0682df708be4945d3ab744d7124fe93
 EBUILD nodejs-10.3.0.ebuild 6339 BLAKE2B c1642519de2c47f964c1a8f32ed4cf5caa2fcaa42d0ca3bee0189d1662fdb170b0ddf80e9a2fbbe7bd51d146623aff652d5c6ef7030a94257c90d76eb63992af SHA512 8e276ab90bf81f0f27da9f8b1d393ed608f98dab610ff3b6c48674e9bcad3a4fbe3cc5da8efb2e1aad4c04a19a4b6be1b7638af295462f8e99c7c7938125f04c
+EBUILD nodejs-10.4.0.ebuild 6339 BLAKE2B c1642519de2c47f964c1a8f32ed4cf5caa2fcaa42d0ca3bee0189d1662fdb170b0ddf80e9a2fbbe7bd51d146623aff652d5c6ef7030a94257c90d76eb63992af SHA512 8e276ab90bf81f0f27da9f8b1d393ed608f98dab610ff3b6c48674e9bcad3a4fbe3cc5da8efb2e1aad4c04a19a4b6be1b7638af295462f8e99c7c7938125f04c
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
diff --git a/net-libs/nodejs/nodejs-10.1.0.ebuild b/net-libs/nodejs/nodejs-10.1.0.ebuild
deleted file mode 100644
index 6ef2faad5c3a..000000000000
--- a/net-libs/nodejs/nodejs-10.1.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# 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="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.19.2:=
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.29.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-61.1:= )
-	ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-S="${WORKDIR}/node-v${PV}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-10.4.0.ebuild b/net-libs/nodejs/nodejs-10.4.0.ebuild
new file mode 100644
index 000000000000..45f560f36a3d
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.4.0.ebuild
@@ -0,0 +1,200 @@
+# 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="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.20.3:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.29.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-61.1:= )
+	ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 3383f227d573..0d8539a156f1 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,5 +1,3 @@
-DIST rabbitmq-c-v0.5.0.zip 234929 BLAKE2B 4b023ff18863190b6a0f7def3dcefd38a84f73f33a0d058ffee7655042b7b065fbacbac57c7ef3be83bc105f6283978de00a7e580394c5138d8e2a5adba3071e SHA512 7b30ecc4831f0145db68a1811b5cb7e4eb55a6b826efa0834a705c03f2ecba3d6d2b8187cdf1472e7da2af8dc77b67674916ec31fa6086e00a01304a097b4430
 DIST rabbitmq-c-v0.8.0.zip 249220 BLAKE2B 171ae0ffc093851089f4dc11cc1e8ef25ae90cbb0cce75ffb93c04a765b7d195e5bde8bbdaa4ce0c598c7f4bb291ed204d157443ed927db373a89f8ab9e7ebc0 SHA512 e386979ce1bc05c02cda06e8582981e0df25f9b31ca950f8a921bd2b249020f751ba65a6f38b8f5ba0be1b3e89492b29b72c6cd1d5ed3d6f19440799d6419ba6
-EBUILD rabbitmq-c-0.5.0.ebuild 838 BLAKE2B 9eb596e2473f3b90b1a32b77571d8de41d001b29f7666225557b6bd93f84016153f776b56f084ade7414ffcb45f316fbdac14070a88992b6178c30dc59ae8ea6 SHA512 8d264f879f19e1bcaa76b16b73fb9afd4dfa6cc90e9c2ea742c568476f68565954a09df5e73c06049ef4813f10a24f27a39bdf7664ef5e937b8234c3bb6d4ee5
 EBUILD rabbitmq-c-0.8.0.ebuild 1107 BLAKE2B 6944fcffe4aed04d2e16630f09b32a56c8699c08c90b6229576500d416a0717755462dc524d4209ba0e46d66f73c88bbf5bc18a783b32c136126c834d12a2597 SHA512 61d32d92f549fd0878bd1bda788335b43d21e0cfedecf95e9bb3e2aae24b86c6399b79678b23727020650ca1cb929abe6dd021aa122fd60e4906f965904d334f
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild
deleted file mode 100644
index 38842119cb7a..000000000000
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils eutils multilib
-
-DESCRIPTION="RabbitMQ C client"
-HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
-else
-	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
-	KEYWORDS="amd64 ~arm hppa x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="tools"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DOCS=( "AUTHORS" "README.md" "THANKS" "TODO" )
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use tools BUILD_TOOLS)
-		$(cmake-utils_use tools BUILD_TOOLS_DOCS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index c2b8387832ef..96792c9defc3 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -2,9 +2,9 @@ AUX rpcsvc-proto-1.3.1-old-preprocessor.patch 1018 BLAKE2B c65052ebb526976482c59
 DIST rpcsvc-proto-1.2.tar.gz 59883 BLAKE2B 178f9f9fced73dc2e4b587f1bd7924c2811f0b96b5efc048e9a6d3cb4abd32a2c34ff0f5b01576f3dc51f07ca6a06266cd7a055f278f7b205cbb9e30563015e4 SHA512 59e6ac2c3e551daef584878e8ae8fc2da7cb80a04c20f96de561abc972fcfac1fbb57a5ee0dbe7bf5288a1527c9b87fc3f73a259b30393982a9a642cf4b4deb4
 DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea
 DIST rpcsvc-proto-1.3.tar.gz 59202 BLAKE2B 88c74806419e097b20fc41bb63ff66401a6c21a2b7100474e55f1b6452a32d669e879248f00349604237e996167b21b9173158e69876f0db3a1394fb922df7af SHA512 5880ea39a750ee1f69dcedfe32afd617e695ee5328d6386977bbd11babb7bd18d8cb50c2d5f8daf35650aa8a94a4f6dda1171c1159917bb596108b1057c5a158
-EBUILD rpcsvc-proto-0.ebuild 495 BLAKE2B c5df8759ec767be4305c031aed71246536b2ea8b9256c7667358e27921d1f421e5b462ace83fa383b7e0e54c634b79e3706f05fb77ecc74336fc78eb2e7f5b25 SHA512 3103a561491eb5afe0b35ea513765297edf42b24c24e24130eccef2af36fb85d066ba648a9938fbf744e0c0be3958040892cc66476a80959ab69dbfdac88850b
+EBUILD rpcsvc-proto-0.ebuild 492 BLAKE2B 147d6d7a2bb633a6da0c7091fbcb772b65985ca55ab4a5aee026ef69468f0a6af7de19a04beafa3eecdb3e03fd1824285fa4f86ee44737c969e5e6b388cf5c00 SHA512 cdaccc05d65d1d4f7bc976b9d13fe097b49a0f7b004a626d5834b7a965305a21a22885459b6f7a7d5a68ce0d623b27da8ff796f257a4b5b25aa3c16b3e51b971
 EBUILD rpcsvc-proto-1.2-r1.ebuild 649 BLAKE2B d95ca842ad48c1fb83a4003cea99ae44312d7e6cb59f777a67dbca0585809a218230f86f2b1237c704bc9805ab36677374b3bbb6f202f4db5178c628faaee668 SHA512 9901e68bd3672ce6689f055d4d79cc73cbf4352c7bb4e1d901450a6ba47f63c0dfe16681a003069a631d31f56b91ed7cc156d3f54a0b1e39b6bb592d180da96d
-EBUILD rpcsvc-proto-1.3.1-r1.ebuild 701 BLAKE2B 4dbb97af693e72b988e9a53f10a14c77c6cb2e8e3e08fb97b2adcfcd01a93516730a09df08f4720737b54b89adf9f8f718fa7a0e3b9efa8a28eee507fe9696f4 SHA512 551299190b219f56c8c35152990218c25ed5f65787d8c31d52a470f9a4db2e63cb5acb08477104cb3cf0b95f1f62a2e89c75bb0a31346a840e3de14c176f905b
+EBUILD rpcsvc-proto-1.3.1-r1.ebuild 694 BLAKE2B f80a4a4741400318132813e36bdca9fea75491035abefb8c256aa06f5bc12e99821f8c55db1a02aa18b5d854631e4d361a2caba51a93a9442ba7dadd1ae71c7a SHA512 f2763bdcfc4b5dcc56006cb8f608f858759641bedb4407c071a7e3462148409298c8b7a4757623200ec1f848397defbdff2cd8652178298d00c218e2e4439275
 EBUILD rpcsvc-proto-1.3.1.ebuild 643 BLAKE2B 7172abfbf67547620ae634f806b19e6dc01a154747096a562bda7ff6a0f50122dcc9c7c1c0978a287421c6d662025342202e227b0552e49d55f15513c49b98fd SHA512 5008ae592acc11837cbaa3100b4f837e4673bf8e152863d41bc4ffb3777425b972851e3195236fcf190e90d4e5b2905ce3d10af4b7a2db909d388733f3269d93
 EBUILD rpcsvc-proto-1.3.ebuild 641 BLAKE2B 384f51cfdca049ba988fbed43765e64232a54d7c3341419a24a0e5df8723cdcb24f5adb4a2c744ef5666c1bba493b6b061bd1986fecd88390e2c83d5120c11ec SHA512 ca768b98578bf6c7b7c6127ac6ac9c33ba8c6c7a28672a9231a085ab78a02fc4745e3c54c54e5584c8903f1a922fcc7ab28b0a9ff8ba304d2fffbacd9ff9024a
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
index fc38a301cfa4..64d9fa1f58a5 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-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=""
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
index 414a3aa7a6a0..d2900ad6c89f 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-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=""
 
 RDEPEND="!<sys-libs/glibc-2.26"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index baba429c8e67..98cb17195421 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
index d6f230c2b3b1..82351acc58e0 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,9 +1,3 @@
-DIST email-2.5.0.tar.bz2 133167 BLAKE2B 3c04076d20d84eaf098afac0ca214db6c3700e898e3f49cc1eaf0791904485504968cc442d4e81d9aa527786964423bb2e16894d005c848519ef07bbf106b05e SHA512 e1f56a875262db6dc79bd0e58e73875cc86bbc73c91c71fb44e9325e4d95b4133f32ca2f299e9bcdbb8217eb20ce155382f0c8d35c48f4d03caf88ef82193ad7
-DIST email-3.0.5.tar.bz2 176575 BLAKE2B 5981a3843bd58124584c7ab07c3d3ded6166fbd993e5a1415e28e0f73843c3b3f9776cfa9c57233002df7a516033060a6c7fae19c2d631b6c8a1cc294df95b45 SHA512 9cb664be7e23c7509d9091115b9ea5450bc90a78c16c3ac514cdff08a4d13f687c25ea5e10f9a644158e2f001c1022e03ba8d1994fcafa1605986c394f54621e
-DIST email-3.1.2.tar.bz2 179546 BLAKE2B 31bf4cb2c10d2ea3b668ebf7870edfc60683899bb7fbfb0b1bd4a126259307e88c0e385236961e34437637d5c8779b962d6ba8140bf2aecff1994cb1ff8026be SHA512 cd005a59b45985ec9ae3cfe86e989568732eaf1e2a127028d0faa7abc0e704ab59668c48b7249e8829fd4944ca8bb27fb3bd23bfe23df5f6fc861d1385f531d1
 DIST email-3.1.3.tar.bz2 178396 BLAKE2B 645d1fd3f0585ce6cbe2e0f2354989f07b39c83c8d21789a94d27a9e9820ea02ec1b213080018c560c7c79ef6f8fa2b636df4f40c9bc5390321d438cf64c448e SHA512 3fc1a8aa653a519261614e54b3215b89e41273207aa63f64572c8820093922a820ecad5e939b0eadf8d4c0587be83ffcb239bb31fd959b96dcf566157420f33b
-EBUILD email-2.5.0.ebuild 1071 BLAKE2B 9eea3835fdb051eeb560a9307466d9a6b09f65d23096a0e3f7fc58c4e88527ded0ca45766d7592fca5d44741eead7f60cf5ed637398df2c436a0b24a460be714 SHA512 405c8d91f714a04ada67932186e156e69c3bb0307a08f85102a8b43c7bf6184852360a7b9a0a224ad677c8e2e9b17beadaca9449d0a4c20dd604c2036576f63d
-EBUILD email-3.0.5.ebuild 1163 BLAKE2B 28443efc57606831b6b0e59dc05ef61dcfc58a13a8bf73409c9a6c6b35748afb6fbd33602cd316941b169fea8d7f4e9137ae3e42d1519b2fe199b22e4ab280f0 SHA512 cbf4cff480645c9e70e89793c1b7159641dd543761e759aa691e590e14af3f5692687eb2fbc2f6647c57a4df5e752f7537e6865d1a2dc57fa56e7cd69f14d43e
-EBUILD email-3.1.2.ebuild 1092 BLAKE2B 8f749b4441056a04a02306b461fa52e047977bf091d27262e9d06e5696c89c0f2cfa04ad6c8df3cdfc7fddb06172c2bbd4aa65c631cc80abed7348a3c0a179f8 SHA512 0acca06e7e4d1a506bd84e64d92b5db58d0cf939668ee5fcf3da16c6baa2a78be4804db5d0739b2fe6934fd57b30db1fc19074dfbcaaa03aaf434beca8301115
 EBUILD email-3.1.3.ebuild 558 BLAKE2B 47884a0b4af4c192ad593c6c43a422c308dc320e61c6b7494178657ecda9c0d0945b56406e18c63a99f996f21b93120a532099de451f3324fb049cfb74b2f24e SHA512 849dbb318fb20a479fe2c46fb8bd7fad9679d8983de5ec4c27040d75401d703c96073fea84e1b39474a07bc1e6d014175de0de3ea1429eb82fcdfc31aed33593
 MISC metadata.xml 341 BLAKE2B db81f48bf76969be24f09df0354f6fecd9e0ad9da358f5f47f8fe45d5cea0b478138e942ceac523a634bb4e7163f9d301a39ece513b75527c8d3c0c7e434fce8 SHA512 8f94720f124779c884470d421573bbf405a5cd82877a2487d3cb0231255a9052f8666f015b62c1ac895b82f2b4eb9ad57fa8cabced7e0fe78d2429f74dcebb24
diff --git a/net-mail/email/email-2.5.0.ebuild b/net-mail/email/email-2.5.0.ebuild
deleted file mode 100644
index 10ed37c23d02..000000000000
--- a/net-mail/email/email-2.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Advanced CLI tool for sending email"
-HOMEPAGE="http://email.cleancode.org"
-SRC_URI="http://email.cleancode.org/download/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="alpha amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local myconf=""
-
-	if [ -f /etc/conf.d/clock ]; then
-		. /etc/conf.d/clock
-		if [ x$CLOCK = "xUTC" ]; then
-			elog "Using UTC timestamps (from /etc/conf.d/clock)"
-			myconf="${myconf} --with-utc"
-		fi
-	fi
-
-	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
-	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	doman email.1
-	dodoc INSTALL quoted-printable.rfc RFC821 TODO
-	make DESTDIR="${D}" install || die "install failed"
-}
-
-pkg_preinst() {
-	rm "${D}"/usr/share/doc/"${P}"/email.1
-}
-
-pkg_postinst() {
-	echo
-	elog "Do not forget to edit /etc/email/email.conf file before using email."
-	echo
-}
diff --git a/net-mail/email/email-3.0.5.ebuild b/net-mail/email/email-3.0.5.ebuild
deleted file mode 100644
index 5f321515d327..000000000000
--- a/net-mail/email/email-3.0.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic
-
-DESCRIPTION="Advanced CLI tool for sending email"
-HOMEPAGE="http://www.cleancode.org/projects/email"
-SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	append-ldflags $(no-as-needed)
-}
-
-src_compile() {
-	local myconf=""
-
-	if [ -f /etc/conf.d/clock ]; then
-		. /etc/conf.d/clock
-		if [ x$CLOCK = "xUTC" ]; then
-			elog "Using UTC timestamps (from /etc/conf.d/clock)"
-			myconf="${myconf} --with-utc"
-		fi
-	fi
-
-	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
-	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	doman email.1
-	dodoc INSTALL quoted-printable.rfc RFC821 TODO
-	make DESTDIR="${D}" install || die "install failed"
-}
-
-pkg_preinst() {
-	rm "${D}"/usr/share/doc/"${P}"/email.1
-}
-
-pkg_postinst() {
-	echo
-	elog "Do not forget to edit /etc/email/email.conf file before using email."
-	echo
-}
diff --git a/net-mail/email/email-3.1.2.ebuild b/net-mail/email/email-3.1.2.ebuild
deleted file mode 100644
index b8e28f557b15..000000000000
--- a/net-mail/email/email-3.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Advanced CLI tool for sending email"
-HOMEPAGE="http://www.cleancode.org/projects/email"
-SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local myconf=""
-
-	if [ -f /etc/conf.d/clock ]; then
-		. /etc/conf.d/clock
-		if [ x$CLOCK = "xUTC" ]; then
-			elog "Using UTC timestamps (from /etc/conf.d/clock)"
-			myconf="${myconf} --with-utc"
-		fi
-	fi
-
-	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
-	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	doman email.1
-	dodoc INSTALL quoted-printable.rfc RFC821 TODO
-	make DESTDIR="${D}" install || die "install failed"
-}
-
-pkg_preinst() {
-	rm "${D}"/usr/share/doc/"${P}"/email.1
-}
-
-pkg_postinst() {
-	echo
-	elog "Do not forget to edit /etc/email/email.conf file before using email."
-	echo
-}
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 284029d14fef..2db7954d6c3b 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -2,7 +2,5 @@ DIST ezmlm-0.53.tar.gz 62693 BLAKE2B f417522da8d2b3ae7d0465e7226cd95dc85b55a397b
 DIST ezmlm-idx-6.0.0.tar.gz 659996 BLAKE2B bf5f7ac0a40d1167d42ef26c4b28f95899f5a72d4c969c975368f61902f5ce9b5721143c251cdcb70c58149e6d7eb28c834b26426d9611b4249a285b523c38d8 SHA512 547186a2e32f3861ef51a9012442e7d8b553d90f2af949bb51845c29178ee2a44760471852c7c23fbd241c14753f22357463c5d5f10b70eceb05603cc6d83d4a
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
 EBUILD ezmlm-idx-6.0.0.ebuild 1740 BLAKE2B 268ec06ad95ed38cdb4fe02d4c36a1a10f877603a6c629c67e205ab4664cf9dfeec45d1dd9998ebe382dce754105476db2dc951ebc7420951163c2c1d9090b16 SHA512 42ffd641cd6d754f898c6d66b4026b0ec5f6492ba52b4f6799b0ef60ff0b1050e86db44886cc487c263da1a7c1d575ec0cb33842d3c47ce9cb0db00cc8713bb3
-EBUILD ezmlm-idx-7.0.0-r1.ebuild 1521 BLAKE2B 52bf5ebd59dc636c5f00dc45ba57f0d99bd70f891b15283615eddd438351bbc4e592f9ab7013ecf718373a2ee57cf3bf78ff9a82e04635883a70ae09e5a8c7ad SHA512 76ab459dfbf2d5132ff15fff296bf49025ad350508a8299ccd99223467f2418b7738a514fc5a840ccbfe2676413be5749c876af498e227d0768d388af01bf880
 EBUILD ezmlm-idx-7.0.0-r2.ebuild 1534 BLAKE2B aacca11db0ff7d161a0c4313385c6ed2f4e5d7ce71f689ee31196a05dcba132124ac87bf399983bfd8017bce0886c2f897dedc817dc09836916e40167df2a7c2 SHA512 3fed930045f3451e4efa6fbd88ffab8b1e98f8dd2b366fbc21655194f94e3b00794c2ce57bc0bf42c84de12025f7c4172370b5658dd9a3dffe9dad5808c25474
-EBUILD ezmlm-idx-7.0.0.ebuild 1492 BLAKE2B 62e9aaddf8926eb35cd2e05302078ebc5a25bc8b6005848ff47825cfabc8134911b6dd6face6814537867e0f04a1417977e0b5f31d46abc87dc573f8f8c27e03 SHA512 633fc79f94ca1f676586725168ca43f7070b5e1af1a74d339d006e73b7635bb56efb5696d3cefc3edc711f2c18f7e53907200c42d273106a96f937f878b5a1bd
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
deleted file mode 100644
index 3c6166ea4f29..000000000000
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail multilib
-
-DESCRIPTION="Simple yet powerful mailing list manager for qmail"
-HOMEPAGE="http://www.ezmlm.org"
-SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="mysql postgres"
-
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
-RDEPEND="${DEPEND}
-	virtual/qmail"
-
-pkg_setup() {
-	if use mysql && use postgres; then
-		die "cannot build mysql and pgsql support at the same time"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-
-	echo /usr/bin > conf-bin
-	echo /usr/$(get_libdir)/ezmlm > conf-lib
-	echo /etc/ezmlm > conf-etc
-	echo /usr/share/man > conf-man
-	echo ${QMAIL_HOME} > conf-qmail
-
-	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
-	echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld
-
-	# fix DESTDIR and skip cat man-pages
-	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
-		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
-		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
-		-i Makefile
-}
-
-src_compile() {
-	emake it man || die "make failed"
-
-	if use mysql; then
-		emake mysql || die "make mysql failed"
-	elif use postgres; then
-		emake pgsql || die "make pgsql failed"
-	fi
-}
-
-src_install () {
-	dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
-	dobin ezmlm-{cgi,checksub}
-
-	make DESTDIR="${D}" setup || die "make setup failed"
-}
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
deleted file mode 100644
index 2f1e6ec24b60..000000000000
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail
-
-DESCRIPTION="Simple yet powerful mailing list manager for qmail"
-HOMEPAGE="http://www.ezmlm.org"
-SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="mysql postgres"
-
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
-RDEPEND="${DEPEND}
-	virtual/qmail"
-
-pkg_setup() {
-	if use mysql && use postgres; then
-		die "cannot build mysql and pgsql support at the same time"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-
-	echo /usr/bin > conf-bin
-	echo /usr/lib/ezmlm > conf-lib
-	echo /etc/ezmlm > conf-etc
-	echo /usr/share/man > conf-man
-	echo ${QMAIL_HOME} > conf-qmail
-
-	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
-	echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld
-
-	# fix DESTDIR and skip cat man-pages
-	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
-		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
-		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
-		-i Makefile
-}
-
-src_compile() {
-	emake it man || die "make failed"
-
-	if use mysql; then
-		emake mysql || die "make mysql failed"
-	elif use postgres; then
-		emake pgsql || die "make pgsql failed"
-	fi
-}
-
-src_install () {
-	dodir /usr/bin /usr/lib/ezmlm /etc/ezmlm /usr/share/man
-	dobin ezmlm-{cgi,checksub}
-
-	make DESTDIR="${D}" setup || die "make setup failed"
-}
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index fe4e5837df9a..735829bf98a1 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,3 +1,5 @@
 DIST getmail-5.4.tar.gz 194884 BLAKE2B f6a64b0bb4f5d89e75187fe162ad13e6e3601fd3338e6d9ef30b2100d8ab59328df1446a6771ec992b18e46e75341fff9308af9a994e4e61f41ab89cec20cf4c SHA512 6557cc46df1d31116f9d28cda1232737c01a568e6ada44edb14cdec30a42160966e1e69f42c46855ce139c3b70d77747324adda8abff3dd772a54a79015b0050
-EBUILD getmail-5.4.ebuild 638 BLAKE2B f2b125ce5cbb5f172118ea7b302e356b1629af7c120ffe079a60717ecf13789333422ef6311a9e0b022e0dbfc57ceb27797dd0cf7b5beb5eae25dff1c08ec011 SHA512 f48009f9e1103f55c0d8b567cd00d05c53bee812e1c1f3e85444f115e8068f2ed214fd148065671ab24bd982947ee027b7eff49c9a94b817dba810f6b4706a08
+DIST getmail-5.6.tar.gz 197360 BLAKE2B 0833933c4dd4b0b7962070dd3d6738b2c7336f359ca9e40e6febbeaffc6cea6942e4271de6cd3053447af94cc7fd189a25beb99c81d2d1221f1c478807dd7c33 SHA512 7ee34f214ab4d98d1b34e46abba61561133f27edf1f64bb9c5d5f671e6944724d1773234bd8ab626607b732cc54fd335cbfcb69fdff8f4d8fcdb33108b25bafd
+EBUILD getmail-5.4.ebuild 638 BLAKE2B d5474cb28c778be265e73661b42e9375f4cce0ee51bd0bf8771178b6ffa82ed5f6deb471ea76ca315c062fe834d110efa0d01a5763710eb8511ebf1c0d6b51bc SHA512 3d4464bd5f4d878711ffb17f04e4dfaa3e204b923a04f881797fe628b69c2cc880b632fc782031a879e3dd393e08ba585cea8cba58c93b0aed9792c2dc231c53
+EBUILD getmail-5.6.ebuild 636 BLAKE2B e6e381cd97d7652c8e746157daaf3e30f6b477e4243a0436ce2f8eecda777bf92ae7e5e33273d17669e4bcca4b6f7a46aa065534e46e1edbc2ffb84c2375f0aa SHA512 ddc4795213d5110a957364afba95cfea5c1762b079565a2d1a97ca81aa0bc2967fa763be48f6adc800ec6ae3fa56ee47b1f627e709c42b63d81a52975980a3dd
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/getmail/getmail-5.4.ebuild b/net-mail/getmail/getmail-5.4.ebuild
index 2fadbd7fdfea..bcf25b422aa1 100644
--- a/net-mail/getmail/getmail-5.4.ebuild
+++ b/net-mail/getmail/getmail-5.4.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 @@ HOMEPAGE="http://pyropus.ca/software/getmail/"
 SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="4"
+SLOT="0"
 KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="ssl"
 
diff --git a/net-mail/getmail/getmail-5.6.ebuild b/net-mail/getmail/getmail-5.6.ebuild
new file mode 100644
index 000000000000..5e4129b2b2eb
--- /dev/null
+++ b/net-mail/getmail/getmail-5.6.ebuild
@@ -0,0 +1,24 @@
+# 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="ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="A mail retriever with reliable Maildir and mbox delivery"
+HOMEPAGE="http://pyropus.ca/software/getmail/"
+SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="ssl"
+
+python_prepare_all() {
+	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
+		-e "/docs\/COPYING/d" "${S}"/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index f4141ea41a2c..bba9c7605a11 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -4,8 +4,6 @@ AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd370
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
 EBUILD mailbase-1.1.ebuild 1657 BLAKE2B ae93c9819b1e5bb8f8ede43955453d2f6aa68a306ebce97b611bb1b37abcbb12fe390c20a4db2c997f860c0b2b0db251052b12d6073e70c3ee1e40b7361139b5 SHA512 998ad423d34728fd24d0ff04d014568eba456775deedb1551e9c8e05a5993235347b0235975599e330e0545a84d8857ac84ce160fedc3bbb8d8062b908026932
-EBUILD mailbase-1.2.ebuild 1492 BLAKE2B ea342a3be316df8623fa242ed2dcc3e47f6bc303cb880a9c4b240a89edebacbecbdc86cc7abe058b5b9b233235f7e9983a8fe548ee77d3ab9be9523637c7e12b SHA512 a5e8edf618de36acefb9326f40e64b9c7f659f704b8f8effd5930ff619085895a8bd26da556adbccfad1d375bdb14149dfb4704c623ce7359ab67f438eb28d6e
 EBUILD mailbase-1.3.ebuild 1458 BLAKE2B 835a54fe1e299fd10342d6d890ef3436b91483a9e12cfc74d4291939c0a8bb1702f9467b9b9f0687a748915fdc3bdccefedaace530d96cb4d37108a474db3e7a SHA512 60cbbe72959a4b0f7f05080765257cdc18bde09c5444acf97d19b4bfbbe70eec3b6e110cbefc382db74d1506f551d9d5e919e8b927465c70fd6ac8a951eaaeb3
 EBUILD mailbase-1.4.ebuild 1482 BLAKE2B eb1a131d41e204bc07a0d6a339bbed18c0abd27054a31f259d7ccecc9d129ba3f2c49984b51939ab8e0ee70c7d21e7bbd5e8e249f5361ad467b53ec2fd177723 SHA512 9463c5dd2bdc408972c4e3fd4a926f97a7e36672d2f6fcca5e361dd922968bea1517bc191bf0dc968fcda51cfcb3951ef1def837a88fc38bc680ae2b1746f0a9
-EBUILD mailbase-1.ebuild 1608 BLAKE2B f730c8dc3723241b5bdad4de17471b22ed3893ad70b072de1ced072fc994c5615cc2c7e7827ebb1d371a6c85eb194dcc943ff1136172229736b45fc9ed86303c SHA512 18bb8bfd64c6eb6e80cfbc5d7c5d4583155020583baf07cd0c031611271994676891a00e354a2b4da02f8f9fefbc423287dbae1ce4c12e5be2284760920720c4
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/mailbase/mailbase-1.2.ebuild b/net-mail/mailbase/mailbase-1.2.ebuild
deleted file mode 100644
index 45ddce55a0e2..000000000000
--- a/net-mail/mailbase/mailbase-1.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam eutils user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup mail 12
-	enewuser mail 8 -1 /var/spool/mail mail
-	enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins "${FILESDIR}"/aliases || die
-	insinto /etc
-	doins "${FILESDIR}"/mailcap || die
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 03775 /var/spool/mail
-	dosym /var/spool/mail /var/mail
-
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
-	if use pam ; then
-		local p
-		for p in pop3 pop3s pops ; do
-			dosym pop /etc/pam.d/${p} || die
-		done
-		for p in imap4 imap4s imaps ; do
-			dosym imap /etc/pam.d/${p} || die
-		done
-	fi
-}
-
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] ; then
-		stat -c%a "${ROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${ROOT}$1" | cut -c 3-
-	fi
-}
-
-pkg_postinst() {
-	# bug 614396
-	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
-		einfo  "Fixing ${ROOT}var/spool/mail/ permissions"
-		chown root:mail "${ROOT}var/spool/mail/"
-		chmod 03775 "${ROOT}var/spool/mail/"
-	fi
-}
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
deleted file mode 100644
index a8ffd2843f24..000000000000
--- a/net-mail/mailbase/mailbase-1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam eutils user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup mail 12
-	enewuser mail 8 -1 /var/spool/mail mail
-	enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins "${FILESDIR}"/aliases || die
-	insinto /etc
-	doins "${FILESDIR}"/mailcap || die
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 0775 /var/spool/mail
-	dosym /var/spool/mail /var/mail
-
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
-	if use pam ; then
-		local p
-		for p in pop3 pop3s pops ; do
-			dosym pop /etc/pam.d/${p} || die
-		done
-		for p in imap4 imap4s imaps ; do
-			dosym imap /etc/pam.d/${p} || die
-		done
-	fi
-}
-
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] ; then
-		stat -c%a "${ROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${ROOT}$1" | cut -c 3-
-	fi
-}
-
-pkg_postinst() {
-	if [[ "$(get_permissions_oct /var/spool/mail)" != "775" ]] ; then
-		echo
-		ewarn "Your ${ROOT}/var/spool/mail/ directory permissions differ from"
-		ewarn "  those which mailbase set when you first installed it (0775)."
-		ewarn "  If you did not change them on purpose, consider running:"
-		ewarn
-		ewarn "    chmod 0775 ${ROOT}/var/spool/mail/"
-		echo
-	fi
-}
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index 4837f4e73343..ce09d8d58416 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,5 +1,4 @@
 AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b869040025951dbaf1f07345a95c9bc45d40f87c3ad9a83d6556421f805d65952f4f9d7588abed9bb5b25f SHA512 333d331433a0b43f414f83e51cad3502afb6f5b287967e55d0dedd90ac06955ccbcbe598a3dafe682c97a7ac4ecf501c0842ade940c0702fb797717e8844ffd4
 DIST poppassd-1.8.5.tar.gz 6054 BLAKE2B f97c908a3880aa9ddb76ce09f33046649dfa2d145c8d8d5b70f1a7b473ba2ba8901b62d8e0644187c5987e3c4c8257c8f2bee9504b98bf3d81035e0acda4522c SHA512 4d8d9c3b15b986bd34e5e459f654e8137019a2466b9fec001d9e61a3267b09f150c3faee8e6914d98742c7b3a7301271ba522ee6dff614cca97815a3ae241ae9
-EBUILD poppassd_ceti-1.8.5-r1.ebuild 1053 BLAKE2B 56d4103103523f14824f703cbb32081dbd200bc8f7516cff0106b89d99ffc7aa6340f278d0e3dad45605930013ce7dde7c72196a6e105f7a3e23ca9482cb5f27 SHA512 175bbfc6dc0472fd3b1e8a64210afce02bd4cbc7d30d95ede217ff5ffa276284482e45cb2187ce698a02a3047a665e444e8a682293614a232f7a2a76b6fbed1b
 EBUILD poppassd_ceti-1.8.5-r2.ebuild 910 BLAKE2B f0cf814c91814de5ab0f0e587a5c1f865286642f90a06d58cc57eb95f190dc3b2b8bf629d3be947f5bd78936923ea99586af782990e40dd940f1fa241aecfb01 SHA512 004588261ef4a027c984bb8f776c98e08de981b8b9e243c21fdf14bc53e7410ba26db1c4556000ae7d42053fea1e7a87e85b7856e28ffb005d2a4a589f871652
 MISC metadata.xml 782 BLAKE2B 00eda3e3c64aa944e4675b970f714bbf5763e169b3beab2836532e69601425b0c222e5b88ea259f49f85ba95f884f69a2e597035ee61f6b2ed403b26bd0fe975 SHA512 8ce15614cc7864c9d4a40ad1c83609d403d012f1d4bb9b6f0fcd523b210d943e816d58a3dd6f9e5345fc889118f7d833980b9615cba1d04d54184c2df8d4e2f8
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
deleted file mode 100644
index 1499debb512c..000000000000
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs pam portability
-
-MY_PN="poppassd"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Password change daemon with PAM support"
-HOMEPAGE="http://echelon.pl/pubs/poppassd.html"
-SRC_URI="http://echelon.pl/pubs/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cracklib"
-
-DEPEND="virtual/pam"
-
-RDEPEND="${DEPEND}
-	sys-apps/xinetd
-	cracklib? ( sys-libs/cracklib )"
-
-src_compile() {
-	$(tc-getCC) -c ${CFLAGS} ${MY_PN}.c || die "Compile failed."
-	$(tc-getCC) -o poppassd ${MY_PN}.o -lpam $(dlopen_lib) || die "Linking failed."
-}
-
-src_install() {
-	dodoc README
-
-	pamd_mimic_system poppassd auth account password
-	if use cracklib; then
-		echo -e "password\trequired\tpam_cracklib.so retry=3" >> \
-			${D}/etc/pam.d/poppassd
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/poppassd.xinetd poppassd
-
-	insinto /usr/sbin
-	insopts -o root -g bin -m 500
-	doins poppassd || die "Install failed."
-}
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index b03e9e7471d1..24cf550fa6e3 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -1,13 +1,8 @@
 AUX qmailadmin-1.2.12-quota-overflow.patch 3613 BLAKE2B c923f9ec3d265f19f63ecbd05f49e588ff34160fca918e2e316585e29d73ccda73fc87a78da3a1442a32dff21ea8f83ad98c632444b069e26abc8b948c1390c6 SHA512 bc2550c86a97dad01558ec57f5ee01e49f1f76feb12cef85e7947fa25d0eaac064b401084972dc195116252bec5454115c432f8be4e9b1377eedbf007a3c4087
 AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d65883cf68aec4fd73dc952e1c2718d6ee4345328c185c3634cd363f1ee72ef5d6f8ea90172613d118ce58a05b1eac5f2366c5aa9 SHA512 bff16e5066f4090e307c971f0be772a9d3db1715cba75063e1e7a7d1760297d849ee54e2f22e6a4c27d369353ba9492f66111ecf2b9637ee57b29da337affa38
 AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
-DIST qmailadmin-1.2.10.tar.gz 390150 BLAKE2B 0c221e7abef7d2ae73a55598005d8bbd4d0bb96d51603867ff72fe396bc345c6c87a3c533c5f1db1658db17b7fd46630facfc8ae00c8e588bc8a350e0ea5588a SHA512 43dcd55b9b3458896398eada9a7d0b513cce5bde6edecb8ae54b6519509361dfab18c7600a3f94ff141b4a3b824e93b4a88a5db3e5a8980ddabf2e6dda8cfb47
-DIST qmailadmin-1.2.12.tar.gz 400144 BLAKE2B 0b4065421cf60bc2328ac11db38294faf9301630927c6955b73604e90fb72db7c924f153e07769689339f1d3937407704d35e8dbf29b0fd5fda935533cad1320 SHA512 9fea49c3cab31606b37b9b827cd21ee852267e8c5555d96c48d52fc8388d7a3a862384cf18211c89c34525b84f866fa371a70a88386309e32dde1d7d8bb5b3ed
 DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.10.ebuild 2629 BLAKE2B 8e9983bc1ce4af0a48015b10c2d4d576bfe9819ac28dc8f33b1df29526d4e0ab199af0ba8b46f2d9e322160c2bcf2554ebbd734fde43b8dd4626636e4363f453 SHA512 923bbdbc450636118dc6600fc70c022d49fecbf2489a8cf9e587f54b4864587356d79ef08c3ec2fd53766bf1580b624589436e66b8867933fd7a5c0e1f039dfc
-EBUILD qmailadmin-1.2.12.ebuild 2153 BLAKE2B c499f55d76bfb7fa48a75908436cba5a5067d2d5e58f39f5b5522ef85cc91050ba963f6f684396d7c661f43628d2cce7f4f28c2c17e58a39585f57b239587b16 SHA512 c73778f2eac01eb689c54b7aa549af19e041e762a5c05ee6be3a2ea4813deae94c1754fd2ddf83c0388ceb803cd946b946c2db16fe9a4a286b341304fd2b8687
 EBUILD qmailadmin-1.2.15-r1.ebuild 2341 BLAKE2B f79f4ab948b150e15b21a9e40b5537cf24dab2069d6616a3be2258e55d830cafe7648c085bc78c8e5ab8fb3b6ad48e5f3aec630d4ce0180e3531d8b26251b23d SHA512 8e00182cac1a77768d6eff31ebde4ce59e3d199f788bb6e59eeed181f63e515625ea12ea7bcaa3d2dc6f3ce0e8ef9405d0e1361f03accdfbea0e7c28e07e9a57
-EBUILD qmailadmin-1.2.15.ebuild 2490 BLAKE2B c779be0ad6d09dd0c7179d09e4a93f81ef4c6e56788496fa49a06d4063f2181ffd81b8d509374820c7d452781e6f8516dce230de4a2d4e7c27053d8eab2fdd43 SHA512 80e8007984fb8bd4df9906cc0f4416bb4f3b2004655f3335640c2a61f1c299d02491cd16e97fde8b78224c3ac1fce89234642f87688b75d3226306eb55e64160
 EBUILD qmailadmin-1.2.16.ebuild 2759 BLAKE2B 73689e59456e0f63e6d1cf1c58159883061f851ce392f19e9a6bf3640b80c3d00789e5e328ec774b08de2b722f7f5e567277d6889787ac5a9ad4dfb248952c68 SHA512 606397c31e347fbec59dc3be0199b4b67e5e7b985f0dc3fbeea0bd86b477464286d12a2ea8accd3e5aa7db69f5a5256112d80d726dff8161aa12b2a1e19cb806
 MISC metadata.xml 494 BLAKE2B 9dc9cea1215b20658f1769a463e0ca17cfa0a34ecebbba5756bd405e212312cde43ec803efe1c4711ba6066f4b539181c97aef1ff7552c6dedaf80b4a29be6e0 SHA512 b2fbb40308df4de4d19781832a17557947033ab4b44f0ce6a6b8048c81d05ae8e67780970914e97e9774b190c57474ca20877c4d4f93c3d6357e7ec6f7535c5b
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
deleted file mode 100644
index 8dfec046d256..000000000000
--- a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-# TODO: convert this ebuild to use web-app.
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT='userpriv'
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A web interface for managing a qmail system with virtual domains"
-HOMEPAGE="http://www.inter7.com/qmailadmin.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc s390 sh sparc x86"
-IUSE="maildrop"
-
-DEPEND="virtual/qmail
-	>=net-mail/vpopmail-5.3
-	net-mail/autorespond
-	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-RDEPEND="${DEPEND}"
-# apache and lighttpd both work, but there's no virtual yet
-#	www-servers/apache"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-}
-
-src_compile() {
-	local dir_vpopmail="/var/vpopmail"
-	local dir_vhost="/var/www/localhost"
-	local dir_htdocs="${dir_vhost}/htdocs/${PN}"
-	local dir_htdocs_images="${dir_htdocs}/images"
-	local url_htdocs_images="/${PN}/images"
-	local dir_cgibin="${dir_vhost}/cgi-bin"
-	local url_cgibin="/cgi-bin/${PN}"
-	local dir_htdocs_htmlib="/usr/share/${PN}/htmllib"
-	local dir_qmail="/var/qmail"
-	local dir_true="/bin"
-	local dir_ezmlm="/usr/bin"
-	local dir_autorespond="/var/qmail/bin"
-
-	# Pass spam stuff through $@ so we get the quoting right
-	if use maildrop ; then
-		set -- --enable-modify-spam \
-			--enable-spam-command='|preline maildrop /etc/maildroprc'
-	else
-		set --
-	fi
-
-	econf \
-		--enable-valias \
-		--enable-vpopmaildir=${dir_vpopmail} \
-		--enable-htmldir=${dir_htdocs} \
-		--enable-imageurl=${url_htdocs_images} \
-		--enable-imagedir=${dir_htdocs_images} \
-		--enable-htmllibdir=${dir_htdocs_htmlib} \
-		--enable-qmaildir=${dir_qmail} \
-		--enable-true-path=${dir_true} \
-		--enable-ezmlmdir=${dir_ezmlm} \
-		--enable-cgibindir=${dir_cgibin} \
-		--enable-cgipath=${url_cgibin} \
-		--enable-autoresponder-path=${dir_autorespond} \
-		--enable-domain-autofill \
-		--enable-modify-quota \
-		--enable-no-cache \
-		--enable-maxusersperpage=50 \
-		--enable-maxaliasesperpage=50 \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		"$@" \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS NEWS FAQ README contrib/*
-}
-
-pkg_postinst() {
-	elog "If you would like support for ezmlm mailing lists inside qmailadmin,"
-	elog "please emerge some variant of ezmlm-idx."
-}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
deleted file mode 100644
index 93204d118804..000000000000
--- a/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail eutils webapp
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
-
-MY_P=${P/_rc/-rc}
-
-DESCRIPTION="A web interface for managing a qmail system with virtual domains"
-HOMEPAGE="http://www.inter7.com/qmailadmin.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="maildrop"
-
-DEPEND="virtual/qmail
-	>=net-mail/vpopmail-5.3
-	net-mail/autorespond
-	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-}
-
-src_compile() {
-	# Pass spam stuff through $@ so we get the quoting right
-	if use maildrop ; then
-		set -- --enable-modify-spam \
-			--enable-spam-command='|preline maildrop /etc/maildroprc'
-	else
-		set --
-	fi
-
-	econf \
-		--enable-valias \
-		--enable-vpopmaildir=/var/vpopmail \
-		--enable-htmldir="${MY_HTDOCSDIR}" \
-		--enable-imagedir="${MY_HTDOCSDIR}"/images \
-		--enable-imageurl=/${PN}/images \
-		--enable-htmllibdir=/usr/share/${PN}/htmllib \
-		--enable-cgibindir="${MY_CGIBINDIR}" \
-		--enable-cgipath=/cgi-bin/${PN} \
-		--enable-qmaildir="${QMAIL_HOME}" \
-		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
-		--enable-true-path=/bin \
-		--enable-ezmlmdir=/usr/bin \
-		--enable-domain-autofill \
-		--enable-modify-quota \
-		--enable-no-cache \
-		--enable-maxusersperpage=50 \
-		--enable-maxaliasesperpage=50 \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		"$@" \
-		|| die "econf failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
-		TRANSLATORS NEWS FAQ README contrib/*
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
-	einfo "please emerge some variant of ezmlm-idx."
-	webapp_pkg_postinst
-}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
deleted file mode 100644
index 1725e884bab2..000000000000
--- a/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail eutils webapp autotools
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
-
-MY_P=${P/_rc/-rc}
-
-DESCRIPTION="A web interface for managing a qmail system with virtual domains"
-HOMEPAGE="http://www.inter7.com/qmailadmin.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 arm ~hppa ppc s390 sh sparc x86"
-IUSE="maildrop"
-
-DEPEND="virtual/qmail
-	>=net-mail/vpopmail-5.3
-	net-mail/autorespond
-	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-	epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
-	eautoreconf
-}
-
-src_compile() {
-	# Pass spam stuff through $@ so we get the quoting right
-	if use maildrop ; then
-		set -- --enable-modify-spam \
-			--enable-spam-command='|preline maildrop /etc/maildroprc'
-	else
-		set --
-	fi
-	# If vpopmail is built with mysql, we need to pick that up.
-	CFLAGS="${CFLAGS} $(</var/vpopmail/etc/inc_deps)"
-	LDFLAGS="${LDFLAGS} $(</var/vpopmail/etc/lib_deps)"
-
-	econf \
-		--enable-valias \
-		--enable-vpopmaildir=/var/vpopmail \
-		--enable-htmldir="${MY_HTDOCSDIR}" \
-		--enable-imagedir="${MY_HTDOCSDIR}"/images \
-		--enable-imageurl=/${PN}/images \
-		--enable-htmllibdir=/usr/share/${PN}/htmllib \
-		--enable-cgibindir="${MY_CGIBINDIR}" \
-		--enable-cgipath=/cgi-bin/${PN} \
-		--enable-qmaildir="${QMAIL_HOME}" \
-		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
-		--enable-true-path=/bin \
-		--enable-ezmlmdir=/usr/bin \
-		--enable-domain-autofill \
-		--enable-modify-quota \
-		--enable-no-cache \
-		--enable-trivial-password \
-		--enable-catchall \
-		--enable-maxusersperpage=50 \
-		--enable-maxaliasesperpage=50 \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		"$@" \
-		|| die "econf failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
-		TRANSLATORS NEWS FAQ README contrib/*
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
-	einfo "please emerge some variant of ezmlm-idx."
-	webapp_pkg_postinst
-}
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index cef0d56fd437..adc98c6d885e 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,6 +1,4 @@
 AUX qmHandle-gentoo-svc.patch 718 BLAKE2B efb684c0c11ab7c2a3df534f0ab9c5cf911c2936fc23c74bef8b88f64b2e4ed68293f5ac6427146ac593149ce9e1e809a88e62d7e717f87045750ccd3de27f37 SHA512 9beeb4a2b17c2577807620b3a67147c694de3f43f491452a7511fd213e5376950b3da55278f2a64b76b95129b3ea7153fc117c286fffd2f472dd9fc4a2f20992
-DIST qmhandle-1.2.0.tar.gz 13134 BLAKE2B e0c3766b1375e2b774e59565f8a03bb025034185dfd555d8288bb514aad0934ddd2b685480ecab7ae65ba268c02c744c4520ec7e787b2cece167a92ee191e06f SHA512 5db69a0fff3a2b6cfc150995f6ff13bcaac4f9c99b653af05904f0af5c38cdee9a5378a8b66d460f403dd938daa650bcffd6d5dc860d0a0813d060105a22ce0e
 DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
-EBUILD qmhandle-1.2.0-r1.ebuild 597 BLAKE2B 2dc47adb570ffd4527f53942a04283adcb485be6a4181b1dd5de42c758ffc1c16973a244cac60a2a379db9062a754b2a77382de8a396272e7d88205b95a539cb SHA512 02183fe7a065fca604977096d7fe0be41628c870807d4aec70b225a22ed22f757097e1131cbaec6c546080a695428f06632cf1298e63ec0e83dcc5a3d1beed5f
 EBUILD qmhandle-1.3.2.ebuild 678 BLAKE2B 5177e5f603d724cd3d3835b5fcd81373ffe50fa045730c2d5fb7f372fe01a06bc9afc2d1897c6192ab0c3e4e2c0707d37a384ecccfbcd6f26af6ec634d9ef575 SHA512 deba6d7414d689720c11726f2fc7a5d06d9eeffea06b120f6d72c64a576b38d3f663089e9aeb89c958cbf31eef573aaf9caff5d13dfd0527b8091665dad380bf
 MISC metadata.xml 762 BLAKE2B f3d23ddb50669bab668e1e5279eec4ee45cb7bc44688aa41ba101c3c90ef128473f0bf396815fc16962f8b44336630cd908fb352a617d15370ed84a5170c59b0 SHA512 88d0d2a8527bf75f55da559f64ccf40e4dc08b64c6bda3a9354b6e0e59a53b8fcb5fd85b6012e30419bb9b03a672ab4b83a1aec93583dc77e64a3c0d1ffa08e4
diff --git a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild b/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
deleted file mode 100644
index 976cf819ee0b..000000000000
--- a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Qmail message queue tool"
-HOMEPAGE="http://qmhandle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmhandle/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="
-	virtual/qmail
-	dev-lang/perl
-	sys-process/psmisc
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/qmHandle-gentoo-svc.patch
-}
-
-src_install() {
-	dodoc README HISTORY
-	dobin qmHandle || die "dobin failed"
-}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index ea2c3221027f..6f45286cfd9c 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,10 +1,11 @@
 AUX 99vpopmail 64 BLAKE2B ab9b8b28494fa8093f1a72e582fc10787eb1f9814b860b1c03f4e336c6a8563b50b34fcc2c33d95e45703ebad5b8155d9575551c894af4e7c12b52748b526216 SHA512 8e9323006ddafae6e4ee8da2e0c9753ce11fd3f6e7c8bb6931ccc147ab6c9782c71d704222343be902f8784aa27a4425fd04a1f11cff5421dfc25fd76d3de953
 AUX vpopmail-5.4.9-access.violation.patch 918 BLAKE2B cb416e6fdbad9405ed01768e070344b2378bca19db3ec80f48e3c93f7fa5d28b61d0d4e73e95716d5db8c77d2ad40f086f4af00f7452fa2e1317f03e69f7f6f0 SHA512 8d877f5057550d25a77a617e81913e9fd94875ab1f1dd6c41e5d49756ff89cd2e089c48d48c81f990d901d5fcfbd0c467b2b0d1a3cdf8c7e78581c1f368e64fd
 AUX vpopmail-Maildir-dotmaildir-fix.sh 1346 BLAKE2B efc7c1e97c201e9f36c3b817538b87c5522b0b2b16b681e0bbbf77bdd8537634d56cbe29b7eb26d657d83fb696b0fc00724dea9d03f246794c5631f8c2ca7ce1 SHA512 201ad103157add727560bc1596042ae621d1645abf912aa3b3ec1af71aaf65dff92c967f000b7a126e9f2eb5e351838c78ffee855402d93bdcf89e96ebb0d0e9
-AUX vpopmail-double-free.patch 411 BLAKE2B 682f7280e6d0d7010157e3469d16d3d9dd6538c19c2b78a262282ab559feb213329bcccca3808c7ca23af0dea026b0ae62a611cd6c9b25e6441818b9c94c64e0 SHA512 f12c29172e0bf0da173847c30db552dfb49e437805c74e0d03064dffb7a1bf71b0d897a5f13d019fd25cb103e394f0f869778de42288e6c6cc3e8612037b5190
+AUX vpopmail-double-free.patch 395 BLAKE2B e17be028bf2ef0b4770c78bbfbeb6f8024db738e50dee7a23728543d1f3f1415a725cdbe0d8b2efff77d86d685a95a5bc9dde0eacf55dd677c090e72e79980c4 SHA512 7c6f6359e6512901e457b76c97826315a9856fc41bf842438fb696f16facebf691a1aa0f227773b6138f52f8252558a5747eeb0edc2cf1800037cf31e61782a8
 AUX vpopmail-lazy.patch 324 BLAKE2B 171579db62d8582612c4b5a1bccdb57b4f08317b0c37ac66298717b1c175204de358c1299e380c191603538d3e6d795dbacde25ef672c6809d85bf7a055c7630 SHA512 42f1e24ee850b9e858a271d734246981c506d74556a62d0124ebe8e842553e32e57603975545d8f49d76e3cca832a73ef61ef191a0a1cf07f9343fe609ecc0c5
 AUX vpopmail-vpgsql.patch 2666 BLAKE2B cad5f0152a3d0a1bc83972aaea7dacf55f1e9f2f2e76e16da9a4cda0f7e9cc609c2d53edc91241566c68cb653910947c74387d23e6d59cd26f8322695c5bc9b8 SHA512 a8067aabfac181637f1366be0215c885ad380e44bbae1a69f9b0438b0a99cd194c2ce2068acf25142c9bfe6623ca8a77b1a9b82790f7faeb6e921c20cd1c1e20
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r1.ebuild 7929 BLAKE2B 9eb9f3c9ac772e1404fd5578cb2e335218ad9eb358575aeb1351b71ddcd6d0108d0c2582ae054d19bd7a9e0c20b9ae44737ce520dc84aee81c4d92f470d7f275 SHA512 0ba88759c94ab55f6f4e0cfdd4118c80bcbec34117a338e5ab423bb0e70cbcc57ffde9ccdbe765e7c834e5aec30130b42fde04c19cd045585bb38d9efe196a0b
-EBUILD vpopmail-5.4.33.ebuild 7532 BLAKE2B 6f4019273f02c2127a2aab7825133b3a10dfc8139a2add4ffd0cfb8b7faaeffc021d98deb5dfdb3330ff956d5cfacde747a1e56707203b595f6472e0f6a5b93e SHA512 d9ee0f65e07ebc0de79122cc34502bbfd208fb28db7bbe68c8f9f6a5b768eae555847dc44a27e815835bc297a119756c657a842a81ab4427ef3e22a21d69a4cf
+EBUILD vpopmail-5.4.33-r1.ebuild 8059 BLAKE2B f8933d6e46ae839bc4280f21013145c0d2d59dad9121028e0e7f2d331c2fa26eeb236f8491554e52ca7f7d8b82cef2a233c775dea853a29a51f508dd373cccba SHA512 4b922cfade81bb7fbc0d5123346d657873dc49dade23882a75faff2a4b81e220d16b661175f06524320ab78297f8066770a7a9201e235dc34ec021d174fe1408
+EBUILD vpopmail-5.4.33-r2.ebuild 9073 BLAKE2B 9d9e0ad5a29f4cf2e9f57f3f174d667755124c59e265040af5b777b32bf03981126df014f2b9ebe44e8f5ae65e93a7fbcd6fd9c3f7e82ba05c2e17e38f8996fb SHA512 9ba37070099d91fe574db65d5c2c05896263ea77ed69028d40ba54b661b053fdfbe9ea51753322b19b890107034f5441641b9346cb06abf88de394adc163f3de
+EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 0c3d9c5736e549d84be9604ece0a11fb064b4966f600fea5c1456ac92ddc25a4488c0fe328b53d12869a229426d98f333170b703484286804db1962e1c72f358 SHA512 8ad7fed94d1cf598ff019c04363ad4d3262716c4d460597c3886826d12b746f1b4151813526c7923225adc29165ba91db2d98bc988b8545bc659df0f5fcee0f6
 MISC metadata.xml 680 BLAKE2B 66efc812c404922158bcef2b9f264e6e90c7c4af1231b7b558d7c8ac8d3d6e21b78f83d350f77278a3e79f66ef865c22f3666a469551e105c59d079ab652ad07 SHA512 66869b1dd1465c1914461874ca44988a1cf3cc34ca53cdaf2fc2851d6580d756ac1446cedc7168f50bcdfc82821f7ebb109276deabdc099325d0848a97a63ffd
diff --git a/net-mail/vpopmail/files/vpopmail-double-free.patch b/net-mail/vpopmail/files/vpopmail-double-free.patch
index d7d118578d73..16a40b82c4f4 100644
--- a/net-mail/vpopmail/files/vpopmail-double-free.patch
+++ b/net-mail/vpopmail/files/vpopmail-double-free.patch
@@ -1,7 +1,7 @@
 diff --git a/trunk/vpalias.c b/trunk/vpalias.c
 index 9853f14..e9bd81f 100644
---- a/trunk/vpalias.c
-+++ b/trunk/vpalias.c
+--- vpalias.c
++++ vpalias.c
 @@ -369,7 +369,7 @@ char *valias_select_names( char *domain )
          }
        }
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
index ecc09b21af25..78bc92f714ee 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-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
@@ -6,7 +6,7 @@ EAPI=5
 inherit autotools eutils fixheadtails qmail user
 
 HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -18,7 +18,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 DEPEND="virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql[server] )
+	postgres? ( dev-db/postgresql:=[server] )
 	spamassassin? ( mail-filter/spamassassin )"
 RDEPEND="${DEPEND}"
 
@@ -28,7 +28,6 @@ VPOP_DEFAULT_HOME="/var/vpopmail"
 vpopmail_set_homedir() {
 	VPOP_HOME=$(egethome vpopmail)
 	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
 		eerror "vpopmail's home directory is null in passwd data!"
 		eerror "You probably want to check that out."
 		eerror "Continuing with default."
@@ -82,14 +81,15 @@ src_configure() {
 
 	local authopts
 	if use mysql; then
-		mysqlinc=$(mysql_config --include)
-		authopts="--enable-incdir=${mysqlinc#-I}"
+		incdir=$(mysql_config --variable=pkgincludedir)
+		libdir=$(mysql_config --variable=pkglibdir)
 		authopts+=" --enable-auth-module=mysql"
-		authopts+="	--enable-libdir=/usr/$(get_libdir)/mysql"
-		authopts+="	--enable-sql-logging"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
 		authopts+=" --enable-valias"
-		authopts+="	--disable-mysql-replication"
-		authopts+="	--enable-mysql-limits"
+		authopts+=" --disable-mysql-replication"
+		authopts+=" --enable-mysql-limits"
 	elif use postgres; then
 		pglibdir=$(pg_config --libdir)
 		authopts+=" --enable-auth-module=pgsql"
@@ -140,13 +140,17 @@ src_install() {
 	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
 	dohtml doc/doc_html/* doc/man_html/*
 	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
+	dosym \
+		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
+		"${VPOP_HOME}"/doc
 
 	# create /etc/vpopmail.conf
 	if use mysql; then
 		dodir /etc
 		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+		dosym \
+			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
+			"${VPOP_HOME}"/etc/vpopmail.mysql
 
 		sed -e '12d' -i "${D}"/etc/vpopmail.conf
 		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
new file mode 100644
index 000000000000..244a01190981
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils fixheadtails qmail user
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) )
+	postgres? ( dev-db/postgresql:=[server] )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"-p0"
+	"--"
+	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	"${FILESDIR}"/${PN}-lazy.patch
+	"${FILESDIR}"/${PN}-vpgsql.patch
+	"${FILESDIR}"/${PN}-double-free.patch
+)
+DOCS=(
+	ChangeLog
+	doc/AUTHORS
+	doc/FAQ
+	doc/INSTALL
+	doc/README.activedirectory
+	doc/README.authvchkpw
+	doc/README.filelocking
+	doc/README.ipaliasdomains
+	doc/README.ldap
+	doc/README.maildrop
+	doc/README.mysql
+	doc/README.onchange
+	doc/README.oracle
+	doc/README.pgsql
+	doc/README.qmail-default
+	doc/README.quotas
+	doc/README.roamingusers
+	doc/README.spamassassin
+	doc/README.sybase
+	doc/README.vdelivermail
+	doc/README.vlimits
+	doc/README.vpopmaild
+	doc/README.vqmaillocal
+)
+HTML_DOCS=(
+	doc/doc_html/vpopmail5.abw
+	doc/doc_html/vpopmailapi.png
+	doc/doc_html/vpopmail.html
+	doc/man_html/clearopensmtp.html
+	doc/man_html/index.html
+	doc/man_html/vaddaliasdomain.html
+	doc/man_html/vadddomain.html
+	doc/man_html/vadduser.html
+	doc/man_html/vchkpw.html
+	doc/man_html/vconvert.html
+	doc/man_html/vdeldomain.html
+	doc/man_html/vdelivermail.html
+	doc/man_html/vdeluser.html
+	doc/man_html/vpasswd.html
+	doc/man_html/vpopbull.html
+	doc/man_html/vsetuserquota.html
+)
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_prepare() {
+	default
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv -f "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+	        configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	vpopmail_set_homedir
+
+	local authopts
+	if use mysql; then
+		incdir=$(mysql_config --variable=pkgincludedir)
+		libdir=$(mysql_config --variable=pkglibdir)
+		authopts+=" --enable-auth-module=mysql"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
+		authopts+=" --enable-valias"
+		authopts+=" --disable-mysql-replication"
+		authopts+=" --enable-mysql-limits"
+	elif use postgres; then
+		libdir=$(pg_config --libdir)
+		incdir=$(pg_config --pkgincludedir)
+		authopts+=" --enable-auth-module=pgsql"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
+		authopts+=" --enable-valias"
+	else
+		authopts+=" --enable-auth-module=cdb"
+	fi
+
+	econf ${authopts} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	einstalldocs
+	rm -rf "${D}/${VPOP_HOME}"/doc
+	dosym \
+		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
+		"${VPOP_HOME}"/doc
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym \
+			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
+			"${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+	ewarn
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index 0084ce003a76..bfc60278c208 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.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
@@ -6,7 +6,7 @@ EAPI=4
 inherit autotools eutils fixheadtails qmail user
 
 HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -26,7 +26,6 @@ VPOP_DEFAULT_HOME="/var/vpopmail"
 vpopmail_set_homedir() {
 	VPOP_HOME=$(egethome vpopmail)
 	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
 		eerror "vpopmail's home directory is null in passwd data!"
 		eerror "You probably want to check that out."
 		eerror "Continuing with default."
@@ -76,14 +75,15 @@ src_configure() {
 
 	local authopts
 	if use mysql; then
-		authopts="$(mysql_config --include)"
-		authopts="--enable-incdir=${authopts#-I}"
+		incdir=$(mysql_config --variable=pkgincludedir)
+		libdir=$(mysql_config --variable=pkglibdir)
 		authopts+=" --enable-auth-module=mysql"
-		authopts+="	--enable-libdir=/usr/$(get_libdir)/mysql"
-		authopts+="	--enable-sql-logging"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
 		authopts+=" --enable-valias"
-		authopts+="	--disable-mysql-replication"
-		authopts+="	--enable-mysql-limits"
+		authopts+=" --disable-mysql-replication"
+		authopts+=" --enable-mysql-limits"
 	else
 		authopts="--enable-auth-module=cdb"
 	fi
@@ -129,13 +129,17 @@ src_install() {
 	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
 	dohtml doc/doc_html/* doc/man_html/*
 	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
+	dosym \
+		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
+		"${VPOP_HOME}"/doc
 
 	# create /etc/vpopmail.conf
 	if use mysql; then
 		dodir /etc
 		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+		dosym \
+			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
+			"${VPOP_HOME}"/etc/vpopmail.mysql
 
 		sed -e '12d' -i "${D}"/etc/vpopmail.conf
 		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 701aec407a52..74c2d820ce94 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 916bc5c128cd..eaa754792784 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1,9 @@
 AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
+DIST bird-1.6.4.tar.gz 1018874 BLAKE2B f6ef0b952f6b00008fadcaa1c1a32ac31b42a9804e221edb75073e23ff942276bf1beee6d3f4c9d89f90339e99bb82a5953c17ff6963e5ff60d29a50f45e06d4 SHA512 5034d6bdca40ecddaed57bd4ab6e700828b89221bd3ce6d347aa9caa4dca65880c080ee3f276a8c31adde2de16402c8b7e7fd32dc4463d29d63b3f16b833b2eb
+DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
 EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
-EBUILD bird-1.6.3.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
+EBUILD bird-1.6.4.ebuild 1285 BLAKE2B e728912943f43f666b0a96430cb48f9d4028627492ce03c87557af59cc78e5af6ac5f152fe63f7a1ef989b4028ec918fccda2f21b27c57f1e8530c2e3ec3ba56 SHA512 f94a5f28cc72dd35a853c5763fd28842cfd34ab0a8063db01e756e021c80191ac4cc40cc83f5fc980d93a5d00e2b777a9e902052db8fa9c50db5905d4a4bbf0b
+EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.3.ebuild b/net-misc/bird/bird-1.6.3.ebuild
deleted file mode 100644
index 580dd5694106..000000000000
--- a/net-misc/bird/bird-1.6.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.4.ebuild b/net-misc/bird/bird-1.6.4.ebuild
new file mode 100644
index 000000000000..ebdf7de5c1f3
--- /dev/null
+++ b/net-misc/bird/bird-1.6.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug ipv6"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	eapply_user
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+}
+
+src_configure() {
+	econf \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable client) \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		if use client; then
+			newbin ipv6/birdc birdc6
+		fi
+		newbin ipv6/birdcl birdcl6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.2.ebuild b/net-misc/bird/bird-2.0.2.ebuild
new file mode 100644
index 000000000000..b5bd01fc5519
--- /dev/null
+++ b/net-misc/bird/bird-2.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 1645a3aeaba8..08e4a9ea6105 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -7,5 +7,5 @@ DIST chrome-remote-desktop_57.0.2987.37_amd64.deb 15677362 BLAKE2B aa92ef2a6c890
 DIST chrome-remote-desktop_63.0.3239.17_amd64.deb 19026074 BLAKE2B 9a62d317768d6c0ab3cf3c6e7c5dea074133cc7c5d2b04ffdc1e0f9877f5f606c044ebab7b230914eba2ade51d2805fb1267f7b1731fa36235495a8192eb3c48 SHA512 2843deb7817217c8b8e41931b1e9ef0fdfb40c6a4ceb1bc69499aed16cc729d7ed64f88200c9bb2366a768f294a164da2360ed2b9654d1626696bcf0403e347a
 EBUILD chrome-remote-desktop-49.0.2623.40.ebuild 3668 BLAKE2B f149fbab2512737be2bf8668ac1aa6b0c2873a23afcbbef60fbb7d67fafd3ce213496860ff4266a05527712a26f6f9cf964258f8c8b5bb5c6638034c4f19ff5c SHA512 7486227050481ba09ac2f5a0c1fa205d1461210354bbbd2b1fdcd40195fc223ed018b439ad421c1f93c825e67106042e867f57552b68c26134fd185daa4126be
 EBUILD chrome-remote-desktop-57.0.2987.37.ebuild 3825 BLAKE2B c5d0b10e2c3685b6152c5e35631d223e5993078365a9d54dbc336455d51c1c4d5d213db0b29f3cd4e84845fa0f35a1606a51aacc91b632ea651fb1322cfc8249 SHA512 0e275cce491f42c3ab65e9d3fce723bea92edfa6354ad20203f347e9b39c152deea52429bb3c055d02d8ac4d913d37c6ce1855bc7ad5db36afa851447a8ec42d
-EBUILD chrome-remote-desktop-63.0.3239.17-r1.ebuild 4081 BLAKE2B d7fb7b32043c28bed4fc6ea8dc0a967aa804031153337dc5b2f550e483cb223852ba101ae4f5a2f3b5ba78c7bb41ea663cc9b4b39c4b297b541bf785e6061dc2 SHA512 f29cffda7ff28eea9f4094090875c633051232214d26d96f30ee7486b5e06d225960e443e32a824194b2eb7d6e345715280b6679be7d6b24586f5fe10ffa9039
+EBUILD chrome-remote-desktop-63.0.3239.17-r1.ebuild 4080 BLAKE2B a0e1646c93031ae3a09b9bbd4e2ec2935498c9104354a8656acff039e1b726b222563e4c7385b44018f5bf974b4359ad68a19b285ecf5de854ff7d4592696f46 SHA512 26c40842a4d067e6690baccc0126379292dc2cfd6b555043fd961cd4152b69bfef7ff33841e5beebad3b0b05f0b926d2633b5b3f420fa880763fd5fe56b50874
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
index 20302fb409ba..d8dbea31d66a 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
 
 LICENSE="google-chrome"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index cebae592c38e..81e457b4bff3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -10,5 +10,5 @@ EBUILD curl-7.57.0-r1.ebuild 7103 BLAKE2B eb3b2a5181284c2e63d57d45e20692adf3e07d
 EBUILD curl-7.57.0.ebuild 7050 BLAKE2B ac2b9ef326caec4e07e89ea30f07140856a4ae62177c1ef7fef78a5a968f8095dbbb82e455d0f309ac35dfbbf57720d013fcb411bbaa523964da124bf0e3f140 SHA512 3b496a5d3159150b6ab7b45fe5145b97a64a9f8909f05f09604634aaf5750ed560941c17be249d7cc5c27a0e03ab353fb913795d47f285ccda7c5e3ad48c786a
 EBUILD curl-7.58.0.ebuild 7093 BLAKE2B 98eaa108a6d55f5a969fe0898e31f0a2af4b7fcb15ca993eb3d238d0a73c6a60d010ada1b1c5d6cd21b117832f8bab1e43fd9e3ff2072457144e4f5df254fc3d SHA512 a31269371ccf0948b1413cd256d6ad4df609b89c40c44a54cc1b83282353b45ea314322fc12fba279c27bfc7513a8c5ced8c09df065230ff833c7b13eebc87a5
 EBUILD curl-7.59.0.ebuild 7267 BLAKE2B 4fadca87badfa6435f391f19508a8a8818b47bf755746f9cb9597858923ea2205daa9661cf1af5cfc65e479205c03662524e18e0ef9d1dd2d2187226f5f93117 SHA512 eaf229ab649e47e2743f1d1217309df883d3513e4f3f0b7be9d1e1a5fbc04f9b0491b6be0a43c6202b0cb17dd03a3381185f5d8f9c256576173cf282dd91c411
-EBUILD curl-7.60.0.ebuild 7193 BLAKE2B ffea81226489b3954b6f3535d44e261b5d0885a731855e7a158295fc798e47cd85bb644434b4ab90a4d4d6522768188f90a65e89d0dd7aad57c57cee92f7a975 SHA512 ef629090384c003951f1f3ccf552a7cd35d3628c60077a31e04bafec18a8dc702e08e8edf3516b07625d7e47cee1fa689c98c628405e2f8d745e623a4a3dcb4c
+EBUILD curl-7.60.0.ebuild 7190 BLAKE2B 36875f071012e815144664cc3a697702e53969d84c4bfd77d36c378692a288ad8744c563ed97228a19bd00396085d5d1ddc0e8d93d8aa8fcf36b70f95ce74542 SHA512 e133adfcfc13eca9b7ec229b8d53a9fa3e56b2af97f4687d4c149bafa05ed7d72c1587b59da21ab24f1f10e87bb20edb83ab99cc7d009e3297a6c421e3a6b8a0
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.60.0.ebuild b/net-misc/curl/curl-7.60.0.ebuild
index 651e81b046c3..b45fffd3d353 100644
--- a/net-misc/curl/curl-7.60.0.ebuild
+++ b/net-misc/curl/curl-7.60.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 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="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index b64222121484..53e335a69a41 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -26,10 +26,12 @@ DIST dahdi-linux-2.11.1.tar.gz 2045435 BLAKE2B b84b8717a7568b00ab9cb9f6edb5a04f2
 DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c1388544710ab69bd727d54963c7df6c7fcd56a450d5ea0242ae1bbbe45855fbe5bd3b3150d28676490713f9dd1331e42c0c2fa5243415b69 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04
 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517
+DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
 EBUILD dahdi-2.10.0.1-r1.ebuild 3619 BLAKE2B 78303522ad9ad22932719028da33f72baadeca7e380c535d10ed95c42941a19502175de1630dbf7dcd484d2189cef4d94813f69341f44527415f5d3da28843b0 SHA512 94273131542d58fcaec97471fd65a9503f1fffd833ef7632503a776c10805cda1f7da6163d2d5683adfbb47085fa920b8a527e37ee867df0ffac320d252fe8f9
 EBUILD dahdi-2.10.0.1.ebuild 3617 BLAKE2B d4ca2fe5dea6d1c175224a3bd72d6f15073d17c0a89347c305f631b9208686f83e5fdb03612e4ab6814dc1f90f90c74701dd5312c1b9ad17da1dbf9cf5c53368 SHA512 a9acaac3ac0d81b07f96c7d30ea2bf41e950dde07b53d2e800e792720ce82317f481322bdb472b10fc78aad7a28f5dc91b1d170025c185b4a0301e0a11f28d07
 EBUILD dahdi-2.10.1.ebuild 3617 BLAKE2B d4ca2fe5dea6d1c175224a3bd72d6f15073d17c0a89347c305f631b9208686f83e5fdb03612e4ab6814dc1f90f90c74701dd5312c1b9ad17da1dbf9cf5c53368 SHA512 a9acaac3ac0d81b07f96c7d30ea2bf41e950dde07b53d2e800e792720ce82317f481322bdb472b10fc78aad7a28f5dc91b1d170025c185b4a0301e0a11f28d07
 EBUILD dahdi-2.10.2-r2.ebuild 3618 BLAKE2B 5105bc86b9eabe1deddde2196d6bf98646a00a49f47d59dc9aef61d25bdf858d496da6663ad72262a79e02a408ed9eb8c44876a8e13c48f66d67caae9fb7bbe3 SHA512 73784dc279ce84937e52cdf2df7df9da91af842944bf2dffbabf780da04d5477067f791aee701b4b3615a14a667520fee602f601021304d06b1154e401e0ba4f
+EBUILD dahdi-2.11.1-r1.ebuild 3668 BLAKE2B ca3be7eda7090e86fa17d221bd1b3764a40b180735a4b00acae5df0654b2a3857802054fd167ea35877c61f82521d6cf9f8c420df68375572f24c2bc9ddcd281 SHA512 62c84fad523c3c58e3d81e1a4bc5b956a7fcde28ee088060f579913e1fad4b6a02895a8c3a0cb2795ba52a156c1b252214bbda1c248a5802613a3cccef755ffd
 EBUILD dahdi-2.11.1.ebuild 3682 BLAKE2B 3ff22d2b78db250bcb1ba265500861e1bdbe920d9871567f26ae736f87e9859fbe6399c7a9466c33050a98f738aa46dd534d7c80bac92a528aacb41126a7ec58 SHA512 6434e30a359f02afcade7384dfe2511ae3ca829abb7553be74bfd6cbe9be27e98be73eec7cdf5af70a082110dcae9585cf4d94b58f924b00d6e33dbe37c9df4e
 MISC metadata.xml 327 BLAKE2B dc7842c2aec03bacdbb85d43b0f13075d77fd36fcd1398b46ac2fcfa0862d2a1d2c2ce1cb6c4dabdd019b7a202661cdaf822223d510d0972e840186a2dc30995 SHA512 ee6a6009392a739eb25095468f78d7c76a09d49141faf8444e2c6e9969f05e4b1748a4f518127c8b14298746515c0606a6949d4629d75b5343ba56f72dc2eb9a
diff --git a/net-misc/dahdi/dahdi-2.11.1-r1.ebuild b/net-misc/dahdi/dahdi-2.11.1-r1.ebuild
new file mode 100644
index 000000000000..7f9b0c8baf40
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.11.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.2.4
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index c344e8fa84fd..5b3f150511f7 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -7,12 +7,16 @@ DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802e
 DIST dhcpcd-7.0.2.tar.xz 208736 BLAKE2B 958118a7acdb6d55e06b88ec8b1fe342600e49caefc7e0e6745a20aafb9588f1c83af171c47e7b6ba1faa664290b052530271f5dd588f82db5933af315b8eea7 SHA512 f5b1407199163fb994519bc1b5a70ad043f00f263e3b254da5d519d1c6b689a4a5a8bcef3bf42401826984e273c2ead38249fcfe99129b87034f90de2fc46ecd
 DIST dhcpcd-7.0.3.tar.xz 208856 BLAKE2B d11f1845cae74470cd9982f5957911ac5fd7cc284b455254fef5c462e516018d94d56f970d758e81cd86a7f918e5cf0d3bd6d2087bda701b299436c4253220f4 SHA512 a2d4e8ea6a310090c2795c596c80a76f0e42dc6654ba50d2900e2af4239dbc542e857d20b2983ea97675903b85cdbd0e9212424390a62081837821bbdaf7ce83
 DIST dhcpcd-7.0.4.tar.xz 209860 BLAKE2B 12c9524d6cd012665479a91f2966ae8123cc38bd3a47d81490f3dc0efecda2a787a0d55e883906e536c989054d25e00fa96d06d11062013d154de88882f31414 SHA512 32382b17a00e6ff7a80868a35424d1cc25410f012048ef099a90fbcb15a43ef6e73d2e65094ac90ccb18ecd92c6fc2c7e2116e19669ad0084ee39182b5cbd7db
-EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
-EBUILD dhcpcd-6.11.5.ebuild 3281 BLAKE2B 6d98c09002122c9044e10aaaefe442f941db4686227d6e7a052c96dfaab68c276f9fc6b3230d3ec0bc9fa4f6fb0ea5933b574d23fd8860cf1e33c3a4eb10121b SHA512 94b13653b8202a4c402f1f52618a9f5bc414cb92ab1376098dc70e12dc5fb963ebb83ba517b100eaea0cd2cc248152b038115ef14e588abb0ae78c024c13316a
-EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
-EBUILD dhcpcd-7.0.1.ebuild 4437 BLAKE2B be75ed49f0477924807faf02e3adc6596257f9a026db8dc5583a24264686ab543aba839c33146ddb2368d632291a8b685d7bb18eb7157023f8f137071c4c7798 SHA512 98596cf6a5ecd4009fe02cab49cae6ac39283da3d3c9dce8ee1144063da4030a3433ac1ffef7d84edbf8bfd2c2a430c43a3791e77988e40b865b8b110fc7607f
-EBUILD dhcpcd-7.0.2.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
-EBUILD dhcpcd-7.0.3.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
-EBUILD dhcpcd-7.0.4.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
-EBUILD dhcpcd-9999.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
+DIST dhcpcd-7.0.5.tar.xz 210088 BLAKE2B bd10e09eb160e09067a3cf0472417a191f05216dbae5e5b65255a6e212fdff099b178a331dc44cf420830d1aaa581629d669f491d4acb099d646a5969d621dee SHA512 b9d5a1c9306ff86544f0a74a0e61f9a78a643087da8cbee2bf09155a745c6815a2078be7f7a400f31f760355eae2177c5760ce4ca55e83cee615a343671d9b41
+DIST dhcpcd-7.0.5b.tar.xz 210024 BLAKE2B 38073a761d93b0cc1ece2f5a87791b50d40740796794852dfdba10a7e8e4264e77fa554c1a2e1192430dee791be7856b707889406bdb1e1d508c56187eb61348 SHA512 f2d9a6930a31e169ae63356c06ed7b6d642d03f13c555512a8cbac4e95430a8fdc7e5eecb2fffb795947e4f6a6e7a9db239fa85f12801833e553000a732879f6
+EBUILD dhcpcd-6.11.3.ebuild 3278 BLAKE2B f7d9dbf6a9d28a1f45e4f33becc4545da4db8298a107d543613035e386b8c529ea2ed21a289b943a6a3f9867f41490acfb9eb15aa791b3f526ac7d2155ab560b SHA512 a97575ba47e8912b17c228d694399af86ab928b87432a9ac6e5ed176ae3906db2fd80a044bc348203a4553571382afca619cb01b8b610b0bf7eab61b5cdc107d
+EBUILD dhcpcd-6.11.5.ebuild 3282 BLAKE2B bc9251210e85f02249a25f0861b598b587f8fcac8bf9e1524c3df64b269f44d654f6cd078b45e1597ee5114da8f17a64af06792e43c53355b1f321aaa09f2546 SHA512 20d99b37d66cf2e16892579189a32bf6586392a3c8216042f25238c7129d829a723da1e66b183edc153527b5c3036b4f588097d4a19b44c41c3d9f108dcaffd6
+EBUILD dhcpcd-7.0.0.ebuild 4458 BLAKE2B 54c2d419ad253ca4700ef26497cf0298675474ab10401897db0fffde6b4230775aa31f887e02d7d6b1fe5d5e0e7c8bac3e89544d6d45350571265ba1643891e5 SHA512 c1bd4860478c81be307db61730746b7a405b73d0bf5360a99b7cda93845a6c14b836c0624d0850bf40aa4472e4353209be762e9b4cee6b816fc1df55a6fe2662
+EBUILD dhcpcd-7.0.1.ebuild 4448 BLAKE2B b9540c9cc1e5e4feeb4839fff89371b89b775d403a704cc64e2212d0e985aae629d22e8174849d7e2be5ed0a858511347cdb56c7653bc1f47e30afe59a0a8311 SHA512 f9b859fab6072982c8081997fa72e3dc1ae1ea48f59857f9af410644caf2826073e7c677fc46ed7b8010dec2883b9ca11dc90e40713600df2603e1595bfd7a80
+EBUILD dhcpcd-7.0.2.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.3.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.4.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.5.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.5b.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
+EBUILD dhcpcd-9999.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
index e3c4a2bbd1a7..ba2d583ce996 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
@@ -9,7 +9,7 @@ else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -17,7 +17,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
index b3643c1a86f2..88c108069c9e 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
@@ -9,7 +9,7 @@ else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -17,7 +17,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
index 2723156dac92..c77b8fed58c1 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
index be9639cc3816..10a09a211b79 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
new file mode 100644
index 000000000000..bca59ecd5d70
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
new file mode 100644
index 000000000000..3d93853bedc3
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 36421cd3cece..fa40604390b6 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -4,5 +4,5 @@ AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a1
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
 EBUILD dropbear-2017.75.ebuild 2479 BLAKE2B b200fd9ce16df2cfcfe197bbaa4d23b86fd65ac28e3a91b2b9b38780ccab35333cc946b71dc67826932dc39dd67f7c0cf4cb3f026bbded140b306c5ab464f42c SHA512 7ff7df1daccbadc9a855ade363dd8158fced88e779ac9764136ed8c42e54380cbbdba2ad6392e859c974a4c81cf54ff7af240c54ee7a03094880528b21ada6c1
-EBUILD dropbear-2018.76.ebuild 2627 BLAKE2B d558e88e05a0169795e8885003f3d3ed6e82b18199a717ab55cc144067b65b0d9fe5f4988ca4b514ab84085779ae7609c05d615fe43e65a9c23d304e2fcb922b SHA512 993b7e76ab0a6746e42f81c94fc7a5e5de07cb76a745c0161ea0d8c1f0e96c5081b785ff68aa173240d753c0bd51576e2734f2394fc8f9af4534e6008db5cf78
+EBUILD dropbear-2018.76.ebuild 2659 BLAKE2B 86c2521f8ff752ab0e3957167f4e1e0f9f20bfa54fed2561b6c27251ee1a6eb71f80a08d8138fed5bd88d8f2778798a9534edf66a1274e7e1cf13cf36ea99ca8 SHA512 66aa0a4d6a60a8d6b893b7a75e088dee4b6c04eaee98cbac5399d4dfcae4df60f0939f52347e8aa372a8818a0906a167c71f6643a5f1aa923f546fdc3668da6f
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild
index f73f40c403a4..a3ec3a6212d2 100644
--- a/net-misc/dropbear/dropbear-2018.76.ebuild
+++ b/net-misc/dropbear/dropbear-2018.76.ebuild
@@ -38,13 +38,13 @@ set_options() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
-	sed -i \
+	sed \
 		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		options.h || die
+		default_options.h > localoptions.h || die
 	sed -i \
 		-e '/pam_start/s:sshd:dropbear:' \
 		svr-authpam.c || die
-	restore_config options.h
+	restore_config localoptions.h
 }
 
 src_configure() {
@@ -86,7 +86,7 @@ src_install() {
 		dosym ../bin/dropbearmulti /usr/sbin/dropbear
 		cd "${S}"
 	fi
-	save_config options.h
+	save_config localoptions.h
 
 	if ! use minimal ; then
 		mv "${ED}"/usr/bin/{,db}scp || die
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 635af27e7a2e..72c37cccb19d 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -1,8 +1,6 @@
 AUX felix.confd 111 BLAKE2B ea790c8b649f58bc8b4cbef2c91dccdbd7ba2bff9db80d45b677ef1a7948252c5175f2d96257d7ce5d7fbf2c5e5543da7bc0345176808e02323d109aeacbe17f SHA512 b922e79f5cffff9ee72ca6b24c8eef13eef08ec5e0a5815665e784b89b7548b9154f5e5d31865aa3fbe964abb76efe4a93331ff2513ddf1fbd2a71f6d815be25
 AUX felix.initd 522 BLAKE2B 1250ebaa33bec5c85ae6489bdeabef8e36bec949c18072235cebb0b5811a89ae061659dc868e804a5f9f069b2829eadd2921313aaad95cb6f7b86cee34d4defe SHA512 c5393cfcf94303fb02e7c2aea7992cc3969437d5f39674f243a800ad2d0659fbc6e42a411aec20d6477774353b125c7a8ffacc510dffb20442eba81e88582ee9
 DIST felix-2.5.1.tar.gz 331705 BLAKE2B b8ed9b2355fd7ed6af95421d863f52f0553db5b2b7043095075231fe79d7500ce94c1ceb33614cdcdf715ba275ec254c605622eeae83486d8861a6449ba0c2bd SHA512 60bea2115164b0c75b08ee5011e6754a5173c5e360215b71483fac2f26f1a57223df6ccfcd226e542335be5aec886d9e4f379353f3d57f11f9ec0098b98b393c
-DIST felix-3.0.1.tar.gz 402532 BLAKE2B 4c648ddeb7e8fe6bb3f8e56ba2a6c519b869afa3096c52d6c426bc35ba0cde98edfea6c0dd9c1e7ad57b9bfc22763ce3d2b7ee26f3401b1012c0600fda64e5ac SHA512 0eef4e9d870835d8661ad570e99861a9e1d3a7ee071e873d783a0cc8c29ccc7d6975de613f32ba4e20b98f22ee925170397c124b279bca521c88e693150eea55
-DIST felix-3.0.2.tar.gz 402681 BLAKE2B 6be0c7a4038b55b9975e045afa15e978de6c89ffc96a970571c1b9b9b4a5ce1fe4e35577c2b32bb2329a60bc894512f305c33c4de53c6c9e17012dc91155a036 SHA512 5ded5c319dd29ba79579f7507215b481690ad6e418e6a262258bd3389913fef335362722324369efa1a1eaded8c97ef7552a47f5d60a7e9b4c97f5c7003b5ab6
 DIST felix-3.1.0.tar.gz 465717 BLAKE2B 07df31c230a377cc8f9f46a5c6d49ff98fb4292bada3713aaa71a73b309d2a661c9a0904cb67897ceafa767fc38ad8fc53cfdb6048e4d92a02ea08c005e8f88a SHA512 1633b9748334bb7e9044554c258130037bbffea5ca132235cb63cb061c3fd5b17f143cb85b815e321c936f31e501e2b4e089c896b1a9a5b5765e3cf354041170
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
@@ -11,10 +9,8 @@ DIST github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.g
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
 DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
 DIST github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz 804453 BLAKE2B 6dff8674476a5667ce4b43922acc1ba752a64d26f720c3554c73b88d5114d211a93fb994bba161911732a61d279b7f5610b5fc218b2985b87ef8a8353e3ca658 SHA512 13716991e01d8192137fa5551607f7320b7a369a5ca7ae29110060a5d9116a0d1c147b9f1fe6539eacbdf331bea2c6abb64c9da4bc921c3621e49e8bc397590e
-DIST github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz 2890046 BLAKE2B da19c84834dd044a93274720437a068b36f97e859f6251af07252732b100297e28b8dd0ff350d8954290bdca50571a154b383f3cacec04f94f548332aa922bda SHA512 88a00ff578826bc7e06c6b88ca4ade468588e72ad4e33bdd8193dd942f1695cca285213ab40ce357f28f534a9d4ca50579f3d29183b468061500262e0441ce21
 DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
 DIST github.com-coreos-etcd-d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz 2527242 BLAKE2B 7ce3619ba5e18414e3732dc4ce608122df130dfe9a61cd2aa6cd573f9010954ab0d352d5660a74032a0d078f040c383eeb0c8eac5022965f7781fa8f152946c0 SHA512 ace63a7e909629993d1b5038460848cecc1aecb024bcb6f35738f3ad36933e564da80f7faafb9b0d6a3e9149e37d34b86913219ce068b17a8adc643aa3099d86
 DIST github.com-coreos-go-systemd-2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz 28165 BLAKE2B 9433c3db4fc8ca8555d6f0d5aee6a47d5bb238d8fb28d69935a126aa5e223a59d35df6bf8cfe2bbc6cef85afa71c63c30ac027f9e551280f6d5f5b5d2248d6ff SHA512 29d6ee973c1752a661ee78869ff26873c2ae6684ea77612c2516b0ccfc9dd00ead885a6b87c1fb9be2ac74ae3381be1893cdb143b6fa18a19b6450f8733fe549
@@ -28,7 +24,6 @@ DIST github.com-gavv-monotime-47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz 59
 DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
 DIST github.com-go-ini-ini-20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz 38030 BLAKE2B b7fd1f9a6f028a68b07ad71c2edaae3050dda90585053273ac8112e9fbcbc66af7cfe675687ff52dc5dbe16c3567b4cbae8ea902066ad4122b9f7e4e36a17a78 SHA512 9de56f22a8b4ffcc8d64ebba79e2a4aac796f4d2edf475dc506a45e155a3a5bd27bf4dc7c7b5745be585ae69f3ba1394d1f6f14812b7c3a338125a5b0c315b40
-DIST github.com-go-ini-ini-32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.tar.gz 42762 BLAKE2B ad0f2ccc909591f79f949a6adb4f6bf1a439c1833d45daad12b88875c0ee6644c0641b8add421514aa563edab6c2fab071863536c1e9ca572b090b37495991d3 SHA512 27c07a78f9dd753b2067af71ffe14fc70117c0db5744ccc294e1cd3ab8690d66763e7e53866f0e8df4d9d239344ac5f383c623b523f5dba4abf55e792c29dbfa
 DIST github.com-go-ini-ini-5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz 31516 BLAKE2B 25846eeaaac2c159820aec06fb0a270d5099b7f0950cd6cfa8611e449fd5a961b3a72d6ee4ae5a03a86a7638c41dc61c287fa15abe87a24f72323a4880f7f546 SHA512 3237eb68ef882515e9de916b0d959920021f8a1b5eb156847441a36f43efabcddf929dd17ca608f66ea405c923e5561f8220fbbc7a7a55b80775b5502cecafaf
 DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
 DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
@@ -39,11 +34,8 @@ DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c
 DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
 DIST github.com-gogo-protobuf-100ba4e885062801d56799d78530b73b178a78f3.tar.gz 2432841 BLAKE2B 744f754476b0ae957d9874c4d06956057006ffcfd2d75ca50dc22b94eee967010b941f205b816216af58a19e8d3405d499d43a4199b5be172ccec6d4f2ece443 SHA512 6047875c5488d943a9f63776a4b55f71ab335344f6e99e76861240ad152db018b13ea52c18ff4db21c932090a50d32659643e0737c3290f18e945a352e450f3f
 DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6
-DIST github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz 248545 BLAKE2B f30fbefd0442e492a1435a415b8b70f19afbe13752779e80ce393ad3c01c478c0c975833c96291ddbcd3ce7086b0be8adb64dd96f16afdac2e5b784fa36eccfe SHA512 fb8a4e6b1689e8e6bec7fb9b4a4580892331322f144819fad96b7b5dd09fa89cfda45a8b4e1dfa25ee9f3bdb8a064705b05180efd1825fa8a3ea4f4cb93130e3
 DIST github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
-DIST github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz 1435086 BLAKE2B 5c9cc162a9a3a17c4423a74717244fb2254db0e83408907a843b3cf684653d71ce4c33fcaca5dc8ca86f99a9b36a7147fced051778e9655f7e6acd01b09df603 SHA512 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e
 DIST github.com-golang-crypto-b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz 1456586 BLAKE2B bdcbb114281611c90e441ab14786336f6352818fa766b6f3f8c62a6988fed3923dee618005cde1e17799272192cb06d1a8a176abfd3504bd7616e3596dd3345b SHA512 30a455f428011f4ab6b6528c8b3d882ed988d43f9e08cda3730b56b3174e674330df9610c48d839f81ec564a03cce5ffad60aed652cd04159a24b999750d81c1
-DIST github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz 1443268 BLAKE2B 19bb8d2861225a14ba3f19b2ae96c6640833fea7da52228480634e715b7690afc94e605a5be1b70b263bb3045a0fbcf9f78211c431836d077cca7d076fec1686 SHA512 e82f87394d2a8d96779cc69c8803555b5d23eb02f3d38101ccb9142a892280c32b8123d61a309a041cf5034282b5269ea38b5d29e03c85ca3c62c4fc0802502e
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz 899847 BLAKE2B 0ac617849aaf70cc78ebeb0b68cd8ed9b866ea15381eb31f233c2afb351c3ed90169311cf5105a961fc6a844434b55aecfc00e26e136a430481f86f3eaa394fb SHA512 9b98953b1cd4a0382175b4299cf605b3a41f758054a167bc764c324c4c5c8ba7205760113c44666f77d447804f7f1a6d3b34a334859cf9528b19161f77baf075
 DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
@@ -51,7 +43,6 @@ DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
 DIST github.com-golang-protobuf-8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz 217385 BLAKE2B 067df31ef043c798835c173eef23fc6dae18c30899752fed1ea776b35f54be63d144616a98230782fba1ef0812dbe02398fc50d196c48035f4d26c77baa1bf45 SHA512 bd5531821feea03d7bb273daf81ed648cf15c1573e70701f0e05c65995cef0030a927980447a5b9e52cfabd6049df9c3f3d9c7736157d994b3b38d4eef026a2c
 DIST github.com-golang-sys-43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz 761710 BLAKE2B c3ef495f2d2695da0dc9ce5c015d42ac0bd7d8f7d097cbbf0e4601b784da07610545bca2cf8673a6f3e0ea1f326424de697e642af29d43e256f5306ad8dda342 SHA512 9b2bc7a6fe78d4c7c4a6d4cb533be483c7f6b3b0f0821452cdcb0f015bf1f07d649d4d562c44d7bfc65d63cc1c2f8def2e7274a02e6f11ad41cdffaa1edc82f5
-DIST github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz 766292 BLAKE2B b88ad923e0caad501858e2b7fc59366fc287151f6ce988fb44632370f019c7edb5f1eccfbb6766f5d67e76d0768c7b459d86ee0a3c3dae68d840eaf7923a9447 SHA512 8d35c2b54cebae7f0f21916dd72be6132c22402829830f7b34805338f81e96da61977b346b72aadecec72c5eb1560998c7523fe0e6828813d635e06cf230934d
 DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0
 DIST github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz 4549739 BLAKE2B a124e96048fe4bf231b3e87e012d40f84de8541eefc4b3136451c75b6d45991b20893656fb920d014cb53a8ab5177a877c5ca48fc0dc43f92e50aa50d20d7ade SHA512 a4542d75a6326255d2cdfa48a454dcabf577fc04527973b6de00abb6d8bd4b04cfa4e6cf6b26fd3b2a546e6b4de7a36eaae409981dfe790b88a841a85348c83e
 DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
@@ -61,14 +52,11 @@ DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.
 DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
 DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d
-DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz 5497 BLAKE2B 104080651e0cac64abdc78169b4a184e9c8fda803a6f629fa3ef4210015f0a76df7fc478ea88e3fc460ab49288633a27ceb452979b610d49475040b74cd2ece6 SHA512 8e444831301404454b0f1506a7cf20347bc42639691ad7946e36e30492e7d8108d83ffc974934632eec9c75f03e28ce75e9caf1e92980803a43fff82849145bc
 DIST github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz 2806 BLAKE2B c41d5bd53f9f4bdff9e5b1cde8af46f3b3c8518af88b45a33625fa6cc4d89052fd6588d99dcaa1f6fe3ddc2a3e566b2da6ae30a1d218256f6707db4f0ca01c32 SHA512 e8f0a888f8103fca6714f6a13ba80434560488c9be389b47ca505e84a45bd18ecd08a19e88684c6af2ed550ca5c11c6a215791420426a89a79cce0dead452d47
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
-DIST github.com-ipfs-go-log-0e2a17b81af445147a78d94a45d4398c4008c219.tar.gz 11185 BLAKE2B 0aaa1f8ef8d29350f1e4158846f03981c6bfda3b66730400c37174da99a755660c26bdc7e491850d35ca7497aca3c23a90a0f0d06d2fb940e772cf27e1d1c3d2 SHA512 1d0ee215e4e3c4d0a36e7ce830742a3d4e0b43b9f84abdee61c02907be24e8d12dda0f1d816950d00c32ed39fa1a732080466f273e835559cfd8850eee47a6da
-DIST github.com-ipfs-go-log-48d644b006ba26f1793bffc46396e981801078e3.tar.gz 10106 BLAKE2B d501a5901493238ac3040383c15d9e823ff738355e020e14dd586fbb7c0d9230073881df1197b453146bd3b88aff6b754f40682dc7f89b4480cda48da16b466f SHA512 4ba1798ba341a5fbe06f98eec71886eb26cbbb8c05c788f91e77285737b77dff671f089c9346c7eb72cdc61351773cc8bcd7af1520915c104d8a94099b9d51a5
 DIST github.com-ipfs-go-log-4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz 11316 BLAKE2B e8aca3cbfc22c76e16c87c3ba3efa8903a7a378b485845831b9d3eb2deff4e637ffa67a490f144966987c9ac133903466a6ae17b5f9ab7ec87bff9ec73d55244 SHA512 5eca2b00b16ff94327b47505426f62c913ab3e0485f18a1d2a30e0a15afbccede8914a7ad10cddc8b0745deab70be4abb650a71c05659874c3900b3b9da26580
 DIST github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz 12680 BLAKE2B 852a4445fa50334de624395ea375945e273b7bfdc2a2dccf677e75a18bde34408ddfc9c0f4329edadec31cbe148cb139cd8659b4e7ba5dde829c58e39228de9f SHA512 729b41f0302aeb23b077a7ad913cb70f06982c243a37ccc264d5475d3db693c6e019c5cf9eb6307d809c2c99a4d68d711d4e11fe062e907750247d3f3e1d519d
 DIST github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz 5584 BLAKE2B 60e968bab9171dc1f09dfa3bfbe98324b4a536fc7664465154173a97f3a4a28a1adb1b8f659c5494b15c03ab8c788e8f9459fca2d6f0b37b7815da20d74e2072 SHA512 055351c704c9227b8d6cbb95177c2dbd554d582cc0ba4dfb5f8f0f550f80cfbd264c82b2a84010b8b1e9f02d9c759b4317f277f0f1b873a5eeb181cd0b672284
@@ -76,11 +64,7 @@ DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
-DIST github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz 599812 BLAKE2B 6763e5204c210f9c4762f659a863ca2333e49b3f35d516fbdcd9a68124bc2f69f464e20caecd6a84b67f4962c4325f41c52464613a687d3ed12d1c97934e790c SHA512 5533ff2a56b573b644f16c4e287d50c850203e79a82588df252df78dd3d0e8ba0bb691b7211c6e24f4ad3bf954e7941851e840fc279ab3f189f4d7096e4b8707
 DIST github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
-DIST github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz 599747 BLAKE2B a9d36fcc97232af6cae2558ef77caec625f790f75065ebbba3a94d61b9f06b68c3f5b7ed58f8fbf79b158905e849ce958b3b071a09e92a9d8bd46554fdf019d7 SHA512 99a1c84bad03df827288cd94665ccfd1c290945ec63787cd56f49ee27ecea8174fe5597d4c48367aec11f3ac18d1087a2cbfb7ed9a76906aabb31bd0199f5ddf
-DIST github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz 450402 BLAKE2B 422d64fd22f92c65f3ed41472e5a98b6197d32aa0b4fb19c7a487481e33738b65b807fa3af05e577641485a9702ce298e9741c57cdc9abba133a10d5a9d58de4 SHA512 628b11b308d8b76724f65e7d04570cd693a01368ea22ab556313ecd3af28e778c0bbf042a04f180bfa9c4b5188b437ae1bb5c0757fbd4d9602cae63f2fd37d36
-DIST github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz 450287 BLAKE2B d311171547b907179e9edb85f1e688752d628fb00001abdb0106bec0ae9f66bbb569c627fcce656dc57538435a6cf18f0d2f426c4e98d12296240f4dfe96352b SHA512 a9559fe0b585499a3f142cc24fc850ae2bc05c3232861f7749dc7b01a82903d17cb8ca889d58e0a76e245d8e8809c3a45160c1f79101b407c9141d8a893574eb
 DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
 DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 BLAKE2B c495730d6f4a4f477513e06c242f4cf9b234f4300a6ea0407a9fd36e6307445794512d7f6002dbe0153113b69af18ea7e316232d0054b714c2552c31b9ce08b8 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1
 DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 BLAKE2B 6229eb3d5a0b66221189588f13be52b6ed2f1a76a065b6c003b4968ff684736138af88ce3bb8b958fcb9ee0272e5c02be939fddff21ca32876880e31cd8b78b4 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe
@@ -93,32 +77,22 @@ DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b6
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz 3009 BLAKE2B b68ad69058837306d4988760ab7a052d988a9ea8c297001698aadff3eb0c404b3f0953faca4b2f12a174aae9e5b6f77dbb793b44b356cb9a420bfdabd72d76b0 SHA512 21392e0a444215f0345548e38e5bd439c1d97742fe705060c9e6dd41c0646d4cffb2932b886f7080c4b849fa4f075a8496328f37112dbf87a81967b229f255c9
 DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
-DIST github.com-onsi-ginkgo-f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz 124167 BLAKE2B 71a35ddf1f3c885e15009705c9ace2ecf9847cf95d5ca4dd1661359ae5ad1b1228db280ceaa174a40b9339633cf3101707b70ff816400a3346a368ab6318e339 SHA512 9d54ec28953d55fb99a293dde31d1c31f68ae5bde987c45d79ad7ff8f5991d5fe26093806b7ef33bd11d76c417dc95ee1b6ac67672ccbaf4feb8f960b0d95e6d
 DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
-DIST github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz 79917 BLAKE2B 4198339ce13c20b18749078bc24e455cca89c088b205b51c028c58bc0aab04854de41f28dd9b6132dcafd175b1eebafc670d4479b704778013cbcf3d751bc9cd SHA512 a26e64dd11ef98b02d5f85cdbcc6e0ebdd54ada1a689fa37a023122fc3bff0486bea060194c4725b5ab445e4533330f625655dc892d015a6b9399def3f402ba8
 DIST github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz 28604 BLAKE2B 9507aaac97438b1331fd190a1ef2a260b9125ae25e5fba57898ec421bfd97c592f0f8c92b12759d57969365273383d8d92a0a153ecdbf758ece6b7559e8b931d SHA512 01fa40a812f568208aa4cc603fb61444b1699bf8f7f7caed538c36051d12aa2f863c6815044760109ab4e4d14e9c777695e5c66ea76d9473c928fb321d87c1bd
-DIST github.com-opentracing-opentracing-go-db37fa5964ade72399b2ac8201123b8623256d75.tar.gz 28595 BLAKE2B b8fa7752a9be6dd52153f353e214c1050699de49c28519ad41b830a1a7cf5d466bd7916ad0e76c7b81297078cb39cb527e36d81f8481f52a01e33e6438211961 SHA512 debe7f1bc668112ad1470aa40c83e8b9985323842fee120ef75d36a45d9421868998130c87a63778d37d9b0b5e4cd0028450e50894cadc295a4d2cbf86e00d63
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
 DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
-DIST github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz 382793 BLAKE2B 39b8355eb1b887328021c6b15c85e3a304e341b52f732b429562a7f0102eff00651091f1978efea0017512538669209e037694093e7482c3d2b2a6a4fbf59b89 SHA512 c411ebaf3c5e6e072b4c3fefac623e5cb7913ee8a58813827c090d1ea388a7b2023d98c56267e8755b2f97359a3c67d241b2e04630d3846cd514162fbcf351bc
-DIST github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz 383022 BLAKE2B 04dffe36eeab8fc1407ff6345bf994f4d507aa462f70c55c27ae2f0a4044a5b2ee09ff36997cb6bee5bbbc5c8574d2cb7fc1b97b8d02fc9883ab28ab17356eb7 SHA512 9034dd3b0d0f088219a3e4b0a1c73b0fb7ede3d3d5f6dd2d61fd51d5705aa9d64ea27f1d40dc6b40bc5d4514b25da73e2baf45f83232658009fca1323066e4a9
 DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
 DIST github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz 198156 BLAKE2B 58eb1a2e617260d1b61582a12d6ae01f7eeb9caefe4c8d6c4276a95d277e1d25242fe6975394c83d1e6bf39375f77dcccf37a77262f56dfc344d15f29cfe4b7d SHA512 0cab2d2d14205b184dba501fd171897117f0dbc2cb42ab121e789c20d46c3e2e6c71fcea4162646432726379322d332a841866101cf32ae51e698fdd92b54c1f
-DIST github.com-projectcalico-typha-0bba94171368573d2a936e02454b1762ff7fba7f.tar.gz 230593 BLAKE2B 86b6ccc0d79724f8a34d5c7f7fdccc918e8ff1eeba74e802b54448dcfdeca2f3eb224013163942cc1d182bae1214f61b2ef04a42909217a3ee6a0a7cc3db25ed SHA512 7a8b5ecdc561d5866433f1d138c49cd392ad6c9f1a1bac01e26f09d7d495d8c7d4e3bae7fe2450fe08dc6abd2018af44bd7aa53d9ea6872ad15406ebcba37a99
-DIST github.com-projectcalico-typha-4308ae102ebdfd52d38ac7a267b5494be1079d05.tar.gz 230683 BLAKE2B 0b8f953db7fde078af1a58600aff7f75585ba8c4ad46aa517fedc3c1c15e160debeb25623e6b30ebf54e339f2710b854b8f387d3420c800b57733d2c11a48cf4 SHA512 36f343d720cf2675286f922c0b607b28e6951551e8397afe9c577ea672f09a0daea3dbd50238f536aea45a93ce97d8c2ddf6716a809dec1c354231b7ac0a9f71
 DIST github.com-projectcalico-typha-6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz 230984 BLAKE2B aa385de599b109ac0fdd2cd8f87e8a9c753bbc60474c8b85d2f4b6a286bd375f0b0ad0c1399292abd4417e2db6cfefad5b11cb3e49c484f13f13b001ed6fa2c6 SHA512 cb857385d2e3ce262615d24149b635d2d84430eb0a5201f7dd7c746b1c2a335a19bd94c2050d1f4f74746eda4f3e9521e4025fe2469aa3fefc0ce148fdfde76f
 DIST github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz 227211 BLAKE2B 41857009f54f2f1dd4b2532cb06e14356990caffca4995020cf311278ad3990719b34add9024a39be513cc1f6491d3a57c2850f5d8990698e7b66eaac5c228d3 SHA512 100d53dc3164008d6f5e701193ea1860a266e2321da585bff2a083a7853224ce866ff5cd1a64be0fd6530101bf0cc6c98fa366df331336023c4fc6f140649e6f
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
 DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz 54718 BLAKE2B 1dec6ac40fc5103117c2cf0538e138fc57c7b9795516c530b3c0dc2f5983f88c2d0eb1b094859815397fb14d50648240556fb6b11a8935586eca29eb66b4e958 SHA512 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
-DIST github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz 62690 BLAKE2B 981efc277b38a6249cb232c2ce6f759ea7313902aa9e8edfa2e76bb793bbe0908d8b175a13248d042a8d2c611e57b278b5fe89d606e8410cd996a9f640bf94a1 SHA512 14e0e3a26c3a01e6921892559d34a6de05f8e1eb1fcb588b3f01d891679bce1a625806bf04aca16c89ca05efc907cc0ce3d06521dec30903886138b3c4b4dcd6
 DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
 DIST github.com-prometheus-common-61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz 61732 BLAKE2B e0e16b1f12d62cb2c4618e37022aff054215b5910389505788bd671d6f29e2e8dac39ead98d590a75b4b07840d7667b293ad43096bc1e285e2b55137d3bcc796 SHA512 8dd198db3ee1f9708684ce25b3afa6e3202c9144537302d21dd34474d56163ceb429bd9372619d025d06a31f712feb2374b14d4053ba83355ff3b193e232c9b1
-DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
 DIST github.com-prometheus-procfs-e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz 43889 BLAKE2B 046b59464a287395f73c756a3addcf319a437f4d5594e56d91ebe4fbc86ff5e6db92c87d7bfcd49b87606d1b2a4b3378a49f39a4989be55021da1e4e1834c7bd SHA512 c31a595327ee82e4f5fdd9f58f395261cd9a290e2bfd9115593b20508966ad529a31322b228736c7fa6eb0cc74d81c6f298bfd17450e534ffe1a8bd74633b325
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
 DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
@@ -128,16 +102,11 @@ DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 BLAKE2B cb880cb4ffd844c5dc86cfa2b1aee79b6ca7c7f527d3331b1bd8a85860cef203c6f4d4a85cbd6c55b3c160e2e121cf69c84de97fb77e3db0028662c15b7cc335 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2
 DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
-DIST github.com-vishvananda-netlink-3ff4c2196115d804aa1c747781ad2b2a5c73e140.tar.gz 116777 BLAKE2B 90826cbd22858f71f6ef6acd373a0668abc2eba17411d2f63cc4a1234017642d3b5e507f4ff92068f1cb584a4fbe2e83231c8a9d4a6336c29883543ad969a33b SHA512 51aab248fd440b8d2770068de70d55e646f2d04256e47b4429d3ed564718e671bf22cf2e0e7fa811ffa9581533f2f5ee78a82b1cdfdeaaa4a9550d829c0220cc
-DIST github.com-vishvananda-netlink-6e453822d85ef5721799774b654d4d02fed62afb.tar.gz 102805 BLAKE2B 502bbbf16137192291fbe8dffa48c3ab1f4564e7e40422df011b02344ecbc6b3f339e66604259b02180ca2c23ef8e57a5daefa8a8b112e0667ed4574ae391bc9 SHA512 09c3f61bca1e9490a158ce4f146d71d1d4017f4e8ed612217b5c8ead2e63f5c1e8edae7f041e456a86cd4096e59a8801bb263e090cb40aba525012df7278407d
 DIST github.com-vishvananda-netlink-85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz 121969 BLAKE2B fe1d28a8249065955a1812e59279d823418af7c437683ba8a65d69339d6acb37ac9c5fb95d927314e0e461512958a2302cd8bde4b643d3ff95894aff374dfc1a SHA512 c5b7586e23a93022e52da1b570747ba2b24c43554ebe3836f93b3cb63e52f059bc300152015ba11d25a0573f03453da30e148933aa5a7db15cd26eecfd9456d9
 DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 BLAKE2B e0016e5a663157383ca37a99c32a1da395a9e6e53536acc6f03f25d9d347f1c4d8d1d00c8cfb02ba4f8ce69a5f7c06d9440fc177bd88e599678d67c18415cb82 SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184
 DIST github.com-vishvananda-netns-86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz 7753 BLAKE2B c251f716c79fd6c94204c1d0a7e99d58b964fa9e9664a80ce4d8045a433e8d7af91fc99ceb0d7d00bed26bb65ff22dc9f0527f4001d9bf71ed8996d5caf2ad4f SHA512 7298f8ff33c14faca3cd57f68de676049eee8aad6891f5ac03427b63f3554c666bf27896801a8528d9483b469df14040116fa52d263d851c7a9766577728b0fe
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
-DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
 EBUILD felix-2.5.1.ebuild 3998 BLAKE2B 13f283532d310dc707daaea73c428a66232c2450a4374d9740fcb8161a310333e6eaa823c5cde65477516725ee357b46d96f2b3fa055b442e74414f175ee70d7 SHA512 3d8f122b1c6214dc60cc47659d44d17aae7da4d14db083eba8d57a08c8c506a8f7086e4a350de2e518df91a96c4f42b8ff75cfb5339c755a950d93c63b4b4cb3
-EBUILD felix-3.0.1.ebuild 7143 BLAKE2B d0a5017d975a6d163156e6af79a6b868ee539797802674846c5ceeb4226075145a87c31fe787aadc916eaa4c0624f30f8a412ac484f5b927e5e8c6af785205c7 SHA512 0dde673a354a7db6fa7f3e386883f52c9c05276bf6f9018a0621906cbf5ca533aea19874284a4f27378ea75f207dbba83761d4d202522d1619d4b2c2fa96bb1b
-EBUILD felix-3.0.2.ebuild 7384 BLAKE2B a7220a19e1b9840f02c1fdae37cf6216aa8254a0ce9e2a99118ac414f7173de62defdbf1c4251eaac7208129efe48c5825b0c85744fffe4b247e9334dcd01f80 SHA512 2c60cdb8e85b49d5e28a2eb697e326828ca1abc8eb426ba73b3b4880133aa3852c0d3b1fce2759c29cff69e774d16b71acdbfab8ec100c83ea2b02c3f105e4f6
 EBUILD felix-3.1.0.ebuild 7540 BLAKE2B 8b10b3463d5bcebe8810044c302f2aa75169345d42ce3c03c2fab20c17539854622ace8d0e156ca356bfae56a4539b885bd8ba5afa48dc3b3ed92a6a9cb7a212 SHA512 e77f909b0902c10d3f8bf193dcd9e6c82697e400327236489b601afa489bfe953332a5e7c73534f2e1158067a62eaa010c6b53f533ace23265a215d6be689369
 MISC metadata.xml 406 BLAKE2B d2f0449cbf46550d7f8794221b6c6f9ed445ebf8b166bdc8976bf605ef61d12f8862b7597f63c6ec171af9d98c3a14bccea7d96fd24cedf58d895b8aed8b1fef SHA512 5aef67b8438efa537ac2a74f6ca701c8211f474ba2aa7a7ec8d26b523f93b18b3e31414143aa488c4480295ef51dac65988b2c923f3593f2028eb69ac93db8cd
diff --git a/net-misc/felix/felix-3.0.1.ebuild b/net-misc/felix/felix-3.0.1.ebuild
deleted file mode 100644
index 9ea4080761d6..000000000000
--- a/net-misc/felix/felix-3.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
-"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e"
-"github.com/coreos/etcd bb66589f8cf18960c7f3d56b1b83753caeed9c7a"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
-"github.com/go-ini/ini 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9"
-"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/ipfs/go-log 48d644b006ba26f1793bffc46396e981801078e3"
-"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c"
-"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a"
-"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026"
-"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
-"github.com/onsi/ginkgo f40a49d81e5c12e90400620b6242fb29a8e7c9d9"
-"github.com/onsi/gomega c893efa28eb45626cdaa76c9f653b62488858837"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go 7c2de5ed8c029f222d87fc849b54c4075ef3173f"
-"github.com/projectcalico/typha 0bba94171368573d2a936e02454b1762ff7fba7f"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
-"github.com/prometheus/common 2e54d0b93cba2fd133edc32211dcc32c06ef72ca"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/vishvananda/netlink 3ff4c2196115d804aa1c747781ad2b2a5c73e140"
-"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
-"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390"
-"golang.org/x/crypto d585fd2cc9195196078f516b69daff6744ef5e84 github.com/golang/crypto"
-"golang.org/x/net 3da985ce5951d99de868be4385f21ea6c2b22f24 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce github.com/golang/sys"
-"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text"
-"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
-"google.golang.org/grpc 8050b9cbc271307e5a716a9d782803d09b0d6f2d github.com/grpc/grpc-go"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 9b9dca205a15b6ce9ef10091f05d60a13fdcf418 github.com/kubernetes/api"
-"k8s.io/apimachinery 5134afd2c0c91158afac0d8a28bd2177185a3bcc github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-FELIX_COMMIT="53553b4f7ff80d193e8550ee3b31704da5349d42"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
-EGO_PN="github.com/projectcalico/felix"
-HOMEPAGE="https://github.com/projectcalico/felix"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-libs/protobuf-3
-	dev-go/gogo-protobuf"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	protoc --gogofaster_out=. proto/*.proto || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
-		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
-		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "bin/calico-${PN}"
-	dodoc README.md
-	insinto /etc/logrotate.d
-	doins debian/calico-felix.logrotate
-	insinto /etc/felix
-	doins etc/felix.cfg.example
-	newinitd "${FILESDIR}"/felix.initd felix
-	newconfd "${FILESDIR}"/felix.confd felix
-}
diff --git a/net-misc/felix/felix-3.0.2.ebuild b/net-misc/felix/felix-3.0.2.ebuild
deleted file mode 100644
index 68ff0f21689a..000000000000
--- a/net-misc/felix/felix-3.0.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
-"github.com/go-ini/ini 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9"
-"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/ipfs/go-log 0e2a17b81af445147a78d94a45d4398c4008c219"
-"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c"
-"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a"
-"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026"
-"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
-"github.com/onsi/ginkgo f40a49d81e5c12e90400620b6242fb29a8e7c9d9"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/opentracing/opentracing-go db37fa5964ade72399b2ac8201123b8623256d75"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501"
-"github.com/projectcalico/typha 4308ae102ebdfd52d38ac7a267b5494be1079d05"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/vishvananda/netlink 6e453822d85ef5721799774b654d4d02fed62afb"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390"
-"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto"
-"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce github.com/golang/sys"
-"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text"
-"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 389dfa299845bcf399c16af89987e8775718ea48 github.com/kubernetes/api"
-"k8s.io/apimachinery 4972c8e335e32ab65ba45bde0a99c6544c8a8e4c github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-FELIX_COMMIT="ccbab346adb7a7759e73fb11e57accc602f368a2"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
-EGO_PN="github.com/projectcalico/felix"
-HOMEPAGE="https://github.com/projectcalico/felix"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+bird"
-
-RESTRICT="test"
-
-DEPEND=">=dev-libs/protobuf-3
-	dev-go/gogo-protobuf"
-
-RDEPEND="net-firewall/ipset
-	bird? ( net-misc/bird )"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	protoc --gogofaster_out=. proto/*.proto || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
-		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
-		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "bin/calico-${PN}"
-	dodoc README.md
-	insinto /etc/logrotate.d
-	doins debian/calico-felix.logrotate
-	insinto /etc/felix
-	doins etc/felix.cfg.example
-	newinitd "${FILESDIR}"/felix.initd felix
-	newconfd "${FILESDIR}"/felix.confd felix
-}
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index 7b1b63e570bb..76fd562a5521 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,8 +1,5 @@
 AUX jwhois-3.2.3-whois-de.patch 462 BLAKE2B 1cee535c7f70bf80d3ae217452a5a38551caf0a37959686a920381641e86c39866eb6c4ff0ad70ede0975c8891c000da0e8b25d083374ec74582256b027efdd0 SHA512 19777491b1fc46df06cb54e136cb7faff595e4524c65f79e887b326cec7cd50e9b90014a30de4c436f711e324124bb39761b1bf24fb738e11174f857783e010c
 AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83
-DIST jwhois-3.2.3.tar.gz 430792 BLAKE2B 9708af6ee3a63c283cbcf581cfe78c22a7b9dad01a4133c3db85c019730e937dfc95a369fd8264c19f99193f8ae842365050e7a4fa9934da76945ae3ca05673f SHA512 92ffeef5d9134800d54326c2281eb38c030acf812d2420031438e1f9171875403384ac847bb6d9670aae3e3efa8cdfe2079c822f82550dc8b0450dcb05baf60d
 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae
-EBUILD jwhois-3.2.3-r1.ebuild 747 BLAKE2B 711363df31fcb3dfc1967891cc686ad4305976f350530a442692fd9e3c5c8b529c01401724f22e9eecd6a6ca076f4587632493c7f9e9067b0ebd212c3f37ef47 SHA512 4947bb7e04c82d2806b988f6684eb085da2ee50bdc69106d8606e5c0bd26bc3c6a3c74e6b97134015016d48d11d4d3d179072658ba4af12c703a5d99444431cf
 EBUILD jwhois-4.0-r1.ebuild 683 BLAKE2B a66d32aba06f4526acff8e3010055739ae948bf3d860c1e944807180f08c6f3c7e86748e0510c3ab6d72451f43f36352fcdef00fb1df9efcf78e60131fe4b895 SHA512 5d97c6b37ad8a42de8236ae3a4aaf7499aa443124dbfbe978ee30f687133e58df5a5f8177c315f92b28d1412a346a06a0d244da7013ee3cb9578da7eba7ae0e1
-EBUILD jwhois-4.0.ebuild 695 BLAKE2B 35b091f83528284ed84869dff61eeb5171ad63b4796a9b2fdd957a1e239c35adf75670f69879d2258f009c8d4d6073c12012570e09900cc77aa17ef811dda9e2 SHA512 8df498816973f43662afdde9218173e36b34cf68efe6bc4e8c47e2f516237247b1ded0cb09b6ec2408224b1f8e6f5feeae0d365b8a8785259824f6640626073b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/jwhois/jwhois-3.2.3-r1.ebuild b/net-misc/jwhois/jwhois-3.2.3-r1.ebuild
deleted file mode 100644
index 6c78a893b720..000000000000
--- a/net-misc/jwhois/jwhois-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
-HOMEPAGE="https://www.gnu.org/software/jwhois/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-whois-de.patch #159776
-}
-
-src_compile() {
-	econf \
-		--localstatedir=/var/cache \
-		--without-cache \
-		$(use_enable nls) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-misc/jwhois/jwhois-4.0.ebuild b/net-misc/jwhois/jwhois-4.0.ebuild
deleted file mode 100644
index f0d604d77d71..000000000000
--- a/net-misc/jwhois/jwhois-4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
-HOMEPAGE="https://www.gnu.org/software/jwhois/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86"
-IUSE="idn nls"
-
-DEPEND="idn? ( net-dns/libidn )"
-
-src_compile() {
-	econf \
-		--localstatedir=/var/cache \
-		--without-cache \
-		$(use_enable nls) \
-		$(use_with idn libidn) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-misc/lcr/Manifest b/net-misc/lcr/Manifest
index e040dac57804..5aee612567fc 100644
--- a/net-misc/lcr/Manifest
+++ b/net-misc/lcr/Manifest
@@ -1,2 +1,2 @@
-EBUILD lcr-9999.ebuild 1235 BLAKE2B 52aac302d842861b0b1881571c5791a4eb7a1c69a7b045c6c43465c74228d3c7d8de0dc539f5a872d2c0d22b4a62dfce6b9f1b089c3bd7763b9c922efbbe3c07 SHA512 93b30ff22f463606800cfc165058975d189d8cd975814b9992a01edf8323c318ff64fa20fa2c4682fec99e8bbd7ade02ecc65571bc51e8d0369c0622750859a1
+EBUILD lcr-9999.ebuild 1236 BLAKE2B 5d6c662fbdf4e1b65e506717056b7b8ae1da3b74a4fd9565e5cf249997cddf6b408ff13540db52c5ed2763bbe5a6e6c56cb22c16788c5cbc0806370e811980a4 SHA512 25870cb4aff0fd585e32ca746f7a2c3f13f2a2f4b81af110cce50bb12169a67fdd33887d6a9036702a724db40c3cd05701402051d5e16d04eb6579065376024d
 MISC metadata.xml 650 BLAKE2B 3677cdb22a18b446b167eb122d2a81efd44505977a23e72a87d52ec813e6efe100d9a88ce04ec8205cac80bdf0076569275346ae723ca8a8f68148f1ca449a86 SHA512 12497b4e4d2b11a3f2fe6aba4ee440419fb217a7df6a56da837384e7a4a16db7a2b62b2f88e5aef462305676081e94475fab15b43581e08136a63eb8439f7a70
diff --git a/net-misc/lcr/lcr-9999.ebuild b/net-misc/lcr/lcr-9999.ebuild
index 4e1cdce0dd5a..8330ca2effc7 100644
--- a/net-misc/lcr/lcr-9999.ebuild
+++ b/net-misc/lcr/lcr-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-2 autotools
+inherit autotools git-r3
 
 DESCRIPTION="Linux Call Router"
 HOMEPAGE="http://isdn.eversberg.eu/"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 844739efed2a..2c83cbbfaa5e 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -30,6 +30,7 @@ DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c
 DIST openssh-7.7p1-hpnssh14v14-gentoo1.patch.xz 21448 BLAKE2B 51d9324990d8098707359f355b9212679db38569e566f47659ffdae8046bdbb4e6873bd67ecb7da0b5706c5243f44f82089f08ecbc59c7e39062fceb4be78316 SHA512 63d2ffbcfe121ddedaa07955b1025d2c6e196ea694464610437368835cf46dd507d4d17361548cae93db53a1e3d93d9c409910620bbd0cd619d82b6215c833b5
 DIST openssh-7.7p1-hpnssh14v15-gentoo1.patch.xz 22060 BLAKE2B 81a7f3d1346718c154b39920c126eb0b00ae43f1369d882b8a1bd0b885668805639d869581fb49a8e7c67b61d72a904fde45841e4396af426b136d6d2f0a0dc3 SHA512 7b437bc061677aeabe561ad74bb19bc6f85369119ad8a92fb430fb5c1394c2bb3afd472ee66b285362b2041f871c56633dc94fec33cb062c6b1817d63c1d4a78
 DIST openssh-7.7p1-patches-1.0.tar.xz 8176 BLAKE2B 196b756f72bb3fccc927e31ae1b94adc3c9116de25258ac599c3653cd1234ff33f3dc608515a5ef56bea05191621974342bdb164b721c94d2c29a0de74731742 SHA512 9d56e306a5886a19d58c7a42389a82d8b912bb9250f97f64e9bf9752fc92e671539b24b0568f21072fb1ba7185e6bd1ec33511a39d26d48a699a911b910121c9
+DIST openssh-7.7p1-patches-1.1.tar.xz 16476 BLAKE2B fca2885a9e29faec40700ece37a995ba83e40bd2a6875129a5327770d8ee43663a7c063de33b4653994ed7332adb03730f613c047550d874190b95c66e2e9efa SHA512 aa5e33ce4bb4be16abf27ac1bade1dc85c51d82002be546402e0b8b0685de3ec7029f0f56bf1295ec346eb3960a6bed7cfc882722e57957a19a732f3174b3039
 DIST openssh-7.7p1-sctp-1.0.patch.xz 7380 BLAKE2B 6ad40972ece131ff148ede6ba94d63bffc606e0bcabb959d4c9056196cb6f4fddc285f97d7b49b73fde7ee84e3c981c07bddb058ad88eb7c7c2fe716e657c630 SHA512 bc5f50805ba25415f93f61b6654e5bcbaef673b0af48d339116ca9c94b6152afae294c5a9144adeb40190da97c2fc73b43e3ac7ac34feb4a647628327a7cac0a
 DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac
 DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05f9c8e623326b60f03b7c5f8abf223e178aa1d5958015b51627565bf5b1ace35b57f309638c908f5a7bf5500d21 SHA512 597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261
@@ -41,4 +42,5 @@ EBUILD openssh-7.6_p1-r5.ebuild 11292 BLAKE2B 0f8a0e888c539172a72cba3fbc08727de7
 EBUILD openssh-7.7_p1-r1.ebuild 14657 BLAKE2B b7539268f745f7edf9f654992a0971dd6d77c609b19f945ba3230a3901b85a675f8c951d146089efc238d66e9a0b5d38e1ab5272133e2af8aa4c7989dad8461d SHA512 e2bd77e37b10bb12350da25468a7f1733985dd375824e572a2de0df84cefdeb7bb1fda30014f9a5a3b86aa546c8419264f2b5b761a77482bf3a4fa65bf8a4e72
 EBUILD openssh-7.7_p1-r2.ebuild 15138 BLAKE2B d11f235d48f444750b33cc0964a997caf441601cde53249dea80ab060690562a596f8c1f99acc41d12bd8ecbe96aa4f3bcb328f123899de28d37667ae60d268a SHA512 833d01ce84557187c1109091ae04f3b53b6119debd412c14424219d7054f88aa6ab01644ab0ebe2beda50cec22f6c7bffbbee13091c369137aebb15542d250d9
 EBUILD openssh-7.7_p1-r3.ebuild 15119 BLAKE2B 76116b847961f3e5d57f47245a3edab2e86b81aa7906d4fd8cbc894d7f300d87fe6c9f8323821d5652d85971ec3e249a8b67568c9e4fa74550123df6f164461a SHA512 bd61079fc0731c03c57300696a7cad1ba75052139971cded7a7fe99b91d428a86350fe2979962e27a664a56957b8ee99f73131b9dc22881b40f66d417aca6ef8
+EBUILD openssh-7.7_p1-r4.ebuild 15571 BLAKE2B 43136015d7a9110d2910ad13be455cd21e469d980d20ab2abdbc09f0b3aa33d57cd191444c679eda08dd232767f6c9b45aca9f96f9cd12d4edf079a4396d1305 SHA512 e7db97cefb29d6cc5264365f85d950035ac7978ec93f0d62723f244bd8f5483e7f4c6348fc169b7e63201ff331d48b22122f134d7083fb3fd315d9e01124cfc7
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.7_p1-r4.ebuild b/net-misc/openssh/openssh-7.7_p1-r4.ebuild
new file mode 100644
index 000000000000..e884e0b9d3e6
--- /dev/null
+++ b/net-misc/openssh/openssh-7.7_p1-r4.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_VER="14v15-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
+SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
+
+# Disable LDAP support until someone will rewrite the patch,
+# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
+#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz"
+
+PATCH_SET="openssh-7.7p1-patches-1.1"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
+	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+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"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+
+		einfo "Disabling broken X.509 agent test ..."
+		sed -i \
+			-e "/^ agent$/d" \
+			"${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test"
+
+		# The following patches don't apply on top of X509 patch
+		rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die
+		rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die
+		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die
+		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
+	else
+		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die
+		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
+	fi
+
+	if use ldap ; then
+		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
+
+		einfo "Patching version.h to expose LDAP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP               \"-ldap-${LDAP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in LDAP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		eapply "${WORKDIR}"/${HPN_PATCH%.*}
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+			
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use hpn ; then
+		einfo "Patching packet.c for X509 and/or HPN patch set ..."
+		sed -i \
+			-e "s/const struct sshcipher/struct sshcipher/" \
+			"${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)"
+	fi
+
+	if use X509 || use sctp || use ldap || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply "${WORKDIR}"/patch/*.patch
+
+	eapply_user #473004
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX%/}"/etc/ssh
+		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX%/}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		# We apply the ldap and sctp patch conditionally, so can't pass --without-{ldap,sctp}
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index ee6e7decf1e9..9be509898612 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,7 @@
+DIST Remmina-1.2.30.1.tar.gz 1252587 BLAKE2B ac5f60cf0e92585a157d9649904146d5ff17e53297e3cf041c443309c4526a89f9bf54358d6c61a59eed88783feb214397cd9af5d9ce1ad671bbf28c9ce2617b SHA512 c160655dd05d3b7ae7b3545e7f41d5bed80cb39b103f906a51c27f4653c7a13919fc02928097747fd2cceff1adf50c36e4d0ecccf32efbea6e859f24bf1b4294
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 DIST remmina-1.2.0_rc29.tar.gz 1194267 BLAKE2B c4059ed56f3903f248009eacc20201fc533d47c2ad5d4e053c2ce225e8bc3fe50fc4c01cf912eb77dde220418589d5a85808b7c5e4b6083f6919dc5695aa049d SHA512 ae1190762588857ac59c86c43c66ba0aa3f584820a6e87ea7b7bb81a63f71acc7407d544d9f25edf9be4f45a536d3a2bb8de34e2448de6cd5d0f130de05ff52c
 EBUILD remmina-1.2.0_rc24.ebuild 2007 BLAKE2B 30c5e90c97fa5c9dc329108320e90d82ebcffc846634e727fe0e6e25d32e5febbe68e249bca955c91449da1c3cc4f22f5a6184c4515d1fef4685236573e37857 SHA512 b69b8a14476ed2ccc75ae82e723d0f780a513f8978d2b27f2331b7c0cfd77797bc1351441fcd048338ad33f1a16cffda4e514e43314c782ccd5e8bf846e18b3a
 EBUILD remmina-1.2.0_rc29-r1.ebuild 2151 BLAKE2B 35512e91077ecf103fe3c3d57d60ccea7eff017af4f09daac52e4f94adb4fb85a952d08e24e90d65f95086cdd4b10931ed4fca821060d2d5c932b1ad5c9ed413 SHA512 21c3dbf8cf7566c4a8207c11868d92983f416d78ae4b710835f01f20c6231f0a905109c7f8fe240b5b33ae160353da90bbc8d4539a48f69369abd9ab1bf02cd6
+EBUILD remmina-1.2.30.1.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
 MISC metadata.xml 1150 BLAKE2B b75ab4d0b30c602c1bdf2d9bb5701444570ea7cc53a97e3a27dde34044ab69f0f550fb2f8ca3d76ff04b0ff0a30164fc20696443896f3f732c4ce589a4a57b0d SHA512 9ed39584a65811d52192ff8390d02c3630f88a213c998e7990acf74f1aa26cb2abb54f4f75eb01cfe88b1986756eb9d59f2362e1ccfacc9e81c99e044a739809
diff --git a/net-misc/remmina/remmina-1.2.30.1.ebuild b/net-misc/remmina/remmina-1.2.30.1.ebuild
new file mode 100644
index 000000000000..9c7e1d7fba7c
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.30.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils xdg-utils
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2 )
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${P^}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_AVAHI=$(usex zeroconf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 442713035334..e27668783dd9 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.05.09.tar.gz 2962389 BLAKE2B bcdf235ce91cd2ac7ddf98d36112d9e23d8d181f5998e5e9bb2638d6acd1aff010f390dc7ae2c9d558c07b20f9d5ea1183444ead6a6a797ef980d8dc10c8b927 SHA512 cf62dff3f8427f0d31dceeebd7b6d8748ba004cd1077076b72f02c2779a8147ce07a7a40cd356a51d0f0dea3008a83f20dea73f6de5c1150cae311c552457a31
 DIST youtube-dl-2018.05.18.tar.gz 2963277 BLAKE2B 4e33f5c97ee20313bad1a4b0ccba55be08177e3c47342f163a04e23e3ce22bbf4e15e620bd5c5c1e1e7a0e3f2e422dc9cc2c213af27a25b40194e3ea93fa98c1 SHA512 99527e5aabf12018037c39d5ce4e3ca67b8848f84106409b8d5fd5271eb6ed53b49abbe5939ab5558ed981a5aeff730b2e27589bbc22d3d616061415154ab9bb
+DIST youtube-dl-2018.06.04.tar.gz 2972929 BLAKE2B 77f1ef9b869ea1b3b98d4deb064d959d3d05ae1732c2277cb5e2143025efb91196d2acd446f24ddd7aafbbe7275c066fa6a032d4a57930b62fb9fbb95ca45e29 SHA512 f354cfc77c6532926bf2a20a47a4b603bdf81a2a15997f493785e76eb0688f13ec3d4b3217f7d6b02d9a83366fbd31d5be6f579551bb179ab6008b85ec3675b0
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.05.09.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-2018.05.18.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
+EBUILD youtube-dl-2018.06.04.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.05.09.ebuild b/net-misc/youtube-dl/youtube-dl-2018.06.04.ebuild
index 37bffad45c8e..37bffad45c8e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.05.09.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.06.04.ebuild
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 59fb134b4936..c6fdb56d0cfd 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 7caec32470b4..022a3515cfa6 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -25,6 +25,6 @@ DIST openldap-2.4.44.tgz 5658830 BLAKE2B 0d9101bbc159f78f23ffc5db78943dd60261065
 DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.44-r1.ebuild 27095 BLAKE2B 98571b53fb80a37fc47e7649500c569ac5d1d81dcf58d676ea6457184df7cedb7ec11f4e7aa93167fd6d3394e26c8df43d62ecd513dcd36d5da2b5aac04776b8 SHA512 838464d2f7be0776800e5575d0daf5dbdd7010499b8815a7dee654c5f76663c94232c474aa5f9d5858d251a5c7ac5269ae82dade5b1140d99bd2725a6b901065
-EBUILD openldap-2.4.44.ebuild 26426 BLAKE2B 909c5ee5a117adc427581d8bee2deb81e14ebfffad8b767f6512b1d59a5ffe1a7109279cf750c4d829231e040aada1591719719a97eb757cb2aefb2d02662144 SHA512 70e26fcf06922239267a357105adac8c19febd97328efcbc32608d5c15cad99246082fb72d7abca4a1fcb75634d30569a0176d6e49da550f79655175e70b8cc2
+EBUILD openldap-2.4.44.ebuild 26425 BLAKE2B a4ec9d7e5810fae7e318bd8e9bb3c3557a7acea39649e455e7a8efe76dcc913d7bd46a01d57d33373f7bb0ec472bbf6809c73d55f960cb61f35296951ca91958 SHA512 a03ee643d9fb2835d6d7bac26eac392dbd848de762d5931eded614ccbe30b534b10949da1d42bb81bbd1a34519ef77db6513a451bb061a98146328752cbe3ea2
 EBUILD openldap-2.4.45.ebuild 27972 BLAKE2B cfb972518f219e88da531a0c324e61328a0a19aea5a50e4787eaea05603015fbc453d868dd284c0de91a03bddb6a3a3b5280216c489abd5db5369c431e81b2e7 SHA512 92f0ca3170e0ce040a31bff5769ebc05945aafa63c29a3b2f1a54190d04ac0bf061335abbede2bee6f24ef1c507b920185eb63cdd17a16906661aea480bc1c0e
 MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild
index 9ff3e77920a1..cf061b07f61f 100644
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index c5eaecb190c5..9860dcb69645 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/slrn/Manifest b/net-nntp/slrn/Manifest
index ac52a8f19c7d..2324424b0905 100644
--- a/net-nntp/slrn/Manifest
+++ b/net-nntp/slrn/Manifest
@@ -3,5 +3,5 @@ AUX slrn-1.0.3-make.patch 1044 BLAKE2B 4c2100b402e57383ccca4dd26a25bdea05ae065f9
 DIST slrn-1.0.2.tar.bz2 995433 BLAKE2B e2812826252918547d5cfb810233b8e0d19bb7df44577cb118ff51064648579f90132c88b5872400cac70cca5b91731d1ede39c4e0521d75d989a5d4417d78c6 SHA512 264dce88622e544356782c483f3639252ba57408d79775b2cd3ea06962ea3ebc568bc45ed19f1690c66b5b71d82eadeebd62a0bad656b1339ab7b80eb3f3cc5f
 DIST slrn-1.0.3a.tar.bz2 997138 BLAKE2B a349783edae24e0269ab1b8ddc328e578340e40e72285bbf070237b3724f475450f08bbc655d3b212684b8fffc495129008bde71a481fb3d2f4326bf396e5981 SHA512 11cef2dfe41f441af15acc22fb675cf607e932f0dd6d4a998e51ecda05c9a50d7abf10a3e693ffc857ad77e09634f460404e4d5b289169e7bbffdaf5d6d565a3
 EBUILD slrn-1.0.2.ebuild 913 BLAKE2B 60381f6a2b434102b2f479e3e71c89662af1aa32d1d7adb8ca11acbb07c5991fb7abe959888c855144274b92607755986db11b5ced2a24fa1875c5f8dd8364d9 SHA512 531084e04e6971e49f98130116e5391136897069f231e1b304f3c797a98605384a7bbfe55af26165e5af15186d7caabac761a4c19850514390f976ae70bec9e9
-EBUILD slrn-1.0.3.ebuild 886 BLAKE2B a26bf6071d232642fd96a923c9472feffb0a801b76040c310ff3f3d9b780b47d56353b01decd5c3a6aebeb9c15cd891945156984ac5d2f4883fa3f0263ac4898 SHA512 e9403c53fa1933db5140561ddb8f166290487874a12d4cfc2b2b193d9fad4a1cd4e7683dc95bb1da5847c10730bbcce95e679c2f120c2a4029f8ecc3b6bdb511
+EBUILD slrn-1.0.3.ebuild 885 BLAKE2B 7ff335d45814dc277f1fa862c93ef639c3e4b975102ca1ebbb41f248c57280096f5adf22c35572f59f1999dc58774ec1981b577c2156e3d9c990aa0efefcc528 SHA512 ffd0a2cbf13629fac95739f2593178124422a0b5dd3655c27102d975fa56e59b85cc7bbcbc8cfc6d8b54d3275d30c1b7f19b2e4c4d13911c51718ed1252621a6
 MISC metadata.xml 659 BLAKE2B cec81f9a34085c1394887cd2456aead6d9791d515f8ba56264ec37dee3c382a869ee59cd5d191820917999135cb9eb2b571531ef8e992c49bed37ce2ff64eb59 SHA512 96c12fba55179bf63aa81e54517cca962f7724c95d89ebc4048c0fab89a14acf3c3c541fa489593570b9a3afb1f88f85302278650c2224b9aea1f2e749c0cafa
diff --git a/net-nntp/slrn/slrn-1.0.3.ebuild b/net-nntp/slrn/slrn-1.0.3.ebuild
index 7416f325d327..0f1df2895675 100644
--- a/net-nntp/slrn/slrn-1.0.3.ebuild
+++ b/net-nntp/slrn/slrn-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://jedsoft.org/releases/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="canlock libressl nls ssl uudeview"
 
 RDEPEND="app-arch/sharutils
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 38fdfd30ef4f..5f27c21c6299 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 527df07e0699..5c6ef69184b7 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -13,7 +13,7 @@ AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f9
 DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
-EBUILD vuze-4.8.1.2-r1.ebuild 4009 BLAKE2B cf4c682b9aa7523e63d5d652b963bacbc3592bee5e8787d8d8d7e0090e9683b8f23c4f8757a5a495d7a581cd61f9e7843eea4325ca20ec347989d50988e96246 SHA512 b161e31d14594bd795bb02a6b0a83b09e6ca6db10b8e8078f8422c202575d8fe3d03c2e111ada4fcb806062e71f7acde163c31c63e8f0c29fd8221223edd6a26
-EBUILD vuze-5.7.2.0-r1.ebuild 4267 BLAKE2B 6767490e9bbf56cc3ca96dce08ede344ff37fd659a45fe5818c86dc9e15fd7f0f9ef29e8d941959145bb3d541df8c857f0279df2b65c140402ebbb8c724ccaba SHA512 a33bd7723ca5076f9372992cb49fd75e1d80183f4c71a599c160140f299a0b02217e88b25d840c62984e47a43466aa1830666b83cd4111069f232cfeef3a06d0
-EBUILD vuze-5.7.2.0.ebuild 4202 BLAKE2B 566b413c98b31d0e6af8e825e7512dedee93aa895fe65e82b96b9807843d38db49ccb7b6fc038768eec1278bb164107308f6ebc37910811e7e8003d5c5555274 SHA512 30018294bf0a93e9970c031ea21ff5923324cf61938a993a0bac7b3f149e67ea519f4a38d99b6e821566fbc5a0f2caafa1600352d4454a9efbccf91ca18a96e0
+EBUILD vuze-4.8.1.2-r1.ebuild 4000 BLAKE2B 5ce11619ce22b732bd1f7c0f38c5d48f72cce4bce2092ccc93bc261b6888b40d24cf0bd1e2a120549c2adddd9576226faa9049105a0b81df188eb49f3d094593 SHA512 bffeac4eaab07b89d9e80cdfa3483cd0d3027f4fc53d5e70177c6e07cecc06f64a606fc8daf06fa2dfbeba84e96fc4ecbd82666203bc939347e021e0931da706
+EBUILD vuze-5.7.2.0-r1.ebuild 4258 BLAKE2B 293eb3c94020520057fbdc377df2cdb3cee346e4aabd1dd74e19fdd1afb70a165595097905b333a117658391cb39f4a51a887ff0b991a5196245b9363727554b SHA512 fef8ac64aa64eb050af258b0fb7955c1b9d9439e47a7d528f329f71bf27da0f2e0162c7e9446fac013fe08e06372977c8262fb63dfb3b4732bfc5f7a42b4b1a4
+EBUILD vuze-5.7.2.0.ebuild 4193 BLAKE2B c1845f9c926717ea470ab39122771498a1d49d0cd9bc5fe406f8c9aa20f99a1b02489c4ef490855743646c184b819c4a767e4fc2b0912caac99cb337f18d5054 SHA512 57542781decd415deaf345fc00977d9502def7faac9685273b2d9df8e55a3233f15efc861183ac85af2bf9d9febad5c99bcac3137d6cf15f96c1083b0cd5044c
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
index 760aa1db034d..4f332aa97f4e 100644
--- a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
+++ b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
+inherit eutils java-pkg-2 java-ant-2 versionator xdg-utils
 
 MY_PV=$(replace_all_version_separators "")
 
@@ -129,9 +129,9 @@ pkg_postinst() {
 	elog "Using this config file you can start the console UI."
 	elog
 
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild b/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
index 814c09731fed..869d675a7172 100644
--- a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
+++ b/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
+inherit eutils java-pkg-2 java-ant-2 versionator xdg-utils
 
 MY_PV=$(replace_all_version_separators "")
 MY_SRC="Vuze_${MY_PV}"
@@ -136,9 +136,9 @@ pkg_postinst() {
 	elog "rather than the startup script.  You can enable the console UI by"
 	elog "editing this config file."
 	echo
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/net-p2p/vuze/vuze-5.7.2.0.ebuild b/net-p2p/vuze/vuze-5.7.2.0.ebuild
index 01f5c404a7cd..41195930d091 100644
--- a/net-p2p/vuze/vuze-5.7.2.0.ebuild
+++ b/net-p2p/vuze/vuze-5.7.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
+inherit eutils java-pkg-2 java-ant-2 versionator xdg-utils
 
 MY_PV=$(replace_all_version_separators "")
 MY_SRC="Vuze_${MY_PV}"
@@ -128,9 +128,9 @@ pkg_postinst() {
 	elog "rather than the startup script.  You can enable the console UI by"
 	elog "editing this config file."
 	echo
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 06f4069f0f1d..34f021b8726a 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index edc034fe042b..7211e4e2ca9f 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,7 +1,7 @@
 DIST cups-pdf_2.6.1.tar.gz 33315 BLAKE2B 8268777d9c604622a801e663f9aac9ea1fd7253ea87f1f65c7954134f7473b7d8baf94cec09c5dd14bb5470df47ea4484cfbd90afb4b0da652395d657011f86d SHA512 60702159907f95e005c93a38551b5aaa65b7e4b8e009b48becf4523d606c4bbb127e81e5acf8519ce4c9aed90b41deb01d80171f3145086351dbd022863a3816
 DIST cups-pdf_3.0.0.tar.gz 29654 BLAKE2B ec1e89eb876161bd2b123568448e9b0075537aacc01623ca2ae5128f946ff2ea797893a009bcf88a1f26af9755d803e57de2271b4cd828fed00e74790f66f9f8 SHA512 14420e50b9ac93d12e75b98ba8c3456d35a3bcce0778eee8308ac7a3c3a987b4dca5a4f140353bd2060a5f0f4d3434c442b00ea309660b4e5a72fe11dba25276
 DIST cups-pdf_3.0.1.tar.gz 29754 BLAKE2B f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818
-EBUILD cups-pdf-2.6.1.ebuild 1069 BLAKE2B b14a70ef6d14a85818179b31eaf4a909ff9f4c0ec704ed83d0fba0e93746c1a430e312725b498eee2e48a69daaac8df37d5f48ad07fb2544fe9cb1a940323034 SHA512 12c9104f1acc59336a4ed7812bcdf6e2e143263c0227b10e1caa30ba23edab60e822b16ab58323887cea03e9445edd8a5890a50374abf4cabde0efc211c7b89b
-EBUILD cups-pdf-3.0.0.ebuild 891 BLAKE2B 7c13832e00d8d9f1dcec8dc18b6cf5f631465fc5e83bb7273b5fc7d454b397b28737cd90243d8956c268522d0973420398f1468e0e35fd3fc870da15cea54600 SHA512 c3183d601b6c0e447a21bef891e200088e323fd5f688a7b9ff131a7e65fd7d7cd229033e86ed845bfda2c7f85385e272300b8e5c9e4a7352501250589925e0fd
-EBUILD cups-pdf-3.0.1.ebuild 891 BLAKE2B 7c13832e00d8d9f1dcec8dc18b6cf5f631465fc5e83bb7273b5fc7d454b397b28737cd90243d8956c268522d0973420398f1468e0e35fd3fc870da15cea54600 SHA512 c3183d601b6c0e447a21bef891e200088e323fd5f688a7b9ff131a7e65fd7d7cd229033e86ed845bfda2c7f85385e272300b8e5c9e4a7352501250589925e0fd
+EBUILD cups-pdf-2.6.1.ebuild 1071 BLAKE2B 03ec0305e33dacc8e8164fb1e0dfb415a4459ff8598876f866c26f93b921dc96b1311e89c731896326e1bdeb92ab5fef4e8a08e2839435799c8b221d8b4ab294 SHA512 3c7f887eced242a62430a98723b013673297ae55e3c627fdf26784c4a90232a5a0898ee37b83f184dd08dbf5d3710fa82ea6c950fef80396325e3c824627ee5a
+EBUILD cups-pdf-3.0.0.ebuild 893 BLAKE2B c91dc95e2f693ae7de87dc407c20826ff55c5a04dc123712024a4776558e6451bc8ef8af0b50db22cde9172ab0d6f3f0b25bf29f7540b3461987d3333d414e8e SHA512 18e8f9b02d82db9dea38dc8001cc5fafd22f545c53da1df15dac1c84023df3fcae63706f324b7ae8935ccfff149aaffe87833f93db185f5ccccd6b283d69c1c4
+EBUILD cups-pdf-3.0.1.ebuild 893 BLAKE2B c91dc95e2f693ae7de87dc407c20826ff55c5a04dc123712024a4776558e6451bc8ef8af0b50db22cde9172ab0d6f3f0b25bf29f7540b3461987d3333d414e8e SHA512 18e8f9b02d82db9dea38dc8001cc5fafd22f545c53da1df15dac1c84023df3fcae63706f324b7ae8935ccfff149aaffe87833f93db185f5ccccd6b283d69c1c4
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-pdf/cups-pdf-2.6.1.ebuild b/net-print/cups-pdf/cups-pdf-2.6.1.ebuild
index edd5a5eba833..bbf9677a3f41 100644
--- a/net-print/cups-pdf/cups-pdf-2.6.1.ebuild
+++ b/net-print/cups-pdf/cups-pdf-2.6.1.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
@@ -6,8 +6,8 @@ EAPI=4
 inherit toolchain-funcs
 
 DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
-HOMEPAGE="http://www.cups-pdf.de/"
-SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV}.tar.gz"
+HOMEPAGE="https://www.cups-pdf.de/"
+SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/cups-pdf/cups-pdf-3.0.0.ebuild b/net-print/cups-pdf/cups-pdf-3.0.0.ebuild
index 4bc7323b0012..b2a6c83640ab 100644
--- a/net-print/cups-pdf/cups-pdf-3.0.0.ebuild
+++ b/net-print/cups-pdf/cups-pdf-3.0.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
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
-HOMEPAGE="http://www.cups-pdf.de/"
-SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
+HOMEPAGE="https://www.cups-pdf.de/"
+SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
index 4bc7323b0012..b2a6c83640ab 100644
--- a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
+++ b/net-print/cups-pdf/cups-pdf-3.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
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
-HOMEPAGE="http://www.cups-pdf.de/"
-SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
+HOMEPAGE="https://www.cups-pdf.de/"
+SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 8632fed0a454..446c40912294 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,22 +1,15 @@
 AUX cups-1.4.4-nostrip.patch 487 BLAKE2B efc4b3db44b65a1b0c67c472e467d80b486969396a48443b8e6be007ba991bdf6830b1e36965bae053753440528e1aa58d792c4f42bea8464ffed1179f049960 SHA512 10f46e841aa5646f40564e92b6c5b90a5d27702ea8a4dd8652cfd39834be54feec20a2c8d4fea663b90685865deae17851e57161aad7ff250916ce4accbb01fa
-AUX cups-1.6.0-dont-compress-manpages.patch 300 BLAKE2B 9efd83f7fbd07eade96311ffb4a634f0f67197e35b33c3dcb989ca8805d7e17c3dcd4e963aecc2a5bab85061ed8688da8b30e30ee9807e6519bd373572ba96a3 SHA512 f61189be61f2be4963f3feeafe281fcf69ccf968cfddf262b30636e5a09584feadecbdf187bb9206c0cd7b5945053f602a9d715ec4d1a1b766323085407f58a6
-AUX cups-1.6.0-fix-install-perms.patch 833 BLAKE2B 96e76288409fd343f76188724cc64899460fe8cf4baf3f1d17f6d2210fc17e78a98949f0c707bba943e7f8d7c4de7a5c371c97af637ef53ff562083935c1e921 SHA512 b8ffec939651ef2114bb8cf53aad82262ada883cee90efa84f2f8fe73de6b0d3ea0997991e1d002b8c707f2b159cc52d9039282aa0894d73bd8122493c72683c
 AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e658f5cbbf6793138653df731c24c89149553994a2db423f85251385628de2f467597af98baa91ab954f63f77b5f7eec037d8db7af SHA512 e4111fb05ac381f5639868464734fbbc9296252bda288fc415274cb0eda37ff57d4d2816e34960a3e30a1c73c3aa6911267a5d2c29f1480d8e44fdb6e95f3836
 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb
-AUX cups-2.0.3-cross-compile.patch 773 BLAKE2B ee7558c0211787c21dd0a3fa3e40ddb6ccbe0802c170a574873e0450126987cb70128b11b2d2ab43ff4b3a25d7e5ae5a551b53e4225ffde6a55010c5460a1f2a SHA512 0a99089f5f6dd231c34a017cfba91182717926943c2865ab0857b2c1aec2efac4e6fc1b9eee9cd1a1f6a99b810f272e8e69bc6fe2275f3d7ff001be3a3bf8ccc
-AUX cups-2.1.2-systemd-socket.patch 1542 BLAKE2B 8836cfba795f2af00f700f380afccdcf71b273bac056303a33bbabb6b4716155d92f70ad5a05413363f7993329bb14ee3e06d63d5206f0fcbf6768831bacb64b SHA512 56759eafbac1e9947bcc445c850acd0c176687ae6360bc925bbb62153d4a049143d1d41efb3fcc78bbdeba18b0f11ef9a0c5452ec20fae7ef689518781cac48e
 AUX cups-2.2.0-dont-compress-manpages.patch 319 BLAKE2B b03a0ab815751055d79475423242bbc407e934cdc00e4596ab05e3d7f87ca0feb7201f6696a8eef59fdb73630431364f12146f1d32743e272de054019acb8380 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5
 AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf
 AUX cups-2.3_rc1-no_pam.patch 4704 BLAKE2B 99d9726f43ebc6ebb7fcaa608b99f435dccdeaa53f8fd6b47b4735c084dec8852ab5b34d06f07293299f13a4d975cf9b5bfc44950910c58c409fdcb71dfec6ea SHA512 f5f0f850a954a970aa5129d518f7b84e1e5fbb57c4bf16d42eb09eac01ebb5280514a580938433525514d5cd57acfcb363aa972d783d7b6b23e8f30e01d5e1b1
-AUX cupsd.init.d-r2 432 BLAKE2B bec86d0a61cfe67b4d760114b703f2b2a9c10a1613cb71eb6aee74e4fdae2ef829086058236279e26c7fff53ba3a037b6cbb0a52ddfaa50c720bb7d98f01acb1 SHA512 d14973383158dd78e4970dce3037b73e812788f9e61ad9348b580cc8891e7ad6c2214709cac4a43829f7010720a755855c8357d1ada11d048deccf59aa4e83d5
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
-DIST cups-2.1.4.tar.gz 9572653 BLAKE2B d01242e8188f8b179e2beebc3730cc32588c4512e56e76be740f6a3e63411f277a6e9b241b27cfa12d3b26743ad9ef6e85f70f66e19d4f4c70593707b1bbaec1 SHA512 5f36d21e1e094323f1811229b452f096f3f0b264757b3c3b1742bbd7ea0059e34d3cd2fbf3b6856d25a04ae1779babafa6d598a8ba249448fce3bf7cafa59aae
-DIST cups-2.2.6.tar.gz 10317889 BLAKE2B 5d9d8a09e73074a8638913c30e163cbed6bbadc4fa0c6b24dd185a2137f3af72aba553b3de62dbf053f9f92f7737efdb5d06e27bfb84225f39d855d830aea02e SHA512 ae880aa3f675e0c1ad269200d06be3c25675a45a697c7a8b44e6ec0c30f05f333acca35cd965e667ff066d753df5e59447c2eeaea240e72d2731690b3b9dcf76
 DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b93dc695a44e2170d4ecf71b80d5691b4d947decf0a84ff9433b43c6d47dc350a8769d1e230ceda276c13add67e5e8a20 SHA512 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e
-DIST cups-2.3b4-source.tar.gz 10130356 BLAKE2B 10dd250516bafa1df0e8d123fbfff44f290180771d5d9bca0879ca985435299277d42e2222969cb1d6f9b5e55ad86f3dd7ebd246724edcb257b42ddb3d7e91b4 SHA512 5613b18bfc28c53fb738feb3e0a96ec6b4cec8575479f50dc06f835e109de52af6f5d0c247c84b9b22285e92ea9694839269c27b67c641cc5f81a68a1f818b31
-EBUILD cups-2.1.4.ebuild 10148 BLAKE2B 8c1fb902b3f7531b212c22315869360c30fccfe4f354052386f9e4d8c28df07ffc78de6cb8a3d24c83329d025c2dd385cdcb59cfb58b001f68e77012bb44269f SHA512 29453995a34ccdd7303365d7c2f5abe457e81897080fefd8c42b82f3133d7833774d9276e2f5569f1a268dbd9c28fcaf35b9ae740f32ba1b163d43857546c1ab
-EBUILD cups-2.2.6.ebuild 9835 BLAKE2B 0a9b787a1691f452ab5b441b2f4a7afcfbb752ade54648428ec823a80098996c63a3a37200df3204ae01e751eccf7b19cb6d548e4171f4949cf677fb4d6fef81 SHA512 bdf1f5a77acc7ad782603c92ad7bb4aaaff178683edf465dfe88b9ecac8315d3996b0f89869acb6ee60e118b34d1225ac0648d1162b704aff74ad6b4f72f6bcb
+DIST cups-2.2.8-source.tar.gz 10374921 BLAKE2B 3fc4d5cae3848cbb7fb1263b377210254dfa08d70a1218c7f20d5a277d0536791e071c50bac282ab2049e1cffddfe91438216ceb37ec279d7cb0ec7b57a315da SHA512 6ed44c5e6f1c46c85b06691713ce476330c93834243720ad2c04fa983e20cde9f6ebfc2eb2ba8bb3700f11320471b99856d6402d3641038da690f89c49fbd261
+DIST cups-2.3b5-source.tar.gz 10176856 BLAKE2B beda07a64ef463371e4e1f25b397caa9487f7acdc982fcfa7edee736a41f6a6875747c772e4c59e2d2746c8c508a0cc87f8608227592f5e1d9c8c48d956ab97c SHA512 48d45f090637bf32bdcc83106272efb8462ff609f74fbe4e82add7f851dcb9173126a1df186848c087d02e8c1441f31a70859faf2714b6ddb1f3738ef8dba60d
 EBUILD cups-2.2.7.ebuild 9948 BLAKE2B 93f232963bb18833570171402bf98eb67a5dc4ab0a05fd224ce82dc71d12ec2698ea0d5e8ce5dd6030005d3392b053261bf22eee9943618146ba7bb3da8811fa SHA512 6bd4ff2b0c17db27ff65a93a5f3ecb61c2bc5c1e4a48621dbe14ba76dd7fb1fbdc9a4eb10a1f08aa9af57cf3afa0114217bbe84df9f5aca24b9cc47cb5625afd
-EBUILD cups-2.3_beta4.ebuild 9877 BLAKE2B 39ada1548f440a4d91602ba56d4451382783e2d851e3b0891ccdae42c54d71915f69cd5fa868c6ed60e266c5ecd4bd73a18f644630b4e196a9942bdb99fd83e3 SHA512 b141f3a9da543989a82af2c1bdef94bc8ee173710e6607efd0c0bbf95ff4e921373aa7cc7ddf739edd32e38b7a8e3052ebfc2737c68a34007f95c8d6393b92e4
-EBUILD cups-9999.ebuild 9877 BLAKE2B 39ada1548f440a4d91602ba56d4451382783e2d851e3b0891ccdae42c54d71915f69cd5fa868c6ed60e266c5ecd4bd73a18f644630b4e196a9942bdb99fd83e3 SHA512 b141f3a9da543989a82af2c1bdef94bc8ee173710e6607efd0c0bbf95ff4e921373aa7cc7ddf739edd32e38b7a8e3052ebfc2737c68a34007f95c8d6393b92e4
+EBUILD cups-2.2.8.ebuild 9897 BLAKE2B cda48fea3fbf39493718b585b2c7a451b57a01ef7d4c888285c2c749d5354880f90cb1705c9e007343fd73688c76de835781aa7008f9c15d9014a13a09f429b0 SHA512 ce22dcbedcd7e6e8366343a2a1ef826fe34bb6403e58ee7fc51a4f7482c1b00a075060a1b1f682e120096ce4a9245b585645f67ebd9f3585a777facdbd5aee02
+EBUILD cups-2.3_beta5.ebuild 9673 BLAKE2B a4b10549bb1e045347580400611de0dc637d23dbab783ff6a6524bfab05a44ea5dc1d9f7f14349028f0843a20ea04ff98fe563c610ad6f5fff00d90110e83029 SHA512 b5024f8e94d6f8e251f54a5c988b512d622ac454a49f84893a900ad63e65dcb565007f95a93b52301e1c0a16ba8cfca06f78edc476fa5c631222fcfed0153bf8
+EBUILD cups-9999.ebuild 9673 BLAKE2B a4b10549bb1e045347580400611de0dc637d23dbab783ff6a6524bfab05a44ea5dc1d9f7f14349028f0843a20ea04ff98fe563c610ad6f5fff00d90110e83029 SHA512 b5024f8e94d6f8e251f54a5c988b512d622ac454a49f84893a900ad63e65dcb565007f95a93b52301e1c0a16ba8cfca06f78edc476fa5c631222fcfed0153bf8
 MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717
diff --git a/net-print/cups/cups-2.1.4.ebuild b/net-print/cups/cups-2.1.4.ebuild
deleted file mode 100644
index f3ca5bc789d9..000000000000
--- a/net-print/cups/cups-2.1.4.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
-	multilib multilib-minimal pam python-single-r1 user versionator \
-	java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/apple/cups.git"
-	if [[ ${PV} != 9999 ]]; then
-		EGIT_BRANCH=branch-${PV/.9999}
-	fi
-else
-	SRC_URI="https://github.com/apple/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
-	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-CDEPEND="
-	app-text/libpaper
-	sys-libs/zlib
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6:* )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-	)
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${CDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-release-${MY_PV}"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
-	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
-	"${FILESDIR}/${PN}-2.1.2-systemd-socket.patch"
-	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
-	"${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cups-config
-)
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	use python && python-single-r1_pkg_setup
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might have some incompatible options enabled."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use usb; then
-				if linux_chkconfig_present USB_PRINTER; then
-					eerror "Your usb printers will be managed via libusb. In this case, "
-					eerror "${P} requires the USB_PRINTER support disabled."
-					eerror "Please disable it:"
-					eerror "    CONFIG_USB_PRINTER=n"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        USB support  --->"
-					eerror "            [ ] USB Printer support"
-					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				fi
-			else
-				#here we should warn user that he should enable it so he can print
-				if ! linux_chkconfig_present USB_PRINTER; then
-					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-					ewarn "support in your kernel."
-					ewarn "Please enable it:"
-					ewarn "    CONFIG_USB_PRINTER=y"
-					ewarn "in /usr/src/linux/.config or"
-					ewarn "    Device Drivers --->"
-					ewarn "        USB support  --->"
-					ewarn "            [*] USB Printer support"
-					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove ".SILENT" rule for verbose output (bug 524338).
-	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
-	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	einfo LINGUAS=\"${LINGUAS}\"
-
-	local myconf=()
-
-	if tc-is-static-only; then
-		myconf+=(
-			--disable-shared
-		)
-	fi
-
-	# explicitly specify compiler wrt bug 524340
-	#
-	# need to override KRB5CONFIG for proper flags
-	# https://github.com/apple/cups/issues/4423
-	econf \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--localstatedir="${EPREFIX}"/var \
-		--with-rundir="${EPREFIX}"/run/cups \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-docdir="${EPREFIX}"/usr/share/cups/html \
-		--with-languages="${LINGUAS}" \
-		--with-system-groups=lpadmin \
-		--with-xinetd=/etc/xinetd.d \
-		$(multilib_native_use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(use_enable debug debug-printfs) \
-		$(multilib_native_use_with java) \
-		$(use_enable kerberos gssapi) \
-		$(multilib_native_use_enable pam) \
-		$(multilib_native_use_with python python "${PYTHON}") \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable ssl gnutls) \
-		$(use_enable systemd) \
-		$(multilib_native_use_enable usb libusb) \
-		$(use_enable zeroconf avahi) \
-		--disable-dnssd \
-		--without-perl \
-		--without-php \
-		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
-		"${myconf[@]}"
-
-	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
-	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
-	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libs
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake BUILDROOT="${D}" install
-	else
-		emake BUILDROOT="${D}" install-libs install-headers
-		dobin cups-config
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.txt
-
-	# move the default config file to docs
-	dodoc "${ED}"/etc/cups/cupsd.conf.default
-	rm -f "${ED}"/etc/cups/cupsd.conf.default
-
-	# clean out cups init scripts
-	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use zeroconf && neededservices+=" avahi-daemon"
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d-r2 "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/$neededservices/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		# always configure with --with-xinetd= and clean up later,
-		# bug #525604
-		rm -rf "${ED}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/log/cups /var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	use X || rm -r "${ED}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
-	# the following file is now provided by cups-filters:
-	rm -r "${ED}"/usr/share/cups/banners || die
-
-	# the following are created by the init script
-	rm -r "${ED}"/var/cache/cups || die
-	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -fv "${ED}"/usr/bin/{lp*,cancel}
-		rm -fv "${ED}"/usr/sbin/lp*
-		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
-		rm -fv "${ED}"/usr/share/man/man8/lp*
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# not slotted - at most one value
-	if ! [[ "${REPLACING_VERSIONS}" ]]; then
-		echo
-		elog "For information about installing a printer and general cups setup"
-		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
-		echo
-	fi
-
-	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
-		echo
-		elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
-		elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
-		elog "You will have to find printers using zeroconf/avahi instead, enter"
-		elog "the location manually, or run cups-browsed from net-print/cups-filters"
-		elog "which re-adds that functionality as a separate daemon."
-		echo
-	fi
-
-	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
-		ewarn
-		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
-		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
-		ewarn
-	fi
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/cups-2.2.6.ebuild b/net-print/cups/cups-2.2.6.ebuild
deleted file mode 100644
index 362712966b7a..000000000000
--- a/net-print/cups/cups-2.2.6.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
-	multilib multilib-minimal pam python-single-r1 user versionator \
-	java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/apple/cups.git"
-	if [[ ${PV} != 9999 ]]; then
-		EGIT_BRANCH=branch-${PV/.9999}
-	fi
-else
-	SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
-	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-CDEPEND="
-	app-text/libpaper
-	sys-libs/zlib
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6:* )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		>=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}]
-	)
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${CDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
-	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
-	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cups-config
-)
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	use python && python-single-r1_pkg_setup
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might have some incompatible options enabled."
-		else
-			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
-			if use usb; then
-				if linux_chkconfig_present USB_PRINTER; then
-					elog "Your USB printers will be managed via libusb. In case you run into problems, "
-					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
-					elog "usblp kernel module."
-					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				fi
-			else
-				#here we should warn user that he should enable it so he can print
-				if ! linux_chkconfig_present USB_PRINTER; then
-					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-					ewarn "support in your kernel."
-					ewarn "Please enable it:"
-					ewarn "    CONFIG_USB_PRINTER=y"
-					ewarn "in /usr/src/linux/.config or"
-					ewarn "    Device Drivers --->"
-					ewarn "        USB support  --->"
-					ewarn "            [*] USB Printer support"
-					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove ".SILENT" rule for verbose output (bug 524338).
-	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
-	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	einfo LINGUAS=\"${LINGUAS}\"
-
-	local myeconfargs=()
-
-	# explicitly specify compiler wrt bug 524340
-	#
-	# need to override KRB5CONFIG for proper flags
-	# https://github.com/apple/cups/issues/4423
-	myeconfargs+=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--localstatedir="${EPREFIX}"/var
-		--with-exe-file-perm=755
-		--with-rundir="${EPREFIX}"/run/cups
-		--with-cups-user=lp
-		--with-cups-group=lp
-		--with-docdir="${EPREFIX}"/usr/share/cups/html
-		--with-languages="${LINGUAS}"
-		--with-system-groups=lpadmin
-		--with-xinetd="${EPREFIX}"/etc/xinetd.d
-		$(multilib_native_use_enable acl)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable debug debug-guards)
-		$(use_enable debug debug-printfs)
-		$(multilib_native_use_with java)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable pam)
-		$(multilib_native_use_with python python "${PYTHON}")
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd)
-		$(multilib_native_use_enable usb libusb)
-		$(use_enable zeroconf avahi)
-		--disable-dnssd
-		--without-perl
-		--without-php
-		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
-	)
-
-	if tc-is-static-only; then
-		myeconfargs+=(
-			--disable-shared
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
-	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
-	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-
-	# additional path corrections needed for prefix, see bug 597728
-	sed -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die
-	sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die
-	sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die
-	sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" Makedefs || die
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libs
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake BUILDROOT="${D}" install
-	else
-		emake BUILDROOT="${D}" install-libs install-headers
-		dobin cups-config
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.md
-
-	# move the default config file to docs
-	dodoc "${ED}"/etc/cups/cupsd.conf.default
-	rm -f "${ED}"/etc/cups/cupsd.conf.default
-
-	# clean out cups init scripts
-	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use zeroconf && neededservices+=" avahi-daemon"
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/$neededservices/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		# always configure with --with-xinetd= and clean up later,
-		# bug #525604
-		rm -rf "${ED}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/log/cups /var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	use X || rm -r "${ED}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
-	# the following file is now provided by cups-filters:
-	rm -r "${ED}"/usr/share/cups/banners || die
-
-	# the following are created by the init script
-	rm -r "${ED}"/var/cache/cups || die
-	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -fv "${ED}"/usr/bin/{lp*,cancel}
-		rm -fv "${ED}"/usr/sbin/lp*
-		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
-		rm -fv "${ED}"/usr/share/man/man8/lp*
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	local v
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.2.2-r2 ${v}; then
-			echo
-			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
-			ewarn "cupsd will fail the next time. To fix this, please run once as root"
-			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
-			echo
-			break
-		fi
-	done
-
-	for v in ${REPLACING_VERSIONS}; do
-		echo
-		elog "For information about installing a printer and general cups setup"
-		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
-		echo
-		break
-	done
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-print/cups/cups-2.2.8.ebuild b/net-print/cups/cups-2.2.8.ebuild
new file mode 100644
index 000000000000..55a2084618d0
--- /dev/null
+++ b/net-print/cups/cups-2.2.8.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam python-single-r1 user java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P="${P/_rc/rc}"
+MY_P="${MY_P/_beta/b}"
+MY_PV="${PV/_rc/rc}"
+MY_PV="${MY_PV/_beta/b}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+CDEPEND="
+	app-text/libpaper
+	sys-libs/zlib
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6:* )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_pkg_setup
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					elog "Your USB printers will be managed via libusb. In case you run into problems, "
+					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+					elog "usblp kernel module."
+					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove ".SILENT" rule for verbose output (bug 524338).
+	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		--with-languages="${LINGUAS}"
+		--with-system-groups=lpadmin
+		--with-xinetd="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(multilib_native_use_with java)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(multilib_native_use_with python python "${PYTHON}")
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_enable zeroconf avahi)
+		--disable-dnssd
+		--without-perl
+		--without-php
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+	# additional path corrections needed for prefix, see bug 597728
+	sed \
+		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+		-i Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,CREDITS,README}.md
+
+	# move the default config file to docs
+	dodoc "${ED%/}"/etc/cups/cupsd.conf.default
+	rm -f "${ED%/}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED%/}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/${neededservices}/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED%/}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED%/}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED%/}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED%/}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	if ! use X ; then
+		rm -r "${ED%/}"/usr/share/applications || die
+	fi
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED%/}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED%/}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED%/}"/var/cache/cups || die
+	rm -r "${ED%/}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED%/}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED%/}"/usr/sbin/lp*
+		rm -fv "${ED%/}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED%/}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
+			echo
+			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+			ewarn "cupsd will fail the next time. To fix this, please run once as root"
+			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+			echo
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-print/cups/cups-2.3_beta4.ebuild b/net-print/cups/cups-2.3_beta4.ebuild
deleted file mode 100644
index 5a4700f50873..000000000000
--- a/net-print/cups/cups-2.3_beta4.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
-	multilib multilib-minimal pam python-single-r1 user versionator \
-	systemd toolchain-funcs
-
-MY_PV="${PV/_rc/rc}"
-MY_PV="${MY_PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/apple/cups.git"
-	if [[ ${PV} != 9999 ]]; then
-		EGIT_BRANCH=branch-${PV/.9999}
-	fi
-else
-	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-	fi
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-CDEPEND="
-	app-text/libpaper
-	sys-libs/zlib
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		>=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}]
-	)
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${CDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
-	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
-	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cups-config
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	use python && python-single-r1_pkg_setup
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might have some incompatible options enabled."
-		else
-			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
-			if use usb; then
-				if linux_chkconfig_present USB_PRINTER; then
-					elog "Your USB printers will be managed via libusb. In case you run into problems, "
-					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
-					elog "usblp kernel module."
-					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				fi
-			else
-				#here we should warn user that he should enable it so he can print
-				if ! linux_chkconfig_present USB_PRINTER; then
-					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-					ewarn "support in your kernel."
-					ewarn "Please enable it:"
-					ewarn "    CONFIG_USB_PRINTER=y"
-					ewarn "in /usr/src/linux/.config or"
-					ewarn "    Device Drivers --->"
-					ewarn "        USB support  --->"
-					ewarn "            [*] USB Printer support"
-					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove ".SILENT" rule for verbose output (bug 524338).
-	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
-	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	einfo LINGUAS=\"${LINGUAS}\"
-
-	# explicitly specify compiler wrt bug 524340
-	#
-	# need to override KRB5CONFIG for proper flags
-	# https://github.com/apple/cups/issues/4423
-	local myeconfargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--localstatedir="${EPREFIX}"/var
-		--with-exe-file-perm=755
-		--with-rundir="${EPREFIX}"/run/cups
-		--with-cups-user=lp
-		--with-cups-group=lp
-		--with-docdir="${EPREFIX}"/usr/share/cups/html
-		--with-languages="${LINGUAS}"
-		--with-system-groups=lpadmin
-		--with-xinetd="${EPREFIX}"/etc/xinetd.d
-		$(multilib_native_use_enable acl)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable debug debug-guards)
-		$(use_enable debug debug-printfs)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable pam)
-		$(multilib_native_use_with python python "${PYTHON}")
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd)
-		$(multilib_native_use_enable usb libusb)
-		$(use_enable zeroconf avahi)
-		--disable-dnssd
-		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
-	)
-
-	if tc-is-static-only; then
-		myeconfargs+=(
-			--disable-shared
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
-	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
-	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-
-	# additional path corrections needed for prefix, see bug 597728
-	sed \
-		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
-		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
-		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
-		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
-		-i Makedefs || die
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libs
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake BUILDROOT="${D}" install
-	else
-		emake BUILDROOT="${D}" install-libs install-headers
-		dobin cups-config
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.md
-
-	# move the default config file to docs
-	dodoc "${ED%/}"/etc/cups/cupsd.conf.default
-	rm -f "${ED%/}"/etc/cups/cupsd.conf.default
-
-	# clean out cups init scripts
-	rm -rf "${ED%/}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use zeroconf && neededservices+=" avahi-daemon"
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/${neededservices}/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${ED%/}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED%/}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED%/}"/etc/xinetd.d/cups-lpd || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		# always configure with --with-xinetd= and clean up later,
-		# bug #525604
-		rm -rf "${ED%/}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/log/cups /var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	if ! use X ; then
-		rm -r "${ED%/}"/usr/share/applications || die
-	fi
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED%/}"/etc/cups/client.conf
-
-	# the following file is now provided by cups-filters:
-	rm -r "${ED%/}"/usr/share/cups/banners || die
-
-	# the following are created by the init script
-	rm -r "${ED%/}"/var/cache/cups || die
-	rm -r "${ED%/}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -fv "${ED%/}"/usr/bin/{lp*,cancel}
-		rm -fv "${ED%/}"/usr/sbin/lp*
-		rm -fv "${ED%/}"/usr/share/man/man1/{lp*,cancel*}
-		rm -fv "${ED%/}"/usr/share/man/man8/lp*
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	local v
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.2.2-r2 ${v}; then
-			echo
-			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
-			ewarn "cupsd will fail the next time. To fix this, please run once as root"
-			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
-			echo
-			break
-		fi
-	done
-
-	for v in ${REPLACING_VERSIONS}; do
-		echo
-		elog "For information about installing a printer and general cups setup"
-		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
-		echo
-		break
-	done
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-print/cups/cups-2.3_beta5.ebuild b/net-print/cups/cups-2.3_beta5.ebuild
new file mode 100644
index 000000000000..608055933fa8
--- /dev/null
+++ b/net-print/cups/cups-2.3_beta5.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam user systemd toolchain-funcs
+
+MY_PV="${PV/_rc/rc}"
+MY_PV="${MY_PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	fi
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+CDEPEND="
+	app-text/libpaper
+	sys-libs/zlib
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					elog "Your USB printers will be managed via libusb. In case you run into problems, "
+					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+					elog "usblp kernel module."
+					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove ".SILENT" rule for verbose output (bug 524338).
+	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		--with-languages="${LINGUAS}"
+		--with-system-groups=lpadmin
+		--with-xinetd="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_enable zeroconf avahi)
+		--disable-dnssd
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+	# additional path corrections needed for prefix, see bug 597728
+	sed \
+		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+		-i Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,CREDITS,README}.md
+
+	# move the default config file to docs
+	dodoc "${ED%/}"/etc/cups/cupsd.conf.default
+	rm -f "${ED%/}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED%/}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/${neededservices}/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED%/}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED%/}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED%/}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED%/}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	if ! use X ; then
+		rm -r "${ED%/}"/usr/share/applications || die
+	fi
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED%/}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED%/}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED%/}"/var/cache/cups || die
+	rm -r "${ED%/}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED%/}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED%/}"/usr/sbin/lp*
+		rm -fv "${ED%/}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED%/}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
+			echo
+			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+			ewarn "cupsd will fail the next time. To fix this, please run once as root"
+			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+			echo
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 5a4700f50873..608055933fa8 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -5,9 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
-	multilib multilib-minimal pam python-single-r1 user versionator \
-	systemd toolchain-funcs
+inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam user systemd toolchain-funcs
 
 MY_PV="${PV/_rc/rc}"
 MY_PV="${MY_PV/_beta/b}"
@@ -32,7 +30,7 @@ HOMEPAGE="https://www.cups.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
 CDEPEND="
 	app-text/libpaper
@@ -47,10 +45,7 @@ CDEPEND="
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		>=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}]
-	)
+	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
@@ -69,7 +64,6 @@ RDEPEND="${CDEPEND}
 PDEPEND=">=net-print/cups-filters-1.0.43"
 
 REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
 	usb? ( threads )
 "
 
@@ -96,8 +90,6 @@ pkg_setup() {
 	enewuser lp -1 -1 -1 lp
 	enewgroup lpadmin 106
 
-	use python && python-single-r1_pkg_setup
-
 	if use kernel_linux; then
 		linux-info_pkg_setup
 		if  ! linux_config_exists; then
@@ -176,7 +168,6 @@ multilib_src_configure() {
 		$(use_enable debug debug-printfs)
 		$(use_enable kerberos gssapi)
 		$(multilib_native_use_enable pam)
-		$(multilib_native_use_with python python "${PYTHON}")
 		$(use_enable static-libs static)
 		$(use_enable threads)
 		$(use_enable ssl gnutls)
@@ -314,7 +305,7 @@ pkg_postinst() {
 	local v
 
 	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.2.2-r2 ${v}; then
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
 			echo
 			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
 			ewarn "cupsd will fail the next time. To fix this, please run once as root"
diff --git a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
deleted file mode 100644
index a388b4d5e021..000000000000
--- a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/config-scripts/cups-manpages.m4
-+++ b/config-scripts/cups-manpages.m4
-@@ -69,10 +69,10 @@
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and OS X
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
deleted file mode 100644
index e71934b7d49f..000000000000
--- a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makedefs.in
-+++ b/Makedefs.in
-@@ -40,14 +40,14 @@
- # Installation programs...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA	=	$(INSTALL) -c -m 444
-+INSTALL_DATA	=	$(INSTALL) -c -m 644
- INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_MAN	=	$(INSTALL) -c -m 644
-+INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
- 
- #
- # Default user, group, and system groups for the scheduler...
diff --git a/net-print/cups/files/cups-2.0.3-cross-compile.patch b/net-print/cups/files/cups-2.0.3-cross-compile.patch
deleted file mode 100644
index d0893c31fa7b..000000000000
--- a/net-print/cups/files/cups-2.0.3-cross-compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-we don't actually install the generated html output, so no point in building
-them.  this also helps cross-compiling because the tool to create the html
-uses $CC and has no logic for $BUILD_CC.  simpler to disable than fix.
-
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -73,7 +73,7 @@ MAN8	=	cupsaccept.$(MAN8EXT) \
- # Make everything...
- #
- 
--all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) html
-+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
- 
- 
- #
-
-similarly, the genstrings tool is used to gather all the translatable strings
-in the code base for passing to gettext.  in our builds, those strings already
-exist, so no point in running this tool.
-
---- a/ppdc/Makefile
-+++ b/ppdc/Makefile
-@@ -70,7 +70,6 @@ EXECTARGETS =	\
- TARGETS	=	\
- 		$(LIBTARGETS) \
- 		$(EXECTARGETS) \
--		genstrings
- 
- 
- #
diff --git a/net-print/cups/files/cups-2.1.2-systemd-socket.patch b/net-print/cups/files/cups-2.1.2-systemd-socket.patch
deleted file mode 100644
index 2f88924ee2d5..000000000000
--- a/net-print/cups/files/cups-2.1.2-systemd-socket.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/scheduler/main.c b/scheduler/main.c
-index b1aa503..2f0f5fe 100644
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -656,8 +656,15 @@ main(int  argc,				/* I - Number of command-line args */
- 
- #if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
-   if (OnDemand)
-+  {
-     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
--  else
-+# ifdef HAVE_SYSTEMD
-+    sd_notifyf(0, "READY=1\n"
-+               "STATUS=Scheduler is running...\n"
-+               "MAINPID=%lu",
-+               (unsigned long) getpid());
-+# endif /* HAVE_SYSTEMD */
-+  } else
- #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
-   if (fg)
-     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
-index 1bccc6f..4564164 100644
---- a/scheduler/org.cups.cupsd.path.in
-+++ b/scheduler/org.cups.cupsd.path.in
-@@ -2,7 +2,7 @@
- Description=CUPS Scheduler
- 
- [Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-+PathExistsGlob=@CUPS_REQUESTS@/d*
- 
- [Install]
- WantedBy=multi-user.target
-diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
-index 0a27c76..0a841a2 100644
---- a/scheduler/org.cups.cupsd.service.in
-+++ b/scheduler/org.cups.cupsd.service.in
-@@ -1,10 +1,11 @@
- [Unit]
- Description=CUPS Scheduler
- Documentation=man:cupsd(8)
-+After=network.target
- 
- [Service]
- ExecStart=@sbindir@/cupsd -l
--Type=simple
-+Type=notify
- 
- [Install]
- Also=org.cups.cupsd.socket org.cups.cupsd.path
diff --git a/net-print/cups/files/cupsd.init.d-r2 b/net-print/cups/files/cupsd.init.d-r2
deleted file mode 100644
index f89263077593..000000000000
--- a/net-print/cups/files/cupsd.init.d-r2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-
-description="The Common Unix Printing System daemon"
-command="/usr/sbin/cupsd"
-
-depend() {
-	use net
-	@neededservices@
-	before nfs
-	after logger
-}
-
-start_pre() {
-	checkpath -q -d -m 0775 -o root:lp /var/cache/cups
-	checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss
-	checkpath -q -d -m 0755 -o root:lp /run/cups
-	checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs
-}
diff --git a/net-print/gtklp/Manifest b/net-print/gtklp/Manifest
index 014b2e7e560a..4912c764e3c6 100644
--- a/net-print/gtklp/Manifest
+++ b/net-print/gtklp/Manifest
@@ -1,5 +1,5 @@
 AUX gtklp-1.3.1-formatsec.patch 2063 BLAKE2B 1c8d8c6843741a788a750f998b8c84a8e234fef9a0e95d5616391b318f53ab36496ae4d3069bf14d8438066d201ad9234924adb87f1a1ba9e2f9480d317be92f SHA512 31a1bb8f81748a23d614adfb05e97816285707b92ca6077e588ba91687aca4785b74f765ae63ee13c7aec779c8011a78df69fc894f3a4a951b9cae98c43defc0
 DIST gtklp-1.3.1.src.tar.gz 641805 BLAKE2B fe5406dc9e95d6faa1335ce44c5e2cf9c0cf2db711c68962f64d88a403e18ac4da2c640467c62f6af256ca73370a3ef6db305ce75a4b7fcc9918d2c8825ffaaf SHA512 22d8e519d5d767add9d786bb9d4e288fffad929e8cac5b0125f654f520e1a466cf0d32bb2f6fbc0804085748403436adc5850b805531dbc971b91eb05627ae70
 DIST gtklp-logo.xpm.gz 2254 BLAKE2B 6ba85919472c0018cb77c89b6d5058e68845d94c2baa941d43d55a9a58b33f9347cdd8e3449afc3f692ae0b4d1bcb73fb0159b372b641537420e7131fcd9d703 SHA512 24fd320bb1fd533d5f539ad5aa22661a2c923c4d6012b7d908a7a8311dcd179f2c7f02a88d52289d659ad89ce63ab40956725051b7dbe14ed23eb3a62e6c9240
-EBUILD gtklp-1.3.1.ebuild 1202 BLAKE2B 9c3ad4bbf32c76e223fa3c3d285b51bdb522e966f829eaf396c6b15649c5ea843b5cdc130b7bcf089a972ca7995e97068c303552ed4ac0dbd22d8df3dd025f24 SHA512 ff4e4e21f3da28f3a2fcd55e0573707e23ef681e435b5ab93841fa1ced742705d070d8b281af4f89de4084175c35599a0f31c4e95a9a5ba2cb12f455e011ed38
+EBUILD gtklp-1.3.1.ebuild 1203 BLAKE2B eb0700ea04729f995c5bbcb7b530667505184852303e7bc2b8ce5e02e63d3c4d8d79e4fcbae425fb6e9edc0e60f819142da112fc83013578159535d0f4b435ee SHA512 3a1e0445f70ecf46bddb984f189c14f5c5c0227446c12780fb9d77f5a0d4268fc416f0f14732b3aafcf9810e4332aa5d3836aa4d5d361672518d7ed6c74f1877
 MISC metadata.xml 627 BLAKE2B 2c68ba73c29ce2f62328ae42342e3303c163c84f0a5b35e9c848e59ab525d6a5058af69c4c1e8f1c6c3f8e22e7737da3e77238de3ad68409cadc7a6f00cdf3d9 SHA512 e0167dc4f64a5dbbd305bff9e40aa7deff39495215fdc1b590f32ad28af2d64eacbbc6929d4803b91ebf1acec94b7cfb2b4d139114d6779714a6ab7931204319
diff --git a/net-print/gtklp/gtklp-1.3.1.ebuild b/net-print/gtklp/gtklp-1.3.1.ebuild
index f497e6e58bc7..4243a9bc3430 100644
--- a/net-print/gtklp/gtklp-1.3.1.ebuild
+++ b/net-print/gtklp/gtklp-1.3.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils
 
 DESCRIPTION="A GUI for cupsd"
-HOMEPAGE="http://gtklp.sirtobi.com/"
+HOMEPAGE="https://gtklp.sirtobi.com/"
 SRC_URI="mirror://sourceforge/gtklp/${P}.src.tar.gz
 	mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz"
 
diff --git a/net-proxy/3proxy/3proxy-0.5.3k.ebuild b/net-proxy/3proxy/3proxy-0.5.3k.ebuild
deleted file mode 100644
index 4556a25a3474..000000000000
--- a/net-proxy/3proxy/3proxy-0.5.3k.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="really tiny cross-platform proxy servers set"
-HOMEPAGE="http://www.security.nnov.ru/soft/3proxy/"
-SRC_URI="http://www.security.nnov.ru/soft/3proxy/${PV}/${P}.tgz"
-
-LICENSE="3proxy"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LN="$(tc-getCC)" \
-		-f Makefile.unix \
-		|| die "emake failed"
-}
-
-src_install() {
-	local x
-
-	pushd src
-	dobin 3proxy || die "dobin 3proxy failed"
-	for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts ; do
-		newbin ${x} ${PN}-${x} || die "newbin ${x} failed"
-		[[ -f ${S}/man/${x}.8 ]] \
-			&& newman "${S}"/man/${x}.8 ${PN}-${x}.8
-	done
-	popd
-
-	doman "${S}"/man/3proxy*.[38]
-
-	cd "${S}"
-	dodoc Changelog Readme Release.notes
-	dohtml -r doc/html/*
-	docinto cfg
-	dodoc cfg/*.{txt,sample}
-	docinto cfg/sql
-	dodoc cfg/sql/*.{cfg,sql}
-}
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index e839430dc31d..25f5225a532b 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,7 +1,5 @@
 AUX 3proxy-0.5.3k-gentoo.patch 956 BLAKE2B 3df8e8bde875df4f892a1a6ef7baef63ad61f1d249bc7bb1e596ccacf46614d4d4a288ffd6538a1df8040fa30f46d492e3e78ad764a70b60e48361d0e66c0b73 SHA512 857d72ad85d5dc5158eda402f0ad81ccd9410e1849c5c1f1a2fd86946ae65073ce5ac09f19e0d9cae940d285d161252045cb0d2b936dcb6121fae161a77df113
 AUX 3proxy-0.8.8-gentoo.patch 1471 BLAKE2B daccc5f278ba4ac59aad24b463557a49e177f0dea679deea0b1282ba31eac21d76ee4587c3a6523da29ea8130ac24c75ee8b0ceecceb1ec57a53cc6028c9bb51 SHA512 9c41df962691f8b2b832495a5e644fcbe58805839b2b40dd65564dc3eb9897de1a744677e2c4a032e39d64b34c4190893049f2ed86be8908f739f720633b2f3a
-DIST 3proxy-0.5.3k.tgz 190797 BLAKE2B c8c043166a927e24880735b7d5f17645ac5b93804649bc5009d3fc027cfcc01f5a28f468da0dfc3e367f42874b777806a082cc37e8f95942801378ef66d64e34 SHA512 d709d57fc7c1a31ab190dd4692a93d9a4866a0cfea4cb6d2ff8dc8f8a3ec2ff674496a4c63854580a933948a6f899db2cc21e5b82a6f854bc236e5779014ae00
 DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815
-EBUILD 3proxy-0.5.3k.ebuild 1085 BLAKE2B bc9d5b084e22f05af5685ec190c73998e30a2198b5f9805b8d9f99f397b97105f7e219b5efcd37dc085092cb64a67d5883ca7f18c8e535581528df3fc1ea6c36 SHA512 2ed4000f10fc0f234fe35bcab0a704eba2eba6654e6e8e193292c8802a460b02fbc1f4d827edff3df961191582efa3142d2e0c9ffffc4342cc37288110be1347
 EBUILD 3proxy-0.8.9.ebuild 837 BLAKE2B 7f5666c6d09b04d57be1147421436435f0ce8487ae5957a474cee81064642bde3b4b80b52d9a14c6a9e0c16e61518cf6b1a412dddf354edc2cbec821e2351207 SHA512 ef8abe07dff61866d3b2a887511aaaba995fbdf3173213790f71a42f64d61b2fa224f41cb1f11d9d42ffbca04c579a013f2adc8ce19c06f03b9b5491552009c4
 MISC metadata.xml 1102 BLAKE2B 1c5bfc3ff94b076a5bc8f7c87091b08e9f2fe69a49776687379d1149cfc3cc3f04fff7278858a548746110533b528fa0d83e7af9c384143ddcf6a9d3e796502b SHA512 f9c7b4b3b9f045b76049a75f2e65f70a316a3ad08f44a39d1c7ea23e5b23bc92232eae7487b4bf7534bb2fbd2655a9debf35ac3ba8ee4de6583d49f61bfc6076
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 16a49258082c..e56c438c2132 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 99f6059facc6..9a6b778e2670 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -7,12 +7,16 @@ DIST haproxy-1.5.19.tar.gz 1362834 BLAKE2B 72543acf3e78b804e778746ae0dbd1a386e31
 DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81e41a7b01ba44937c6ff2e14c1f1a4f1472dde229ecef1ed3170f4e89d356324cb2ce1e7d7064837f37fbd4c3b46 SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434
 DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c28010ed391b20faae7cd1fd84cdb181e560353337eb9230e38ac2570673725884c131501820c3ef4559ef12f95f2 SHA512 389be3935d901af1fb3a748b5bf73a454578a3ca3e4cc0b881980c2f1e875c47feb2681b42f8d9244d70777261a965c8e47cf5175b7790ff995bff8333902a11
 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
+DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
 DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
+DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
 EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
 EBUILD haproxy-1.5.19-r2.ebuild 3283 BLAKE2B 698bb63a7c0b97aa62e1c3b12de9689ababa6407dc98870bd73fed0d7aad4f2e08f13faf466aa40d8c420618dcd82e2292a54b4a779772a8e106e7f88194c7b0 SHA512 f8056a851fb9800bcced3827d1294b8b81115c5da3ae603067bb4d10e276c9e053823ba72ebabf21955a7fe241911256e87d4f086eb029a5c1e3d144c15ebfc3
 EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
 EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
+EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
 EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
+EBUILD haproxy-1.8.9.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/haproxy/haproxy-1.7.11.ebuild b/net-proxy/haproxy/haproxy-1.7.11.ebuild
new file mode 100644
index 000000000000..38e5fbe73044
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.7.11.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym /usr/sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	dosbin haproxy-systemd-wrapper
+	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.8.9.ebuild b/net-proxy/haproxy/haproxy-1.8.9.ebuild
new file mode 100644
index 000000000000..44131da836d2
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.9.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 570a6007a8e0..cf1546893e3a 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index ffb316aa54d0..6e51f9d4e674 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -10,6 +10,6 @@ DIST openvpn-2.4.5.tar.gz 1430930 BLAKE2B 3ff1324b18fdc24109085a4958401e6d5636b5
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
 EBUILD openvpn-2.4.4.ebuild 4671 BLAKE2B 40962a19add6aca1a388cd121852d79496e8b1a496f78e0a86fe1b7498b445bb3a367f89e35d56d061dcd29d086ffd5f9e26eb92f05a66f4cac588a53609f951 SHA512 a02edb8f48fbe348d58cfbe35dfc07c7886844a64c6955f2ad0c317b92a6e86ec19cd44e140e4d1ca7bb326fd888ac1610c4533478cacf2fcf495286b031753f
 EBUILD openvpn-2.4.5.ebuild 4724 BLAKE2B a9d07e27b4c23da4d00831a0986389ce0c308bdee95680b6a6c5244e87f95d8742b7ed99ab02af086582ec78a837b3199ef00b3c0c1262117af596c151537883 SHA512 d06e458407309246c87a93a1beb29431dd7621560a3704ab04a27f22303e880e6a9da165f7e9293f1aa443e60752e939b0d4f15803f509b3e78a830f05b653f1
-EBUILD openvpn-2.4.6.ebuild 4731 BLAKE2B c1ba02f4fb33f4f91e620b2e40c8b1775b337e4b74b00850c4ee0fdbcdbec0318fcedf2978e32baf79bdb3e4fe9fc82fb5dcb29b30be78c0502b70be588c66f9 SHA512 8cec9657b2f2753a1f25544e326006b91c21386557d479f6e0708bdc5f9e59e86b7e912f5990e76c30a31897d34b8c0ea2f22b6792238132456066eea772984f
+EBUILD openvpn-2.4.6.ebuild 4728 BLAKE2B f2e20428fc10ef77c4abdee4dea1945e682a1ea2ea3c21ada4fb015c8e835fbd3fbfeefd58ca5c46917b46696793a835c9b96bb7ca516de56f26e2caf7232148 SHA512 c1ef3ff65a11cf46e744c05a320546fe1ecd19fa9b834a96d01e4b62670546fab1dad8ae6add83f453e6e98773cf52247619d2e75ae448d79bead089f1250259
 EBUILD openvpn-9999.ebuild 4474 BLAKE2B 2f86c306a76bb95d5c9dd0815c4cfb3148d39e8c4364b727d6c6115c5942d87eed921ef7cdf98b82ee2244d1e18444ef2c3a09295dee07548ae5bcb6713d43bb SHA512 7aa03b7ff2999dcaad84837c554618c5eccc4e5ed6e0ea93705410148526143a27b4245968c9b7c5d531a95bdd74fa7d81de0ae312f3b6b54bf46dc7a7ab45ef
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 36c8bc9602d9..390731822f62 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 113e2aafd994..c3e4abcb891f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 6b87fa372fd9..035ea44efeb0 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -10,7 +10,9 @@ AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e59907
 AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd00a43d5ee7aca045fb566ab39638664bc37ec54c516aa327c6ba54b046ed18696cabf3228ad0e28588 SHA512 bcbb6a78c4c25ad797dc1d45180382909a052e9be32439eec85772082a01799f45181e8a90be89b952a68b7276f6ac1cef98fc3f4d0a5e5c8075089a29f3ddd1
 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
+DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
 EBUILD bluez-5.49-r1.ebuild 8104 BLAKE2B 614bf0fab42321ed4b96f92d5309895ff816805ed9405e758981bb0ebc48196a6c14b43349c62b531f19144971b2dab92a6bb1c12894bb8f041580aeb16a04e9 SHA512 cd3308db12790dc05180f0501319d22786150936ce574ec685000aab65fd3bc2c26291cea538afd1ee74c7825fc84618117264d6662376f56f8bda2acca6fda3
 EBUILD bluez-5.49.ebuild 7932 BLAKE2B f9c6a66914d52f6e08d4d40ac27cf8b88c554865e10ade87cf66342489c18a514394eba0b0bca71e4fd37a8a90316a9a3296630b5c45da713c10241b5564e55d SHA512 c7bfd84e13fb86070dd5cdb9ccb1fdec8692973d9775c3b82d4ede76316fc98aaf7bf659acfc9027b049097ff9dc155640d3c1b336adedbe322061ba34a85f9e
-MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93
+EBUILD bluez-5.50.ebuild 8023 BLAKE2B 8a4de0906a26274dda252538c2515e17531b70750ac70db439347fec2b44f19a11caba5de9be4f6f1e69e57ca3d309cf6ecc57a392db8be9cddfb9e56668cc36 SHA512 48348e8bb6e68935985cbdacb0854ed03b6adc48606303fa6be9fd91e7770557b0cd58e4059d9ad1ebb2ba65c966ec541e422d70c81e4d989f7cc292ef6d03fb
+MISC metadata.xml 1173 BLAKE2B 1c9c14538f8686c8b6f99aced931cac0235f0bb86d2e8962ace5174c486b5e7436afc1db3bb493778e70be5b5b389964f0aa8e8925093e08490f98cf6aa6b79f SHA512 151424ecb4edbcb1c632453b42e22114cb9a4ac07a41211735ec28b18072a69a1286b4b9724701016a748df3a519daeb5ef5a3611def327fc2bd461547891de4
diff --git a/net-wireless/bluez/bluez-5.50.ebuild b/net-wireless/bluez/bluez-5.50.ebuild
new file mode 100644
index 000000000000..e6b7d9974ddf
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.50.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~hppa ~mips ~x86"
+IUSE="alsa +btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+	user-session? ( systemd )
+"
+
+CDEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.6:=[user-session=]
+	>=sys-apps/hwids-20121202.2
+	alsa? ( media-libs/alsa-lib )
+	btpclient? ( >=dev-libs/ell-0.3 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.3
+		dev-libs/json-c:=
+		sys-libs/readline:0= )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-172 )
+"
+TEST_DEPS="${PYTHON_DEPS}
+	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? (	${TEST_DEPS} )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+DOC_CONTENTS="
+	If you want to control your bluetooth devices as a non-root user,
+	please remember to add you to plugdev group.
+"
+
+PATCHES=(
+	# Use static group "plugdev" to not force people to become root for
+	# controlling the devices.
+	"${FILESDIR}"/${PN}-plugdev.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	"${FILESDIR}"/${PN}-udevadm-path.patch
+
+	# build: Quote systemd variable names, bug #527432
+	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
+	"${FILESDIR}"/${PN}-5.39-systemd-quote.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# ???
+	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+)
+
+pkg_setup() {
+	enewgroup plugdev
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	# btpclient disabled because we don't have ell library in the tree
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--disable-btpclient \
+		--enable-datafiles \
+		--enable-experimental \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable alsa midi) \
+		$(multilib_native_use_enable btpclient) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also that tools can break"
+			ewarn "without previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			# gatttool is only built with readline, bug #530776
+			dobin attrib/gatttool
+			dobin tools/btmgmt
+		fi
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# example-gatt-client is the only one needing
+			# python3, the others are python2 only. Remove
+			# until we see how to pull in python2 and python3
+			# for runtime
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	! use systemd && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	! use systemd && readme.gentoo_print_elog
+
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+}
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index 45d6538bf366..3f1b1fdf5cd3 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -6,6 +6,7 @@
     <name>Pacho Ramos</name>
   </maintainer>
 <use>
+  <flag name="btpclient">Enable BTP client</flag>
   <flag name="deprecated">Build deprecated plugins</flag>
   <flag name="experimental">Build experimental plugins</flag>
   <flag name="extra-tools">Install tools that upstream doesn't install on
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 412b295f270f..a769c16b90ac 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -2,9 +2,9 @@ AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
-EBUILD gnuradio-3.6.5.1-r2.ebuild 5338 BLAKE2B 6bb26c728d0e3b5f4b2e4e99eb23511047319c5fe2168803388da77d78327ff58ace4985b38cc76954a6042c312cb9d4243355c7910540e7ddc20862c0240b2b SHA512 93a9be9c3b8abc3b9c6b33de2b1fad9b0f4d87461de2497ca4dbd17cb14ef8c3a552ea861e27750e0fed6cb1a4d48afa727c84415f2231bd3e9845be24b540ce
-EBUILD gnuradio-3.7.11-r3.ebuild 7032 BLAKE2B 2ada9c5dddc983c01179d0522026fa4b1576808aabd911de6fa822169bcd7ed1622a03ac38a01c1974007a7b724d9dedace797933006ce6b89b74b8d6c7f27ea SHA512 8728f26aa4f6e5fa7aa1e1b430c26dd53993c58974b6b841966c2afe581382dbe0c02b9b590d2ed6283e9c2422fc2bfefc416c9da774c902c50fdfdf28bded24
-EBUILD gnuradio-3.7.9999.ebuild 7109 BLAKE2B b7cc3f3db94948ae94a64b1e6491bbd54896f9f6ec6d9dd1e4be2d66ed40d77710795198c77cf9acc5d0784d8680e0a10eaeab95d72567e15a92eb5993ed85b3 SHA512 7c3d4128deed42a28478bbef779e29426e18f4b966bb31cc5084d12cb64e6049375d620594287e5c1f889f352ea699a34ce9e7c76c1fa486307cfa253b0bb935
-EBUILD gnuradio-3.8.9999.ebuild 6658 BLAKE2B a0aba22afedcb57ad905602f7dabdb61042b3ae51a0a41ed14ef46e23eafe35add7e335630ad0e284e47b46fda457f5618859bcaa954f68b4d20332d60fba542 SHA512 3b8d514421d415b8a326962839d31a38f519845097ef396a244dd827d5b9bae039ffcea25b995a2a6df9ff28564824118827977b339951e7d7a1fddaf420bb4b
-EBUILD gnuradio-9999.ebuild 7109 BLAKE2B b7cc3f3db94948ae94a64b1e6491bbd54896f9f6ec6d9dd1e4be2d66ed40d77710795198c77cf9acc5d0784d8680e0a10eaeab95d72567e15a92eb5993ed85b3 SHA512 7c3d4128deed42a28478bbef779e29426e18f4b966bb31cc5084d12cb64e6049375d620594287e5c1f889f352ea699a34ce9e7c76c1fa486307cfa253b0bb935
+EBUILD gnuradio-3.6.5.1-r2.ebuild 5334 BLAKE2B c1832d28df13b422a2c2c246d87ad2b73389c7293d99fd20cc13e9d43737d1393de8596140ca981b6dd5d39871fefcb12cc19925941db45f01200969ae5d887e SHA512 9a2975c4be004a7654ac466c15c04381e8f187a2584a0377d866b91f464c0870f8bcc96db8cc968c6b08986810ac1d17374c0e97455aefaf449f77b8650fa786
+EBUILD gnuradio-3.7.11-r3.ebuild 7024 BLAKE2B c29549a5022c6557c3466d6e9a5bb4d3cc2428a4a95a4e7cfb7ee20b639ddd49a7d2b1af9080f4a3b1975d278f0e186cccedce80410bc842c11bc97bb53deb92 SHA512 b7fe2d8931ac3dc94e0aa73b8b3d508cdb96015d62c11a7332282039a98c5a603be171de1efc675c9039e63261242d9d71c2fa9f2f0ff227705d9e2edcec24f0
+EBUILD gnuradio-3.7.9999.ebuild 7100 BLAKE2B a57e16d927a61c6a0ae5aaf77b80725a8e5e7906ffee58db901d2b018f35d2fac835314ff3c4244bc5537914a5e8288d89bbc031c1425c0e8c257a583272217d SHA512 ef3488005de9e5158e68636fffd964c30ecb614d3620d2964e66fb7d13116fadd01030e03b19c7b5d91113fa01b1b5e5755a317a306753a65ec9ac13f9d17141
+EBUILD gnuradio-3.8.9999.ebuild 6649 BLAKE2B be57d7c251d0ed046042da7ad9bef94e4512a5bf3d8301a05de208c1f94a35efc927e4e70606ca6f0d68ec5da74ad59f90cd68cf68da1d9276bccaa68ada9f71 SHA512 bc15231f5329e1ec59259487f38e58ca01babaaeb84551372a6643ca817526c545f7acb54e941835fcc05a1a458dda77325b54ac18c106676b2fd233e9d442ac
+EBUILD gnuradio-9999.ebuild 7100 BLAKE2B a57e16d927a61c6a0ae5aaf77b80725a8e5e7906ffee58db901d2b018f35d2fac835314ff3c4244bc5537914a5e8288d89bbc031c1425c0e8c257a583272217d SHA512 ef3488005de9e5158e68636fffd964c30ecb614d3620d2964e66fb7d13116fadd01030e03b19c7b5d91113fa01b1b5e5755a317a306753a65ec9ac13f9d17141
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index 2147baf1dabc..dfd9a9881248 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils fdo-mime python-single-r1
+inherit cmake-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -12,11 +12,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-2
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -158,8 +158,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -177,8 +177,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
index 4eaaf0dca196..209382cc3fe1 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -214,8 +214,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -233,8 +233,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 9c0cb3a61048..43aaf6e9d946 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -221,8 +221,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -240,8 +240,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
index 08671c06752a..ec6405c3f929 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils python-utils-r1
+inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -207,8 +207,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -226,8 +226,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 9c0cb3a61048..43aaf6e9d946 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -221,8 +221,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -240,8 +240,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gr-air-modes/Manifest b/net-wireless/gr-air-modes/Manifest
index c16f06cb139d..3ae1eec3c096 100644
--- a/net-wireless/gr-air-modes/Manifest
+++ b/net-wireless/gr-air-modes/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-air-modes-9999.ebuild 901 BLAKE2B 02b3be5a369f7357237a21171ca34e891a5525f241a545c7c90fdeaa30a20a5233e941031f92b5e713d5bcae6ca914de59b6eba17350f1a941e382c4e5d09dea SHA512 4e42d94e3fd0487367bcdc49e0bdc7c7fd6240cb447192472366181d04701e9c6e7e10aeb8318a3ca35e547588650b563af56936ba08bcceab78a5f797b510f8
+EBUILD gr-air-modes-9999.ebuild 902 BLAKE2B fa2417bfde40f6dada0c233b14aba231ffdc89b015fcc9bf3a2542feb39ace13491a5f250ccb701d68c45c51a0ece2836bc1a5fca755eed2ec254b276c0f163a SHA512 3995a239bf3020ed4038e72716482f8ae6c22f78bb08a4e711fc0019f07c3937d94510dfe3b6e566c90c86d2ecdd216f7086ae3c824a3c36fa075a2696fe186c
 MISC metadata.xml 447 BLAKE2B 3d205cace1b2c5446d3b3db17116f0e8d071cc1a1e59b17597c1a083b781e6ea1bc9e2f52de22d685ca53a96b08a13965e121f5924559040da23a827243579d3 SHA512 d05f480160792ec408d852a61ddaebe4088e38a7efbee14e8b576fb4ac2e2c98e5196b0c6fe62457e7de9ed2db80317e452061e90d5c6a760f5b5cf941027f0c
diff --git a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
index 355f3c208e6d..fe5fbccf4407 100644
--- a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
+++ b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 cmake-utils git-2
+inherit python-single-r1 cmake-utils git-r3
 
 DESCRIPTION="This module implements a complete Mode S and ADS-B receiver for Gnuradio"
 HOMEPAGE="https://www.cgran.org/wiki/gr-air-modes"
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index ec32b68c1fea..233a39edf6c3 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,6 +1,4 @@
-DIST gr-osmosdr-0.1.4_p20150730.tar.xz 1148596 BLAKE2B ff5f27dc32438c94ac920e77e7722b3a4331c350b0535a8a787b72ad8653f57dc2a434c3dec9499bbe791e12dc863323c8f9f6c750b2c154ab35ed722e8e221f SHA512 7e6847eba0d4e217ea71bb4b8105290b329bf8840a7193df013b3a0cd9c9ef57f3686252da48cb0df239288b5794c75178a8bb45ff2a2dd8b605f63fec2426d9
 DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
-EBUILD gr-osmosdr-0.1.4_p20150730.ebuild 1853 BLAKE2B f38fbb657305d45969cccc5ba1b6c87431d8b77d795ef6f37f31c0cc8bf5861172de32b41f25ebeb922ad1920c316bfb7d625df4f7105779bb10a740cdb3bc65 SHA512 5de5b03466ed8988fec9e8760d1b409cdb0f5ed5e719ea8cfebb110c8c4e031bb1999caab884a8fb93988e80520918f4d9cc5e4a2fbd31b1fef9aeb6e829ab75
-EBUILD gr-osmosdr-0.1.4_p20170612.ebuild 1946 BLAKE2B cd32fd38bf1d777bfbd27de9b49d39fd4fa4452929e426f348ae25929a32ef9e03c6dfefb0f57e9b991edcc72ddbcebadb7446604ff01b711f058bf3ecd35625 SHA512 6a0f8abe2944b5158c7e070f69040a4a2c705448db300bad86407cdb22623984e542034badf5e305908e25f2984b42dc5914e36d9c0d3c0ff4c2554b70c826b8
+EBUILD gr-osmosdr-0.1.4_p20170612.ebuild 1938 BLAKE2B 3e38f3d1095f3c5156a8c330075b76434cf7078b913cd1e69c523038470a10afa036fd0c09ff5cf3e20444ac3306646d45d7081b5fbffca544ee05eb9b11628e SHA512 f3ed65e23a8c25b4b6898e24b199659575185234eb92851483ce3d9fb213e1a868e4ba38a2dd7ebc0fec42fd1107888effa4a54886380fed9c750b356ab6e6e0
 EBUILD gr-osmosdr-9999.ebuild 1951 BLAKE2B 188473e7daca19b30ac21eb480164950833fc90c2f46464622d59041210d238b040b9d45c216d8b1107cc8c2d1c690694173c2665e14ed9509b3681d4a90914c SHA512 25c5db2b82e7072085fcc65d06a8472228a2f313c37dbadbe2a3078cd306a2cacf4333a05038e6b31171ee37e33db2c31deed6809daaa7e15aa35a60e09dd139
 MISC metadata.xml 807 BLAKE2B 1bfa0c852f52882323bd9a08d0ca16eb234e4514b7bc1d6825baf8e29e650ccbf28d1e33ff45c826563cd256e12eb32207a217dfdc70a5623baae2da39040a4d SHA512 9981bc760da9077c8ccf54a5184caa03f3e9614ff253f9163bd6be0245506e26489c97010186e7861f9a8513245d789c73d2f28ba3045878bf2a5b0b440b69f1
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
deleted file mode 100644
index ba56a992249f..000000000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	#git clone git://git.osmocom.org/gr-osmosdr.git
-	#cd gr-osmosdr
-	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-	bladerf? ( net-wireless/bladerf:= )
-	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
-	mirisdr? ( net-libs/libmirisdr:= )
-	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DENABLE_FILE=ON
-		$(cmake-utils_use_enable bladerf)
-		$(cmake-utils_use_enable fcd)
-		$(cmake-utils_use_enable hackrf)
-		$(cmake-utils_use_enable iqbalance)
-		$(cmake-utils_use_enable mirisdr MIRI)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable rtlsdr RTL)
-		$(cmake-utils_use_enable rtlsdr RTL_TCP)
-		$(cmake-utils_use_enable uhd)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		python_fix_shebang "${ED}"/usr/bin
-	fi
-}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
index 156b4781b570..579c974f8abe 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
@@ -13,14 +13,13 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
 else
 	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
 	#git clone git://git.osmocom.org/gr-osmosdr.git
 	#cd gr-osmosdr
 	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest
index 14c81c9672fb..9ca6eee3a6f6 100644
--- a/net-wireless/hackrf-tools/Manifest
+++ b/net-wireless/hackrf-tools/Manifest
@@ -1,7 +1,5 @@
-DIST hackrf-2015.07.2.tar.xz 14415212 BLAKE2B c9ef83e7a4c1c0cca9ea592c02cc1fe9fc5f42203d177f15b36893e719cf3c269cdb8c3d0e13ed5c51826b8e346b58d572b96c3d197c615e58f9d4464a306c14 SHA512 a4f7b7800ece9b260d5c8c374f5544aa55cd2e97e10c6a0b33cf476e2ad4811321ffb1308d9dfb2168b2624cd3af616d1c314ad86bcd6f4c3fd0897319fa2cbd
 DIST hackrf-2017.02.1.tar.xz 15409352 BLAKE2B 930c6d30cbcadd366f889add7cd8f9756edf7a6b82a478353ea94662e9d2e0b612ca5ec0473eb0083dcbec761f2d5385eea31608f50f81543449ffa4bc31d277 SHA512 7cd6ad9aa8fef8afed41c48a3358bff18c6b2a9a112b13daabda87726e0e3ca4cf1e0c0c6ff9689bdd49f854e2e5887a84ccd7975abef43a43b75ecf8a5236ce
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
-EBUILD hackrf-tools-2015.07.2-r1.ebuild 1683 BLAKE2B 785a87dce81761d59a79e38baa3bedc5b334fe216d149c6170bea480c3f4835e708c0ddbf1be7ce45630cc72fd8fc4fa5bba1e8889f4ac7aef5e8ee88fd48ddb SHA512 3909d29654d4e6dbd3a93f0f7dcdd0521ef640772241f99a450784a4b32915962992bb634637d95ac73b69c079ffbc2cbe314a9f176fb560e27fbaf20f8a0e7c
 EBUILD hackrf-tools-2017.02.1.ebuild 1789 BLAKE2B 20161a6b7e8671113734a07739e3b06877a0cccbedca9a7c2e5c46b565bef9895ce53892154287af729bf4ce9976dcc4bab10a9c6dfa534545d51d80adb80f3d SHA512 30db812a7478defce70a780c43bab24faeb84487b6b4a0dea633637e9c5169a98b6655a8378dee88a518bce4bcb8759eecc198095f857da18c1a40098bc13150
 EBUILD hackrf-tools-2018.01.1.ebuild 1789 BLAKE2B ceb59c1a24d3a825bed85a04d53d72b0814fe98dd2602a5a329d72c791923075bd5764747308aeebba212d42cfe1bcd2f188a85a9a4159c75e5d61d7e8896fb0 SHA512 a98f7a085966d5679f7a2eccac5689afe1d13169ccdb0e5155d7f19a901a3ee517e59036427ec65ad31bf4e79ddff53229b4574aa021d8b573f814fb0ee10270
 EBUILD hackrf-tools-9999.ebuild 1789 BLAKE2B 20161a6b7e8671113734a07739e3b06877a0cccbedca9a7c2e5c46b565bef9895ce53892154287af729bf4ce9976dcc4bab10a9c6dfa534545d51d80adb80f3d SHA512 30db812a7478defce70a780c43bab24faeb84487b6b4a0dea633637e9c5169a98b6655a8378dee88a518bce4bcb8759eecc198095f857da18c1a40098bc13150
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild
deleted file mode 100644
index fbc622bedbb4..000000000000
--- a/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="tools for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/hackrf-tools"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
-	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="=net-libs/libhackrf-${PV}:="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${PV} != "9999" ]] ; then
-		insinto /usr/share/hackrf
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb_rom_to_ram.bin" hackrf_jawbreaker_usb_rom_to_ram-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb_ram.dfu" hackrf_jawbreaker_usb_ram-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb_rom_to_ram.bin" hackrf_one_usb_rom_to_ram-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb_ram.dfu" hackrf_one_usb_ram-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf
-		ln -s hackrf_one_usb_rom_to_ram-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
-		ln -s hackrf_one_usb_ram-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
-	else
-		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
-	fi
-}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f5a1246add21..561d9e979663 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -10,8 +10,10 @@ AUX hostapd-conf.d 245 BLAKE2B 5a4315f10ab8fcfda662252bf31b53eb4d3c55fa258062f28
 AUX hostapd-init.d 739 BLAKE2B 83c48748cf20c8ee7d1124d373ee565c724d4714bffc512629a1850be0bfe5e9430a7512b296e1441dcaa4b098a665a873948162c5edec60430bf69cc90c157c SHA512 ab364383da45403d7734be20e7486937ad0a6be25a56eb1ec03d131243270a143189b699becf6e9e14d30b02bb5d93cddde55e51908801f2e6830de53791ccc8
 AUX hostapd.service 213 BLAKE2B 0141aace8e6f807611e423e70cce437a5ae38a5fee8af74a7284980a1c2f642f1e98d020f327dbe5591e9d68114f3ee966229fb6d8f5116fe7d9e2bd93bae7bd SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011 SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
+DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981 SHA512 cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
 EBUILD hostapd-2.6-r1.ebuild 6372 BLAKE2B a3202c1e11ca7d9fc252c2f4a0d3cdbde3eb06818a566bba57890e47347e71cc9553213146793c11c586c403a9d5020b14234ab6b2fbe949c5fc48774fc3eea2 SHA512 fec5dabf5ac3d4103f46d538bc45b7bb07b43755505a255989b0845cb0773c4ed39fb85977a9d73b2966095b5bb39118b2a464ce9a16d9b8ecb9ea8e243f7c95
 EBUILD hostapd-2.6-r2.ebuild 6453 BLAKE2B 3ea7ab9dbce47bf62a27953b5201318fc9f5eab8afa9d6d6e8a49aa58a6a4f412610956bd93485534eac57d41c851e53eac4965883bf1edf94895ee05554a7b5 SHA512 3b2196198d83b69f93e73ba62d8a939ef55cb2cb45abd62bc3e008d61b4b7e2f32e697546b1429d4147f651b5a09b5015ec62ece7d8e740b66f92c2fdd474c03
 EBUILD hostapd-2.6-r3.ebuild 6549 BLAKE2B f8469d75aeeba6c1d3f81d237c14482d30acf61023f5e7fd5b66cf1b5e56392d49dad96c00547d1382b350b2c6f2397b0c1a77da98d1e315f966310e6490a147 SHA512 1c9d50e31f453cce63043d159f7545a44c2c954153ebf2caf27bbbd515ba439621f0cf0c3cfc47e6e1a313ea6206422bfb8d121fbd48f11ec7e73f0a56b264dd
 EBUILD hostapd-2.6-r4.ebuild 6973 BLAKE2B b76c7d612398a241960c624a1c9c8f2dbc844c67255f1fd7ce77d0e7f16fe9f79dea0a89c64100a366c88903ba7a23ea5d31ae745d4ab62900f57807da7dcd6f SHA512 277a224ef2f4c23f675d8ca1dea432101efef209c632a92f1a630815eb440d5107ea385b0b29e8ad09bca5855091f9f4512438449a8a600823032d6fef99ff43
+EBUILD hostapd-2.6-r5.ebuild 7246 BLAKE2B 19db8237f3ca6da609333433f51cbe68a7be8242c5d11fabc7e55f6f66f607402dc59506cc24cfb34064b2d0258ccb45610b1f7299aaa35e624165a32d1c787c SHA512 54b77fffe854a8f214b4caac4a5e9d3d0bb650106afcdd02c6d2b13230fe7e1087438c80314f13f296f0d5c48590cbfdbb44204c98b2ca9846993d710323f8fa
 MISC metadata.xml 1024 BLAKE2B bcec2660f99c07f069daa175482fd7f6bcd15c4e0db2818af130221a737577223642a5439c325c39b263fc7bcabe3f5b4676a8d3311678cd24a062ea3273575d SHA512 cdb85ed770340ca5cfc4efdf7566e7f358b7c921db5a69763c01b2c2dc90a5f3aeb4e62d862452ddf67646b0ac4698cdc34be826187fede76121cb0824f00b18
diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
new file mode 100644
index 000000000000..67f105b8c77a
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi"
+EXTRAS_VER="2.6-r5"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="http://w1.fi/releases/${P}.tar.gz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? (
+		internal-tls? ( dev-libs/libtommath )
+		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	)
+	kernel_linux? (
+		dev-libs/libnl:3
+		crda? ( net-wireless/crda )
+	)
+	netlink? ( net-libs/libnfnetlink )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+	if use internal-tls; then
+		if use libressl; then
+			elog "libressl flag takes precedence over internal-tls"
+		else
+			ewarn "internal-tls implementation is experimental and provides fewer features"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Allow users to apply patches to src/drivers for example,
+	# i.e. anything outside ${S}/${PN}
+	pushd ../ >/dev/null || die
+
+	# Add LibreSSL compatibility patch bug (#567262)
+	eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch"
+
+	# https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+	default
+	popd >/dev/null || die
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		"${S}/hostapd.conf" || die
+
+}
+
+src_configure() {
+	local CONFIG="${S}/.config"
+
+	restore_config "${CONFIG}"
+	if [[ -f "${CONFIG}" ]]; then
+		default_src_configure
+		return 0
+	fi
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# EAP authentication methods
+	echo "CONFIG_EAP=y" >> ${CONFIG}
+	echo "CONFIG_ERP=y" >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+	if use internal-tls && !use libressl; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG}
+	else
+		# SSL authentication methods
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+		echo "CONFIG_TLSV11=y" >> ${CONFIG}
+		echo "CONFIG_TLSV12=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+	fi
+
+	if use wps; then
+		# Enable Wi-Fi Protected Setup
+		echo "CONFIG_WPS=y" >> ${CONFIG}
+		echo "CONFIG_WPS2=y" >> ${CONFIG}
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+		einfo "Enabling Wi-Fi Protected Setup support"
+	fi
+
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+
+	einfo "Enabling drivers: "
+
+	# drivers
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	einfo "  HostAP driver enabled"
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	einfo "  Wired driver enabled"
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	einfo "  None driver enabled"
+
+	einfo "  nl80211 driver enabled"
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+
+	# epoll
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+
+	# misc
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y" >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_IAPP=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
+	echo "CONFIG_HS20=y" >> ${CONFIG}
+	echo "CONFIG_WNM=y" >> ${CONFIG}
+	echo "CONFIG_FST=y" >> ${CONFIG}
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
+	echo "CONFIG_ACS=y" >> ${CONFIG}
+
+	if use netlink; then
+		# Netlink support
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+	fi
+
+	if use ipv6; then
+		# IPv6 support
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	if use sqlite; then
+		# Sqlite support
+		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		echo "CONFIG_LIBNL32=y" >> .config
+	fi
+
+	# TODO: Add support for BSD drivers
+
+	default_src_configure
+}
+
+src_compile() {
+	emake V=1
+
+	if use libressl || !use internal-tls; then
+		emake V=1 nt_password_hash
+		emake V=1 hlr_auc_gw
+	fi
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
+
+	fperms -R 600 /etc/${PN}
+
+	dosbin ${PN}
+	dobin ${PN}_cli
+
+	if use libressl || !use internal-tls; then
+		dobin nt_password_hash hlr_auc_gw
+	fi
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
+
+	doman ${PN}{.8,_cli.1}
+
+	dodoc ChangeLog README
+	use wps && dodoc README-WPS
+
+	docinto examples
+	dodoc wired.conf
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/${PN}.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/${PN}
+	fi
+
+	save_config .config
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you are running openRC you need to follow this instructions:"
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net and then start"
+	einfo "/etc/init.d/${PN}."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+	#	einfo "This package now compiles against the headers installed by"
+	#	einfo "the kernel source for the mac80211 driver. You should "
+	#	einfo "re-emerge ${PN} after upgrading your kernel source."
+	#fi
+
+	if use wps; then
+		einfo "You have enabled Wi-Fi Protected Setup support, please"
+		einfo "read the README-WPS file in /usr/share/doc/${P}"
+		einfo "for info on how to use WPS"
+	fi
+}
diff --git a/net-wireless/inspectrum/Manifest b/net-wireless/inspectrum/Manifest
index 7d40a6c7a124..1479be19423a 100644
--- a/net-wireless/inspectrum/Manifest
+++ b/net-wireless/inspectrum/Manifest
@@ -1,6 +1,4 @@
-DIST inspectrum-0.1.1.tar.gz 151874 BLAKE2B d0b60d479e2b6a93a6971390a23c7fa242ebdf956d9b55f6316f6684d1534d88c062c93ed4928605a256b794f3cf6d65d943822e239390c6c2d3e879d3b492a6 SHA512 e151448f7071540a00b6d74036752b336c69cab166952a2d0e54cd3e4ed04e23fba54c1382bcbc3f9a8da4f88caa8fd188c6bcbc248f2da872681fe108613721
-DIST inspectrum-0.2.tar.gz 108562 BLAKE2B 7a8704a7a14873d2f4759f9b286f2642e49eeacdab4e98c217e864f04959ab6b57c0a425c60cbbc7e027bcc130f3e84c76306984e74a940830f18ea3a2d40e92 SHA512 743058ab32d7aa10e7f31e225b35c4a64f8cac2e43c0e7ecc88c17786e11df8f83234ed8f0361d08e9759ba322fc38952582014cde31c8d1a81ede99a6585c73
-EBUILD inspectrum-0.1.1.ebuild 657 BLAKE2B a29efa640dc1c4ad1727e3a379815d13e29d2a8325a3460be9e77dec1230b1ddad2dac746a3bd494af8e58287d026ae584b6c2aa71bba69d65b1c06fa9cbda6a SHA512 225024f23f98affba59e596a59f7ac476d3a691f8d4038cc7be6a849ac0bc71ac2ee7d2ac207c28c8ada17048572614bbc5556df135a28668d34eee36b3df776
-EBUILD inspectrum-0.2.ebuild 701 BLAKE2B 867db11a0499c8c67ff1b7f94fa66209b1957e1c6381982c6e5d81e3cd4c74656252ecd71923b777571901aa6d6a308f15b590559611b77cf30da7408a4df7aa SHA512 0e448bfb2a47728a9ea6de25ef792aa03bc953f3d9d19078533898ee63c36129fbcf87f20a82762449c699301372ea335e9ccc134d1d7b5d5f22af6c18ed9413
+DIST inspectrum-0.2.2.tar.gz 109165 BLAKE2B 62926305bfa03bb3a404ed2a9098b9afd93f0de7f35846cfcf66b42ec6a81532003976bcc9a6916217044ad80fce8df689d200aa5861778f0e3f00d67373cbb6 SHA512 37ad48f87889731b7aa83a6cfa401c9986d2657f5f06f8dbdf02213123ff4d0d7cb23aa21e9b4062b7ab746d32c937dd56e85bd5c8d0bbf2181a54929e3fc501
+EBUILD inspectrum-0.2.2.ebuild 701 BLAKE2B 08445e6eada91acc1728a4ac137875b32ca78ae359310ba8c9d375b991ffe23dabc3791c1cc41354110302143dc4bc4d018b3acab67815d6a7b1445ef768f01a SHA512 e6da862809dd1ffcef94a8e6951e776c0c09542f9d3fca873c33902997919ad259065e274e264a089c66f645aa5a09bf8202e617931adf1e97a79a44ba6626e3
 EBUILD inspectrum-9999.ebuild 701 BLAKE2B 867db11a0499c8c67ff1b7f94fa66209b1957e1c6381982c6e5d81e3cd4c74656252ecd71923b777571901aa6d6a308f15b590559611b77cf30da7408a4df7aa SHA512 0e448bfb2a47728a9ea6de25ef792aa03bc953f3d9d19078533898ee63c36129fbcf87f20a82762449c699301372ea335e9ccc134d1d7b5d5f22af6c18ed9413
 MISC metadata.xml 426 BLAKE2B a117a458ba8b91db0841ba470ee987daf8c5b55c1f87064d203b58feb9e0650b6c33f37f4259a2f5ad051c9ade4d67c7b37077f9772c3c84c942e00789ce655e SHA512 a1da383e40f0fccae9fbb2b8b29051619104e4276b8d4027c9584de14625b3612d6bdf1343f1261e5d6df8b13789f1d4f95e62b76d1ef1eda84b66c82464520e
diff --git a/net-wireless/inspectrum/inspectrum-0.1.1.ebuild b/net-wireless/inspectrum/inspectrum-0.1.1.ebuild
deleted file mode 100644
index b0770bdc411a..000000000000
--- a/net-wireless/inspectrum/inspectrum-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
-HOMEPAGE="https://github.com/miek/inspectrum"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="sci-libs/fftw:3.0=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
diff --git a/net-wireless/inspectrum/inspectrum-0.2.2.ebuild b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
new file mode 100644
index 000000000000..55640eba8fb0
--- /dev/null
+++ b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
+HOMEPAGE="https://github.com/miek/inspectrum"
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="sci-libs/fftw:3.0=
+	dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	net-libs/liquid-dsp"
+DEPEND="virtual/pkgconfig
+	dev-qt/qtconcurrent:5
+	${RDEPEND}"
diff --git a/net-wireless/inspectrum/inspectrum-0.2.ebuild b/net-wireless/inspectrum/inspectrum-0.2.ebuild
deleted file mode 100644
index a9a777d77d39..000000000000
--- a/net-wireless/inspectrum/inspectrum-0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
-HOMEPAGE="https://github.com/miek/inspectrum"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="sci-libs/fftw:3.0=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	net-libs/liquid-dsp"
-DEPEND="virtual/pkgconfig
-	dev-qt/qtconcurrent:5
-	${RDEPEND}"
diff --git a/net-wireless/openbsc/Manifest b/net-wireless/openbsc/Manifest
index 97d8d2b4a4cf..f56ba046eb52 100644
--- a/net-wireless/openbsc/Manifest
+++ b/net-wireless/openbsc/Manifest
@@ -1,2 +1,2 @@
-EBUILD openbsc-9999.ebuild 664 BLAKE2B 3b171b93c98ad5fd453d578105e6c3f7f3ae2154cfbbfff34af1cad635cd02cdc7dade6776abce9d72dd66b2ce5eea7b3364ee4b0453c20d92d044f875d8a6a5 SHA512 0a041c03b706366eef7ca32961f0a8668f0f3844caa20a452610772954fc8d665ba08e03412f811b690759dea551b2fd3e75f34201ab933036bb454f05bb22ea
+EBUILD openbsc-9999.ebuild 632 BLAKE2B 460c96c1ca460d4854c51847cdbfbccf9d81b89d9b28d170d99e7525ef65b7069824bfdda45ce524654049055e82b4825eb75b81facc18c50aef9975a61ae03d SHA512 ff18ee81695dbf4874b13c100571fa4defa159ea6c216d0302910f155ea60fc3997f2d760b5887cc5c15d00941ba880d1885b280a85bcf01bed37dd5682a007c
 MISC metadata.xml 306 BLAKE2B c430f924b1f5811fab4efa2f4a3a42529e8a37744783e8adb2ee48f10ca1aa2030f544a89bd554fb53ea746a48a69710e586d47d007100762cd34a81534c6b13 SHA512 b2cba4799307872808b4d932c487c1344e2251f0da3186ab7ccf6bd8e76bca2c7d31661d7ef4cd5982c97483a53d8197aaf49ff88e1aa172ed179dcf75505f28
diff --git a/net-wireless/openbsc/openbsc-9999.ebuild b/net-wireless/openbsc/openbsc-9999.ebuild
index 2c055ae0bb6a..c8175a0f58f9 100644
--- a/net-wireless/openbsc/openbsc-9999.ebuild
+++ b/net-wireless/openbsc/openbsc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools git-2 eutils
+inherit autotools eutils git-r3
 
 DESCRIPTION="OpenBSC, OsmoSGSN, OsmoBSC and other programs"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC"
@@ -25,7 +25,6 @@ RDEPEND="${DEPEND}
 	dev-db/sqlite:3"
 
 S="${WORKDIR}/${P}/${PN}"
-EGIT_SOURCEDIR="${WORKDIR}/${P}"
 
 src_prepare() {
 	epatch_user
diff --git a/net-wireless/openggsn/Manifest b/net-wireless/openggsn/Manifest
index fdfd6eaf379a..aae191092e82 100644
--- a/net-wireless/openggsn/Manifest
+++ b/net-wireless/openggsn/Manifest
@@ -1,2 +1,2 @@
-EBUILD openggsn-9999.ebuild 398 BLAKE2B 26f3474c17fe49a5e35f72cdc6da117fcdcc1f6827f1fbcd35bbf2d565bc5ffb7386a06a93873254ce4324e059e39ae12a4a2fb7f49b9db7ef800cf22e55c749 SHA512 7e4be8ef342de12a0a7145304302f2b74cf06a60d010e65839941ce72c7782ccebc7adeba89bc2a4589f4e997be3157bdbe300679d5d8f3b325621f0e6a98ae8
+EBUILD openggsn-9999.ebuild 399 BLAKE2B 602d12169c5d8d8f248be49b5fe956139412ad996c5bbc9103fcfb6076dd779f8288681366ed2c0e0679ad4e6d5a4e6bb3e472dd91497c514ccbadc91a872571 SHA512 a55b6ab3dce424f90bf9f3194c8a919af37050a52c96e30528cc97e05c3e385da0c37dc0ca79d420e69f41ac1b0e3c5c61dd08e520abf7705c24d4f221acbb82
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/openggsn/openggsn-9999.ebuild b/net-wireless/openggsn/openggsn-9999.ebuild
index 51836d9bccfb..eb2dc537ed83 100644
--- a/net-wireless/openggsn/openggsn-9999.ebuild
+++ b/net-wireless/openggsn/openggsn-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-2 autotools
+inherit autotools git-r3
 
 DESCRIPTION="Gateway GPRS Support Node"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC_GPRS"
diff --git a/net-wireless/osmobts/Manifest b/net-wireless/osmobts/Manifest
index 6e00f827f5bd..cc8a6a6925bf 100644
--- a/net-wireless/osmobts/Manifest
+++ b/net-wireless/osmobts/Manifest
@@ -1,2 +1,2 @@
-EBUILD osmobts-9999.ebuild 801 BLAKE2B 2a85101dcd24a27b41a4993d71f86db52fe87c0a54ec803718f4b1eafd4911c61c78247bd42f26ef77535eacc60ef21dd864343f65d00a176e1ab1bd778b6944 SHA512 64e41db9c8c616750a88db50110cc00bf18bc376eaa6c25963319f57c694a69a8764443b4799c703224021d3ec8c6613a0edacd359d2b6356110d573548b317f
+EBUILD osmobts-9999.ebuild 842 BLAKE2B 6dcd29c3ea81884543b600d1f8d81af17ebac8cf42dcc0b63187e933863031239d1266c6e42ab392b331bd57a793511848e3c8940ac3cf576e849bedcc973fb1 SHA512 99d1cbdab522e38632da3af1ceae22214b76501749cb2778ed6c0dd68c7dce3889f2ec72cb4353415aa98165bf753c7784a263d717f5b28b881dec963aac8842
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/osmobts/osmobts-9999.ebuild b/net-wireless/osmobts/osmobts-9999.ebuild
index 134b5749b7bb..c88880d41de7 100644
--- a/net-wireless/osmobts/osmobts-9999.ebuild
+++ b/net-wireless/osmobts/osmobts-9999.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
 
-inherit autotools git-2
+inherit autotools git-r3
 
 DESCRIPTION="Osmocom BTS-Side code (Abis, scheduling)"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OsmoBTS"
@@ -19,6 +19,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	eautoreconf
+	mkdir -p "${S}"/include/openbsc || die
 	wget -O "${S}"/include/openbsc/gsm_data_shared.h http://cgit.osmocom.org/openbsc/plain/openbsc/include/openbsc/gsm_data_shared.h || die
 	wget -O "${S}"/src/common/gsm_data_shared.c http://cgit.osmocom.org/openbsc/plain/openbsc/src/libcommon/gsm_data_shared.c || die
 
diff --git a/net-wireless/osmocom-bb/Manifest b/net-wireless/osmocom-bb/Manifest
index 7e436d9c0b96..528be7067240 100644
--- a/net-wireless/osmocom-bb/Manifest
+++ b/net-wireless/osmocom-bb/Manifest
@@ -1,2 +1,2 @@
-EBUILD osmocom-bb-9999.ebuild 1268 BLAKE2B 3440decc71d48570294fa717f9f3992e66fe2e9da84db619bb4c187b2c7e861db8323d88868e65d684f22090c7974d1284ec86c0e95104c6aab947c6058abc99 SHA512 b4b6263953ae779cd98eb2645c0f7b4f0160ef665fdccbc04453fcd9f698ddce7442ca2cb08ae36d1a09d932d924a5c52025dab82e8c0cfac0fda3f8fce8d6bd
+EBUILD osmocom-bb-9999.ebuild 1269 BLAKE2B 573ddf5a8436ea3b701a9b0312a90f2dff7543c4cbf0413f6d42c2aea8f60d5161001a7fa3f11fe2f4dda39ad2535f1b8a4640ced410f8d2570be74f97f5b267 SHA512 14d85cf119bed653c84707943b655f7892a50524bef096cc3eafa2ef1dbc09488dd9001d52c6bd39de0b552efc994fa8e443a19a0bcb3a90e245d3629ef5619c
 MISC metadata.xml 318 BLAKE2B a84cbe76b571c704e7ccb8f8a62d6966a891c27276e238947360beba3105bc8e7d714cf43765d87b3549652e4bccf99554b50d56e1b36017625dbd287c045229 SHA512 e4f59e33a6c647e67c1ac74f8d9b8cf1be9283162e838bea486c59ba312c9ce44c81103ce05d90592a831c03516aa0a6532c83a4c71761db32c68def4c20a301
diff --git a/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild b/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
index e8413a907551..be88f95016e4 100644
--- a/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
+++ b/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-2 autotools flag-o-matic
+inherit autotools flag-o-matic git-r3
 
 DESCRIPTION="OsmocomBB MS-side GSM Protocol stack (L1, L2, L3) excluding firmware"
 HOMEPAGE="http://bb.osmocom.org"
diff --git a/net-wireless/rfcat/Manifest b/net-wireless/rfcat/Manifest
index 7b4cda49573b..022c454d1b70 100644
--- a/net-wireless/rfcat/Manifest
+++ b/net-wireless/rfcat/Manifest
@@ -4,5 +4,5 @@ DIST RfCatYS1CCBootloader-170313.hex 50208 BLAKE2B 9df19800d5c0c5a4b8c99f550c758
 DIST immeSniff-170508.hex 38770 BLAKE2B fd34fee85ee6bf893234939cab9794c34f9302e37d86636116e544ca39e368ed8b6015ae2efa80c49ad56722b1fa573897e0b93ca4d5b2e6496c9f92c9c761d6 SHA512 3f06693fc893071adfb75e510da4d5c47752480896e449f893141b4db43dc7fb859dc25ab368d742ae612ebda085f199bcd8e18c9f5fa6f58c6b6204defc7b5f
 DIST rfcat_170508.tgz 462440 BLAKE2B 20d4b875be7caeb8263e3582c101a2402527b2f4f54feceba49bf01f65d268f3f9537c42a9a40502a6e232c7d828b6be27d899e979509c607c1160a71aa3677a SHA512 79f960ee6b8c2d66cb17ca69216041bb9679b0d38579feb3ab59bbb6e41337b29c4ad30a6d03b2de4c58eeeff5f22fe26412a670da5278e81a47a2ec3d699f60
 EBUILD rfcat-0.0.170508.ebuild 1381 BLAKE2B 06c89b4f5b5edbc0f9569fbe13e3c51b68e81775d77d8e03a7e8f2bb6ded0d567a46329171bdb8f83fdaf5db2e156d1337b37412565d05a0eb9331d37e83a7d6 SHA512 5957e81e866b1ecafa618c435da3790e1a540f31d8d893c42314f9339af4e9bd8a0158be50e8404b54efbc2fee29638369935291be5b6452b4085f880165ca45
-EBUILD rfcat-9999.ebuild 1381 BLAKE2B 06c89b4f5b5edbc0f9569fbe13e3c51b68e81775d77d8e03a7e8f2bb6ded0d567a46329171bdb8f83fdaf5db2e156d1337b37412565d05a0eb9331d37e83a7d6 SHA512 5957e81e866b1ecafa618c435da3790e1a540f31d8d893c42314f9339af4e9bd8a0158be50e8404b54efbc2fee29638369935291be5b6452b4085f880165ca45
+EBUILD rfcat-9999.ebuild 1380 BLAKE2B d7a670474617557244737596581b355472b1c49d8675d33ec7a3b84dfe7c82db202d0b87597246a7386df913ffdbc587dce40dccd05781da4bb60e56dea40e3d SHA512 15d164d65d44d5eb6a2240d5babb7edcdf9d15911a94f48c0d4e2d760af30b7c8bb08a8b15bb20d141f2ed9271c16b8a24d1d5ecd4fad38f3d668fe9d4e3fbaf
 MISC metadata.xml 332 BLAKE2B f434ada12078111a24ebbf48d22c9820bd2c4f93c86b90a75e3e31b62dada319d35260ca469b9e8931abfd34416b9018c55e6a246ba9f29b793f32eb30e3bfce SHA512 c99ea897c8e261d0fe784a70e40fa34d11e5ed1600ff1a24c5b0a3618430c9509d94755ec3c4e76e656c62cc51502b6345f0de7713f9a3dc213ef00bb5fce468
diff --git a/net-wireless/rfcat/rfcat-9999.ebuild b/net-wireless/rfcat/rfcat-9999.ebuild
index 344278dba590..12bb3e32f0c5 100644
--- a/net-wireless/rfcat/rfcat-9999.ebuild
+++ b/net-wireless/rfcat/rfcat-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
@@ -10,8 +10,8 @@ DESCRIPTION="The swiss army knife of subGHz"
 HOMEPAGE="https://bitbucket.org/atlas0fd00m/rfcat/"
 
 if [ "${PV}" = "9999" ]; then
-	EHG_REPO_URI="https://bitbucket.org/atlas0fd00m/rfcat"
-	inherit mercurial
+	EGIT_REPO_URI="https://github.com/atlas0fd00m/rfcat.git"
+	inherit git-r3
 	KEYWORDS=""
 else
 	DATE="170508"
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 37714f32df38..2e5c247aac01 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,7 +1,4 @@
-AUX rtl-sdr-0.5.3-static-inline.patch 1994 BLAKE2B b986fdeb438f9f566b74c4f0914019667c45a654eeb6c875e5d20bbdf8be37e5881db9648fc556354f1b20c9fdfec62c5afddebfbd76c0685ebbe6f6908efb80 SHA512 f7de6345a9ede8b05ebdd28a3c1fd07a58caadafe24a1009ca05d82d9cd8fbc86fc04fe545d05c951cea7b6b819e54911f8b4ad06ce7fbe8d998e51d9480ac3e
-DIST rtl-sdr-0.5.3_p20150730.tar.xz 485476 BLAKE2B 950d6b6d959bf6998c1ddb0c8ee55621e05ccce16abc7b03ee6632dc194249a8cea75f68697a54c0e156750708f14365bbb327f4198e36a9e042898ea015f945 SHA512 b19e9ce6ebc1c63a26ad3d8b13ccdcac76d4dee317aba547a8cd760e59256251df59ecc3ff6f8cb42d9be8235d67bd280f3373e58acb64f553fae5e3c2d113a6
 DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
-EBUILD rtl-sdr-0.5.3_p20150730.ebuild 1074 BLAKE2B f6e0df306e19cc6dd9932660153ed44958c4e22d0c3a080963105179bb8e18c8e2f3531891f4d39614e718c1402028f012ed847fc7a9f4a0511b981b15af6d8a SHA512 9eabb3496eed4409b2382a5a76f1c3e68219111c8ae56f2a25739c05eb53cf520203ce7ac612535ef6b7a0eda75cb40a2f57ab5c01ccd3c4b216ed3debf96932
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
 EBUILD rtl-sdr-9999.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch b/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch
deleted file mode 100644
index 0f0e829e3b06..000000000000
--- a/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://github.com/steve-m/librtlsdr/pull/38
-
-From ea6a86d8e792430faa3a8161ee99f2bc392875d1 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 3 Feb 2017 15:44:18 -1000
-Subject: [PATCH] fix builds with newer compilers & C standards
-
-The meaning of "inline" has changed when "static" is not used.
-Since none of these functions are used outside of their respective
-files, mark them as static to avoid build errors where funcs are
-not inlined (based on compiler flags too).
----
- src/rtl_adsb.c  | 8 ++++----
- src/rtl_power.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c
-index e611e78f3dad..a3bfa7f36b5e 100644
---- a/src/rtl_adsb.c
-+++ b/src/rtl_adsb.c
-@@ -182,7 +182,7 @@ int magnitute(uint8_t *buf, int len)
- 	return len/2;
- }
- 
--inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
-+static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
- /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
- {
- 	int bit, bit_p;
-@@ -223,17 +223,17 @@ inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d
- 	return BADSAMPLE;
- }
- 
--inline uint16_t min16(uint16_t a, uint16_t b)
-+static inline uint16_t min16(uint16_t a, uint16_t b)
- {
- 	return a<b ? a : b;
- }
- 
--inline uint16_t max16(uint16_t a, uint16_t b)
-+static inline uint16_t max16(uint16_t a, uint16_t b)
- {
- 	return a>b ? a : b;
- }
- 
--inline int preamble(uint16_t *buf, int i)
-+static inline int preamble(uint16_t *buf, int i)
- /* returns 0/1 for preamble at index i */
- {
- 	int i2;
-diff --git a/src/rtl_power.c b/src/rtl_power.c
-index aa7a138a8cd3..a7a43bbd2507 100644
---- a/src/rtl_power.c
-+++ b/src/rtl_power.c
-@@ -249,7 +249,7 @@ void sine_table(int size)
- 	}
- }
- 
--inline int16_t FIX_MPY(int16_t a, int16_t b)
-+static inline int16_t FIX_MPY(int16_t a, int16_t b)
- /* fixed point multiply and scale */
- {
- 	int c = ((int)a * (int)b) >> 14;
--- 
-2.11.0
-
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild
deleted file mode 100644
index 11c384d72641..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.3-static-inline.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_configure() {
-	#the udev rules are 666, we don't want that
-	mycmakeargs=(
-		-DINSTALL_UDEV_RULES=OFF
-		-DDETACH_KERNEL_DRIVER=ON
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "Only users in the usb group can capture."
-	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-}
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 53bde86a49a4..4e94f7c2dad1 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,12 +1,11 @@
 AUX uhd-3.10.3.0-tinfo.patch 1680 BLAKE2B 6b31b95c4b63d043e66e5fb41f75b3e73d0e9327d304a211d950bc982209f12425ee716ff2218ceace317ba978ddfe7d0b94961c9feeb0a08dd5454515df7505 SHA512 2c0e6163ddb005b5d02a380033030d111d1eff23f8327aff802e80e449594e48bdd8f2656ffd21c6281233a36ac89d52aa6833e2ea0349276baaef497c463cba
-AUX uhd-3.9.6-tinfo.patch 1824 BLAKE2B bbbd4f17e7e24532d49847f7ab476bc2105d4de63346d73cecc77cf422e471a9f8cb6bec6545eac8226da12e66ee6be9088070970408ec2aa48867e817fa0aeb SHA512 66d1b7197b727c1e16469e47fa7392585e68f30e61c23114152f8cb0dab41bb074236f33637bba4e7b03421468e43943ad65b8f148a341666cc407ebc10f5522
 DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
 DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
-DIST EttusResearch-UHD-3.9.6.tar.gz 2458419 BLAKE2B 39859c9c7a520b91fd0ad11b82a454ae267d0e04bbb3d3f474ab31ea8daac69c03e5abe4ed54f3eec5810d180d00aa700e67b10d989295fdedf73cb198ae324d SHA512 f8e89f67659e9509d90fb63a91c75b7a5fe037821ccd2f33313ac0b20d856cbdc2cab79715f7fca035ba0e28b240c73408d6764cb09b01700c4ddbdcafa71da1
-DIST uhd-images_003.009.006-release.zip 26268656 BLAKE2B 7d8c1b0bbd627a0180d5e2de996eb68b1fb995ea2c28ed12fa73705cda680d6304ff013a80cfd4ea5928137c16ac128546bdb9ed3cf932a837faa6dfe0866ffa SHA512 3b07a054583a55424edeb37d3ee70b9bd8c7b6cb4c83a10faf4dd518aa148be17af7cb8b5e4fb7cbb643eae32d7a3295a94d9a0eb031823ccf1f414da0cef631
+DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
 DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
+DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
 DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
 EBUILD uhd-3.10.3.0.ebuild 2043 BLAKE2B 299a8f73dbabe40dafae728cca63636e29ba90b0ee48bec4637bbab4c61668fb2121f6a65808a44696a2c4f8bf5f2bc773d4485a2b6556bc6e7c3e819b5bf1cd SHA512 777d6d6fd40bd74816916dc94e712de0cecc9e5a4275bfff67d69cef63866e9ae75cdaf0ed75bf17591b8667e3f73fda35f513ab13070c40d855b807bc53d93e
 EBUILD uhd-3.11.0.0.ebuild 3902 BLAKE2B 34d21ac5fca3a00b255bb0dbae36d5930416013d79a7544d0c365c0f3cdd6df5a9418cc5a4196968e15b469312522545ce6c360103bfd76191aa6595a777e5fe SHA512 1ee713c893dbf749851df9a4e628504b7a3bd907b3a9f06de3444656e101d63ab6f85a0b201658da3afce3a03389dba027fde92b09076976289694cb091ab498
-EBUILD uhd-3.9.6.ebuild 1900 BLAKE2B 99a2bb4b1e3a391408c48222a4ebb0e7a423d48400468993554e127bd3c16a7a5f415f91a8ba8d39d766ff3ee4361e51d89ea580f0114f67af8ba9dfa8084e39 SHA512 38673ebcb6d9acff3be5173dec793fc0a8f3dcc3839c92e80dabcfeae34a5cfbeadd5bd2acb48cbbd5834abe7416ec1d232714d1ec3f91a965bbfe22a9522bec
+EBUILD uhd-3.12.0.0.ebuild 3535 BLAKE2B cde3b15683186acf7f2eb877609df487c83afb924718076b591e5670eee32634867e658088d88edab7ebf3b3346572b4c3a19b070169e5e78a9e72962a35bf90 SHA512 6e6cb73b52e631dc7ac6274f77756846d5252e73e7b95c28b639ff1713be1bbca0ab333aaecd971553433fe49ebbd61ab18f9be04b2ff0b81bdf9a45e0ceb8c8
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch b/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch
deleted file mode 100644
index 511bc3c13fcd..000000000000
--- a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- uhd-release_003_009_006/host/utils/latency/CMakeLists.txt.orig	2017-05-11 19:44:54.824946672 +0300

-+++ uhd-release_003_009_006/host/utils/latency/CMakeLists.txt	2017-05-11 19:45:08.498880360 +0300

-@@ -35,7 +35,8 @@

-         GET_FILENAME_COMPONENT(name ${source} NAME_WE)

-         ADD_EXECUTABLE(${name} ${source} ${latency_lib_path})

-     	LIBUHD_APPEND_SOURCES(${name})

--        TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES})

-+        TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES}

-+            ${CURSES_LIBRARIES} tinfo)

-     	UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name})

-     ENDFOREACH(source)

- 

---- uhd-release_003_009_006/host/examples/CMakeLists.txt.orig	2017-05-11 19:41:02.322302577 +0300

-+++ uhd-release_003_009_006/host/examples/CMakeLists.txt	2017-05-11 19:44:32.604066325 +0300

-@@ -59,7 +59,7 @@

- IF(CURSES_FOUND)

-     INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})

-     ADD_EXECUTABLE(rx_ascii_art_dft rx_ascii_art_dft.cpp)

--    TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})

-+    TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})

-     UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)

- ENDIF(CURSES_FOUND)

- 

---- uhd-release_003_009_006/host/CMakeLists.txt.orig	2017-05-11 19:36:38.944798634 +0300

-+++ uhd-release_003_009_006/host/CMakeLists.txt	2017-05-11 19:36:40.819788408 +0300

-@@ -436,6 +436,8 @@

-     LIST(APPEND UHD_LINK_LIST_STATIC "usb-1.0")

- ENDIF(ENABLE_USB)

- 

-+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo")

-+

- CONFIGURE_FILE(

-     ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDConfigVersion.cmake.in

-     ${CMAKE_BINARY_DIR}/cmake/Modules/UHDConfigVersion.cmake

diff --git a/net-wireless/uhd/uhd-3.12.0.0.ebuild b/net-wireless/uhd/uhd-3.12.0.0.ebuild
new file mode 100644
index 000000000000..18e5ddf13060
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.12.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+			b100? ( usb )
+			b200? ( usb )
+			usrp1? ( usb )
+			usrp2? ( usb )
+			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+	e300? ( virtual/udev )
+	usb? ( virtual/libusb:1 )
+	dev-libs/boost:=
+	sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-python/mako
+	app-arch/unzip
+	app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+	default
+	mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	gnome2_environment_reset #534582
+
+	#this may not be needed in 3.4.3 and above, please verify
+	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_LIBUHD=ON
+		-DENABLE_C_API=ON
+		-DENABLE_LIBERIO=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_GPSD=OFF
+		-DENABLE_EXAMPLES="$(usex examples)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_USB="$(usex usb)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DENABLE_MANUAL="$(usex doc)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_B100="$(usex b100)"
+		-DENABLE_B200="$(usex b200)"
+		-DENABLE_E300="$(usex e300)"
+		-DENABLE_USRP1="$(usex usrp1)"
+		-DENABLE_USRP2="$(usex usrp2)"
+		-DENABLE_X300="$(usex x300)"
+		-DENABLE_N230="$(usex n230)"
+		-DENABLE_MPMD="$(usex mpmd)"
+		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+	)
+	cmake-utils_src_configure
+}
+src_install() {
+	cmake-utils_src_install
+	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+	if [ "${PV}" != "9999" ]; then
+		rm -rf "${ED}/usr/bin/uhd_images_downloader"
+		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
+	fi
+
+	insinto /lib/udev/rules.d/
+	doins "${S}/utils/uhd-usrp.rules"
+
+	rm -rf "${WORKDIR}/images/winusb_driver"
+	if ! use b100; then
+		rm "${WORKDIR}"/images/usrp_b100* || die
+	fi
+	if ! use b200; then
+		rm "${WORKDIR}"/images/usrp_b2[01]* || die
+	fi
+	if ! use e300; then
+		rm "${WORKDIR}"/images/usrp_e3* || die
+	fi
+	if ! use mpmd; then
+		rm "${WORKDIR}"/images/usrp_n310* || die
+	fi
+	if ! use n230; then
+		rm "${WORKDIR}"/images/usrp_n230* || die
+	fi
+	if ! use octoclock; then
+		rm "${WORKDIR}"/images/octoclock* || die
+	fi
+	if ! use usrp1; then
+		rm "${WORKDIR}"/images/usrp1* || die
+	fi
+	if ! use usrp2; then
+		rm "${WORKDIR}"/images/usrp2* || die
+		rm "${WORKDIR}"/images/usrp_n2[01]* || die
+		rm -r "${WORKDIR}"/images/bit || die
+	fi
+	if ! use x300; then
+		rm "${WORKDIR}/"images/usrp_x3* || die
+	fi
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}/images"
+}
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild
deleted file mode 100644
index d7bf1683325c..000000000000
--- a/net-wireless/uhd/uhd-3.9.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).00$(get_version_component_range 3)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
-	http://files.ettus.com/binaries/images/${image_version}.zip"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	virtual/libusb:1
-	dev-lang/orc
-	dev-libs/boost:=
-	sys-libs/ncurses:0
-	"
-DEPEND="${RDEPEND}
-	dev-python/mako
-	dev-python/cheetah
-	app-arch/unzip"
-
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
-
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
diff --git a/perl-core/HTTP-Tiny/HTTP-Tiny-0.43.0.ebuild b/perl-core/HTTP-Tiny/HTTP-Tiny-0.43.0.ebuild
index 546160297780..919a26e0035f 100644
--- a/perl-core/HTTP-Tiny/HTTP-Tiny-0.43.0.ebuild
+++ b/perl-core/HTTP-Tiny/HTTP-Tiny-0.43.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
@@ -7,7 +7,7 @@ MODULE_VERSION=0.043
 inherit perl-module
 
 DESCRIPTION='A small, simple, correct HTTP/1.1 client'
-LICENSE=" || ( Artistic GPL-2 )"
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
diff --git a/perl-core/HTTP-Tiny/Manifest b/perl-core/HTTP-Tiny/Manifest
index 72883e421698..3ec1979a01ff 100644
--- a/perl-core/HTTP-Tiny/Manifest
+++ b/perl-core/HTTP-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Tiny-0.043.tar.gz 58982 BLAKE2B 9aecaa727012e664f5a1be17b0f0308cc71dc848e89831704fa728e6098b154bb3619cd27abe7c449b633450733816b49e1d34305914b627165b5a1b3df0b9ba SHA512 80483d80de05583398fd136463fef6abb7850d07d32b9c7f391e8b356b1c89494beeb38f80e3f1d4d804f7defff1f5d19aeae82935131761f09cbce1e7202ba2
-EBUILD HTTP-Tiny-0.43.0.ebuild 743 BLAKE2B f495a96a5eb2704f94532749d3ca6274bfedf1ba6c24324d883456b5879789aaeb1a627595d23b2e59ede3610298aa711a26f63e9a900adf57d3c128a22f2075 SHA512 d667a4c7599d2ef9db54007b17803314226b14ce261afdeae43c42fdda073a60b9ed3bd8b80551c042ff8eb5b55b97663eec22380b4334348bf4a3e306abec8d
+EBUILD HTTP-Tiny-0.43.0.ebuild 742 BLAKE2B 000dc68c7c770044c682e28fc6c82a8411ed5a43341a4093f3dfb9fe6e85a6e2c5d52720409f49021c48546e5a835ab6751d4d22b3f971346587f06521783daf SHA512 c9a43b1f52db10959a5354fe9b4fcdc8089974ae6ca6964df16b832b162f07b923795a83c0aa2f9b46b90c019257cb3e8ab797bb9539efa2ba3ee3c4196b8145
 MISC metadata.xml 502 BLAKE2B ab28c39d5ed0c9c3ef5b1bb9c000a04952397405c6d6036ff1f54d8c3e328ad6c0501b7dbbeeb10f7d7a75068a8edaf0c25c38d03fc619ecd3bb4090403d7e16 SHA512 0856ec3d4f3f7680b317b49ccd954288c7130c4178d0d7e2b228d5559a838155ded00deb16ffb60bd345db4c7009d85d3746f742828cc0f640faa74549da1b19
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 6a7ae1a865d7..6ee33ad89df7 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c27cdf48266b..b7c013429d51 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index d46392a89773..9dc1afa26544 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
+# Needs sys-apps/fakechroot which isn't keyworded
+app-arch/rpm test
+
+# Tomáš Mózes <hydrapolic@gmail.com> (05 Jun 2018)
+# Unkeyworded dependencies.
+app-admin/syslog-ng amqp mongodb
+
 # Thomas Deutschmann <whissi@gentoo.org> (02 Jun 2018)
 # Needs dev-ruby/asciidoctor which has a lot of unstable deps
 net-analyzer/wireshark doc
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 4ee4d9f04da2..1de040a58101 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -57,7 +57,7 @@ app-doc/doxygen clang
 dev-perl/GD fcgi
 media-libs/libcanberra gnome
 media-libs/mesa vaapi
-media-sound/pulseaudio equalizer qt4 realtime
+media-sound/pulseaudio equalizer qt4 qt5 realtime
 media-video/ffmpeg celt ebur128 kvazaar libilbc openh264
 media-video/ffmpeg rubberband sdl ssh x265 zeromq zimg
 net-libs/gnutls idn
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 1ca36a8d4f3d..48ae66bb3eb1 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -62,3 +62,8 @@ USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
 # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
 # by non-multilib ebuilds when non-native ABIs are disabled.
 IUSE_IMPLICIT="abi_x86_64"
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2 Jun 2017)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 649c65331dde..2b54cc864822 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -36,9 +36,6 @@ app-emulation/winetricks
 app-office/ooextras
 dev-embedded/libftd2xx
 dev-embedded/openocd
-dev-lang/icc
-dev-lang/idb
-dev-lang/ifc
 dev-util/android-ndk
 dev-util/android-sdk-update-manager
 dev-util/android-studio
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index cbe1c0f8f654..a8638afdd530 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
+# Needs sys-apps/fakechroot which isn't keyworded
+app-arch/rpm test
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# net-wireless/soapysdr not keyworded
+net-wireless/gr-osmosdr soapy
+
 # Markus Meier <maekke@gentoo.org> (30 May 2018)
 # unkeyworded deps for bug #621434
 net-analyzer/zmap mongo
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index f985ef0637e5..df725d4fdf2a 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -17,6 +17,11 @@ LIBDIR_arm64="lib64"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
 
+# Mart Raudsepp <leio@gentoo.org> (5 Jun 2018)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
+
 # Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index fc75fc61cf83..c859a1044c81 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
+# Needs sys-apps/fakechroot which isn't keyworded
+app-arch/rpm test
+
+# Alex Bennee <alex@bennee.com> (31 May 2018)
+# bunch of dev-perl packages not yet keyworded
+# and the i3 ebuild currently has RESTRICT="test" due to upstream bug
+x11-wm/i3 test
+
 # Mart Raudsepp <leio@gentoo.org> (30 May 2018)
 # app-text/pandoc not keyworded yet
 app-emulation/xen-tools doc
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index dbfa5efa2134..0f0509dd7730 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -10,6 +10,11 @@ CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 
+# Sergei Trofimovich <slyfox@gentoo.org> (3 Jun 2017)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
+
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
 # Set ABI & DEFAULT_ABI consistently with ${ARCH}, to make ebuild
 # checks simpler.
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index d38ac61fcce9..acf5931ca845 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
+# Needs sys-apps/fakechroot which isn't keyworded
+app-arch/rpm test
+
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded deps.
 net-misc/curl curl_ssl_axtls
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 051dd2a3ae48..1a3eba7d3b0b 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,18 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (08 Jun 2018)
+# Requires unported sys-libs/netbsd-csu
+sys-devel/clang-runtime crt
+
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (08 Jun 2018)
+# sys-devel/llvmgold not yet keyworded
+sys-devel/llvm gold
+
+# Tomáš Mózes <hydrapolic@gmail.com> (05 Jun 2018)
+# Unkeyworded dependencies.
+app-admin/syslog-ng mongodb
+
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # media-libs/libaom not yet keyworded
 media-video/vlc aom
@@ -111,10 +123,6 @@ sys-auth/polkit kde
 sys-block/gparted kde
 virtual/notification-daemon kde
 
-# Davide Pesavento <pesa@gentoo.org> (06 Jun 2016)
-# Requires unkeyworded dev-python/PyQt5
-net-print/hplip qt5
-
 # Johannes Huber <johu@gentoo.org> (26 Mar 2016)
 # Unkeyworded dependency x11-libs/snorenotify
 net-irc/quassel snorenotify
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 2072793be339..3b9295ec5153 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# dev-python/PyQt5 is not stable.
+net-print/hplip qt5
+
 # Andreas Sturmlechner <asturm@gentoo.org> (15 Mar 2018)
 # Requires media-libs/portmidi which is not stable
 media-sound/hydrogen portmidi
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index ba62d2f2003d..9cef2886a2d9 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -5,10 +5,6 @@
 # kde-frameworks/kdelibs4support not keyworded on ppc
 x11-wm/sawfish kde
 
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Feb 2018)
-# Requires not yet keyworded dependencies
-sys-libs/gwenhywfar sensors serialport webkit
-
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Jan 2018)
 # Requires media-libs/libffado, which requires dev-python/PyQt5,
 # which is not keyworded.
@@ -45,7 +41,7 @@ sys-devel/clang-runtime openmp
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (01 Aug 2016)
 # dev-qt/qtwebkit:5 and kde-frameworks/*:5 not keyworded.
-net-irc/kvirc kde webkit
+net-irc/kvirc kde
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jun 2016)
 # Missing keywords on app-text/gspell - bug #587368
@@ -57,14 +53,6 @@ media-plugins/audacious-plugins qt5
 net-analyzer/wireshark qt5
 sci-astronomy/stellarium sound
 
-# Davide Pesavento <pesa@gentoo.org> (06 Jun 2016)
-# Requires unkeyworded dev-qt/qtwebkit:5, which is a PITA to maintain on
-# minor arches and has been declared deprecated by upstream. So we'd like
-# to avoid keywording it, unless requested by users.
-dev-qt/designer webkit
-net-irc/quassel webkit
-kde-plasma/libksysguard detailedmemory
-
 # James Le Cuirot <chewi@gentoo.org> (30 Jan 2016)
 # scrollview requires Java, which is unsupported on ppc.
 app-text/tesseract scrollview
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 19da80b5d443..c0aa19b0062b 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# Requires not yet stable dependencies
+sys-libs/gwenhywfar sensors serialport webkit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# dev-qt/qtwebkit:5 is not stable.
+dev-qt/designer webkit
+
 # Michael Weber <xmw@gentoo.org> (01 Mar 2017)
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index aadc14726b50..d1eed069ec84 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -58,10 +58,6 @@ net-analyzer/rrdtool rados
 # Missing keywords on deps #567458
 kde-apps/kalzium editor
 
-# Michael Palimaka <kensington@gentoo.org> (17 Oct 2015)
-# Unkeyworded dependencies
-dev-qt/qtwebkit webchannel
-
 # Ben de Groot <yngwin@gentoo.org> (20 Jul 2015)
 # missing keywords
 media-sound/audacity midi soundtouch
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 74ad5000a41e..35aa1a46e827 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,10 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mikle Kolyada <zlogene@gentoo.org> (03 Jun 2018)
+# Not tested
+app-crypt/pinentry fltk
+dev-python/cssselect doc
+dev-vcs/subversion kwallet
+
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
 media-libs/mesa vulkan
 
+# Robin H. Johnson <robbat2@gentoo.org> (05 Aug 2017)
+# Upstream Git is switching to PCRE2 w/ JIT.
+# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
+dev-vcs/git pcre-jit
+
+# Lars Wendler <polynomial-c@gentoo.org> (17 Nov 2016)
+# jit not supported on ia64 (bug #600052).
+dev-libs/libpcre2 jit
+
 # Sergey Popov <pinkbyte@gentoo.org> (24 Oct 2015)
 # Not tested
 net-mail/dovecot lz4
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index bf9dbcfa2b33..c361207bea32 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -50,6 +50,7 @@ directfb
 lirc
 java
 hardened
+qt5
 
 # Needs java
 pdfannotextractor
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 2e9b5fa264c6..d11e26fedd16 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -46,3 +46,8 @@ ABI_X86="32"
 # Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
 # Temporary entry to support stable bug 639476
 RUBY_TARGETS="ruby22"
+
+# Thomas Deutschmann <whissi@gentoo.org> (6 Jun 2018)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 5ba559abf262..884fbc406423 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Michał Górny <mgorny@gentoo.org> (07 Jun 2018)
+# sys-libs/netbsd-csu not stable yet.
+sys-devel/clang-runtime crt
+
 # Thomas Deutschmann <whissi@gentoo.org> (01 Jun 2018)
 # Needs dev-ruby/asciidoctor which has a lot of unstable deps
 net-analyzer/wireshark doc
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index 82dd641f675f..468564c334a9 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -20,9 +20,6 @@ app-emulation/winetricks
 app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
-dev-lang/icc
-dev-lang/idb
-dev-lang/ifc
 dev-perl/Archive-Rar
 dev-util/android-sdk-update-manager
 dev-util/android-ndk
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 2e28bee7cd74..62a977ee8dd1 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -37,9 +37,6 @@ app-emulation/winetricks
 app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
-dev-lang/icc
-dev-lang/idb
-dev-lang/ifc
 dev-perl/Archive-Rar
 dev-util/android-sdk-update-manager
 dev-util/android-studio
diff --git a/profiles/package.mask b/profiles/package.mask
index a4915d46e026..39e704066339 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Lars Wendler <polynomial-c@gentoo.org> (9 June 2018)
+# Causes high system load when being used with kde or gnome print manager.
+# https://bugs.gentoo.org/657526
+=net-print/cups-2.2.8
+
+# Daniel Pielmeier <billie@gentoo.org> (8 June 2018)
+# Does not support PyQt5 as well as python 3. Upstream unresponsive.
+# Masked for removal in 30 days. Bug #649112.
+media-sound/puddletag
+
 # Mike Pagano <mpagano@gentoo.org> (30 May 2018)
 # Masking due to bad commit in the networking stack.
 =sys-kernel/gentoo-sources-4.14.46
@@ -212,36 +222,6 @@ net-dns/dnssec-system-tray
 # Use dev-libs/memcached istead. Removal in 30 days.
 dev-libs/libmemcache
 
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4. Masked for removal in 30 days.
-dev-python/pyside-tools:0
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, does not build, needs someone to bump to Qt5.
-# Masked for removal in 30 days. Bugs #588892, #588898, #649656
-media-libs/libprojectm-qt
-media-sound/projectm-pulseaudio
-media-sound/projectm-jack
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, no revdeps. Masked for removal in 30 days.
-dev-libs/sni-qt
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, dead upstream.
-# Masked for removal in 30 days. Bugs #408651, #642950, #651622
-media-gfx/structure-synth
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, dead upstream.
-# Masked for removal in 30 days. Bug #640258
-dev-util/valkyrie
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, severely outdated, no one does the bump.
-# Masked for removal in 30 days. Bugs #489190, #648666
-media-gfx/ipe
-
 # Hans de Graaff <graaff@gentoo.org> (7 May 2018)
 # Old slots that are ruby23-only and no longer maintained
 # upstream, and that do not have packages depend on them.
@@ -261,11 +241,6 @@ dev-ruby/twitter:5
 >=media-libs/coin-4.0.0
 >=media-libs/simage-1.7.1
 
-# Mikle Kolyada <zlogene@gentoo.org> (4 May 2018)
-# Upstream is dead, no maintainer, no longer updated.
-# Masked for removal in 30 days
-games-misc/fortune-mod-gentoo-ru
-
 # Mike Gilbert <floppym@gentoo.org> (30 Apr 2018)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
@@ -275,12 +250,6 @@ games-misc/fortune-mod-gentoo-ru
 # Masked for testing
 =dev-libs/libressl-2.7*
 
-# Mikle Kolyada <zlogene@gentoo.org> (27 Apr 2018)
-# Upstream is dead, the site with the sources is down.
-# There's no chance to get the sources (fetch restricted)
-# Removal in 30 days (bug #642866)
-app-emulation/armv8-fast-model
-
 # Hans de Graaff <graaff@gentoo.org> (27 Apr 2018)
 # No longer supported upstream. Use ruby23 instead.
 # Masked for removal in 30 days. Bug #642258.
@@ -292,35 +261,6 @@ dev-ruby/tzinfo:0
 # Package version depends on Qt-5.10 that was/is/will not be in tree.
 >=sci-misc/mendeleydesktop-1.18
 
-# Michał Górny <mgorny@gentoo.org> (26 Apr 2018)
-# Apparently redundant to built-in Python features.  Homepage gone
-# without trace.  Last release in 2003.  No reverse dependencies.
-# Removal in 30 days.  Bug #537720.
-dev-python/iconvcodec
-
-# Michał Górny <mgorny@gentoo.org> (26 Apr 2018)
-# Does not work with any of the unmasked django versions.  Unmaintained.
-# No reverse dependencies.  Removal in 30 days.  Bug #527176.
-dev-python/django-evolution
-
-# Michał Górny <mgorny@gentoo.org> (26 Apr 2018)
-# Produces a lot of Pango warnings, then segfaults.  Unmaintained.
-# No reverse dependencies.  Removal in 30 days.  Bug #526668.
-dev-python/kiwi
-
-# Michał Górny <mgorny@gentoo.org> (26 Apr 2018)
-# Obsolete package used during some past GSoC development
-# and unmaintained since.  All of its users have retired already.
-# No reverse dependencies.  The ebuild runs test suite of CPython
-# instead of its own.  Removal in 30 days.  Bug #526552.
-dev-python/tdaemon
-
-# Michał Górny <mgorny@gentoo.org> (22 Apr 2018)
-# Unmaintained buggy package with unresearched segfaults.  No support
-# for Python 3.  No reverse dependencies.
-# Removal in 30 days.  Bug #454680.
-dev-python/simpleparse
-
 # Alexis Ballier <aballier@gentoo.org> (21 Apr 2018)
 # Needs porting of revdeps
 # See: https://bugs.gentoo.org/653678
@@ -337,28 +277,6 @@ dev-python/simpleparse
 sys-fs/aufs3
 sys-fs/aufs4
 
-# Michał Górny (03 Apr 2018)
-# Starting with sys-apps/sandbox-2.13+, unloading is possible via
-# disabling (SANDBOX_ON=0) + wiping LD_PRELOAD. This renders the tool
-# obsolete. Removal in 30 days.
-app-portage/unsandbox
-
-# Matthias Maier <tamiko@gentoo.org> (3 Apr 2018)
-# Remove old Intel C/C++/Fortran compiler ebuilds. These packages require
-# to acquire a non-commercial license by Intel and download "Intel Parallel
-# Studio" in ancient versions (3+ years old). Current versions (as of 2018)
-# can be found in the ::science overlay.
-#
-# Corresponding eclass/intel-sdp eclass slated for removal as well.
-#
-# Masked for removal in 30 days.
-<dev-lang/icc-18
-<dev-lang/ifc-18
-dev-lang/idb
-<dev-libs/intel-common-18
-<sci-libs/ipp-18
-sci-chemistry/cyana
-
 # Jeroen Roovers <jer@gentoo.org> (6 Apr 2018)
 # Requires >=dev-libs/icu-61.1
 # https://bugs.gentoo.org/651698
@@ -398,12 +316,6 @@ media-plugins/gst-plugins-mad:1.0
 # that do not make it any more working. Bug #651030.
 >=sys-devel/distcc-3.3
 
-# Georgy Yakovlev <ya@sysdump.net> (13 Mar 2018)
-# 1.x version is no longer maintained by upstream
-# 2.x is in the tree and is better in almost every way
-# Removal in 90 days. Bug #650464
-=net-dns/dnscrypt-proxy-1.9.5-r1
-
 # Sebastian Pipping <sping@gentoo.org> (11 Mar 2018)
 # Breaks XFCE, 1.19.6 was fine (in that regard). Bug #650228
 >=x11-base/xorg-server-1.19.7
diff --git a/profiles/prefix/windows/cygwin/package.use b/profiles/prefix/windows/cygwin/package.use
index e115972f7c11..e84dda26175c 100644
--- a/profiles/prefix/windows/cygwin/package.use
+++ b/profiles/prefix/windows/cygwin/package.use
@@ -3,7 +3,7 @@
 
 # Michael Haubenwallner <haubi@gentoo.org> (14 May 2018)
 # stack protector does not fully work on Cygwin yet
-=sys-devel/gcc-6* -ssp
+sys-devel/gcc -ssp
 
 # Michael Haubenwallner <haubi@gentoo.org> (23 Mar 2017)
 # Using nettle hides a conflict between wincrypt and openssl.
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index b6003491e016..3c036af7321b 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -10,3 +10,5 @@ move ros-meta/geometry_experimental ros-meta/geometry2
 slotmove =dev-ruby/websocket-driver-0.7.0 0 0.7
 move kde-plasma/oxygen-fonts media-fonts/oxygen-fonts
 move media-libs/vulkan-tools dev-util/vulkan-tools
+move games-strategy/ufo-ai games-strategy/ufoai
+slotmove =net-mail/getmail-5.4 4 0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 14dd30861bc8..42f496546a76 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -280,7 +280,6 @@ app-cdr/brasero:packagekit - Enable support for the distro-neutral package manag
 app-cdr/brasero:playlist - Enable support for playlists through dev-libs/totem-pl-parser
 app-cdr/brasero:tracker - Enable audio playlist search using the app-misc/tracker indexer
 app-cdr/cdemu:cdemu-daemon - Pull app-cdr/cdemu-daemon dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.
-app-cdr/cuetools:extras - Install additional script that tag files based on cue/toc file information
 app-cdr/dvdisaster:debug - Enable memory debugging.
 app-cdr/gaffitter:scripts - Install additional gaffitter scripts for external programs
 app-cdr/mirage2iso:pinentry - Support app-crypt/pinentry password input backend.
@@ -458,6 +457,9 @@ app-emulation/bochs:debugger - Enable debugger (slows down emulation)
 app-emulation/bochs:gdb - Enable support for the remote GDB stub
 app-emulation/bochs:x86-64 - Enable support for emulation of 64-bit CPUs
 app-emulation/containerd:btrfs - Support for BTRFS snapshot driver
+app-emulation/cri-o:btrfs - Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.
+app-emulation/cri-o:device-mapper - Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags.
+app-emulation/cri-o:ostree - Enables dependencies for handling of OSTree images.
 app-emulation/crossover-bin:capi - Enable ISDN support via CAPI
 app-emulation/crossover-bin:opencl - Enable OpenCL support
 app-emulation/docker:apparmor - Enable AppArmor support.
@@ -1951,6 +1953,7 @@ dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readli
 dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
 dev-lang/rust:extended - Build and install rls, rustfmt and cargo alongside the compiler and stdlib
 dev-lang/rust:jemalloc - Use dev-libs/jemalloc as the standard memory allocator
+dev-lang/rust:wasm - Build support for the wasm32-unknown-unknown target
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
 dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 dev-lang/spidermonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -2064,6 +2067,7 @@ dev-libs/efl:xpresent - Enable x11-libs/libXpresent support
 dev-libs/elfutils:lzma - Support automatic decompression of LZMA-compressed files and kernel images
 dev-libs/elfutils:threads - Build the libraries with thread safe support
 dev-libs/elfutils:utils - Install command-line utilities (all the eu-* programs)
+dev-libs/ell:glib - Enable dev-libs/glib support
 dev-libs/fcgi:html - Install HTML documentation
 dev-libs/folks:telepathy - Load contacts from the Telepathy framework
 dev-libs/folks:tracker - Load contacts from app-misc/tracker index
@@ -2267,7 +2271,6 @@ dev-libs/weston:ivi - Enable the IVI shell
 dev-libs/weston:launch - Install weston-launch utility
 dev-libs/weston:rdp - Enable Remote Desktop Protocol compositor support
 dev-libs/weston:resize-optimization - Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi
-dev-libs/weston:rpi - Raspberry Pi GPU support
 dev-libs/weston:screen-sharing - Enable screen-sharing through RDP
 dev-libs/weston:unwind - Enable libunwind usage for backtraces
 dev-libs/weston:wayland-compositor - Enable Wayland compositor support
@@ -2500,7 +2503,9 @@ dev-python/django-two-factor-auth:yubikey - Adds support for Yubikeys via django
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
 dev-python/falcon:cython - Build cython-based python modules
 dev-python/fastparquet:brotli - Enable support for brotli compression
+dev-python/fastparquet:lz4 - Enable support for lz4 compression
 dev-python/fastparquet:snappy - Enable support for snappy compression
+dev-python/fastparquet:zstd - Enable support for zstandard compression
 dev-python/flask-restful:paging - Enable resource paging support
 dev-python/geopy:timezone - Enables localized date support
 dev-python/geopy:yahoo - Enables use of YahooPlaceFinder
@@ -2600,7 +2605,6 @@ dev-python/sympy:pyglet - Use dev-python/pyglet for plots and print preview
 dev-python/sympy:symengine - Add support for a dev-python/symengine backend
 dev-python/sympy:texmacs - Add app-office/texmacs interface
 dev-python/sympy:theano - Add support for dev-python/theano
-dev-python/tdaemon:coverage - Enable code coverage support
 dev-python/translate-toolkit:html - Support conversion between po and html files
 dev-python/translate-toolkit:ical - Support conversion between po and ical files
 dev-python/translate-toolkit:ini - Support conversion between po and ini files
@@ -2943,6 +2947,8 @@ dev-util/nvidia-cuda-sdk:opencl - Build OpenCL binaries
 dev-util/nvidia-cuda-toolkit:debugger - Installs the CUDA debugger
 dev-util/nvidia-cuda-toolkit:eclipse - Install plugins for eclipse
 dev-util/nvidia-cuda-toolkit:profiler - Installs the NVIDIA CUDA visual profiler
+dev-util/ostree:grub - Enable grub configuration generator
+dev-util/ostree:soup - Use libsoup for networking
 dev-util/perf:demangle - Enable C++ symbol name demangling, using libbfd from sys-devel/binutils. When this flag is enabled, the package will have to be rebuilt after every version bump of binutils.
 dev-util/perf:doc - Build documentation and man pages. With this USE flag disabled, the --help parameter for perf and its sub-tools will not be available. This is optional because it depends on a few documentation handling tools that are not always welcome on user systems.
 dev-util/perf:numa - Enable NUMA support
@@ -3317,7 +3323,9 @@ games-strategy/megaglest:tools - Build model import/export tools
 games-strategy/megaglest:unicode - Use unicode strings for wxwidgets
 games-strategy/megaglest:wxuniversal - Use the wxUniversal port which implements the various GUI controls by drawing them itself
 games-strategy/naev:mixer - Enables media-libs/sdl-mixer sound backend in addition to media-libs/openal one.
-games-strategy/ufo-ai:editor - Build map editor
+games-strategy/ufoai:client - Build the main game client
+games-strategy/ufoai:editor - Build the map editor and compiler
+games-strategy/ufoai:server - Build the dedicated server
 games-strategy/uqm:music - download and install music files (large)
 games-strategy/uqm:remix - download and install music remix files (large)
 games-strategy/uqm:voice - download and install voice files (large)
@@ -3955,8 +3963,6 @@ media-gfx/digikam:marble - Enable support for geolocation using kde-apps/marble
 media-gfx/digikam:mediaplayer - Enable support for media player using media-libs/qtav
 media-gfx/digikam:panorama - Build the panorama plugin which requires media-gfx/hugin
 media-gfx/digikam:semantic-desktop - Enable kde-frameworks/kfilemetadata support
-media-gfx/enblend:gpu - GPU support for Enblend
-media-gfx/enblend:image-cache - allow for processing of large images
 media-gfx/eog-plugins:map - Enable world map display using media-libs/libchamplain
 media-gfx/eog-plugins:picasa - Enable uploading to Google's Picasa Web Albums
 media-gfx/eom:gtk3 - Build with GTK+3 instead of GTK+2
@@ -4647,6 +4653,7 @@ media-sound/pulseaudio:equalizer - Enable the equalizer module (requires sci-lib
 media-sound/pulseaudio:gdbm - Use sys-libs/gdbm to store PulseAudio databases. Recommended for desktop usage. This flag causes the whole package to be licensed under GPL-2 or later.
 media-sound/pulseaudio:glib - Add support to dev-libs/glib-based mainloop for the libpulse client library, to allow using libpulse on glib-based programs.
 media-sound/pulseaudio:gnome - Use GConf to store user preferences on streams and so on. Don't enable this flag if you want to use a system wide instance. If unsure, enable this flag.
+media-sound/pulseaudio:gsettings - Use GSettings instead of GConf to store user preferences.
 media-sound/pulseaudio:native-headset - Build with native HSP backend for bluez 5.
 media-sound/pulseaudio:ofono-headset - Build with oFono HFP backend for bluez 5, requires net-misc/ofono.
 media-sound/pulseaudio:oss - Enable OSS sink/source (output/input). Deprecated, upstream does not support this on systems where other sink/source systems are available (i.e.: Linux). The padsp wrapper is now always build if the system supports OSS at all.
@@ -5471,8 +5478,6 @@ net-dns/bind-tools:gssapi - Enable gssapi support
 net-dns/bind-tools:urandom - Use /dev/urandom instead of /dev/random
 net-dns/ddclient:cloudflare - Enable support for updating IP address via CloudFlare
 net-dns/ddclient:hardened - Use iproute2 instead of ifconfig to grab an IP address
-net-dns/dnscrypt-proxy:plugins - Enable plugin support to inspect and modify queries and responses
-net-dns/dnscrypt-proxy:systemd - Use systemd's socket activation instead of creating the sockets itself
 net-dns/dnsdist:dnscrypt - Enable the ability to act as a DNSCrypt server
 net-dns/dnsdist:regex - Enable support for regular expression matching via dev-libs/re2
 net-dns/dnsdist:remote-logging - Enable support for remote logging via dev-libs/protobuf
@@ -6884,6 +6889,7 @@ net-wireless/bladerf-fpga:x115 - bitstream for the x115KLE Cyclone IV FPGA blade
 net-wireless/bladerf-fpga:x40 - bitstream for the x40KLE Cyclone IV FPGA bladerf model"
 net-wireless/blueman:appindicator - Enable usage of dev-libs/libappindicator to export menu options
 net-wireless/blueman:network - Add functionality to setup (host) PAN connections using either net-dns/dnsmasq or net-misc/dhcp
+net-wireless/bluez:btpclient - Enable BTP client
 net-wireless/bluez:deprecated - Build deprecated plugins
 net-wireless/bluez:experimental - Build experimental plugins
 net-wireless/bluez:extra-tools - Install tools that upstream doesn't install on purpose by default. All this tools shouldn't be used. Then, please notify upstream about you still need them to let them know the situation.
@@ -8494,6 +8500,12 @@ www-plugins/gnash:ssl - Enable directly using OpenSSL in libnet (not needed for
 www-plugins/lightspark:gles - Replace default OpenGL renderer with GLESv2
 www-plugins/lightspark:ppapi - Install the PPAPI plugin (for Chromium)
 www-plugins/lightspark:rtmp - Enable Real Time Messaging Protocol using librtmp
+www-plugins/passff:firefox - Install plugin for www-client/firefox
+www-plugins/passff:firefox-bin - Install plugin for www-client/firefox-bin
+www-plugins/passff-host:chrome - Install plugin for chrome (which also includes opera)
+www-plugins/passff-host:chromium - Install plugin for chromium
+www-plugins/passff-host:firefox - Install plugin for firefox
+www-plugins/passff-host:vivaldi - Install plugin for vivaldi
 www-servers/apache:apache2_modules_access_compat - Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.
 www-servers/apache:apache2_modules_authn_core - Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).
 www-servers/apache:apache2_modules_authz_core - Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index efae2df09c83..4fb98eb53250 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/imu_tools/Manifest b/ros-meta/imu_tools/Manifest
index 4b6289e6e5ae..291de9e36759 100644
--- a/ros-meta/imu_tools/Manifest
+++ b/ros-meta/imu_tools/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
+DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
 EBUILD imu_tools-1.1.5.ebuild 425 BLAKE2B dc5a4b08ea353efed9876c8d0f14d07d43801adb80598d07fc950a6c6d9ba86a0a904d91c42e5e85d4b190b673d5822a5e6b3c7dd00ca9883980d3c25242e8ff SHA512 3c7fde8f62f1b388cd7727498362da37c1cfbde078f3a1a2490427670374eae28b5eeeb34a28599583c12cde1438b21249ce9f8c52606db5f9f0e5622ca73531
+EBUILD imu_tools-1.2.0.ebuild 425 BLAKE2B f8dc933d0eee5bc95e3b9a708e1416b9f473ac53c08708531e28648ab7247d3a003971b25624af6220ca01ac57bef85d7ea1452c872c83b7e870698d8b207f1c SHA512 63e0a7f354cff1fcf03e79fb253c98b9164089976e50e1dc408cc3c8ed4b5bafa9534261afabeba7fcbd80ed7fe0501c569079a0f2793096d9606417fca661ea
 EBUILD imu_tools-9999.ebuild 425 BLAKE2B dc5a4b08ea353efed9876c8d0f14d07d43801adb80598d07fc950a6c6d9ba86a0a904d91c42e5e85d4b190b673d5822a5e6b3c7dd00ca9883980d3c25242e8ff SHA512 3c7fde8f62f1b388cd7727498362da37c1cfbde078f3a1a2490427670374eae28b5eeeb34a28599583c12cde1438b21249ce9f8c52606db5f9f0e5622ca73531
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/ros-meta/imu_tools/imu_tools-1.2.0.ebuild b/ros-meta/imu_tools/imu_tools-1.2.0.ebuild
new file mode 100644
index 000000000000..a9db663f6fd2
--- /dev/null
+++ b/ros-meta/imu_tools/imu_tools-1.2.0.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/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Various tools for IMU devices"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/imu_complementary_filter
+	dev-ros/imu_filter_madgwick
+	dev-ros/rviz_imu_plugin
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/roscpp_core/Manifest b/ros-meta/roscpp_core/Manifest
index b5eac3349a5c..a849092b67bd 100644
--- a/ros-meta/roscpp_core/Manifest
+++ b/ros-meta/roscpp_core/Manifest
@@ -1,9 +1,11 @@
 DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
+DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
 DIST roscpp_core-0.6.5.tar.gz 34493 BLAKE2B 9804fe6f23192e0e19bfb26e0671ad36189b936701e45755adb0c54e25c1c92dabd6f645bd014451bcd21f45af39be2f1c24727d1231cc52b62caba4d01ca4ff SHA512 32314cac55716b074416fac6665a8dec3a6a64abfac55be709f50b7ca1cbd993797d176bc2aefe2ae8b233b21e8464f330ad31de98bf60edc63149215dcb0cda
 DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
 DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
 DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
 EBUILD roscpp_core-0.6.10.ebuild 440 BLAKE2B 16b8ee7e778c936f50e9996be7d84bc2e0fcce5c289526bd33e510068b41c2299b539bbfa6e11cba26fc69744ffb80ec0b9e6049c54a4d3949d271c5862e4957 SHA512 56acc7d239994e0c1a194654ea7aff3808117de03ced59b11b5429059b0b51edc0c078483c83d7ac4a9363e0d87fd842e2516d4c3cffc70107ed7fe8245816d4
+EBUILD roscpp_core-0.6.11.ebuild 440 BLAKE2B 16b8ee7e778c936f50e9996be7d84bc2e0fcce5c289526bd33e510068b41c2299b539bbfa6e11cba26fc69744ffb80ec0b9e6049c54a4d3949d271c5862e4957 SHA512 56acc7d239994e0c1a194654ea7aff3808117de03ced59b11b5429059b0b51edc0c078483c83d7ac4a9363e0d87fd842e2516d4c3cffc70107ed7fe8245816d4
 EBUILD roscpp_core-0.6.5.ebuild 440 BLAKE2B eaeba100a8cba2364642381c5d16a0db8d591aab78f876f1d88cb127bf55d2760f3d58c2a87eb6f165ce5a5a9557f2413905491aca3284f254be666f51db9a7f SHA512 c19160c6021835790eae06c6d5f18e4a05b78e1a46bfc01c8dc0b03aac901c09751491f0fa54fc3fb7df13b5810d8a01fb14a4ecb8b296be6de95c1b8a36f075
 EBUILD roscpp_core-0.6.7.ebuild 440 BLAKE2B eaeba100a8cba2364642381c5d16a0db8d591aab78f876f1d88cb127bf55d2760f3d58c2a87eb6f165ce5a5a9557f2413905491aca3284f254be666f51db9a7f SHA512 c19160c6021835790eae06c6d5f18e4a05b78e1a46bfc01c8dc0b03aac901c09751491f0fa54fc3fb7df13b5810d8a01fb14a4ecb8b296be6de95c1b8a36f075
 EBUILD roscpp_core-0.6.8.ebuild 440 BLAKE2B 16b8ee7e778c936f50e9996be7d84bc2e0fcce5c289526bd33e510068b41c2299b539bbfa6e11cba26fc69744ffb80ec0b9e6049c54a4d3949d271c5862e4957 SHA512 56acc7d239994e0c1a194654ea7aff3808117de03ced59b11b5429059b0b51edc0c078483c83d7ac4a9363e0d87fd842e2516d4c3cffc70107ed7fe8245816d4
diff --git a/ros-meta/roscpp_core/roscpp_core-0.6.11.ebuild b/ros-meta/roscpp_core/roscpp_core-0.6.11.ebuild
new file mode 100644
index 000000000000..c4465ab79b4d
--- /dev/null
+++ b/ros-meta/roscpp_core/roscpp_core-0.6.11.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/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Underlying data libraries for roscpp messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/roscpp_traits
+	dev-ros/roscpp_serialization
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 86cca25c5d9b..16f5e36c55be 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 2cd2e265f8af..6c16027d776f 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,6 +1,4 @@
 AUX kstars-2.9.5-qt-5.11.patch 776 BLAKE2B ab6d180fb89b526e4a50df17f24dad512bc25705611636076d287109d8ab6c4109030819458e0760339a59f3185451966c70e3970324cd152d486a18f3a5d6bb SHA512 6287dfdb0720e53d38ca6b24bd5c1c5cfd01af5db36de2b7d45551ac0c57d50d892a31830d8a3328fa1f36ebefc87635380593af97f6d5db0f17705dcb7742d3
-DIST kstars-17.08.3.tar.xz 61485232 BLAKE2B 7ddf318ed9659814b49a5f8efe6ecc3b65d2ba30b4a368d00c6c46f96e42fe36be8e16244b097d665a95b82682bbac1d948999889c9dca56010d1cc4978ddc68 SHA512 fbd409a506f93283f1104ee40eae1f5b306db52483f56ee20a57398576449a0c702d5c6578dceac6543892c16459e3bff594538d801bb80c413d70792c2c68df
 DIST kstars-2.9.5.tar.xz 64033600 BLAKE2B 1d858d40d1ebccb1ae3217d8f3a464089171a6a9777cf759902017b373ceac3c7e56febf6ec3b2bed5db6cef779252e2d653e3c513545bf55261465465df2274 SHA512 850e3ad31f0c60547c406dc24bf3064f86867557f97acd63fb951d49fb09d7d20462a85016f8c645f316de0310cf7969e08c19e00fc0bedb5c1b006dfda0622b
-EBUILD kstars-17.08.3.ebuild 1897 BLAKE2B 78346da0af3f0f854b79130f26086edd5d8506de9f6c713e94f22dd0e27bd6dc9d87ec7a2234b92e8da0a6e12d24fc08066d0f165c27c7df30413f87288e77f0 SHA512 19735f1309ec5368bea65a1f3eaf24536fc1f452b4426b0c87fdeb23e8d61879fde560b84fc93181e7b12aabdfe07b3ce5cd5b2fd45437e7eb053de449f7f2ae
-EBUILD kstars-2.9.5.ebuild 1957 BLAKE2B 05fed53e5ef1f4d97fb92921c9c0a76cb438a93dd928f6e2baed1f09d6eebab62090f655753b58be0bb196c7cc003e5377ae8fdacb64234fa1b1ca44de73fb79 SHA512 be55db06571d17ace568ef48a08de6a5e169667986a6953592b5eb6cafd99fd16d8b82bc0287bfb9baddd171f22de33017cd224eaafd34561b750433a3f638c3
+EBUILD kstars-2.9.5.ebuild 1955 BLAKE2B 78d56d1972e6cf950de1d6d2b0c60e5026c5ef0bc6680213585ed35d27d62ded3528ec0b4ba55bae0ab4c8299b3b4f04930867c14993fe5fa3132d918fae8ba3 SHA512 29b271c2207842c287f3fa45283f9d7dfbe023897b75ae5c43b63d293c7cdaa31c5017be8e54ab07e314e75e2536c08b86653e4527c755a2f79f6e318f2eff2d
 MISC metadata.xml 589 BLAKE2B 2615369c55a548e9263b3544a571c343ea5f1a60dc79b32c1124e06b1feef782f4631f31ecf4c52f37b8370ee8766198364008d3c77a310f5c1c2b34589f5d85 SHA512 e18188aaab2d0b650d7494849df568234e3e385917c70770652895e2907e4bed49ebb76d8874867eb54d008ac958b43eb0bf6486de49694ab299ac37ed8ab9d2
diff --git a/sci-astronomy/kstars/kstars-17.08.3.ebuild b/sci-astronomy/kstars/kstars-17.08.3.ebuild
deleted file mode 100644
index a46c35fe68f8..000000000000
--- a/sci-astronomy/kstars/kstars-17.08.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/applications/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
-IUSE="fits indi raw wcs xplanet"
-
-REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
-
-# TODO: AstrometryNet requires new package
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio )
-	indi? ( >=sci-libs/indilib-1.4.0 )
-	raw? ( media-libs/libraw:= )
-	wcs? ( sci-astronomy/wcslib )
-	xplanet? ( x11-misc/xplanet )
-"
-# TODO: Add back when re-enabled by upstream
-# 	opengl? (
-# 		$(add_qt_dep qtopengl)
-# 		virtual/opengl
-# 	)
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	dev-cpp/eigen:3
-"
-RDEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
-		$(cmake-utils_use_find_package xplanet Xplanet)
-	)
-
-	kde5_src_configure
-}
diff --git a/sci-astronomy/kstars/kstars-2.9.5.ebuild b/sci-astronomy/kstars/kstars-2.9.5.ebuild
index cb8577f01377..a982e58b0958 100644
--- a/sci-astronomy/kstars/kstars-2.9.5.ebuild
+++ b/sci-astronomy/kstars/kstars-2.9.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Desktop Planetarium"
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index e59ea102f561..a6331266ed70 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 021a84b14bbe..b100b6a10fa1 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,33 +1,18 @@
-DIST gromacs-2016.1.tar.gz 27336258 BLAKE2B 3a255252e789a4260b559ab5ce0676c884c40093f647c4c5b0f5ef143383cdb840a668bafcb921f39a81064e9893ddc3d1f7e481bd40ff88f870e94d232b297d SHA512 d30a4ad5faa6e12c95b8e94acaabc387d9aab3780490f5442c48ccac2f86bef6dca60df5bb6097dbc68ab28e6f1a15e234e1244606afdf12a841b88ece65c97b
 DIST gromacs-2016.2.tar.gz 27339623 BLAKE2B c3548f4abdc4c1b09a79a3da99d7ca8060daca7307e4c5b81bd97d54adfb9621fbccf1ea7fd96c3676d6b44c20f9f4cd2168ce131799792512fad3b8b1ac0522 SHA512 f5e74bb8c126823c90d205ac0f0835e61fdd13a4550bc15aa9c972ee9b187f6451cdc90877c17276d2f889d61abb5eaa5ea1b54f7cbf3da67074146c749c1aa6
-DIST gromacs-2016.3.tar.gz 27342692 BLAKE2B 3bea357cb672f41dda68c0d4291c06e2ab8bbc91629e25c9e56741223911be7994be10b2427fb1ca1cd41e511d23323851ba3211ee8590f152e23a64b2253095 SHA512 16593df0a52620766fb86cfeb16328793503f860cb07cdbbd503ba7f41e6430efb4848389b7179ca3907b57311162666d05224b454e1afb1b74b220f38498d86
-DIST gromacs-2016.4.tar.gz 27368706 BLAKE2B 2a176812fe2a097d72c7148ff5ed4ed7209279cf439af6a969c3aba81157c59a4d9af34d19c7b1da088b0a4ab981b489b84446afbcaf64b20724bda1dc3560ff SHA512 69661d2a7a8a5259be277de35e2baa4b688d1f7bef225fc7d733a9b00c6ee135dcbad517c7c9f751121647c2fbd085f2c9cdf22dbd941c7ebc5d3b09e7e08f1f
 DIST gromacs-2016.5.tar.gz 27369491 BLAKE2B 4a8bf1ae3e298ac2e26ec476130720dc3ef00db5d999e3a45fdbfd7fbfe7e94fbc86be6ff0f2f23552769c8bc851ce49c73f6fc1ab13f372523279b93e7794d7 SHA512 9cb8ff88871aa5df0967c60ba303c03296c6fa3c215cd01b26259df7753f0014f04222078ab4b84a66a1f709997837134d5c0f74da19b78322e410010c9d9e10
-DIST gromacs-2016.tar.gz 27321561 BLAKE2B cdcf0aa5ac36981e736fd2ecc2f641e99f40146d829c88e5ff973c7b7c3c1ab920f7822c336e9eea87a8605362e723d7477dd07f9154c8a38476a3f6c391d6aa SHA512 756771baaa85a1d16e7d5b8e4c96bbd1c04c7acdc536a253886cff186316330f06d60d206a0159efb15f47f161c779d3757dc5dbceab8c097241c1382d376201
-DIST gromacs-2018-rc1.tar.gz 29863602 BLAKE2B 1b8146198aef435d74c57b5a6e42b8107416896fed71444830baf4368604c1b35326a77815c5125e1610a9765cf1d5d51d3a69a04d3679f7c1f3618598258c0a SHA512 f2a56a2d3ce6efd170f22d66dbb9418ae59257aff27853037570d0939582df947c7558aa652626dd911ee22c037ab0cb1b340b5008bc8f40d27d90883100d375
-DIST gromacs-2018.tar.gz 29855797 BLAKE2B ff7bfd6a11d8d0fba2a0da405eb264504e18d820179eee234fd2c6e0d6a001aabd601c8a695e14b6d290fbca2253f3fc760a72c6fcaf566f88bb3675612f0bfb SHA512 95c464ec4a0c95b5e7b30571e9693f6be1bce4cd3d6f7d7eeee0f0cd9b8ad43dda4dbb8568e9502706a01d1621f288711227a935060ce524871e6521d53eb902
+DIST gromacs-2018.1.tar.gz 29895119 BLAKE2B 45cc674bd78dc7dc56388a899ae50da9f10eb4dc80dad461f7e298894ee845eae744010013e682f3be4b03c1f04624111266e84cd9721415b23f87d544846827 SHA512 d29f152e9f115c7de07881c6af4cc05481e0a5520bd33142a09507e8c4df9f8b6c9d6d96efcb7adaaf4e0127b76ab247421d43918bd7e7779d6e71f5984db715
 DIST gromacs-5.0.4.tar.gz 26342095 BLAKE2B 27a2483e23533ad627114c0005fa0d49a311b359c31aed6378bdd768c9dda03c3b19f11d961f0bd3b82a1711737d4b7dce13cad5fc56d058dd0110fe21421ee3 SHA512 bc62b623bf71dcaa948aaf7563a3d3afa973da0702062848a20323db202e862dcee413197dacd1472866ccb40fce7709e283177b1c6c49514064f23e6c46b5ee
 DIST gromacs-5.1.3.tar.gz 27095702 BLAKE2B b7fd8fa10e8c4f4368ac551338c59374dc35f85c9fdae5d64eec62929b8f04ea724a084959b3618cd8a151bf3e0a0c84c8f75de953722effca82a4928941ce73 SHA512 9ab26e1b2268f8d567b89b2d99d0b75b937b28edceaec56d17ca3243c76faa31255ffc0c45d762c7c693fe500b00e36ad43b80572d1d7f92dc87f9d2d98c0ba6
-DIST regressiontests-2016.1.tar.gz 67094518 BLAKE2B 3ae0132e246f2abcf77495bff69adb32bfe98063a824cc408279fb43022ca5e8e07afaee08f3a255657b8cdfd21ba2ff4cc428c2c3d21958ba5149ce745d436c SHA512 fc01c802d81400373a147171881f3b7b9309402e8ffb08287ba393aefbb701ba93bbe0b9549ff6fa264a8befbba445c2d2c7450633063a724f78ec8ca81ae8c9
 DIST regressiontests-2016.2.tar.gz 67095329 BLAKE2B fec8a663845ad67374c8a230d1590fa9e5079460198f41cee3b788aaa1c72e8ec9dcda48bc68a594f15003d11bf6617d46cc1a09c16b7a333587b43904a16ba6 SHA512 e0aceb56d1f38a7e6ab9fdaac5063fd20c5b3a162ffb6eddd0e6dc7dff9b724bfe31363493a9437e9f9d5421a534b375960fcb31e903a4901a0fa94ed8511294
-DIST regressiontests-2016.3.tar.gz 67093968 BLAKE2B a644bbd2a0398c1d84f61809a9f4f1cb89d307b0e9952f414e28d18464799e5f49fe810e342768a7b15f1d63b10bf1facb148c1d04ad670c613022302f04ea9d SHA512 ee87df9f339954da0e1f1b4c8b8d4deb574f3b73d174010a295a7a0e8bc462ead7691090ea7cf8ac3d984a6cd70f1cd22c3592fa161b2967061ae5ba2796286b
-DIST regressiontests-2016.4.tar.gz 67643648 BLAKE2B 767c3b0ca1002e6ca68fc3346b7164cca3beaa52f9b1c70672b64cf80427cab045e4d924d0b67a4fe4c76e3a1c0a803964e278d2a9b14b87a555f98dd78525d3 SHA512 367438b897a05e1cc0dcd1d3872fb6a0e9ff6b1146e9448d941d6517dce789f0c478d20cf0a4f3565070f132dc88872441aadb8b499f59efa0e1e4a6dd6a7135
 DIST regressiontests-2016.5.tar.gz 67641413 BLAKE2B 4fcd30c198f3acbbabf1104c040d9a686de49536a97dbeb14732bfa0ed3cf37aa61b1b0f45393668985b993d1f1862a8985e416af819cf9793f5964f3e4f43cc SHA512 31764fd99cc4185d61de5d4443ee482c27b13533451a24aa0e4899997ce275a63685424eafacae38b1a3ffd4ce0d5ebe02a90348953b04c104f91376f0edfdff
-DIST regressiontests-2016.tar.gz 66908712 BLAKE2B 3039b5b46bf99dc2e34a61ed0f47f7355087c260bd1accc119f9ed99bb03c4645d05df41e301cfc6a6de6a9a369b2bf4e01a54852100577e40605e091bbe24e8 SHA512 59902c1973c33ea8f003f21a737dc7cc64da3258112322eedc9834b53628134a6817d5ee5b3950c9bfd97a3a0580aef88ddef0609ef2c58693c96c7575651e01
-DIST regressiontests-2018-rc1.tar.gz 67866295 BLAKE2B 1936a4a14d3011e426e0f057d803339a8324e10d087d56f93dc7a497250a973c6b19ed2691b4641d12b7f13de01dbe36a9903a4e10e3792b842319e42ad0331a SHA512 feccf48d6af84abf350e5ad829c600f86b8e8e4f4f3378c34b209daa30965e3f68751058f12bdbb228da6b4ccd0a72c8191956ec5bd184f190000a9c97e581a9
-DIST regressiontests-2018.tar.gz 67858633 BLAKE2B 21fe5ca9ad682873c616d6ac46e1408d646ab4620498bd63f94f2719354ea38e3b2ee81330629038e320229079802705393b049d9fbdd91612a54a043a98fbcd SHA512 95d4085bd7d60cd1a40dde25d7a770e549f17f69771a63eb55e95e5735b29ebe76dbfebd5452542fede984e9b3ce0339c166aeb9a42754d36be87b43b6d6b1ec
+DIST regressiontests-2018.1.tar.gz 67859956 BLAKE2B f561eb9373b4e0e5faae2aa91e3cb3911c096c1fce96755fc7a8a7b3a25b53bda88ef90d04d3a6fce414bf9dba44d0933827f080949306d5c98f60e5a1797412 SHA512 81c9a62fca859923c1e27214b32b0cff1dd48224dd4ad9301554036b842ccc400a2729752ba71b284e0c5b6c1769ce7de5fe2c9ba4fc7cf0917fd4ced9883112
 DIST regressiontests-5.0.4.tar.gz 65193251 BLAKE2B c5e5f23adcc2639fe652bc252533307c7fda44453d506603242968bd8588c7394028b2c3c7a9252f807a050d40e8f78735e904dfe517d3db8ae962051f4826c1 SHA512 747725fa28c1c9525596bdeeb8809e45268e19036c11dac67d043aa1c51748688ca37eb6014eb7e819eb927a8b9ca2631d0ace4cdff8ed491b08c316c530ab65
 DIST regressiontests-5.1.3.tar.gz 66994083 BLAKE2B 7009f65ad0138664ac84e57f8bc7cce5d18a59f99943e56b6642583120bfce279e005ac0bacd2db8904ea477a48e2b938c64de46a65fa5d08fce6009d53583c3 SHA512 486e86eb3b75bae822abe82dac4e1098aa13723bd04214021f835a2f0b847303f015a9ececc33aa5ae63d31a2eeae07e512f22464b6c0e26d1286b0781578022
-EBUILD gromacs-2016.1.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb0f5c40cdf1a75e81b59bd2d603b4235f6e4942e40211b748b7cf8239c90f8d613b20bdc44fca48d23f9c45ae14 SHA512 ce2b0d2730e87831a517468033cada7097ba431d8a60dcef77a04c9e05bf4cfacb6eb500a5196e378f4c69e5020f8e9f871eac6e61dd2776834aee006ecb167f
 EBUILD gromacs-2016.2.ebuild 7971 BLAKE2B 90510b56d31e59f2f7f76e7772b55e4acdb825af6e8df46da40c7aeb6b7d4b986253b10ac71fbd04c749dd3935b1eeb154e7d0aac7b21147859fb03b57e4e687 SHA512 7a85084cc29da0d3da6c9aabf65320edb38cd682146cc1b739120b728c6704c3e20941b9022c846b84a111e3ca88f29ca21cdbcdf4c5b7204989ac194bf15725
-EBUILD gromacs-2016.3.ebuild 7974 BLAKE2B ec37b1dbbbbe9c3aab0d7819f48c15e7c29d2855ac9d1b0b43b364bdfd11d8fae675c6ea8b69cee9966c5022f340b139553f58a592eb637c997fd579b3ba97b1 SHA512 9a3415f66fdd5832abf764b6adfe5deccb62b3f233ccd9156e1caac61907835c13623a3772673c43c9a3e9dbe544e83b2f20953a09d9b598c6af0120cfed558d
-EBUILD gromacs-2016.4.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb0f5c40cdf1a75e81b59bd2d603b4235f6e4942e40211b748b7cf8239c90f8d613b20bdc44fca48d23f9c45ae14 SHA512 ce2b0d2730e87831a517468033cada7097ba431d8a60dcef77a04c9e05bf4cfacb6eb500a5196e378f4c69e5020f8e9f871eac6e61dd2776834aee006ecb167f
 EBUILD gromacs-2016.5.ebuild 7987 BLAKE2B 02bfdcce78718a1e16ad0cdf63e521d656eaa886ddf2ef7016f22abc398b95e240ecb4705a894609f188afbf4ec17c96ee9441ee7510cfaeb02c0ceced4e1b17 SHA512 5d762c0f9212ec0b91fba7565c15787201b1fcd923111b7055d6362b813d92b850f67becff023c57d3846c2f01a7df29e2b5e52d1bd643f797305c59449b1f46
 EBUILD gromacs-2016.9999.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb0f5c40cdf1a75e81b59bd2d603b4235f6e4942e40211b748b7cf8239c90f8d613b20bdc44fca48d23f9c45ae14 SHA512 ce2b0d2730e87831a517468033cada7097ba431d8a60dcef77a04c9e05bf4cfacb6eb500a5196e378f4c69e5020f8e9f871eac6e61dd2776834aee006ecb167f
-EBUILD gromacs-2016.ebuild 7968 BLAKE2B c0ba44661dce5ccda3c2378fad57e88ca90d15cb1914d6214ee4559e8ebd6c6c700624b32abf168a4a653cc5794fac9fab71024a9b7bc5464d404d768ac74ef1 SHA512 3ca5d4ae9b01a106b279bc828e42366a017b9517a450b773b944c6d12dce64199e3a80d280e4c475c637c70009a1a0fd1ca74f99b03f08067a10d9e9ad450d8f
+EBUILD gromacs-2018.1.ebuild 7899 BLAKE2B f70665f54e2103275dbf7466d15c15ce41593264bb768b542a49eebd76b1764871ac9b82e9eacee5db1a413cac8863a6e87d751cdb2196ff5a431a096c7f6f3f SHA512 3cb7bab30e822420e308b15af997f01ab3ce3072ddefc752d5f0d314040f699febcd804d983cf9af160d1388b38a62e81c9ee6fc7a6647a5d7e199262b3afec9
 EBUILD gromacs-2018.9999.ebuild 7899 BLAKE2B 8053de4c12e2201d37e8d0a077d33fc0b103b79d73379488c46bc638ba763b55ebf69ae53180ffd850e4b860fc03a1c3ec57049f1b257e04e0322ed482afcd51 SHA512 734710474160c6a55206b332e5370bd9e2d0092aed19c4c1ccab7f5d9567eac2a47d163a50aa607f8c7e8e2ccc6eadeb9b394e9f638ac85eafe5f74ced68fd02
-EBUILD gromacs-2018.ebuild 7899 BLAKE2B f70665f54e2103275dbf7466d15c15ce41593264bb768b542a49eebd76b1764871ac9b82e9eacee5db1a413cac8863a6e87d751cdb2196ff5a431a096c7f6f3f SHA512 3cb7bab30e822420e308b15af997f01ab3ce3072ddefc752d5f0d314040f699febcd804d983cf9af160d1388b38a62e81c9ee6fc7a6647a5d7e199262b3afec9
-EBUILD gromacs-2018_rc1.ebuild 7899 BLAKE2B 8053de4c12e2201d37e8d0a077d33fc0b103b79d73379488c46bc638ba763b55ebf69ae53180ffd850e4b860fc03a1c3ec57049f1b257e04e0322ed482afcd51 SHA512 734710474160c6a55206b332e5370bd9e2d0092aed19c4c1ccab7f5d9567eac2a47d163a50aa607f8c7e8e2ccc6eadeb9b394e9f638ac85eafe5f74ced68fd02
 EBUILD gromacs-4.6.9999.ebuild 8110 BLAKE2B dd8ac9cbc4abfcc75a3a188c59cdbe5111f363404ff5a787f64b05d4bd411deebb50f172f09963800ed87997788b2e678617805e65a523bed19aa6ef18fe2b96 SHA512 2206e257f0b29b6f3a90c5d7739079b9add3e04f2a3acbd58c814811b389b5d51b3594815a94529d1de43deb380504029c302d18fc16d63a81c92727254e863e
 EBUILD gromacs-5.0.4.ebuild 8429 BLAKE2B c06c423365fa79befd5a4f0b6314e77b96d983c84df776ce84fddc79d35ce735d856d1184e5913af0c8cd3a0c4e9087110af9bd4402e2bce1f014e64a8a585a7 SHA512 d1e91cc25c5f90bd0fbad15060cae9c8bf1235ca45a2b72521b3a4f5f091bdd7d32ec2e6ff2bb22cd3fe165092f11a24ea148ae8000b8517f0b8671f6c2af6f2
 EBUILD gromacs-5.0.9999.ebuild 8439 BLAKE2B 33d51254e62593a58c636bd902f43edc553ad11af306d1d022278b223eda15b0772097f26565df74a1118bd5b144e5b93aac09cdb995123ccbae2856889c31b2 SHA512 6756116cdeae9c21b094f74ea1b1d9f41617467dc736878cdcff27fed9f53b338830a608e23e87238d0756884799fbc5d62f02685774ea86c239ecc3e8804814
diff --git a/sci-chemistry/gromacs/gromacs-2016.1.ebuild b/sci-chemistry/gromacs/gromacs-2016.1.ebuild
deleted file mode 100644
index 7e426ddfdf5a..000000000000
--- a/sci-chemistry/gromacs/gromacs-2016.1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)
-	dev-libs/tinyxml2
-	"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl && has_version "<sci-libs/mkl-11.3"; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		-DGMX_EXTERNAL_TINYXML2=ON
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2016.3.ebuild b/sci-chemistry/gromacs/gromacs-2016.3.ebuild
deleted file mode 100644
index b361f69c44f4..000000000000
--- a/sci-chemistry/gromacs/gromacs-2016.3.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)
-	dev-libs/tinyxml2
-	"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl && has_version "<sci-libs/mkl-11.3"; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		-DGMX_EXTERNAL_TINYXML2=ON
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2016.4.ebuild b/sci-chemistry/gromacs/gromacs-2016.4.ebuild
deleted file mode 100644
index 7e426ddfdf5a..000000000000
--- a/sci-chemistry/gromacs/gromacs-2016.4.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)
-	dev-libs/tinyxml2
-	"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl && has_version "<sci-libs/mkl-11.3"; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		-DGMX_EXTERNAL_TINYXML2=ON
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2016.ebuild b/sci-chemistry/gromacs/gromacs-2016.ebuild
deleted file mode 100644
index 84f5c56a6aae..000000000000
--- a/sci-chemistry/gromacs/gromacs-2016.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:1}-${PV:2:1}"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl && has_version "<sci-libs/mkl-11.3"; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2018.ebuild b/sci-chemistry/gromacs/gromacs-2018.1.ebuild
index 11f2b2483a38..11f2b2483a38 100644
--- a/sci-chemistry/gromacs/gromacs-2018.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018.1.ebuild
diff --git a/sci-chemistry/gromacs/gromacs-2018_rc1.ebuild b/sci-chemistry/gromacs/gromacs-2018_rc1.ebuild
deleted file mode 100644
index 315835fdc606..000000000000
--- a/sci-chemistry/gromacs/gromacs-2018_rc1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/modeller/Manifest b/sci-chemistry/modeller/Manifest
new file mode 100644
index 000000000000..1c4122663ce1
--- /dev/null
+++ b/sci-chemistry/modeller/Manifest
@@ -0,0 +1,3 @@
+DIST modeller-9.20.tar.gz 34909796 BLAKE2B d89c81823c4d7784a7b3d64fdb01158a973edc7d8b316c773e038ba8645797c543d5bc58c1bff5462ae5975a6c2796f4b2d500641d226c3b2281cf794cfeba8d SHA512 667edeeda0a9038258f6932b3cef22a1e9d0fe47f47bd2ac612e7bac7f23a863f5a65cfd93abfa405310e7fb7b305d53e71d6c6e930613b0dbd43b24dcd5919a
+EBUILD modeller-9.20.ebuild 3692 BLAKE2B b5980772f4916b2eb66b09be0480331bcc0d2c608d9ac96af0c414ecd00806e2c8ab8fbb9bd190466abcc79b5e4f3137e24263de6c48588bdd7d120c63de11eb SHA512 c3ba77e370565394cad2df714b94ae8c39633ca5e0a29e9bdecd5a4e17d331604d6aafe78771ea6de08e39aa0af9712f6b6a73bdeb01d862706646f2fafa8b4b
+MISC metadata.xml 265 BLAKE2B d5a98b9309829a0486c4b8a4336c2d24a0fe34e926d52afd0cc87e16fcc887ca4c18851e58afb33866823121fa8f221a90e0d726dbd85552a4caf66cf03b7b4a SHA512 470f6c178e88c4e83afa46d5e901a45fc2427a779ae832df7fa2d6e25e9e8b4ce77cd3a8fe191e6242d6df3b673f0de6b4f90f1e147aa8b8dd566f18163cc73a
diff --git a/sci-chemistry/modeller/metadata.xml b/sci-chemistry/modeller/metadata.xml
new file mode 100644
index 000000000000..da36ecbfcd6a
--- /dev/null
+++ b/sci-chemistry/modeller/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/modeller/modeller-9.20.ebuild b/sci-chemistry/modeller/modeller-9.20.ebuild
new file mode 100644
index 000000000000..0d29c3843f29
--- /dev/null
+++ b/sci-chemistry/modeller/modeller-9.20.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils multilib versionator
+
+DESCRIPTION="Homology or comparative modeling of protein three-dimensional structures"
+HOMEPAGE="http://salilab.org/modeller/"
+SRC_URI="http://salilab.org/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="modeller"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+SLOT="0"
+
+RESTRICT="mirror"
+
+DEPEND=">=dev-lang/swig-1.3"
+RDEPEND=""
+
+INPATH="${EPREFIX}"/opt/modeller${ver}
+
+QA_PREBUILT="/opt/*"
+
+pkg_setup() {
+	case ${ARCH} in
+		x86)
+			EXECTYPE="i386-intel8";;
+		amd64)
+			EXECTYPE="x86_64-intel8";;
+		*)
+			die "Your arch "${ARCH}" does not appear supported at this time.";;
+	esac
+}
+
+python_prepare_all(){
+	sed "s:i386-intel8:${EXECTYPE}:g" -i src/swig/setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile(){
+	cd src/swig || die
+	swig -python -keyword -nodefaultctor -nodefaultdtor -noproxy modeller.i || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd src/swig || die
+	distutils-r1_python_install
+}
+
+python_install_all(){
+	cd "${S}" || die
+	sed \
+		-e "/^EXECUTABLE_TYPE/s:xxx:${EXECTYPE}:g" \
+		-e "/MODINSTALL/s:xxx:\"${INPATH}\":g" \
+		-i bin/modscript || die
+
+	sed -e "s;@TOPDIR\@;\"${INPATH}\";" \
+		-e "s;@EXETYPE\@;${EXECTYPE};" \
+		bin/modpy.sh.in > "${T}/modpy.sh"
+
+	insinto ${INPATH}
+	doins -r modlib
+	python_foreach_impl python_domodule modlib/modeller
+
+	insinto ${INPATH}/bin
+	doins -r bin/{lib,*top}
+
+	exeinto ${INPATH}/bin
+	doexe bin/{modscript,mod${PV}_${EXECTYPE}} "${T}"/modpy.sh
+
+	python_foreach_impl python_doscript bin/modslave.py
+	dosym ${INPATH}/bin/modscript /opt/bin/mod${PV}
+	dosym ${INPATH}/bin/modpy.sh /opt/bin/modpy.sh
+
+	exeinto ${INPATH}/lib/${EXECTYPE}/
+	doexe lib/${EXECTYPE}/lib*
+	dosym libmodeller.so.8 ${INPATH}/lib/${EXECTYPE}/libmodeller.so
+	dosym ../../${INPATH}/lib/${EXECTYPE}/libmodeller.so.8 /usr/$(get_libdir)/libmodeller.so.8
+
+	use doc && HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/${PN}/
+		doins -r examples
+	fi
+
+	insinto /etc/revdep-rebuild
+	cat >> "${T}"/40-${PN} <<- EOF
+	SEARCH_DIRS_MASK="${EPREFIX}/opt/modeller/lib/"
+	EOF
+	doins "${T}"/40-${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -e "${INPATH}/modlib/modeller/config.py" ]]; then
+		echo install_dir = \"${INPATH}/\"> ${INPATH}/modlib/modeller/config.py
+	fi
+
+	if grep -q license ${INPATH}/modlib/modeller/config.py; then
+		einfo "A license key file is already present in ${IN_PATH}/modlib/modeller/config.py"
+	else
+		ewarn "Obtain a license Key from"
+		ewarn "http://salilab.org/modeller/registration.html"
+		ewarn "And run this before using modeller:"
+		ewarn "emerge --config =${CATEGORY}/${PF}"
+		ewarn "That way you can [re]enter your license key."
+	fi
+}
+
+pkg_postrm() {
+	ewarn "This package leaves a license Key file in ${INPATH}/modlib/modeller/config.py"
+	ewarn "that you need to remove to completely get rid of modeller."
+}
+
+pkg_config() {
+	ewarn "Your license key is NOT checked for validity here."
+	ewarn "  Make sure you type it in correctly."
+	eerror "If you CTRL+C out of this, modeller will not run!"
+	while true
+	do
+		einfo "Please enter your license key:"
+		read license_key1
+		einfo "Please re-enter your license key:"
+		read license_key2
+		if [[ "$license_key1" == "" ]]
+		then
+			echo "You entered a blank license key.  Try again."
+		else
+			if [[ "$license_key1" == "$license_key2" ]]
+			then
+				echo license = '"'$license_key1'"' >> "${INPATH}/modlib/modeller/config.py"
+				einfo "Thank you!"
+				break
+			else
+				eerror "Your license key entries do not match.  Try again."
+			fi
+		fi
+	done
+}
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest
index 2dfe0ff1b01b..be99a3ca0878 100644
--- a/sci-chemistry/molsketch/Manifest
+++ b/sci-chemistry/molsketch/Manifest
@@ -1,9 +1,5 @@
 AUX molsketch-0.3.0-_DEFAULT_SOURCE.patch 661 BLAKE2B 48e877f41de2b27d1c6bbdac34d68893b58bf22e3d2ca8fa3e777f950f6906b100471b0a1287205e65bb5e97e9b3bd40b64377f513750ec039ebffdddbd0ea22 SHA512 9fd409ca55d5df0c61e84d3d9941f4855b7dcd32fd7521f24204570858dc6205c70ca4c645c5eee31bdc446a315e02081fa947677a4f22addce16ec4dad64c10
-AUX molsketch-0.3.0-desktop.patch 572 BLAKE2B 60a377d98647d213a5be4bc6b3dc251cb0b78f366c4bdd9f9fd52eeb79a08cedae8066b25daa61e69f32d6c59edf1c0e2111573d03e7f2ebe8162000e7a4c87f SHA512 dbb074dd2bff41872ce9363241aa26bdc2537950c7635399c7a173845c30b8603de24bc6dcaf8a27a6eadbdc2c5249aa4cdd2bb63f059475d53f99b99acffd6a
-AUX molsketch-0.3.0-no-quotes.patch 490 BLAKE2B 52b1e3330f7bc734e59de3f46f8303ca20d7eb20c84cce7f5d2e3ad935de535304265ae87dbe1cf9756ee19c0505b34d0b6af26fd3e2a1c9f02a9c33086d82d7 SHA512 cf5028b8b99c77543943f517eee6eafbe8bc8a590fe8dbb9840001e568866a74c852fd59653714f507b0a5a556ce7c40dd1768c29df92af9cb8ff4131ac48e35
 AUX molsketch-0.4.1-more-quotes.patch 478 BLAKE2B 857f6a6f2514a4322f2a178aed0232f6f18d06831fea72ac8bbfa2cb806cdb2f73f2daeb4e9b8326be9dbd96518047c24f2721c3509d1551d90cfa80ca0105a8 SHA512 015344abb4aaa7f214e4e8a7eebe1a7a8f4d43b8a76a9c5f984fc4c5cf8da450430330543fe69d481ceec25c5a59ee332439654fd4ce82ce080aa4883cc1d113
-DIST Molsketch-0.3.0-src.tar.gz 337388 BLAKE2B c24f82326b1dd852b5828acd7fea1d9b0e4ff048b23aa8e07dc54380041077d7dce3799491db4d101cd6686fc96724e540dd5ec19494a04b94a41cd50ce33bbe SHA512 405553c9d84f0ce9d70a237834f8273dd5010b95868434f9b1b9042fd626e2782c5d3da7d17d9485946210e48e86d0c2de8385d80667018dbc833c3928d076d4
 DIST Molsketch-0.4.1-src.tar.gz 1499842 BLAKE2B 22584f012e838037f9e23c16da6c63984604002884d279b2b6012d80eb08af9ee18b4d364fa29327572854fccad34840f97413b29b487cfbeb6496a2a8003d17 SHA512 263b088c2b8d01c1f13802b18aea6f6784580fe1a806de45b0e1ecd9f29024350e01a611bdeed1891938acc733a42746203d345d3be13ebaf4c309413e86bf26
-EBUILD molsketch-0.3.0.ebuild 1352 BLAKE2B 79905fc613749ec68a02a683c901a239eaf146275a4a725cbb052fc05b76163cbf8175b892aa86bf86e300eb0d0c2ae9a8673f94fe4a24a86471e8bf5aa10984 SHA512 d63d3a6ac76f071977d1708f072082a1e2ea3c7f02bb6cb37a28cdc62a9255eb2766257cf86b0a9c65ef9c7a0cf5828e7d1afc8616035c2cb93cb155fbbf72e0
 EBUILD molsketch-0.4.1-r1.ebuild 1359 BLAKE2B 2c455402f624b9fadf848b8e4f9ecbcf0d89f453f284bd907a55ef2118f6099af46d907216bf40319f5fece28b3d00c294286cdf82137f0a807299b707e05e50 SHA512 e1ecf0c0a0412cee651839204cd80039216a81bbd28cd37c23197a8270ce97e26b2df644b4b9144f139d7b8243b3437a2f13301c184152ad89fcf9778d6eaf82
 MISC metadata.xml 609 BLAKE2B 07b5bc6ee3fbbbd071bac3959e4f42a6d38cb6dff2ca6e86f9d6e0108c9f3370dc1a99ea5b4a26b58769d45d064e85e9c0c5c6cacf980b68def32e7c63b1cf54 SHA512 34417299d583ff8a830dbe5e4898e999c3a4d72f11cc032f1274e12ad9dfb424d7d8eaaa2e5dac8efb748d7da68691e4ea1b4b1a426407b8dadc740ba109d61c
diff --git a/sci-chemistry/molsketch/files/molsketch-0.3.0-desktop.patch b/sci-chemistry/molsketch/files/molsketch-0.3.0-desktop.patch
deleted file mode 100644
index fd44e88c7870..000000000000
--- a/sci-chemistry/molsketch/files/molsketch-0.3.0-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- molsketch/src/molsketch.desktop | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/molsketch/src/molsketch.desktop b/molsketch/src/molsketch.desktop
-index a4a5418..4e0a2ef 100644
---- a/molsketch/src/molsketch.desktop
-+++ b/molsketch/src/molsketch.desktop
-@@ -5,9 +5,9 @@ Type=Application
- Name=molsKetch
- TryExec=molsketch
- Exec=molsketch
--Icon=molsketch.png
-+Icon=molsketch
- DocPath=molsketch/index.html
--MimeType=chemical/x-cml
-+MimeType=chemical/x-cml;
- Terminal=false
- Categories=Qt;Education;Science;
- GenericName=2D molecular structures editor
diff --git a/sci-chemistry/molsketch/files/molsketch-0.3.0-no-quotes.patch b/sci-chemistry/molsketch/files/molsketch-0.3.0-no-quotes.patch
deleted file mode 100644
index db7be800e385..000000000000
--- a/sci-chemistry/molsketch/files/molsketch-0.3.0-no-quotes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64c18a2..75c2fb7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,7 +97,7 @@ endif(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5PrintSupport_FO
- if(FORCEQt4)
- 	add_definitions(-DQTVERSIONSUFFIX="")
- else(FORCEQt4)
--	add_definitions(-DQTVERSIONSUFFIX="\\\"-qt5\\\"")
-+	add_definitions(-DQTVERSIONSUFFIX="-qt5")
- endif(FORCEQt4)
- 
- # and OpenBabel2
diff --git a/sci-chemistry/molsketch/molsketch-0.3.0.ebuild b/sci-chemistry/molsketch/molsketch-0.3.0.ebuild
deleted file mode 100644
index d9533bfed28c..000000000000
--- a/sci-chemistry/molsketch/molsketch-0.3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils multilib qmake-utils
-
-MY_P=${P/m/M}-src
-
-DESCRIPTION="A drawing tool for 2D molecular structures"
-HOMEPAGE="http://molsketch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/Molsketch/Lithium%20${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	>=sci-chemistry/openbabel-2.2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P%%-src}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-no-quotes.patch
-	)
-
-src_prepare() {
-	sed -e "/LIBRARY DESTINATION/ s/lib/$(get_libdir)/g" \
-		-i {obabeliface,libmolsketch/src}/CMakeLists.txt || die #351246
-	sed -e "s:doc/molsketch:doc/${PF}:g" \
-		-i molsketch/src/{CMakeLists.txt,mainwindow.cpp} || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPENBABEL2_INCLUDE_DIR="${EPREFIX}/usr/include/openbabel-2.0"
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDE4=ON
-		-DENABLE_TESTS=$(usex test "ON" "OFF")
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym ${PN}-qt5 /usr/bin/${PN}
-}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index d4690de6d2e3..abc20f974011 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index e7031ba69d7d..20895c53362c 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,8 +1,7 @@
 AUX ffmpeg4.patch 1301 BLAKE2B 7ce55736e3a6fd4b9e0ebc8515305a666cc042c8063eb86aa7efc87c5bad290e15c9778f1be383fbd1bc6e1ed49f537671d522966523ccccba4f7644f1c24447 SHA512 6500270c1d5c9d165a70ec44f30bb6fc3d921461554af0d92d79ff9f659993cfbb87459cb0e78d49d507cd27b39354c53d93fd9839068fa28bcd0c8eaf03245c
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
-AUX tinyxml6.patch 870 BLAKE2B 2edfb3b8f3a2ec715f429bb982c8f33179d713206bd427d10e4f9277fcc48712c8be2683f9d1ed54447dfde3d055a4fdd87e779bb58918ea78e19dedd3ce6109 SHA512 819b67127e97abe0dfd2b145f8d4e1aab1a11d7a8d734f085d82b3c4b814a37498e2f6b913e6c4a3a558c0420fc6f5de3dae508e76c6465352a3e6e45292eec6
-DIST gazebo-8.2.0.tar.bz2 52513092 BLAKE2B d44c4ac837163331f50e266bb4880f42fff82037ccc9a7e1ac7ccea0a37415a2fc217c62b449358510308fc741e0c569e2613c70c328e323f6f018c5bc6f0b31 SHA512 d2561a6e5460ea068d9c84945e5955d986bc1f6f0d1ba16100aae53015c6e11da3a152ac6ecb906147d37261d4c680025bcc5f5587c6c09f127319dc184cf843
 DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50
-EBUILD gazebo-8.2.0-r1.ebuild 1871 BLAKE2B de6a0ab367d0e12fd886b64b2f88467d19b923c7d86399baf1254ae61875399ed08d733cf6b4ca9cdcb5f7971f3fb7bf44d253f72c823972d40e5fa10bc58127 SHA512 83bb680ebeb1f08fa09c9192acbf5ad744bc37fd4782f3d2387bfbaee50bc202eb891a0a7798d0255fc77cc1b137913b5ceba21fa0ed41cc07cf2bd910c10000
+DIST gazebo-9.1.0.tar.bz2 52928923 BLAKE2B 2b152964d649a3eb572b96bbb27e8f6795bddd5347f893f200d97a80f4c0d8128d548d87dfa3e5051b9aa3af6a4a6be56e79f05252cc6f17278ef2c1592cfb0e SHA512 9ea27cf802e6ce657fe98c886f9d4582303abcec83f6be5e27980969564ec69f42c9589586baa19ea4fd514c3385b9b263f7205a0510b42414c90c1de7cbfd29
 EBUILD gazebo-9.0.0.ebuild 1864 BLAKE2B eb60f9ede47bcf3d12a23472e59291d612d9528992f0f4ee9ff1a45911a305e9e2d38ef8b17090da9b61fafc16cf30c9147f8dae034c38a13f933cd767e4b909 SHA512 1b4b025892208067cd7276bebec5235f6708ef7e0d4ca9f2588c1a076dafcfa1d8b23489a5afbb32e49ce4cdc0778d5480b1d41641a629071d2bce92a675782b
+EBUILD gazebo-9.1.0.ebuild 1836 BLAKE2B 01ef8b3926fb57be24d79c8c84d018ef9f382007c29e73fa597c22b1958c52fa4fa75f17c9f82de6dd4d0a8fd193e30d6a59121995e1e06b8cc3aea88966cd8e SHA512 286428641b606469bdc2887d3b0a0d8a5bbf9eb356daf08b5cb1810469dc1fcea52553b86d9eb2ec74d021360e369a5820ab7f839cb4eb1f61824e7512ac6dd2
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/tinyxml6.patch b/sci-electronics/gazebo/files/tinyxml6.patch
deleted file mode 100644
index 16a3862fc78f..000000000000
--- a/sci-electronics/gazebo/files/tinyxml6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gazebo-8.2.0/gazebo/util/LogPlay.cc
-===================================================================
---- gazebo-8.2.0.orig/gazebo/util/LogPlay.cc
-+++ gazebo-8.2.0/gazebo/util/LogPlay.cc
-@@ -125,12 +125,9 @@ void LogPlay::Open(const std::string &_l
-   {
-     gzerr << "Unable to load file[" << _logFile << "]. "
-       << "Check the Gazebo server log file for more information.\n";
--    const char *errorStr1 = this->dataPtr->xmlDoc.GetErrorStr1();
--    const char *errorStr2 = this->dataPtr->xmlDoc.GetErrorStr2();
--    if (errorStr1)
--      gzlog << "Log Error 1:\n" << errorStr1 << std::endl;
--    if (errorStr2)
--      gzlog << "Log Error 2:\n" << errorStr2 << std::endl;
-+    const char *errorStr = this->dataPtr->xmlDoc.ErrorStr();
-+    if (errorStr)
-+      gzlog << "Log Error:\n" << errorStr << std::endl;
-     gzthrow("Error parsing log file");
-   }
- 
diff --git a/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild b/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild
deleted file mode 100644
index 2c1546415b0b..000000000000
--- a/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 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-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]
-"
-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" "${FILESDIR}/tinyxml6.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-9.1.0.ebuild b/sci-electronics/gazebo/gazebo-9.1.0.ebuild
new file mode 100644
index 000000000000..76ad65771aa8
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-9.1.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 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/9"
+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-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-6.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:1=
+	sci-libs/ignition-math:4=
+	net-libs/ignition-transport:4=
+	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/xcircuit/Manifest b/sci-electronics/xcircuit/Manifest
index 493183218a7c..f690b7944b22 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,9 +1,7 @@
 DIST xcircuit-3.7.48.tgz 1648993 BLAKE2B 4c3693a75323634ec39a4bc1b76a5310c68e63346cf92209fdce7576038315e4a3488f18c9835dca5069e947daabf143c6b6ab328ae37c4adc2bb6255bacedc9 SHA512 686bd2139a6d2d5011b51ff500ea9ffb4007326734eafc0afeec250cb844d8107a344c4ef90d2ed747d8485e7dc8dca69c7e62fd785fc17d3f3460212a0dcb84
 DIST xcircuit-3.8.83.tgz 1533560 BLAKE2B 25e634effad9f5c81954982baacdcb6cf05423ed4c7b92abd85873af054f29b0886a6dddf9771862f839e8274067f990e684f20f3fd123b4298ddb1826637d53 SHA512 2fc798c7fd1e098e4cf1605cd46007ae980be27373cdc0089a129f4a98be475c6a7452e8498c39d28bc97e7b8d7dcd9ef35e029ca416fb49144f00bf83c4b36a
-DIST xcircuit-3.9.62.tgz 1610475 BLAKE2B 1d1c0e33aef24e9d68c5ea6aecda0897a3bfb269db653196c554b1847884837c459edb19c5a023d5ecaacc3bc8458664948cb2c6498c272011736b59b117aa08 SHA512 8042c2b891336e3985385eaefa5762f806af779f2885a74f180b91fdd5178cfb276e496974ad7e81e64cd3e403b4039d060ab6a660a52f18455cd67811609fd7
 DIST xcircuit-3.9.73.tgz 1620922 BLAKE2B ac3f8e6f9370efd720b57a9cd7c487621534f477d1af4fd267d311da3bd949886eccd1c8e8e59071689637272ca23f985dd1809594aab692fa60ea2ca8f8a456 SHA512 2dfeb130a48c99bf08bdff94250f7157acd283bc3f3d6b41f963346deb1241aca0d59a3e8d60dbd36a4aa60acd89e131b263ddbf489b2b44e7e1831714d7b703
 EBUILD xcircuit-3.7.48.ebuild 1212 BLAKE2B e462f909be5497e81247a0fa96f0cbbd080e3a9de4a4ece573977e9f77828f09815b454d61e1926832e4dcc7b57cc609415039f5226825f1524fdb3904873ab0 SHA512 35365cb0b11d21c406849a7d7edc09bf024e1b320561654e76d72f367c902f00c4079f7a9674b5b40992e3770cd119f4749b1df228328805f88d9ec51b05b590
 EBUILD xcircuit-3.8.83.ebuild 1215 BLAKE2B ed8669698fd431940c1a82425f35bebd36daa2690e80bef00429546efcf39d85b9cac203830d944bc346e7c4d5e1ccf18730081f1922ba59063556e01d55da59 SHA512 39e18aaded14727d29bc4ec769fa645195b60768469654b08651934781cdbfcc9155a740f9a634919ada0edc34dd9ee0b523da4fcd5306eaddadc4136ba8cd39
-EBUILD xcircuit-3.9.62.ebuild 1286 BLAKE2B 5bcf938df171c5e92c5f772fc92721bd19e049b97ab5ec60cb5f5dc3569dd6716232cdb70dbb5183b6c8bbf90a8d233ee760ee4f600cc352af967eae4f959379 SHA512 4c128d4f95b5246aa025f275cebbb15bd201de5912e250e65067c3820b662c75c8fdb89013715f14a5bb131c23626271992a14e68233002dc058d80b80efc13e
 EBUILD xcircuit-3.9.73.ebuild 972 BLAKE2B bf6c5041bfb0ae3bc107560c8958a2c776f00beca2271b4f9625ef6152e5a2a926a4a762974ec5f28fc5410ea792a52d8e7fedc815fb255afa86d2b9b3bc1026 SHA512 b93f9289f6c6bfd0809d6a48f5a94f80f4600feface7a1a7c8c20b98db2ac28407184d6c106d79de4edcc4079e1544ae1e9b77ecd2dc1f5ff55f8601ee045a78
 MISC metadata.xml 1266 BLAKE2B cab37ad91d300f9a4b5d1dec7820284af0a4893df0a22642662105cc442fed2a51e4822ed005fe40fddeb3186161fe2212977fb829788dcab9a60793b3e1c633 SHA512 2cec9ece544f2c125f4413c3fe9d3f119b9f50a0c2da80e3f7b1164050986ed58a2f01299a5a844f951c490d56c169e196c8e1843e12504f3182d4893df11c3a
diff --git a/sci-electronics/xcircuit/xcircuit-3.9.62.ebuild b/sci-electronics/xcircuit/xcircuit-3.9.62.ebuild
deleted file mode 100644
index c43e347fcd25..000000000000
--- a/sci-electronics/xcircuit/xcircuit-3.9.62.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Circuit drawing and schematic capture program"
-SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
-HOMEPAGE="http://opencircuitdesign.com/xcircuit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	app-text/ghostscript-gpl
-	dev-lang/tk:0
-	media-libs/fontconfig:1.0
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXpm
-	x11-libs/libSM
-	x11-libs/libICE
-"
-RDEPEND=${DEPEND}
-
-RESTRICT="test" #131024
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# automake-1.12
-	sed \
-		-e '/AM_C_PROTOTYPES/d' \
-		-i configure.in || die
-	# automake-1.13
-	mv configure.{in,ac} || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	export loader_run_path="/usr/$(get_libdir)"
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--with-tcl
-		--with-ngspice
-		--with-tk
-		--with-cairo
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
-}
-
-src_install () {
-	autotools-utils_src_install \
-		appdefaultsdir="/usr/share/X11/app-defaults" \
-		appmandir="/usr/share/man/man1"
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 06d7b61a3b3c..c50a79ac465b 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cminpack/Manifest b/sci-libs/cminpack/Manifest
index 131c9038b6e2..b58485eb32f5 100644
--- a/sci-libs/cminpack/Manifest
+++ b/sci-libs/cminpack/Manifest
@@ -1,7 +1,4 @@
-AUX cminpack-1.2.2-underlinking.patch 448 BLAKE2B 812e320f7edcdc457497e25fa84b0c987b6798a87dcadff36b8bcbe1cb4a4226af7c388e9f5cd41ec22bed35b7e086bec54f43b8fae492b6edd6274f04230f57 SHA512 319ad720e9fb2fe369fa398adaffc54d3d84dd5deeefe95dba5f46bb35dbdef9229e45e321129581dca7643a58afc0f366ba662d7f3a8a5ca9a9e1211565c60a
 AUX cminpack-1.3.5-underlinking.patch 338 BLAKE2B 65f3d7014529ea914067fd8a46bc6812fb688e456f416bab8af2ac145833321c0bbc1cbce1e8901bc1b3c76862f273e69db32a483b50903824baffc065d4115a SHA512 e75edbe045d6936d09a2454504fba6b5b5535424aa1c7603df4b55416e801d27f74f1e2db1038193d36262a12734760138df1c66b6c3d9e6d318f124e7409307
-DIST cminpack-1.3.4.tar.gz 311147 BLAKE2B 031739d6932326d2b11ccda6317afd17cd610bfd394106720f1b5e18d8311f19e99ff36a3b362fd2ee37e997630a267be9bdab208add61597c23198dda4d6363 SHA512 2221dd710285e4d043ec51b296979686645ee48dad2e4bcbfef3e78ff6e8e02c09575af17edc3e9879cb9b7d4b431f0effe24640a2bdc437e32d0d0710545d7a
 DIST cminpack-1.3.5.tar.gz 312932 BLAKE2B 52ab91490f7c569e3931346510e08db55166322399736ceb9cc090a3be3624e8db6de12ed33ee8f97f6c5358dc2488f8aa7c7aab81365316f1dbb8948e669a2e SHA512 bb6f1764d90ccc7cbbb114a509f5416567246a730e4329617671e01b535b3a69f6a6df0483810ad1ad28228a1061a3595a15d437647b94a8a2013203905c6fed
-EBUILD cminpack-1.3.4.ebuild 795 BLAKE2B 7232e7ecd6af0bba01bb5e30f1f0c4e066db1ef27aaaf14734198ff771336764ae1286cbfba778554b6647ffb27f8b21edbd3fe7387b6ecb5e436f630b1caf2b SHA512 9536dc09732dac7601caced01372736c52e6e5ecb32232cb8873959f56594b01d724651dcd49eedfbea2a9bf37492a30188b7bd6170a0983e5194df2b9342729
 EBUILD cminpack-1.3.5.ebuild 821 BLAKE2B 95effef87137dafa1e3afaa5c60b748a725f0dd164e5338b1690a35e8f897cbdaaf95c6f11ed68eedfd1cd86d024ff025e3ddd4b61145df09f443f6fa9fcdeeb SHA512 211026ea97bf24f287b786f32b27f977be65a6e6d08bfc15b1b16af0e3e25a75a10cdbafe518f62f871d9f2f38e7f10cd528f5fde27bfe74354d96deed2ac68d
 MISC metadata.xml 993 BLAKE2B e037c0d06b1c6192de166d3ced5f6dbc92229fd268ee83e0e6589b05314906c5469d521c61b8d88b6e6c66e877e54e15fd6d7e57b16fa27b62167671d3b0c274 SHA512 d488a3fe1cfc9a04264d7e6078b033b4056236736d7466a609e308988c9e36c25d4fdce24bb3606e8b9878a63ee3ec9a660ab296f081004b601f6317b80bf257
diff --git a/sci-libs/cminpack/cminpack-1.3.4.ebuild b/sci-libs/cminpack/cminpack-1.3.4.ebuild
deleted file mode 100644
index e4845a26287c..000000000000
--- a/sci-libs/cminpack/cminpack-1.3.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="C implementation of the MINPACK nonlinear optimization library"
-HOMEPAGE="http://devernay.free.fr/hacks/cminpack/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="minpack"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.2-underlinking.patch )
-
-src_configure() {
-	sed -i \
-		-e "/CMINPACK_LIB_INSTALL_DIR/s:lib\(\|64\):$(get_libdir):g" \
-		cmake/cminpack_utils.cmake || die
-	local mycmakeargs+=(
-		-DSHARED_LIBS=ON
-		$(cmake-utils_use_build test examples)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc readme*
-	use doc && dohtml -A .txt doc/*
-}
diff --git a/sci-libs/cminpack/files/cminpack-1.2.2-underlinking.patch b/sci-libs/cminpack/files/cminpack-1.2.2-underlinking.patch
deleted file mode 100644
index a042d4c2f72b..000000000000
--- a/sci-libs/cminpack/files/cminpack-1.2.2-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- CMakeLists.txt |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 57394af..5a46a75 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,6 +56,7 @@ set (cminpack_hdrs
-     cminpack.h minpack.h)
- 
- add_library (cminpack ${LIB_TYPE} ${cminpack_srcs})
-+target_link_libraries (cminpack m)
- 
- install (TARGETS cminpack 
-    LIBRARY DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index c56bd493cbba..5e20b564af2f 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,10 +1,8 @@
 AUX cxsparse-2.2.1-autotools.patch 5606 BLAKE2B a313f8cc54f5b97c34ee1c6ca70b1e8dc3af04a5e8cf7982a2da24d4276c4e909dc1e12bdff08da6361cbb105fb5feeb3faf396ab9a6c3ecd84aa7acd405df43 SHA512 463feef6919f421a27ce43588bfb439a0efd8abc8b51cdc7db36b16f4c858ef396dbbff302b51af73d33ece8f0668acb1aae2de543d25d749cf0125cf8328f7a
 AUX cxsparse-2.2.2-autotools.patch 5606 BLAKE2B 2736f9aa6033d1c4a81a34462afdd9ff1f3df41c463da865d22bb0ef29c98839c192a62fbbe96932976614c076806ae6984deb1d9eb7475812df27c80b94c226 SHA512 f11831810dca8b870cfe468f14942be84fa7e0b2975c5f7c677dee52b72aebe81d827e3bfa0f48fe005b20894c8bc99ea596849c6e87d01eaa4b29dda372e4fa
-DIST CXSparse-2.2.1.tar.gz 1906557 BLAKE2B cec947f80848da4e2ca744499192ef583ed208639f50f07dbfcbf7dd5f9beb82374e69e32ad266c8785d6e7232c3efc47470721bd9fcf2f6c37f0fb9927e79a2 SHA512 e8f900a4fcc4d9578f624adb09ac5a6bfce78524c56e8f53ca156a8981586be57df2ebc954c81c8335c0829cb16d38e1c0783d79b34687768ca7d9daed326e0f
 DIST CXSparse-2.2.6.tar.gz 1987681 BLAKE2B a778a2d91a98d3764940155eff1cfd3397333a02becef2f2c3c85dc45a58e83597b2e5680ef7cbac4c8d6b8af0a9966d0402154c6c0bee79c67b7697f1af2c19 SHA512 a049349e1a389f03e918e3d0b7e76f79ee2647229a4935378caa0aa3bf3beb8cff649e5e37263f6f839d90a32e6929fd5a7f9193e787cab02cea7b2eb64dd5ac
 DIST cxsparse-3.1.1.tar.gz 667306 BLAKE2B d8c960b37cacd042286691a4e4d4144f4abc5c8f25345e6d7ceb25785361a36b7b9244cc7c53211a753614cf54d61462895a0a4b8f8bf4af61faf6d0132cc30a SHA512 a36cf3a124baa74fb742c563dc6accfaf320a35f899cd2a684813ef22df4557af2d2b3489272496a370e85cea3a350293043071bb66830305fe3bf925865b424
 DIST cxsparse-3.1.2.tar.bz2 2004570 BLAKE2B 4f1874e83faa1d831fce3847b82aeb67ae96e59b635489eceed3ed08a0fd0aaef7b0c9e40142f96ae5c7820a75bfb58b4d6a741c742b5a85dd6d8e4d78960be9 SHA512 dd3c5e31997564387b6145eaf2069c01e2ae8de384cd775a13ac7ccf03a83b6d0b8bf156a6645547f230dd13fc159d14203a4adcbe65703c154f35ecb161b6e9
-EBUILD cxsparse-2.2.1.ebuild 728 BLAKE2B 84057faec581b32d1f39e200baddba6fc1f87164aaef4596ac2b6bb4175e4ec35a20af31866c2a0c125fc0016b7bd441abb9dda2f0cbb2dea31978d438949b2a SHA512 c6df10258581c98e06b1383d548382ab0471bd002bd9e318d4d3d9305e47c35b83ae3462990aa32288d41a2bc0c822c7bd251c21fc7294b76290fdef3bb8f79e
 EBUILD cxsparse-2.2.6.ebuild 672 BLAKE2B e44808aacdb0682431b4f5fbb7866fab818472c0f27520405fd8bfba2461c3570850206505519619390712bf995c042cd66bdced267281d5e5798cb66e4d5698 SHA512 0906c15b07f56c61c1991567d005864d3f1b3a0c273a78d2c1b9b95d3ecf5621e5b5b611000560d59a08468d2fc5adfdbff035702045d956e4cd2af4172037e7
 EBUILD cxsparse-3.1.1.ebuild 530 BLAKE2B 62a921de1551e78add94c56d7201f7c424d6937d5d5b83d0eaeda1f4895457d231c104e3dfbca8ad62a87c5c075690755d07b3a3a57a5b4d587f9e3b27452070 SHA512 4f08c3969f0a4393eca9ce76670a4b367d5ddbfebd342ce3af5ee044b32e2ff31d1981e574295c85fcb772ade1f64adc54831de759356c4fe2f09b725dcb4486
 EBUILD cxsparse-3.1.2-r1.ebuild 763 BLAKE2B 90e7f55a1e5ee35637f4322e370f686d33863b4b340b6cdf78853798689e6a5f7feca10e1d19d7c9200f5145b8286353493e60d6e346c2e8f5bbebb3882021c0 SHA512 77174b63939ade819b74fa8cd4c0371293a48138c0aced7012f1f19deaad2373a48ee4ca2b8e37c0f21533c76edd61066483e2bb2db7a36264982e0710445cf8
diff --git a/sci-libs/cxsparse/cxsparse-2.2.1.ebuild b/sci-libs/cxsparse/cxsparse-2.2.1.ebuild
deleted file mode 100644
index 9efe9492f5f9..000000000000
--- a/sci-libs/cxsparse/cxsparse-2.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils
-
-MY_PN=CXSparse
-
-DESCRIPTION="Extended sparse matrix package"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/CXSparse/"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/versions/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="sci-libs/ufconfig"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-}
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 776bfcc49c80..ea3a2c7cf1d7 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -4,10 +4,7 @@ AUX flann-1.8.4-docdir.patch 571 BLAKE2B 19e6c5161290bec1b85157452884ba9c6272fe8
 AUX flann-1.8.4-examples.patch 1020 BLAKE2B b4eb466cb53aa6e4ebb2285c605685974e6d371fd4efd2a33c71c78acf427c33c326ca5c29b38a6a8e3641c1063226f18c9dcf75a6e4e5e095a9ca3555bf83af SHA512 5baeb594d2b4a1a8456135c9f0bec72a3182dcacbdebd398b079f13982e5e7a1722500313699ea25b7085f1dca3cab4ea355992d9014135e011452168e65fc83
 AUX flann-1.8.4-multilib.patch 570 BLAKE2B c3f6e2a88a6d6eed16b5cafedf2ba99b51d9686e83f2f8b10ac7ed28b835965cda7ff4702d2f106585cea941ae1475eab89f1323f3c5ad8e05553203c5bece8d SHA512 1f5a72920af200f23a318b3205cce498a6f193eb8f89b85fcc9b8ef45c49b4b98143cc9cc6996821e63cdb709eeac0f13b46c129471aa82a06ec22be1f4ec8f6
 AUX flann-1.8.4-options.patch 1485 BLAKE2B 2691716dfda2e931849a0852c7be75b3dbc14877950ade2a52481108d75b84aea2686f2245f7b924c0f1a20f94e3ff34372fda519c474e0bdfc961911e746ccf SHA512 2335ddf683d883f0b5247b4d7e688644231c2d6a914c0d271965b0024270e77a36ccded142ab666651833712cb64a427eb753f76757cf5eb765f130b170f4251
-DIST flann-1.8.4-src.zip 561057 BLAKE2B 0cd1cf7bc394501d878d848246f76919924e39dc950e49e82bd2c8dbf46d9626fc9749ba4578ce62aabd0313314969dd7f6883c42167545238bc89561ce028ce SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a
-DIST flann-1.8.4-testdata.tar.xz 26744244 BLAKE2B eb8a5066d79dedd2ff4ec48f0e0969d6486417abfb2cc5c2e3e1e0f8dfef637f2cb290e8f1868b819ff7e4d71687daf2aaeb16c8197f5642125ea50ef775441f SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
-EBUILD flann-1.8.4-r1.ebuild 2691 BLAKE2B 7cb6cc288d4b6fbcd6af98cc612b5ed21ec41cf421ce4fc9385fac0c1e124802b8818303540d88070f60e50f0805c40f7a5428e852d9ada601ebfa49d6687e28 SHA512 1fbac04c82251e1dd9ee912128b74822a7fd7dd890f9a3272a1c6a3e37c8156623a9fd4b73c369497b0462615e8117dc6e94359f791b12d428788e596e1a6bbd
 EBUILD flann-1.9.1.ebuild 2185 BLAKE2B d81b5cc93e470f846c915401b35d7bcdae4c8c9a14c412829035367f85c1f4c9eb690bef0002d24adf78ab655603a06c14969a95670fab826baf04f14b025d2a SHA512 d2b3ee61c1066ca047bfa5ccbad4c37402fc3f10fbe0f4be8ea75580935de055cde09ea7db2a9a51ba4da14e7f069748be8642c63b5cd074d86bffbaaf568650
-EBUILD flann-9999.ebuild 2449 BLAKE2B e7cad0db176ec4b58b7e776608a4bbb8df3686042bdcf7c13123573ed9ba3be2a773f2cfe969d89a2bfb2661612cdcff872c286dc809d3c099441622d93edd29 SHA512 c5bd3475386f5cb7f5a0c7d71932694752a48f2f67a8052cf668424ff2fce69f0d2fbfa040b994e06942c17502bac1b3f0032f7387325d0d9c3578273c353f6b
+EBUILD flann-9999.ebuild 2121 BLAKE2B 336e31bc0e5ece6c63ca3c82e3b61605fbfa46e76ab111574b3d05303add959c31b2339c60768d7ab32f56e534b7cb08f08c1a29fb15279bf2d048a02d00df06 SHA512 6e3978c5c92f2723eed4615cc292aedd3be146a9afe0fc47cd1922a12fb9fb58d81d2f284f2946d96c5f4c2d235f06c0dc5929b37258ea83bf412d36a0ac1e2e
 MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03
diff --git a/sci-libs/flann/flann-1.8.4-r1.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild
deleted file mode 100644
index 00be826a33e5..000000000000
--- a/sci-libs/flann/flann-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils cuda eutils multilib toolchain-funcs
-
-DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
-SRC_URI="
-	http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
-	test? ( https://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc examples mpi openmp octave static-libs test"
-
-RDEPEND="
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	mpi? (
-		sci-libs/hdf5[mpi]
-		dev-libs/boost[mpi]
-	)
-	!mpi? ( !sci-libs/hdf5[mpi] )
-	octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( dev-tex/latex2html )
-	test? (
-		dev-cpp/gtest
-		cuda? ( sci-libs/hdf5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-examples.patch
-	"${FILESDIR}"/${P}-options.patch
-	"${FILESDIR}"/${P}-CUDA_NVCC_FLAGS.patch
-	"${FILESDIR}"/${P}-cuda5.5.patch
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-docdir.patch
-)
-
-S="${WORKDIR}"/${P}-src
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
-}
-
-src_prepare() {
-	# bug #302621
-	use mpi && export CXX=mpicxx
-	# produce pure octave files
-	# octave gentoo installation for .m files respected
-	sed -i \
-		-e 's/--mex//' \
-		-e 's/\.mex/\.oct/' \
-		-e '/FILES/s/${MEX_FILE}//' \
-		-e 's:share/flann/octave:share/octave/site/m:' \
-		-e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \
-		src/matlab/CMakeLists.txt || die
-	use cuda && cuda_src_prepare
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# python bindings are split
-	local mycmakeargs=(
-		-DBUILD_C_BINDINGS=ON
-		-DBUILD_PYTHON_BINDINGS=OFF
-		-DPYTHON_EXECUTABLE=
-		-DDOCDIR=share/doc/${PF}
-		$(cmake-utils_use_build cuda CUDA_LIB)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build octave MATLAB_BINDINGS)
-		$(cmake-utils_use_use mpi)
-		$(cmake-utils_use_use openmp)
-	)
-	use cuda && \
-		mycmakeargs+=(
-		-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
-		)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	ln -s "${WORKDIR}"/testdata/* test/ || die
-	# -j1 to avoid obversubscribing jobs
-	LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
-		cmake-utils_src_compile -j1 test
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	if ! use static-libs; then
-		find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
-	fi
-}
diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild
index 2f25498da1dc..06d78eb963d7 100644
--- a/sci-libs/flann/flann-9999.ebuild
+++ b/sci-libs/flann/flann-9999.ebuild
@@ -1,55 +1,45 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs
+inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
 HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
-SRC_URI="test? ( https://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )"
 EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="cuda doc examples mpi openmp octave static-libs test"
+IUSE="cuda doc examples mpi openmp octave static-libs"
 
 RDEPEND="
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
 	mpi? (
 		sci-libs/hdf5[mpi]
-		dev-libs/boost[mpi]
+		dev-libs/boost:=[mpi]
 	)
 	!mpi? ( !sci-libs/hdf5[mpi] )
 	octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	doc? ( dev-tex/latex2html )
-	test? (
-		dev-cpp/gtest
-		cuda? ( sci-libs/hdf5 )
-	)
-"
+	doc? ( dev-tex/latex2html )"
+# TODO:
+# readd dependencies for test suite,
+# requires multiple ruby dependencies
 
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-src_unpack() {
-	default
-	git-r3_src_unpack
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
 	# bug #302621
 	use mpi && export CXX=mpicxx
-
 	# produce pure octave files
 	# octave gentoo installation for .m files respected
 	sed -i \
@@ -65,38 +55,32 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -std=c++11
+
 	# python bindings are split
+	# off into dev-python/pyflann
 	local mycmakeargs=(
 		-DBUILD_C_BINDINGS=ON
 		-DBUILD_PYTHON_BINDINGS=OFF
 		-DPYTHON_EXECUTABLE=
 		-DDOCDIR=share/doc/${PF}
-		$(cmake-utils_use_build cuda CUDA_LIB)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build octave MATLAB_BINDINGS)
-		$(cmake-utils_use_use mpi)
-		$(cmake-utils_use_use openmp)
+		-DBUILD_CUDA_LIB=$(usex cuda)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_TESTS=OFF
+		-DBUILD_MATLAB_BINDINGS=$(usex octave)
+		-DUSE_MPI=$(usex mpi)
+		-DUSE_OPENMP=$(usex openmp)
+	)
+	use cuda && mycmakeargs+=(
+		-DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\""
 	)
-	use cuda && \
-		mycmakeargs+=(
-		-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
-		)
 	cmake-utils_src_configure
 }
 
-src_test() {
-	ln -s "${WORKDIR}"/testdata/* test/ || die
-	# -j1 to avoid obversubscribing jobs
-	LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
-		cmake-utils_src_compile -j1 test
-}
-
 src_install() {
 	cmake-utils_src_install
-	dodoc README.md
 	if ! use static-libs; then
-		find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
+		find "${D}" -name 'lib*.a' -delete || die
 	fi
 }
diff --git a/sci-libs/gaul-devel/Manifest b/sci-libs/gaul-devel/Manifest
index b73484422466..317675efac83 100644
--- a/sci-libs/gaul-devel/Manifest
+++ b/sci-libs/gaul-devel/Manifest
@@ -1,6 +1,5 @@
 AUX gaul-devel-0.1849-as-needed.patch 972 BLAKE2B e03bef77af59333a76a6c91ed6cde6277c5457867cbf78b06f1489fff8e3c0f352485d8a2f7708d39103fc5f4c329373f4f4e54bbcc143de68e145a8befc392c SHA512 2f5b17231b3bc1d932389a3c550ab2756c39ce302bee3c1d9d64932dd080fb828a6035000c2b0b1b45815f2377da5e4665738630ea32cb827d63387c26c1ab6c
 AUX gaul-devel-0.1849-slang2-error.patch 976 BLAKE2B e5f7427d4a566fcec91c37234621beeaabc80aa62a5f0b3ae5b83539ad30d4332447affe9dfb7518d226d871faefee36ecb5c08af84995b26a0865a45263a51c SHA512 7f31cc6d382122e6610230cfc7541517948a35a499b1334573cd023c9af0148a8b1c37ffaaf5b3ca9facbfce5a5ecceeb9a0d9725719979b7e973fc88a478269
 DIST gaul-devel-0.1849-0.tar.bz2 416827 BLAKE2B 7d35ed137731efccd823d580192a3648b075900d469e1506e2689017271e78bb81e7f5cfe256100e3469f92df5c69eceaeadf5b396f58a1a76df614103b00a12 SHA512 c9da2b983073c99b9f785b665b17c7c63b61a5d879c99c167c2014cc1dfd8ad689f89ec788d69a05e0ed391c97dbe1671d039d9122e58a354e8304785082c93d
-EBUILD gaul-devel-0.1849-r1.ebuild 870 BLAKE2B f4fc3f58ce0461f9e38cd34ea8ebcc4f185aaade4014eb26ebef5daba24b3a6caad7e7a1ab77f4313d6c90a30fb9a74ad6f57a7e1c1c7d6508e69f325b8b3183 SHA512 fc7a85fe4003cca01575b06f9ebc07232cc283ef3169987490389950150a93f0f409303b51381c8d8975920621c697c5504bf84b12fae542de3a749957bc1694
 EBUILD gaul-devel-0.1849-r2.ebuild 903 BLAKE2B eca8661b4718b7be5e8bedd574280cf139b60a9bfe6ca01ce9cdbd6c7d64ab8fe6142c31d05cca64bbbef277c2424ec564177e6af9fa1952253153d85668d482 SHA512 e30e93e55aa133ea1aac716582b69848e5c7ed99704e90f987fc51bf2022ce6be86da702c7235f9a8608fe549692958a1ee76d3572d46c8850ce48c67725d47c
 MISC metadata.xml 881 BLAKE2B 76b563cd127da255b8faa32c39b879632098d8b068c559c7d77b16b542282edf69291bc8f58ef744d1301ea8c5f61da6900567e80899ed5370d2f4a277a7058c SHA512 636f1af4488f9b15cf8df5ba76d9d8eae2da7a879e970fdff6342420ecf869ce76b70bd39b033bc28d90f6b4a8affd5d3f10d2ad1ba7700b59d5f6f009d724cb
diff --git a/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
deleted file mode 100644
index b65497b1ca97..000000000000
--- a/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Genetic Algorithm Utility Library"
-HOMEPAGE="http://GAUL.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaul/${P}-0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug slang"
-
-DEPEND="
-	sys-apps/sed
-	slang? ( sys-libs/slang )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-0
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-slang2-error.patch
-}
-
-src_compile() {
-	local myconf
-	use slang || myconf="--enable-slang=no"
-	if use debug ; then
-		myconf="${myconf} --enable-debug=yes --enable-memory-debug=yes"
-	else
-		myconf="${myconf} --enable-g=no"
-	fi
-	econf ${myconf}
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "Install failed"
-	dodoc README || die
-}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index d00e61b0f495..7616fd67f76d 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,5 @@
 DIST indilib-1.4.1.tar.gz 1529660 BLAKE2B e869ba6b7430515a88f536d1738a9e5beb2622fad20d47ef2e981f9f00eb46e8703b2ad7842dca00b784d972cae639db3c8bfbb301ecbec8d582f372dae2f360 SHA512 b1655070fbc71095215a06edc88b8fff247ed3dcab86c2af058978b209e48ce1701f3a6eef13d0b200be58abfcfdffe7800ecea35d820fc2fb158ea0f899833f
 DIST indilib-1.6.0.tar.gz 1726681 BLAKE2B fc746fe74b41467930f50f4aabe63d485372dc3f7e551bf8b91ec92694efc5a73a29495ee4931f84215a90afdd1deb3c12f87aaedc32d33e408114674e6d79ad SHA512 a086a63e15f5f6fb05a0d1569578f5fbd4d6ba6ff5a0aaff7bd475925d3858840753f1aa04e7429a22576f52432a19e93b781e821ea908db6b7352af85f30422
 EBUILD indilib-1.4.1.ebuild 845 BLAKE2B 67d815e51377ee5b154f91835e89352c77d5bdeccb69fe547da980a6be529ac08fdbaa07e69a505ffe542efc9793bb2fb63a2c7c88a95d9cecc6ef83ffe40824 SHA512 8bd626e97b2e8dff6081c62664be68cd5e42179315c5587a377e3a043d04dc416f89fbea44213e374d5470cd43866172f0bcd8f226b824e6ab8e16d7d21b4375
-EBUILD indilib-1.6.0.ebuild 1107 BLAKE2B 413847725a1a8f32f42d919c3d2fe7c005f6aeeb28d148ad14494ac1fee314149fc5b4a238906b5c32dca998704f968425858623a32640ec73390f9628d905ce SHA512 c0126cdb25006c02d6f1f768879339cf3beb2238b699206edb601c9c725463f7ff3cab93545b44b7bda98141540be919ff4e30202ea2913456aa4b5d4f48cf92
+EBUILD indilib-1.6.0.ebuild 1105 BLAKE2B 8f5e21b13aea5f88309ea355abf526255c200a78b545e2992c774aefd28383bb5a14c07137f1370f820577c257e6304feed0e6be0912e69fe39fd7f2cf76b963 SHA512 42ca02a83d01913d99a786365166088a13bc0a41f49a99077f9d0acb58592f990124d753eaa21ff860deae33d438cacd591d7f6533cda7370b75f395e3e4750b
 MISC metadata.xml 375 BLAKE2B 68a9fc46a21fd5e530412d36468b96bbf409de646206ec8e36bf35fd39ec9193464100f5cc3398c1bfac01a947a70970ecf2d505a1932070ff6ca12dc3a9db1e SHA512 b5dc385e3823484e4fdc5974ace09edb4c19272c159e086cdc6968cafda528b27623c3696dbe42e5a869c3b9b9060dcf99466d5ac9961363de2f05fdcc523448
diff --git a/sci-libs/indilib/indilib-1.6.0.ebuild b/sci-libs/indilib/indilib-1.6.0.ebuild
index 5db4cefb37e5..2bf180538e5e 100644
--- a/sci-libs/indilib/indilib-1.6.0.ebuild
+++ b/sci-libs/indilib/indilib-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/releases/download/v${PV}/${MY_PN}_$
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="ogg test"
 
 RDEPEND="
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 3ae3baf4b637..2744805d19e4 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,7 +1,5 @@
 AUX mathgl-2.4.1-mutex.patch 424 BLAKE2B 2077654d0b17d2a1ba63bfcc17bcc82dac7dcc274253357a70cd0b2d49f9c99b73b380c1d09ad70e302fd04449b9adb6392c12cbd03fcefae4a36a50491cf012 SHA512 d0a0101041c91ba4d295484b8b06825d66787600b98acc2ee6e3cb8ec54e86939deadc40924bce42b6eb782bf5c03c6a7687ac853d7bc393e75bcf9a809d7849
 DIST STIX_font.tgz 2450541 BLAKE2B f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
-DIST mathgl-2.3.4.tar.gz 21361705 BLAKE2B 652cae42ace83077c5e5add2164a99d9a4f0b76a95d9ddd9b5570c04e87ce06c6cf127af85c451f74c7aa59e411c02c970e5fea7ed501a690f6d1a1456dcbd9c SHA512 2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d
 DIST mathgl-2.4.1.tar.gz 22665490 BLAKE2B a9c9e0ec7d145262994a754dfbcf1f789d2777f9334c8b4e73696265adba4d2fd7283621857318264c2162841e81427df21f7bc7b951d83876fbc066d3b9068f SHA512 10fd016662ca60b9507942691f85b4d9151104319627732f4add0175475f7e8dff16e3645bb858c283b747f34e58f410d0532e94dc64cf8cf472938d3966402d
-EBUILD mathgl-2.3.4-r1.ebuild 4597 BLAKE2B 8253c8fc6bb37b6a4ad0b56ad3f0f6d0081ae1b5403f555bf93e5386689fb4ef620221e5ab997ebdbc8e6e4a8308c1f2e17b9bb626c6f0766209788a68b017c3 SHA512 2d543d0e4a8ce51b60c0d08d34fc40865827f57ec0bda5383ea24bc73e9b70beff1111a1599b98c709238d7956708828373ba61a469ea621b4c6c47430bb3642
 EBUILD mathgl-2.4.1.ebuild 4369 BLAKE2B 11ef176152d57eb1dfd90add52d081c8341c7179e3502290b54d5b5f8a18bc34e523e0f0e429bf082efb3f04744c82111a7e35b96afea9d98631d78f95edd2a1 SHA512 9ba6cadab25ebced5babd95404870f3b626de1c471dbb3dde6d5f2e6e71a790f9a92fa67cc266b03c7117c0bd91139a8b7279f87b4ac5a2671518c98bbd326fa
 MISC metadata.xml 800 BLAKE2B baa75251910016e5d059cebeebd85632d290ab0c3c50089de0485ffbcd08ee8ac59cbfe33824347a5a5c339c74ea7a56c516d4d38661e56f7498d628d748f64a SHA512 8b75db0a01ce59f22543701447630c56a82f9091b5901f85ae102de7deca281e09dbcb443b8ff2930cf18145d63504646a289fd5e77defccc4d38480596d1968
diff --git a/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild b/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
deleted file mode 100644
index 187531c3a89d..000000000000
--- a/sci-libs/mathgl/mathgl-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER=3.0
-
-inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0/7.4.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
-	png python qt5 static-libs threads wxwidgets zlib"
-
-LANGS="ru"
-for l in ${LANGS}; do
-	IUSE+=" l10n_${l}"
-done
-unset l
-
-RDEPEND="
-	!sci-visualization/udav
-	virtual/opengl
-	fltk? ( x11-libs/fltk:1 )
-	gif? ( media-libs/giflib )
-	glut? ( media-libs/freeglut )
-	gsl? ( >=sci-libs/gsl-2 )
-	hdf? ( sci-libs/hdf )
-	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-	jpeg? ( virtual/jpeg:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
-	octave? ( >=sci-mathematics/octave-3.4.0 )
-	openmp? ( sys-cluster/openmpi )
-	pdf? ( media-libs/libharu )
-	png? ( media-libs/libpng:0 )
-	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	octave? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-REQUIRED_USE="
-	mpi? ( hdf5 )
-	openmp? ( !threads )
-	png? ( zlib )
-	pdf? ( png )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use mpi && export CC=mpicc CXX=mpicxx
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	if ! [[ -d "${S}"/fonts ]]; then
-		mkdir "${S}"/fonts || die
-	fi
-	cd "${S}"/fonts || die
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix for location of hdf headers
-	sed -i -e 's:hdf/::g' src/data_io.cpp || die
-	# bored of reporting bad libdir upstream
-	sed -i \
-		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
-		{src,widgets}/CMakeLists.txt || die
-	echo "" > lang/install.m || die
-	# fix desktop file
-	sed -i -e 's/.png//' udav/udav.desktop || die
-	# prevent sandbox violation
-	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
-	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
-	# fix missing include, bug 564204
-	sed \
-		-e '/#include <QStringList>/i #include <QObject>' \
-		-i json/Backend.hpp || die
-
-	use python && \
-		append-cppflags \
-		-I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
-	use wxwidgets && need-wxwidgets unicode
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# No clue about this option:
-		# option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
-		-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
-		-DMGL_LIB_INSTALL_DIR="$(get_libdir)"
-		$(cmake-utils_use doc enable-all-docs)
-		$(cmake-utils_use fltk enable-fltk)
-		$(cmake-utils_use gif enable-gif)
-		$(cmake-utils_use glut enable-glut)
-		$(cmake-utils_use gsl enable-gsl)
-		$(cmake-utils_use hdf enable-hdf4)
-		$(cmake-utils_use hdf5 enable-hdf5_18)
-		$(cmake-utils_use jpeg enable-jpeg)
-		$(cmake-utils_use lua enable-lua)
-		$(cmake-utils_use mpi enable-mpi)
-		$(cmake-utils_use octave enable-octave)
-		$(cmake-utils_use opengl enable-opengl)
-		$(cmake-utils_use openmp enable-openmp)
-		$(cmake-utils_use pdf enable-pdf)
-		$(cmake-utils_use png enable-png)
-		-Denable-qt4=OFF
-		$(cmake-utils_use qt5 enable-qt5)
-		$(cmake-utils_use qt5 enable-qt5asqt)
-		$(cmake-utils_use threads enable-pthread)
-		$(cmake-utils_use threads enable-pthr-widget)
-		$(cmake-utils_use python enable-python)
-		$(cmake-utils_use wxwidgets enable-wx)
-		$(cmake-utils_use zlib enable-zlib)
-	)
-	cmake-utils_src_configure
-	# to whoever cares: TODO: do for multiple python ABI
-	if use python; then
-		sed -i \
-			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
-			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README* *.txt AUTHORS
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-	if use qt5 ; then
-		local lang
-		insinto /usr/share/udav
-		for lang in ${LANGS} ; do
-			use l10n_${lang} && doins udav/udav_${lang}.qm
-		done
-	fi
-	if use octave ; then
-		insinto /usr/share/${PN}/octave
-		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
-	fi
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if use octave; then
-		octave <<-EOF
-		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
-		EOF
-	fi
-}
-
-pkg_prerm() {
-	if use octave; then
-		octave <<-EOF
-		pkg uninstall ${PN}
-		EOF
-	fi
-}
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index a4661daff4ef..62ab0f6d8680 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -12,10 +12,8 @@ AUX ogdi-3.2.0_beta2-64b.patch 289 BLAKE2B 7b35827d1d06037d25a17a8d9dc4bb288e653
 AUX ogdi-3.2.0_beta2-endianess.patch 590 BLAKE2B 4af94feb2e6b3345d9e440f48f1ac98f71792a832010f5666c38335b55b0215248ec568a52d61dfbae3e5804122a8fa4d95751108de85125182dcb440417e337 SHA512 7d4508610cc34d2552c4135226e2418d6e634ff6f85a9423534a3f2275392e5097399decc4bb9b8f4f02e7a23b7f7a4507182541c814e73efd5544292469e50e
 AUX ogdi-3.2.0_beta2-proj480.patch 9939 BLAKE2B bcefedd0043c8535adc8d5e3362f38514ec91a220444145b1c27b1a41b45191364f52130a46e91e371571bf4a5f7a4df64f798c7d526fa29a250b67690044989 SHA512 3ac6c554c8f89252b8ff6f8f9ff3824ec1c453b1ac395d41e395ccd1c15c659dfbb77d0a6110edf2cd20a1c738f70e444a566cd6bee7ead2bc563d773c77c737
 AUX ogdi-3.2.0_beta2-subdirs.patch 905 BLAKE2B 69db0794449ca68b61ba8723585a2d055836f2bfd031023073b515a326ca04215833c9ab1ef1d73f1bd5392a56d2479ba71d9a24fea42f5a41f239a3ec6c55db SHA512 b6e6f50dafdb6aea991b8ece37953a9910b3fa790dcb68108ba7316c81de3cffae1413afb9d9126457550fa46bded8a7613c8be27fcd9956c8c17b5b64065732
-DIST ogdi-3.1.5.tar.gz 913902 BLAKE2B ec60b620823b0ac77823b4c41f828d7edb8651d4ddfdb377c98030b0d58b723b7488d27fff80fc35f7b5040e13022bc8d54e266ec0e2ec2271d96a8902237ccc SHA512 fd77106a25b07bbaba23cab2e9e5298d7df62faf50c9ead72c4def683c4097717559b816a476ddfa16823f23d418a474ec49937b961ba06f606880f3338d6cfd
 DIST ogdi-3.2.0.beta2.tar.gz 956839 BLAKE2B d0729d42f3224d9911bb09f8cf2f150204950739547bf8ed5349c8ed63e7ab7a4e17298fe8bbf45fc17f5781e86925ab35d8356d396ffe7f35a4cf20803fce04 SHA512 2159dfd010be9da63cf009beee7f6571cd13c4f08d1a69a5d945dd64878347b28455eb5376f184e2d91fa4a3bd409446ccbd706aa9000d3d7d2ac4b6e30ced93
 DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
-EBUILD ogdi-3.1.5-r1.ebuild 1106 BLAKE2B df33e6ef2c2caf31b191662b3cbbde8c2e13dadbbacf7a46e9dcd5f595ee2845cdc0dc1fa6e8d1b4d798eca90f26a9cc4183eded2ff76c8c981ba5987b9d370a SHA512 2918251648dee47da2e1fed456e14dce64b59b16baa2128ccf0e33810c8c66780a439a5b520537e182573d4b8e99471a5f382bf9b74b895de29544acf9664120
 EBUILD ogdi-3.2.0.ebuild 1712 BLAKE2B 1b8e346639cbc60551e82eeaa3ad4b7958939e2aefbed3d5554179c517955dc84f08e19b8238e65b27d4b254b42c781766f42e32d933a38e23578c03715d2e5d SHA512 91903156b5c98782bcb5377d9a7820e16087c4360d18365e5f65a3cc8dea46cdcb638a3e44ded81321e5f98c9024e832ed9f4cb1fbdf825942d4fbfb28d2cd06
 EBUILD ogdi-3.2.0_beta2.ebuild 1549 BLAKE2B ed66593abbf8525dc1b6282e08bc0c73863fda2a9be458f7ea9cb483690dae42ff88fc4ccf014abbd7a95dd0c6a9fdd59953519d668b2ac9ed6c81e15b8b16a2 SHA512 13418dbe5f9bdf62bee8d5a3a8e11562cadb40221fcb47f862c01e0dc52170cfcd6b10901af69c4d94da472f2b1b87f26c78954982d8cb8398453b8ddfda6fdc
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
deleted file mode 100644
index 55b9b5f1325b..000000000000
--- a/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	<sci-libs/proj-4.8.0
-	sys-libs/zlib
-	dev-libs/expat"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-fpic.patch
-}
-
-src_compile() {
-	export TOPDIR="${S}"
-	export TARGET=`uname`
-	export CFG="release"
-	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
-
-	econf --with-projlib="-L/usr/$(get_libdir) -lproj" \
-		--with-zlib --with-expat
-
-	# bug #299239
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	mv "${S}"/bin/Linux/*.so "${S}"/lib/Linux/. || die "lib move failed"
-	dobin "${S}"/bin/Linux/*
-	insinto /usr/include
-	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
-	dolib.so lib/Linux/*.so
-	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed"
-	dodoc ChangeLog NEWS README VERSION
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 51214f1b7b3b..900748f7652c 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index c9b75dc11e0a..e288d953f615 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,3 +1,3 @@
 DIST alt-ergo-1.30.tar.gz 380329 BLAKE2B fab16757ed110474cf8f9d01ab53f76b6a300eb478b32bbfd6bb79d7603b1f5c2fc5c97bf44358eb138283f3487ef90febd23865723a4721b01bd870cfdd6507 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2
-EBUILD alt-ergo-1.30.ebuild 732 BLAKE2B 7049058ef4e9da664c22089e6a58002e3abef92ef190c4da764915e658b083051224276c9084c3e863c1d2bfefade21cd4b459503bff34db5bda9626eda8b92f SHA512 39fed507ea5fd20dc150e6ee4c342ad5b48e766b1c10c9aa1957bf718aa60bf59bfa4888bc0ed48e7086f88f4ba84d4902c91b5202d4d66feee5dc05210b2bfe
+EBUILD alt-ergo-1.30.ebuild 733 BLAKE2B 7d97a0a5ac57ba2c10c670906c2273a15f44ca993120b99675ccf5d0bdaee4ef77f5f4ee5517ac851675ec79b473b10679ea829e35159516f9179f7976a783b5 SHA512 9e171c46a0d4a5ff2de3de321cec8582d3dbec05d2d4f6fdd4c4429c7bf4078f625a380c7a7dd41e707922cb3209a3b5d7674808eb1628c50fb54e63658a7b94
 MISC metadata.xml 670 BLAKE2B 5f03c359cb298cc9a0fea6ef3a5deb092e5ccca7acfb2b7a5630303659bfd853fe86277ebbfb1fb7b6677d45dde2d5c68d55fffa8d3d8187acac3765f52df7c9 SHA512 9e514e4da2b92aa1e8e8e084450f478b51947172b689664dfe6c0fe0eb139e278e13689c8ba53825cb3bc32140cfd4cd7a68fede0d013cd065d5339d34931e8d
diff --git a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
index 46560c627430..8126e7e63d8e 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-1.30.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="Automatic theorem prover"
-HOMEPAGE="http://alt-ergo.ocamlpro.com"
+HOMEPAGE="https://alt-ergo.ocamlpro.com"
 SRC_URI="https://alt-ergo.ocamlpro.com/http/${P}/${P}.tar.gz"
 
 LICENSE="CeCILL-C"
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index 470f8742e73f..f3a08fa4035a 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -2,10 +2,8 @@ AUX 2.12.4.0-ldflags.patch 4026 BLAKE2B 75aecbb3d8e3cc03ff8e2ef248d7b54adf7417c2
 AUX calc-2.12.2.2-libdir-fix.patch 570 BLAKE2B 20a50ab8c9c3715420f70e1fd83ac42db15543d7cb8de36563da1d2e00c787daf8a0f30e8be3885efa995dbbefecc59e64c7f7d29360c9c4f6b1a0c6f8cacfcb SHA512 ad15beeb3a52682e8119582b67abbecbe6de0aeac207b5cc88d085d986c34617b09e08678eae49a105577e415381ea99c6514a454d26c40cd77bfab8b375d79c
 AUX calc-2.12.4.13-prefix.patch 3189 BLAKE2B 888798c53afbbd85375ab01a0cbbf0e790de52f82481a4e26a1c54d349789662484e3def5a0d2fedb4c81bb36d7219f295354ea3cda33e1019cb5cd2928da61f SHA512 aedaf30a8837cc1ff545b502e60e3284e4d8df37dd9d98516fbed17788f3d9a497aa3ba66f4613bd237de6152c041b339f26c89ff20ccdc1fb15387f9dba166e
 AUX calc-2.12.5.4-as-needed.patch 6226 BLAKE2B cb75c4ffbc5fd916e6d94d00bd32f8170be6eb82f47f1fde3d2d5968853ac7c7719883844563df6b545aa7226b178f9f54f7adb89a843fdd9ab7b92701193276 SHA512 fd65cdc727b9859d8d1a55e4140bb74301dc1941f647f5d52026818a1da56f90d21eea26a578bfd4fb0988cb3c516985239e8a06a3de15a9109fbe77b9536466
-DIST calc-2.12.2.2.tar.bz2 864687 BLAKE2B 0ef36c1ff24537d3c713dff7e7dad4729d4ecbf7b7d38ac80bc98924957158eb1b22dbdb49bf26e0542d69b64c5ea7832bd467025efff07923cd263ca119dd01 SHA512 701e8414366f112aa0aba2359a0d76037994fa647d14beb216a23a05e328665b2e0218b902b5e2a447ccf6277795baef4c68e278e12dfc40b1ee95f23858b9f4
 DIST calc-2.12.4.13.tar.bz2 970778 BLAKE2B 0e34df7d445a84de89e2c662ea7e8da4a350eaeef984b5027befe5947bf8e863180dd07bbe525c4bc04a6e3aa53bfbb2f3d719c8bfff3c238b16941b701d4b4d SHA512 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534
 DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f
-EBUILD calc-2.12.2.2.ebuild 1136 BLAKE2B 0863f8e550ae4068482b67095e958ffd0cf05a868226f74fff03783fd98b03c8d4c2c37bb24b832e727ed9350646f3abaf206f688893ba9b367157a54606eea8 SHA512 7911a132da03a4996de94760c628dc8471dfc2d684a6bbc0c14d5cb749dba52f26535b745c6a733c96c5abaa2705ff8e101292e2d51c01732f11c8633ae5df7b
 EBUILD calc-2.12.4.13-r1.ebuild 1324 BLAKE2B a4d8ae6c4997d8199cdbe5963fff227afb614ce2d38b454b0f67d62d9b47e070fdad784af9fc6e2fee608dfc68ebb069f7d22e2353ea7357d61717601b66b00d SHA512 0b71f653135b3c9241243110f1387d8bfa3ff80e5d12bc41dde8c7354d1dc00a7fe0dd1716772e22f8a9959aef621bdbdb78c3c7c8988d6353e8e090d47ae3b3
 EBUILD calc-2.12.5.4.ebuild 1313 BLAKE2B 5add771307505fdf9715f931306a7d2787e12650d0a2e934d9a7965ca7324ae3a6d90cca2b391f63985337afe48d3d9df9b9bea823fcecbca0ecebc8027f99c8 SHA512 ccbb388e68777c4a674504324e1dfaf0ca67c4a3125350a3ebe06c8f0f75989c6edae559475b0152e6a8200f74b04ce29eb50dad383a7a6c2eb17ee335cdfc43
 MISC metadata.xml 711 BLAKE2B 6c2e8e29413c40ccc3226b0e90f181b0ef4dea5d26bed5acc054c05576ca3c339ea433b4aaa45e940515346e83fffaf93d210a0eaecd55a64b822b425b54798f SHA512 8d88980b122ab65162de6d7038f4fc3744f741dabaf543d3edb6a013b61c3c6b53e30643174064c14fadc6d85d08c141aae0336f347b95caa78019c4e6fa8290
diff --git a/sci-mathematics/calc/calc-2.12.2.2.ebuild b/sci-mathematics/calc/calc-2.12.2.2.ebuild
deleted file mode 100644
index a153e579b9fe..000000000000
--- a/sci-mathematics/calc/calc-2.12.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-DESCRIPTION="An arbitrary precision C-like arithmetic system"
-HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.2"
-
-RDEPEND="${DEPEND}
-		>=sys-apps/less-348"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-libdir-fix.patch
-
-	sed -e "s:LIBDIR= /usr/lib:LIBDIR= /usr/$(get_libdir):" \
-		-i Makefile || die "Failed to fix multilib in makefile"
-}
-
-src_compile() {
-	# bug #299224
-	emake -j1 \
-		T="${D}" \
-		DEBUG="${CFLAGS}" \
-		CALCPAGER=less \
-		USE_READLINE="-DUSE_READLINE" \
-		READLINE_LIB="-lreadline -lhistory -lncurses" \
-		all \
-	|| die
-	if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
-		ewarn "Can't run check when running in sandbox - see bug #59676"
-	else
-		make chk || die "Check failed"
-	fi
-}
-
-src_install() {
-	make T="${D}" install || die
-	dodoc BUGS CHANGES LIBRARY README
-}
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 7fd6b4e857a4..dd243146c95e 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index 88d8490fc315..9f9810469995 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-abrt-2.20170204-r1.ebuild 280 BLAKE2B 70794beaf79c20487160074b3005009a8daccc7b5a10d8cf9992ce51df3e9be796cf36cb3276f2f5cb56328c20c970297a8b8957c983aef40f739e4c4a2c3cfe SHA512 5c8482d26f83c82459cff7118f0890a9ea1c299695535670f5a22050a5cfde2511a4aa33b79b95c88c30316920deb889ddea9d6a1776bdd9c617148a5fde1bf1
-EBUILD selinux-abrt-2.20170204-r2.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddfbc58d2f80ed70c6a9cbeb8e8550c04eefc0f00184bf66fc8cecd61c84894207046b33266940446466c16abbd91df129c26afc SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9
-EBUILD selinux-abrt-2.20170204-r3.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddfbc58d2f80ed70c6a9cbeb8e8550c04eefc0f00184bf66fc8cecd61c84894207046b33266940446466c16abbd91df129c26afc SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9
-EBUILD selinux-abrt-2.20170204-r4.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddfbc58d2f80ed70c6a9cbeb8e8550c04eefc0f00184bf66fc8cecd61c84894207046b33266940446466c16abbd91df129c26afc SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9
 EBUILD selinux-abrt-2.20170805-r2.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddfbc58d2f80ed70c6a9cbeb8e8550c04eefc0f00184bf66fc8cecd61c84894207046b33266940446466c16abbd91df129c26afc SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9
 EBUILD selinux-abrt-2.20170805-r3.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddfbc58d2f80ed70c6a9cbeb8e8550c04eefc0f00184bf66fc8cecd61c84894207046b33266940446466c16abbd91df129c26afc SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9
-EBUILD selinux-abrt-2.20170805-r4.ebuild 280 BLAKE2B 70794beaf79c20487160074b3005009a8daccc7b5a10d8cf9992ce51df3e9be796cf36cb3276f2f5cb56328c20c970297a8b8957c983aef40f739e4c4a2c3cfe SHA512 5c8482d26f83c82459cff7118f0890a9ea1c299695535670f5a22050a5cfde2511a4aa33b79b95c88c30316920deb889ddea9d6a1776bdd9c617148a5fde1bf1
 EBUILD selinux-abrt-2.20180114-r1.ebuild 278 BLAKE2B 14448ac8460247df1f60f95ba332b8d6bc23956950e06d76520d300be140d6625786ddacd487180a1742ae5885ba7148ad8ff31b8a3bec7ec2f16c02a5e25741 SHA512 5738cc689707e85c7e449eb799b149c352d78b0bc26e2ca1adbb919a5433359f5313c9bd1c9f86f36bdb4cc9d9f78c2b5a4280343f14a9b0b0d81b1c181d0cca
 EBUILD selinux-abrt-2.20180114-r2.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
+EBUILD selinux-abrt-2.20180114-r3.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
 EBUILD selinux-abrt-9999.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
 MISC metadata.xml 314 BLAKE2B a9aeb3ee56eda731aac4307519a5adcc7bc1530574eff9720c6110b7f509881f50fef50fcd32ee5efcfca1b75bb9cce9e1f438b9a368ba40fa5c77eb3c2f2d5a SHA512 b3d4a77a87b4deac8607f1b27a93c8b98e56ab0006d47d295bbd6da521788e8259d0497cd7369de74908d8d50d592d7c2a866957cd472c66de603bdc4e07a28a
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r1.ebuild
deleted file mode 100644
index fccfc9d3f0c7..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r2.ebuild
deleted file mode 100644
index 8bbf2f4b5b10..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r3.ebuild
deleted file mode 100644
index 8bbf2f4b5b10..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r4.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r4.ebuild
deleted file mode 100644
index 8bbf2f4b5b10..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r4.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r4.ebuild
deleted file mode 100644
index fccfc9d3f0c7..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20180114-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..16244467e5a4
--- /dev/null
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="abrt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for abrt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index 5b4efb3921d3..22df97b14037 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-accountsd-2.20170204-r1.ebuild 383 BLAKE2B 98f30e783a2d2b6dd9b1164e0a2ae762cabcef8383afdb59dc73484dd6adc8de2ed754e7ab65378c4f8ab95c214cfc3e1a8c62e7bf29f8d8e3f71490cf6726f3 SHA512 91db923427caa52357bfd86cf5d10ce5e355ba2a71bac07994c5723ebb55ced8107bf874c079e20e34bb5cfcf3894aa3e3b68f4c3946b9f2749a464af3a53574
-EBUILD selinux-accountsd-2.20170204-r2.ebuild 381 BLAKE2B 07b0dae19393685dfe27a53e263e08623e2f94ec5af091eefe72a0c9a3fb3117ac796b8dbb3855e3b289a09c17885d816e372ff2317d503d3568bfeda7b711ac SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2
-EBUILD selinux-accountsd-2.20170204-r3.ebuild 381 BLAKE2B 07b0dae19393685dfe27a53e263e08623e2f94ec5af091eefe72a0c9a3fb3117ac796b8dbb3855e3b289a09c17885d816e372ff2317d503d3568bfeda7b711ac SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2
-EBUILD selinux-accountsd-2.20170204-r4.ebuild 381 BLAKE2B 07b0dae19393685dfe27a53e263e08623e2f94ec5af091eefe72a0c9a3fb3117ac796b8dbb3855e3b289a09c17885d816e372ff2317d503d3568bfeda7b711ac SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2
 EBUILD selinux-accountsd-2.20170805-r2.ebuild 381 BLAKE2B 07b0dae19393685dfe27a53e263e08623e2f94ec5af091eefe72a0c9a3fb3117ac796b8dbb3855e3b289a09c17885d816e372ff2317d503d3568bfeda7b711ac SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2
 EBUILD selinux-accountsd-2.20170805-r3.ebuild 381 BLAKE2B 07b0dae19393685dfe27a53e263e08623e2f94ec5af091eefe72a0c9a3fb3117ac796b8dbb3855e3b289a09c17885d816e372ff2317d503d3568bfeda7b711ac SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2
-EBUILD selinux-accountsd-2.20170805-r4.ebuild 383 BLAKE2B 98f30e783a2d2b6dd9b1164e0a2ae762cabcef8383afdb59dc73484dd6adc8de2ed754e7ab65378c4f8ab95c214cfc3e1a8c62e7bf29f8d8e3f71490cf6726f3 SHA512 91db923427caa52357bfd86cf5d10ce5e355ba2a71bac07994c5723ebb55ced8107bf874c079e20e34bb5cfcf3894aa3e3b68f4c3946b9f2749a464af3a53574
 EBUILD selinux-accountsd-2.20180114-r1.ebuild 381 BLAKE2B e690461f73a6637048aa192893210d832dd9f4a7d0b776bfc784c2e8ee421521c763dd51a587bfeb8a37e74df4fbde58001bf3e5df29b7ae24a74f45d36212ac SHA512 19d467e07a13ef8dd187c498c4350bb4fcb28c2e6b7e1ffc8e26822888cc561fdce22b2fbdfc2b20af099f32a5e6401421f43d2c78336e01914230fefed3c8a1
 EBUILD selinux-accountsd-2.20180114-r2.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
+EBUILD selinux-accountsd-2.20180114-r3.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
 EBUILD selinux-accountsd-9999.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
 MISC metadata.xml 319 BLAKE2B 2db1e4990fa93a4687f70a6f07fc9c5ac1de4115ec232f4586a8279158bedd333caa185421da45832561ab34fbf54ceefe6665e28843e71d66215f5e74fea157 SHA512 d6458bc554feed33eabcf07a330ffba0317fbf3fcd3704f93db022cf555ca2ab257b59c62bb903c8e104cf7f606248946907540e0cadd1854e39e2ea6878d9e4
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r1.ebuild
deleted file mode 100644
index a1c85cb64604..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r2.ebuild
deleted file mode 100644
index e521b0dcc2e8..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r3.ebuild
deleted file mode 100644
index e521b0dcc2e8..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r4.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r4.ebuild
deleted file mode 100644
index e521b0dcc2e8..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r4.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r4.ebuild
deleted file mode 100644
index a1c85cb64604..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20180114-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a4d002b6a69b
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="accountsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for accountsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index fd35d8983e3d..5075c299e1ca 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-acct-2.20170204-r1.ebuild 280 BLAKE2B b6810b6e526be4cdc4816e56aa9b993101535cf0f1be054497c0c5cf530e03e1b697e600c0ee561086411a9fa6cfff93a3a30335d4d9ccd1ab690c335fb5aa12 SHA512 a886f62df0485964d557bac73f26b0b810f0a34968a7cb5e6e7301557b6e0a50b72590a0f784acd7e5c18c8b453b560ea83e49072a68dc88a90e00a25be5e081
-EBUILD selinux-acct-2.20170204-r2.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d5b3292b422d60627d9983e931a2ada605d391baf12c4ec9fd74d397fc55e02567a58e73ae0275de185d1a95c4ef7b3475faf7 SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6
-EBUILD selinux-acct-2.20170204-r3.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d5b3292b422d60627d9983e931a2ada605d391baf12c4ec9fd74d397fc55e02567a58e73ae0275de185d1a95c4ef7b3475faf7 SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6
-EBUILD selinux-acct-2.20170204-r4.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d5b3292b422d60627d9983e931a2ada605d391baf12c4ec9fd74d397fc55e02567a58e73ae0275de185d1a95c4ef7b3475faf7 SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6
 EBUILD selinux-acct-2.20170805-r2.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d5b3292b422d60627d9983e931a2ada605d391baf12c4ec9fd74d397fc55e02567a58e73ae0275de185d1a95c4ef7b3475faf7 SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6
 EBUILD selinux-acct-2.20170805-r3.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d5b3292b422d60627d9983e931a2ada605d391baf12c4ec9fd74d397fc55e02567a58e73ae0275de185d1a95c4ef7b3475faf7 SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6
-EBUILD selinux-acct-2.20170805-r4.ebuild 280 BLAKE2B b6810b6e526be4cdc4816e56aa9b993101535cf0f1be054497c0c5cf530e03e1b697e600c0ee561086411a9fa6cfff93a3a30335d4d9ccd1ab690c335fb5aa12 SHA512 a886f62df0485964d557bac73f26b0b810f0a34968a7cb5e6e7301557b6e0a50b72590a0f784acd7e5c18c8b453b560ea83e49072a68dc88a90e00a25be5e081
 EBUILD selinux-acct-2.20180114-r1.ebuild 278 BLAKE2B 835818028645cf6268a1085d6ebf81f17e160163f496072001a190d65a4d6de340670780b9012f813f73ac6e2226edd9aa2759987ef3a24274490711c490613a SHA512 6cb60c6543e3dd6b9dc50c5100a1be11d5dd272c6cb6ab6cfbb7e8344130782dcbbb8abf0682524e630116f2c75adefadb35a8e786033f5f1f9432cb86813db6
 EBUILD selinux-acct-2.20180114-r2.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
+EBUILD selinux-acct-2.20180114-r3.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
 EBUILD selinux-acct-9999.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
 MISC metadata.xml 314 BLAKE2B 9a10659585a888cbb5577aadf1ac833608cf700a42f27a8048835bdc873f4b9aebb60a1b529f21e8d1b7c828cf50bd2e0457f623ae2b555053db097b18f00dc7 SHA512 3baaefcdf1846cec59a14866f9a1bcd9a0fbad615069a45eb2c6d74df733533d10bb03adbeef08496c7c4462694649eb619ae36eccdf1e9e91740c495edcb054
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170204-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170204-r1.ebuild
deleted file mode 100644
index ec9e00ae08e9..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170204-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170204-r2.ebuild
deleted file mode 100644
index 1455ef2d30b4..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170204-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170204-r3.ebuild
deleted file mode 100644
index 1455ef2d30b4..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170204-r4.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170204-r4.ebuild
deleted file mode 100644
index 1455ef2d30b4..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170805-r4.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170805-r4.ebuild
deleted file mode 100644
index ec9e00ae08e9..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20180114-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..bb4f2d3ea880
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="acct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acct"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index b99f94dbfee1..e96d56d357d8 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ada-2.20170204-r1.ebuild 278 BLAKE2B 04fc35b289647fa709f3540e4cf79e63d406be1f8ac5801ebc1bb60c5d1f47c201c629607aa021286744fc3f0ed122945321618f1a017c39f9961f78f31889bc SHA512 5d0a18b3e05909fb1ad4fc9433388c7f95907f15cddbd6524421cee0f570d122682af2c01b633bd14419af5209917514b4eee72181d525c2817a75a995c46be8
-EBUILD selinux-ada-2.20170204-r2.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485275f3f42db921609bf0382c6d1fc805618665c6c322f5a92d7f13536c8ea41adc0b0591107719926bf14a9a990302ea74525 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7
-EBUILD selinux-ada-2.20170204-r3.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485275f3f42db921609bf0382c6d1fc805618665c6c322f5a92d7f13536c8ea41adc0b0591107719926bf14a9a990302ea74525 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7
-EBUILD selinux-ada-2.20170204-r4.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485275f3f42db921609bf0382c6d1fc805618665c6c322f5a92d7f13536c8ea41adc0b0591107719926bf14a9a990302ea74525 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7
 EBUILD selinux-ada-2.20170805-r2.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485275f3f42db921609bf0382c6d1fc805618665c6c322f5a92d7f13536c8ea41adc0b0591107719926bf14a9a990302ea74525 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7
 EBUILD selinux-ada-2.20170805-r3.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485275f3f42db921609bf0382c6d1fc805618665c6c322f5a92d7f13536c8ea41adc0b0591107719926bf14a9a990302ea74525 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7
-EBUILD selinux-ada-2.20170805-r4.ebuild 278 BLAKE2B 04fc35b289647fa709f3540e4cf79e63d406be1f8ac5801ebc1bb60c5d1f47c201c629607aa021286744fc3f0ed122945321618f1a017c39f9961f78f31889bc SHA512 5d0a18b3e05909fb1ad4fc9433388c7f95907f15cddbd6524421cee0f570d122682af2c01b633bd14419af5209917514b4eee72181d525c2817a75a995c46be8
 EBUILD selinux-ada-2.20180114-r1.ebuild 276 BLAKE2B 80b3e73e990ba36ed8e2b50617e44af17635bf603fb9e0752e0023ffb7cfff63795736f19dfb11cee844618dd953724aaff06ae0a38fe9689bad3d2b30b17b33 SHA512 adc70da605ba9a69a6ffc3aa7fd79cc11d7daccf174ac4c33415561bb432281626faf2a3660f82f0f4dd1362935c38dd4ce13d4e0ba3f7da26cdf2e89d979d11
 EBUILD selinux-ada-2.20180114-r2.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
+EBUILD selinux-ada-2.20180114-r3.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
 EBUILD selinux-ada-9999.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
 MISC metadata.xml 313 BLAKE2B ede61a44528842cd37d2a8fe8ad6a0f3018510bc2d37f2029fc4d2b9b59ac4844e0d2d2ecf91b61f044bad161d1e292fce1d7e26efa24d2cc9d874de6862bc69 SHA512 9412dc7f263273b69ac4665caa58138477732b72b6c3f1fcbb09781127434b532d34384c40c2b92bb2e10396b2bc67135a8e767c4fdae16e253b39684104b4cc
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170204-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170204-r1.ebuild
deleted file mode 100644
index 022f41b890f3..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170204-r2.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170204-r2.ebuild
deleted file mode 100644
index 2d5796f9461b..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170204-r3.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170204-r3.ebuild
deleted file mode 100644
index 2d5796f9461b..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170204-r4.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170204-r4.ebuild
deleted file mode 100644
index 2d5796f9461b..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170805-r4.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170805-r4.ebuild
deleted file mode 100644
index 022f41b890f3..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20180114-r3.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..b224e8eab965
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ada"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ada"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index e32172e3ede9..0bb03ff9b9ce 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-afs-2.20170204-r1.ebuild 278 BLAKE2B afc98f44c6f24dec10f6077121bc240ac36fb2c0bb3d22a1323c8dca5353a68472000c6add3833475da29eb42bc70158a1083280f87b9663d6f9b797b7f7d894 SHA512 6c7de1144da950f2b23bd461bca3d9d3e5019c8d3b9bde6668e29942207054390533897338f470a5ea33e35ff31ed64eec1233226507081c0b6874864fd206e4
-EBUILD selinux-afs-2.20170204-r2.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc02fbb9ea238d78845be779347ba17aad7c1a969e96d3b1a9b88fdee83a8d436ea980295aa90e1ab8b816a1cd4a91d571b375 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f
-EBUILD selinux-afs-2.20170204-r3.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc02fbb9ea238d78845be779347ba17aad7c1a969e96d3b1a9b88fdee83a8d436ea980295aa90e1ab8b816a1cd4a91d571b375 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f
-EBUILD selinux-afs-2.20170204-r4.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc02fbb9ea238d78845be779347ba17aad7c1a969e96d3b1a9b88fdee83a8d436ea980295aa90e1ab8b816a1cd4a91d571b375 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f
 EBUILD selinux-afs-2.20170805-r2.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc02fbb9ea238d78845be779347ba17aad7c1a969e96d3b1a9b88fdee83a8d436ea980295aa90e1ab8b816a1cd4a91d571b375 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f
 EBUILD selinux-afs-2.20170805-r3.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc02fbb9ea238d78845be779347ba17aad7c1a969e96d3b1a9b88fdee83a8d436ea980295aa90e1ab8b816a1cd4a91d571b375 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f
-EBUILD selinux-afs-2.20170805-r4.ebuild 278 BLAKE2B afc98f44c6f24dec10f6077121bc240ac36fb2c0bb3d22a1323c8dca5353a68472000c6add3833475da29eb42bc70158a1083280f87b9663d6f9b797b7f7d894 SHA512 6c7de1144da950f2b23bd461bca3d9d3e5019c8d3b9bde6668e29942207054390533897338f470a5ea33e35ff31ed64eec1233226507081c0b6874864fd206e4
 EBUILD selinux-afs-2.20180114-r1.ebuild 276 BLAKE2B fbb22198b0062c249cf53b7d1d21bc7b21fa6d84fc6831ce141b8d47a9ba4ddf349f787bab859cd600bd0da1b26e01b2984c7dda622be53b8587345f9e02d2cd SHA512 3a333da5eccc519db3f4cdfcc7498b56e399d75aa1f098d3a53f6b0a339c79eb6f7296a710dabdcf36219edfd12d2a9c45026526d709888ce7bd82a8d3819794
 EBUILD selinux-afs-2.20180114-r2.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
+EBUILD selinux-afs-2.20180114-r3.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
 EBUILD selinux-afs-9999.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
 MISC metadata.xml 313 BLAKE2B 7b38235217ab30ab97d9ca8da2d57e2f776f75b6f6ac4946477c20ddc13408d1302baa55f73d315613d35ba3c55eafde625888cae5a6929ac7ab5346f2603650 SHA512 b684826f0ad47ac371f231ebc834fbed092a7bc39730ca9aeb5a28eb1b604e19b21ec6e731b7f9f54f8e5580fe35dc87332dd44c37c9fba44c4bf78a7daa04ef
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170204-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170204-r1.ebuild
deleted file mode 100644
index 2bc1bec56412..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170204-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170204-r2.ebuild
deleted file mode 100644
index 81eaa17a2782..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170204-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170204-r3.ebuild
deleted file mode 100644
index 81eaa17a2782..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170204-r4.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170204-r4.ebuild
deleted file mode 100644
index 81eaa17a2782..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170805-r4.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170805-r4.ebuild
deleted file mode 100644
index 2bc1bec56412..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20180114-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8b497cad73df
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="afs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for afs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 8dbfa44bee79..4460d55b3a62 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-aide-2.20170204-r1.ebuild 280 BLAKE2B e9eb74f4a9baea500e4f2ecd1b6613b940140b640b536c78c28331fdf0c12cd63ed2fe62a074ed1193cddcc189b99545ac555ad6456bc4a6aa03d2cdff329f0f SHA512 ad0739aed3be03055247b22fcb0d11ce645139e53675e410c26c77bc2cb9582c1b1e2881fc3c30e7fad700cd2851e464cef926a752b6c9249166754b8168cb98
-EBUILD selinux-aide-2.20170204-r2.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e63d0d858dd28d61a1e1929d2ad5d42681451d67bf6097f4c459a21f2629d505213e9fa4094a11930bd056019dd55d293a14b3c SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9
-EBUILD selinux-aide-2.20170204-r3.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e63d0d858dd28d61a1e1929d2ad5d42681451d67bf6097f4c459a21f2629d505213e9fa4094a11930bd056019dd55d293a14b3c SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9
-EBUILD selinux-aide-2.20170204-r4.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e63d0d858dd28d61a1e1929d2ad5d42681451d67bf6097f4c459a21f2629d505213e9fa4094a11930bd056019dd55d293a14b3c SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9
 EBUILD selinux-aide-2.20170805-r2.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e63d0d858dd28d61a1e1929d2ad5d42681451d67bf6097f4c459a21f2629d505213e9fa4094a11930bd056019dd55d293a14b3c SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9
 EBUILD selinux-aide-2.20170805-r3.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e63d0d858dd28d61a1e1929d2ad5d42681451d67bf6097f4c459a21f2629d505213e9fa4094a11930bd056019dd55d293a14b3c SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9
-EBUILD selinux-aide-2.20170805-r4.ebuild 280 BLAKE2B e9eb74f4a9baea500e4f2ecd1b6613b940140b640b536c78c28331fdf0c12cd63ed2fe62a074ed1193cddcc189b99545ac555ad6456bc4a6aa03d2cdff329f0f SHA512 ad0739aed3be03055247b22fcb0d11ce645139e53675e410c26c77bc2cb9582c1b1e2881fc3c30e7fad700cd2851e464cef926a752b6c9249166754b8168cb98
 EBUILD selinux-aide-2.20180114-r1.ebuild 278 BLAKE2B 8f21d5fb6bf2a8c006bb995864832c2c2ae9a641f93fa781f43a23e69c28a0a25724e28b1df770b6b964117c346ccb010df71aed5795940ebfb25f9690c8a8ea SHA512 6312bbc2c5520eb0c407ce2f174ddafb6302960f7e6cc4b9db7c9f4af302d9c3a55a35333c432feaa9f90b4ac279d43017f5e2745c02642613e052cbd57f990a
 EBUILD selinux-aide-2.20180114-r2.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
+EBUILD selinux-aide-2.20180114-r3.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
 EBUILD selinux-aide-9999.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
 MISC metadata.xml 314 BLAKE2B e34b139fe06e3ea9cbce95a309248a9ac900d5e97897761294d05e3d89d5c4fc6e4841ce4f8de90827b45a78572d007c192973a9380de30cc1968b049dfb9699 SHA512 3ae94807091069e074f1efdd413a2acb748d0cae2f5ac3edaa1469536aebf9f8c1125298696dbaa50a48ee6ca1f212cf5e02c7ec2664b48633a2f345e4c5421d
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170204-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170204-r1.ebuild
deleted file mode 100644
index 1788dc1864f5..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170204-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170204-r2.ebuild
deleted file mode 100644
index e0a1e68af6e4..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170204-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170204-r3.ebuild
deleted file mode 100644
index e0a1e68af6e4..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170204-r4.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170204-r4.ebuild
deleted file mode 100644
index e0a1e68af6e4..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170805-r4.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170805-r4.ebuild
deleted file mode 100644
index 1788dc1864f5..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20180114-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..9764c0700398
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="aide"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for aide"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index b9fabf050461..2cbe251b3d71 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-alsa-2.20170204-r1.ebuild 280 BLAKE2B fa064450d0f8727dd1390da4ff870874421493f6902ee103e90deeead0dde0ee726970f89069b83748e3e035f1516d7ff72b51d5d2c5cfdc7a779ff1b8735048 SHA512 3674a694f9763e43a752bf2a2707d509451a52175b91d60a186280363ec7adc66a73980ab36045b536e2ee3e95455799c0c38a63912163e9e40569e9024bc6ea
-EBUILD selinux-alsa-2.20170204-r2.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db031fe4a48ee46eed1e4ebfdac2fc7df8bf02c976def5d3ab3dda9ec08fa31f5ff4c8a02c72516a1294e30e8927216c1ea3c29 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61
-EBUILD selinux-alsa-2.20170204-r3.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db031fe4a48ee46eed1e4ebfdac2fc7df8bf02c976def5d3ab3dda9ec08fa31f5ff4c8a02c72516a1294e30e8927216c1ea3c29 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61
-EBUILD selinux-alsa-2.20170204-r4.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db031fe4a48ee46eed1e4ebfdac2fc7df8bf02c976def5d3ab3dda9ec08fa31f5ff4c8a02c72516a1294e30e8927216c1ea3c29 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61
 EBUILD selinux-alsa-2.20170805-r2.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db031fe4a48ee46eed1e4ebfdac2fc7df8bf02c976def5d3ab3dda9ec08fa31f5ff4c8a02c72516a1294e30e8927216c1ea3c29 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61
 EBUILD selinux-alsa-2.20170805-r3.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db031fe4a48ee46eed1e4ebfdac2fc7df8bf02c976def5d3ab3dda9ec08fa31f5ff4c8a02c72516a1294e30e8927216c1ea3c29 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61
-EBUILD selinux-alsa-2.20170805-r4.ebuild 280 BLAKE2B fa064450d0f8727dd1390da4ff870874421493f6902ee103e90deeead0dde0ee726970f89069b83748e3e035f1516d7ff72b51d5d2c5cfdc7a779ff1b8735048 SHA512 3674a694f9763e43a752bf2a2707d509451a52175b91d60a186280363ec7adc66a73980ab36045b536e2ee3e95455799c0c38a63912163e9e40569e9024bc6ea
 EBUILD selinux-alsa-2.20180114-r1.ebuild 278 BLAKE2B 69e4037e0ec56d6a24d935ff153c8251783a9671605ccd19841b481f684c8d938665695f5172bd6435d334b72942beb1668dac34c2178c6d3c5bcdc925d78c3f SHA512 6362acb4f3828c8a0917d4a4968f75a23a119d2a46c32c731341aeb85a62f2e0bd118c82c45d9561ecdd7b98cc655f05e9269ce584adbcca3fe1483b0c79e381
 EBUILD selinux-alsa-2.20180114-r2.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
+EBUILD selinux-alsa-2.20180114-r3.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
 EBUILD selinux-alsa-9999.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
 MISC metadata.xml 314 BLAKE2B 804e8fd77ee3d8a8ef928de31a5db28fe522eafed3695574154fd70316f49d793c62a758dd53e5902c322c23bd9edc4f18888258e41b8701d3ae5cf4c573560c SHA512 dec699cdcba4fb0219f7fb71afbfca634d1a5767121078a206289fda39d33a622f2986064e29f16548290f4ca8aa71150667e92fbb4d799ece93209b2f1967c2
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r1.ebuild
deleted file mode 100644
index b0c22d727324..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r2.ebuild
deleted file mode 100644
index 7779979544f7..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r3.ebuild
deleted file mode 100644
index 7779979544f7..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r4.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r4.ebuild
deleted file mode 100644
index 7779979544f7..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r4.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r4.ebuild
deleted file mode 100644
index b0c22d727324..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20180114-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c13f83b1040f
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="alsa"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for alsa"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 24a54d98a632..c33caf69348d 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-amanda-2.20170204-r1.ebuild 378 BLAKE2B 5ae5a8969c75dcf15f72f4d7704039af8f6b638058295b30cbf83f530326360883542d3c04b2a5bee79f521e336ce13bb366f9cefcef8fac1f870dd862e2e122 SHA512 c9232febe94e63d87f68d9117dd4c23ad1f8b8ff989c478847d302173208dfe2ebfd3eb23f157d2ea2dcb56d4b2e5bab5e4ed2f9c10bb39849254fda1af08f10
-EBUILD selinux-amanda-2.20170204-r2.ebuild 376 BLAKE2B 333914160f179fc1a629769a7dd192b75927b1c1c970db8f82eb212a6ff203510986fde7eec9085b78097112b801ad17c05bdf93c946183f33f49cf7e398ad43 SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865
-EBUILD selinux-amanda-2.20170204-r3.ebuild 376 BLAKE2B 333914160f179fc1a629769a7dd192b75927b1c1c970db8f82eb212a6ff203510986fde7eec9085b78097112b801ad17c05bdf93c946183f33f49cf7e398ad43 SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865
-EBUILD selinux-amanda-2.20170204-r4.ebuild 376 BLAKE2B 333914160f179fc1a629769a7dd192b75927b1c1c970db8f82eb212a6ff203510986fde7eec9085b78097112b801ad17c05bdf93c946183f33f49cf7e398ad43 SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865
 EBUILD selinux-amanda-2.20170805-r2.ebuild 376 BLAKE2B 333914160f179fc1a629769a7dd192b75927b1c1c970db8f82eb212a6ff203510986fde7eec9085b78097112b801ad17c05bdf93c946183f33f49cf7e398ad43 SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865
 EBUILD selinux-amanda-2.20170805-r3.ebuild 376 BLAKE2B 333914160f179fc1a629769a7dd192b75927b1c1c970db8f82eb212a6ff203510986fde7eec9085b78097112b801ad17c05bdf93c946183f33f49cf7e398ad43 SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865
-EBUILD selinux-amanda-2.20170805-r4.ebuild 378 BLAKE2B 5ae5a8969c75dcf15f72f4d7704039af8f6b638058295b30cbf83f530326360883542d3c04b2a5bee79f521e336ce13bb366f9cefcef8fac1f870dd862e2e122 SHA512 c9232febe94e63d87f68d9117dd4c23ad1f8b8ff989c478847d302173208dfe2ebfd3eb23f157d2ea2dcb56d4b2e5bab5e4ed2f9c10bb39849254fda1af08f10
 EBUILD selinux-amanda-2.20180114-r1.ebuild 376 BLAKE2B 3b573737fb73e34f5a3a17aeca31bf0b34e32c0dd0df0515c4b8929693c0a4efc42193cb5dbcf1800249ca5ef3c965ec9158ec4b5e1dec646ea30504e388285f SHA512 ca2dde23325eab0bead876188b4b95f370737c24eaa58f35aac195cb9430d11dcd1ea958a137695f46e26072782bbdc5648dbc850ff35d5340b5b67b74fdd151
 EBUILD selinux-amanda-2.20180114-r2.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
+EBUILD selinux-amanda-2.20180114-r3.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
 EBUILD selinux-amanda-9999.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
 MISC metadata.xml 316 BLAKE2B 31b7d1885430846c69fc4563f57d45836ff9a08877ae5e96df4b464cc445ade4843d6cda2bb12aa1154fee717eef45f24d4a79e98d7419153115df81d1976d15 SHA512 175f419f4f7218403e30c562aea9be81f919761be0aec6ff0e931328e2f4b0c260f80f1ef9d883507e86fb749e73049fdd45d30851df3eee7ad0c915d0e89284
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r1.ebuild
deleted file mode 100644
index 852ae5b812fb..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r2.ebuild
deleted file mode 100644
index 009f7e3b1e9a..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r3.ebuild
deleted file mode 100644
index 009f7e3b1e9a..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r4.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r4.ebuild
deleted file mode 100644
index 009f7e3b1e9a..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r4.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r4.ebuild
deleted file mode 100644
index 852ae5b812fb..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20180114-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..6cce4fee502d
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="amanda"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amanda"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index db108d220aef..2b7137fc6a58 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-amavis-2.20170204-r1.ebuild 284 BLAKE2B f8ad0d88f27bfe0aea549d46229dd8bb7f15a2d024249b91ca6efbe84e77a8da5b5365000adb80783cd4353db7980861011b1756e24cd3ddb23375e6193200db SHA512 886df583cbb9d96132651e58a92487acfe62a58985de5ab51f03f740c91b3db9c8d5a1010a28718c8ff6e0ad997506b479ca46f705c3ff7e94c3da764154ded7
-EBUILD selinux-amavis-2.20170204-r2.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d8724a569de4ba10e831b98f5583842f06e785c3f5655e421b58d935ba79157256c206d880b9132193479258bc8dfd2334acfc5d99 SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc
-EBUILD selinux-amavis-2.20170204-r3.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d8724a569de4ba10e831b98f5583842f06e785c3f5655e421b58d935ba79157256c206d880b9132193479258bc8dfd2334acfc5d99 SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc
-EBUILD selinux-amavis-2.20170204-r4.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d8724a569de4ba10e831b98f5583842f06e785c3f5655e421b58d935ba79157256c206d880b9132193479258bc8dfd2334acfc5d99 SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc
 EBUILD selinux-amavis-2.20170805-r2.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d8724a569de4ba10e831b98f5583842f06e785c3f5655e421b58d935ba79157256c206d880b9132193479258bc8dfd2334acfc5d99 SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc
 EBUILD selinux-amavis-2.20170805-r3.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d8724a569de4ba10e831b98f5583842f06e785c3f5655e421b58d935ba79157256c206d880b9132193479258bc8dfd2334acfc5d99 SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc
-EBUILD selinux-amavis-2.20170805-r4.ebuild 284 BLAKE2B f8ad0d88f27bfe0aea549d46229dd8bb7f15a2d024249b91ca6efbe84e77a8da5b5365000adb80783cd4353db7980861011b1756e24cd3ddb23375e6193200db SHA512 886df583cbb9d96132651e58a92487acfe62a58985de5ab51f03f740c91b3db9c8d5a1010a28718c8ff6e0ad997506b479ca46f705c3ff7e94c3da764154ded7
 EBUILD selinux-amavis-2.20180114-r1.ebuild 282 BLAKE2B 1b857a90d864e2beecff6e6b2f9894fc2a8ad5ec7c6b32e4f23f24e38fe19e2c818517f9a54a6329223be3699ce73c494cf68b9e16ff29d52002bff18d9f3851 SHA512 e131b48bf6d80e892cbbe610e3dd5fe7b0b07f2c2a021e6cf069fffc1a223a10da62991bc811b0552ac57735e16791d82ff564dd170387577936292fb8bb582f
 EBUILD selinux-amavis-2.20180114-r2.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
+EBUILD selinux-amavis-2.20180114-r3.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
 EBUILD selinux-amavis-9999.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
 MISC metadata.xml 316 BLAKE2B aa2a01d791833d7cbabf044b7cbd8d1644ec81d305e02bd43fa0a5f71444d02dd9719cae25a656144a592d75be8bbd8c0593e1365e1d28a3c9c1e6e957da0146 SHA512 fe718a2ad4043b9e7a44e68158c792a8f27f604632640d186fdedc222e3d6c9c74cbcb5e39e443df698aa33ba699e7d056974843e62b9f9616524dc718f5965b
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r1.ebuild
deleted file mode 100644
index 965eab088ddd..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r2.ebuild
deleted file mode 100644
index d960edbb1189..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r3.ebuild
deleted file mode 100644
index d960edbb1189..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r4.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r4.ebuild
deleted file mode 100644
index d960edbb1189..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r4.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r4.ebuild
deleted file mode 100644
index 965eab088ddd..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20180114-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..35bcba26802e
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="amavis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amavis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index 2f386192efc9..a722cc0194f1 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-android-2.20170204-r1.ebuild 435 BLAKE2B 73aff42e27a5a55278ca0cbed3305d7a76c793eeff7fe8b4984510d05751ae3b423133c3033a44e5fa3e52c5bcff058ecab4c469477c3af2316dd46ed56a861a SHA512 0814b60ee0f7846b2331d0d509bedd45f0a49d9194fac9a60bda177d942f68aca68b313a97182e5deb07d1b7f523ad86979a5e65c189c97374b94ce651e69a76
-EBUILD selinux-android-2.20170204-r2.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d3a5a7521ca508b2bf0e5fd147c96686f63e850ba532617e59ade75221ed966bf3ddcb04a31143240a76b1a209641616397edcace SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2
-EBUILD selinux-android-2.20170204-r3.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d3a5a7521ca508b2bf0e5fd147c96686f63e850ba532617e59ade75221ed966bf3ddcb04a31143240a76b1a209641616397edcace SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2
-EBUILD selinux-android-2.20170204-r4.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d3a5a7521ca508b2bf0e5fd147c96686f63e850ba532617e59ade75221ed966bf3ddcb04a31143240a76b1a209641616397edcace SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2
 EBUILD selinux-android-2.20170805-r2.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d3a5a7521ca508b2bf0e5fd147c96686f63e850ba532617e59ade75221ed966bf3ddcb04a31143240a76b1a209641616397edcace SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2
 EBUILD selinux-android-2.20170805-r3.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d3a5a7521ca508b2bf0e5fd147c96686f63e850ba532617e59ade75221ed966bf3ddcb04a31143240a76b1a209641616397edcace SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2
-EBUILD selinux-android-2.20170805-r4.ebuild 435 BLAKE2B 73aff42e27a5a55278ca0cbed3305d7a76c793eeff7fe8b4984510d05751ae3b423133c3033a44e5fa3e52c5bcff058ecab4c469477c3af2316dd46ed56a861a SHA512 0814b60ee0f7846b2331d0d509bedd45f0a49d9194fac9a60bda177d942f68aca68b313a97182e5deb07d1b7f523ad86979a5e65c189c97374b94ce651e69a76
 EBUILD selinux-android-2.20180114-r1.ebuild 433 BLAKE2B c9e514389ca165a5116ca9010b59b83952981b54d32a078e15f56fdf21a98f5629775ef24dd9b870da57b205c130ddb0dc15f6d687a69e272d70ccee62bd799e SHA512 7045846caadde5d99b5e2b2049be011b771f28a34b541a36bb50c7a9995e13e72d43dfeff43a9ab1ee81013a85dd0e2d8c92d429557c4989c49df3473f29645b
 EBUILD selinux-android-2.20180114-r2.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
+EBUILD selinux-android-2.20180114-r3.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
 EBUILD selinux-android-9999.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
 MISC metadata.xml 317 BLAKE2B 0eb943554a2dce9c3ddd27c1599d70bf3023fa16142d335ba27922287a8201002822ce6b396551cae6b1ee47c686de96638c1aa44906c14a673cbdea181775c2 SHA512 fdaad87814ab78792c7bb30ba017e2f7ae7e25dd11701b2cca62c6847f5f79a59d453865aee812ce0c1d6842f9ba1867ac0206fecfd2edbc40da6ee45f56a428
diff --git a/sec-policy/selinux-android/selinux-android-2.20170204-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20170204-r1.ebuild
deleted file mode 100644
index 9c8c811f3570..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20170204-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20170204-r2.ebuild
deleted file mode 100644
index 754819bc2276..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20170204-r3.ebuild b/sec-policy/selinux-android/selinux-android-2.20170204-r3.ebuild
deleted file mode 100644
index 754819bc2276..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20170204-r4.ebuild b/sec-policy/selinux-android/selinux-android-2.20170204-r4.ebuild
deleted file mode 100644
index 754819bc2276..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20170805-r4.ebuild b/sec-policy/selinux-android/selinux-android-2.20170805-r4.ebuild
deleted file mode 100644
index 9c8c811f3570..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20180114-r3.ebuild b/sec-policy/selinux-android/selinux-android-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1090e96d263d
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20180114-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="android"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for android"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 8a07bdf3a202..542d641c0d8e 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-apache-2.20170204-r1.ebuild 384 BLAKE2B 9ba742c148a1443e30abb8851de65a8ebd5b9bffe25fb528330b2053beedce69d4e000034a977d2087bcdd97c027b45117fde6262f3db3754fea8f39c8e3efa7 SHA512 9f03a7c6160ce61df1f7047b1e50fde73b392cc2cef433b0cecaeefc06412ab7626f3d8642b0fa601240330a907deb38e2cd62bb321cc50dd8e177c97e7bd59b
-EBUILD selinux-apache-2.20170204-r2.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc91117d3fe8abce404c123533693d8491de119b1258b5e3d010a3cbcaff1c97cdcdfaa478f5b05838bb48a07c38435476303eb07f SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54
-EBUILD selinux-apache-2.20170204-r3.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc91117d3fe8abce404c123533693d8491de119b1258b5e3d010a3cbcaff1c97cdcdfaa478f5b05838bb48a07c38435476303eb07f SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54
-EBUILD selinux-apache-2.20170204-r4.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc91117d3fe8abce404c123533693d8491de119b1258b5e3d010a3cbcaff1c97cdcdfaa478f5b05838bb48a07c38435476303eb07f SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54
 EBUILD selinux-apache-2.20170805-r2.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc91117d3fe8abce404c123533693d8491de119b1258b5e3d010a3cbcaff1c97cdcdfaa478f5b05838bb48a07c38435476303eb07f SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54
 EBUILD selinux-apache-2.20170805-r3.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc91117d3fe8abce404c123533693d8491de119b1258b5e3d010a3cbcaff1c97cdcdfaa478f5b05838bb48a07c38435476303eb07f SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54
-EBUILD selinux-apache-2.20170805-r4.ebuild 384 BLAKE2B 9ba742c148a1443e30abb8851de65a8ebd5b9bffe25fb528330b2053beedce69d4e000034a977d2087bcdd97c027b45117fde6262f3db3754fea8f39c8e3efa7 SHA512 9f03a7c6160ce61df1f7047b1e50fde73b392cc2cef433b0cecaeefc06412ab7626f3d8642b0fa601240330a907deb38e2cd62bb321cc50dd8e177c97e7bd59b
 EBUILD selinux-apache-2.20180114-r1.ebuild 382 BLAKE2B 2b6773e146e41eb3242ea6f1a006423fb8975446ff7ede91d94487b8293d18ff651f8c7807cc4d061b3257448cd3a70fe4b763f8500c723bc0c1dab557ef5676 SHA512 a5a4fcfe6652fab2b6a29b42ee96cbfc119ab33490a3390435c7ea04b5c24b80d42b432dca97b737b3f9c7d23d1b34de2169b0df7e8eaac9f718b3458f7b6086
 EBUILD selinux-apache-2.20180114-r2.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
+EBUILD selinux-apache-2.20180114-r3.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
 EBUILD selinux-apache-9999.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
 MISC metadata.xml 316 BLAKE2B 7bc6c7cc3d055719a8d6fd244d495a0c7eb666157ccd55ddda35ae818dbb8afc8c4b5cd2777610dd872bcfd3ff0ce63b96b478d41517857efacc672f2e38ad08 SHA512 f8795858dc0c9f6b6384f67f6f83c6a59ba1da9ba3c1ef070604e2fbade2f202e88ca876e995512da3f89c1b0f163e8e206734c1f4a78a4170307a6840976293
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170204-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170204-r1.ebuild
deleted file mode 100644
index 4e93a6c2168f..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170204-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170204-r2.ebuild
deleted file mode 100644
index 8af33686fcbe..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170204-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170204-r3.ebuild
deleted file mode 100644
index 8af33686fcbe..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170204-r4.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170204-r4.ebuild
deleted file mode 100644
index 8af33686fcbe..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170805-r4.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170805-r4.ebuild
deleted file mode 100644
index 4e93a6c2168f..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20180114-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..077ce01d6342
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="apache"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apache"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-kerberos
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-kerberos
+"
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 880eba703d4b..5dae1f932367 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-apcupsd-2.20170204-r1.ebuild 382 BLAKE2B 9a5a6bf7cd49671cb304b2d9b78fe886465f0a8d5ef5a668cb0a9d14649a39a8825b0db3d0af4bc6456ef45a89944da1a307909de703c590e0870df56e067879 SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2
-EBUILD selinux-apcupsd-2.20170204-r2.ebuild 380 BLAKE2B a6506297b6de931074bd7817fdeea2d7fef426ec26aed60f9e9fe86ae1317b9237cbfb04f058f262162159a9916d7a0b5a0506bdbb7e0d220ddd37c2a877cffc SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513
-EBUILD selinux-apcupsd-2.20170204-r3.ebuild 380 BLAKE2B a6506297b6de931074bd7817fdeea2d7fef426ec26aed60f9e9fe86ae1317b9237cbfb04f058f262162159a9916d7a0b5a0506bdbb7e0d220ddd37c2a877cffc SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513
-EBUILD selinux-apcupsd-2.20170204-r4.ebuild 380 BLAKE2B a6506297b6de931074bd7817fdeea2d7fef426ec26aed60f9e9fe86ae1317b9237cbfb04f058f262162159a9916d7a0b5a0506bdbb7e0d220ddd37c2a877cffc SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513
 EBUILD selinux-apcupsd-2.20170805-r2.ebuild 380 BLAKE2B a6506297b6de931074bd7817fdeea2d7fef426ec26aed60f9e9fe86ae1317b9237cbfb04f058f262162159a9916d7a0b5a0506bdbb7e0d220ddd37c2a877cffc SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513
 EBUILD selinux-apcupsd-2.20170805-r3.ebuild 380 BLAKE2B a6506297b6de931074bd7817fdeea2d7fef426ec26aed60f9e9fe86ae1317b9237cbfb04f058f262162159a9916d7a0b5a0506bdbb7e0d220ddd37c2a877cffc SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513
-EBUILD selinux-apcupsd-2.20170805-r4.ebuild 382 BLAKE2B 9a5a6bf7cd49671cb304b2d9b78fe886465f0a8d5ef5a668cb0a9d14649a39a8825b0db3d0af4bc6456ef45a89944da1a307909de703c590e0870df56e067879 SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2
 EBUILD selinux-apcupsd-2.20180114-r1.ebuild 380 BLAKE2B a1a225da65e7e43c1b38a9f284d5287d744b69930a3a506bbf6d27c7b995be75d55ac5f044cbf7dbef3c9ee80f9e5c7817489a1e24d77cecbd93041101087e4e SHA512 2b348194d990c1459abc4e84b2e59a20a6179fd8cb6dfa3eaf2e41572c6bdeb5b6b1e32406d39bbc02986385667d1aec889c795f4bd069842227651df5e16dd7
 EBUILD selinux-apcupsd-2.20180114-r2.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
+EBUILD selinux-apcupsd-2.20180114-r3.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
 EBUILD selinux-apcupsd-9999.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
 MISC metadata.xml 317 BLAKE2B 36a8cdec46ee79e127fad419024564374d2ccea486979e0275ea3aefcccf87f6ad519954bc696e700cca523fb04f4da7d5e66e703b2ae195934e15ad9cb0c421 SHA512 60b1efe0a05b69802dc9be53e4420921416667159ec6a0803a119c1ef4524cf9178ef60521f1f5a12c62c3d405ca3fc145f71aedbffa14190933614091379a01
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild
deleted file mode 100644
index 44ec399af7be..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild
deleted file mode 100644
index 18f55a8b17ad..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild
deleted file mode 100644
index 18f55a8b17ad..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild
deleted file mode 100644
index 18f55a8b17ad..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r4.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r4.ebuild
deleted file mode 100644
index 44ec399af7be..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180114-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..67784a4a30c6
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="apcupsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index eeb02957fc04..2247ded619fa 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-apm-2.20170204-r1.ebuild 278 BLAKE2B d7ce2eba14d73f8f0274bbd380b44c533e493d305c59f3b7f0b662ebf9e0856fd652e80dd13162b041ab8b77ad49247c020dc2a221ff79984b7b575b8f2e47aa SHA512 71b805fa94fb3c6e4c34a869474fff3994341b54ff5ec2132d0f65769475296761b61a1a65823b052debb4ba3e0a9ab014908ea3be50b0f2c5f30f46138cb3ae
-EBUILD selinux-apm-2.20170204-r2.ebuild 276 BLAKE2B 86d58447e620fb4b2c77520771c27e12a3b690e1dc83dcdbc01d09bd709e930342e46ba423440ada3a700a7d83530e74d1fff6f5f587d73163829cda1e298576 SHA512 f3e5540fa9a87de8eb11ab7f1f7a3df25b99a05391fd73344c0b1e357a829394944c68d2da29bacf4de1d19c1bb327b8f9d20830b373a62847770496dd1be5ea
-EBUILD selinux-apm-2.20170204-r3.ebuild 276 BLAKE2B 86d58447e620fb4b2c77520771c27e12a3b690e1dc83dcdbc01d09bd709e930342e46ba423440ada3a700a7d83530e74d1fff6f5f587d73163829cda1e298576 SHA512 f3e5540fa9a87de8eb11ab7f1f7a3df25b99a05391fd73344c0b1e357a829394944c68d2da29bacf4de1d19c1bb327b8f9d20830b373a62847770496dd1be5ea
-EBUILD selinux-apm-2.20170204-r4.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134f5cd67110f47824c3478fa52ba52af031e58db2876bf6164e6f5ae382ca7b07e4e9d67d059d466dcaa0960eb0eb891992194 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d
 EBUILD selinux-apm-2.20170805-r2.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134f5cd67110f47824c3478fa52ba52af031e58db2876bf6164e6f5ae382ca7b07e4e9d67d059d466dcaa0960eb0eb891992194 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d
 EBUILD selinux-apm-2.20170805-r3.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134f5cd67110f47824c3478fa52ba52af031e58db2876bf6164e6f5ae382ca7b07e4e9d67d059d466dcaa0960eb0eb891992194 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d
-EBUILD selinux-apm-2.20170805-r4.ebuild 813 BLAKE2B cfe761b3c6bd3bf7b798123f742e7833f156e9d10f114e9fce6236c7ed7cb434b1b4f85492300a48685c840b1f36258d37446637b6fe52b0d35bb86dc47346dc SHA512 9633fea36343b9c84a6fce2bb8d69ce9f70c5a37946c5c65d069579d900afaff66298ee9714103511a11022bec3821c29b47134f89c00611d9914a99310504c6
 EBUILD selinux-apm-2.20180114-r1.ebuild 811 BLAKE2B ee8ac809c6bbd3f0a55869c813f5e3fcb679f3cbb77c6099337ba805b9bf4321216deb83034580afa0b5549ef1c2150160954c5226fee496c27ef13395dfc4e9 SHA512 e4568748d776c019721a559b893db7b3b940854e6cd9be8d2631c1b2e4d17896b02bd0863a23aabf179e0f27a808bdf1d1cc97bdc07c587ba3e346fc81f05a08
 EBUILD selinux-apm-2.20180114-r2.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
+EBUILD selinux-apm-2.20180114-r3.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
 EBUILD selinux-apm-9999.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
 MISC metadata.xml 313 BLAKE2B 909f5fce3d131c6329123f5e35a79476a45dcf4efd8a0ac47ae70abe6ee6da7a4816d42e85ddb22ca425259c296108762dc85e962d8f83ed3f6ad2f06b6e58f4 SHA512 9616055313d194ea536d3d633887c199e71a976f044e357de7da9da4e53b274105869f4c85539133d66ced469fab27d44524251bb389dbdbf3298d7799baec3a
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170204-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170204-r1.ebuild
deleted file mode 100644
index 31e7844ae58c..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170204-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170204-r2.ebuild
deleted file mode 100644
index 0c59387a149a..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170204-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170204-r3.ebuild
deleted file mode 100644
index 0c59387a149a..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170204-r4.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170204-r4.ebuild
deleted file mode 100644
index d0e664f67c7b..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acpi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acpi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-pkg_postinst() {
-	# "apm" module got renamed to "acpi", must remove apm first
-	# the contexts are okay even tho the modules are not
-	# replaced in the same command (doesnt become unlabeled_t)
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postinst
-}
-
-pkg_postrm() {
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postrm
-}
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170805-r4.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170805-r4.ebuild
deleted file mode 100644
index d389ead90e00..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acpi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acpi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-pkg_postinst() {
-	# "apm" module got renamed to "acpi", must remove apm first
-	# the contexts are okay even tho the modules are not
-	# replaced in the same command (doesnt become unlabeled_t)
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postinst
-}
-
-pkg_postrm() {
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postrm
-}
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20180114-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a5f7f30b0e7a
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20180114-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="acpi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acpi"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+pkg_postinst() {
+	# "apm" module got renamed to "acpi", must remove apm first
+	# the contexts are okay even tho the modules are not
+	# replaced in the same command (doesnt become unlabeled_t)
+	for i in ${POLICY_TYPES}; do
+		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+			semodule -s "${i}" -r apm
+		fi
+	done
+	selinux-policy-2_pkg_postinst
+}
+
+pkg_postrm() {
+	for i in ${POLICY_TYPES}; do
+		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+			semodule -s "${i}" -r apm
+		fi
+	done
+	selinux-policy-2_pkg_postrm
+}
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 8869d820b336..60561607f80a 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-arpwatch-2.20170204-r1.ebuild 288 BLAKE2B fba92ab5bcbdda83a35c2098e2fa4fbe0f0e5c861e66eaed90a1d1fcd8424e3d5379c097e374c17b6a9988debfaa2213a55b9db1496337d5604cf40f553479ce SHA512 fdef4b3a1739d93f6a0c3e294561d339cb1c3825ddbecb3ff1ea91fdfabce1fd37d48f518bceea576a3097f9b78958374b9ff282c4d1371f93145d41bc32a7ee
-EBUILD selinux-arpwatch-2.20170204-r2.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1ad18ac126467eb16c4550b9924045be48261cc4b042052476b9d82b6ac20012f682b0a648e8c1b17514b98a119f8982a1384aa96a8 SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5
-EBUILD selinux-arpwatch-2.20170204-r3.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1ad18ac126467eb16c4550b9924045be48261cc4b042052476b9d82b6ac20012f682b0a648e8c1b17514b98a119f8982a1384aa96a8 SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5
-EBUILD selinux-arpwatch-2.20170204-r4.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1ad18ac126467eb16c4550b9924045be48261cc4b042052476b9d82b6ac20012f682b0a648e8c1b17514b98a119f8982a1384aa96a8 SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5
 EBUILD selinux-arpwatch-2.20170805-r2.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1ad18ac126467eb16c4550b9924045be48261cc4b042052476b9d82b6ac20012f682b0a648e8c1b17514b98a119f8982a1384aa96a8 SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5
 EBUILD selinux-arpwatch-2.20170805-r3.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1ad18ac126467eb16c4550b9924045be48261cc4b042052476b9d82b6ac20012f682b0a648e8c1b17514b98a119f8982a1384aa96a8 SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5
-EBUILD selinux-arpwatch-2.20170805-r4.ebuild 288 BLAKE2B fba92ab5bcbdda83a35c2098e2fa4fbe0f0e5c861e66eaed90a1d1fcd8424e3d5379c097e374c17b6a9988debfaa2213a55b9db1496337d5604cf40f553479ce SHA512 fdef4b3a1739d93f6a0c3e294561d339cb1c3825ddbecb3ff1ea91fdfabce1fd37d48f518bceea576a3097f9b78958374b9ff282c4d1371f93145d41bc32a7ee
 EBUILD selinux-arpwatch-2.20180114-r1.ebuild 286 BLAKE2B 4968a9834da18a657aba2ef8532e84922fb472697c15e0c7bf508ef8b0c1daaca4ce9e37bea461ddea71cbde7a2a06679c9ce53d04420ebe3ea62ff42c2b3627 SHA512 165337e1d0f661a4b82a43c70712f4a50dcd1396ce58206e969c05c9c32a199de71d001d80ffa2899945d9bf5910f14e551e1bd07edae678602dc76c664ea9b6
 EBUILD selinux-arpwatch-2.20180114-r2.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
+EBUILD selinux-arpwatch-2.20180114-r3.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
 EBUILD selinux-arpwatch-9999.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
 MISC metadata.xml 318 BLAKE2B 5ae25a1f92a7aaf41d0dc2cf33495365e90bad3310c41af2ab48c7aaafe0449f5b2ca1d1d31c37f2a69cfc2e793859de8f57e6f0d5d3eb99a86530f960badc1b SHA512 4917bd6c1284df4face1c8b14e2df39187fb36bd5094fd460bd324bebfdd69b825b783daab79ff957b77579ddfaef98ff65121a78cc15cbbcae37e8fea53d8db
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r1.ebuild
deleted file mode 100644
index 7d675ca0f2fe..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r2.ebuild
deleted file mode 100644
index 750ca85588f5..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r3.ebuild
deleted file mode 100644
index 750ca85588f5..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r4.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r4.ebuild
deleted file mode 100644
index 750ca85588f5..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r4.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r4.ebuild
deleted file mode 100644
index 7d675ca0f2fe..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180114-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a07ffc2e1c8f
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="arpwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for arpwatch"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index 5647f53a84fe..bc1b4eb3ca53 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-asterisk-2.20170204-r1.ebuild 288 BLAKE2B bbeeac6b844758bee39ffcdb27e8846fd0de1fd2a925add426b4cf4ec78b4257da89bf7ece155c0df5906e4ab6757d677c7ddf5e32b8d53d7b42b29907b0c348 SHA512 bb5c57d0b1760a5835a6ff3c6eb88fbd47141127a47624369dfd2d95015e9e11e92b750fde136073535a46c7eeb50f2de2e8d3390b857d21e71d18db2d4f4ac4
-EBUILD selinux-asterisk-2.20170204-r2.ebuild 286 BLAKE2B f16eb032ff79c14529b2da374b72946791d139df1010c320f33f917aa1dbb1338466e693803470f6863197dbb6107006298f0c8d65f85069991d779ab126da56 SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7
-EBUILD selinux-asterisk-2.20170204-r3.ebuild 286 BLAKE2B f16eb032ff79c14529b2da374b72946791d139df1010c320f33f917aa1dbb1338466e693803470f6863197dbb6107006298f0c8d65f85069991d779ab126da56 SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7
-EBUILD selinux-asterisk-2.20170204-r4.ebuild 286 BLAKE2B f16eb032ff79c14529b2da374b72946791d139df1010c320f33f917aa1dbb1338466e693803470f6863197dbb6107006298f0c8d65f85069991d779ab126da56 SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7
 EBUILD selinux-asterisk-2.20170805-r2.ebuild 286 BLAKE2B f16eb032ff79c14529b2da374b72946791d139df1010c320f33f917aa1dbb1338466e693803470f6863197dbb6107006298f0c8d65f85069991d779ab126da56 SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7
 EBUILD selinux-asterisk-2.20170805-r3.ebuild 286 BLAKE2B f16eb032ff79c14529b2da374b72946791d139df1010c320f33f917aa1dbb1338466e693803470f6863197dbb6107006298f0c8d65f85069991d779ab126da56 SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7
-EBUILD selinux-asterisk-2.20170805-r4.ebuild 288 BLAKE2B bbeeac6b844758bee39ffcdb27e8846fd0de1fd2a925add426b4cf4ec78b4257da89bf7ece155c0df5906e4ab6757d677c7ddf5e32b8d53d7b42b29907b0c348 SHA512 bb5c57d0b1760a5835a6ff3c6eb88fbd47141127a47624369dfd2d95015e9e11e92b750fde136073535a46c7eeb50f2de2e8d3390b857d21e71d18db2d4f4ac4
 EBUILD selinux-asterisk-2.20180114-r1.ebuild 286 BLAKE2B bb616b27ae9224cac9cb951051aac7b19504a7caadce81adac53e131aa2bd521168bc5970103fa34f097efd9b77ee2d20768d8d25730f5e22a1490ba3bf4c36b SHA512 e70983ecb1324229b6df0d19ea3d767132762649bff5c78f5cb95f7427734cf3ee57a7a9cb68356bb849fe1c9b5a57139c37da325ba87f707cbd1d450445d4d8
 EBUILD selinux-asterisk-2.20180114-r2.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
+EBUILD selinux-asterisk-2.20180114-r3.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
 EBUILD selinux-asterisk-9999.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
 MISC metadata.xml 318 BLAKE2B 19b2f4f1ae7f3ca7873f362bf74b0c997ee59f5273f16774c01cb9dd094e315389d09dc124381495ad4c83bec68093b981ffde7a5f7fa593e07eaedeafce2d6c SHA512 33015c2f0865e82401513b3615960fa0f13b51839ab82fe874f3134d1d4240ad4ac5f7c34b0cb3b6db50fb6f5860634db84281ec6518de23d4d56f2e9cf20ae5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r1.ebuild
deleted file mode 100644
index 30bc3aaba1a8..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r2.ebuild
deleted file mode 100644
index 62ff34ffcdf0..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r3.ebuild
deleted file mode 100644
index 62ff34ffcdf0..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r4.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r4.ebuild
deleted file mode 100644
index 62ff34ffcdf0..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r4.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r4.ebuild
deleted file mode 100644
index 30bc3aaba1a8..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20180114-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..76ca59655949
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="asterisk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for asterisk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index 6fad2c99a92b..5265d890b0a1 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-at-2.20170204-r1.ebuild 276 BLAKE2B 566a1c96afda206bbc42f5b39f94f8845f7c08b6c59af5c3b386f720246fde996df3b0d313d71e45e7e672e92215f068c80974e14f72a2dfc4ea7f6952143703 SHA512 c1992b4d225439daddf525fafab1f144a43b33e1855fa58e7b2b1f6a628ad4b7720f50d9e33b6b66ff17761c3fb2aa2ef50c0010047dea766f10a3106dddf7df
-EBUILD selinux-at-2.20170204-r2.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec4f9c02fc95492efa393101d517c7bec780451b458fb4e369a5f141d210ccb31b8af37799008c6834745eda8d5f6c2c72f33 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88
-EBUILD selinux-at-2.20170204-r3.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec4f9c02fc95492efa393101d517c7bec780451b458fb4e369a5f141d210ccb31b8af37799008c6834745eda8d5f6c2c72f33 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88
-EBUILD selinux-at-2.20170204-r4.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec4f9c02fc95492efa393101d517c7bec780451b458fb4e369a5f141d210ccb31b8af37799008c6834745eda8d5f6c2c72f33 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88
 EBUILD selinux-at-2.20170805-r2.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec4f9c02fc95492efa393101d517c7bec780451b458fb4e369a5f141d210ccb31b8af37799008c6834745eda8d5f6c2c72f33 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88
 EBUILD selinux-at-2.20170805-r3.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec4f9c02fc95492efa393101d517c7bec780451b458fb4e369a5f141d210ccb31b8af37799008c6834745eda8d5f6c2c72f33 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88
-EBUILD selinux-at-2.20170805-r4.ebuild 276 BLAKE2B 566a1c96afda206bbc42f5b39f94f8845f7c08b6c59af5c3b386f720246fde996df3b0d313d71e45e7e672e92215f068c80974e14f72a2dfc4ea7f6952143703 SHA512 c1992b4d225439daddf525fafab1f144a43b33e1855fa58e7b2b1f6a628ad4b7720f50d9e33b6b66ff17761c3fb2aa2ef50c0010047dea766f10a3106dddf7df
 EBUILD selinux-at-2.20180114-r1.ebuild 274 BLAKE2B acd4fc9fc65ac9860a277331fb1984825239270ae6d7db5e0ce903a402a47b393a47e519793cec5f7f52726affb93864f2d267d45b44b036557287946b59e0e5 SHA512 2d00e67eb2b74e87d8672246241253d7c79f3748cbf2ffc0a3bf427a296cc102a0241f271604987dd10eadc2953162b1e36bcc35324aeb6923554dbcfc1267b3
 EBUILD selinux-at-2.20180114-r2.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
+EBUILD selinux-at-2.20180114-r3.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
 EBUILD selinux-at-9999.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
 MISC metadata.xml 312 BLAKE2B cd411cd53bcbd27cdb2e71835c8d78684618419c265d17c3b9844abc9c14427ff3369ac949392bc1ad632a14926f2891b640941e6c59bc57a9033700856e6f13 SHA512 0d8118c4453dfb4796c10532034c98ab3ed08255c27881959dfa818486918c9c36616d0b9921fbe5af35f238593d6b39011d48a9c8b302e577ea2ee7ed5fd333
diff --git a/sec-policy/selinux-at/selinux-at-2.20170204-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20170204-r1.ebuild
deleted file mode 100644
index 60be724ec280..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20170204-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20170204-r2.ebuild
deleted file mode 100644
index 2033d520758c..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20170204-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20170204-r3.ebuild
deleted file mode 100644
index 2033d520758c..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20170204-r4.ebuild b/sec-policy/selinux-at/selinux-at-2.20170204-r4.ebuild
deleted file mode 100644
index 2033d520758c..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20170805-r4.ebuild b/sec-policy/selinux-at/selinux-at-2.20170805-r4.ebuild
deleted file mode 100644
index 60be724ec280..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20180114-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..d5d07f6dd98d
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="at"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for at"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index bfed4978147a..0e00da919c9b 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-automount-2.20170204-r1.ebuild 290 BLAKE2B db29327a13d713244d8da5faa07f0ee0b39274f2d41f42ef6b516ee438e60587ccfa10dee162632e3b3aae49b8eca119524418b000ed8230413f19a3d7a3c377 SHA512 c7ed768a3a3b47d1941b0cd096503aae8e4210262044701840e3a0c3653e00353f0fb9ddd6fff93bef452580fd0b7165220ecd5fbb78724002c538a457db5d57
-EBUILD selinux-automount-2.20170204-r2.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607db98e70cd8ffa0301dad1701c12d57f19f0015a9d382ac8d3a87efc64112d684df57800195be4275ff0e45b3a7a8c10f9468075af7 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0
-EBUILD selinux-automount-2.20170204-r3.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607db98e70cd8ffa0301dad1701c12d57f19f0015a9d382ac8d3a87efc64112d684df57800195be4275ff0e45b3a7a8c10f9468075af7 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0
-EBUILD selinux-automount-2.20170204-r4.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607db98e70cd8ffa0301dad1701c12d57f19f0015a9d382ac8d3a87efc64112d684df57800195be4275ff0e45b3a7a8c10f9468075af7 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0
 EBUILD selinux-automount-2.20170805-r2.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607db98e70cd8ffa0301dad1701c12d57f19f0015a9d382ac8d3a87efc64112d684df57800195be4275ff0e45b3a7a8c10f9468075af7 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0
 EBUILD selinux-automount-2.20170805-r3.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607db98e70cd8ffa0301dad1701c12d57f19f0015a9d382ac8d3a87efc64112d684df57800195be4275ff0e45b3a7a8c10f9468075af7 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0
-EBUILD selinux-automount-2.20170805-r4.ebuild 290 BLAKE2B db29327a13d713244d8da5faa07f0ee0b39274f2d41f42ef6b516ee438e60587ccfa10dee162632e3b3aae49b8eca119524418b000ed8230413f19a3d7a3c377 SHA512 c7ed768a3a3b47d1941b0cd096503aae8e4210262044701840e3a0c3653e00353f0fb9ddd6fff93bef452580fd0b7165220ecd5fbb78724002c538a457db5d57
 EBUILD selinux-automount-2.20180114-r1.ebuild 288 BLAKE2B 90115b2a0412af2744c8231106169e7ec3ec917d3aec09728cd8bb79d99436658542386972fd2672d9f3f043bae41cb6ba6cf638dbd7b5766c6f9189ef59ff5b SHA512 69f594cc4963ce677ac5b918cbac3089283820db6bcb51ca8cb30c70043bc7955abebdd6b2f5caa1c0cf5279319c6f35c57884ac4c1d0b678d180daf67ce1f0a
 EBUILD selinux-automount-2.20180114-r2.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
+EBUILD selinux-automount-2.20180114-r3.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
 EBUILD selinux-automount-9999.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
 MISC metadata.xml 319 BLAKE2B 9d1c7f70a181a970e9c1e12a4708344025d78e5008e81323d255093af8e7974eaad668e0807e7ca9a7b7be0a1825cd290620c7f2e5ff48ac6c0722249eecfa0b SHA512 df7fb7f023892cb790bb12bcf25abd4ed0bffe469cfcdffa399d0e3f13535e5a9b29c8aebc8ef11c9171f033da569597c9824cf1789d1042e0493f4d14aa6fec
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170204-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170204-r1.ebuild
deleted file mode 100644
index 908d5219c7b3..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170204-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170204-r2.ebuild
deleted file mode 100644
index a3cfbe6ac4f2..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170204-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170204-r3.ebuild
deleted file mode 100644
index a3cfbe6ac4f2..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170204-r4.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170204-r4.ebuild
deleted file mode 100644
index a3cfbe6ac4f2..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170805-r4.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170805-r4.ebuild
deleted file mode 100644
index 908d5219c7b3..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20180114-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..98c74562e3e3
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="automount"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index b94597062fe6..e5ad87621961 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-avahi-2.20170204-r1.ebuild 282 BLAKE2B c960d496318897a9d6f81db7b15a7c0b32cbe15e7198fdd72415b7c6f3a9c1c2def8637af17f18f602bfced3038ae9362ef28fcc14891730f68351f04b8c2d70 SHA512 543d6968dad88ce5d0a661320723af462587091ce8e253e63fb19a12afabb5082d9e52353189d00f61966b7b9fc763786208c84335fd686d08c894b58c3ff6d1
-EBUILD selinux-avahi-2.20170204-r2.ebuild 280 BLAKE2B 1f01209b402c703f9054dc50912b05dabf015e6da1a1274e1db0734de4479dd5825a3e47ae44a8821ac3f627f9410e03866d29208a120d30b7ce21d91a03ddd7 SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16
-EBUILD selinux-avahi-2.20170204-r3.ebuild 280 BLAKE2B 1f01209b402c703f9054dc50912b05dabf015e6da1a1274e1db0734de4479dd5825a3e47ae44a8821ac3f627f9410e03866d29208a120d30b7ce21d91a03ddd7 SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16
-EBUILD selinux-avahi-2.20170204-r4.ebuild 280 BLAKE2B 1f01209b402c703f9054dc50912b05dabf015e6da1a1274e1db0734de4479dd5825a3e47ae44a8821ac3f627f9410e03866d29208a120d30b7ce21d91a03ddd7 SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16
 EBUILD selinux-avahi-2.20170805-r2.ebuild 280 BLAKE2B 1f01209b402c703f9054dc50912b05dabf015e6da1a1274e1db0734de4479dd5825a3e47ae44a8821ac3f627f9410e03866d29208a120d30b7ce21d91a03ddd7 SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16
 EBUILD selinux-avahi-2.20170805-r3.ebuild 280 BLAKE2B 1f01209b402c703f9054dc50912b05dabf015e6da1a1274e1db0734de4479dd5825a3e47ae44a8821ac3f627f9410e03866d29208a120d30b7ce21d91a03ddd7 SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16
-EBUILD selinux-avahi-2.20170805-r4.ebuild 282 BLAKE2B c960d496318897a9d6f81db7b15a7c0b32cbe15e7198fdd72415b7c6f3a9c1c2def8637af17f18f602bfced3038ae9362ef28fcc14891730f68351f04b8c2d70 SHA512 543d6968dad88ce5d0a661320723af462587091ce8e253e63fb19a12afabb5082d9e52353189d00f61966b7b9fc763786208c84335fd686d08c894b58c3ff6d1
 EBUILD selinux-avahi-2.20180114-r1.ebuild 280 BLAKE2B 25f9d63f4734aacde5f3ce57f69027611ad6d80de1852da701a6cf00774505c99ad005949fc6b73bd1b0d6944ddae67870f55bf3fa6fab46105847e2acee398c SHA512 3f0682b759ddaf2c9a079c0764526f5e76af1a087a2fe7e9c20526cba089e58864442b40c9fd9e0571dd2207457582e56fda49ae3f6fa8bb8bde3f0ebce7e278
 EBUILD selinux-avahi-2.20180114-r2.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
+EBUILD selinux-avahi-2.20180114-r3.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
 EBUILD selinux-avahi-9999.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
 MISC metadata.xml 315 BLAKE2B 7cda989834ad58ea2460821062d71ad45f8e2e563caf4a2bc582262362d2ae282403e0be36eeb4bb2a3c28a55fca9ae5341d6fb5e3604fa57a71768b841ed246 SHA512 891d4ca0710d0f8ebbeaae86e71ff03f0011ded5cdafde29af66684e39f27ab8a6ff3b447b9138434503938484b7c9947c1f386a67860acb316ed1fdd91177e3
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r1.ebuild
deleted file mode 100644
index f6123cfbbb86..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r2.ebuild
deleted file mode 100644
index 70871b2b615d..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r3.ebuild
deleted file mode 100644
index 70871b2b615d..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r4.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r4.ebuild
deleted file mode 100644
index 70871b2b615d..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r4.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r4.ebuild
deleted file mode 100644
index f6123cfbbb86..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20180114-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ff1e5370ad15
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="avahi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for avahi"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index 1b8b8406469d..b6744b722a4f 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-awstats-2.20170204-r1.ebuild 382 BLAKE2B e6293e1727f5040cb93b03f404d7f956748e5b28123701319bed36977fc8dd86ebb3622e354577971b4774c938efc2f88edf848843b3e9cf463ddb3ab92369b9 SHA512 c9268dbe2875d2dc40b3a2a47849f98997bae255315f9fbf44dcf8639f3a69c331d047fc13ba1ab46bc011687ff0fae69d3c83d337eb1b8ba4661216d1df2d39
-EBUILD selinux-awstats-2.20170204-r2.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88bde3a6ec4a7e1b580825ff580040b2b282f510476105859ff09d40de5a20ea6cf49be1eb5fb86c7da38f8eb33e69042a2860df6ff SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30
-EBUILD selinux-awstats-2.20170204-r3.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88bde3a6ec4a7e1b580825ff580040b2b282f510476105859ff09d40de5a20ea6cf49be1eb5fb86c7da38f8eb33e69042a2860df6ff SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30
-EBUILD selinux-awstats-2.20170204-r4.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88bde3a6ec4a7e1b580825ff580040b2b282f510476105859ff09d40de5a20ea6cf49be1eb5fb86c7da38f8eb33e69042a2860df6ff SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30
 EBUILD selinux-awstats-2.20170805-r2.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88bde3a6ec4a7e1b580825ff580040b2b282f510476105859ff09d40de5a20ea6cf49be1eb5fb86c7da38f8eb33e69042a2860df6ff SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30
 EBUILD selinux-awstats-2.20170805-r3.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88bde3a6ec4a7e1b580825ff580040b2b282f510476105859ff09d40de5a20ea6cf49be1eb5fb86c7da38f8eb33e69042a2860df6ff SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30
-EBUILD selinux-awstats-2.20170805-r4.ebuild 382 BLAKE2B e6293e1727f5040cb93b03f404d7f956748e5b28123701319bed36977fc8dd86ebb3622e354577971b4774c938efc2f88edf848843b3e9cf463ddb3ab92369b9 SHA512 c9268dbe2875d2dc40b3a2a47849f98997bae255315f9fbf44dcf8639f3a69c331d047fc13ba1ab46bc011687ff0fae69d3c83d337eb1b8ba4661216d1df2d39
 EBUILD selinux-awstats-2.20180114-r1.ebuild 380 BLAKE2B 7b3f43aceb65a7ea8d0707346e4e028256d9cf5312de85f8db2b2914f6c648756e3f132aa01ebd608a04b35d41ddac9dcf0a5751ae77112fc1d6d37376cef1d1 SHA512 5c9e7529915516a76e81dac38ccde11359f2c1b31734c01a259d8a521d92688f002bb2d40684bc4ebe5373550456a6e1ed3422574f78c1d9c1046bc8acc6fe90
 EBUILD selinux-awstats-2.20180114-r2.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
+EBUILD selinux-awstats-2.20180114-r3.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
 EBUILD selinux-awstats-9999.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
 MISC metadata.xml 317 BLAKE2B ef3132bec05c99928997bde44181ef17235bc9dd2ff78bf1fbab078c2bf2925622e19419d624a51aa6574f1f880191690f3184c1472407cdf286c416544bef04 SHA512 0b9ddebb84974b0eef29ff4eb9b3449593d2652944d17648e297db2a6f301531c1c003efac88215970b739b9e6c2fc733e21edb3257f2138ce8aa95047a70fa9
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r1.ebuild
deleted file mode 100644
index 09e5c4fe1978..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r2.ebuild
deleted file mode 100644
index 95cae5acdab5..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r3.ebuild
deleted file mode 100644
index 95cae5acdab5..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r4.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r4.ebuild
deleted file mode 100644
index 95cae5acdab5..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r4.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r4.ebuild
deleted file mode 100644
index 09e5c4fe1978..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20180114-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..967aa579c24d
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="awstats"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for awstats"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index e05cdc098040..8f5a380f91f9 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-backup-2.20170204-r1.ebuild 297 BLAKE2B 27709490067d90b840d8ecf31c7404f5b8925009077bccf49307c441e09f7e0b6e17f1f89e19bf4159e1d759c4d8d3c03e628ee8d953b19f8b22f8c2cdd064d2 SHA512 8a0ae54d4e036fc16b7cd2684c1f41a0c406dee0a5fd78e51a4413339d198ee338a1350dea3ed9265533711490db40423b6de59684d5cad1f0b9f5824e2d9ae8
-EBUILD selinux-backup-2.20170204-r2.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f7073bd464ce9a52fa2440e03e9bc0d6683f9d93a1a5d37d173ad6a638de19355915127cdbf261c2b0c70f9ce238861fcad85d0aeef SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d
-EBUILD selinux-backup-2.20170204-r3.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f7073bd464ce9a52fa2440e03e9bc0d6683f9d93a1a5d37d173ad6a638de19355915127cdbf261c2b0c70f9ce238861fcad85d0aeef SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d
-EBUILD selinux-backup-2.20170204-r4.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f7073bd464ce9a52fa2440e03e9bc0d6683f9d93a1a5d37d173ad6a638de19355915127cdbf261c2b0c70f9ce238861fcad85d0aeef SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d
 EBUILD selinux-backup-2.20170805-r2.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f7073bd464ce9a52fa2440e03e9bc0d6683f9d93a1a5d37d173ad6a638de19355915127cdbf261c2b0c70f9ce238861fcad85d0aeef SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d
 EBUILD selinux-backup-2.20170805-r3.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f7073bd464ce9a52fa2440e03e9bc0d6683f9d93a1a5d37d173ad6a638de19355915127cdbf261c2b0c70f9ce238861fcad85d0aeef SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d
-EBUILD selinux-backup-2.20170805-r4.ebuild 297 BLAKE2B 27709490067d90b840d8ecf31c7404f5b8925009077bccf49307c441e09f7e0b6e17f1f89e19bf4159e1d759c4d8d3c03e628ee8d953b19f8b22f8c2cdd064d2 SHA512 8a0ae54d4e036fc16b7cd2684c1f41a0c406dee0a5fd78e51a4413339d198ee338a1350dea3ed9265533711490db40423b6de59684d5cad1f0b9f5824e2d9ae8
 EBUILD selinux-backup-2.20180114-r1.ebuild 295 BLAKE2B 7ff6c3e188b4af86155f93c0fe042034de10641f0f4ca11bb5ce55b02c453706a355b8d934833cc40c8a847bb43ccc2af42e0d1662e41d111c9ccd5cabf0ab58 SHA512 df3a7d48d57c85ed85560ff6d161c0d54298b98ec15e90954b8c29a24078a79a485dc914cad1d0303cabed1e4b45054777e68e99fe4c41d85355ea9918ec7883
 EBUILD selinux-backup-2.20180114-r2.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
+EBUILD selinux-backup-2.20180114-r3.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
 EBUILD selinux-backup-9999.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
 MISC metadata.xml 329 BLAKE2B a10467077df9d62a7d16cb8c0ae23601c02dfcbd65ddeee59f6c3185e04c41e3a6de49607f03b43181b692446714e7b8e64a1b37beafc57b5d8ae581da38526c SHA512 0c171ebf47304dac2737f47f0b7246540d41a8b14a59b7354b64ec0a0dd70345fe0fb634cd8c03636b9a8c3510bede5d1a9a12f072e6c91fae04734d334d1f20
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170204-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170204-r1.ebuild
deleted file mode 100644
index df29db3b1fcb..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170204-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170204-r2.ebuild
deleted file mode 100644
index b29860f1c7e0..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170204-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170204-r3.ebuild
deleted file mode 100644
index b29860f1c7e0..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170204-r4.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170204-r4.ebuild
deleted file mode 100644
index b29860f1c7e0..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170805-r4.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170805-r4.ebuild
deleted file mode 100644
index df29db3b1fcb..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20180114-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..235b2655afe2
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="backup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for generic backup apps"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 43998c7eb108..392619147ef3 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bacula-2.20170204-r1.ebuild 284 BLAKE2B 52b948274d02a2d213c40c39ec067fadc7de5f9a9e756e030133ccc3c4a394c9c1bfc1cf0693ec872e8eb9c2c30ac60e1a112d5c11dbdd606f1fbdc6dc8504fe SHA512 e3fbaced964a16f3dae73e21b6c50fbead88d7c8930613422472efea20c2f3c5179fcd06f7070adaa64dad5340cf76496e368af3dd626de2c5b5dfea75f8490d
-EBUILD selinux-bacula-2.20170204-r2.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3abbf9b015adb187d5a39cba729f08812ce96df2db3506c6b6e4fcd6127b906cab225279ba3e313d603c1a51928eeb890f1c8b36 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6
-EBUILD selinux-bacula-2.20170204-r3.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3abbf9b015adb187d5a39cba729f08812ce96df2db3506c6b6e4fcd6127b906cab225279ba3e313d603c1a51928eeb890f1c8b36 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6
-EBUILD selinux-bacula-2.20170204-r4.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3abbf9b015adb187d5a39cba729f08812ce96df2db3506c6b6e4fcd6127b906cab225279ba3e313d603c1a51928eeb890f1c8b36 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6
 EBUILD selinux-bacula-2.20170805-r2.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3abbf9b015adb187d5a39cba729f08812ce96df2db3506c6b6e4fcd6127b906cab225279ba3e313d603c1a51928eeb890f1c8b36 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6
 EBUILD selinux-bacula-2.20170805-r3.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3abbf9b015adb187d5a39cba729f08812ce96df2db3506c6b6e4fcd6127b906cab225279ba3e313d603c1a51928eeb890f1c8b36 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6
-EBUILD selinux-bacula-2.20170805-r4.ebuild 284 BLAKE2B 52b948274d02a2d213c40c39ec067fadc7de5f9a9e756e030133ccc3c4a394c9c1bfc1cf0693ec872e8eb9c2c30ac60e1a112d5c11dbdd606f1fbdc6dc8504fe SHA512 e3fbaced964a16f3dae73e21b6c50fbead88d7c8930613422472efea20c2f3c5179fcd06f7070adaa64dad5340cf76496e368af3dd626de2c5b5dfea75f8490d
 EBUILD selinux-bacula-2.20180114-r1.ebuild 282 BLAKE2B 89ff8825fcade423ab0edfbe5f73ef5ddede8fefc53940b3ac9b4da9babb926aa99fe5f87c8f476473b03f96e068ffc4f210dbee16e491b65f08202f5d755078 SHA512 8a713ac2301c3051472692d9ed1e00c9217e3c4dfa1801d43372759c8edf86df3f51533be81ea76e48d7e6553da3bf4ea476ddfa0cc52d50e6f702d3986c72a0
 EBUILD selinux-bacula-2.20180114-r2.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
+EBUILD selinux-bacula-2.20180114-r3.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
 EBUILD selinux-bacula-9999.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
 MISC metadata.xml 316 BLAKE2B dc6935ac38b7c07ca95aee076ada83f985acacc3fb09eeb221466886c6d5362fc84fd24c16f068a2f733dc23dd3b4f5ef5173432e099002029785c2fbb7fc4ed SHA512 372cf73fefff21230ab25228a49d88abf1d32ba3dbb9241ebcba8d18b6802f8ac4965ff05f92f680cbc3057115b8821eeb6be263ee187f17b1ef563fa8d22d1f
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r1.ebuild
deleted file mode 100644
index c56d67a6f4af..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r2.ebuild
deleted file mode 100644
index cde85a82b54b..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r3.ebuild
deleted file mode 100644
index cde85a82b54b..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r4.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r4.ebuild
deleted file mode 100644
index cde85a82b54b..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r4.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r4.ebuild
deleted file mode 100644
index c56d67a6f4af..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20180114-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..b50372799c1e
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bacula"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bacula"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 2e7e48b8c9fe..342bf4d1d37f 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-base-policy-2.20170204-r1.ebuild 3658 BLAKE2B 8f5f709e54ed60c5742094d672098c08f6be2a299c476e6f419c43d9677998bfc93d4d451362512912459191ba0d6812696c93dda272e718daeb5a78d2d61e94 SHA512 34009aaa106e759b806ad1b747ca61630c2d5bc5a5ca4ae52c625abc369361f1976a2072fb5ab8d0aba5f362a46e9daae0811a35a480398ae8591af931d8d920
-EBUILD selinux-base-policy-2.20170204-r2.ebuild 3656 BLAKE2B 9236f03e371586e62b2dcb2dc798c919307d5a192b8fcef2e370abb4bb92cb5cfb3fec932aa6c454a10ff0efc9e592c45100afe6eb52e7c5d3faddeb6c28106e SHA512 9cfe12f027876bfc6830061db11098a706495d8bda4661af5b13bb1d9c1a62064e70c875d0817df81b393948e61b060ff0dfb02efee4435c8656882d07566204
-EBUILD selinux-base-policy-2.20170204-r3.ebuild 3656 BLAKE2B 9236f03e371586e62b2dcb2dc798c919307d5a192b8fcef2e370abb4bb92cb5cfb3fec932aa6c454a10ff0efc9e592c45100afe6eb52e7c5d3faddeb6c28106e SHA512 9cfe12f027876bfc6830061db11098a706495d8bda4661af5b13bb1d9c1a62064e70c875d0817df81b393948e61b060ff0dfb02efee4435c8656882d07566204
-EBUILD selinux-base-policy-2.20170204-r4.ebuild 3656 BLAKE2B 9236f03e371586e62b2dcb2dc798c919307d5a192b8fcef2e370abb4bb92cb5cfb3fec932aa6c454a10ff0efc9e592c45100afe6eb52e7c5d3faddeb6c28106e SHA512 9cfe12f027876bfc6830061db11098a706495d8bda4661af5b13bb1d9c1a62064e70c875d0817df81b393948e61b060ff0dfb02efee4435c8656882d07566204
 EBUILD selinux-base-policy-2.20170805-r2.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7f1c2ea6d957a8b05d109196322a8c482ed9d8c7f517e14329b13ac4762ffc5483bd207d81e75cb113ae29c39c1da4ca8c4b16fcdc919e SHA512 0057be4e522c0704ef4080751a94e445cf42d658cd8b1227eb0b1c7074de57010cd31b90dcb757a0f0ab6672b5b1a53341800142b11869dcffbede53e0e59282
 EBUILD selinux-base-policy-2.20170805-r3.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7f1c2ea6d957a8b05d109196322a8c482ed9d8c7f517e14329b13ac4762ffc5483bd207d81e75cb113ae29c39c1da4ca8c4b16fcdc919e SHA512 0057be4e522c0704ef4080751a94e445cf42d658cd8b1227eb0b1c7074de57010cd31b90dcb757a0f0ab6672b5b1a53341800142b11869dcffbede53e0e59282
-EBUILD selinux-base-policy-2.20170805-r4.ebuild 3605 BLAKE2B 4f27262143270f66d1dc3752647adc4c6b8285d1147e3cd6247f6783f10a7c0fa3d11a4cd5b085218fc18d46d73c832cf340787d9d30af2dec09e7e8fba34559 SHA512 bb23adb0d62440dabb05d44566eef538d4fc0c905eb2c5c9f7b1ce85ea6ee2ed5770e0cb986b9ce71930538570c478621fb5ec740e55f3a00c63e82fa1e2d1f7
 EBUILD selinux-base-policy-2.20180114-r1.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7f1c2ea6d957a8b05d109196322a8c482ed9d8c7f517e14329b13ac4762ffc5483bd207d81e75cb113ae29c39c1da4ca8c4b16fcdc919e SHA512 0057be4e522c0704ef4080751a94e445cf42d658cd8b1227eb0b1c7074de57010cd31b90dcb757a0f0ab6672b5b1a53341800142b11869dcffbede53e0e59282
-EBUILD selinux-base-policy-2.20180114-r2.ebuild 3605 BLAKE2B 4f27262143270f66d1dc3752647adc4c6b8285d1147e3cd6247f6783f10a7c0fa3d11a4cd5b085218fc18d46d73c832cf340787d9d30af2dec09e7e8fba34559 SHA512 bb23adb0d62440dabb05d44566eef538d4fc0c905eb2c5c9f7b1ce85ea6ee2ed5770e0cb986b9ce71930538570c478621fb5ec740e55f3a00c63e82fa1e2d1f7
-EBUILD selinux-base-policy-9999.ebuild 3605 BLAKE2B 4f27262143270f66d1dc3752647adc4c6b8285d1147e3cd6247f6783f10a7c0fa3d11a4cd5b085218fc18d46d73c832cf340787d9d30af2dec09e7e8fba34559 SHA512 bb23adb0d62440dabb05d44566eef538d4fc0c905eb2c5c9f7b1ce85ea6ee2ed5770e0cb986b9ce71930538570c478621fb5ec740e55f3a00c63e82fa1e2d1f7
+EBUILD selinux-base-policy-2.20180114-r2.ebuild 3937 BLAKE2B 9d2f4297edd38a837f6299f0fc1a1424e391ac5fa7f1c77f187e049545a0e4cdc3bffbdeb7b86f6bde30af093b813f4a8bd3ce85b8a25a4ab514bc8a5464e010 SHA512 6a7a3ac43cfc10aedd4cce05190c34877075da8ec699adb0ebfe15e94bcc5e026b7f0876cb7fb7f18f657a511f9906db1c8e6323d019f25679bfe778767a7591
+EBUILD selinux-base-policy-2.20180114-r3.ebuild 3937 BLAKE2B 9d2f4297edd38a837f6299f0fc1a1424e391ac5fa7f1c77f187e049545a0e4cdc3bffbdeb7b86f6bde30af093b813f4a8bd3ce85b8a25a4ab514bc8a5464e010 SHA512 6a7a3ac43cfc10aedd4cce05190c34877075da8ec699adb0ebfe15e94bcc5e026b7f0876cb7fb7f18f657a511f9906db1c8e6323d019f25679bfe778767a7591
+EBUILD selinux-base-policy-9999.ebuild 3937 BLAKE2B 9d2f4297edd38a837f6299f0fc1a1424e391ac5fa7f1c77f187e049545a0e4cdc3bffbdeb7b86f6bde30af093b813f4a8bd3ce85b8a25a4ab514bc8a5464e010 SHA512 6a7a3ac43cfc10aedd4cce05190c34877075da8ec699adb0ebfe15e94bcc5e026b7f0876cb7fb7f18f657a511f9906db1c8e6323d019f25679bfe778767a7591
 MISC metadata.xml 534 BLAKE2B 1bb289204431150ae974c9fd677926faf72e75def3294b9df405a048e398ac3b6147de8483512487edaeea378e1dbd32df0675acb7fa50326c48382603c5dbfe SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
deleted file mode 100644
index 0c6f6a24107c..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
-	if use systemd; then
-		MODS="${MODS} systemd"
-	fi
-}
-
-pkg_pretend() {
-	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
-			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
-		fi
-	done
-}
-
-src_prepare() {
-	local modfiles
-
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-src_compile() {
-	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	# Override the command from the eclass, we need to load in base as well here
-	local COMMAND="-i base.pp"
-	if has_version "<sys-apps/policycoreutils-2.5"; then
-		COMMAND="-b base.pp"
-	fi
-
-	for i in ${MODS}; do
-		COMMAND="${COMMAND} -i ${i}.pp"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
-		cd /usr/share/selinux/${i}
-
-		semodule -s ${i} ${COMMAND}
-	done
-
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
deleted file mode 100644
index b92e2c6358cd..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
-	if use systemd; then
-		MODS="${MODS} systemd"
-	fi
-}
-
-pkg_pretend() {
-	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
-			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
-		fi
-	done
-}
-
-src_prepare() {
-	local modfiles
-
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-src_compile() {
-	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	# Override the command from the eclass, we need to load in base as well here
-	local COMMAND="-i base.pp"
-	if has_version "<sys-apps/policycoreutils-2.5"; then
-		COMMAND="-b base.pp"
-	fi
-
-	for i in ${MODS}; do
-		COMMAND="${COMMAND} -i ${i}.pp"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
-		cd /usr/share/selinux/${i}
-
-		semodule -s ${i} ${COMMAND}
-	done
-
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
deleted file mode 100644
index b92e2c6358cd..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
-	if use systemd; then
-		MODS="${MODS} systemd"
-	fi
-}
-
-pkg_pretend() {
-	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
-			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
-		fi
-	done
-}
-
-src_prepare() {
-	local modfiles
-
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-src_compile() {
-	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	# Override the command from the eclass, we need to load in base as well here
-	local COMMAND="-i base.pp"
-	if has_version "<sys-apps/policycoreutils-2.5"; then
-		COMMAND="-b base.pp"
-	fi
-
-	for i in ${MODS}; do
-		COMMAND="${COMMAND} -i ${i}.pp"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
-		cd /usr/share/selinux/${i}
-
-		semodule -s ${i} ${COMMAND}
-	done
-
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
deleted file mode 100644
index b92e2c6358cd..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
-	if use systemd; then
-		MODS="${MODS} systemd"
-	fi
-}
-
-pkg_pretend() {
-	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
-			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
-		fi
-	done
-}
-
-src_prepare() {
-	local modfiles
-
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-src_compile() {
-	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	# Override the command from the eclass, we need to load in base as well here
-	local COMMAND="-i base.pp"
-	if has_version "<sys-apps/policycoreutils-2.5"; then
-		COMMAND="-b base.pp"
-	fi
-
-	for i in ${MODS}; do
-		COMMAND="${COMMAND} -i ${i}.pp"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
-		cd /usr/share/selinux/${i}
-
-		semodule -s ${i} ${COMMAND}
-	done
-
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
deleted file mode 100644
index ffcbe80f607c..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
-	if use systemd; then
-		MODS="${MODS} systemd"
-	fi
-}
-
-pkg_pretend() {
-	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
-			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
-		fi
-	done
-}
-
-src_prepare() {
-	local modfiles
-
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-src_compile() {
-	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	# Override the command from the eclass, we need to load in base as well here
-	local COMMAND="-i base.pp"
-	if has_version "<sys-apps/policycoreutils-2.5"; then
-		COMMAND="-b base.pp"
-	fi
-
-	for i in ${MODS}; do
-		COMMAND="${COMMAND} -i ${i}.pp"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
-		cd /usr/share/selinux/${i}
-
-		semodule -s ${i} ${COMMAND}
-	done
-
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
index ffcbe80f607c..b2976ccee54b 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
@@ -22,6 +22,7 @@ IUSE="systemd +unconfined"
 
 PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
 DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+RDEPEND="$DEPEND"
 
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
 LICENSE="GPL-2"
@@ -74,7 +75,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
 	done
 }
 
@@ -91,6 +92,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	# Set root path and don't load policy into the kernel when cross compiling
+	local root_opts=""
+	if [[ "${ROOT%/}" != "" ]]; then
+		root_opts="-p ${ROOT%/} -n"
+	fi
+
 	# Override the command from the eclass, we need to load in base as well here
 	local COMMAND="-i base.pp"
 	if has_version "<sys-apps/policycoreutils-2.5"; then
@@ -104,19 +111,22 @@ pkg_postinst() {
 	for i in ${POLICY_TYPES}; do
 		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
 
-		cd /usr/share/selinux/${i}
+		cd "${ROOT%/}/usr/share/selinux/${i}"
 
-		semodule -s ${i} ${COMMAND}
+		semodule ${root_opts} -s ${i} ${COMMAND}
 	done
 
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
+	# Don't relabel when cross compiling
+	if [[ "${ROOT%/}" == "" ]]; then
+		# Relabel depending packages
+		local PKGSET="";
+		if [[ -x /usr/bin/qdepends ]] ; then
+			PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		elif [[ -x /usr/bin/equery ]] ; then
+			PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		fi
+		if [[ -n "${PKGSET}" ]] ; then
+			rlpkg ${PKGSET};
+		fi
 	fi
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..b2976ccee54b
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="systemd +unconfined"
+
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+RDEPEND="$DEPEND"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_setup() {
+	if use systemd; then
+		MODS="${MODS} systemd"
+	fi
+}
+
+pkg_pretend() {
+	for i in ${POLICY_TYPES}; do
+		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+		fi
+	done
+}
+
+src_prepare() {
+	local modfiles
+
+	if [[ ${PV} != 9999* ]]; then
+		einfo "Applying SELinux policy updates ... "
+		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+	fi
+
+	eapply_user
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Set root path and don't load policy into the kernel when cross compiling
+	local root_opts=""
+	if [[ "${ROOT%/}" != "" ]]; then
+		root_opts="-p ${ROOT%/} -n"
+	fi
+
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND="-i base.pp"
+	if has_version "<sys-apps/policycoreutils-2.5"; then
+		COMMAND="-b base.pp"
+	fi
+
+	for i in ${MODS}; do
+		COMMAND="${COMMAND} -i ${i}.pp"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd "${ROOT%/}/usr/share/selinux/${i}"
+
+		semodule ${root_opts} -s ${i} ${COMMAND}
+	done
+
+	# Don't relabel when cross compiling
+	if [[ "${ROOT%/}" == "" ]]; then
+		# Relabel depending packages
+		local PKGSET="";
+		if [[ -x /usr/bin/qdepends ]] ; then
+			PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		elif [[ -x /usr/bin/equery ]] ; then
+			PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		fi
+		if [[ -n "${PKGSET}" ]] ; then
+			rlpkg ${PKGSET};
+		fi
+	fi
+}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index ffcbe80f607c..b2976ccee54b 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -22,6 +22,7 @@ IUSE="systemd +unconfined"
 
 PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
 DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+RDEPEND="$DEPEND"
 
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
 LICENSE="GPL-2"
@@ -74,7 +75,7 @@ src_prepare() {
 
 src_compile() {
 	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
 	done
 }
 
@@ -91,6 +92,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	# Set root path and don't load policy into the kernel when cross compiling
+	local root_opts=""
+	if [[ "${ROOT%/}" != "" ]]; then
+		root_opts="-p ${ROOT%/} -n"
+	fi
+
 	# Override the command from the eclass, we need to load in base as well here
 	local COMMAND="-i base.pp"
 	if has_version "<sys-apps/policycoreutils-2.5"; then
@@ -104,19 +111,22 @@ pkg_postinst() {
 	for i in ${POLICY_TYPES}; do
 		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
 
-		cd /usr/share/selinux/${i}
+		cd "${ROOT%/}/usr/share/selinux/${i}"
 
-		semodule -s ${i} ${COMMAND}
+		semodule ${root_opts} -s ${i} ${COMMAND}
 	done
 
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
+	# Don't relabel when cross compiling
+	if [[ "${ROOT%/}" == "" ]]; then
+		# Relabel depending packages
+		local PKGSET="";
+		if [[ -x /usr/bin/qdepends ]] ; then
+			PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		elif [[ -x /usr/bin/equery ]] ; then
+			PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		fi
+		if [[ -n "${PKGSET}" ]] ; then
+			rlpkg ${PKGSET};
+		fi
 	fi
 }
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index c4837bbd673e..1c47ee496261 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -1,25 +1,16 @@
 AUX config 631 BLAKE2B 7c7c5ad7e2349cf8dd6877bba7947f256b6bdee492ef76a44ac378eafb9203c0d7ad6f188a762c61b80672a56dca65767567cd68c998aa67d58a9579e5c0cae6 SHA512 f3c4fece54e5786de94fc97c8e7678f9901c6963828d28b020c423458ac258480191f216522fed7658e7ad1c94fd25557efc524a4b75ec8837116c6a14c2328a
 AUX selinux.conf 119 BLAKE2B c877aec601cfc066b42493a3b45e179834d30b7f0eb34b625f3758795c2fd2e58744cf539fdb5b06c002365fb264bdf6e953c1f6e30c7b2d310e22206ea5a37f SHA512 a057f84388b2b494b5e7623b076450c1856687c50a4ccb5aa22215748461786a0c71fdd9f76e9ed8639bcd3040006fb010aa5497192d6c0cab432a1b9c028b3b
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-base-2.20170204-r1.ebuild 4280 BLAKE2B 098f62a24432d4d4daa0c5e0b13c8a86440be7b6a399c5a9123825dc2318860918171e057094492247ddb28beaee3526961b30254d6c2ded16340bb42013002a SHA512 a261ba545c469e280bc72c67fa39b8aa4de1835da65003433bae24880ae6b727e283735bc6f4237d488226751cfa6a698923bb965289bf7640c6979ca9cbaaf9
-EBUILD selinux-base-2.20170204-r2.ebuild 4278 BLAKE2B a25f743f1b4834f55560a1d362a4d2380c7023245e7eb4da26c5d39b201fba919409a1ff3473c6f86e0b96c96f7590b0c6cc157baf04cde9a25e196c40644440 SHA512 e11c1f1f4a97cfb06fc05a93033810482f7f199d3da04d7a7ccf0c1af96d9b500e1f0b9872f912dd1b5e6cce3bc081652696addc287ba850a730fe2301b26be0
-EBUILD selinux-base-2.20170204-r3.ebuild 4278 BLAKE2B a25f743f1b4834f55560a1d362a4d2380c7023245e7eb4da26c5d39b201fba919409a1ff3473c6f86e0b96c96f7590b0c6cc157baf04cde9a25e196c40644440 SHA512 e11c1f1f4a97cfb06fc05a93033810482f7f199d3da04d7a7ccf0c1af96d9b500e1f0b9872f912dd1b5e6cce3bc081652696addc287ba850a730fe2301b26be0
-EBUILD selinux-base-2.20170204-r4.ebuild 4278 BLAKE2B a25f743f1b4834f55560a1d362a4d2380c7023245e7eb4da26c5d39b201fba919409a1ff3473c6f86e0b96c96f7590b0c6cc157baf04cde9a25e196c40644440 SHA512 e11c1f1f4a97cfb06fc05a93033810482f7f199d3da04d7a7ccf0c1af96d9b500e1f0b9872f912dd1b5e6cce3bc081652696addc287ba850a730fe2301b26be0
 EBUILD selinux-base-2.20170805-r2.ebuild 4225 BLAKE2B 1b767058fd8a870edc18cc21b9c2973721ed9fa29d1aa50fb338752df06cc8a2c01ef451aefa579652e88ad4e63898de0927234df1e6506f28da69acd55a9889 SHA512 c656f41074d167d28b8a89b0278a72ecd960bd5151cc8ea8bf387f30ba8278213fbb6461c19b1b418d58d2a85fbff325d69a42ec8deb862b92ac64210b5fbffc
 EBUILD selinux-base-2.20170805-r3.ebuild 4225 BLAKE2B 1b767058fd8a870edc18cc21b9c2973721ed9fa29d1aa50fb338752df06cc8a2c01ef451aefa579652e88ad4e63898de0927234df1e6506f28da69acd55a9889 SHA512 c656f41074d167d28b8a89b0278a72ecd960bd5151cc8ea8bf387f30ba8278213fbb6461c19b1b418d58d2a85fbff325d69a42ec8deb862b92ac64210b5fbffc
-EBUILD selinux-base-2.20170805-r4.ebuild 4227 BLAKE2B 18c1170398d476703df986d56568a8f7dde7a9ceed5c21583e56062066903d4de926fa1138da395be68807124484640b3f3c1d3a27c19a45bca497000bf73397 SHA512 500be37b5d0cff6f2ac558a3bb8eaf6e6fc7e597226307dca6c8246c4254ca652bff466deeae81084ee9d05efef93e8fb3075007d4cae2d8bed593b0d5b70f02
 EBUILD selinux-base-2.20180114-r1.ebuild 4225 BLAKE2B 787204b62302c43e3bb5025ae66c9973e0fe1b8f5574e487c2cc916f553aff15ebf14f6047e69299ca14b2f9faf18c39bd711bb4e1acb2aeb75ed1b45d2dec7c SHA512 6c1c7932dbbdf55075b0d0c04fa96767ad490785ce70449f9b4a3344c3a890b361980a04dab62c8d9c30c08fec3436f4c5a60cfac9809c8e913639570e04d66c
 EBUILD selinux-base-2.20180114-r2.ebuild 4227 BLAKE2B 2805a6a1851567ba8c92da6fb03bf768474946fc92ab16c99c588a5a837188ecf6ae0c31b4038587770222f00a168daf38ab7a65a569a5977d817b959d8547c6 SHA512 9f5348bbe0daa39df84de5ca32e82590e0e8f3227451b9aa534b78582a4d8579aaba08823f89e29bf30e15d2f2accedac08a8678cc25611d0c4f546a267d37f2
+EBUILD selinux-base-2.20180114-r3.ebuild 4227 BLAKE2B 2805a6a1851567ba8c92da6fb03bf768474946fc92ab16c99c588a5a837188ecf6ae0c31b4038587770222f00a168daf38ab7a65a569a5977d817b959d8547c6 SHA512 9f5348bbe0daa39df84de5ca32e82590e0e8f3227451b9aa534b78582a4d8579aaba08823f89e29bf30e15d2f2accedac08a8678cc25611d0c4f546a267d37f2
 EBUILD selinux-base-9999.ebuild 4227 BLAKE2B 2805a6a1851567ba8c92da6fb03bf768474946fc92ab16c99c588a5a837188ecf6ae0c31b4038587770222f00a168daf38ab7a65a569a5977d817b959d8547c6 SHA512 9f5348bbe0daa39df84de5ca32e82590e0e8f3227451b9aa534b78582a4d8579aaba08823f89e29bf30e15d2f2accedac08a8678cc25611d0c4f546a267d37f2
 MISC metadata.xml 839 BLAKE2B 797f551065b80455c9538f115d680016954b7fc05cd5232ca09b86d83163c81e9ed868ea6b9be08d3c1284dcfd3527e88660befb747a631f4d2292331410cb52 SHA512 330017a98a3f9f4e6d6004955eb939c8d9c1c92fe6d091f78cdd7d2f6a02838c67a8a3268f38dad7df27f909ff51dc295d5de748f9767a257b5dad36c74d921a
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild
deleted file mode 100644
index c820f10346bb..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
-	virtual/udev"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	cd "${S}/refpolicy" || die
-	emake bare
-}
-
-src_configure() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	# Update the SELinux refpolicy capabilities based on the users' USE flags.
-
-	if ! use peer_perms; then
-		sed -i -e '/network_peer_controls/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use open_perms; then
-		sed -i -e '/open_perms/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use ubac; then
-		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to disable User Based Access Control"
-	fi
-
-	if use systemd; then
-		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to enable SystemD"
-	fi
-
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
-	# Prepare initial configuration
-	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
-
-	# Setup the policies based on the types delivered by the end user.
-	# These types can be "targeted", "strict", "mcs" and "mls".
-	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}" || die
-		cd "${S}/${i}" || die
-
-		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
-		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
-			"${S}/${i}/build.conf" || die "build.conf setup failed."
-
-		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
-		then
-			# MCS/MLS require additional settings
-			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
-				|| die "failed to set type to mls"
-		fi
-
-		if [ "${i}" == "targeted" ]; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-standard/seusers" \
-			|| die "targeted seusers setup failed."
-		fi
-
-		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-${i}/seusers" \
-			|| die "policy seusers setup failed."
-		fi
-	done
-}
-
-src_compile() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-		emake base
-		if use doc; then
-			emake html
-		fi
-	done
-}
-
-src_install() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-
-		if use doc; then
-			docinto ${i}/html
-			dodoc -r doc/html/*;
-		fi
-
-		insinto /usr/share/selinux/devel;
-		doins doc/policy.xml;
-
-	done
-
-	docinto /
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	doman man/man8/*.8;
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild
deleted file mode 100644
index 93269b394a86..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
-	virtual/udev"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	cd "${S}/refpolicy" || die
-	emake bare
-}
-
-src_configure() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	# Update the SELinux refpolicy capabilities based on the users' USE flags.
-
-	if ! use peer_perms; then
-		sed -i -e '/network_peer_controls/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use open_perms; then
-		sed -i -e '/open_perms/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use ubac; then
-		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to disable User Based Access Control"
-	fi
-
-	if use systemd; then
-		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to enable SystemD"
-	fi
-
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
-	# Prepare initial configuration
-	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
-
-	# Setup the policies based on the types delivered by the end user.
-	# These types can be "targeted", "strict", "mcs" and "mls".
-	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}" || die
-		cd "${S}/${i}" || die
-
-		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
-		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
-			"${S}/${i}/build.conf" || die "build.conf setup failed."
-
-		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
-		then
-			# MCS/MLS require additional settings
-			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
-				|| die "failed to set type to mls"
-		fi
-
-		if [ "${i}" == "targeted" ]; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-standard/seusers" \
-			|| die "targeted seusers setup failed."
-		fi
-
-		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-${i}/seusers" \
-			|| die "policy seusers setup failed."
-		fi
-	done
-}
-
-src_compile() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-		emake base
-		if use doc; then
-			emake html
-		fi
-	done
-}
-
-src_install() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-
-		if use doc; then
-			docinto ${i}/html
-			dodoc -r doc/html/*;
-		fi
-
-		insinto /usr/share/selinux/devel;
-		doins doc/policy.xml;
-
-	done
-
-	docinto /
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	doman man/man8/*.8;
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild
deleted file mode 100644
index 93269b394a86..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
-	virtual/udev"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	cd "${S}/refpolicy" || die
-	emake bare
-}
-
-src_configure() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	# Update the SELinux refpolicy capabilities based on the users' USE flags.
-
-	if ! use peer_perms; then
-		sed -i -e '/network_peer_controls/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use open_perms; then
-		sed -i -e '/open_perms/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use ubac; then
-		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to disable User Based Access Control"
-	fi
-
-	if use systemd; then
-		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to enable SystemD"
-	fi
-
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
-	# Prepare initial configuration
-	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
-
-	# Setup the policies based on the types delivered by the end user.
-	# These types can be "targeted", "strict", "mcs" and "mls".
-	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}" || die
-		cd "${S}/${i}" || die
-
-		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
-		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
-			"${S}/${i}/build.conf" || die "build.conf setup failed."
-
-		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
-		then
-			# MCS/MLS require additional settings
-			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
-				|| die "failed to set type to mls"
-		fi
-
-		if [ "${i}" == "targeted" ]; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-standard/seusers" \
-			|| die "targeted seusers setup failed."
-		fi
-
-		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-${i}/seusers" \
-			|| die "policy seusers setup failed."
-		fi
-	done
-}
-
-src_compile() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-		emake base
-		if use doc; then
-			emake html
-		fi
-	done
-}
-
-src_install() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-
-		if use doc; then
-			docinto ${i}/html
-			dodoc -r doc/html/*;
-		fi
-
-		insinto /usr/share/selinux/devel;
-		doins doc/policy.xml;
-
-	done
-
-	docinto /
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	doman man/man8/*.8;
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild
deleted file mode 100644
index 93269b394a86..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
-	virtual/udev"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	cd "${S}/refpolicy" || die
-	emake bare
-}
-
-src_configure() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	# Update the SELinux refpolicy capabilities based on the users' USE flags.
-
-	if ! use peer_perms; then
-		sed -i -e '/network_peer_controls/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use open_perms; then
-		sed -i -e '/open_perms/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use ubac; then
-		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to disable User Based Access Control"
-	fi
-
-	if use systemd; then
-		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to enable SystemD"
-	fi
-
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
-	# Prepare initial configuration
-	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
-
-	# Setup the policies based on the types delivered by the end user.
-	# These types can be "targeted", "strict", "mcs" and "mls".
-	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}" || die
-		cd "${S}/${i}" || die
-
-		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
-		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
-			"${S}/${i}/build.conf" || die "build.conf setup failed."
-
-		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
-		then
-			# MCS/MLS require additional settings
-			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
-				|| die "failed to set type to mls"
-		fi
-
-		if [ "${i}" == "targeted" ]; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-standard/seusers" \
-			|| die "targeted seusers setup failed."
-		fi
-
-		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-${i}/seusers" \
-			|| die "policy seusers setup failed."
-		fi
-	done
-}
-
-src_compile() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-		emake base
-		if use doc; then
-			emake html
-		fi
-	done
-}
-
-src_install() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-
-		if use doc; then
-			docinto ${i}/html
-			dodoc -r doc/html/*;
-		fi
-
-		insinto /usr/share/selinux/devel;
-		doins doc/policy.xml;
-
-	done
-
-	docinto /
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	doman man/man8/*.8;
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20170805-r4.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r4.ebuild
deleted file mode 100644
index 868a49d1c088..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
-	virtual/udev"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	cd "${S}/refpolicy" || die
-	emake bare
-}
-
-src_configure() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	# Update the SELinux refpolicy capabilities based on the users' USE flags.
-
-	if ! use peer_perms; then
-		sed -i -e '/network_peer_controls/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use open_perms; then
-		sed -i -e '/open_perms/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use ubac; then
-		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to disable User Based Access Control"
-	fi
-
-	if use systemd; then
-		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to enable SystemD"
-	fi
-
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
-	# Prepare initial configuration
-	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
-
-	# Setup the policies based on the types delivered by the end user.
-	# These types can be "targeted", "strict", "mcs" and "mls".
-	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}" || die
-		cd "${S}/${i}" || die
-
-		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
-		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
-			"${S}/${i}/build.conf" || die "build.conf setup failed."
-
-		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
-		then
-			# MCS/MLS require additional settings
-			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
-				|| die "failed to set type to mls"
-		fi
-
-		if [ "${i}" == "targeted" ]; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-standard/seusers" \
-			|| die "targeted seusers setup failed."
-		fi
-
-		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-${i}/seusers" \
-			|| die "policy seusers setup failed."
-		fi
-	done
-}
-
-src_compile() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-		emake base
-		if use doc; then
-			emake html
-		fi
-	done
-}
-
-src_install() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-
-		if use doc; then
-			docinto ${i}/html
-			dodoc -r doc/html/*;
-		fi
-
-		insinto /usr/share/selinux/devel;
-		doins doc/policy.xml;
-
-	done
-
-	docinto /
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	doman man/man8/*.8;
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..b779ed9e7cf9
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.7
+	virtual/udev"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.7"
+
+S=${WORKDIR}/
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		einfo "Applying SELinux policy updates ... "
+		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+	fi
+
+	eapply_user
+
+	cd "${S}/refpolicy" || die
+	emake bare
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities" || die
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities" || die
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	if use systemd; then
+		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to enable SystemD"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
+
+	# Prepare initial configuration
+	cd "${S}/refpolicy" || die
+	emake conf || die "Make conf failed"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}" || die
+		cd "${S}/${i}" || die
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+
+		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-${i}/seusers" \
+			|| die "policy seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}" || die
+		emake base
+		if use doc; then
+			emake html
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}" || die
+
+		emake DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		emake DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			docinto ${i}/html
+			dodoc -r doc/html/*;
+		fi
+
+		insinto /usr/share/selinux/devel;
+		doins doc/policy.xml;
+
+	done
+
+	docinto /
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	doman man/man8/*.8;
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/selinux.conf"
+}
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 23720ae43297..856a1f850366 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bind-2.20170204-r1.ebuild 280 BLAKE2B f5d872d31544346c0f2fd1680e69fb1d35b76788c8bd69a20ff959aec7c9ab5ae9f8e2d6be3b21e06997e4b6372c751471d361183198d0ff299f602fc2a97c6e SHA512 9de3bf8f814083fb9bdb081df25a328707ea790fc8ffb3da8c1d592772cb5d51a5dbf2032942a68d7bfbeeb0894d565f6d68ae413ca61e4208817b2fcaa99411
-EBUILD selinux-bind-2.20170204-r2.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1eaa66ea062b433c4b0158fd8602e94e827d3844f3086c3147226107bfd15a1612c73e9f8459fbc9f8913d499a0df14c5c67489 SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8
-EBUILD selinux-bind-2.20170204-r3.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1eaa66ea062b433c4b0158fd8602e94e827d3844f3086c3147226107bfd15a1612c73e9f8459fbc9f8913d499a0df14c5c67489 SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8
-EBUILD selinux-bind-2.20170204-r4.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1eaa66ea062b433c4b0158fd8602e94e827d3844f3086c3147226107bfd15a1612c73e9f8459fbc9f8913d499a0df14c5c67489 SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8
 EBUILD selinux-bind-2.20170805-r2.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1eaa66ea062b433c4b0158fd8602e94e827d3844f3086c3147226107bfd15a1612c73e9f8459fbc9f8913d499a0df14c5c67489 SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8
 EBUILD selinux-bind-2.20170805-r3.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1eaa66ea062b433c4b0158fd8602e94e827d3844f3086c3147226107bfd15a1612c73e9f8459fbc9f8913d499a0df14c5c67489 SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8
-EBUILD selinux-bind-2.20170805-r4.ebuild 280 BLAKE2B f5d872d31544346c0f2fd1680e69fb1d35b76788c8bd69a20ff959aec7c9ab5ae9f8e2d6be3b21e06997e4b6372c751471d361183198d0ff299f602fc2a97c6e SHA512 9de3bf8f814083fb9bdb081df25a328707ea790fc8ffb3da8c1d592772cb5d51a5dbf2032942a68d7bfbeeb0894d565f6d68ae413ca61e4208817b2fcaa99411
 EBUILD selinux-bind-2.20180114-r1.ebuild 278 BLAKE2B e15df438ee73bbf4b95d6534c5200f09ee892e28447a5ea3918d9d8ebfebaa085f89afe8e2a175b96fdcce5934caf46d3cd88daa34ca6862771350f2a6ab0e79 SHA512 8a5250f11f9f8b62db99503731e4b144730d710a6677004a13187f41147f63b4a5fbd3f42bf640189f67ae1d6d97710e2f531e32ad536d0d2d96faf46db803e4
 EBUILD selinux-bind-2.20180114-r2.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
+EBUILD selinux-bind-2.20180114-r3.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
 EBUILD selinux-bind-9999.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
 MISC metadata.xml 314 BLAKE2B d4d110f172517ad4a4913425d261f06ce6111ac5e67455e148212f5f1934cbbdcc0471b110c891bd546b19fd144b325589aba60aa032ed1ce9f807f872415582 SHA512 9062d22c1c459260c2f1202823ac2bc9e2a6ba8214380785a6f92b5eeb2470017249d24e64e1abc92dfe58910a45b860f5b81cfdc0643198b5c5bf84e6598372
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170204-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170204-r1.ebuild
deleted file mode 100644
index b3da5a34f97f..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170204-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170204-r2.ebuild
deleted file mode 100644
index f7758b06f680..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170204-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170204-r3.ebuild
deleted file mode 100644
index f7758b06f680..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170204-r4.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170204-r4.ebuild
deleted file mode 100644
index f7758b06f680..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170805-r4.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170805-r4.ebuild
deleted file mode 100644
index b3da5a34f97f..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20180114-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c08eed19e706
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bind"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index 4cc092ce89c6..646080af0115 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bitcoin-2.20170204-r1.ebuild 286 BLAKE2B 24334fd93f13e5c7d9cebc18d482d61ca3b553867ed14125439868e59a19d170bc4e8d702684ac9420ab9b9b44f82074d5427751ae8bf72e94e4f8fe81521e02 SHA512 f1e5269dd9b9ef50bb14ef6b6e2ea269ef12deee7640b16dde8d8977a626f677d3b8ac24398f9ac58bdce8bcdf60f2a43857ff052cca35ac2d6fb956f7aa9d3f
-EBUILD selinux-bitcoin-2.20170204-r2.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b00fda8fab47b98aaedd5576aa4de582bdb06c2a6028fc8f67f8c5bc0c036ccb5c21c7762af36b88c3d621ab55941e64de837e53b SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e
-EBUILD selinux-bitcoin-2.20170204-r3.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b00fda8fab47b98aaedd5576aa4de582bdb06c2a6028fc8f67f8c5bc0c036ccb5c21c7762af36b88c3d621ab55941e64de837e53b SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e
-EBUILD selinux-bitcoin-2.20170204-r4.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b00fda8fab47b98aaedd5576aa4de582bdb06c2a6028fc8f67f8c5bc0c036ccb5c21c7762af36b88c3d621ab55941e64de837e53b SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e
 EBUILD selinux-bitcoin-2.20170805-r2.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b00fda8fab47b98aaedd5576aa4de582bdb06c2a6028fc8f67f8c5bc0c036ccb5c21c7762af36b88c3d621ab55941e64de837e53b SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e
 EBUILD selinux-bitcoin-2.20170805-r3.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b00fda8fab47b98aaedd5576aa4de582bdb06c2a6028fc8f67f8c5bc0c036ccb5c21c7762af36b88c3d621ab55941e64de837e53b SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e
-EBUILD selinux-bitcoin-2.20170805-r4.ebuild 286 BLAKE2B 24334fd93f13e5c7d9cebc18d482d61ca3b553867ed14125439868e59a19d170bc4e8d702684ac9420ab9b9b44f82074d5427751ae8bf72e94e4f8fe81521e02 SHA512 f1e5269dd9b9ef50bb14ef6b6e2ea269ef12deee7640b16dde8d8977a626f677d3b8ac24398f9ac58bdce8bcdf60f2a43857ff052cca35ac2d6fb956f7aa9d3f
 EBUILD selinux-bitcoin-2.20180114-r1.ebuild 284 BLAKE2B 3e02f143a0f2551f5e4929a1ea35ec6bb2d1d5e5732c60d613fdd2900c5aaa0d2af7cc67ae23fc97098ee370d438a443755e6ffb906a47da2f8ff66befa84c13 SHA512 581f829392330d42dd27a4a987b12113d4d111f1abd50205dfb8a96577fc1ee0615576d167f3c391248fdcb1d8257d249f2f0f43f4a5ba70216aca1a373772bd
 EBUILD selinux-bitcoin-2.20180114-r2.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
+EBUILD selinux-bitcoin-2.20180114-r3.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
 EBUILD selinux-bitcoin-9999.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
 MISC metadata.xml 317 BLAKE2B 2bf5e205be759496e9432490df495d4131fdb36a5e809709eb8a506e1d5a36fe4894a5dcbb64604910b2dcada0c7da5cf5fc71e175704e181d3170d33228bfcb SHA512 3478dc7035310237bd5df88943831b1ec05b7c8975c0d275a67b2f0c216a3447942077c131244efa347bbb8cdf91543e290a2d84f153e603fcc492e4079e7537
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r1.ebuild
deleted file mode 100644
index 24a913d8dba5..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r2.ebuild
deleted file mode 100644
index a2b7fd41fa87..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r3.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r3.ebuild
deleted file mode 100644
index a2b7fd41fa87..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r4.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r4.ebuild
deleted file mode 100644
index a2b7fd41fa87..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r4.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r4.ebuild
deleted file mode 100644
index 24a913d8dba5..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180114-r3.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..6b32fb1c8d60
--- /dev/null
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bitcoin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitcoin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index 3ca527a4a8e2..39eeab69735c 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bitlbee-2.20170204-r1.ebuild 381 BLAKE2B c5a9178adeea5d27a771865c3200588dbdbe9f5395b7874487014868da9141f4a10f4757f32d694ad4afb904fbd1f9e191256b6054bf63638271631b856acdcb SHA512 59b945bf366a671ca180664f6d3906b4bfe78bab6e822ae1121b1206d5b1a7607fc4a968421fe49ec26198983261ee0c5e1ed911f48effdd6383d3ee850fc076
-EBUILD selinux-bitlbee-2.20170204-r2.ebuild 379 BLAKE2B d574b46e313134065f231e3da07681b0334a1699a9b0f8716b2a04ebbfa7bc6d05f8459d1d0f3a1752bc4ee4ec137066beb1d87dba41acebcd0e14487dddf12c SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845
-EBUILD selinux-bitlbee-2.20170204-r3.ebuild 379 BLAKE2B d574b46e313134065f231e3da07681b0334a1699a9b0f8716b2a04ebbfa7bc6d05f8459d1d0f3a1752bc4ee4ec137066beb1d87dba41acebcd0e14487dddf12c SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845
-EBUILD selinux-bitlbee-2.20170204-r4.ebuild 379 BLAKE2B d574b46e313134065f231e3da07681b0334a1699a9b0f8716b2a04ebbfa7bc6d05f8459d1d0f3a1752bc4ee4ec137066beb1d87dba41acebcd0e14487dddf12c SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845
 EBUILD selinux-bitlbee-2.20170805-r2.ebuild 379 BLAKE2B d574b46e313134065f231e3da07681b0334a1699a9b0f8716b2a04ebbfa7bc6d05f8459d1d0f3a1752bc4ee4ec137066beb1d87dba41acebcd0e14487dddf12c SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845
 EBUILD selinux-bitlbee-2.20170805-r3.ebuild 379 BLAKE2B d574b46e313134065f231e3da07681b0334a1699a9b0f8716b2a04ebbfa7bc6d05f8459d1d0f3a1752bc4ee4ec137066beb1d87dba41acebcd0e14487dddf12c SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845
-EBUILD selinux-bitlbee-2.20170805-r4.ebuild 381 BLAKE2B c5a9178adeea5d27a771865c3200588dbdbe9f5395b7874487014868da9141f4a10f4757f32d694ad4afb904fbd1f9e191256b6054bf63638271631b856acdcb SHA512 59b945bf366a671ca180664f6d3906b4bfe78bab6e822ae1121b1206d5b1a7607fc4a968421fe49ec26198983261ee0c5e1ed911f48effdd6383d3ee850fc076
 EBUILD selinux-bitlbee-2.20180114-r1.ebuild 379 BLAKE2B e5395c419305a03362f28f21b5f556e662cf35372a19fd6bfef3a7d745406b941a1acf6191612edd6a72e96a9988c90e0c57f92d822464c094c340f8299ae3c3 SHA512 86d51c755948f624185db623a6769f0c2b2988925458701c077fd438a6937ba816a54cd36a3613bb747c6826fe607eac29e6873522c9227b00a9abcdc534c412
 EBUILD selinux-bitlbee-2.20180114-r2.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
+EBUILD selinux-bitlbee-2.20180114-r3.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
 EBUILD selinux-bitlbee-9999.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
 MISC metadata.xml 317 BLAKE2B f9c9b5fcf4de89f18b2a74b18af457fd54942be1c9a9b0a43a07ee34df828599dfecf84a0dcda60dd5cf8b7e98d8e2792b0a8e3aa1ca6e71bc0201b4932ec880 SHA512 551ce283639086916b90d0e0da81e66946c957e946c333fd4b11d482e57483e6adfe5145417e37bc7bb7ee47da60b645e34271e82ffe86cb05e22f65da348df9
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r1.ebuild
deleted file mode 100644
index e5e8a067939d..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r2.ebuild
deleted file mode 100644
index 7ccc7d516bc1..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r3.ebuild
deleted file mode 100644
index 7ccc7d516bc1..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r4.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r4.ebuild
deleted file mode 100644
index 7ccc7d516bc1..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r4.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r4.ebuild
deleted file mode 100644
index e5e8a067939d..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180114-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..78fbf6bdc40b
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bitlbee"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitlbee"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 1a23e0a9679c..8cd7c49a68ba 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-bluetooth-2.20170204-r1.ebuild 290 BLAKE2B 108cbf0325a32f987a3be380623bd65ae0e3cfb6f8eade559ea2d611769c28296e05e642a4519337b742337375a7b910b94142006362f5ddaa144f2cff67a57e SHA512 1660976a4a77219d76e9ca55b6bcc7074d5a97b1abcb18232bf335bbeab39a60f19852216b1e8dd6f8483503d8dbffafe2e509bc8564c7f7a0daf79de341ed7a
-EBUILD selinux-bluetooth-2.20170204-r2.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e72cd550339d1cc8c9f1f763659e3f42a4fda625decb186682c6c9db7e894bc21ecb776413efd79cd6925dc6174bc05a878d5a6042ea SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb
-EBUILD selinux-bluetooth-2.20170204-r3.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e72cd550339d1cc8c9f1f763659e3f42a4fda625decb186682c6c9db7e894bc21ecb776413efd79cd6925dc6174bc05a878d5a6042ea SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb
-EBUILD selinux-bluetooth-2.20170204-r4.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e72cd550339d1cc8c9f1f763659e3f42a4fda625decb186682c6c9db7e894bc21ecb776413efd79cd6925dc6174bc05a878d5a6042ea SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb
 EBUILD selinux-bluetooth-2.20170805-r2.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e72cd550339d1cc8c9f1f763659e3f42a4fda625decb186682c6c9db7e894bc21ecb776413efd79cd6925dc6174bc05a878d5a6042ea SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb
 EBUILD selinux-bluetooth-2.20170805-r3.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e72cd550339d1cc8c9f1f763659e3f42a4fda625decb186682c6c9db7e894bc21ecb776413efd79cd6925dc6174bc05a878d5a6042ea SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb
-EBUILD selinux-bluetooth-2.20170805-r4.ebuild 290 BLAKE2B 108cbf0325a32f987a3be380623bd65ae0e3cfb6f8eade559ea2d611769c28296e05e642a4519337b742337375a7b910b94142006362f5ddaa144f2cff67a57e SHA512 1660976a4a77219d76e9ca55b6bcc7074d5a97b1abcb18232bf335bbeab39a60f19852216b1e8dd6f8483503d8dbffafe2e509bc8564c7f7a0daf79de341ed7a
 EBUILD selinux-bluetooth-2.20180114-r1.ebuild 288 BLAKE2B 76f5481de8be8635754463a7aa44edbd009c37141362bb21865d0076d9597ca7eff135e098dd3ef6c648e4c32632394a8c029ff2635a650e3103ea577fbf95f0 SHA512 92b3ad02cd3abcef4c3a26752631d4b96f65fdc89d37419b8fc3878dee3625789c1b44252d5a7f7c08f6bbe4bd4c3b94396294ecc27119c03e9a75e8961f8023
 EBUILD selinux-bluetooth-2.20180114-r2.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
+EBUILD selinux-bluetooth-2.20180114-r3.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
 EBUILD selinux-bluetooth-9999.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
 MISC metadata.xml 319 BLAKE2B 77895c048b499cf4233a28baa860e5e9bcb4c52d919342c27d619cce316973b3f71a1f4a10edb2e3b605442a8bd6ff5bdf2eedf32e58de89d7354c7dcf796c5d SHA512 23cc2ad068f0758998957a4d8cfaa9f2ee39fbd8a7dee48834f6907611229e2d623f78b8f169eaf1cae6c66665d663d28d9072b98506947de8c6d84ca0398c0a
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r1.ebuild
deleted file mode 100644
index a32d89d332ef..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r2.ebuild
deleted file mode 100644
index 9a5acf93c291..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r3.ebuild
deleted file mode 100644
index 9a5acf93c291..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r4.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r4.ebuild
deleted file mode 100644
index 9a5acf93c291..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r4.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r4.ebuild
deleted file mode 100644
index a32d89d332ef..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180114-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e708bb5381a9
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bluetooth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bluetooth"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index a9ec89e7f2e7..52b9e06484f3 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-brctl-2.20170204-r1.ebuild 282 BLAKE2B 71333cbfd77bc6bd7b02d18bca7f8c8f4e2edb86e5418154237c461695f188b8774773cce95597d2a2139ad9d7da4aeabe57cbc1f471f5b6828da371e6ad7b0a SHA512 34232e7421d68bf8f5c87dcecf113316ff582ad01c701d771b393a630b1ec267eb8bfec5193ca06b7e8169d853cdce4923aadaa61170aa058d97c1c72aad5ed6
-EBUILD selinux-brctl-2.20170204-r2.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42af4636dffba570ffa20f75ac7e80aaf7fdf43f44eb1a06a749856d93de9d598f2d3daf7f6de9d5df0ed01d5551cddaf42802356 SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0
-EBUILD selinux-brctl-2.20170204-r3.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42af4636dffba570ffa20f75ac7e80aaf7fdf43f44eb1a06a749856d93de9d598f2d3daf7f6de9d5df0ed01d5551cddaf42802356 SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0
-EBUILD selinux-brctl-2.20170204-r4.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42af4636dffba570ffa20f75ac7e80aaf7fdf43f44eb1a06a749856d93de9d598f2d3daf7f6de9d5df0ed01d5551cddaf42802356 SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0
 EBUILD selinux-brctl-2.20170805-r2.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42af4636dffba570ffa20f75ac7e80aaf7fdf43f44eb1a06a749856d93de9d598f2d3daf7f6de9d5df0ed01d5551cddaf42802356 SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0
 EBUILD selinux-brctl-2.20170805-r3.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42af4636dffba570ffa20f75ac7e80aaf7fdf43f44eb1a06a749856d93de9d598f2d3daf7f6de9d5df0ed01d5551cddaf42802356 SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0
-EBUILD selinux-brctl-2.20170805-r4.ebuild 282 BLAKE2B 71333cbfd77bc6bd7b02d18bca7f8c8f4e2edb86e5418154237c461695f188b8774773cce95597d2a2139ad9d7da4aeabe57cbc1f471f5b6828da371e6ad7b0a SHA512 34232e7421d68bf8f5c87dcecf113316ff582ad01c701d771b393a630b1ec267eb8bfec5193ca06b7e8169d853cdce4923aadaa61170aa058d97c1c72aad5ed6
 EBUILD selinux-brctl-2.20180114-r1.ebuild 280 BLAKE2B 58236f0cbd1cadcb492edb1c1890c233a0c466021e6e4ec44b88a8689b3e3245b786878c11a625171e1b2109459b117294e4537881acdbf342075807650e832c SHA512 76d27b343160c1253b98ebb265257e6de54e41e6af09ad19ba5d84c1e787e8ba3e559fae6d838d3a0d4b6c38304b2d678d29cb357593eaac326aee8b4fa16a75
 EBUILD selinux-brctl-2.20180114-r2.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
+EBUILD selinux-brctl-2.20180114-r3.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
 EBUILD selinux-brctl-9999.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
 MISC metadata.xml 315 BLAKE2B 21a1f569bbdae9a692fa08c5d226bb6304010fd00bdbb30d8295d8ebc8da159029ed67cb151225af0aadb2a004391c4fe80204e6d53efa21dd21c809a5ae3154 SHA512 23d754daa42126bda3f13dca1fc91726bf4562978ce88efacaefe003b19365c97356b716db8a53a12f99b119fbfd890dbe9d6d782e63cee9722c61cb047f65f6
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r1.ebuild
deleted file mode 100644
index 65ee67a2614d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r2.ebuild
deleted file mode 100644
index 794feb3c8c3d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r3.ebuild
deleted file mode 100644
index 794feb3c8c3d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r4.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r4.ebuild
deleted file mode 100644
index 794feb3c8c3d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r4.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r4.ebuild
deleted file mode 100644
index 65ee67a2614d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20180114-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e160f1e6735f
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="brctl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for brctl"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index a7bccae752e1..9af99bd7ec71 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cachefilesd-2.20170204-r1.ebuild 294 BLAKE2B 412a219654131785c274abfb03ea1478e8ed746549dd33eafe733b33a676d55f960d78840c44dc4729c86a36617396216aa3b13427b95e069cbc32313e09a768 SHA512 02229a442a31e2d61fa068dbd33e68e7b171cab470d29e983a5697d99c750bc78c41dde8d9c80bea83704423c9ecf7cfc03c297ab03af4158b355b7ba9b381ab
-EBUILD selinux-cachefilesd-2.20170204-r2.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf56809ceeca41518969becd7321455b26ee60349866ee27cadbb3a0c84c562109559be79d8c27d24e44b00f3448cdd6eccd26e96e45063 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e
-EBUILD selinux-cachefilesd-2.20170204-r3.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf56809ceeca41518969becd7321455b26ee60349866ee27cadbb3a0c84c562109559be79d8c27d24e44b00f3448cdd6eccd26e96e45063 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e
-EBUILD selinux-cachefilesd-2.20170204-r4.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf56809ceeca41518969becd7321455b26ee60349866ee27cadbb3a0c84c562109559be79d8c27d24e44b00f3448cdd6eccd26e96e45063 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e
 EBUILD selinux-cachefilesd-2.20170805-r2.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf56809ceeca41518969becd7321455b26ee60349866ee27cadbb3a0c84c562109559be79d8c27d24e44b00f3448cdd6eccd26e96e45063 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e
 EBUILD selinux-cachefilesd-2.20170805-r3.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf56809ceeca41518969becd7321455b26ee60349866ee27cadbb3a0c84c562109559be79d8c27d24e44b00f3448cdd6eccd26e96e45063 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e
-EBUILD selinux-cachefilesd-2.20170805-r4.ebuild 294 BLAKE2B 412a219654131785c274abfb03ea1478e8ed746549dd33eafe733b33a676d55f960d78840c44dc4729c86a36617396216aa3b13427b95e069cbc32313e09a768 SHA512 02229a442a31e2d61fa068dbd33e68e7b171cab470d29e983a5697d99c750bc78c41dde8d9c80bea83704423c9ecf7cfc03c297ab03af4158b355b7ba9b381ab
 EBUILD selinux-cachefilesd-2.20180114-r1.ebuild 292 BLAKE2B 45a9fb567074a09e72d256e0fdd21f1dd50d9daa308f77e4da0d1e7f86384ed832166e8ff51026a0dd62ae37220806c528cc9b0405b0a0110750f2f4671326d9 SHA512 a7e2a15540d79ee880a63026e9b999203c43836e8eaa7aafe4e94b8770336c82db7afbc92f283b730941dc5eecea65570714192e0815a107d1281e2c0a18f3b8
 EBUILD selinux-cachefilesd-2.20180114-r2.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
+EBUILD selinux-cachefilesd-2.20180114-r3.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
 EBUILD selinux-cachefilesd-9999.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
 MISC metadata.xml 321 BLAKE2B 700dac90fc3d2d192dce2d3c60453e2c75365a64b092b874f8b049b5c6b587292e5d8cb2b409839621b518a6bd93db364ecb49a729a8903c059988770694f06b SHA512 16b6e111c04de229332ccf3c692d634e1f0fd1d832495e580bd0c5371b220fb07aed2c3ce2391c775b839902099d6bc342d3e190b70ae1ac3f07fdf93fb67077
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r1.ebuild
deleted file mode 100644
index 165217dc1f47..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r2.ebuild
deleted file mode 100644
index b1a424794c25..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r3.ebuild
deleted file mode 100644
index b1a424794c25..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r4.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r4.ebuild
deleted file mode 100644
index b1a424794c25..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r4.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r4.ebuild
deleted file mode 100644
index 165217dc1f47..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180114-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..99c5f3d0bc6a
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cachefilesd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index ada13937d9e3..9ee467323094 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-calamaris-2.20170204-r1.ebuild 290 BLAKE2B c2c4454ed2a68e371b3a82e84a464153c190b2fc30584f9791b12a1802e376c8eeece73a06b1523a1edf8b62ed079b066b8b4b8dcb54fb450068df5e5a60016d SHA512 5fd542093da3e601c2ec603ee0b7a38ee6f13c9b2712641d00af7f9365935953953b699d08bfcccc83286060da4d2b1c35700ea2d402c962de7ee32956578f2a
-EBUILD selinux-calamaris-2.20170204-r2.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2dea034b2cf0ad94431a41cfa9a63252fe1c8066661b3f6c6221b78d4b034ce93e01f27f1fac7516bc5208275988665b45826f74b322 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59
-EBUILD selinux-calamaris-2.20170204-r3.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2dea034b2cf0ad94431a41cfa9a63252fe1c8066661b3f6c6221b78d4b034ce93e01f27f1fac7516bc5208275988665b45826f74b322 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59
-EBUILD selinux-calamaris-2.20170204-r4.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2dea034b2cf0ad94431a41cfa9a63252fe1c8066661b3f6c6221b78d4b034ce93e01f27f1fac7516bc5208275988665b45826f74b322 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59
 EBUILD selinux-calamaris-2.20170805-r2.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2dea034b2cf0ad94431a41cfa9a63252fe1c8066661b3f6c6221b78d4b034ce93e01f27f1fac7516bc5208275988665b45826f74b322 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59
 EBUILD selinux-calamaris-2.20170805-r3.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2dea034b2cf0ad94431a41cfa9a63252fe1c8066661b3f6c6221b78d4b034ce93e01f27f1fac7516bc5208275988665b45826f74b322 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59
-EBUILD selinux-calamaris-2.20170805-r4.ebuild 290 BLAKE2B c2c4454ed2a68e371b3a82e84a464153c190b2fc30584f9791b12a1802e376c8eeece73a06b1523a1edf8b62ed079b066b8b4b8dcb54fb450068df5e5a60016d SHA512 5fd542093da3e601c2ec603ee0b7a38ee6f13c9b2712641d00af7f9365935953953b699d08bfcccc83286060da4d2b1c35700ea2d402c962de7ee32956578f2a
 EBUILD selinux-calamaris-2.20180114-r1.ebuild 288 BLAKE2B aef9467d001fb495a52df303ff85ddf2da57750d8a2add28e1001341a499fa15f5ae4141910bff8d106df978ddac645d56c2a6d6216ffc1a6badcb6db27f8eb1 SHA512 c98a40dd67e9e841572927621bf59b1507f75ffe74e86f8decd5b09268c1603edcb66c40216e33ec23ba80087da95ebe544ff82b534e15104355646b2aaaccf7
 EBUILD selinux-calamaris-2.20180114-r2.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
+EBUILD selinux-calamaris-2.20180114-r3.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
 EBUILD selinux-calamaris-9999.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
 MISC metadata.xml 319 BLAKE2B 1c58cda4753da502bad82f0f9c99b6cfcd96b33f1c9c89e3470503fc0d93e2dd81940cdeff3d3f4951b4d4d14ada408bb343f900a6a974bb5cd85db6c0034cd5 SHA512 edaf87737833fd3c1d0d956adb41875d96d4dbaa0f0c709c5ca8e7645e1eef616871d7e0b20b5cbd8cbbbe3710d5b694c5436cc0b30e21228fd2e3291d201ea1
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r1.ebuild
deleted file mode 100644
index 01ab06cafe39..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r2.ebuild
deleted file mode 100644
index 1e304e912d33..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r3.ebuild
deleted file mode 100644
index 1e304e912d33..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r4.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r4.ebuild
deleted file mode 100644
index 1e304e912d33..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r4.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r4.ebuild
deleted file mode 100644
index 01ab06cafe39..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20180114-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..799409419ec1
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="calamaris"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index b0e8b563b959..85f561a6c3ae 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-canna-2.20170204-r1.ebuild 282 BLAKE2B 1f32b3225dfb6c3ac4c5b4b2da7c20e00791eb86583ddb70f4aefa186c944d28b82dbcacd0dab795ba600d0602452ae8e56dbeba399a66b1627fd90f81bb2610 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c
-EBUILD selinux-canna-2.20170204-r2.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
-EBUILD selinux-canna-2.20170204-r3.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
-EBUILD selinux-canna-2.20170204-r4.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
 EBUILD selinux-canna-2.20170805-r2.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
 EBUILD selinux-canna-2.20170805-r3.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
-EBUILD selinux-canna-2.20170805-r4.ebuild 282 BLAKE2B 1f32b3225dfb6c3ac4c5b4b2da7c20e00791eb86583ddb70f4aefa186c944d28b82dbcacd0dab795ba600d0602452ae8e56dbeba399a66b1627fd90f81bb2610 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c
 EBUILD selinux-canna-2.20180114-r1.ebuild 280 BLAKE2B ad564675d7be4f22a700e406a43048dbb0f9d5f781f0adcd965b1c93abc64c639d816bfd9a2c10ef7c27a78d60b8a514bb1c5b59f2e666c5c0c1465a2e1dca7d SHA512 7311537e732176504ed77322c3c95dd68deaa6edfc44cc9465a592b802fa6dba238ccd3c887c6687af9c51c89950b27c3d183a36f07d50d8d18f81b60b334502
 EBUILD selinux-canna-2.20180114-r2.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
+EBUILD selinux-canna-2.20180114-r3.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 EBUILD selinux-canna-9999.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 MISC metadata.xml 315 BLAKE2B 675fbadeb697d9af143ccec9b334e5f7f44effe1a0f6a05e1f05b9a5f6d763e13930c294169a8ff912f324ff463d218a0737a49b36facace2fdb4b8b07f388c5 SHA512 e769ff18487231316820a744d1567208e4ed3d329e1eb7ddabdaece562292189ac0486732261c737339d40687019319baccc52ddfa2a99b2a75cde4a4b450ee9
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild
deleted file mode 100644
index 82d4746419dd..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170805-r4.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170805-r4.ebuild
deleted file mode 100644
index 82d4746419dd..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20180114-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..33f018f5f6ce
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="canna"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for canna"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index c3172159afae..e8036759cd59 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ccs-2.20170204-r1.ebuild 278 BLAKE2B 7a0de4d4509eee1580681de9e740b7fb57f2d6c37815b0e96874f241856c6fd1e95cbe6a63a1083c2e37a01a9921485b4fc6604aab8bbe702826316508f7f165 SHA512 8e6bf6e263393257e88a758c5ba401fc3637b0345921daa44d09bac915c8ede3050f6d655dd84b66d5b587514b0f2b192c43aa90793055dea0dc0db78088d4cb
-EBUILD selinux-ccs-2.20170204-r2.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108449d5d3326aa15e44faa785d5c0f25a5713dbe4544434446c293dab71a27e9b2b9662c5f4e81c5fc8dc88c7c69e9f88bad6d SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618
-EBUILD selinux-ccs-2.20170204-r3.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108449d5d3326aa15e44faa785d5c0f25a5713dbe4544434446c293dab71a27e9b2b9662c5f4e81c5fc8dc88c7c69e9f88bad6d SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618
-EBUILD selinux-ccs-2.20170204-r4.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108449d5d3326aa15e44faa785d5c0f25a5713dbe4544434446c293dab71a27e9b2b9662c5f4e81c5fc8dc88c7c69e9f88bad6d SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618
 EBUILD selinux-ccs-2.20170805-r2.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108449d5d3326aa15e44faa785d5c0f25a5713dbe4544434446c293dab71a27e9b2b9662c5f4e81c5fc8dc88c7c69e9f88bad6d SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618
 EBUILD selinux-ccs-2.20170805-r3.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108449d5d3326aa15e44faa785d5c0f25a5713dbe4544434446c293dab71a27e9b2b9662c5f4e81c5fc8dc88c7c69e9f88bad6d SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618
-EBUILD selinux-ccs-2.20170805-r4.ebuild 278 BLAKE2B 7a0de4d4509eee1580681de9e740b7fb57f2d6c37815b0e96874f241856c6fd1e95cbe6a63a1083c2e37a01a9921485b4fc6604aab8bbe702826316508f7f165 SHA512 8e6bf6e263393257e88a758c5ba401fc3637b0345921daa44d09bac915c8ede3050f6d655dd84b66d5b587514b0f2b192c43aa90793055dea0dc0db78088d4cb
 EBUILD selinux-ccs-2.20180114-r1.ebuild 276 BLAKE2B e562c570e9702ac268adcedd405b99475f01efb1ad285ef35c1703d86fb7cc16aeceb516df10722d2b23dbd42cb95c53808e1fea1e9b740debeb580e9026d9e0 SHA512 21da52d677cb06fc1b55543634d227b29eb859580ec6ba99f77f44c6d699a5708836d5beccfd2ce388403ab750b779e1ffae560ac7eb981e0ffa57061fb0b57c
 EBUILD selinux-ccs-2.20180114-r2.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
+EBUILD selinux-ccs-2.20180114-r3.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
 EBUILD selinux-ccs-9999.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
 MISC metadata.xml 313 BLAKE2B 97e2ffbb66364d5710045e11689425c4a307ec5f8900bf999db57142d704a302658558d087c03ed499dd40d99138d7d44447614de2ea358373d0582c30676323 SHA512 be700477be516907f457fa88bce00b34cb30c8ba470736e40f8cb180c1c8e19ad8888df8e45d41c0d283dad0396ccea00477026222a5cf2936bc4f82b6261ac6
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r1.ebuild
deleted file mode 100644
index f9d2983ed2dc..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r2.ebuild
deleted file mode 100644
index 1d8cdadadb25..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r3.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r3.ebuild
deleted file mode 100644
index 1d8cdadadb25..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r4.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r4.ebuild
deleted file mode 100644
index 1d8cdadadb25..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r4.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r4.ebuild
deleted file mode 100644
index f9d2983ed2dc..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20180114-r3.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..40dac97d118c
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ccs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ccs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 0fd0d6324378..2fbc8e5efc41 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cdrecord-2.20170204-r1.ebuild 288 BLAKE2B 9cfd512241d531b51a76eafbcebe228488d6f0a3ec418b64d9d9a8b438a76e91de0912b17a518f59cf82ad198e3c3918ff6587eb2af55dae3db4734d6e33caf2 SHA512 846af34522a894e474feb5d7a4c63e9189ac357a497c1212051cb8139d6016efbd5d094b3480fae3219c056449ba607e5f5087cca6fd6aeb6d0ceeb26fb81fbd
-EBUILD selinux-cdrecord-2.20170204-r2.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9665159d8ea0c72aea51efdbc3723618e8c5982e1e9ed229cc40ba3684a6fd2f8e90029b0380310c16e0fc483cdeee158174f04dde SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d
-EBUILD selinux-cdrecord-2.20170204-r3.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9665159d8ea0c72aea51efdbc3723618e8c5982e1e9ed229cc40ba3684a6fd2f8e90029b0380310c16e0fc483cdeee158174f04dde SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d
-EBUILD selinux-cdrecord-2.20170204-r4.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9665159d8ea0c72aea51efdbc3723618e8c5982e1e9ed229cc40ba3684a6fd2f8e90029b0380310c16e0fc483cdeee158174f04dde SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d
 EBUILD selinux-cdrecord-2.20170805-r2.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9665159d8ea0c72aea51efdbc3723618e8c5982e1e9ed229cc40ba3684a6fd2f8e90029b0380310c16e0fc483cdeee158174f04dde SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d
 EBUILD selinux-cdrecord-2.20170805-r3.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9665159d8ea0c72aea51efdbc3723618e8c5982e1e9ed229cc40ba3684a6fd2f8e90029b0380310c16e0fc483cdeee158174f04dde SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d
-EBUILD selinux-cdrecord-2.20170805-r4.ebuild 288 BLAKE2B 9cfd512241d531b51a76eafbcebe228488d6f0a3ec418b64d9d9a8b438a76e91de0912b17a518f59cf82ad198e3c3918ff6587eb2af55dae3db4734d6e33caf2 SHA512 846af34522a894e474feb5d7a4c63e9189ac357a497c1212051cb8139d6016efbd5d094b3480fae3219c056449ba607e5f5087cca6fd6aeb6d0ceeb26fb81fbd
 EBUILD selinux-cdrecord-2.20180114-r1.ebuild 286 BLAKE2B a655817ed4d6489efaa650f118ad32585d068d50bddfd2c63456484155cba5412d1995550c2a2228844cd004f20534b504f93a20b12fcb198e032973a3419153 SHA512 54b304b0fd2a688b5a353654411ff69cff5e80609736740e90f2a37e23190d2171def5ec561e2a84e4875399e225856f7730a6058207ed022f6fe72603bf8122
 EBUILD selinux-cdrecord-2.20180114-r2.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
+EBUILD selinux-cdrecord-2.20180114-r3.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
 EBUILD selinux-cdrecord-9999.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
 MISC metadata.xml 318 BLAKE2B 277095870372899df6eed127113b9efe82a78ffe2d03b8df09e32ef4dd23287d291e573e65f14f903279d931393ebe2f903115228cb0f2f34763c090cfe1af45 SHA512 c2a9030ca10cf81b9eb40957e99c3dd31bef004c7bf94da5bef7013ca32a224e65e21a6ccb93b91db873b5b9b68e3aa482e332c870976920e5939c83266d182a
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r1.ebuild
deleted file mode 100644
index ba2c56444f42..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r2.ebuild
deleted file mode 100644
index b8e9c33e8dbd..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r3.ebuild
deleted file mode 100644
index b8e9c33e8dbd..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r4.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r4.ebuild
deleted file mode 100644
index b8e9c33e8dbd..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r4.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r4.ebuild
deleted file mode 100644
index ba2c56444f42..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180114-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a7f9587a269c
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cdrecord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cdrecord"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index c9aa85242603..34a07420e68e 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ceph-2.20170204-r1.ebuild 280 BLAKE2B 8b6f7b2d1778a6973cecbfd0d91b92d3eda3902c1614822e230aece1e7e63570f8a624322587230714322d2be129de895e15345e205d9c679e9c8912ea25078d SHA512 f1eedf0cdc4c5bbcdc216c17acc7ab3e09444d59b08b3ccbb4e353357f48b2551c3f5842e1f6a3abcec87789963ff94fc3442d3338ba098032e26e9b68e53cb7
-EBUILD selinux-ceph-2.20170204-r2.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5ee19939132d93772c37a948d7c6057e0a858f9cfc2167eac0567ec1f4cce30471739b521291fea7660250c5df0f87c1733411 SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a
-EBUILD selinux-ceph-2.20170204-r3.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5ee19939132d93772c37a948d7c6057e0a858f9cfc2167eac0567ec1f4cce30471739b521291fea7660250c5df0f87c1733411 SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a
-EBUILD selinux-ceph-2.20170204-r4.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5ee19939132d93772c37a948d7c6057e0a858f9cfc2167eac0567ec1f4cce30471739b521291fea7660250c5df0f87c1733411 SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a
 EBUILD selinux-ceph-2.20170805-r2.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5ee19939132d93772c37a948d7c6057e0a858f9cfc2167eac0567ec1f4cce30471739b521291fea7660250c5df0f87c1733411 SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a
 EBUILD selinux-ceph-2.20170805-r3.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5ee19939132d93772c37a948d7c6057e0a858f9cfc2167eac0567ec1f4cce30471739b521291fea7660250c5df0f87c1733411 SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a
-EBUILD selinux-ceph-2.20170805-r4.ebuild 280 BLAKE2B 8b6f7b2d1778a6973cecbfd0d91b92d3eda3902c1614822e230aece1e7e63570f8a624322587230714322d2be129de895e15345e205d9c679e9c8912ea25078d SHA512 f1eedf0cdc4c5bbcdc216c17acc7ab3e09444d59b08b3ccbb4e353357f48b2551c3f5842e1f6a3abcec87789963ff94fc3442d3338ba098032e26e9b68e53cb7
 EBUILD selinux-ceph-2.20180114-r1.ebuild 278 BLAKE2B 1f4b71dd5360e8ad36f0b7783b26c759488ea3759b58c0e2e6e9b89bf03f274c110a5ec762236dce043818560e8af5b2cb5dc81fd9bb7534bc4b161e56a6f9c9 SHA512 04ba5035c523192f8bd3e4ffcc8b632ea4850f27606627773e600c438267530533f5077fe088b708e5930d514f09dbd1ebd77ace14db724a8a1b50481177d29d
 EBUILD selinux-ceph-2.20180114-r2.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
+EBUILD selinux-ceph-2.20180114-r3.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
 EBUILD selinux-ceph-9999.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
 MISC metadata.xml 314 BLAKE2B 444357eaf7e8b989ecb2a74f717c3f8ded048ad87bc3288008b8beb86bb6ae7d5e5c8a06c1e0e2b927b1b3de2b55876672e8ab55cf01d1bc4c432e47291234c8 SHA512 d3e9c09959bfad3e2f60aa141354eac5cdbdee34df07f06c04a6af6564b1ad8396d2f220eadf6c7c883ee0e33c755537f0adfc2ec1039bb61b0ec90a9d07d282
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r1.ebuild
deleted file mode 100644
index 99d200867dfb..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r2.ebuild
deleted file mode 100644
index 2718ef75f150..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r3.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r3.ebuild
deleted file mode 100644
index 2718ef75f150..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r4.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r4.ebuild
deleted file mode 100644
index 2718ef75f150..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r4.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r4.ebuild
deleted file mode 100644
index 99d200867dfb..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20180114-r3.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..760e26def4d1
--- /dev/null
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ceph"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ceph"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index 0625e6876b51..d6725f5be409 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cgmanager-2.20170204-r1.ebuild 290 BLAKE2B a939a2bf8dc1cfb842e0f404606a77d8d7bcbbb96fd07d83116ac46b068767d312cb97a8d2ffebe58af457c34f503cd8f046517f2443702fcbccb11a7728f972 SHA512 e9c75fb1fc3721cd04dc8e4994e83458301be804ec2cda723ccac0ab42d9bd63d1b7958bcdc9cfbeb3f714941af3ca855164419403c9d2519c93ba47c20648cd
-EBUILD selinux-cgmanager-2.20170204-r2.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5ae14fb298f2363802a8707b5d7208685ee1894fba1298b6c3737c1c64ca4fdad0a6f2222ad01ca7c1968fc8e0feb06da9e7a22c33bb SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6
-EBUILD selinux-cgmanager-2.20170204-r3.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5ae14fb298f2363802a8707b5d7208685ee1894fba1298b6c3737c1c64ca4fdad0a6f2222ad01ca7c1968fc8e0feb06da9e7a22c33bb SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6
-EBUILD selinux-cgmanager-2.20170204-r4.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5ae14fb298f2363802a8707b5d7208685ee1894fba1298b6c3737c1c64ca4fdad0a6f2222ad01ca7c1968fc8e0feb06da9e7a22c33bb SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6
 EBUILD selinux-cgmanager-2.20170805-r2.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5ae14fb298f2363802a8707b5d7208685ee1894fba1298b6c3737c1c64ca4fdad0a6f2222ad01ca7c1968fc8e0feb06da9e7a22c33bb SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6
 EBUILD selinux-cgmanager-2.20170805-r3.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5ae14fb298f2363802a8707b5d7208685ee1894fba1298b6c3737c1c64ca4fdad0a6f2222ad01ca7c1968fc8e0feb06da9e7a22c33bb SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6
-EBUILD selinux-cgmanager-2.20170805-r4.ebuild 290 BLAKE2B a939a2bf8dc1cfb842e0f404606a77d8d7bcbbb96fd07d83116ac46b068767d312cb97a8d2ffebe58af457c34f503cd8f046517f2443702fcbccb11a7728f972 SHA512 e9c75fb1fc3721cd04dc8e4994e83458301be804ec2cda723ccac0ab42d9bd63d1b7958bcdc9cfbeb3f714941af3ca855164419403c9d2519c93ba47c20648cd
 EBUILD selinux-cgmanager-2.20180114-r1.ebuild 288 BLAKE2B 28806ba59e461f6d2e7da6460d86c42d09b6aced9244fdfd2d11d7082b69d0cf0d571c5820581833dd68a625d3a0dcc08fa4c6d44e06d0355ed5e3472ef86e5d SHA512 972f7abfffd1024c57d6aa10aaccafa473a8758a59af9ebfe29630bf66c8dfd344b82f17f47da90f4f175bfe2c167311e674a04f745ce5c7b127a369988f674f
 EBUILD selinux-cgmanager-2.20180114-r2.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
+EBUILD selinux-cgmanager-2.20180114-r3.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
 EBUILD selinux-cgmanager-9999.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
 MISC metadata.xml 338 BLAKE2B 5ead11f88099181dfac530eae53a88d027fcd0b989adaef605f55c7a131e83ed4e581ae90ae0c6334c37f7c81fadf4cca50215e2d7321b9204b7b3f9783260bb SHA512 94f4ae40489fd875bd8c5fd8e57c5e103909205e1cc872e706d44192eb045c646b9f8f5225acd74eac0f10cdcf06a8c30a9e0d8305d6913666ecf780e40faeb8
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r1.ebuild
deleted file mode 100644
index b04b419ed7ec..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r2.ebuild
deleted file mode 100644
index 24e72162f472..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r3.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r3.ebuild
deleted file mode 100644
index 24e72162f472..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r4.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r4.ebuild
deleted file mode 100644
index 24e72162f472..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r4.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r4.ebuild
deleted file mode 100644
index b04b419ed7ec..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180114-r3.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4e076e8694ad
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index 80d4a01f8408..6cb1cdab5f03 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cgroup-2.20170204-r1.ebuild 284 BLAKE2B d47bc1b8187115063f6e88f3890ad48744f2880e76a8d4cf9d7a42ca4858ea2a02dfdb50c411471c6ee6b0041a3011f930515e6a08ed64862eda80e4729d65ff SHA512 fae06d6e543a4fa116cfa4429057b95eaa225372bbd50ed5dc8c285b69c6278f229dbf4e78cef2ade12b8b81ec901ed8aa3eb906b7dbcbf54abcfee3452a2e1f
-EBUILD selinux-cgroup-2.20170204-r2.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5ffefbfefbe5d063f0142ca29de1ed9ab5c37e7dc4ac85f162920f28fde1a70cfaa485fbf06a264435f2e30f6e9c5ca0bc768ddc2 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189
-EBUILD selinux-cgroup-2.20170204-r3.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5ffefbfefbe5d063f0142ca29de1ed9ab5c37e7dc4ac85f162920f28fde1a70cfaa485fbf06a264435f2e30f6e9c5ca0bc768ddc2 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189
-EBUILD selinux-cgroup-2.20170204-r4.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5ffefbfefbe5d063f0142ca29de1ed9ab5c37e7dc4ac85f162920f28fde1a70cfaa485fbf06a264435f2e30f6e9c5ca0bc768ddc2 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189
 EBUILD selinux-cgroup-2.20170805-r2.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5ffefbfefbe5d063f0142ca29de1ed9ab5c37e7dc4ac85f162920f28fde1a70cfaa485fbf06a264435f2e30f6e9c5ca0bc768ddc2 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189
 EBUILD selinux-cgroup-2.20170805-r3.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5ffefbfefbe5d063f0142ca29de1ed9ab5c37e7dc4ac85f162920f28fde1a70cfaa485fbf06a264435f2e30f6e9c5ca0bc768ddc2 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189
-EBUILD selinux-cgroup-2.20170805-r4.ebuild 284 BLAKE2B d47bc1b8187115063f6e88f3890ad48744f2880e76a8d4cf9d7a42ca4858ea2a02dfdb50c411471c6ee6b0041a3011f930515e6a08ed64862eda80e4729d65ff SHA512 fae06d6e543a4fa116cfa4429057b95eaa225372bbd50ed5dc8c285b69c6278f229dbf4e78cef2ade12b8b81ec901ed8aa3eb906b7dbcbf54abcfee3452a2e1f
 EBUILD selinux-cgroup-2.20180114-r1.ebuild 282 BLAKE2B 6e9dfb1c9edb4126bffeb9cb0810ad2e29639f5cd802c85a9280685a5061d4af8cae9085829dbbd7daa9d6ff3d544833b1070f1ae4933184d0665e0ab3bb84e4 SHA512 b5e64f9e745d4d7def776dd8182b9d05b5d707b553d3c3bc05a4daf5d78e1891e839ec235405eb6fb7dc255fd9c7609bda82a028abb37abc93373fa62e0fc8c1
 EBUILD selinux-cgroup-2.20180114-r2.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
+EBUILD selinux-cgroup-2.20180114-r3.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
 EBUILD selinux-cgroup-9999.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
 MISC metadata.xml 316 BLAKE2B 4ab37a97ff87330a7bfa17880a37f1895b75c1efe830484da145380ada7229f44a7fb5fb58c1018afd66502059ae05ef8b8cd5407cdb107af66da769f96129b5 SHA512 5f6f16a1e6e45cc3483dda299489e6cb5ef903f60d2a9831e234bac9bcff876dcf382a51ba0151905bb876053339ec95802298838f22821bee7c3b3f4cdb1bda
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r1.ebuild
deleted file mode 100644
index 48e62f2483f0..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r2.ebuild
deleted file mode 100644
index bc51a313709b..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r3.ebuild
deleted file mode 100644
index bc51a313709b..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r4.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r4.ebuild
deleted file mode 100644
index bc51a313709b..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r4.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r4.ebuild
deleted file mode 100644
index 48e62f2483f0..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20180114-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..885e7b0cb6d5
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cgroup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgroup"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index d914ece79450..09df6e70b21c 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-chromium-2.20170204-r1.ebuild 391 BLAKE2B 317c2ee51f71fd029a60786c191cca3fd17759df799cf75877863b471c704de552939457843bed1e98d67f98a8d15d50c04831a16685e32662b852508afb4cb2 SHA512 882fcdb7998ea5a014dd71be392ab9e918187e0c6e8394a8df5a877edbed748ffee214457997949d94557541f9f953d12d46c7e374aea6c8b8ec3bdd14697258
-EBUILD selinux-chromium-2.20170204-r2.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981ac9c1a10ad0178f502dc7b53150b7f8a4557d291294992c6164777c37e875a602e850f1f6b46c884dcd05fbeffe34d7826a457c13e SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd
-EBUILD selinux-chromium-2.20170204-r3.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981ac9c1a10ad0178f502dc7b53150b7f8a4557d291294992c6164777c37e875a602e850f1f6b46c884dcd05fbeffe34d7826a457c13e SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd
-EBUILD selinux-chromium-2.20170204-r4.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981ac9c1a10ad0178f502dc7b53150b7f8a4557d291294992c6164777c37e875a602e850f1f6b46c884dcd05fbeffe34d7826a457c13e SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd
 EBUILD selinux-chromium-2.20170805-r2.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981ac9c1a10ad0178f502dc7b53150b7f8a4557d291294992c6164777c37e875a602e850f1f6b46c884dcd05fbeffe34d7826a457c13e SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd
 EBUILD selinux-chromium-2.20170805-r3.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981ac9c1a10ad0178f502dc7b53150b7f8a4557d291294992c6164777c37e875a602e850f1f6b46c884dcd05fbeffe34d7826a457c13e SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd
-EBUILD selinux-chromium-2.20170805-r4.ebuild 391 BLAKE2B 317c2ee51f71fd029a60786c191cca3fd17759df799cf75877863b471c704de552939457843bed1e98d67f98a8d15d50c04831a16685e32662b852508afb4cb2 SHA512 882fcdb7998ea5a014dd71be392ab9e918187e0c6e8394a8df5a877edbed748ffee214457997949d94557541f9f953d12d46c7e374aea6c8b8ec3bdd14697258
 EBUILD selinux-chromium-2.20180114-r1.ebuild 389 BLAKE2B a20f32218542a567a3867f96930eddfb03f4bd70e71793610be110b46ea1caf58cec992a74bfed51f9798493f2f639512defa8dde5bb30a2965a01444f2beb36 SHA512 a3e1aa5dffd88f5164780c040d4ff922fcb209e2a44e90397f1e42ca0972c14e9ca5c0a2e1b7b778fafed6ad5870555ef2180b85135fd075cd7533ef627f8672
 EBUILD selinux-chromium-2.20180114-r2.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
+EBUILD selinux-chromium-2.20180114-r3.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
 EBUILD selinux-chromium-9999.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
 MISC metadata.xml 318 BLAKE2B c7ed04aeaf5f0bdf6fef164f5fbbda80e2479f25fc6abbb505e8ebd1d29f05b505594a4e6ebf3c9662d5d1e5aff01755842ae22a155a1f4e3950fe7257ac781a SHA512 35a3ae361b20adc58424c078918cfb959fb4ed36ec73789d171ae30628b37da1444f9a028138a56aa6d3cb5605ecdaa48695bc8608dc0df54647492c07c88846
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r1.ebuild
deleted file mode 100644
index 385e71fce9da..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r2.ebuild
deleted file mode 100644
index 4785cfb100af..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r3.ebuild
deleted file mode 100644
index 4785cfb100af..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r4.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r4.ebuild
deleted file mode 100644
index 4785cfb100af..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r4.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r4.ebuild
deleted file mode 100644
index 385e71fce9da..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20180114-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1698c89c8ec8
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="chromium"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chromium"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index a484bd22d40e..47e311591098 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-chronyd-2.20170204-r1.ebuild 286 BLAKE2B 00e224a83948231660657bf20dbc3f886ac7e95a9e37a90b1636ce3cf5cd7af5547d3728762b5210ff8764ee70c272e6ae8c4c0ca955b2288e5e6215b5b56120 SHA512 f53c87cfa595925f0b6f109bf91632184be76b1fe0c7a7ed5086963646b9c74ace1a7d4725ba357f7eeef77a7f9dc7d89af8308ad423b24019cc35c13198acbe
-EBUILD selinux-chronyd-2.20170204-r2.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3c9d18edf38ba32aa3555333e96eba263bbfa739a94f9c3459ae294abdec241e677b43b773dc2cc273f06764471c8b9571362343a SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a
-EBUILD selinux-chronyd-2.20170204-r3.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3c9d18edf38ba32aa3555333e96eba263bbfa739a94f9c3459ae294abdec241e677b43b773dc2cc273f06764471c8b9571362343a SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a
-EBUILD selinux-chronyd-2.20170204-r4.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3c9d18edf38ba32aa3555333e96eba263bbfa739a94f9c3459ae294abdec241e677b43b773dc2cc273f06764471c8b9571362343a SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a
 EBUILD selinux-chronyd-2.20170805-r2.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3c9d18edf38ba32aa3555333e96eba263bbfa739a94f9c3459ae294abdec241e677b43b773dc2cc273f06764471c8b9571362343a SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a
 EBUILD selinux-chronyd-2.20170805-r3.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3c9d18edf38ba32aa3555333e96eba263bbfa739a94f9c3459ae294abdec241e677b43b773dc2cc273f06764471c8b9571362343a SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a
-EBUILD selinux-chronyd-2.20170805-r4.ebuild 286 BLAKE2B 00e224a83948231660657bf20dbc3f886ac7e95a9e37a90b1636ce3cf5cd7af5547d3728762b5210ff8764ee70c272e6ae8c4c0ca955b2288e5e6215b5b56120 SHA512 f53c87cfa595925f0b6f109bf91632184be76b1fe0c7a7ed5086963646b9c74ace1a7d4725ba357f7eeef77a7f9dc7d89af8308ad423b24019cc35c13198acbe
 EBUILD selinux-chronyd-2.20180114-r1.ebuild 284 BLAKE2B e6069ef348e76b69b567dafca2a8a09a5503cdd8a49c516bbc17065cd63671a2e1f24dd1fff1df61002c868524842b22444d557f438fc91ef400b86f441219e4 SHA512 c94af3b3d93cfe14dcddae87ffcc329439c370f3332a24321c6e5c4b4ce177b767be048858f47f177008eda53452c4301d14d25045dfcca0b13045c240c10148
 EBUILD selinux-chronyd-2.20180114-r2.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
+EBUILD selinux-chronyd-2.20180114-r3.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
 EBUILD selinux-chronyd-9999.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
 MISC metadata.xml 317 BLAKE2B 76b647d80d58d09d093b0e1f60ad302e332fdd9af4ebb7b6b9a089b49944a88e27f63312ea4bdce1ac753d55d448e8b977eee9e19a4ebb233b158caaff0d7a87 SHA512 567ce0e458597f415e01f706a700f210e033acf7887684adc26a51f57e8587a6b48a74c75cee937d0a69123ad4884a0e1e889a5227989681349564f9d02b4c85
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r1.ebuild
deleted file mode 100644
index e8394421bf40..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r2.ebuild
deleted file mode 100644
index d1960499b90d..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r3.ebuild
deleted file mode 100644
index d1960499b90d..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r4.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r4.ebuild
deleted file mode 100644
index d1960499b90d..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r4.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r4.ebuild
deleted file mode 100644
index e8394421bf40..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20180114-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1d020ca13aec
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="chronyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chronyd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 483818772c6c..1e5944ab4e94 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-clamav-2.20170204-r1.ebuild 284 BLAKE2B cf30bf14d41ba78fb41c20aca0c4d6c247b668612d58117bb6cd555dd52b4c8848e659d31754209a01daf7f1f8ad5db311d913b70b1bab9efa1fa5db90bcf2ef SHA512 41181ad8ee7b2b5cdda4c31ceab788339e52d70dd878ef8a8e76f4f2b9b673ad8175b5edb98e558b49af36c027d48f7eb09449f63fca011eba4d44537a841124
-EBUILD selinux-clamav-2.20170204-r2.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355672a428be0ba55f812c6832328b1d66087582500779d079e7d109c819dac4aa4f5e25ee006faaa11584ca238bf0bf93d498d2da SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2
-EBUILD selinux-clamav-2.20170204-r3.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355672a428be0ba55f812c6832328b1d66087582500779d079e7d109c819dac4aa4f5e25ee006faaa11584ca238bf0bf93d498d2da SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2
-EBUILD selinux-clamav-2.20170204-r4.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355672a428be0ba55f812c6832328b1d66087582500779d079e7d109c819dac4aa4f5e25ee006faaa11584ca238bf0bf93d498d2da SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2
 EBUILD selinux-clamav-2.20170805-r2.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355672a428be0ba55f812c6832328b1d66087582500779d079e7d109c819dac4aa4f5e25ee006faaa11584ca238bf0bf93d498d2da SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2
 EBUILD selinux-clamav-2.20170805-r3.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355672a428be0ba55f812c6832328b1d66087582500779d079e7d109c819dac4aa4f5e25ee006faaa11584ca238bf0bf93d498d2da SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2
-EBUILD selinux-clamav-2.20170805-r4.ebuild 284 BLAKE2B cf30bf14d41ba78fb41c20aca0c4d6c247b668612d58117bb6cd555dd52b4c8848e659d31754209a01daf7f1f8ad5db311d913b70b1bab9efa1fa5db90bcf2ef SHA512 41181ad8ee7b2b5cdda4c31ceab788339e52d70dd878ef8a8e76f4f2b9b673ad8175b5edb98e558b49af36c027d48f7eb09449f63fca011eba4d44537a841124
 EBUILD selinux-clamav-2.20180114-r1.ebuild 282 BLAKE2B e18889feac7dd3529792f26fb755f41da855ca5ca8705dace198026a65934066a1ad13ae939f14959b7add23fefc0fe3a0806e49d3fe218a9fd303001676e7bd SHA512 24fc90e7ffd53cc5cf024d63c6a4c5810fe290bd0643521e44bb8435b8161306a79615c40e48d9ad7f890a0ba985cf6011f73ec9521c732c14e14be7d8772b1a
 EBUILD selinux-clamav-2.20180114-r2.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
+EBUILD selinux-clamav-2.20180114-r3.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
 EBUILD selinux-clamav-9999.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
 MISC metadata.xml 316 BLAKE2B 7960e2c8f85fde2ce87b6ec978f64ceca50c7a5135187a01b2c6ead802b564e02d64f458fc12cacf7a848820c0acebe044cf4bdb79f10471391a4c6e4339e0af SHA512 f1979723a6f2267cb7614e961f3af14fb84e05912d27c2a153695abb993c4d406c9558c12a3cc1ea1e44b7592dcbdf28573708fcb27cf5defa0608c58f00fbd7
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r1.ebuild
deleted file mode 100644
index cc2182e6c321..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r2.ebuild
deleted file mode 100644
index cf4980f98ff0..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r3.ebuild
deleted file mode 100644
index cf4980f98ff0..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r4.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r4.ebuild
deleted file mode 100644
index cf4980f98ff0..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r4.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r4.ebuild
deleted file mode 100644
index cc2182e6c321..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20180114-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e65376ea36cd
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="clamav"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clamav"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index 638640407db0..e867f1564752 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-clockspeed-2.20170204-r1.ebuild 292 BLAKE2B 5b634ea995b14eaadd5119605d56939af0db9922f5c374c5bfa1624e8c6862a78b2571c66409c0b2bd9f9b134df76a45b84b4ce7b52cf5432ac6ec061f99f348 SHA512 661ac8ce4cfd795057a4991c4a733004801eda5c68819c7551a0b1a68962ff8163e38c9d17a0b4e1b68372f6055a287e06dea4a25f461e9695e8e54494135c1c
-EBUILD selinux-clockspeed-2.20170204-r2.ebuild 290 BLAKE2B ec0d460e547f3ed488ebeff207a44b0cdccb5367dd3824836a189d0826cb659850201f8e1f7d8c24257bbd63680e638f0aae86af91922be908a86108dc93a352 SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b
-EBUILD selinux-clockspeed-2.20170204-r3.ebuild 290 BLAKE2B ec0d460e547f3ed488ebeff207a44b0cdccb5367dd3824836a189d0826cb659850201f8e1f7d8c24257bbd63680e638f0aae86af91922be908a86108dc93a352 SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b
-EBUILD selinux-clockspeed-2.20170204-r4.ebuild 290 BLAKE2B ec0d460e547f3ed488ebeff207a44b0cdccb5367dd3824836a189d0826cb659850201f8e1f7d8c24257bbd63680e638f0aae86af91922be908a86108dc93a352 SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b
 EBUILD selinux-clockspeed-2.20170805-r2.ebuild 290 BLAKE2B ec0d460e547f3ed488ebeff207a44b0cdccb5367dd3824836a189d0826cb659850201f8e1f7d8c24257bbd63680e638f0aae86af91922be908a86108dc93a352 SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b
 EBUILD selinux-clockspeed-2.20170805-r3.ebuild 290 BLAKE2B ec0d460e547f3ed488ebeff207a44b0cdccb5367dd3824836a189d0826cb659850201f8e1f7d8c24257bbd63680e638f0aae86af91922be908a86108dc93a352 SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b
-EBUILD selinux-clockspeed-2.20170805-r4.ebuild 292 BLAKE2B 5b634ea995b14eaadd5119605d56939af0db9922f5c374c5bfa1624e8c6862a78b2571c66409c0b2bd9f9b134df76a45b84b4ce7b52cf5432ac6ec061f99f348 SHA512 661ac8ce4cfd795057a4991c4a733004801eda5c68819c7551a0b1a68962ff8163e38c9d17a0b4e1b68372f6055a287e06dea4a25f461e9695e8e54494135c1c
 EBUILD selinux-clockspeed-2.20180114-r1.ebuild 290 BLAKE2B 3417ae6ca0e663b3e0b16859783f81b005432eb38409898bea8a8271878a859c9b8cc5cd41399566b4e8e2a93f8389a5ca366b845847a495b1bfe365184825c9 SHA512 85519cc204421fe74f05ecb37eeba085c566e9cf6377c51bac7b54db83f3a84f241ec924d7d37eb0924e9b43990a8f8765067e424af930f7aadcd11787541f09
 EBUILD selinux-clockspeed-2.20180114-r2.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
+EBUILD selinux-clockspeed-2.20180114-r3.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
 EBUILD selinux-clockspeed-9999.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
 MISC metadata.xml 320 BLAKE2B 760f3041fd82667196780a0ea9491ec8186e56c2e3fb60edab38584cead30b307cae4e8a589ba06096db7dbe259562989e3de8f842ca7d0dba0d7d17ba65c202 SHA512 7bafbbd72540c4ce4cda253f41f30180c5eaad307c5f53b87e0415587e2aa119204daed097e2db7d3ab025d48313ad4b0c9e5af5e1b0d31b640e099fe7ef3254
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r1.ebuild
deleted file mode 100644
index 748170655bd3..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r2.ebuild
deleted file mode 100644
index 9818b65bed95..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r3.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r3.ebuild
deleted file mode 100644
index 9818b65bed95..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r4.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r4.ebuild
deleted file mode 100644
index 9818b65bed95..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r4.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r4.ebuild
deleted file mode 100644
index 748170655bd3..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180114-r3.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..d83bc877500c
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="clockspeed"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clockspeed"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 7adac7102e25..36eda0b20544 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-collectd-2.20170204-r1.ebuild 386 BLAKE2B 84a818529877753ad106e7b5bd7396d3309a80f3b72895bdc2aaea3fba24f958994a5ed4556fe9b6ff20213a10fc5cfabe2c85005220d8f7d7181642c757cb4d SHA512 c2a06fd6c26ced5c718636b6f62a9b61c9daa888ed02921f7dce2899f6ae6e28ebebe8bc187937fda760fe625c8c261e864d78b24d40e6676fd26d1151fbb342
-EBUILD selinux-collectd-2.20170204-r2.ebuild 384 BLAKE2B 86c46998e89789a775b3edb2455016d0247bbafa83f052355e5c6b937fccd7220d6a602ce92a6c10977d12b096c7e134ece9a71a6ab1665efd95ea4808e1362f SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d
-EBUILD selinux-collectd-2.20170204-r3.ebuild 384 BLAKE2B 86c46998e89789a775b3edb2455016d0247bbafa83f052355e5c6b937fccd7220d6a602ce92a6c10977d12b096c7e134ece9a71a6ab1665efd95ea4808e1362f SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d
-EBUILD selinux-collectd-2.20170204-r4.ebuild 384 BLAKE2B 86c46998e89789a775b3edb2455016d0247bbafa83f052355e5c6b937fccd7220d6a602ce92a6c10977d12b096c7e134ece9a71a6ab1665efd95ea4808e1362f SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d
 EBUILD selinux-collectd-2.20170805-r2.ebuild 384 BLAKE2B 86c46998e89789a775b3edb2455016d0247bbafa83f052355e5c6b937fccd7220d6a602ce92a6c10977d12b096c7e134ece9a71a6ab1665efd95ea4808e1362f SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d
 EBUILD selinux-collectd-2.20170805-r3.ebuild 384 BLAKE2B 86c46998e89789a775b3edb2455016d0247bbafa83f052355e5c6b937fccd7220d6a602ce92a6c10977d12b096c7e134ece9a71a6ab1665efd95ea4808e1362f SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d
-EBUILD selinux-collectd-2.20170805-r4.ebuild 386 BLAKE2B 84a818529877753ad106e7b5bd7396d3309a80f3b72895bdc2aaea3fba24f958994a5ed4556fe9b6ff20213a10fc5cfabe2c85005220d8f7d7181642c757cb4d SHA512 c2a06fd6c26ced5c718636b6f62a9b61c9daa888ed02921f7dce2899f6ae6e28ebebe8bc187937fda760fe625c8c261e864d78b24d40e6676fd26d1151fbb342
 EBUILD selinux-collectd-2.20180114-r1.ebuild 384 BLAKE2B e2faffda08dd86db36e5380f9799973b8f9aaf950ba789de2b65edaad2b1ba2bc9aabdfd6c6deee4ac2dfe62d9740a10d35f25696e1dbf7c9d51a50cbb5643db SHA512 e74afb7f2d640d0532696757224e7ba9fc6183820811faf57e77a59459f77a29742a46421feed1baacac68878c3fd00c446c80119e6d1d6613e4bfc0ce384f2e
 EBUILD selinux-collectd-2.20180114-r2.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
+EBUILD selinux-collectd-2.20180114-r3.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
 EBUILD selinux-collectd-9999.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
 MISC metadata.xml 318 BLAKE2B be69d0693525604ac1c29e2fec3384e737f531ad9f94245b9cc65d8d2d5ac3c46079d7206565da1b5d5a89d1aa5be8f78eddc31fa158768dbfdb37f96826561b SHA512 6da5121253ae7018f81cc66a816a364e836e226e2e679f245acd61d6bdbe5fed013032bc4d3f38b917a4372a436ee08b53d0c379b9daa3f8ef6c7797fcd59b54
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r1.ebuild
deleted file mode 100644
index 814ff4a9f1b1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r2.ebuild
deleted file mode 100644
index 8ff30ae5f2e1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r3.ebuild
deleted file mode 100644
index 8ff30ae5f2e1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r4.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r4.ebuild
deleted file mode 100644
index 8ff30ae5f2e1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r4.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r4.ebuild
deleted file mode 100644
index 814ff4a9f1b1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20180114-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..72250ed6c043
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20180114-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="collectd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for collectd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
index 23b9392e50bc..dd13bc0bc38f 100644
--- a/sec-policy/selinux-consolekit/Manifest
+++ b/sec-policy/selinux-consolekit/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-consolekit-2.20170204-r1.ebuild 292 BLAKE2B a8c3137e9c92ab37f22e72b82241eb136187efddacaa3133809da87e54a951be37dcdd16357043368d9747255dd038ba6a8f3d0fbd1d8d67d0d5d7f7e39aa0fe SHA512 7c854971f86b8498f139b14fdc6b5cacff7fdb25a7be2717998abe0cd8a08afc9f69f5f9eef508369ca446d94a870aad397318c7d4b8b4b2fdb99ad4732cff7e
-EBUILD selinux-consolekit-2.20170204-r2.ebuild 290 BLAKE2B 79460a4732ed7437d5189f1aeef0a2b0809289be082f2f8c47f8b6803d45fa6899351e0cd6876e88f8d5105adbf2393c84f4cdb5910b81543b956a2042817ac8 SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565
-EBUILD selinux-consolekit-2.20170204-r3.ebuild 290 BLAKE2B 79460a4732ed7437d5189f1aeef0a2b0809289be082f2f8c47f8b6803d45fa6899351e0cd6876e88f8d5105adbf2393c84f4cdb5910b81543b956a2042817ac8 SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565
-EBUILD selinux-consolekit-2.20170204-r4.ebuild 290 BLAKE2B 79460a4732ed7437d5189f1aeef0a2b0809289be082f2f8c47f8b6803d45fa6899351e0cd6876e88f8d5105adbf2393c84f4cdb5910b81543b956a2042817ac8 SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565
 EBUILD selinux-consolekit-2.20170805-r2.ebuild 290 BLAKE2B 79460a4732ed7437d5189f1aeef0a2b0809289be082f2f8c47f8b6803d45fa6899351e0cd6876e88f8d5105adbf2393c84f4cdb5910b81543b956a2042817ac8 SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565
 EBUILD selinux-consolekit-2.20170805-r3.ebuild 290 BLAKE2B 79460a4732ed7437d5189f1aeef0a2b0809289be082f2f8c47f8b6803d45fa6899351e0cd6876e88f8d5105adbf2393c84f4cdb5910b81543b956a2042817ac8 SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565
-EBUILD selinux-consolekit-2.20170805-r4.ebuild 292 BLAKE2B a8c3137e9c92ab37f22e72b82241eb136187efddacaa3133809da87e54a951be37dcdd16357043368d9747255dd038ba6a8f3d0fbd1d8d67d0d5d7f7e39aa0fe SHA512 7c854971f86b8498f139b14fdc6b5cacff7fdb25a7be2717998abe0cd8a08afc9f69f5f9eef508369ca446d94a870aad397318c7d4b8b4b2fdb99ad4732cff7e
 EBUILD selinux-consolekit-2.20180114-r1.ebuild 290 BLAKE2B 244bf65e1b3cca07eee102197915df263bc00de5165adbc287006547681d8830b3181f6e55fbce942ae727d9f1c399925406509ff381c2e06232a744573b1ce5 SHA512 e22897baa22c80a08f5206fea5d2497945fa84788161525f5087902ea9e6857205b5486de35e72f45eebdf00098409655a76fb5dad0a50a2cbc17a8660605d30
 EBUILD selinux-consolekit-2.20180114-r2.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
+EBUILD selinux-consolekit-2.20180114-r3.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
 EBUILD selinux-consolekit-9999.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
 MISC metadata.xml 320 BLAKE2B 0726c22f0efb654d222e7ac8915a1bf952c61a99a3cf4c3a316d1b3c1119ef1a930629f1c5ac98f1aacdb0f406eacaf705dac8b1711144b654e9d4ae9c597c81 SHA512 2cec206212671d162d6ae717d104543e9dbc5efa80f01f72d6aa1a7cd1863577b58d80b57cae6259ade3f4a88a12a5a1cbbacc060739f012879468be0ea03e3a
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r1.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r1.ebuild
deleted file mode 100644
index c306c4a21f00..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r2.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r2.ebuild
deleted file mode 100644
index 05ee08f64f2c..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r3.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r3.ebuild
deleted file mode 100644
index 05ee08f64f2c..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r4.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r4.ebuild
deleted file mode 100644
index 05ee08f64f2c..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r4.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r4.ebuild
deleted file mode 100644
index c306c4a21f00..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20180114-r3.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..084d9430ec27
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="consolekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for consolekit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 51094a9d107d..e84d5e5453cf 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-corosync-2.20170204-r1.ebuild 288 BLAKE2B b84c5f0de71a56026f94d958d9f4e07ae2c26b5f7d21f2efbb1743c9741143ef4f702f987b6f9a979a4f8f1fffa5388307bc2e32e379060c082b84afca371bf5 SHA512 d75940e7d1a0c95fe3cd3af159c41db3738d1ec9ac4432c063f56a8f6cc318b9672050f39f159dba04365c64f3701ea28cb430c9a241f7da2767867a60fdb62f
-EBUILD selinux-corosync-2.20170204-r2.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255707d3b6703b67d39e41d5832fcdb9617858d2dc7ca607038557150b93428e2123437bc0b9e277154baedcc1506c0216fb9299a727 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e
-EBUILD selinux-corosync-2.20170204-r3.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255707d3b6703b67d39e41d5832fcdb9617858d2dc7ca607038557150b93428e2123437bc0b9e277154baedcc1506c0216fb9299a727 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e
-EBUILD selinux-corosync-2.20170204-r4.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255707d3b6703b67d39e41d5832fcdb9617858d2dc7ca607038557150b93428e2123437bc0b9e277154baedcc1506c0216fb9299a727 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e
 EBUILD selinux-corosync-2.20170805-r2.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255707d3b6703b67d39e41d5832fcdb9617858d2dc7ca607038557150b93428e2123437bc0b9e277154baedcc1506c0216fb9299a727 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e
 EBUILD selinux-corosync-2.20170805-r3.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255707d3b6703b67d39e41d5832fcdb9617858d2dc7ca607038557150b93428e2123437bc0b9e277154baedcc1506c0216fb9299a727 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e
-EBUILD selinux-corosync-2.20170805-r4.ebuild 288 BLAKE2B b84c5f0de71a56026f94d958d9f4e07ae2c26b5f7d21f2efbb1743c9741143ef4f702f987b6f9a979a4f8f1fffa5388307bc2e32e379060c082b84afca371bf5 SHA512 d75940e7d1a0c95fe3cd3af159c41db3738d1ec9ac4432c063f56a8f6cc318b9672050f39f159dba04365c64f3701ea28cb430c9a241f7da2767867a60fdb62f
 EBUILD selinux-corosync-2.20180114-r1.ebuild 286 BLAKE2B f1ab17a91642010aacc6d085b8121979d25a39e75345e50cfc4e8dd41636f1ba8c3513f08c243c0966d02659a3a1e19e60c4730f2cea19c8294cf28cf33bd3c5 SHA512 4fe08cd0dde9a9704c269cbe2fb0e10a99b347294d4aa3396807451842c6f4682d2d5a9c30a12fefdad4d79ea847db34f89f022f061a5489cdedea78d1220c34
 EBUILD selinux-corosync-2.20180114-r2.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
+EBUILD selinux-corosync-2.20180114-r3.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
 EBUILD selinux-corosync-9999.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
 MISC metadata.xml 318 BLAKE2B 6dba862352dff5eb9f0a33f37c5fdecd6e7beb99b01e47c259398c2dc79adf04dcfd4b376f10190385fa8e510eb7b12603235097b653d58e7da1d915b69206b1 SHA512 13956c6e5e42d77e6588be5abeb1adeda5d425aa0187a430aad4f5c69cf28ff34d5d8afd83c0a2965454ffc2500f3c5f8c3300e8bb4992b9e1de5a501d0497b1
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r1.ebuild
deleted file mode 100644
index 3e8874f582ed..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r2.ebuild
deleted file mode 100644
index a5e3c2a8632c..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r3.ebuild
deleted file mode 100644
index a5e3c2a8632c..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r4.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r4.ebuild
deleted file mode 100644
index a5e3c2a8632c..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r4.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r4.ebuild
deleted file mode 100644
index 3e8874f582ed..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20180114-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..dd5454d318ad
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="corosync"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for corosync"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index 11955380c500..7ff5ed82b3cb 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-couchdb-2.20170204-r1.ebuild 286 BLAKE2B 211efd4a83fcde4ef52ce7dd58279117f6b4436eed54eaf539d39d4c7226634c177e630b9748c906df05c0db8b80ad36adc9008eefceb19b568acdc8288fbc7e SHA512 c8182dd937ccb08b6abf56909b4f0ccdac0559239684ee7753ce576f444baf9d71653159f5bd828331c1af194ae682b3e927249c4fdf0f83c2a868933d404f22
-EBUILD selinux-couchdb-2.20170204-r2.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d397560ea52a2a27eab8308a664c9e1d82d777765297b281a9476a680bc60e4ad6609638348d05d6eb3bfeb5bc45405472a495d17e SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5
-EBUILD selinux-couchdb-2.20170204-r3.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d397560ea52a2a27eab8308a664c9e1d82d777765297b281a9476a680bc60e4ad6609638348d05d6eb3bfeb5bc45405472a495d17e SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5
-EBUILD selinux-couchdb-2.20170204-r4.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d397560ea52a2a27eab8308a664c9e1d82d777765297b281a9476a680bc60e4ad6609638348d05d6eb3bfeb5bc45405472a495d17e SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5
 EBUILD selinux-couchdb-2.20170805-r2.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d397560ea52a2a27eab8308a664c9e1d82d777765297b281a9476a680bc60e4ad6609638348d05d6eb3bfeb5bc45405472a495d17e SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5
 EBUILD selinux-couchdb-2.20170805-r3.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d397560ea52a2a27eab8308a664c9e1d82d777765297b281a9476a680bc60e4ad6609638348d05d6eb3bfeb5bc45405472a495d17e SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5
-EBUILD selinux-couchdb-2.20170805-r4.ebuild 286 BLAKE2B 211efd4a83fcde4ef52ce7dd58279117f6b4436eed54eaf539d39d4c7226634c177e630b9748c906df05c0db8b80ad36adc9008eefceb19b568acdc8288fbc7e SHA512 c8182dd937ccb08b6abf56909b4f0ccdac0559239684ee7753ce576f444baf9d71653159f5bd828331c1af194ae682b3e927249c4fdf0f83c2a868933d404f22
 EBUILD selinux-couchdb-2.20180114-r1.ebuild 284 BLAKE2B c961197f2487eee27da7aa612f8d673f1b82a38caa9be64a7265915c66661586259c7a448750d329820d3dba4c83afd876e1c14514eb0b666906ba9498f50b1e SHA512 bd3527b8171e02ec2ec7659f56234e4ecd6401af3d182e2a894749c94bae3c071a90b8aae5bb40f3d87bbf5fb036b3c12340af14e2a7102a1cea994ebeb528ae
 EBUILD selinux-couchdb-2.20180114-r2.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
+EBUILD selinux-couchdb-2.20180114-r3.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
 EBUILD selinux-couchdb-9999.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
 MISC metadata.xml 317 BLAKE2B d943379ea7b56183adf18645a4c3c6352a3d259ad5140789a8a9b5aca17d665fadd8d06618ca93ff92135f4ddba37d9a4b76094eb8e9bad3e048636ed23cb35a SHA512 43fda061c7a92dc5b9602aa01616bd876000263114982314135e8e544c1b209b55438736c3287ea456faba6f7666564d66cac0897ea4c8c29a0211ddd86b7dd9
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r1.ebuild
deleted file mode 100644
index 6d8c2b236897..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r2.ebuild
deleted file mode 100644
index 424eb13f89ea..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r3.ebuild
deleted file mode 100644
index 424eb13f89ea..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r4.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r4.ebuild
deleted file mode 100644
index 424eb13f89ea..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r4.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r4.ebuild
deleted file mode 100644
index 6d8c2b236897..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20180114-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..941f36368fcd
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="couchdb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for couchdb"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 10590d0b40d7..ef8d038d4330 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-courier-2.20170204-r1.ebuild 286 BLAKE2B df865fabf7773af4ee3bba4b3fbd48fadcd77b8289c92ccd96a07f7900c94e542a472a68a7c1cca72332a72305237f681be760af0bbb03cc19ab9852f8d0c0e1 SHA512 8cd5fdd8c204e86fbeb23dea5748cb2653981ffe885ae7a2c5d63b44bf50da71c8b421f1e41113601da5ed705326d3e2d52dd8ce293485706eaeabead02d6c39
-EBUILD selinux-courier-2.20170204-r2.ebuild 284 BLAKE2B d7f187097fde47caeefc612908fa82ed2bb33358618aaa61895139a2ea45fe3c8657afc8eb358c2f64e6ac3775d835c44c8e25dfbcb842e1dfbc618eb0ba9a08 SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b
-EBUILD selinux-courier-2.20170204-r3.ebuild 284 BLAKE2B d7f187097fde47caeefc612908fa82ed2bb33358618aaa61895139a2ea45fe3c8657afc8eb358c2f64e6ac3775d835c44c8e25dfbcb842e1dfbc618eb0ba9a08 SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b
-EBUILD selinux-courier-2.20170204-r4.ebuild 284 BLAKE2B d7f187097fde47caeefc612908fa82ed2bb33358618aaa61895139a2ea45fe3c8657afc8eb358c2f64e6ac3775d835c44c8e25dfbcb842e1dfbc618eb0ba9a08 SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b
 EBUILD selinux-courier-2.20170805-r2.ebuild 284 BLAKE2B d7f187097fde47caeefc612908fa82ed2bb33358618aaa61895139a2ea45fe3c8657afc8eb358c2f64e6ac3775d835c44c8e25dfbcb842e1dfbc618eb0ba9a08 SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b
 EBUILD selinux-courier-2.20170805-r3.ebuild 284 BLAKE2B d7f187097fde47caeefc612908fa82ed2bb33358618aaa61895139a2ea45fe3c8657afc8eb358c2f64e6ac3775d835c44c8e25dfbcb842e1dfbc618eb0ba9a08 SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b
-EBUILD selinux-courier-2.20170805-r4.ebuild 286 BLAKE2B df865fabf7773af4ee3bba4b3fbd48fadcd77b8289c92ccd96a07f7900c94e542a472a68a7c1cca72332a72305237f681be760af0bbb03cc19ab9852f8d0c0e1 SHA512 8cd5fdd8c204e86fbeb23dea5748cb2653981ffe885ae7a2c5d63b44bf50da71c8b421f1e41113601da5ed705326d3e2d52dd8ce293485706eaeabead02d6c39
 EBUILD selinux-courier-2.20180114-r1.ebuild 284 BLAKE2B b9ccc575a3bd9da475e82d71c87c893bbd4dd0bf36a46e426dc81195673dcf076d8f47718022a913676296985d2663c689cc6c9a422a4c696dc598663b53854a SHA512 fe1f103f31fec89fbeeb9c3865e2fc243db3d7d897070d1718e43a9f97328f4e4152de2694a5a278ddc98a9e1a32275c4adb39c64de90aa49691c2b4dc45d17b
 EBUILD selinux-courier-2.20180114-r2.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
+EBUILD selinux-courier-2.20180114-r3.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
 EBUILD selinux-courier-9999.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
 MISC metadata.xml 317 BLAKE2B 5b253862e05652fdaf7df04a7c858b9f2ec63b2088225ceacbadd26f4b489bcbe4593c74ec73cc6a50d80955a93537019168de09ebc32e18dc80540eca6d6b44 SHA512 90512d732a7e87c960108c4ab698a7d4205d016bc019a7e90a5776eeee024393354bafcdf07774cba6cbf028ba54003897cd732a48591905407cc32c672085e9
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170204-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170204-r1.ebuild
deleted file mode 100644
index f5edf27c3631..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170204-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170204-r2.ebuild
deleted file mode 100644
index bd2859fe885e..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170204-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170204-r3.ebuild
deleted file mode 100644
index bd2859fe885e..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170204-r4.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170204-r4.ebuild
deleted file mode 100644
index bd2859fe885e..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170805-r4.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170805-r4.ebuild
deleted file mode 100644
index f5edf27c3631..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20180114-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..0bffc4d35084
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="courier"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for courier"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index 3a5c2c6735c9..1eb05e05371a 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cpucontrol-2.20170204-r1.ebuild 292 BLAKE2B 73953dd8caf49c2883fc0ea618d5c468f1e6cf05363614b11a655930ee18eacd98bdee1dd5bb15322ca4d533ff672364e1019950be1202ffebcb2db7989fc6ca SHA512 7afc55c524e9723f582da69e727c8a3188b359a4073d603de91029b75bd621d310cd0ded9e8f100010c6b50d762e5f410d2d71dc5e73856479cf31a229a8d70e
-EBUILD selinux-cpucontrol-2.20170204-r2.ebuild 290 BLAKE2B df1c3373d2ac574d09269a4fc5f0eee134284402aaf719204a68fd2f62d5dd7f5acd88c2b2e4b144b6d8c2b3daf97fb1a970f2662c715bb0cc0d79fc7290c189 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370
-EBUILD selinux-cpucontrol-2.20170204-r3.ebuild 290 BLAKE2B df1c3373d2ac574d09269a4fc5f0eee134284402aaf719204a68fd2f62d5dd7f5acd88c2b2e4b144b6d8c2b3daf97fb1a970f2662c715bb0cc0d79fc7290c189 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370
-EBUILD selinux-cpucontrol-2.20170204-r4.ebuild 290 BLAKE2B df1c3373d2ac574d09269a4fc5f0eee134284402aaf719204a68fd2f62d5dd7f5acd88c2b2e4b144b6d8c2b3daf97fb1a970f2662c715bb0cc0d79fc7290c189 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370
 EBUILD selinux-cpucontrol-2.20170805-r2.ebuild 290 BLAKE2B df1c3373d2ac574d09269a4fc5f0eee134284402aaf719204a68fd2f62d5dd7f5acd88c2b2e4b144b6d8c2b3daf97fb1a970f2662c715bb0cc0d79fc7290c189 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370
 EBUILD selinux-cpucontrol-2.20170805-r3.ebuild 290 BLAKE2B df1c3373d2ac574d09269a4fc5f0eee134284402aaf719204a68fd2f62d5dd7f5acd88c2b2e4b144b6d8c2b3daf97fb1a970f2662c715bb0cc0d79fc7290c189 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370
-EBUILD selinux-cpucontrol-2.20170805-r4.ebuild 292 BLAKE2B 73953dd8caf49c2883fc0ea618d5c468f1e6cf05363614b11a655930ee18eacd98bdee1dd5bb15322ca4d533ff672364e1019950be1202ffebcb2db7989fc6ca SHA512 7afc55c524e9723f582da69e727c8a3188b359a4073d603de91029b75bd621d310cd0ded9e8f100010c6b50d762e5f410d2d71dc5e73856479cf31a229a8d70e
 EBUILD selinux-cpucontrol-2.20180114-r1.ebuild 290 BLAKE2B 7c1de236d6884928dbc87d4b6eccc568c4f5f64cf30c094a233fb7e4b207b2ec40eb3624b39fec762f893b82df0ad86f9c5ea652f75921eb3e2bb51fdddabb65 SHA512 40aea489ea270feea19ab52eeb9f83f4838d7a9c06755c675188326ae80a59140fcdc7ad7ddda88c23cfe7a5bdc1e374c51f748c66aaa6ed4475b49bee9404c1
 EBUILD selinux-cpucontrol-2.20180114-r2.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
+EBUILD selinux-cpucontrol-2.20180114-r3.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
 EBUILD selinux-cpucontrol-9999.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
 MISC metadata.xml 320 BLAKE2B f9a459ad3ee2c922f96cb0ab568409dea7f25e2b483977e2dbc143af8c2fa9d75e3110f6e8204025ddd9639715235a47863afb7bd67ab0bc39bba1965975f1fd SHA512 f51c895b670b210dfd339f77a0abdaf240d3a85dfda0de494d3128fe21d9e14e28d4b98cee9af199273ac96c58dc66f2344363b7c7d9fd744291c9027825a86d
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r1.ebuild
deleted file mode 100644
index 3a0cfda0dc6f..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r2.ebuild
deleted file mode 100644
index 313aff5ad2fd..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r3.ebuild
deleted file mode 100644
index 313aff5ad2fd..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r4.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r4.ebuild
deleted file mode 100644
index 313aff5ad2fd..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r4.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r4.ebuild
deleted file mode 100644
index 3a0cfda0dc6f..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180114-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5c59da7db4eb
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cpucontrol"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpucontrol"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 7ff61704cfb0..012cf92d9911 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cpufreqselector-2.20170204-r1.ebuild 302 BLAKE2B 753fe75b315660018c650ef6aaad968b386d3b13e0eab56eb5728e0001ef23a7865a542e9a87c67c85a05449feed2be33e3ffc7aa6af6841e0c71e836f732699 SHA512 b79ae2784c81f7f795e480914f7228c8d1e1eeb03e2f82119c74d3b5f318ebc60a83a5601b37d973c350a3d42a9bff8103b43e921f29d47ccec07eb6d8858ca5
-EBUILD selinux-cpufreqselector-2.20170204-r2.ebuild 300 BLAKE2B 32a070e700ace2133aa6341fcd28c9e579f2c5c4f4460f5aa3a85ad100a699c48196a282708c8d2e207fc0583815b6b755e58d57522f3a56e832ae208808dd93 SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2
-EBUILD selinux-cpufreqselector-2.20170204-r3.ebuild 300 BLAKE2B 32a070e700ace2133aa6341fcd28c9e579f2c5c4f4460f5aa3a85ad100a699c48196a282708c8d2e207fc0583815b6b755e58d57522f3a56e832ae208808dd93 SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2
-EBUILD selinux-cpufreqselector-2.20170204-r4.ebuild 300 BLAKE2B 32a070e700ace2133aa6341fcd28c9e579f2c5c4f4460f5aa3a85ad100a699c48196a282708c8d2e207fc0583815b6b755e58d57522f3a56e832ae208808dd93 SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2
 EBUILD selinux-cpufreqselector-2.20170805-r2.ebuild 300 BLAKE2B 32a070e700ace2133aa6341fcd28c9e579f2c5c4f4460f5aa3a85ad100a699c48196a282708c8d2e207fc0583815b6b755e58d57522f3a56e832ae208808dd93 SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2
 EBUILD selinux-cpufreqselector-2.20170805-r3.ebuild 300 BLAKE2B 32a070e700ace2133aa6341fcd28c9e579f2c5c4f4460f5aa3a85ad100a699c48196a282708c8d2e207fc0583815b6b755e58d57522f3a56e832ae208808dd93 SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2
-EBUILD selinux-cpufreqselector-2.20170805-r4.ebuild 302 BLAKE2B 753fe75b315660018c650ef6aaad968b386d3b13e0eab56eb5728e0001ef23a7865a542e9a87c67c85a05449feed2be33e3ffc7aa6af6841e0c71e836f732699 SHA512 b79ae2784c81f7f795e480914f7228c8d1e1eeb03e2f82119c74d3b5f318ebc60a83a5601b37d973c350a3d42a9bff8103b43e921f29d47ccec07eb6d8858ca5
 EBUILD selinux-cpufreqselector-2.20180114-r1.ebuild 300 BLAKE2B 4d75b44eedea359dcd289c328033e5869a29d209e15ef2fd198785273526f001cac58567a022e3b3406f03c5895cfa9291a7d9cb441a45455ff4badcd9523d78 SHA512 f9642a0ddeadc52f48f8e9398ae53fbce350e38729a65aaaf30e8769a6e4bd9afcfa90af7f2c6b097341058af2284648d09c4eeb47da35ac906a63f93ab19778
 EBUILD selinux-cpufreqselector-2.20180114-r2.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
+EBUILD selinux-cpufreqselector-2.20180114-r3.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
 EBUILD selinux-cpufreqselector-9999.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
 MISC metadata.xml 325 BLAKE2B 6da93f91708af6a99357f791fe3391ed190761d48455473e903ecb366b3dbff15d6d6a6132cb4638e0b61bb77bdcd03f7deabe8c637fa02c4e0cd40cdd9a9e6e SHA512 0aef2f311fb25142a08caca6f25f0b1a903631e4742c79dc79afda113e0cbfc6be2ea807afd10b2f31acd8aec3810864614e685e89b83f664f9e1955d4e8ea3b
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r1.ebuild
deleted file mode 100644
index 31d48df30f19..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r2.ebuild
deleted file mode 100644
index 33095e87ded9..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r3.ebuild
deleted file mode 100644
index 33095e87ded9..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r4.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r4.ebuild
deleted file mode 100644
index 33095e87ded9..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r4.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r4.ebuild
deleted file mode 100644
index 31d48df30f19..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180114-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4644b016b922
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cpufreqselector"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpufreqselector"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index bbdbb3434941..5ba2c4c4b4b6 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cups-2.20170204-r1.ebuild 370 BLAKE2B 2d1ce80e360d234e1433f6c8caa7a46a1c54bd925c168bd368b74dbdd80762c72d59edce44201bb588936a90d39eee565f747c0d762289a767bd0a174a070d0d SHA512 0c096742effbe529a141e668a61b53a5095bf1eb35e1a15b26282993da1a0f42a8519e43a722b2d8124343fd3370de780f60964db71d5b6674777d47bf7fee13
-EBUILD selinux-cups-2.20170204-r2.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a2057fbec156a45f94abb575a26699f53636c3687458bbe86772dd1af80a98dcb16efa7193509ca1b620d27600483d0d79dd8f SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6
-EBUILD selinux-cups-2.20170204-r3.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a2057fbec156a45f94abb575a26699f53636c3687458bbe86772dd1af80a98dcb16efa7193509ca1b620d27600483d0d79dd8f SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6
-EBUILD selinux-cups-2.20170204-r4.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a2057fbec156a45f94abb575a26699f53636c3687458bbe86772dd1af80a98dcb16efa7193509ca1b620d27600483d0d79dd8f SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6
 EBUILD selinux-cups-2.20170805-r2.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a2057fbec156a45f94abb575a26699f53636c3687458bbe86772dd1af80a98dcb16efa7193509ca1b620d27600483d0d79dd8f SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6
 EBUILD selinux-cups-2.20170805-r3.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a2057fbec156a45f94abb575a26699f53636c3687458bbe86772dd1af80a98dcb16efa7193509ca1b620d27600483d0d79dd8f SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6
-EBUILD selinux-cups-2.20170805-r4.ebuild 370 BLAKE2B 2d1ce80e360d234e1433f6c8caa7a46a1c54bd925c168bd368b74dbdd80762c72d59edce44201bb588936a90d39eee565f747c0d762289a767bd0a174a070d0d SHA512 0c096742effbe529a141e668a61b53a5095bf1eb35e1a15b26282993da1a0f42a8519e43a722b2d8124343fd3370de780f60964db71d5b6674777d47bf7fee13
 EBUILD selinux-cups-2.20180114-r1.ebuild 368 BLAKE2B d36074b86f2ee837ccb5a40bfa987bca28a598ebdad7a3e0d13f864f7696fc4bfed4445202d999c69e2f101af355e2d8d1e88c35464d1ec39555fab11f9d33ad SHA512 237851dc3d4b13069c2683bc257ab4b08be9acb301982279e46444a730844537d27d910acf4b3d85283c653e2a592c873594542be748aefcb280af1bfb780ce1
 EBUILD selinux-cups-2.20180114-r2.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
+EBUILD selinux-cups-2.20180114-r3.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
 EBUILD selinux-cups-9999.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
 MISC metadata.xml 314 BLAKE2B bd165fe274c682223b50a6adcfc385fb4d2853c833c82d3bd1e36ede581a1511bf31d8e8ca3068533f2ff154655446c7e486e543b0576df77e3ae374a5c6564d SHA512 3e3d89bc53170e64971ce9e3effcd321f19a95b2ceaaf97a8a3212121848c3bdc88d6f1d2a1211efd04209165c1cd24e54a2cda9bdc841d9dc3470e3aa7e23a7
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170204-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170204-r1.ebuild
deleted file mode 100644
index f7f3da060978..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170204-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170204-r2.ebuild
deleted file mode 100644
index f5d7e97be718..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170204-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170204-r3.ebuild
deleted file mode 100644
index f5d7e97be718..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170204-r4.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170204-r4.ebuild
deleted file mode 100644
index f5d7e97be718..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170805-r4.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170805-r4.ebuild
deleted file mode 100644
index f7f3da060978..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20180114-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..45dc986ba8b0
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cups"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cups"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-lpd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-lpd
+"
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index b49d943c7a24..6940dede48e4 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cvs-2.20170204-r1.ebuild 426 BLAKE2B e4663429433c74a226175dcb485f8b16291bc401f8dc146f4c64141b9d7b069a661533781eaddd59ff1d7868c9a7d09cba27ba2a77724354892c5474ec795ce1 SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde
-EBUILD selinux-cvs-2.20170204-r2.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e6711c9d5daae1a102c7acfa54c879933cf9d4daec590b490c499217772e8c5c44a2255892f001a5508e04ce76d3c5fb48e26a5a SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50
-EBUILD selinux-cvs-2.20170204-r3.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e6711c9d5daae1a102c7acfa54c879933cf9d4daec590b490c499217772e8c5c44a2255892f001a5508e04ce76d3c5fb48e26a5a SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50
-EBUILD selinux-cvs-2.20170204-r4.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e6711c9d5daae1a102c7acfa54c879933cf9d4daec590b490c499217772e8c5c44a2255892f001a5508e04ce76d3c5fb48e26a5a SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50
 EBUILD selinux-cvs-2.20170805-r2.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e6711c9d5daae1a102c7acfa54c879933cf9d4daec590b490c499217772e8c5c44a2255892f001a5508e04ce76d3c5fb48e26a5a SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50
 EBUILD selinux-cvs-2.20170805-r3.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e6711c9d5daae1a102c7acfa54c879933cf9d4daec590b490c499217772e8c5c44a2255892f001a5508e04ce76d3c5fb48e26a5a SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50
-EBUILD selinux-cvs-2.20170805-r4.ebuild 426 BLAKE2B e4663429433c74a226175dcb485f8b16291bc401f8dc146f4c64141b9d7b069a661533781eaddd59ff1d7868c9a7d09cba27ba2a77724354892c5474ec795ce1 SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde
 EBUILD selinux-cvs-2.20180114-r1.ebuild 424 BLAKE2B d124ba5ac3e8c6999b4b4dff2099c76cc5664a5d6dadf2e3f27f7fd1fc3ecbb43d10a7f6d0740a4ae027f6342be1be071c7917c003988759dd8fd1648c5ef8cd SHA512 2c78fcaf45548d965f5d494685ce701b1d8714acf18e3be207bf33f41bfd09fcf3d53c9852b457a8c0c8612d02e197aa6213445cc024637aff53ca0818bfb490
 EBUILD selinux-cvs-2.20180114-r2.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
+EBUILD selinux-cvs-2.20180114-r3.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
 EBUILD selinux-cvs-9999.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
 MISC metadata.xml 313 BLAKE2B 703f78367a1b094227e5c85a203f9cbd6b5126e619cc81d5910ee71d63096221354fa016fd10cf399348ed62b66d526f4be04b5e73496fbcc29a58179b921eca SHA512 6d7001e06d985c2395e10c6272950a5bc76279c60ad5ca17d54fbe12e449c2b6485fc5d3e88775f4ab2a3d9c5ccbc37f412a783a7841ba54901f34a520f8c5b1
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild
deleted file mode 100644
index 5dfc34680758..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild
deleted file mode 100644
index 01387904e784..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild
deleted file mode 100644
index 01387904e784..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild
deleted file mode 100644
index 01387904e784..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r4.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r4.ebuild
deleted file mode 100644
index 5dfc34680758..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20180114-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..582dc0abdc03
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20180114-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cvs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index eaaf8a775a14..f4889369a370 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-cyphesis-2.20170204-r1.ebuild 288 BLAKE2B 4c252e7e729d0742ef53ec82e47c80747428160382ed8c93252261fc1a8aba5c029d125b01300697af352645087016dd191acf294f4fcbbf7eaf10a673e74798 SHA512 39e3f96100867221df4721cbe46d2c3f32cfa9d2b7f311eaadf85804389a21c66dda332d3fe2a16070d7b7c69429d18df0dbcc9af3402cf8c5102b00f1ce03db
-EBUILD selinux-cyphesis-2.20170204-r2.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0169c186e266ac83ef512a9984e48b59905b43d2d99425dd87dd46c21fc0941a087e45c50e1355c69c0c216c40a7dccc7559a17cc2 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353
-EBUILD selinux-cyphesis-2.20170204-r3.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0169c186e266ac83ef512a9984e48b59905b43d2d99425dd87dd46c21fc0941a087e45c50e1355c69c0c216c40a7dccc7559a17cc2 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353
-EBUILD selinux-cyphesis-2.20170204-r4.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0169c186e266ac83ef512a9984e48b59905b43d2d99425dd87dd46c21fc0941a087e45c50e1355c69c0c216c40a7dccc7559a17cc2 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353
 EBUILD selinux-cyphesis-2.20170805-r2.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0169c186e266ac83ef512a9984e48b59905b43d2d99425dd87dd46c21fc0941a087e45c50e1355c69c0c216c40a7dccc7559a17cc2 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353
 EBUILD selinux-cyphesis-2.20170805-r3.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0169c186e266ac83ef512a9984e48b59905b43d2d99425dd87dd46c21fc0941a087e45c50e1355c69c0c216c40a7dccc7559a17cc2 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353
-EBUILD selinux-cyphesis-2.20170805-r4.ebuild 288 BLAKE2B 4c252e7e729d0742ef53ec82e47c80747428160382ed8c93252261fc1a8aba5c029d125b01300697af352645087016dd191acf294f4fcbbf7eaf10a673e74798 SHA512 39e3f96100867221df4721cbe46d2c3f32cfa9d2b7f311eaadf85804389a21c66dda332d3fe2a16070d7b7c69429d18df0dbcc9af3402cf8c5102b00f1ce03db
 EBUILD selinux-cyphesis-2.20180114-r1.ebuild 286 BLAKE2B af68719283763c2a11b4e6e151c1f434255ebf314d36f8738fbfde446940fc5faa433ab8da8347879820d58f96f4ef16510d007126fd1349d64ebebdf0a7b05c SHA512 c5d72501b795a0d642e60206f9813067742b3ddbb2e8b37a36041c2cf7518fd4968181872486fe2ce54520c0e0e91646db3e65e87a2d53a3290c9ed92f5cb2af
 EBUILD selinux-cyphesis-2.20180114-r2.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
+EBUILD selinux-cyphesis-2.20180114-r3.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
 EBUILD selinux-cyphesis-9999.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
 MISC metadata.xml 318 BLAKE2B 2570233d3c042ab5a91b4b9c07c99a280cd7c6c1f69e71219b56310917280a26e16463660c4b1922f81d49857acca546db06033e9dcf40846d0a54aaf61a0af6 SHA512 58e70c654d22bceeb06ee1f89577451cdf23871d63bb17427e18da11d7adb5edf7f20264ca4cc934be2b44e471973addaf717e0254f2814217f5a0a25309be2e
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r1.ebuild
deleted file mode 100644
index 01ba8f935e3e..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r2.ebuild
deleted file mode 100644
index 24ef891db8cc..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r3.ebuild
deleted file mode 100644
index 24ef891db8cc..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r4.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r4.ebuild
deleted file mode 100644
index 24ef891db8cc..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r4.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r4.ebuild
deleted file mode 100644
index 01ba8f935e3e..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180114-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4bbdb67ee7e1
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cyphesis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cyphesis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index f0aaaaabc17b..3b9534c3c20f 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-daemontools-2.20170204-r1.ebuild 294 BLAKE2B e3174a98ad030b64f9b11441e6c64a69880f979b605ccc3f5be9d407383d64ac7baaebb6dcbfe4cd0aa0a5ef17d7a4bf73d6235bd5eebb06ed24cf58008b3b59 SHA512 3753ab23a1031a11bd0f01c8e2f64d6a09ebaaae9dd8e368c21ada26d7bc09aae884d1ea341b37b5f0ee39c6d263774440280809af78f0382a3b5837c921cf81
-EBUILD selinux-daemontools-2.20170204-r2.ebuild 292 BLAKE2B 6147db72ef8666ba81a4834c36a008aff3539273ec8d6d5fbde5d1173edc7e9685b2203f5b40fff7eb6fe4386998af145b32e4ba1be98f61f398ba8ebcab84df SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879
-EBUILD selinux-daemontools-2.20170204-r3.ebuild 292 BLAKE2B 6147db72ef8666ba81a4834c36a008aff3539273ec8d6d5fbde5d1173edc7e9685b2203f5b40fff7eb6fe4386998af145b32e4ba1be98f61f398ba8ebcab84df SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879
-EBUILD selinux-daemontools-2.20170204-r4.ebuild 292 BLAKE2B 6147db72ef8666ba81a4834c36a008aff3539273ec8d6d5fbde5d1173edc7e9685b2203f5b40fff7eb6fe4386998af145b32e4ba1be98f61f398ba8ebcab84df SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879
 EBUILD selinux-daemontools-2.20170805-r2.ebuild 292 BLAKE2B 6147db72ef8666ba81a4834c36a008aff3539273ec8d6d5fbde5d1173edc7e9685b2203f5b40fff7eb6fe4386998af145b32e4ba1be98f61f398ba8ebcab84df SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879
 EBUILD selinux-daemontools-2.20170805-r3.ebuild 292 BLAKE2B 6147db72ef8666ba81a4834c36a008aff3539273ec8d6d5fbde5d1173edc7e9685b2203f5b40fff7eb6fe4386998af145b32e4ba1be98f61f398ba8ebcab84df SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879
-EBUILD selinux-daemontools-2.20170805-r4.ebuild 294 BLAKE2B e3174a98ad030b64f9b11441e6c64a69880f979b605ccc3f5be9d407383d64ac7baaebb6dcbfe4cd0aa0a5ef17d7a4bf73d6235bd5eebb06ed24cf58008b3b59 SHA512 3753ab23a1031a11bd0f01c8e2f64d6a09ebaaae9dd8e368c21ada26d7bc09aae884d1ea341b37b5f0ee39c6d263774440280809af78f0382a3b5837c921cf81
 EBUILD selinux-daemontools-2.20180114-r1.ebuild 292 BLAKE2B 1d73cb370683f64f70ca8fb5c451d52b75f1bd597d00ad638c74a65ce7c92ea1b707f6595008d68d6d852edd6f1c11244ce5fdf41973810545fe5b825633a6bd SHA512 caf019eb1b105af4f41820e88b555fdffc5626e7b24939ecb12d93fb9d79400eff7dc7071a18124f5b5878d8b5d88fa6d3ff9681932a4e091128160610939e3c
 EBUILD selinux-daemontools-2.20180114-r2.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
+EBUILD selinux-daemontools-2.20180114-r3.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
 EBUILD selinux-daemontools-9999.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
 MISC metadata.xml 321 BLAKE2B 6d6514d6443844395a0800a3a2d652d4383f1c21aa10f7d00198fdb028be2c6a171c32d0e9af0f84d6da4d8b99ed3a2ce931b43c2d55c1e4e864721ce3d9c3e2 SHA512 2b805bc57fdb8ce67f8628d2ff8e97923ecd5f3ed6502bab2a97fda612f613c5af1964fe33f0b110757d2f60c795ff1b2b94e89c2f4cc4508d148fbfd20c12e1
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r1.ebuild
deleted file mode 100644
index 550743a1d4d6..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r2.ebuild
deleted file mode 100644
index 1f23f5162145..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r3.ebuild
deleted file mode 100644
index 1f23f5162145..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r4.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r4.ebuild
deleted file mode 100644
index 1f23f5162145..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r4.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r4.ebuild
deleted file mode 100644
index 550743a1d4d6..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20180114-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3927f59ea456
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="daemontools"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for daemontools"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index c8d52197e53d..d6b4f78f3ec6 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dante-2.20170204-r1.ebuild 282 BLAKE2B 17688efba3ed7cf10ffa66cfb1aff94957b7c3797385c4e9d6daf3671cdc774837a27d655f72b73fa2544aaef516a7ef13f64cb4fab5d5909cb549e351bbcdcd SHA512 ee684018536da113a47cb31d5b172bbc951210db50798f158eb83bba85f9214c5e6140de284fb2ed6af4f55874c32034e05c364269f33bdcd922bb417d7d73ea
-EBUILD selinux-dante-2.20170204-r2.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c34b65ce2692acbc4eb22144427709ccb47314263f20aa5298d6491578767ad04c0d85c26aa5a3a50d74b12de2401e75450e212 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271
-EBUILD selinux-dante-2.20170204-r3.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c34b65ce2692acbc4eb22144427709ccb47314263f20aa5298d6491578767ad04c0d85c26aa5a3a50d74b12de2401e75450e212 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271
-EBUILD selinux-dante-2.20170204-r4.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c34b65ce2692acbc4eb22144427709ccb47314263f20aa5298d6491578767ad04c0d85c26aa5a3a50d74b12de2401e75450e212 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271
 EBUILD selinux-dante-2.20170805-r2.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c34b65ce2692acbc4eb22144427709ccb47314263f20aa5298d6491578767ad04c0d85c26aa5a3a50d74b12de2401e75450e212 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271
 EBUILD selinux-dante-2.20170805-r3.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c34b65ce2692acbc4eb22144427709ccb47314263f20aa5298d6491578767ad04c0d85c26aa5a3a50d74b12de2401e75450e212 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271
-EBUILD selinux-dante-2.20170805-r4.ebuild 282 BLAKE2B 17688efba3ed7cf10ffa66cfb1aff94957b7c3797385c4e9d6daf3671cdc774837a27d655f72b73fa2544aaef516a7ef13f64cb4fab5d5909cb549e351bbcdcd SHA512 ee684018536da113a47cb31d5b172bbc951210db50798f158eb83bba85f9214c5e6140de284fb2ed6af4f55874c32034e05c364269f33bdcd922bb417d7d73ea
 EBUILD selinux-dante-2.20180114-r1.ebuild 280 BLAKE2B f56beb65314a6ff8a9a370e0391b8955ebf257a5d07bdec08c6c472ab6b8f63651b8335794ea40870bfea448fff7678493a2b024ff4db6d852727154f6eec209 SHA512 190a680ef8c9552a12ef11772698d747eaa12f17548aa043772f4743e9b1257d50676f43875a8eb67b3eb74f3dfb0b97ee50f061142b8d2d22e6fedcfbc72e27
 EBUILD selinux-dante-2.20180114-r2.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
+EBUILD selinux-dante-2.20180114-r3.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
 EBUILD selinux-dante-9999.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
 MISC metadata.xml 315 BLAKE2B 4a9614e97425dcef15e5f81c7703c071f393a540f4fcd20669e3989ec2f660215121f84b413d88d294a20a4234d208ae6008b2c80cd8857890d2163a100a2916 SHA512 e9a60869542dab4e36aa4a2cdc6bbcbb12a825ba498aefc79d3a3ffbc6b3f22025ec4ab0fce073c983a6a3c4f9d144e2dd9f6019f74e641ec6876c6a3d3ce25b
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170204-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170204-r1.ebuild
deleted file mode 100644
index e2de99289f2e..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170204-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170204-r2.ebuild
deleted file mode 100644
index 3557637d05e8..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170204-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170204-r3.ebuild
deleted file mode 100644
index 3557637d05e8..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170204-r4.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170204-r4.ebuild
deleted file mode 100644
index 3557637d05e8..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170805-r4.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170805-r4.ebuild
deleted file mode 100644
index e2de99289f2e..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20180114-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4e8f92b6d411
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dante"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dante"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index dc4780036c86..918688e86332 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dbadm-2.20170204-r1.ebuild 282 BLAKE2B f2b1fe91b2ad3db0aae4c3742cc0b4fcc2b888513172d35126c320463ddcaba8ab3a8a0e6495a9a9c9ae6a4266baabd890c459ab94bbbbf04d3d4d9e6ad58747 SHA512 338b04a5a7b1748de3b8c7f6c75996bb6328287980a101cdc6831cb2a308cb9e0f4a6781d0b9044cd081bab3f875b6dfe29ec2a21bda2985e5cbe2196c4a2110
-EBUILD selinux-dbadm-2.20170204-r2.ebuild 280 BLAKE2B 719bc2376359d85c6273701a551c667aa53f68578a726a8d6639b7be53fda26bdc1758bd4ba222c8f0a114d3d1b2b2d970a5c2bfdaf2642d89660226937a5f26 SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89
-EBUILD selinux-dbadm-2.20170204-r3.ebuild 280 BLAKE2B 719bc2376359d85c6273701a551c667aa53f68578a726a8d6639b7be53fda26bdc1758bd4ba222c8f0a114d3d1b2b2d970a5c2bfdaf2642d89660226937a5f26 SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89
-EBUILD selinux-dbadm-2.20170204-r4.ebuild 280 BLAKE2B 719bc2376359d85c6273701a551c667aa53f68578a726a8d6639b7be53fda26bdc1758bd4ba222c8f0a114d3d1b2b2d970a5c2bfdaf2642d89660226937a5f26 SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89
 EBUILD selinux-dbadm-2.20170805-r2.ebuild 280 BLAKE2B 719bc2376359d85c6273701a551c667aa53f68578a726a8d6639b7be53fda26bdc1758bd4ba222c8f0a114d3d1b2b2d970a5c2bfdaf2642d89660226937a5f26 SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89
 EBUILD selinux-dbadm-2.20170805-r3.ebuild 280 BLAKE2B 719bc2376359d85c6273701a551c667aa53f68578a726a8d6639b7be53fda26bdc1758bd4ba222c8f0a114d3d1b2b2d970a5c2bfdaf2642d89660226937a5f26 SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89
-EBUILD selinux-dbadm-2.20170805-r4.ebuild 282 BLAKE2B f2b1fe91b2ad3db0aae4c3742cc0b4fcc2b888513172d35126c320463ddcaba8ab3a8a0e6495a9a9c9ae6a4266baabd890c459ab94bbbbf04d3d4d9e6ad58747 SHA512 338b04a5a7b1748de3b8c7f6c75996bb6328287980a101cdc6831cb2a308cb9e0f4a6781d0b9044cd081bab3f875b6dfe29ec2a21bda2985e5cbe2196c4a2110
 EBUILD selinux-dbadm-2.20180114-r1.ebuild 280 BLAKE2B 381d99cae9c278ff55999c757fd14b0bee14c456dfe05798d5dfe1d456459ec586757278f982642f468b02a328b46d731eda468bb919d1cd77792572a4c248f1 SHA512 4683f934bcd58636290b2d6dced456cfe5c5cdd6629585454f1ea741deacc27fcecab8b88cf25a56db40ce47fd52da3722ba9b2d1975b1e09e2ef7e02a8262bc
 EBUILD selinux-dbadm-2.20180114-r2.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
+EBUILD selinux-dbadm-2.20180114-r3.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
 EBUILD selinux-dbadm-9999.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
 MISC metadata.xml 315 BLAKE2B 110047b31921d4401c5cd28fede2d4ea7478c78491d2f2ddd2736400d233813230fac16c929172a71af8bafaaed42bd2b5dcf8b52e698ee0441aceb3b158379a SHA512 c87f64c70f1f825f314d5febb85d0172d528a8e643472d4c47f3b9e0fc28e89fdb62e0f5bd77813bd2239e13b22310d152e34768d69a99f4240d1c2aa43e5bd0
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r1.ebuild
deleted file mode 100644
index 6fa3539250e5..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r2.ebuild
deleted file mode 100644
index ecf1d5968039..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r3.ebuild
deleted file mode 100644
index ecf1d5968039..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r4.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r4.ebuild
deleted file mode 100644
index ecf1d5968039..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r4.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r4.ebuild
deleted file mode 100644
index 6fa3539250e5..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20180114-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..862759a2ffb5
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbadm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbadm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index 12e5679a9e0d..06436eee1f2e 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dbskk-2.20170204-r1.ebuild 376 BLAKE2B e6f13e427f7a107b5215d2f2b1295cac3be2b096f85aa44af5ae323b4c896e441ec485e5e8d1ea232e779a9bc88ced0c608c0c135853dde54b23e8fcab323f4a SHA512 13e1d2877bf9ccb9b8d3d23927d7e66062124ed515c2d7d65a94719af5124468d8725705df957108afae243b4c0a479e928f805651fa4123b6680d0a103399dc
-EBUILD selinux-dbskk-2.20170204-r2.ebuild 374 BLAKE2B c4ab5a501d0741602b8486623458eec6b7c5c7c60fe63dd9bd4282ec8e25221d7b78d0db7530f828a7dc35905d54118965b8491390c691ca7eb70abdcde9cbf1 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724
-EBUILD selinux-dbskk-2.20170204-r3.ebuild 374 BLAKE2B c4ab5a501d0741602b8486623458eec6b7c5c7c60fe63dd9bd4282ec8e25221d7b78d0db7530f828a7dc35905d54118965b8491390c691ca7eb70abdcde9cbf1 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724
-EBUILD selinux-dbskk-2.20170204-r4.ebuild 374 BLAKE2B c4ab5a501d0741602b8486623458eec6b7c5c7c60fe63dd9bd4282ec8e25221d7b78d0db7530f828a7dc35905d54118965b8491390c691ca7eb70abdcde9cbf1 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724
 EBUILD selinux-dbskk-2.20170805-r2.ebuild 374 BLAKE2B c4ab5a501d0741602b8486623458eec6b7c5c7c60fe63dd9bd4282ec8e25221d7b78d0db7530f828a7dc35905d54118965b8491390c691ca7eb70abdcde9cbf1 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724
 EBUILD selinux-dbskk-2.20170805-r3.ebuild 374 BLAKE2B c4ab5a501d0741602b8486623458eec6b7c5c7c60fe63dd9bd4282ec8e25221d7b78d0db7530f828a7dc35905d54118965b8491390c691ca7eb70abdcde9cbf1 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724
-EBUILD selinux-dbskk-2.20170805-r4.ebuild 376 BLAKE2B e6f13e427f7a107b5215d2f2b1295cac3be2b096f85aa44af5ae323b4c896e441ec485e5e8d1ea232e779a9bc88ced0c608c0c135853dde54b23e8fcab323f4a SHA512 13e1d2877bf9ccb9b8d3d23927d7e66062124ed515c2d7d65a94719af5124468d8725705df957108afae243b4c0a479e928f805651fa4123b6680d0a103399dc
 EBUILD selinux-dbskk-2.20180114-r1.ebuild 374 BLAKE2B 3199a4ec06202b1d8d6c616ce410c06d1949ca70f9654925043e96dce9b8b1c01bd7dd2813f0caf2e26f9d7310064d2c8bbd4c8a3c2e7deb27190577b553d5ef SHA512 1282386135ffddcc08dd3c05ac80d841ce03115841084684d0322d5cf4280d1e86521055ecdd5c56704f128852cf5615912b19dbbf30004d7dddcd5076ddf724
 EBUILD selinux-dbskk-2.20180114-r2.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
+EBUILD selinux-dbskk-2.20180114-r3.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
 EBUILD selinux-dbskk-9999.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
 MISC metadata.xml 315 BLAKE2B 6c0f1abd410df11d4316dcb65dc8ca479cddc8c968c1572260cd0903f4e71d02676856a2f7c0fc86143ea1c3589ca46da943e1f0b542729e3819472608adf7a7 SHA512 6343c4ff0f737a41d7651884b4193cb14fa546125723e032c1f9e277a006fc321102a081b8017388c3d7001bebbec12ad4b83c0b2e347e8abdb01ef41a4d5945
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r1.ebuild
deleted file mode 100644
index 6c92882d3140..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r2.ebuild
deleted file mode 100644
index c08daf48574f..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r3.ebuild
deleted file mode 100644
index c08daf48574f..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r4.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r4.ebuild
deleted file mode 100644
index c08daf48574f..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r4.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r4.ebuild
deleted file mode 100644
index 6c92882d3140..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20180114-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..98edbc85d0ba
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbskk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbskk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 8353d91a7562..814972c01299 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dbus-2.20170204-r1.ebuild 280 BLAKE2B b03191f868c7c7ad8ea8683f4d40b46b52982459b9b616e0273c649b305ba742a35160e48a6c72f0c91753a539b2d6b39b43c417cc1f58a912f74bac302b1a05 SHA512 931f64ffd9ebdb05344c2d7494862bdd5f943f298caf7d2fac9d6579bf8781206f22bd7eda4a0dc1aa9ed1a199af0f8020fbcc68964876b6aaf742dfea2e550c
-EBUILD selinux-dbus-2.20170204-r2.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f20e7b212fe9a6743c59b200ac51b155982310903efdaa9d64706b2d9840122487eedd0680c5994bac2045856e3f8a6e4066b7 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9
-EBUILD selinux-dbus-2.20170204-r3.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f20e7b212fe9a6743c59b200ac51b155982310903efdaa9d64706b2d9840122487eedd0680c5994bac2045856e3f8a6e4066b7 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9
-EBUILD selinux-dbus-2.20170204-r4.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f20e7b212fe9a6743c59b200ac51b155982310903efdaa9d64706b2d9840122487eedd0680c5994bac2045856e3f8a6e4066b7 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9
 EBUILD selinux-dbus-2.20170805-r2.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f20e7b212fe9a6743c59b200ac51b155982310903efdaa9d64706b2d9840122487eedd0680c5994bac2045856e3f8a6e4066b7 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9
 EBUILD selinux-dbus-2.20170805-r3.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f20e7b212fe9a6743c59b200ac51b155982310903efdaa9d64706b2d9840122487eedd0680c5994bac2045856e3f8a6e4066b7 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9
-EBUILD selinux-dbus-2.20170805-r4.ebuild 280 BLAKE2B b03191f868c7c7ad8ea8683f4d40b46b52982459b9b616e0273c649b305ba742a35160e48a6c72f0c91753a539b2d6b39b43c417cc1f58a912f74bac302b1a05 SHA512 931f64ffd9ebdb05344c2d7494862bdd5f943f298caf7d2fac9d6579bf8781206f22bd7eda4a0dc1aa9ed1a199af0f8020fbcc68964876b6aaf742dfea2e550c
 EBUILD selinux-dbus-2.20180114-r1.ebuild 278 BLAKE2B 2569c69b88347fa2d03f2ba989334985092ef2e0cc0bb5bea747dccd6ca090d3d0666cad6fe026a3886da346f356f0b651e185c0a1b01ca63d0548b24a9a4762 SHA512 5ca9cc85796d7f5a619cb6ca85c041d023dd5772d3fbf57bb2d941e916279ff922335e3cc6621d92d618ec24fa9e7368ba7ec1b74542328210f92eec2c6fea0e
 EBUILD selinux-dbus-2.20180114-r2.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
+EBUILD selinux-dbus-2.20180114-r3.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
 EBUILD selinux-dbus-9999.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
 MISC metadata.xml 314 BLAKE2B 4fcd6165b52aa91bc2922a04f61cb4822869918c12752f97fcb9fd5b8d05e8f2136355e9f77d9642c2daf5c7bad71210a93433819405ee7915b11ce18fc90033 SHA512 a92e00860f8191520785ee5e38c2f824330b7d7f625813e3be52cbf1a46262b32e6a110663a8842423dc6f1d27ceffac15142847a8d8da6e6e249d8c69328a92
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r1.ebuild
deleted file mode 100644
index 16443054382f..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r2.ebuild
deleted file mode 100644
index f96c24e0ab6b..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r3.ebuild
deleted file mode 100644
index f96c24e0ab6b..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r4.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r4.ebuild
deleted file mode 100644
index f96c24e0ab6b..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r4.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r4.ebuild
deleted file mode 100644
index 16443054382f..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20180114-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c24f8df7469e
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbus"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index 11a0cbad8312..ebfec6026cba 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dcc-2.20170204-r1.ebuild 278 BLAKE2B ce0d29e45095f58a72c57207b71a8ba62cb4308074e3fb57a280062426a24038f8fccb90701257ab4a7faa146cea847a3ae08f2845dc85d3671c1e72eb39fe2e SHA512 61e037454bf3f2ede1912f7e94f825c06934eff668b517ef5e4b58e18e62caa3fa79b50122a27d46f501499d0540c98b81259ac1d8a01645345e56e999ebf362
-EBUILD selinux-dcc-2.20170204-r2.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e146008ba75cd81116b76e9d1ff789da5358b51305701918dfcbb9331e7c17fabdad3170ee68c2b3b74139492af70459a1df7de28 SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f
-EBUILD selinux-dcc-2.20170204-r3.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e146008ba75cd81116b76e9d1ff789da5358b51305701918dfcbb9331e7c17fabdad3170ee68c2b3b74139492af70459a1df7de28 SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f
-EBUILD selinux-dcc-2.20170204-r4.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e146008ba75cd81116b76e9d1ff789da5358b51305701918dfcbb9331e7c17fabdad3170ee68c2b3b74139492af70459a1df7de28 SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f
 EBUILD selinux-dcc-2.20170805-r2.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e146008ba75cd81116b76e9d1ff789da5358b51305701918dfcbb9331e7c17fabdad3170ee68c2b3b74139492af70459a1df7de28 SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f
 EBUILD selinux-dcc-2.20170805-r3.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e146008ba75cd81116b76e9d1ff789da5358b51305701918dfcbb9331e7c17fabdad3170ee68c2b3b74139492af70459a1df7de28 SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f
-EBUILD selinux-dcc-2.20170805-r4.ebuild 278 BLAKE2B ce0d29e45095f58a72c57207b71a8ba62cb4308074e3fb57a280062426a24038f8fccb90701257ab4a7faa146cea847a3ae08f2845dc85d3671c1e72eb39fe2e SHA512 61e037454bf3f2ede1912f7e94f825c06934eff668b517ef5e4b58e18e62caa3fa79b50122a27d46f501499d0540c98b81259ac1d8a01645345e56e999ebf362
 EBUILD selinux-dcc-2.20180114-r1.ebuild 276 BLAKE2B 4eb4cbb74f8dcf11954085be4dc817c31de4c3c2a0edf5d93ed625c5bf2d374f5524a1dcee5a26f0aadc9f811ca002b7663bec3e8786e47449416c747ef1dbcb SHA512 77efe74b398e3082a6a734d74bbf9bbb852826d44c3f17c276e4d992507f533f525c8b90c033256ff8ea99f1e06dee015bd3c4007e6811a5e849e0a632ed8944
 EBUILD selinux-dcc-2.20180114-r2.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
+EBUILD selinux-dcc-2.20180114-r3.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
 EBUILD selinux-dcc-9999.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
 MISC metadata.xml 313 BLAKE2B 72b1c9d78d51969f6d03fc534af7b9e32c422df26519a8e208f56b6e0c7a98da72cfd5da986bbb19c600562dd343f25357cf365ec3e4be206d7036b1d813b6c8 SHA512 ef501f3bda02fad46ab6b41261dbab964ddfc5afe9db0717e95e417dc9836858c6b6bec1942ae37e9f8cb9c2c7661acf032e15488aab5442dd072d41ec7e156f
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r1.ebuild
deleted file mode 100644
index 7d7eb206a34a..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r2.ebuild
deleted file mode 100644
index 9878e953a6df..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r3.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r3.ebuild
deleted file mode 100644
index 9878e953a6df..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r4.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r4.ebuild
deleted file mode 100644
index 9878e953a6df..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r4.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r4.ebuild
deleted file mode 100644
index 7d7eb206a34a..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20180114-r3.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e6cabc4e2e37
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dcc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index b7d4335c4139..29a991ac4ab9 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ddclient-2.20170204-r1.ebuild 288 BLAKE2B 4d386ea3afd75bed1a417f5a7096e7e63442682f473c1dbc5a21227ebaf7484fefaf9605f198b1a4a7e81dec3f2281677e198286e6bdc4162f7158d2d8ba6e28 SHA512 8aa32b9852c6784c6ecdb9a60dd9e1c702b5ae63a72ad5c28de479c75de546fa04f04f4a40396aaeb991426eb94183c76911435ae7810374b2ec97ec7777a725
-EBUILD selinux-ddclient-2.20170204-r2.ebuild 286 BLAKE2B 3ab331fbbcaa003749f09803521dc4c6e31d0566a8da442c79dd55b242787e036a7e5377bdc8c7423b037b52be8ddaab4adaed6435b70250e4c1d05d1706e9da SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17
-EBUILD selinux-ddclient-2.20170204-r3.ebuild 286 BLAKE2B 3ab331fbbcaa003749f09803521dc4c6e31d0566a8da442c79dd55b242787e036a7e5377bdc8c7423b037b52be8ddaab4adaed6435b70250e4c1d05d1706e9da SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17
-EBUILD selinux-ddclient-2.20170204-r4.ebuild 286 BLAKE2B 3ab331fbbcaa003749f09803521dc4c6e31d0566a8da442c79dd55b242787e036a7e5377bdc8c7423b037b52be8ddaab4adaed6435b70250e4c1d05d1706e9da SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17
 EBUILD selinux-ddclient-2.20170805-r2.ebuild 286 BLAKE2B 3ab331fbbcaa003749f09803521dc4c6e31d0566a8da442c79dd55b242787e036a7e5377bdc8c7423b037b52be8ddaab4adaed6435b70250e4c1d05d1706e9da SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17
 EBUILD selinux-ddclient-2.20170805-r3.ebuild 286 BLAKE2B 3ab331fbbcaa003749f09803521dc4c6e31d0566a8da442c79dd55b242787e036a7e5377bdc8c7423b037b52be8ddaab4adaed6435b70250e4c1d05d1706e9da SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17
-EBUILD selinux-ddclient-2.20170805-r4.ebuild 288 BLAKE2B 4d386ea3afd75bed1a417f5a7096e7e63442682f473c1dbc5a21227ebaf7484fefaf9605f198b1a4a7e81dec3f2281677e198286e6bdc4162f7158d2d8ba6e28 SHA512 8aa32b9852c6784c6ecdb9a60dd9e1c702b5ae63a72ad5c28de479c75de546fa04f04f4a40396aaeb991426eb94183c76911435ae7810374b2ec97ec7777a725
 EBUILD selinux-ddclient-2.20180114-r1.ebuild 286 BLAKE2B 338d213dc780376cf5e2aaa61540e84607e943779b2b80c97cc894a5eefc2238b1b317de0088e0215837ee5713d42e157c9209574b951ba849d3eb3e18364586 SHA512 98ddb9d72131d24e1ed8bf9ff8921e2642fb31733bdbdf4ef1b58ed20be335eee78878b07639bb4413f5540829d4f70fde80729dbb8a708c9b4bc4ca5be8b2ab
 EBUILD selinux-ddclient-2.20180114-r2.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
+EBUILD selinux-ddclient-2.20180114-r3.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
 EBUILD selinux-ddclient-9999.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
 MISC metadata.xml 318 BLAKE2B 26ca491ead35c7aa0e490849739e7eb814815cdac8d86980667b69cdb9751a640fe4b3fc50a74c5a1ba897b68b6a9ce57e745bec1f24a0bd7d679597152db4a4 SHA512 e02add998ae60515272a524c40bc4fc3f31d2ea91f1690badb7c8fee19a99f0b84d4909f04c4e0f65af614a295e1177ddad05479dfd5b9f3ab620cc536b7dc40
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r1.ebuild
deleted file mode 100644
index ddf11df4075d..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r2.ebuild
deleted file mode 100644
index c331ba78ff2c..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r3.ebuild
deleted file mode 100644
index c331ba78ff2c..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r4.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r4.ebuild
deleted file mode 100644
index c331ba78ff2c..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r4.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r4.ebuild
deleted file mode 100644
index ddf11df4075d..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20180114-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a4a614ec0441
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ddclient"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddclient"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 6e887a13abe2..b58a1abece24 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ddcprobe-2.20170204-r1.ebuild 288 BLAKE2B f97747f27b1b8eefeecee6f6cda449ceb91f3402f7745c88d13296350179be5082025fad421778778140bbe5facdf7dddf7ff8dcef9fbf3cd0a4906dd9d2a9e7 SHA512 6fcbca94028ecee22f9f25526e19f4cd468f79773273432689864d723886a6b5f4ada57bea9da738eb6dc6c1d95bac63a2a416a39c1bcfe509ad979a4ca76b41
-EBUILD selinux-ddcprobe-2.20170204-r2.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f34831a91c312684edfad5433e46ca6a4f0a56e93642004d0548002a58d59abc8d752a0fdc61b5d8b98b79caa007a23116f55c3ed8492e SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45
-EBUILD selinux-ddcprobe-2.20170204-r3.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f34831a91c312684edfad5433e46ca6a4f0a56e93642004d0548002a58d59abc8d752a0fdc61b5d8b98b79caa007a23116f55c3ed8492e SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45
-EBUILD selinux-ddcprobe-2.20170204-r4.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f34831a91c312684edfad5433e46ca6a4f0a56e93642004d0548002a58d59abc8d752a0fdc61b5d8b98b79caa007a23116f55c3ed8492e SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45
 EBUILD selinux-ddcprobe-2.20170805-r2.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f34831a91c312684edfad5433e46ca6a4f0a56e93642004d0548002a58d59abc8d752a0fdc61b5d8b98b79caa007a23116f55c3ed8492e SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45
 EBUILD selinux-ddcprobe-2.20170805-r3.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f34831a91c312684edfad5433e46ca6a4f0a56e93642004d0548002a58d59abc8d752a0fdc61b5d8b98b79caa007a23116f55c3ed8492e SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45
-EBUILD selinux-ddcprobe-2.20170805-r4.ebuild 288 BLAKE2B f97747f27b1b8eefeecee6f6cda449ceb91f3402f7745c88d13296350179be5082025fad421778778140bbe5facdf7dddf7ff8dcef9fbf3cd0a4906dd9d2a9e7 SHA512 6fcbca94028ecee22f9f25526e19f4cd468f79773273432689864d723886a6b5f4ada57bea9da738eb6dc6c1d95bac63a2a416a39c1bcfe509ad979a4ca76b41
 EBUILD selinux-ddcprobe-2.20180114-r1.ebuild 286 BLAKE2B bbfab612c0c6368f8aadea60b74a4cf84ea696318a9628b951773efe7ee6c232ae73d317d7d9552b97e106b2d1d7b287e28dddbad8ae905b3b573d6ca8138916 SHA512 65aa9c28d83fcd58e54921821a3377a760ee3ed9b9ce5e32a1a928f9b243c944736906758a1a4c8d585c52f6e72c4814976ea089abac5f6d98cf3eb575bf4b92
 EBUILD selinux-ddcprobe-2.20180114-r2.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
+EBUILD selinux-ddcprobe-2.20180114-r3.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
 EBUILD selinux-ddcprobe-9999.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
 MISC metadata.xml 318 BLAKE2B 8ea59d3e7d74b92ef2e32b967e9606e80fe4ff72bebea772eb272e578c70d9e4562aa31c0efef3288dd584aaca119ad379180256f1f4003d0012e5da3a69af76 SHA512 70b987e8cfc216fc7f312aee7a1b4dea757f886dac76ebfcd6dd367b2454d02ff6dee1b11c16324cf3c5c005fdf6d74a209503d82c74b1472275ac059d99498d
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r1.ebuild
deleted file mode 100644
index 570d37c13b71..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r2.ebuild
deleted file mode 100644
index 429e77fdd693..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r3.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r3.ebuild
deleted file mode 100644
index 429e77fdd693..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r4.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r4.ebuild
deleted file mode 100644
index 429e77fdd693..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r4.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r4.ebuild
deleted file mode 100644
index 570d37c13b71..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180114-r3.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..7610bd34daae
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ddcprobe"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddcprobe"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index fe696071b4d1..f90d917f8573 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-denyhosts-2.20170204-r1.ebuild 290 BLAKE2B 574757e3b1f4907e832c8a6ad0fda2799c57a0672cc9673a1baf2884eed99f1f81c3c2876b84a688aa6422ef9f000e9d63dc5c5c508941388b26b616678210fc SHA512 d6461fe5594de0a81bb7ff107a28b98b1e44143d127210b61102a6648c30cbf5ff3fa395b0b7aa97c15956c3dc852f85e6b01613effc1e85bd08535e8e446b48
-EBUILD selinux-denyhosts-2.20170204-r2.ebuild 288 BLAKE2B 1b0a6e27b69fb10675666963d101afe32190401be6e5a71c2f69316ed419d696106123e6dc080dcaec273293008d0f19415393856a7bb3d58ab792b0bcd9fd6a SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed
-EBUILD selinux-denyhosts-2.20170204-r3.ebuild 288 BLAKE2B 1b0a6e27b69fb10675666963d101afe32190401be6e5a71c2f69316ed419d696106123e6dc080dcaec273293008d0f19415393856a7bb3d58ab792b0bcd9fd6a SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed
-EBUILD selinux-denyhosts-2.20170204-r4.ebuild 288 BLAKE2B 1b0a6e27b69fb10675666963d101afe32190401be6e5a71c2f69316ed419d696106123e6dc080dcaec273293008d0f19415393856a7bb3d58ab792b0bcd9fd6a SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed
 EBUILD selinux-denyhosts-2.20170805-r2.ebuild 288 BLAKE2B 1b0a6e27b69fb10675666963d101afe32190401be6e5a71c2f69316ed419d696106123e6dc080dcaec273293008d0f19415393856a7bb3d58ab792b0bcd9fd6a SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed
 EBUILD selinux-denyhosts-2.20170805-r3.ebuild 288 BLAKE2B 1b0a6e27b69fb10675666963d101afe32190401be6e5a71c2f69316ed419d696106123e6dc080dcaec273293008d0f19415393856a7bb3d58ab792b0bcd9fd6a SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed
-EBUILD selinux-denyhosts-2.20170805-r4.ebuild 290 BLAKE2B 574757e3b1f4907e832c8a6ad0fda2799c57a0672cc9673a1baf2884eed99f1f81c3c2876b84a688aa6422ef9f000e9d63dc5c5c508941388b26b616678210fc SHA512 d6461fe5594de0a81bb7ff107a28b98b1e44143d127210b61102a6648c30cbf5ff3fa395b0b7aa97c15956c3dc852f85e6b01613effc1e85bd08535e8e446b48
 EBUILD selinux-denyhosts-2.20180114-r1.ebuild 288 BLAKE2B 1094017dd669f3ee74866ddd795cdda48cd23f09c8f7880c84926e9247428a5110330187e3987fe421f5300e5ae108d913d917b2357fc1f54a8ae23af6859fa0 SHA512 dfef3cb1c9e2caef526015f63c4cc3f20deda28b89afd87de2bcd28a41ea2f38ac5291a3a22e42f747c25776fa78c0ecb02719b9b2a24447281a7479a2999030
 EBUILD selinux-denyhosts-2.20180114-r2.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
+EBUILD selinux-denyhosts-2.20180114-r3.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
 EBUILD selinux-denyhosts-9999.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
 MISC metadata.xml 319 BLAKE2B 43810ff5ba18ac57ea1aeee013566f684ecc5e747cad3b555b4a35991118c03b1022a08684266ee115aa9b5df3f038d24d42f2e23542b1b4446a2549d5b1a904 SHA512 b1f81195c4854d94076bf7a5117c4191ba41a58acc7a8922c0a8aecf5ea7ebed3e870c1dfaee33b4be5906a7c420ca6362c4e782304309b74ca769b56054dc80
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r1.ebuild
deleted file mode 100644
index bfa1effa9131..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r2.ebuild
deleted file mode 100644
index dd82b4469eb7..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r3.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r3.ebuild
deleted file mode 100644
index dd82b4469eb7..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r4.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r4.ebuild
deleted file mode 100644
index dd82b4469eb7..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r4.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r4.ebuild
deleted file mode 100644
index bfa1effa9131..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180114-r3.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..877366a77e16
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="denyhosts"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index c3f0c92f0419..6e26cd941091 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-devicekit-2.20170204-r1.ebuild 383 BLAKE2B 5199757ced2ed584321e575dae80012cb4d0ec29709655eececa18f2c77a0d57bd1696b73803c69d79f130c759204ff8ae4d2637e66c1e9ae6b6195ddbb4f428 SHA512 3b73da7e828fd7fb63a2c410a45f7ed52af1a8fab3479bcaf95fdd9d6a33dcc7e7b314daca172f62952f0b7d2d77b0e25f73576334b5b0e99bb5a2b5572ef975
-EBUILD selinux-devicekit-2.20170204-r2.ebuild 381 BLAKE2B d55473d87c2d1d91865f2317e940d710a21673baf7f6d1c6e3c63c1dd5f5183836ae1f92b5fa903c638e1201403c38977de5490a15b4731deaa410add4134423 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281
-EBUILD selinux-devicekit-2.20170204-r3.ebuild 381 BLAKE2B d55473d87c2d1d91865f2317e940d710a21673baf7f6d1c6e3c63c1dd5f5183836ae1f92b5fa903c638e1201403c38977de5490a15b4731deaa410add4134423 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281
-EBUILD selinux-devicekit-2.20170204-r4.ebuild 381 BLAKE2B d55473d87c2d1d91865f2317e940d710a21673baf7f6d1c6e3c63c1dd5f5183836ae1f92b5fa903c638e1201403c38977de5490a15b4731deaa410add4134423 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281
 EBUILD selinux-devicekit-2.20170805-r2.ebuild 381 BLAKE2B d55473d87c2d1d91865f2317e940d710a21673baf7f6d1c6e3c63c1dd5f5183836ae1f92b5fa903c638e1201403c38977de5490a15b4731deaa410add4134423 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281
 EBUILD selinux-devicekit-2.20170805-r3.ebuild 381 BLAKE2B d55473d87c2d1d91865f2317e940d710a21673baf7f6d1c6e3c63c1dd5f5183836ae1f92b5fa903c638e1201403c38977de5490a15b4731deaa410add4134423 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281
-EBUILD selinux-devicekit-2.20170805-r4.ebuild 383 BLAKE2B 5199757ced2ed584321e575dae80012cb4d0ec29709655eececa18f2c77a0d57bd1696b73803c69d79f130c759204ff8ae4d2637e66c1e9ae6b6195ddbb4f428 SHA512 3b73da7e828fd7fb63a2c410a45f7ed52af1a8fab3479bcaf95fdd9d6a33dcc7e7b314daca172f62952f0b7d2d77b0e25f73576334b5b0e99bb5a2b5572ef975
 EBUILD selinux-devicekit-2.20180114-r1.ebuild 381 BLAKE2B 7dd3552901f3837fb5f6e240026381fb20dee57bcf7a8689363e098f6e274d8cd845ce7a0ba3533840c5f526ae496b32d82fa578c6deb3e54e9a665a2f2eda6b SHA512 2a6942fc46e05cebec4222d2d23e959a455365ab055fd9f8389baf6a56be2ddd918d7c2dac822b1af1b92fb45380a2001f65a76dcdea4787666a0f661b5cdeda
 EBUILD selinux-devicekit-2.20180114-r2.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
+EBUILD selinux-devicekit-2.20180114-r3.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
 EBUILD selinux-devicekit-9999.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
 MISC metadata.xml 319 BLAKE2B 19df3379053729b3be3174b80bd4df6ab786b63d2314672280e8d05804291099de6305de7a3d48b4f36fb3160f56b7196738387489e23acdaf155bfd4d97dcdc SHA512 050e2d0054e24c19050680c508a5e92d1d452a36ea729cc92fd503a66ea58b0a8a67c002684c8a7ea7a93c0562b518ec5f51df62007f0d1643a335cab86a9275
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r1.ebuild
deleted file mode 100644
index 7fe49468301f..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r2.ebuild
deleted file mode 100644
index d125b8879229..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r3.ebuild
deleted file mode 100644
index d125b8879229..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r4.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r4.ebuild
deleted file mode 100644
index d125b8879229..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r4.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r4.ebuild
deleted file mode 100644
index 7fe49468301f..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20180114-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8635987d27c4
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="devicekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for devicekit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 8215bfa5bdbf..cf304954a402 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dhcp-2.20170204-r1.ebuild 280 BLAKE2B 8c63bb06ed3c16626171d33e7c365afaedfe958619b58cbfc68043964ec95f829f1dd61508529d8f1e5e1f7405d7d92fbaa8cf287031e4b5ca14265b62e22d4e SHA512 58cd17a389f588c818941d1f1962b5876a5939e872c2eef89e0318e8c9a26d604de65c1a3ad311bb5ff7127edde70a1e1ff86357bd3f9f1adb8f0128a47344ed
-EBUILD selinux-dhcp-2.20170204-r2.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05e03db3f008c849cdac5f9c5d9424391aa2ef95cef22358356aa0aee125020d8d59d9e3e438ba8d76ee9a2912decdd5898490a SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2
-EBUILD selinux-dhcp-2.20170204-r3.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05e03db3f008c849cdac5f9c5d9424391aa2ef95cef22358356aa0aee125020d8d59d9e3e438ba8d76ee9a2912decdd5898490a SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2
-EBUILD selinux-dhcp-2.20170204-r4.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05e03db3f008c849cdac5f9c5d9424391aa2ef95cef22358356aa0aee125020d8d59d9e3e438ba8d76ee9a2912decdd5898490a SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2
 EBUILD selinux-dhcp-2.20170805-r2.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05e03db3f008c849cdac5f9c5d9424391aa2ef95cef22358356aa0aee125020d8d59d9e3e438ba8d76ee9a2912decdd5898490a SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2
 EBUILD selinux-dhcp-2.20170805-r3.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05e03db3f008c849cdac5f9c5d9424391aa2ef95cef22358356aa0aee125020d8d59d9e3e438ba8d76ee9a2912decdd5898490a SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2
-EBUILD selinux-dhcp-2.20170805-r4.ebuild 280 BLAKE2B 8c63bb06ed3c16626171d33e7c365afaedfe958619b58cbfc68043964ec95f829f1dd61508529d8f1e5e1f7405d7d92fbaa8cf287031e4b5ca14265b62e22d4e SHA512 58cd17a389f588c818941d1f1962b5876a5939e872c2eef89e0318e8c9a26d604de65c1a3ad311bb5ff7127edde70a1e1ff86357bd3f9f1adb8f0128a47344ed
 EBUILD selinux-dhcp-2.20180114-r1.ebuild 278 BLAKE2B 9f0eda59a11601f44c28594214e410841902567f0bdc76a162b3acfaf1556178eaee4001cd2c75ba8eca431e52991b5240886cc962b42fc028b07bc064d9c24b SHA512 b81c962fd2d9c09e41da581ca69f919735466e7f8c00cf17ebb058a09bd2ebc0717f817641bb56cb08f3127aa062d4e05a9a232dae9fa48019a340b3892cd101
 EBUILD selinux-dhcp-2.20180114-r2.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
+EBUILD selinux-dhcp-2.20180114-r3.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
 EBUILD selinux-dhcp-9999.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
 MISC metadata.xml 314 BLAKE2B 7c9ade7ecfc9dff591107acbc0173d499c623147232bbd1d813d54e8d416fad826015c68c0796deba6bcf57f14af972c9c25af14d85d639a37f4abf50d4dacfc SHA512 40ea84ff6d5136b2da274d6a300e6c3daa1fdcbc7df92538895e071c37c2cbb6520949c4cf42ff9056dff84ff773e042748e6b8fc07d9253cb8ef5542001931b
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r1.ebuild
deleted file mode 100644
index 520dbcd29dc2..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r2.ebuild
deleted file mode 100644
index fd486e8a3107..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r3.ebuild
deleted file mode 100644
index fd486e8a3107..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r4.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r4.ebuild
deleted file mode 100644
index fd486e8a3107..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r4.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r4.ebuild
deleted file mode 100644
index 520dbcd29dc2..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20180114-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..75aea97a567e
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dhcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 171e0a0a9b58..9193bfc8f2b9 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dictd-2.20170204-r1.ebuild 282 BLAKE2B 65546c4a04b853d43f2c734ddc26307136e590d8dced4735052eff442b176420de4f504b78cd44dab7d6c36a2489c82334fe86bfa4f2376c5cfe4b393468d158 SHA512 a5af417f0329bc8939f6e20b53dafcf09bd16abf8729ee352540471c087abf49f638306a1e0f5a24536cefe3567b101570d0fbd2671c9287b0cb91d0da4e41c2
-EBUILD selinux-dictd-2.20170204-r2.ebuild 280 BLAKE2B 0e98cef7ff83fe25d66142489657417d4f6e80096c76426f334a01619803fb02482aceda36cae52855b3beeeb7964bce15e0709bf1c3df288aebd9ce519a33ed SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552
-EBUILD selinux-dictd-2.20170204-r3.ebuild 280 BLAKE2B 0e98cef7ff83fe25d66142489657417d4f6e80096c76426f334a01619803fb02482aceda36cae52855b3beeeb7964bce15e0709bf1c3df288aebd9ce519a33ed SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552
-EBUILD selinux-dictd-2.20170204-r4.ebuild 280 BLAKE2B 0e98cef7ff83fe25d66142489657417d4f6e80096c76426f334a01619803fb02482aceda36cae52855b3beeeb7964bce15e0709bf1c3df288aebd9ce519a33ed SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552
 EBUILD selinux-dictd-2.20170805-r2.ebuild 280 BLAKE2B 0e98cef7ff83fe25d66142489657417d4f6e80096c76426f334a01619803fb02482aceda36cae52855b3beeeb7964bce15e0709bf1c3df288aebd9ce519a33ed SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552
 EBUILD selinux-dictd-2.20170805-r3.ebuild 280 BLAKE2B 0e98cef7ff83fe25d66142489657417d4f6e80096c76426f334a01619803fb02482aceda36cae52855b3beeeb7964bce15e0709bf1c3df288aebd9ce519a33ed SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552
-EBUILD selinux-dictd-2.20170805-r4.ebuild 282 BLAKE2B 65546c4a04b853d43f2c734ddc26307136e590d8dced4735052eff442b176420de4f504b78cd44dab7d6c36a2489c82334fe86bfa4f2376c5cfe4b393468d158 SHA512 a5af417f0329bc8939f6e20b53dafcf09bd16abf8729ee352540471c087abf49f638306a1e0f5a24536cefe3567b101570d0fbd2671c9287b0cb91d0da4e41c2
 EBUILD selinux-dictd-2.20180114-r1.ebuild 280 BLAKE2B 2086dc6befd36106b3ee1c642e27f744f4d1d1d69e98d4a876a50daadb113492504268dd8b2cba3a61d4a8e8a1e1d47beee9e025e159d23bf106a87b74f7a856 SHA512 c427e4a692bb22dcc7329933ac94c4c4742d2c706fcd5025b00aae9f50439a2b826cf1f9f6f1cf430260ffded055dc2a7181fe8028611be8f83160d56d68a3f2
 EBUILD selinux-dictd-2.20180114-r2.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
+EBUILD selinux-dictd-2.20180114-r3.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
 EBUILD selinux-dictd-9999.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
 MISC metadata.xml 315 BLAKE2B 6c3cb785d70993fdc4d2adaf234fb780b86279256a852cf5102134d51db57eebecedb3dc09e05bf527f80287ce40656a0c6c05885ad0f8e80e4fa139f51ddc4b SHA512 02c4865816cef6be48361eae1ae305c74b1c0808a4f56b5eb8d2ac31526eed898d6b4d506ed7c649d387c0cb10f4915289a218dfe40b78a3ca14f613a39f4157
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r1.ebuild
deleted file mode 100644
index dd7cf2f34df0..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r2.ebuild
deleted file mode 100644
index 3bc15bd2b29c..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r3.ebuild
deleted file mode 100644
index 3bc15bd2b29c..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r4.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r4.ebuild
deleted file mode 100644
index 3bc15bd2b29c..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r4.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r4.ebuild
deleted file mode 100644
index dd7cf2f34df0..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20180114-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2d32bb503a41
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dictd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dictd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirmngr/Manifest b/sec-policy/selinux-dirmngr/Manifest
index 2eec037d0052..42e1cb9e38d9 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -1,10 +1,9 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dirmngr-2.20170805-r4.ebuild 286 BLAKE2B 3c3a2d2ac3fa330bb32ba8d515bdcf299f1ab868d5d23a6affb41ef06e485ff07cb9a0e08ef8a59a24d47cd7bf72b7e6b4825b7469a38ec2a1beaaee603ab06e SHA512 ed9eaeac9b671f7156da80bb4552ddd1844b5edefe9eecf2cc537b834ef05e84d4fbc373ae7b28870ed040916f2590066e44f5ec95dda6227d95edb0a2846c96
 EBUILD selinux-dirmngr-2.20180114-r1.ebuild 284 BLAKE2B 6ee47587b4ae99a401207a275a669b11bab2017c4fc35ed7b34945453f5230ff7f9d7a172b017f327ce62daab5f2bd318771c98a7c30f88083ea9b7279d1f328 SHA512 5854039cd68edafe1f88ea317a9e26907e80275cbfdfbabf1a016d95b4a32f4cc9ba000f8d1c595485a8f826ae442b796adc69bea56bb02d3fc5079b1dc5bbfe
 EBUILD selinux-dirmngr-2.20180114-r2.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
+EBUILD selinux-dirmngr-2.20180114-r3.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
 EBUILD selinux-dirmngr-9999.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
 MISC metadata.xml 317 BLAKE2B 797c5e5f1c668c0528e160b2c254f8253f6e09bfa6e7ab92187d9d980c20eea9d8bc55744137f6e0ee3b3fee3625ed36edb12a61bc9e6df1bf4619f351800f59 SHA512 059adc0970cb771c2025a010952755316b64d534921fa68acfd93534db445e44abee7e29554471e2d17d3b7eb7c8cea8603358812e3875f66633938f6b5ba553
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20170805-r4.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20170805-r4.ebuild
deleted file mode 100644
index 83febaf24086..000000000000
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirmngr"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirmngr"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180114-r3.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..0416233eb076
--- /dev/null
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dirmngr"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirmngr"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index 59bcd8accd55..de6f730da5cb 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dirsrv-2.20170204-r1.ebuild 284 BLAKE2B a4aca060eeef99a8b53baecde23629370d840c921a9ec24ea5f4fbaaf767a12b2a5cc2870580375a07a93c5158bb2b620f0915fd2793f33c0ef47ccecfe0d400 SHA512 1cdd5c18721c8ca813ebae53d74c4f01ba5df84899383ea9b3320f78a1c77bcce98d8256fd3a67c6f82655270f00d95553fb186043c71278dbc1e7246072a135
-EBUILD selinux-dirsrv-2.20170204-r2.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822d83e62bf2a4e08df977a1ede9ddcdd9d58c6a071e9f552a7e511a23be498b7f12aead2287aaa956c60dd38a1466c5fbfe8ef7b3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff
-EBUILD selinux-dirsrv-2.20170204-r3.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822d83e62bf2a4e08df977a1ede9ddcdd9d58c6a071e9f552a7e511a23be498b7f12aead2287aaa956c60dd38a1466c5fbfe8ef7b3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff
-EBUILD selinux-dirsrv-2.20170204-r4.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822d83e62bf2a4e08df977a1ede9ddcdd9d58c6a071e9f552a7e511a23be498b7f12aead2287aaa956c60dd38a1466c5fbfe8ef7b3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff
 EBUILD selinux-dirsrv-2.20170805-r2.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822d83e62bf2a4e08df977a1ede9ddcdd9d58c6a071e9f552a7e511a23be498b7f12aead2287aaa956c60dd38a1466c5fbfe8ef7b3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff
 EBUILD selinux-dirsrv-2.20170805-r3.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822d83e62bf2a4e08df977a1ede9ddcdd9d58c6a071e9f552a7e511a23be498b7f12aead2287aaa956c60dd38a1466c5fbfe8ef7b3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff
-EBUILD selinux-dirsrv-2.20170805-r4.ebuild 284 BLAKE2B a4aca060eeef99a8b53baecde23629370d840c921a9ec24ea5f4fbaaf767a12b2a5cc2870580375a07a93c5158bb2b620f0915fd2793f33c0ef47ccecfe0d400 SHA512 1cdd5c18721c8ca813ebae53d74c4f01ba5df84899383ea9b3320f78a1c77bcce98d8256fd3a67c6f82655270f00d95553fb186043c71278dbc1e7246072a135
 EBUILD selinux-dirsrv-2.20180114-r1.ebuild 282 BLAKE2B b28d95175d198b46784aaff8ca5ce09f222db8056e5cf5cfa0d0d10aa63cf7fea3c0b5d9ee429725edb44845856769d4a6eb107d65da9a1786ccc3f797fc97ff SHA512 817e44ba301c2b96a01fa072f0ca867f3b7ed0fea29b0f139c2ac32b0f8169dd77573d309a2cb510b7372e4e81ed7665c114f062bb010a196086da3609de7140
 EBUILD selinux-dirsrv-2.20180114-r2.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
+EBUILD selinux-dirsrv-2.20180114-r3.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
 EBUILD selinux-dirsrv-9999.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
 MISC metadata.xml 316 BLAKE2B d5958060111e46d47e53c36a8465a3fcdc63cfb433b2236c7d7b60aea0f72c9a33a72f5fedd8f418f20fbd3be4080ae1252cba9968ce142d9385cdf13bb458c8 SHA512 9392b125315ce8aaeac508910a071d09007a8cf56fbeaf82a935af65958599622d3eeef89eef93c72e2cac81582a4d1dc5ddace14e255764db5df80d9553cb50
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r1.ebuild
deleted file mode 100644
index 5192f6530f14..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r2.ebuild
deleted file mode 100644
index fdea3c6062de..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r3.ebuild
deleted file mode 100644
index fdea3c6062de..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r4.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r4.ebuild
deleted file mode 100644
index fdea3c6062de..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r4.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r4.ebuild
deleted file mode 100644
index 5192f6530f14..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180114-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a55356877e2a
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dirsrv"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirsrv"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index 73be4879d881..cf06af1f73ac 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-distcc-2.20170204-r1.ebuild 284 BLAKE2B d415c0e0e239a9ee7be0b8ee3154d5158ffa0bd86a3cec0fd1ef3aa723cfafaa25ba66624b1855f36344dda9e2504906b6f613492da0cb8789f9ab21ebc65458 SHA512 13edfc37c4d512915db725ba4dbb7ecad9646532bd20f63340d2fbac8785d3c52232aafb28c3a94c0b472a10da4076e05d9b4b72a04f64b00b091fa2b6ccd619
-EBUILD selinux-distcc-2.20170204-r2.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d062a9841a16d1f3b1654e28c755c0215f07832b8bb4ad9bfd2b683ba2152dc552268ad58b2d8e96fc8c3697478ee1f6d2698d06a3 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425
-EBUILD selinux-distcc-2.20170204-r3.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d062a9841a16d1f3b1654e28c755c0215f07832b8bb4ad9bfd2b683ba2152dc552268ad58b2d8e96fc8c3697478ee1f6d2698d06a3 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425
-EBUILD selinux-distcc-2.20170204-r4.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d062a9841a16d1f3b1654e28c755c0215f07832b8bb4ad9bfd2b683ba2152dc552268ad58b2d8e96fc8c3697478ee1f6d2698d06a3 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425
 EBUILD selinux-distcc-2.20170805-r2.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d062a9841a16d1f3b1654e28c755c0215f07832b8bb4ad9bfd2b683ba2152dc552268ad58b2d8e96fc8c3697478ee1f6d2698d06a3 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425
 EBUILD selinux-distcc-2.20170805-r3.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d062a9841a16d1f3b1654e28c755c0215f07832b8bb4ad9bfd2b683ba2152dc552268ad58b2d8e96fc8c3697478ee1f6d2698d06a3 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425
-EBUILD selinux-distcc-2.20170805-r4.ebuild 284 BLAKE2B d415c0e0e239a9ee7be0b8ee3154d5158ffa0bd86a3cec0fd1ef3aa723cfafaa25ba66624b1855f36344dda9e2504906b6f613492da0cb8789f9ab21ebc65458 SHA512 13edfc37c4d512915db725ba4dbb7ecad9646532bd20f63340d2fbac8785d3c52232aafb28c3a94c0b472a10da4076e05d9b4b72a04f64b00b091fa2b6ccd619
 EBUILD selinux-distcc-2.20180114-r1.ebuild 282 BLAKE2B 10da4486447142b592fdf68ed059c1cab8408cedeef5cda795d1f03a80cef4e6323e81275790570efe92ca1502f266e586faadf307766f2eb17e55965dfa3b79 SHA512 13151cec63fb66c6e1b5f4c8103d0ce654fdb368dfb24e63f83b4b6dc097b8be779b303e1c5a8a51b9f7753480e112fa57e3e7ca29f20442507d81306dd57871
 EBUILD selinux-distcc-2.20180114-r2.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
+EBUILD selinux-distcc-2.20180114-r3.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
 EBUILD selinux-distcc-9999.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
 MISC metadata.xml 316 BLAKE2B 8f0a143701ede64165bd298ad78e39d6aa50d3dcc078928ded40470022d1a88ba72f685acccba96f7d14f2e8514d29e06d22639bd7f88da33f19338b05376f69 SHA512 d11cb8bc6cf54e4c1ba0e2e00ef18db5c5a91e3138347156c04b2e4bc9cd002220c5406d19020993746fa41014b85e80d779a82a80c2db01b8bae02aea6d1fa4
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r1.ebuild
deleted file mode 100644
index 3c4706bd83ad..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r2.ebuild
deleted file mode 100644
index 6cf879968a47..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r3.ebuild
deleted file mode 100644
index 6cf879968a47..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r4.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r4.ebuild
deleted file mode 100644
index 6cf879968a47..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r4.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r4.ebuild
deleted file mode 100644
index 3c4706bd83ad..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20180114-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..111905d35fc6
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="distcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for distcc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index e62bea2701ae..73cf739420fb 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-djbdns-2.20170204-r1.ebuild 448 BLAKE2B 1025c4c28d7a13c305706fc75c66d1afcc300623e0ef12ee130302783921c56a3ec5491e77d29178bdd7b0610d2b5c909229a1e46ec2553436ccbeb5fc8dd512 SHA512 765262cd6c4e0d260aa609166b23dee4103ac456355fd95498b209e01d1186cf189c472a0b6fdc1f20e9777830d8588419c3d424cf0a14bfe6b32f12825a222d
-EBUILD selinux-djbdns-2.20170204-r2.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac1fcb9d2c8aa45d52a12f0deca05ebd8eee370987e703b24d4c1fc4cd5011aadfb0eb613f9d97de12d16386b1a23f6005f395eef SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c
-EBUILD selinux-djbdns-2.20170204-r3.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac1fcb9d2c8aa45d52a12f0deca05ebd8eee370987e703b24d4c1fc4cd5011aadfb0eb613f9d97de12d16386b1a23f6005f395eef SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c
-EBUILD selinux-djbdns-2.20170204-r4.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac1fcb9d2c8aa45d52a12f0deca05ebd8eee370987e703b24d4c1fc4cd5011aadfb0eb613f9d97de12d16386b1a23f6005f395eef SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c
 EBUILD selinux-djbdns-2.20170805-r2.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac1fcb9d2c8aa45d52a12f0deca05ebd8eee370987e703b24d4c1fc4cd5011aadfb0eb613f9d97de12d16386b1a23f6005f395eef SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c
 EBUILD selinux-djbdns-2.20170805-r3.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac1fcb9d2c8aa45d52a12f0deca05ebd8eee370987e703b24d4c1fc4cd5011aadfb0eb613f9d97de12d16386b1a23f6005f395eef SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c
-EBUILD selinux-djbdns-2.20170805-r4.ebuild 448 BLAKE2B 1025c4c28d7a13c305706fc75c66d1afcc300623e0ef12ee130302783921c56a3ec5491e77d29178bdd7b0610d2b5c909229a1e46ec2553436ccbeb5fc8dd512 SHA512 765262cd6c4e0d260aa609166b23dee4103ac456355fd95498b209e01d1186cf189c472a0b6fdc1f20e9777830d8588419c3d424cf0a14bfe6b32f12825a222d
 EBUILD selinux-djbdns-2.20180114-r1.ebuild 446 BLAKE2B a81b22789f7e9d4f19d52a0923ca0c1ee5996bf94ab6d3b8dce8254f1e0598ce1b7e811f74106e037b581d8214c0efe0de594f8ba7ca6b6cc711b89d86a49272 SHA512 e4a10530455eac44c2b4be280477c4f1af4d64170e4650656574e8a297bdd97bd3028dffed0ed26794f77d6e44542f8e794a872f2691b383f0aff40209525abb
 EBUILD selinux-djbdns-2.20180114-r2.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
+EBUILD selinux-djbdns-2.20180114-r3.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
 EBUILD selinux-djbdns-9999.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
 MISC metadata.xml 316 BLAKE2B 94ad6fd295fcdec5d40784cb276b30d35ce1c9a4aa3dd4840b80b7ec51077b72d1c1e886219ef76040617bedf30f875823d3b89ac2a467205b53770788c35f82 SHA512 7431b1e50c034acffe00d3aabdf88c497390908543c1e4b13ae47532d5b9519bd8c5a4b3062c8df790c218a5880a06ca425f8cb1b114f62cad5038b54f8e2587
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r1.ebuild
deleted file mode 100644
index 8d7216ec1da2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r2.ebuild
deleted file mode 100644
index 6af0fe9551b2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r3.ebuild
deleted file mode 100644
index 6af0fe9551b2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r4.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r4.ebuild
deleted file mode 100644
index 6af0fe9551b2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r4.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r4.ebuild
deleted file mode 100644
index 8d7216ec1da2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20180114-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..6d03e0a05302
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20180114-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="djbdns"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for djbdns"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index a99c390fb6aa..3d1e15755357 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dkim-2.20170204-r1.ebuild 377 BLAKE2B 377e289da21e3dab88728e6ad5829b592817c66a978d822b4713ea249510161a68a5d40011923be1306e05e8471f75969f836acff940c31bf16a5e62f7b48df4 SHA512 20338b7f29629d8d25d1eb5590057263f6ecc7cb2bf953e3c3b5ba2632919e8068825f8a7e837ad482453292b7bd8a58d2e95b95e0c72b2cf2991ba0faef7820
-EBUILD selinux-dkim-2.20170204-r2.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd33c10a006be0dcedd26e90b92c4c27ec448c2dd2d3dc8fcf70fb59e92cfe720be92a6735e27295ae067842e3745c7994f55f0 SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56
-EBUILD selinux-dkim-2.20170204-r3.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd33c10a006be0dcedd26e90b92c4c27ec448c2dd2d3dc8fcf70fb59e92cfe720be92a6735e27295ae067842e3745c7994f55f0 SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56
-EBUILD selinux-dkim-2.20170204-r4.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd33c10a006be0dcedd26e90b92c4c27ec448c2dd2d3dc8fcf70fb59e92cfe720be92a6735e27295ae067842e3745c7994f55f0 SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56
 EBUILD selinux-dkim-2.20170805-r2.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd33c10a006be0dcedd26e90b92c4c27ec448c2dd2d3dc8fcf70fb59e92cfe720be92a6735e27295ae067842e3745c7994f55f0 SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56
 EBUILD selinux-dkim-2.20170805-r3.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd33c10a006be0dcedd26e90b92c4c27ec448c2dd2d3dc8fcf70fb59e92cfe720be92a6735e27295ae067842e3745c7994f55f0 SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56
-EBUILD selinux-dkim-2.20170805-r4.ebuild 377 BLAKE2B 377e289da21e3dab88728e6ad5829b592817c66a978d822b4713ea249510161a68a5d40011923be1306e05e8471f75969f836acff940c31bf16a5e62f7b48df4 SHA512 20338b7f29629d8d25d1eb5590057263f6ecc7cb2bf953e3c3b5ba2632919e8068825f8a7e837ad482453292b7bd8a58d2e95b95e0c72b2cf2991ba0faef7820
 EBUILD selinux-dkim-2.20180114-r1.ebuild 375 BLAKE2B ecd0fdc5ce40ad8f72c7bbd56bd696b3e59fc075dc8395ae8008717f9e84a174320d0fa19e96450a92c7aaacb3cdaf0142533843ebe9cb24b0094b149026ff76 SHA512 6faf0f19e9546e49c4be38e526048b836afd94420002ada5c7b091864907b0798e0882ec869ac78ea4e281f16fa9e035a54693d6b9741b8041aa942b589bf1f7
 EBUILD selinux-dkim-2.20180114-r2.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
+EBUILD selinux-dkim-2.20180114-r3.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
 EBUILD selinux-dkim-9999.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
 MISC metadata.xml 314 BLAKE2B 52a2ee591bb7e3d3377433b75e6b94fd6fe583fa6325fc79d111bd08f8164d275fdd7d2251e633777df699d78c2af7fd52cd7c0c2500a0354692430c0cd8e312 SHA512 a38550fb1e03f39702b4f45f068d6726aea262a480a35360e055b2ab98accf4f83395ff3f566babce8a75d3b654eb5b2cc729fcdac5441426494750b6eb59120
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r1.ebuild
deleted file mode 100644
index cd6a5e88374e..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r2.ebuild
deleted file mode 100644
index e8bc10bc3959..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r3.ebuild
deleted file mode 100644
index e8bc10bc3959..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r4.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r4.ebuild
deleted file mode 100644
index e8bc10bc3959..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r4.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r4.ebuild
deleted file mode 100644
index cd6a5e88374e..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20180114-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..725721271283
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dkim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dkim"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-milter
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-milter
+"
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index e5beab14c7c4..b3e23acf0ae5 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dmidecode-2.20170204-r1.ebuild 290 BLAKE2B 61e5ee55b22dc90579cf9bec01a5c498941f41af6d595e4270046aa23d859b243b236014e07a5f49a4c0eb362ba56cf5ccffc655f7cc480c33c3cbe19d2d5a33 SHA512 6d44adcf84c02343a2977547a73140b8c1581e9a9b27ea0db5da827ac93143148e914052f0a9fb202199104f7ec354ccd24d0159fa465c6f495a549b0b33a79d
-EBUILD selinux-dmidecode-2.20170204-r2.ebuild 288 BLAKE2B db8c8a8144ae91054a98d76642c4dc32bdbc9ea44a6d531fd105ad790994734aa19dbaa2d684a5dff9df147df112c26a3244f40686da40c42a4470e9d20c06ee SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533
-EBUILD selinux-dmidecode-2.20170204-r3.ebuild 288 BLAKE2B db8c8a8144ae91054a98d76642c4dc32bdbc9ea44a6d531fd105ad790994734aa19dbaa2d684a5dff9df147df112c26a3244f40686da40c42a4470e9d20c06ee SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533
-EBUILD selinux-dmidecode-2.20170204-r4.ebuild 288 BLAKE2B db8c8a8144ae91054a98d76642c4dc32bdbc9ea44a6d531fd105ad790994734aa19dbaa2d684a5dff9df147df112c26a3244f40686da40c42a4470e9d20c06ee SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533
 EBUILD selinux-dmidecode-2.20170805-r2.ebuild 288 BLAKE2B db8c8a8144ae91054a98d76642c4dc32bdbc9ea44a6d531fd105ad790994734aa19dbaa2d684a5dff9df147df112c26a3244f40686da40c42a4470e9d20c06ee SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533
 EBUILD selinux-dmidecode-2.20170805-r3.ebuild 288 BLAKE2B db8c8a8144ae91054a98d76642c4dc32bdbc9ea44a6d531fd105ad790994734aa19dbaa2d684a5dff9df147df112c26a3244f40686da40c42a4470e9d20c06ee SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533
-EBUILD selinux-dmidecode-2.20170805-r4.ebuild 290 BLAKE2B 61e5ee55b22dc90579cf9bec01a5c498941f41af6d595e4270046aa23d859b243b236014e07a5f49a4c0eb362ba56cf5ccffc655f7cc480c33c3cbe19d2d5a33 SHA512 6d44adcf84c02343a2977547a73140b8c1581e9a9b27ea0db5da827ac93143148e914052f0a9fb202199104f7ec354ccd24d0159fa465c6f495a549b0b33a79d
 EBUILD selinux-dmidecode-2.20180114-r1.ebuild 288 BLAKE2B 95a04055c2b5a4229d1fd106c5fd14d0268ee0704bcb449b7a8e9142c5b6022aa56d2a2922dc3deb5013072f10c84b5467e634f9812b8814a5838fead38c46a0 SHA512 519b459cfaaf5e6118c2ce33bc5013c536b67c955038abcfa9726d3befabaac1f18e13edf9cadbf1e7ea3a8e176151cdfc06f5712dad70dee005917f8de27de8
 EBUILD selinux-dmidecode-2.20180114-r2.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
+EBUILD selinux-dmidecode-2.20180114-r3.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
 EBUILD selinux-dmidecode-9999.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
 MISC metadata.xml 319 BLAKE2B a91428c1e8c58f2901df33a3bfecaa09414f9a4a7cb2cea6350a7795c5c0a8e87f95139807d2025cf0fd725404bef1b5bc56880d7a44b4264ee5e5d6adcbecf1 SHA512 d866eeed95bad62f746cb0576f592abc6f0728661fa06563d55146ccacddcc50e9154d0c7bb0b673acae16ef0f80dd80b70763a810d829920cc6e0483b7830ec
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r1.ebuild
deleted file mode 100644
index f8577819b41a..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r2.ebuild
deleted file mode 100644
index bd6f8395e534..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r3.ebuild
deleted file mode 100644
index bd6f8395e534..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r4.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r4.ebuild
deleted file mode 100644
index bd6f8395e534..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r4.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r4.ebuild
deleted file mode 100644
index f8577819b41a..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180114-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8e615d71505e
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dmidecode"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dmidecode"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 644aeb7403df..54a9e18bc9e7 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dnsmasq-2.20170204-r1.ebuild 286 BLAKE2B 40fe1622875bd3178bc03fe3bd548d2c7c0fd14b000566820aeaf71a7940478019391af26e882f652f70030d921347869ee436e44f7956ac3ea7addc6f75ee38 SHA512 bbecf4664cc6925f7803003df8cf9525e66e351b2f8c16053db6bc6ae2223187b0d35faac1d7e42500ca3f2df407ed7ba65cbda33413a3e6de134eb8f1ec3b26
-EBUILD selinux-dnsmasq-2.20170204-r2.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f15361d1730b30fa9d24fbe4f7b6ac99b30c0af61398ae628d485ed0bf9eefd43183d7a69ca5e046fc3cee91bde8df2b23713cfc8680b SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24
-EBUILD selinux-dnsmasq-2.20170204-r3.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f15361d1730b30fa9d24fbe4f7b6ac99b30c0af61398ae628d485ed0bf9eefd43183d7a69ca5e046fc3cee91bde8df2b23713cfc8680b SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24
-EBUILD selinux-dnsmasq-2.20170204-r4.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f15361d1730b30fa9d24fbe4f7b6ac99b30c0af61398ae628d485ed0bf9eefd43183d7a69ca5e046fc3cee91bde8df2b23713cfc8680b SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24
 EBUILD selinux-dnsmasq-2.20170805-r2.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f15361d1730b30fa9d24fbe4f7b6ac99b30c0af61398ae628d485ed0bf9eefd43183d7a69ca5e046fc3cee91bde8df2b23713cfc8680b SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24
 EBUILD selinux-dnsmasq-2.20170805-r3.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f15361d1730b30fa9d24fbe4f7b6ac99b30c0af61398ae628d485ed0bf9eefd43183d7a69ca5e046fc3cee91bde8df2b23713cfc8680b SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24
-EBUILD selinux-dnsmasq-2.20170805-r4.ebuild 286 BLAKE2B 40fe1622875bd3178bc03fe3bd548d2c7c0fd14b000566820aeaf71a7940478019391af26e882f652f70030d921347869ee436e44f7956ac3ea7addc6f75ee38 SHA512 bbecf4664cc6925f7803003df8cf9525e66e351b2f8c16053db6bc6ae2223187b0d35faac1d7e42500ca3f2df407ed7ba65cbda33413a3e6de134eb8f1ec3b26
 EBUILD selinux-dnsmasq-2.20180114-r1.ebuild 284 BLAKE2B b67c2202f0ecca890cf7e8df0d68ff9163162d4e720e93b1acddaf08f824fd2ef1629ceee3a2d47dcc78f0f50253aabc2d16a27e867b519cfaf2bc12eeec8748 SHA512 fb06be5bae2aba1706f29527014428301db798cf062db79d5a071e117af62c17ebd75d175a785508be3e9e39a797c356c24ad032778777e92524f0b39cdd8ce2
 EBUILD selinux-dnsmasq-2.20180114-r2.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
+EBUILD selinux-dnsmasq-2.20180114-r3.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
 EBUILD selinux-dnsmasq-9999.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
 MISC metadata.xml 317 BLAKE2B 2c180da5a4bb38b80679465ea103b0cfdd396830b4ab9f22de8bb2134f603e840a7225661d575ca48fc378cf5790c3026ca6c9ec1a2c4de08264292db1813b26 SHA512 badb018cf0e4f48bf7394d4c8b882cae63fbd47755668c58159f23f2ae6b5ff18d15f17790eb6721f2585cdb307e37f3430c9616641581dab70ef3b866157464
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r1.ebuild
deleted file mode 100644
index 898a5615d884..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r2.ebuild
deleted file mode 100644
index 3b6d5fbe2cf5..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r3.ebuild
deleted file mode 100644
index 3b6d5fbe2cf5..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r4.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r4.ebuild
deleted file mode 100644
index 3b6d5fbe2cf5..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r4.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r4.ebuild
deleted file mode 100644
index 898a5615d884..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180114-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e12df6ce58f6
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dnsmasq"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dnsmasq"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index 45fb0134a3d8..9a35e31ee12f 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dovecot-2.20170204-r1.ebuild 286 BLAKE2B 1d6502fc342b07f29a0c4f5924826cbc9bc65a4a4b2beb917fa15ac448c996cd13f166e9d0da970ec1818c2138e26e4a966971107b875faa1f82551af7490c4d SHA512 3e885e9fc01b6b601079754e67f4589a16eecf840f02280ca998b44b2a5d0f96f463fe4c3df59c78fc707a349384afb1f138be79e0874456b0d0604154a5ffec
-EBUILD selinux-dovecot-2.20170204-r2.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02c3c34a1d508bcd8011e1c0a6854d45eb02ce0a6cbee6476e0781ac4e1524f8fd4fd5785737abe744d3f1cf2a290688a282abbadb SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464
-EBUILD selinux-dovecot-2.20170204-r3.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02c3c34a1d508bcd8011e1c0a6854d45eb02ce0a6cbee6476e0781ac4e1524f8fd4fd5785737abe744d3f1cf2a290688a282abbadb SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464
-EBUILD selinux-dovecot-2.20170204-r4.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02c3c34a1d508bcd8011e1c0a6854d45eb02ce0a6cbee6476e0781ac4e1524f8fd4fd5785737abe744d3f1cf2a290688a282abbadb SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464
 EBUILD selinux-dovecot-2.20170805-r2.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02c3c34a1d508bcd8011e1c0a6854d45eb02ce0a6cbee6476e0781ac4e1524f8fd4fd5785737abe744d3f1cf2a290688a282abbadb SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464
 EBUILD selinux-dovecot-2.20170805-r3.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02c3c34a1d508bcd8011e1c0a6854d45eb02ce0a6cbee6476e0781ac4e1524f8fd4fd5785737abe744d3f1cf2a290688a282abbadb SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464
-EBUILD selinux-dovecot-2.20170805-r4.ebuild 286 BLAKE2B 1d6502fc342b07f29a0c4f5924826cbc9bc65a4a4b2beb917fa15ac448c996cd13f166e9d0da970ec1818c2138e26e4a966971107b875faa1f82551af7490c4d SHA512 3e885e9fc01b6b601079754e67f4589a16eecf840f02280ca998b44b2a5d0f96f463fe4c3df59c78fc707a349384afb1f138be79e0874456b0d0604154a5ffec
 EBUILD selinux-dovecot-2.20180114-r1.ebuild 284 BLAKE2B d51c8bdd38720f3b0ab23a9b438546dd18de60b64444ba704b198e71e505f00aa4d952bf66eda7ec19cd39423284cd039d263f29999674ca45f463b06b7e9c27 SHA512 d237e2b8a4cd65501450c2c9f1306047555ec922260b056587a1cf6531fbda7313983e1c6809b93d0494755abede9af3652825f121a07accb65677738623da56
 EBUILD selinux-dovecot-2.20180114-r2.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
+EBUILD selinux-dovecot-2.20180114-r3.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
 EBUILD selinux-dovecot-9999.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
 MISC metadata.xml 317 BLAKE2B bd378647bd4b9d38fda7a04f6baf817da4cfb58ae8acf6b1ebb1fc4e088d4e71a99700562d2ac08e8ccaab094c1d446ffeb8aa5bcec9b85333808fa9f225bd88 SHA512 c48caae167d778fc011c650d92060756d568ec1b57957f7b581d93acd0ceed15f2da615c9cdc4571765935e9f62b073211e90c79cc19727aee2b0fcc13a23510
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r1.ebuild
deleted file mode 100644
index 0d2ff0050289..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r2.ebuild
deleted file mode 100644
index 27872911b461..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r3.ebuild
deleted file mode 100644
index 27872911b461..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r4.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r4.ebuild
deleted file mode 100644
index 27872911b461..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r4.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r4.ebuild
deleted file mode 100644
index 0d2ff0050289..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20180114-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3f4f764487e3
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dovecot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dovecot"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index c67fb456d2b4..5dcf01c205ca 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dpkg-2.20170204-r1.ebuild 280 BLAKE2B 94dada9fc0944b3d87f4e201b414f66c9c754f09914c6dad886ddf11cb37c4c884fbbef966ecc84567ca9f49ec226a0bd2138b38b96d6ed32502a58e713d997c SHA512 b8964968ac607b07a1f5ec861bb3ea3037a7c2df27e15207bb3c843e0b7ab8d345c63bccbe3ad68bfd8db13613a282a3b07e7fa3746c751a2ed8e68a0f4bf5d0
-EBUILD selinux-dpkg-2.20170204-r2.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564c2f5b91bb3c704578371dcd88c7a7a44b58c04a85a003ac68e48f6ec1126b356440424d7982bf57191cfe7d88e87013dde895 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890
-EBUILD selinux-dpkg-2.20170204-r3.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564c2f5b91bb3c704578371dcd88c7a7a44b58c04a85a003ac68e48f6ec1126b356440424d7982bf57191cfe7d88e87013dde895 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890
-EBUILD selinux-dpkg-2.20170204-r4.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564c2f5b91bb3c704578371dcd88c7a7a44b58c04a85a003ac68e48f6ec1126b356440424d7982bf57191cfe7d88e87013dde895 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890
 EBUILD selinux-dpkg-2.20170805-r2.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564c2f5b91bb3c704578371dcd88c7a7a44b58c04a85a003ac68e48f6ec1126b356440424d7982bf57191cfe7d88e87013dde895 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890
 EBUILD selinux-dpkg-2.20170805-r3.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564c2f5b91bb3c704578371dcd88c7a7a44b58c04a85a003ac68e48f6ec1126b356440424d7982bf57191cfe7d88e87013dde895 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890
-EBUILD selinux-dpkg-2.20170805-r4.ebuild 280 BLAKE2B 94dada9fc0944b3d87f4e201b414f66c9c754f09914c6dad886ddf11cb37c4c884fbbef966ecc84567ca9f49ec226a0bd2138b38b96d6ed32502a58e713d997c SHA512 b8964968ac607b07a1f5ec861bb3ea3037a7c2df27e15207bb3c843e0b7ab8d345c63bccbe3ad68bfd8db13613a282a3b07e7fa3746c751a2ed8e68a0f4bf5d0
 EBUILD selinux-dpkg-2.20180114-r1.ebuild 278 BLAKE2B 849b6751f721c931481c3aa2d0504b005ace0534223a1ad5dd34108e7bdd3fdf6a1cf75d50bf7a6fb69b89fcf5f0300b6e39fa0e4c3e4bcdcba7f9b2486ee9eb SHA512 316f118ad7b635c8d0a3ad615b87459f9a21273d8a0f104565f05d551b0b78fcf8b5f070e59a9e0fa41114ce5bf9f3bab938a94f1cf07d865d49707ff096590c
 EBUILD selinux-dpkg-2.20180114-r2.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
+EBUILD selinux-dpkg-2.20180114-r3.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
 EBUILD selinux-dpkg-9999.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
 MISC metadata.xml 314 BLAKE2B 3723d66dcaeb3e3276c7dc99b11debed63f9d2a34cc34f3bde1007c2015d024afac6081b3b07a0890aeedec7c869f4635d8f0249c7578f06b96c8ab3ca876c7f SHA512 4dc73eaa9a7604687d8a74bac77bd1f595a1e5f10916589fcee39af23db6afec167d30a3f7851eebcc1c942684ce71651fbbbe98d2dae98d8a2d892b314896b3
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r1.ebuild
deleted file mode 100644
index 0c6a27f0f0c6..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r2.ebuild
deleted file mode 100644
index aec4a7de2677..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r3.ebuild
deleted file mode 100644
index aec4a7de2677..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r4.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r4.ebuild
deleted file mode 100644
index aec4a7de2677..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r4.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r4.ebuild
deleted file mode 100644
index 0c6a27f0f0c6..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20180114-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..0458ecafbca5
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dpkg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 8678684b6681..3ef6b1aedde3 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dracut-2.20170204-r1.ebuild 284 BLAKE2B 1aa8b339aa1fb34048c35d9afd5b31369e51590c106b165af93f63e5e90988d6c1ef295ff8fb87accfc6a7046fd984900a7c428f1b14cb9956472a40d0b18bf4 SHA512 d8b035f9060f8515b57d7d617b475977ec585a5b6ead185d885fea6f7912bef07cbce8616946f984d7128604f28e6f8636e940ee00ef49f1baf48b116eeb5666
-EBUILD selinux-dracut-2.20170204-r2.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d651cb846fee0afabd6d1dd5e86e487c6cb1332572d97de383bf141eef2f2f84df0be272ada16c9f1d1f93c60ea8c1f3273c06a4 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5
-EBUILD selinux-dracut-2.20170204-r3.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d651cb846fee0afabd6d1dd5e86e487c6cb1332572d97de383bf141eef2f2f84df0be272ada16c9f1d1f93c60ea8c1f3273c06a4 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5
-EBUILD selinux-dracut-2.20170204-r4.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d651cb846fee0afabd6d1dd5e86e487c6cb1332572d97de383bf141eef2f2f84df0be272ada16c9f1d1f93c60ea8c1f3273c06a4 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5
 EBUILD selinux-dracut-2.20170805-r2.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d651cb846fee0afabd6d1dd5e86e487c6cb1332572d97de383bf141eef2f2f84df0be272ada16c9f1d1f93c60ea8c1f3273c06a4 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5
 EBUILD selinux-dracut-2.20170805-r3.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d651cb846fee0afabd6d1dd5e86e487c6cb1332572d97de383bf141eef2f2f84df0be272ada16c9f1d1f93c60ea8c1f3273c06a4 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5
-EBUILD selinux-dracut-2.20170805-r4.ebuild 284 BLAKE2B 1aa8b339aa1fb34048c35d9afd5b31369e51590c106b165af93f63e5e90988d6c1ef295ff8fb87accfc6a7046fd984900a7c428f1b14cb9956472a40d0b18bf4 SHA512 d8b035f9060f8515b57d7d617b475977ec585a5b6ead185d885fea6f7912bef07cbce8616946f984d7128604f28e6f8636e940ee00ef49f1baf48b116eeb5666
 EBUILD selinux-dracut-2.20180114-r1.ebuild 282 BLAKE2B e538f9acf5e994ce641f0fb572862a512c5285b1215f7c34e44b808b9665b90571f0a3f8de686b694d6052f1123b461675f55f628e23a2c0f6b973e3815853dc SHA512 9cc2e17ac780ce9454543ef604c756f09191438505b352840117f02074140d994ea658a1b721d8bc5771df18d38180e4fdedc4cb6362f38f0a3c58d5725af734
 EBUILD selinux-dracut-2.20180114-r2.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
+EBUILD selinux-dracut-2.20180114-r3.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
 EBUILD selinux-dracut-9999.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
 MISC metadata.xml 316 BLAKE2B 29c2809e3a45df49908273931adf865e193d059333270de4b37f86cad3c83dff9636ae3f96f6fa841d27716f4e4591b152ac581f997c0fdb103cee4e8a050d68 SHA512 ba6cf5bed2367c69a18d097224989ea7c5208b718f670d040634afad0a017f15ff370bfe7012bc71880b2e234fbb85a0831976c77bc4ed46328607724dd0bfe3
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r1.ebuild
deleted file mode 100644
index 75c012e1a920..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r2.ebuild
deleted file mode 100644
index cf5ba1764a89..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r3.ebuild
deleted file mode 100644
index cf5ba1764a89..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r4.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r4.ebuild
deleted file mode 100644
index cf5ba1764a89..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r4.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r4.ebuild
deleted file mode 100644
index 75c012e1a920..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20180114-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ab4f4e3bd132
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dracut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dracut"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 867a6b36692f..cb1a880f6c1f 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-dropbox-2.20170204-r1.ebuild 434 BLAKE2B beba280b0ad71eca1760d2101d39552ee0c92fad7769705adb0aee8d3039da08611186477c8f16380d758eb612763e42a3b56739929b5bf8219a5ed23360000f SHA512 ad5ebcf263461e126a58582f187faa3c0a18a56ae2d0ef0d481db0915c4af88cca50deee77831449dcbad9f9ef001c27fe61e1b5561537e6a3ae41019f33ce2c
-EBUILD selinux-dropbox-2.20170204-r2.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1f3101d7ad2027867aa9fb46218c6da4ed8b2ec8f5b5ccda3537a682407ccdbf6179070d015b515b24ae42d7edfdfbbe6e3efc512 SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8
-EBUILD selinux-dropbox-2.20170204-r3.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1f3101d7ad2027867aa9fb46218c6da4ed8b2ec8f5b5ccda3537a682407ccdbf6179070d015b515b24ae42d7edfdfbbe6e3efc512 SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8
-EBUILD selinux-dropbox-2.20170204-r4.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1f3101d7ad2027867aa9fb46218c6da4ed8b2ec8f5b5ccda3537a682407ccdbf6179070d015b515b24ae42d7edfdfbbe6e3efc512 SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8
 EBUILD selinux-dropbox-2.20170805-r2.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1f3101d7ad2027867aa9fb46218c6da4ed8b2ec8f5b5ccda3537a682407ccdbf6179070d015b515b24ae42d7edfdfbbe6e3efc512 SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8
 EBUILD selinux-dropbox-2.20170805-r3.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1f3101d7ad2027867aa9fb46218c6da4ed8b2ec8f5b5ccda3537a682407ccdbf6179070d015b515b24ae42d7edfdfbbe6e3efc512 SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8
-EBUILD selinux-dropbox-2.20170805-r4.ebuild 434 BLAKE2B beba280b0ad71eca1760d2101d39552ee0c92fad7769705adb0aee8d3039da08611186477c8f16380d758eb612763e42a3b56739929b5bf8219a5ed23360000f SHA512 ad5ebcf263461e126a58582f187faa3c0a18a56ae2d0ef0d481db0915c4af88cca50deee77831449dcbad9f9ef001c27fe61e1b5561537e6a3ae41019f33ce2c
 EBUILD selinux-dropbox-2.20180114-r1.ebuild 432 BLAKE2B 371840718b25972f5d42cdada825c929a95e3b13adc2f3164caba91baff00e3ca61171d1df5fbd551d5a15ecc9c5cb63d90dded16cc4375e67d982b6374a4255 SHA512 5f5d68126da1d6b6a93f686e91aa985575baa1222f038a7cc473dd9d6aac3825d2edf34a52b152baa7a68f1d75135cc4d471ce3e344516182ba06a9f2f2df66c
 EBUILD selinux-dropbox-2.20180114-r2.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
+EBUILD selinux-dropbox-2.20180114-r3.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
 EBUILD selinux-dropbox-9999.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
 MISC metadata.xml 317 BLAKE2B 7db5d1a4e812a844ab0528bf724b389ab91a0c5eec2edc2086c64cff779f210f5e4dc852731d976b88f407c6efa61551a823f1834b6eed8fef136d18f58008d8 SHA512 9f232635f6084134360a64b5f1fcf84580b5df46feff6d897d4a53651329ca930ca23b15ae40316748a2914cddff3358b49bdb15bf7312973d6a9ada604dc717
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r1.ebuild
deleted file mode 100644
index 70286e8066b8..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r2.ebuild
deleted file mode 100644
index 363f44cec3e0..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r3.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r3.ebuild
deleted file mode 100644
index 363f44cec3e0..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r4.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r4.ebuild
deleted file mode 100644
index 363f44cec3e0..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r4.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r4.ebuild
deleted file mode 100644
index 70286e8066b8..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20180114-r3.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..d25d2723627f
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20180114-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dropbox"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dropbox"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index ca42133a65d5..9e345f34e80d 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-entropyd-2.20170204-r1.ebuild 288 BLAKE2B 4f2c14f354e73e4c8c8fa5f5771f29f33ca3975b4ca913d1b4730f35e085a1c800244b1a9bec88f77741482a5bcd7c1685e8eda5bda86d11b8e23332467e4805 SHA512 532df8d2ae82fceb83249e47c25450f1a73f7249b1e31a345862baa04401529a06bd2ebf1777a3294f46d1a1c164eea0b38e1a193cdc2b7d0d0b1fef02cde23a
-EBUILD selinux-entropyd-2.20170204-r2.ebuild 286 BLAKE2B c157ece3aefd338994321c96a74c2fcab6fdf95fcbf77027fa2b52ce13854edb1fda0e787adc10226196b5f89ea1f8a51e66b80e4697ebc5e5cf1b9f0bb4385a SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1
-EBUILD selinux-entropyd-2.20170204-r3.ebuild 286 BLAKE2B c157ece3aefd338994321c96a74c2fcab6fdf95fcbf77027fa2b52ce13854edb1fda0e787adc10226196b5f89ea1f8a51e66b80e4697ebc5e5cf1b9f0bb4385a SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1
-EBUILD selinux-entropyd-2.20170204-r4.ebuild 286 BLAKE2B c157ece3aefd338994321c96a74c2fcab6fdf95fcbf77027fa2b52ce13854edb1fda0e787adc10226196b5f89ea1f8a51e66b80e4697ebc5e5cf1b9f0bb4385a SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1
 EBUILD selinux-entropyd-2.20170805-r2.ebuild 286 BLAKE2B c157ece3aefd338994321c96a74c2fcab6fdf95fcbf77027fa2b52ce13854edb1fda0e787adc10226196b5f89ea1f8a51e66b80e4697ebc5e5cf1b9f0bb4385a SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1
 EBUILD selinux-entropyd-2.20170805-r3.ebuild 286 BLAKE2B c157ece3aefd338994321c96a74c2fcab6fdf95fcbf77027fa2b52ce13854edb1fda0e787adc10226196b5f89ea1f8a51e66b80e4697ebc5e5cf1b9f0bb4385a SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1
-EBUILD selinux-entropyd-2.20170805-r4.ebuild 288 BLAKE2B 4f2c14f354e73e4c8c8fa5f5771f29f33ca3975b4ca913d1b4730f35e085a1c800244b1a9bec88f77741482a5bcd7c1685e8eda5bda86d11b8e23332467e4805 SHA512 532df8d2ae82fceb83249e47c25450f1a73f7249b1e31a345862baa04401529a06bd2ebf1777a3294f46d1a1c164eea0b38e1a193cdc2b7d0d0b1fef02cde23a
 EBUILD selinux-entropyd-2.20180114-r1.ebuild 286 BLAKE2B d91ec84be9f08f769dc8837fb585c853b08e8f319f3a575607f5132b0af2d08970cd2ba261c1ae986ef653dc8a1c25023ed79a3b1de95af7313155c03e55878d SHA512 503f1eadde311785402cc3e02ac177b975d92a6352f555d80397093c1210aff06196864fc7307c8e445a63934a7b241d6a7318e5a9440be1dc20680c46c087dd
 EBUILD selinux-entropyd-2.20180114-r2.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
+EBUILD selinux-entropyd-2.20180114-r3.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
 EBUILD selinux-entropyd-9999.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
 MISC metadata.xml 333 BLAKE2B 413e0582ad11233747036b6669533af49c9c6f43954d104bdfd062efb891c36bdfe526b0eac7317c5c7a350c480ce7e903f7b87b9eaf776d21c7a84576627d9d SHA512 0d80f8560f5d0dd12ac9913f52a7d6ce5f96567b727fd68c7f66ee96edb25dd5adc168bf2618c6992d56d96c049ac44240621ae576b46b536f4851dad9c049cf
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r1.ebuild
deleted file mode 100644
index be9434592141..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r2.ebuild
deleted file mode 100644
index b161e431a80f..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r3.ebuild
deleted file mode 100644
index b161e431a80f..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r4.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r4.ebuild
deleted file mode 100644
index b161e431a80f..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r4.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r4.ebuild
deleted file mode 100644
index be9434592141..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20180114-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..d58341e4fc36
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="entropyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for entropyd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 2e5ff3246094..53590293906e 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-evolution-2.20170204-r1.ebuild 388 BLAKE2B a458eee69c3ddaf15f3b1e61ba22f0a6f9c8f1c8b5baae2d5dbc4797e94e3bb4ae00227cf8bfa9f65065e370afbed30f482bd397b45e77497402d68b58ae9a52 SHA512 60b6b46027fbefd7288ff2863455d9a40f55395b4560b8c38fb0b081747473f9cc7c1dffc37aa62766b70781578cceed32d3bf9f3067309e760c49c5f6b14435
-EBUILD selinux-evolution-2.20170204-r2.ebuild 386 BLAKE2B d72669a01e2b1397ce1346f90c5e518af18eb701ccd0db599e73698f90aadf91eebfd5a8b53b567645862666b6fc459004148f1b5f00950848d7c9a0b608fbb7 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c
-EBUILD selinux-evolution-2.20170204-r3.ebuild 386 BLAKE2B d72669a01e2b1397ce1346f90c5e518af18eb701ccd0db599e73698f90aadf91eebfd5a8b53b567645862666b6fc459004148f1b5f00950848d7c9a0b608fbb7 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c
-EBUILD selinux-evolution-2.20170204-r4.ebuild 386 BLAKE2B d72669a01e2b1397ce1346f90c5e518af18eb701ccd0db599e73698f90aadf91eebfd5a8b53b567645862666b6fc459004148f1b5f00950848d7c9a0b608fbb7 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c
 EBUILD selinux-evolution-2.20170805-r2.ebuild 386 BLAKE2B d72669a01e2b1397ce1346f90c5e518af18eb701ccd0db599e73698f90aadf91eebfd5a8b53b567645862666b6fc459004148f1b5f00950848d7c9a0b608fbb7 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c
 EBUILD selinux-evolution-2.20170805-r3.ebuild 386 BLAKE2B d72669a01e2b1397ce1346f90c5e518af18eb701ccd0db599e73698f90aadf91eebfd5a8b53b567645862666b6fc459004148f1b5f00950848d7c9a0b608fbb7 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c
-EBUILD selinux-evolution-2.20170805-r4.ebuild 388 BLAKE2B a458eee69c3ddaf15f3b1e61ba22f0a6f9c8f1c8b5baae2d5dbc4797e94e3bb4ae00227cf8bfa9f65065e370afbed30f482bd397b45e77497402d68b58ae9a52 SHA512 60b6b46027fbefd7288ff2863455d9a40f55395b4560b8c38fb0b081747473f9cc7c1dffc37aa62766b70781578cceed32d3bf9f3067309e760c49c5f6b14435
 EBUILD selinux-evolution-2.20180114-r1.ebuild 386 BLAKE2B 45bd407a0bc5c8ed37390fc133a5af2b7f4226b70afffebbbc1979da4057f69c1698ccc5265c036e4c02aed566497ab05399ca45e1ee3af366aa21c3f939c3fd SHA512 cfa6b12d75ff108e4d4f7603503bfb8f125f5787d48c3710877611f269a1fb7d31fdf38a19a6e85d5665391fdec2e62c200c1f1b9a6724f0aaac97b225a8c8d6
 EBUILD selinux-evolution-2.20180114-r2.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
+EBUILD selinux-evolution-2.20180114-r3.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
 EBUILD selinux-evolution-9999.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
 MISC metadata.xml 319 BLAKE2B 827cd797e5422e54ce6d813dfe5c600dabb778ac4d9f099202b206abae98931807176d07aeb0020fa41a3d62e4aeaeef0b98b33f18b9f827bd5a85f691b7630a SHA512 5fd8bf75b73ea55686dc7d253d26fd4fb43cd89e46e141ee4fcb4da6b4ea9056aafb499f0bdc5e7d3cf15fb286497e05402a282d21f93ae6d18bd6b2cef0f0b4
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r1.ebuild
deleted file mode 100644
index 16c61488cca9..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r2.ebuild
deleted file mode 100644
index 91acf3bb059b..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r3.ebuild
deleted file mode 100644
index 91acf3bb059b..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r4.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r4.ebuild
deleted file mode 100644
index 91acf3bb059b..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r4.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r4.ebuild
deleted file mode 100644
index 16c61488cca9..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20180114-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c5fb02648452
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="evolution"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for evolution"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index f05ad808921d..46ec82b8f4e1 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-exim-2.20170204-r1.ebuild 280 BLAKE2B 2379bcddd56d5fc59735514382999633ef3664522eb1376d6058d84b18698155006a6e6f33a0bd0010a1b7ef7a6dd469f0a1074af5ecace9ebeba67c1a50b13c SHA512 01ab22b764f32bb29f8c3091358bbf61521ef355f8b64b804983c6a9ea4d3ddd8529bb44cb64ef40f7404b4606910cc7a258a2cf0b0179945a92b899e19362b4
-EBUILD selinux-exim-2.20170204-r2.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f461932531e08a858be84f57c8fe0ff04caea05a20fbe997ce929f484755ae34c4b99ddcc4a8830c2cce1344123325029a002fd SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286
-EBUILD selinux-exim-2.20170204-r3.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f461932531e08a858be84f57c8fe0ff04caea05a20fbe997ce929f484755ae34c4b99ddcc4a8830c2cce1344123325029a002fd SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286
-EBUILD selinux-exim-2.20170204-r4.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f461932531e08a858be84f57c8fe0ff04caea05a20fbe997ce929f484755ae34c4b99ddcc4a8830c2cce1344123325029a002fd SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286
 EBUILD selinux-exim-2.20170805-r2.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f461932531e08a858be84f57c8fe0ff04caea05a20fbe997ce929f484755ae34c4b99ddcc4a8830c2cce1344123325029a002fd SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286
 EBUILD selinux-exim-2.20170805-r3.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f461932531e08a858be84f57c8fe0ff04caea05a20fbe997ce929f484755ae34c4b99ddcc4a8830c2cce1344123325029a002fd SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286
-EBUILD selinux-exim-2.20170805-r4.ebuild 280 BLAKE2B 2379bcddd56d5fc59735514382999633ef3664522eb1376d6058d84b18698155006a6e6f33a0bd0010a1b7ef7a6dd469f0a1074af5ecace9ebeba67c1a50b13c SHA512 01ab22b764f32bb29f8c3091358bbf61521ef355f8b64b804983c6a9ea4d3ddd8529bb44cb64ef40f7404b4606910cc7a258a2cf0b0179945a92b899e19362b4
 EBUILD selinux-exim-2.20180114-r1.ebuild 278 BLAKE2B d35a8243d349eb44902771a5ed881ae61baabfa15fa72dc21623bea235a4231926254b4b2067a375e1dde272ef84a31814c73dbd9f9e094b4499aaf71fc87fe4 SHA512 7e6dfee86ca8d1eee1703cbdf48c1fdd6770bbf6042fa980a9d9d4d11518f078d50ace9d596be5c4447c97878876c43000b2a5cbca1ed64edeff3b4b0ee1b6cb
 EBUILD selinux-exim-2.20180114-r2.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
+EBUILD selinux-exim-2.20180114-r3.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
 EBUILD selinux-exim-9999.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
 MISC metadata.xml 314 BLAKE2B c2415733accb4920f1d02a77d2af6b2c4ec0ad8e90fb9e6a8d501dd19ae8036470b1280d075b2ed0cfdd90110a650566d9ae68a953318dfdfa41bf5b5251a46d SHA512 219657ec49c7edd6b2f78c3edcd2f06a9a5e12324988bb3dba22f3da68903ea42f9cdbd48ddd95a21abe6b59b27244e6c654869dee7db1a653ab7bc89fd36b1a
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170204-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170204-r1.ebuild
deleted file mode 100644
index 0a93a9896758..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170204-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170204-r2.ebuild
deleted file mode 100644
index 04c9e431e452..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170204-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170204-r3.ebuild
deleted file mode 100644
index 04c9e431e452..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170204-r4.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170204-r4.ebuild
deleted file mode 100644
index 04c9e431e452..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170805-r4.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170805-r4.ebuild
deleted file mode 100644
index 0a93a9896758..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20180114-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..73ffc301d15c
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="exim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for exim"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 4da2f609ac06..ad0b6be7d4b0 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-fail2ban-2.20170204-r1.ebuild 288 BLAKE2B 8e88f917df69911542e3226fc45ba177954132328138eb382171cfdf6a8201a4bc499801f741ec262383d7e24be9d22bce866f74b3caa2082261aae1d82e5bd2 SHA512 e53629026965f59981ead269c101c2ca14463f2a27eb484b71411fc5dedc938236ac1c95592e314b07af91e9bb58537e9b7c46305b8805eb1d15c013befcbe3b
-EBUILD selinux-fail2ban-2.20170204-r2.ebuild 286 BLAKE2B 71e230c5a39df97998b49078de6621e214c3da5912749a664180060caa2707771b4824df8d7d1d90cc117a631f916814203ad3516a2edca041bb1f4cdb2c373c SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592
-EBUILD selinux-fail2ban-2.20170204-r3.ebuild 286 BLAKE2B 71e230c5a39df97998b49078de6621e214c3da5912749a664180060caa2707771b4824df8d7d1d90cc117a631f916814203ad3516a2edca041bb1f4cdb2c373c SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592
-EBUILD selinux-fail2ban-2.20170204-r4.ebuild 286 BLAKE2B 71e230c5a39df97998b49078de6621e214c3da5912749a664180060caa2707771b4824df8d7d1d90cc117a631f916814203ad3516a2edca041bb1f4cdb2c373c SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592
 EBUILD selinux-fail2ban-2.20170805-r2.ebuild 286 BLAKE2B 71e230c5a39df97998b49078de6621e214c3da5912749a664180060caa2707771b4824df8d7d1d90cc117a631f916814203ad3516a2edca041bb1f4cdb2c373c SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592
 EBUILD selinux-fail2ban-2.20170805-r3.ebuild 286 BLAKE2B 71e230c5a39df97998b49078de6621e214c3da5912749a664180060caa2707771b4824df8d7d1d90cc117a631f916814203ad3516a2edca041bb1f4cdb2c373c SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592
-EBUILD selinux-fail2ban-2.20170805-r4.ebuild 288 BLAKE2B 8e88f917df69911542e3226fc45ba177954132328138eb382171cfdf6a8201a4bc499801f741ec262383d7e24be9d22bce866f74b3caa2082261aae1d82e5bd2 SHA512 e53629026965f59981ead269c101c2ca14463f2a27eb484b71411fc5dedc938236ac1c95592e314b07af91e9bb58537e9b7c46305b8805eb1d15c013befcbe3b
 EBUILD selinux-fail2ban-2.20180114-r1.ebuild 286 BLAKE2B 18de2881e70cd43bcd40c02a2e44314166c601e213efb7f065da26bb71b3f1aa431dc3460619ae1272f6077ed5b7a2e6033771b994c44e10ab6604a5257128c1 SHA512 c8c047312f7a5972a676f62013756afbe8897f6f2d3861af44036b62eab966e7271cfec99c555c70a3d3d19efbc114b6b015332a3f59cef8a1498c10a4ce7488
 EBUILD selinux-fail2ban-2.20180114-r2.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
+EBUILD selinux-fail2ban-2.20180114-r3.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
 EBUILD selinux-fail2ban-9999.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
 MISC metadata.xml 318 BLAKE2B e95df98e6f8f3f9e88df4a93bb326b51d7ca228e96eb7eae30654ab441bbd9930478e22755a1988dac5142d546c905be0acd1baa888a635a5ed8173fda53b4ca SHA512 e3d5af97c4cc7917dd015904de3badbecf54cf8fd3c10c294d33d3bee38b5b7b0b82888ebfac3afbc7d9b53b15e876bd16be1ba5a6567e7736a30bb1c1995349
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r1.ebuild
deleted file mode 100644
index b52254f9da68..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r2.ebuild
deleted file mode 100644
index 845bdb9e2354..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r3.ebuild
deleted file mode 100644
index 845bdb9e2354..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r4.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r4.ebuild
deleted file mode 100644
index 845bdb9e2354..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r4.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r4.ebuild
deleted file mode 100644
index b52254f9da68..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180114-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2135a7bb5fb7
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fail2ban"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fail2ban"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 8b7ecd264522..03696eb1e9f4 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-fetchmail-2.20170204-r1.ebuild 290 BLAKE2B c29a10f2b1204654a9c244af9d2d985594d4b9d33cf1fb50fd03c5183997d363e9cbaa37036e993a60f2502d23eedaef5e4f01ed5ca3cdc48f109e90edbdf4c7 SHA512 8ff07ba58d3055cc4028043089e65f2b3d249640bdbb20035b6c351334a8ced22654d36edf0f5afcd1cb4c398707964892c00c71ee3fe06bd732ec56d9e6efda
-EBUILD selinux-fetchmail-2.20170204-r2.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2c6d3c001129b02578c50ab900ed2e8f4b9a33d3b6701c4812a0253a6157ba1a82dd1dc59930b3b218c2d6022ca14456a5a8f874ab7 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95
-EBUILD selinux-fetchmail-2.20170204-r3.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2c6d3c001129b02578c50ab900ed2e8f4b9a33d3b6701c4812a0253a6157ba1a82dd1dc59930b3b218c2d6022ca14456a5a8f874ab7 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95
-EBUILD selinux-fetchmail-2.20170204-r4.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2c6d3c001129b02578c50ab900ed2e8f4b9a33d3b6701c4812a0253a6157ba1a82dd1dc59930b3b218c2d6022ca14456a5a8f874ab7 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95
 EBUILD selinux-fetchmail-2.20170805-r2.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2c6d3c001129b02578c50ab900ed2e8f4b9a33d3b6701c4812a0253a6157ba1a82dd1dc59930b3b218c2d6022ca14456a5a8f874ab7 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95
 EBUILD selinux-fetchmail-2.20170805-r3.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2c6d3c001129b02578c50ab900ed2e8f4b9a33d3b6701c4812a0253a6157ba1a82dd1dc59930b3b218c2d6022ca14456a5a8f874ab7 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95
-EBUILD selinux-fetchmail-2.20170805-r4.ebuild 290 BLAKE2B c29a10f2b1204654a9c244af9d2d985594d4b9d33cf1fb50fd03c5183997d363e9cbaa37036e993a60f2502d23eedaef5e4f01ed5ca3cdc48f109e90edbdf4c7 SHA512 8ff07ba58d3055cc4028043089e65f2b3d249640bdbb20035b6c351334a8ced22654d36edf0f5afcd1cb4c398707964892c00c71ee3fe06bd732ec56d9e6efda
 EBUILD selinux-fetchmail-2.20180114-r1.ebuild 288 BLAKE2B b44657971263ce459cdb732684efa8571f820bd967a696af02c2ef0fa699010ce45ddc0880564d9465755b43feb32ede01aadc1547cf4a264bd29be34e74720b SHA512 04ff3bc24d3faa9e97ca821343728583cec3d6e87a3eec742222c89f81b85993e6886f01f37799d17f3b4fe6125b5b0d3126c7f74b83c651da37c1036e8b2cf9
 EBUILD selinux-fetchmail-2.20180114-r2.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
+EBUILD selinux-fetchmail-2.20180114-r3.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
 EBUILD selinux-fetchmail-9999.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
 MISC metadata.xml 319 BLAKE2B e073dc2b6ff305b6eada410f65d501d465ee269aaece755ae147580c52b4487bd805947f5bcce1f80cfda5dc0995caec87f6cb73ff393837b7877462b1f3296e SHA512 7e8e5cc8a4d87c86538ce4d507c43763e77be4819715c302c6c616fd6d84c010c109fba0ee147ed4dee2398f5d924e28561b4d9fb4b8c7f99acb8861ac05b472
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r1.ebuild
deleted file mode 100644
index 3f6a235d2487..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r2.ebuild
deleted file mode 100644
index 66140edae922..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r3.ebuild
deleted file mode 100644
index 66140edae922..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r4.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r4.ebuild
deleted file mode 100644
index 66140edae922..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r4.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r4.ebuild
deleted file mode 100644
index 3f6a235d2487..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180114-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1c4c778ba5af
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fetchmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fetchmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index 12e4c431bf41..b0f2307d46fe 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-finger-2.20170204-r1.ebuild 379 BLAKE2B 4f202cb92bf811ad058b0a237aaa99f405f01afa734035c993769a74eb892facdcfea1d1d0f4f0599bafd2f62e582d5d6ba4e04db23fca3c420e234cb179815d SHA512 88c1c9c746a4c19b16deac479d5d22197f0f2ff040541bd1648b505aac33929bf4b94f2c429d048ca6d0cce0cf98291c2fa41bbf1175ca7f966b24eacc31a2e0
-EBUILD selinux-finger-2.20170204-r2.ebuild 377 BLAKE2B ff667a395281176cce09b774ad959c3086a88d7e2b690bc6eda78133790c9a0a5d03fbf0012ea0a8d6a73bcb7599c357a47bde5131016d238c3c7617e679b79e SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802
-EBUILD selinux-finger-2.20170204-r3.ebuild 377 BLAKE2B ff667a395281176cce09b774ad959c3086a88d7e2b690bc6eda78133790c9a0a5d03fbf0012ea0a8d6a73bcb7599c357a47bde5131016d238c3c7617e679b79e SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802
-EBUILD selinux-finger-2.20170204-r4.ebuild 377 BLAKE2B ff667a395281176cce09b774ad959c3086a88d7e2b690bc6eda78133790c9a0a5d03fbf0012ea0a8d6a73bcb7599c357a47bde5131016d238c3c7617e679b79e SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802
 EBUILD selinux-finger-2.20170805-r2.ebuild 377 BLAKE2B ff667a395281176cce09b774ad959c3086a88d7e2b690bc6eda78133790c9a0a5d03fbf0012ea0a8d6a73bcb7599c357a47bde5131016d238c3c7617e679b79e SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802
 EBUILD selinux-finger-2.20170805-r3.ebuild 377 BLAKE2B ff667a395281176cce09b774ad959c3086a88d7e2b690bc6eda78133790c9a0a5d03fbf0012ea0a8d6a73bcb7599c357a47bde5131016d238c3c7617e679b79e SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802
-EBUILD selinux-finger-2.20170805-r4.ebuild 379 BLAKE2B 4f202cb92bf811ad058b0a237aaa99f405f01afa734035c993769a74eb892facdcfea1d1d0f4f0599bafd2f62e582d5d6ba4e04db23fca3c420e234cb179815d SHA512 88c1c9c746a4c19b16deac479d5d22197f0f2ff040541bd1648b505aac33929bf4b94f2c429d048ca6d0cce0cf98291c2fa41bbf1175ca7f966b24eacc31a2e0
 EBUILD selinux-finger-2.20180114-r1.ebuild 377 BLAKE2B cb8e2b93da9c49c82941aeb2797349f04eaa26ac80ad0fa85f8e70a12fb2706d5c1afb956ecc7b0e83209d5716651eb03776ba1e7c717d2554d2a72650899876 SHA512 650e792126aad2ac4fdacfbc6dc0e9649bc4fcc1c77a8561e8d35f54cc5c7c163972ef61c456b3fa451863b448836956929fce6fb6a4b6d41327a78b7924dc9d
 EBUILD selinux-finger-2.20180114-r2.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
+EBUILD selinux-finger-2.20180114-r3.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
 EBUILD selinux-finger-9999.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
 MISC metadata.xml 316 BLAKE2B 4616dff4829030f8809d5bfd76c5b3ba9efa72963c9e758418b06bd85a1538125526b60d1fe6fd282dbe9cc04a9139f85f8a134751be0ba47b157d8e5d62d9a1 SHA512 52daa0a0cca3fc954aafb579561bbd1c68d17cb2b1ab8f03b0de5be5a6d0c02dcdd1c1384a6b55dfe83e41ebf62da5dd3cb39bc11e03eacab82b18ce198ab8a7
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170204-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170204-r1.ebuild
deleted file mode 100644
index eb23f0062012..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170204-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170204-r2.ebuild
deleted file mode 100644
index db0f3afa26f2..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170204-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170204-r3.ebuild
deleted file mode 100644
index db0f3afa26f2..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170204-r4.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170204-r4.ebuild
deleted file mode 100644
index db0f3afa26f2..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170805-r4.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170805-r4.ebuild
deleted file mode 100644
index eb23f0062012..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20180114-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..04668c6ca0b6
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="finger"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for finger"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 42ebe0853c6f..9027464ba248 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-flash-2.20170204-r1.ebuild 282 BLAKE2B dc53ae431fc71dcbe747079ec4f982119ca2e6fa4ceb39d7a7b2bde47152d88f5f4f8e067eb0106ba74781902c94db3c85316f3760856f5a188684aa32ba4a02 SHA512 693a00499184276b494b9bcf6999968407d9a3f1f789d62a93f488e9522c86c816da1ef208a234de0da3406f70799316d71e37147bb65389ee12e56727844bf5
-EBUILD selinux-flash-2.20170204-r2.ebuild 280 BLAKE2B 445b038d4a164313e67c5e388736f345e4d390803f37e264d36dd79aa536d61e12175aa18cfdbf2481b67553a5f8fe7d3fdb33e80da335a9be537827a9e68660 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3
-EBUILD selinux-flash-2.20170204-r3.ebuild 280 BLAKE2B 445b038d4a164313e67c5e388736f345e4d390803f37e264d36dd79aa536d61e12175aa18cfdbf2481b67553a5f8fe7d3fdb33e80da335a9be537827a9e68660 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3
-EBUILD selinux-flash-2.20170204-r4.ebuild 280 BLAKE2B 445b038d4a164313e67c5e388736f345e4d390803f37e264d36dd79aa536d61e12175aa18cfdbf2481b67553a5f8fe7d3fdb33e80da335a9be537827a9e68660 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3
 EBUILD selinux-flash-2.20170805-r2.ebuild 280 BLAKE2B 445b038d4a164313e67c5e388736f345e4d390803f37e264d36dd79aa536d61e12175aa18cfdbf2481b67553a5f8fe7d3fdb33e80da335a9be537827a9e68660 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3
 EBUILD selinux-flash-2.20170805-r3.ebuild 280 BLAKE2B 445b038d4a164313e67c5e388736f345e4d390803f37e264d36dd79aa536d61e12175aa18cfdbf2481b67553a5f8fe7d3fdb33e80da335a9be537827a9e68660 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3
-EBUILD selinux-flash-2.20170805-r4.ebuild 282 BLAKE2B dc53ae431fc71dcbe747079ec4f982119ca2e6fa4ceb39d7a7b2bde47152d88f5f4f8e067eb0106ba74781902c94db3c85316f3760856f5a188684aa32ba4a02 SHA512 693a00499184276b494b9bcf6999968407d9a3f1f789d62a93f488e9522c86c816da1ef208a234de0da3406f70799316d71e37147bb65389ee12e56727844bf5
 EBUILD selinux-flash-2.20180114-r1.ebuild 280 BLAKE2B 053fa938e689a0ec43a8d940c5024d63b8cdbeba5dc448f8ac2b2f7fb47768f8d06d3950f4c0227075499a640f76f537b42f9dcf2edb12ccccedc85090c520e4 SHA512 263956232acec65293b38252b4bdbfbdb34a27b6e11e42a517a9d17c98c8ea5c59f3b9897f324519a8b479a69fd2cc3fbccc544b7ed1318175c960917c317151
 EBUILD selinux-flash-2.20180114-r2.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
+EBUILD selinux-flash-2.20180114-r3.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
 EBUILD selinux-flash-9999.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
 MISC metadata.xml 326 BLAKE2B 7bf48ddd76caa0a0e6ffa9ac59dbe33b521498795ec20b8da4a155ff8c7c729e5c8904569ce4793780c78abb5ad92b2292af23be21fca3c1b1eda793ef375757 SHA512 0534363003255e27ff839750cb0a7363afe38894d5ffda86dca467dcc0c25cd0de3c186ae856391d3466602eedde24599fee66c2a2786bb662da5abb646a9d50
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170204-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170204-r1.ebuild
deleted file mode 100644
index b72f895854fe..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170204-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170204-r2.ebuild
deleted file mode 100644
index c323d6d1b044..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170204-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170204-r3.ebuild
deleted file mode 100644
index c323d6d1b044..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170204-r4.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170204-r4.ebuild
deleted file mode 100644
index c323d6d1b044..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170805-r4.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170805-r4.ebuild
deleted file mode 100644
index b72f895854fe..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20180114-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..09267ae8a349
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="flash"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for flash"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index 9197365274fc..c39f96aa477d 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-fprintd-2.20170204-r1.ebuild 378 BLAKE2B c9a82aff7eee483aa5756e09ef61cd2b0b8fa81ea941968b80e820c904483b2c761ebfb196dd8c34814418aa97d2a93be31e4b4084089ee68ea2c322679d643e SHA512 7c44ff20bf43e7d9ba3ccd844759ce7e423b4e72214b84ce4c25cde3e876b6fbe21cbd8880ee5f89220b825719135cf4e677a93b6d7f138d16a6d7035609bed9
-EBUILD selinux-fprintd-2.20170204-r2.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f85bafd66b06d909fbbbdf7962976d99299659f6a35637f7ef69ebc39bf96dd73d2f6e6268474456ff9d8f279ad4b4558e19163f8 SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3
-EBUILD selinux-fprintd-2.20170204-r3.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f85bafd66b06d909fbbbdf7962976d99299659f6a35637f7ef69ebc39bf96dd73d2f6e6268474456ff9d8f279ad4b4558e19163f8 SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3
-EBUILD selinux-fprintd-2.20170204-r4.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f85bafd66b06d909fbbbdf7962976d99299659f6a35637f7ef69ebc39bf96dd73d2f6e6268474456ff9d8f279ad4b4558e19163f8 SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3
 EBUILD selinux-fprintd-2.20170805-r2.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f85bafd66b06d909fbbbdf7962976d99299659f6a35637f7ef69ebc39bf96dd73d2f6e6268474456ff9d8f279ad4b4558e19163f8 SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3
 EBUILD selinux-fprintd-2.20170805-r3.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f85bafd66b06d909fbbbdf7962976d99299659f6a35637f7ef69ebc39bf96dd73d2f6e6268474456ff9d8f279ad4b4558e19163f8 SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3
-EBUILD selinux-fprintd-2.20170805-r4.ebuild 378 BLAKE2B c9a82aff7eee483aa5756e09ef61cd2b0b8fa81ea941968b80e820c904483b2c761ebfb196dd8c34814418aa97d2a93be31e4b4084089ee68ea2c322679d643e SHA512 7c44ff20bf43e7d9ba3ccd844759ce7e423b4e72214b84ce4c25cde3e876b6fbe21cbd8880ee5f89220b825719135cf4e677a93b6d7f138d16a6d7035609bed9
 EBUILD selinux-fprintd-2.20180114-r1.ebuild 376 BLAKE2B b0b06f790bb6eefb2441e6e96e9b69c599eb8eaed3db9b0a6f1aeb28276cf19c2baf1bdc87b9e2af4b69b9139dd00b2ddc43849fb2a05bd187be510b77555d93 SHA512 e8b9bb62cd7e3aaad9767728c0fb256339f04e8a3961b6b96e9af52fbd579627cd8ce520e100f95881dcdb1775c899853236720766ff3ff22e141782c05498bf
 EBUILD selinux-fprintd-2.20180114-r2.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
+EBUILD selinux-fprintd-2.20180114-r3.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
 EBUILD selinux-fprintd-9999.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
 MISC metadata.xml 317 BLAKE2B 9f9ccfabc8cfba6051f77a746c06cd1a0752fc436b99969b9a08ec19cb2c4bfa810570df992eb9477ae043661184d7752435a8b32b063ed0c5eae9bf02c04d33 SHA512 b81abea30f23855ef1ab888e412acae6e66013ed0805219a09cdf6b89dfb06bb76f009aa4adb2caf880b4db26193af2fd90d4d95b74e94568438687dbc578d19
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r1.ebuild
deleted file mode 100644
index d302e23cb97d..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r2.ebuild
deleted file mode 100644
index a683af902859..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r3.ebuild
deleted file mode 100644
index a683af902859..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r4.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r4.ebuild
deleted file mode 100644
index a683af902859..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r4.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r4.ebuild
deleted file mode 100644
index d302e23cb97d..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20180114-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..0e40c0e7a66c
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fprintd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fprintd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index 836ad83963c7..64be9e444a40 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ftp-2.20170204-r1.ebuild 278 BLAKE2B 2176d309bfadfce32a131c39a3f850eee60d939994a9dad1df251465f36678fd45d468082a93f8cd38530f6efdbcc66a8e3fa2b4e44132e3da932840710d6c59 SHA512 224834fc17de3d8aa1869721f6385d16c6fcae5df2a7f4f00633b1f0491f79f791a0bdc1be6660a555edd623bd28e00772c3e4a321d0dda9aed59d1b31279223
-EBUILD selinux-ftp-2.20170204-r2.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa8b3f8fb923b813c17b1df936176836373e8c3b163ac5b53631c381bd501de47219200822d503fd370160eabf7fa2cd18fe08 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc
-EBUILD selinux-ftp-2.20170204-r3.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa8b3f8fb923b813c17b1df936176836373e8c3b163ac5b53631c381bd501de47219200822d503fd370160eabf7fa2cd18fe08 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc
-EBUILD selinux-ftp-2.20170204-r4.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa8b3f8fb923b813c17b1df936176836373e8c3b163ac5b53631c381bd501de47219200822d503fd370160eabf7fa2cd18fe08 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc
 EBUILD selinux-ftp-2.20170805-r2.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa8b3f8fb923b813c17b1df936176836373e8c3b163ac5b53631c381bd501de47219200822d503fd370160eabf7fa2cd18fe08 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc
 EBUILD selinux-ftp-2.20170805-r3.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa8b3f8fb923b813c17b1df936176836373e8c3b163ac5b53631c381bd501de47219200822d503fd370160eabf7fa2cd18fe08 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc
-EBUILD selinux-ftp-2.20170805-r4.ebuild 278 BLAKE2B 2176d309bfadfce32a131c39a3f850eee60d939994a9dad1df251465f36678fd45d468082a93f8cd38530f6efdbcc66a8e3fa2b4e44132e3da932840710d6c59 SHA512 224834fc17de3d8aa1869721f6385d16c6fcae5df2a7f4f00633b1f0491f79f791a0bdc1be6660a555edd623bd28e00772c3e4a321d0dda9aed59d1b31279223
 EBUILD selinux-ftp-2.20180114-r1.ebuild 276 BLAKE2B 9bdb6a9b7cb1ef72481eb81b6888ecffabcd4efe06105a4478d9dcc25c242a2e510ff1a3b8164d42c05e6811e28c22caf82be2f5bdddbffc71ceb9da2125976a SHA512 d91002e2bbf29abb24ddf3ed0f12c9d7d06b2f6eb6bd974fabf8c39adba4c37b28b174e61afa0cd46af2d9dc3103e31ac1de4104def8c54b3d157d58edb30cca
 EBUILD selinux-ftp-2.20180114-r2.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
+EBUILD selinux-ftp-2.20180114-r3.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
 EBUILD selinux-ftp-9999.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
 MISC metadata.xml 313 BLAKE2B 517baf67e6834fdc3d1442c7c372f23a739c737068e2e13c33def26402837b2e3697cf39240bca81fe68180f8e509dc0e2d3c19f10780aa5a4a6a9ad0351ee72 SHA512 766f08c10b53ad30173f64f9ca3306cc2441442a6dfb3fd48d485bd0c3c2bb95896e447f6e1d94db1b6808c111489e2e5c2f40c64b1642303d801c99d1fe8c57
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r1.ebuild
deleted file mode 100644
index 8e0376cb5ebb..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r2.ebuild
deleted file mode 100644
index 9d26c095cd26..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r3.ebuild
deleted file mode 100644
index 9d26c095cd26..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r4.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r4.ebuild
deleted file mode 100644
index 9d26c095cd26..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r4.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r4.ebuild
deleted file mode 100644
index 8e0376cb5ebb..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20180114-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..6353d9496e45
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ftp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 2d099a48e644..aa5f0625ee8e 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-games-2.20170204-r1.ebuild 282 BLAKE2B 051f5fb9a7980fa7b9ee125506ec4291e691beb29a5c9c4fb613c5de3cd422ca3774f251a0b69055fbc17e692d989003c36ab8db2b76f7fe2ee0cb69b0c4d48e SHA512 8d2292aac43ddd08870c6418c473bfd57ca7c9e4a6f745273f9ab94616a1749674c38bdf788592ffb84ebd79a155dc07e46948a8798c526d1ab75d24c9408066
-EBUILD selinux-games-2.20170204-r2.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c417c3a9b89bb443a54bc1b46f89a91982f9e6ebfa8bc8ab61f8f8c00e8404bbe4ee14e6027fb2fd421f2ef3088eefc9e22d190 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0
-EBUILD selinux-games-2.20170204-r3.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c417c3a9b89bb443a54bc1b46f89a91982f9e6ebfa8bc8ab61f8f8c00e8404bbe4ee14e6027fb2fd421f2ef3088eefc9e22d190 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0
-EBUILD selinux-games-2.20170204-r4.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c417c3a9b89bb443a54bc1b46f89a91982f9e6ebfa8bc8ab61f8f8c00e8404bbe4ee14e6027fb2fd421f2ef3088eefc9e22d190 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0
 EBUILD selinux-games-2.20170805-r2.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c417c3a9b89bb443a54bc1b46f89a91982f9e6ebfa8bc8ab61f8f8c00e8404bbe4ee14e6027fb2fd421f2ef3088eefc9e22d190 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0
 EBUILD selinux-games-2.20170805-r3.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c417c3a9b89bb443a54bc1b46f89a91982f9e6ebfa8bc8ab61f8f8c00e8404bbe4ee14e6027fb2fd421f2ef3088eefc9e22d190 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0
-EBUILD selinux-games-2.20170805-r4.ebuild 282 BLAKE2B 051f5fb9a7980fa7b9ee125506ec4291e691beb29a5c9c4fb613c5de3cd422ca3774f251a0b69055fbc17e692d989003c36ab8db2b76f7fe2ee0cb69b0c4d48e SHA512 8d2292aac43ddd08870c6418c473bfd57ca7c9e4a6f745273f9ab94616a1749674c38bdf788592ffb84ebd79a155dc07e46948a8798c526d1ab75d24c9408066
 EBUILD selinux-games-2.20180114-r1.ebuild 280 BLAKE2B d2dbf9504ad2fae821a010e88388f014d7fa4ed093f57cfef8461eb3a5bbc4ef91ddb02d30e5c566033f168c454694d8144dc54500d3f1c1aa97483ba511aa66 SHA512 8579f3d952fd9742975ba40b511e893fa54eb19af9170e52e6b9418f70dee592ee07c0b59511ed21624f801a25670a3ff45b98cf455db45c47dfef1f9e525ccc
 EBUILD selinux-games-2.20180114-r2.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
+EBUILD selinux-games-2.20180114-r3.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
 EBUILD selinux-games-9999.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
 MISC metadata.xml 315 BLAKE2B 1232c932d995c55e4fccd0caf1b2b1d352878d82747b3a8c6eb52098afd11ba83aabb33b483293c7eaf1caf81add060c2cb0ad03f6339404fea29ce65f851c9a SHA512 056daa36a74927c8200145591e5fbabc9404fea497de85f944ab497c9b75507a34c7f40696829dbdb5d7d7edb8a74e8bc4fce97acba3ec84bbdf8000a106544b
diff --git a/sec-policy/selinux-games/selinux-games-2.20170204-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20170204-r1.ebuild
deleted file mode 100644
index 4c24909e61d9..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20170204-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20170204-r2.ebuild
deleted file mode 100644
index d512c656bda1..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20170204-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20170204-r3.ebuild
deleted file mode 100644
index d512c656bda1..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20170204-r4.ebuild b/sec-policy/selinux-games/selinux-games-2.20170204-r4.ebuild
deleted file mode 100644
index d512c656bda1..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20170805-r4.ebuild b/sec-policy/selinux-games/selinux-games-2.20170805-r4.ebuild
deleted file mode 100644
index 4c24909e61d9..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20180114-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4057d0081474
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="games"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for games"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index fea418d27bd6..b61e685d2b9d 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gatekeeper-2.20170204-r1.ebuild 292 BLAKE2B a90a98b707604b2d81e82bf2e666b3b2b8fe6cece3ee6beb1737707bf9c0adddd577c40d4e3a8f14763f757b038f72aa2ac9d0cf9b077de496298e9fdf1ac5f3 SHA512 151b0dec849d4533b68f3d8be0b465a2b441bfe8f38ac9cf0a0e6845966140139591dbbd9f3348801eacd9930358490a1a581448fe9993c134c45eb38025cc87
-EBUILD selinux-gatekeeper-2.20170204-r2.ebuild 290 BLAKE2B 5b1aee806b59aea062acdbf814d9890dfa022a3f290248bddbaaf00d2e68809496a084ce55425437a70702d1e00538606845d34746e39996bd48ab8a710d6fbe SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67
-EBUILD selinux-gatekeeper-2.20170204-r3.ebuild 290 BLAKE2B 5b1aee806b59aea062acdbf814d9890dfa022a3f290248bddbaaf00d2e68809496a084ce55425437a70702d1e00538606845d34746e39996bd48ab8a710d6fbe SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67
-EBUILD selinux-gatekeeper-2.20170204-r4.ebuild 290 BLAKE2B 5b1aee806b59aea062acdbf814d9890dfa022a3f290248bddbaaf00d2e68809496a084ce55425437a70702d1e00538606845d34746e39996bd48ab8a710d6fbe SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67
 EBUILD selinux-gatekeeper-2.20170805-r2.ebuild 290 BLAKE2B 5b1aee806b59aea062acdbf814d9890dfa022a3f290248bddbaaf00d2e68809496a084ce55425437a70702d1e00538606845d34746e39996bd48ab8a710d6fbe SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67
 EBUILD selinux-gatekeeper-2.20170805-r3.ebuild 290 BLAKE2B 5b1aee806b59aea062acdbf814d9890dfa022a3f290248bddbaaf00d2e68809496a084ce55425437a70702d1e00538606845d34746e39996bd48ab8a710d6fbe SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67
-EBUILD selinux-gatekeeper-2.20170805-r4.ebuild 292 BLAKE2B a90a98b707604b2d81e82bf2e666b3b2b8fe6cece3ee6beb1737707bf9c0adddd577c40d4e3a8f14763f757b038f72aa2ac9d0cf9b077de496298e9fdf1ac5f3 SHA512 151b0dec849d4533b68f3d8be0b465a2b441bfe8f38ac9cf0a0e6845966140139591dbbd9f3348801eacd9930358490a1a581448fe9993c134c45eb38025cc87
 EBUILD selinux-gatekeeper-2.20180114-r1.ebuild 290 BLAKE2B 6b0ee589fd681020df5bfb6b529553a08516632ac4319d64bcec52ed1efd4406b690cfe5f94d7e029f25b59fa25879dd11be03103efb9ed0bc1f345b90f608c1 SHA512 2aae8002cd3e3735e3e082c14e6e7c7f4ba9fac233743a6c2efa444c6b10f6285958f5b8b684b8b6e723a11e0ad7d18127e324f5844bd1905fb9d337ac45a1c5
 EBUILD selinux-gatekeeper-2.20180114-r2.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
+EBUILD selinux-gatekeeper-2.20180114-r3.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
 EBUILD selinux-gatekeeper-9999.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
 MISC metadata.xml 320 BLAKE2B d91c149118f412ba61feff679a92152bee2bc3be1cd62c5ba9e3caa0a0fc94a0161c5f70595c7e2616f93359693e05037e181f26cd334955b90e7ce0e967d69b SHA512 d03bbe8a36c743c5a8ec79df643d4075e1edb314f2d37b6579e155acd141e3d1c08d8c070f0690c899b166fa469e2774a546132f19353c81a541f831087aa55b
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r1.ebuild
deleted file mode 100644
index 1c7fb8d34324..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r2.ebuild
deleted file mode 100644
index ceccf09bb602..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r3.ebuild
deleted file mode 100644
index ceccf09bb602..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r4.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r4.ebuild
deleted file mode 100644
index ceccf09bb602..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r4.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r4.ebuild
deleted file mode 100644
index 1c7fb8d34324..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180114-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c10d2e7e7c9f
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gatekeeper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gatekeeper"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index 4501b1222f74..72b169311369 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-git-2.20170204-r1.ebuild 374 BLAKE2B f47ddf03eaea721c74cdae9feac6663ce7c48fc4a3103cd247682e704b67b1b31c3828f7fbcc549fbe256d742eef1af55b987a4b3d48cdaaa4755b5107775cf9 SHA512 61118174098f658adb0c617c867bac82ddf8adfe4b3e70282ff8d52da961d9eb517a349357c1a8f6fd39e48effbfa94fc24d41a206f19513e402cf0a3daee5a0
-EBUILD selinux-git-2.20170204-r2.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b676d2f12977c45034eef1f763e178630975ed56ef876a61b2438e79c1bf52f895e2ff15806dafd8c0bdd95d0a7f4108117f5e7 SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be
-EBUILD selinux-git-2.20170204-r3.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b676d2f12977c45034eef1f763e178630975ed56ef876a61b2438e79c1bf52f895e2ff15806dafd8c0bdd95d0a7f4108117f5e7 SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be
-EBUILD selinux-git-2.20170204-r4.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b676d2f12977c45034eef1f763e178630975ed56ef876a61b2438e79c1bf52f895e2ff15806dafd8c0bdd95d0a7f4108117f5e7 SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be
 EBUILD selinux-git-2.20170805-r2.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b676d2f12977c45034eef1f763e178630975ed56ef876a61b2438e79c1bf52f895e2ff15806dafd8c0bdd95d0a7f4108117f5e7 SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be
 EBUILD selinux-git-2.20170805-r3.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b676d2f12977c45034eef1f763e178630975ed56ef876a61b2438e79c1bf52f895e2ff15806dafd8c0bdd95d0a7f4108117f5e7 SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be
-EBUILD selinux-git-2.20170805-r4.ebuild 374 BLAKE2B f47ddf03eaea721c74cdae9feac6663ce7c48fc4a3103cd247682e704b67b1b31c3828f7fbcc549fbe256d742eef1af55b987a4b3d48cdaaa4755b5107775cf9 SHA512 61118174098f658adb0c617c867bac82ddf8adfe4b3e70282ff8d52da961d9eb517a349357c1a8f6fd39e48effbfa94fc24d41a206f19513e402cf0a3daee5a0
 EBUILD selinux-git-2.20180114-r1.ebuild 372 BLAKE2B f18cebe3b7e6d07178a70ad20065f934c256dcb7878a3f86a6ee2071a11336e3e72b5979f7de256c0402a19a67baea6429b4c62600c4667e9906df5592706094 SHA512 bee9100fde860491d73906929a81833357b292b6bd19df089fbf403ce35ba88ec7df2c88c67087691f5eee22a98f630a7a57f88bce047942c71b489e2a2f8286
 EBUILD selinux-git-2.20180114-r2.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
+EBUILD selinux-git-2.20180114-r3.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
 EBUILD selinux-git-9999.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
 MISC metadata.xml 313 BLAKE2B effb568bf70e783215963ed3cbabecdbdf7bf8246a47791737925a4198f3daa55c471e223d89b83d58e3d3c2eaec75cc7d2a127a781b1bf1410cb346c28d3505 SHA512 907a80ca3d13826b0ddf500695e9d568cc90a3708a4fa87d442a9b32b93f94795d8d5bb8cfb191a95fc1eae4173c4bdba8192e427606ce6c74b00aa8d25239b6
diff --git a/sec-policy/selinux-git/selinux-git-2.20170204-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20170204-r1.ebuild
deleted file mode 100644
index 7efd60bfe073..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20170204-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20170204-r2.ebuild
deleted file mode 100644
index 2e5c586bcc2c..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20170204-r3.ebuild b/sec-policy/selinux-git/selinux-git-2.20170204-r3.ebuild
deleted file mode 100644
index 2e5c586bcc2c..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20170204-r4.ebuild b/sec-policy/selinux-git/selinux-git-2.20170204-r4.ebuild
deleted file mode 100644
index 2e5c586bcc2c..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20170805-r4.ebuild b/sec-policy/selinux-git/selinux-git-2.20170805-r4.ebuild
deleted file mode 100644
index 7efd60bfe073..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20180114-r3.ebuild b/sec-policy/selinux-git/selinux-git-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c88c3cfb5859
--- /dev/null
+++ b/sec-policy/selinux-git/selinux-git-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="git"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for git"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index f2b819c880a8..1281fc01a261 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gitosis-2.20170204-r1.ebuild 286 BLAKE2B eca7be85f5c4ff67c0a047a9575288e50921aceb5462a6039fd56e45f36c7327fe0edb8cdacc0d60c96b6d8d642c07868a9a96b8fcc075345c47ba38a529edc0 SHA512 51e8548c8395447f8be3ce3d8e3ffdbd380a24fcfc927d765062008016d97e1b1b504815bdbf55bf863607e713607a9c0c508269a06c0310a3a57d4a448c627f
-EBUILD selinux-gitosis-2.20170204-r2.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77320afd671cd74546e1d99b1cbc9927c451651ac8863fb990f586d49ef2ccace37cafcd5348ffed535a5ff1ca9204b7ddf322a5f1 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5
-EBUILD selinux-gitosis-2.20170204-r3.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77320afd671cd74546e1d99b1cbc9927c451651ac8863fb990f586d49ef2ccace37cafcd5348ffed535a5ff1ca9204b7ddf322a5f1 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5
-EBUILD selinux-gitosis-2.20170204-r4.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77320afd671cd74546e1d99b1cbc9927c451651ac8863fb990f586d49ef2ccace37cafcd5348ffed535a5ff1ca9204b7ddf322a5f1 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5
 EBUILD selinux-gitosis-2.20170805-r2.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77320afd671cd74546e1d99b1cbc9927c451651ac8863fb990f586d49ef2ccace37cafcd5348ffed535a5ff1ca9204b7ddf322a5f1 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5
 EBUILD selinux-gitosis-2.20170805-r3.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77320afd671cd74546e1d99b1cbc9927c451651ac8863fb990f586d49ef2ccace37cafcd5348ffed535a5ff1ca9204b7ddf322a5f1 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5
-EBUILD selinux-gitosis-2.20170805-r4.ebuild 286 BLAKE2B eca7be85f5c4ff67c0a047a9575288e50921aceb5462a6039fd56e45f36c7327fe0edb8cdacc0d60c96b6d8d642c07868a9a96b8fcc075345c47ba38a529edc0 SHA512 51e8548c8395447f8be3ce3d8e3ffdbd380a24fcfc927d765062008016d97e1b1b504815bdbf55bf863607e713607a9c0c508269a06c0310a3a57d4a448c627f
 EBUILD selinux-gitosis-2.20180114-r1.ebuild 284 BLAKE2B e2c3faf80ecbed4275cef356e96777576abca75d1c82f137825228f78ab5b835fb8e072da43d272c736038a42d167cff74c7e7a1a5b7af625efd6e1ff96edb9a SHA512 394bbd7995f8bb52846c8cf075472d78244aaaa921209442e1ff9dc2c3cd6de92ddd89e70363a9bbcd61a8d2c0c820034f4912b2d0719737184cf14ad2fb7408
 EBUILD selinux-gitosis-2.20180114-r2.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
+EBUILD selinux-gitosis-2.20180114-r3.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
 EBUILD selinux-gitosis-9999.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
 MISC metadata.xml 317 BLAKE2B 2783356823beb4808b1b3cc33c32ff6791ce87dc8f0ee675a1f115b085ecb6514a324846b3f495822f0682fc45f7287e3380ece31d4231412bfd101f628fbdeb SHA512 aaf3e9dc008475b8fa3eea3471cc12fbac3ff7473303649cc8d4189513657f0dbf7ddb9b9cce659220ef4100a4560d551547886923c7cf43e12316c6bde03d17
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r1.ebuild
deleted file mode 100644
index 995d98230feb..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r2.ebuild
deleted file mode 100644
index a8675b63b73f..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r3.ebuild
deleted file mode 100644
index a8675b63b73f..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r4.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r4.ebuild
deleted file mode 100644
index a8675b63b73f..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r4.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r4.ebuild
deleted file mode 100644
index 995d98230feb..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20180114-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..0f2fb118b3e1
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gitosis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gitosis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index ce50f93f7326..fa4d936645ca 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gnome-2.20170204-r1.ebuild 282 BLAKE2B 10a878b9c15c3f63c0086da4246bf70726266674864067dbcbcfad00cece11748c1d2d44da3980a5f09630c46c05fef58a725a52f35c1bdd8fd0afc2f9e11064 SHA512 c74c5392e1bae262f9290aa8e8296b7d2e21efa08b793c2779e0335c1fe6c9fa3136d5d52279f95729e297656475518e5d4ce72e669f968722a16e4a55ef1a35
-EBUILD selinux-gnome-2.20170204-r2.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8e40d4ff7fa3c05ee8bdbc50965384a47cca012ee12e42cce591177b7f272c33b9d2718ef713bc260ea3c5b4ac4f9b2ffc86029 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2
-EBUILD selinux-gnome-2.20170204-r3.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8e40d4ff7fa3c05ee8bdbc50965384a47cca012ee12e42cce591177b7f272c33b9d2718ef713bc260ea3c5b4ac4f9b2ffc86029 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2
-EBUILD selinux-gnome-2.20170204-r4.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8e40d4ff7fa3c05ee8bdbc50965384a47cca012ee12e42cce591177b7f272c33b9d2718ef713bc260ea3c5b4ac4f9b2ffc86029 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2
 EBUILD selinux-gnome-2.20170805-r2.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8e40d4ff7fa3c05ee8bdbc50965384a47cca012ee12e42cce591177b7f272c33b9d2718ef713bc260ea3c5b4ac4f9b2ffc86029 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2
 EBUILD selinux-gnome-2.20170805-r3.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8e40d4ff7fa3c05ee8bdbc50965384a47cca012ee12e42cce591177b7f272c33b9d2718ef713bc260ea3c5b4ac4f9b2ffc86029 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2
-EBUILD selinux-gnome-2.20170805-r4.ebuild 282 BLAKE2B 10a878b9c15c3f63c0086da4246bf70726266674864067dbcbcfad00cece11748c1d2d44da3980a5f09630c46c05fef58a725a52f35c1bdd8fd0afc2f9e11064 SHA512 c74c5392e1bae262f9290aa8e8296b7d2e21efa08b793c2779e0335c1fe6c9fa3136d5d52279f95729e297656475518e5d4ce72e669f968722a16e4a55ef1a35
 EBUILD selinux-gnome-2.20180114-r1.ebuild 280 BLAKE2B 56c25071d6c04a7463516bccd17ebbc574a085d422965abd5a58516bc7798725697b2ac5fc469092a3b92f57d5bde8436e03e46a9f19320fc29c5fe2d342dd2f SHA512 dcba23c72712d6b0f262c3b46998eb18d113c06fd24d4ba40a4b64fb8649dde6e0a95b3bba08f3e87bfb550acd89ca9d3aff67a5c404c508f842b164e021d483
 EBUILD selinux-gnome-2.20180114-r2.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
+EBUILD selinux-gnome-2.20180114-r3.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
 EBUILD selinux-gnome-9999.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
 MISC metadata.xml 315 BLAKE2B 1932f9fe6969fec43c46097b2085ca52cd1127fc78f06a4447166ec95c342c7fb04dad5d35f6f38506e94f5cb099e500085fbe692c7949a5dcca1ac423988b2d SHA512 31d6b3a85661d1b7438e748deb4b92fb4908ace1ee215381d47953c265a75f171b58138d775e9bc1c55aeeb1e375e0ebbc6f6d98e9292fcb27a83e79975f54f3
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r1.ebuild
deleted file mode 100644
index 092756b47a10..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r2.ebuild
deleted file mode 100644
index 3053d928e565..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r3.ebuild
deleted file mode 100644
index 3053d928e565..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r4.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r4.ebuild
deleted file mode 100644
index 3053d928e565..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r4.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r4.ebuild
deleted file mode 100644
index 092756b47a10..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20180114-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..0038031ba9d5
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gnome"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gnome"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 45d92b48c40d..5eb4dd3d3420 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-googletalk-2.20170204-r1.ebuild 296 BLAKE2B 85f889444504616d731e97337499fbb126fbd02ea2dd8c001c58c241ae61a47a2995d59c0441737b54a153ad7e4da379b00de2632d74d885941a9454a950a354 SHA512 c8e6acd0c6991be782be496556d9228b89537f0571eef01202f558b0aaf3b943cda029e9ea1dccd9d73b2d339d7eab8b7e3200a0916a701924052df01ae8a929
-EBUILD selinux-googletalk-2.20170204-r2.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b5965e9ae0c1b78d37b1b0c27448e7c1d1b6ed428522c1cf342985108d35b4500b577a403fe5ab272f9b57472219b248a2dfb0d1f83d98 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6
-EBUILD selinux-googletalk-2.20170204-r3.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b5965e9ae0c1b78d37b1b0c27448e7c1d1b6ed428522c1cf342985108d35b4500b577a403fe5ab272f9b57472219b248a2dfb0d1f83d98 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6
-EBUILD selinux-googletalk-2.20170204-r4.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b5965e9ae0c1b78d37b1b0c27448e7c1d1b6ed428522c1cf342985108d35b4500b577a403fe5ab272f9b57472219b248a2dfb0d1f83d98 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6
 EBUILD selinux-googletalk-2.20170805-r2.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b5965e9ae0c1b78d37b1b0c27448e7c1d1b6ed428522c1cf342985108d35b4500b577a403fe5ab272f9b57472219b248a2dfb0d1f83d98 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6
 EBUILD selinux-googletalk-2.20170805-r3.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b5965e9ae0c1b78d37b1b0c27448e7c1d1b6ed428522c1cf342985108d35b4500b577a403fe5ab272f9b57472219b248a2dfb0d1f83d98 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6
-EBUILD selinux-googletalk-2.20170805-r4.ebuild 296 BLAKE2B 85f889444504616d731e97337499fbb126fbd02ea2dd8c001c58c241ae61a47a2995d59c0441737b54a153ad7e4da379b00de2632d74d885941a9454a950a354 SHA512 c8e6acd0c6991be782be496556d9228b89537f0571eef01202f558b0aaf3b943cda029e9ea1dccd9d73b2d339d7eab8b7e3200a0916a701924052df01ae8a929
 EBUILD selinux-googletalk-2.20180114-r1.ebuild 294 BLAKE2B 7e9eb49026cde11de107c3adf05e096ef9829246d270ce76aa4c7728d5a14b5f5f2ba5e9b7c5db717868db81f5f94d6f5ea0b89a0a76cee0a119c04a9e842389 SHA512 fd377f68c3cc8b10747fbe1d579ff788ab3b120adfa4648a5dca853986f5a258e6c4b78fc86a0c4d3091520e059e8ad7edaac19ba0c52ef1659e1c18ab3e9338
 EBUILD selinux-googletalk-2.20180114-r2.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
+EBUILD selinux-googletalk-2.20180114-r3.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
 EBUILD selinux-googletalk-9999.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
 MISC metadata.xml 321 BLAKE2B 2d10b65fda50b9f62a890a562f6c972873d80f356cdb3d73cb7f88f4481dc780c2a5031064b71371758b9ec8a34b277b33c433286bb82ae05c7f675ed0746927 SHA512 e09997299b9a7ed78be623f1158549b24d507e8393f47da561094dc216cfbd5f715ab169875c3faa42025da80972d825c55fac9335392731d7a181f78c41286b
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r1.ebuild
deleted file mode 100644
index 7acb35a9c323..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r2.ebuild
deleted file mode 100644
index 485e75461fa7..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r3.ebuild
deleted file mode 100644
index 485e75461fa7..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r4.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r4.ebuild
deleted file mode 100644
index 485e75461fa7..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r4.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r4.ebuild
deleted file mode 100644
index 7acb35a9c323..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20180114-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..715779dd67c1
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="googletalk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for googletalk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index 516abb6b7215..24505dbf4766 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gorg-2.20170204-r1.ebuild 280 BLAKE2B df0f29126bf4b298e896fd1a1627acc90357ab2e759f6ac866a780982c088531271570019d87de832fb44b58fd500159953e8e4cc016661c63c73feec35f0770 SHA512 a9656bbef538f64cb147f4ffa22f05ccae099e293ddf1a683703d7e22b528b5df801a0f78a4eeb8b68c2e6d763209e0599f9f7936ba3b9c85750bcd902b2129a
-EBUILD selinux-gorg-2.20170204-r2.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67ee21b84800252dd8b227de5907b62aa7c7a31ce20c60c71bed278f17e408d1910c0945dd593fd2d2a739f0181e141246ff5d1 SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd
-EBUILD selinux-gorg-2.20170204-r3.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67ee21b84800252dd8b227de5907b62aa7c7a31ce20c60c71bed278f17e408d1910c0945dd593fd2d2a739f0181e141246ff5d1 SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd
-EBUILD selinux-gorg-2.20170204-r4.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67ee21b84800252dd8b227de5907b62aa7c7a31ce20c60c71bed278f17e408d1910c0945dd593fd2d2a739f0181e141246ff5d1 SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd
 EBUILD selinux-gorg-2.20170805-r2.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67ee21b84800252dd8b227de5907b62aa7c7a31ce20c60c71bed278f17e408d1910c0945dd593fd2d2a739f0181e141246ff5d1 SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd
 EBUILD selinux-gorg-2.20170805-r3.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67ee21b84800252dd8b227de5907b62aa7c7a31ce20c60c71bed278f17e408d1910c0945dd593fd2d2a739f0181e141246ff5d1 SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd
-EBUILD selinux-gorg-2.20170805-r4.ebuild 280 BLAKE2B df0f29126bf4b298e896fd1a1627acc90357ab2e759f6ac866a780982c088531271570019d87de832fb44b58fd500159953e8e4cc016661c63c73feec35f0770 SHA512 a9656bbef538f64cb147f4ffa22f05ccae099e293ddf1a683703d7e22b528b5df801a0f78a4eeb8b68c2e6d763209e0599f9f7936ba3b9c85750bcd902b2129a
 EBUILD selinux-gorg-2.20180114-r1.ebuild 278 BLAKE2B 8fe4d5379f2c72bdd11bd548bf796f0311729cc76be80ef51b3da033a543e63b4a45415c5c9a1c4f79befe363382de2112d4c00cc8c0718c59c6149c287c6666 SHA512 c09443eac98ed28ea7c402c29d8761a892949e3869eb5243e8c54c9494ef9353311e1f35047ed7f36fba3865d6245393487a54782a051c2af65293511c1eac60
 EBUILD selinux-gorg-2.20180114-r2.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
+EBUILD selinux-gorg-2.20180114-r3.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
 EBUILD selinux-gorg-9999.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
 MISC metadata.xml 314 BLAKE2B c5f46fdd3046a5e9ca0fe3a6a518f39329090fe38761a84e147868e126a108d1d04d29de16cd7d7e4bab04672cd77d2ca594c0f29b7593e05ec1dac3d54a1fd7 SHA512 bbbf21e449ca7c6bc287093a5c8f42db23f0f41f41316b7b5f08e7a1bcbcdd3e54c2e79bbeec9533ef78c2a8ef5e6c029ffad2f02eee7532e219fef42b0f99b8
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r1.ebuild
deleted file mode 100644
index f4eff5e13fcf..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r2.ebuild
deleted file mode 100644
index 447dca165e3a..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r3.ebuild
deleted file mode 100644
index 447dca165e3a..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r4.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r4.ebuild
deleted file mode 100644
index 447dca165e3a..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r4.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r4.ebuild
deleted file mode 100644
index f4eff5e13fcf..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20180114-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1538462400a9
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gorg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gorg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index 44b95b3dae83..883120127dd4 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gpg-2.20170204-r1.ebuild 278 BLAKE2B 33174c82504b2981ef564a5285d4acde6537265473dfd1997104f4f5fd6800ffb395c044c3c05d957151cccee960d90e77ad73882d4dfa009c9f30f04fef8d4b SHA512 65d4d8cb15d99c8fa0095c1bfdc88521cdb688f41e8f92ecb53da7aa07bbdd0deb6aec750a0c1704d29e04d380cd0989635b904ab1850ca9c338ee4622a36306
-EBUILD selinux-gpg-2.20170204-r2.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386a6ee36b6d340cf5a96234d47e63a70591e6fc9fc2263de936612b5882b3c569c3f644375becae5fedd90c56291e25813b438 SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7
-EBUILD selinux-gpg-2.20170204-r3.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386a6ee36b6d340cf5a96234d47e63a70591e6fc9fc2263de936612b5882b3c569c3f644375becae5fedd90c56291e25813b438 SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7
-EBUILD selinux-gpg-2.20170204-r4.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386a6ee36b6d340cf5a96234d47e63a70591e6fc9fc2263de936612b5882b3c569c3f644375becae5fedd90c56291e25813b438 SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7
 EBUILD selinux-gpg-2.20170805-r2.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386a6ee36b6d340cf5a96234d47e63a70591e6fc9fc2263de936612b5882b3c569c3f644375becae5fedd90c56291e25813b438 SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7
 EBUILD selinux-gpg-2.20170805-r3.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386a6ee36b6d340cf5a96234d47e63a70591e6fc9fc2263de936612b5882b3c569c3f644375becae5fedd90c56291e25813b438 SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7
-EBUILD selinux-gpg-2.20170805-r4.ebuild 377 BLAKE2B 627fd0e4b57cb9fd3c17a357d429c0f057b66c5b75ac2bcb9feb740517df862e77d7f62fbe5164df91ca73e529e50de88371f96c4b37cfea984ff280d468a94f SHA512 ed572b8c2d639deb6e01abdef2919db94f3493a3a4f14f83636a87295a20df3b7288b22a89eca1dd2ab0aae970db3aea2a07bbd3b115259c73a836cccdb242e7
 EBUILD selinux-gpg-2.20180114-r1.ebuild 375 BLAKE2B 8f82301056fd5b042dde285220f4eab3478ee7feb530323a6ddffe408b3f1b86d666c07161c19215a8bb2b311a57a837cd94ff302e589386875cb3bebac1612a SHA512 35b8edef3d506aa496b5746911227d93384ff3af629374ba97a488a549879edfc57bdf12924f97e3906c63fcdf31f05a224d1fccd336e6cca348b9f123c87ac7
 EBUILD selinux-gpg-2.20180114-r2.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
+EBUILD selinux-gpg-2.20180114-r3.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
 EBUILD selinux-gpg-9999.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
 MISC metadata.xml 315 BLAKE2B f1ad4327dbf000875d21f426a15d4e8acd3f1f6c0a4934697f805d5a3f9a304ddfac85e5563119d39f40ce78adb9869208ef0e54f580a34e7649c7a1c8edeba3 SHA512 5d35232f8849235b089f2f8b7e4eb1b1692e805a196605e51d78ac960613ba9116b25ddeb4bc3141a043af41454ad653bd4cd44ab8bf386c0d89075b75028f35
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r1.ebuild
deleted file mode 100644
index 14ec068cc0f4..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r2.ebuild
deleted file mode 100644
index 9ee3d3257b12..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r3.ebuild
deleted file mode 100644
index 9ee3d3257b12..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r4.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r4.ebuild
deleted file mode 100644
index 9ee3d3257b12..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r4.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r4.ebuild
deleted file mode 100644
index fbf406d7ff60..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dirmngr
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dirmngr
-"
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20180114-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..34f5b61061ad
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dirmngr
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dirmngr
+"
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index f35bb27f8516..46e619b2a70c 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gpm-2.20170204-r1.ebuild 278 BLAKE2B 8047d2b09f4e27c2e958b3f409ddc051e394e8b3c7bdbae5b16d93a994667a90b216694a257d04df2d7211caa55dfe97149f61060a2e88529c5d6716888441b1 SHA512 021f77c663d5b10aeadf93be5ac914b92bb58593042725925960f3f23a443f1a198a257e28c5de13b5227b9a2c21716509dcb8ba86ee14c467fa7eb09e86b53c
-EBUILD selinux-gpm-2.20170204-r2.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b5e4dedb7b9698b946f4d1d9cc5cd0aafbbdd48221c697e9718dc49c23999819f51c0099b2b6475ff63eee98867ffea9e975a SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b
-EBUILD selinux-gpm-2.20170204-r3.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b5e4dedb7b9698b946f4d1d9cc5cd0aafbbdd48221c697e9718dc49c23999819f51c0099b2b6475ff63eee98867ffea9e975a SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b
-EBUILD selinux-gpm-2.20170204-r4.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b5e4dedb7b9698b946f4d1d9cc5cd0aafbbdd48221c697e9718dc49c23999819f51c0099b2b6475ff63eee98867ffea9e975a SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b
 EBUILD selinux-gpm-2.20170805-r2.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b5e4dedb7b9698b946f4d1d9cc5cd0aafbbdd48221c697e9718dc49c23999819f51c0099b2b6475ff63eee98867ffea9e975a SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b
 EBUILD selinux-gpm-2.20170805-r3.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b5e4dedb7b9698b946f4d1d9cc5cd0aafbbdd48221c697e9718dc49c23999819f51c0099b2b6475ff63eee98867ffea9e975a SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b
-EBUILD selinux-gpm-2.20170805-r4.ebuild 278 BLAKE2B 8047d2b09f4e27c2e958b3f409ddc051e394e8b3c7bdbae5b16d93a994667a90b216694a257d04df2d7211caa55dfe97149f61060a2e88529c5d6716888441b1 SHA512 021f77c663d5b10aeadf93be5ac914b92bb58593042725925960f3f23a443f1a198a257e28c5de13b5227b9a2c21716509dcb8ba86ee14c467fa7eb09e86b53c
 EBUILD selinux-gpm-2.20180114-r1.ebuild 276 BLAKE2B fe19eac7a2a7bbdbfa83496d1584e9c6f21f10d0be87455bd13a906b11afa5ffcc6a4c93e0acf71880a71467e96c24042ecbeb02dc821f6aaabccebf041c45a9 SHA512 a5ee0c98a6c6e12ab64959016d43556fd2a6031dcb73e5ab4257f115bb38c21810b61ff98e486773dc69d4b08a63a838e07438e73fb91ff2169624bab4e7ee53
 EBUILD selinux-gpm-2.20180114-r2.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
+EBUILD selinux-gpm-2.20180114-r3.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
 EBUILD selinux-gpm-9999.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
 MISC metadata.xml 313 BLAKE2B 0156d87c7a5dfa2fcb253ff1cb51bf894ad4aee416fc5f8fa1bbe5db086b73b9bfd28b07fa715284d3526e6724a4f52a852a6b274b14afbd3ed86de0be3375d4 SHA512 c51b135cecad18c17f0597b098d2c0e0d60fcc4a51c70534bb7b4d39e85374cdfc6b793734f514c62194d603b6a0bde889c6772b2438e01bc3632842e1a3c1d7
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r1.ebuild
deleted file mode 100644
index 32c356ae9091..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r2.ebuild
deleted file mode 100644
index fd4ff754ca46..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r3.ebuild
deleted file mode 100644
index fd4ff754ca46..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r4.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r4.ebuild
deleted file mode 100644
index fd4ff754ca46..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r4.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r4.ebuild
deleted file mode 100644
index 32c356ae9091..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20180114-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..9a99c34dc431
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index e165cab89b42..efa614e0c6e8 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-gpsd-2.20170204-r1.ebuild 280 BLAKE2B 2e8b490709574e1f25191501d55111295e9c5eebd23502291cfa73583c391f0a18239b199cae39683ba9bd94bb8a0ed28f42e0a60f5977fdada26d78095066b8 SHA512 262719337e7626ff706b3318b3013cecfee751c9681710e1849b8f663e506064aada986041e006f7dc220c9a28db917da97702836565caa620c45de2b0218edf
-EBUILD selinux-gpsd-2.20170204-r2.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105f2e6446b3ae34a210aa34d549867040a8bddc6a640ea2283ad90dfac105ef059d64581bdee2fdbd94faa097bf8823606ca9a6 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a
-EBUILD selinux-gpsd-2.20170204-r3.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105f2e6446b3ae34a210aa34d549867040a8bddc6a640ea2283ad90dfac105ef059d64581bdee2fdbd94faa097bf8823606ca9a6 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a
-EBUILD selinux-gpsd-2.20170204-r4.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105f2e6446b3ae34a210aa34d549867040a8bddc6a640ea2283ad90dfac105ef059d64581bdee2fdbd94faa097bf8823606ca9a6 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a
 EBUILD selinux-gpsd-2.20170805-r2.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105f2e6446b3ae34a210aa34d549867040a8bddc6a640ea2283ad90dfac105ef059d64581bdee2fdbd94faa097bf8823606ca9a6 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a
 EBUILD selinux-gpsd-2.20170805-r3.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105f2e6446b3ae34a210aa34d549867040a8bddc6a640ea2283ad90dfac105ef059d64581bdee2fdbd94faa097bf8823606ca9a6 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a
-EBUILD selinux-gpsd-2.20170805-r4.ebuild 280 BLAKE2B 2e8b490709574e1f25191501d55111295e9c5eebd23502291cfa73583c391f0a18239b199cae39683ba9bd94bb8a0ed28f42e0a60f5977fdada26d78095066b8 SHA512 262719337e7626ff706b3318b3013cecfee751c9681710e1849b8f663e506064aada986041e006f7dc220c9a28db917da97702836565caa620c45de2b0218edf
 EBUILD selinux-gpsd-2.20180114-r1.ebuild 278 BLAKE2B 4111994d1fb16ea92326a3f52945bfec5072eb11eccd1276e996f18057fe8fff84c3bc30f418153e879aa89403bc052840fa1dca036ec58ba507f62b16eb39cd SHA512 b21b6808c534f0035b0c33110060dc8888a454227193219f86ef4d59e2996708a4535850ce52dc28c75fa474e5f112eadf8e1acbb0627e7257cf3c0c6f5e76c2
 EBUILD selinux-gpsd-2.20180114-r2.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
+EBUILD selinux-gpsd-2.20180114-r3.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
 EBUILD selinux-gpsd-9999.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
 MISC metadata.xml 314 BLAKE2B 3ff140fdf0bff20956c6daf624624ae51a6002199bc2e5c68c65a13882ca1a983595bee054bb0f417ec42293e177535f2abf923073825caade7da39db1ebad65 SHA512 15038df07a6a26d2e27fcefb00f460d3dce414f5fa30ff7e40a818d27c25747afd61caa1888f3c7b7a4f4030aa0b6f34187e2b36d7ba549a65ad084378043027
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r1.ebuild
deleted file mode 100644
index f5f7d014b04e..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r2.ebuild
deleted file mode 100644
index f0ea0d9089e3..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r3.ebuild
deleted file mode 100644
index f0ea0d9089e3..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r4.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r4.ebuild
deleted file mode 100644
index f0ea0d9089e3..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r4.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r4.ebuild
deleted file mode 100644
index f5f7d014b04e..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20180114-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..bf438a7ffa19
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
index b200a45b441e..43360035adcf 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -1,12 +1,12 @@
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
 EBUILD selinux-gssproxy-2.20170805-r3.ebuild 286 BLAKE2B 15f7642f886571f21c5ceeaea4e0059c6947dbc5252d83bb6aafe592fbc6f3739f51d115536c0d87da674b0bd4c3e3f690296483f9dca7716a504666498f15dd SHA512 364e1c2a368ac2de0c65b385fb3e27cdd34a3ddf3f159cb108b718208a347fd9ceb02183daa812673cc45230ee5ebde7c331375674af547ee6528a31b333f5e2
-EBUILD selinux-gssproxy-2.20170805-r4.ebuild 288 BLAKE2B 4348d8aae0cbf71ff4d5109dff7442c16dcc66cf008cfd71a115c5d860e4d4ad3680c58d9a9b89a7b5d014988379055b318bca4a029d605b12e107f8f3f9395c SHA512 7b633bfc8b0ba5a15801c4c9ef5beaf9ffd5f4636aa0c55b18a2aec45f5a9fa90f32a8ea356f66a937112c87c150bee65768a6dd3a2e7ea34660449432f64ce7
 EBUILD selinux-gssproxy-2.20180114-r1.ebuild 286 BLAKE2B 5bb8c83d1742e6e5bef300d8a0cce83ed766c06dcd3abc6d3d816cd39ae480875b7b50aff9d177323b7b429e553d555ccb8babf012decae78485c17b36337a57 SHA512 298d589cc6d81e103505328a2198b29e2506cb7d6f641e02a74b99d50fcebf21e32bb1fac7d98af4f1fe821a7141c518004f2e2ca3d2ba23222b7f27611fb025
 EBUILD selinux-gssproxy-2.20180114-r2.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
+EBUILD selinux-gssproxy-2.20180114-r3.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
 EBUILD selinux-gssproxy-9999.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
 MISC metadata.xml 318 BLAKE2B 4ac0a5cf3a0f05bbca7dc3c68462a83d55ecf1b463620627a3ee500eca9d1f9e5319eff72f76bd38a935c8f1379122ddd750c4c9003688afd0bf9d9a4238ea9a SHA512 172d47914a3c198f958c1f796e949cf65948ecea9d3c5e1228ff10070bdbaddab3ec63ce9d1d47ea727f57d7574233f8149beec0f52a4de00f3027f97d9452d8
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r4.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r4.ebuild
deleted file mode 100644
index c4d41d41b472..000000000000
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gssproxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gssproxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180114-r3.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5ec1fa45c248
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gssproxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gssproxy"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 5520577170b1..a067e1ce843b 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-hddtemp-2.20170204-r1.ebuild 286 BLAKE2B 8f71217769b8c96360efd7d70afbc5a58e0850926e836daac136bff59b0f418b8bcb6186cad48fe1ec4730b3b331987d857b4cd8c55f62797a2e52e959f792f0 SHA512 95714a293b9302903239f460666f8d35127af968b3a6774639a77ff2f9c0e87651496b78976496b89cb87a6bd7ad4728949b3a579b8d5c30146d1f4dee1ee31e
-EBUILD selinux-hddtemp-2.20170204-r2.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090d042dff8f31b843abf4d2be41f2f4dc84f3ca8fa8fc52a90646d17632aefee350abaf354e4c53eb472c11eb7364fb265b757125d SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb
-EBUILD selinux-hddtemp-2.20170204-r3.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090d042dff8f31b843abf4d2be41f2f4dc84f3ca8fa8fc52a90646d17632aefee350abaf354e4c53eb472c11eb7364fb265b757125d SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb
-EBUILD selinux-hddtemp-2.20170204-r4.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090d042dff8f31b843abf4d2be41f2f4dc84f3ca8fa8fc52a90646d17632aefee350abaf354e4c53eb472c11eb7364fb265b757125d SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb
 EBUILD selinux-hddtemp-2.20170805-r2.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090d042dff8f31b843abf4d2be41f2f4dc84f3ca8fa8fc52a90646d17632aefee350abaf354e4c53eb472c11eb7364fb265b757125d SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb
 EBUILD selinux-hddtemp-2.20170805-r3.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090d042dff8f31b843abf4d2be41f2f4dc84f3ca8fa8fc52a90646d17632aefee350abaf354e4c53eb472c11eb7364fb265b757125d SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb
-EBUILD selinux-hddtemp-2.20170805-r4.ebuild 286 BLAKE2B 8f71217769b8c96360efd7d70afbc5a58e0850926e836daac136bff59b0f418b8bcb6186cad48fe1ec4730b3b331987d857b4cd8c55f62797a2e52e959f792f0 SHA512 95714a293b9302903239f460666f8d35127af968b3a6774639a77ff2f9c0e87651496b78976496b89cb87a6bd7ad4728949b3a579b8d5c30146d1f4dee1ee31e
 EBUILD selinux-hddtemp-2.20180114-r1.ebuild 284 BLAKE2B ec9771533e66050cbc9c2de0424e748ec988345f3e6bc81bc3bf9b6fbe07a669bc841089e3a81adb341490be3593904268ee57fd8013df7dc3f29dd41466948a SHA512 43cf238ba699b7fed624f9469757872de6329b40c6d8db7bb6aa6b9c0f9a161f411c9972246768509daa2e5d57f74388208cd1c96193f30e4454979b136ae240
 EBUILD selinux-hddtemp-2.20180114-r2.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
+EBUILD selinux-hddtemp-2.20180114-r3.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
 EBUILD selinux-hddtemp-9999.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
 MISC metadata.xml 317 BLAKE2B a8f2c2d734a44304ef1c2f8640e9c12d3901d39fa71a72bdc51861bf595de88f574a450f5cb0bb8e4dc6cccb100b5067aad3c9f9b0f6741dedbe7c78ccde5b9d SHA512 2be1948142bfe89c0091371632d7a8bc662cc2f65e7e07bc2635602decc6bf3557191d3989d285a4428cc05d950a815a1b7a6938d1bfc86594e755a25fc3df71
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r1.ebuild
deleted file mode 100644
index 35d6f1c5297a..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r2.ebuild
deleted file mode 100644
index d987e86caa40..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r3.ebuild
deleted file mode 100644
index d987e86caa40..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r4.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r4.ebuild
deleted file mode 100644
index d987e86caa40..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r4.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r4.ebuild
deleted file mode 100644
index 35d6f1c5297a..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180114-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..9cadc59e8777
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="hddtemp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for hddtemp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index 7ea45b556a7d..eb1d8e15155a 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-howl-2.20170204-r1.ebuild 280 BLAKE2B 80dac2d05551924293fcfe86e8099106633c9783751400fa41546c871dab9f4d3c0dc6f95916dcb85e63ed94400fc2ba5bbd928cbceec0008fbf064a2a6293c2 SHA512 40222272b1337b6b395acd5bdb564aec33cec1f1abbc4e3bbe3a1b66773085070b4d1df658d4008b9db3349de42c2ec36104101dc4b1238a2a6837bd2330641a
-EBUILD selinux-howl-2.20170204-r2.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a847958eb1bd423bda527fbb28a01084978a35f29a4d5f064ca16e1701ed51fb8750fbd0a2e69ae143ecf1a2adfa3db7b4c8e42b474 SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8
-EBUILD selinux-howl-2.20170204-r3.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a847958eb1bd423bda527fbb28a01084978a35f29a4d5f064ca16e1701ed51fb8750fbd0a2e69ae143ecf1a2adfa3db7b4c8e42b474 SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8
-EBUILD selinux-howl-2.20170204-r4.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a847958eb1bd423bda527fbb28a01084978a35f29a4d5f064ca16e1701ed51fb8750fbd0a2e69ae143ecf1a2adfa3db7b4c8e42b474 SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8
 EBUILD selinux-howl-2.20170805-r2.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a847958eb1bd423bda527fbb28a01084978a35f29a4d5f064ca16e1701ed51fb8750fbd0a2e69ae143ecf1a2adfa3db7b4c8e42b474 SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8
 EBUILD selinux-howl-2.20170805-r3.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a847958eb1bd423bda527fbb28a01084978a35f29a4d5f064ca16e1701ed51fb8750fbd0a2e69ae143ecf1a2adfa3db7b4c8e42b474 SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8
-EBUILD selinux-howl-2.20170805-r4.ebuild 280 BLAKE2B 80dac2d05551924293fcfe86e8099106633c9783751400fa41546c871dab9f4d3c0dc6f95916dcb85e63ed94400fc2ba5bbd928cbceec0008fbf064a2a6293c2 SHA512 40222272b1337b6b395acd5bdb564aec33cec1f1abbc4e3bbe3a1b66773085070b4d1df658d4008b9db3349de42c2ec36104101dc4b1238a2a6837bd2330641a
 EBUILD selinux-howl-2.20180114-r1.ebuild 278 BLAKE2B 83d478db36f8618284ec6f2006dd70976d0eb824d10cd104a3475ac20217e1ee75ab663400380fa82c394a66fef48a65b4d80e64fd2f1790fa26a0bc161876ae SHA512 57b9c8edef72d9f932e1982331183101a66757342d7f9a180cc0a754dd0fec25483842122e853dc8a8256e32431c0dbc2287c051b77c146abb7f3d265cd19090
 EBUILD selinux-howl-2.20180114-r2.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
+EBUILD selinux-howl-2.20180114-r3.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
 EBUILD selinux-howl-9999.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
 MISC metadata.xml 314 BLAKE2B ab9f8685632c6231f1b32f125e499723048e8edec178166a9caf7c8a6630218af7737802dfbb5c3777d26990bc559da1dee145d4794d9663d4b744405de9a3ee SHA512 f983d404a2995149e5399efa664d1f81398b2fa9bea2e071cb1a8b54e6efd0d43cd42ac4d2bd7ff9d0586158ead91b8bf67169cc7761815073469498396c4da9
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170204-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170204-r1.ebuild
deleted file mode 100644
index 37f0c1f248a4..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170204-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170204-r2.ebuild
deleted file mode 100644
index 450b071d9cae..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170204-r3.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170204-r3.ebuild
deleted file mode 100644
index 450b071d9cae..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170204-r4.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170204-r4.ebuild
deleted file mode 100644
index 450b071d9cae..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170805-r4.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170805-r4.ebuild
deleted file mode 100644
index 37f0c1f248a4..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20180114-r3.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ce74d9396b95
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="howl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index 887659617c7e..1cc61c51443f 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-icecast-2.20170204-r1.ebuild 286 BLAKE2B 8bcf945b1bf52008dbd9dee733ee93538340e6e64a4fc36140f60b9a9159883fb912b48252de9d73f727963bc23be1d99447be31c7d86835d2a0aca69b97013e SHA512 41fede15b84daa85c265d175b5e3d27775bf51ef66058b4ba2b2d88dd1ee82803cc3e31a0bc09ef525ff0f57adb9c21db576026214442d32751944008616d6a1
-EBUILD selinux-icecast-2.20170204-r2.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d7639cf1c12cbde416277bc1d072ac520953b61b5e0cb3f7de2552e5edd6481c03ae6d5613f4dc21662fa8a52d0b992c56ffb5c57e16 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66
-EBUILD selinux-icecast-2.20170204-r3.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d7639cf1c12cbde416277bc1d072ac520953b61b5e0cb3f7de2552e5edd6481c03ae6d5613f4dc21662fa8a52d0b992c56ffb5c57e16 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66
-EBUILD selinux-icecast-2.20170204-r4.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d7639cf1c12cbde416277bc1d072ac520953b61b5e0cb3f7de2552e5edd6481c03ae6d5613f4dc21662fa8a52d0b992c56ffb5c57e16 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66
 EBUILD selinux-icecast-2.20170805-r2.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d7639cf1c12cbde416277bc1d072ac520953b61b5e0cb3f7de2552e5edd6481c03ae6d5613f4dc21662fa8a52d0b992c56ffb5c57e16 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66
 EBUILD selinux-icecast-2.20170805-r3.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d7639cf1c12cbde416277bc1d072ac520953b61b5e0cb3f7de2552e5edd6481c03ae6d5613f4dc21662fa8a52d0b992c56ffb5c57e16 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66
-EBUILD selinux-icecast-2.20170805-r4.ebuild 286 BLAKE2B 8bcf945b1bf52008dbd9dee733ee93538340e6e64a4fc36140f60b9a9159883fb912b48252de9d73f727963bc23be1d99447be31c7d86835d2a0aca69b97013e SHA512 41fede15b84daa85c265d175b5e3d27775bf51ef66058b4ba2b2d88dd1ee82803cc3e31a0bc09ef525ff0f57adb9c21db576026214442d32751944008616d6a1
 EBUILD selinux-icecast-2.20180114-r1.ebuild 284 BLAKE2B 00cc4ff5633578f8342272212592eaf2bf35f9e11d1ae736e9df5b7cc47a501eeb2dd4ab0d33712b3e049d71c8d42c8702a76b4c0d5c552e79344fb6ec22b8a3 SHA512 31f93dafc1617482cc30d9927b17f9532b8121f48e0ccfb55369d8e849e49584779a067fcc3f71b89b7b433f56d6b4ea53c7f56d92db7fe6f825eaa30b4d3b84
 EBUILD selinux-icecast-2.20180114-r2.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
+EBUILD selinux-icecast-2.20180114-r3.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
 EBUILD selinux-icecast-9999.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
 MISC metadata.xml 317 BLAKE2B 5c15c4fe74c3663381d1f85a850ebd86baa744f8649459c741e90fa9126b4b653edea9ea15a07e106dbb9f5d18ef5795a221f4e9eb15708915c651f1b4a72830 SHA512 db55ad061f07883e2a62e74ebeabb5d05c9595fd74b0719068cb54da1ffea47738112c8287242c38b1499a1a9b7bddc1f71edfab4b4a4b1f1262c50791395f21
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r1.ebuild
deleted file mode 100644
index a00b3189d6e3..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r2.ebuild
deleted file mode 100644
index b94587eb4e73..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r3.ebuild
deleted file mode 100644
index b94587eb4e73..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r4.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r4.ebuild
deleted file mode 100644
index b94587eb4e73..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r4.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r4.ebuild
deleted file mode 100644
index a00b3189d6e3..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20180114-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..738fc05228ae
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="icecast"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for icecast"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index a66b9065bb5a..15acbb2e83d1 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ifplugd-2.20170204-r1.ebuild 286 BLAKE2B e178e7146dacc9c255814acc6e0cb33335835cbd8f93c8a87c300343b47641fab03b2a1611782e0ab633895eb77010a0415c16fc193e395c2b04f465c5fe9a6f SHA512 1bcc024bc2b7f7af2b4d866ef481c9181ebf5fb04e175b4718c26ae8722977049cfcfbef1923e0f753275ce9e82ad651bb4dc269b1697a72927558de6cb28127
-EBUILD selinux-ifplugd-2.20170204-r2.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60bc032b526693960e8320f0a74750ec3e219c625d56d6c3db983966cb5b30515d69a484dcaa9d2e28d277b6d9dc54163565d93083 SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27
-EBUILD selinux-ifplugd-2.20170204-r3.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60bc032b526693960e8320f0a74750ec3e219c625d56d6c3db983966cb5b30515d69a484dcaa9d2e28d277b6d9dc54163565d93083 SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27
-EBUILD selinux-ifplugd-2.20170204-r4.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60bc032b526693960e8320f0a74750ec3e219c625d56d6c3db983966cb5b30515d69a484dcaa9d2e28d277b6d9dc54163565d93083 SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27
 EBUILD selinux-ifplugd-2.20170805-r2.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60bc032b526693960e8320f0a74750ec3e219c625d56d6c3db983966cb5b30515d69a484dcaa9d2e28d277b6d9dc54163565d93083 SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27
 EBUILD selinux-ifplugd-2.20170805-r3.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60bc032b526693960e8320f0a74750ec3e219c625d56d6c3db983966cb5b30515d69a484dcaa9d2e28d277b6d9dc54163565d93083 SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27
-EBUILD selinux-ifplugd-2.20170805-r4.ebuild 286 BLAKE2B e178e7146dacc9c255814acc6e0cb33335835cbd8f93c8a87c300343b47641fab03b2a1611782e0ab633895eb77010a0415c16fc193e395c2b04f465c5fe9a6f SHA512 1bcc024bc2b7f7af2b4d866ef481c9181ebf5fb04e175b4718c26ae8722977049cfcfbef1923e0f753275ce9e82ad651bb4dc269b1697a72927558de6cb28127
 EBUILD selinux-ifplugd-2.20180114-r1.ebuild 284 BLAKE2B 84169e52841df2ddb979fe8235d398a2fff7f20bcc9b914af366956613f28d2a381d0316434b5575be1b0e837ad636392cec07a96b73e31464c0b5857df55103 SHA512 3e6afcc7dcc14fd0477349a425668b17290c489d23bfae263d3c9d7009ec8bcbd027290152dcbb5d4d7be3645d41c573e216f90a18530828890a776d287d280a
 EBUILD selinux-ifplugd-2.20180114-r2.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
+EBUILD selinux-ifplugd-2.20180114-r3.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
 EBUILD selinux-ifplugd-9999.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
 MISC metadata.xml 317 BLAKE2B 21371e37cc40f9799d708dc4d68da349bab8757b0d733326ce75f2f97833c528417135f784b29e4bb1ceed7d20e27dad7b15f2c4496f8ab812a5c8b083236052 SHA512 8905d0861d320d44fff344d2208982c611ac72402a9355a23a8b2f43fdf4f13aef9f8b504c1bcb12357852ad51f4f74d1a11b3a71e53fb43ac2ac3d57e268f3a
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r1.ebuild
deleted file mode 100644
index d329259c12b4..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r2.ebuild
deleted file mode 100644
index b06316edc59a..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r3.ebuild
deleted file mode 100644
index b06316edc59a..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r4.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r4.ebuild
deleted file mode 100644
index b06316edc59a..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r4.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r4.ebuild
deleted file mode 100644
index d329259c12b4..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180114-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..41ac6475c514
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ifplugd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ifplugd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 00fc0e8c4fe1..bf5a54d56a24 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-imaze-2.20170204-r1.ebuild 282 BLAKE2B d81b99b4a9613117b94d11adefb47ada7b3f2bb3edd8def65fbfb9bdea3280c7ac52a5eb7a0141aaf9131660a83e7152d0924d6e868ec27734fa4c78ede3401f SHA512 6f83f58a38fa35e29e1aee4522761498c57ec32c32865fda0269806aab937259349d31807f66e12735bf76894df2ab44c11a9aceb9ba563e9e5124f8e3f909bc
-EBUILD selinux-imaze-2.20170204-r2.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5fee6d6709f1698efe68d4f34d44e0616b64118e12bcbd77f6a18ec8c20ef360ca35c2c36a267473bf7467c365d9264f8a7be16b SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db
-EBUILD selinux-imaze-2.20170204-r3.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5fee6d6709f1698efe68d4f34d44e0616b64118e12bcbd77f6a18ec8c20ef360ca35c2c36a267473bf7467c365d9264f8a7be16b SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db
-EBUILD selinux-imaze-2.20170204-r4.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5fee6d6709f1698efe68d4f34d44e0616b64118e12bcbd77f6a18ec8c20ef360ca35c2c36a267473bf7467c365d9264f8a7be16b SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db
 EBUILD selinux-imaze-2.20170805-r2.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5fee6d6709f1698efe68d4f34d44e0616b64118e12bcbd77f6a18ec8c20ef360ca35c2c36a267473bf7467c365d9264f8a7be16b SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db
 EBUILD selinux-imaze-2.20170805-r3.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5fee6d6709f1698efe68d4f34d44e0616b64118e12bcbd77f6a18ec8c20ef360ca35c2c36a267473bf7467c365d9264f8a7be16b SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db
-EBUILD selinux-imaze-2.20170805-r4.ebuild 282 BLAKE2B d81b99b4a9613117b94d11adefb47ada7b3f2bb3edd8def65fbfb9bdea3280c7ac52a5eb7a0141aaf9131660a83e7152d0924d6e868ec27734fa4c78ede3401f SHA512 6f83f58a38fa35e29e1aee4522761498c57ec32c32865fda0269806aab937259349d31807f66e12735bf76894df2ab44c11a9aceb9ba563e9e5124f8e3f909bc
 EBUILD selinux-imaze-2.20180114-r1.ebuild 280 BLAKE2B ea387bfd3ba1e46675eb5e146b28b8356adc6c2b00fc8606e10758b3037f4605f4f77cee269ded467bf85c0d02c389316d7af75ecde94c474eac242ce6295f62 SHA512 354f401b8b62cb6663c8f34422d0376946e8319561eec33c53ca4bc4c216fce435e2ce0da5ad233d6914d6913a3585b86c91d081940367a35e6f029384190d05
 EBUILD selinux-imaze-2.20180114-r2.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
+EBUILD selinux-imaze-2.20180114-r3.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
 EBUILD selinux-imaze-9999.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
 MISC metadata.xml 315 BLAKE2B d844e1ef27a53d646a98320bdfc18a7ac7e8876a01d70f404546c1a2ef2c5a173e4e636bc234bb262a3dbf729747ca9104444d4ae30e4d9acca632ca56d98090 SHA512 8c12773bd2c0c5009639149ff2c80024af96995b148e4e164ccf7ecc44e12333adeb109b245676703f6ff18f13b0b7caa7907b45fe06f688b7c56b71958696ea
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r1.ebuild
deleted file mode 100644
index 450c9c57c0a0..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r2.ebuild
deleted file mode 100644
index c9149c10a566..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r3.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r3.ebuild
deleted file mode 100644
index c9149c10a566..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r4.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r4.ebuild
deleted file mode 100644
index c9149c10a566..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r4.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r4.ebuild
deleted file mode 100644
index 450c9c57c0a0..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20180114-r3.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..934faa978982
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="imaze"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for imaze"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 1c48725b7c32..d9f85f4cad3a 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-inetd-2.20170204-r1.ebuild 282 BLAKE2B 52cf9b61c3a94797571b7db8825657b07d90d7234b1e652d3ace5e29e8f6033d88c3466ce5d6d6678d77ddee5a996bdd3159a4187d066055debbe81c03cd12e3 SHA512 dfe9e114aa7ab2bacd01a6639be8c109c3ddf8c561577355cba90ca8798591ad97b3e32c4af97d490e3720514b553b92234fcbfa8d5946909c51e077f7842ce2
-EBUILD selinux-inetd-2.20170204-r2.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df711f0b13b14b710bbabf5842dd4436b3a5db0f43102995a5371800c9fc5d86a559ab8901d2720d6e117a2afb0ac440333f7a4f SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac
-EBUILD selinux-inetd-2.20170204-r3.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df711f0b13b14b710bbabf5842dd4436b3a5db0f43102995a5371800c9fc5d86a559ab8901d2720d6e117a2afb0ac440333f7a4f SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac
-EBUILD selinux-inetd-2.20170204-r4.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df711f0b13b14b710bbabf5842dd4436b3a5db0f43102995a5371800c9fc5d86a559ab8901d2720d6e117a2afb0ac440333f7a4f SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac
 EBUILD selinux-inetd-2.20170805-r2.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df711f0b13b14b710bbabf5842dd4436b3a5db0f43102995a5371800c9fc5d86a559ab8901d2720d6e117a2afb0ac440333f7a4f SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac
 EBUILD selinux-inetd-2.20170805-r3.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df711f0b13b14b710bbabf5842dd4436b3a5db0f43102995a5371800c9fc5d86a559ab8901d2720d6e117a2afb0ac440333f7a4f SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac
-EBUILD selinux-inetd-2.20170805-r4.ebuild 282 BLAKE2B 52cf9b61c3a94797571b7db8825657b07d90d7234b1e652d3ace5e29e8f6033d88c3466ce5d6d6678d77ddee5a996bdd3159a4187d066055debbe81c03cd12e3 SHA512 dfe9e114aa7ab2bacd01a6639be8c109c3ddf8c561577355cba90ca8798591ad97b3e32c4af97d490e3720514b553b92234fcbfa8d5946909c51e077f7842ce2
 EBUILD selinux-inetd-2.20180114-r1.ebuild 280 BLAKE2B 2a4eb321f08a2d87412610ba8812293e8f7046e98598bf791a6f5b95e77f2f5da39a7e8caaa2b58ff8a908b69b3068e4a25723b2881e97c32b08b47e2565b593 SHA512 3f7fbdb218db805e87f65ee36ac742f48f8017e1a65c2678a7de4b263084a1d3ff7c957188e6fbdc6a1f34364c79a06384842d35faedf56024a1f00fe9c3b189
 EBUILD selinux-inetd-2.20180114-r2.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
+EBUILD selinux-inetd-2.20180114-r3.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
 EBUILD selinux-inetd-9999.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
 MISC metadata.xml 315 BLAKE2B a9eb3c49b5be3317c1de43cd686a7d9e28c5139ca87a9113f88ff3021fb996165890da6fb7bd0caa41eda11038b47dd534e593218520634f2d2a512ecae7617e SHA512 438620bab81d97f74d43168aac08340ab265551b7865d8ce2613fe7ac0885903abaf0d43be01861fb2736cbe047e56c6ff89a8665aacdd05b48c1df86616a358
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r1.ebuild
deleted file mode 100644
index 5dfc645611fe..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r2.ebuild
deleted file mode 100644
index 61e8f5d044fc..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r3.ebuild
deleted file mode 100644
index 61e8f5d044fc..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r4.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r4.ebuild
deleted file mode 100644
index 61e8f5d044fc..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r4.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r4.ebuild
deleted file mode 100644
index 5dfc645611fe..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20180114-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..9330c3d1d3ae
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="inetd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index 9ecc7302bf8a..e166afa81eed 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-inn-2.20170204-r1.ebuild 278 BLAKE2B a1c700a60ca922b53a677c189db787efc87ceb23b5ffc3849560d5f977822e2d0515231fd2be562edca2e399f75a44abc13ab82aa94b67b6b3d2c8c0a0d7ed2e SHA512 652f786bbc3f78086bc4eb68db2e78f824f4fab0036b01d53bcac725c66fe0b7bf04e2157e7fe5f5f7e44b874eedc47cd1d212e05e381d8a3d4ab71b55c48ebe
-EBUILD selinux-inn-2.20170204-r2.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed23a1b6ebcd79beef073444f743f04cee78a7a535fdea4818278086cc11062cc00b0d40366adc963dc66c2fe44d1dc92377653 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511
-EBUILD selinux-inn-2.20170204-r3.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed23a1b6ebcd79beef073444f743f04cee78a7a535fdea4818278086cc11062cc00b0d40366adc963dc66c2fe44d1dc92377653 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511
-EBUILD selinux-inn-2.20170204-r4.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed23a1b6ebcd79beef073444f743f04cee78a7a535fdea4818278086cc11062cc00b0d40366adc963dc66c2fe44d1dc92377653 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511
 EBUILD selinux-inn-2.20170805-r2.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed23a1b6ebcd79beef073444f743f04cee78a7a535fdea4818278086cc11062cc00b0d40366adc963dc66c2fe44d1dc92377653 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511
 EBUILD selinux-inn-2.20170805-r3.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed23a1b6ebcd79beef073444f743f04cee78a7a535fdea4818278086cc11062cc00b0d40366adc963dc66c2fe44d1dc92377653 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511
-EBUILD selinux-inn-2.20170805-r4.ebuild 278 BLAKE2B a1c700a60ca922b53a677c189db787efc87ceb23b5ffc3849560d5f977822e2d0515231fd2be562edca2e399f75a44abc13ab82aa94b67b6b3d2c8c0a0d7ed2e SHA512 652f786bbc3f78086bc4eb68db2e78f824f4fab0036b01d53bcac725c66fe0b7bf04e2157e7fe5f5f7e44b874eedc47cd1d212e05e381d8a3d4ab71b55c48ebe
 EBUILD selinux-inn-2.20180114-r1.ebuild 276 BLAKE2B 64c57f88ce9b650e58d03d5d87fa0a6a7f837abdf120fd125d2dee85e039cedb27120cdc7dea8b8becd1278a44a5dd0e415550e9f730ceced9c62180ab074978 SHA512 d9084823cfb674736e48ed416eb9ac2605cddd9c8953d8e15bb2fbdbf7447a6b9717c0de54549f1a4dc9d053113db03d4e9153ab4fdfaf309ed0538478841c49
 EBUILD selinux-inn-2.20180114-r2.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
+EBUILD selinux-inn-2.20180114-r3.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
 EBUILD selinux-inn-9999.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
 MISC metadata.xml 313 BLAKE2B bb0ed4879acef51b74bbee0cb44c07dcade072dac9bf86f147f50e0042b3376f3a082515f320ba73aa30146ff961fa2a098c9debd81f248c98453b6857eb18da SHA512 697ce85e544cbd0e530b6aa1408ec7cb391c832327ac4012f0bc7b844af03632c3593550bcbb6fc717821b29b68f42ce48d594274240de164ef490c95ed6b5f6
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170204-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170204-r1.ebuild
deleted file mode 100644
index aa1cf8cf674f..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170204-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170204-r2.ebuild
deleted file mode 100644
index e296b2b3892e..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170204-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170204-r3.ebuild
deleted file mode 100644
index e296b2b3892e..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170204-r4.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170204-r4.ebuild
deleted file mode 100644
index e296b2b3892e..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170805-r4.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170805-r4.ebuild
deleted file mode 100644
index aa1cf8cf674f..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20180114-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2f668dd26f26
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="inn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index f50733d17cfe..f6f8e8e7a350 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ipsec-2.20170204-r1.ebuild 282 BLAKE2B 3bb2889965a9b5587dda687633c7610f74118a835ec1c59cbc8f47d0948586bbf1a861e7c25ddfc147a26b40b99116ea2403526c337bd7018e10dcc1bcdf2107 SHA512 b0df3bf894a2e0a76a1c096fabe3e8c8ddee947ec8d4a1a02120a5459bc077b9dc0035d513af8ed2e8714dde9224cd182c94891bd0eee25a93e3b7b099bf546e
-EBUILD selinux-ipsec-2.20170204-r2.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ffcf3dcb13deb9dbe4f81c9207616e33b56c5443503b869ce6a888d3d21ffd574b5ccb9c04d86d21f4e7967390b68a9389262689 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d
-EBUILD selinux-ipsec-2.20170204-r3.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ffcf3dcb13deb9dbe4f81c9207616e33b56c5443503b869ce6a888d3d21ffd574b5ccb9c04d86d21f4e7967390b68a9389262689 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d
-EBUILD selinux-ipsec-2.20170204-r4.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ffcf3dcb13deb9dbe4f81c9207616e33b56c5443503b869ce6a888d3d21ffd574b5ccb9c04d86d21f4e7967390b68a9389262689 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d
 EBUILD selinux-ipsec-2.20170805-r2.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ffcf3dcb13deb9dbe4f81c9207616e33b56c5443503b869ce6a888d3d21ffd574b5ccb9c04d86d21f4e7967390b68a9389262689 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d
 EBUILD selinux-ipsec-2.20170805-r3.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ffcf3dcb13deb9dbe4f81c9207616e33b56c5443503b869ce6a888d3d21ffd574b5ccb9c04d86d21f4e7967390b68a9389262689 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d
-EBUILD selinux-ipsec-2.20170805-r4.ebuild 282 BLAKE2B 3bb2889965a9b5587dda687633c7610f74118a835ec1c59cbc8f47d0948586bbf1a861e7c25ddfc147a26b40b99116ea2403526c337bd7018e10dcc1bcdf2107 SHA512 b0df3bf894a2e0a76a1c096fabe3e8c8ddee947ec8d4a1a02120a5459bc077b9dc0035d513af8ed2e8714dde9224cd182c94891bd0eee25a93e3b7b099bf546e
 EBUILD selinux-ipsec-2.20180114-r1.ebuild 280 BLAKE2B 00b755f93f4f65344087591efb89019fd89754083d6089de4c4c568dd93bf5630a9a83da601dee73f89a48c5c7dd490ab0f8508cb61ad3cd3cffff7d1c97685f SHA512 db1aeb018b6386cef146cebeae32e75e991b7d9c17b07e71a02defb849f6d106343882a9fa13903d764de01b9e47b34ee8417b3a16f40d0c9501e59c5f9e0dcc
 EBUILD selinux-ipsec-2.20180114-r2.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
+EBUILD selinux-ipsec-2.20180114-r3.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
 EBUILD selinux-ipsec-9999.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
 MISC metadata.xml 315 BLAKE2B b8e6cfb46c3e1d84e5f32bc51b17606599cdc025a88dc452bd6c12784845b627819e6c974c710020d41536bd38835f77801a47e0d0a75af26776f112a231139d SHA512 602a740c62ae3a51f2d1d21912b9a1ec5a910a8062813ef0101f4ed0e80c54c78c8595dce19be2cff521a92b251702aa6768c05e4b6fe2301c8cd3e266bd8948
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r1.ebuild
deleted file mode 100644
index c4ddfcfdab11..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r2.ebuild
deleted file mode 100644
index 466fe9db0faf..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r3.ebuild
deleted file mode 100644
index 466fe9db0faf..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r4.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r4.ebuild
deleted file mode 100644
index 466fe9db0faf..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r4.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r4.ebuild
deleted file mode 100644
index c4ddfcfdab11..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20180114-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..afe4efc9a73b
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ipsec"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 8960460f2f35..a0e69c1dcad2 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-irc-2.20170204-r1.ebuild 278 BLAKE2B f0a6990b5d60b0d9dfbfd58bf22519f5aa8147f19d34617d1e736f9831ef96ef58889302fb46f7dd370b21bba0024c053e92d0691c2eaacd26a5f146a19b0cee SHA512 c4cf0fcbdb1f4ece3b865e76617f7e9779f745d896328992591f36dcb91a4fb7f9b07314b2c1c0bcd72e53df5c965e01e68499356d518964c72c5fc69ccf521c
-EBUILD selinux-irc-2.20170204-r2.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0bb130eb5e9adf50ebfe679c926249d6e1beffd771b6472755ad846fe8c5ada5d23cd23d0b0455e449ca7b2ffbd118dfa67723 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b
-EBUILD selinux-irc-2.20170204-r3.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0bb130eb5e9adf50ebfe679c926249d6e1beffd771b6472755ad846fe8c5ada5d23cd23d0b0455e449ca7b2ffbd118dfa67723 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b
-EBUILD selinux-irc-2.20170204-r4.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0bb130eb5e9adf50ebfe679c926249d6e1beffd771b6472755ad846fe8c5ada5d23cd23d0b0455e449ca7b2ffbd118dfa67723 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b
 EBUILD selinux-irc-2.20170805-r2.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0bb130eb5e9adf50ebfe679c926249d6e1beffd771b6472755ad846fe8c5ada5d23cd23d0b0455e449ca7b2ffbd118dfa67723 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b
 EBUILD selinux-irc-2.20170805-r3.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0bb130eb5e9adf50ebfe679c926249d6e1beffd771b6472755ad846fe8c5ada5d23cd23d0b0455e449ca7b2ffbd118dfa67723 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b
-EBUILD selinux-irc-2.20170805-r4.ebuild 278 BLAKE2B f0a6990b5d60b0d9dfbfd58bf22519f5aa8147f19d34617d1e736f9831ef96ef58889302fb46f7dd370b21bba0024c053e92d0691c2eaacd26a5f146a19b0cee SHA512 c4cf0fcbdb1f4ece3b865e76617f7e9779f745d896328992591f36dcb91a4fb7f9b07314b2c1c0bcd72e53df5c965e01e68499356d518964c72c5fc69ccf521c
 EBUILD selinux-irc-2.20180114-r1.ebuild 276 BLAKE2B ec1dbc760cabe2147927372c8ed012ce58315fe90dd75853e810fc7df7912f23435b8df68ebd7a7e8474cbb529e142906ef7c12451166a29a697600530ec6f4d SHA512 ed269d2d2f417cac1519c6667ed7808eb3edbbf2fcb8a72b314985474dde79ff00e43c81b25ce5ba4ffd7c7aa77a935b6a698f17d0be210e917906efb7aee2a7
 EBUILD selinux-irc-2.20180114-r2.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
+EBUILD selinux-irc-2.20180114-r3.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
 EBUILD selinux-irc-9999.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
 MISC metadata.xml 313 BLAKE2B f75266dc159e6b7855968a1226cd33e813b387b09cfe8f810b7f828fca40fb0f5f5b16100b4225b6f89a45d8a9233834c8daa802e1d9c08e8f0d046cf7d3d51c SHA512 79d10315a82d308f9417e6d0b331363b33a8022f0e5366412c0452f614e98243e946cccc605b55cb71cb7f5361a2aa3ae45fd5cbad9d4664cac406930734ea58
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170204-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170204-r1.ebuild
deleted file mode 100644
index 3d43669f0515..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170204-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170204-r2.ebuild
deleted file mode 100644
index 6afd2f64a468..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170204-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170204-r3.ebuild
deleted file mode 100644
index 6afd2f64a468..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170204-r4.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170204-r4.ebuild
deleted file mode 100644
index 6afd2f64a468..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170805-r4.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170805-r4.ebuild
deleted file mode 100644
index 3d43669f0515..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20180114-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..248af928b807
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="irc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 67b9308834bc..a39c8cdba041 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ircd-2.20170204-r1.ebuild 280 BLAKE2B b2a55847fd742d7c94af3b767e6b3ac25ab03333831947ed25f076462183ce3235cd9c9caec96e35ceb9f5b3f7d329f82f64ca6b5996ce41a3d0ca4510df1213 SHA512 30da19de0f102312ac1549d5b6ca438e2309c1dd6b33c4a5a3d7a7c44eb2d691a9597ec87f5faf2653f9492ec207f390579e348ab20e93b45f45b21d66503175
-EBUILD selinux-ircd-2.20170204-r2.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8ed88f6445479ccccd6beebe311dcbeb2378c2f3683e0250064847d60e5231bb6690eb0d0c9e21c0343c756900574205fee2b8 SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8
-EBUILD selinux-ircd-2.20170204-r3.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8ed88f6445479ccccd6beebe311dcbeb2378c2f3683e0250064847d60e5231bb6690eb0d0c9e21c0343c756900574205fee2b8 SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8
-EBUILD selinux-ircd-2.20170204-r4.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8ed88f6445479ccccd6beebe311dcbeb2378c2f3683e0250064847d60e5231bb6690eb0d0c9e21c0343c756900574205fee2b8 SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8
 EBUILD selinux-ircd-2.20170805-r2.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8ed88f6445479ccccd6beebe311dcbeb2378c2f3683e0250064847d60e5231bb6690eb0d0c9e21c0343c756900574205fee2b8 SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8
 EBUILD selinux-ircd-2.20170805-r3.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8ed88f6445479ccccd6beebe311dcbeb2378c2f3683e0250064847d60e5231bb6690eb0d0c9e21c0343c756900574205fee2b8 SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8
-EBUILD selinux-ircd-2.20170805-r4.ebuild 280 BLAKE2B b2a55847fd742d7c94af3b767e6b3ac25ab03333831947ed25f076462183ce3235cd9c9caec96e35ceb9f5b3f7d329f82f64ca6b5996ce41a3d0ca4510df1213 SHA512 30da19de0f102312ac1549d5b6ca438e2309c1dd6b33c4a5a3d7a7c44eb2d691a9597ec87f5faf2653f9492ec207f390579e348ab20e93b45f45b21d66503175
 EBUILD selinux-ircd-2.20180114-r1.ebuild 278 BLAKE2B a3b620a0f8d99c72dc3e258c2b2eea18788ef00712f1e2428f1e9076be3298bd9b380cf5f6355d6505230327574316a1e886233024c404b4b84b7e8f2c4665c5 SHA512 074ff5c9061afe585579f19cf0ceb9f67d1d9abeb10a2f0c781d72ecec71678afd6200b757c1e107185bdf04bc4178d87be45b1891b4ada70b0308dc378b0497
 EBUILD selinux-ircd-2.20180114-r2.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
+EBUILD selinux-ircd-2.20180114-r3.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
 EBUILD selinux-ircd-9999.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
 MISC metadata.xml 314 BLAKE2B ad8986a6f937d46dcb66254f589a49979a9bae8a019f0c104c89f20b523416f1204683984038c76be066ab0c80797435a18f74f48356ee4b5520b9573b90e493 SHA512 8832769974dbfe7244583d60b35e9fab3a73eac269a237895979ea704098a00d92089ad4efe9c1a110b71fd2da271518b5f80212815f9b2097f7c6438f607ce6
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r1.ebuild
deleted file mode 100644
index cdffe7a88d49..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r2.ebuild
deleted file mode 100644
index 224993627a11..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r3.ebuild
deleted file mode 100644
index 224993627a11..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r4.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r4.ebuild
deleted file mode 100644
index 224993627a11..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r4.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r4.ebuild
deleted file mode 100644
index cdffe7a88d49..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20180114-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1b5dc73ec5b9
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ircd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index 3d35f07a056d..64383665b25d 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-irqbalance-2.20170204-r1.ebuild 292 BLAKE2B fe0e880b71edd5c778d969a6b08e9d3d25d2b283447b53240591bb9a19d884ce3ea28065b0f2e5d4bd43b98510fec59d0c0aec26378dffaa2ac96b892de26d6d SHA512 1d40a7d0948058341b2f2e6b018a146f89c5ed7e120b8aa9f72d8beac1a5c985948ee2d712b2577b4b799da65a2e784a2c9d10de3ebb11c9a9802d77ca8845b2
-EBUILD selinux-irqbalance-2.20170204-r2.ebuild 290 BLAKE2B 3fcc9d3213205995296c8670ab0c626ad94bc81791168395642f4b2adb3edf03563fa0bd45b92ccd63a689bff1a22d0fa29d8dca0338d756fa02628b897641d0 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113
-EBUILD selinux-irqbalance-2.20170204-r3.ebuild 290 BLAKE2B 3fcc9d3213205995296c8670ab0c626ad94bc81791168395642f4b2adb3edf03563fa0bd45b92ccd63a689bff1a22d0fa29d8dca0338d756fa02628b897641d0 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113
-EBUILD selinux-irqbalance-2.20170204-r4.ebuild 290 BLAKE2B 3fcc9d3213205995296c8670ab0c626ad94bc81791168395642f4b2adb3edf03563fa0bd45b92ccd63a689bff1a22d0fa29d8dca0338d756fa02628b897641d0 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113
 EBUILD selinux-irqbalance-2.20170805-r2.ebuild 290 BLAKE2B 3fcc9d3213205995296c8670ab0c626ad94bc81791168395642f4b2adb3edf03563fa0bd45b92ccd63a689bff1a22d0fa29d8dca0338d756fa02628b897641d0 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113
 EBUILD selinux-irqbalance-2.20170805-r3.ebuild 290 BLAKE2B 3fcc9d3213205995296c8670ab0c626ad94bc81791168395642f4b2adb3edf03563fa0bd45b92ccd63a689bff1a22d0fa29d8dca0338d756fa02628b897641d0 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113
-EBUILD selinux-irqbalance-2.20170805-r4.ebuild 292 BLAKE2B fe0e880b71edd5c778d969a6b08e9d3d25d2b283447b53240591bb9a19d884ce3ea28065b0f2e5d4bd43b98510fec59d0c0aec26378dffaa2ac96b892de26d6d SHA512 1d40a7d0948058341b2f2e6b018a146f89c5ed7e120b8aa9f72d8beac1a5c985948ee2d712b2577b4b799da65a2e784a2c9d10de3ebb11c9a9802d77ca8845b2
 EBUILD selinux-irqbalance-2.20180114-r1.ebuild 290 BLAKE2B 1a3b3b284304b2a3d4791cd49b942837758e6c114c70beb4e1985b97d0a29537f4ef2f8070ac056b8d1b9e189e680cfaaea4fe96b963b4511aef2527a0059ab8 SHA512 78342d57561b61059885ae9cb7311d68295a9022a6c1eddb9164f33cce81e44a47e30637b8748172c027c98257cb8632590ab3f6dac77286003d895b6a1bafe2
 EBUILD selinux-irqbalance-2.20180114-r2.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
+EBUILD selinux-irqbalance-2.20180114-r3.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
 EBUILD selinux-irqbalance-9999.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
 MISC metadata.xml 320 BLAKE2B 5fa14aca6d178a397ce0a1874d8be6f9c104276635636b4c0126bb3ff84a73a0672560ff3e176d54acfde446915dce87fe15fbcc3ecec5622b7e1f939dc43d31 SHA512 e2e7fb33bdd96b5dfa7f0278225c5696da53693800ed86b6ea7e9a7f5685ce6dda87bb3775752068a20f9232fe1638d6b553859f8fa1707b0f36dcc493ef1bc9
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r1.ebuild
deleted file mode 100644
index 1f967d7f50c5..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r2.ebuild
deleted file mode 100644
index d882023aed99..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r3.ebuild
deleted file mode 100644
index d882023aed99..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r4.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r4.ebuild
deleted file mode 100644
index d882023aed99..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r4.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r4.ebuild
deleted file mode 100644
index 1f967d7f50c5..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180114-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4d7b25864b7e
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="irqbalance"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irqbalance"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index 21c542fcc15f..90743506f967 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-jabber-2.20170204-r1.ebuild 284 BLAKE2B fb13528f2eec408ee480674e7bddd528c021d6f5ae7bfbb76d5a0f3f6dde02e401eefcc02a65911b3230d0be1c5bdd47d76bfb1e0f25b6fe82fdbb219b051a56 SHA512 1242f51907cd796deda6889897296a2c7cc07e09f604513d600307e84589ed38930942f3816b03b2598dd9483df0fd1acd9643f1699d02a4daecd6e9a7fd7e08
-EBUILD selinux-jabber-2.20170204-r2.ebuild 282 BLAKE2B 414045e305de467c9665c0af5dc4b998b9d2af49b2a5d857be2eb7b3c094918f250d5b646499aec5d19a9487af028de7b4ae23947f7546239ec4af7d33653c2c SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a
-EBUILD selinux-jabber-2.20170204-r3.ebuild 282 BLAKE2B 414045e305de467c9665c0af5dc4b998b9d2af49b2a5d857be2eb7b3c094918f250d5b646499aec5d19a9487af028de7b4ae23947f7546239ec4af7d33653c2c SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a
-EBUILD selinux-jabber-2.20170204-r4.ebuild 282 BLAKE2B 414045e305de467c9665c0af5dc4b998b9d2af49b2a5d857be2eb7b3c094918f250d5b646499aec5d19a9487af028de7b4ae23947f7546239ec4af7d33653c2c SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a
 EBUILD selinux-jabber-2.20170805-r2.ebuild 282 BLAKE2B 414045e305de467c9665c0af5dc4b998b9d2af49b2a5d857be2eb7b3c094918f250d5b646499aec5d19a9487af028de7b4ae23947f7546239ec4af7d33653c2c SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a
 EBUILD selinux-jabber-2.20170805-r3.ebuild 282 BLAKE2B 414045e305de467c9665c0af5dc4b998b9d2af49b2a5d857be2eb7b3c094918f250d5b646499aec5d19a9487af028de7b4ae23947f7546239ec4af7d33653c2c SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a
-EBUILD selinux-jabber-2.20170805-r4.ebuild 284 BLAKE2B fb13528f2eec408ee480674e7bddd528c021d6f5ae7bfbb76d5a0f3f6dde02e401eefcc02a65911b3230d0be1c5bdd47d76bfb1e0f25b6fe82fdbb219b051a56 SHA512 1242f51907cd796deda6889897296a2c7cc07e09f604513d600307e84589ed38930942f3816b03b2598dd9483df0fd1acd9643f1699d02a4daecd6e9a7fd7e08
 EBUILD selinux-jabber-2.20180114-r1.ebuild 282 BLAKE2B cda9eff6fbac5773386a0534b0035d0bd8ed38a1a55bd8a64d37632fb01cf2ceb443791f628d0b316c571a10d8fdeff329bcf1fdc7550f442f1e2a8f4bbba6e2 SHA512 c2b1c424a1f2fc9878e134bf0150af8c4529f50fa4f6d8874fa3dcbd63e35f433d2193dbe6db7672bfa3f034dd90d6d24e53da064ebff85c15c0c7a33f3ef16b
 EBUILD selinux-jabber-2.20180114-r2.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
+EBUILD selinux-jabber-2.20180114-r3.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
 EBUILD selinux-jabber-9999.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
 MISC metadata.xml 316 BLAKE2B 263c8405f8376db80cdc680d1452a5a64465a8040fb2ccf2b0a74213173a1858e3aeba5310fbdd2079c2ef7bbf7815da4f14b813cd8d0a5ab0a8639648d4467f SHA512 269cb023c313456e0ff91148007509ef5cdaea6c33ceb42ba3bf57674fc4c709d719824a3e95f3171773c4979d03be50873ac62fdb2f8bea86e5904703dd76bc
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r1.ebuild
deleted file mode 100644
index 442bb867c229..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r2.ebuild
deleted file mode 100644
index 7839c32713ca..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r3.ebuild
deleted file mode 100644
index 7839c32713ca..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r4.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r4.ebuild
deleted file mode 100644
index 7839c32713ca..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r4.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r4.ebuild
deleted file mode 100644
index 442bb867c229..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20180114-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5cda0ea5f16b
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="jabber"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for jabber"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index fdb2f1610a5b..1ec1cc80f3ff 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-java-2.20170204-r1.ebuild 284 BLAKE2B f16162a88486212bd0a57d46b334b56ccbc5b5b9d95772ce365804862f8ae24b6302568d78625014963a9c2c426dfb8fe561d4cc6a202d5f5fad444715c9c62a SHA512 3bb68c2e6129cc3f7cd97c5da2fbe14c24de7ecdac2656683a244c1f5b9159707df4a91740d05ccca6346b2382dea4ad25f013bd34e2d7edea7bdf23cb459593
-EBUILD selinux-java-2.20170204-r2.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0b0d762a4f7c405db757eb79a70aaf484ca4ff9ae67618fe4843d7133fff309e5cd6c3bdf4175de63c6f71f6139f991b2a2744 SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4
-EBUILD selinux-java-2.20170204-r3.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0b0d762a4f7c405db757eb79a70aaf484ca4ff9ae67618fe4843d7133fff309e5cd6c3bdf4175de63c6f71f6139f991b2a2744 SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4
-EBUILD selinux-java-2.20170204-r4.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0b0d762a4f7c405db757eb79a70aaf484ca4ff9ae67618fe4843d7133fff309e5cd6c3bdf4175de63c6f71f6139f991b2a2744 SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4
 EBUILD selinux-java-2.20170805-r2.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0b0d762a4f7c405db757eb79a70aaf484ca4ff9ae67618fe4843d7133fff309e5cd6c3bdf4175de63c6f71f6139f991b2a2744 SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4
 EBUILD selinux-java-2.20170805-r3.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0b0d762a4f7c405db757eb79a70aaf484ca4ff9ae67618fe4843d7133fff309e5cd6c3bdf4175de63c6f71f6139f991b2a2744 SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4
-EBUILD selinux-java-2.20170805-r4.ebuild 284 BLAKE2B f16162a88486212bd0a57d46b334b56ccbc5b5b9d95772ce365804862f8ae24b6302568d78625014963a9c2c426dfb8fe561d4cc6a202d5f5fad444715c9c62a SHA512 3bb68c2e6129cc3f7cd97c5da2fbe14c24de7ecdac2656683a244c1f5b9159707df4a91740d05ccca6346b2382dea4ad25f013bd34e2d7edea7bdf23cb459593
 EBUILD selinux-java-2.20180114-r1.ebuild 282 BLAKE2B 203d52667b2744b47168528eb53a78722294a267775738db026f2993b458657e404ed781c6cb03b9c6a8b6621e6c3c416901f20099d8d232677388f47e6f300e SHA512 62891f2a4e9045a531e1149a9148adc7c798d43915d839a1021fbb99c8bbefe5c0cc9bb0e5554ce773b0cc3d9c13ebc0764b559ee75288d6c4e6076bc1348cb0
 EBUILD selinux-java-2.20180114-r2.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
+EBUILD selinux-java-2.20180114-r3.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
 EBUILD selinux-java-9999.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
 MISC metadata.xml 314 BLAKE2B 88ef45c4d4dd356bb361916a45ae25046b69e40bd24a963f0460e54cfb0f5e273ec5dc418b208b10d57c5dd0cf0d50984b055a8614677bf5887118274f55250f SHA512 6abe4c867275288d443678ad009b88232db9ae9a9565a0bf4bf5a07dd424d28ee1be71351e74f3aef0c7c4e236125089f10ca13f2799004c6eca3a7081326b57
diff --git a/sec-policy/selinux-java/selinux-java-2.20170204-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20170204-r1.ebuild
deleted file mode 100644
index 05561d39f0d7..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20170204-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20170204-r2.ebuild
deleted file mode 100644
index 382b26fa4cac..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20170204-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20170204-r3.ebuild
deleted file mode 100644
index 382b26fa4cac..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20170204-r4.ebuild b/sec-policy/selinux-java/selinux-java-2.20170204-r4.ebuild
deleted file mode 100644
index 382b26fa4cac..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20170805-r4.ebuild b/sec-policy/selinux-java/selinux-java-2.20170805-r4.ebuild
deleted file mode 100644
index 05561d39f0d7..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20180114-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..d9242ad11ef6
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="java"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for java"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index 65ef4fcc2c7a..236c20225e41 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kdeconnect-2.20170204-r1.ebuild 292 BLAKE2B 4598f8d5eb7fe46db360b5279a9745e7ef7590a4ed0e3ada3a4004cfc160861fe954ab4698a61e4ae77d0d6590ed21a2c4d8f7207d90e0165e63f9d82f09e022 SHA512 1b81a19b393fb91d30856372be698ecbb782c5921dad4dd46ba3d3bf3e42690c77055ad306710c95c8bd1ac2f94acb4fe0948505c6e97a27329fc3a2500ce616
-EBUILD selinux-kdeconnect-2.20170204-r2.ebuild 290 BLAKE2B 600095d321bd94e44be30db25568da4ecf38f3a95c8d1b58e2aa4df6ed302f32fa245d9c84ddc5a23317eaf233484472a8f7622113f572049f274b87a0eae43f SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6
-EBUILD selinux-kdeconnect-2.20170204-r3.ebuild 290 BLAKE2B 600095d321bd94e44be30db25568da4ecf38f3a95c8d1b58e2aa4df6ed302f32fa245d9c84ddc5a23317eaf233484472a8f7622113f572049f274b87a0eae43f SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6
-EBUILD selinux-kdeconnect-2.20170204-r4.ebuild 290 BLAKE2B 600095d321bd94e44be30db25568da4ecf38f3a95c8d1b58e2aa4df6ed302f32fa245d9c84ddc5a23317eaf233484472a8f7622113f572049f274b87a0eae43f SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6
 EBUILD selinux-kdeconnect-2.20170805-r2.ebuild 290 BLAKE2B 600095d321bd94e44be30db25568da4ecf38f3a95c8d1b58e2aa4df6ed302f32fa245d9c84ddc5a23317eaf233484472a8f7622113f572049f274b87a0eae43f SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6
 EBUILD selinux-kdeconnect-2.20170805-r3.ebuild 290 BLAKE2B 600095d321bd94e44be30db25568da4ecf38f3a95c8d1b58e2aa4df6ed302f32fa245d9c84ddc5a23317eaf233484472a8f7622113f572049f274b87a0eae43f SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6
-EBUILD selinux-kdeconnect-2.20170805-r4.ebuild 292 BLAKE2B 4598f8d5eb7fe46db360b5279a9745e7ef7590a4ed0e3ada3a4004cfc160861fe954ab4698a61e4ae77d0d6590ed21a2c4d8f7207d90e0165e63f9d82f09e022 SHA512 1b81a19b393fb91d30856372be698ecbb782c5921dad4dd46ba3d3bf3e42690c77055ad306710c95c8bd1ac2f94acb4fe0948505c6e97a27329fc3a2500ce616
 EBUILD selinux-kdeconnect-2.20180114-r1.ebuild 290 BLAKE2B 522cfeaf30af854f6b620151ddb899d13e1b99c31185f7fbfd6ac44d6ad12fb44d827021e079c17a495c11dd835a50f845980d96712c2b1e32dff5287f0d10ef SHA512 367360ed7ac03c07ac03212fc3ae131af5248fc1207c50e3e5e43c9df9eeaee8edd654b847769c27635574d6af8504c0b6b0f159755fe86c7042ead787a95836
 EBUILD selinux-kdeconnect-2.20180114-r2.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
+EBUILD selinux-kdeconnect-2.20180114-r3.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
 EBUILD selinux-kdeconnect-9999.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
 MISC metadata.xml 320 BLAKE2B 43e71bffab415a3c2f7d13cf88852fbb2887efc0c53b8a60df96bed740bdb0fd5b31b59987c96648e43e680de654b94b99f3de77dab601a28aa0d0cc187f04f4 SHA512 ab0e14cd212f45bc18bd3fd8c63b5c1f28b71f9c8ffbbf7c3dc913b1c5dadd8a082d362e0cc9f5b16faf16f7eecff743f45186161cc002f9b4011b39866dc0a3
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r1.ebuild
deleted file mode 100644
index f60a7bd6e180..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r2.ebuild
deleted file mode 100644
index 07464ddad1ed..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r3.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r3.ebuild
deleted file mode 100644
index 07464ddad1ed..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r4.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r4.ebuild
deleted file mode 100644
index 07464ddad1ed..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r4.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r4.ebuild
deleted file mode 100644
index f60a7bd6e180..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180114-r3.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..d0153053b417
--- /dev/null
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kdeconnect"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdeconnect"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index e17a05f50c1c..29e3288d24f4 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kdump-2.20170204-r1.ebuild 282 BLAKE2B 143069d3b2edcba4c2533e70f059a7bde476c0cafe356739b0b4b5071f402cdfd28d03e054f802753f5d3aa53d444374107a68a24cd2bbf3ef19b0ea9426449c SHA512 c146fb71939f8968eb435986a9ca1aca176cdf1a96308071e01de59552ee39d900f63574428611c460d846fadb412ce359f92c88e10879bd5ee4857de27c9c2f
-EBUILD selinux-kdump-2.20170204-r2.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff81e069f62194257a0b692362651cdc22425cdfbb85427e840a72d9c0610726d6838111e67c13ff09607e163010a817c5b463b6 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae
-EBUILD selinux-kdump-2.20170204-r3.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff81e069f62194257a0b692362651cdc22425cdfbb85427e840a72d9c0610726d6838111e67c13ff09607e163010a817c5b463b6 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae
-EBUILD selinux-kdump-2.20170204-r4.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff81e069f62194257a0b692362651cdc22425cdfbb85427e840a72d9c0610726d6838111e67c13ff09607e163010a817c5b463b6 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae
 EBUILD selinux-kdump-2.20170805-r2.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff81e069f62194257a0b692362651cdc22425cdfbb85427e840a72d9c0610726d6838111e67c13ff09607e163010a817c5b463b6 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae
 EBUILD selinux-kdump-2.20170805-r3.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff81e069f62194257a0b692362651cdc22425cdfbb85427e840a72d9c0610726d6838111e67c13ff09607e163010a817c5b463b6 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae
-EBUILD selinux-kdump-2.20170805-r4.ebuild 282 BLAKE2B 143069d3b2edcba4c2533e70f059a7bde476c0cafe356739b0b4b5071f402cdfd28d03e054f802753f5d3aa53d444374107a68a24cd2bbf3ef19b0ea9426449c SHA512 c146fb71939f8968eb435986a9ca1aca176cdf1a96308071e01de59552ee39d900f63574428611c460d846fadb412ce359f92c88e10879bd5ee4857de27c9c2f
 EBUILD selinux-kdump-2.20180114-r1.ebuild 280 BLAKE2B 08f383ede40fc74440f7a1a04b37a24876b76edf1187f436dd182bd9768e1b78e5a157df7bc1a2befd5e798d71d066c6fb0f94e5857937f0ea744ed100fd2315 SHA512 99c6812e319001d3dc402548333e4f982a30ede70952e88425b515906013d41e3c827b807791903697fe90b25dab72c1d55a7319d5c8543014deec0b13b6e153
 EBUILD selinux-kdump-2.20180114-r2.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
+EBUILD selinux-kdump-2.20180114-r3.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
 EBUILD selinux-kdump-9999.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
 MISC metadata.xml 315 BLAKE2B 5a90634892dcd621a33900cf7dee3e544bf0557b468310f08707bf599139660f213ff38182b21c55cf3d02cdb71880f26016529ce770ff3b42fadf60eaa56258 SHA512 9676f97f6e2e5fd7d8578c1c11662630f5ddc156a3adca855ba145e146531ca54a8f969c689e0c5e233531b9b8ca05a94a03802ab8a3cc18015bce1a0d3b3980
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r1.ebuild
deleted file mode 100644
index 47b5a73190ad..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r2.ebuild
deleted file mode 100644
index 5529a3914ce1..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r3.ebuild
deleted file mode 100644
index 5529a3914ce1..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r4.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r4.ebuild
deleted file mode 100644
index 5529a3914ce1..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r4.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r4.ebuild
deleted file mode 100644
index 47b5a73190ad..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20180114-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..658c34f327a3
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kdump"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdump"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index d10aa4f8a887..64a0b3e9efe6 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kerberos-2.20170204-r1.ebuild 288 BLAKE2B d5daeb328a1ad4458e431556c2c159c7a5c645d8560723052c271f919f3158230e86af0b8cbb27179baa168bab90855b617d34fff294fa3fe7d2e3c5300f166d SHA512 220e38526134071d1ae14d338a9040acce5285641f5c2d53582d4b4de79bfe442d2b1d20cb756e30dcc133fe8453a7c34bb5c8aa3e16f5f2ebb812043a70e015
-EBUILD selinux-kerberos-2.20170204-r2.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175cabb4f80e5499c290d4bf6f69818b75a0ce8fc927e8bc06adaddd6ef6969cf408fb5d8dd2a0309e51624ed6b8b22edb500331fad8 SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1
-EBUILD selinux-kerberos-2.20170204-r3.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175cabb4f80e5499c290d4bf6f69818b75a0ce8fc927e8bc06adaddd6ef6969cf408fb5d8dd2a0309e51624ed6b8b22edb500331fad8 SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1
-EBUILD selinux-kerberos-2.20170204-r4.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175cabb4f80e5499c290d4bf6f69818b75a0ce8fc927e8bc06adaddd6ef6969cf408fb5d8dd2a0309e51624ed6b8b22edb500331fad8 SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1
 EBUILD selinux-kerberos-2.20170805-r2.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175cabb4f80e5499c290d4bf6f69818b75a0ce8fc927e8bc06adaddd6ef6969cf408fb5d8dd2a0309e51624ed6b8b22edb500331fad8 SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1
 EBUILD selinux-kerberos-2.20170805-r3.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175cabb4f80e5499c290d4bf6f69818b75a0ce8fc927e8bc06adaddd6ef6969cf408fb5d8dd2a0309e51624ed6b8b22edb500331fad8 SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1
-EBUILD selinux-kerberos-2.20170805-r4.ebuild 288 BLAKE2B d5daeb328a1ad4458e431556c2c159c7a5c645d8560723052c271f919f3158230e86af0b8cbb27179baa168bab90855b617d34fff294fa3fe7d2e3c5300f166d SHA512 220e38526134071d1ae14d338a9040acce5285641f5c2d53582d4b4de79bfe442d2b1d20cb756e30dcc133fe8453a7c34bb5c8aa3e16f5f2ebb812043a70e015
 EBUILD selinux-kerberos-2.20180114-r1.ebuild 286 BLAKE2B d65e18d8059502b1dbc10b9d6299cc472a1ffb1d1d9bd4150b68c82b63d2462b3b4ce47bd6d3921ca50a9cf850a16d793045da98adbd637b2b63964f29c0245b SHA512 7cb01ba1430849b65fdbab2c4fc159c22dd8388649d9085dbbd397f18a24972a98700c97b1678249282c8cfbdcb386d97c80bbaadedb2bae4c68735d6e92b005
 EBUILD selinux-kerberos-2.20180114-r2.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
+EBUILD selinux-kerberos-2.20180114-r3.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
 EBUILD selinux-kerberos-9999.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
 MISC metadata.xml 318 BLAKE2B e6059f2ad603ee10e5f075ccf2c32b901923e09e6ae0e64b9605ab411ac21e6b1ec0d1928ae7dfb2564f72fe5031dd86813e20fc417ab37b9bd91333aed1721e SHA512 7c5a7eeb9d6dbfd9ff85af7392e3b522d558726d72dada332dd3df088c5b8bb52cdc9cbd707ba1da49b6a36a0fce9bdbdbd58830bb411d99d0f75fe29adfa27c
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r1.ebuild
deleted file mode 100644
index 8a747d140fef..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r2.ebuild
deleted file mode 100644
index e583ae84114b..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r3.ebuild
deleted file mode 100644
index e583ae84114b..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r4.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r4.ebuild
deleted file mode 100644
index e583ae84114b..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r4.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r4.ebuild
deleted file mode 100644
index 8a747d140fef..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20180114-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3c70dba4223c
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kerberos"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerberos"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 8d4662b035b6..ddc7f9051f6d 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kerneloops-2.20170204-r1.ebuild 292 BLAKE2B 2089df71589b7d392084de3b47359d9a475c58ab81de6780c2f3db2e4995d7d6ee9788cc8791a7e195cc85a2ceef7b05816134d95f605e619cb94148887c71a3 SHA512 465c4b2e0e3de2ec2c1abeceab994cec808468e5c140468484bd425ef3cdaa7146aafbf75501eea7669c79e2316d1eec090cea1cfe6bc0ec7cfbd53ee98c3055
-EBUILD selinux-kerneloops-2.20170204-r2.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b64ead1b549b14ced1e22d19327ccbc983e8300d4a486f0dc8f03a0ebb4a842fca5077ea2d1ab6af64483ccfd3d91f25fd81ab5a1a141 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69
-EBUILD selinux-kerneloops-2.20170204-r3.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b64ead1b549b14ced1e22d19327ccbc983e8300d4a486f0dc8f03a0ebb4a842fca5077ea2d1ab6af64483ccfd3d91f25fd81ab5a1a141 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69
-EBUILD selinux-kerneloops-2.20170204-r4.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b64ead1b549b14ced1e22d19327ccbc983e8300d4a486f0dc8f03a0ebb4a842fca5077ea2d1ab6af64483ccfd3d91f25fd81ab5a1a141 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69
 EBUILD selinux-kerneloops-2.20170805-r2.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b64ead1b549b14ced1e22d19327ccbc983e8300d4a486f0dc8f03a0ebb4a842fca5077ea2d1ab6af64483ccfd3d91f25fd81ab5a1a141 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69
 EBUILD selinux-kerneloops-2.20170805-r3.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b64ead1b549b14ced1e22d19327ccbc983e8300d4a486f0dc8f03a0ebb4a842fca5077ea2d1ab6af64483ccfd3d91f25fd81ab5a1a141 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69
-EBUILD selinux-kerneloops-2.20170805-r4.ebuild 292 BLAKE2B 2089df71589b7d392084de3b47359d9a475c58ab81de6780c2f3db2e4995d7d6ee9788cc8791a7e195cc85a2ceef7b05816134d95f605e619cb94148887c71a3 SHA512 465c4b2e0e3de2ec2c1abeceab994cec808468e5c140468484bd425ef3cdaa7146aafbf75501eea7669c79e2316d1eec090cea1cfe6bc0ec7cfbd53ee98c3055
 EBUILD selinux-kerneloops-2.20180114-r1.ebuild 290 BLAKE2B 4e8b772c2a65060140c319efa05459d1f902a7a6ab1bead2923ec5d34d6bc67aacf0f71b21ac3df5f6b39f24d7fd7079f987f3c151179542c3181ae35e98977c SHA512 705bfcaea97c6f5d93bca5b3c75f73b035ca43d7d470c808676556c33fd1bed5510897d01bd0e310595f88c1c077a1eac0dd93e2d4e9ef4e8655ab237f1a9cbd
 EBUILD selinux-kerneloops-2.20180114-r2.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
+EBUILD selinux-kerneloops-2.20180114-r3.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
 EBUILD selinux-kerneloops-9999.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
 MISC metadata.xml 320 BLAKE2B b414c390eb4c160312b7c9a4d393bc9f05bc036397ed1b4663aafc2d72418f09fa650e7b88dd40f147d8da88f3e83b9055138a53f92f0d653837d751a9544cd2 SHA512 84353674a6bc581ee9d8e25410b630574201701a8ccf025f6789e488b045fae7ea6662ebd17aa92273d2ea5b61c0c0d7218919449ec60a4f69c88d12fd1e5c69
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r1.ebuild
deleted file mode 100644
index 0779d104ce8d..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r2.ebuild
deleted file mode 100644
index c4ad389d33db..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r3.ebuild
deleted file mode 100644
index c4ad389d33db..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r4.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r4.ebuild
deleted file mode 100644
index c4ad389d33db..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r4.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r4.ebuild
deleted file mode 100644
index 0779d104ce8d..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180114-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ce419430b0ed
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kerneloops"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerneloops"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 955a12ecca9d..ce14eb0e360b 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kismet-2.20170204-r1.ebuild 284 BLAKE2B 25367e6c04b385178e98d463a455d48ffac64b03bb47381d73b3abba07ae239404df6efc6eefc0a396540a1827be11078c0f2c252edd2d41089c866c894644ac SHA512 14d7d2e1cfaaab9e733ef2a470a2073756e71794f6cd814b22c486202fd072bffad0d8500b595d2d7c2815ca5ab5e85dd101ef7a57f8e1338efef7cc0054a581
-EBUILD selinux-kismet-2.20170204-r2.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d2ee5db63fde44eb740f9be19643bc100c9413accf3ebf4f0047e0bc73c78be0d528b2fc197b5ba153a4b84ec4ede34063ddf7e4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773
-EBUILD selinux-kismet-2.20170204-r3.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d2ee5db63fde44eb740f9be19643bc100c9413accf3ebf4f0047e0bc73c78be0d528b2fc197b5ba153a4b84ec4ede34063ddf7e4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773
-EBUILD selinux-kismet-2.20170204-r4.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d2ee5db63fde44eb740f9be19643bc100c9413accf3ebf4f0047e0bc73c78be0d528b2fc197b5ba153a4b84ec4ede34063ddf7e4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773
 EBUILD selinux-kismet-2.20170805-r2.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d2ee5db63fde44eb740f9be19643bc100c9413accf3ebf4f0047e0bc73c78be0d528b2fc197b5ba153a4b84ec4ede34063ddf7e4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773
 EBUILD selinux-kismet-2.20170805-r3.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d2ee5db63fde44eb740f9be19643bc100c9413accf3ebf4f0047e0bc73c78be0d528b2fc197b5ba153a4b84ec4ede34063ddf7e4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773
-EBUILD selinux-kismet-2.20170805-r4.ebuild 284 BLAKE2B 25367e6c04b385178e98d463a455d48ffac64b03bb47381d73b3abba07ae239404df6efc6eefc0a396540a1827be11078c0f2c252edd2d41089c866c894644ac SHA512 14d7d2e1cfaaab9e733ef2a470a2073756e71794f6cd814b22c486202fd072bffad0d8500b595d2d7c2815ca5ab5e85dd101ef7a57f8e1338efef7cc0054a581
 EBUILD selinux-kismet-2.20180114-r1.ebuild 282 BLAKE2B ea8a57163fe730c7ee78c202569a2e28a7843e1fab8782e7c47c00f970410dda67a2f1a65eb2f65b4b6ff06b8e88ca1fd3d00c9d90c98a459e24afe26f937aed SHA512 b4716d3dec21a6b3e878095584bb4441cf4d8e989e3d325696275b5fb316808adbb72170b3056cb6e11d30d42a047ad4001d487f07114f89af59327941f2a5b1
 EBUILD selinux-kismet-2.20180114-r2.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
+EBUILD selinux-kismet-2.20180114-r3.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
 EBUILD selinux-kismet-9999.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
 MISC metadata.xml 316 BLAKE2B 7c41f7092fe7ab9ca102e311c97b9f680b91cb29db60863f231f850f6bf47d38f5b15b3f6cd62e8f737b379f5bff9701529eebe078c7d95dcbfa7cb08b3a19d7 SHA512 48f0a31367966ccbb1564017c9329ee4d4990333904312f9b2b59f1b8b213974c3861d59ba49ed2f94f6eea1948556bdfcad0d3308c5ca70341316220ec44fc7
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r1.ebuild
deleted file mode 100644
index dd31cb4033bc..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r2.ebuild
deleted file mode 100644
index e541ecf0d9da..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r3.ebuild
deleted file mode 100644
index e541ecf0d9da..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r4.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r4.ebuild
deleted file mode 100644
index e541ecf0d9da..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r4.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r4.ebuild
deleted file mode 100644
index dd31cb4033bc..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20180114-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..9de91d19d567
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kismet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kismet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index 9ef07a22e940..b4cd84ed06d7 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ksmtuned-2.20170204-r1.ebuild 288 BLAKE2B 5c2d643888eb63eff1de2d091fd431daeef19d5e699e00942af2274e2825b2e8bfd5ecad28c7c80e7001d7d20d54f15c92d261d73cfdf4cbddda796fa44b0377 SHA512 222f62f769ade1f9605fdc246dc541d9e5272b7892ad9da51fd963217d41489fc2a4b56e436f9f2792d14b08cf4b04f8db7cf7adaab55a6aab7f87cf74776cf3
-EBUILD selinux-ksmtuned-2.20170204-r2.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3ca0de6669ae916e845c67048d65888e3e5294ff564b3cc58e0227946ae763d2b2095a45aaaad6a5d8eeba1f4e4ff0f835f291db8fb SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406
-EBUILD selinux-ksmtuned-2.20170204-r3.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3ca0de6669ae916e845c67048d65888e3e5294ff564b3cc58e0227946ae763d2b2095a45aaaad6a5d8eeba1f4e4ff0f835f291db8fb SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406
-EBUILD selinux-ksmtuned-2.20170204-r4.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3ca0de6669ae916e845c67048d65888e3e5294ff564b3cc58e0227946ae763d2b2095a45aaaad6a5d8eeba1f4e4ff0f835f291db8fb SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406
 EBUILD selinux-ksmtuned-2.20170805-r2.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3ca0de6669ae916e845c67048d65888e3e5294ff564b3cc58e0227946ae763d2b2095a45aaaad6a5d8eeba1f4e4ff0f835f291db8fb SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406
 EBUILD selinux-ksmtuned-2.20170805-r3.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3ca0de6669ae916e845c67048d65888e3e5294ff564b3cc58e0227946ae763d2b2095a45aaaad6a5d8eeba1f4e4ff0f835f291db8fb SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406
-EBUILD selinux-ksmtuned-2.20170805-r4.ebuild 288 BLAKE2B 5c2d643888eb63eff1de2d091fd431daeef19d5e699e00942af2274e2825b2e8bfd5ecad28c7c80e7001d7d20d54f15c92d261d73cfdf4cbddda796fa44b0377 SHA512 222f62f769ade1f9605fdc246dc541d9e5272b7892ad9da51fd963217d41489fc2a4b56e436f9f2792d14b08cf4b04f8db7cf7adaab55a6aab7f87cf74776cf3
 EBUILD selinux-ksmtuned-2.20180114-r1.ebuild 286 BLAKE2B d74481fdba74c67e32fc7776e5a2d56afb4622fc7a70844b2080b3940fbbd5489325ab821da7661bd3466bf65aa085b67aa02c40ff9de87af28647e2a2a34997 SHA512 c8d65198f2a05443deef3525532fc1bdc43be02dfe05a1dd260f8413439e1625edd8d5fbbdc5841d58595475beb71494ea79379933a80d62078c109687cd53fe
 EBUILD selinux-ksmtuned-2.20180114-r2.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
+EBUILD selinux-ksmtuned-2.20180114-r3.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
 EBUILD selinux-ksmtuned-9999.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
 MISC metadata.xml 318 BLAKE2B 0e008ad609d3c3233bbb182c1fc0f9c68644dc549ea061c606b4091d351da404d79839b7fc6cee020fb1fe3ed5220415ded3b80e0df22baffffd5498af3a613e SHA512 2c5d3c14cd6464c30370575797fa54c5b897dfa28b05198324d5b79eb65d9b75a23282469ebc112137274a5ffcd5340e7a688cd9cf1b1f9195d87d6e4e12ae9c
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r1.ebuild
deleted file mode 100644
index 507d008d2d31..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r2.ebuild
deleted file mode 100644
index f87f6d8a97db..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r3.ebuild
deleted file mode 100644
index f87f6d8a97db..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r4.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r4.ebuild
deleted file mode 100644
index f87f6d8a97db..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r4.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r4.ebuild
deleted file mode 100644
index 507d008d2d31..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180114-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..acb143010d43
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ksmtuned"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ksmtuned"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index ba750990c646..76a1efaf372a 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-kudzu-2.20170204-r1.ebuild 282 BLAKE2B 2d1281d945f4c9ec256c0c6898fc96f928421727fd16e025d80e426ad09e9d818ae31e21f238ede8388bc35706da0ffdffbc8f47ff2299779917adbeaa7266e3 SHA512 ee12fec88796a14721984a452b013c8e57812496317b1f66c86cfed89c66d500aa92a954b8d881a285d5e33c629020b3668eec63f0ec3fd83e7821afcd43cce0
-EBUILD selinux-kudzu-2.20170204-r2.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9d42bef61caee79c4c938c075bc40c22b534e151fac0d45e91224d69aa0c758688ed00a7c24d012b33daf9a124ae3ef2a8351b5 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9
-EBUILD selinux-kudzu-2.20170204-r3.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9d42bef61caee79c4c938c075bc40c22b534e151fac0d45e91224d69aa0c758688ed00a7c24d012b33daf9a124ae3ef2a8351b5 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9
-EBUILD selinux-kudzu-2.20170204-r4.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9d42bef61caee79c4c938c075bc40c22b534e151fac0d45e91224d69aa0c758688ed00a7c24d012b33daf9a124ae3ef2a8351b5 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9
 EBUILD selinux-kudzu-2.20170805-r2.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9d42bef61caee79c4c938c075bc40c22b534e151fac0d45e91224d69aa0c758688ed00a7c24d012b33daf9a124ae3ef2a8351b5 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9
 EBUILD selinux-kudzu-2.20170805-r3.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9d42bef61caee79c4c938c075bc40c22b534e151fac0d45e91224d69aa0c758688ed00a7c24d012b33daf9a124ae3ef2a8351b5 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9
-EBUILD selinux-kudzu-2.20170805-r4.ebuild 282 BLAKE2B 2d1281d945f4c9ec256c0c6898fc96f928421727fd16e025d80e426ad09e9d818ae31e21f238ede8388bc35706da0ffdffbc8f47ff2299779917adbeaa7266e3 SHA512 ee12fec88796a14721984a452b013c8e57812496317b1f66c86cfed89c66d500aa92a954b8d881a285d5e33c629020b3668eec63f0ec3fd83e7821afcd43cce0
 EBUILD selinux-kudzu-2.20180114-r1.ebuild 280 BLAKE2B 1c9fc8582ce2058bac91c4bb8bd965aee867c6f4a3bdff07f781b7f636e48718935dfaf9fc97a6cee6cd8596a016c8c6496a94c64f60b46a373c521c483ea540 SHA512 1af4c756ca0377df000594d7738eec35dfd87b3db7dfbb6da8ed5cc71493666a6a8e907d0891bca3188d0e72961c7fd827a6c204c0454258f76cced84f1c8f20
 EBUILD selinux-kudzu-2.20180114-r2.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
+EBUILD selinux-kudzu-2.20180114-r3.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
 EBUILD selinux-kudzu-9999.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
 MISC metadata.xml 315 BLAKE2B 5266f866f1e292ed61b8e9e3c6b1b18c16054f7bb54919adec9b4f38613b75e0bbe2fac08f1632403bdf00a55c370e91cef0a5e4b87b6d00485784e433fd6a21 SHA512 bd0badbc4aa7c515fd361c07c690377e11b17befbc0062be81ea8208ae445ca7f716f2613227e9b16426d12ef6714cf26803dad9d9b524811c8425bfcaa10cc5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r1.ebuild
deleted file mode 100644
index ac845a64b551..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r2.ebuild
deleted file mode 100644
index 2c68ff3064dc..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r3.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r3.ebuild
deleted file mode 100644
index 2c68ff3064dc..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r4.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r4.ebuild
deleted file mode 100644
index 2c68ff3064dc..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r4.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r4.ebuild
deleted file mode 100644
index ac845a64b551..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20180114-r3.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..45827dff4600
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kudzu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kudzu"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 78c4d77d638e..20fcbcaf3708 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ldap-2.20170204-r1.ebuild 280 BLAKE2B 0b8a1b8ef24ff19f861c856ece0d14e928400c195f50a27f05ab7dbbff280db08bd7bae47b4b9c374023e860062e34aa65dc29e970407833e468f1173794d1d9 SHA512 2f01ba21c0820092847f2b3f8422f0dd9e5882b6ba7d2bcf35b53e8ad600948a897cca20db2fb24b6b98f8fd9116988adcf37ee015cf0583dc9ba9f58b666875
-EBUILD selinux-ldap-2.20170204-r2.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb55599174f9c4fb7fcc1d239615eb9e65aad8c36b63cd1546e9eb07b372f581fd6de3b76901a785e8995b89274eaef878c6aeb8 SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14
-EBUILD selinux-ldap-2.20170204-r3.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb55599174f9c4fb7fcc1d239615eb9e65aad8c36b63cd1546e9eb07b372f581fd6de3b76901a785e8995b89274eaef878c6aeb8 SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14
-EBUILD selinux-ldap-2.20170204-r4.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb55599174f9c4fb7fcc1d239615eb9e65aad8c36b63cd1546e9eb07b372f581fd6de3b76901a785e8995b89274eaef878c6aeb8 SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14
 EBUILD selinux-ldap-2.20170805-r2.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb55599174f9c4fb7fcc1d239615eb9e65aad8c36b63cd1546e9eb07b372f581fd6de3b76901a785e8995b89274eaef878c6aeb8 SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14
 EBUILD selinux-ldap-2.20170805-r3.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb55599174f9c4fb7fcc1d239615eb9e65aad8c36b63cd1546e9eb07b372f581fd6de3b76901a785e8995b89274eaef878c6aeb8 SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14
-EBUILD selinux-ldap-2.20170805-r4.ebuild 280 BLAKE2B 0b8a1b8ef24ff19f861c856ece0d14e928400c195f50a27f05ab7dbbff280db08bd7bae47b4b9c374023e860062e34aa65dc29e970407833e468f1173794d1d9 SHA512 2f01ba21c0820092847f2b3f8422f0dd9e5882b6ba7d2bcf35b53e8ad600948a897cca20db2fb24b6b98f8fd9116988adcf37ee015cf0583dc9ba9f58b666875
 EBUILD selinux-ldap-2.20180114-r1.ebuild 278 BLAKE2B 59ab9bb8a94d9eb852c9318d71c09d87882217cdd77f12b52f8ea386b6df317c2e15e7d8e94ecf79341b1d4d727c8b759336087dafe48e9b176b0d2bde9e4b8b SHA512 d3f54fc3d7be1632aed0e22ed51d49b3e4e8b9d6384067f051e4bf4aed73597bfbad529fe0e7d8537e7712c7ca329e09c01a1f86f609d8d0e568ad6bcb49ea43
 EBUILD selinux-ldap-2.20180114-r2.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
+EBUILD selinux-ldap-2.20180114-r3.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
 EBUILD selinux-ldap-9999.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
 MISC metadata.xml 318 BLAKE2B fb1d3d5b87f8aac5d5d49e186c63bb171983f260a97a621b88c4047f1ea79a463ca3b88a047a5d1e9932a03fb6fa569429ba86cb830e782f8d383a9e80344f37 SHA512 636c91232655cac886c240aa32b8280ea47601e5c55eeb7d7a202caad891e0d149e895406b414302d733868182896f9a7ff68a09a2a406689de7b8ad018771d0
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r1.ebuild
deleted file mode 100644
index c6e413af1000..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r2.ebuild
deleted file mode 100644
index 66544777383b..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r3.ebuild
deleted file mode 100644
index 66544777383b..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r4.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r4.ebuild
deleted file mode 100644
index 66544777383b..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r4.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r4.ebuild
deleted file mode 100644
index c6e413af1000..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20180114-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..df0d6e69d5b3
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ldap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ldap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index 47a7b947a847..869e7a3338a5 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-links-2.20170204-r1.ebuild 282 BLAKE2B 3f5dbdda8f5416e191ea3b817f0ae53bc6abe1a4853e655a4e081ea3e46a72e4c87119845af52a916bffa549db8283276dfe055d38639bc7c5167a3ea72d2b5f SHA512 90f19f11e3c20c270fe050e1516d8cb153ce77a8f284e926cd82342e05d3b06623fac2c2bf96df63b10f9be6ace3fb0a4fe4348b4e8ac17eb1848a3d384f79d9
-EBUILD selinux-links-2.20170204-r2.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78a08954bd34151309e51740c035d293114db2688a6f937381b622d3367ea544b3ba73f18e3c15ffd6231bdf6861d83d259588e5 SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45
-EBUILD selinux-links-2.20170204-r3.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78a08954bd34151309e51740c035d293114db2688a6f937381b622d3367ea544b3ba73f18e3c15ffd6231bdf6861d83d259588e5 SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45
-EBUILD selinux-links-2.20170204-r4.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78a08954bd34151309e51740c035d293114db2688a6f937381b622d3367ea544b3ba73f18e3c15ffd6231bdf6861d83d259588e5 SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45
 EBUILD selinux-links-2.20170805-r2.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78a08954bd34151309e51740c035d293114db2688a6f937381b622d3367ea544b3ba73f18e3c15ffd6231bdf6861d83d259588e5 SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45
 EBUILD selinux-links-2.20170805-r3.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78a08954bd34151309e51740c035d293114db2688a6f937381b622d3367ea544b3ba73f18e3c15ffd6231bdf6861d83d259588e5 SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45
-EBUILD selinux-links-2.20170805-r4.ebuild 282 BLAKE2B 3f5dbdda8f5416e191ea3b817f0ae53bc6abe1a4853e655a4e081ea3e46a72e4c87119845af52a916bffa549db8283276dfe055d38639bc7c5167a3ea72d2b5f SHA512 90f19f11e3c20c270fe050e1516d8cb153ce77a8f284e926cd82342e05d3b06623fac2c2bf96df63b10f9be6ace3fb0a4fe4348b4e8ac17eb1848a3d384f79d9
 EBUILD selinux-links-2.20180114-r1.ebuild 280 BLAKE2B 1694b38695ac8f4f103b99e3f011a5ba9c77a5db354648929cae1d30a9b052e63055588f6e3963bed658a4e805f20c9d0020611c804effcf9f2c5790bdb42c48 SHA512 6aff064d0f303f4dc7d4754f084ccacb80e5d853499f76a0765566b047bc9f5f4eb34a3e2f4316dbdc8bc302d94abe0bac83958519d56df762bf1f4283c65c40
 EBUILD selinux-links-2.20180114-r2.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
+EBUILD selinux-links-2.20180114-r3.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
 EBUILD selinux-links-9999.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
 MISC metadata.xml 315 BLAKE2B b5fcf7545c331d474867d047a6293eb1b4316723c51728ee5e392a817a0c2f52313d062ed0b53973875b1fe84b4991cf2f4ef9f49a8980ba36c196a1938384bf SHA512 7424e06fb28587f673f2e510b5b15f3d88bcfe6502870fb295219069950c4496254f40d8124f4e49029ea3a52c7864ec3c8623de21c6e845940f22cdf5f71e8a
diff --git a/sec-policy/selinux-links/selinux-links-2.20170204-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20170204-r1.ebuild
deleted file mode 100644
index 0bcedfffe5dd..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20170204-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20170204-r2.ebuild
deleted file mode 100644
index 0ff1679a2579..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20170204-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20170204-r3.ebuild
deleted file mode 100644
index 0ff1679a2579..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20170204-r4.ebuild b/sec-policy/selinux-links/selinux-links-2.20170204-r4.ebuild
deleted file mode 100644
index 0ff1679a2579..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20170805-r4.ebuild b/sec-policy/selinux-links/selinux-links-2.20170805-r4.ebuild
deleted file mode 100644
index 0bcedfffe5dd..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20180114-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..12a9b9d2e1a6
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="links"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for links"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index ae4f5cecf997..31e2d027ed4d 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-lircd-2.20170204-r1.ebuild 282 BLAKE2B 7a3750f16a518f360feddbb66c45419e1c9ce1b1a1afe6eebad24010168558b1400a35a81461d1f3b416f59e0ca16442de85b5706031024953e44b432c7e482c SHA512 6f6c5fdd7aee5686c7e80b2b2da554f918240714924be114363a75da0ccb5e59cb762af10196ae0861ba79c1f5ef11e9833d7d0eee74be164b69ba3e3b581dde
-EBUILD selinux-lircd-2.20170204-r2.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48417206b3cc6c3ee0084e0838095d0f64a741b87d0ceaee71bd47a7f920a27f9d4573635d3a093b6925af280739a0ea3561fb8b SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd
-EBUILD selinux-lircd-2.20170204-r3.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48417206b3cc6c3ee0084e0838095d0f64a741b87d0ceaee71bd47a7f920a27f9d4573635d3a093b6925af280739a0ea3561fb8b SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd
-EBUILD selinux-lircd-2.20170204-r4.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48417206b3cc6c3ee0084e0838095d0f64a741b87d0ceaee71bd47a7f920a27f9d4573635d3a093b6925af280739a0ea3561fb8b SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd
 EBUILD selinux-lircd-2.20170805-r2.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48417206b3cc6c3ee0084e0838095d0f64a741b87d0ceaee71bd47a7f920a27f9d4573635d3a093b6925af280739a0ea3561fb8b SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd
 EBUILD selinux-lircd-2.20170805-r3.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48417206b3cc6c3ee0084e0838095d0f64a741b87d0ceaee71bd47a7f920a27f9d4573635d3a093b6925af280739a0ea3561fb8b SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd
-EBUILD selinux-lircd-2.20170805-r4.ebuild 282 BLAKE2B 7a3750f16a518f360feddbb66c45419e1c9ce1b1a1afe6eebad24010168558b1400a35a81461d1f3b416f59e0ca16442de85b5706031024953e44b432c7e482c SHA512 6f6c5fdd7aee5686c7e80b2b2da554f918240714924be114363a75da0ccb5e59cb762af10196ae0861ba79c1f5ef11e9833d7d0eee74be164b69ba3e3b581dde
 EBUILD selinux-lircd-2.20180114-r1.ebuild 280 BLAKE2B 0ec17efa4d31eafec47df1a76e0921737bc066834faf2091d9807cc88c44b7f38505f08fa12f1977b280270ca1fd726a38cee90b8a9c3b52c29bcce5d7fc650c SHA512 ed93f261b092600e6e78bd684fc5d67d7494528e282119b17f111b1c4f20b28b76e728ca647573f6b753b4ac961dc4c4800c9d5a24bc87735c40509fd5e19d10
 EBUILD selinux-lircd-2.20180114-r2.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
+EBUILD selinux-lircd-2.20180114-r3.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
 EBUILD selinux-lircd-9999.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
 MISC metadata.xml 315 BLAKE2B c7de893548597a8afca883e27ef053856c01df653834bb48b428c970e90e6d0f62454ca7b06763228164046ff198c7520827d9b8c77fbe5015318307c082a790 SHA512 9d04fdc81f5f216b29dd4b7c1a1a88f0b112bb1eb713b75b67b33db0ebfbc82c71572515347febcb2c71bf843e8422100c5f1da33b836b4612900231459719e7
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r1.ebuild
deleted file mode 100644
index 523955cf2879..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r2.ebuild
deleted file mode 100644
index 366e54bdc751..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r3.ebuild
deleted file mode 100644
index 366e54bdc751..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r4.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r4.ebuild
deleted file mode 100644
index 366e54bdc751..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r4.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r4.ebuild
deleted file mode 100644
index 523955cf2879..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20180114-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..b4d38f9204f1
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lircd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 99afb6f4a85f..6263446083f1 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-loadkeys-2.20170204-r1.ebuild 288 BLAKE2B 5a89defc5f924c5fc58bdbadb5ac88f74383c100f4a3b876706e096baf3b45d26cb4449f22a9e426d5499fc0387596f9e1dae7b08b363c18771981d7f93d4706 SHA512 cc217920009519a39dc64ef71640f6ffbf8d61c58182c5d81ae668a7575abc6060b2902a6c3c050d51d936eedf4eddbfb7567a0b3ddb9013b99acdfb73705093
-EBUILD selinux-loadkeys-2.20170204-r2.ebuild 286 BLAKE2B 20d0b63a187349caa24d6858aef1a15fa9a391f90ab0c8edae41bcaaf4f273ebcd533a83dd4e51f4ac5de1be31b50f477780c12cd77a74d966e29cb66d46aa61 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2
-EBUILD selinux-loadkeys-2.20170204-r3.ebuild 286 BLAKE2B 20d0b63a187349caa24d6858aef1a15fa9a391f90ab0c8edae41bcaaf4f273ebcd533a83dd4e51f4ac5de1be31b50f477780c12cd77a74d966e29cb66d46aa61 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2
-EBUILD selinux-loadkeys-2.20170204-r4.ebuild 286 BLAKE2B 20d0b63a187349caa24d6858aef1a15fa9a391f90ab0c8edae41bcaaf4f273ebcd533a83dd4e51f4ac5de1be31b50f477780c12cd77a74d966e29cb66d46aa61 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2
 EBUILD selinux-loadkeys-2.20170805-r2.ebuild 286 BLAKE2B 20d0b63a187349caa24d6858aef1a15fa9a391f90ab0c8edae41bcaaf4f273ebcd533a83dd4e51f4ac5de1be31b50f477780c12cd77a74d966e29cb66d46aa61 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2
 EBUILD selinux-loadkeys-2.20170805-r3.ebuild 286 BLAKE2B 20d0b63a187349caa24d6858aef1a15fa9a391f90ab0c8edae41bcaaf4f273ebcd533a83dd4e51f4ac5de1be31b50f477780c12cd77a74d966e29cb66d46aa61 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2
-EBUILD selinux-loadkeys-2.20170805-r4.ebuild 288 BLAKE2B 5a89defc5f924c5fc58bdbadb5ac88f74383c100f4a3b876706e096baf3b45d26cb4449f22a9e426d5499fc0387596f9e1dae7b08b363c18771981d7f93d4706 SHA512 cc217920009519a39dc64ef71640f6ffbf8d61c58182c5d81ae668a7575abc6060b2902a6c3c050d51d936eedf4eddbfb7567a0b3ddb9013b99acdfb73705093
 EBUILD selinux-loadkeys-2.20180114-r1.ebuild 286 BLAKE2B f36b5a0536d3100922525b6e24c92fd7d0c311798ac27011b8ba55f477510ffa669dc737ab79a664a4db433fa7404fd8f07f362de4c7eb430c5da116b7ffb079 SHA512 20e1534d13ef86595a6ffc0d8889c78d06576a553472ccb89040f3203317a2647fcd88539defb9c770f472fcabb37676df602e5fe82b1340c3dc7f07ae102cad
 EBUILD selinux-loadkeys-2.20180114-r2.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
+EBUILD selinux-loadkeys-2.20180114-r3.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
 EBUILD selinux-loadkeys-9999.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
 MISC metadata.xml 318 BLAKE2B 18f6edce47c51b76593e30d7aa65c9fb96b9437f4bfb3c42a63209f0ead735ce8e3376d16c600b21ced48514eb7b98e1c0d676f60971502078901d80cb6bd08f SHA512 439186e025dfd23a3d5d0906647428b694742a73493a57ec1d4b63e4c4f81e8cf0329336afb890f3089051a791296765ad9916af15bbea20215bb6698ea22f4d
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r1.ebuild
deleted file mode 100644
index ca13bafa86e9..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r2.ebuild
deleted file mode 100644
index 025692b422ba..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r3.ebuild
deleted file mode 100644
index 025692b422ba..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r4.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r4.ebuild
deleted file mode 100644
index 025692b422ba..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r4.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r4.ebuild
deleted file mode 100644
index ca13bafa86e9..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180114-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..f47cbc382bd5
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="loadkeys"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for loadkeys"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index e27413e6f871..bfd131a34ad0 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-lockdev-2.20170204-r1.ebuild 286 BLAKE2B 767f17951b755e811e66caf0185171293a43ccd28bfbe3888a3bf99499042c44aee33db9986030067e2b261ec76440c0e743ef73f8ab939f8af39622754bcaaf SHA512 d36d65c67eeac4b10dbf747f225e2d31b2485d4acdea54f551b30cc1d209586c684c80cc65241bee9a64a22c6a1beef6bc3f01f6e150c6581581cd3f120b6d4d
-EBUILD selinux-lockdev-2.20170204-r2.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35b9a571e6f035374e7d560fb4ddcc67102ca2e1035cd4b74d4fc82dfb0f57f9ae76daca74ce94eff86e3d36106dc1721538877f18 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6
-EBUILD selinux-lockdev-2.20170204-r3.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35b9a571e6f035374e7d560fb4ddcc67102ca2e1035cd4b74d4fc82dfb0f57f9ae76daca74ce94eff86e3d36106dc1721538877f18 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6
-EBUILD selinux-lockdev-2.20170204-r4.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35b9a571e6f035374e7d560fb4ddcc67102ca2e1035cd4b74d4fc82dfb0f57f9ae76daca74ce94eff86e3d36106dc1721538877f18 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6
 EBUILD selinux-lockdev-2.20170805-r2.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35b9a571e6f035374e7d560fb4ddcc67102ca2e1035cd4b74d4fc82dfb0f57f9ae76daca74ce94eff86e3d36106dc1721538877f18 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6
 EBUILD selinux-lockdev-2.20170805-r3.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35b9a571e6f035374e7d560fb4ddcc67102ca2e1035cd4b74d4fc82dfb0f57f9ae76daca74ce94eff86e3d36106dc1721538877f18 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6
-EBUILD selinux-lockdev-2.20170805-r4.ebuild 286 BLAKE2B 767f17951b755e811e66caf0185171293a43ccd28bfbe3888a3bf99499042c44aee33db9986030067e2b261ec76440c0e743ef73f8ab939f8af39622754bcaaf SHA512 d36d65c67eeac4b10dbf747f225e2d31b2485d4acdea54f551b30cc1d209586c684c80cc65241bee9a64a22c6a1beef6bc3f01f6e150c6581581cd3f120b6d4d
 EBUILD selinux-lockdev-2.20180114-r1.ebuild 284 BLAKE2B 6509d66dd88f5b00dc2b5ed3a04fb08e1da9d6e6d4df604545f8cd3ea17c676c9f7ef1a4411cab73fe09761d50a88f4e60a7ea2477f4656f26032fc56b607399 SHA512 8fa66f28df93482e6259a6d05b2865c24b27beebbab37bbd25b33ff9b54eb7586871ecefb297e1072aab0ad5ee0385499e2ff9e077be3901b623375956e9d8a9
 EBUILD selinux-lockdev-2.20180114-r2.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
+EBUILD selinux-lockdev-2.20180114-r3.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
 EBUILD selinux-lockdev-9999.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
 MISC metadata.xml 317 BLAKE2B 08130a25336c5ec4393ead62f4e28f20101014d346088fcdfb454a12c510e5c86140990efc8761c92833558f9bed3ee4b13a8be2345ffb6fe65fc0387dab481a SHA512 03fda7bf63650835f954517ae6277944215299e0d44567b59c7235a5790ff74391e021b86954e77f9af6fe3edf9552bf553b75e34b772c93d75f1f3a52d26d2d
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r1.ebuild
deleted file mode 100644
index 1d3c797a71da..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r2.ebuild
deleted file mode 100644
index 9629e202505e..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r3.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r3.ebuild
deleted file mode 100644
index 9629e202505e..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r4.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r4.ebuild
deleted file mode 100644
index 9629e202505e..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r4.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r4.ebuild
deleted file mode 100644
index 1d3c797a71da..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20180114-r3.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..09c1bb019c76
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lockdev"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lockdev"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index eb125d7f7e5b..6c08dd4d6d78 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-logrotate-2.20170204-r1.ebuild 290 BLAKE2B 69e7643c1d24e2927a859be089092c57a8bbf09147d3e70b2932bfad3c68ded8923a33b7a63eef1747455f9d8eeda5fb095f65649254dab17e6468ee5d2a705f SHA512 5624e9618cc8180315f82f1da8ce566ed5df9143dda38da29c7bfbc4b28ada600aff96e5a624281ad9cddd7c18f4b194340c8e7b5988eb426a74c61647ce24b3
-EBUILD selinux-logrotate-2.20170204-r2.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed37340208303c9d2207f9eb8b5fbfc14d6a59e71af4d9f8ed1be56ffbdd9a1b8a38dac6cdbee90f491866435ebc258f7c16e0bb98bbe SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f
-EBUILD selinux-logrotate-2.20170204-r3.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed37340208303c9d2207f9eb8b5fbfc14d6a59e71af4d9f8ed1be56ffbdd9a1b8a38dac6cdbee90f491866435ebc258f7c16e0bb98bbe SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f
-EBUILD selinux-logrotate-2.20170204-r4.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed37340208303c9d2207f9eb8b5fbfc14d6a59e71af4d9f8ed1be56ffbdd9a1b8a38dac6cdbee90f491866435ebc258f7c16e0bb98bbe SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f
 EBUILD selinux-logrotate-2.20170805-r2.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed37340208303c9d2207f9eb8b5fbfc14d6a59e71af4d9f8ed1be56ffbdd9a1b8a38dac6cdbee90f491866435ebc258f7c16e0bb98bbe SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f
 EBUILD selinux-logrotate-2.20170805-r3.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed37340208303c9d2207f9eb8b5fbfc14d6a59e71af4d9f8ed1be56ffbdd9a1b8a38dac6cdbee90f491866435ebc258f7c16e0bb98bbe SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f
-EBUILD selinux-logrotate-2.20170805-r4.ebuild 290 BLAKE2B 69e7643c1d24e2927a859be089092c57a8bbf09147d3e70b2932bfad3c68ded8923a33b7a63eef1747455f9d8eeda5fb095f65649254dab17e6468ee5d2a705f SHA512 5624e9618cc8180315f82f1da8ce566ed5df9143dda38da29c7bfbc4b28ada600aff96e5a624281ad9cddd7c18f4b194340c8e7b5988eb426a74c61647ce24b3
 EBUILD selinux-logrotate-2.20180114-r1.ebuild 288 BLAKE2B c2c022b7e3a0c0a00f5f1a0a9ebf337bb06532f949415e840afa4689b01f0c368a704a3512efcd216a7dfaf8b93f1beab9e9c2d9073ac1688b7f102b0d947199 SHA512 c54c6e2335362651a807de5d7616170f584b80372d9336780c8016d656df5918096542eb362887379845ba5005d579493fbd7dc755a2e2c03eb70b77db7813e7
 EBUILD selinux-logrotate-2.20180114-r2.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
+EBUILD selinux-logrotate-2.20180114-r3.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
 EBUILD selinux-logrotate-9999.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
 MISC metadata.xml 319 BLAKE2B b23741f933d94eb0e498321a6c389a74c95a0aa5c7a2e3ebd05f5835e1b9f77b3946f0cae556d310ed5f1c86d66158b498f57bd4cda3aad105de606fd4d923b5 SHA512 cb02bc8a888c83776ca20c832c91c72ad8c72fae6e498d75442c516e71fd3a8c1620b885974e8d3a34815cb624bef74f357d90593d4d4dfc0a35113401e28048
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r1.ebuild
deleted file mode 100644
index b2095c2205e4..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r2.ebuild
deleted file mode 100644
index 8e78ab257d42..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r3.ebuild
deleted file mode 100644
index 8e78ab257d42..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r4.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r4.ebuild
deleted file mode 100644
index 8e78ab257d42..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r4.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r4.ebuild
deleted file mode 100644
index b2095c2205e4..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20180114-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..844b28f1c301
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logrotate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logrotate"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 22fade98a3a2..59c7b26370b4 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-logsentry-2.20170204-r1.ebuild 290 BLAKE2B b88aa1a8b5a487c7d6f9e56bc1af48476a12a1d60cd99250cded5164d173866a5310e4d8d28f7aecd0c9da2e3eb0949cc698a35d0fe0667c7f4de8faa4fad230 SHA512 d20869d54d19706f6b38bcb7a0161310f84869b5c73a0d379ee731e0bbf68babd74702038259e825ec27332e511f066b1bf3c52bcf738b7d5629becf040589a6
-EBUILD selinux-logsentry-2.20170204-r2.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed43d4e82b1b8e8ef7ed31486f34e4a445f6a407c75404e615e2e7c836b23e703c1f06a3e4f99e9f363fb80da7c5f83f9dc6cf014080f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2
-EBUILD selinux-logsentry-2.20170204-r3.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed43d4e82b1b8e8ef7ed31486f34e4a445f6a407c75404e615e2e7c836b23e703c1f06a3e4f99e9f363fb80da7c5f83f9dc6cf014080f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2
-EBUILD selinux-logsentry-2.20170204-r4.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed43d4e82b1b8e8ef7ed31486f34e4a445f6a407c75404e615e2e7c836b23e703c1f06a3e4f99e9f363fb80da7c5f83f9dc6cf014080f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2
 EBUILD selinux-logsentry-2.20170805-r2.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed43d4e82b1b8e8ef7ed31486f34e4a445f6a407c75404e615e2e7c836b23e703c1f06a3e4f99e9f363fb80da7c5f83f9dc6cf014080f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2
 EBUILD selinux-logsentry-2.20170805-r3.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed43d4e82b1b8e8ef7ed31486f34e4a445f6a407c75404e615e2e7c836b23e703c1f06a3e4f99e9f363fb80da7c5f83f9dc6cf014080f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2
-EBUILD selinux-logsentry-2.20170805-r4.ebuild 290 BLAKE2B b88aa1a8b5a487c7d6f9e56bc1af48476a12a1d60cd99250cded5164d173866a5310e4d8d28f7aecd0c9da2e3eb0949cc698a35d0fe0667c7f4de8faa4fad230 SHA512 d20869d54d19706f6b38bcb7a0161310f84869b5c73a0d379ee731e0bbf68babd74702038259e825ec27332e511f066b1bf3c52bcf738b7d5629becf040589a6
 EBUILD selinux-logsentry-2.20180114-r1.ebuild 288 BLAKE2B 580845bed16396e6757c4e05a57830314391b30eb92129c67c9989c627371e3d752bd538f10215927007d2b0fff0b24596501fc116f2c1ee236470428c1c58b8 SHA512 d5d176c92462d00e5ea994687aa10b1c06f879b8548b8acb4ae4be8d0276f15f0c332f35001866f31ec9cdefa337aff989245b11f376071d0ec1b487240a48be
 EBUILD selinux-logsentry-2.20180114-r2.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
+EBUILD selinux-logsentry-2.20180114-r3.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
 EBUILD selinux-logsentry-9999.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
 MISC metadata.xml 319 BLAKE2B 56ac266d2b53e0d67f40dbf9dc8cc67131ef2df1850f1101a531ff8e5bf8099212cb024811b87c2ac726f9118350739f9cf139804c7e30d4e80923796362b87f SHA512 8f566c30ab3450fd5f24a28bff2f948e13efb047005069b4954266a6442182332f74294edf4964064ed41ce973d58b63f6c0216c57380b47853321a2b797e1a2
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r1.ebuild
deleted file mode 100644
index b60407d2ed6a..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r2.ebuild
deleted file mode 100644
index 523ca2af3edd..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r3.ebuild
deleted file mode 100644
index 523ca2af3edd..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r4.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r4.ebuild
deleted file mode 100644
index 523ca2af3edd..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r4.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r4.ebuild
deleted file mode 100644
index b60407d2ed6a..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20180114-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..b4593b5031c6
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logsentry"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logsentry"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 5e446833e36a..e3385ca810f3 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-logwatch-2.20170204-r1.ebuild 288 BLAKE2B 73278d5acae5f442eebb6c80d48025c696711c2773c5598c9f907bdddb77497616359085ea4d8ee240041e6cba3ca17564db83593862e3fb8e03b3e41df3b925 SHA512 c913d9d3075fc324ff027ff6b52edbbcb79cbbded39e42afc96a0ba5bea7d2cc3dfa8dee6a7c1ef2897c227b1b685c3cd39b33a09efe0dc12082658f1b3ef47e
-EBUILD selinux-logwatch-2.20170204-r2.ebuild 286 BLAKE2B 0c4c173643039a56520b438272922f3a4df338be5b663363dd1e9469c46ae302fc7c0a13c6e18ea50b01bd7aff33bfedf4915bacacc52e871635993a71c17f0d SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8
-EBUILD selinux-logwatch-2.20170204-r3.ebuild 286 BLAKE2B 0c4c173643039a56520b438272922f3a4df338be5b663363dd1e9469c46ae302fc7c0a13c6e18ea50b01bd7aff33bfedf4915bacacc52e871635993a71c17f0d SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8
-EBUILD selinux-logwatch-2.20170204-r4.ebuild 286 BLAKE2B 0c4c173643039a56520b438272922f3a4df338be5b663363dd1e9469c46ae302fc7c0a13c6e18ea50b01bd7aff33bfedf4915bacacc52e871635993a71c17f0d SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8
 EBUILD selinux-logwatch-2.20170805-r2.ebuild 286 BLAKE2B 0c4c173643039a56520b438272922f3a4df338be5b663363dd1e9469c46ae302fc7c0a13c6e18ea50b01bd7aff33bfedf4915bacacc52e871635993a71c17f0d SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8
 EBUILD selinux-logwatch-2.20170805-r3.ebuild 286 BLAKE2B 0c4c173643039a56520b438272922f3a4df338be5b663363dd1e9469c46ae302fc7c0a13c6e18ea50b01bd7aff33bfedf4915bacacc52e871635993a71c17f0d SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8
-EBUILD selinux-logwatch-2.20170805-r4.ebuild 288 BLAKE2B 73278d5acae5f442eebb6c80d48025c696711c2773c5598c9f907bdddb77497616359085ea4d8ee240041e6cba3ca17564db83593862e3fb8e03b3e41df3b925 SHA512 c913d9d3075fc324ff027ff6b52edbbcb79cbbded39e42afc96a0ba5bea7d2cc3dfa8dee6a7c1ef2897c227b1b685c3cd39b33a09efe0dc12082658f1b3ef47e
 EBUILD selinux-logwatch-2.20180114-r1.ebuild 286 BLAKE2B 1affb24e23c79d10433d7a3b475b9482d0fb99d8c31ba4ce8f7223e46bfe32b121977767837db1539e3013d941b06951a9d42442baea29e7c397a19ff858b35d SHA512 3d011e2a73dd7af367bd274fe54ff2ef0704789d9cb8cb393afc3b20d7564b36d390354c7cc38e14a37bdb8cff07c6c7b55476adfa5ace64c7bebe9d6879c657
 EBUILD selinux-logwatch-2.20180114-r2.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
+EBUILD selinux-logwatch-2.20180114-r3.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
 EBUILD selinux-logwatch-9999.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
 MISC metadata.xml 318 BLAKE2B 376d0452a036c9a51c1aa405e531f58d00e19802c57a8ff64c5548a96b583220dfaab02b7d89bb9d686109cf0bbebfbe7a0a3c906dedfd4e8c3a8fec170ec511 SHA512 4a7407a0137f66d16b507fc695b45b9e21f4ebfab64d4cb0a755a5c961e1cb2deb84807209b2039f1de6867319091236b4eaa37647c8107db2f9e04caf6383bd
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r1.ebuild
deleted file mode 100644
index 402975aec14a..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r2.ebuild
deleted file mode 100644
index 1b00546dc81d..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r3.ebuild
deleted file mode 100644
index 1b00546dc81d..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r4.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r4.ebuild
deleted file mode 100644
index 1b00546dc81d..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r4.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r4.ebuild
deleted file mode 100644
index 402975aec14a..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20180114-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5e3afa99aab0
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logwatch"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 8f6b62256080..0b6c38910271 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-lpd-2.20170204-r1.ebuild 278 BLAKE2B 43d7a74b1cf253cbd8110a37e47bbb2a61ca1ced11e8e37fa948098e152a49441ba292372869790bea19b6842cbe2c3f1cb3b1d40476e7e3a8daf03d996b23a1 SHA512 21fa11fc80bd790560e4c8c52c60e7a54439b20cbe95cc62829d3d94363fdfb79c0251a20f7fe2807bce699bb37936403d607cf48a91b6cd774dca10abf2708b
-EBUILD selinux-lpd-2.20170204-r2.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d13a104f5dc684769901217c2ec01b44c204727a813de2055099c9830310ac2db4f34a42e640b7bba9ed03bbbd30c1c695d1b SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784
-EBUILD selinux-lpd-2.20170204-r3.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d13a104f5dc684769901217c2ec01b44c204727a813de2055099c9830310ac2db4f34a42e640b7bba9ed03bbbd30c1c695d1b SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784
-EBUILD selinux-lpd-2.20170204-r4.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d13a104f5dc684769901217c2ec01b44c204727a813de2055099c9830310ac2db4f34a42e640b7bba9ed03bbbd30c1c695d1b SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784
 EBUILD selinux-lpd-2.20170805-r2.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d13a104f5dc684769901217c2ec01b44c204727a813de2055099c9830310ac2db4f34a42e640b7bba9ed03bbbd30c1c695d1b SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784
 EBUILD selinux-lpd-2.20170805-r3.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d13a104f5dc684769901217c2ec01b44c204727a813de2055099c9830310ac2db4f34a42e640b7bba9ed03bbbd30c1c695d1b SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784
-EBUILD selinux-lpd-2.20170805-r4.ebuild 278 BLAKE2B 43d7a74b1cf253cbd8110a37e47bbb2a61ca1ced11e8e37fa948098e152a49441ba292372869790bea19b6842cbe2c3f1cb3b1d40476e7e3a8daf03d996b23a1 SHA512 21fa11fc80bd790560e4c8c52c60e7a54439b20cbe95cc62829d3d94363fdfb79c0251a20f7fe2807bce699bb37936403d607cf48a91b6cd774dca10abf2708b
 EBUILD selinux-lpd-2.20180114-r1.ebuild 276 BLAKE2B 6bb1cee38b563650deac14c6cebeb1ebffdaba5e1cff151d6a4679ac5d13ad46dd83e156952ade05600b599bea9375dd0c169cb1916c1a361ffe447ed6ae963e SHA512 9d423e65370573d452177b332f33a0e92df99116e1bcf230bb41ab0fb2549e7ca06b300ffd5e018b89cd31bfd888eacdc67468117f6b3bca99ad55ee58653c04
 EBUILD selinux-lpd-2.20180114-r2.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
+EBUILD selinux-lpd-2.20180114-r3.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
 EBUILD selinux-lpd-9999.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
 MISC metadata.xml 313 BLAKE2B 296a070541acd47ca37a948cd1df1ec41bbdcb4c3f254f1af346d434a48c68a4cb9d607ef7b939b544b319f28166e26e6052abe3d1610fe35ec504b5e5d19ba1 SHA512 03d93808ba7e8db5cc04b91fc47ec9975edc36e1586851e16bde078f0d37c7560a4c33ee00c865332ffca409c8cb07f9a9d3427e160528c111e64f51ad46ff77
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r1.ebuild
deleted file mode 100644
index 839cb34d661a..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r2.ebuild
deleted file mode 100644
index 721d9802aa83..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r3.ebuild
deleted file mode 100644
index 721d9802aa83..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r4.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r4.ebuild
deleted file mode 100644
index 721d9802aa83..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r4.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r4.ebuild
deleted file mode 100644
index 839cb34d661a..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20180114-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c0511bb2d938
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 1c3d1a118723..c76bea7c5ef2 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mailman-2.20170204-r1.ebuild 286 BLAKE2B b016cac56657e6d0e2680447f5e9096444abd4d4eabe1f42866130dad6e26f2df771b6c696673785e9f0d41000700b7c8acf2d8af869804cf6f026cebf2a69b7 SHA512 21ac5e5e0f708a7eb0b9c3c16bce2cdc36f8a170e19e457f02a67babb71e3f6f627a23b53f124056fc1c970c175279cad6f01ed1fa51c038657c04360b2bb8b1
-EBUILD selinux-mailman-2.20170204-r2.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95bf5bbc127cdf44794a45d4d0c86ce249c2db9c02b362562447d3940425cec31ed7e13ab6c9a917046f07e3fd4096cc0ecf6d77e3 SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0
-EBUILD selinux-mailman-2.20170204-r3.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95bf5bbc127cdf44794a45d4d0c86ce249c2db9c02b362562447d3940425cec31ed7e13ab6c9a917046f07e3fd4096cc0ecf6d77e3 SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0
-EBUILD selinux-mailman-2.20170204-r4.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95bf5bbc127cdf44794a45d4d0c86ce249c2db9c02b362562447d3940425cec31ed7e13ab6c9a917046f07e3fd4096cc0ecf6d77e3 SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0
 EBUILD selinux-mailman-2.20170805-r2.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95bf5bbc127cdf44794a45d4d0c86ce249c2db9c02b362562447d3940425cec31ed7e13ab6c9a917046f07e3fd4096cc0ecf6d77e3 SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0
 EBUILD selinux-mailman-2.20170805-r3.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95bf5bbc127cdf44794a45d4d0c86ce249c2db9c02b362562447d3940425cec31ed7e13ab6c9a917046f07e3fd4096cc0ecf6d77e3 SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0
-EBUILD selinux-mailman-2.20170805-r4.ebuild 286 BLAKE2B b016cac56657e6d0e2680447f5e9096444abd4d4eabe1f42866130dad6e26f2df771b6c696673785e9f0d41000700b7c8acf2d8af869804cf6f026cebf2a69b7 SHA512 21ac5e5e0f708a7eb0b9c3c16bce2cdc36f8a170e19e457f02a67babb71e3f6f627a23b53f124056fc1c970c175279cad6f01ed1fa51c038657c04360b2bb8b1
 EBUILD selinux-mailman-2.20180114-r1.ebuild 284 BLAKE2B 61251a5c7148f50ff283ffe07157eb0dbff38ee17022f8564355ae968153b0f89ef287588258aeb5b1bf2fd589ed993fe466c5a0f43920e16a1cdbc1b731fb6f SHA512 8b0361b09fb8c9aa7d0bb9af6f6f22aaef5a4c750f5c80acf62063cc384c749031456a79fcc205642738f9c238c90b492d67ebeb4820809fcd13a1f60b6d799e
 EBUILD selinux-mailman-2.20180114-r2.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
+EBUILD selinux-mailman-2.20180114-r3.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
 EBUILD selinux-mailman-9999.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
 MISC metadata.xml 317 BLAKE2B 5ade8770d43e7f5003060d64c8716fecce914f0123e695a57c83afed3099b491f4161605ae6d4dcc0a22a9317726121eac9a67b50ebfa11bba5654c3ea4c966f SHA512 2c542b0d9cf5698b68e2fb6052480e3e3e0c28f2b06cca88016cb67cc8930ca81bf4c8958124bc447571a8527ece7834e47d7f8f8f1e49a52d308b04e9378b09
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r1.ebuild
deleted file mode 100644
index 94b0bef5e7d2..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r2.ebuild
deleted file mode 100644
index 600e865a80db..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r3.ebuild
deleted file mode 100644
index 600e865a80db..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r4.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r4.ebuild
deleted file mode 100644
index 600e865a80db..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r4.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r4.ebuild
deleted file mode 100644
index 94b0bef5e7d2..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20180114-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..984440327ed0
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mailman"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mailman"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 3e5bd7e4fbb2..ae3e0738a1e3 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-makewhatis-2.20170204-r1.ebuild 292 BLAKE2B 21e93aabf90e2a92bf0109ca2cc5a39c4a19677b626d3293a7039245db3ec71a8f683cbe4f9b59f39b15957f1b9785709f50f1b7d35427ea7cc035dbc3a8fada SHA512 0a0d25bf49d4d67effa5e64a3c7cd869ddf28480f065e703f5e9c784b350a0a6c625cdb13cdf37d26591c9cb7576097afdb77f8ea193a77556bc6895144d3594
-EBUILD selinux-makewhatis-2.20170204-r2.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc6ce7417c67ec8fa85a501be12816083502dce0d5c33897a684dd2e6fa7dcf29c48ead4ba8705be22a0ec211daa14081ce1356f534b0 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130
-EBUILD selinux-makewhatis-2.20170204-r3.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc6ce7417c67ec8fa85a501be12816083502dce0d5c33897a684dd2e6fa7dcf29c48ead4ba8705be22a0ec211daa14081ce1356f534b0 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130
-EBUILD selinux-makewhatis-2.20170204-r4.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc6ce7417c67ec8fa85a501be12816083502dce0d5c33897a684dd2e6fa7dcf29c48ead4ba8705be22a0ec211daa14081ce1356f534b0 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130
 EBUILD selinux-makewhatis-2.20170805-r2.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc6ce7417c67ec8fa85a501be12816083502dce0d5c33897a684dd2e6fa7dcf29c48ead4ba8705be22a0ec211daa14081ce1356f534b0 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130
 EBUILD selinux-makewhatis-2.20170805-r3.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc6ce7417c67ec8fa85a501be12816083502dce0d5c33897a684dd2e6fa7dcf29c48ead4ba8705be22a0ec211daa14081ce1356f534b0 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130
-EBUILD selinux-makewhatis-2.20170805-r4.ebuild 292 BLAKE2B 21e93aabf90e2a92bf0109ca2cc5a39c4a19677b626d3293a7039245db3ec71a8f683cbe4f9b59f39b15957f1b9785709f50f1b7d35427ea7cc035dbc3a8fada SHA512 0a0d25bf49d4d67effa5e64a3c7cd869ddf28480f065e703f5e9c784b350a0a6c625cdb13cdf37d26591c9cb7576097afdb77f8ea193a77556bc6895144d3594
 EBUILD selinux-makewhatis-2.20180114-r1.ebuild 290 BLAKE2B ad579193ba62f00ecb9e678ac5a959c763adaa3bb0806654b2d3976cfc1d501191a89d02c42ca516db337a2a01bcf7d00ff1a2b58023e865b556b33928429ff8 SHA512 7c4a73b3f722edb2e81b134b6311a352e0dc8b9fc4f41aabda8d339094e6d22c37e7c579aa9512242312173aec12b262e1503fffc8ad1511b3cb3aa23b990957
 EBUILD selinux-makewhatis-2.20180114-r2.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
+EBUILD selinux-makewhatis-2.20180114-r3.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
 EBUILD selinux-makewhatis-9999.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
 MISC metadata.xml 320 BLAKE2B a265a990113bf8db09888651333afc37c1211d09dbd681c28df733462fe35caa192770a298c5595e11abb4ef907756c4506451f67be96d8932fda325b1175e5f SHA512 bc95b01949705d19d1f46eb6d0281381fec137ca312fa6d1ee1ecdbd7cd4b79ec2cefa93032f8ac4e33039b299455f0dc0806b06754066f5134dd0d025beb417
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r1.ebuild
deleted file mode 100644
index d2ef7e421b30..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r2.ebuild
deleted file mode 100644
index 9d093cdcf13d..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r3.ebuild
deleted file mode 100644
index 9d093cdcf13d..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r4.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r4.ebuild
deleted file mode 100644
index 9d093cdcf13d..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r4.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r4.ebuild
deleted file mode 100644
index d2ef7e421b30..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180114-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..cc05d1066e42
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="makewhatis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for makewhatis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index 85bc7ea2c245..c97985f59083 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mandb-2.20170204-r1.ebuild 282 BLAKE2B 831527f594c7d32f5a7a97a0d2be851f4829e3d5a2beaba539684faf1e2fa8cb8fdd65eff2839963d1b421211854027b826ec4013ce92524888bddb0ae83586c SHA512 93c95e217c30dfdd1da9c437116580516bdf44e9c5119b5c629fab3c295e060a51c7d37fb3ccfd55018af72e050265d6c749f61f78f1544a3c9bca393aa52c48
-EBUILD selinux-mandb-2.20170204-r2.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab0925775aa212fbcc431488182ac35d3f285828b69a42ff8989de9d3bc7c83db550c0e222b7972ceb9306f040bd3e5e292339af SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25
-EBUILD selinux-mandb-2.20170204-r3.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab0925775aa212fbcc431488182ac35d3f285828b69a42ff8989de9d3bc7c83db550c0e222b7972ceb9306f040bd3e5e292339af SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25
-EBUILD selinux-mandb-2.20170204-r4.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab0925775aa212fbcc431488182ac35d3f285828b69a42ff8989de9d3bc7c83db550c0e222b7972ceb9306f040bd3e5e292339af SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25
 EBUILD selinux-mandb-2.20170805-r2.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab0925775aa212fbcc431488182ac35d3f285828b69a42ff8989de9d3bc7c83db550c0e222b7972ceb9306f040bd3e5e292339af SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25
 EBUILD selinux-mandb-2.20170805-r3.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab0925775aa212fbcc431488182ac35d3f285828b69a42ff8989de9d3bc7c83db550c0e222b7972ceb9306f040bd3e5e292339af SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25
-EBUILD selinux-mandb-2.20170805-r4.ebuild 282 BLAKE2B 831527f594c7d32f5a7a97a0d2be851f4829e3d5a2beaba539684faf1e2fa8cb8fdd65eff2839963d1b421211854027b826ec4013ce92524888bddb0ae83586c SHA512 93c95e217c30dfdd1da9c437116580516bdf44e9c5119b5c629fab3c295e060a51c7d37fb3ccfd55018af72e050265d6c749f61f78f1544a3c9bca393aa52c48
 EBUILD selinux-mandb-2.20180114-r1.ebuild 280 BLAKE2B 76f427ba513dda98294b86b455f67aec0b5351b67f64699b10899cf6999fb1f2c83c559cf15710d532e99fe99d0788d0b94af80e480181a95e09b04a6d7e98bc SHA512 8ee309232d4acae6fbd50f4f0f7a1371da4704a5660e03652f80653862c263aa1c3188f081d53b4504e182f2436169a372d69dfc139e6b9be4bc8e51a99c495c
 EBUILD selinux-mandb-2.20180114-r2.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
+EBUILD selinux-mandb-2.20180114-r3.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
 EBUILD selinux-mandb-9999.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
 MISC metadata.xml 315 BLAKE2B 95d3f83b404b3156ccaab92641107d67fd67c9b8d953695d57e531ef27e9a842dc89147e671a3cd25f9e95cbb8bf4826bd47b655714a793b5991c8d670e643d3 SHA512 d7b487c06c8e54342d58e1905e552b7879b76963c9dfa6ff0203e1c29f2268604a9aef7f9d02992fda0f61b8315afab6709cd2708c99f4c00ce1ce3971bb536c
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r1.ebuild
deleted file mode 100644
index 87177e7f1e53..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r2.ebuild
deleted file mode 100644
index cb215b310388..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r3.ebuild
deleted file mode 100644
index cb215b310388..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r4.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r4.ebuild
deleted file mode 100644
index cb215b310388..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r4.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r4.ebuild
deleted file mode 100644
index 87177e7f1e53..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20180114-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c8db292f4e56
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mandb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mandb"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index ec375a4eb5d8..c11d690d419e 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mcelog-2.20170204-r1.ebuild 284 BLAKE2B 55386b99953f8c9fc8117b0833537921a7c67860e4231d0a8b95c132e4d5ecce01bdc0271022f7820f0e3d1fea4f7298f7facbe88a676933f4aa5d65bff784d4 SHA512 2e52bf3dd34547e1bc62a306c7eb23f2c9bfa978c7553f723141e212c392c1f7aa4a2a334362a3cd2b2ca1621b0e733fef1b48cae23f12898a733cf851f38424
-EBUILD selinux-mcelog-2.20170204-r2.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e1a6b0c91dbce4fd515b67bb2c610a81d2563c906211ae7a8a4540c64912e01f33bac6e60412b72df3f5cf941e0f362758e99963 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22
-EBUILD selinux-mcelog-2.20170204-r3.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e1a6b0c91dbce4fd515b67bb2c610a81d2563c906211ae7a8a4540c64912e01f33bac6e60412b72df3f5cf941e0f362758e99963 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22
-EBUILD selinux-mcelog-2.20170204-r4.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e1a6b0c91dbce4fd515b67bb2c610a81d2563c906211ae7a8a4540c64912e01f33bac6e60412b72df3f5cf941e0f362758e99963 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22
 EBUILD selinux-mcelog-2.20170805-r2.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e1a6b0c91dbce4fd515b67bb2c610a81d2563c906211ae7a8a4540c64912e01f33bac6e60412b72df3f5cf941e0f362758e99963 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22
 EBUILD selinux-mcelog-2.20170805-r3.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e1a6b0c91dbce4fd515b67bb2c610a81d2563c906211ae7a8a4540c64912e01f33bac6e60412b72df3f5cf941e0f362758e99963 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22
-EBUILD selinux-mcelog-2.20170805-r4.ebuild 284 BLAKE2B 55386b99953f8c9fc8117b0833537921a7c67860e4231d0a8b95c132e4d5ecce01bdc0271022f7820f0e3d1fea4f7298f7facbe88a676933f4aa5d65bff784d4 SHA512 2e52bf3dd34547e1bc62a306c7eb23f2c9bfa978c7553f723141e212c392c1f7aa4a2a334362a3cd2b2ca1621b0e733fef1b48cae23f12898a733cf851f38424
 EBUILD selinux-mcelog-2.20180114-r1.ebuild 282 BLAKE2B 2b325e7a12ab360373abeeb2233cd024b1da57556951a35a6f49054bd787e2d878ee5b2e4d5f4cb124bb629c44094f8e076b80aedbdcd42d0cd1a78b7ad338e5 SHA512 1f04e00039e026d198eb39514f86c3046c3192bc7945d62bc8d7304a330f274d859b4940083c603cd7bad1ebcb692904bde0b9313b58e7aeafcd77b389b3817e
 EBUILD selinux-mcelog-2.20180114-r2.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
+EBUILD selinux-mcelog-2.20180114-r3.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
 EBUILD selinux-mcelog-9999.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
 MISC metadata.xml 316 BLAKE2B be4ad3832b18bd9e26aa46ccf572100dc64879ad860c75e6f6135a928f9ceaca16d8aae6f04bf7ea5ee26cb0008ff927b330e3d8c6f484e9cf4ccc879545de20 SHA512 8d61276e7343ddf65a6874ea736d342da652068bd08a0806888afb2adc9245490f4e1cff4f63788752f18ccc2e1afe3f4aad0db3932d3af76fe1e12f0ec48b35
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r1.ebuild
deleted file mode 100644
index ae3b9155f4df..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r2.ebuild
deleted file mode 100644
index 971821bbbd04..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r3.ebuild
deleted file mode 100644
index 971821bbbd04..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r4.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r4.ebuild
deleted file mode 100644
index 971821bbbd04..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r4.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r4.ebuild
deleted file mode 100644
index ae3b9155f4df..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20180114-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8ad129985e68
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mcelog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mcelog"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 507c85b36c5c..d418d6e394cd 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-memcached-2.20170204-r1.ebuild 290 BLAKE2B efa50b3eb0e7ccc0642663b9c027f397c999c2a8800efbba4884445352b97aca7bc076c9c136cddaa30ba838b692752df1b14f1be9144b2dc9d341c032ac0bec SHA512 b8886cd2885e2c05d54d67598220f2c491fc99af5f29951348c33324e55502f7eccc6094abd8603009a91b2b8b03bd0fa5b6fcaa17e757d29be4fa1a6d0c48c2
-EBUILD selinux-memcached-2.20170204-r2.ebuild 288 BLAKE2B c5ddd924905108cf7390f62344a218c8183db8fe23a4b3ce145bee71d5cc5aa178e3b2eb4a281c212956124ccc601310ee391f05c26ee44c6c7f184755814322 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6
-EBUILD selinux-memcached-2.20170204-r3.ebuild 288 BLAKE2B c5ddd924905108cf7390f62344a218c8183db8fe23a4b3ce145bee71d5cc5aa178e3b2eb4a281c212956124ccc601310ee391f05c26ee44c6c7f184755814322 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6
-EBUILD selinux-memcached-2.20170204-r4.ebuild 288 BLAKE2B c5ddd924905108cf7390f62344a218c8183db8fe23a4b3ce145bee71d5cc5aa178e3b2eb4a281c212956124ccc601310ee391f05c26ee44c6c7f184755814322 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6
 EBUILD selinux-memcached-2.20170805-r2.ebuild 288 BLAKE2B c5ddd924905108cf7390f62344a218c8183db8fe23a4b3ce145bee71d5cc5aa178e3b2eb4a281c212956124ccc601310ee391f05c26ee44c6c7f184755814322 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6
 EBUILD selinux-memcached-2.20170805-r3.ebuild 288 BLAKE2B c5ddd924905108cf7390f62344a218c8183db8fe23a4b3ce145bee71d5cc5aa178e3b2eb4a281c212956124ccc601310ee391f05c26ee44c6c7f184755814322 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6
-EBUILD selinux-memcached-2.20170805-r4.ebuild 290 BLAKE2B efa50b3eb0e7ccc0642663b9c027f397c999c2a8800efbba4884445352b97aca7bc076c9c136cddaa30ba838b692752df1b14f1be9144b2dc9d341c032ac0bec SHA512 b8886cd2885e2c05d54d67598220f2c491fc99af5f29951348c33324e55502f7eccc6094abd8603009a91b2b8b03bd0fa5b6fcaa17e757d29be4fa1a6d0c48c2
 EBUILD selinux-memcached-2.20180114-r1.ebuild 288 BLAKE2B c3318a48abd28b8d803f58f31a022d0efa0d5e30b0c27bf0405921ba7c3620f721ad8bd7d73a5f83534fb066e733b4193d57842c3c1529ba6744065026f055d7 SHA512 6b45b9629aaa229f4869352c08076bd0b74e05b6caa0362d628e9f1a7b9d8e0b5ffbd8a3e3d9d1234bd5614cbd2fb4886f57c551d3c3fc0fdd592aa6e2b9feb1
 EBUILD selinux-memcached-2.20180114-r2.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
+EBUILD selinux-memcached-2.20180114-r3.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
 EBUILD selinux-memcached-9999.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
 MISC metadata.xml 319 BLAKE2B c34d581f6b79142497f663b8b9023a750f845e460d724694efd5c495c27e3c01b2df9b3be085260ab6f3529b42bd4a8343e39a13ead394a46222dca4cf40ff4e SHA512 7a186901e5cade308e538d8f4fbd4afa50af93c4d046978a385ca0c83f3e481da51c70586b8d803f690030d8ca6b9e6c9b73436c5eee63237de86c6c3edf78b0
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r1.ebuild
deleted file mode 100644
index 40e9d79f726f..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r2.ebuild
deleted file mode 100644
index 7542a10c4315..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r3.ebuild
deleted file mode 100644
index 7542a10c4315..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r4.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r4.ebuild
deleted file mode 100644
index 7542a10c4315..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r4.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r4.ebuild
deleted file mode 100644
index 40e9d79f726f..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20180114-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a835ef04fc2d
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="memcached"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for memcached"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 6d01d2ef6243..e1f6d52644a5 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-milter-2.20170204-r1.ebuild 284 BLAKE2B 055c050ec329635755aa784eae47e72202b113e0fec8d9e11635e54643a2a5c28881d50d13629f9b6747e0058269a80d9f47526e357f24060d8b0b01f1abc086 SHA512 7e517c42ee2fdbab7798567c70b1f08a50156fd60c513945a8bc5dd648c84a1beb7ffcbef64f042ca422892feaff564f7abaada6e1b11c32ff689c85693c99b8
-EBUILD selinux-milter-2.20170204-r2.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d617445f91a330f6e86cc7171d7354c1ac7101e482d97a929eb6d101d1474c49075c760d8bdb3f739c9c8adad0dd8740fc5e3b0d2 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd
-EBUILD selinux-milter-2.20170204-r3.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d617445f91a330f6e86cc7171d7354c1ac7101e482d97a929eb6d101d1474c49075c760d8bdb3f739c9c8adad0dd8740fc5e3b0d2 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd
-EBUILD selinux-milter-2.20170204-r4.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d617445f91a330f6e86cc7171d7354c1ac7101e482d97a929eb6d101d1474c49075c760d8bdb3f739c9c8adad0dd8740fc5e3b0d2 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd
 EBUILD selinux-milter-2.20170805-r2.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d617445f91a330f6e86cc7171d7354c1ac7101e482d97a929eb6d101d1474c49075c760d8bdb3f739c9c8adad0dd8740fc5e3b0d2 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd
 EBUILD selinux-milter-2.20170805-r3.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d617445f91a330f6e86cc7171d7354c1ac7101e482d97a929eb6d101d1474c49075c760d8bdb3f739c9c8adad0dd8740fc5e3b0d2 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd
-EBUILD selinux-milter-2.20170805-r4.ebuild 284 BLAKE2B 055c050ec329635755aa784eae47e72202b113e0fec8d9e11635e54643a2a5c28881d50d13629f9b6747e0058269a80d9f47526e357f24060d8b0b01f1abc086 SHA512 7e517c42ee2fdbab7798567c70b1f08a50156fd60c513945a8bc5dd648c84a1beb7ffcbef64f042ca422892feaff564f7abaada6e1b11c32ff689c85693c99b8
 EBUILD selinux-milter-2.20180114-r1.ebuild 282 BLAKE2B d55903d85b334715243a7af90edb560fd0606085fcdcdd6f0d76fc084f42e849f91e3d309c73daf4b4ca667f571295c080ecf1d2825972c9052a4dc1b3ba8666 SHA512 123204b48a3ac9a122007fb55ee8853e772e4c68c5f9cc1e7101984bdd74baabc24420b8a3d7bd468314e4b3f414e94211f74240c377902eca183766e6bc9e5f
 EBUILD selinux-milter-2.20180114-r2.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
+EBUILD selinux-milter-2.20180114-r3.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
 EBUILD selinux-milter-9999.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
 MISC metadata.xml 316 BLAKE2B d0482a4d41556c4c8177df2842603bb3fc7f296f5bef7b721de2e3e12b1e9286953614bfa6e18e9caaa00ddf15e85c1b7e4be7f567c6417e8c70f663062836f8 SHA512 d3f36e28dd8e18aec87946218c34d88ed23720dab347f459ed95fa746b205432509c2e2c45497945d8d7e8683bee0d0b3bbfefe2d7e2ff6220a41815a2381e8e
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170204-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170204-r1.ebuild
deleted file mode 100644
index 78963a43df13..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170204-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170204-r2.ebuild
deleted file mode 100644
index 99b5939f93e5..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170204-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170204-r3.ebuild
deleted file mode 100644
index 99b5939f93e5..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170204-r4.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170204-r4.ebuild
deleted file mode 100644
index 99b5939f93e5..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170805-r4.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170805-r4.ebuild
deleted file mode 100644
index 78963a43df13..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20180114-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..415133d64542
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="milter"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for milter"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 722bc9c2d6c7..fb79270f4986 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-modemmanager-2.20170204-r1.ebuild 388 BLAKE2B 6a3caaef59aa4d3283beb643b4e93a97eed85f76fd68c7cb130967b1df3243ab09a908ebdc87112c7e1e8f88c5a407c9b759325ba3dbd58f55bfa7edd70edc45 SHA512 b8e597a89aa4fd31358a6427010f29d683e58fae2687d9fe2b85d0bdb38ca28a7eef138969b2b5bbee598e697cf3e879dc3afb1d612d845527a97b4db8b15013
-EBUILD selinux-modemmanager-2.20170204-r2.ebuild 386 BLAKE2B 13798cb76dd0f0ec0698106185c547e57b0b82e156885b984ad2ad721fc69fe4de976864f57f7c91962d14b1eeb748f2249ae221c0cd2f7f76ce5a74860471f1 SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b
-EBUILD selinux-modemmanager-2.20170204-r3.ebuild 386 BLAKE2B 13798cb76dd0f0ec0698106185c547e57b0b82e156885b984ad2ad721fc69fe4de976864f57f7c91962d14b1eeb748f2249ae221c0cd2f7f76ce5a74860471f1 SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b
-EBUILD selinux-modemmanager-2.20170204-r4.ebuild 386 BLAKE2B 13798cb76dd0f0ec0698106185c547e57b0b82e156885b984ad2ad721fc69fe4de976864f57f7c91962d14b1eeb748f2249ae221c0cd2f7f76ce5a74860471f1 SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b
 EBUILD selinux-modemmanager-2.20170805-r2.ebuild 386 BLAKE2B 13798cb76dd0f0ec0698106185c547e57b0b82e156885b984ad2ad721fc69fe4de976864f57f7c91962d14b1eeb748f2249ae221c0cd2f7f76ce5a74860471f1 SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b
 EBUILD selinux-modemmanager-2.20170805-r3.ebuild 386 BLAKE2B 13798cb76dd0f0ec0698106185c547e57b0b82e156885b984ad2ad721fc69fe4de976864f57f7c91962d14b1eeb748f2249ae221c0cd2f7f76ce5a74860471f1 SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b
-EBUILD selinux-modemmanager-2.20170805-r4.ebuild 388 BLAKE2B 6a3caaef59aa4d3283beb643b4e93a97eed85f76fd68c7cb130967b1df3243ab09a908ebdc87112c7e1e8f88c5a407c9b759325ba3dbd58f55bfa7edd70edc45 SHA512 b8e597a89aa4fd31358a6427010f29d683e58fae2687d9fe2b85d0bdb38ca28a7eef138969b2b5bbee598e697cf3e879dc3afb1d612d845527a97b4db8b15013
 EBUILD selinux-modemmanager-2.20180114-r1.ebuild 386 BLAKE2B 2b97e0c24770ba95db3bd2568348289a6f021855c1aa05b93eaa925a4ac155d2089b0d341ca5c9b9408616782d33d8813933efa120589392555e359a985ade75 SHA512 49a5ac4ce984fb3d966e08471bb29dd728d1168e1765995092e8f5a0f2b37420242ccd6282dc98bd028922fbfab9df82ade9922a560d9970c046f776d4ffcb19
 EBUILD selinux-modemmanager-2.20180114-r2.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
+EBUILD selinux-modemmanager-2.20180114-r3.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
 EBUILD selinux-modemmanager-9999.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
 MISC metadata.xml 322 BLAKE2B 8aec0e42986a81957e9e2bae812e952567b59c3c041922f2ea8222fc1acf4b41608f30d0f03d9671e1bc5a3fc7247796ca38e9c47fa9701fca6ec3a7e194f93c SHA512 830ca621d92823ba149cdec9e44812c2f84ec451de1616c7147cd8640d4620ba9bc91dc95584ec081bb9b31de180f4b568d8cb8988077442c98259a2e9bbd399
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r1.ebuild
deleted file mode 100644
index 6c204aed8092..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r2.ebuild
deleted file mode 100644
index 2f4d0eccee54..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r3.ebuild
deleted file mode 100644
index 2f4d0eccee54..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r4.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r4.ebuild
deleted file mode 100644
index 2f4d0eccee54..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r4.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r4.ebuild
deleted file mode 100644
index 6c204aed8092..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180114-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..bcd8127f743d
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="modemmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for modemmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index ae774063c87c..17e7f709cf41 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mono-2.20170204-r1.ebuild 280 BLAKE2B 230ff77f471082cab59994ed1d373a51f18329b180622723380d784bb0aa4ae7bd39f80d1cfe8b0947898abcd4e029435e035333b4ed9b5ad526e97d3a145122 SHA512 6f6b1d46178b95928f949b548db96f669f24ba41b5388797dc6d5e7e3d45f0f2eb8f2fb4ffdb4608476c7b76950ff9b65d7a6224e895fe7904580c2215094507
-EBUILD selinux-mono-2.20170204-r2.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb53845476165365836f9587dc3b296bd22f3383e54ffc8a4a8bc9954566c120da440bf6883b330ef381f7daf5a5232315255e72 SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3
-EBUILD selinux-mono-2.20170204-r3.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb53845476165365836f9587dc3b296bd22f3383e54ffc8a4a8bc9954566c120da440bf6883b330ef381f7daf5a5232315255e72 SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3
-EBUILD selinux-mono-2.20170204-r4.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb53845476165365836f9587dc3b296bd22f3383e54ffc8a4a8bc9954566c120da440bf6883b330ef381f7daf5a5232315255e72 SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3
 EBUILD selinux-mono-2.20170805-r2.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb53845476165365836f9587dc3b296bd22f3383e54ffc8a4a8bc9954566c120da440bf6883b330ef381f7daf5a5232315255e72 SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3
 EBUILD selinux-mono-2.20170805-r3.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb53845476165365836f9587dc3b296bd22f3383e54ffc8a4a8bc9954566c120da440bf6883b330ef381f7daf5a5232315255e72 SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3
-EBUILD selinux-mono-2.20170805-r4.ebuild 280 BLAKE2B 230ff77f471082cab59994ed1d373a51f18329b180622723380d784bb0aa4ae7bd39f80d1cfe8b0947898abcd4e029435e035333b4ed9b5ad526e97d3a145122 SHA512 6f6b1d46178b95928f949b548db96f669f24ba41b5388797dc6d5e7e3d45f0f2eb8f2fb4ffdb4608476c7b76950ff9b65d7a6224e895fe7904580c2215094507
 EBUILD selinux-mono-2.20180114-r1.ebuild 278 BLAKE2B 2b12ad2922c5eb0182ceebf51485b05d2927c32924c914de722f64b1865b1895536aa60ccc603cb82667c1aa1541c9f88da8fa2e6c62ef364c4dadc2278fa639 SHA512 fc99b59307b1ca5b8fa2f9d83fb07c7d4de412250da671968dade9241b1754570b22b33858684e0ef5a45a0bc4efc7f36da1ff8e9885e1515820199ef2dc4ec1
 EBUILD selinux-mono-2.20180114-r2.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
+EBUILD selinux-mono-2.20180114-r3.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
 EBUILD selinux-mono-9999.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
 MISC metadata.xml 314 BLAKE2B 57962d2d2ce159f638a1c086cbf3b5ffce2cdce728ea5cd7b8850431f728120a0b2fa04e68e0cf32fc27e301fea58be5b04dc0778757afb8d5d82a09efa10bcd SHA512 8c8beb605d3c5f0bc763dca943cc89871bd50eb086d2c18dac03402a13a0dd584073b8c2f4dbfa0bdeda14e4b795395a0806f3d622cce4108593860ce26d08a7
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170204-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170204-r1.ebuild
deleted file mode 100644
index e77111606246..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170204-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170204-r2.ebuild
deleted file mode 100644
index 4a1268d7ba59..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170204-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170204-r3.ebuild
deleted file mode 100644
index 4a1268d7ba59..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170204-r4.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170204-r4.ebuild
deleted file mode 100644
index 4a1268d7ba59..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170805-r4.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170805-r4.ebuild
deleted file mode 100644
index e77111606246..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20180114-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1f2dc9e10a6b
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mono"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mono"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 1757045b38f2..1f3bdca49653 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mozilla-2.20170204-r1.ebuild 388 BLAKE2B 427906d7e249f62c17144e0749ae04d5f9a59d2ee0d1ee4e2007e2c4c173a08f09bd6a385e02439203fb93de8a8d36ff20c868e49334e76042b98f2531e315ab SHA512 409155bbe533888b1358cfb9089e756e21255960a052488e9a09fbe206e063758d2a999d1f248a5dbff966a1747a009fa784a128714c3231d20006161d40562f
-EBUILD selinux-mozilla-2.20170204-r2.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e059325f43cbe1480dfc8d879ef5ae98abda179b2aaf652170a1bab00ca479b9a6cd5ecf6657f4f73f24244332f41a40d71894253 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105
-EBUILD selinux-mozilla-2.20170204-r3.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e059325f43cbe1480dfc8d879ef5ae98abda179b2aaf652170a1bab00ca479b9a6cd5ecf6657f4f73f24244332f41a40d71894253 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105
-EBUILD selinux-mozilla-2.20170204-r4.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e059325f43cbe1480dfc8d879ef5ae98abda179b2aaf652170a1bab00ca479b9a6cd5ecf6657f4f73f24244332f41a40d71894253 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105
 EBUILD selinux-mozilla-2.20170805-r2.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e059325f43cbe1480dfc8d879ef5ae98abda179b2aaf652170a1bab00ca479b9a6cd5ecf6657f4f73f24244332f41a40d71894253 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105
 EBUILD selinux-mozilla-2.20170805-r3.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e059325f43cbe1480dfc8d879ef5ae98abda179b2aaf652170a1bab00ca479b9a6cd5ecf6657f4f73f24244332f41a40d71894253 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105
-EBUILD selinux-mozilla-2.20170805-r4.ebuild 388 BLAKE2B 427906d7e249f62c17144e0749ae04d5f9a59d2ee0d1ee4e2007e2c4c173a08f09bd6a385e02439203fb93de8a8d36ff20c868e49334e76042b98f2531e315ab SHA512 409155bbe533888b1358cfb9089e756e21255960a052488e9a09fbe206e063758d2a999d1f248a5dbff966a1747a009fa784a128714c3231d20006161d40562f
 EBUILD selinux-mozilla-2.20180114-r1.ebuild 386 BLAKE2B ed99526b9913e0cf44c4760accc90594cc44673cc47a7d9ee7a9c4b854ae8660aef8b7280a5f0649619b30e0d0603e45ef47cc7772fd1efd9bdcf7a3e1a35057 SHA512 70d2e826e60878f17c78a3c23c9599e60c8cad6898833d79dc4b11cd98adc1779ed211e81485841873a2a8c2f0afd6b7f44385a1614aa6963111bfc3ffdd2c04
 EBUILD selinux-mozilla-2.20180114-r2.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
+EBUILD selinux-mozilla-2.20180114-r3.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
 EBUILD selinux-mozilla-9999.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
 MISC metadata.xml 317 BLAKE2B ad2ade96838b5a417ba33a4bd8bc29759e7722ccc57be5c2a8f1c4a5ecf164ca9cf5f5bd9e45176dfd60e83e37269a2ea3aedda6fd4a96769c02c87d7fdceb85 SHA512 de84d7a15921be8c58ffe8bb4cbb4cb890853bf3450a7622bc86dc63d8937dac59a0c683616781ce084b59a2121e118ed0d7fcec73cb9b6a2ef57fea8aaa2167
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r1.ebuild
deleted file mode 100644
index 3649e88c3dd6..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r2.ebuild
deleted file mode 100644
index d8777f6fa2e5..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r3.ebuild
deleted file mode 100644
index d8777f6fa2e5..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r4.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r4.ebuild
deleted file mode 100644
index d8777f6fa2e5..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r4.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r4.ebuild
deleted file mode 100644
index 3649e88c3dd6..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20180114-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e2e9e97b72b5
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="mozilla"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mozilla"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 7690b65e2d2c..63dca1b09a8d 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mpd-2.20170204-r1.ebuild 278 BLAKE2B f587a706e28b11ff315f7b16c94f1f953084654f1c6636ac8786323196d0e8d548a460dcc1f616f720de6a63a80504cf46ee5a37e1d99bc4a9954ac537ceeef0 SHA512 42db79dd427c885124edca742497a8b1f6d86e5bacdbb8cde2ac85ce527cc3363fdbe963f8961c0166f53dab6f6d5d555b83d79eca9a22728bab886554021d02
-EBUILD selinux-mpd-2.20170204-r2.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da829732414cfc7e8285ec5a0cce17fdfdd9ab14454d0a5970232711b67716ac4890b7eaea04a68dacbe4321bc1412dfd34925 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736
-EBUILD selinux-mpd-2.20170204-r3.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da829732414cfc7e8285ec5a0cce17fdfdd9ab14454d0a5970232711b67716ac4890b7eaea04a68dacbe4321bc1412dfd34925 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736
-EBUILD selinux-mpd-2.20170204-r4.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da829732414cfc7e8285ec5a0cce17fdfdd9ab14454d0a5970232711b67716ac4890b7eaea04a68dacbe4321bc1412dfd34925 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736
 EBUILD selinux-mpd-2.20170805-r2.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da829732414cfc7e8285ec5a0cce17fdfdd9ab14454d0a5970232711b67716ac4890b7eaea04a68dacbe4321bc1412dfd34925 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736
 EBUILD selinux-mpd-2.20170805-r3.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da829732414cfc7e8285ec5a0cce17fdfdd9ab14454d0a5970232711b67716ac4890b7eaea04a68dacbe4321bc1412dfd34925 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736
-EBUILD selinux-mpd-2.20170805-r4.ebuild 278 BLAKE2B f587a706e28b11ff315f7b16c94f1f953084654f1c6636ac8786323196d0e8d548a460dcc1f616f720de6a63a80504cf46ee5a37e1d99bc4a9954ac537ceeef0 SHA512 42db79dd427c885124edca742497a8b1f6d86e5bacdbb8cde2ac85ce527cc3363fdbe963f8961c0166f53dab6f6d5d555b83d79eca9a22728bab886554021d02
 EBUILD selinux-mpd-2.20180114-r1.ebuild 276 BLAKE2B ebc2c472622718536454e93bd53fa0a3cdeaa955c598d965ccd980d9a2a765e624ef08d1b314569da9c92db3b8878630a70993de391d89c9847d31dd6f966d01 SHA512 6dd9361120854f1f88a64c364de16aca00df8887e12d409e884c3d92e6ba059fcebad2ad8ef0e5b8ef8f3647920428be4c9795b629f7c2aa0956b5be39ba35ed
 EBUILD selinux-mpd-2.20180114-r2.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
+EBUILD selinux-mpd-2.20180114-r3.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
 EBUILD selinux-mpd-9999.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
 MISC metadata.xml 313 BLAKE2B 56c3875a7e1c3bde39af4122fc4cc48590656c6fa7bb4e4cb36c92045afbcf7d891e49bae22d40b400c2deed09ebe68ae164cebf6307e7aeb24fda0db5fb842a SHA512 6b549fa3968053908625a20d90fffebc16b8b3e4e9b35cf6fd5af36eedc7283512b43e7b40fd42791d41b4dff2c030313bea318bfcd513f7e9a447a2a58d4f43
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r1.ebuild
deleted file mode 100644
index 0a1db71ae8b4..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r2.ebuild
deleted file mode 100644
index 7ec661829684..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r3.ebuild
deleted file mode 100644
index 7ec661829684..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r4.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r4.ebuild
deleted file mode 100644
index 7ec661829684..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r4.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r4.ebuild
deleted file mode 100644
index 0a1db71ae8b4..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20180114-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..304f5af1016c
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index 831fee9707b7..aa1e9cb1d323 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mplayer-2.20170204-r1.ebuild 290 BLAKE2B 9c425fcdc8b053b92d648598371cbea41438d7093683460ecd05225a9f8fb963b74e1d57510e1050f4c5148a4a0f92f285a7f3eea77b7784f179966f50b57e0e SHA512 4aff9e610af74f87984b5b14c3055a5e136172ebbe96e0b58c7859cc075513a8d1ab4405622b2e552f5b1fff391326765f1444993ca04b80005c3d6b2e98a79e
-EBUILD selinux-mplayer-2.20170204-r2.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809faf174b2e132461dc0aebd20eeed3fcb88a064b10dd6245b4b5cb08091ba53f12285fcfb952758e05a37893d2a5f4d78246e93a6 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028
-EBUILD selinux-mplayer-2.20170204-r3.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809faf174b2e132461dc0aebd20eeed3fcb88a064b10dd6245b4b5cb08091ba53f12285fcfb952758e05a37893d2a5f4d78246e93a6 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028
-EBUILD selinux-mplayer-2.20170204-r4.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809faf174b2e132461dc0aebd20eeed3fcb88a064b10dd6245b4b5cb08091ba53f12285fcfb952758e05a37893d2a5f4d78246e93a6 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028
 EBUILD selinux-mplayer-2.20170805-r2.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809faf174b2e132461dc0aebd20eeed3fcb88a064b10dd6245b4b5cb08091ba53f12285fcfb952758e05a37893d2a5f4d78246e93a6 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028
 EBUILD selinux-mplayer-2.20170805-r3.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809faf174b2e132461dc0aebd20eeed3fcb88a064b10dd6245b4b5cb08091ba53f12285fcfb952758e05a37893d2a5f4d78246e93a6 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028
-EBUILD selinux-mplayer-2.20170805-r4.ebuild 290 BLAKE2B 9c425fcdc8b053b92d648598371cbea41438d7093683460ecd05225a9f8fb963b74e1d57510e1050f4c5148a4a0f92f285a7f3eea77b7784f179966f50b57e0e SHA512 4aff9e610af74f87984b5b14c3055a5e136172ebbe96e0b58c7859cc075513a8d1ab4405622b2e552f5b1fff391326765f1444993ca04b80005c3d6b2e98a79e
 EBUILD selinux-mplayer-2.20180114-r1.ebuild 288 BLAKE2B c1fe750537a400b18d81dac3ac548163bb1a576c06e5122dea18aa2485aee7d21535b1d8cc1421c0502092ec36a9c3ad790293474237b409ef991e6bb46e6e68 SHA512 4ab227a345e8027d13252588f846b8766fb350da886eab45e0c629b7ce259453c7888eb6f0b1222652d2caa54e80ec0fd5201a1dcf3d42cba630c14c8895b859
 EBUILD selinux-mplayer-2.20180114-r2.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
+EBUILD selinux-mplayer-2.20180114-r3.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
 EBUILD selinux-mplayer-9999.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
 MISC metadata.xml 317 BLAKE2B 86b31fb450909c4a3131419b92f8046aeb53575d0053424a06be4936a4f2e21d2cb7278db928d66e801e5569efc249380d94ecb6698602283b9f5cb4f8968ab5 SHA512 57f431a7e6dbf14548477b092ae19d706f17aa579ff51c6fafc87ce00690a365027449aff1e6eadfbdd6e071421c4e8173a912feb6670947551a30354f76c764
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r1.ebuild
deleted file mode 100644
index 72bbe9045800..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r2.ebuild
deleted file mode 100644
index 2b3ae984c26c..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r3.ebuild
deleted file mode 100644
index 2b3ae984c26c..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r4.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r4.ebuild
deleted file mode 100644
index 2b3ae984c26c..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r4.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r4.ebuild
deleted file mode 100644
index 72bbe9045800..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20180114-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..fbc2e02fe8a6
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="mplayer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index ccaddd120c16..855779958699 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mrtg-2.20170204-r1.ebuild 280 BLAKE2B 7b6f1cbbc7b058158002c280fed4bbbaba63dcd48e9457e1a3d5d6900320e2e6b53502bd8fe560bcb4a45b46389b3506eeda42e6c736a820ca43ade1fa7ebdc1 SHA512 5d5f200e06f66d5ed63206d79ea234d6d8039bb55463848fd8b06f3459d998bc4b81d7fc39a595cfab11f2dc2ec6dfeb576d3fb44d65d0ab0fc510f9290d79ea
-EBUILD selinux-mrtg-2.20170204-r2.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64c7f494a3101709163281615c5e9b20481b0a0fa67b4d9375543afb4e0682418f58c261cc4b850844668f935a308d94d5d535f SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1
-EBUILD selinux-mrtg-2.20170204-r3.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64c7f494a3101709163281615c5e9b20481b0a0fa67b4d9375543afb4e0682418f58c261cc4b850844668f935a308d94d5d535f SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1
-EBUILD selinux-mrtg-2.20170204-r4.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64c7f494a3101709163281615c5e9b20481b0a0fa67b4d9375543afb4e0682418f58c261cc4b850844668f935a308d94d5d535f SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1
 EBUILD selinux-mrtg-2.20170805-r2.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64c7f494a3101709163281615c5e9b20481b0a0fa67b4d9375543afb4e0682418f58c261cc4b850844668f935a308d94d5d535f SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1
 EBUILD selinux-mrtg-2.20170805-r3.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64c7f494a3101709163281615c5e9b20481b0a0fa67b4d9375543afb4e0682418f58c261cc4b850844668f935a308d94d5d535f SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1
-EBUILD selinux-mrtg-2.20170805-r4.ebuild 280 BLAKE2B 7b6f1cbbc7b058158002c280fed4bbbaba63dcd48e9457e1a3d5d6900320e2e6b53502bd8fe560bcb4a45b46389b3506eeda42e6c736a820ca43ade1fa7ebdc1 SHA512 5d5f200e06f66d5ed63206d79ea234d6d8039bb55463848fd8b06f3459d998bc4b81d7fc39a595cfab11f2dc2ec6dfeb576d3fb44d65d0ab0fc510f9290d79ea
 EBUILD selinux-mrtg-2.20180114-r1.ebuild 278 BLAKE2B 28b5083c7616898794afd68e497effa237883572c58d065f6b631b3064522c3a6a82ef5c8ac20d91c4aff8ef747d2e544bfdbf669a1c0934238c68a4e8440d4e SHA512 1511e5d9a8a64e58c923b913363e57ede18261a54d3484566b96aefb2fd682c1115e09b0e0c436b8c8a98ab27b18231204fbce645575f583afdf22b0f8e820b2
 EBUILD selinux-mrtg-2.20180114-r2.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
+EBUILD selinux-mrtg-2.20180114-r3.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
 EBUILD selinux-mrtg-9999.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
 MISC metadata.xml 314 BLAKE2B 9869ea3f73a19aceef604cc504383d7fb45c1e011ee4839dcc946f9d15c50e57d23e3643f49613a321da719ee7ecd2ef775efddbe7e2bd7850dca89a0a7f31a7 SHA512 5e0e1440238a7083dbb60b7174c389296846c3a4a96e2f0136e197ecc47cd7c03ff6a59b9b30c92c5ec78ca046c021eb6af38575a8360a619e1ccb95fc85bed3
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r1.ebuild
deleted file mode 100644
index c968719ab67f..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r2.ebuild
deleted file mode 100644
index 703cc95773bd..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r3.ebuild
deleted file mode 100644
index 703cc95773bd..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r4.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r4.ebuild
deleted file mode 100644
index 703cc95773bd..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r4.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r4.ebuild
deleted file mode 100644
index c968719ab67f..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20180114-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5a3b8257ed47
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mrtg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mrtg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 8d88d9379b07..21eedd84426d 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-munin-2.20170204-r1.ebuild 378 BLAKE2B c0885925b8a581dfa7eb338f2891150da16c90ddb15095626a02204cd1919b7fef716978f566f545228af791c3b286a7cf110028a4cf8fbf530389dacaca519c SHA512 2ef5a45586a0358d10ec726f6c05059064b0f2955f5d537760c3f6369837e0b4522b4766054c7a641ca036015a05ab0b6cde589e6ce6c3b60eb35e504414e6ca
-EBUILD selinux-munin-2.20170204-r2.ebuild 376 BLAKE2B d8341723f371168d765f82a399bfd9f9ef79a2665f89c043d7b6a0f54b9c9b898ad61ef15207787dbf6a614225f62688decb51b54ce864030949bdeacb160839 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941
-EBUILD selinux-munin-2.20170204-r3.ebuild 376 BLAKE2B d8341723f371168d765f82a399bfd9f9ef79a2665f89c043d7b6a0f54b9c9b898ad61ef15207787dbf6a614225f62688decb51b54ce864030949bdeacb160839 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941
-EBUILD selinux-munin-2.20170204-r4.ebuild 376 BLAKE2B d8341723f371168d765f82a399bfd9f9ef79a2665f89c043d7b6a0f54b9c9b898ad61ef15207787dbf6a614225f62688decb51b54ce864030949bdeacb160839 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941
 EBUILD selinux-munin-2.20170805-r2.ebuild 376 BLAKE2B d8341723f371168d765f82a399bfd9f9ef79a2665f89c043d7b6a0f54b9c9b898ad61ef15207787dbf6a614225f62688decb51b54ce864030949bdeacb160839 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941
 EBUILD selinux-munin-2.20170805-r3.ebuild 376 BLAKE2B d8341723f371168d765f82a399bfd9f9ef79a2665f89c043d7b6a0f54b9c9b898ad61ef15207787dbf6a614225f62688decb51b54ce864030949bdeacb160839 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941
-EBUILD selinux-munin-2.20170805-r4.ebuild 378 BLAKE2B c0885925b8a581dfa7eb338f2891150da16c90ddb15095626a02204cd1919b7fef716978f566f545228af791c3b286a7cf110028a4cf8fbf530389dacaca519c SHA512 2ef5a45586a0358d10ec726f6c05059064b0f2955f5d537760c3f6369837e0b4522b4766054c7a641ca036015a05ab0b6cde589e6ce6c3b60eb35e504414e6ca
 EBUILD selinux-munin-2.20180114-r1.ebuild 376 BLAKE2B b481f500c3fb6034eaa30bb6a4a7f01f7de91df6fc6f90336d5cdaca4a3feb8960545d400267b1527369e9b30080d719483ae06ffeb8a85e54b9a554d20457f1 SHA512 429375708c60175af3f6c36213868a4ada2c79bc27e220aa664b9347219edf70d36ae6a86489b1e766c2aec5393418ad60160b8fa678fa187d1257c7a4a5c688
 EBUILD selinux-munin-2.20180114-r2.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
+EBUILD selinux-munin-2.20180114-r3.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
 EBUILD selinux-munin-9999.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
 MISC metadata.xml 315 BLAKE2B 5b0a30d9351d16aa2e63f73393208384826c5124f4da01c7f9b30ad696ce81f2cc2bf311986266f4138de5cc1b12b6dad882952948aa60d65616a7b03588d40e SHA512 e8b021d51d8fe289205ff90c3b3a955bb6445d492aae83b48d269e0b5773b813f9ef4a54776588f4c0135dde15d59560f558cc1d11a4d0d62f4720d656557c55
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170204-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170204-r1.ebuild
deleted file mode 100644
index 13ac5a6041ff..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170204-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170204-r2.ebuild
deleted file mode 100644
index a2537fc5f74b..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170204-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170204-r3.ebuild
deleted file mode 100644
index a2537fc5f74b..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170204-r4.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170204-r4.ebuild
deleted file mode 100644
index a2537fc5f74b..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170805-r4.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170805-r4.ebuild
deleted file mode 100644
index 13ac5a6041ff..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20180114-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..fd86c50e8c82
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="munin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index d61cc115c684..0593f1199fc1 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mutt-2.20170204-r1.ebuild 280 BLAKE2B 2bf5e8b8289112f1b3caba114e708636492befdaa2856dc69e45755de4334bfeffde952261117a123a7f3efcd3612c57bc8bc7cac8b28c7f47c26039335ad092 SHA512 8fb2f9396012948682414c8b1a2ee4a36599e024cd0cd25848c4e7d5f5fcf5a9453319c989e06d26b3f1f539bdf377da8efe0b5384d39ae4080ea60907fbb98e
-EBUILD selinux-mutt-2.20170204-r2.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1f65065267174204b8fe0fda7d288a13021472e6fac6cf65f4051f8b5e7855d7d504253df79086596318d4ce602c2341a4e2d0 SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4
-EBUILD selinux-mutt-2.20170204-r3.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1f65065267174204b8fe0fda7d288a13021472e6fac6cf65f4051f8b5e7855d7d504253df79086596318d4ce602c2341a4e2d0 SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4
-EBUILD selinux-mutt-2.20170204-r4.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1f65065267174204b8fe0fda7d288a13021472e6fac6cf65f4051f8b5e7855d7d504253df79086596318d4ce602c2341a4e2d0 SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4
 EBUILD selinux-mutt-2.20170805-r2.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1f65065267174204b8fe0fda7d288a13021472e6fac6cf65f4051f8b5e7855d7d504253df79086596318d4ce602c2341a4e2d0 SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4
 EBUILD selinux-mutt-2.20170805-r3.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1f65065267174204b8fe0fda7d288a13021472e6fac6cf65f4051f8b5e7855d7d504253df79086596318d4ce602c2341a4e2d0 SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4
-EBUILD selinux-mutt-2.20170805-r4.ebuild 280 BLAKE2B 2bf5e8b8289112f1b3caba114e708636492befdaa2856dc69e45755de4334bfeffde952261117a123a7f3efcd3612c57bc8bc7cac8b28c7f47c26039335ad092 SHA512 8fb2f9396012948682414c8b1a2ee4a36599e024cd0cd25848c4e7d5f5fcf5a9453319c989e06d26b3f1f539bdf377da8efe0b5384d39ae4080ea60907fbb98e
 EBUILD selinux-mutt-2.20180114-r1.ebuild 278 BLAKE2B 52fa750ef826ffe4e48fdca095b41a62b4dbd2a60cfd5be49527404732cbd756fdc27b74da6f2314792f4a95b819a0d9f51ee05600d36c1b2fb3ccec71e580ea SHA512 7471e159b7603e7b096d4a6013507f46e2704813ea16eac89be1a859ecf155663b233380f88cfcec983dd1d8b9aa8e70d097d9b991d00c5bf8b3a003d5a0ce53
 EBUILD selinux-mutt-2.20180114-r2.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
+EBUILD selinux-mutt-2.20180114-r3.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
 EBUILD selinux-mutt-9999.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
 MISC metadata.xml 314 BLAKE2B 14db2b3469abab7da356b04aae1da84b6edcd11ad35130d2f1c1f2f4d287acf97e205539450052fab29c5b9fc9276626e1594096b8ae251ed06abc918e686b47 SHA512 87a3948b2f9708c5516bb4141e5673d45390ed2b0bc3e49ebc8298c7177abb1c3a99442d60d22d99fcc13d08251fef29efd9bda3ea14eb588164209eab2c4c4c
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r1.ebuild
deleted file mode 100644
index f7c456f1ff19..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r2.ebuild
deleted file mode 100644
index af31a44a05b3..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r3.ebuild
deleted file mode 100644
index af31a44a05b3..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r4.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r4.ebuild
deleted file mode 100644
index af31a44a05b3..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r4.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r4.ebuild
deleted file mode 100644
index f7c456f1ff19..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20180114-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2f811eb9e42e
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mutt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mutt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 513e6ec5d829..b0c175d5420a 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-mysql-2.20170204-r1.ebuild 282 BLAKE2B fe90fb44eb3a59075fe4f6f7f3166d56cb046912772dff61e7bb6b903cfc3e3b51f158c5265be47268ba64686f625185fbd17c6e10cc6787ae6af0ccd8938066 SHA512 e85312159a9f05c78f9e65525e245f818aab9542fad5d492cb803ee6dcc97dea037dbeed32413774e5b3ba40ccc4d58f764afa533fe833349da26ae6c0c3b6b3
-EBUILD selinux-mysql-2.20170204-r2.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf99667b8758f70084198a9b41918eac13d0b63b3157280bee9bef9954c2d54363e53d8c8f4b59b6e38b3cd9b371700226c5865ea SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd
-EBUILD selinux-mysql-2.20170204-r3.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf99667b8758f70084198a9b41918eac13d0b63b3157280bee9bef9954c2d54363e53d8c8f4b59b6e38b3cd9b371700226c5865ea SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd
-EBUILD selinux-mysql-2.20170204-r4.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf99667b8758f70084198a9b41918eac13d0b63b3157280bee9bef9954c2d54363e53d8c8f4b59b6e38b3cd9b371700226c5865ea SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd
 EBUILD selinux-mysql-2.20170805-r2.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf99667b8758f70084198a9b41918eac13d0b63b3157280bee9bef9954c2d54363e53d8c8f4b59b6e38b3cd9b371700226c5865ea SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd
 EBUILD selinux-mysql-2.20170805-r3.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf99667b8758f70084198a9b41918eac13d0b63b3157280bee9bef9954c2d54363e53d8c8f4b59b6e38b3cd9b371700226c5865ea SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd
-EBUILD selinux-mysql-2.20170805-r4.ebuild 282 BLAKE2B fe90fb44eb3a59075fe4f6f7f3166d56cb046912772dff61e7bb6b903cfc3e3b51f158c5265be47268ba64686f625185fbd17c6e10cc6787ae6af0ccd8938066 SHA512 e85312159a9f05c78f9e65525e245f818aab9542fad5d492cb803ee6dcc97dea037dbeed32413774e5b3ba40ccc4d58f764afa533fe833349da26ae6c0c3b6b3
 EBUILD selinux-mysql-2.20180114-r1.ebuild 280 BLAKE2B 27edb8a2dcd31a47fff86745180f162f21281f7953cc7b509f5291dbfff1372c0a134cedde4d13ea5d0d3a00e0de2f681787ddb5cd9468203ff0c762651ac81b SHA512 8acdda96c3df4169e81260ab48fb7f5168e130bd90d99c874fb1bdc28fcf25a3473645dd27f4a4b6ecd55f2ed2e5693bbdc55f82ccfbc8e82d2abb3a71e46b23
 EBUILD selinux-mysql-2.20180114-r2.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
+EBUILD selinux-mysql-2.20180114-r3.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
 EBUILD selinux-mysql-9999.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
 MISC metadata.xml 315 BLAKE2B dd4dc39a65cad0c1af7fa9d63bed6b0b4be0672149b9992dacb6b348e171bd857b53040ff3ce253c76104016ac41ede91956b4ff0f2962e4874eaf0ef870ea26 SHA512 aafeb5465f6e05bf143959c7964e5539bea915238572612d6b6cd118a30ea57fca14735e70d4a39fee37a5203cd160988c830653fb2cd751cf4e14acc6f78508
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r1.ebuild
deleted file mode 100644
index dfc625b9d286..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r2.ebuild
deleted file mode 100644
index 8f8b693543ed..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r3.ebuild
deleted file mode 100644
index 8f8b693543ed..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r4.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r4.ebuild
deleted file mode 100644
index 8f8b693543ed..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r4.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r4.ebuild
deleted file mode 100644
index dfc625b9d286..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20180114-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..367f1ee95c27
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mysql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mysql"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index cb77f87079fd..de11bf310643 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nagios-2.20170204-r1.ebuild 380 BLAKE2B 3f07aeec380a2590d04968a8c48c1f1b58995e9e95a416b9fb4fe92ed6fb4727d2beb01d0ba8cec192a57c0b0d604f1ba0878c2088fe1c1caca2e3479f4873ee SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9
-EBUILD selinux-nagios-2.20170204-r2.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
-EBUILD selinux-nagios-2.20170204-r3.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
-EBUILD selinux-nagios-2.20170204-r4.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
 EBUILD selinux-nagios-2.20170805-r2.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
 EBUILD selinux-nagios-2.20170805-r3.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
-EBUILD selinux-nagios-2.20170805-r4.ebuild 380 BLAKE2B 3f07aeec380a2590d04968a8c48c1f1b58995e9e95a416b9fb4fe92ed6fb4727d2beb01d0ba8cec192a57c0b0d604f1ba0878c2088fe1c1caca2e3479f4873ee SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9
 EBUILD selinux-nagios-2.20180114-r1.ebuild 378 BLAKE2B 32ad3d8cdef590cb43a54ef3137932ba1a61a1a614944fe6c99beeadb2be608f50c3c8d3d67a14d7fe6aebedfb59cae2916258ad2c121187e374737358601a9e SHA512 e7566bfcb434de97cdc577f82920296859c8e2e1ac9d173e1b1c226e0638faf95cf82ba9c2c2f2fe01c06bd94d91b89aa7626fb6b753a30ef5b52d4ccb0af411
 EBUILD selinux-nagios-2.20180114-r2.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
+EBUILD selinux-nagios-2.20180114-r3.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
 EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
 MISC metadata.xml 316 BLAKE2B 73f32348443cb66f5d8274a05c1993b656d2be9d4c10ede6269793703d156ecf50259c73ff79b11af06aabd9c16c6d69ad875c38dab97c55072301748f8c6d61 SHA512 d41b531c5f7456da060d2d335d0f9e8ac94c307127b3124e9ce6e1c92a9ce6fa5cbfcc7fc2e62ec51d15e966b43f50b8006ee95422cc790a4c17a1a9000dc9f5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild
deleted file mode 100644
index 6390a69a57ce..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild
deleted file mode 100644
index 5cc4a9ef62eb..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild
deleted file mode 100644
index 5cc4a9ef62eb..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild
deleted file mode 100644
index 5cc4a9ef62eb..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r4.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r4.ebuild
deleted file mode 100644
index 6390a69a57ce..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5bf419cc42d4
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nagios"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index 71abbdac3d89..fc6e4340daca 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ncftool-2.20170204-r1.ebuild 286 BLAKE2B 855c2e2aca46d9f3d73b18d29cc167ea30af8e0731ab74ba0b835ea3c9f904d95041d0da21433722dbf5d60e1905762f99b0de9a0291da6b5d3080b9d4a68d3c SHA512 538ce4a1822228fb5bffa8e73569d7fbc9e1d5c9fb7c8dc164a10c7f748bad4c8d9a25171ff03a964b76616e62ea2fb4c388ec1c588058d795f640077610797c
-EBUILD selinux-ncftool-2.20170204-r2.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563ccb59e19eac44a6b3c8dfab93d404bbbedfe7eb46765cb2a40cfb7dfe3cd10d3ed7dd9a05b69f177ab030efd78ad0b5a266e2707 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0
-EBUILD selinux-ncftool-2.20170204-r3.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563ccb59e19eac44a6b3c8dfab93d404bbbedfe7eb46765cb2a40cfb7dfe3cd10d3ed7dd9a05b69f177ab030efd78ad0b5a266e2707 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0
-EBUILD selinux-ncftool-2.20170204-r4.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563ccb59e19eac44a6b3c8dfab93d404bbbedfe7eb46765cb2a40cfb7dfe3cd10d3ed7dd9a05b69f177ab030efd78ad0b5a266e2707 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0
 EBUILD selinux-ncftool-2.20170805-r2.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563ccb59e19eac44a6b3c8dfab93d404bbbedfe7eb46765cb2a40cfb7dfe3cd10d3ed7dd9a05b69f177ab030efd78ad0b5a266e2707 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0
 EBUILD selinux-ncftool-2.20170805-r3.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563ccb59e19eac44a6b3c8dfab93d404bbbedfe7eb46765cb2a40cfb7dfe3cd10d3ed7dd9a05b69f177ab030efd78ad0b5a266e2707 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0
-EBUILD selinux-ncftool-2.20170805-r4.ebuild 286 BLAKE2B 855c2e2aca46d9f3d73b18d29cc167ea30af8e0731ab74ba0b835ea3c9f904d95041d0da21433722dbf5d60e1905762f99b0de9a0291da6b5d3080b9d4a68d3c SHA512 538ce4a1822228fb5bffa8e73569d7fbc9e1d5c9fb7c8dc164a10c7f748bad4c8d9a25171ff03a964b76616e62ea2fb4c388ec1c588058d795f640077610797c
 EBUILD selinux-ncftool-2.20180114-r1.ebuild 284 BLAKE2B 0d284f1fadabba54c50d1f1d6cbbcba94e45e53b98a38b27e24398caf6fbcfaa278417f76a2ad5cb39a0c4afceec474acd5db76aba4355af3e39dd416a36d9ab SHA512 d8240aa1818324ab80e184f523c91ad07bd0b31c222a3adbb69cd5f87bdc9672f3d1e583625e363a25301a702d4c5e7970d38d8d5dbdecf7729f9c5b7a82dc5a
 EBUILD selinux-ncftool-2.20180114-r2.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
+EBUILD selinux-ncftool-2.20180114-r3.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
 EBUILD selinux-ncftool-9999.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
 MISC metadata.xml 317 BLAKE2B 65121da87d0f50d6b1309c953c5e8c3afb350072b70d71f7f25363e8286da650d8c4be29f2fd11056ecec3d2441838d6046cbc89e5e12fe6ca60e24f02cfecf8 SHA512 672a4431cf13c8b31c165ef0a1cb0020b1e5ce4106169661f9f55374178fa961c960096d4d4f4a628d8c15789ea1f0b693ac5872f46765e2f7526dc11f8ad30c
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r1.ebuild
deleted file mode 100644
index ce074baad76b..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r2.ebuild
deleted file mode 100644
index cce911b31108..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r3.ebuild
deleted file mode 100644
index cce911b31108..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r4.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r4.ebuild
deleted file mode 100644
index cce911b31108..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r4.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r4.ebuild
deleted file mode 100644
index ce074baad76b..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20180114-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a941042f000e
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ncftool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
index dd5cedd3ec96..08a761ea7192 100644
--- a/sec-policy/selinux-nessus/Manifest
+++ b/sec-policy/selinux-nessus/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nessus-2.20170204-r1.ebuild 284 BLAKE2B 691d877fb185be09bdb710de4af555eb3436282ddaf8ee95b24031e1096cd2ce953ee6f8951ad4bc5a5e7d2feaf5cf6ca0c9453f7c774aa5fa246d611e17e201 SHA512 6e4ba774c8d084c07665c45883c36838c079053764b494d2981f7ff80dad1e61ba2dcb81fbdfb2ab7a4d868d0a1c00ec820cf3221a5bcbabeb1a7654104b0627
-EBUILD selinux-nessus-2.20170204-r2.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e79dc6029b83a13e4adf2802968acd2a460dc98d64d113d692e5373471eee3e6cdd6c7db46e0ceaa5f82f7a9e1143b29a5b189b1a SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b
-EBUILD selinux-nessus-2.20170204-r3.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e79dc6029b83a13e4adf2802968acd2a460dc98d64d113d692e5373471eee3e6cdd6c7db46e0ceaa5f82f7a9e1143b29a5b189b1a SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b
-EBUILD selinux-nessus-2.20170204-r4.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e79dc6029b83a13e4adf2802968acd2a460dc98d64d113d692e5373471eee3e6cdd6c7db46e0ceaa5f82f7a9e1143b29a5b189b1a SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b
 EBUILD selinux-nessus-2.20170805-r2.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e79dc6029b83a13e4adf2802968acd2a460dc98d64d113d692e5373471eee3e6cdd6c7db46e0ceaa5f82f7a9e1143b29a5b189b1a SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b
 EBUILD selinux-nessus-2.20170805-r3.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e79dc6029b83a13e4adf2802968acd2a460dc98d64d113d692e5373471eee3e6cdd6c7db46e0ceaa5f82f7a9e1143b29a5b189b1a SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b
-EBUILD selinux-nessus-2.20170805-r4.ebuild 284 BLAKE2B 691d877fb185be09bdb710de4af555eb3436282ddaf8ee95b24031e1096cd2ce953ee6f8951ad4bc5a5e7d2feaf5cf6ca0c9453f7c774aa5fa246d611e17e201 SHA512 6e4ba774c8d084c07665c45883c36838c079053764b494d2981f7ff80dad1e61ba2dcb81fbdfb2ab7a4d868d0a1c00ec820cf3221a5bcbabeb1a7654104b0627
 EBUILD selinux-nessus-2.20180114-r1.ebuild 282 BLAKE2B d18284f3594c77a5d22e4cce61c2450f4d64db624e106732a0875f4138981742907719fed65d8156a2deecec9d86e7e255b141abd108fbd592fc10bb83b6a52a SHA512 b9cfffa3f5b5a67d35ff8c5f04ab65034d80afe5304591a48232129b1e5bbc51a605a8bbe58f73f9453219df8e770c5384fa715b2257d4f9e910717329283310
 EBUILD selinux-nessus-2.20180114-r2.ebuild 284 BLAKE2B 69194a944ae5e6352b983a40f8a434cac6e391e55a49c860e1c10e65ac7eecefbc0940b9768c827bc6d8482056b029dbb927f0424af73f79c3c93d99482fb9c6 SHA512 223d3bb566eaaff5f6d7a268a87e59105793412a029972b5663d3f2526fb6815dcdf42f1938e4adc3f68ed9b51de25dd55071de90c7c2eaf97ebb109004fb6aa
+EBUILD selinux-nessus-2.20180114-r3.ebuild 284 BLAKE2B 69194a944ae5e6352b983a40f8a434cac6e391e55a49c860e1c10e65ac7eecefbc0940b9768c827bc6d8482056b029dbb927f0424af73f79c3c93d99482fb9c6 SHA512 223d3bb566eaaff5f6d7a268a87e59105793412a029972b5663d3f2526fb6815dcdf42f1938e4adc3f68ed9b51de25dd55071de90c7c2eaf97ebb109004fb6aa
 EBUILD selinux-nessus-9999.ebuild 284 BLAKE2B 69194a944ae5e6352b983a40f8a434cac6e391e55a49c860e1c10e65ac7eecefbc0940b9768c827bc6d8482056b029dbb927f0424af73f79c3c93d99482fb9c6 SHA512 223d3bb566eaaff5f6d7a268a87e59105793412a029972b5663d3f2526fb6815dcdf42f1938e4adc3f68ed9b51de25dd55071de90c7c2eaf97ebb109004fb6aa
 MISC metadata.xml 316 BLAKE2B 7bb5aceefc53184451f08c1277171170110d3b9e82ce9785c14cca1c007e4e0dbd28e6904147119c14ddec710f804f95f28875da90422153aa1eb59c8f6ae4fd SHA512 b7f0c0e49c6a43610f87535899fb40b6b9fc73b3f4e4aaaa405764ee2268a3fad518d4fd696b57b505c3729460298eed3a9eb454dbeb8d4f9814ee2ff53438b4
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r1.ebuild
deleted file mode 100644
index c1601de1831a..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r2.ebuild
deleted file mode 100644
index e11434f3dbe6..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r3.ebuild
deleted file mode 100644
index e11434f3dbe6..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r4.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r4.ebuild
deleted file mode 100644
index e11434f3dbe6..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r4.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r4.ebuild
deleted file mode 100644
index c1601de1831a..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e3e8e63caa48
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nessus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nessus"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 354718cdc5f8..c926b1e40086 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-networkmanager-2.20170204-r1.ebuild 300 BLAKE2B 58563954614138e607abbefbb86e666356c9cfcdeb08c34fb346bf8f9ebec9d4aafcca230ed1aae1b84e64ffb5463b863e152a113422f7cb9903d03c13901d3b SHA512 1be3601ab5eb808ca587356a3084ca5bb8b2896b84663f673742d92ac537479715520e326f1066e26134170c451055648cd6d36487cb4f7ccfbdf42d6b620115
-EBUILD selinux-networkmanager-2.20170204-r2.ebuild 298 BLAKE2B 339c04c781e3c3e057a51b8b4259364fb0259350b7f5237b11ae0f45ce8529a8c6bb16c5834037d82123939f41ce71aee48dc1721bb234105dd31cec233f3668 SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f
-EBUILD selinux-networkmanager-2.20170204-r3.ebuild 298 BLAKE2B 339c04c781e3c3e057a51b8b4259364fb0259350b7f5237b11ae0f45ce8529a8c6bb16c5834037d82123939f41ce71aee48dc1721bb234105dd31cec233f3668 SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f
-EBUILD selinux-networkmanager-2.20170204-r4.ebuild 298 BLAKE2B 339c04c781e3c3e057a51b8b4259364fb0259350b7f5237b11ae0f45ce8529a8c6bb16c5834037d82123939f41ce71aee48dc1721bb234105dd31cec233f3668 SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f
 EBUILD selinux-networkmanager-2.20170805-r2.ebuild 298 BLAKE2B 339c04c781e3c3e057a51b8b4259364fb0259350b7f5237b11ae0f45ce8529a8c6bb16c5834037d82123939f41ce71aee48dc1721bb234105dd31cec233f3668 SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f
 EBUILD selinux-networkmanager-2.20170805-r3.ebuild 298 BLAKE2B 339c04c781e3c3e057a51b8b4259364fb0259350b7f5237b11ae0f45ce8529a8c6bb16c5834037d82123939f41ce71aee48dc1721bb234105dd31cec233f3668 SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f
-EBUILD selinux-networkmanager-2.20170805-r4.ebuild 300 BLAKE2B 58563954614138e607abbefbb86e666356c9cfcdeb08c34fb346bf8f9ebec9d4aafcca230ed1aae1b84e64ffb5463b863e152a113422f7cb9903d03c13901d3b SHA512 1be3601ab5eb808ca587356a3084ca5bb8b2896b84663f673742d92ac537479715520e326f1066e26134170c451055648cd6d36487cb4f7ccfbdf42d6b620115
 EBUILD selinux-networkmanager-2.20180114-r1.ebuild 298 BLAKE2B e735f37707ddfca78370dadfe6f3b8852124e9916175c29ee4533045d20c71e3da8d798ca84f92858308e7053698b60b7308642b22f17d6a1b96136aa88891e4 SHA512 812f52848f4f2bbb936955fc9dec7d1ce0601b6ab57f0c5a41b2fdb5a2fdcd633faac666255d03797fa4b02eb97db0eebccc50731d6dbf62d16d9eaec2edb053
 EBUILD selinux-networkmanager-2.20180114-r2.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
+EBUILD selinux-networkmanager-2.20180114-r3.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
 EBUILD selinux-networkmanager-9999.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
 MISC metadata.xml 324 BLAKE2B 11f974ba31e403c660eee09c59b4c8489665237b205e4a7e5a919293046575b69d76ce1bbea199342160f6c5c0d39698eba27a2c08ced09e7e9ca814b382cf34 SHA512 310ecd0be68aece22be60ec8d52fcf6fab187d9bb70300e9e7ebab713a0191f770b1fabd836d4f7af6ce351d7a8e6d03ef9cf8dde07afcbfbe86d1dae1fdcd5a
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r1.ebuild
deleted file mode 100644
index 684e79d51dd7..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r2.ebuild
deleted file mode 100644
index ff6dfece34ea..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r3.ebuild
deleted file mode 100644
index ff6dfece34ea..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r4.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r4.ebuild
deleted file mode 100644
index ff6dfece34ea..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r4.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r4.ebuild
deleted file mode 100644
index 684e79d51dd7..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180114-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a6052e7f0e44
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="networkmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 528b4c809ff3..7dc84086f04c 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nginx-2.20170204-r1.ebuild 377 BLAKE2B 391ebfdd30ce7bb2cfd281224b9783a36e3e3771141d6ce79a3607b411fa656ebe9fb358cc2cfdd55f7db98fe35a95d9dc23cd89e5438882c67358ffa4649b9e SHA512 7d5b7465ac1eb32622eaaa4810a22af37f01d3b0bf04d506db3418677f802934928299467f20a8832b706a1e976930e7d8e4a2d6c00e0f579c7c1ce4646d534a
-EBUILD selinux-nginx-2.20170204-r2.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6dde3e1d979404fe1ae064daca13856a36461f42aa4e74b3fe333d33f6b4d34efdc39b1b065e77963f7f28e45ed8db2f8c43ea3 SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76
-EBUILD selinux-nginx-2.20170204-r3.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6dde3e1d979404fe1ae064daca13856a36461f42aa4e74b3fe333d33f6b4d34efdc39b1b065e77963f7f28e45ed8db2f8c43ea3 SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76
-EBUILD selinux-nginx-2.20170204-r4.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6dde3e1d979404fe1ae064daca13856a36461f42aa4e74b3fe333d33f6b4d34efdc39b1b065e77963f7f28e45ed8db2f8c43ea3 SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76
 EBUILD selinux-nginx-2.20170805-r2.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6dde3e1d979404fe1ae064daca13856a36461f42aa4e74b3fe333d33f6b4d34efdc39b1b065e77963f7f28e45ed8db2f8c43ea3 SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76
 EBUILD selinux-nginx-2.20170805-r3.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6dde3e1d979404fe1ae064daca13856a36461f42aa4e74b3fe333d33f6b4d34efdc39b1b065e77963f7f28e45ed8db2f8c43ea3 SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76
-EBUILD selinux-nginx-2.20170805-r4.ebuild 377 BLAKE2B 391ebfdd30ce7bb2cfd281224b9783a36e3e3771141d6ce79a3607b411fa656ebe9fb358cc2cfdd55f7db98fe35a95d9dc23cd89e5438882c67358ffa4649b9e SHA512 7d5b7465ac1eb32622eaaa4810a22af37f01d3b0bf04d506db3418677f802934928299467f20a8832b706a1e976930e7d8e4a2d6c00e0f579c7c1ce4646d534a
 EBUILD selinux-nginx-2.20180114-r1.ebuild 375 BLAKE2B a40891117ba673f44c6e7704108005dc1cdb8a51dde5af12659956c4fc294c66bf0558415b656ef4390a4fbd04b96cbe1dd003c16b9ccd15d87c2a8862dd0bed SHA512 896d5281b76ec286757fd8435f01022694b4055d4a5083475987c3d1a4f1c4294a43bb547157936e2a27e0cbf54559b01557f864363b72cdb0f3b4ac1f0dfcda
 EBUILD selinux-nginx-2.20180114-r2.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
+EBUILD selinux-nginx-2.20180114-r3.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
 EBUILD selinux-nginx-9999.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
 MISC metadata.xml 315 BLAKE2B 19c860410de694561fa09b50d87c5ea3290bb66c7b9b587c3a28e245d858519d10ac0e303b1038e1f9a3b9f9401425876d59f286289ffa657d06449f7cd7054a SHA512 3728836b5b16fc9d04bb74db4e7f0f9ab5418e3831c54ff56af4c65b7d3cfda5c1e710b5ed79766e08e0a978b744b0fe658644fb66e88776886a44296ea70f02
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r1.ebuild
deleted file mode 100644
index 926ca451833e..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r2.ebuild
deleted file mode 100644
index 41b11469d6c8..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r3.ebuild
deleted file mode 100644
index 41b11469d6c8..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r4.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r4.ebuild
deleted file mode 100644
index 41b11469d6c8..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r4.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r4.ebuild
deleted file mode 100644
index 926ca451833e..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20180114-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..250ecf0ab249
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nginx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index e4bbee5ae1d6..72a479c97cc9 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nslcd-2.20170204-r1.ebuild 282 BLAKE2B fbe41d1d3b835e628aaeadc4b68952dce685faf4a9c20577404ae9f2c9815c8b986420f2b81da8c48e375dca684778f57d305f5df0ce65a635ec17ce9732826d SHA512 62b491afab24fd6d650482d99c3e5f8ed1a12fd9d0a8e720ac8344db02b954571c017748a29a6c6a4407272bd5e75ad5d658359bad3907fb25cb98667b9186d7
-EBUILD selinux-nslcd-2.20170204-r2.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0acfacefe7543099a551a41803d96745f5f1ff8e0e4c7c54f1cca1f2f12e296d4c252c6101505b5ca6d37ade8b7799fa8d4864d SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585
-EBUILD selinux-nslcd-2.20170204-r3.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0acfacefe7543099a551a41803d96745f5f1ff8e0e4c7c54f1cca1f2f12e296d4c252c6101505b5ca6d37ade8b7799fa8d4864d SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585
-EBUILD selinux-nslcd-2.20170204-r4.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0acfacefe7543099a551a41803d96745f5f1ff8e0e4c7c54f1cca1f2f12e296d4c252c6101505b5ca6d37ade8b7799fa8d4864d SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585
 EBUILD selinux-nslcd-2.20170805-r2.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0acfacefe7543099a551a41803d96745f5f1ff8e0e4c7c54f1cca1f2f12e296d4c252c6101505b5ca6d37ade8b7799fa8d4864d SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585
 EBUILD selinux-nslcd-2.20170805-r3.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0acfacefe7543099a551a41803d96745f5f1ff8e0e4c7c54f1cca1f2f12e296d4c252c6101505b5ca6d37ade8b7799fa8d4864d SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585
-EBUILD selinux-nslcd-2.20170805-r4.ebuild 282 BLAKE2B fbe41d1d3b835e628aaeadc4b68952dce685faf4a9c20577404ae9f2c9815c8b986420f2b81da8c48e375dca684778f57d305f5df0ce65a635ec17ce9732826d SHA512 62b491afab24fd6d650482d99c3e5f8ed1a12fd9d0a8e720ac8344db02b954571c017748a29a6c6a4407272bd5e75ad5d658359bad3907fb25cb98667b9186d7
 EBUILD selinux-nslcd-2.20180114-r1.ebuild 280 BLAKE2B dc966dc0edcd24aa8a1b93d2f4880b7ceb55ac54b97b54ee4ac8b149e50af619dac7478d525f47be3474ec6b2fadf25f8f61c9d1e136a643ca6ad08d6b41f99e SHA512 20a1a923ff9b473310462201f8bc646803885fd6032c7ba435075545dada24d33a0be8c40c34f37f79d14c0d52eef0baa72438d68ef4e5e81f864c735d827e07
 EBUILD selinux-nslcd-2.20180114-r2.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
+EBUILD selinux-nslcd-2.20180114-r3.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
 EBUILD selinux-nslcd-9999.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
 MISC metadata.xml 315 BLAKE2B ce1a4e8077f570bc9e064e31bb38711eaa068f8d94c20de64c1b631ec94979b5a9075c59599cc14692c26c0985c4dd5b15081a640aab5bc887f2faab694e1090 SHA512 c347218b8973a5e113fd27cbfdbc3f7b0f19938714ea7ac0896f1d3755aebee20409a94ecd8ada8131e7e4bee1e3286f81bd1129bdb4d27cbf10cd88fbefba78
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r1.ebuild
deleted file mode 100644
index 1911d5845dd7..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r2.ebuild
deleted file mode 100644
index 042b51887a29..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r3.ebuild
deleted file mode 100644
index 042b51887a29..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r4.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r4.ebuild
deleted file mode 100644
index 042b51887a29..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r4.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r4.ebuild
deleted file mode 100644
index 1911d5845dd7..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20180114-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..32a1b1cd1c32
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nslcd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nslcd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 5ce959bfa2e3..8eea1a570ba7 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ntop-2.20170204-r1.ebuild 280 BLAKE2B 219ca383ed452c8c1a209f0334721443ef22825e1714b3bf7d2761a44622ba2dcbfdb62e0a6d725e30becebf52b8cc22e41b6d46a19a522d9f10b8738b024a2e SHA512 01c602a12217535d87d254634f1ab5e8616027b696b06333ed7a2b3b251e8584bbca57067dce866af16a8f4ec3e550f7470f245e3a51c23dbcda08d6ea45555e
-EBUILD selinux-ntop-2.20170204-r2.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d60e973a12961bcd48a90d748db53c6ae215d4dab95a0d6078acc028ce68228dc468185e6241915cbfd04823b51f30b085a9a2a SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1
-EBUILD selinux-ntop-2.20170204-r3.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d60e973a12961bcd48a90d748db53c6ae215d4dab95a0d6078acc028ce68228dc468185e6241915cbfd04823b51f30b085a9a2a SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1
-EBUILD selinux-ntop-2.20170204-r4.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d60e973a12961bcd48a90d748db53c6ae215d4dab95a0d6078acc028ce68228dc468185e6241915cbfd04823b51f30b085a9a2a SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1
 EBUILD selinux-ntop-2.20170805-r2.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d60e973a12961bcd48a90d748db53c6ae215d4dab95a0d6078acc028ce68228dc468185e6241915cbfd04823b51f30b085a9a2a SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1
 EBUILD selinux-ntop-2.20170805-r3.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d60e973a12961bcd48a90d748db53c6ae215d4dab95a0d6078acc028ce68228dc468185e6241915cbfd04823b51f30b085a9a2a SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1
-EBUILD selinux-ntop-2.20170805-r4.ebuild 280 BLAKE2B 219ca383ed452c8c1a209f0334721443ef22825e1714b3bf7d2761a44622ba2dcbfdb62e0a6d725e30becebf52b8cc22e41b6d46a19a522d9f10b8738b024a2e SHA512 01c602a12217535d87d254634f1ab5e8616027b696b06333ed7a2b3b251e8584bbca57067dce866af16a8f4ec3e550f7470f245e3a51c23dbcda08d6ea45555e
 EBUILD selinux-ntop-2.20180114-r1.ebuild 278 BLAKE2B 2284810124a60ecfbd65c57ae9ef848432d214048f0e1ee7435aec669fd6b92fa93bc581c814810ca1218a99bd0b46a2abdbb8b8ebc94cb2da6d0ad359bf89e0 SHA512 4391a137f0d4741e1ca81473056883831ac93d53be6b1d034329250942e3710f315c4db8ae18c68de90f1fbd8f2cd814ec7dac2c0abe39b2f1ab0b3fd18b4591
 EBUILD selinux-ntop-2.20180114-r2.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
+EBUILD selinux-ntop-2.20180114-r3.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
 EBUILD selinux-ntop-9999.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
 MISC metadata.xml 314 BLAKE2B 566f04094da0302734856467282a2e4471d3602732a35368e8a92520919ce926c51f8c6c0e86cecce5914b40a4d885e67d365430bfa73fd0c0ca94799908f6d5 SHA512 c8b7f3a30b340a90da32b188b2ea37ea243e11843aa69310c49e2b2f7e69556c77f96e5f2f9355dca5d46d3c3fa6899f1732e14ff43e6173413aa06fe974333f
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r1.ebuild
deleted file mode 100644
index b234f2c1347f..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r2.ebuild
deleted file mode 100644
index fef41238e825..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r3.ebuild
deleted file mode 100644
index fef41238e825..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r4.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r4.ebuild
deleted file mode 100644
index fef41238e825..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r4.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r4.ebuild
deleted file mode 100644
index b234f2c1347f..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20180114-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..818cd6a734df
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ntop"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntop"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index d612b7bed803..ce1fb20c5e17 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ntp-2.20170204-r1.ebuild 278 BLAKE2B 6924a343f3b30d91c4e9800fead8baa7804a3390157abf8a4a891db5529cc1f87357dcd7e711d4fd6294382d4f4e5d9725d6dd3348c4573be553c4e3ad242c7c SHA512 84260058e67bf10eca361682ae219ab25708fd1377e654d0b7f3290977690ccfcc89194b62bfec3edb80c487985fe31995f4dc576d66ff7c9784e9bd638625b1
-EBUILD selinux-ntp-2.20170204-r2.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa605ded9cca3aa2f71e4d10e41eff60805186db0dce342bfe26fde72caf53ec543eb4abae732cac770f63b2c7ffd8d1df5ff420 SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed
-EBUILD selinux-ntp-2.20170204-r3.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa605ded9cca3aa2f71e4d10e41eff60805186db0dce342bfe26fde72caf53ec543eb4abae732cac770f63b2c7ffd8d1df5ff420 SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed
-EBUILD selinux-ntp-2.20170204-r4.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa605ded9cca3aa2f71e4d10e41eff60805186db0dce342bfe26fde72caf53ec543eb4abae732cac770f63b2c7ffd8d1df5ff420 SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed
 EBUILD selinux-ntp-2.20170805-r2.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa605ded9cca3aa2f71e4d10e41eff60805186db0dce342bfe26fde72caf53ec543eb4abae732cac770f63b2c7ffd8d1df5ff420 SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed
 EBUILD selinux-ntp-2.20170805-r3.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa605ded9cca3aa2f71e4d10e41eff60805186db0dce342bfe26fde72caf53ec543eb4abae732cac770f63b2c7ffd8d1df5ff420 SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed
-EBUILD selinux-ntp-2.20170805-r4.ebuild 278 BLAKE2B 6924a343f3b30d91c4e9800fead8baa7804a3390157abf8a4a891db5529cc1f87357dcd7e711d4fd6294382d4f4e5d9725d6dd3348c4573be553c4e3ad242c7c SHA512 84260058e67bf10eca361682ae219ab25708fd1377e654d0b7f3290977690ccfcc89194b62bfec3edb80c487985fe31995f4dc576d66ff7c9784e9bd638625b1
 EBUILD selinux-ntp-2.20180114-r1.ebuild 276 BLAKE2B 86125d84d17c72949e87aec6f08ab49e587b795fc9ad4ff7c70ef210976625d70e186b43dea9c3599ff058336712b0a6eb0a0d5358d94e011c6f938d36915f3e SHA512 61c8efdaa233baa76e4cf639d6d3acc33dfe98b84da6c83525b0e2ea5526f28adcd582fa98a89873b2eb0aa202b351b97ce1311d60868033d1f09dea79622f3e
 EBUILD selinux-ntp-2.20180114-r2.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
+EBUILD selinux-ntp-2.20180114-r3.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
 EBUILD selinux-ntp-9999.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
 MISC metadata.xml 313 BLAKE2B abe800009008c7147fadad7c39286afcf0227560fa37c8b4f362db3227209c5ec6686d3328cc5eea5f8699b74b18a08cfe562dba47d26025e8887a76c8f794ee SHA512 a8e07dfa0336b16ca67328dc4a299930348e725477f9cb37026e8d73a50635294ea9f1ab9174e3de396211596adfdc156e71e897cd177c7d590da460d6e19b41
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r1.ebuild
deleted file mode 100644
index 0370a473c119..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r2.ebuild
deleted file mode 100644
index f3c6f0b241b9..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r3.ebuild
deleted file mode 100644
index f3c6f0b241b9..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r4.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r4.ebuild
deleted file mode 100644
index f3c6f0b241b9..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r4.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r4.ebuild
deleted file mode 100644
index 0370a473c119..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20180114-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..430225fcdc26
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ntp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 644b2a1a2bf2..502a8bab00fd 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nut-2.20170204-r1.ebuild 374 BLAKE2B 7580150e8e0b64ae8ecc598fdc05fd84c475e5ed51f739cd2d41e507f3436469ca1ec8e182a491b2f932cc28e2bb4ada47ac732ef4d811b4820d73ce9fe63a53 SHA512 a53e567ee0aac9a11c24c08e0317ad250c7df8362693177fb2ba0a4fe3a692e01c4ee5f822db56ba92940d85fafbf61b1d317a4147fd471e379f21eeb12d2c5e
-EBUILD selinux-nut-2.20170204-r2.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91ca37350205ca5760658e6c4ae444c035b83e0ef54e1a3137de41f6372a63bd4f9f26eb579ed14993781bff16576381f5291a SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8
-EBUILD selinux-nut-2.20170204-r3.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91ca37350205ca5760658e6c4ae444c035b83e0ef54e1a3137de41f6372a63bd4f9f26eb579ed14993781bff16576381f5291a SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8
-EBUILD selinux-nut-2.20170204-r4.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91ca37350205ca5760658e6c4ae444c035b83e0ef54e1a3137de41f6372a63bd4f9f26eb579ed14993781bff16576381f5291a SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8
 EBUILD selinux-nut-2.20170805-r2.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91ca37350205ca5760658e6c4ae444c035b83e0ef54e1a3137de41f6372a63bd4f9f26eb579ed14993781bff16576381f5291a SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8
 EBUILD selinux-nut-2.20170805-r3.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91ca37350205ca5760658e6c4ae444c035b83e0ef54e1a3137de41f6372a63bd4f9f26eb579ed14993781bff16576381f5291a SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8
-EBUILD selinux-nut-2.20170805-r4.ebuild 374 BLAKE2B 7580150e8e0b64ae8ecc598fdc05fd84c475e5ed51f739cd2d41e507f3436469ca1ec8e182a491b2f932cc28e2bb4ada47ac732ef4d811b4820d73ce9fe63a53 SHA512 a53e567ee0aac9a11c24c08e0317ad250c7df8362693177fb2ba0a4fe3a692e01c4ee5f822db56ba92940d85fafbf61b1d317a4147fd471e379f21eeb12d2c5e
 EBUILD selinux-nut-2.20180114-r1.ebuild 372 BLAKE2B 3062809e821f4a5ef60570ec9d702993fd37f0e63384570d3e6cab7c6b187a608a48018915188bcf1b663247e46191a07eeb519ebfbce502091b59c0844fe69f SHA512 4c41faf56960a4173a2eb3db5af12d28eeb0217df532ed2ad7f753f1b09fa14c206cc40d6fd93a67f38f31fcbd6eb9f1795a473e705b2d25853d16e379ff49c5
 EBUILD selinux-nut-2.20180114-r2.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
+EBUILD selinux-nut-2.20180114-r3.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
 EBUILD selinux-nut-9999.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
 MISC metadata.xml 313 BLAKE2B 9b567dc3e05486c4bd208301cee25627046f3b9c5c097a4ace7ee30649e70fb90f99243009f57d9a61156a20a505a230f6f4b514007b358573d496a5ba1c886a SHA512 27ce423f0771c0420170fe4a345d4c16186376a787202bdb57dc770889295602d15574c95e916c6e50edb4877ff6216d7032893c601dc9f5f4c614452b5b6b1f
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170204-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170204-r1.ebuild
deleted file mode 100644
index 1d268740c79e..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170204-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170204-r2.ebuild
deleted file mode 100644
index 52278013312d..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170204-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170204-r3.ebuild
deleted file mode 100644
index 52278013312d..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170204-r4.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170204-r4.ebuild
deleted file mode 100644
index 52278013312d..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170805-r4.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170805-r4.ebuild
deleted file mode 100644
index 1d268740c79e..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20180114-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a4fb8098acf4
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index 2a7fd965c88d..99881db7dca8 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-nx-2.20170204-r1.ebuild 276 BLAKE2B 1dc373af8fb74698fcfc492ca8cb415d17b34583fcc557422f9318285ded2190599278f2c29d3f33bda174b22e17450452166759f2dd8dfa9466978a9785774c SHA512 adc9190ac7444c198cb9793ba333ad07529b14a4aed2eabcc7cc0d681a4a7ea8a4e618303f9dbd50b1e7d5bc407cb15bad52d4495bfddc1edc085f9aa5eae254
-EBUILD selinux-nx-2.20170204-r2.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc7045b610b0124d30cf1b4ccfa9ff7d825c133ea26dd0d81a3e826f0a070fc5bc14dc37a15eab399c4e07e073f5073b977f5 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50
-EBUILD selinux-nx-2.20170204-r3.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc7045b610b0124d30cf1b4ccfa9ff7d825c133ea26dd0d81a3e826f0a070fc5bc14dc37a15eab399c4e07e073f5073b977f5 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50
-EBUILD selinux-nx-2.20170204-r4.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc7045b610b0124d30cf1b4ccfa9ff7d825c133ea26dd0d81a3e826f0a070fc5bc14dc37a15eab399c4e07e073f5073b977f5 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50
 EBUILD selinux-nx-2.20170805-r2.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc7045b610b0124d30cf1b4ccfa9ff7d825c133ea26dd0d81a3e826f0a070fc5bc14dc37a15eab399c4e07e073f5073b977f5 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50
 EBUILD selinux-nx-2.20170805-r3.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc7045b610b0124d30cf1b4ccfa9ff7d825c133ea26dd0d81a3e826f0a070fc5bc14dc37a15eab399c4e07e073f5073b977f5 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50
-EBUILD selinux-nx-2.20170805-r4.ebuild 276 BLAKE2B 1dc373af8fb74698fcfc492ca8cb415d17b34583fcc557422f9318285ded2190599278f2c29d3f33bda174b22e17450452166759f2dd8dfa9466978a9785774c SHA512 adc9190ac7444c198cb9793ba333ad07529b14a4aed2eabcc7cc0d681a4a7ea8a4e618303f9dbd50b1e7d5bc407cb15bad52d4495bfddc1edc085f9aa5eae254
 EBUILD selinux-nx-2.20180114-r1.ebuild 274 BLAKE2B 05108e4746f6bfb1e79ca102e95072406f1116c41c5e48f6b527e106a2007fc809b92238864429b4a9291ef929cfea57560544518ac32161b3eff770ac4bd5e3 SHA512 7c9bcf23657d8b2900f0aa196953bd1ab252d1e8713ea192dcec9fb4293172c48e99fc21af00bb53dbea87df244284a1f061d582155cde5dc0a6a412856c84ef
 EBUILD selinux-nx-2.20180114-r2.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
+EBUILD selinux-nx-2.20180114-r3.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
 EBUILD selinux-nx-9999.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
 MISC metadata.xml 312 BLAKE2B ce5b19a15c4c2255a16c90631f486f3e19e2568f021c6c12d5ade7c23c663a4d8f3eea86bb2ff43f38b7d973c56f720625e576a00879660b9c5da103e116826f SHA512 2974c5cf4c601110b07cdb7dbc5a246002de84c2c3f440b4b7ba80e1f325c34449d39ea026d63fa2a8a347d6025c5c487ce80429f8889b0b89f11c8cc2a5ab15
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170204-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170204-r1.ebuild
deleted file mode 100644
index 32b6df252108..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170204-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170204-r2.ebuild
deleted file mode 100644
index c69d81570ac5..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170204-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170204-r3.ebuild
deleted file mode 100644
index c69d81570ac5..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170204-r4.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170204-r4.ebuild
deleted file mode 100644
index c69d81570ac5..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170805-r4.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170805-r4.ebuild
deleted file mode 100644
index 32b6df252108..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20180114-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..eaae5499cf3a
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nx"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 3a25dff62418..4489ab967508 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-oddjob-2.20170204-r1.ebuild 284 BLAKE2B 0bed561baaba61d9f075ff15b191a84f3d7dac0c9362fa420a48ab9874dd36a8cc7c4dd0488b1aecc9607788e5a407f1538b5bade7c5c093d53adb1df609e65b SHA512 6a93548be71481d5bbd98115a309f52733798394c2a0394684fb5ee608f22b77ea1af504296b45967ad36c95eaa808ae1c9c4a13a05388b7f622e80a106cf2a3
-EBUILD selinux-oddjob-2.20170204-r2.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018b7a5a4024c5c36e2460c26231a7297172f8d4bc8cb1eb587a9cfea9349e0f13beb1c9b6cfb81fd080150cfc9ff3b71ccd0bcc3d SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446
-EBUILD selinux-oddjob-2.20170204-r3.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018b7a5a4024c5c36e2460c26231a7297172f8d4bc8cb1eb587a9cfea9349e0f13beb1c9b6cfb81fd080150cfc9ff3b71ccd0bcc3d SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446
-EBUILD selinux-oddjob-2.20170204-r4.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018b7a5a4024c5c36e2460c26231a7297172f8d4bc8cb1eb587a9cfea9349e0f13beb1c9b6cfb81fd080150cfc9ff3b71ccd0bcc3d SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446
 EBUILD selinux-oddjob-2.20170805-r2.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018b7a5a4024c5c36e2460c26231a7297172f8d4bc8cb1eb587a9cfea9349e0f13beb1c9b6cfb81fd080150cfc9ff3b71ccd0bcc3d SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446
 EBUILD selinux-oddjob-2.20170805-r3.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018b7a5a4024c5c36e2460c26231a7297172f8d4bc8cb1eb587a9cfea9349e0f13beb1c9b6cfb81fd080150cfc9ff3b71ccd0bcc3d SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446
-EBUILD selinux-oddjob-2.20170805-r4.ebuild 284 BLAKE2B 0bed561baaba61d9f075ff15b191a84f3d7dac0c9362fa420a48ab9874dd36a8cc7c4dd0488b1aecc9607788e5a407f1538b5bade7c5c093d53adb1df609e65b SHA512 6a93548be71481d5bbd98115a309f52733798394c2a0394684fb5ee608f22b77ea1af504296b45967ad36c95eaa808ae1c9c4a13a05388b7f622e80a106cf2a3
 EBUILD selinux-oddjob-2.20180114-r1.ebuild 282 BLAKE2B 4a379431b7d6bd3a881bb4e0b47be7f8fcb4a1448a2a305a48f27f17ba0095f1861a8f1b558d7b628b21c38e9e0c6cfd5d439190f5b1abd3839cd1e99242cc94 SHA512 c91237411c3096b0a04e7cef34b98b7901fb896171fb0e3c7540ffdce6a6ac8cd34d68e9a6163cca1b1032adbd24ab0ef94d82022afb1b400101550c74c731a6
 EBUILD selinux-oddjob-2.20180114-r2.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
+EBUILD selinux-oddjob-2.20180114-r3.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
 EBUILD selinux-oddjob-9999.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
 MISC metadata.xml 334 BLAKE2B ad589091646cdb6c4b3e272d47f0cb5131ffcc65b198b4cd9e18ad651dfb96b148956fd414a77951fb58a4a1b3499ef0f8366e9bd5c3135d3d7303427059ea3b SHA512 488d945f4cfc2c9a101c66ededd0280dc4fc9a83d3a0aa2496de1c5fbc756092cd1540526d499729432e325c03f1cb5a893773df3162b3d80dfcda2a07eabe93
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r1.ebuild
deleted file mode 100644
index 3ce719e3c642..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r2.ebuild
deleted file mode 100644
index 05d81dbf6e35..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r3.ebuild
deleted file mode 100644
index 05d81dbf6e35..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r4.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r4.ebuild
deleted file mode 100644
index 05d81dbf6e35..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r4.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r4.ebuild
deleted file mode 100644
index 3ce719e3c642..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20180114-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..6cf65e47af84
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="oddjob"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oddjob"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 865f8afa5805..5c0821502533 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-oident-2.20170204-r1.ebuild 284 BLAKE2B 0325c83b32c4f8d9e47a45871017b7f83e9d1ef4c46ba8938ea5f28464efa913ae1585964b103a36324f41db793c70e68ce8543d10ba4c215ac44a6b9073bca5 SHA512 5a2f2125aa69e8423877c55d18467822b41b4854b40052907d2b0741dd2b518d9a53fc1cc288d00273d59bdce3533c3d68daf7d66182fd4e657b53cc83b7f33c
-EBUILD selinux-oident-2.20170204-r2.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fbeaf91bf8b6470023905153413038e7300bb8a25b1976411038b859a6fcbc3e2f48aa8a614e09b97a81ae4be8cee7114102845cc SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc
-EBUILD selinux-oident-2.20170204-r3.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fbeaf91bf8b6470023905153413038e7300bb8a25b1976411038b859a6fcbc3e2f48aa8a614e09b97a81ae4be8cee7114102845cc SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc
-EBUILD selinux-oident-2.20170204-r4.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fbeaf91bf8b6470023905153413038e7300bb8a25b1976411038b859a6fcbc3e2f48aa8a614e09b97a81ae4be8cee7114102845cc SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc
 EBUILD selinux-oident-2.20170805-r2.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fbeaf91bf8b6470023905153413038e7300bb8a25b1976411038b859a6fcbc3e2f48aa8a614e09b97a81ae4be8cee7114102845cc SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc
 EBUILD selinux-oident-2.20170805-r3.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fbeaf91bf8b6470023905153413038e7300bb8a25b1976411038b859a6fcbc3e2f48aa8a614e09b97a81ae4be8cee7114102845cc SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc
-EBUILD selinux-oident-2.20170805-r4.ebuild 284 BLAKE2B 0325c83b32c4f8d9e47a45871017b7f83e9d1ef4c46ba8938ea5f28464efa913ae1585964b103a36324f41db793c70e68ce8543d10ba4c215ac44a6b9073bca5 SHA512 5a2f2125aa69e8423877c55d18467822b41b4854b40052907d2b0741dd2b518d9a53fc1cc288d00273d59bdce3533c3d68daf7d66182fd4e657b53cc83b7f33c
 EBUILD selinux-oident-2.20180114-r1.ebuild 282 BLAKE2B caa2aff586d36d303b7be2b4ac0fb72cc7cfe455d1e79bc47b347b1c71888aceeca20e2904e873c6a4412bba998e50ec02fe22be50eb64a4208e8639861fd028 SHA512 3314ac956ecbc9ed0278308bab37773bfb44ad79aeacffd8cbe5fbdbf980b3d2830a3f3b53091c450b802683cb629c2e62f20b37dd3547da5f2f466ef0c365ff
 EBUILD selinux-oident-2.20180114-r2.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
+EBUILD selinux-oident-2.20180114-r3.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
 EBUILD selinux-oident-9999.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
 MISC metadata.xml 316 BLAKE2B fdea156e5b038e408170545c6323f7de20b6b9c30fda9ee7c001fec9b0e1557c58a652cb2e0e61821600e2e8e6c36614e256b79aa6f2a072377152b8c113f8cd SHA512 bf1249529ca86fa8714111c62b51db48ba0239663e4192968a7717958d67c3c36f9ad03d0bc43a7baf04d2026bafeb409bcb9b7dffad2711c2a2349204041ed2
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170204-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170204-r1.ebuild
deleted file mode 100644
index fd3eb560f53e..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170204-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170204-r2.ebuild
deleted file mode 100644
index 11bf08ade1c1..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170204-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170204-r3.ebuild
deleted file mode 100644
index 11bf08ade1c1..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170204-r4.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170204-r4.ebuild
deleted file mode 100644
index 11bf08ade1c1..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170805-r4.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170805-r4.ebuild
deleted file mode 100644
index fd3eb560f53e..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20180114-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..931c5f14889c
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="oident"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oident"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index 1efdfb8701da..14ded038719a 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-openct-2.20170204-r1.ebuild 284 BLAKE2B dbcf0f23b3fe025b36d160ebe3ff6c5aaa1baa546227e4f2c031ba509c16374b177139db30c4bbe91edb55212da5f01e7378193bc7e03ab7325636eea393b91b SHA512 4a0783698255db839ca415ac48c4d4438bf0bb3efa47b774a9ad3040c1c370ccc88cc8227702fd4ee8995f1c05041a4602c167a69b1560892df6a0c79ab41927
-EBUILD selinux-openct-2.20170204-r2.ebuild 282 BLAKE2B 805ec99632d0aad8da992353dfcc21848b60e7587250ab4809b64a35ff5be335157983a4dfde65b5e8736698e081dafb77dbb516f44ee6d5f01fcef57deeb642 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170
-EBUILD selinux-openct-2.20170204-r3.ebuild 282 BLAKE2B 805ec99632d0aad8da992353dfcc21848b60e7587250ab4809b64a35ff5be335157983a4dfde65b5e8736698e081dafb77dbb516f44ee6d5f01fcef57deeb642 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170
-EBUILD selinux-openct-2.20170204-r4.ebuild 282 BLAKE2B 805ec99632d0aad8da992353dfcc21848b60e7587250ab4809b64a35ff5be335157983a4dfde65b5e8736698e081dafb77dbb516f44ee6d5f01fcef57deeb642 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170
 EBUILD selinux-openct-2.20170805-r2.ebuild 282 BLAKE2B 805ec99632d0aad8da992353dfcc21848b60e7587250ab4809b64a35ff5be335157983a4dfde65b5e8736698e081dafb77dbb516f44ee6d5f01fcef57deeb642 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170
 EBUILD selinux-openct-2.20170805-r3.ebuild 282 BLAKE2B 805ec99632d0aad8da992353dfcc21848b60e7587250ab4809b64a35ff5be335157983a4dfde65b5e8736698e081dafb77dbb516f44ee6d5f01fcef57deeb642 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170
-EBUILD selinux-openct-2.20170805-r4.ebuild 284 BLAKE2B dbcf0f23b3fe025b36d160ebe3ff6c5aaa1baa546227e4f2c031ba509c16374b177139db30c4bbe91edb55212da5f01e7378193bc7e03ab7325636eea393b91b SHA512 4a0783698255db839ca415ac48c4d4438bf0bb3efa47b774a9ad3040c1c370ccc88cc8227702fd4ee8995f1c05041a4602c167a69b1560892df6a0c79ab41927
 EBUILD selinux-openct-2.20180114-r1.ebuild 282 BLAKE2B 41552c3fce6ebcb670c349724a74819e86450825ba8ef016c4adbb605ab86fd7cfbfbafcb44bd67b70234e53964769e96569425641f87df1f4a46a6c0364b9e3 SHA512 2be34004ae3bfbb7a27c4ac7efeaec1a748f1ab2ffc3fef925b43ebf8b4965b73deb41baaf251dcb0603b88509aa2327c09d720240e9fa5b6fcc18f390204910
 EBUILD selinux-openct-2.20180114-r2.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
+EBUILD selinux-openct-2.20180114-r3.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
 EBUILD selinux-openct-9999.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
 MISC metadata.xml 316 BLAKE2B 5a71ac1fdc33e227acfaf2db6d5db8b3bde2ac47c9e00b8bf350f128d552ff12964dd04c6ae4e36143307bde27f3bf6af20966f8c118fbf45c042d4f1a7185b4 SHA512 2f34a907f602c48245d3b5bce00bc178b2c8d58d28ee6992438179375e116ec2beb5d9422cf7897af985910402fce75c9d9b50a2d372e59bcbaa59dedb7490bc
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170204-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170204-r1.ebuild
deleted file mode 100644
index fe1edaa9eafd..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170204-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170204-r2.ebuild
deleted file mode 100644
index 9ee9b2f682a0..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170204-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170204-r3.ebuild
deleted file mode 100644
index 9ee9b2f682a0..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170204-r4.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170204-r4.ebuild
deleted file mode 100644
index 9ee9b2f682a0..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170805-r4.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170805-r4.ebuild
deleted file mode 100644
index fe1edaa9eafd..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20180114-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..accd8f695a5d
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openct"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 87e8bd5e347e..1a6d319ee74f 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-openrc-2.20170204-r1.ebuild 284 BLAKE2B 234ab87a4f4cbaec17170aacfcb87e94afa23a85fbab3468050fd3da22858ad4fbbfe5c4d4d7465d8db8f9d249a484fd4c96aaee54cf4fda78f528264123a370 SHA512 647bd90e04ef02b80ccb042e6053771a1bf5edc1477cc42c6b96f88e12e8b33afb4df3b3e623423dcc74b314077586d8f14e8473d3ba8221acbfa66ee0a2a1a1
-EBUILD selinux-openrc-2.20170204-r2.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf356ceea2b225de8e2a61ef6aec9f824fb1e8d02d834b2d35698c0205ac8c6102a45704005b99c42d4247341c5232500428c8162 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14
-EBUILD selinux-openrc-2.20170204-r3.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf356ceea2b225de8e2a61ef6aec9f824fb1e8d02d834b2d35698c0205ac8c6102a45704005b99c42d4247341c5232500428c8162 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14
-EBUILD selinux-openrc-2.20170204-r4.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf356ceea2b225de8e2a61ef6aec9f824fb1e8d02d834b2d35698c0205ac8c6102a45704005b99c42d4247341c5232500428c8162 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14
 EBUILD selinux-openrc-2.20170805-r2.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf356ceea2b225de8e2a61ef6aec9f824fb1e8d02d834b2d35698c0205ac8c6102a45704005b99c42d4247341c5232500428c8162 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14
 EBUILD selinux-openrc-2.20170805-r3.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf356ceea2b225de8e2a61ef6aec9f824fb1e8d02d834b2d35698c0205ac8c6102a45704005b99c42d4247341c5232500428c8162 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14
-EBUILD selinux-openrc-2.20170805-r4.ebuild 284 BLAKE2B 234ab87a4f4cbaec17170aacfcb87e94afa23a85fbab3468050fd3da22858ad4fbbfe5c4d4d7465d8db8f9d249a484fd4c96aaee54cf4fda78f528264123a370 SHA512 647bd90e04ef02b80ccb042e6053771a1bf5edc1477cc42c6b96f88e12e8b33afb4df3b3e623423dcc74b314077586d8f14e8473d3ba8221acbfa66ee0a2a1a1
 EBUILD selinux-openrc-2.20180114-r1.ebuild 282 BLAKE2B 29e21d8a671ea178c9271ebf4eaab28778d7f5187d248f97900c9a9f0a26359240f8607b496bcba2d301587894062e34aee880c90f94ac106f5f7f62b0976dd6 SHA512 7a26eb020d4c2718faccc0b6077bfb8c8913f4b8b0abd909f7afd16bc6c470526b67db1016356a5e5a7275837c049c3b10035b7b02f3b7dbe5fe0076c4e0a29d
 EBUILD selinux-openrc-2.20180114-r2.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
+EBUILD selinux-openrc-2.20180114-r3.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
 EBUILD selinux-openrc-9999.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
 MISC metadata.xml 316 BLAKE2B ef625d3f5e926917f4433d9edcb72b4ba245ae29561833f4878f7169643a36da79209de521951749d8a2f0184452d2055c97c581bf8136594da02ce172597395 SHA512 0cf24e90730fd2dbe20f789319b4a5f5e8a0f17613a0ae5bd75fecf9b9f4575c3980fc51680b279b82e91fbdb0f2ba01009f025afd6c5216d538a7c37a6b91d7
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r1.ebuild
deleted file mode 100644
index 3809ff69dbd0..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r2.ebuild
deleted file mode 100644
index fa3eb713c887..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r3.ebuild
deleted file mode 100644
index fa3eb713c887..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r4.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r4.ebuild
deleted file mode 100644
index fa3eb713c887..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r4.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r4.ebuild
deleted file mode 100644
index 3809ff69dbd0..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20180114-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..f7967faa52e1
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openrc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openrc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index f4d58dc7da00..03bf4bad3361 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-openvpn-2.20170204-r1.ebuild 286 BLAKE2B 2d9cc41db0bc5c7ccb4ad2fd63773ffa5194af1c024204fabe62d6482ff544b21a4cdab3d71055ee065c7ebb10bf7262951dcab53a4e3082b9f32dc8563c00e7 SHA512 d50afb395a5ab1c8c210211bfcc4c45d504dff138a55203e3526fe04d45f32cdea03fb0c61eb1dab56ca2a067c6189e5986ad78e95b6c8abe9bb92395c51c35f
-EBUILD selinux-openvpn-2.20170204-r2.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab1d5b50528a5ec2f4a3edfb732f2e9fd361b36aa3b89ae580157eab86ebf637f82beca27ec13d99e4b9955e2daf182fd40b191006 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5
-EBUILD selinux-openvpn-2.20170204-r3.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab1d5b50528a5ec2f4a3edfb732f2e9fd361b36aa3b89ae580157eab86ebf637f82beca27ec13d99e4b9955e2daf182fd40b191006 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5
-EBUILD selinux-openvpn-2.20170204-r4.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab1d5b50528a5ec2f4a3edfb732f2e9fd361b36aa3b89ae580157eab86ebf637f82beca27ec13d99e4b9955e2daf182fd40b191006 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5
 EBUILD selinux-openvpn-2.20170805-r2.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab1d5b50528a5ec2f4a3edfb732f2e9fd361b36aa3b89ae580157eab86ebf637f82beca27ec13d99e4b9955e2daf182fd40b191006 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5
 EBUILD selinux-openvpn-2.20170805-r3.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab1d5b50528a5ec2f4a3edfb732f2e9fd361b36aa3b89ae580157eab86ebf637f82beca27ec13d99e4b9955e2daf182fd40b191006 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5
-EBUILD selinux-openvpn-2.20170805-r4.ebuild 286 BLAKE2B 2d9cc41db0bc5c7ccb4ad2fd63773ffa5194af1c024204fabe62d6482ff544b21a4cdab3d71055ee065c7ebb10bf7262951dcab53a4e3082b9f32dc8563c00e7 SHA512 d50afb395a5ab1c8c210211bfcc4c45d504dff138a55203e3526fe04d45f32cdea03fb0c61eb1dab56ca2a067c6189e5986ad78e95b6c8abe9bb92395c51c35f
 EBUILD selinux-openvpn-2.20180114-r1.ebuild 284 BLAKE2B 50b509b2fa573ed2e8b6e35478174642483d4fa9050bcd5bbaf5596a94f3bdc0c3ed1615b318184e38999162f573a80bf4c94e66e4afcb110628de68f0ec0550 SHA512 249a145290294dc7b49c948adfae2831b018b8d2097bf7791b8e1d96eef52310bd49427e4df4d7219028a916b389ff94b1648c0e1c771cbfcb259e3a90070305
 EBUILD selinux-openvpn-2.20180114-r2.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
+EBUILD selinux-openvpn-2.20180114-r3.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
 EBUILD selinux-openvpn-9999.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
 MISC metadata.xml 317 BLAKE2B dd336bd2ceb38396b70383f3d53ed8d39c14641e3e5b3f95c9c7e032bcbd9de96de4d364a8465fa8a55b9bebe80fbb926b69c7a494077d764f5331698e86a4dc SHA512 404052219f5f8e5b95dc2e34baef116609b40581aa99d5e93861807d28fbc1eb23a4368e2e01ee6dd6c4cec76294fe567bf860bb4c0db36bf34b1972d3ca1dab
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r1.ebuild
deleted file mode 100644
index 7536af68e6ee..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r2.ebuild
deleted file mode 100644
index ba6de62cc44f..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r3.ebuild
deleted file mode 100644
index ba6de62cc44f..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r4.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r4.ebuild
deleted file mode 100644
index ba6de62cc44f..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r4.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r4.ebuild
deleted file mode 100644
index 7536af68e6ee..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20180114-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5814dd787ebf
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openvpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openvpn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 1990b3e3ecb5..028ed6f985f7 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pan-2.20170204-r1.ebuild 376 BLAKE2B 0e1afd52ebc5b1e933a2b98dd8d6a71dbd2b1c755e8bd4c06fa052da83a5ff93b115d12578f79b0c6ba48f331281020e433bbed45a2569812fd9254793373f42 SHA512 271e5246d3a246cca2744e390870c8fac026ee8ae6befa609b42d244d5c5de76e251e7ae0a7f2e3e62b0ef25d59168c868ca10afc58a1e326aa93b654347c473
-EBUILD selinux-pan-2.20170204-r2.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943570191423f1a91b4897df571eb8978039ea4f78845c6197359740669f88b19b320970481fbe33c7f5dfbe14c7d7828fb7d97 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd
-EBUILD selinux-pan-2.20170204-r3.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943570191423f1a91b4897df571eb8978039ea4f78845c6197359740669f88b19b320970481fbe33c7f5dfbe14c7d7828fb7d97 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd
-EBUILD selinux-pan-2.20170204-r4.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943570191423f1a91b4897df571eb8978039ea4f78845c6197359740669f88b19b320970481fbe33c7f5dfbe14c7d7828fb7d97 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd
 EBUILD selinux-pan-2.20170805-r2.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943570191423f1a91b4897df571eb8978039ea4f78845c6197359740669f88b19b320970481fbe33c7f5dfbe14c7d7828fb7d97 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd
 EBUILD selinux-pan-2.20170805-r3.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943570191423f1a91b4897df571eb8978039ea4f78845c6197359740669f88b19b320970481fbe33c7f5dfbe14c7d7828fb7d97 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd
-EBUILD selinux-pan-2.20170805-r4.ebuild 376 BLAKE2B 0e1afd52ebc5b1e933a2b98dd8d6a71dbd2b1c755e8bd4c06fa052da83a5ff93b115d12578f79b0c6ba48f331281020e433bbed45a2569812fd9254793373f42 SHA512 271e5246d3a246cca2744e390870c8fac026ee8ae6befa609b42d244d5c5de76e251e7ae0a7f2e3e62b0ef25d59168c868ca10afc58a1e326aa93b654347c473
 EBUILD selinux-pan-2.20180114-r1.ebuild 374 BLAKE2B ce75258541c84d8854a4255280705dde69a63b5fba71ae9568b025aa708ca8850f0f200441decc857e441f0cc30a1f9bd248e4892f31887325ba970a0766c0d3 SHA512 7dfdd0dfe599875db62de637693bada6b714e263dfe23aac538c6971513981fc15563d1a60f8218fd43cdd7be3565cde636c4fc6dfd99ba92146747a717befa5
 EBUILD selinux-pan-2.20180114-r2.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
+EBUILD selinux-pan-2.20180114-r3.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
 EBUILD selinux-pan-9999.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
 MISC metadata.xml 313 BLAKE2B 00b319beed1e12194de64ce3825134a40dd1a48666aed759d136ed77b52dece7d4ea81752e443c0eb2fd3a41ed038b814bf56f7591e6430bd2b0cff4f1523d08 SHA512 c7b7a83c7cbe58b4294977429326fd22b59391fd3c670e4a4083687c4eff871665af17d9ee4cdd14efac69f630d97d38eaf1e5bc37a7ff538cd847c993408a1a
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170204-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170204-r1.ebuild
deleted file mode 100644
index 741fbe8a33e2..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170204-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170204-r2.ebuild
deleted file mode 100644
index d460c840cdc3..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170204-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170204-r3.ebuild
deleted file mode 100644
index d460c840cdc3..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170204-r4.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170204-r4.ebuild
deleted file mode 100644
index d460c840cdc3..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170805-r4.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170805-r4.ebuild
deleted file mode 100644
index 741fbe8a33e2..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20180114-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c9aa8c17ed05
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pan"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pan"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index f1489de2bf94..4e4595993c9c 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pcmcia-2.20170204-r1.ebuild 284 BLAKE2B 1d0a5bee2331fd0b000b4130e8f14d5611247a3291ae9aa82b6e27a0b7e57544db7ace27d1866ba27f3f6df9c88ac0b90fcc5fffe49030d7ff20f69f27d4fa7a SHA512 36d3a13f6e0835f236f61229eaaa46563d5ad0ef56b8d8c303156c420ef25a47df5a5e89ac7d36a8a3c02079eb9bc6d5ab7c452b54f887dc2527568dfd9c2d33
-EBUILD selinux-pcmcia-2.20170204-r2.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e0170d57dc0156b0f2245add91025ce7ede5a54d03f942f3ea5c0ff10bae4a5dbad999500f50a25ef4be2f36f3dc3cd6f610873c39a SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d
-EBUILD selinux-pcmcia-2.20170204-r3.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e0170d57dc0156b0f2245add91025ce7ede5a54d03f942f3ea5c0ff10bae4a5dbad999500f50a25ef4be2f36f3dc3cd6f610873c39a SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d
-EBUILD selinux-pcmcia-2.20170204-r4.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e0170d57dc0156b0f2245add91025ce7ede5a54d03f942f3ea5c0ff10bae4a5dbad999500f50a25ef4be2f36f3dc3cd6f610873c39a SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d
 EBUILD selinux-pcmcia-2.20170805-r2.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e0170d57dc0156b0f2245add91025ce7ede5a54d03f942f3ea5c0ff10bae4a5dbad999500f50a25ef4be2f36f3dc3cd6f610873c39a SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d
 EBUILD selinux-pcmcia-2.20170805-r3.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e0170d57dc0156b0f2245add91025ce7ede5a54d03f942f3ea5c0ff10bae4a5dbad999500f50a25ef4be2f36f3dc3cd6f610873c39a SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d
-EBUILD selinux-pcmcia-2.20170805-r4.ebuild 284 BLAKE2B 1d0a5bee2331fd0b000b4130e8f14d5611247a3291ae9aa82b6e27a0b7e57544db7ace27d1866ba27f3f6df9c88ac0b90fcc5fffe49030d7ff20f69f27d4fa7a SHA512 36d3a13f6e0835f236f61229eaaa46563d5ad0ef56b8d8c303156c420ef25a47df5a5e89ac7d36a8a3c02079eb9bc6d5ab7c452b54f887dc2527568dfd9c2d33
 EBUILD selinux-pcmcia-2.20180114-r1.ebuild 282 BLAKE2B 24430e64f73c7e4f5a1344a01f0892729c7eca0c6f21b91cbf56b308e36bd87a69dbd85bdf0e8d4c0a4d39f4485c7cfc0606d310c3de59c53246930e453a8462 SHA512 39938301b80534c5d4af5a2c5decf7a265295797904ca57fb9cf38d1e1ed79d9a88db0185973368027d4c9612731f902e6175397b2badfff80fd4efb41781fc0
 EBUILD selinux-pcmcia-2.20180114-r2.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
+EBUILD selinux-pcmcia-2.20180114-r3.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
 EBUILD selinux-pcmcia-9999.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
 MISC metadata.xml 316 BLAKE2B cc90a9ff7d7b6e65a1f4559b90413d7b6460fa82c4afb91ba3c1f02e551431c9e797f5126c997c9c9a8bb2a1348faa744bed3a116cb98bf73c8b6ffbf755a064 SHA512 644a200cefcb82931e5c53f504228299b407d25c41b933af09a705755fe7c6c017da62e70162fe83221d534d33be77c82235c39bade584af62249e97a963abd3
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r1.ebuild
deleted file mode 100644
index 6b569dce36a2..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r2.ebuild
deleted file mode 100644
index 29b5f976a9b6..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r3.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r3.ebuild
deleted file mode 100644
index 29b5f976a9b6..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r4.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r4.ebuild
deleted file mode 100644
index 29b5f976a9b6..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r4.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r4.ebuild
deleted file mode 100644
index 6b569dce36a2..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180114-r3.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..f79f167b79a6
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pcmcia"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcmcia"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index 2ff4601049ee..d47f0ee873e3 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pcscd-2.20170204-r1.ebuild 282 BLAKE2B 6bb31e933150f113ab1c131b481e228df439c7d8558b2f1ef848490a8717d394e72e8d39b4d75ab281a602cf28ecd7b0b612c4a6f710ed9b6f4b5d91057af1db SHA512 2023a44c06bb74372315b55bb48e3cc4630542cc2721d5c0e7ba8392a3d99a07f58c689776c342e100c4f2f108dc4dc5e72cc15176187fbb52bc35972065a1b2
-EBUILD selinux-pcscd-2.20170204-r2.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb0a3894a741ee2dd6538e3c13f1d85634529760cd151b0edf2fb041700e3aac4e2f3942ae2d7277128d2829d9b62c26aaea6855 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253
-EBUILD selinux-pcscd-2.20170204-r3.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb0a3894a741ee2dd6538e3c13f1d85634529760cd151b0edf2fb041700e3aac4e2f3942ae2d7277128d2829d9b62c26aaea6855 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253
-EBUILD selinux-pcscd-2.20170204-r4.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb0a3894a741ee2dd6538e3c13f1d85634529760cd151b0edf2fb041700e3aac4e2f3942ae2d7277128d2829d9b62c26aaea6855 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253
 EBUILD selinux-pcscd-2.20170805-r2.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb0a3894a741ee2dd6538e3c13f1d85634529760cd151b0edf2fb041700e3aac4e2f3942ae2d7277128d2829d9b62c26aaea6855 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253
 EBUILD selinux-pcscd-2.20170805-r3.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb0a3894a741ee2dd6538e3c13f1d85634529760cd151b0edf2fb041700e3aac4e2f3942ae2d7277128d2829d9b62c26aaea6855 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253
-EBUILD selinux-pcscd-2.20170805-r4.ebuild 282 BLAKE2B 6bb31e933150f113ab1c131b481e228df439c7d8558b2f1ef848490a8717d394e72e8d39b4d75ab281a602cf28ecd7b0b612c4a6f710ed9b6f4b5d91057af1db SHA512 2023a44c06bb74372315b55bb48e3cc4630542cc2721d5c0e7ba8392a3d99a07f58c689776c342e100c4f2f108dc4dc5e72cc15176187fbb52bc35972065a1b2
 EBUILD selinux-pcscd-2.20180114-r1.ebuild 280 BLAKE2B 3a6384e0ccc0e6425bd4829f6a17694d6bf8d6a94b0f1963989b0896ad17c3e26f3defaeddd28c3b5918e45e1eba2e64469cec3beeeb3e60482b17972d022a92 SHA512 e7463b34072f589a8d7910620dbad82a958ee6c4c85752883f2a4d201857bd912918c3da156f176e6cd7d6b9da5814e97016d0fbfbba3e1cf65ba93f15a690e4
 EBUILD selinux-pcscd-2.20180114-r2.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
+EBUILD selinux-pcscd-2.20180114-r3.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
 EBUILD selinux-pcscd-9999.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
 MISC metadata.xml 315 BLAKE2B ecff7b2e5046a9d47a71a286d57f8cfae05d578c284f0a93508b2ac6e36695123b1ec98836fc1daee2020976f7163a3651be97ef6453347c11e4ce6733648195 SHA512 07d74c79dedc7fa7d45e23d019551a2358b69c08b1ff86a22bd8b41068c33a951520e21563844bf75f9fa0b9e966c41d91ad834a6ecbdc2293f210fc45091566
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r1.ebuild
deleted file mode 100644
index 494fe7d84678..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r2.ebuild
deleted file mode 100644
index d7bd020019d8..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r3.ebuild
deleted file mode 100644
index d7bd020019d8..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r4.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r4.ebuild
deleted file mode 100644
index d7bd020019d8..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r4.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r4.ebuild
deleted file mode 100644
index 494fe7d84678..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20180114-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..989d82a295c7
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pcscd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcscd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
index da579ea5195a..5404e0de6a17 100644
--- a/sec-policy/selinux-perdition/Manifest
+++ b/sec-policy/selinux-perdition/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-perdition-2.20170204-r1.ebuild 290 BLAKE2B 46eca07d6cd1e091637dcc476a5786ad4d01ae1e9d482e8e5d434289fa36bb66911a7c00f6bbbcffba93df711f391837fa1397a6e4d7a00b67dee22ccc63ca92 SHA512 b36946cce789a242068b4181059ab1ad0c95575f34dee5f6373f65c0efbcd6f962fe53ab0b3e8f793d01564e20fee856c39354e6f947c9bc77a526a1808ed32b
-EBUILD selinux-perdition-2.20170204-r2.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb900c2df089a205c11400d0e1a378d0536ca1538d7aebfa7a6c7700b0e83008297a3d1f55cfdc20718dc7371d441266a1242375f707 SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85
-EBUILD selinux-perdition-2.20170204-r3.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb900c2df089a205c11400d0e1a378d0536ca1538d7aebfa7a6c7700b0e83008297a3d1f55cfdc20718dc7371d441266a1242375f707 SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85
-EBUILD selinux-perdition-2.20170204-r4.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb900c2df089a205c11400d0e1a378d0536ca1538d7aebfa7a6c7700b0e83008297a3d1f55cfdc20718dc7371d441266a1242375f707 SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85
 EBUILD selinux-perdition-2.20170805-r2.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb900c2df089a205c11400d0e1a378d0536ca1538d7aebfa7a6c7700b0e83008297a3d1f55cfdc20718dc7371d441266a1242375f707 SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85
 EBUILD selinux-perdition-2.20170805-r3.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb900c2df089a205c11400d0e1a378d0536ca1538d7aebfa7a6c7700b0e83008297a3d1f55cfdc20718dc7371d441266a1242375f707 SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85
-EBUILD selinux-perdition-2.20170805-r4.ebuild 290 BLAKE2B 46eca07d6cd1e091637dcc476a5786ad4d01ae1e9d482e8e5d434289fa36bb66911a7c00f6bbbcffba93df711f391837fa1397a6e4d7a00b67dee22ccc63ca92 SHA512 b36946cce789a242068b4181059ab1ad0c95575f34dee5f6373f65c0efbcd6f962fe53ab0b3e8f793d01564e20fee856c39354e6f947c9bc77a526a1808ed32b
 EBUILD selinux-perdition-2.20180114-r1.ebuild 288 BLAKE2B d8f1fdf63ea6846f2936bfb2c41a9505e5b4cc226901a36319f49d70b747e04ab738dcbaab53759e5cf49351c87885000bc4f71aeb65d2199818ac096ac91254 SHA512 9df1a7fd1d48f1c56e432e84e14eb3083b781861a81c479ad3ea05d919628939253a69d145d640499fb4cddb8464ba962a6beaacd5e2d8afd4522fc9b88d5fe2
 EBUILD selinux-perdition-2.20180114-r2.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
+EBUILD selinux-perdition-2.20180114-r3.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
 EBUILD selinux-perdition-9999.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
 MISC metadata.xml 319 BLAKE2B 5f81c14cad4ee37a46611e0955e94fdf96b7f908006816cc7c7416aedd4cc9e9ee5b15c7f25a0ed355d5797d57f7a7d50ce9512417c9c5ce9056f81ef77f53b6 SHA512 7857badc182ef47415327b8560a32dcf20284532b2c1123cf4b0ce6d4cc3f2d2dfda7b03f6125694d709160ff4a7e54398c381fb49e2215340e419ee360ae605
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r1.ebuild
deleted file mode 100644
index 5e3f0a2e7714..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r2.ebuild
deleted file mode 100644
index e66923075b91..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r3.ebuild
deleted file mode 100644
index e66923075b91..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r4.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r4.ebuild
deleted file mode 100644
index e66923075b91..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r4.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r4.ebuild
deleted file mode 100644
index 5e3f0a2e7714..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..d84c6e5b0da8
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="perdition"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for perdition"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 0c01fb99f430..1277f0fbcbef 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-phpfpm-2.20170204-r1.ebuild 380 BLAKE2B 1d5b876774bf0e37e76a370a44fa5bfe0290d1f706163526d5337342d8a1e38eb54adcc7752609df275f9003c191a25523c9c981edfc85f3ef29320b108b7264 SHA512 4a97b337e4cab7acc28b9825bb3ea956823b8acd69c3c9178c65d18c325c801c31e59bae97ff487fc322645288a8b8b2decad58a483ef6fd38d1e8f8cd9d075e
-EBUILD selinux-phpfpm-2.20170204-r2.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82f3d4d5e3a41511c5ce66074d41180d6189df0cf0d962bd79ea4cd338c72f4e5a296cca599ddc22ee86dcea8037c7f0a4d99a454 SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac
-EBUILD selinux-phpfpm-2.20170204-r3.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82f3d4d5e3a41511c5ce66074d41180d6189df0cf0d962bd79ea4cd338c72f4e5a296cca599ddc22ee86dcea8037c7f0a4d99a454 SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac
-EBUILD selinux-phpfpm-2.20170204-r4.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82f3d4d5e3a41511c5ce66074d41180d6189df0cf0d962bd79ea4cd338c72f4e5a296cca599ddc22ee86dcea8037c7f0a4d99a454 SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac
 EBUILD selinux-phpfpm-2.20170805-r2.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82f3d4d5e3a41511c5ce66074d41180d6189df0cf0d962bd79ea4cd338c72f4e5a296cca599ddc22ee86dcea8037c7f0a4d99a454 SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac
 EBUILD selinux-phpfpm-2.20170805-r3.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82f3d4d5e3a41511c5ce66074d41180d6189df0cf0d962bd79ea4cd338c72f4e5a296cca599ddc22ee86dcea8037c7f0a4d99a454 SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac
-EBUILD selinux-phpfpm-2.20170805-r4.ebuild 380 BLAKE2B 1d5b876774bf0e37e76a370a44fa5bfe0290d1f706163526d5337342d8a1e38eb54adcc7752609df275f9003c191a25523c9c981edfc85f3ef29320b108b7264 SHA512 4a97b337e4cab7acc28b9825bb3ea956823b8acd69c3c9178c65d18c325c801c31e59bae97ff487fc322645288a8b8b2decad58a483ef6fd38d1e8f8cd9d075e
 EBUILD selinux-phpfpm-2.20180114-r1.ebuild 378 BLAKE2B 1ee2960b59f4859f12d451e004649a0b32b95408e57bb2811896dae8529c7a551ce79ff427eaa0bedc134608ef88280c22e729509362d78e9cf814bb8c1ea738 SHA512 0b6cded271592617ad5d8f552f8a55be91af3adf80cf7713b305d7c2c43eacbb3af40f601d41000f718e1b40767665ba95d893a24ed8a4befd2537e6b102e40e
 EBUILD selinux-phpfpm-2.20180114-r2.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
+EBUILD selinux-phpfpm-2.20180114-r3.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
 EBUILD selinux-phpfpm-9999.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
 MISC metadata.xml 316 BLAKE2B 491ffb7eba4985bada61e934b968c15e8eaa6bb358065a9eaa02e9d637c9f6fa5db6cbac130b5c00cc16ebd9d867082c7d734923f932132a9e6ac6c015f452df SHA512 9e18c465be0429fc172b0f8636488175749a69d8066deca7c00bd7d456b12ba9beb1c115fc1468add61c4d34863aa617d1710372a4c75f0f3ba66e3e9265e242
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r1.ebuild
deleted file mode 100644
index 8e7706cdf177..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r2.ebuild
deleted file mode 100644
index fc156736d5cf..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r3.ebuild
deleted file mode 100644
index fc156736d5cf..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r4.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r4.ebuild
deleted file mode 100644
index fc156736d5cf..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r4.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r4.ebuild
deleted file mode 100644
index 8e7706cdf177..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180114-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..34cea65b1a0c
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="phpfpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 97f722be59a3..10841638cdba 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-plymouthd-2.20170204-r1.ebuild 290 BLAKE2B cc2b7660eea14d4df74666992a679fab40c0dd04de1b65ad95c4afe82dae3de107c74058da28b2624e3ed12d66f586031065388f5d9d2d03bd6a3a0049d265ec SHA512 9bc1a5a50f57360af52f83fe8ebb8bffa2e0b94b88ef54992324211693207a9849755f7202dce5a0b50e309868870a6fc25f04a409e4895b23d71f864b154a36
-EBUILD selinux-plymouthd-2.20170204-r2.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505c554b6a062c53c1832b44033175f53a319a65ba47ad9a3878af682bf6279f362687b97200ffe12c29d8ef306add5d4adda78970cfe SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf
-EBUILD selinux-plymouthd-2.20170204-r3.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505c554b6a062c53c1832b44033175f53a319a65ba47ad9a3878af682bf6279f362687b97200ffe12c29d8ef306add5d4adda78970cfe SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf
-EBUILD selinux-plymouthd-2.20170204-r4.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505c554b6a062c53c1832b44033175f53a319a65ba47ad9a3878af682bf6279f362687b97200ffe12c29d8ef306add5d4adda78970cfe SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf
 EBUILD selinux-plymouthd-2.20170805-r2.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505c554b6a062c53c1832b44033175f53a319a65ba47ad9a3878af682bf6279f362687b97200ffe12c29d8ef306add5d4adda78970cfe SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf
 EBUILD selinux-plymouthd-2.20170805-r3.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505c554b6a062c53c1832b44033175f53a319a65ba47ad9a3878af682bf6279f362687b97200ffe12c29d8ef306add5d4adda78970cfe SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf
-EBUILD selinux-plymouthd-2.20170805-r4.ebuild 290 BLAKE2B cc2b7660eea14d4df74666992a679fab40c0dd04de1b65ad95c4afe82dae3de107c74058da28b2624e3ed12d66f586031065388f5d9d2d03bd6a3a0049d265ec SHA512 9bc1a5a50f57360af52f83fe8ebb8bffa2e0b94b88ef54992324211693207a9849755f7202dce5a0b50e309868870a6fc25f04a409e4895b23d71f864b154a36
 EBUILD selinux-plymouthd-2.20180114-r1.ebuild 288 BLAKE2B fcaf7da46081233346a42a7e428800594a1b0e89552cca0410ebafa7e5a5a8d0be271d078792a1077e6acdf629cb5cb97117b20fea03e94188c2a141d3d05c67 SHA512 fca637f699222b6c88ea53e6c062061ec82c68aa4a0a88449dd2b489fc7cc48739dc5ccdedec3af5f20e9707d45ea6f66be8adae55d066fc896f7c1b2632851b
 EBUILD selinux-plymouthd-2.20180114-r2.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
+EBUILD selinux-plymouthd-2.20180114-r3.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
 EBUILD selinux-plymouthd-9999.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
 MISC metadata.xml 319 BLAKE2B c640f4703f9a4a02cb667d7bf67ebc0806f4c50d5f0dff51bd02af057b475fd2f795f06682fdcbbc8aafc3216b7a2c649f19dc6e5f3182bb8bd1c87df6ee1c9b SHA512 ec3d23e23f563f0ed5979e38b0809c54b5ac69e831934a5078cf9c8ca6dd4fd88570f53be750f1e0330d917129dce6b636dd6d3f17c23daa42e08b4a1e1979a0
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r1.ebuild
deleted file mode 100644
index f9b5a3ae0830..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r2.ebuild
deleted file mode 100644
index 4e3c8f552158..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r3.ebuild
deleted file mode 100644
index 4e3c8f552158..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r4.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r4.ebuild
deleted file mode 100644
index 4e3c8f552158..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r4.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r4.ebuild
deleted file mode 100644
index f9b5a3ae0830..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180114-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..241f5416f25e
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="plymouthd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index 91ba9564dd14..17ba8c440411 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-podsleuth-2.20170204-r1.ebuild 290 BLAKE2B f7aafec9e3c07f08a90822d85d371092de54d13ddd5aa70e1aba488befc6bae78ca1851f57fc307059136e53a16903dc1168636a2e511edc0b4976d13459b490 SHA512 d071cba7b2d5f03188e1adee57f4e10bbf684d480fb1bb5e91a751427ef63ced0d1a38e5379c1c761e43da870be2c1455f8d97d731e8a8f9b784e822342b9046
-EBUILD selinux-podsleuth-2.20170204-r2.ebuild 288 BLAKE2B f335ead531b4c1434a51c324eb82244699caaa0e70fd3b90113149f3d747d2fbd4bf2da7d40146ae867d20a915023ba22a8973ddb7fd7bc13f2e6b868935e7f1 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf
-EBUILD selinux-podsleuth-2.20170204-r3.ebuild 288 BLAKE2B f335ead531b4c1434a51c324eb82244699caaa0e70fd3b90113149f3d747d2fbd4bf2da7d40146ae867d20a915023ba22a8973ddb7fd7bc13f2e6b868935e7f1 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf
-EBUILD selinux-podsleuth-2.20170204-r4.ebuild 288 BLAKE2B f335ead531b4c1434a51c324eb82244699caaa0e70fd3b90113149f3d747d2fbd4bf2da7d40146ae867d20a915023ba22a8973ddb7fd7bc13f2e6b868935e7f1 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf
 EBUILD selinux-podsleuth-2.20170805-r2.ebuild 288 BLAKE2B f335ead531b4c1434a51c324eb82244699caaa0e70fd3b90113149f3d747d2fbd4bf2da7d40146ae867d20a915023ba22a8973ddb7fd7bc13f2e6b868935e7f1 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf
 EBUILD selinux-podsleuth-2.20170805-r3.ebuild 288 BLAKE2B f335ead531b4c1434a51c324eb82244699caaa0e70fd3b90113149f3d747d2fbd4bf2da7d40146ae867d20a915023ba22a8973ddb7fd7bc13f2e6b868935e7f1 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf
-EBUILD selinux-podsleuth-2.20170805-r4.ebuild 290 BLAKE2B f7aafec9e3c07f08a90822d85d371092de54d13ddd5aa70e1aba488befc6bae78ca1851f57fc307059136e53a16903dc1168636a2e511edc0b4976d13459b490 SHA512 d071cba7b2d5f03188e1adee57f4e10bbf684d480fb1bb5e91a751427ef63ced0d1a38e5379c1c761e43da870be2c1455f8d97d731e8a8f9b784e822342b9046
 EBUILD selinux-podsleuth-2.20180114-r1.ebuild 288 BLAKE2B 1aa8898a2804f83c8bd4867e508c9f5a3dc26deac8f378498fa544c1d6c1a6b65fddf6996e0f5379137f7afacc3e5ed29072fed6393844eff2e2f308cdcbb021 SHA512 6dd6e1e064d366886d78a8042f4c0a17e4ae56cbbdb5014b4847943b752067c9b4002f7639222653b934589b1c015e58224c8f6ba32ee8d0a27f6ff9d89221ca
 EBUILD selinux-podsleuth-2.20180114-r2.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
+EBUILD selinux-podsleuth-2.20180114-r3.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
 EBUILD selinux-podsleuth-9999.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
 MISC metadata.xml 319 BLAKE2B 6b1ef1db3cd6c566b2c7197e1372c95ac3cb61b1e051337532db604bc38458eff42cbb5c2e1056fd7e2d260682559e6deeae7b4f8949a0fb0d0142a35d0596a4 SHA512 1f97d533c42cf5a869d2ab25691faee9f3b08b2eccedaf36b14e1e3097dee240dc689bacc980f3d6dec3366041bbb83aa0a23c9c33be132334b8f3262868e7db
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r1.ebuild
deleted file mode 100644
index 302379b6be20..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r2.ebuild
deleted file mode 100644
index baa6c77f1dee..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r3.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r3.ebuild
deleted file mode 100644
index baa6c77f1dee..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r4.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r4.ebuild
deleted file mode 100644
index baa6c77f1dee..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r4.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r4.ebuild
deleted file mode 100644
index 302379b6be20..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180114-r3.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..f17b187cb320
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="podsleuth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podsleuth"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index b790701cd43c..81dac0e176cd 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-policykit-2.20170204-r1.ebuild 290 BLAKE2B 874ede9a95d68ac01ce4e09111bfe8286ff19ed40569687989c2816d277114e8454bea7c48b1d90391cfe47594072946407266b5559356796238bb16ef7556e8 SHA512 51197b2d15bb950585c2a5acce28a762bcc31af2f909c2865236fadffd22d7aa66b57a2c351bc6f49e065e2c4c7a673ecb17b32a1e9c541e04f005f4005b05ff
-EBUILD selinux-policykit-2.20170204-r2.ebuild 288 BLAKE2B a75c4569762576f45a94a24bb59cc2088883d2286b0cd387fa71a0550425eec234ae576d248f0380dce8ce783b646e0e8de29ca79f08dd7a91bdfd4ec9a6f5b7 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21
-EBUILD selinux-policykit-2.20170204-r3.ebuild 288 BLAKE2B a75c4569762576f45a94a24bb59cc2088883d2286b0cd387fa71a0550425eec234ae576d248f0380dce8ce783b646e0e8de29ca79f08dd7a91bdfd4ec9a6f5b7 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21
-EBUILD selinux-policykit-2.20170204-r4.ebuild 288 BLAKE2B a75c4569762576f45a94a24bb59cc2088883d2286b0cd387fa71a0550425eec234ae576d248f0380dce8ce783b646e0e8de29ca79f08dd7a91bdfd4ec9a6f5b7 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21
 EBUILD selinux-policykit-2.20170805-r2.ebuild 288 BLAKE2B a75c4569762576f45a94a24bb59cc2088883d2286b0cd387fa71a0550425eec234ae576d248f0380dce8ce783b646e0e8de29ca79f08dd7a91bdfd4ec9a6f5b7 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21
 EBUILD selinux-policykit-2.20170805-r3.ebuild 288 BLAKE2B a75c4569762576f45a94a24bb59cc2088883d2286b0cd387fa71a0550425eec234ae576d248f0380dce8ce783b646e0e8de29ca79f08dd7a91bdfd4ec9a6f5b7 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21
-EBUILD selinux-policykit-2.20170805-r4.ebuild 290 BLAKE2B 874ede9a95d68ac01ce4e09111bfe8286ff19ed40569687989c2816d277114e8454bea7c48b1d90391cfe47594072946407266b5559356796238bb16ef7556e8 SHA512 51197b2d15bb950585c2a5acce28a762bcc31af2f909c2865236fadffd22d7aa66b57a2c351bc6f49e065e2c4c7a673ecb17b32a1e9c541e04f005f4005b05ff
 EBUILD selinux-policykit-2.20180114-r1.ebuild 288 BLAKE2B 1509b2dcc7deaef6f2f4bbe679090f871203b89a994b1e2480ff7ca66e232b46ce298638e206c0a787c9ce83144e2ace9642771e098eeaf0da9d59ceb4ca8125 SHA512 9546c4362a4bd4e23c717f929df5a25d7cc2aeebb8ac7eaee4116c1c5ded9951e4985469b3a4a451751cd03cad9a3a16b1b47e84491f72df744b9f176c241c75
 EBUILD selinux-policykit-2.20180114-r2.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
+EBUILD selinux-policykit-2.20180114-r3.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
 EBUILD selinux-policykit-9999.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
 MISC metadata.xml 319 BLAKE2B 61b04c742d6106be38db5c1f5abed362c49c2aeb7bfeb97d3a7b0fe14fefb576a931c44baec61d0f97861554697f9b6d712e68b6c5cd77d1adf4816dd4f443dd SHA512 f12d584c6a1bb11eac0e6e282989f90b0ce0e660afa5097cc667f7a3686378a16030f1dc1adb62ff3035df60f53e3c8c49167ada253688c5d7198a3cddb9ae55
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r1.ebuild
deleted file mode 100644
index 0d7dc409996d..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r2.ebuild
deleted file mode 100644
index 89e77cc4f8e7..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r3.ebuild
deleted file mode 100644
index 89e77cc4f8e7..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r4.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r4.ebuild
deleted file mode 100644
index 89e77cc4f8e7..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r4.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r4.ebuild
deleted file mode 100644
index 0d7dc409996d..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20180114-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..63984df43a0b
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="policykit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for policykit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 860e17c040a4..981878d76c25 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-portmap-2.20170204-r1.ebuild 286 BLAKE2B 0edf3249003e33bc96ae7ad156d8d119afabe417d492ce77289c85cbb5f07d66d4a2e82241f346fcd7d6441f8f5c5cb638cfd616c1f17ec9e6945696fe968146 SHA512 77d108dc130386a7f611bfe06eeeb2a2bc1fb6d056caef65a73be982b9585eeab29b1efbb91de817472ad86d777fe52ace08b528eed3c3427f3082a5bef70a30
-EBUILD selinux-portmap-2.20170204-r2.ebuild 284 BLAKE2B 3e431ee50184d37b4786164aa316630683304780150f8113fff6cd676cfcc6d063e14d2707216affee613d433d9a3d3b1250f484ce52d2cf58c6391049c8c7a0 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615
-EBUILD selinux-portmap-2.20170204-r3.ebuild 284 BLAKE2B 3e431ee50184d37b4786164aa316630683304780150f8113fff6cd676cfcc6d063e14d2707216affee613d433d9a3d3b1250f484ce52d2cf58c6391049c8c7a0 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615
-EBUILD selinux-portmap-2.20170204-r4.ebuild 284 BLAKE2B 3e431ee50184d37b4786164aa316630683304780150f8113fff6cd676cfcc6d063e14d2707216affee613d433d9a3d3b1250f484ce52d2cf58c6391049c8c7a0 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615
 EBUILD selinux-portmap-2.20170805-r2.ebuild 284 BLAKE2B 3e431ee50184d37b4786164aa316630683304780150f8113fff6cd676cfcc6d063e14d2707216affee613d433d9a3d3b1250f484ce52d2cf58c6391049c8c7a0 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615
 EBUILD selinux-portmap-2.20170805-r3.ebuild 284 BLAKE2B 3e431ee50184d37b4786164aa316630683304780150f8113fff6cd676cfcc6d063e14d2707216affee613d433d9a3d3b1250f484ce52d2cf58c6391049c8c7a0 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615
-EBUILD selinux-portmap-2.20170805-r4.ebuild 286 BLAKE2B 0edf3249003e33bc96ae7ad156d8d119afabe417d492ce77289c85cbb5f07d66d4a2e82241f346fcd7d6441f8f5c5cb638cfd616c1f17ec9e6945696fe968146 SHA512 77d108dc130386a7f611bfe06eeeb2a2bc1fb6d056caef65a73be982b9585eeab29b1efbb91de817472ad86d777fe52ace08b528eed3c3427f3082a5bef70a30
 EBUILD selinux-portmap-2.20180114-r1.ebuild 284 BLAKE2B b23b637cfb66946667c0238663ff7390482ccaad551fd0fa289a3277ec6a75502e730a411b1c5fc66723ab0a4b11062d4fe44f8d49cab777b50fe820f5bebba8 SHA512 f549f8f54445325229f2b8443366aa1ff7eb2ae8a1b331bba7e0213a323a7d5ad0bdc9ce832f29c4cbd86459decbc3047eae38f5e8282e0ca2689456aaed616a
 EBUILD selinux-portmap-2.20180114-r2.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
+EBUILD selinux-portmap-2.20180114-r3.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
 EBUILD selinux-portmap-9999.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
 MISC metadata.xml 317 BLAKE2B 019b066f537fe5be713e1ce41f21856ff7b00dbfb3c4b9b11b964921c18ef8cd5be215641e0bf48b063444df71fdc9323a645f528bba61e7a093a086711e5558 SHA512 6d0fb959a90af947b760a5e5ab8895ba2e19538e516bff45e9f83625a405b442c04773c1c8e738b0af9f7c7dab257627bae490426861a70170fbaf47c1761526
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r1.ebuild
deleted file mode 100644
index 488ef18d25d7..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r2.ebuild
deleted file mode 100644
index 82ee01f0fd00..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r3.ebuild
deleted file mode 100644
index 82ee01f0fd00..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r4.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r4.ebuild
deleted file mode 100644
index 82ee01f0fd00..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r4.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r4.ebuild
deleted file mode 100644
index 488ef18d25d7..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20180114-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a62eeb9cf4c3
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="portmap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for portmap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index ba220fe6cdcc..bdccaa35fd9f 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-postfix-2.20170204-r1.ebuild 286 BLAKE2B 79cd268ccb1c9dd7c6b04a73b4d6b06c94adbdf2061f8ca794becac7a066ee04793a5ab9293acf155ef852327a1a110e7828923d3179c9d3a0b167acece24128 SHA512 46bfe088df5279da8e97ff22d9a4607f5a607e8fac1b1db483ca40d6d0686d768210d117335e16b2ac0a7a4d7fdb2158bc0180f49f59fe3b4ed7def85ac7da31
-EBUILD selinux-postfix-2.20170204-r2.ebuild 284 BLAKE2B b6e847f12f23d522902c5f160029fef6dab2abd362a43bb34c43ca204ed403e020b0e298fb2f19f5642752d676bcace15cea140c60c1e32adf493d406e8c55ca SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6
-EBUILD selinux-postfix-2.20170204-r3.ebuild 284 BLAKE2B b6e847f12f23d522902c5f160029fef6dab2abd362a43bb34c43ca204ed403e020b0e298fb2f19f5642752d676bcace15cea140c60c1e32adf493d406e8c55ca SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6
-EBUILD selinux-postfix-2.20170204-r4.ebuild 284 BLAKE2B b6e847f12f23d522902c5f160029fef6dab2abd362a43bb34c43ca204ed403e020b0e298fb2f19f5642752d676bcace15cea140c60c1e32adf493d406e8c55ca SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6
 EBUILD selinux-postfix-2.20170805-r2.ebuild 284 BLAKE2B b6e847f12f23d522902c5f160029fef6dab2abd362a43bb34c43ca204ed403e020b0e298fb2f19f5642752d676bcace15cea140c60c1e32adf493d406e8c55ca SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6
 EBUILD selinux-postfix-2.20170805-r3.ebuild 284 BLAKE2B b6e847f12f23d522902c5f160029fef6dab2abd362a43bb34c43ca204ed403e020b0e298fb2f19f5642752d676bcace15cea140c60c1e32adf493d406e8c55ca SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6
-EBUILD selinux-postfix-2.20170805-r4.ebuild 286 BLAKE2B 79cd268ccb1c9dd7c6b04a73b4d6b06c94adbdf2061f8ca794becac7a066ee04793a5ab9293acf155ef852327a1a110e7828923d3179c9d3a0b167acece24128 SHA512 46bfe088df5279da8e97ff22d9a4607f5a607e8fac1b1db483ca40d6d0686d768210d117335e16b2ac0a7a4d7fdb2158bc0180f49f59fe3b4ed7def85ac7da31
 EBUILD selinux-postfix-2.20180114-r1.ebuild 284 BLAKE2B 60125d89fd0832e53535e6c80a41028cc7fa53157342f834859ded531d7302545dd39d769b0c346f51ddf72432311a3ecbccb5e3d61f364543d5e19cb4b912e7 SHA512 34cefe47bbce4daf87c3b56f9e72d1b743b8fc6fe3a86aa45969fffcf7020aa89b8d644a60ed6a41685419428cef18ab6a8d5a70b837bf6b82452eea37fa6199
 EBUILD selinux-postfix-2.20180114-r2.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
+EBUILD selinux-postfix-2.20180114-r3.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
 EBUILD selinux-postfix-9999.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
 MISC metadata.xml 317 BLAKE2B bc62377144bd61efc49ad850d68d9b3a178767b8f5e3732a9269370980615ccc3c17432b8b241c44cabafb9d9e92122b4be11146df128bc244226b8c53ed5b37 SHA512 7109989e6380231647aaf248be3bf2fd619859ae42bf0e271ef1de45b9b663e804988c03993b18502110d86d58d35bc265c3a59e03bd3484cffe6d8f29a3e9c1
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r1.ebuild
deleted file mode 100644
index 00c6d47db3c2..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r2.ebuild
deleted file mode 100644
index d80d82971876..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r3.ebuild
deleted file mode 100644
index d80d82971876..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r4.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r4.ebuild
deleted file mode 100644
index d80d82971876..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r4.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r4.ebuild
deleted file mode 100644
index 00c6d47db3c2..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20180114-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c921b4c1e505
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postfix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postfix"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index b91f09821265..79e35a1e1ee7 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-postgresql-2.20170204-r1.ebuild 292 BLAKE2B ce9de3c13e5d2b8f86470c4d7a0116ce9366f37f81e99254b40ddcc77d0d20885f4720622243e5ac6a3d21ba34344e7ea50d89bddb9f2d017ea0a6b41507cfab SHA512 9821c318ac8386b57223a015dacce399ce4e71feb807574cfa6038a9effb1ffdc4e36a8bbe0c87059e2b85b4f00623ce9a8ccf137036c917c63339e7d95be058
-EBUILD selinux-postgresql-2.20170204-r2.ebuild 290 BLAKE2B 29abdd6b340016f21538bb26590d8e67ec501c3dd5c27a30200bd2193e70ca3d482b7b7178497d2022b406dce3e721fba53179daf4ba0ce6d158c6acbecfbd97 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35
-EBUILD selinux-postgresql-2.20170204-r3.ebuild 290 BLAKE2B 29abdd6b340016f21538bb26590d8e67ec501c3dd5c27a30200bd2193e70ca3d482b7b7178497d2022b406dce3e721fba53179daf4ba0ce6d158c6acbecfbd97 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35
-EBUILD selinux-postgresql-2.20170204-r4.ebuild 290 BLAKE2B 29abdd6b340016f21538bb26590d8e67ec501c3dd5c27a30200bd2193e70ca3d482b7b7178497d2022b406dce3e721fba53179daf4ba0ce6d158c6acbecfbd97 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35
 EBUILD selinux-postgresql-2.20170805-r2.ebuild 290 BLAKE2B 29abdd6b340016f21538bb26590d8e67ec501c3dd5c27a30200bd2193e70ca3d482b7b7178497d2022b406dce3e721fba53179daf4ba0ce6d158c6acbecfbd97 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35
 EBUILD selinux-postgresql-2.20170805-r3.ebuild 290 BLAKE2B 29abdd6b340016f21538bb26590d8e67ec501c3dd5c27a30200bd2193e70ca3d482b7b7178497d2022b406dce3e721fba53179daf4ba0ce6d158c6acbecfbd97 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35
-EBUILD selinux-postgresql-2.20170805-r4.ebuild 292 BLAKE2B ce9de3c13e5d2b8f86470c4d7a0116ce9366f37f81e99254b40ddcc77d0d20885f4720622243e5ac6a3d21ba34344e7ea50d89bddb9f2d017ea0a6b41507cfab SHA512 9821c318ac8386b57223a015dacce399ce4e71feb807574cfa6038a9effb1ffdc4e36a8bbe0c87059e2b85b4f00623ce9a8ccf137036c917c63339e7d95be058
 EBUILD selinux-postgresql-2.20180114-r1.ebuild 290 BLAKE2B 3851635b36293bb26057a8280274b36d55474273db35502d8b6eb56c05d63cbd9bf195b528d57a3615d6b015c7ce4071f21847d5f4566c98d2c08c65166c59cd SHA512 a25b7b88126fd9449db2998bbfc39fa9609922671b61a60c5f086923afe674a55275420704375143c2098b8b7e963e6e9576f5e2fef6785fca7ea819dafa990e
 EBUILD selinux-postgresql-2.20180114-r2.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
+EBUILD selinux-postgresql-2.20180114-r3.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
 EBUILD selinux-postgresql-9999.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
 MISC metadata.xml 320 BLAKE2B ef4a728b52983625b81115b7a19880b1f54d4144f46f06761620fa76e0c93c307b877c6d43322c91ed826ef5455b63e2e8a723fa5fb026695dbc3c5240c56b12 SHA512 00365c82e7ac0b2cc9cfeeb766acd22e5000f1146cee207bd7df897b560590c9a7ddfde7f4ce0d4f5f535125a29137355cdd2415ad6fd4def67535e112990853
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r1.ebuild
deleted file mode 100644
index 6c31791b6846..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r2.ebuild
deleted file mode 100644
index a1f50973b366..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r3.ebuild
deleted file mode 100644
index a1f50973b366..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r4.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r4.ebuild
deleted file mode 100644
index a1f50973b366..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r4.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r4.ebuild
deleted file mode 100644
index 6c31791b6846..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20180114-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ccdfdb169305
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postgresql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgresql"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index bcea08f833e1..e3743c02f78f 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-postgrey-2.20170204-r1.ebuild 288 BLAKE2B 979923106aaa4287226763cefcb5f061fdff7b4003a0ae4c267dc44558a5d26dda4eaf2a0577cfd6e2ac27a8acfb5a1b796f335c421d7dd693cdcac903e53168 SHA512 06bde822722d217eab7d77cf09c78961a185ba9c7e012c5115f8b221b3c18eafe8816396e5fdcabc1dfcf4411a2ffe0a42ddafc6ad67a9b1884d42d489c794b0
-EBUILD selinux-postgrey-2.20170204-r2.ebuild 286 BLAKE2B 509b406659c150d7ae94d23357174ba6462f40ddf1793477f94c2644087b668360110c5eb7ca716cf671a9d4653e1bbdb04d49d37d0a36f4b0e0922b33d3f358 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178
-EBUILD selinux-postgrey-2.20170204-r3.ebuild 286 BLAKE2B 509b406659c150d7ae94d23357174ba6462f40ddf1793477f94c2644087b668360110c5eb7ca716cf671a9d4653e1bbdb04d49d37d0a36f4b0e0922b33d3f358 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178
-EBUILD selinux-postgrey-2.20170204-r4.ebuild 286 BLAKE2B 509b406659c150d7ae94d23357174ba6462f40ddf1793477f94c2644087b668360110c5eb7ca716cf671a9d4653e1bbdb04d49d37d0a36f4b0e0922b33d3f358 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178
 EBUILD selinux-postgrey-2.20170805-r2.ebuild 286 BLAKE2B 509b406659c150d7ae94d23357174ba6462f40ddf1793477f94c2644087b668360110c5eb7ca716cf671a9d4653e1bbdb04d49d37d0a36f4b0e0922b33d3f358 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178
 EBUILD selinux-postgrey-2.20170805-r3.ebuild 286 BLAKE2B 509b406659c150d7ae94d23357174ba6462f40ddf1793477f94c2644087b668360110c5eb7ca716cf671a9d4653e1bbdb04d49d37d0a36f4b0e0922b33d3f358 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178
-EBUILD selinux-postgrey-2.20170805-r4.ebuild 288 BLAKE2B 979923106aaa4287226763cefcb5f061fdff7b4003a0ae4c267dc44558a5d26dda4eaf2a0577cfd6e2ac27a8acfb5a1b796f335c421d7dd693cdcac903e53168 SHA512 06bde822722d217eab7d77cf09c78961a185ba9c7e012c5115f8b221b3c18eafe8816396e5fdcabc1dfcf4411a2ffe0a42ddafc6ad67a9b1884d42d489c794b0
 EBUILD selinux-postgrey-2.20180114-r1.ebuild 286 BLAKE2B ab43a8a24b72280e42015afbaa403c32991bf7a455b971102c501f66879e0cd1f5c53fb32b7d27a33f49e09d08cd931303f115e3a75245d3e23e262bced1bce1 SHA512 cf183d6cb3dd9db3ca43dbcbb2a159a39c9bb29e21ed656545d6db6a5b3495ead33b395309d0184c1eb5b559f29afd2f393bada6dad76fcb4677f05e32b078b7
 EBUILD selinux-postgrey-2.20180114-r2.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
+EBUILD selinux-postgrey-2.20180114-r3.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
 EBUILD selinux-postgrey-9999.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
 MISC metadata.xml 318 BLAKE2B c3c0c371099e41034efe77018016eac5506cf25b5cb3b03f5f5bf171186a73df923b9641df09c55bbf178227a95ef4dd3ba6b3beef2eaf4cbce93eb4f033192f SHA512 03a6f16ebf3c2f2cfe4c417434cc56007ca5df669d76ca93aacfe30a74b6bb8e6d269ef0b9eb4e96b85d638b266b5839c8713ef1be4e8925417a5004ed0d7c19
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r1.ebuild
deleted file mode 100644
index 4f70a25a4dd2..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r2.ebuild
deleted file mode 100644
index db1666610044..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r3.ebuild
deleted file mode 100644
index db1666610044..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r4.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r4.ebuild
deleted file mode 100644
index db1666610044..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r4.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r4.ebuild
deleted file mode 100644
index 4f70a25a4dd2..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20180114-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a5da0c400ac3
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postgrey"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgrey"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index 7fc6b650062f..37fb9d22f788 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ppp-2.20170204-r1.ebuild 278 BLAKE2B cb80bb2479bf481752bfacd97ba37e3742a9faa53bd93166a349cbc6c075a332f17d4dcf27050d65c4a31195c81c89868649f03b6e2142898d017c164dc371d9 SHA512 9f8bdd984b1b1b4531c70ca1aea89fa811635f13f1bcde0aeae17446bce75dfd4e9bee05267a927cc39fa94df05570fc22779c1ba032b8bb5d8c82f2b08645fc
-EBUILD selinux-ppp-2.20170204-r2.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490aaf7cc16a16fb82d7d2bb1a92b3f454e31005ac84f1fe73a290b66db52e98ff1cc7bfa0f0264773082e0c79373f28cbfbe3ca SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa
-EBUILD selinux-ppp-2.20170204-r3.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490aaf7cc16a16fb82d7d2bb1a92b3f454e31005ac84f1fe73a290b66db52e98ff1cc7bfa0f0264773082e0c79373f28cbfbe3ca SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa
-EBUILD selinux-ppp-2.20170204-r4.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490aaf7cc16a16fb82d7d2bb1a92b3f454e31005ac84f1fe73a290b66db52e98ff1cc7bfa0f0264773082e0c79373f28cbfbe3ca SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa
 EBUILD selinux-ppp-2.20170805-r2.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490aaf7cc16a16fb82d7d2bb1a92b3f454e31005ac84f1fe73a290b66db52e98ff1cc7bfa0f0264773082e0c79373f28cbfbe3ca SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa
 EBUILD selinux-ppp-2.20170805-r3.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490aaf7cc16a16fb82d7d2bb1a92b3f454e31005ac84f1fe73a290b66db52e98ff1cc7bfa0f0264773082e0c79373f28cbfbe3ca SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa
-EBUILD selinux-ppp-2.20170805-r4.ebuild 278 BLAKE2B cb80bb2479bf481752bfacd97ba37e3742a9faa53bd93166a349cbc6c075a332f17d4dcf27050d65c4a31195c81c89868649f03b6e2142898d017c164dc371d9 SHA512 9f8bdd984b1b1b4531c70ca1aea89fa811635f13f1bcde0aeae17446bce75dfd4e9bee05267a927cc39fa94df05570fc22779c1ba032b8bb5d8c82f2b08645fc
 EBUILD selinux-ppp-2.20180114-r1.ebuild 276 BLAKE2B 930b7453921d0d5b5fbce985736f7738281f16f8421fed10e6c00ddeb79970a6857d75f96d97c246ff0774801d780febc4a15eeff04ec8908b6d98a27c4bc623 SHA512 faed7e4c4e7876fa45d7528b80cf3b189fdb739f34549a181ba75669e1f7558d5176bf6b10b26b2261197323682f2bac832889fa7a993021dbc547170ee0bd2b
 EBUILD selinux-ppp-2.20180114-r2.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
+EBUILD selinux-ppp-2.20180114-r3.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
 EBUILD selinux-ppp-9999.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
 MISC metadata.xml 313 BLAKE2B 8dce03a7e86358b04a98c6f42367961c2fe621b0d8dd89551378a205218eec627d875c25b5ed2064813ca6012c608b077ab163acea43ed64e832839f553f3205 SHA512 f7b9c2a6b0c8aca070e0dbdd25fc506aa957b0a033f9cf3bef165f0c51a8d03c2c05e98a7c0712f27671c688b0e95aea4360e7313b4f9379852483d0afcbc3aa
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r1.ebuild
deleted file mode 100644
index 87dd919d6022..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r2.ebuild
deleted file mode 100644
index 6f9d3d996de4..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r3.ebuild
deleted file mode 100644
index 6f9d3d996de4..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r4.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r4.ebuild
deleted file mode 100644
index 6f9d3d996de4..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r4.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r4.ebuild
deleted file mode 100644
index 87dd919d6022..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20180114-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5deee503f6f2
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ppp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ppp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index ca66458849fc..ed41e9a4583e 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-prelink-2.20170204-r1.ebuild 286 BLAKE2B d5ff481b6d93873b4c21947b26b8575ebe2dd7d2f08d44b7f540fe8a524bbc26d148d28a949b709b34ed9712f9f0250511e454ca8a3488233a01121a5cf98415 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6
-EBUILD selinux-prelink-2.20170204-r2.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
-EBUILD selinux-prelink-2.20170204-r3.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
-EBUILD selinux-prelink-2.20170204-r4.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
 EBUILD selinux-prelink-2.20170805-r2.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
 EBUILD selinux-prelink-2.20170805-r3.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
-EBUILD selinux-prelink-2.20170805-r4.ebuild 286 BLAKE2B d5ff481b6d93873b4c21947b26b8575ebe2dd7d2f08d44b7f540fe8a524bbc26d148d28a949b709b34ed9712f9f0250511e454ca8a3488233a01121a5cf98415 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6
 EBUILD selinux-prelink-2.20180114-r1.ebuild 284 BLAKE2B ae8839f864d62249f8769eed890e7ac0ec83a3723b58a7aacaf4d565093a4fd2962284d6af3ae4e22f15dc2b85ac590accf57cdbb5e836f97db738b626519246 SHA512 44ce8cc56110c03a7420b32ef7fe3aa3ed27b88616bbc89bcc3bfdad3cf77dcd8fcd8648ae8dcb6e7823ca56e59384ee213abeaf40ad457500542e3971ef1cbb
 EBUILD selinux-prelink-2.20180114-r2.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
+EBUILD selinux-prelink-2.20180114-r3.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
 EBUILD selinux-prelink-9999.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
 MISC metadata.xml 317 BLAKE2B 13304bdab3d7cf89c48d3feb1b7893a4c4014cd799a40eecf6e07adf2fd31320a75c7e4e6555f01b23148992ebceadf2da32623b2918a5885ae2a61c3ba44e31 SHA512 858d2c01c7dfe3f73a2293cb15ff34bcaeb3f92c5736a09da4eaaedb341a52e32289525a07cbac480add98386016d07b1b705aead1b9992a7541d5bdd3126c42
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r1.ebuild
deleted file mode 100644
index 57e11bb1b330..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r2.ebuild
deleted file mode 100644
index adc387dd5666..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r3.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r3.ebuild
deleted file mode 100644
index adc387dd5666..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r4.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r4.ebuild
deleted file mode 100644
index adc387dd5666..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r4.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r4.ebuild
deleted file mode 100644
index 57e11bb1b330..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20180114-r3.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8dc9cf31cd90
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="prelink"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 146e7b075875..e55c1e12d1f2 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-prelude-2.20170204-r1.ebuild 382 BLAKE2B 8e9372065653530e183f3f3a81d68e0e6e698a52f576cd00a79e7d249803a1c628baa862aad7d2304a12b37075176aaeee3658e29f308cec4541a340651097cb SHA512 7c0f08079abf1dec06241c2be6f1e6f528ab81c627256eab53f0430542456bd22dbc0af963a718144efb4b68d2f1e497ab6d360b8d29c39b5f282cc58d0a2c10
-EBUILD selinux-prelude-2.20170204-r2.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb45f178b192162d83d2bd87819bcf3cb762fd5de05d3cee823086671666b4d079866fda01f1ff261f9b022e766c66d29b174f8743 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3
-EBUILD selinux-prelude-2.20170204-r3.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb45f178b192162d83d2bd87819bcf3cb762fd5de05d3cee823086671666b4d079866fda01f1ff261f9b022e766c66d29b174f8743 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3
-EBUILD selinux-prelude-2.20170204-r4.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb45f178b192162d83d2bd87819bcf3cb762fd5de05d3cee823086671666b4d079866fda01f1ff261f9b022e766c66d29b174f8743 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3
 EBUILD selinux-prelude-2.20170805-r2.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb45f178b192162d83d2bd87819bcf3cb762fd5de05d3cee823086671666b4d079866fda01f1ff261f9b022e766c66d29b174f8743 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3
 EBUILD selinux-prelude-2.20170805-r3.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb45f178b192162d83d2bd87819bcf3cb762fd5de05d3cee823086671666b4d079866fda01f1ff261f9b022e766c66d29b174f8743 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3
-EBUILD selinux-prelude-2.20170805-r4.ebuild 382 BLAKE2B 8e9372065653530e183f3f3a81d68e0e6e698a52f576cd00a79e7d249803a1c628baa862aad7d2304a12b37075176aaeee3658e29f308cec4541a340651097cb SHA512 7c0f08079abf1dec06241c2be6f1e6f528ab81c627256eab53f0430542456bd22dbc0af963a718144efb4b68d2f1e497ab6d360b8d29c39b5f282cc58d0a2c10
 EBUILD selinux-prelude-2.20180114-r1.ebuild 380 BLAKE2B 73b0198f04357b5e457be1371a846bb775c209700ffc9d27fc86adf51572be1529d3304a9ed00e5a7262e0cb895b5139fa30fa38ba60e781472014d715657f1c SHA512 1424a8dd172868c88635e565b9f8cb7c5ff21b45fde3e4afe0e35ec42963020383934fe57fa850eec696325ee4ac8143c9ec501cdddf4e9371b66cfac6bfc65d
 EBUILD selinux-prelude-2.20180114-r2.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
+EBUILD selinux-prelude-2.20180114-r3.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
 EBUILD selinux-prelude-9999.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
 MISC metadata.xml 317 BLAKE2B 52ee6446cb2b505c719ee40919082eaea9dd76287b2994a0027c697e73f574584152ca522fe34c42f864b44a746006292e75af3f4511c3157f5c6b3a9f7306b3 SHA512 08ccae1fc36026c405d62f24cf756d27253247e7a29cc0fc8bbb09c9a44c071875caf81bf5fe428da00bc7d876ce69bbcee65ea8289efee6ab14a6ad797ec198
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r1.ebuild
deleted file mode 100644
index 01b1601cb16f..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r2.ebuild
deleted file mode 100644
index 70194da11ac5..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r3.ebuild
deleted file mode 100644
index 70194da11ac5..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r4.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r4.ebuild
deleted file mode 100644
index 70194da11ac5..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r4.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r4.ebuild
deleted file mode 100644
index 01b1601cb16f..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20180114-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..346eb876da5d
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="prelude"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelude"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index fabf6e7612f1..a9b7dd90c948 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-privoxy-2.20170204-r1.ebuild 286 BLAKE2B 92d8dc4318f032713a5c2ff957819e8e87c8e1f27b24b1d77b943eb4bc3726e0736e1cadbc2f736f5369d81c59b422f7b657c487e6e505dfad2863bdf62f02bd SHA512 ab9d314ffecf0a0dd99e286093908b4435fa9fb392b4eef377e06fa3b21897cb0232e810c2622b4ff160a0944733e463658792f84f8c9565b5e6d4a61d163737
-EBUILD selinux-privoxy-2.20170204-r2.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e22d3913bffac0a77b6402ffd7ad95c34636c7954accca9807de18730a9e8a3b1d784640bcdf3b9cadb6d7d44a1b110260ab0e2b0f SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7
-EBUILD selinux-privoxy-2.20170204-r3.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e22d3913bffac0a77b6402ffd7ad95c34636c7954accca9807de18730a9e8a3b1d784640bcdf3b9cadb6d7d44a1b110260ab0e2b0f SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7
-EBUILD selinux-privoxy-2.20170204-r4.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e22d3913bffac0a77b6402ffd7ad95c34636c7954accca9807de18730a9e8a3b1d784640bcdf3b9cadb6d7d44a1b110260ab0e2b0f SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7
 EBUILD selinux-privoxy-2.20170805-r2.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e22d3913bffac0a77b6402ffd7ad95c34636c7954accca9807de18730a9e8a3b1d784640bcdf3b9cadb6d7d44a1b110260ab0e2b0f SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7
 EBUILD selinux-privoxy-2.20170805-r3.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e22d3913bffac0a77b6402ffd7ad95c34636c7954accca9807de18730a9e8a3b1d784640bcdf3b9cadb6d7d44a1b110260ab0e2b0f SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7
-EBUILD selinux-privoxy-2.20170805-r4.ebuild 286 BLAKE2B 92d8dc4318f032713a5c2ff957819e8e87c8e1f27b24b1d77b943eb4bc3726e0736e1cadbc2f736f5369d81c59b422f7b657c487e6e505dfad2863bdf62f02bd SHA512 ab9d314ffecf0a0dd99e286093908b4435fa9fb392b4eef377e06fa3b21897cb0232e810c2622b4ff160a0944733e463658792f84f8c9565b5e6d4a61d163737
 EBUILD selinux-privoxy-2.20180114-r1.ebuild 284 BLAKE2B a6254c3465327128b8e07f9566b39702171a7f4be9eadd736a9c9e17ba794f13a63034bd119386ddbb90f28dbf7d07e6ffc23a227aed3ad85471ee3fb42ed78e SHA512 222de7ddaa07de03b37b1471f13fe28adc0fb226c5d7cfbb5ee7f8285a91fe44acf90094de25d3edfbfd3a5ac155934f51f2f65086983fa035083040523467a5
 EBUILD selinux-privoxy-2.20180114-r2.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
+EBUILD selinux-privoxy-2.20180114-r3.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
 EBUILD selinux-privoxy-9999.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
 MISC metadata.xml 317 BLAKE2B 9f2053b7554c349b575079a4eaa2bebacce6461c82a4834db9db952ca79e89f8835c60012fb88d05036b24bfaaf494786919fd3f33fa5a909c1cac3d1ff402c6 SHA512 3c9b547563afda91854884e1933b0957390dcbdd3259ee8944a20af10f12dc987f24428de06250172299fa92d274680f86bfdbd2c2c95d8aa675bf519238470b
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r1.ebuild
deleted file mode 100644
index e3cf3ac3b34d..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r2.ebuild
deleted file mode 100644
index 91deb19563de..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r3.ebuild
deleted file mode 100644
index 91deb19563de..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r4.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r4.ebuild
deleted file mode 100644
index 91deb19563de..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r4.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r4.ebuild
deleted file mode 100644
index e3cf3ac3b34d..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20180114-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..37dbabe24a88
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="privoxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for privoxy"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 08b06e5a0cc1..9df640304eb3 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-procmail-2.20170204-r1.ebuild 288 BLAKE2B 1b72f5c4a940a63e2159ef0470b48d28f2de5184f179cb0ca96cb168ad37b7652bd37714bd6745748f825854a37668dac474b39560bf071431738f253fdfe991 SHA512 66a278af92f496982effe8ea4bae07704ae31d1ab6780360c13ac760f73b69b876f27e178c7ffd9869dcc9a151cf47ec2cc645c7862285385066e5733cd761e7
-EBUILD selinux-procmail-2.20170204-r2.ebuild 286 BLAKE2B f538bde206161fe049b688fd6c2671dbe4df4e67ba0e37e773c7d6878ab21733a06a92486156f2b69452a2bd7e2b012a06a3abf757bc08d3c4363f8fb4ce28a7 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc
-EBUILD selinux-procmail-2.20170204-r3.ebuild 286 BLAKE2B f538bde206161fe049b688fd6c2671dbe4df4e67ba0e37e773c7d6878ab21733a06a92486156f2b69452a2bd7e2b012a06a3abf757bc08d3c4363f8fb4ce28a7 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc
-EBUILD selinux-procmail-2.20170204-r4.ebuild 286 BLAKE2B f538bde206161fe049b688fd6c2671dbe4df4e67ba0e37e773c7d6878ab21733a06a92486156f2b69452a2bd7e2b012a06a3abf757bc08d3c4363f8fb4ce28a7 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc
 EBUILD selinux-procmail-2.20170805-r2.ebuild 286 BLAKE2B f538bde206161fe049b688fd6c2671dbe4df4e67ba0e37e773c7d6878ab21733a06a92486156f2b69452a2bd7e2b012a06a3abf757bc08d3c4363f8fb4ce28a7 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc
 EBUILD selinux-procmail-2.20170805-r3.ebuild 286 BLAKE2B f538bde206161fe049b688fd6c2671dbe4df4e67ba0e37e773c7d6878ab21733a06a92486156f2b69452a2bd7e2b012a06a3abf757bc08d3c4363f8fb4ce28a7 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc
-EBUILD selinux-procmail-2.20170805-r4.ebuild 288 BLAKE2B 1b72f5c4a940a63e2159ef0470b48d28f2de5184f179cb0ca96cb168ad37b7652bd37714bd6745748f825854a37668dac474b39560bf071431738f253fdfe991 SHA512 66a278af92f496982effe8ea4bae07704ae31d1ab6780360c13ac760f73b69b876f27e178c7ffd9869dcc9a151cf47ec2cc645c7862285385066e5733cd761e7
 EBUILD selinux-procmail-2.20180114-r1.ebuild 286 BLAKE2B f079428bf7a6d003b38c3906064a9e13a2a15ba2140c4b1794597bd8c8c5de96e59538026771c4d14e8980900afba2fcea80d30eb0e489846fbe4fd90e57bae5 SHA512 ed7a02f3bb1f5ef2e88394a76ca94cdf700e08bfd880dd66d2ef680232e499b555612c5cecb7c5255432230a5c38a07013e4466dc6483eea35ebfa679dc2b91f
 EBUILD selinux-procmail-2.20180114-r2.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
+EBUILD selinux-procmail-2.20180114-r3.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
 EBUILD selinux-procmail-9999.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
 MISC metadata.xml 318 BLAKE2B fd09708c49ff5681ba2609ceb19c7001a62077d505bd71159ceb4824f2a86fa8d865ab5a9c023ae9c088c7e531bf55986058fa79dd6e008191c6e66eeda622a9 SHA512 9d12c3604c6dbf96afab2541fbce6d92206273a42f21a3c3643a15fb3569faf2d7f7818eb69078ff8ec4431b744dac805d378c2816064128709f392bc59ba3ac
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r1.ebuild
deleted file mode 100644
index e0d25df17277..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r2.ebuild
deleted file mode 100644
index 3f1f915432ff..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r3.ebuild
deleted file mode 100644
index 3f1f915432ff..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r4.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r4.ebuild
deleted file mode 100644
index 3f1f915432ff..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r4.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r4.ebuild
deleted file mode 100644
index e0d25df17277..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20180114-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a898ad1b5e30
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="procmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for procmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index b509999004c2..25e0eccd96df 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-psad-2.20170204-r1.ebuild 280 BLAKE2B f3200473c446b9f7571b3bc20a92571a9ac810a760121c57d2c67a9f7c99be19c50600a639d66cf3d228a79cf0b4a59b1caca889fcad0263a1cd59e7d3f2fb6a SHA512 93db3fae6a0be18987bafe2ed5cc8ff1f7f94f0dcc68bdb37de542d37b01be4e44397c1d478aa75f9c459685f764cbef5a3a5750d65ca44b3b6d36b03751efaf
-EBUILD selinux-psad-2.20170204-r2.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3d264319af790814670318edc27f7d115f92bcec2a33a4d111e10b9e9e766d92481576cb77e2043c48c984fbc163a9166e2106 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b
-EBUILD selinux-psad-2.20170204-r3.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3d264319af790814670318edc27f7d115f92bcec2a33a4d111e10b9e9e766d92481576cb77e2043c48c984fbc163a9166e2106 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b
-EBUILD selinux-psad-2.20170204-r4.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3d264319af790814670318edc27f7d115f92bcec2a33a4d111e10b9e9e766d92481576cb77e2043c48c984fbc163a9166e2106 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b
 EBUILD selinux-psad-2.20170805-r2.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3d264319af790814670318edc27f7d115f92bcec2a33a4d111e10b9e9e766d92481576cb77e2043c48c984fbc163a9166e2106 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b
 EBUILD selinux-psad-2.20170805-r3.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3d264319af790814670318edc27f7d115f92bcec2a33a4d111e10b9e9e766d92481576cb77e2043c48c984fbc163a9166e2106 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b
-EBUILD selinux-psad-2.20170805-r4.ebuild 280 BLAKE2B f3200473c446b9f7571b3bc20a92571a9ac810a760121c57d2c67a9f7c99be19c50600a639d66cf3d228a79cf0b4a59b1caca889fcad0263a1cd59e7d3f2fb6a SHA512 93db3fae6a0be18987bafe2ed5cc8ff1f7f94f0dcc68bdb37de542d37b01be4e44397c1d478aa75f9c459685f764cbef5a3a5750d65ca44b3b6d36b03751efaf
 EBUILD selinux-psad-2.20180114-r1.ebuild 278 BLAKE2B c4d583e0ca99074fc3b869f19cd158f7c25a2add6b43865cfbfe55e62490a7e61053a01cf88ecae65170a7a27af19a9f9805deea7a1a7cdf2dd7f4cf73bdd7cf SHA512 9d87b0c3f2bd7760d2e602d9baf6d14ed53e0fa9713255a270e6c08408240f60c090dad64717a20ba19dd0745dd68b9947d83befe987ed57fa7877cc907d9f59
 EBUILD selinux-psad-2.20180114-r2.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
+EBUILD selinux-psad-2.20180114-r3.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
 EBUILD selinux-psad-9999.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
 MISC metadata.xml 314 BLAKE2B 7290c16148ae3d6277bf1e9887b2874b110f7b1d580857d41befc01f97986b12b77e1ffed75660be88650cc3b27840f3c8d40c278577ae6ce77bc3ce187fcde9 SHA512 bee35dcd491d4c557ffbc36f6940fa5e903fa41e373553964f995fc7c14609e50b013fb4aa78193f33a9fb39c0c7c8fbf26d1da17c8c4e648bce921296496a05
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170204-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170204-r1.ebuild
deleted file mode 100644
index 2369b22a4299..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170204-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170204-r2.ebuild
deleted file mode 100644
index 094912a02bad..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170204-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170204-r3.ebuild
deleted file mode 100644
index 094912a02bad..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170204-r4.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170204-r4.ebuild
deleted file mode 100644
index 094912a02bad..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170805-r4.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170805-r4.ebuild
deleted file mode 100644
index 2369b22a4299..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20180114-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a0c481b2f48b
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="psad"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for psad"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 55501632f0b8..fec1ec5336db 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-publicfile-2.20170204-r1.ebuild 292 BLAKE2B bd1c708f055f68f80e884b68963fe3dd6949b4c8e72461ba17ea9dac4bc8a607cf092e235dd2b49cd5e88126c5f24af59dca81358e68d11b269f490b80f64c6e SHA512 02eaa7acd1ac0ec46f30c5ee9b4c64d3954012c0fe0cd981dcdf4d4beb45fabe84a6b222630d43e8cc8be04a7cbb531cc2bbeac4ab076c0523eac11888e59258
-EBUILD selinux-publicfile-2.20170204-r2.ebuild 290 BLAKE2B 886e6284621135e9bdb03b92e64c6dae95988185bbf55fb58608f6acde1585fd076e8c34d940944d7041c2064ef0d05b8bef9a332ded234e28d3a6828361516f SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4
-EBUILD selinux-publicfile-2.20170204-r3.ebuild 290 BLAKE2B 886e6284621135e9bdb03b92e64c6dae95988185bbf55fb58608f6acde1585fd076e8c34d940944d7041c2064ef0d05b8bef9a332ded234e28d3a6828361516f SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4
-EBUILD selinux-publicfile-2.20170204-r4.ebuild 290 BLAKE2B 886e6284621135e9bdb03b92e64c6dae95988185bbf55fb58608f6acde1585fd076e8c34d940944d7041c2064ef0d05b8bef9a332ded234e28d3a6828361516f SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4
 EBUILD selinux-publicfile-2.20170805-r2.ebuild 290 BLAKE2B 886e6284621135e9bdb03b92e64c6dae95988185bbf55fb58608f6acde1585fd076e8c34d940944d7041c2064ef0d05b8bef9a332ded234e28d3a6828361516f SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4
 EBUILD selinux-publicfile-2.20170805-r3.ebuild 290 BLAKE2B 886e6284621135e9bdb03b92e64c6dae95988185bbf55fb58608f6acde1585fd076e8c34d940944d7041c2064ef0d05b8bef9a332ded234e28d3a6828361516f SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4
-EBUILD selinux-publicfile-2.20170805-r4.ebuild 292 BLAKE2B bd1c708f055f68f80e884b68963fe3dd6949b4c8e72461ba17ea9dac4bc8a607cf092e235dd2b49cd5e88126c5f24af59dca81358e68d11b269f490b80f64c6e SHA512 02eaa7acd1ac0ec46f30c5ee9b4c64d3954012c0fe0cd981dcdf4d4beb45fabe84a6b222630d43e8cc8be04a7cbb531cc2bbeac4ab076c0523eac11888e59258
 EBUILD selinux-publicfile-2.20180114-r1.ebuild 290 BLAKE2B e1ec439af7bc22da312c8e9cb7cf1b67625301211854412a3cb31cc84bd09f1f6ca872aa848c972d7648b70a6f904c7de50801927ce3ea05fd9967bdaf8fa61a SHA512 2e18b5e96a03ed37e88ecbbeba2210852e7cfedae05033fa6c1dff9ca1fe1d8fe72548d4c3d2b2ae848d8cea454c2469c335672eac1c654df6fc8b9bb57cf8ec
 EBUILD selinux-publicfile-2.20180114-r2.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
+EBUILD selinux-publicfile-2.20180114-r3.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
 EBUILD selinux-publicfile-9999.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
 MISC metadata.xml 320 BLAKE2B 4cabac23d0424c4dc69d8c154e5d7cfe999ea5b132dfa8773168e781baabaa9145d225ddff271bcac1c9bb267e3c5c6da1cd35516f263f18dee398edf870f830 SHA512 44842cde8be2b2955172671bc0fb969c2eea4382d286d3833cef9099708f67a9c878c33245ccf85b781864921283490c821444cc6a4cdcbf477f00ab5a272420
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r1.ebuild
deleted file mode 100644
index 3edd8cd37a4b..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r2.ebuild
deleted file mode 100644
index e08956bbce63..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r3.ebuild
deleted file mode 100644
index e08956bbce63..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r4.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r4.ebuild
deleted file mode 100644
index e08956bbce63..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r4.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r4.ebuild
deleted file mode 100644
index 3edd8cd37a4b..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20180114-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1c14791a6816
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="publicfile"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for publicfile"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index 3c9ec4286a1f..d1d6cde0e34f 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pulseaudio-2.20170204-r1.ebuild 292 BLAKE2B 44955da74935aae47ebdc6aed18bfdbd6c92598b7901df6b8aa30be3486b2d53b1d700a7bd1fa94416567fcd7b60476d0ff3f27af0bf519f81d7f94df5622937 SHA512 cf18fce2ed9b17058345fcae8db5fae84d4c7dea33b85c6c36fea5c1a0ed44baae7391c46126c0195eb43445dca4071346dc47a9519b6d4965dbdc18c13fc77e
-EBUILD selinux-pulseaudio-2.20170204-r2.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd0b8407712f83b4fe872adb782746e19ec3b097e9b00473b9ef803866d901c6342c9ccdbfd5012f9424a55e6a287a6f90dae67fc0559 SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a
-EBUILD selinux-pulseaudio-2.20170204-r3.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd0b8407712f83b4fe872adb782746e19ec3b097e9b00473b9ef803866d901c6342c9ccdbfd5012f9424a55e6a287a6f90dae67fc0559 SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a
-EBUILD selinux-pulseaudio-2.20170204-r4.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd0b8407712f83b4fe872adb782746e19ec3b097e9b00473b9ef803866d901c6342c9ccdbfd5012f9424a55e6a287a6f90dae67fc0559 SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a
 EBUILD selinux-pulseaudio-2.20170805-r2.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd0b8407712f83b4fe872adb782746e19ec3b097e9b00473b9ef803866d901c6342c9ccdbfd5012f9424a55e6a287a6f90dae67fc0559 SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a
 EBUILD selinux-pulseaudio-2.20170805-r3.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd0b8407712f83b4fe872adb782746e19ec3b097e9b00473b9ef803866d901c6342c9ccdbfd5012f9424a55e6a287a6f90dae67fc0559 SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a
-EBUILD selinux-pulseaudio-2.20170805-r4.ebuild 292 BLAKE2B 44955da74935aae47ebdc6aed18bfdbd6c92598b7901df6b8aa30be3486b2d53b1d700a7bd1fa94416567fcd7b60476d0ff3f27af0bf519f81d7f94df5622937 SHA512 cf18fce2ed9b17058345fcae8db5fae84d4c7dea33b85c6c36fea5c1a0ed44baae7391c46126c0195eb43445dca4071346dc47a9519b6d4965dbdc18c13fc77e
 EBUILD selinux-pulseaudio-2.20180114-r1.ebuild 290 BLAKE2B b7a97302b874592274875a76945d1778945ff493ee169c95ff5c27c967c6e941904d540a91134d15a563afc46463c62395a649fd21588ad754b82b640a45ad21 SHA512 71c67046a9fc51a297d78e0bab88f3124bce3b1e9aec1e1b9a31167b4b27e16ef73c95ebdef43a8fcd006d1571aab4bf1cec456897440e746c146c1b65757c56
 EBUILD selinux-pulseaudio-2.20180114-r2.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
+EBUILD selinux-pulseaudio-2.20180114-r3.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
 EBUILD selinux-pulseaudio-9999.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
 MISC metadata.xml 320 BLAKE2B 793c0ea0809ffaf2c30fa0089b9a9630cb625e510e96ba6b5a5b2689b1ca6e1fb810053f0a1458c92b337e5a98c74124384e52d9e39e9706f879c23860bc326a SHA512 49ed7fee8050b230c333264e6289d297cf3b4106b773446231dfcec9ce84121b39668e15304edb422ebb9477a3c03695cf8b35744f60fd81de5ac269b45a30ac
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r1.ebuild
deleted file mode 100644
index 32081f566756..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r2.ebuild
deleted file mode 100644
index b9bc2de57be1..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r3.ebuild
deleted file mode 100644
index b9bc2de57be1..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r4.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r4.ebuild
deleted file mode 100644
index b9bc2de57be1..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r4.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r4.ebuild
deleted file mode 100644
index 32081f566756..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180114-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..21591c2d56ee
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pulseaudio"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pulseaudio"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 94de7fbcf205..40a2211d3b24 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-puppet-2.20170204-r1.ebuild 284 BLAKE2B cec20e9e49badf505bd508f41b58c453fbfab6dd735cd701af893c0e9ccee27be330eee017e2ff2a5796f35a3fbc2d18bf5e7b303b7251c1f1de14c5acd96f2c SHA512 7a8c427f54afc34bb685fd353aab1edd18da78b697fa1b4816d72db2d523c34b51914133efc20eb9e05ef05028985203618a6f6660486e2e048a083c3bc47cee
-EBUILD selinux-puppet-2.20170204-r2.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f4df7ebfc5f743b43ea3114ae7f59ccd6e6ff3d0892b14f5914d7d8d7a9a4fd2cade7d9ad97972eeaba6529900e87153bb8d4d5f SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628
-EBUILD selinux-puppet-2.20170204-r3.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f4df7ebfc5f743b43ea3114ae7f59ccd6e6ff3d0892b14f5914d7d8d7a9a4fd2cade7d9ad97972eeaba6529900e87153bb8d4d5f SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628
-EBUILD selinux-puppet-2.20170204-r4.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f4df7ebfc5f743b43ea3114ae7f59ccd6e6ff3d0892b14f5914d7d8d7a9a4fd2cade7d9ad97972eeaba6529900e87153bb8d4d5f SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628
 EBUILD selinux-puppet-2.20170805-r2.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f4df7ebfc5f743b43ea3114ae7f59ccd6e6ff3d0892b14f5914d7d8d7a9a4fd2cade7d9ad97972eeaba6529900e87153bb8d4d5f SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628
 EBUILD selinux-puppet-2.20170805-r3.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f4df7ebfc5f743b43ea3114ae7f59ccd6e6ff3d0892b14f5914d7d8d7a9a4fd2cade7d9ad97972eeaba6529900e87153bb8d4d5f SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628
-EBUILD selinux-puppet-2.20170805-r4.ebuild 284 BLAKE2B cec20e9e49badf505bd508f41b58c453fbfab6dd735cd701af893c0e9ccee27be330eee017e2ff2a5796f35a3fbc2d18bf5e7b303b7251c1f1de14c5acd96f2c SHA512 7a8c427f54afc34bb685fd353aab1edd18da78b697fa1b4816d72db2d523c34b51914133efc20eb9e05ef05028985203618a6f6660486e2e048a083c3bc47cee
 EBUILD selinux-puppet-2.20180114-r1.ebuild 282 BLAKE2B e8ced202640e5728b041fdb85cdb109f19155837b0ff68ccc2179fadd54de9a4c7c42114c1f4a4826155276a014291f29bf9949620197ee91c0e9b79fc930f35 SHA512 0488b42ec219f0d4d7749d57900eec1f6fdcc4be571d68fbfc18858d8a9ecea9de55959bbfa55c91ba622a817cba2c6b6f8be9b353447e7cc17c4190531d8598
 EBUILD selinux-puppet-2.20180114-r2.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
+EBUILD selinux-puppet-2.20180114-r3.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
 EBUILD selinux-puppet-9999.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
 MISC metadata.xml 316 BLAKE2B 41b7d803407b6b7274b78d8ac231ccb2e4042733f1fefea6b3ca488f4e0c9e8e18abe121c5d7b9779f41fd28d046d8172e6882c43c1af470de3c893b03a6e081 SHA512 075a815fc9424250d8d6a37af0aac045f22851a10053e21da5e507989bd5e98a708c3969301b3f935eb8b6b16e6823eeed9a72003e924de052289d8400518a31
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r1.ebuild
deleted file mode 100644
index fe530c6f9110..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r2.ebuild
deleted file mode 100644
index 1e54cd59cf9e..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r3.ebuild
deleted file mode 100644
index 1e54cd59cf9e..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r4.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r4.ebuild
deleted file mode 100644
index 1e54cd59cf9e..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r4.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r4.ebuild
deleted file mode 100644
index fe530c6f9110..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20180114-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5f3399e38f63
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="puppet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for puppet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index b0412a5b87fa..a585d817dd02 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pyicqt-2.20170204-r1.ebuild 284 BLAKE2B c1b4914823555a2f38f6bb335df366539199d88a28219f31e19354d62eb6cd59df8b76f68ddc5ecc0f4238020c2564e66bed5b16c419006e573a77ba7da20a1b SHA512 0f275aefcc63b6bb614333d9d63b9373b8227b1659bde89adbdd0dd774402644fec7bf479d97d1ddc2a145b245d54ab0b76836efe5fada9ffddbae9bd373036e
-EBUILD selinux-pyicqt-2.20170204-r2.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660e1d74e5771b1ec71381b5574d7217d608980a27dc936f217d9a5c846d71217e2609dcebccad6ae7b217444dedf6655241b063f5 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504
-EBUILD selinux-pyicqt-2.20170204-r3.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660e1d74e5771b1ec71381b5574d7217d608980a27dc936f217d9a5c846d71217e2609dcebccad6ae7b217444dedf6655241b063f5 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504
-EBUILD selinux-pyicqt-2.20170204-r4.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660e1d74e5771b1ec71381b5574d7217d608980a27dc936f217d9a5c846d71217e2609dcebccad6ae7b217444dedf6655241b063f5 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504
 EBUILD selinux-pyicqt-2.20170805-r2.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660e1d74e5771b1ec71381b5574d7217d608980a27dc936f217d9a5c846d71217e2609dcebccad6ae7b217444dedf6655241b063f5 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504
 EBUILD selinux-pyicqt-2.20170805-r3.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660e1d74e5771b1ec71381b5574d7217d608980a27dc936f217d9a5c846d71217e2609dcebccad6ae7b217444dedf6655241b063f5 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504
-EBUILD selinux-pyicqt-2.20170805-r4.ebuild 284 BLAKE2B c1b4914823555a2f38f6bb335df366539199d88a28219f31e19354d62eb6cd59df8b76f68ddc5ecc0f4238020c2564e66bed5b16c419006e573a77ba7da20a1b SHA512 0f275aefcc63b6bb614333d9d63b9373b8227b1659bde89adbdd0dd774402644fec7bf479d97d1ddc2a145b245d54ab0b76836efe5fada9ffddbae9bd373036e
 EBUILD selinux-pyicqt-2.20180114-r1.ebuild 282 BLAKE2B 30ce516978b424711498f00c0af7f5eb0ca3dc7fc8d057aaee1c8013d351ee344bf3ff9a039a6a3cca2ae31a8237940d09098ee3b2f357232e065fdbd6169ee1 SHA512 8b79ec9d92a2c203824be59933bd164e987cbe3040b312cd0c2229012820252911dab20a0a20a66cb354c4c7a032ff66b191ffa5cc09170f02abc522a49e01f8
 EBUILD selinux-pyicqt-2.20180114-r2.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
+EBUILD selinux-pyicqt-2.20180114-r3.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
 EBUILD selinux-pyicqt-9999.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
 MISC metadata.xml 316 BLAKE2B f3ecd392817e5dcc1ef59a12822299ce751eeeada34370ec54492984863020c5d829c1c43d551993567fed5c46db1aad949acd8a75c8c58ad0dd5d4311149dbc SHA512 639389768b8e94cabcef99bf8f0362d37f0711a2c9280e5b29cc5e39fa5ebc088f8048065109eba81387301cd4a4f878f2115a71ecf110bb56d3ae7483548dea
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r1.ebuild
deleted file mode 100644
index 03d0ddd72959..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r2.ebuild
deleted file mode 100644
index 09982db295aa..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r3.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r3.ebuild
deleted file mode 100644
index 09982db295aa..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r4.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r4.ebuild
deleted file mode 100644
index 09982db295aa..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r4.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r4.ebuild
deleted file mode 100644
index 03d0ddd72959..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180114-r3.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3ff7315fd87f
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pyicqt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyicqt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 04433ea6129d..ac2aa0ab3a15 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-pyzor-2.20170204-r1.ebuild 282 BLAKE2B e2561fb3e1b2908de7886ac4641de738719080ed0fb32082e60474580867db4dc4aa7b3576af6bec738366188a6e1f400d6c5a99b79a2ef25456ff56ad36940f SHA512 dfa691cd0e5b07200beb5aec555eceaa8b4234a5415ce6211d16abbcc597a3039f8ee3b045f1bdd633f5eed70d6848f515c9919dcbfe080c352b92662fc3a43e
-EBUILD selinux-pyzor-2.20170204-r2.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a665902ac2195b231205db8898aee8d818183a1ab72e6e071d84fba27baa29a0fa3197c4bdbfa6006fc64f745611b8612b8f61d80 SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b
-EBUILD selinux-pyzor-2.20170204-r3.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a665902ac2195b231205db8898aee8d818183a1ab72e6e071d84fba27baa29a0fa3197c4bdbfa6006fc64f745611b8612b8f61d80 SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b
-EBUILD selinux-pyzor-2.20170204-r4.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a665902ac2195b231205db8898aee8d818183a1ab72e6e071d84fba27baa29a0fa3197c4bdbfa6006fc64f745611b8612b8f61d80 SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b
 EBUILD selinux-pyzor-2.20170805-r2.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a665902ac2195b231205db8898aee8d818183a1ab72e6e071d84fba27baa29a0fa3197c4bdbfa6006fc64f745611b8612b8f61d80 SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b
 EBUILD selinux-pyzor-2.20170805-r3.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a665902ac2195b231205db8898aee8d818183a1ab72e6e071d84fba27baa29a0fa3197c4bdbfa6006fc64f745611b8612b8f61d80 SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b
-EBUILD selinux-pyzor-2.20170805-r4.ebuild 282 BLAKE2B e2561fb3e1b2908de7886ac4641de738719080ed0fb32082e60474580867db4dc4aa7b3576af6bec738366188a6e1f400d6c5a99b79a2ef25456ff56ad36940f SHA512 dfa691cd0e5b07200beb5aec555eceaa8b4234a5415ce6211d16abbcc597a3039f8ee3b045f1bdd633f5eed70d6848f515c9919dcbfe080c352b92662fc3a43e
 EBUILD selinux-pyzor-2.20180114-r1.ebuild 280 BLAKE2B 2f6d29e6cd31faefe5ac042e48811454f0f5712d1b7f7b29f7ee349422e8de9ace8e254bd1143aed63baa899ea749a40a6699383b8d12d8564f9ffabacba531c SHA512 fc7330631185e255e8e48a30407caf107e5879f64c4cfa785ea7e6c99c96ef815abebe21a1f0c3f2bce1d204b88f1e85ee6f33abd445f4053fc68afd5ee0d125
 EBUILD selinux-pyzor-2.20180114-r2.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
+EBUILD selinux-pyzor-2.20180114-r3.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
 EBUILD selinux-pyzor-9999.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
 MISC metadata.xml 315 BLAKE2B b1a3009ebe5927bf782f39e1371ddfdeafb03b69be332d51e790524a69ac9a8a259f515bb6a017533a26f7efeba3af41ce489b3900271de33b7f54b453c5711a SHA512 6a068357d8420fe2434228757a54cbd193f5a0ad645902603261d512f78853a45573143d522cee139d97e9ccbed8af8562325442aa0c89f6feb9760cb2924029
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r1.ebuild
deleted file mode 100644
index f8260fdc84ba..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r2.ebuild
deleted file mode 100644
index 0ad570dad2d9..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r3.ebuild
deleted file mode 100644
index 0ad570dad2d9..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r4.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r4.ebuild
deleted file mode 100644
index 0ad570dad2d9..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r4.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r4.ebuild
deleted file mode 100644
index f8260fdc84ba..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20180114-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ec7ec7e951f3
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pyzor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyzor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 962256abac04..b2f5c252a62c 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-qemu-2.20170204-r1.ebuild 372 BLAKE2B 81dcf3abc5bf29d140827ac6d0521f6cd4e5c5b9a22f641b0ec935791548e6008882a70549ee55d6a3a604c47b620b4b9bc9303d043e034f737c9cc2f88da6ff SHA512 83ebd75cda1a8559094890e30defe3947ff2a764eafbe15f663a3ed0553bfeb0cc42402bdee0edccd966dd468d18db3ad2fee2d5b1fe2d1560fb1321256a8db7
-EBUILD selinux-qemu-2.20170204-r2.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce166d188bc96d75930170a6cac0a8ab92e1d6c4894e3ee5efd55c46f6aeaf4fec128af4806778e9ac7350529012cf6514946962 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd
-EBUILD selinux-qemu-2.20170204-r3.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce166d188bc96d75930170a6cac0a8ab92e1d6c4894e3ee5efd55c46f6aeaf4fec128af4806778e9ac7350529012cf6514946962 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd
-EBUILD selinux-qemu-2.20170204-r4.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce166d188bc96d75930170a6cac0a8ab92e1d6c4894e3ee5efd55c46f6aeaf4fec128af4806778e9ac7350529012cf6514946962 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd
 EBUILD selinux-qemu-2.20170805-r2.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce166d188bc96d75930170a6cac0a8ab92e1d6c4894e3ee5efd55c46f6aeaf4fec128af4806778e9ac7350529012cf6514946962 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd
 EBUILD selinux-qemu-2.20170805-r3.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce166d188bc96d75930170a6cac0a8ab92e1d6c4894e3ee5efd55c46f6aeaf4fec128af4806778e9ac7350529012cf6514946962 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd
-EBUILD selinux-qemu-2.20170805-r4.ebuild 372 BLAKE2B 81dcf3abc5bf29d140827ac6d0521f6cd4e5c5b9a22f641b0ec935791548e6008882a70549ee55d6a3a604c47b620b4b9bc9303d043e034f737c9cc2f88da6ff SHA512 83ebd75cda1a8559094890e30defe3947ff2a764eafbe15f663a3ed0553bfeb0cc42402bdee0edccd966dd468d18db3ad2fee2d5b1fe2d1560fb1321256a8db7
 EBUILD selinux-qemu-2.20180114-r1.ebuild 370 BLAKE2B 5151e057bc53bc9ac0032f9f0e71f8021c92d9d01aaab1017e75180de64d7ddedffbefb958af56d230cc99f931aa248156bb5d661bde0851392759edab229ea9 SHA512 2fa89efad15389b44834a93e6ad6fe0b4cf7cefd196def543fa7504262e35c4841518a114347da5caaeec0cf612b29a8e62f4471b913f1b13011d93ba39b53da
 EBUILD selinux-qemu-2.20180114-r2.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
+EBUILD selinux-qemu-2.20180114-r3.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
 EBUILD selinux-qemu-9999.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
 MISC metadata.xml 314 BLAKE2B 0eab470121ac7e8afbc955da96c9fd85273bed160b7da7347d4176a5176aba2356ca42f82fbbdb79bebf3a53468280a20e4af2cfdabb4a5cfbb4face95de69ce SHA512 ce815f5d3ee896942198504d8b1156c2508978f6de36773b816b2d132a045889caa740a033a517b5447bd24414a97bad2950a4b43b8a4c762facffe983ff020a
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r1.ebuild
deleted file mode 100644
index 55511c28b3cd..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r2.ebuild
deleted file mode 100644
index 011cb0278ab4..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r3.ebuild
deleted file mode 100644
index 011cb0278ab4..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r4.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r4.ebuild
deleted file mode 100644
index 011cb0278ab4..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r4.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r4.ebuild
deleted file mode 100644
index 55511c28b3cd..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20180114-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3ac8c85d7ff8
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="qemu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-virt
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-virt
+"
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 0acdae300144..26f674b1e657 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-qmail-2.20170204-r1.ebuild 282 BLAKE2B bc83e2553e09d615a1819dbdfe6a5da1cea3bf8b8a910db334fd4ebea2ae0e7fccadb61aaa0f48a1ac5926bc1f27a40fce6b0308d3b4b9481fdf98c54bd811b7 SHA512 3805bd59040ef634d8fa4b6322aa1e85202fe19c1c5301724423d05c142d34c1c618f4aa0350a80aa549a639b6f1354997d6d541fc1ca536752004d651901e27
-EBUILD selinux-qmail-2.20170204-r2.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec44b60c737467927e2a2b5856aab5c681e9afb5865f11759d58c6c5ce745afdda44a88f3197d6585bef52936ca2229171d869ff7 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f
-EBUILD selinux-qmail-2.20170204-r3.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec44b60c737467927e2a2b5856aab5c681e9afb5865f11759d58c6c5ce745afdda44a88f3197d6585bef52936ca2229171d869ff7 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f
-EBUILD selinux-qmail-2.20170204-r4.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec44b60c737467927e2a2b5856aab5c681e9afb5865f11759d58c6c5ce745afdda44a88f3197d6585bef52936ca2229171d869ff7 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f
 EBUILD selinux-qmail-2.20170805-r2.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec44b60c737467927e2a2b5856aab5c681e9afb5865f11759d58c6c5ce745afdda44a88f3197d6585bef52936ca2229171d869ff7 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f
 EBUILD selinux-qmail-2.20170805-r3.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec44b60c737467927e2a2b5856aab5c681e9afb5865f11759d58c6c5ce745afdda44a88f3197d6585bef52936ca2229171d869ff7 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f
-EBUILD selinux-qmail-2.20170805-r4.ebuild 282 BLAKE2B bc83e2553e09d615a1819dbdfe6a5da1cea3bf8b8a910db334fd4ebea2ae0e7fccadb61aaa0f48a1ac5926bc1f27a40fce6b0308d3b4b9481fdf98c54bd811b7 SHA512 3805bd59040ef634d8fa4b6322aa1e85202fe19c1c5301724423d05c142d34c1c618f4aa0350a80aa549a639b6f1354997d6d541fc1ca536752004d651901e27
 EBUILD selinux-qmail-2.20180114-r1.ebuild 280 BLAKE2B f7ff4df29f076637641b6e617ed2704899f0e4751e069862fe0d798891a2ff994d4d5ac98434d43640b0db1777957f9badfae0003552146d94cbf25bf16778d8 SHA512 645b65efb1e48350af05f27d4382350901ac90c255aa4839832b3870cdbdf7c8ce3694cfe679cdfe1c98b7b43666938b8dabd3b755117d732beb853dba036ba9
 EBUILD selinux-qmail-2.20180114-r2.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
+EBUILD selinux-qmail-2.20180114-r3.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
 EBUILD selinux-qmail-9999.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
 MISC metadata.xml 315 BLAKE2B 5d47ed9edc375f1f288563eaea7d28a90fc69cdc0250cd6d5c99aa9f422b87218d0a4428335bf6f450e82fd23874d58c680656f461a948786920b6ddf00a229d SHA512 b37ef0a329dedd9fb843e7d8f10d3153afab24b82336fdfd2dc03c713ce36cbf90a1506837ffefaed140d839af1a0f38e479a3f1ee6829c4d33cfef3cc8f5f95
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r1.ebuild
deleted file mode 100644
index 184de3cb7caa..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r2.ebuild
deleted file mode 100644
index e9b5c9724763..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r3.ebuild
deleted file mode 100644
index e9b5c9724763..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r4.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r4.ebuild
deleted file mode 100644
index e9b5c9724763..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r4.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r4.ebuild
deleted file mode 100644
index 184de3cb7caa..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20180114-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..91f8c6d5ea57
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="qmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index 6ec5ebc504c1..34716da995c5 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-quota-2.20170204-r1.ebuild 282 BLAKE2B 1cdae0575cb734de666489990ec2b318c2619415302f2db021bb575f0de7ddd4598465d1fab3693b39780d2b907082e6237683e1c3de991fa658bcc1f283a9b3 SHA512 5aa3da065f7b334317b1abaf8b6265ef4501ad19b6fee265a9f8736f7f15a39cb35024b2886a32b49e688ec40a46419cdbd0106a72d69235ab5b2bfed5a628e0
-EBUILD selinux-quota-2.20170204-r2.ebuild 280 BLAKE2B c14095d05ad9740309e6eae95737216b5db34c5d28fd50dd9afdfa138101fb9c9ae4e48bfb8ea161e8cc74bfe734c4390047558d8c71d7ae3efe1bb1471257d7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452
-EBUILD selinux-quota-2.20170204-r3.ebuild 280 BLAKE2B c14095d05ad9740309e6eae95737216b5db34c5d28fd50dd9afdfa138101fb9c9ae4e48bfb8ea161e8cc74bfe734c4390047558d8c71d7ae3efe1bb1471257d7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452
-EBUILD selinux-quota-2.20170204-r4.ebuild 280 BLAKE2B c14095d05ad9740309e6eae95737216b5db34c5d28fd50dd9afdfa138101fb9c9ae4e48bfb8ea161e8cc74bfe734c4390047558d8c71d7ae3efe1bb1471257d7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452
 EBUILD selinux-quota-2.20170805-r2.ebuild 280 BLAKE2B c14095d05ad9740309e6eae95737216b5db34c5d28fd50dd9afdfa138101fb9c9ae4e48bfb8ea161e8cc74bfe734c4390047558d8c71d7ae3efe1bb1471257d7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452
 EBUILD selinux-quota-2.20170805-r3.ebuild 280 BLAKE2B c14095d05ad9740309e6eae95737216b5db34c5d28fd50dd9afdfa138101fb9c9ae4e48bfb8ea161e8cc74bfe734c4390047558d8c71d7ae3efe1bb1471257d7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452
-EBUILD selinux-quota-2.20170805-r4.ebuild 282 BLAKE2B 1cdae0575cb734de666489990ec2b318c2619415302f2db021bb575f0de7ddd4598465d1fab3693b39780d2b907082e6237683e1c3de991fa658bcc1f283a9b3 SHA512 5aa3da065f7b334317b1abaf8b6265ef4501ad19b6fee265a9f8736f7f15a39cb35024b2886a32b49e688ec40a46419cdbd0106a72d69235ab5b2bfed5a628e0
 EBUILD selinux-quota-2.20180114-r1.ebuild 280 BLAKE2B a0ef52eadaa28918d4f749b0996da5d5f992c3055285bf78302d9a387f6c44eb68ba59af9bdf38eadc60a7c72ff1095ddd2f22455dea08e3326305335c618b36 SHA512 8f49edbaf0a628a9d836260c87444c092711a8ab3330ae06860acdfb1f1478250bdf84413449b660d3b931f121e6124f44421ff8c2965c128a5a89b6279f83d6
 EBUILD selinux-quota-2.20180114-r2.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
+EBUILD selinux-quota-2.20180114-r3.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
 EBUILD selinux-quota-9999.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
 MISC metadata.xml 315 BLAKE2B 736a4f87fa9901b4056fbc68ffdbbf3c91b8945d6e8ef2c8f54bdcfaf21ca8193dcd40dee2efc20cd2a8e504ba93c7e88aabab28e20b808f4c3d63abf5915870 SHA512 af9939539d2e2846f01e42e77ca895260ac530e9071407dcef52b80069bd4bed814d0405bcc8dd41715ef0528c222d1dd96a138633efec2173e98ad44c0790af
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170204-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170204-r1.ebuild
deleted file mode 100644
index 221b97456a3d..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170204-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170204-r2.ebuild
deleted file mode 100644
index 0af9af0d6630..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170204-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170204-r3.ebuild
deleted file mode 100644
index 0af9af0d6630..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170204-r4.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170204-r4.ebuild
deleted file mode 100644
index 0af9af0d6630..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170805-r4.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170805-r4.ebuild
deleted file mode 100644
index 221b97456a3d..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20180114-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..36e2461e5a20
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="quota"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for quota"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 88fca1c32631..62947a23d10e 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-radius-2.20170204-r1.ebuild 284 BLAKE2B 87334cd519cc398cbda8fa98d0ec744a81175c9d3add4ef3b826cb956092b43cdcf1e4799d2ca9322f316c5095b81e5786877e64bad2c75ace185447cdba07c4 SHA512 402a35906308ed60424cc963f3b1fa97b80397d96b1f36377dfaa8be0b2a73daeee67c0852f5f57b9c0fd6e5776443fc793eece731f1f6619146a29cd05a2d11
-EBUILD selinux-radius-2.20170204-r2.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2ba2ad4455b0f98efffab2c473e599b9f4e110fccd8e8f2b53e5af51402c0bb4b9f355b65d3ccfc74ab4e0fa22a8063e6b62155d SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594
-EBUILD selinux-radius-2.20170204-r3.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2ba2ad4455b0f98efffab2c473e599b9f4e110fccd8e8f2b53e5af51402c0bb4b9f355b65d3ccfc74ab4e0fa22a8063e6b62155d SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594
-EBUILD selinux-radius-2.20170204-r4.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2ba2ad4455b0f98efffab2c473e599b9f4e110fccd8e8f2b53e5af51402c0bb4b9f355b65d3ccfc74ab4e0fa22a8063e6b62155d SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594
 EBUILD selinux-radius-2.20170805-r2.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2ba2ad4455b0f98efffab2c473e599b9f4e110fccd8e8f2b53e5af51402c0bb4b9f355b65d3ccfc74ab4e0fa22a8063e6b62155d SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594
 EBUILD selinux-radius-2.20170805-r3.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2ba2ad4455b0f98efffab2c473e599b9f4e110fccd8e8f2b53e5af51402c0bb4b9f355b65d3ccfc74ab4e0fa22a8063e6b62155d SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594
-EBUILD selinux-radius-2.20170805-r4.ebuild 284 BLAKE2B 87334cd519cc398cbda8fa98d0ec744a81175c9d3add4ef3b826cb956092b43cdcf1e4799d2ca9322f316c5095b81e5786877e64bad2c75ace185447cdba07c4 SHA512 402a35906308ed60424cc963f3b1fa97b80397d96b1f36377dfaa8be0b2a73daeee67c0852f5f57b9c0fd6e5776443fc793eece731f1f6619146a29cd05a2d11
 EBUILD selinux-radius-2.20180114-r1.ebuild 282 BLAKE2B 5402f1c6dc257cf845c2e6fb067479279c36d372477137ae9bda32ea0d0767e242d5df767209fd2b916d36af2ba2cf4adfa76eea8f7d7ceb642b0d4e29540e4b SHA512 89dab49c0d70ce81d439d61a873a2fad910c64788408da27bab21c66daf716b80eb1ba2c88e6064e804cc260677457aace649a1f3f019887e7b176fd3319f1ed
 EBUILD selinux-radius-2.20180114-r2.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
+EBUILD selinux-radius-2.20180114-r3.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
 EBUILD selinux-radius-9999.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
 MISC metadata.xml 316 BLAKE2B 7e4f0c89d1b0fac60267001131b4935d92686292be9f60fcfca7ed3612aaad76c3c5d1c1e110ead346c0220ada5750c763e2fb9b6016d36b2d018898cbea76b6 SHA512 0500b19ec7cff97e422e1a5e89bfd8c6574ab2c4fc03fada1abbbb1ab62bed170be38b5c70b6a515d57cfc65dbaf0d0c365e859b8533c9afa92f78d7df9c5731
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170204-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170204-r1.ebuild
deleted file mode 100644
index 0bc1d7c29795..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170204-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170204-r2.ebuild
deleted file mode 100644
index 5b124668c37b..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170204-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170204-r3.ebuild
deleted file mode 100644
index 5b124668c37b..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170204-r4.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170204-r4.ebuild
deleted file mode 100644
index 5b124668c37b..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170805-r4.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170805-r4.ebuild
deleted file mode 100644
index 0bc1d7c29795..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20180114-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5d61679de48d
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="radius"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radius"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 76fc3524af22..5a45279ca50a 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-radvd-2.20170204-r1.ebuild 282 BLAKE2B 1acb8c0ef7c1c22cffc99f5acd24aa13a4b84ef0c026e844314d638fdb53c03c6ad7175bd9492565e5f855fc8729432689a248b4af873e4b83b084c92b11a887 SHA512 5b01aa9bc75ff4ef94c02b9b620ef13c66c0d335284ff1d06aec1e3684a7d51cfb2a2b4053ab9861fd7430961432c06e53cadd778edd5f1d5761471b8b6f25c5
-EBUILD selinux-radvd-2.20170204-r2.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc62b5c442d4162c91d55bb15494737325f51fe99644e3a9229040d54277f848cdcc0e77728aea157684fe0fdfe38c6565b1eac70 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322
-EBUILD selinux-radvd-2.20170204-r3.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc62b5c442d4162c91d55bb15494737325f51fe99644e3a9229040d54277f848cdcc0e77728aea157684fe0fdfe38c6565b1eac70 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322
-EBUILD selinux-radvd-2.20170204-r4.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc62b5c442d4162c91d55bb15494737325f51fe99644e3a9229040d54277f848cdcc0e77728aea157684fe0fdfe38c6565b1eac70 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322
 EBUILD selinux-radvd-2.20170805-r2.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc62b5c442d4162c91d55bb15494737325f51fe99644e3a9229040d54277f848cdcc0e77728aea157684fe0fdfe38c6565b1eac70 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322
 EBUILD selinux-radvd-2.20170805-r3.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc62b5c442d4162c91d55bb15494737325f51fe99644e3a9229040d54277f848cdcc0e77728aea157684fe0fdfe38c6565b1eac70 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322
-EBUILD selinux-radvd-2.20170805-r4.ebuild 282 BLAKE2B 1acb8c0ef7c1c22cffc99f5acd24aa13a4b84ef0c026e844314d638fdb53c03c6ad7175bd9492565e5f855fc8729432689a248b4af873e4b83b084c92b11a887 SHA512 5b01aa9bc75ff4ef94c02b9b620ef13c66c0d335284ff1d06aec1e3684a7d51cfb2a2b4053ab9861fd7430961432c06e53cadd778edd5f1d5761471b8b6f25c5
 EBUILD selinux-radvd-2.20180114-r1.ebuild 280 BLAKE2B f71308fa83d6b9fc56302107e2caa3ec3450cc263660013fb54bb6ef4f4a30f3f6ab597bdffca489b1c7844adc16d6a050548dd3158911ad6c689a6dab4c935d SHA512 d3ed889c36dff973be855941a54d3efb5f8e804d3bbad4e880219bd5e24b0376d5f16c8d3b3d1444d52a9d2adf7dff9acc96e4834c1a367306e2a20f0852a7fc
 EBUILD selinux-radvd-2.20180114-r2.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
+EBUILD selinux-radvd-2.20180114-r3.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
 EBUILD selinux-radvd-9999.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
 MISC metadata.xml 315 BLAKE2B ddd9d0af6e1fe07ddb8ff4a619ffab1fd862ac54a95bbb1f9bb771a73fc0d288e330090f7c0e60abbba681062cd1246a83dc5b0ca1c4c39f592e71b726d003f2 SHA512 be9c80d6e07a38b69d9f9c50cc93bbdc8851ec45b578f22cc4335960ca0f55a2835987e304cb9d40fc01eaa473cc9c7c6136c6b051ca92fa42e38543cacddf92
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r1.ebuild
deleted file mode 100644
index a3e239253a9a..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r2.ebuild
deleted file mode 100644
index bef7d9af97e3..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r3.ebuild
deleted file mode 100644
index bef7d9af97e3..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r4.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r4.ebuild
deleted file mode 100644
index bef7d9af97e3..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r4.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r4.ebuild
deleted file mode 100644
index a3e239253a9a..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20180114-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..b92e3d1ca215
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="radvd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radvd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 69e74654fa0c..fdc47d4cb858 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-razor-2.20170204-r1.ebuild 282 BLAKE2B e0f0c1bb1e5ddf7587b2ddeccabc076fd8418357a5822a4577488880d8ca55ae5345d1dcc80963643f1e75dc1b917d87e175c40da5458afbcf13857a655d7bb1 SHA512 061395a8e514b4791d9c407867560a90e542c7a0ec37bfaa94cc5b6d5fce9ace35372ac6f0dbf70df73ff6fa53ec5070d3e6f4560cbded01240f20329272349f
-EBUILD selinux-razor-2.20170204-r2.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b1139a260bf19276e74ed46b5bfcc131b9f7c7c7ace91a4b78d881f6b0a4370dd48b2dff32c75bafaf57ba8fb96dfac5717a13a SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0
-EBUILD selinux-razor-2.20170204-r3.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b1139a260bf19276e74ed46b5bfcc131b9f7c7c7ace91a4b78d881f6b0a4370dd48b2dff32c75bafaf57ba8fb96dfac5717a13a SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0
-EBUILD selinux-razor-2.20170204-r4.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b1139a260bf19276e74ed46b5bfcc131b9f7c7c7ace91a4b78d881f6b0a4370dd48b2dff32c75bafaf57ba8fb96dfac5717a13a SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0
 EBUILD selinux-razor-2.20170805-r2.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b1139a260bf19276e74ed46b5bfcc131b9f7c7c7ace91a4b78d881f6b0a4370dd48b2dff32c75bafaf57ba8fb96dfac5717a13a SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0
 EBUILD selinux-razor-2.20170805-r3.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b1139a260bf19276e74ed46b5bfcc131b9f7c7c7ace91a4b78d881f6b0a4370dd48b2dff32c75bafaf57ba8fb96dfac5717a13a SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0
-EBUILD selinux-razor-2.20170805-r4.ebuild 282 BLAKE2B e0f0c1bb1e5ddf7587b2ddeccabc076fd8418357a5822a4577488880d8ca55ae5345d1dcc80963643f1e75dc1b917d87e175c40da5458afbcf13857a655d7bb1 SHA512 061395a8e514b4791d9c407867560a90e542c7a0ec37bfaa94cc5b6d5fce9ace35372ac6f0dbf70df73ff6fa53ec5070d3e6f4560cbded01240f20329272349f
 EBUILD selinux-razor-2.20180114-r1.ebuild 280 BLAKE2B 7f6346c177b76b6d3e23a9f898b3062090f09e144f09dcdcca7a58600c966f8307c9f2f2a3141dc6392e2310b803b571938d89b9fb281c331fe767260c0e303e SHA512 d7a4421b7aa4e187c6c7642606eff61bb99196ddb8336cb65a8b9ff7ef0175c3b31888a6a6b6dac75ed1e763dee135902f0b8eb761c4e752611a6216024a146a
 EBUILD selinux-razor-2.20180114-r2.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
+EBUILD selinux-razor-2.20180114-r3.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
 EBUILD selinux-razor-9999.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
 MISC metadata.xml 315 BLAKE2B dec27f37b99c6e66ed79661ee687e9d564e6ed45010165318e550e7ffb53d61c8101a732ced96ec84dd787ceb9ff6d09352be44962c1dbcc02b80325fbe9ab5c SHA512 fb1fbe7d5d8a99d86dce5d79e90fa849a94cbccc66a972e92084f1dbd4c459c42920f6591918151b22cb16e0db43ffd3dd738cc8dd4cc020db25286009d82d56
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170204-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170204-r1.ebuild
deleted file mode 100644
index 625cdd8e9593..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170204-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170204-r2.ebuild
deleted file mode 100644
index 6baab7d2f481..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170204-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170204-r3.ebuild
deleted file mode 100644
index 6baab7d2f481..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170204-r4.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170204-r4.ebuild
deleted file mode 100644
index 6baab7d2f481..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170805-r4.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170805-r4.ebuild
deleted file mode 100644
index 625cdd8e9593..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20180114-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1d3b49748dc1
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="razor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for razor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-redis/Manifest b/sec-policy/selinux-redis/Manifest
index 15508eb76649..c4f194b80c9c 100644
--- a/sec-policy/selinux-redis/Manifest
+++ b/sec-policy/selinux-redis/Manifest
@@ -1,5 +1,7 @@
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
 EBUILD selinux-redis-2.20180114-r2.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
+EBUILD selinux-redis-2.20180114-r3.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
 EBUILD selinux-redis-9999.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
 MISC metadata.xml 315 BLAKE2B f694245feccb9ef96f0afc7f912bfb60ee4ce97085b0626f57006b8532c3f9a5c6fe43aa1029f28f057fad5801a420c2d2b0da5aa25f9028e16f62b7c985fecf SHA512 3f104b8866ca3c24c8c9f37727b63245f6bf536bbe70f564abc07ba7f68f22f45170269a18db552e4681d042545dfd09eb694010c9f629e85dda4e5def3db919
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20180114-r3.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..cf01a8f45bcb
--- /dev/null
+++ b/sec-policy/selinux-redis/selinux-redis-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="redis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for redis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index dad8371b2c9a..7b3e092b2443 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-remotelogin-2.20170204-r1.ebuild 294 BLAKE2B 272b73a5cc415e9b810c5d18a6cff90e8e7342b1a5f2bafa9dfa6859d92797003a173a723cb845e346540633dbd064cd7b1e19b02d4376b00a63d39c46f57e76 SHA512 aa13bf014e5601d9e271b6cb1eb965dd3039b668de18991dd88b8eeb2c536991b42c0624cc50d35e16991ce4424dba89b1e776f044b5c01ce24fa92955a3df4a
-EBUILD selinux-remotelogin-2.20170204-r2.ebuild 292 BLAKE2B 447a2680488dfac796b9937d10d1b84956c898d0c4f048dd61b3b331eeec8823956f4d134eb36d0d02e3d8352c81851d4b9611ebb5e7cbb7aae9080c72f76769 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d
-EBUILD selinux-remotelogin-2.20170204-r3.ebuild 292 BLAKE2B 447a2680488dfac796b9937d10d1b84956c898d0c4f048dd61b3b331eeec8823956f4d134eb36d0d02e3d8352c81851d4b9611ebb5e7cbb7aae9080c72f76769 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d
-EBUILD selinux-remotelogin-2.20170204-r4.ebuild 292 BLAKE2B 447a2680488dfac796b9937d10d1b84956c898d0c4f048dd61b3b331eeec8823956f4d134eb36d0d02e3d8352c81851d4b9611ebb5e7cbb7aae9080c72f76769 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d
 EBUILD selinux-remotelogin-2.20170805-r2.ebuild 292 BLAKE2B 447a2680488dfac796b9937d10d1b84956c898d0c4f048dd61b3b331eeec8823956f4d134eb36d0d02e3d8352c81851d4b9611ebb5e7cbb7aae9080c72f76769 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d
 EBUILD selinux-remotelogin-2.20170805-r3.ebuild 292 BLAKE2B 447a2680488dfac796b9937d10d1b84956c898d0c4f048dd61b3b331eeec8823956f4d134eb36d0d02e3d8352c81851d4b9611ebb5e7cbb7aae9080c72f76769 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d
-EBUILD selinux-remotelogin-2.20170805-r4.ebuild 294 BLAKE2B 272b73a5cc415e9b810c5d18a6cff90e8e7342b1a5f2bafa9dfa6859d92797003a173a723cb845e346540633dbd064cd7b1e19b02d4376b00a63d39c46f57e76 SHA512 aa13bf014e5601d9e271b6cb1eb965dd3039b668de18991dd88b8eeb2c536991b42c0624cc50d35e16991ce4424dba89b1e776f044b5c01ce24fa92955a3df4a
 EBUILD selinux-remotelogin-2.20180114-r1.ebuild 292 BLAKE2B 136a3487949999cf8bdfe55e2f8cdde27247e0386de45f0758ed9c1dff4c51a5e2626f849217c6121163d724a78f50b1d29ffc1836e897c0877d9adcb9ef7e2d SHA512 30b725494525381393609420108e0a5caf5754d7a299b8e888731d93cf7c934c71745ba1b6f38778aeeb51f064116c94fc38e5ad1bb5f5a43a70b94ddd4c8d61
 EBUILD selinux-remotelogin-2.20180114-r2.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
+EBUILD selinux-remotelogin-2.20180114-r3.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
 EBUILD selinux-remotelogin-9999.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
 MISC metadata.xml 321 BLAKE2B 941ee41d833475aa740383a6686ff0d464ccec0550daf105b1bad6b065d19ec7ccd63b30857f34ed5b29d87a251914cb8905aea6aadfa8682f903fca1f6735d3 SHA512 de35cd8293d68562e772d0163377341a118b1d25957533ade5621dd4d1c5d34ab0269ddc27aaef0bce6826393ad12da5e185aa9761cccaecd7668b03078a5a0b
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r1.ebuild
deleted file mode 100644
index cc9a91d67a4c..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r2.ebuild
deleted file mode 100644
index 71d819dc07d1..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r3.ebuild
deleted file mode 100644
index 71d819dc07d1..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r4.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r4.ebuild
deleted file mode 100644
index 71d819dc07d1..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r4.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r4.ebuild
deleted file mode 100644
index cc9a91d67a4c..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180114-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8b28c4fbe3c5
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="remotelogin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for remotelogin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index dc490fc9d469..4d2f362d8b5d 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-resolvconf-2.20170204-r1.ebuild 292 BLAKE2B 60be866278fb2b1abb9f174d789475cef88a3bac129d5292636705b7294f0247316a369914fd6628bc91e4ba1e9f5a1e7b48da135d8eca686ba5f3a38026bbd7 SHA512 03541e8acfc57674b1502027e06bab6fae1a85af0a71e6ab61765adf7c50a76b9b38b8fad1cd5683d2526391d1c3f67e41de3208be09e49d8b7db3a063fac3ad
-EBUILD selinux-resolvconf-2.20170204-r2.ebuild 290 BLAKE2B e62838002ba259bf79f62c075727d777035a45a74e83371e247f780f49bc6bd5ae59ed0c6d128f37ff624c18755680c14ef39f8e2c3fc173cd842f2992ceebc0 SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63
-EBUILD selinux-resolvconf-2.20170204-r3.ebuild 290 BLAKE2B e62838002ba259bf79f62c075727d777035a45a74e83371e247f780f49bc6bd5ae59ed0c6d128f37ff624c18755680c14ef39f8e2c3fc173cd842f2992ceebc0 SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63
-EBUILD selinux-resolvconf-2.20170204-r4.ebuild 290 BLAKE2B e62838002ba259bf79f62c075727d777035a45a74e83371e247f780f49bc6bd5ae59ed0c6d128f37ff624c18755680c14ef39f8e2c3fc173cd842f2992ceebc0 SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63
 EBUILD selinux-resolvconf-2.20170805-r2.ebuild 290 BLAKE2B e62838002ba259bf79f62c075727d777035a45a74e83371e247f780f49bc6bd5ae59ed0c6d128f37ff624c18755680c14ef39f8e2c3fc173cd842f2992ceebc0 SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63
 EBUILD selinux-resolvconf-2.20170805-r3.ebuild 290 BLAKE2B e62838002ba259bf79f62c075727d777035a45a74e83371e247f780f49bc6bd5ae59ed0c6d128f37ff624c18755680c14ef39f8e2c3fc173cd842f2992ceebc0 SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63
-EBUILD selinux-resolvconf-2.20170805-r4.ebuild 292 BLAKE2B 60be866278fb2b1abb9f174d789475cef88a3bac129d5292636705b7294f0247316a369914fd6628bc91e4ba1e9f5a1e7b48da135d8eca686ba5f3a38026bbd7 SHA512 03541e8acfc57674b1502027e06bab6fae1a85af0a71e6ab61765adf7c50a76b9b38b8fad1cd5683d2526391d1c3f67e41de3208be09e49d8b7db3a063fac3ad
 EBUILD selinux-resolvconf-2.20180114-r1.ebuild 290 BLAKE2B c79ad531030fcbfc49ee64b30f29e7ba942aa87f41331577701b97b9519bb9d3dd3419cb9488b8fcac157198487e1129c155c1c7cfeaf921070e84fe73cc6e4c SHA512 d6fc316a1808285e0a8d96d29020c8a876f8da462043e74e3bd63168c25520e436624a1e3c1b5dc4ff792ad44306984cb6e514884f1ea7ac5b44aa3238d33093
 EBUILD selinux-resolvconf-2.20180114-r2.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
+EBUILD selinux-resolvconf-2.20180114-r3.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
 EBUILD selinux-resolvconf-9999.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
 MISC metadata.xml 320 BLAKE2B fb1910a5f3e88fdfd7a95e0bf6e495eb2f2671a37a77f3fc2f804e8dc5b82f1626e0d0ac53020d83467bbca29d563efc54e119cbc3da8d760c7959827034c30f SHA512 a0886fd0602510911aa320748175141f3c30f31361994fd86a8a3923962252dfda9ec6d08a07502b514d8366fc4b7ecc0311fad268620b8eddd1be6af4f86183
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r1.ebuild
deleted file mode 100644
index e8cbc1daf54e..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r2.ebuild
deleted file mode 100644
index 42f62e6a45d7..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r3.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r3.ebuild
deleted file mode 100644
index 42f62e6a45d7..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r4.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r4.ebuild
deleted file mode 100644
index 42f62e6a45d7..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r4.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r4.ebuild
deleted file mode 100644
index e8cbc1daf54e..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180114-r3.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e1fbd450a3b6
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="resolvconf"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for resolvconf"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index 763a536d5283..0ba2dbf446f3 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rgmanager-2.20170204-r1.ebuild 290 BLAKE2B 55d87828681f8835c4261910e873335fb75fb99ad3a2b538fddbaa2fa1c68ba2acb8fe35377a61d3460c34b40ef89bdd2a4ef0928ed6caf080529e9f05565908 SHA512 699bdd339d310b6da3846309c3c6a0657ca71c42e942e1f2ca2a71fa8a36b482a52e580624a2e60771931d4dd74d1d54ff48ce62273263a2f2a1bd631144f413
-EBUILD selinux-rgmanager-2.20170204-r2.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517283db374f4bb7da9ecde9140091a0106581250d8bb477c4b7605ce21acf9b7b3c8ed6b04eac001da5b92e7ed3567f1b6fb322470bc SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458
-EBUILD selinux-rgmanager-2.20170204-r3.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517283db374f4bb7da9ecde9140091a0106581250d8bb477c4b7605ce21acf9b7b3c8ed6b04eac001da5b92e7ed3567f1b6fb322470bc SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458
-EBUILD selinux-rgmanager-2.20170204-r4.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517283db374f4bb7da9ecde9140091a0106581250d8bb477c4b7605ce21acf9b7b3c8ed6b04eac001da5b92e7ed3567f1b6fb322470bc SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458
 EBUILD selinux-rgmanager-2.20170805-r2.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517283db374f4bb7da9ecde9140091a0106581250d8bb477c4b7605ce21acf9b7b3c8ed6b04eac001da5b92e7ed3567f1b6fb322470bc SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458
 EBUILD selinux-rgmanager-2.20170805-r3.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517283db374f4bb7da9ecde9140091a0106581250d8bb477c4b7605ce21acf9b7b3c8ed6b04eac001da5b92e7ed3567f1b6fb322470bc SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458
-EBUILD selinux-rgmanager-2.20170805-r4.ebuild 290 BLAKE2B 55d87828681f8835c4261910e873335fb75fb99ad3a2b538fddbaa2fa1c68ba2acb8fe35377a61d3460c34b40ef89bdd2a4ef0928ed6caf080529e9f05565908 SHA512 699bdd339d310b6da3846309c3c6a0657ca71c42e942e1f2ca2a71fa8a36b482a52e580624a2e60771931d4dd74d1d54ff48ce62273263a2f2a1bd631144f413
 EBUILD selinux-rgmanager-2.20180114-r1.ebuild 288 BLAKE2B fa53326d8f2a77f4dac1c37e7787292f0e3fe65c2a8f712ada83e90f1dd0272af22c3ca7e553747b14398f61feac41856ab4d7c4cc61a26c69106d31e8ca4655 SHA512 4266859112acaba909ae5178f6a287762d9c4d48c8db22e333b70143a8efc71e8cadc19274ba50b8b9e4511538b0557ea70fce3613bd310485b155ac3e30f19a
 EBUILD selinux-rgmanager-2.20180114-r2.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
+EBUILD selinux-rgmanager-2.20180114-r3.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
 EBUILD selinux-rgmanager-9999.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
 MISC metadata.xml 319 BLAKE2B ca194dfa68c48ec29894ecf75ddfd81e61911888fa10274f2a979f094403a6677ef3578e5b61274ad77eb51f7523d27a43df5ada162d6b475c6170ad0f409222 SHA512 3fe6e00bc4ff66fa281731582d5713081be180c8340ecd2c28501629018dac75c731d6a154cb84dc587af87e85bd787937ff64a16f9180400d0ed4894871df61
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r1.ebuild
deleted file mode 100644
index a4634675fedf..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r2.ebuild
deleted file mode 100644
index 512e893e0173..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r3.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r3.ebuild
deleted file mode 100644
index 512e893e0173..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r4.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r4.ebuild
deleted file mode 100644
index 512e893e0173..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r4.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r4.ebuild
deleted file mode 100644
index a4634675fedf..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180114-r3.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c3ff16e532a0
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rgmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index 20fd462bbbde..fd4e4ea1296d 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rngd-2.20170204-r1.ebuild 280 BLAKE2B 0afb79f2decd799a4b39bb3d893b1c111151259de1e981d268a0333eb30a5b32287884b08497efbc8e149f85482a6cfa8d516f5605d612e8276526ee77a10b59 SHA512 81730c9374298549144660e309c23450121df6e33635302ff51c7222b92e963365358de3382136f3575989a534611bd26481a52453f7165e8395ccd62a63c462
-EBUILD selinux-rngd-2.20170204-r2.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e2784b495fac6b190944c99fe8833798ee81be91545e1d48e9dd179ba3b3090c89d9fecd052c891ce51a92a55e3e3b7ae52cd6b5e SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b
-EBUILD selinux-rngd-2.20170204-r3.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e2784b495fac6b190944c99fe8833798ee81be91545e1d48e9dd179ba3b3090c89d9fecd052c891ce51a92a55e3e3b7ae52cd6b5e SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b
-EBUILD selinux-rngd-2.20170204-r4.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e2784b495fac6b190944c99fe8833798ee81be91545e1d48e9dd179ba3b3090c89d9fecd052c891ce51a92a55e3e3b7ae52cd6b5e SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b
 EBUILD selinux-rngd-2.20170805-r2.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e2784b495fac6b190944c99fe8833798ee81be91545e1d48e9dd179ba3b3090c89d9fecd052c891ce51a92a55e3e3b7ae52cd6b5e SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b
 EBUILD selinux-rngd-2.20170805-r3.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e2784b495fac6b190944c99fe8833798ee81be91545e1d48e9dd179ba3b3090c89d9fecd052c891ce51a92a55e3e3b7ae52cd6b5e SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b
-EBUILD selinux-rngd-2.20170805-r4.ebuild 280 BLAKE2B 0afb79f2decd799a4b39bb3d893b1c111151259de1e981d268a0333eb30a5b32287884b08497efbc8e149f85482a6cfa8d516f5605d612e8276526ee77a10b59 SHA512 81730c9374298549144660e309c23450121df6e33635302ff51c7222b92e963365358de3382136f3575989a534611bd26481a52453f7165e8395ccd62a63c462
 EBUILD selinux-rngd-2.20180114-r1.ebuild 278 BLAKE2B 0bee59ed11f29fb240283ba55e96f3b26b8b1cda9dccf16285d9a760cce14011982400f2c71ccc838827ce44ff2711b6490acb464dfd7913d150e55b0e6cd03e SHA512 75a2f755d889d76b9355deab8e09a0835a5696c5c59c8f789970d3b927a2df9e392cec256bcf56f2864c111407fd0185560152263426660314a7619427333e14
 EBUILD selinux-rngd-2.20180114-r2.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
+EBUILD selinux-rngd-2.20180114-r3.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
 EBUILD selinux-rngd-9999.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
 MISC metadata.xml 314 BLAKE2B 513d7e06f59b864334350fbefb1a4baedca21f57aaec2505f2e76681dd04dc179e3371ac97006e533f1ecc445cd97790b10b3258b2086ee282455ad308766695 SHA512 fd3229d5a3c38e74a5ac713c58882697f0effec4f4c64a0fa6649f6b068934a9669a56c05eceff23970d884094b3336532ef36c48acbf27904a8628bdce677fc
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r1.ebuild
deleted file mode 100644
index fab98c37fb75..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r2.ebuild
deleted file mode 100644
index 94b1d6c82413..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r3.ebuild
deleted file mode 100644
index 94b1d6c82413..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r4.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r4.ebuild
deleted file mode 100644
index 94b1d6c82413..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r4.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r4.ebuild
deleted file mode 100644
index fab98c37fb75..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20180114-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..cf9dea3431e6
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rngd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rngd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 0d7f7409ce2f..56e68f91ec47 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-roundup-2.20170204-r1.ebuild 286 BLAKE2B a66fe87956f690567a4818be08b4fedd417bb2845e6c240e5fd2898526c6e55198cd0c17892ef93701cf8edc02a2e5b34005ab4f5debace7e36ac757d630e106 SHA512 a8c9f440658db9d1889b3751c2291dd3bea564b05f356b410283f7f7299307682667df22ed36bd1e999b43cc884763b6b2e9674a0fc76a43c7e91e5644b7bd2e
-EBUILD selinux-roundup-2.20170204-r2.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1fcd2000b06c0cfbed221fdc7245de3e1668d7f7b23c9a914254df4cd6cc3839d1227b94b2f6c7a6c69e2293968b3a558ae33ab27 SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb
-EBUILD selinux-roundup-2.20170204-r3.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1fcd2000b06c0cfbed221fdc7245de3e1668d7f7b23c9a914254df4cd6cc3839d1227b94b2f6c7a6c69e2293968b3a558ae33ab27 SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb
-EBUILD selinux-roundup-2.20170204-r4.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1fcd2000b06c0cfbed221fdc7245de3e1668d7f7b23c9a914254df4cd6cc3839d1227b94b2f6c7a6c69e2293968b3a558ae33ab27 SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb
 EBUILD selinux-roundup-2.20170805-r2.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1fcd2000b06c0cfbed221fdc7245de3e1668d7f7b23c9a914254df4cd6cc3839d1227b94b2f6c7a6c69e2293968b3a558ae33ab27 SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb
 EBUILD selinux-roundup-2.20170805-r3.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1fcd2000b06c0cfbed221fdc7245de3e1668d7f7b23c9a914254df4cd6cc3839d1227b94b2f6c7a6c69e2293968b3a558ae33ab27 SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb
-EBUILD selinux-roundup-2.20170805-r4.ebuild 286 BLAKE2B a66fe87956f690567a4818be08b4fedd417bb2845e6c240e5fd2898526c6e55198cd0c17892ef93701cf8edc02a2e5b34005ab4f5debace7e36ac757d630e106 SHA512 a8c9f440658db9d1889b3751c2291dd3bea564b05f356b410283f7f7299307682667df22ed36bd1e999b43cc884763b6b2e9674a0fc76a43c7e91e5644b7bd2e
 EBUILD selinux-roundup-2.20180114-r1.ebuild 284 BLAKE2B aad4498fc5fc0275ee5c58d3076e4435c0ed0cd2db2e8bd082ffc059674c1a49acefd46353a337defc5fbbc3b47f5a6f3414b236d8659bc1ce5112a57c13a5d7 SHA512 04ea35c7852a1b54da3a720a581105c909072f8718c852f35982b7dbe9aaeb91048a4025f3232df130a7d0a6fd54747b62a30f6e25b2e23aeaf78f87736917a8
 EBUILD selinux-roundup-2.20180114-r2.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
+EBUILD selinux-roundup-2.20180114-r3.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
 EBUILD selinux-roundup-9999.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
 MISC metadata.xml 317 BLAKE2B 48aeb72f67904490c071c0de906f946a2c576225495c4e3613b6b7d1c7549536dcc94d76c59d478f2b350a24f293aef611bb2bbad618f294d61ede0eb73cecad SHA512 d52f384e061b6b658c8b1e0a692c37698e8054e4e3dcd48de402a15b76551befaedee464bd8fca9afddc11550ad735ee5f5857801eaf79579939000e4d4f5f22
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r1.ebuild
deleted file mode 100644
index f6155ea5c0e6..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r2.ebuild
deleted file mode 100644
index 3f643b0125a9..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r3.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r3.ebuild
deleted file mode 100644
index 3f643b0125a9..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r4.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r4.ebuild
deleted file mode 100644
index 3f643b0125a9..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r4.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r4.ebuild
deleted file mode 100644
index f6155ea5c0e6..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20180114-r3.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2a695a0dcd64
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="roundup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for roundup"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 19194c61c506..84dc46d44686 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rpc-2.20170204-r1.ebuild 278 BLAKE2B b4b4906d28341d0890c7f422ec14509751caca7f7c85e2e871a1bdc224355226b6e86c2b000bfc5d5beee2cb0a4f835e3130a2f36bbdeb360d698b7fc92fea47 SHA512 21a385ef523487562cbe8bc4174d1d0d84b6e96f32bd72bb5f064eb4a4afe46197e9ef9800afe0a922985a565d0d21c6a151e464411414d4a740864eb726e605
-EBUILD selinux-rpc-2.20170204-r2.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67b89a1b37ab219a996191ee1253c7718d38a1952929c018d1c580bf05b9f512bc6ff2bea4bd340a54ca52cab2123829c4e175 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76
-EBUILD selinux-rpc-2.20170204-r3.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67b89a1b37ab219a996191ee1253c7718d38a1952929c018d1c580bf05b9f512bc6ff2bea4bd340a54ca52cab2123829c4e175 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76
-EBUILD selinux-rpc-2.20170204-r4.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67b89a1b37ab219a996191ee1253c7718d38a1952929c018d1c580bf05b9f512bc6ff2bea4bd340a54ca52cab2123829c4e175 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76
 EBUILD selinux-rpc-2.20170805-r2.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67b89a1b37ab219a996191ee1253c7718d38a1952929c018d1c580bf05b9f512bc6ff2bea4bd340a54ca52cab2123829c4e175 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76
 EBUILD selinux-rpc-2.20170805-r3.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67b89a1b37ab219a996191ee1253c7718d38a1952929c018d1c580bf05b9f512bc6ff2bea4bd340a54ca52cab2123829c4e175 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76
-EBUILD selinux-rpc-2.20170805-r4.ebuild 278 BLAKE2B b4b4906d28341d0890c7f422ec14509751caca7f7c85e2e871a1bdc224355226b6e86c2b000bfc5d5beee2cb0a4f835e3130a2f36bbdeb360d698b7fc92fea47 SHA512 21a385ef523487562cbe8bc4174d1d0d84b6e96f32bd72bb5f064eb4a4afe46197e9ef9800afe0a922985a565d0d21c6a151e464411414d4a740864eb726e605
 EBUILD selinux-rpc-2.20180114-r1.ebuild 276 BLAKE2B 800277ef62e11d41ad679f6e512c11e44ef5da7ec52f91d735da3d407b65510aad93f787cb3cedf248a1e8321956421485f563eb3d31d3e17c196377b3208429 SHA512 31750b63182112745a6d3ed6728fa74dbac6792fcf91e71480567a823af33b4253c2a144c192a8035a053a6b75d80d46b7911a4ab46b264337a3e6b9d708c1cd
 EBUILD selinux-rpc-2.20180114-r2.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
+EBUILD selinux-rpc-2.20180114-r3.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
 EBUILD selinux-rpc-9999.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
 MISC metadata.xml 313 BLAKE2B 7d496dd5e180419c17a712b92c464695df58b5ef3da31834e791390ff031afbd5c4e12920424aa87d34c6fe32bbeab0257335c4c2133ba7b1bd936879ae7b1ba SHA512 ddb7d0ea7dabca0eae92354cf6f8b6a8d488a7b483fe87bcbf8ad17e6d9641531e93ab999f8e4f5b7257eee469adc400dbf00a7854538e44a58b5a718586d937
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r1.ebuild
deleted file mode 100644
index d49e871c3dc0..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r2.ebuild
deleted file mode 100644
index f2a514e5612c..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r3.ebuild
deleted file mode 100644
index f2a514e5612c..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r4.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r4.ebuild
deleted file mode 100644
index f2a514e5612c..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r4.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r4.ebuild
deleted file mode 100644
index d49e871c3dc0..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20180114-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..dd191f5c475e
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index c3097084af89..a1ca6106daa1 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rpcbind-2.20170204-r1.ebuild 286 BLAKE2B 792aaa6453011d57f5bac4fd78f78fb74a787c1216440178ca4a0d0b7b5c58c32c29c5fd5e6168264955865288f7e9b4e1c6aba3334e68c7719a06f688473e20 SHA512 58d8de2acb54ceea44e21b26b84a77a976448d39b740a2f42e10aa68b0ea114e5e98a54614f2efd179b8d1ca55c3bb03bb87e85aab7f39716340af636ac94023
-EBUILD selinux-rpcbind-2.20170204-r2.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6ddabb0349819007c742d3dfca0e3673c94b1ea4b0f5008e137e1e3887943902c7a189da5bb46084bc1637ade7c785439ccae8e024 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a
-EBUILD selinux-rpcbind-2.20170204-r3.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6ddabb0349819007c742d3dfca0e3673c94b1ea4b0f5008e137e1e3887943902c7a189da5bb46084bc1637ade7c785439ccae8e024 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a
-EBUILD selinux-rpcbind-2.20170204-r4.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6ddabb0349819007c742d3dfca0e3673c94b1ea4b0f5008e137e1e3887943902c7a189da5bb46084bc1637ade7c785439ccae8e024 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a
 EBUILD selinux-rpcbind-2.20170805-r2.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6ddabb0349819007c742d3dfca0e3673c94b1ea4b0f5008e137e1e3887943902c7a189da5bb46084bc1637ade7c785439ccae8e024 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a
 EBUILD selinux-rpcbind-2.20170805-r3.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6ddabb0349819007c742d3dfca0e3673c94b1ea4b0f5008e137e1e3887943902c7a189da5bb46084bc1637ade7c785439ccae8e024 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a
-EBUILD selinux-rpcbind-2.20170805-r4.ebuild 286 BLAKE2B 792aaa6453011d57f5bac4fd78f78fb74a787c1216440178ca4a0d0b7b5c58c32c29c5fd5e6168264955865288f7e9b4e1c6aba3334e68c7719a06f688473e20 SHA512 58d8de2acb54ceea44e21b26b84a77a976448d39b740a2f42e10aa68b0ea114e5e98a54614f2efd179b8d1ca55c3bb03bb87e85aab7f39716340af636ac94023
 EBUILD selinux-rpcbind-2.20180114-r1.ebuild 284 BLAKE2B d9dbaec85bf96aae9b8f7989bfaa0d16da52c2c9f26b145881be4b509b1d47b86d68278d50975b80512d750f6dbffd37a305c0d328c94af3700b3bd5d21ac0df SHA512 e075f0d6a19b54e909a872cf83b9d625625f3a890b93421e521dca633056e82e1787617e4a5ea1b23aa360f2ef096724cfb406034a11c89e2282e426931daa5f
 EBUILD selinux-rpcbind-2.20180114-r2.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
+EBUILD selinux-rpcbind-2.20180114-r3.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
 EBUILD selinux-rpcbind-9999.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
 MISC metadata.xml 317 BLAKE2B 8ea56a9585ed24600649e412272989d00dde035ede35ff4fe79008920db09576c9a5eaf6b7f826f050de0edc995db3ae88de9a743fb8b97012d38115a0dc4a44 SHA512 903ca4b03b1d626137474588ce532951d7ce861ccd800b63e65bb662b79e61faf5439e323a329f0870c8718ca4f38e466979f6bd78b0a4564c342e6ced8734a3
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r1.ebuild
deleted file mode 100644
index c2f8f06fca17..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r2.ebuild
deleted file mode 100644
index 9719bf26dcb3..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r3.ebuild
deleted file mode 100644
index 9719bf26dcb3..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r4.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r4.ebuild
deleted file mode 100644
index 9719bf26dcb3..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r4.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r4.ebuild
deleted file mode 100644
index c2f8f06fca17..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180114-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..16c4589f6924
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpcbind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpcbind"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index db54a96596ed..b12a96e0d484 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rpm-2.20170204-r1.ebuild 278 BLAKE2B 606f3699165355df0d9f4113cbf950766da4ee797a47e29e63db66f56a570feb9189074eac007e7293e21b77088f9409025e1abadbb3b900d6e3ee2d036b5d2c SHA512 b56b74aaa78c0a795b765955950c3d8923b07ff8459a3ff2d11738e9000d87b4db0b0500ba7023e12fa63f422c9eaef2b81ab07d1075a482fc4a6d06113bdf24
-EBUILD selinux-rpm-2.20170204-r2.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e793170076ef4802b2b3bb9c58ce62a1c7c97c2aace6be998d1f094c189bc7499ab64882aff086d6a69c0f89988c6108586b2 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b
-EBUILD selinux-rpm-2.20170204-r3.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e793170076ef4802b2b3bb9c58ce62a1c7c97c2aace6be998d1f094c189bc7499ab64882aff086d6a69c0f89988c6108586b2 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b
-EBUILD selinux-rpm-2.20170204-r4.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e793170076ef4802b2b3bb9c58ce62a1c7c97c2aace6be998d1f094c189bc7499ab64882aff086d6a69c0f89988c6108586b2 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b
 EBUILD selinux-rpm-2.20170805-r2.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e793170076ef4802b2b3bb9c58ce62a1c7c97c2aace6be998d1f094c189bc7499ab64882aff086d6a69c0f89988c6108586b2 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b
 EBUILD selinux-rpm-2.20170805-r3.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e793170076ef4802b2b3bb9c58ce62a1c7c97c2aace6be998d1f094c189bc7499ab64882aff086d6a69c0f89988c6108586b2 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b
-EBUILD selinux-rpm-2.20170805-r4.ebuild 278 BLAKE2B 606f3699165355df0d9f4113cbf950766da4ee797a47e29e63db66f56a570feb9189074eac007e7293e21b77088f9409025e1abadbb3b900d6e3ee2d036b5d2c SHA512 b56b74aaa78c0a795b765955950c3d8923b07ff8459a3ff2d11738e9000d87b4db0b0500ba7023e12fa63f422c9eaef2b81ab07d1075a482fc4a6d06113bdf24
 EBUILD selinux-rpm-2.20180114-r1.ebuild 276 BLAKE2B 387831059d418204789e9af654b5d5e8e35fb937d17907ef5cc34299ed129e0b79639d53860fcc02c2cf43255f2ef9437190ca6cba48c3ee452fe53366d885ee SHA512 46aa5f078d6162981fb267af6a670a6efa16f14ff67b47585e05fffb1dead64a09e06f0640d059e355df67640ad61e3f86d2cdbcc6f9f8c8afd1890d0582913b
 EBUILD selinux-rpm-2.20180114-r2.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
+EBUILD selinux-rpm-2.20180114-r3.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
 EBUILD selinux-rpm-9999.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
 MISC metadata.xml 313 BLAKE2B 0ab90c03f0fcaf067a288f97269c036a325cf51d9c11664e48764d5b2f54fd4a25d6bfa76c0808375ce331598a1c67a0ed8c83dd0cfbf14265b5f94fad5a3d61 SHA512 d242612261b4697fef46c087a118c428fcbb6e3a462a9dd1ed7ec95edc4405fe35ce6ab9fe05fd74d68ca0922dfb2749fd77677a123c6e452505679c8e3eec38
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r1.ebuild
deleted file mode 100644
index 45076e967f27..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r2.ebuild
deleted file mode 100644
index 59bb7c84fd76..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r3.ebuild
deleted file mode 100644
index 59bb7c84fd76..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r4.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r4.ebuild
deleted file mode 100644
index 59bb7c84fd76..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r4.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r4.ebuild
deleted file mode 100644
index 45076e967f27..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20180114-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..9b767ab57db8
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 16fb46bb5f8b..0d12d849b00a 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rssh-2.20170204-r1.ebuild 280 BLAKE2B 726c4b2c06aa1a46d1eca4a4aec113a38783f31c931b49c0710089d4e70998866c1554b59c659ad9ae985d71124210df89d8721c5fa5a52ab07350dbba7b19e1 SHA512 b7163f307201217150d4f897801c8c7cf968e1a8819e299bba5026c2975dd02da595ea36a4117eb17f061fde436e1eb632869e601dfad87cd4e80c6bbf5af045
-EBUILD selinux-rssh-2.20170204-r2.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2ad9d6931c7c3a83fe104343df4438a4eb951ffabd256551ce734886c835acd41e21fbe4e88713f7d8921a0e458a37bb19f6a28 SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba
-EBUILD selinux-rssh-2.20170204-r3.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2ad9d6931c7c3a83fe104343df4438a4eb951ffabd256551ce734886c835acd41e21fbe4e88713f7d8921a0e458a37bb19f6a28 SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba
-EBUILD selinux-rssh-2.20170204-r4.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2ad9d6931c7c3a83fe104343df4438a4eb951ffabd256551ce734886c835acd41e21fbe4e88713f7d8921a0e458a37bb19f6a28 SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba
 EBUILD selinux-rssh-2.20170805-r2.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2ad9d6931c7c3a83fe104343df4438a4eb951ffabd256551ce734886c835acd41e21fbe4e88713f7d8921a0e458a37bb19f6a28 SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba
 EBUILD selinux-rssh-2.20170805-r3.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2ad9d6931c7c3a83fe104343df4438a4eb951ffabd256551ce734886c835acd41e21fbe4e88713f7d8921a0e458a37bb19f6a28 SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba
-EBUILD selinux-rssh-2.20170805-r4.ebuild 280 BLAKE2B 726c4b2c06aa1a46d1eca4a4aec113a38783f31c931b49c0710089d4e70998866c1554b59c659ad9ae985d71124210df89d8721c5fa5a52ab07350dbba7b19e1 SHA512 b7163f307201217150d4f897801c8c7cf968e1a8819e299bba5026c2975dd02da595ea36a4117eb17f061fde436e1eb632869e601dfad87cd4e80c6bbf5af045
 EBUILD selinux-rssh-2.20180114-r1.ebuild 278 BLAKE2B 0dff0649e4ebcbc7725c7f949fc999c8f93e1bd8ad0de1b1da2ba2b99d54cc88642f460ceb13e6164bd2f1c988bae721e0c4969e45b8111e8e5deefe663bbba0 SHA512 c3ee8e3e5e5a4f9f9f9f76db6ac2fa88d9802d436f76a2d5938cfe1e0eb10d16936e19be88631d32b99af784daced28fb87b11a9a9af06eed0f6f49abd38220c
 EBUILD selinux-rssh-2.20180114-r2.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
+EBUILD selinux-rssh-2.20180114-r3.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
 EBUILD selinux-rssh-9999.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
 MISC metadata.xml 314 BLAKE2B 6c1539b4a9e4db6f0c2727a5b007880cdb7d094a45cfa1ee30ad86b3265d23b7f141b8aa6516a3158a400f0b71ea080bad9be868379d88ad985c0b87d3a81812 SHA512 ace4b64738699a4322654bba904e10a682ffbbff7b2e7e1f28551aae8bf81188ecfe12a3400b8adbc110f6559d5b4d5820f49910a85dc0bd791cb3a73e07234d
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r1.ebuild
deleted file mode 100644
index f962319827c1..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r2.ebuild
deleted file mode 100644
index 21d4a46f4368..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r3.ebuild
deleted file mode 100644
index 21d4a46f4368..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r4.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r4.ebuild
deleted file mode 100644
index 21d4a46f4368..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r4.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r4.ebuild
deleted file mode 100644
index f962319827c1..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20180114-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..802637b63464
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rssh"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rssh"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index 99f3a71ebacf..7416aeb9b04f 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rtkit-2.20170204-r1.ebuild 374 BLAKE2B a30fd5cf021c7bff8fae75e25789a175aa5d9de35c0f0f98788825e3601da2cfe9e3f8894a9800587dfb32817642b7aee478850dfda41fdc47a8ee7758ab6aab SHA512 899903c2c2ca652a7653ff26064c4374c70425116cae7f45505bdd1d1f0c4c93d04fbe3cb07eb27fb42082144c0e6ddba53da91a9023130ff01a33c5a8cb6d7b
-EBUILD selinux-rtkit-2.20170204-r2.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef49d3b6b041d847778f639b172d09ea7a38908f516066028dd2bc50ef62593514d68096ba0660cf1be6049b2f2f22e891881b440 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058
-EBUILD selinux-rtkit-2.20170204-r3.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef49d3b6b041d847778f639b172d09ea7a38908f516066028dd2bc50ef62593514d68096ba0660cf1be6049b2f2f22e891881b440 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058
-EBUILD selinux-rtkit-2.20170204-r4.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef49d3b6b041d847778f639b172d09ea7a38908f516066028dd2bc50ef62593514d68096ba0660cf1be6049b2f2f22e891881b440 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058
 EBUILD selinux-rtkit-2.20170805-r2.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef49d3b6b041d847778f639b172d09ea7a38908f516066028dd2bc50ef62593514d68096ba0660cf1be6049b2f2f22e891881b440 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058
 EBUILD selinux-rtkit-2.20170805-r3.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef49d3b6b041d847778f639b172d09ea7a38908f516066028dd2bc50ef62593514d68096ba0660cf1be6049b2f2f22e891881b440 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058
-EBUILD selinux-rtkit-2.20170805-r4.ebuild 374 BLAKE2B a30fd5cf021c7bff8fae75e25789a175aa5d9de35c0f0f98788825e3601da2cfe9e3f8894a9800587dfb32817642b7aee478850dfda41fdc47a8ee7758ab6aab SHA512 899903c2c2ca652a7653ff26064c4374c70425116cae7f45505bdd1d1f0c4c93d04fbe3cb07eb27fb42082144c0e6ddba53da91a9023130ff01a33c5a8cb6d7b
 EBUILD selinux-rtkit-2.20180114-r1.ebuild 372 BLAKE2B 7d556364b3ec8b8324a93a6bb960df605e907b99ae9cf778461bce53bd951082a047526264a143f8bd3d20b5ba73b5879ea01fd7fa32def77a59ed8d997746b5 SHA512 78b55ca8bf1f6aa87629c92148ea3c9172f0d3f9195da8b24123751e4f91735269ee7ed864db79dd1d409f06e18e6a93d26910f5db546a9e0a145e9a94de9164
 EBUILD selinux-rtkit-2.20180114-r2.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
+EBUILD selinux-rtkit-2.20180114-r3.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
 EBUILD selinux-rtkit-9999.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
 MISC metadata.xml 315 BLAKE2B 35a8407fb69824482900b61bd80d8d7861a23b5a4b6f0c314cf92debba2290da83dfa0733428a35bbee6e108cc49f95275e6b6e28b7a307da07329f49ede626c SHA512 d3c120cce40e5aa7af88aa6603cf1389c5691023d21b0f9ead865c1cd1305008c286d7433f1364387360bbf0820ee32be67d820fc070c32ac89a6919382261a2
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r1.ebuild
deleted file mode 100644
index 7c7434d72bea..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r2.ebuild
deleted file mode 100644
index d112318cb27c..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r3.ebuild
deleted file mode 100644
index d112318cb27c..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r4.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r4.ebuild
deleted file mode 100644
index d112318cb27c..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r4.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r4.ebuild
deleted file mode 100644
index 7c7434d72bea..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20180114-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e3c7a6ffeeca
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rtkit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtkit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index c2b5fee93944..356793a91712 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-rtorrent-2.20170204-r1.ebuild 288 BLAKE2B 3d23378696d14e6eaf8f38771556227d487c483f4464a0f58b84cf657de71a07ee2e3e5999563a64d0517182c266884b2c7295e07479f6f969b29c3eea415da9 SHA512 ec0430392715f3fea025141fee031164d597fa6d702902294bf51df86ab06132d4945454b9747e316cc97d6606ebcffafd71f54612c0f98c0b9df76837fc7c8d
-EBUILD selinux-rtorrent-2.20170204-r2.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2376a497760846d8a42232db30d5d02f0eb590f8d8a4211d71bd2790ae2a8ca98e501c6291b8401af721e5b07c359e7fb1a8b8a968 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2
-EBUILD selinux-rtorrent-2.20170204-r3.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2376a497760846d8a42232db30d5d02f0eb590f8d8a4211d71bd2790ae2a8ca98e501c6291b8401af721e5b07c359e7fb1a8b8a968 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2
-EBUILD selinux-rtorrent-2.20170204-r4.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2376a497760846d8a42232db30d5d02f0eb590f8d8a4211d71bd2790ae2a8ca98e501c6291b8401af721e5b07c359e7fb1a8b8a968 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2
 EBUILD selinux-rtorrent-2.20170805-r2.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2376a497760846d8a42232db30d5d02f0eb590f8d8a4211d71bd2790ae2a8ca98e501c6291b8401af721e5b07c359e7fb1a8b8a968 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2
 EBUILD selinux-rtorrent-2.20170805-r3.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2376a497760846d8a42232db30d5d02f0eb590f8d8a4211d71bd2790ae2a8ca98e501c6291b8401af721e5b07c359e7fb1a8b8a968 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2
-EBUILD selinux-rtorrent-2.20170805-r4.ebuild 288 BLAKE2B 3d23378696d14e6eaf8f38771556227d487c483f4464a0f58b84cf657de71a07ee2e3e5999563a64d0517182c266884b2c7295e07479f6f969b29c3eea415da9 SHA512 ec0430392715f3fea025141fee031164d597fa6d702902294bf51df86ab06132d4945454b9747e316cc97d6606ebcffafd71f54612c0f98c0b9df76837fc7c8d
 EBUILD selinux-rtorrent-2.20180114-r1.ebuild 286 BLAKE2B fa17f9d900967bfc3f3e323b8a9e6ece938a20547989e64d8a608020465e93a61563149755830e0bba627b6a900c260539819807c93b3bd3d26afaced1d500cb SHA512 871f9aa8f5410aa3c986a0cd4e5f0d7b0587d9818985f14a73066132afb14fe34b948b3c271118ea7e9dc33ed8e675c4e4291a2e34c934de98f3e9ce7e53ebc0
 EBUILD selinux-rtorrent-2.20180114-r2.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
+EBUILD selinux-rtorrent-2.20180114-r3.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
 EBUILD selinux-rtorrent-9999.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
 MISC metadata.xml 318 BLAKE2B 55d670e11602395b801aa1f7794353c9418326e4d11c4488fb14695ccc288ae364e9e1625321948295e72d6e9e710767af35566161e75eb74ae4e09c831317d7 SHA512 a16d37c7a1c742c24f0b87f126157efaf9a62929d891cb93a3abfe0937f71b56eaec201f9f648f20697347c5628f330114a6e1c2132f5364d828c1c68936c3bb
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r1.ebuild
deleted file mode 100644
index 3c24e1312d0f..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r2.ebuild
deleted file mode 100644
index dd1f6c8ef94b..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r3.ebuild
deleted file mode 100644
index dd1f6c8ef94b..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r4.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r4.ebuild
deleted file mode 100644
index dd1f6c8ef94b..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r4.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r4.ebuild
deleted file mode 100644
index 3c24e1312d0f..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180114-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3b601d633ec8
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rtorrent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtorrent"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index dbf9db5927df..1d39f6c90813 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-salt-2.20170204-r1.ebuild 280 BLAKE2B 9f336e2195284f2146e4b4bdd9bd64bfbae71dd559d75f2bfb579b8c4fcd9225547cb71f1fd3fbae43617c2e143acd2b6495a86be77a88811cd36fcaa8d1e098 SHA512 561a38ade7c43d7bf06ee8269016b645175b886ec16ed506390212acc0b96597315ee321a039e666d228cfac83f1e27238634a6ca8a4e7ad4573ab2580ff35b4
-EBUILD selinux-salt-2.20170204-r2.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f895b93a6c258fa96c80d07b6f6c2b51d2f8f6a3d043082517f1c39e9efb1aec592882b5f09dda7351cb14450f2bd7139b1c565 SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60
-EBUILD selinux-salt-2.20170204-r3.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f895b93a6c258fa96c80d07b6f6c2b51d2f8f6a3d043082517f1c39e9efb1aec592882b5f09dda7351cb14450f2bd7139b1c565 SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60
-EBUILD selinux-salt-2.20170204-r4.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f895b93a6c258fa96c80d07b6f6c2b51d2f8f6a3d043082517f1c39e9efb1aec592882b5f09dda7351cb14450f2bd7139b1c565 SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60
 EBUILD selinux-salt-2.20170805-r2.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f895b93a6c258fa96c80d07b6f6c2b51d2f8f6a3d043082517f1c39e9efb1aec592882b5f09dda7351cb14450f2bd7139b1c565 SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60
 EBUILD selinux-salt-2.20170805-r3.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f895b93a6c258fa96c80d07b6f6c2b51d2f8f6a3d043082517f1c39e9efb1aec592882b5f09dda7351cb14450f2bd7139b1c565 SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60
-EBUILD selinux-salt-2.20170805-r4.ebuild 280 BLAKE2B 9f336e2195284f2146e4b4bdd9bd64bfbae71dd559d75f2bfb579b8c4fcd9225547cb71f1fd3fbae43617c2e143acd2b6495a86be77a88811cd36fcaa8d1e098 SHA512 561a38ade7c43d7bf06ee8269016b645175b886ec16ed506390212acc0b96597315ee321a039e666d228cfac83f1e27238634a6ca8a4e7ad4573ab2580ff35b4
 EBUILD selinux-salt-2.20180114-r1.ebuild 278 BLAKE2B 53bcdf785a5fd09a2fa1c58cebd408145513a710bb0a703136f28a3d6d340281488009073eb90dedfb34a4326fd94e8331958a042d724213ace4fd67a8ee6a21 SHA512 7b9c581c011abb9d5579adc6784a381ba8bdad5644f40282f25738fd0598b2f64aee9b6b10d24982fb8e10aa7a81be227fee92cf20c5059ce540e724e502361e
 EBUILD selinux-salt-2.20180114-r2.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
+EBUILD selinux-salt-2.20180114-r3.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
 EBUILD selinux-salt-9999.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
 MISC metadata.xml 314 BLAKE2B 2350a13155f12cb04aed75e030971f0ebb9cc7151b177bfd98c2d64dfbe6b1df79ec8fc09df61a2f5cc2ee6d641d3d1910259e6661d4522b3dfef554776bb5a0 SHA512 634ec5b038d166c8b654784e899ef50e4ffb87a855cc5fc54230276b89a84a1d879e84b52af6165edd1c4533eb37085443073d56d9f8f95e29b52945c0b6767a
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170204-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170204-r1.ebuild
deleted file mode 100644
index b6d17ac4b6d5..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170204-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170204-r2.ebuild
deleted file mode 100644
index 85eed76b3642..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170204-r3.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170204-r3.ebuild
deleted file mode 100644
index 85eed76b3642..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170204-r4.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170204-r4.ebuild
deleted file mode 100644
index 85eed76b3642..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170805-r4.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170805-r4.ebuild
deleted file mode 100644
index b6d17ac4b6d5..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20180114-r3.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..bc84b0e7d7ea
--- /dev/null
+++ b/sec-policy/selinux-salt/selinux-salt-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="salt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for salt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 45c77a6cc161..b2582a4aaa3c 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-samba-2.20170204-r1.ebuild 282 BLAKE2B a578bd7e149399eb0997b0d8e0cfffb0285b95f9191016d52849b54e2741762de13a99602b5167d2279752b7cef0afa098a2a924e6c7ee4c8b5a0a99d53b5ae8 SHA512 a6ce43835a90ec9137827413cb7e0d15225ca9615a617218fc0a5a3a181294fc4cf1fe88bb397b5591caff6f5198a89e919b744c2d4fde13ea34ffdf7118a8b7
-EBUILD selinux-samba-2.20170204-r2.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613fa239a636f7f76a0928cfa8f0b8d27dfbc1b2ff4d604a376a0a1674c1f191ac7f4eed656abaee82b49318d18a51ddb6387b8b9 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e
-EBUILD selinux-samba-2.20170204-r3.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613fa239a636f7f76a0928cfa8f0b8d27dfbc1b2ff4d604a376a0a1674c1f191ac7f4eed656abaee82b49318d18a51ddb6387b8b9 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e
-EBUILD selinux-samba-2.20170204-r4.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613fa239a636f7f76a0928cfa8f0b8d27dfbc1b2ff4d604a376a0a1674c1f191ac7f4eed656abaee82b49318d18a51ddb6387b8b9 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e
 EBUILD selinux-samba-2.20170805-r2.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613fa239a636f7f76a0928cfa8f0b8d27dfbc1b2ff4d604a376a0a1674c1f191ac7f4eed656abaee82b49318d18a51ddb6387b8b9 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e
 EBUILD selinux-samba-2.20170805-r3.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613fa239a636f7f76a0928cfa8f0b8d27dfbc1b2ff4d604a376a0a1674c1f191ac7f4eed656abaee82b49318d18a51ddb6387b8b9 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e
-EBUILD selinux-samba-2.20170805-r4.ebuild 282 BLAKE2B a578bd7e149399eb0997b0d8e0cfffb0285b95f9191016d52849b54e2741762de13a99602b5167d2279752b7cef0afa098a2a924e6c7ee4c8b5a0a99d53b5ae8 SHA512 a6ce43835a90ec9137827413cb7e0d15225ca9615a617218fc0a5a3a181294fc4cf1fe88bb397b5591caff6f5198a89e919b744c2d4fde13ea34ffdf7118a8b7
 EBUILD selinux-samba-2.20180114-r1.ebuild 280 BLAKE2B 8106d5ffb67ceaedf752686fce0e46974697cb85dc1aa37953088857de51bb786dd7412e30b7d88125d66d2bbd05003d4a0cbac9e6177e5dab845f035822d231 SHA512 dd11d9cdfaa246dbbe28d3f1955cb793ab4ac2a9bb319ba7bf48a0d2521662fb3321b12d77bb88bb54a3ea9ab671fd9b63719a9974d11a260295aa9030976860
 EBUILD selinux-samba-2.20180114-r2.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
+EBUILD selinux-samba-2.20180114-r3.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
 EBUILD selinux-samba-9999.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
 MISC metadata.xml 315 BLAKE2B 08646bda187b856809d9bbdb57448783486da0b00f51c6e5b81ab65e54d86e3fa78934fb2774aa4f47d5a7b4328ccebe4132174d96953d33a3040afbcc6a8b59 SHA512 be5d21037154c9faad9ee42bb7337dde65086d188d3703a85e0557003efa33456dc3229ec6c3f36520ba5601d6af2c33825c0fdfa9b6611e4ba67aefe58e2224
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170204-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170204-r1.ebuild
deleted file mode 100644
index 285da42679a2..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170204-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170204-r2.ebuild
deleted file mode 100644
index 78c653fcbb84..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170204-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170204-r3.ebuild
deleted file mode 100644
index 78c653fcbb84..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170204-r4.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170204-r4.ebuild
deleted file mode 100644
index 78c653fcbb84..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170805-r4.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170805-r4.ebuild
deleted file mode 100644
index 285da42679a2..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20180114-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3ab5f4c3c662
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="samba"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for samba"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index a2f7cdc38791..4f348a85b8e5 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sasl-2.20170204-r1.ebuild 280 BLAKE2B e0a31c6aea765df8154cf887d67b10329135cf84b4964e1cb813dea47a39184fc81494ead75a2127620cfcb0bfe760cf6cb989390d68f978be8e384e1c5defa3 SHA512 ac3921327660254c03f18c073dae9f082c38fad82e5fcdfff7673c05a9bad12906030c8489cc2c25e0778ef3fa158668b99608e8fdda221971d625b593300143
-EBUILD selinux-sasl-2.20170204-r2.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47e11cec3dc8b1d3652d53f936b71a99784739545c5a53d9cf142cbbc11ea15b8c3c6f34fa5dcb6a09509f5af1da3b746f76ea1 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4
-EBUILD selinux-sasl-2.20170204-r3.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47e11cec3dc8b1d3652d53f936b71a99784739545c5a53d9cf142cbbc11ea15b8c3c6f34fa5dcb6a09509f5af1da3b746f76ea1 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4
-EBUILD selinux-sasl-2.20170204-r4.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47e11cec3dc8b1d3652d53f936b71a99784739545c5a53d9cf142cbbc11ea15b8c3c6f34fa5dcb6a09509f5af1da3b746f76ea1 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4
 EBUILD selinux-sasl-2.20170805-r2.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47e11cec3dc8b1d3652d53f936b71a99784739545c5a53d9cf142cbbc11ea15b8c3c6f34fa5dcb6a09509f5af1da3b746f76ea1 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4
 EBUILD selinux-sasl-2.20170805-r3.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47e11cec3dc8b1d3652d53f936b71a99784739545c5a53d9cf142cbbc11ea15b8c3c6f34fa5dcb6a09509f5af1da3b746f76ea1 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4
-EBUILD selinux-sasl-2.20170805-r4.ebuild 280 BLAKE2B e0a31c6aea765df8154cf887d67b10329135cf84b4964e1cb813dea47a39184fc81494ead75a2127620cfcb0bfe760cf6cb989390d68f978be8e384e1c5defa3 SHA512 ac3921327660254c03f18c073dae9f082c38fad82e5fcdfff7673c05a9bad12906030c8489cc2c25e0778ef3fa158668b99608e8fdda221971d625b593300143
 EBUILD selinux-sasl-2.20180114-r1.ebuild 278 BLAKE2B de1e42f981db6b0861ca06c5ee03dd1dd6bd6e3da980bfd63900d768e912e8ab05859e62584eca5c37da1a0d95f69eba8765badba54a6d07810d5d753ac3b98e SHA512 238ee634adbdd088ceccca41b9b2e642154ef191bfe9d8b62f2d5e45b1672841be92651a0046c77d1be0078ca6d4f43e24a1b3601afa43260d57585103559f02
 EBUILD selinux-sasl-2.20180114-r2.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
+EBUILD selinux-sasl-2.20180114-r3.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
 EBUILD selinux-sasl-9999.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
 MISC metadata.xml 314 BLAKE2B 353081e43c3d5accea023efca05e8127596b4eb0156cd37f425f298b2fac17610a8519ca0490666e77270c9bdf100bf950753652a21b4b54bf4b48e166cab84d SHA512 45edaf69b73c11c1ed1b7f7fc2b97aadeb3d11b51e2b4c8e388c556efc79441bf70d1f0c835980626e3bdb8cc8bb315204f680a6dd64402035220606449e1960
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r1.ebuild
deleted file mode 100644
index 2dcdf2d01349..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r2.ebuild
deleted file mode 100644
index 577d5c116604..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r3.ebuild
deleted file mode 100644
index 577d5c116604..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r4.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r4.ebuild
deleted file mode 100644
index 577d5c116604..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r4.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r4.ebuild
deleted file mode 100644
index 2dcdf2d01349..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20180114-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5798ce3dd1bd
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sasl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sasl"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index d091df258b79..84a19cf4e6c9 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-screen-2.20170204-r1.ebuild 284 BLAKE2B 4500afd5a697e0761a73ce24885a7dc981f3430a3f5d8e10b677c92edaf5bc26aacee6f95625ac6eccd39f7716ce5172e5ca2f9ab264d8eac7e5ffbd8bf1e062 SHA512 943f6b8dc5ca666b46121532a3115019cef0220653950edefbce326fb8d54ac566793f5726c4e276f90b1eceb87ca50f2f0f33b3bd3e04b866cfff4e62e166dc
-EBUILD selinux-screen-2.20170204-r2.ebuild 282 BLAKE2B 140806ce070744630e561931b05761f983a37709ff229afa452b76e814edc500200df138b622a55b5f799938cd5552499d4c470d98df4bbd1634a6da5bb87df9 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212
-EBUILD selinux-screen-2.20170204-r3.ebuild 282 BLAKE2B 140806ce070744630e561931b05761f983a37709ff229afa452b76e814edc500200df138b622a55b5f799938cd5552499d4c470d98df4bbd1634a6da5bb87df9 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212
-EBUILD selinux-screen-2.20170204-r4.ebuild 282 BLAKE2B 140806ce070744630e561931b05761f983a37709ff229afa452b76e814edc500200df138b622a55b5f799938cd5552499d4c470d98df4bbd1634a6da5bb87df9 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212
 EBUILD selinux-screen-2.20170805-r2.ebuild 282 BLAKE2B 140806ce070744630e561931b05761f983a37709ff229afa452b76e814edc500200df138b622a55b5f799938cd5552499d4c470d98df4bbd1634a6da5bb87df9 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212
 EBUILD selinux-screen-2.20170805-r3.ebuild 282 BLAKE2B 140806ce070744630e561931b05761f983a37709ff229afa452b76e814edc500200df138b622a55b5f799938cd5552499d4c470d98df4bbd1634a6da5bb87df9 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212
-EBUILD selinux-screen-2.20170805-r4.ebuild 284 BLAKE2B 4500afd5a697e0761a73ce24885a7dc981f3430a3f5d8e10b677c92edaf5bc26aacee6f95625ac6eccd39f7716ce5172e5ca2f9ab264d8eac7e5ffbd8bf1e062 SHA512 943f6b8dc5ca666b46121532a3115019cef0220653950edefbce326fb8d54ac566793f5726c4e276f90b1eceb87ca50f2f0f33b3bd3e04b866cfff4e62e166dc
 EBUILD selinux-screen-2.20180114-r1.ebuild 282 BLAKE2B b72341581d9eedb0946df773f447411657732b759bb2ef7379f98a54e81f00f23fc30721b74bdee8b5317a49870f7fb428e66f54dcdd4b670d6c22a349e3e815 SHA512 7fc84811b4b7eb90794312f65fdff8301f546edf6ccce6b19d74028edf892a4449a48ed5534bc44f778ca94c9fc107a62d594c4d1977dea81b1ce2d3e32d3978
 EBUILD selinux-screen-2.20180114-r2.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
+EBUILD selinux-screen-2.20180114-r3.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
 EBUILD selinux-screen-9999.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
 MISC metadata.xml 316 BLAKE2B 197be4a73afaa6ab290a9589ba55be1aaa09881838010414216330577d2d785eecb1a47e1054c3824c24658e7377cb2982ac8d0f146ee11ed6beee02fb20823d SHA512 4fe7d61f85ea2a1a24235cb5d571e9c0ff213b44d985f33d2d72858e7e429992ad6e779cc641eb2712f4abc089dab74203ed2b5111c627efce0a45c0da25bd5a
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170204-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170204-r1.ebuild
deleted file mode 100644
index eecd441a1825..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170204-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170204-r2.ebuild
deleted file mode 100644
index a82707f09fb1..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170204-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170204-r3.ebuild
deleted file mode 100644
index a82707f09fb1..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170204-r4.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170204-r4.ebuild
deleted file mode 100644
index a82707f09fb1..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170805-r4.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170805-r4.ebuild
deleted file mode 100644
index eecd441a1825..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20180114-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..943274f4a0a3
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="screen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for screen"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 396ae61d46e6..03be7ca1db8f 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sendmail-2.20170204-r1.ebuild 288 BLAKE2B c4a125e0713c75726ec46a36e1e998d33b27bfa30ea57c5cc5a86e2552d1a186fac629c4d428ddaba4968a9e151465f9230bda5f3f52f28fd7a55474db318e6b SHA512 2e5a94c30bcbd1498ce5dae67b6cdc0b18219e24be4e33bb55a913fbc21d6bed9e7439ebaf01e7f80324fe5420dcf0c3c70ce78ff616c377ed4e89d20488e5e7
-EBUILD selinux-sendmail-2.20170204-r2.ebuild 286 BLAKE2B c010079a8c39b284277a29a1ffee86cf1dca3e69fe7835289f01ddc32496bbc1ba369e65046397928391cd595961076da4276d62a8592e6fbcae7d0b0f94d9a9 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26
-EBUILD selinux-sendmail-2.20170204-r3.ebuild 286 BLAKE2B c010079a8c39b284277a29a1ffee86cf1dca3e69fe7835289f01ddc32496bbc1ba369e65046397928391cd595961076da4276d62a8592e6fbcae7d0b0f94d9a9 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26
-EBUILD selinux-sendmail-2.20170204-r4.ebuild 286 BLAKE2B c010079a8c39b284277a29a1ffee86cf1dca3e69fe7835289f01ddc32496bbc1ba369e65046397928391cd595961076da4276d62a8592e6fbcae7d0b0f94d9a9 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26
 EBUILD selinux-sendmail-2.20170805-r2.ebuild 286 BLAKE2B c010079a8c39b284277a29a1ffee86cf1dca3e69fe7835289f01ddc32496bbc1ba369e65046397928391cd595961076da4276d62a8592e6fbcae7d0b0f94d9a9 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26
 EBUILD selinux-sendmail-2.20170805-r3.ebuild 286 BLAKE2B c010079a8c39b284277a29a1ffee86cf1dca3e69fe7835289f01ddc32496bbc1ba369e65046397928391cd595961076da4276d62a8592e6fbcae7d0b0f94d9a9 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26
-EBUILD selinux-sendmail-2.20170805-r4.ebuild 288 BLAKE2B c4a125e0713c75726ec46a36e1e998d33b27bfa30ea57c5cc5a86e2552d1a186fac629c4d428ddaba4968a9e151465f9230bda5f3f52f28fd7a55474db318e6b SHA512 2e5a94c30bcbd1498ce5dae67b6cdc0b18219e24be4e33bb55a913fbc21d6bed9e7439ebaf01e7f80324fe5420dcf0c3c70ce78ff616c377ed4e89d20488e5e7
 EBUILD selinux-sendmail-2.20180114-r1.ebuild 286 BLAKE2B 775fb96c91cabcb2070b37f5e6e38596534136083e691a0a9836ee644047d419c45ec7fbc3a1d246f49b57f2e6a4fe10abd56e4cb7701dba3aef1eeca0bb78b9 SHA512 72d9d4c1663b192127f031ad6a7a047442257e99b9792722790d7511ce9e774412afbd411663575489ee1becb421789e458e7a8c16d3c726ecfd34a82e030687
 EBUILD selinux-sendmail-2.20180114-r2.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
+EBUILD selinux-sendmail-2.20180114-r3.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
 EBUILD selinux-sendmail-9999.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
 MISC metadata.xml 318 BLAKE2B d2c93df153de9789f247d6fb548f65a2d69493673af0b806b3dd40b0101cecdd27a9a3e681bd49e9fa210b250cc17468706c4c73009b7c8fb1d3bf24180a902a SHA512 32cedde0f34cdc0e2dce0599332364e3a2b7feafaec1dab8e96c34b4ebd1274c53ea4051d555ff3fc48cf86df7c45ce929c938c3f7e914e47012a8ba8b6fbcaf
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r1.ebuild
deleted file mode 100644
index ea30505244e3..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r2.ebuild
deleted file mode 100644
index 2731066a0876..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r3.ebuild
deleted file mode 100644
index 2731066a0876..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r4.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r4.ebuild
deleted file mode 100644
index 2731066a0876..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r4.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r4.ebuild
deleted file mode 100644
index ea30505244e3..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20180114-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..b94c5bf9764c
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sendmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sendmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 97993c76bc59..9118cf83b103 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sensord-2.20170204-r1.ebuild 286 BLAKE2B 779a723b368935ad8dfaf054339da52bfe3f8511157a9e9feac2b48a15020f1bf4e091e7978b3452d7e45cdb1b540a331af3cfaaff41b18840a533392e64fd5b SHA512 53b6df1e5b5a6906d58eb1edf49526e2577ccac46505e2a6cb819a3fbbe0ed483e2924ff29611641392e353b99366e800c357c0094af2bfa1b4b39403888185f
-EBUILD selinux-sensord-2.20170204-r2.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d69fdb2933daa19a382797fa6d3b62280ee85fcb7d3a16aa2ae3b716f4daade99415c2bb028e9f13d7b02c7a93cf9d569f72360d9 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75
-EBUILD selinux-sensord-2.20170204-r3.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d69fdb2933daa19a382797fa6d3b62280ee85fcb7d3a16aa2ae3b716f4daade99415c2bb028e9f13d7b02c7a93cf9d569f72360d9 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75
-EBUILD selinux-sensord-2.20170204-r4.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d69fdb2933daa19a382797fa6d3b62280ee85fcb7d3a16aa2ae3b716f4daade99415c2bb028e9f13d7b02c7a93cf9d569f72360d9 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75
 EBUILD selinux-sensord-2.20170805-r2.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d69fdb2933daa19a382797fa6d3b62280ee85fcb7d3a16aa2ae3b716f4daade99415c2bb028e9f13d7b02c7a93cf9d569f72360d9 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75
 EBUILD selinux-sensord-2.20170805-r3.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d69fdb2933daa19a382797fa6d3b62280ee85fcb7d3a16aa2ae3b716f4daade99415c2bb028e9f13d7b02c7a93cf9d569f72360d9 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75
-EBUILD selinux-sensord-2.20170805-r4.ebuild 286 BLAKE2B 779a723b368935ad8dfaf054339da52bfe3f8511157a9e9feac2b48a15020f1bf4e091e7978b3452d7e45cdb1b540a331af3cfaaff41b18840a533392e64fd5b SHA512 53b6df1e5b5a6906d58eb1edf49526e2577ccac46505e2a6cb819a3fbbe0ed483e2924ff29611641392e353b99366e800c357c0094af2bfa1b4b39403888185f
 EBUILD selinux-sensord-2.20180114-r1.ebuild 284 BLAKE2B 10d77950f9cdc680e3ea389381f00175524caa51784a79f4dea11b3d4065b93dfb6918919df9a5056ddb26146ed36abaf5129535cd5f94744a5b0435996ba5b2 SHA512 099f4b968552181f1039cc07902a40b662445689bdaf21196214924e92943cc00f962f27c396545713ac9401baadd94535c11e4c49c5a82d197b73a269b18c4f
 EBUILD selinux-sensord-2.20180114-r2.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
+EBUILD selinux-sensord-2.20180114-r3.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
 EBUILD selinux-sensord-9999.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
 MISC metadata.xml 317 BLAKE2B 7a98bdcdf553ecde53aa9469cbe665f14eacca0b14774c2f59d8c7a74580c0a9b28c81aadb9b43dd807452dbb42b42a383f14e7fc536caec35292cdfdb884ca1 SHA512 efb7c659fad7bca559bbac9b5abe6fff6b82c69a6557a167327d569be61c75a51deb7a3f2785bac38a2b000cf1bec227423906a1ea678229aba158a8227dd6d3
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r1.ebuild
deleted file mode 100644
index 236c00e8a136..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r2.ebuild
deleted file mode 100644
index dec54296bc72..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r3.ebuild
deleted file mode 100644
index dec54296bc72..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r4.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r4.ebuild
deleted file mode 100644
index dec54296bc72..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r4.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r4.ebuild
deleted file mode 100644
index 236c00e8a136..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20180114-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4247b25372f9
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sensord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sensord"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 0556ca4ba96c..d8d001474de5 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-shorewall-2.20170204-r1.ebuild 290 BLAKE2B 6aaeb26ae61b97700bac883a3053d3641de3ec5e5082bef69686ed7a757e741a334fa2309f4c07d54d3c7a89487afe308ccc424443230cb4c80d3ec203f14729 SHA512 b388d77a4ed849213df8ef02ab1da73f204fab753796e1b4d43b3df6d9ac7323dccff47b0492edee280aa810e5c919fc6ebdde2f1dfd50cdb755cebbe1d86bf0
-EBUILD selinux-shorewall-2.20170204-r2.ebuild 288 BLAKE2B c690ca66e22568e87b9e748b2c5e0d2ed16aff0c87f2876336076adbd22da9466259f129bd9ee4c55bd655a8cad9b2062a98b536798ec300d08026832e9ac178 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17
-EBUILD selinux-shorewall-2.20170204-r3.ebuild 288 BLAKE2B c690ca66e22568e87b9e748b2c5e0d2ed16aff0c87f2876336076adbd22da9466259f129bd9ee4c55bd655a8cad9b2062a98b536798ec300d08026832e9ac178 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17
-EBUILD selinux-shorewall-2.20170204-r4.ebuild 288 BLAKE2B c690ca66e22568e87b9e748b2c5e0d2ed16aff0c87f2876336076adbd22da9466259f129bd9ee4c55bd655a8cad9b2062a98b536798ec300d08026832e9ac178 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17
 EBUILD selinux-shorewall-2.20170805-r2.ebuild 288 BLAKE2B c690ca66e22568e87b9e748b2c5e0d2ed16aff0c87f2876336076adbd22da9466259f129bd9ee4c55bd655a8cad9b2062a98b536798ec300d08026832e9ac178 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17
 EBUILD selinux-shorewall-2.20170805-r3.ebuild 288 BLAKE2B c690ca66e22568e87b9e748b2c5e0d2ed16aff0c87f2876336076adbd22da9466259f129bd9ee4c55bd655a8cad9b2062a98b536798ec300d08026832e9ac178 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17
-EBUILD selinux-shorewall-2.20170805-r4.ebuild 290 BLAKE2B 6aaeb26ae61b97700bac883a3053d3641de3ec5e5082bef69686ed7a757e741a334fa2309f4c07d54d3c7a89487afe308ccc424443230cb4c80d3ec203f14729 SHA512 b388d77a4ed849213df8ef02ab1da73f204fab753796e1b4d43b3df6d9ac7323dccff47b0492edee280aa810e5c919fc6ebdde2f1dfd50cdb755cebbe1d86bf0
 EBUILD selinux-shorewall-2.20180114-r1.ebuild 288 BLAKE2B 108a586ae38b988c5c358af60a4464524798f7db79e0afb5458d4cbdf8951c0c7a249e8be02922ba0d2d7771258656c186a88da0b2469e37e9906f8ab84642fe SHA512 7543c73dbeac5bd8023af10c118b510a3e6ea6a3811df7eedcb4c60517595446f953cd9b9e3d6b68ab5cf80c40fd14f4f05e4f48c5322793be30e802c0165ece
 EBUILD selinux-shorewall-2.20180114-r2.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
+EBUILD selinux-shorewall-2.20180114-r3.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
 EBUILD selinux-shorewall-9999.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
 MISC metadata.xml 319 BLAKE2B 770bef5667ce36c3e531cd9bb5160ec813134ebd648c97e51f9fd98b413d322d69e00058e2e91bd8755fcf08e4ba7a7ccf7e36e13ad8503a6408c221dac2cad3 SHA512 fdad724a2c1f0baf476b7a23debedd76f6966f06ed68f1f8a09d4f3fc6288879ba290ba82f625e98542799b54f82cf348f6d99b9e8b4389cffc861f50c55d4b1
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r1.ebuild
deleted file mode 100644
index f2350f1e5510..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r2.ebuild
deleted file mode 100644
index dbaa7c21f7c9..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r3.ebuild
deleted file mode 100644
index dbaa7c21f7c9..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r4.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r4.ebuild
deleted file mode 100644
index dbaa7c21f7c9..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r4.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r4.ebuild
deleted file mode 100644
index f2350f1e5510..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20180114-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..dfd988330a21
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="shorewall"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shorewall"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index be365c2c7c97..890971f34be8 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-shutdown-2.20170204-r1.ebuild 288 BLAKE2B 69c84af832438b8fbbde58d3df42529d90f2ccbc3cefc08dd304854acfa6d6ac4677fd30b00417bb0e50acfc96474fc8af4ec2c2494bbd204ce078d603acfc17 SHA512 7a662ae671884585b48ee39f1a172f5b02e8149993cde0d5dcaaba9c18e12a4e664dec4c1a9e251c35c90999d4d7eb0065d64506599c6633da35981adb82036c
-EBUILD selinux-shutdown-2.20170204-r2.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e93b88b7e7dce90173afcb4051aa13faf169a16333e773dac2a7aa2a93e0c3ffa27edb06000bd613223cee0f4c525f50bcdf13344c9 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c
-EBUILD selinux-shutdown-2.20170204-r3.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e93b88b7e7dce90173afcb4051aa13faf169a16333e773dac2a7aa2a93e0c3ffa27edb06000bd613223cee0f4c525f50bcdf13344c9 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c
-EBUILD selinux-shutdown-2.20170204-r4.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e93b88b7e7dce90173afcb4051aa13faf169a16333e773dac2a7aa2a93e0c3ffa27edb06000bd613223cee0f4c525f50bcdf13344c9 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c
 EBUILD selinux-shutdown-2.20170805-r2.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e93b88b7e7dce90173afcb4051aa13faf169a16333e773dac2a7aa2a93e0c3ffa27edb06000bd613223cee0f4c525f50bcdf13344c9 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c
 EBUILD selinux-shutdown-2.20170805-r3.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e93b88b7e7dce90173afcb4051aa13faf169a16333e773dac2a7aa2a93e0c3ffa27edb06000bd613223cee0f4c525f50bcdf13344c9 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c
-EBUILD selinux-shutdown-2.20170805-r4.ebuild 288 BLAKE2B 69c84af832438b8fbbde58d3df42529d90f2ccbc3cefc08dd304854acfa6d6ac4677fd30b00417bb0e50acfc96474fc8af4ec2c2494bbd204ce078d603acfc17 SHA512 7a662ae671884585b48ee39f1a172f5b02e8149993cde0d5dcaaba9c18e12a4e664dec4c1a9e251c35c90999d4d7eb0065d64506599c6633da35981adb82036c
 EBUILD selinux-shutdown-2.20180114-r1.ebuild 286 BLAKE2B aa6ca83034db161ef08a1b540574e395dd4189aeeaa421dbe083151518eb03b1139bfe83d2376906e84350e6cd48d325670b6a48f6c4ebf2940a53981696a188 SHA512 63b2e22bb50aa994dd6d71a382c20dc301b903570ca110ad2ee880db410f2c76755851fa4929b38ee7ac73ec18512299a54959483ca39f785787bd3acb6891aa
 EBUILD selinux-shutdown-2.20180114-r2.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
+EBUILD selinux-shutdown-2.20180114-r3.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
 EBUILD selinux-shutdown-9999.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
 MISC metadata.xml 318 BLAKE2B aa7bb6373d464eeb3bb0fd6f1cde62da5e0d49891c361a555194e6e30223d5130620888282020e14afafcdacbf95db797264fed49d1027c2b6b0df99fec7e2bc SHA512 4fa45f9cb30c10064cb7c91c5331d4ca91a05cb1f74403feb9dbeadd943a0741c1849371bd444432c3ed7c0ae84e09e4742cb9e12ba9c8b8f40413a56f002767
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r1.ebuild
deleted file mode 100644
index 9c13a5d94f6e..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r2.ebuild
deleted file mode 100644
index c046de54cbb4..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r3.ebuild
deleted file mode 100644
index c046de54cbb4..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r4.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r4.ebuild
deleted file mode 100644
index c046de54cbb4..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r4.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r4.ebuild
deleted file mode 100644
index 9c13a5d94f6e..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20180114-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a1ee5c0570e9
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="shutdown"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shutdown"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index a62288635137..a747f2022aa8 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-skype-2.20170204-r1.ebuild 384 BLAKE2B 258c197153862aca6021413cbb0afb71f9f36c8fc4e1bfa859c7618afdaf0fe22c8f778eeb11244a5e08ff1a3c68d6d68758b31c1361e3896132915b2a4c6230 SHA512 959b3803b8ed7e538b49c529564efec93b0f9a92f29a73afb42f357e70babbe2685bc853b95246f62f688af3195b03e5b413430a7441dc34057f59f73c5dbeca
-EBUILD selinux-skype-2.20170204-r2.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384459f828e564466eaad85b11624e5dc735f35a26384e152ed05b00b15c5d51be83daf551efdb6276553a69c2f1e3d4e5eccb0d4 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124
-EBUILD selinux-skype-2.20170204-r3.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384459f828e564466eaad85b11624e5dc735f35a26384e152ed05b00b15c5d51be83daf551efdb6276553a69c2f1e3d4e5eccb0d4 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124
-EBUILD selinux-skype-2.20170204-r4.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384459f828e564466eaad85b11624e5dc735f35a26384e152ed05b00b15c5d51be83daf551efdb6276553a69c2f1e3d4e5eccb0d4 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124
 EBUILD selinux-skype-2.20170805-r2.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384459f828e564466eaad85b11624e5dc735f35a26384e152ed05b00b15c5d51be83daf551efdb6276553a69c2f1e3d4e5eccb0d4 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124
 EBUILD selinux-skype-2.20170805-r3.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384459f828e564466eaad85b11624e5dc735f35a26384e152ed05b00b15c5d51be83daf551efdb6276553a69c2f1e3d4e5eccb0d4 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124
-EBUILD selinux-skype-2.20170805-r4.ebuild 384 BLAKE2B 258c197153862aca6021413cbb0afb71f9f36c8fc4e1bfa859c7618afdaf0fe22c8f778eeb11244a5e08ff1a3c68d6d68758b31c1361e3896132915b2a4c6230 SHA512 959b3803b8ed7e538b49c529564efec93b0f9a92f29a73afb42f357e70babbe2685bc853b95246f62f688af3195b03e5b413430a7441dc34057f59f73c5dbeca
 EBUILD selinux-skype-2.20180114-r1.ebuild 382 BLAKE2B 985fa9b9b714917b516a82c0489632ffc2c634737baf35a454a2c00f9cd99d19af0f1e63e447d40a156d04ac7e54984456014cb8fd931d881931dbe83973b5cd SHA512 25518b95a19fb6ffc0e38633bebdd44df6aac130278b8d11498d1681e9f93c984e4052dc4e52873d0b6cecac3daa06c6e8647de71aee439344d45827ff331db8
 EBUILD selinux-skype-2.20180114-r2.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
+EBUILD selinux-skype-2.20180114-r3.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
 EBUILD selinux-skype-9999.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
 MISC metadata.xml 315 BLAKE2B 03028ab251445c2df09ebe2861996a9ec8006d4b044543401f97c05775f88d5789002c403876e2cff79bb6629003c1607ad289670ea18c4e913f2b4edc88ead0 SHA512 1a924ae849c1f4c698f1e30e99a612fd88ef66371170814f4e51a3940fbd463345b80156f2ed35b5aab70e808f42cd2c1a100b018659a182f96660b501fd85ba
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170204-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170204-r1.ebuild
deleted file mode 100644
index 6c095687d264..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170204-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170204-r2.ebuild
deleted file mode 100644
index 5bc6c4afe878..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170204-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170204-r3.ebuild
deleted file mode 100644
index 5bc6c4afe878..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170204-r4.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170204-r4.ebuild
deleted file mode 100644
index 5bc6c4afe878..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170805-r4.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170805-r4.ebuild
deleted file mode 100644
index 6c095687d264..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20180114-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..0ae995509331
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="skype"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for skype"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index 1a8957255ca1..e9c357e3f04d 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-slocate-2.20170204-r1.ebuild 286 BLAKE2B 10450da85d7ba2f98375f78c28a57414dc80a5b22c5a26bac80a8151f7766ff7156468a57e90e960b1ff9488eb261932b10e72f94d52b0dda6c6e72f0e0b53c8 SHA512 d43d8f090028a9aa6d37ac7e36350c83e720893c8be577cb9dfadeb88b46a4d0f3bb91381b12abd876bb447edd5c64e6f6edec4f5596c5c75a4364efc75d403d
-EBUILD selinux-slocate-2.20170204-r2.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6bfb63371a1e24838210eff99d2fc8f79591f43f85a409ae4e65b4fdcaa3b0f5ab99c2ddfb2526b1b4b55e61f44b6fd257076ae39 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971
-EBUILD selinux-slocate-2.20170204-r3.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6bfb63371a1e24838210eff99d2fc8f79591f43f85a409ae4e65b4fdcaa3b0f5ab99c2ddfb2526b1b4b55e61f44b6fd257076ae39 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971
-EBUILD selinux-slocate-2.20170204-r4.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6bfb63371a1e24838210eff99d2fc8f79591f43f85a409ae4e65b4fdcaa3b0f5ab99c2ddfb2526b1b4b55e61f44b6fd257076ae39 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971
 EBUILD selinux-slocate-2.20170805-r2.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6bfb63371a1e24838210eff99d2fc8f79591f43f85a409ae4e65b4fdcaa3b0f5ab99c2ddfb2526b1b4b55e61f44b6fd257076ae39 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971
 EBUILD selinux-slocate-2.20170805-r3.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6bfb63371a1e24838210eff99d2fc8f79591f43f85a409ae4e65b4fdcaa3b0f5ab99c2ddfb2526b1b4b55e61f44b6fd257076ae39 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971
-EBUILD selinux-slocate-2.20170805-r4.ebuild 286 BLAKE2B 10450da85d7ba2f98375f78c28a57414dc80a5b22c5a26bac80a8151f7766ff7156468a57e90e960b1ff9488eb261932b10e72f94d52b0dda6c6e72f0e0b53c8 SHA512 d43d8f090028a9aa6d37ac7e36350c83e720893c8be577cb9dfadeb88b46a4d0f3bb91381b12abd876bb447edd5c64e6f6edec4f5596c5c75a4364efc75d403d
 EBUILD selinux-slocate-2.20180114-r1.ebuild 284 BLAKE2B 809d3525988975bf1c8392274d7ff2f7a31f8ecfda4047808a2d839c6b7faedd62c5c711754a66d99ffb782cf94c34b54e21ef77eafb02c45a7982859d92024a SHA512 bd7d16e44585daeb9bd3486374e2c989d3f24732aa35d37171c6b3fc1c38b6eff1cde075bf98881b07e98e6c20bd4c76e65c0197b01b790e083e828c24a87749
 EBUILD selinux-slocate-2.20180114-r2.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
+EBUILD selinux-slocate-2.20180114-r3.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
 EBUILD selinux-slocate-9999.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
 MISC metadata.xml 317 BLAKE2B 5ce4f43bcfb01aee90580b7011699ba0623f846297d542b2f565474b8ead543e8f1a131595bf13e7b51916b10c337303535c6e41e92bd7670b9c12dc683adee7 SHA512 644efe6833d658d1f9e1181652ef2d10b13a45e8c5896235efe04a4f7f1dc9676145f501f2682a5763836038d16e3f9f0e9aad3138880b0ee77d4b3b22de66fe
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r1.ebuild
deleted file mode 100644
index 77c44ff84c62..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r2.ebuild
deleted file mode 100644
index 9fa5b68e5434..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r3.ebuild
deleted file mode 100644
index 9fa5b68e5434..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r4.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r4.ebuild
deleted file mode 100644
index 9fa5b68e5434..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r4.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r4.ebuild
deleted file mode 100644
index 77c44ff84c62..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20180114-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8393ac0bfd57
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="slocate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slocate"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 4d0e13a55130..748f50a26d31 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-slrnpull-2.20170204-r1.ebuild 288 BLAKE2B b51fb73f6c6bee6aa1720515cf6301c1334bc8dc2785b46fa8d5076330d4efdf8a1a690e3a83b5c6d16d9ab502a934d627a78863e588d473b0f5c51e6d17009f SHA512 430bd0cefcc22ff1fc4458e0ca5d9d64bce56849d90bf95406865a06741990f71f07a5d3db6e9b74f47afd58e624215f232f87d4af9a4b12b8e1bb1784d4e2e7
-EBUILD selinux-slrnpull-2.20170204-r2.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311edddda935b6cd41137a2dc8799ebe68ab92e55d42df00e37f1aecffa1ef6f19b9cc569cd89650125bae55fcb5f75a70c96f65014a4 SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21
-EBUILD selinux-slrnpull-2.20170204-r3.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311edddda935b6cd41137a2dc8799ebe68ab92e55d42df00e37f1aecffa1ef6f19b9cc569cd89650125bae55fcb5f75a70c96f65014a4 SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21
-EBUILD selinux-slrnpull-2.20170204-r4.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311edddda935b6cd41137a2dc8799ebe68ab92e55d42df00e37f1aecffa1ef6f19b9cc569cd89650125bae55fcb5f75a70c96f65014a4 SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21
 EBUILD selinux-slrnpull-2.20170805-r2.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311edddda935b6cd41137a2dc8799ebe68ab92e55d42df00e37f1aecffa1ef6f19b9cc569cd89650125bae55fcb5f75a70c96f65014a4 SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21
 EBUILD selinux-slrnpull-2.20170805-r3.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311edddda935b6cd41137a2dc8799ebe68ab92e55d42df00e37f1aecffa1ef6f19b9cc569cd89650125bae55fcb5f75a70c96f65014a4 SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21
-EBUILD selinux-slrnpull-2.20170805-r4.ebuild 288 BLAKE2B b51fb73f6c6bee6aa1720515cf6301c1334bc8dc2785b46fa8d5076330d4efdf8a1a690e3a83b5c6d16d9ab502a934d627a78863e588d473b0f5c51e6d17009f SHA512 430bd0cefcc22ff1fc4458e0ca5d9d64bce56849d90bf95406865a06741990f71f07a5d3db6e9b74f47afd58e624215f232f87d4af9a4b12b8e1bb1784d4e2e7
 EBUILD selinux-slrnpull-2.20180114-r1.ebuild 286 BLAKE2B f3a6aaccf23d823ba6b25c378097bd25df6edd2e07196e811a71b36d64f9ab9e3c5070e2f1f7a8f8a3df648ca671ae98c22311875545e38103b492693adc4210 SHA512 270fa2d6e74eccfe589fe49a4f444821925a153635b6a6ec7f8cea4963724c82fe432e34b45a12482c58f5511057cfee25bd83f0d8458d458849dbaa8a20e93c
 EBUILD selinux-slrnpull-2.20180114-r2.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
+EBUILD selinux-slrnpull-2.20180114-r3.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
 EBUILD selinux-slrnpull-9999.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
 MISC metadata.xml 318 BLAKE2B 7ce08160f820c186fefe0d8fd4c286425f48c130f7b604b996e503662486e0ed5176340b744dfe54824ac00248afa95ed10f607e0a537a2dd56bf1dee3d9179e SHA512 d44cf9551886870def9addeb8e1cccfb4d79dae34507f43d45539e331e8120c6e2d49692e2aa6c3eacc86b3a57d83956298da1c4e7b12da2718fb15d812cced1
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r1.ebuild
deleted file mode 100644
index aa2c2be7cf12..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r2.ebuild
deleted file mode 100644
index 69221061cb64..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r3.ebuild
deleted file mode 100644
index 69221061cb64..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r4.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r4.ebuild
deleted file mode 100644
index 69221061cb64..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r4.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r4.ebuild
deleted file mode 100644
index aa2c2be7cf12..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180114-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3602a91bf185
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="slrnpull"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slrnpull"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index 737d0eb4f69a..c5d32640ca3b 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-smartmon-2.20170204-r1.ebuild 288 BLAKE2B 3a8cc58b76ad65e9e1dd340c9d3c060d183a2b9ca63cdf88943fcfaf2e760a687ad19f3a1ae1fc7eb2328c0821c71322ae2f6582070757ec97f9d5790157d36a SHA512 8c7e17d1ccbbf020605b0a367c85eb6e9dac95c90786ff646dcd9687aaf14f1d4de3a1dc7b739057e5a92dfff9846c4daefd79b1c1de99cd46469cb6cc33b2bc
-EBUILD selinux-smartmon-2.20170204-r2.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786ef3889382a70f27c93a247ba5f573f05663aae13ebc6f001dd84077ab3f5eacc5d5a524e0a4a5d410c9125ccdbe6aaececb9147716 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778
-EBUILD selinux-smartmon-2.20170204-r3.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786ef3889382a70f27c93a247ba5f573f05663aae13ebc6f001dd84077ab3f5eacc5d5a524e0a4a5d410c9125ccdbe6aaececb9147716 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778
-EBUILD selinux-smartmon-2.20170204-r4.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786ef3889382a70f27c93a247ba5f573f05663aae13ebc6f001dd84077ab3f5eacc5d5a524e0a4a5d410c9125ccdbe6aaececb9147716 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778
 EBUILD selinux-smartmon-2.20170805-r2.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786ef3889382a70f27c93a247ba5f573f05663aae13ebc6f001dd84077ab3f5eacc5d5a524e0a4a5d410c9125ccdbe6aaececb9147716 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778
 EBUILD selinux-smartmon-2.20170805-r3.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786ef3889382a70f27c93a247ba5f573f05663aae13ebc6f001dd84077ab3f5eacc5d5a524e0a4a5d410c9125ccdbe6aaececb9147716 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778
-EBUILD selinux-smartmon-2.20170805-r4.ebuild 288 BLAKE2B 3a8cc58b76ad65e9e1dd340c9d3c060d183a2b9ca63cdf88943fcfaf2e760a687ad19f3a1ae1fc7eb2328c0821c71322ae2f6582070757ec97f9d5790157d36a SHA512 8c7e17d1ccbbf020605b0a367c85eb6e9dac95c90786ff646dcd9687aaf14f1d4de3a1dc7b739057e5a92dfff9846c4daefd79b1c1de99cd46469cb6cc33b2bc
 EBUILD selinux-smartmon-2.20180114-r1.ebuild 286 BLAKE2B 5d5c2bd964bb8446e16ff837f374431093bceaed809a131b0ee29328a92c9b2b1600e548092cb3edd0c0fe969dfa80da8ce531557678eca71856248a5e8ec16c SHA512 4f6bd806f0e4300166bdb7c42b09c679d0a7d5c85b85f79a4b41bec5920cdb06043390963d323e6097ec0c025ea56d6c9fd8b406f47717c516237be00dd15f69
 EBUILD selinux-smartmon-2.20180114-r2.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
+EBUILD selinux-smartmon-2.20180114-r3.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
 EBUILD selinux-smartmon-9999.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
 MISC metadata.xml 318 BLAKE2B f431a7c8290a07e455ec0be6e5b1e8d7427fefd7d0eaefc226ac899288d71e4d39023f912b3260ea398c2e4fa6e03f6b789129568403dbed8dd8a3ebdcbf6d66 SHA512 918ce5bfdccbef2cdb0580bd1e60fa164dfe2b64d08ae080b48b311f777d2b4c14c6a5b19e826789a07febd52820bb4cfc42927317770b766908ae347e6ed71f
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r1.ebuild
deleted file mode 100644
index af2f50224de2..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r2.ebuild
deleted file mode 100644
index 36aaabb2cebf..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r3.ebuild
deleted file mode 100644
index 36aaabb2cebf..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r4.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r4.ebuild
deleted file mode 100644
index 36aaabb2cebf..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r4.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r4.ebuild
deleted file mode 100644
index af2f50224de2..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20180114-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..bda18992ab22
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="smartmon"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smartmon"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 6309bfb3d928..9d8cf4aa8c26 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-smokeping-2.20170204-r1.ebuild 386 BLAKE2B 90eb6f40ae09217a420b66f6a2325053b9475c5e86c7591c4acf9f5307a108369811455f5e01eacec943484f90b628cc73e177612fec2a764ab89438029e6bbf SHA512 abc32b15254f34582a33f221d2e0a348dbbea0272a4a7bb222bd6ffcc2e8f660b9c0c05b084899e989546183e64629c5d4eb29ba83ba1bf4cd049275ded886d5
-EBUILD selinux-smokeping-2.20170204-r2.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd86c7d236594f16c8aee3ed7c32b5744e75fab2a48e2d830fbf2c1541b39a3d6aaf0d63e2f4ea321271e1025a016284b4c97c16050c SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3
-EBUILD selinux-smokeping-2.20170204-r3.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd86c7d236594f16c8aee3ed7c32b5744e75fab2a48e2d830fbf2c1541b39a3d6aaf0d63e2f4ea321271e1025a016284b4c97c16050c SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3
-EBUILD selinux-smokeping-2.20170204-r4.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd86c7d236594f16c8aee3ed7c32b5744e75fab2a48e2d830fbf2c1541b39a3d6aaf0d63e2f4ea321271e1025a016284b4c97c16050c SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3
 EBUILD selinux-smokeping-2.20170805-r2.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd86c7d236594f16c8aee3ed7c32b5744e75fab2a48e2d830fbf2c1541b39a3d6aaf0d63e2f4ea321271e1025a016284b4c97c16050c SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3
 EBUILD selinux-smokeping-2.20170805-r3.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd86c7d236594f16c8aee3ed7c32b5744e75fab2a48e2d830fbf2c1541b39a3d6aaf0d63e2f4ea321271e1025a016284b4c97c16050c SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3
-EBUILD selinux-smokeping-2.20170805-r4.ebuild 386 BLAKE2B 90eb6f40ae09217a420b66f6a2325053b9475c5e86c7591c4acf9f5307a108369811455f5e01eacec943484f90b628cc73e177612fec2a764ab89438029e6bbf SHA512 abc32b15254f34582a33f221d2e0a348dbbea0272a4a7bb222bd6ffcc2e8f660b9c0c05b084899e989546183e64629c5d4eb29ba83ba1bf4cd049275ded886d5
 EBUILD selinux-smokeping-2.20180114-r1.ebuild 384 BLAKE2B e8af79ac9fc79c49f837d28777518be4861fd1415a96705fc8d4e1a6384a1dc89eed3870e36388ea7871308ee9f036a4d34c26d25b9787951279e6fedb170936 SHA512 7d728f25328bc23b7f0a0ba25466a824df1d9f57c05ffc2f4480bef7ef417dbea7d9f0cf3b24362942e639747d146cf76cf55891c0b8b21b27e68fc45469f8a7
 EBUILD selinux-smokeping-2.20180114-r2.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
+EBUILD selinux-smokeping-2.20180114-r3.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
 EBUILD selinux-smokeping-9999.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
 MISC metadata.xml 319 BLAKE2B f64021cb4ab298dc7a704b55c81ac1bd119aebd97cd69e38444773e06ce510e318cc6f5a513f4f63d0f79fefd956a83c6b005cbf2c1727c6d9c77e113995a63c SHA512 d4db53e2c965a838139c9aafbc227a9b9378c674d074392ff08e2dea5247e7bb7fa912312f12a14cf534faf48e27b182f477694a5ad2d96f5322f2ed2404e83f
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r1.ebuild
deleted file mode 100644
index e8933368429b..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r2.ebuild
deleted file mode 100644
index 9f12ac25cb12..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r3.ebuild
deleted file mode 100644
index 9f12ac25cb12..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r4.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r4.ebuild
deleted file mode 100644
index 9f12ac25cb12..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r4.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r4.ebuild
deleted file mode 100644
index e8933368429b..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20180114-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..764fbe3b4119
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="smokeping"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smokeping"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index f13d2f371567..a48a82baadb6 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-snmp-2.20170204-r1.ebuild 280 BLAKE2B 92b4200c7e638364bc16d4c94399372c420b27a1c64facd1e10b0af7e0f7a12e8717c7225775f0b57214c9ed77ca7182abcf4c7fbe562dd12ea97ec8a00f5bbe SHA512 5d3731f8aa4c75c7e515e09a384aa66a37290c16b9ccf1f6476eac6368b058d3f1562a32cc5f8770e88a07035ea72976cf676d09fed54ca8a91ce29fc15d919d
-EBUILD selinux-snmp-2.20170204-r2.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7804ce993c88d0ef178301d9f09c40315d75994550421ba7a1342c6b305652dbc53db74e8df0fda063f36388aad255c3422255 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a
-EBUILD selinux-snmp-2.20170204-r3.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7804ce993c88d0ef178301d9f09c40315d75994550421ba7a1342c6b305652dbc53db74e8df0fda063f36388aad255c3422255 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a
-EBUILD selinux-snmp-2.20170204-r4.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7804ce993c88d0ef178301d9f09c40315d75994550421ba7a1342c6b305652dbc53db74e8df0fda063f36388aad255c3422255 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a
 EBUILD selinux-snmp-2.20170805-r2.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7804ce993c88d0ef178301d9f09c40315d75994550421ba7a1342c6b305652dbc53db74e8df0fda063f36388aad255c3422255 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a
 EBUILD selinux-snmp-2.20170805-r3.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7804ce993c88d0ef178301d9f09c40315d75994550421ba7a1342c6b305652dbc53db74e8df0fda063f36388aad255c3422255 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a
-EBUILD selinux-snmp-2.20170805-r4.ebuild 280 BLAKE2B 92b4200c7e638364bc16d4c94399372c420b27a1c64facd1e10b0af7e0f7a12e8717c7225775f0b57214c9ed77ca7182abcf4c7fbe562dd12ea97ec8a00f5bbe SHA512 5d3731f8aa4c75c7e515e09a384aa66a37290c16b9ccf1f6476eac6368b058d3f1562a32cc5f8770e88a07035ea72976cf676d09fed54ca8a91ce29fc15d919d
 EBUILD selinux-snmp-2.20180114-r1.ebuild 278 BLAKE2B d200a6507021fd775b95621973149028e4af6f2ef8d3e791acc56ee1de9fdec579a3e2adc95ee275052990f52ba17873f48e7b5efa25fefa268966fa74e325e8 SHA512 3bd3b80bc471f2c94f4d4013ce81d3dee33f644c5351cd55aeeb1ef10405253c8362b5cefa54cd1d41719c1e5250b6e8905051c3c5660440740fbbd261525869
 EBUILD selinux-snmp-2.20180114-r2.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
+EBUILD selinux-snmp-2.20180114-r3.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
 EBUILD selinux-snmp-9999.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
 MISC metadata.xml 314 BLAKE2B e3dedb894a12e1456e6e7de952e75ebbaa721995b7dd46320002488595c2bc26f4155184ad83b8c127a2f74859cf925107143fa53c362740228e9483dda9b0d2 SHA512 59b89808ea75eb3191a556a44d3be23f5d2f884cb0a195e3626bd11d03f0972d7a53bd15a509c8fb426f89a09e72a5485c6c12938dfe173a1f2e05dc999baee2
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r1.ebuild
deleted file mode 100644
index b53a3244ca41..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r2.ebuild
deleted file mode 100644
index 01575533a1eb..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r3.ebuild
deleted file mode 100644
index 01575533a1eb..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r4.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r4.ebuild
deleted file mode 100644
index 01575533a1eb..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r4.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r4.ebuild
deleted file mode 100644
index b53a3244ca41..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20180114-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..432be580324f
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="snmp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snmp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 26cb0e42ed73..0fe10fbf47a8 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-snort-2.20170204-r1.ebuild 282 BLAKE2B a7b1eb50f01d4145dadb096d3c44de956d2e1d7abf59eaff781914fb0a45fe8cd10753a4ca96b284542664f650298565a125e8f540d64c30e1b97451ee78a28b SHA512 afc26103653cc637cd2274e11f75c6c18b3f4b9f8486783dd570d7833a1ca50095ed25538311e78f6945c5dd7b49601e205004dd888b49859d56cd022495d8bb
-EBUILD selinux-snort-2.20170204-r2.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453e1d119c51af2615aac87284a098eb2f3fae412e86cb27ff5a3598f4d5e321cf2afbc6d3b6f508dc53e80c5869cf02e31b0beee SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f
-EBUILD selinux-snort-2.20170204-r3.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453e1d119c51af2615aac87284a098eb2f3fae412e86cb27ff5a3598f4d5e321cf2afbc6d3b6f508dc53e80c5869cf02e31b0beee SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f
-EBUILD selinux-snort-2.20170204-r4.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453e1d119c51af2615aac87284a098eb2f3fae412e86cb27ff5a3598f4d5e321cf2afbc6d3b6f508dc53e80c5869cf02e31b0beee SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f
 EBUILD selinux-snort-2.20170805-r2.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453e1d119c51af2615aac87284a098eb2f3fae412e86cb27ff5a3598f4d5e321cf2afbc6d3b6f508dc53e80c5869cf02e31b0beee SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f
 EBUILD selinux-snort-2.20170805-r3.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453e1d119c51af2615aac87284a098eb2f3fae412e86cb27ff5a3598f4d5e321cf2afbc6d3b6f508dc53e80c5869cf02e31b0beee SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f
-EBUILD selinux-snort-2.20170805-r4.ebuild 282 BLAKE2B a7b1eb50f01d4145dadb096d3c44de956d2e1d7abf59eaff781914fb0a45fe8cd10753a4ca96b284542664f650298565a125e8f540d64c30e1b97451ee78a28b SHA512 afc26103653cc637cd2274e11f75c6c18b3f4b9f8486783dd570d7833a1ca50095ed25538311e78f6945c5dd7b49601e205004dd888b49859d56cd022495d8bb
 EBUILD selinux-snort-2.20180114-r1.ebuild 280 BLAKE2B 9db715c0582bbff42aea446a5269e6fe35d710c0f55f0d9ba25956c75ae09749e873f0d0c45ff968149ed275e159229a7ca4bab6c66dea5702dc050f753ec5fb SHA512 bac1d40c6f096ee528f191b5b6a4314e8f4d1f4a334fd11fa3293f0496b363c6f16727cfa6bf2c8bb461f15915e744b4d6a433c24ef73e80498b564e9a1c5bab
 EBUILD selinux-snort-2.20180114-r2.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
+EBUILD selinux-snort-2.20180114-r3.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
 EBUILD selinux-snort-9999.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
 MISC metadata.xml 315 BLAKE2B f39f4978caccc6f70806683fe33bf2383e5e523a5041adc7e63b07059ab7e41e5b442fedf617772030989d5f12bad5abba537ec0ae002bc9e0f8124bb63ce083 SHA512 84eaf9d6b3a721099ebb825ffb0efb1d5bb4b17b5e8181cdd6bd59028047f6458b3444c5fd2ec970f848de4b6c5d03b8242cadf3d7c99918bb1f09babbdfcdc8
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170204-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170204-r1.ebuild
deleted file mode 100644
index d0581e4cfde6..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170204-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170204-r2.ebuild
deleted file mode 100644
index 08d277ba8239..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170204-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170204-r3.ebuild
deleted file mode 100644
index 08d277ba8239..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170204-r4.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170204-r4.ebuild
deleted file mode 100644
index 08d277ba8239..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170805-r4.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170805-r4.ebuild
deleted file mode 100644
index d0581e4cfde6..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20180114-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2a79291258ea
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="snort"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snort"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index f35d58e47e1b..3a8c0158e42f 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-soundserver-2.20170204-r1.ebuild 294 BLAKE2B 49708abb613e69f2a0e9f7bbde4e8231310d4c858dd023c1dddf2b5f2d314c525e29a3306ad12c34de66ebe151538a4b764ca0627694f9718d272341d2231e8b SHA512 8e5e82c447ac33e73257a73640e2d7ce4f267b105bc80027ae711eebe97c3c1610d0fe706e0a994001ce97dd15d1eeca537e2f24e32e312d261de18f02e0e66b
-EBUILD selinux-soundserver-2.20170204-r2.ebuild 292 BLAKE2B 1d40b25395568208dffed067110776a4e0effd66e129d9a884fb8772cf5decec2d09ba4dff127c02aacd691d917e7f50569d30036194226ad3d7c94deb938e88 SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1
-EBUILD selinux-soundserver-2.20170204-r3.ebuild 292 BLAKE2B 1d40b25395568208dffed067110776a4e0effd66e129d9a884fb8772cf5decec2d09ba4dff127c02aacd691d917e7f50569d30036194226ad3d7c94deb938e88 SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1
-EBUILD selinux-soundserver-2.20170204-r4.ebuild 292 BLAKE2B 1d40b25395568208dffed067110776a4e0effd66e129d9a884fb8772cf5decec2d09ba4dff127c02aacd691d917e7f50569d30036194226ad3d7c94deb938e88 SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1
 EBUILD selinux-soundserver-2.20170805-r2.ebuild 292 BLAKE2B 1d40b25395568208dffed067110776a4e0effd66e129d9a884fb8772cf5decec2d09ba4dff127c02aacd691d917e7f50569d30036194226ad3d7c94deb938e88 SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1
 EBUILD selinux-soundserver-2.20170805-r3.ebuild 292 BLAKE2B 1d40b25395568208dffed067110776a4e0effd66e129d9a884fb8772cf5decec2d09ba4dff127c02aacd691d917e7f50569d30036194226ad3d7c94deb938e88 SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1
-EBUILD selinux-soundserver-2.20170805-r4.ebuild 294 BLAKE2B 49708abb613e69f2a0e9f7bbde4e8231310d4c858dd023c1dddf2b5f2d314c525e29a3306ad12c34de66ebe151538a4b764ca0627694f9718d272341d2231e8b SHA512 8e5e82c447ac33e73257a73640e2d7ce4f267b105bc80027ae711eebe97c3c1610d0fe706e0a994001ce97dd15d1eeca537e2f24e32e312d261de18f02e0e66b
 EBUILD selinux-soundserver-2.20180114-r1.ebuild 292 BLAKE2B bf9ba45689e490182a562f85137590fa8b67beb44872af0f626a2b3587bf0021e3bea653cb6915c576eb35bfeb37c3ea2a2e8dd8aa9498abea02f7e745709f9d SHA512 6bb3c7d1e7d28e63927a6f92f8a2bac369312fc8de6a46660ac0a35292c4be8ccc5d733d91dae62794737f1d1233dd79da79a35db2bf2f61209e862f03fece17
 EBUILD selinux-soundserver-2.20180114-r2.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
+EBUILD selinux-soundserver-2.20180114-r3.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
 EBUILD selinux-soundserver-9999.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
 MISC metadata.xml 321 BLAKE2B 9bfdd274709d25944554b345f60312535acea154d2aba88c784c9c974f7e2a752b2f828b4a8cbadc95f569d09beb6846d669e8cfb3bb4d992dee2f4fcb15c7f0 SHA512 b9da9a501ff24e1b78750de04a1611143d7ef73e228018cd676cbc2d92624191acbe8b97fe640111184dd5460b7944f4f690994b8aceb64cb6ded5e418d87da7
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r1.ebuild
deleted file mode 100644
index b71c67387f96..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r2.ebuild
deleted file mode 100644
index 7834a39e4c90..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r3.ebuild
deleted file mode 100644
index 7834a39e4c90..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r4.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r4.ebuild
deleted file mode 100644
index 7834a39e4c90..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r4.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r4.ebuild
deleted file mode 100644
index b71c67387f96..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20180114-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2ff6085dc186
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="soundserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for soundserver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 9ba82cec1dd0..8a5ff6e06bad 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-spamassassin-2.20170204-r1.ebuild 296 BLAKE2B 0182c93de87b40770c32f01b7ee96593bc9ad25742489134c535e87e82c286bd688b250d430368a0a38172e27735e281e91f47ab626f3c9c256cb3fc3c31244e SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1
-EBUILD selinux-spamassassin-2.20170204-r2.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
-EBUILD selinux-spamassassin-2.20170204-r3.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
-EBUILD selinux-spamassassin-2.20170204-r4.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
 EBUILD selinux-spamassassin-2.20170805-r2.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
 EBUILD selinux-spamassassin-2.20170805-r3.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
-EBUILD selinux-spamassassin-2.20170805-r4.ebuild 296 BLAKE2B 0182c93de87b40770c32f01b7ee96593bc9ad25742489134c535e87e82c286bd688b250d430368a0a38172e27735e281e91f47ab626f3c9c256cb3fc3c31244e SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1
 EBUILD selinux-spamassassin-2.20180114-r1.ebuild 294 BLAKE2B 50c51c85763893ec673adb9ec074767830d4563b174cd3bba6bcfba06662d211f1c77ecb4a94d4caf9b465e0069f50d9b7c0fc2d5a31c4d86217d016970b2641 SHA512 be97ccc40035e67ad39be6f218139e344f90e0f665a714f83e681a86da969dc53f3777a8ebefeceba897c2c35edaf633d76e121ee841c8a0054d0ab39cc84a8a
 EBUILD selinux-spamassassin-2.20180114-r2.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
+EBUILD selinux-spamassassin-2.20180114-r3.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
 EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
 MISC metadata.xml 322 BLAKE2B 3b45dfb6f0b204b42d1854faefd6a817d4f6433d5ce76b10838ad703dbc4ea86af21a23bbbaffdb61bffd7c41c8c1031afeb6315b3c3e06c155554fbe43d7389 SHA512 345132094265e24dad21ecc976e75750a363d6773ef83fd63c53ea744b8d3afcd9504d1e63f6758ed54e85cb8e3461e65dfb72bc67f5a63c21c50d9e71dc90ef
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r1.ebuild
deleted file mode 100644
index bcd8854a85b4..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r2.ebuild
deleted file mode 100644
index 97b3d713e960..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r3.ebuild
deleted file mode 100644
index 97b3d713e960..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r4.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r4.ebuild
deleted file mode 100644
index 97b3d713e960..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r4.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r4.ebuild
deleted file mode 100644
index bcd8854a85b4..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..909e42792205
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="spamassassin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index d5ec863e400a..3a62b7a1851c 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-speedtouch-2.20170204-r1.ebuild 292 BLAKE2B 74989873001b78ed00119e35475864884c41eff838c51170b9bb35b2bd5ebbc5b155d00deead16855587ba9c38a64d0022024270d90b0e74bd6dcf5e4c607562 SHA512 6137f4e95ed00fc55f45982fc921a847020e022f48340a42438e04e1a5c1705de4755ca290247083ea7e5e365e5ca42eb43a2b2bcb22dc3b4471d38fbd5f8baa
-EBUILD selinux-speedtouch-2.20170204-r2.ebuild 290 BLAKE2B 323eae427def731199667ada640e7d03b15ef500522cb5c25a97691507cbf5c8a4b5397937c7c39d0480820b9e6cc9818d0d6d8e0db942d9a5bed2b037aac049 SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a
-EBUILD selinux-speedtouch-2.20170204-r3.ebuild 290 BLAKE2B 323eae427def731199667ada640e7d03b15ef500522cb5c25a97691507cbf5c8a4b5397937c7c39d0480820b9e6cc9818d0d6d8e0db942d9a5bed2b037aac049 SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a
-EBUILD selinux-speedtouch-2.20170204-r4.ebuild 290 BLAKE2B 323eae427def731199667ada640e7d03b15ef500522cb5c25a97691507cbf5c8a4b5397937c7c39d0480820b9e6cc9818d0d6d8e0db942d9a5bed2b037aac049 SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a
 EBUILD selinux-speedtouch-2.20170805-r2.ebuild 290 BLAKE2B 323eae427def731199667ada640e7d03b15ef500522cb5c25a97691507cbf5c8a4b5397937c7c39d0480820b9e6cc9818d0d6d8e0db942d9a5bed2b037aac049 SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a
 EBUILD selinux-speedtouch-2.20170805-r3.ebuild 290 BLAKE2B 323eae427def731199667ada640e7d03b15ef500522cb5c25a97691507cbf5c8a4b5397937c7c39d0480820b9e6cc9818d0d6d8e0db942d9a5bed2b037aac049 SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a
-EBUILD selinux-speedtouch-2.20170805-r4.ebuild 292 BLAKE2B 74989873001b78ed00119e35475864884c41eff838c51170b9bb35b2bd5ebbc5b155d00deead16855587ba9c38a64d0022024270d90b0e74bd6dcf5e4c607562 SHA512 6137f4e95ed00fc55f45982fc921a847020e022f48340a42438e04e1a5c1705de4755ca290247083ea7e5e365e5ca42eb43a2b2bcb22dc3b4471d38fbd5f8baa
 EBUILD selinux-speedtouch-2.20180114-r1.ebuild 290 BLAKE2B 41812b000437cb50d45f86a05bfe43f251c9493304c1ec59557afbc4c0b4ee97e1c75b2bd7a50c92a851e32bbb7537416489cbe067757c96abe02866170cfc10 SHA512 6250e84a640e4cc3042ef42f9b5436ea8e5f0e29c084daacd85cc5f41acf2be4e2bd25b355a07a01c0243cb6aeb097108aeb37d213418329838c5864f2f84cac
 EBUILD selinux-speedtouch-2.20180114-r2.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
+EBUILD selinux-speedtouch-2.20180114-r3.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
 EBUILD selinux-speedtouch-9999.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
 MISC metadata.xml 320 BLAKE2B 34a59dc2b37e67afb4cab2ad95cf3319232f1857e85aae35ce641a22e5ec62cadea9e07725445f9185cc78e90d36b98cd864240f739372d6051bfb54bcb90094 SHA512 ef55a786bf5aa65e1bba7df8f14e019fb4f18ae58eddc64b46bdf9b0cf39ba4fde9171ee436fb5264556038d3ae464df4adbd65ca3c3213fb3925dd8e5635c96
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r1.ebuild
deleted file mode 100644
index 09634f1a006f..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r2.ebuild
deleted file mode 100644
index 77e844e3803e..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r3.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r3.ebuild
deleted file mode 100644
index 77e844e3803e..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r4.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r4.ebuild
deleted file mode 100644
index 77e844e3803e..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r4.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r4.ebuild
deleted file mode 100644
index 09634f1a006f..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180114-r3.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..c9c31f9b77ac
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="speedtouch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for speedtouch"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 994cc7a1990e..f77221752e24 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-squid-2.20170204-r1.ebuild 378 BLAKE2B ea3b14d0acc695538447cdc26dd6b75ca82305b2f7c009fc1f1aa7b6bc5e6e1a5bf538de42a94c210ffd02ba86918d31c3feb67671e7b6f62221c8b04446ec2a SHA512 256465bd4c929af1d39de325c8be1ad2940ce99020e9b4270aca4308715773ddd3b2ea9c0d348bf5eec60e18ef3b3613bc790335135127fbea2d33bc8c99dcd4
-EBUILD selinux-squid-2.20170204-r2.ebuild 376 BLAKE2B 544f7a7439783901991da68058f8cd4d632ceb6bbd88af3696f8e3c2dc7acbd4673a8bf2dbfb9ff8c5718f3e6289d954d1cb222605d3a867cfa30576a90d2a88 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064
-EBUILD selinux-squid-2.20170204-r3.ebuild 376 BLAKE2B 544f7a7439783901991da68058f8cd4d632ceb6bbd88af3696f8e3c2dc7acbd4673a8bf2dbfb9ff8c5718f3e6289d954d1cb222605d3a867cfa30576a90d2a88 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064
-EBUILD selinux-squid-2.20170204-r4.ebuild 376 BLAKE2B 544f7a7439783901991da68058f8cd4d632ceb6bbd88af3696f8e3c2dc7acbd4673a8bf2dbfb9ff8c5718f3e6289d954d1cb222605d3a867cfa30576a90d2a88 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064
 EBUILD selinux-squid-2.20170805-r2.ebuild 376 BLAKE2B 544f7a7439783901991da68058f8cd4d632ceb6bbd88af3696f8e3c2dc7acbd4673a8bf2dbfb9ff8c5718f3e6289d954d1cb222605d3a867cfa30576a90d2a88 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064
 EBUILD selinux-squid-2.20170805-r3.ebuild 376 BLAKE2B 544f7a7439783901991da68058f8cd4d632ceb6bbd88af3696f8e3c2dc7acbd4673a8bf2dbfb9ff8c5718f3e6289d954d1cb222605d3a867cfa30576a90d2a88 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064
-EBUILD selinux-squid-2.20170805-r4.ebuild 378 BLAKE2B ea3b14d0acc695538447cdc26dd6b75ca82305b2f7c009fc1f1aa7b6bc5e6e1a5bf538de42a94c210ffd02ba86918d31c3feb67671e7b6f62221c8b04446ec2a SHA512 256465bd4c929af1d39de325c8be1ad2940ce99020e9b4270aca4308715773ddd3b2ea9c0d348bf5eec60e18ef3b3613bc790335135127fbea2d33bc8c99dcd4
 EBUILD selinux-squid-2.20180114-r1.ebuild 376 BLAKE2B ad42454befe5ca67e0c57ba676728cd5980162aeb779b9ca4f8539cdc00480886321084bb1448113210c9bddae8bad011f5241914aea8245f7328d6c9ca0083e SHA512 27a186e36208c45f23ce6de9b747ffd78d00ba1494414519c1a2cccb284d5cce9b0170b9cbbac209ff28486e7e5d315fe75c6c73086a52fdb723428dfb1403a5
 EBUILD selinux-squid-2.20180114-r2.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
+EBUILD selinux-squid-2.20180114-r3.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
 EBUILD selinux-squid-9999.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
 MISC metadata.xml 315 BLAKE2B 73d453753c413703df9d5b137710f031f520258d26efcdf9076ae128573efae6fc54210fb815a446015c1046c454b485476bfe912c8fbdec163965ecb22f6796 SHA512 0742eacb66c8dcaa556ca6bdc0d55789c28d5f776b065340d6f72eea41ddbd1ac34fa4d5257a11cd970e23c42b4ed36b556838d619b70b8fa78d854bfc82396d
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170204-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170204-r1.ebuild
deleted file mode 100644
index d1355ec6f9bc..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170204-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170204-r2.ebuild
deleted file mode 100644
index 473a40019dda..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170204-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170204-r3.ebuild
deleted file mode 100644
index 473a40019dda..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170204-r4.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170204-r4.ebuild
deleted file mode 100644
index 473a40019dda..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170805-r4.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170805-r4.ebuild
deleted file mode 100644
index d1355ec6f9bc..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20180114-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..21f8d9686c17
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="squid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index b3d13893a105..e1e33611a985 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sssd-2.20170204-r1.ebuild 280 BLAKE2B b2bcccbf3c096ac24a472b02ce6fb927dfd8cdabeac1fc2dc0565b4f1ac37d4c7bf9961172683b93bc2e134a59be882a913ce31636728dd30cb742b88c38baab SHA512 c93d51c97b4a02188736100bf2e7a84b113ee8f50a62fb915c5c81a4b34a7d00e37c9cae7f9c3e7b056492184595c8d4c4ab942df32c9f990a0f848035128799
-EBUILD selinux-sssd-2.20170204-r2.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e97286ee8bfc05166f1cdc65aea7e4804ff51a88f4e8edc4dfadc43b97c4ecde207ae28ef7f807af3291652591ad118ff65646 SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f
-EBUILD selinux-sssd-2.20170204-r3.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e97286ee8bfc05166f1cdc65aea7e4804ff51a88f4e8edc4dfadc43b97c4ecde207ae28ef7f807af3291652591ad118ff65646 SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f
-EBUILD selinux-sssd-2.20170204-r4.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e97286ee8bfc05166f1cdc65aea7e4804ff51a88f4e8edc4dfadc43b97c4ecde207ae28ef7f807af3291652591ad118ff65646 SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f
 EBUILD selinux-sssd-2.20170805-r2.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e97286ee8bfc05166f1cdc65aea7e4804ff51a88f4e8edc4dfadc43b97c4ecde207ae28ef7f807af3291652591ad118ff65646 SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f
 EBUILD selinux-sssd-2.20170805-r3.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e97286ee8bfc05166f1cdc65aea7e4804ff51a88f4e8edc4dfadc43b97c4ecde207ae28ef7f807af3291652591ad118ff65646 SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f
-EBUILD selinux-sssd-2.20170805-r4.ebuild 280 BLAKE2B b2bcccbf3c096ac24a472b02ce6fb927dfd8cdabeac1fc2dc0565b4f1ac37d4c7bf9961172683b93bc2e134a59be882a913ce31636728dd30cb742b88c38baab SHA512 c93d51c97b4a02188736100bf2e7a84b113ee8f50a62fb915c5c81a4b34a7d00e37c9cae7f9c3e7b056492184595c8d4c4ab942df32c9f990a0f848035128799
 EBUILD selinux-sssd-2.20180114-r1.ebuild 278 BLAKE2B c92e17b1905a1fbeaa97c1f4024ee7a762111f7c128abfd9c79da42ec84eaf8d7d35f19b46ac84f82f596e8347d4202fba98c001d2605cbc3e2df9908a029ce9 SHA512 71f83205f2d49cd43518397eb0182b79837c416a8160ef3abb1d9df46bfd89a231bc537e0d59e860fffafea4b85f42b5a91e1d7cb306d62981dd417d42d0d2bf
 EBUILD selinux-sssd-2.20180114-r2.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
+EBUILD selinux-sssd-2.20180114-r3.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
 EBUILD selinux-sssd-9999.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
 MISC metadata.xml 314 BLAKE2B 0ce46de60572d5bc06a9c52cefaccd4bae559c48cbbf48237c71b59812367913916fd358730e0c9d18f39dacc9d7984d8adc69f5fa7c289229a12ea8d664ff0e SHA512 850856c4a38b6056377fffad65b5987f74586928976b767366f7fa8380ee67eb24c176defc0b4936b7a346256fc2575e938a689f972a6adbcad85be2900ff6d4
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r1.ebuild
deleted file mode 100644
index 682823541841..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r2.ebuild
deleted file mode 100644
index 079338b4f98e..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r3.ebuild
deleted file mode 100644
index 079338b4f98e..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r4.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r4.ebuild
deleted file mode 100644
index 079338b4f98e..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r4.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r4.ebuild
deleted file mode 100644
index 682823541841..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20180114-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ba214289acee
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sssd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sssd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 8f75314156bf..56561250b183 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-stunnel-2.20170204-r1.ebuild 286 BLAKE2B 26a462e3cbeaca21cef173281347efa24a4f005a27048432403264b3a04a91dd69a5940616a3a7cf00410aee95d183166539659979b5fedda19977ff8650c066 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1
-EBUILD selinux-stunnel-2.20170204-r2.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
-EBUILD selinux-stunnel-2.20170204-r3.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
-EBUILD selinux-stunnel-2.20170204-r4.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
 EBUILD selinux-stunnel-2.20170805-r2.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
 EBUILD selinux-stunnel-2.20170805-r3.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
-EBUILD selinux-stunnel-2.20170805-r4.ebuild 286 BLAKE2B 26a462e3cbeaca21cef173281347efa24a4f005a27048432403264b3a04a91dd69a5940616a3a7cf00410aee95d183166539659979b5fedda19977ff8650c066 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1
 EBUILD selinux-stunnel-2.20180114-r1.ebuild 284 BLAKE2B e1e106eb2afa0565f6ef00f3449b01c5ed0d3cd0510a5bacdc51414e1b79509a37333b97d29e766a2cb653616855aa83e8a3e0e0d65218c2c8db3791c664fb01 SHA512 ce2b9a4b4b19ebf96fd26246e3bda2bb2cf905f4bfd7e847d9572e96f392ec2a9042244e84e945c3f40970efbe44621d70a4b8b203626a06d9847cf2229502d0
 EBUILD selinux-stunnel-2.20180114-r2.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
+EBUILD selinux-stunnel-2.20180114-r3.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
 EBUILD selinux-stunnel-9999.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
 MISC metadata.xml 317 BLAKE2B bf5e87f13017b76af0fba2e7cdc4723cc79907a563915448a9d079deadd4afec709dcb5700c9712298da4b912ed01440b19963eacfe053344865058a4640d463 SHA512 d9d1705ea1176d67de1ab424d18da867f135c5c385baea034322103ec6590bf34d38fc248205bde9aed697e367e2b4d529c039ca967663ddd0f30a3ed603a00e
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r1.ebuild
deleted file mode 100644
index 7547c9eb6f3e..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r2.ebuild
deleted file mode 100644
index def3fd49aa87..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r3.ebuild
deleted file mode 100644
index def3fd49aa87..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r4.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r4.ebuild
deleted file mode 100644
index def3fd49aa87..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r4.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r4.ebuild
deleted file mode 100644
index 7547c9eb6f3e..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..6d44c6fdbaad
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="stunnel"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index e81a10d8d0bc..961c4848803e 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-subsonic-2.20170204-r1.ebuild 288 BLAKE2B 0e5cbc563b757ef3a7407f4e07430690ac36351520ae71b1f26935d60c4c9685a2d172b03b04adf629268325414d5c0f95d30831e50f8a7d4ffb3d49dcc738b8 SHA512 a7e7982f371398ce8450a8be9cec93d36dc263320d852ab37d01d0db8c5e4787c7d6d27caf62b9b19a06859f47e3b8b255bbec4a16d641203994aac4660fa3c8
-EBUILD selinux-subsonic-2.20170204-r2.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e17fb42405bd3c7d70ae8de239cd1538f8a27d2eaaaff480ea9520d18c181b72faf93137bcfcae83f71dc13224ff4300981166fdad SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434
-EBUILD selinux-subsonic-2.20170204-r3.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e17fb42405bd3c7d70ae8de239cd1538f8a27d2eaaaff480ea9520d18c181b72faf93137bcfcae83f71dc13224ff4300981166fdad SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434
-EBUILD selinux-subsonic-2.20170204-r4.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e17fb42405bd3c7d70ae8de239cd1538f8a27d2eaaaff480ea9520d18c181b72faf93137bcfcae83f71dc13224ff4300981166fdad SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434
 EBUILD selinux-subsonic-2.20170805-r2.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e17fb42405bd3c7d70ae8de239cd1538f8a27d2eaaaff480ea9520d18c181b72faf93137bcfcae83f71dc13224ff4300981166fdad SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434
 EBUILD selinux-subsonic-2.20170805-r3.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e17fb42405bd3c7d70ae8de239cd1538f8a27d2eaaaff480ea9520d18c181b72faf93137bcfcae83f71dc13224ff4300981166fdad SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434
-EBUILD selinux-subsonic-2.20170805-r4.ebuild 288 BLAKE2B 0e5cbc563b757ef3a7407f4e07430690ac36351520ae71b1f26935d60c4c9685a2d172b03b04adf629268325414d5c0f95d30831e50f8a7d4ffb3d49dcc738b8 SHA512 a7e7982f371398ce8450a8be9cec93d36dc263320d852ab37d01d0db8c5e4787c7d6d27caf62b9b19a06859f47e3b8b255bbec4a16d641203994aac4660fa3c8
 EBUILD selinux-subsonic-2.20180114-r1.ebuild 286 BLAKE2B abf73054c1ac88e12d03c830627607be5f867789d636d3f285c8bc76d6af75dd5774c8ab98ee469b2c91104de6f19d4701ab7afbfaf657bb77a00a9e3fd556e3 SHA512 6a7cdcd7d9da7c44491186ae7e9b9d24e9f42e7990e7a09c793f472d8771154b083ec62dfbfb2c43657855951849eac0a1c64da33ba2d44147af51e5e67e08d8
 EBUILD selinux-subsonic-2.20180114-r2.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
+EBUILD selinux-subsonic-2.20180114-r3.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
 EBUILD selinux-subsonic-9999.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
 MISC metadata.xml 341 BLAKE2B 0a0fc876104016c1f6126056bab70ff8354571b39ef2defbcff7c7ff651abbd48244ba2ea7d40bf5f76aa550ae4873ee75adff58f7f379f73d86c70450b922ae SHA512 aea1601d2968cd582294b37bebb44b891131f4d4834a67c0f3adc8706a5fb4df4ba8d287db981896a1a0602c92ddfea4e76c001b2604f462de98433921dd4f09
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r1.ebuild
deleted file mode 100644
index 63b61085e5e5..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r2.ebuild
deleted file mode 100644
index 03d0da972a08..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r3.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r3.ebuild
deleted file mode 100644
index 03d0da972a08..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r4.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r4.ebuild
deleted file mode 100644
index 03d0da972a08..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r4.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r4.ebuild
deleted file mode 100644
index 63b61085e5e5..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20180114-r3.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..452f4a422fcd
--- /dev/null
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="subsonic"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for subsonic"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index dff8fc08b380..fe46a727800a 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sudo-2.20170204-r1.ebuild 280 BLAKE2B 8dbd61c4d0c2994225ee8ab24ec8ed324b92ee92c929a4498b8cc6b9006c2bc7d534a0071ba9212087a87d006a8a7b1f46a9c1ceb5186a3d39bbd72e3ab6e9dd SHA512 ea01fe9c8543d80ab8b153d1f1fc9e196e09483b2a7aed58edc84d559b6d41b737fee2bd9e652496dc119e87d8399a3deaae9f57e40b8eef4dbfd5700b111274
-EBUILD selinux-sudo-2.20170204-r2.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fbb3d4e73764e9317aae7590e6c235d127dc5399f0bd3ca4d7d74e2c706f513e456169589697615fc8e6007559a3288efc109f8 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12
-EBUILD selinux-sudo-2.20170204-r3.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fbb3d4e73764e9317aae7590e6c235d127dc5399f0bd3ca4d7d74e2c706f513e456169589697615fc8e6007559a3288efc109f8 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12
-EBUILD selinux-sudo-2.20170204-r4.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fbb3d4e73764e9317aae7590e6c235d127dc5399f0bd3ca4d7d74e2c706f513e456169589697615fc8e6007559a3288efc109f8 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12
 EBUILD selinux-sudo-2.20170805-r2.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fbb3d4e73764e9317aae7590e6c235d127dc5399f0bd3ca4d7d74e2c706f513e456169589697615fc8e6007559a3288efc109f8 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12
 EBUILD selinux-sudo-2.20170805-r3.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fbb3d4e73764e9317aae7590e6c235d127dc5399f0bd3ca4d7d74e2c706f513e456169589697615fc8e6007559a3288efc109f8 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12
-EBUILD selinux-sudo-2.20170805-r4.ebuild 280 BLAKE2B 8dbd61c4d0c2994225ee8ab24ec8ed324b92ee92c929a4498b8cc6b9006c2bc7d534a0071ba9212087a87d006a8a7b1f46a9c1ceb5186a3d39bbd72e3ab6e9dd SHA512 ea01fe9c8543d80ab8b153d1f1fc9e196e09483b2a7aed58edc84d559b6d41b737fee2bd9e652496dc119e87d8399a3deaae9f57e40b8eef4dbfd5700b111274
 EBUILD selinux-sudo-2.20180114-r1.ebuild 278 BLAKE2B 2b79ed822c01117b8574eb4fc381cb059a4d0bf56c5bff08056f90e7a4e301a8d9ce16781a8791a2a277da856bcfdc68bf1c2a6d0550cf977b618437dfc2790d SHA512 00c9d4e8f0cbf1980e69a3a803b56a39af20f69540dfdc30c0494e4af2ea289db28b70ba2000ac0c61e7b26e476fb316ff98e43aec8f6110370f10edb3e01356
 EBUILD selinux-sudo-2.20180114-r2.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
+EBUILD selinux-sudo-2.20180114-r3.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
 EBUILD selinux-sudo-9999.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
 MISC metadata.xml 314 BLAKE2B fa0d65ec12bf3e67b5f44eb7fcd861f83118a6546369b277d169262f48af9654c9da7f95b597eb84552a52bd049c9e18e44f65ce216e4305ddacf68e52045f18 SHA512 444deb961f20c878bf6c95a7bcdb8195b05616a6387d817f627920eeea4a982eb671990e9acf7fe8c4b2bb2d7f36a6d46ea5fde70a78fd5fcd9efe47d23f33a0
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r1.ebuild
deleted file mode 100644
index 6cd25b8657a4..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r2.ebuild
deleted file mode 100644
index 805037ec8a00..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r3.ebuild
deleted file mode 100644
index 805037ec8a00..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r4.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r4.ebuild
deleted file mode 100644
index 805037ec8a00..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r4.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r4.ebuild
deleted file mode 100644
index 6cd25b8657a4..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20180114-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..f170453419a4
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sudo"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sudo"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index b8e6a88da8cc..ae229ae6e73b 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sxid-2.20170204-r1.ebuild 280 BLAKE2B 899c769ffefc8737aa7b82442fb2cd63f706cbf1ea972d73ab8952dbcedb41518872936c2456ca7e6fb0c4a42ad80ee94987b4dc1ba950a8e3bd75ccc0e78fcc SHA512 3263fdc3a536e2b8b64909b7262b3979dc43d592e2e1aca190a6dec54d9a2f4ae14dabf207e99ab0d09618667a3054a62ce85d0d45cec1d94c7d2edfb1a251b9
-EBUILD selinux-sxid-2.20170204-r2.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd7d4a762e5201308d71fc0f7d83cff9c169e20825804970bebfa06550e44974d27c621c1a51124300a78423ebf70bb62c487a0 SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd
-EBUILD selinux-sxid-2.20170204-r3.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd7d4a762e5201308d71fc0f7d83cff9c169e20825804970bebfa06550e44974d27c621c1a51124300a78423ebf70bb62c487a0 SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd
-EBUILD selinux-sxid-2.20170204-r4.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd7d4a762e5201308d71fc0f7d83cff9c169e20825804970bebfa06550e44974d27c621c1a51124300a78423ebf70bb62c487a0 SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd
 EBUILD selinux-sxid-2.20170805-r2.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd7d4a762e5201308d71fc0f7d83cff9c169e20825804970bebfa06550e44974d27c621c1a51124300a78423ebf70bb62c487a0 SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd
 EBUILD selinux-sxid-2.20170805-r3.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd7d4a762e5201308d71fc0f7d83cff9c169e20825804970bebfa06550e44974d27c621c1a51124300a78423ebf70bb62c487a0 SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd
-EBUILD selinux-sxid-2.20170805-r4.ebuild 280 BLAKE2B 899c769ffefc8737aa7b82442fb2cd63f706cbf1ea972d73ab8952dbcedb41518872936c2456ca7e6fb0c4a42ad80ee94987b4dc1ba950a8e3bd75ccc0e78fcc SHA512 3263fdc3a536e2b8b64909b7262b3979dc43d592e2e1aca190a6dec54d9a2f4ae14dabf207e99ab0d09618667a3054a62ce85d0d45cec1d94c7d2edfb1a251b9
 EBUILD selinux-sxid-2.20180114-r1.ebuild 278 BLAKE2B eda95377b8be5421b9605eb7a32957a1faf2cd0a213b59883106b72ac6a48160dd89248259d828ccc39f5e85e4e86aa84736a957b6c6f6aed16cf04c507dad49 SHA512 4b959ffc16ebe567ce574bbc0ab0a63a94131bf49f14b06d19e2ba52143841535fd999711c0b0d856c5fa9f080238c04dc34e34ac6dd80eaa0fc85ac4c127d66
 EBUILD selinux-sxid-2.20180114-r2.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
+EBUILD selinux-sxid-2.20180114-r3.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
 EBUILD selinux-sxid-9999.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
 MISC metadata.xml 314 BLAKE2B 8d371c34b9d307154ebaf04b4cd15173c06c8efbbd6565f40b8f78157f4e584485cf140199eec6b3a08e83c830aea67d97c3d0e191914c4cca3c5c7188b56dce SHA512 0baa2e4f8b229b455faa8ca4a17e2f4eb9479cf4ed41c21d835bdd43fba5cb3bea22d80c8f6ac5c1518d40ea4e5208fbeda1d7236c612507410d8609a9c919e0
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r1.ebuild
deleted file mode 100644
index 78004d97bad7..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r2.ebuild
deleted file mode 100644
index 53981821277d..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r3.ebuild
deleted file mode 100644
index 53981821277d..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r4.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r4.ebuild
deleted file mode 100644
index 53981821277d..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r4.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r4.ebuild
deleted file mode 100644
index 78004d97bad7..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20180114-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..73566a466c1a
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sxid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sxid"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index 5b23fd8cce5d..0c42a1a2178d 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-syncthing-2.20170204-r1.ebuild 290 BLAKE2B ad20bb719be71cc393d039fdcd6a8683f2f7ea58fc38a95c007f3d6304cf2d51de8e30163ca1d6bc442bfa734b52f71ef125391e8bc00f0bed7b3be36a35f59b SHA512 95169f6ab6b871b29f8639bc0b36959ff09e984691370c5508691fa839091e03a27472b8c9739f891ebbdfae9990c633908a149e5bbdc52e5aeb26cc58cf6d16
-EBUILD selinux-syncthing-2.20170204-r2.ebuild 288 BLAKE2B b226c19631f1b97070988c25273a188d9577e354fc6f9f92d12ae9b28377f92acf4a9c621699346d817a27a5f0410a6e974710384beb3df39df66ff9ff797396 SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85
-EBUILD selinux-syncthing-2.20170204-r3.ebuild 288 BLAKE2B b226c19631f1b97070988c25273a188d9577e354fc6f9f92d12ae9b28377f92acf4a9c621699346d817a27a5f0410a6e974710384beb3df39df66ff9ff797396 SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85
-EBUILD selinux-syncthing-2.20170204-r4.ebuild 288 BLAKE2B b226c19631f1b97070988c25273a188d9577e354fc6f9f92d12ae9b28377f92acf4a9c621699346d817a27a5f0410a6e974710384beb3df39df66ff9ff797396 SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85
 EBUILD selinux-syncthing-2.20170805-r2.ebuild 288 BLAKE2B b226c19631f1b97070988c25273a188d9577e354fc6f9f92d12ae9b28377f92acf4a9c621699346d817a27a5f0410a6e974710384beb3df39df66ff9ff797396 SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85
 EBUILD selinux-syncthing-2.20170805-r3.ebuild 288 BLAKE2B b226c19631f1b97070988c25273a188d9577e354fc6f9f92d12ae9b28377f92acf4a9c621699346d817a27a5f0410a6e974710384beb3df39df66ff9ff797396 SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85
-EBUILD selinux-syncthing-2.20170805-r4.ebuild 290 BLAKE2B ad20bb719be71cc393d039fdcd6a8683f2f7ea58fc38a95c007f3d6304cf2d51de8e30163ca1d6bc442bfa734b52f71ef125391e8bc00f0bed7b3be36a35f59b SHA512 95169f6ab6b871b29f8639bc0b36959ff09e984691370c5508691fa839091e03a27472b8c9739f891ebbdfae9990c633908a149e5bbdc52e5aeb26cc58cf6d16
 EBUILD selinux-syncthing-2.20180114-r1.ebuild 288 BLAKE2B 0de40e791e960bcee9af7aebe3fdf8d3762ee3710f11902f51b7edf0c2978291a99b6e155b068522401d5d76b22a49172f2a76ab3d4a703e0c739c8bf11f9324 SHA512 af59492d90e8f44a03884024e2fb2146a76b2ca406c9e0b629f5d8c06bee406fd426e42e51d9d47c9590511019cfa572adb1b04da03d74d41655f497a6a102a7
 EBUILD selinux-syncthing-2.20180114-r2.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
+EBUILD selinux-syncthing-2.20180114-r3.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
 EBUILD selinux-syncthing-9999.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
 MISC metadata.xml 319 BLAKE2B 880cc6e865a46e68115698fade5b2af342b717eec3fe5989a823456a5ff63f430106d7d783027b2a15df37e00067f782d40c650fa2af8f55883b01a5df3409e8 SHA512 0ae48ef15966fa6b5b11a0b5e067061a5385c22c78b016caaa29a77457d5f48522abe1303c870cc1117d3a1a67d8b7f47ad8da9e9703ec13d05656d86b2168fa
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r1.ebuild
deleted file mode 100644
index 770ad757c47f..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r2.ebuild
deleted file mode 100644
index f09aa093c1f5..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r3.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r3.ebuild
deleted file mode 100644
index f09aa093c1f5..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r4.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r4.ebuild
deleted file mode 100644
index f09aa093c1f5..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r4.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r4.ebuild
deleted file mode 100644
index 770ad757c47f..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20180114-r3.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..fb45ab18b9ca
--- /dev/null
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="syncthing"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for syncthing"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index c2e126deb1ae..a9b1f8b6ef32 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-sysstat-2.20170204-r1.ebuild 286 BLAKE2B 58e3c824aba68b58a65466f0d20b37a443aae67f429d655743d42bd29aa923acc1aca2a67be522de5ad35b4b200e04844db63e63047f45ecef89fadeb9d7869f SHA512 f00d7f8ce98117bb8c4fa474c52a6e83f0c6900afba1c3392fec9cbe31588891fa0b6cb5065a4cef066b53897dbb24369341d10979e2e825aac0460d935e9515
-EBUILD selinux-sysstat-2.20170204-r2.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a403d4e0892ad895f7e3aa9847462791d0922e672fad789840306fae17f711b6b1c2082df3d8c2921cbe9d4628e7a50951e4d5201d SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec
-EBUILD selinux-sysstat-2.20170204-r3.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a403d4e0892ad895f7e3aa9847462791d0922e672fad789840306fae17f711b6b1c2082df3d8c2921cbe9d4628e7a50951e4d5201d SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec
-EBUILD selinux-sysstat-2.20170204-r4.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a403d4e0892ad895f7e3aa9847462791d0922e672fad789840306fae17f711b6b1c2082df3d8c2921cbe9d4628e7a50951e4d5201d SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec
 EBUILD selinux-sysstat-2.20170805-r2.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a403d4e0892ad895f7e3aa9847462791d0922e672fad789840306fae17f711b6b1c2082df3d8c2921cbe9d4628e7a50951e4d5201d SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec
 EBUILD selinux-sysstat-2.20170805-r3.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a403d4e0892ad895f7e3aa9847462791d0922e672fad789840306fae17f711b6b1c2082df3d8c2921cbe9d4628e7a50951e4d5201d SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec
-EBUILD selinux-sysstat-2.20170805-r4.ebuild 286 BLAKE2B 58e3c824aba68b58a65466f0d20b37a443aae67f429d655743d42bd29aa923acc1aca2a67be522de5ad35b4b200e04844db63e63047f45ecef89fadeb9d7869f SHA512 f00d7f8ce98117bb8c4fa474c52a6e83f0c6900afba1c3392fec9cbe31588891fa0b6cb5065a4cef066b53897dbb24369341d10979e2e825aac0460d935e9515
 EBUILD selinux-sysstat-2.20180114-r1.ebuild 284 BLAKE2B bc712b68c9d939820e1a4dfc30fa528181bdfb4781a41c3db9d0c03c2a2f269d0e9bf7bc62f280b916c5f6c98531116462e8ae09d2048df7b94ec76bad1a16cd SHA512 2dead4902b274a9f2d38cc8ed914d66237598b76440ce7e1da3e437d55fac9818497c6ce39cce22222db700507f359c3f9bca202806dc93192552b3b636086d9
 EBUILD selinux-sysstat-2.20180114-r2.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
+EBUILD selinux-sysstat-2.20180114-r3.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
 EBUILD selinux-sysstat-9999.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
 MISC metadata.xml 317 BLAKE2B 96d9b10ff7d8b6b058c4bdc14ed41cbd12f5088469b1f43e8f21f15d0416c24ec54fdf7f1c5a8b40bf1956361eba6f5057e932f68b01b15cfc67103b39f7d1e6 SHA512 dab3ab7e1b48828952a50e5b936336fa179a5e7d852e82061dd2c0d2caed0ce4c52dd06c6610ab0b19c6441a927eb826eaabd84100edff7271e73be4165f35d5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r1.ebuild
deleted file mode 100644
index 3d7093c2ea1f..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r2.ebuild
deleted file mode 100644
index 6a019365f64c..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r3.ebuild
deleted file mode 100644
index 6a019365f64c..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r4.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r4.ebuild
deleted file mode 100644
index 6a019365f64c..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r4.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r4.ebuild
deleted file mode 100644
index 3d7093c2ea1f..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20180114-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1551a51a365a
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sysstat"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sysstat"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index 564548830adb..2ba3ba5d64c1 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tboot-2.20170204-r1.ebuild 282 BLAKE2B b02a827eb0e87c70b5671ed4fcae0288f3a51930577fcedda63f6dd4ec956e53b00cd2a484de50b9e9cdb0c69985f516676f350af7b47a408230e3b93de5a01e SHA512 5f499c39d47b9fb43eba196c9abe72a838f4026dcad1f83fa8c263b107711301c13197034c55bb9e0cc9a664705bd0c74ed9b639c6d25c470c414376d4987f2d
-EBUILD selinux-tboot-2.20170204-r2.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5560f003054fb7329387677827733168742ea6f24ed778e0efe344ee8b2415dc257b81b6a9c9e6461fa3601bcd99a2f56f31f71 SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832
-EBUILD selinux-tboot-2.20170204-r3.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5560f003054fb7329387677827733168742ea6f24ed778e0efe344ee8b2415dc257b81b6a9c9e6461fa3601bcd99a2f56f31f71 SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832
-EBUILD selinux-tboot-2.20170204-r4.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5560f003054fb7329387677827733168742ea6f24ed778e0efe344ee8b2415dc257b81b6a9c9e6461fa3601bcd99a2f56f31f71 SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832
 EBUILD selinux-tboot-2.20170805-r2.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5560f003054fb7329387677827733168742ea6f24ed778e0efe344ee8b2415dc257b81b6a9c9e6461fa3601bcd99a2f56f31f71 SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832
 EBUILD selinux-tboot-2.20170805-r3.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5560f003054fb7329387677827733168742ea6f24ed778e0efe344ee8b2415dc257b81b6a9c9e6461fa3601bcd99a2f56f31f71 SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832
-EBUILD selinux-tboot-2.20170805-r4.ebuild 282 BLAKE2B b02a827eb0e87c70b5671ed4fcae0288f3a51930577fcedda63f6dd4ec956e53b00cd2a484de50b9e9cdb0c69985f516676f350af7b47a408230e3b93de5a01e SHA512 5f499c39d47b9fb43eba196c9abe72a838f4026dcad1f83fa8c263b107711301c13197034c55bb9e0cc9a664705bd0c74ed9b639c6d25c470c414376d4987f2d
 EBUILD selinux-tboot-2.20180114-r1.ebuild 280 BLAKE2B a54c20f8acae990c7736b4753c9dd67198d3041370e2728f200713fc5d47de1d8b96793828e1351eb7b2e9ce787957cf1e821b23991ffa0a7b550e2aea03a06b SHA512 da43c84bff2331210493343c95fb8bfc32b9cf40e9e689915c07f4d7aae02eda62457cefc1f715c23cead234c5ea373a18bf271d7ffe2725773b8b92aefe8a54
 EBUILD selinux-tboot-2.20180114-r2.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
+EBUILD selinux-tboot-2.20180114-r3.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
 EBUILD selinux-tboot-9999.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
 MISC metadata.xml 335 BLAKE2B 24e218a7e26eabb17fd01eb43a960921e4b3bc7dd936db2bc76cdcb15c29b4766052a18bbd2d1a0af659746a2eadc124175ac8d68e8a918a1be7077bbf133eb8 SHA512 893b7c0695b5811aa706cbdee4a48d90de09b9e6e24305b5dd73f51d4a0f06c3ea32911e0e800b5fde6d2f5024095d501fedd600bc542ca14e83809696b3d028
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r1.ebuild
deleted file mode 100644
index 90dfb5417720..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r2.ebuild
deleted file mode 100644
index 9e6ed3ef669c..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r3.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r3.ebuild
deleted file mode 100644
index 9e6ed3ef669c..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r4.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r4.ebuild
deleted file mode 100644
index 9e6ed3ef669c..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r4.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r4.ebuild
deleted file mode 100644
index 90dfb5417720..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20180114-r3.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..71edee22c6c5
--- /dev/null
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tboot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tboot"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 3e2cc078ae57..27a5c6f8532b 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tcpd-2.20170204-r1.ebuild 374 BLAKE2B ce02f810b45fbfdccf121a8b40e75d21fcc6fd9ba4087b4cbccac3ecbc38e891d7999e77699b9366bcfe2b914070082218303a166fea70d4c5a10955a809818e SHA512 eed42c09121833b6208ec36f4cefad7f02d76cae5e35654bda28045ad02f55bdb4bfcfd4019fa822f7da7226ed9e44e1b687a41446d25906963077529b72f39b
-EBUILD selinux-tcpd-2.20170204-r2.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d34112a08e5654038d6bee203ad0e5595e59e26e6717569d1f51b4830040342025fd07bae795f2f1e05f776276f74a4172948ed5fa SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87
-EBUILD selinux-tcpd-2.20170204-r3.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d34112a08e5654038d6bee203ad0e5595e59e26e6717569d1f51b4830040342025fd07bae795f2f1e05f776276f74a4172948ed5fa SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87
-EBUILD selinux-tcpd-2.20170204-r4.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d34112a08e5654038d6bee203ad0e5595e59e26e6717569d1f51b4830040342025fd07bae795f2f1e05f776276f74a4172948ed5fa SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87
 EBUILD selinux-tcpd-2.20170805-r2.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d34112a08e5654038d6bee203ad0e5595e59e26e6717569d1f51b4830040342025fd07bae795f2f1e05f776276f74a4172948ed5fa SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87
 EBUILD selinux-tcpd-2.20170805-r3.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d34112a08e5654038d6bee203ad0e5595e59e26e6717569d1f51b4830040342025fd07bae795f2f1e05f776276f74a4172948ed5fa SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87
-EBUILD selinux-tcpd-2.20170805-r4.ebuild 374 BLAKE2B ce02f810b45fbfdccf121a8b40e75d21fcc6fd9ba4087b4cbccac3ecbc38e891d7999e77699b9366bcfe2b914070082218303a166fea70d4c5a10955a809818e SHA512 eed42c09121833b6208ec36f4cefad7f02d76cae5e35654bda28045ad02f55bdb4bfcfd4019fa822f7da7226ed9e44e1b687a41446d25906963077529b72f39b
 EBUILD selinux-tcpd-2.20180114-r1.ebuild 372 BLAKE2B e9c28b78dee5e030df7f4a960389a74aa91b4cdbb5cc2ab832910b2bdf75e755171fe86e735cd4a0ba327fe008f5e2a774dcd1b85c1fc0afed298f44ddaa5041 SHA512 e6f39d36d622704e21fafe2d58b1346d65cce3c0e3b66f4cb7448e4a66db705193683b96cfe1aa280f23e174de68d03e2f4199d1d00dac91f2dd79178bee47a3
 EBUILD selinux-tcpd-2.20180114-r2.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
+EBUILD selinux-tcpd-2.20180114-r3.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
 EBUILD selinux-tcpd-9999.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
 MISC metadata.xml 314 BLAKE2B 7275643a566403529d2075c82da3d4dbeb78ba6cdf5d87a704952f0c19ad36913fe9e1a248809b156ffd7c3e25162df7b8f37aee6ac80ef6ed5667d36d487537 SHA512 5fe5784f0e2a678a0202842e256c029ca34fcf992151a05f0f015ba8abaaa0b71729ffb3e9400c9dbedbb90830efd17d363ac60a4a042d24ecdee368341483ce
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r1.ebuild
deleted file mode 100644
index 0c4d8ce778f6..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r2.ebuild
deleted file mode 100644
index 18e3c007e6c0..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r3.ebuild
deleted file mode 100644
index 18e3c007e6c0..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r4.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r4.ebuild
deleted file mode 100644
index 18e3c007e6c0..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r4.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r4.ebuild
deleted file mode 100644
index 0c4d8ce778f6..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20180114-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..dbaebf94c9a4
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tcpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 5d3369fd0d07..ad127a8a3652 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tcsd-2.20170204-r1.ebuild 280 BLAKE2B c5d01ace661bd37bbf0a33a955eb1849cee8865e4d14c17d4ce55011a5a4121c8c24e6f97546c16585fcf61372e081451f97de0953faeb72c4ccc5044b3713ed SHA512 0c31b575b6774879c87fc28126d3eda7ed4b46948af1904e05f50f9308bbe5f249bd450ed83e40b77bcd08dc933de013b157243ac43619afbfcb15b62b986b63
-EBUILD selinux-tcsd-2.20170204-r2.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3dd983732b884d802b70daf32f74df5bee4f79f271ffddaba8922ea77582b0813c97e1744621ad24eb0f987e8a0ad1865fc30dd SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40
-EBUILD selinux-tcsd-2.20170204-r3.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3dd983732b884d802b70daf32f74df5bee4f79f271ffddaba8922ea77582b0813c97e1744621ad24eb0f987e8a0ad1865fc30dd SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40
-EBUILD selinux-tcsd-2.20170204-r4.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3dd983732b884d802b70daf32f74df5bee4f79f271ffddaba8922ea77582b0813c97e1744621ad24eb0f987e8a0ad1865fc30dd SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40
 EBUILD selinux-tcsd-2.20170805-r2.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3dd983732b884d802b70daf32f74df5bee4f79f271ffddaba8922ea77582b0813c97e1744621ad24eb0f987e8a0ad1865fc30dd SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40
 EBUILD selinux-tcsd-2.20170805-r3.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3dd983732b884d802b70daf32f74df5bee4f79f271ffddaba8922ea77582b0813c97e1744621ad24eb0f987e8a0ad1865fc30dd SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40
-EBUILD selinux-tcsd-2.20170805-r4.ebuild 280 BLAKE2B c5d01ace661bd37bbf0a33a955eb1849cee8865e4d14c17d4ce55011a5a4121c8c24e6f97546c16585fcf61372e081451f97de0953faeb72c4ccc5044b3713ed SHA512 0c31b575b6774879c87fc28126d3eda7ed4b46948af1904e05f50f9308bbe5f249bd450ed83e40b77bcd08dc933de013b157243ac43619afbfcb15b62b986b63
 EBUILD selinux-tcsd-2.20180114-r1.ebuild 278 BLAKE2B 429caa4b92fe6dcdd5784100462c903ae37de24e89d269066b2db481477fec24ac46fc06c8fdc26e68cdf51b74bdde7954527a831a19c6e706b504795f31efc9 SHA512 5f07cf19475dc6f83f60d487ddf7458656b1ec239b15da7a5d6e2032cf17171fdd123dd721fb7acaa8cf767e39e47a26ecb1ceb8957ff5f153c89b35becb412f
 EBUILD selinux-tcsd-2.20180114-r2.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
+EBUILD selinux-tcsd-2.20180114-r3.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
 EBUILD selinux-tcsd-9999.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
 MISC metadata.xml 314 BLAKE2B 97c20c7e1bafbb77a72b6cf1571a100bb9d8eb89d58fa9d74994758111b73748f57066b97fe2357f146ccf628e96da1c3c3d1331fd760f31c9ec346f0b90dcf2 SHA512 12aed2a47c90c7da82be53abc650160c5b012b358dea0b609ed3c2761ba49cf7113901b4f82121972af204b582aeed230d74f18fbd8c5469dedf5c5fc642cc74
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r1.ebuild
deleted file mode 100644
index ab910d37f2ba..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r2.ebuild
deleted file mode 100644
index 070a4fc6fff8..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r3.ebuild
deleted file mode 100644
index 070a4fc6fff8..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r4.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r4.ebuild
deleted file mode 100644
index 070a4fc6fff8..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r4.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r4.ebuild
deleted file mode 100644
index ab910d37f2ba..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20180114-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..adc49785ec0a
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tcsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index 4b0207ecaae3..e0f1643e49b9 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-telnet-2.20170204-r1.ebuild 390 BLAKE2B 03d02d334338e11cd9fc5fa48300e24e42c6ab4ea8ee99904ee5f15b5e8d0b4ce27e68ab75d58a92076271e5b9bf5e5245dda9cbaed0c9923925035a31077b4f SHA512 af1f55df68650962dc3254aae42ad90ed765dbfb341efebad4937b6b38e80222a76802e5b400c5e2c133600de84e579235db0b9f665046aa0dbcf9b74c4f5bb7
-EBUILD selinux-telnet-2.20170204-r2.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd95438a51b219763d1775bb729166d5710b005ea9f08fdbfb2bc3094be3c4badbafdf56c8c66b6d28deb7c4b5f6edd2d54f93497 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a
-EBUILD selinux-telnet-2.20170204-r3.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd95438a51b219763d1775bb729166d5710b005ea9f08fdbfb2bc3094be3c4badbafdf56c8c66b6d28deb7c4b5f6edd2d54f93497 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a
-EBUILD selinux-telnet-2.20170204-r4.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd95438a51b219763d1775bb729166d5710b005ea9f08fdbfb2bc3094be3c4badbafdf56c8c66b6d28deb7c4b5f6edd2d54f93497 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a
 EBUILD selinux-telnet-2.20170805-r2.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd95438a51b219763d1775bb729166d5710b005ea9f08fdbfb2bc3094be3c4badbafdf56c8c66b6d28deb7c4b5f6edd2d54f93497 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a
 EBUILD selinux-telnet-2.20170805-r3.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd95438a51b219763d1775bb729166d5710b005ea9f08fdbfb2bc3094be3c4badbafdf56c8c66b6d28deb7c4b5f6edd2d54f93497 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a
-EBUILD selinux-telnet-2.20170805-r4.ebuild 390 BLAKE2B 03d02d334338e11cd9fc5fa48300e24e42c6ab4ea8ee99904ee5f15b5e8d0b4ce27e68ab75d58a92076271e5b9bf5e5245dda9cbaed0c9923925035a31077b4f SHA512 af1f55df68650962dc3254aae42ad90ed765dbfb341efebad4937b6b38e80222a76802e5b400c5e2c133600de84e579235db0b9f665046aa0dbcf9b74c4f5bb7
 EBUILD selinux-telnet-2.20180114-r1.ebuild 388 BLAKE2B 958ed0039723dbd68de431e348095418b53837c0ead1b27ad475810d3e64fdd9568c6d4d0a71fbc51b26b1c25cff2b99da808381352da29f309b600314af7bad SHA512 b2645ef75943d569e070a629965d2088f50584d08793b45b9a9bd1816280ce823b759bb8cc99c7d322861c40c2a168666afcfdc531d3553a8ffcfac9c5f683cb
 EBUILD selinux-telnet-2.20180114-r2.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
+EBUILD selinux-telnet-2.20180114-r3.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
 EBUILD selinux-telnet-9999.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
 MISC metadata.xml 316 BLAKE2B f9dacecead9d85c43146f0521bba36ef38ec49370642a692230d46fb5154f911a507a3a18fcb53444170d1708dd317e43f40266d3919c4dc88f2c42c417d7b21 SHA512 09fc5cf80795fa3e4565a9102ee44138f0c8e4f14a308634bd55b9cb1a6e2dadfc8afa7f6ff1993b1e2d9ee738c8de4c91aeb34e3974695ad9165815bff49222
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r1.ebuild
deleted file mode 100644
index e310a9be1384..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r2.ebuild
deleted file mode 100644
index 1ca26530766f..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r3.ebuild
deleted file mode 100644
index 1ca26530766f..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r4.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r4.ebuild
deleted file mode 100644
index 1ca26530766f..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r4.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r4.ebuild
deleted file mode 100644
index e310a9be1384..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20180114-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ed9362153891
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="telnet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for telnet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-remotelogin
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-remotelogin
+"
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 36096bb1ac9f..ade6d8ea7c40 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tftp-2.20170204-r1.ebuild 280 BLAKE2B e79077698cf62bfe74bb8d8af8f511ab62d15a44fb508f099ff6eedb6a530ec928d393f3dd9f0fb97113dea84f60620289a5b41422ee0fd61e53cdc717e3e261 SHA512 bb60564eb8c6b70ccd3a637c8c4cba45b0089cb05313ddb6fb21aab3aa35a4b692a647af90072ed8cc622581e3ff3f6d0d7d982a11cb954804d17eb1e866ded2
-EBUILD selinux-tftp-2.20170204-r2.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c799d90ec323fb595029121748765bf9022ac2aac47fce239e04654c810644bec77c689b795752e6c60ebd031b035aa306d25a SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198
-EBUILD selinux-tftp-2.20170204-r3.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c799d90ec323fb595029121748765bf9022ac2aac47fce239e04654c810644bec77c689b795752e6c60ebd031b035aa306d25a SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198
-EBUILD selinux-tftp-2.20170204-r4.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c799d90ec323fb595029121748765bf9022ac2aac47fce239e04654c810644bec77c689b795752e6c60ebd031b035aa306d25a SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198
 EBUILD selinux-tftp-2.20170805-r2.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c799d90ec323fb595029121748765bf9022ac2aac47fce239e04654c810644bec77c689b795752e6c60ebd031b035aa306d25a SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198
 EBUILD selinux-tftp-2.20170805-r3.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c799d90ec323fb595029121748765bf9022ac2aac47fce239e04654c810644bec77c689b795752e6c60ebd031b035aa306d25a SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198
-EBUILD selinux-tftp-2.20170805-r4.ebuild 280 BLAKE2B e79077698cf62bfe74bb8d8af8f511ab62d15a44fb508f099ff6eedb6a530ec928d393f3dd9f0fb97113dea84f60620289a5b41422ee0fd61e53cdc717e3e261 SHA512 bb60564eb8c6b70ccd3a637c8c4cba45b0089cb05313ddb6fb21aab3aa35a4b692a647af90072ed8cc622581e3ff3f6d0d7d982a11cb954804d17eb1e866ded2
 EBUILD selinux-tftp-2.20180114-r1.ebuild 278 BLAKE2B c2f349d617e46484844cf04bee0d3ef22ceb78ac87ac92d7900b7ee62e9161ce4e523fdf920e453dd550e48dc7651b1e90df80fee45a8e48591520816cf3371b SHA512 686ee13b563b0c1e8e3c98de8d26acfeeddd67ab48bc358d7fd6391832aa103e7b093cc0864f43f1349f94c6c77bdc55cdb36d1cf71e7ebad86f63c0cca40dc7
 EBUILD selinux-tftp-2.20180114-r2.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
+EBUILD selinux-tftp-2.20180114-r3.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
 EBUILD selinux-tftp-9999.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
 MISC metadata.xml 314 BLAKE2B 036c95216e3d91689bb297ee53e07038b3a26723ed4ea4dd2cf87972e22c1ae71c7e587e43bbf4c204ea8cdf43ecab6523a484e61c98cbb6abb4813d82407b58 SHA512 697206bf11d8ea4c4935fff9751b8abe279f21d513d288e61b1d4a485c64236452bf37e7a3940a8b2c151c0981b6feda30c7985b32069a0647adc7ad8c70aea1
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r1.ebuild
deleted file mode 100644
index 7aad3f461a12..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r2.ebuild
deleted file mode 100644
index e0fd48b2a2c5..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r3.ebuild
deleted file mode 100644
index e0fd48b2a2c5..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r4.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r4.ebuild
deleted file mode 100644
index e0fd48b2a2c5..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r4.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r4.ebuild
deleted file mode 100644
index 7aad3f461a12..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20180114-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..6a14788e1b36
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tftp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index bd0135e0375e..d8d6d2fc036f 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tgtd-2.20170204-r1.ebuild 280 BLAKE2B 3d3e333fff0733254742256773629671bed893b820a0da11175ced52fda7a2c2d03d314b3c2c9f34e99e91ed6215e3665196f1151090b3562c0b49e58ad4855c SHA512 f935c7ae309f2e80c007f871eacd875ece8d74767b3510ab89526d9d9623716008ec50b3fa698b18aadb52d124c8d9facb37b6c0268f629f8611f6e8667b0a08
-EBUILD selinux-tgtd-2.20170204-r2.ebuild 278 BLAKE2B e314ce620b35943a4460d403975107fc7393252dd842794798bb739f404d6697d7089588c051296084f75e92648173569a82f8574e883d8ae71a0a6eaa3df4ea SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462
-EBUILD selinux-tgtd-2.20170204-r3.ebuild 278 BLAKE2B e314ce620b35943a4460d403975107fc7393252dd842794798bb739f404d6697d7089588c051296084f75e92648173569a82f8574e883d8ae71a0a6eaa3df4ea SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462
-EBUILD selinux-tgtd-2.20170204-r4.ebuild 278 BLAKE2B e314ce620b35943a4460d403975107fc7393252dd842794798bb739f404d6697d7089588c051296084f75e92648173569a82f8574e883d8ae71a0a6eaa3df4ea SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462
 EBUILD selinux-tgtd-2.20170805-r2.ebuild 278 BLAKE2B e314ce620b35943a4460d403975107fc7393252dd842794798bb739f404d6697d7089588c051296084f75e92648173569a82f8574e883d8ae71a0a6eaa3df4ea SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462
 EBUILD selinux-tgtd-2.20170805-r3.ebuild 278 BLAKE2B e314ce620b35943a4460d403975107fc7393252dd842794798bb739f404d6697d7089588c051296084f75e92648173569a82f8574e883d8ae71a0a6eaa3df4ea SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462
-EBUILD selinux-tgtd-2.20170805-r4.ebuild 280 BLAKE2B 3d3e333fff0733254742256773629671bed893b820a0da11175ced52fda7a2c2d03d314b3c2c9f34e99e91ed6215e3665196f1151090b3562c0b49e58ad4855c SHA512 f935c7ae309f2e80c007f871eacd875ece8d74767b3510ab89526d9d9623716008ec50b3fa698b18aadb52d124c8d9facb37b6c0268f629f8611f6e8667b0a08
 EBUILD selinux-tgtd-2.20180114-r1.ebuild 278 BLAKE2B 5cec03fb728eed3bc64cdc8eff4c5bdef14c4d5749ee8aa7d3c06256fd894b1ebf9b06879f6d96da9a95c179cca78646070cfa7c1431ad57246aa094e68124e3 SHA512 bf143364a8343d5fb8012092fb0b605b714b7d7a0de27851b2ef38b081bdad9d3835c47ed52aa77b5ebe2e703cf1ea6c4d8b327a2357dfe5bb2059e064330194
 EBUILD selinux-tgtd-2.20180114-r2.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
+EBUILD selinux-tgtd-2.20180114-r3.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
 EBUILD selinux-tgtd-9999.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
 MISC metadata.xml 314 BLAKE2B fb88f2b1f35ccd416cb3580c0d9ef2607a0be750c0690a1697ef180bfc93fd20ee6c4675be91421f73041cedd56454dae3acd432b495fad491e3e8c55a75d3c0 SHA512 7ff6b603403c8ab2e2832738a2078a20d56226a35f70d61b9d067044d7a71d160965a93e76bf705456f8a61b268324d910d43d4dab11d84efc0455eb247db5a4
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r1.ebuild
deleted file mode 100644
index ebb8910a0195..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r2.ebuild
deleted file mode 100644
index ccf0acbaf89c..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r3.ebuild
deleted file mode 100644
index ccf0acbaf89c..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r4.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r4.ebuild
deleted file mode 100644
index ccf0acbaf89c..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r4.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r4.ebuild
deleted file mode 100644
index ebb8910a0195..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20180114-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..6df710db4630
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tgtd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tgtd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index 16d9a9f1754c..2be3c9bb0932 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-thunderbird-2.20170204-r1.ebuild 392 BLAKE2B 2069532cadc41cbeef39dbacd359481d82483dba95250a241cd18a338ffedc5fd70b00c50030cb476dd6b50f0a68ebd7d31d9d7d8d2fe3a39e775650bd66ef28 SHA512 5bc301cfc155ff736bef4b0456d4ba50f04cbbdc09311d6a0786667cd77688c6eb06d0d90bb4fc54bc5d7329c2f15e3677205c7634c1dd021db84390b995edf0
-EBUILD selinux-thunderbird-2.20170204-r2.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
-EBUILD selinux-thunderbird-2.20170204-r3.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
-EBUILD selinux-thunderbird-2.20170204-r4.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
 EBUILD selinux-thunderbird-2.20170805-r2.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
 EBUILD selinux-thunderbird-2.20170805-r3.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
-EBUILD selinux-thunderbird-2.20170805-r4.ebuild 392 BLAKE2B 2069532cadc41cbeef39dbacd359481d82483dba95250a241cd18a338ffedc5fd70b00c50030cb476dd6b50f0a68ebd7d31d9d7d8d2fe3a39e775650bd66ef28 SHA512 5bc301cfc155ff736bef4b0456d4ba50f04cbbdc09311d6a0786667cd77688c6eb06d0d90bb4fc54bc5d7329c2f15e3677205c7634c1dd021db84390b995edf0
 EBUILD selinux-thunderbird-2.20180114-r1.ebuild 390 BLAKE2B 510ce2af64dfdbb58247adcb95534540ab6a23a3a45bc8cd4fd683314233ccc393d0375cc56febc7f59850d8bf12518cdc732f30932ab58e71021bbffe196432 SHA512 0fb2721321e8b378eea559e2605691e2101b6095f3fbc6332c58d462679feea19b2320279041c2e2b7fb3724e5dd913fb9a2f20bd77acb3b6394dde94ca3113c
 EBUILD selinux-thunderbird-2.20180114-r2.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
+EBUILD selinux-thunderbird-2.20180114-r3.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
 EBUILD selinux-thunderbird-9999.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
 MISC metadata.xml 321 BLAKE2B 803c387bb4a8c829e856e92c76897b4af3d810ca56a257d12b08d29adcb779add9821927c6c20fc14adeb3c3638042b043cf58630635f6f3ee8aa906c3aea8c4 SHA512 883b02eb500849986493b7ef57241788991bbb266076583b5d5436b31c841ca789eda0d04e74e3ff7b1bff87270a409352f077d62d4b8bf280c12f36da01856e
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r1.ebuild
deleted file mode 100644
index 07d2fda0570c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r2.ebuild
deleted file mode 100644
index 7ead7c22e75c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r3.ebuild
deleted file mode 100644
index 7ead7c22e75c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r4.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r4.ebuild
deleted file mode 100644
index 7ead7c22e75c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r4.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r4.ebuild
deleted file mode 100644
index 07d2fda0570c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180114-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..fe691d8cd407
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="thunderbird"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for thunderbird"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 021cb28b60d5..662dc0f8ecec 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-timidity-2.20170204-r1.ebuild 288 BLAKE2B 7bf49f36c78d7f6576aa4558081d5fcdb2888823fad860c1867370c002c92272360b4ec49d1356229ddee6ed7c855ce78287f100dbd0ba5803ad55dc4985cf42 SHA512 82240ca68e2cbf22996232ffc8145c669ba516fa5e41234baedea25e1a1153bbfb91035aa8e563a87e7b93762ba470774c34068460b8a5432d0c1546495e8c0d
-EBUILD selinux-timidity-2.20170204-r2.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f7e1d151a612ab4f8f6d518ba1eaa7ad457d4f089c5cfff2e3d58088d0a1805f1f4da734ae0055ba9d264bb0b88d44db946ec11cec SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e
-EBUILD selinux-timidity-2.20170204-r3.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f7e1d151a612ab4f8f6d518ba1eaa7ad457d4f089c5cfff2e3d58088d0a1805f1f4da734ae0055ba9d264bb0b88d44db946ec11cec SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e
-EBUILD selinux-timidity-2.20170204-r4.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f7e1d151a612ab4f8f6d518ba1eaa7ad457d4f089c5cfff2e3d58088d0a1805f1f4da734ae0055ba9d264bb0b88d44db946ec11cec SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e
 EBUILD selinux-timidity-2.20170805-r2.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f7e1d151a612ab4f8f6d518ba1eaa7ad457d4f089c5cfff2e3d58088d0a1805f1f4da734ae0055ba9d264bb0b88d44db946ec11cec SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e
 EBUILD selinux-timidity-2.20170805-r3.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f7e1d151a612ab4f8f6d518ba1eaa7ad457d4f089c5cfff2e3d58088d0a1805f1f4da734ae0055ba9d264bb0b88d44db946ec11cec SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e
-EBUILD selinux-timidity-2.20170805-r4.ebuild 288 BLAKE2B 7bf49f36c78d7f6576aa4558081d5fcdb2888823fad860c1867370c002c92272360b4ec49d1356229ddee6ed7c855ce78287f100dbd0ba5803ad55dc4985cf42 SHA512 82240ca68e2cbf22996232ffc8145c669ba516fa5e41234baedea25e1a1153bbfb91035aa8e563a87e7b93762ba470774c34068460b8a5432d0c1546495e8c0d
 EBUILD selinux-timidity-2.20180114-r1.ebuild 286 BLAKE2B d50cdfb1074490a66e7bdefb29906a0e4c7a9eb3a8917c484a05450f4f4976802074210ea7edac20b52a4555bf8261597217cafdcdaefcf78279747de0120e07 SHA512 95fee436cc9588f1e5ac0e7c60c5e2e0224d5bf42b28e1309539d122f1de9fc3e0ae9866e994aa3ef995a17ff3e8bbdc350438a710d055f9ae356fe1b50e9c94
 EBUILD selinux-timidity-2.20180114-r2.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
+EBUILD selinux-timidity-2.20180114-r3.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
 EBUILD selinux-timidity-9999.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
 MISC metadata.xml 318 BLAKE2B 1b053789156ce3b2dbd11a7c0640cb00539bd706d6f69ceffcc71c3c0449b75c37d2ad4eeda684df5ae541044d43495ce6e362df89c25f73eb5c85755ef5f34c SHA512 60ed41e8c07067ddc123bcf078ffa3448facf9eb0bdd79f59031bc75ad1f46ee6fdd512a542f5240752bd3ce548e1dd782c027fa9e3f42375cff6e89fa46dc8b
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r1.ebuild
deleted file mode 100644
index 087a9e76ffa7..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r2.ebuild
deleted file mode 100644
index 5142bf04b71c..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r3.ebuild
deleted file mode 100644
index 5142bf04b71c..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r4.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r4.ebuild
deleted file mode 100644
index 5142bf04b71c..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r4.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r4.ebuild
deleted file mode 100644
index 087a9e76ffa7..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20180114-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4be6efafc96c
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="timidity"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for timidity"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 9b638b827bf9..04a8d7f9b60b 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tmpreaper-2.20170204-r1.ebuild 290 BLAKE2B 56921a949b657693d8af4e88720e091221892552902b445e05951ddc874f007f4ac7a2006a5751e01c94fe13e86b31ad5d057a75e2ecd0f67c40bddfaf0fc969 SHA512 5afd9ac9c7cb97240ea82e5f171f32c491cb1c5c6398434eb51a7524b7f69fdcd6d51c9275cb97f1078802909b756650d1d2e605c080af4f9643406bfdbf0c30
-EBUILD selinux-tmpreaper-2.20170204-r2.ebuild 288 BLAKE2B dad452a94ececde170d03032b01ee5a72eabca65931620f9d951771bb510033d866076e10d362582d99f4d3b27ce834d6fe28b9a70ce0543ba9fa20478b1e8d4 SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8
-EBUILD selinux-tmpreaper-2.20170204-r3.ebuild 288 BLAKE2B dad452a94ececde170d03032b01ee5a72eabca65931620f9d951771bb510033d866076e10d362582d99f4d3b27ce834d6fe28b9a70ce0543ba9fa20478b1e8d4 SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8
-EBUILD selinux-tmpreaper-2.20170204-r4.ebuild 288 BLAKE2B dad452a94ececde170d03032b01ee5a72eabca65931620f9d951771bb510033d866076e10d362582d99f4d3b27ce834d6fe28b9a70ce0543ba9fa20478b1e8d4 SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8
 EBUILD selinux-tmpreaper-2.20170805-r2.ebuild 288 BLAKE2B dad452a94ececde170d03032b01ee5a72eabca65931620f9d951771bb510033d866076e10d362582d99f4d3b27ce834d6fe28b9a70ce0543ba9fa20478b1e8d4 SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8
 EBUILD selinux-tmpreaper-2.20170805-r3.ebuild 288 BLAKE2B dad452a94ececde170d03032b01ee5a72eabca65931620f9d951771bb510033d866076e10d362582d99f4d3b27ce834d6fe28b9a70ce0543ba9fa20478b1e8d4 SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8
-EBUILD selinux-tmpreaper-2.20170805-r4.ebuild 290 BLAKE2B 56921a949b657693d8af4e88720e091221892552902b445e05951ddc874f007f4ac7a2006a5751e01c94fe13e86b31ad5d057a75e2ecd0f67c40bddfaf0fc969 SHA512 5afd9ac9c7cb97240ea82e5f171f32c491cb1c5c6398434eb51a7524b7f69fdcd6d51c9275cb97f1078802909b756650d1d2e605c080af4f9643406bfdbf0c30
 EBUILD selinux-tmpreaper-2.20180114-r1.ebuild 288 BLAKE2B 26116c16c3217215d50c831e8d89536b99647d499d08f7824a2e2272a867eeb9022673c92aabbf92d4e5909179691c095736ef9bce9a047da7d1ef847f7d3981 SHA512 97e4941595414d6903cc63ce4c4668ab12f553ecc31c8cee38340ef55f120240766b07ed1096a1809a916bf4193477ced144583460cefb9a4f0169ed40fdd4be
 EBUILD selinux-tmpreaper-2.20180114-r2.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
+EBUILD selinux-tmpreaper-2.20180114-r3.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
 EBUILD selinux-tmpreaper-9999.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
 MISC metadata.xml 319 BLAKE2B ea0ed6217581afe0a106bb750288395d119c9b49aff567208af66f8eec7ea9a9b33aab1f8e267ea7a06b47cdbbed49e8c5718f6f342784c7fac7068785655416 SHA512 1968fd2f682e983d15fb072d2dab31a3aa7e7a25a6fc29d0e66639719c4de662d664864541e5533dc968d7a34551658db31a485a291e3c7dc7f59d649b1f7c34
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r1.ebuild
deleted file mode 100644
index 8db99f896b5e..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r2.ebuild
deleted file mode 100644
index b75a1daff5d6..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r3.ebuild
deleted file mode 100644
index b75a1daff5d6..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r4.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r4.ebuild
deleted file mode 100644
index b75a1daff5d6..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r4.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r4.ebuild
deleted file mode 100644
index 8db99f896b5e..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180114-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..49add2559ade
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tmpreaper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tmpreaper"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index d8151dd8be8a..9f7843d620f5 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tor-2.20170204-r1.ebuild 278 BLAKE2B df8a2d4cd86861bd373ea420e1d706df752400d9bfdba1910145a1a9d8bd828dcdf12aafa83796aa11c3a2e4bb765d0606572e15ef2b3d2f19d5c44f4f32813b SHA512 c481337bbf2245cdacdd9d3e73b9d97380c0d8e591e3f2208a0559624aac3a1ff43ac7da355968fee73257fc11aa26177aa1a019ec9a847c734c44b88ae0fb24
-EBUILD selinux-tor-2.20170204-r2.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393ecdfb42de44afcd6164564c30973d2388cf3815bad793d534b504c7debcfcd4f5a7b594d71b4f7c8f2994b24e389467778a1b SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22
-EBUILD selinux-tor-2.20170204-r3.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393ecdfb42de44afcd6164564c30973d2388cf3815bad793d534b504c7debcfcd4f5a7b594d71b4f7c8f2994b24e389467778a1b SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22
-EBUILD selinux-tor-2.20170204-r4.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393ecdfb42de44afcd6164564c30973d2388cf3815bad793d534b504c7debcfcd4f5a7b594d71b4f7c8f2994b24e389467778a1b SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22
 EBUILD selinux-tor-2.20170805-r2.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393ecdfb42de44afcd6164564c30973d2388cf3815bad793d534b504c7debcfcd4f5a7b594d71b4f7c8f2994b24e389467778a1b SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22
 EBUILD selinux-tor-2.20170805-r3.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393ecdfb42de44afcd6164564c30973d2388cf3815bad793d534b504c7debcfcd4f5a7b594d71b4f7c8f2994b24e389467778a1b SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22
-EBUILD selinux-tor-2.20170805-r4.ebuild 278 BLAKE2B df8a2d4cd86861bd373ea420e1d706df752400d9bfdba1910145a1a9d8bd828dcdf12aafa83796aa11c3a2e4bb765d0606572e15ef2b3d2f19d5c44f4f32813b SHA512 c481337bbf2245cdacdd9d3e73b9d97380c0d8e591e3f2208a0559624aac3a1ff43ac7da355968fee73257fc11aa26177aa1a019ec9a847c734c44b88ae0fb24
 EBUILD selinux-tor-2.20180114-r1.ebuild 276 BLAKE2B d2ce311c09328d953af9560aa97943188c13e8bd6bfc809f390c8a03a1b574e2a6e1e2fd66ba0e4ac1b54ce3221919bd4bef1c4e10e87b86161c6fb19fd1e78d SHA512 db5af08c64c0a0fa846341fa61a59ddddae8b5ede19297a1d96a14f4bebb2c4079075f134d298e2058261a564531efc18bb13ccf8a0c79fee12d44012f6d2cc1
 EBUILD selinux-tor-2.20180114-r2.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
+EBUILD selinux-tor-2.20180114-r3.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
 EBUILD selinux-tor-9999.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
 MISC metadata.xml 313 BLAKE2B 15b3197ed234755ff54a8faef2fc30b62a520e485d33eb6848a86ec7204409a69791313d94fada955ead14545009f5a8f15f8caafa4e6326e096d3dc53ce77d8 SHA512 812fc17e450c14ed18f79425f4db05719e57e9baa896dde3775434e6e59c93148b95ca466b4aa8113066c442a577bc526ef52037adbf2c54468645c4055c87be
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170204-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170204-r1.ebuild
deleted file mode 100644
index a35c78a3000b..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170204-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170204-r2.ebuild
deleted file mode 100644
index bd211fc676fc..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170204-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170204-r3.ebuild
deleted file mode 100644
index bd211fc676fc..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170204-r4.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170204-r4.ebuild
deleted file mode 100644
index bd211fc676fc..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170805-r4.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170805-r4.ebuild
deleted file mode 100644
index a35c78a3000b..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20180114-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5aa55ea732f0
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 53c8917b2b5a..1362174fe4ab 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-tripwire-2.20170204-r1.ebuild 288 BLAKE2B ab5e624d8cb3185cd58ba25a81c99dc2951ea0672acda39ead50076b377a3b5c00b1ea807998157d8f9c6f45353bc22075f5518e340a3e5af5e10d42973dc68a SHA512 311e9920ea49a99401733a5a13073a60195fde6782853866a4e06d5a5e17deee17e30063f41c13e2f3bc0b52b079df0a323b976301a0d701260506fd7da6e173
-EBUILD selinux-tripwire-2.20170204-r2.ebuild 286 BLAKE2B 8b517ce0d632256f34762b06b3023f0a83ef7e3c37e8e0757f31025992016cd3483c6e32a10918de339843bf96cd99f6f2131965b683405577f5314b43508e60 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc
-EBUILD selinux-tripwire-2.20170204-r3.ebuild 286 BLAKE2B 8b517ce0d632256f34762b06b3023f0a83ef7e3c37e8e0757f31025992016cd3483c6e32a10918de339843bf96cd99f6f2131965b683405577f5314b43508e60 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc
-EBUILD selinux-tripwire-2.20170204-r4.ebuild 286 BLAKE2B 8b517ce0d632256f34762b06b3023f0a83ef7e3c37e8e0757f31025992016cd3483c6e32a10918de339843bf96cd99f6f2131965b683405577f5314b43508e60 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc
 EBUILD selinux-tripwire-2.20170805-r2.ebuild 286 BLAKE2B 8b517ce0d632256f34762b06b3023f0a83ef7e3c37e8e0757f31025992016cd3483c6e32a10918de339843bf96cd99f6f2131965b683405577f5314b43508e60 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc
 EBUILD selinux-tripwire-2.20170805-r3.ebuild 286 BLAKE2B 8b517ce0d632256f34762b06b3023f0a83ef7e3c37e8e0757f31025992016cd3483c6e32a10918de339843bf96cd99f6f2131965b683405577f5314b43508e60 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc
-EBUILD selinux-tripwire-2.20170805-r4.ebuild 288 BLAKE2B ab5e624d8cb3185cd58ba25a81c99dc2951ea0672acda39ead50076b377a3b5c00b1ea807998157d8f9c6f45353bc22075f5518e340a3e5af5e10d42973dc68a SHA512 311e9920ea49a99401733a5a13073a60195fde6782853866a4e06d5a5e17deee17e30063f41c13e2f3bc0b52b079df0a323b976301a0d701260506fd7da6e173
 EBUILD selinux-tripwire-2.20180114-r1.ebuild 286 BLAKE2B 07652a857c30bb9dca904f31c7875ea9b7c8ae53cddc2c812b10dc06f28e95ede803533a22237fba9d117f2dc9d8bf5d3035fa0cdc2ee35c26c0a2cb71360646 SHA512 7fd1e64afeec50861992eba325a9fcdd8162def157ffdcec212ad2b24112cb038ae722757d4dbceb2e7035492eb7f9770daea90ba26035ac84b23574478a7eab
 EBUILD selinux-tripwire-2.20180114-r2.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
+EBUILD selinux-tripwire-2.20180114-r3.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
 EBUILD selinux-tripwire-9999.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
 MISC metadata.xml 318 BLAKE2B 744c496ac8614aaa78beda534dc43782a35574148fd25e41bb49fcba13438d0f0ab15b7d579d055f2e18cc3f950e808e87ee91c5310c7631778c0f6943da2da4 SHA512 10c01fcc08c2dbc4367fb8e5f2e5c336794d5d15fef2511047d12e45c2fc88c3456d57022aecc5a131d7d267841e9123a84dcd6d06c87f2967cdc52651d9dd2c
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r1.ebuild
deleted file mode 100644
index 074454b60692..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r2.ebuild
deleted file mode 100644
index fd6e987a85a9..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r3.ebuild
deleted file mode 100644
index fd6e987a85a9..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r4.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r4.ebuild
deleted file mode 100644
index fd6e987a85a9..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r4.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r4.ebuild
deleted file mode 100644
index 074454b60692..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20180114-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..748273d6d53f
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tripwire"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tripwire"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index cf7b4efbe5b4..e196a3259d31 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ucspitcp-2.20170204-r1.ebuild 288 BLAKE2B b662efe6003d7613e17712d7a8f7220aea43b35457784e9d1d56a98253857c40b389e2836d15dd1fc41c973031493fe7cc74cea68bb9930eb0ab91683b378bda SHA512 ed8c8ebe92d1e8fe14ecb3486a3a90a5a8767b48ad2be3e9121a18be0051f397c4652cb70016a5accfc7fcbfdf393b6da7ee2e3e863ca1157e0f4673cea3dcfe
-EBUILD selinux-ucspitcp-2.20170204-r2.ebuild 286 BLAKE2B c163478f66be047b26d3dd1cfba1bcbb72f6fb4b82d3abd11d9e4ba2f6099f86991a691fcf0364312d5d7315bd5f4e144e10384a293ae36b7e0948a122b0112d SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706
-EBUILD selinux-ucspitcp-2.20170204-r3.ebuild 286 BLAKE2B c163478f66be047b26d3dd1cfba1bcbb72f6fb4b82d3abd11d9e4ba2f6099f86991a691fcf0364312d5d7315bd5f4e144e10384a293ae36b7e0948a122b0112d SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706
-EBUILD selinux-ucspitcp-2.20170204-r4.ebuild 286 BLAKE2B c163478f66be047b26d3dd1cfba1bcbb72f6fb4b82d3abd11d9e4ba2f6099f86991a691fcf0364312d5d7315bd5f4e144e10384a293ae36b7e0948a122b0112d SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706
 EBUILD selinux-ucspitcp-2.20170805-r2.ebuild 286 BLAKE2B c163478f66be047b26d3dd1cfba1bcbb72f6fb4b82d3abd11d9e4ba2f6099f86991a691fcf0364312d5d7315bd5f4e144e10384a293ae36b7e0948a122b0112d SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706
 EBUILD selinux-ucspitcp-2.20170805-r3.ebuild 286 BLAKE2B c163478f66be047b26d3dd1cfba1bcbb72f6fb4b82d3abd11d9e4ba2f6099f86991a691fcf0364312d5d7315bd5f4e144e10384a293ae36b7e0948a122b0112d SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706
-EBUILD selinux-ucspitcp-2.20170805-r4.ebuild 288 BLAKE2B b662efe6003d7613e17712d7a8f7220aea43b35457784e9d1d56a98253857c40b389e2836d15dd1fc41c973031493fe7cc74cea68bb9930eb0ab91683b378bda SHA512 ed8c8ebe92d1e8fe14ecb3486a3a90a5a8767b48ad2be3e9121a18be0051f397c4652cb70016a5accfc7fcbfdf393b6da7ee2e3e863ca1157e0f4673cea3dcfe
 EBUILD selinux-ucspitcp-2.20180114-r1.ebuild 286 BLAKE2B 9e02eebf767e31a069a3c7c80a48b89e332a402482d79639e99e4962555e73a79860e9bdddc7b35cd85ac0e008198b0041e4090255c06f692657d79c03c18c63 SHA512 b189955b5d84f2da72f90fbf3c8ffe7ad6245bacdd25c46d977c05fde4d9524acb6b42721f097ec975b0b0aada795515e3fcb5d21250a0d33f494b251f37dfa5
 EBUILD selinux-ucspitcp-2.20180114-r2.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
+EBUILD selinux-ucspitcp-2.20180114-r3.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
 EBUILD selinux-ucspitcp-9999.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
 MISC metadata.xml 318 BLAKE2B 03d0271ee0ea320497095125a6b94d19a79b952375d2514b3fa3cdfeebf88cc1d1c5b0927f4f3fa30216005a6a7b3c53e14b30f5d40d0287e380c10ecdb555e4 SHA512 bc88dff90d9f7ef337ce73f739422a0a0463980c87836abcd07beff56a122d7c9a7503007fe8bfd9a93cc86d61ee27a766c3d72b5562e7d7d52599c12228c41a
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r1.ebuild
deleted file mode 100644
index 4f0acd849293..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r2.ebuild
deleted file mode 100644
index eb74383dee3b..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r3.ebuild
deleted file mode 100644
index eb74383dee3b..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r4.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r4.ebuild
deleted file mode 100644
index eb74383dee3b..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r4.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r4.ebuild
deleted file mode 100644
index 4f0acd849293..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180114-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a8d12b4fad56
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ucspitcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index d38cc881a87c..4f6280f27eeb 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-ulogd-2.20170204-r1.ebuild 282 BLAKE2B b5ff66cc3d27754a8b7405dbd0634c45b1ca18c730e8384f25dfd25780b1b22a2c7b65dc8aab9da226908c281b024b15c93167a556183936f96c9f02f6eb65c6 SHA512 91ec1489c4c0059d72a8e468053d48f33f1e68b8114606784f3bb01e106fd042019dc589c65c455ae86b6e86d4b2e8bf0fca0e260882e9291bf71ab1031fd787
-EBUILD selinux-ulogd-2.20170204-r2.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aaf465ff628ca736d402a2924c3bc1b37ba2d448f381537e821ceadc42f16eb123af9934de974527e567d55380d7992b423e3dea SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb
-EBUILD selinux-ulogd-2.20170204-r3.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aaf465ff628ca736d402a2924c3bc1b37ba2d448f381537e821ceadc42f16eb123af9934de974527e567d55380d7992b423e3dea SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb
-EBUILD selinux-ulogd-2.20170204-r4.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aaf465ff628ca736d402a2924c3bc1b37ba2d448f381537e821ceadc42f16eb123af9934de974527e567d55380d7992b423e3dea SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb
 EBUILD selinux-ulogd-2.20170805-r2.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aaf465ff628ca736d402a2924c3bc1b37ba2d448f381537e821ceadc42f16eb123af9934de974527e567d55380d7992b423e3dea SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb
 EBUILD selinux-ulogd-2.20170805-r3.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aaf465ff628ca736d402a2924c3bc1b37ba2d448f381537e821ceadc42f16eb123af9934de974527e567d55380d7992b423e3dea SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb
-EBUILD selinux-ulogd-2.20170805-r4.ebuild 282 BLAKE2B b5ff66cc3d27754a8b7405dbd0634c45b1ca18c730e8384f25dfd25780b1b22a2c7b65dc8aab9da226908c281b024b15c93167a556183936f96c9f02f6eb65c6 SHA512 91ec1489c4c0059d72a8e468053d48f33f1e68b8114606784f3bb01e106fd042019dc589c65c455ae86b6e86d4b2e8bf0fca0e260882e9291bf71ab1031fd787
 EBUILD selinux-ulogd-2.20180114-r1.ebuild 280 BLAKE2B 5b9b0db1fd19a4b65bf0a58316352719907f06787be1dc306b4c1a2aa4f6f0c31f1d62fb37a321f2a95ead31c0ed478eadada0dec7a76dbabd922a2ceff4a03a SHA512 f8d4f17fde015bffd696615295c2f19c0798c9413b8e1fb20400b98ff8b83f489d6c1b21a69795e6d4e69c5d5bbb0a3253342f9c0b73fa5380504d80ef730c7a
 EBUILD selinux-ulogd-2.20180114-r2.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
+EBUILD selinux-ulogd-2.20180114-r3.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
 EBUILD selinux-ulogd-9999.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
 MISC metadata.xml 315 BLAKE2B 67250dc62189c5174385ab19a3bc5d680e3d30aa2e0189fcfa9368489024c9feacb2a2bae5da5e9ef87b54a4b2804481604e773dcd6a1207206489f2300a5f4f SHA512 43d0ad46433208b51b68ed06a3529a2895e9cc835f233f69b38034ddb07addf44c66da5054c0cb87289aee78af243494af13cd6eeda89dc122baddb1bf0f2cc5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r1.ebuild
deleted file mode 100644
index 000c027b33f6..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r2.ebuild
deleted file mode 100644
index 21dfb6cfe665..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r3.ebuild
deleted file mode 100644
index 21dfb6cfe665..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r4.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r4.ebuild
deleted file mode 100644
index 21dfb6cfe665..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r4.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r4.ebuild
deleted file mode 100644
index 000c027b33f6..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20180114-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8dd9622e1527
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ulogd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ulogd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index b14ede10c6d5..d7baeaf2e7d9 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uml-2.20170204-r1.ebuild 278 BLAKE2B dd522d6033cdb4b2f6df62bb894a07a02c734d21cc6cf6f26890940bc3c2c88fb84798779840ed57842e542e4255c48f0a5357f76d49639199253fd749969da7 SHA512 3660735270f80018260baf7243d6d61dc4daa9ce24eacd90c7cf53d51de6e6c1872df872eb660f08509d6706baf9ee6653becf80f8e1b1824b85773c988731fd
-EBUILD selinux-uml-2.20170204-r2.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574af94b25e70c68f6e8efc9967f03b5bbc6558297b9ed827bd6436985635ee383f68552a2688c9a929fafe1698f5448e78cc25 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2
-EBUILD selinux-uml-2.20170204-r3.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574af94b25e70c68f6e8efc9967f03b5bbc6558297b9ed827bd6436985635ee383f68552a2688c9a929fafe1698f5448e78cc25 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2
-EBUILD selinux-uml-2.20170204-r4.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574af94b25e70c68f6e8efc9967f03b5bbc6558297b9ed827bd6436985635ee383f68552a2688c9a929fafe1698f5448e78cc25 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2
 EBUILD selinux-uml-2.20170805-r2.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574af94b25e70c68f6e8efc9967f03b5bbc6558297b9ed827bd6436985635ee383f68552a2688c9a929fafe1698f5448e78cc25 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2
 EBUILD selinux-uml-2.20170805-r3.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574af94b25e70c68f6e8efc9967f03b5bbc6558297b9ed827bd6436985635ee383f68552a2688c9a929fafe1698f5448e78cc25 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2
-EBUILD selinux-uml-2.20170805-r4.ebuild 278 BLAKE2B dd522d6033cdb4b2f6df62bb894a07a02c734d21cc6cf6f26890940bc3c2c88fb84798779840ed57842e542e4255c48f0a5357f76d49639199253fd749969da7 SHA512 3660735270f80018260baf7243d6d61dc4daa9ce24eacd90c7cf53d51de6e6c1872df872eb660f08509d6706baf9ee6653becf80f8e1b1824b85773c988731fd
 EBUILD selinux-uml-2.20180114-r1.ebuild 276 BLAKE2B 74b27f2336c0d22a542f59ee583d829eac82184f2099981f91353efcdccaaf0a90bfb27b6760f60bc14369de34b4574714075fb6c2a1c8bc24b7c33cc61e086f SHA512 9a22161b350d341f258623d2c85b5f7fe5d096c5f33b6099d07d996fced3cf4fec021248ec9a725e40a0afd85aabb842ea950c1a40b0cfe5e089329fdfe3a5f7
 EBUILD selinux-uml-2.20180114-r2.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
+EBUILD selinux-uml-2.20180114-r3.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
 EBUILD selinux-uml-9999.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
 MISC metadata.xml 313 BLAKE2B 5cfff015c6be184861283a7428c346b62c890bbbc860ab8dfef6cdbca1483b380167530a5d40bf3873c10499d6c889e883621f51f835947e1af61d14b271b763 SHA512 8baf21630b68613adafb49e007574ff1f62067c7f77ddacbf7bce11289e02b9a6c22fc89430ffac207615fbe28efb4384bd29abc36d10616b08c427a2cbd61db
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170204-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170204-r1.ebuild
deleted file mode 100644
index b6515dea628a..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170204-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170204-r2.ebuild
deleted file mode 100644
index 7f5c71535ec1..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170204-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170204-r3.ebuild
deleted file mode 100644
index 7f5c71535ec1..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170204-r4.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170204-r4.ebuild
deleted file mode 100644
index 7f5c71535ec1..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170805-r4.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170805-r4.ebuild
deleted file mode 100644
index b6515dea628a..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20180114-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..64e52e582f92
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uml"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uml"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 113dadc7596b..6cebb9e9932a 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-unconfined-2.20170204-r1.ebuild 292 BLAKE2B b23a44cf9d7c3fa3d77eaf44da007d28ca8ebc2c31b4502522d08b10ab36315b64e6f185115aa8f47918313b2b6baa27f80acc3784c3c03c811c8a997bac01b0 SHA512 8c12825359a1bafb9003732e3823264286eefc2c395196c14437104e4861235a29f6a9a35be9fd7daa776c748e9b9d337ec2948bc2b458079d1bbf3307d96a24
-EBUILD selinux-unconfined-2.20170204-r2.ebuild 290 BLAKE2B 3848b3489bde7117a1132261c2ac7f09d367282afbec1150a2315f0de28e45d737c9ffc3c4178df9fd3b961eb2bd42e34119e97d25a8fedf4c9e3d793c015708 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8
-EBUILD selinux-unconfined-2.20170204-r3.ebuild 290 BLAKE2B 3848b3489bde7117a1132261c2ac7f09d367282afbec1150a2315f0de28e45d737c9ffc3c4178df9fd3b961eb2bd42e34119e97d25a8fedf4c9e3d793c015708 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8
-EBUILD selinux-unconfined-2.20170204-r4.ebuild 290 BLAKE2B 3848b3489bde7117a1132261c2ac7f09d367282afbec1150a2315f0de28e45d737c9ffc3c4178df9fd3b961eb2bd42e34119e97d25a8fedf4c9e3d793c015708 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8
 EBUILD selinux-unconfined-2.20170805-r2.ebuild 290 BLAKE2B 3848b3489bde7117a1132261c2ac7f09d367282afbec1150a2315f0de28e45d737c9ffc3c4178df9fd3b961eb2bd42e34119e97d25a8fedf4c9e3d793c015708 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8
 EBUILD selinux-unconfined-2.20170805-r3.ebuild 290 BLAKE2B 3848b3489bde7117a1132261c2ac7f09d367282afbec1150a2315f0de28e45d737c9ffc3c4178df9fd3b961eb2bd42e34119e97d25a8fedf4c9e3d793c015708 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8
-EBUILD selinux-unconfined-2.20170805-r4.ebuild 292 BLAKE2B b23a44cf9d7c3fa3d77eaf44da007d28ca8ebc2c31b4502522d08b10ab36315b64e6f185115aa8f47918313b2b6baa27f80acc3784c3c03c811c8a997bac01b0 SHA512 8c12825359a1bafb9003732e3823264286eefc2c395196c14437104e4861235a29f6a9a35be9fd7daa776c748e9b9d337ec2948bc2b458079d1bbf3307d96a24
 EBUILD selinux-unconfined-2.20180114-r1.ebuild 290 BLAKE2B 8f2d50a8b216647271f45dbd2df2afaa9ab26362a110703a1964ecb377b3eaf5b26aa0d298dd1ff5a16b2524a518ea37b3738be1177c4c22b42141bf75708af7 SHA512 af02d7f63bbd4eb8316f597e7c5b55e9f6a04345853a115a8c76d6399a587bebf9cf036734328985a044e55e745432540c38fbc4456e0aa2baafdc2e24b210fb
 EBUILD selinux-unconfined-2.20180114-r2.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
+EBUILD selinux-unconfined-2.20180114-r3.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
 EBUILD selinux-unconfined-9999.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
 MISC metadata.xml 328 BLAKE2B 87e024bb413e0c65f34313030016af3ead498111d26844172eb61cfdc17c6605ea41975127ed67f33b5c905a4a7095b2661288ecd4e383a314425f3661602297 SHA512 dcf584f01f9b74b9e5196147219616837c1c46a73b258a37ddd8d183b9bd61d6c0819d92e27390d67b4d6d01b8b1a1447010d6437459a329c3eaa4a79f39b050
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r1.ebuild
deleted file mode 100644
index 11d2e71947f3..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r2.ebuild
deleted file mode 100644
index f5d4a5975a3e..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r3.ebuild
deleted file mode 100644
index f5d4a5975a3e..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r4.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r4.ebuild
deleted file mode 100644
index f5d4a5975a3e..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r4.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r4.ebuild
deleted file mode 100644
index 11d2e71947f3..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20180114-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..43c9b7b8e9b3
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="unconfined"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for unconfined"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index af1672e362c3..d4286227e07e 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uptime-2.20170204-r1.ebuild 284 BLAKE2B def8d9552dce76000c4481cf2dfed87c67ad5cc6b58cb8bbec1b24fbebd89501644914fd24e96ee4c05283a1092649affeca656129c57c85b64cb483c842158e SHA512 0ded768478c416e640d9ec589aea705a51bfd4ebdc3476c8173e8b07f399fa3a55a9b4062e89b43d96fcc648bcd368298af7f7e59817d3eca412babaaa677549
-EBUILD selinux-uptime-2.20170204-r2.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc467e1d35636e1c177eff597dcc97629e0f6ebb87a74e9590f3f27c9f5ac21a1b0a32f4dc73ce50f10a21a11327ca3b5cb3e39bd SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229
-EBUILD selinux-uptime-2.20170204-r3.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc467e1d35636e1c177eff597dcc97629e0f6ebb87a74e9590f3f27c9f5ac21a1b0a32f4dc73ce50f10a21a11327ca3b5cb3e39bd SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229
-EBUILD selinux-uptime-2.20170204-r4.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc467e1d35636e1c177eff597dcc97629e0f6ebb87a74e9590f3f27c9f5ac21a1b0a32f4dc73ce50f10a21a11327ca3b5cb3e39bd SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229
 EBUILD selinux-uptime-2.20170805-r2.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc467e1d35636e1c177eff597dcc97629e0f6ebb87a74e9590f3f27c9f5ac21a1b0a32f4dc73ce50f10a21a11327ca3b5cb3e39bd SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229
 EBUILD selinux-uptime-2.20170805-r3.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc467e1d35636e1c177eff597dcc97629e0f6ebb87a74e9590f3f27c9f5ac21a1b0a32f4dc73ce50f10a21a11327ca3b5cb3e39bd SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229
-EBUILD selinux-uptime-2.20170805-r4.ebuild 284 BLAKE2B def8d9552dce76000c4481cf2dfed87c67ad5cc6b58cb8bbec1b24fbebd89501644914fd24e96ee4c05283a1092649affeca656129c57c85b64cb483c842158e SHA512 0ded768478c416e640d9ec589aea705a51bfd4ebdc3476c8173e8b07f399fa3a55a9b4062e89b43d96fcc648bcd368298af7f7e59817d3eca412babaaa677549
 EBUILD selinux-uptime-2.20180114-r1.ebuild 282 BLAKE2B 4a587715bc8740e154285ffdffa1bed01e580ca467680340a1c9e44a4b7e6267b667ff47cfa2cadce789269fb811db5be13357af114287ab2c7be3bfb0f20861 SHA512 df876d308c800b59741f3ec39c12182f89d7553dc8d8f7f31742736b944bd197f00ccacba7375c275f98ec97980d271f9d31d703b31b92fd4ab9f58a22718e3a
 EBUILD selinux-uptime-2.20180114-r2.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
+EBUILD selinux-uptime-2.20180114-r3.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
 EBUILD selinux-uptime-9999.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
 MISC metadata.xml 316 BLAKE2B acf9ae252e00852dd1e33874f4fb0cde71272e94c531f5a3efc4075426b883ba36564d25b107b68277ec09bcad64bd36e5a20e6a248098f916ebe6ee690a2b6b SHA512 9ed46568e9691f16b8574be220647e054032aa60cee04ddd1d69c739a6f7afeadef8bfd95d81f238339a9a4b2276190328c49d57c99d0a57bb2c16d63d6777f2
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r1.ebuild
deleted file mode 100644
index 7708280c3c98..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r2.ebuild
deleted file mode 100644
index 5a87d03a0013..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r3.ebuild
deleted file mode 100644
index 5a87d03a0013..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r4.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r4.ebuild
deleted file mode 100644
index 5a87d03a0013..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r4.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r4.ebuild
deleted file mode 100644
index 7708280c3c98..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20180114-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..ebc62cef7c80
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uptime"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uptime"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index b72ebf3051b5..cd2f440f2ba9 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-usbmuxd-2.20170204-r1.ebuild 286 BLAKE2B 6bd754efce5366674c40837a03bfe20c999423e4aaf0ca63d9b569017d0b507485344a4bce4f082963799f74577f03bab2ba93b7ea9f109bb77c0a02bea8fa9e SHA512 bdca5e59fcd6d50a58b3b0bca8cb7bd3fc832487800e92e5849aaac7bb79b7c339cdbcd44a45f922d05347886a5c4434b9f013886d8af4f5d27f9ad81f5aee0d
-EBUILD selinux-usbmuxd-2.20170204-r2.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc7580afc133554390c34eb95954a96ac1e0ca56a602c2cb385bcbcaa098d41cdd6d3f11b816a118105ee740965b0d6e1dbfaa9fa5fd9 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630
-EBUILD selinux-usbmuxd-2.20170204-r3.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc7580afc133554390c34eb95954a96ac1e0ca56a602c2cb385bcbcaa098d41cdd6d3f11b816a118105ee740965b0d6e1dbfaa9fa5fd9 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630
-EBUILD selinux-usbmuxd-2.20170204-r4.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc7580afc133554390c34eb95954a96ac1e0ca56a602c2cb385bcbcaa098d41cdd6d3f11b816a118105ee740965b0d6e1dbfaa9fa5fd9 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630
 EBUILD selinux-usbmuxd-2.20170805-r2.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc7580afc133554390c34eb95954a96ac1e0ca56a602c2cb385bcbcaa098d41cdd6d3f11b816a118105ee740965b0d6e1dbfaa9fa5fd9 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630
 EBUILD selinux-usbmuxd-2.20170805-r3.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc7580afc133554390c34eb95954a96ac1e0ca56a602c2cb385bcbcaa098d41cdd6d3f11b816a118105ee740965b0d6e1dbfaa9fa5fd9 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630
-EBUILD selinux-usbmuxd-2.20170805-r4.ebuild 286 BLAKE2B 6bd754efce5366674c40837a03bfe20c999423e4aaf0ca63d9b569017d0b507485344a4bce4f082963799f74577f03bab2ba93b7ea9f109bb77c0a02bea8fa9e SHA512 bdca5e59fcd6d50a58b3b0bca8cb7bd3fc832487800e92e5849aaac7bb79b7c339cdbcd44a45f922d05347886a5c4434b9f013886d8af4f5d27f9ad81f5aee0d
 EBUILD selinux-usbmuxd-2.20180114-r1.ebuild 284 BLAKE2B bd43f1a8aa1980fb0f0c06136bc681325fb14f2e19c000383550b105d66dd32e2285e5db25a193530ff51e293407f61221cf694db455d31681eb6c1c014fd4ed SHA512 76c603b69f0e3be496ef012fece147642228dad86d4f1d7c08cf0a509ac46e704121d0dbd9e18fe6a9c98d1964775a1962a51c67005babedd924a31fbc7f653c
 EBUILD selinux-usbmuxd-2.20180114-r2.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
+EBUILD selinux-usbmuxd-2.20180114-r3.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
 EBUILD selinux-usbmuxd-9999.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
 MISC metadata.xml 317 BLAKE2B f5a31afd9b4f2c569006e7f7ab0368ff7cc392f05a9cb008c845a897f357824d78f7ee2d7e35699d4b0d7c3137af53eaeb68eb4247c7a7acd188ceff5f1bdad3 SHA512 665ff350330f9449152e4d72346e30788b685ec475ed56d90cfa6666b719c99fe1c26ed45281febe03d6104fd7a41d4cc0458b4f72bfce59d019c4dd43fe4bc1
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r1.ebuild
deleted file mode 100644
index df10f9c69bd5..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r2.ebuild
deleted file mode 100644
index e2e4e1d57829..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r3.ebuild
deleted file mode 100644
index e2e4e1d57829..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r4.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r4.ebuild
deleted file mode 100644
index e2e4e1d57829..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r4.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r4.ebuild
deleted file mode 100644
index df10f9c69bd5..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180114-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5b87f855a57e
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="usbmuxd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbmuxd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 2b76c28e4930..44b1288fa106 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uucp-2.20170204-r1.ebuild 374 BLAKE2B aa30f6701c2bd77355bb6ec7df7a7fb60c93625a44ba64ad8948216d79434adf329865f8cfdd566f3221d373b761b6e6fc964883b8f76a8a2aac8f8d0165733d SHA512 35b9d4d7c054653612cd2cfa9ddad25bce2a509275b2bd65873e6f6df1dd5060ab68a8c7d67f62d9f3ab6beb214075c8e43b23e434bc9c6ecd3c6f7e347cfb8f
-EBUILD selinux-uucp-2.20170204-r2.ebuild 372 BLAKE2B 0f41f095bea303adec173330138626724644e30479992e0777bb748bcb9a39e65fb1c5f050782c1744a3336d9dcc004b2368eab07a763bc286958d2351ffed1a SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93
-EBUILD selinux-uucp-2.20170204-r3.ebuild 372 BLAKE2B 0f41f095bea303adec173330138626724644e30479992e0777bb748bcb9a39e65fb1c5f050782c1744a3336d9dcc004b2368eab07a763bc286958d2351ffed1a SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93
-EBUILD selinux-uucp-2.20170204-r4.ebuild 372 BLAKE2B 0f41f095bea303adec173330138626724644e30479992e0777bb748bcb9a39e65fb1c5f050782c1744a3336d9dcc004b2368eab07a763bc286958d2351ffed1a SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93
 EBUILD selinux-uucp-2.20170805-r2.ebuild 372 BLAKE2B 0f41f095bea303adec173330138626724644e30479992e0777bb748bcb9a39e65fb1c5f050782c1744a3336d9dcc004b2368eab07a763bc286958d2351ffed1a SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93
 EBUILD selinux-uucp-2.20170805-r3.ebuild 372 BLAKE2B 0f41f095bea303adec173330138626724644e30479992e0777bb748bcb9a39e65fb1c5f050782c1744a3336d9dcc004b2368eab07a763bc286958d2351ffed1a SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93
-EBUILD selinux-uucp-2.20170805-r4.ebuild 374 BLAKE2B aa30f6701c2bd77355bb6ec7df7a7fb60c93625a44ba64ad8948216d79434adf329865f8cfdd566f3221d373b761b6e6fc964883b8f76a8a2aac8f8d0165733d SHA512 35b9d4d7c054653612cd2cfa9ddad25bce2a509275b2bd65873e6f6df1dd5060ab68a8c7d67f62d9f3ab6beb214075c8e43b23e434bc9c6ecd3c6f7e347cfb8f
 EBUILD selinux-uucp-2.20180114-r1.ebuild 372 BLAKE2B 829306d55c826225634344d409c89ca464d915819973b48c089433c4e34226b8d034cdba686bbf604a7fe8b4300e8612aaece467a6a47ba585107df559a16533 SHA512 053a408f95ff21aa4057a436a1fe73b4cb3588adba43ccbd7d176223eca06c7fd0f26a182b59b02aa6520bc1b45b8cbeb2bcac69dfcdf7163f5218b58d016453
 EBUILD selinux-uucp-2.20180114-r2.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
+EBUILD selinux-uucp-2.20180114-r3.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
 EBUILD selinux-uucp-9999.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
 MISC metadata.xml 314 BLAKE2B 711a4df7837b6f37b01d35252b543c170ac51971121f7815136c9938708cd26dfc34bec50d5bff21afcf1afddf78043475db37aef1e12994b120403550ed04ef SHA512 aa9491ed1334875262b8071e567e17188fdbba3e6befe80fdcc42784848f2b843fba7cd1dbd9f6958f67a221fd838405859a946cbd487130348cf8ed922df174
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r1.ebuild
deleted file mode 100644
index b52c5d01321a..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r2.ebuild
deleted file mode 100644
index 969d32f72b87..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r3.ebuild
deleted file mode 100644
index 969d32f72b87..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r4.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r4.ebuild
deleted file mode 100644
index 969d32f72b87..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r4.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r4.ebuild
deleted file mode 100644
index b52c5d01321a..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20180114-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..8c9d51902f24
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uucp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index d0e96b59db43..48de349775f9 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uwimap-2.20170204-r1.ebuild 284 BLAKE2B 0410d9cb9b22166b715cf866c1e628bac6b8785fa69b3d0cc24c4042161456e57fa693811f267187234cc55e18af213ce84482aa39aaa3becda0dc465219222d SHA512 ea0d57ddcc47bf7bcb03f8bef6be001159e64d07603066ff111011e79158070b4fd05101307df15d0b9977e1dfb01b57e41d81d0cc6537e19a8595a6b09a2191
-EBUILD selinux-uwimap-2.20170204-r2.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be671069f56271254b0fc9079ee7e7529b475fca99a5f364098ae5b432bc1fc9b9765ec77d386ba478f68a81d6fe27c51f9a56c1d SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33
-EBUILD selinux-uwimap-2.20170204-r3.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be671069f56271254b0fc9079ee7e7529b475fca99a5f364098ae5b432bc1fc9b9765ec77d386ba478f68a81d6fe27c51f9a56c1d SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33
-EBUILD selinux-uwimap-2.20170204-r4.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be671069f56271254b0fc9079ee7e7529b475fca99a5f364098ae5b432bc1fc9b9765ec77d386ba478f68a81d6fe27c51f9a56c1d SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33
 EBUILD selinux-uwimap-2.20170805-r2.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be671069f56271254b0fc9079ee7e7529b475fca99a5f364098ae5b432bc1fc9b9765ec77d386ba478f68a81d6fe27c51f9a56c1d SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33
 EBUILD selinux-uwimap-2.20170805-r3.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be671069f56271254b0fc9079ee7e7529b475fca99a5f364098ae5b432bc1fc9b9765ec77d386ba478f68a81d6fe27c51f9a56c1d SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33
-EBUILD selinux-uwimap-2.20170805-r4.ebuild 284 BLAKE2B 0410d9cb9b22166b715cf866c1e628bac6b8785fa69b3d0cc24c4042161456e57fa693811f267187234cc55e18af213ce84482aa39aaa3becda0dc465219222d SHA512 ea0d57ddcc47bf7bcb03f8bef6be001159e64d07603066ff111011e79158070b4fd05101307df15d0b9977e1dfb01b57e41d81d0cc6537e19a8595a6b09a2191
 EBUILD selinux-uwimap-2.20180114-r1.ebuild 282 BLAKE2B bc36b21eda6e70b5842917c94e6b59120bfa09334d82dfa895919acfa4009f1276f4060b456b1e771c3cc7bd7ef7ff5dec1c1ce18e56212c67d46f90ca152c3b SHA512 0d0fac1daf81e01b62b3f58fc7d16773cb64db5af12c30df05b27e3b0d80db3599ede4a3b04a9cd10a41aaabb53c4e9fe23708fad97e1fcf041fc64fa5ce1ad4
 EBUILD selinux-uwimap-2.20180114-r2.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
+EBUILD selinux-uwimap-2.20180114-r3.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
 EBUILD selinux-uwimap-9999.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
 MISC metadata.xml 316 BLAKE2B 25547926e63f1e897510bf7eabde2ebb5d7ad8643ef4225cf84e18d13f4652d3d194c501c617db3ba7c0a3f9afe63ddcc5a5b4b5367be18d3f016c7d7600e849 SHA512 687b16d372a27eb09ed8eadbd694b3ad9ff3ddcdee85aebc5cb685fe91767e6523bbd8db0a928d47bc3670a59966c474d6a761ba5d2f86bc44423693e52e6077
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r1.ebuild
deleted file mode 100644
index 8cb2b52fc63c..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r2.ebuild
deleted file mode 100644
index b475676e6381..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r3.ebuild
deleted file mode 100644
index b475676e6381..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r4.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r4.ebuild
deleted file mode 100644
index b475676e6381..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r4.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r4.ebuild
deleted file mode 100644
index 8cb2b52fc63c..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20180114-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..51464c765d13
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uwimap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uwimap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index c9753a6f3718..fcf7ebe062bf 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-uwsgi-2.20170204-r1.ebuild 282 BLAKE2B 1a15a44986cb07125c7ed732c857352f5db782def08e9e21a9432475d395b3a6b67077b3806b7ffa818f9d4b72cabef6ef92ecad867ce833bb2a05e7d08e3b3f SHA512 6fb41475267d49f47b94baf66f6947a8b8c4c0d689b68cc228cdb4f6a5e52cdc96be9baba2abb7e92967dbfb61eb6c4c37f37d30705925a35bc6872c26ddcd68
-EBUILD selinux-uwsgi-2.20170204-r2.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe594ed6b70b74e24e6bc69f350483c2c639cd4622de51ca352f292fd651c19f44437a7a1d72e2604e18f1f130b766be63d989c34 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17
-EBUILD selinux-uwsgi-2.20170204-r3.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe594ed6b70b74e24e6bc69f350483c2c639cd4622de51ca352f292fd651c19f44437a7a1d72e2604e18f1f130b766be63d989c34 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17
-EBUILD selinux-uwsgi-2.20170204-r4.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe594ed6b70b74e24e6bc69f350483c2c639cd4622de51ca352f292fd651c19f44437a7a1d72e2604e18f1f130b766be63d989c34 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17
 EBUILD selinux-uwsgi-2.20170805-r2.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe594ed6b70b74e24e6bc69f350483c2c639cd4622de51ca352f292fd651c19f44437a7a1d72e2604e18f1f130b766be63d989c34 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17
 EBUILD selinux-uwsgi-2.20170805-r3.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe594ed6b70b74e24e6bc69f350483c2c639cd4622de51ca352f292fd651c19f44437a7a1d72e2604e18f1f130b766be63d989c34 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17
-EBUILD selinux-uwsgi-2.20170805-r4.ebuild 282 BLAKE2B 1a15a44986cb07125c7ed732c857352f5db782def08e9e21a9432475d395b3a6b67077b3806b7ffa818f9d4b72cabef6ef92ecad867ce833bb2a05e7d08e3b3f SHA512 6fb41475267d49f47b94baf66f6947a8b8c4c0d689b68cc228cdb4f6a5e52cdc96be9baba2abb7e92967dbfb61eb6c4c37f37d30705925a35bc6872c26ddcd68
 EBUILD selinux-uwsgi-2.20180114-r1.ebuild 280 BLAKE2B fce7c3b0ace16e9bef7322edf25d3b4624059002671195ebb32152005f4a6fea8b104316de17f2308b74b571071521ac07c22810ce12f9976aec7e009c683a88 SHA512 4ed7bc730e9a99d391c4c3081bb552f83b0d645904dd6b6ac82a0473492de9fa3f0221212551ba8ee555051386f71f3a699eaf40518259497bc2a60c286f0c63
 EBUILD selinux-uwsgi-2.20180114-r2.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
+EBUILD selinux-uwsgi-2.20180114-r3.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
 EBUILD selinux-uwsgi-9999.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
 MISC metadata.xml 315 BLAKE2B f7cf3dfb0a58fc7095e7c5dc17d33936021b6214f45265bca604f80752de8b2e75d35f4e742b44c21e10b2e8d86069767047e439f38089175b2ddeabfa89664c SHA512 14aeb44c80b9433064e670dd4f1036507965fead0068adc05311bd13eff263f7c177a20b30f4057d3e1af7fc708de09777d820f6a7ce7dee67d305a61d198e24
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r1.ebuild
deleted file mode 100644
index 3f59203ab90f..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r2.ebuild
deleted file mode 100644
index 1b94bdcad05b..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r3.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r3.ebuild
deleted file mode 100644
index 1b94bdcad05b..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r4.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r4.ebuild
deleted file mode 100644
index 1b94bdcad05b..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r4.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r4.ebuild
deleted file mode 100644
index 3f59203ab90f..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180114-r3.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..e25f57d05481
--- /dev/null
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uwsgi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uWSGI"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 1c4adcd2770a..929090cca00f 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-varnishd-2.20170204-r1.ebuild 288 BLAKE2B bda1e2a54291fb5025b6c8bd298f1d9a6d96d181980b8d594e9b7f743e70bd0fdc0eab988284d6d43cc96cd7aea807e529a1b1054bee949f65a6f74b15061ecf SHA512 a4a0d7a456054b9ee70127e62868110e0ce64708abc6edc2515e55572dca8b03d28dc6a00d5f409ded778b2b62d5da404962471f9af5cefca8c177ab1bfb81d7
-EBUILD selinux-varnishd-2.20170204-r2.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f32aa5bdab3c45172a314ea19df8a8ca39771215bd1613793f90ab58022c484501682f744d87b3932832b5a947268d84e44b3501c6 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305
-EBUILD selinux-varnishd-2.20170204-r3.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f32aa5bdab3c45172a314ea19df8a8ca39771215bd1613793f90ab58022c484501682f744d87b3932832b5a947268d84e44b3501c6 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305
-EBUILD selinux-varnishd-2.20170204-r4.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f32aa5bdab3c45172a314ea19df8a8ca39771215bd1613793f90ab58022c484501682f744d87b3932832b5a947268d84e44b3501c6 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305
 EBUILD selinux-varnishd-2.20170805-r2.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f32aa5bdab3c45172a314ea19df8a8ca39771215bd1613793f90ab58022c484501682f744d87b3932832b5a947268d84e44b3501c6 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305
 EBUILD selinux-varnishd-2.20170805-r3.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f32aa5bdab3c45172a314ea19df8a8ca39771215bd1613793f90ab58022c484501682f744d87b3932832b5a947268d84e44b3501c6 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305
-EBUILD selinux-varnishd-2.20170805-r4.ebuild 288 BLAKE2B bda1e2a54291fb5025b6c8bd298f1d9a6d96d181980b8d594e9b7f743e70bd0fdc0eab988284d6d43cc96cd7aea807e529a1b1054bee949f65a6f74b15061ecf SHA512 a4a0d7a456054b9ee70127e62868110e0ce64708abc6edc2515e55572dca8b03d28dc6a00d5f409ded778b2b62d5da404962471f9af5cefca8c177ab1bfb81d7
 EBUILD selinux-varnishd-2.20180114-r1.ebuild 286 BLAKE2B a05ef9682e97179e502695fce0a5a32d377b39d0971f1681db38a5eaf3b3ac5637650537405d77df8edc6a637dacafd174dcb9947661998725f7d090852093ab SHA512 fd3d80286b324b920002f9b5167ba268603a10346ed88d7acd470a89ff328d4f79aa0d4d8e95363e072ec74530e6eaca605e41f15cbb3dbb4216f19bac6b73f8
 EBUILD selinux-varnishd-2.20180114-r2.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
+EBUILD selinux-varnishd-2.20180114-r3.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
 EBUILD selinux-varnishd-9999.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
 MISC metadata.xml 318 BLAKE2B fb17ecb36c4fdba23d3b977a5b24b968b68c0d00fdec6762fcd0e99c6afa9f881a7e2b06035ecbb1ef4f025cdf770937c6c17aaba1a5bf1c20b274990166da06 SHA512 3385342c923b2616dd114a23706ae2094a384ced315787b9a47fe77a81c3ecf2effd26fb7faa403dabcf622b5893808950b0202eee80fee075c75e99c3f9a891
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r1.ebuild
deleted file mode 100644
index 8034483d39a7..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r2.ebuild
deleted file mode 100644
index 7a2f763d1f29..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r3.ebuild
deleted file mode 100644
index 7a2f763d1f29..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r4.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r4.ebuild
deleted file mode 100644
index 7a2f763d1f29..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r4.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r4.ebuild
deleted file mode 100644
index 8034483d39a7..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20180114-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..32059274afa4
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="varnishd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for varnishd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 4135616c52bb..ff782e49dc52 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vbetool-2.20170204-r1.ebuild 286 BLAKE2B f4ed17d58c1ed18a32015cc0ff6cb3ba2c99bde4951832a1c427be6f71d41d97d7a001a4c3d427e81cd4da8dfa3152818c3551ef50bec0af93e38f5c24a5dca6 SHA512 644c4347318ebdbee6f04cd5045eef145fb1291181e430d7c64a1e8f735778e18980747f8b12c5d476d430d80c3fa8f94063df711016899773a61aeba14a73cf
-EBUILD selinux-vbetool-2.20170204-r2.ebuild 284 BLAKE2B 0618e232e6820d720f5250507484e9bb0435854c595bea4fbf6a2185c9b131abefa7543a04306a1ee223bfcd6906aa94a47850e39e671e117aa173537be292b4 SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b
-EBUILD selinux-vbetool-2.20170204-r3.ebuild 284 BLAKE2B 0618e232e6820d720f5250507484e9bb0435854c595bea4fbf6a2185c9b131abefa7543a04306a1ee223bfcd6906aa94a47850e39e671e117aa173537be292b4 SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b
-EBUILD selinux-vbetool-2.20170204-r4.ebuild 284 BLAKE2B 0618e232e6820d720f5250507484e9bb0435854c595bea4fbf6a2185c9b131abefa7543a04306a1ee223bfcd6906aa94a47850e39e671e117aa173537be292b4 SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b
 EBUILD selinux-vbetool-2.20170805-r2.ebuild 284 BLAKE2B 0618e232e6820d720f5250507484e9bb0435854c595bea4fbf6a2185c9b131abefa7543a04306a1ee223bfcd6906aa94a47850e39e671e117aa173537be292b4 SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b
 EBUILD selinux-vbetool-2.20170805-r3.ebuild 284 BLAKE2B 0618e232e6820d720f5250507484e9bb0435854c595bea4fbf6a2185c9b131abefa7543a04306a1ee223bfcd6906aa94a47850e39e671e117aa173537be292b4 SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b
-EBUILD selinux-vbetool-2.20170805-r4.ebuild 286 BLAKE2B f4ed17d58c1ed18a32015cc0ff6cb3ba2c99bde4951832a1c427be6f71d41d97d7a001a4c3d427e81cd4da8dfa3152818c3551ef50bec0af93e38f5c24a5dca6 SHA512 644c4347318ebdbee6f04cd5045eef145fb1291181e430d7c64a1e8f735778e18980747f8b12c5d476d430d80c3fa8f94063df711016899773a61aeba14a73cf
 EBUILD selinux-vbetool-2.20180114-r1.ebuild 284 BLAKE2B f266fc031065a2e52ab7e803f596d5d7b5f07add4e5ce3e15e5459b1f0c85efa5e1e34e0148a8b4e10b1677c99096fc4333c2faf4cd749397e1dc69272fa9552 SHA512 69b1bb4c56d72cc331f883115fb50b0ec64acd73e0fad742d08ad673958735ea653d4001ab8554382b263e411b158224858a78fcb203fe4394967a8c40a88977
 EBUILD selinux-vbetool-2.20180114-r2.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
+EBUILD selinux-vbetool-2.20180114-r3.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
 EBUILD selinux-vbetool-9999.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
 MISC metadata.xml 317 BLAKE2B 085f433e29e9ea7829dbab4ee7c46a55235f4d37d19fc5ee2b662856eb4b730a9ccdecaf26b87b2b62f72fdf39d7cb14a686e3aa56b03fba7550a87d75b553c4 SHA512 4fee052e81194420528867acdb66be7ef51270f9d621773aec3da0ef33bafbdacb48cde9fe9da2cbac390b209eaac1579c3bb36cf999d2ff3bd00770913e1486
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r1.ebuild
deleted file mode 100644
index 97bea22ece75..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r2.ebuild
deleted file mode 100644
index b63eaefd1be6..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r3.ebuild
deleted file mode 100644
index b63eaefd1be6..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r4.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r4.ebuild
deleted file mode 100644
index b63eaefd1be6..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r4.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r4.ebuild
deleted file mode 100644
index 97bea22ece75..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20180114-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..9028867c2cf0
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vbetool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vbetool"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 455d32078865..73bb9a1b8643 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vdagent-2.20170204-r1.ebuild 286 BLAKE2B 4b49b9a68e3a7d96982439f7d0467a8d508c47b44bfa5e6c9fbfae88a121d29d1d2ed3d65f9b8d70747627dfd961371ddb38682d18cbe1aca2adc28867d7ea20 SHA512 cbca3403930c09de1650762452a7946e375b010cf9c1116be629cb65682c882c8f7f9f2211bb8a19d815ef40a6f84b305a87003ed3fbf314ed0dfe76cb543513
-EBUILD selinux-vdagent-2.20170204-r2.ebuild 284 BLAKE2B 7de538be9081d1f531f9049dc961836f49b837697c4f38c173eda84d9b8bb32edfb35e8b905dd9951c7be90683463028ef041a87a647c7f2f06486f0679aca4a SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3
-EBUILD selinux-vdagent-2.20170204-r3.ebuild 284 BLAKE2B 7de538be9081d1f531f9049dc961836f49b837697c4f38c173eda84d9b8bb32edfb35e8b905dd9951c7be90683463028ef041a87a647c7f2f06486f0679aca4a SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3
-EBUILD selinux-vdagent-2.20170204-r4.ebuild 284 BLAKE2B 7de538be9081d1f531f9049dc961836f49b837697c4f38c173eda84d9b8bb32edfb35e8b905dd9951c7be90683463028ef041a87a647c7f2f06486f0679aca4a SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3
 EBUILD selinux-vdagent-2.20170805-r2.ebuild 284 BLAKE2B 7de538be9081d1f531f9049dc961836f49b837697c4f38c173eda84d9b8bb32edfb35e8b905dd9951c7be90683463028ef041a87a647c7f2f06486f0679aca4a SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3
 EBUILD selinux-vdagent-2.20170805-r3.ebuild 284 BLAKE2B 7de538be9081d1f531f9049dc961836f49b837697c4f38c173eda84d9b8bb32edfb35e8b905dd9951c7be90683463028ef041a87a647c7f2f06486f0679aca4a SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3
-EBUILD selinux-vdagent-2.20170805-r4.ebuild 286 BLAKE2B 4b49b9a68e3a7d96982439f7d0467a8d508c47b44bfa5e6c9fbfae88a121d29d1d2ed3d65f9b8d70747627dfd961371ddb38682d18cbe1aca2adc28867d7ea20 SHA512 cbca3403930c09de1650762452a7946e375b010cf9c1116be629cb65682c882c8f7f9f2211bb8a19d815ef40a6f84b305a87003ed3fbf314ed0dfe76cb543513
 EBUILD selinux-vdagent-2.20180114-r1.ebuild 284 BLAKE2B 217098909f7f7b0322e239fe7d6d8a69ce2beb3d40eef3290cc00ae5dd2f33b52d4e0858b23f0dba27837cdefd7af1e6da280623359bfb5a70df34a47a7d5547 SHA512 37929d854e935c5118f55a8ed08a1192f86f3e453076300668fbf149fb2d502515c2b7b632d9bca1993225aef98abab983de40b98d3916f293e393fde8d3d51b
 EBUILD selinux-vdagent-2.20180114-r2.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
+EBUILD selinux-vdagent-2.20180114-r3.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
 EBUILD selinux-vdagent-9999.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
 MISC metadata.xml 317 BLAKE2B a98ed12a533b34c929c1cd90b51fed25bb7492e88a06976f8281dd024d9a0b2085b46096fb15500db5d7c5470dd4cb707fcd04d5c8643a98992d96cadbd627f0 SHA512 e9c10cc57616d2df0efd1fe633998fcdfcb91ca11333f24045a146f45d42eae8b9e70a846e000f3331d4c84c5fbbad6ac29ee30a51d4c347bab682f7b80f8adb
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r1.ebuild
deleted file mode 100644
index 9fde11bddc8f..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r2.ebuild
deleted file mode 100644
index ca4e87518c36..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r3.ebuild
deleted file mode 100644
index ca4e87518c36..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r4.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r4.ebuild
deleted file mode 100644
index ca4e87518c36..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r4.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r4.ebuild
deleted file mode 100644
index 9fde11bddc8f..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20180114-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..cc7d763e03dd
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vdagent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vdagent"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index 2aafe6031b5d..e3cc4875fe84 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vde-2.20170204-r1.ebuild 278 BLAKE2B 44adedcf8e8ccdff52e7b7842ab34ff187ecbb0279a6979d6a27e2a98b0917be0c14486b0642e3202abe77e587f80fa1039573e9289527496dc7dbd2e3835d2c SHA512 63a88bb13bd342f72336dab6bb01d06e3078ff292bf668a0c9e0211009c3361a70f24e29863a4563cde4beef02124a6021d905fd94e5439bd7ef18152625e089
-EBUILD selinux-vde-2.20170204-r2.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9dd6a9ef8a7b79eb11d91d3b3b338531199a6f67683fb24494be527ecf6c243cb8f691257e9a81465ce56ccac3e7eddf55deb5 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5
-EBUILD selinux-vde-2.20170204-r3.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9dd6a9ef8a7b79eb11d91d3b3b338531199a6f67683fb24494be527ecf6c243cb8f691257e9a81465ce56ccac3e7eddf55deb5 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5
-EBUILD selinux-vde-2.20170204-r4.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9dd6a9ef8a7b79eb11d91d3b3b338531199a6f67683fb24494be527ecf6c243cb8f691257e9a81465ce56ccac3e7eddf55deb5 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5
 EBUILD selinux-vde-2.20170805-r2.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9dd6a9ef8a7b79eb11d91d3b3b338531199a6f67683fb24494be527ecf6c243cb8f691257e9a81465ce56ccac3e7eddf55deb5 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5
 EBUILD selinux-vde-2.20170805-r3.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9dd6a9ef8a7b79eb11d91d3b3b338531199a6f67683fb24494be527ecf6c243cb8f691257e9a81465ce56ccac3e7eddf55deb5 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5
-EBUILD selinux-vde-2.20170805-r4.ebuild 278 BLAKE2B 44adedcf8e8ccdff52e7b7842ab34ff187ecbb0279a6979d6a27e2a98b0917be0c14486b0642e3202abe77e587f80fa1039573e9289527496dc7dbd2e3835d2c SHA512 63a88bb13bd342f72336dab6bb01d06e3078ff292bf668a0c9e0211009c3361a70f24e29863a4563cde4beef02124a6021d905fd94e5439bd7ef18152625e089
 EBUILD selinux-vde-2.20180114-r1.ebuild 276 BLAKE2B 5094788a012a8958853f5221d8ade087c7ea9ff55d674fdf41e5f2e15010da3952271b7e225f53b72cd636b1afa139fefadddbd23d36ccdf35d941e5e1bf208b SHA512 10756d7160bba9b8caa80719dac4f35c898a204fe53b7c4249e383e64fe864f398224a268da901f902917300510922da686cda0a92fcda23ecf7e03032d42a9a
 EBUILD selinux-vde-2.20180114-r2.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
+EBUILD selinux-vde-2.20180114-r3.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
 EBUILD selinux-vde-9999.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
 MISC metadata.xml 313 BLAKE2B bcbb05e797b8776598699d30290f26e68f54b310410214a23181f1aa5f3eb265817eb4efcd29977bc09129c3b38a2844bb55e5344077915d4ace391d0ef8394c SHA512 40aca5ba39fd653e4c621b4a0eff2b9eaed17e78f92144fd561c32470b72e69e0e191976af1f3bf6152e3b19c8fcc017be3ddeca3a4b191cfa513f6f42549e1e
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170204-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170204-r1.ebuild
deleted file mode 100644
index 6b53aaf68e45..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170204-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170204-r2.ebuild
deleted file mode 100644
index f0957f8c5d3f..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170204-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170204-r3.ebuild
deleted file mode 100644
index f0957f8c5d3f..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170204-r4.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170204-r4.ebuild
deleted file mode 100644
index f0957f8c5d3f..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170805-r4.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170805-r4.ebuild
deleted file mode 100644
index 6b53aaf68e45..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20180114-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..69c143bd9777
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vde"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vde"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index ad94bc11968c..fce058de3bb8 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-virt-2.20170204-r1.ebuild 280 BLAKE2B 165c00867db4af8d38122bb325d82ece7b41c7289cdfcc33a5f94cbf359d3cfe59836ab27fc3ae96f0d1474338223ca2fc657cf7a9ea6c72410b3142577f41ac SHA512 5bf96dc492c14c5e49420e5f709039551ed5ac0684110913c98b9dad3bcc1bf4dc842f85a44f368592f3091eb67b97b9b42398451a7fb5a9cf649dd18f0ff69d
-EBUILD selinux-virt-2.20170204-r2.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c60c3a66fe15240200c2d0f294e5c6b7f259a48e9c4db4fb033a8389ecf92b3eb710f6553a06d417b13e906f8ab60a83f56a91 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330
-EBUILD selinux-virt-2.20170204-r3.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c60c3a66fe15240200c2d0f294e5c6b7f259a48e9c4db4fb033a8389ecf92b3eb710f6553a06d417b13e906f8ab60a83f56a91 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330
-EBUILD selinux-virt-2.20170204-r4.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c60c3a66fe15240200c2d0f294e5c6b7f259a48e9c4db4fb033a8389ecf92b3eb710f6553a06d417b13e906f8ab60a83f56a91 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330
 EBUILD selinux-virt-2.20170805-r2.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c60c3a66fe15240200c2d0f294e5c6b7f259a48e9c4db4fb033a8389ecf92b3eb710f6553a06d417b13e906f8ab60a83f56a91 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330
 EBUILD selinux-virt-2.20170805-r3.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c60c3a66fe15240200c2d0f294e5c6b7f259a48e9c4db4fb033a8389ecf92b3eb710f6553a06d417b13e906f8ab60a83f56a91 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330
-EBUILD selinux-virt-2.20170805-r4.ebuild 280 BLAKE2B 165c00867db4af8d38122bb325d82ece7b41c7289cdfcc33a5f94cbf359d3cfe59836ab27fc3ae96f0d1474338223ca2fc657cf7a9ea6c72410b3142577f41ac SHA512 5bf96dc492c14c5e49420e5f709039551ed5ac0684110913c98b9dad3bcc1bf4dc842f85a44f368592f3091eb67b97b9b42398451a7fb5a9cf649dd18f0ff69d
 EBUILD selinux-virt-2.20180114-r1.ebuild 278 BLAKE2B 005e5eb9c1ef5aff676a25dea35223f6799afe5198e8014c358db959b2202c0f5fa7a1b02a7fee4767d376dbbbeff97779fcfc4e968d02f810b1b7cb556eddb3 SHA512 b084320fe3be2f3253e93fa681e08a91040d8ef7f383b374b91207dc0e995c4e2d45f8306fb47b9cb7cc8fd1381188df7514aed1a7bacb8ca55f4f3f87f65fbb
 EBUILD selinux-virt-2.20180114-r2.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
+EBUILD selinux-virt-2.20180114-r3.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
 EBUILD selinux-virt-9999.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
 MISC metadata.xml 314 BLAKE2B ddfe4853a8e46120ae40067c91e5aae0b9398391620fdead4a2bd05ecb7aab29e9125e287b86a08fd5c7c11c31f231b1c82a5cb98bbaddbdff638bc87a779eb3 SHA512 0a2c6884ff96c1bab8de52467afdba253e06c6d873d5e389ac2f84c485e4e4fa1bd5cb95a907b0ab49777755afcc1a26446f653ded9b3e3f64b576af14013296
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170204-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170204-r1.ebuild
deleted file mode 100644
index 1e81f92d5cc7..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170204-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170204-r2.ebuild
deleted file mode 100644
index 6c625e778520..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170204-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170204-r3.ebuild
deleted file mode 100644
index 6c625e778520..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170204-r4.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170204-r4.ebuild
deleted file mode 100644
index 6c625e778520..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170805-r4.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170805-r4.ebuild
deleted file mode 100644
index 1e81f92d5cc7..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20180114-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..4c2b8e1ee3ad
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="virt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for virt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index ee9cdab37a81..c950714dac8c 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vlock-2.20170204-r1.ebuild 282 BLAKE2B 51120478dc8899818d8e61f25fbfcfbab1b79078a5bccccee7133072b1aa504c1b47b34f3819e275c1874f60490653a3a116e738b1b6a0ab1b94a7547fa9de7e SHA512 87a355509b1b4c003a48a600434ef805b18d69572674c58b1d022e99a58863fde715bc519386aa16413c2b5779692180f9716333a8e0b5dfdb2b9053d24ee163
-EBUILD selinux-vlock-2.20170204-r2.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8efbc2a2592b827c744c163655e0b452d938ff6f25f532d9a481782eb92022d6392f51b3071721f7987faf17553ab43da905730f7 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b
-EBUILD selinux-vlock-2.20170204-r3.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8efbc2a2592b827c744c163655e0b452d938ff6f25f532d9a481782eb92022d6392f51b3071721f7987faf17553ab43da905730f7 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b
-EBUILD selinux-vlock-2.20170204-r4.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8efbc2a2592b827c744c163655e0b452d938ff6f25f532d9a481782eb92022d6392f51b3071721f7987faf17553ab43da905730f7 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b
 EBUILD selinux-vlock-2.20170805-r2.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8efbc2a2592b827c744c163655e0b452d938ff6f25f532d9a481782eb92022d6392f51b3071721f7987faf17553ab43da905730f7 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b
 EBUILD selinux-vlock-2.20170805-r3.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8efbc2a2592b827c744c163655e0b452d938ff6f25f532d9a481782eb92022d6392f51b3071721f7987faf17553ab43da905730f7 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b
-EBUILD selinux-vlock-2.20170805-r4.ebuild 282 BLAKE2B 51120478dc8899818d8e61f25fbfcfbab1b79078a5bccccee7133072b1aa504c1b47b34f3819e275c1874f60490653a3a116e738b1b6a0ab1b94a7547fa9de7e SHA512 87a355509b1b4c003a48a600434ef805b18d69572674c58b1d022e99a58863fde715bc519386aa16413c2b5779692180f9716333a8e0b5dfdb2b9053d24ee163
 EBUILD selinux-vlock-2.20180114-r1.ebuild 280 BLAKE2B 89b7d29aeaa21f3a738e6620ae5a767ec7761c486877798a67143ed5c24c519620ecad6543345b6ee891d07ea04c814223e66a6f0c9c1b87b7eb3ea5955ccd1e SHA512 db6a4849319b5001ddac41ab71ea9126f758795d09992e1ce60efbbce9878581d09a575bcb0b66742493c0a39928647c6cd61fda441d657a0ec58d5edf7c9e96
 EBUILD selinux-vlock-2.20180114-r2.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
+EBUILD selinux-vlock-2.20180114-r3.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
 EBUILD selinux-vlock-9999.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
 MISC metadata.xml 315 BLAKE2B b864e9c08b6219c42e71fb64cd812a5583705c7bdc2383d6070600891e5747306a80604ab62e329e6dad082139792dc3bff0dc8d09d8594bb9b0b712b616f38c SHA512 5ded38e727d6a36ea133c0500a64212b193ff5935a53386bf4ca2286e4d18e9468ad18f5fb4c80e9d0cde1d4e1713f4a5fbfe7ede03ed17e3ee573dce1a094b1
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r1.ebuild
deleted file mode 100644
index 908b9dd52b8b..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r2.ebuild
deleted file mode 100644
index 292f78fe8861..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r3.ebuild
deleted file mode 100644
index 292f78fe8861..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r4.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r4.ebuild
deleted file mode 100644
index 292f78fe8861..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r4.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r4.ebuild
deleted file mode 100644
index 908b9dd52b8b..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20180114-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..5ceb572ace30
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vlock"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vlock"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index f8d6884b5fa7..9e2824e3a9fd 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vmware-2.20170204-r1.ebuild 382 BLAKE2B 8e2a610152f138bf10ad73cb66e9c4810f8ca62a1dbc27bf4b73b5bf6d01311c63efc73fe4eb15fd13cb9e123796659542d3f34d31bb887d994fefe4cdb7a9cb SHA512 2e3e8d351d0d2f78220aff7a4b86bce74c00672375c4e55d72fe30479598e80cfae7cea6f8c53fce75a1e78512b9385ca1405058356bab835e7b8bee3e566f91
-EBUILD selinux-vmware-2.20170204-r2.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a8c1ffa157f40b33945e39cfb57901f5abcf2e1da879900fa877cf14379a621bb2885c9a979506ecba1faaec01ee7b60e68ed113 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66
-EBUILD selinux-vmware-2.20170204-r3.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a8c1ffa157f40b33945e39cfb57901f5abcf2e1da879900fa877cf14379a621bb2885c9a979506ecba1faaec01ee7b60e68ed113 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66
-EBUILD selinux-vmware-2.20170204-r4.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a8c1ffa157f40b33945e39cfb57901f5abcf2e1da879900fa877cf14379a621bb2885c9a979506ecba1faaec01ee7b60e68ed113 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66
 EBUILD selinux-vmware-2.20170805-r2.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a8c1ffa157f40b33945e39cfb57901f5abcf2e1da879900fa877cf14379a621bb2885c9a979506ecba1faaec01ee7b60e68ed113 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66
 EBUILD selinux-vmware-2.20170805-r3.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a8c1ffa157f40b33945e39cfb57901f5abcf2e1da879900fa877cf14379a621bb2885c9a979506ecba1faaec01ee7b60e68ed113 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66
-EBUILD selinux-vmware-2.20170805-r4.ebuild 382 BLAKE2B 8e2a610152f138bf10ad73cb66e9c4810f8ca62a1dbc27bf4b73b5bf6d01311c63efc73fe4eb15fd13cb9e123796659542d3f34d31bb887d994fefe4cdb7a9cb SHA512 2e3e8d351d0d2f78220aff7a4b86bce74c00672375c4e55d72fe30479598e80cfae7cea6f8c53fce75a1e78512b9385ca1405058356bab835e7b8bee3e566f91
 EBUILD selinux-vmware-2.20180114-r1.ebuild 380 BLAKE2B eccf5ce9368768a2941cad5478ad72796c9086dbe4917e24782f636c2af98e13dc81fc3d57f19aaebe5b31755d96447f46a197172de5150b843edeafe88e4adc SHA512 c27de4732968a38b8a2220c5b36ff4126763bea7113fc26f5cae87c1dd3324de2c10fb75074d9c71a3cb8ff64063a1da831c9041dc774f72087fbd1f32fa7bcb
 EBUILD selinux-vmware-2.20180114-r2.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
+EBUILD selinux-vmware-2.20180114-r3.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
 EBUILD selinux-vmware-9999.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
 MISC metadata.xml 316 BLAKE2B ede764cc96f6774fc982138cef45b3e8470e94c8bc8e25482d8b1934c4de5e35469e18bdddb60f3693a71f1ebbff9201f7c4d8456f709695eed7131e76a7d0d0 SHA512 6410be397d5216abf34e154e3d52de5bccddeceebe65bf886df5628c459cbc346c585debcc4d89ceac8302d9eb80acc1c7460c0a6327344850896aad2050d6fb
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r1.ebuild
deleted file mode 100644
index 6845b4dbd1fd..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r2.ebuild
deleted file mode 100644
index 8f875de1fced..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r3.ebuild
deleted file mode 100644
index 8f875de1fced..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r4.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r4.ebuild
deleted file mode 100644
index 8f875de1fced..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r4.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r4.ebuild
deleted file mode 100644
index 6845b4dbd1fd..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20180114-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..85939ad36b26
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vmware"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vmware"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 687de871a014..0cde0f666dc9 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vnstatd-2.20170204-r1.ebuild 286 BLAKE2B df2f1ec7db9726272a3b2b7b497c26f7a358ae6aa414747b95f85f7a914262c291dc461247329515dff738f8d4d942cc8ac338fa0299e063e4b85f18d08aee58 SHA512 a0d7f18d0e533c29b24019c7d8dc53cc0dd4f2f30c59a42eb2bfa292c53a8ce1104cced3db2ad0e5498349dd066b6518fbb184beb583d53d48c58ddf73c3d6c6
-EBUILD selinux-vnstatd-2.20170204-r2.ebuild 284 BLAKE2B 3a48be71cae244802a35239e380c4435ddbc2fd01ea105beeb14b75b517ea0414a8dfc0e2f6877b5fddbd23e3c6c2de6222840d050e44ff093e136aa272d7592 SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7
-EBUILD selinux-vnstatd-2.20170204-r3.ebuild 284 BLAKE2B 3a48be71cae244802a35239e380c4435ddbc2fd01ea105beeb14b75b517ea0414a8dfc0e2f6877b5fddbd23e3c6c2de6222840d050e44ff093e136aa272d7592 SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7
-EBUILD selinux-vnstatd-2.20170204-r4.ebuild 284 BLAKE2B 3a48be71cae244802a35239e380c4435ddbc2fd01ea105beeb14b75b517ea0414a8dfc0e2f6877b5fddbd23e3c6c2de6222840d050e44ff093e136aa272d7592 SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7
 EBUILD selinux-vnstatd-2.20170805-r2.ebuild 284 BLAKE2B 3a48be71cae244802a35239e380c4435ddbc2fd01ea105beeb14b75b517ea0414a8dfc0e2f6877b5fddbd23e3c6c2de6222840d050e44ff093e136aa272d7592 SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7
 EBUILD selinux-vnstatd-2.20170805-r3.ebuild 284 BLAKE2B 3a48be71cae244802a35239e380c4435ddbc2fd01ea105beeb14b75b517ea0414a8dfc0e2f6877b5fddbd23e3c6c2de6222840d050e44ff093e136aa272d7592 SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7
-EBUILD selinux-vnstatd-2.20170805-r4.ebuild 286 BLAKE2B df2f1ec7db9726272a3b2b7b497c26f7a358ae6aa414747b95f85f7a914262c291dc461247329515dff738f8d4d942cc8ac338fa0299e063e4b85f18d08aee58 SHA512 a0d7f18d0e533c29b24019c7d8dc53cc0dd4f2f30c59a42eb2bfa292c53a8ce1104cced3db2ad0e5498349dd066b6518fbb184beb583d53d48c58ddf73c3d6c6
 EBUILD selinux-vnstatd-2.20180114-r1.ebuild 284 BLAKE2B b6c5c393b11075625bd94c5a853a3b80b145acfb28d328c5edd2c90af4b906278dc1a1b22e2dbac54520eb9e2d009f1e00374f4c6c6db703a5f89c6bcf972039 SHA512 8909a0d06b13429de400849ab141de67b7f4c75a9e10a5602b233e389e819acd9cf11e898877022f08d67a20d33f0323b2d5083b451815ed9614cb49c3db2cbf
 EBUILD selinux-vnstatd-2.20180114-r2.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
+EBUILD selinux-vnstatd-2.20180114-r3.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
 EBUILD selinux-vnstatd-9999.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
 MISC metadata.xml 317 BLAKE2B bcb38dd9c3df8e508df7129013547025ff8f9856a4032c1599f237d398e874228318ac515ccf1710233e40b4aaea1ddf02f044b58d69e5a35f51221da2ca5ee4 SHA512 0384e8de44653fbeffaa82186ce1b560fa1a1f9f7c5e5255cfa61988d4189cf698da7f17abfbc35d8f608735d609496fe53077d5d9e84f870e2e376cc728c072
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r1.ebuild
deleted file mode 100644
index f4b210298df8..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r2.ebuild
deleted file mode 100644
index cfefdd158567..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r3.ebuild
deleted file mode 100644
index cfefdd158567..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r4.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r4.ebuild
deleted file mode 100644
index cfefdd158567..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r4.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r4.ebuild
deleted file mode 100644
index f4b210298df8..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180114-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a96ef5b2ccad
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vnstatd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index 1b8f3a9a6ed2..6f1aaba305fc 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-vpn-2.20170204-r1.ebuild 278 BLAKE2B d7633b1b380c736d18a928c5cb09d3935eee72c3fcc137d596505d5be93e5c50ad6cdc375ce6745793b7e36d868892e2d31ddcb02c559caecd07aed952e21dad SHA512 c32e36f7de207fc5cc25e083e85058f121929fd751b5d6ce291197c1e93180376ab0d82c6d6f77f3ccfac103527562f97e731614f0401e024607fa0a11f9f6a3
-EBUILD selinux-vpn-2.20170204-r2.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c47d56cf768c19f9d5c858aee751bb8a8ccc3d97ee85ab2fde067a35bbcfb8584a8f22c3cc4e74f40eecff000434633939ec1 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9
-EBUILD selinux-vpn-2.20170204-r3.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c47d56cf768c19f9d5c858aee751bb8a8ccc3d97ee85ab2fde067a35bbcfb8584a8f22c3cc4e74f40eecff000434633939ec1 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9
-EBUILD selinux-vpn-2.20170204-r4.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c47d56cf768c19f9d5c858aee751bb8a8ccc3d97ee85ab2fde067a35bbcfb8584a8f22c3cc4e74f40eecff000434633939ec1 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9
 EBUILD selinux-vpn-2.20170805-r2.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c47d56cf768c19f9d5c858aee751bb8a8ccc3d97ee85ab2fde067a35bbcfb8584a8f22c3cc4e74f40eecff000434633939ec1 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9
 EBUILD selinux-vpn-2.20170805-r3.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c47d56cf768c19f9d5c858aee751bb8a8ccc3d97ee85ab2fde067a35bbcfb8584a8f22c3cc4e74f40eecff000434633939ec1 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9
-EBUILD selinux-vpn-2.20170805-r4.ebuild 278 BLAKE2B d7633b1b380c736d18a928c5cb09d3935eee72c3fcc137d596505d5be93e5c50ad6cdc375ce6745793b7e36d868892e2d31ddcb02c559caecd07aed952e21dad SHA512 c32e36f7de207fc5cc25e083e85058f121929fd751b5d6ce291197c1e93180376ab0d82c6d6f77f3ccfac103527562f97e731614f0401e024607fa0a11f9f6a3
 EBUILD selinux-vpn-2.20180114-r1.ebuild 276 BLAKE2B 97e68bff55a22b4f136a7dd395eecd0bb80cde7c483ff58a6f0e1937f78ea92099bcd2b671970783c7a89a2c13377f4550622f9ed2ca7ffc830e32736038363d SHA512 c7a1f9ccaea4daa37b8f2aafc9494c568e494f0aec4abb582914d5576df403bb6625141426807ba00362f6fabcdf6b036f78cb4405916cc13ee819c1c42ae769
 EBUILD selinux-vpn-2.20180114-r2.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
+EBUILD selinux-vpn-2.20180114-r3.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
 EBUILD selinux-vpn-9999.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
 MISC metadata.xml 313 BLAKE2B aa394352994b58b3af9cfa456bf4bbdcac364ac6fbb30c784122ab4482ae84f26fff0a3b568017d2aa8a4c053e4dcf55b44ea90a7b013da56896393817ab8db8 SHA512 5932c33a47a1c1a8a64b94fc174b8f284d4fbfec1852b6a971d5b72008bce6c5d532f3075ab5dbf61eca24e8f59e8723facf83c57b7d5a0d3ee490cf34abb302
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r1.ebuild
deleted file mode 100644
index 7c2d0498e818..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r2.ebuild
deleted file mode 100644
index bd9a0bb823e3..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r3.ebuild
deleted file mode 100644
index bd9a0bb823e3..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r4.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r4.ebuild
deleted file mode 100644
index bd9a0bb823e3..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r4.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r4.ebuild
deleted file mode 100644
index 7c2d0498e818..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20180114-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..7132c9718995
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vpn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 0310dd03ed3b..edb5bbd9a792 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-watchdog-2.20170204-r1.ebuild 288 BLAKE2B 16420194bc5f6524597624d4bd63e7c58432b90aebeece41c76ef9c2b6574f49c8440330fde929f302aa2e145c87cfcd40e31037dcc706f9d0b544434fb2f674 SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b
-EBUILD selinux-watchdog-2.20170204-r2.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
-EBUILD selinux-watchdog-2.20170204-r3.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
-EBUILD selinux-watchdog-2.20170204-r4.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
 EBUILD selinux-watchdog-2.20170805-r2.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
 EBUILD selinux-watchdog-2.20170805-r3.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
-EBUILD selinux-watchdog-2.20170805-r4.ebuild 288 BLAKE2B 16420194bc5f6524597624d4bd63e7c58432b90aebeece41c76ef9c2b6574f49c8440330fde929f302aa2e145c87cfcd40e31037dcc706f9d0b544434fb2f674 SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b
 EBUILD selinux-watchdog-2.20180114-r1.ebuild 286 BLAKE2B c8be687a6675b575c9e0e0defac043bc5016b519c8b56c3f80fa51b0da504b82d0dcfe212d2ce7c78275d7097050e209fa7f7c1e48d91a7e64d0a102d142f540 SHA512 6f85669499407ff21e3d5785cb69b8c9017ed6903540160628e8bde81f51bff079f54f40eddd30f18239b6fef95e973440b7dec3ee86a1203a59f389aca531ca
 EBUILD selinux-watchdog-2.20180114-r2.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
+EBUILD selinux-watchdog-2.20180114-r3.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
 EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
 MISC metadata.xml 318 BLAKE2B ffea2648ec00eff9dc1d23552633fee8cf1db446b8f7d110b613f9e2d40b5aac0ea80462754f72e70fa4e86ed42717c6ef1ecf1680ea771e497cd6349df0b283 SHA512 3c77f235f65bc644d316ec2bb0d859ee22c622049c4f406904a7c24a4c17156636d86f249f4dca2a15a90d0334da677df3038956991a256f591fe3c7c2284957
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r1.ebuild
deleted file mode 100644
index 8fe981a7e558..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r2.ebuild
deleted file mode 100644
index fad30c50079d..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r3.ebuild
deleted file mode 100644
index fad30c50079d..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r4.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r4.ebuild
deleted file mode 100644
index fad30c50079d..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r4.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r4.ebuild
deleted file mode 100644
index 8fe981a7e558..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20180114-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..3bf64e50b5ac
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="watchdog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 4ffa430fa30d..b2a2ffd31dfc 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-webalizer-2.20170204-r1.ebuild 387 BLAKE2B c9b93230dc3c2779f7607346e1508ebd63bc068e1cc47a09c111a25b0fb4060fad7c99d3f8d361405fe58cb843c14e71487dc305974e8539c655e5cd06c63f2b SHA512 8ce716769e63bb9d5e369f60d821684f537f98e745a57be4d3be134f6e501b4b1ff0f8478847e0801999cd2a1f578938e3f4d5d448cb38733ce0cef695a5155c
-EBUILD selinux-webalizer-2.20170204-r2.ebuild 385 BLAKE2B 715680209d939667f1efdf6346eb06360f692638017a3f849591a6f4b7758e0507547a23c8e95ceac349d80ea5abada20f3da9e898b2555c6441f0decf52eb95 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1
-EBUILD selinux-webalizer-2.20170204-r3.ebuild 385 BLAKE2B 715680209d939667f1efdf6346eb06360f692638017a3f849591a6f4b7758e0507547a23c8e95ceac349d80ea5abada20f3da9e898b2555c6441f0decf52eb95 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1
-EBUILD selinux-webalizer-2.20170204-r4.ebuild 385 BLAKE2B 715680209d939667f1efdf6346eb06360f692638017a3f849591a6f4b7758e0507547a23c8e95ceac349d80ea5abada20f3da9e898b2555c6441f0decf52eb95 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1
 EBUILD selinux-webalizer-2.20170805-r2.ebuild 385 BLAKE2B 715680209d939667f1efdf6346eb06360f692638017a3f849591a6f4b7758e0507547a23c8e95ceac349d80ea5abada20f3da9e898b2555c6441f0decf52eb95 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1
 EBUILD selinux-webalizer-2.20170805-r3.ebuild 385 BLAKE2B 715680209d939667f1efdf6346eb06360f692638017a3f849591a6f4b7758e0507547a23c8e95ceac349d80ea5abada20f3da9e898b2555c6441f0decf52eb95 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1
-EBUILD selinux-webalizer-2.20170805-r4.ebuild 387 BLAKE2B c9b93230dc3c2779f7607346e1508ebd63bc068e1cc47a09c111a25b0fb4060fad7c99d3f8d361405fe58cb843c14e71487dc305974e8539c655e5cd06c63f2b SHA512 8ce716769e63bb9d5e369f60d821684f537f98e745a57be4d3be134f6e501b4b1ff0f8478847e0801999cd2a1f578938e3f4d5d448cb38733ce0cef695a5155c
 EBUILD selinux-webalizer-2.20180114-r1.ebuild 385 BLAKE2B 7619dd5c99386ecd1dd2262fc0aabba54be543c2978fcf83507637ad53c60df53ab7fb896847ba4453d550816992e9b8ebf78660f470fd45a834b89df15c053f SHA512 d67717e516eee69a05453c427d4bfba176432a1d75df00f67bca97cbadd0098963b3f22cbe3a339517963da71f7ff6e52bafa3225b4d4287c2af390ca70a5ddb
 EBUILD selinux-webalizer-2.20180114-r2.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
+EBUILD selinux-webalizer-2.20180114-r3.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
 EBUILD selinux-webalizer-9999.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
 MISC metadata.xml 319 BLAKE2B 2a6a658da12d525a5781ff850e1c0c732e099ed2173eb82f985b7dd1ed6550911653e6f87c36be245aa1044b4e85f69be26f7318b3a262d05e1975fac7524d84 SHA512 6986d5695bb17f98f786b3639631f0a2571c91b2e90f33bc4b8e63b8390c70995b1b9010d22e9ce2ec23444342c246aa1e36f6da0675831c59534c0da6a0cb04
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r1.ebuild
deleted file mode 100644
index 925130750022..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r2.ebuild
deleted file mode 100644
index 2d855739245b..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r3.ebuild
deleted file mode 100644
index 2d855739245b..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r4.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r4.ebuild
deleted file mode 100644
index 2d855739245b..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r4.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r4.ebuild
deleted file mode 100644
index 925130750022..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20180114-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..1faf79c01338
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20180114-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="webalizer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for webalizer"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 7f8eb916a295..dd9ac46e21ee 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-wine-2.20170204-r1.ebuild 280 BLAKE2B a3c899c1322227b1c7721c4427f88a8cc5ab0d1f952aeffbc3c8eb7a349d6ae0e886eaa59891f71f8742123d174532dc73ba5de313a6d782931068d8d363ac32 SHA512 f7999bee2cd65fc5f287858d8494808a374d2a3485085df71802fc05b8f5764f33794a1080a941986dc5aaf37ef24fd97196fce583a98386102592650439279c
-EBUILD selinux-wine-2.20170204-r2.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefec787eab2e264feafbb87d4821cb8e78ae9d1efa9cf9b3becd8b87c7cbd3d2c2c0dab6a6b992cf6739f69135c4f1d87919e79c SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15
-EBUILD selinux-wine-2.20170204-r3.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefec787eab2e264feafbb87d4821cb8e78ae9d1efa9cf9b3becd8b87c7cbd3d2c2c0dab6a6b992cf6739f69135c4f1d87919e79c SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15
-EBUILD selinux-wine-2.20170204-r4.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefec787eab2e264feafbb87d4821cb8e78ae9d1efa9cf9b3becd8b87c7cbd3d2c2c0dab6a6b992cf6739f69135c4f1d87919e79c SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15
 EBUILD selinux-wine-2.20170805-r2.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefec787eab2e264feafbb87d4821cb8e78ae9d1efa9cf9b3becd8b87c7cbd3d2c2c0dab6a6b992cf6739f69135c4f1d87919e79c SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15
 EBUILD selinux-wine-2.20170805-r3.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefec787eab2e264feafbb87d4821cb8e78ae9d1efa9cf9b3becd8b87c7cbd3d2c2c0dab6a6b992cf6739f69135c4f1d87919e79c SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15
-EBUILD selinux-wine-2.20170805-r4.ebuild 280 BLAKE2B a3c899c1322227b1c7721c4427f88a8cc5ab0d1f952aeffbc3c8eb7a349d6ae0e886eaa59891f71f8742123d174532dc73ba5de313a6d782931068d8d363ac32 SHA512 f7999bee2cd65fc5f287858d8494808a374d2a3485085df71802fc05b8f5764f33794a1080a941986dc5aaf37ef24fd97196fce583a98386102592650439279c
 EBUILD selinux-wine-2.20180114-r1.ebuild 278 BLAKE2B 94afa0a4f935d584d67374584eef5d8d6500e0f31ba0b946e7495d593c778607cbae8536178ec60b66fddc2c2ee1026370fe0db049647e1e2c3f14bb2134738a SHA512 1cd810ae984811ae1aa37c7c2e67ca6e70c40b58e271844f1704b46547a137e67d840bc1f0a4038a58871d8d85ed5ff52d6958f3ca80b34c4d665e9f6cf58453
 EBUILD selinux-wine-2.20180114-r2.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
+EBUILD selinux-wine-2.20180114-r3.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
 EBUILD selinux-wine-9999.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
 MISC metadata.xml 314 BLAKE2B 780bfce1351e4e91d04d338327f744c024f95f430bd756c235b7e198c24ef1af56f769ff4c7567be38c4e5e839afa03a1bc2ed8a56d6b7c0f4ce7b85bd95e1c7 SHA512 50bcf648ab54f3c7eb0a7027ccdf189eae0279672792f52cd52ac894a589154f9ca5feafb5d0eb646d666f1a0c1300c7403cd60efeda86087b44516ebca2da44
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170204-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170204-r1.ebuild
deleted file mode 100644
index 027c75dc915b..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170204-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170204-r2.ebuild
deleted file mode 100644
index b3e3abbe3939..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170204-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170204-r3.ebuild
deleted file mode 100644
index b3e3abbe3939..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170204-r4.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170204-r4.ebuild
deleted file mode 100644
index b3e3abbe3939..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170805-r4.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170805-r4.ebuild
deleted file mode 100644
index 027c75dc915b..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20180114-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2d14db60213d
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wine"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wine"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index a2f309e0a3a1..9c8866d2ba5b 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-wireshark-2.20170204-r1.ebuild 290 BLAKE2B 491844e26a732d1caee47288ab5a2b75d191c66f17abe7f92e46f9179ddd92a606b7449bed7a454d70a132c5a6b4f60153e5bc672f16fa512d3a8626581c2ef7 SHA512 98a690ef6fc2adf79a6821018006a86eadb8fec6c6974a012ba0388f8bb75eb175bd69997039d6205aab386dfaee860b0c3941bd4779162a2c643a150d17ba8e
-EBUILD selinux-wireshark-2.20170204-r2.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f7a0a97047de09c81dccaa1eac2dccb9ba5078f098760a15a795823c6b88317dca798742bb830fa76b3bd23a25b3c7e3b3ae1b86fbc SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25
-EBUILD selinux-wireshark-2.20170204-r3.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f7a0a97047de09c81dccaa1eac2dccb9ba5078f098760a15a795823c6b88317dca798742bb830fa76b3bd23a25b3c7e3b3ae1b86fbc SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25
-EBUILD selinux-wireshark-2.20170204-r4.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f7a0a97047de09c81dccaa1eac2dccb9ba5078f098760a15a795823c6b88317dca798742bb830fa76b3bd23a25b3c7e3b3ae1b86fbc SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25
 EBUILD selinux-wireshark-2.20170805-r2.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f7a0a97047de09c81dccaa1eac2dccb9ba5078f098760a15a795823c6b88317dca798742bb830fa76b3bd23a25b3c7e3b3ae1b86fbc SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25
 EBUILD selinux-wireshark-2.20170805-r3.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f7a0a97047de09c81dccaa1eac2dccb9ba5078f098760a15a795823c6b88317dca798742bb830fa76b3bd23a25b3c7e3b3ae1b86fbc SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25
-EBUILD selinux-wireshark-2.20170805-r4.ebuild 290 BLAKE2B 491844e26a732d1caee47288ab5a2b75d191c66f17abe7f92e46f9179ddd92a606b7449bed7a454d70a132c5a6b4f60153e5bc672f16fa512d3a8626581c2ef7 SHA512 98a690ef6fc2adf79a6821018006a86eadb8fec6c6974a012ba0388f8bb75eb175bd69997039d6205aab386dfaee860b0c3941bd4779162a2c643a150d17ba8e
 EBUILD selinux-wireshark-2.20180114-r1.ebuild 288 BLAKE2B 77c61f431d6c1193ae90fba2313c32c1e29f9de4eebe152415c030a6e513ac8e0f5b086dea9092d82ce7f44d9410e2fb7634b1ba9680c89fefca3b4a02eae762 SHA512 581a8344984e78d04a005b007fd9edb95abb674dda99be463078b75b08fe173218de1c9b36a6078af2955c6a5dae84e2c26f6ce1b09ce34e207849b0d86ed870
 EBUILD selinux-wireshark-2.20180114-r2.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
+EBUILD selinux-wireshark-2.20180114-r3.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
 EBUILD selinux-wireshark-9999.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
 MISC metadata.xml 319 BLAKE2B bcf0d4e0124dcc45b99b5087c5433088fc85bd11cba9728e30d7171b0c88da21bb44e3c945f3a4bfa749281aeea68f4d0ee93d59fbe0af66093ac260bd48c3d9 SHA512 80924418148b0afd56b379bf7b8295dcc9544be8b78dc0716f5b0e692be198fcb5629a283e5cb42a9eeee6cb4af348232bb3538bc27929b8e58494c6859327a0
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r1.ebuild
deleted file mode 100644
index c10051b4366f..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r2.ebuild
deleted file mode 100644
index 60ec7ab1acdf..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r3.ebuild
deleted file mode 100644
index 60ec7ab1acdf..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r4.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r4.ebuild
deleted file mode 100644
index 60ec7ab1acdf..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r4.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r4.ebuild
deleted file mode 100644
index c10051b4366f..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20180114-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a53c36b9a8b4
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wireshark"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireshark"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 745ddb1d4a01..12612ba18487 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-wm-2.20170204-r1.ebuild 276 BLAKE2B 50bb5f0737d27d292fc1a7e5b6e8a4235557bdd6aed1bf43a408138b4d342176efa23356e058e360507646bf357e92b10c7408f1ac368a602caa70785c4c5dee SHA512 29d8195a7320143ea63eb49e7a032921fec7779f2c13c59b30cb6b86784e85fdd6e0a79997bf63195cca37886f72b07db6dbd2b39f560c6d1fe3bbcc51ef8488
-EBUILD selinux-wm-2.20170204-r2.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce0413070a26919ae5be566ea70ccec8015a04163d375c3ad8213e2597d39ca323420090d9f1f4ff145354826ff593438b9fb SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2
-EBUILD selinux-wm-2.20170204-r3.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce0413070a26919ae5be566ea70ccec8015a04163d375c3ad8213e2597d39ca323420090d9f1f4ff145354826ff593438b9fb SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2
-EBUILD selinux-wm-2.20170204-r4.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce0413070a26919ae5be566ea70ccec8015a04163d375c3ad8213e2597d39ca323420090d9f1f4ff145354826ff593438b9fb SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2
 EBUILD selinux-wm-2.20170805-r2.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce0413070a26919ae5be566ea70ccec8015a04163d375c3ad8213e2597d39ca323420090d9f1f4ff145354826ff593438b9fb SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2
 EBUILD selinux-wm-2.20170805-r3.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce0413070a26919ae5be566ea70ccec8015a04163d375c3ad8213e2597d39ca323420090d9f1f4ff145354826ff593438b9fb SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2
-EBUILD selinux-wm-2.20170805-r4.ebuild 276 BLAKE2B 50bb5f0737d27d292fc1a7e5b6e8a4235557bdd6aed1bf43a408138b4d342176efa23356e058e360507646bf357e92b10c7408f1ac368a602caa70785c4c5dee SHA512 29d8195a7320143ea63eb49e7a032921fec7779f2c13c59b30cb6b86784e85fdd6e0a79997bf63195cca37886f72b07db6dbd2b39f560c6d1fe3bbcc51ef8488
 EBUILD selinux-wm-2.20180114-r1.ebuild 274 BLAKE2B 69b9ed374aa90ae1606fcf46b205e196af64ded879e4a612c02d642383cb85e0d655e12b07f0dc7c3ff5ee914424a8ace25c8014e7adc813a30594f4b7dda827 SHA512 912bcac95aaba7ca7c6a56059eece95ab44a83c4cd8501ba169992155c50fd605e8e2d145291a9f30bed39f0a6934dae3ed509353c3835e642ff552d42a7a904
 EBUILD selinux-wm-2.20180114-r2.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
+EBUILD selinux-wm-2.20180114-r3.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
 EBUILD selinux-wm-9999.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
 MISC metadata.xml 312 BLAKE2B 33d3910b761a83e4c2053db450c00b83dfa1bce1ac99a444a6b8ad247fddbb3bb23cac7fa5da9f29e2cbe52c4ef1e69323526ea1e2c1b2f537505c0584a672fa SHA512 af59f138e5a0a4e5cfc193cbffb4a43623325f89fd7241630fef628faede5bfe521f4d8309cc4eb93bd51b25e7e0a62134d3579f9dddaa68e42ac410e0e2f437
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170204-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170204-r1.ebuild
deleted file mode 100644
index c5f1f0e33b99..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170204-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170204-r2.ebuild
deleted file mode 100644
index dadc5193812c..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170204-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170204-r3.ebuild
deleted file mode 100644
index dadc5193812c..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170204-r4.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170204-r4.ebuild
deleted file mode 100644
index dadc5193812c..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170805-r4.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170805-r4.ebuild
deleted file mode 100644
index c5f1f0e33b99..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20180114-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..356ec814381b
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index f480007ede1f..700e3e1ea1c5 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xen-2.20170204-r1.ebuild 278 BLAKE2B 0a14e69debdc7884e688d019c823b2331fdd82d23bd24d2039554ea40db177b41e899f439fc32783104b33949a3009c0a83573bbb576f4051975e72c6d1179c7 SHA512 084266843378d6e8830157fed1903232d9390932ecbe8c5b28db366bcebeee7ef2f35c53af96d243474c355cfd52aafa68fe4b519faae6133e6d2f4e37b75c21
-EBUILD selinux-xen-2.20170204-r2.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20c17143c42b30fec40cc52809d65a54accb65bf6951f4b3b6ab74c9ee83ddd796e5d1644e62da83423d50a0357817d76ab1bb SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9
-EBUILD selinux-xen-2.20170204-r3.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20c17143c42b30fec40cc52809d65a54accb65bf6951f4b3b6ab74c9ee83ddd796e5d1644e62da83423d50a0357817d76ab1bb SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9
-EBUILD selinux-xen-2.20170204-r4.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20c17143c42b30fec40cc52809d65a54accb65bf6951f4b3b6ab74c9ee83ddd796e5d1644e62da83423d50a0357817d76ab1bb SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9
 EBUILD selinux-xen-2.20170805-r2.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20c17143c42b30fec40cc52809d65a54accb65bf6951f4b3b6ab74c9ee83ddd796e5d1644e62da83423d50a0357817d76ab1bb SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9
 EBUILD selinux-xen-2.20170805-r3.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20c17143c42b30fec40cc52809d65a54accb65bf6951f4b3b6ab74c9ee83ddd796e5d1644e62da83423d50a0357817d76ab1bb SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9
-EBUILD selinux-xen-2.20170805-r4.ebuild 278 BLAKE2B 0a14e69debdc7884e688d019c823b2331fdd82d23bd24d2039554ea40db177b41e899f439fc32783104b33949a3009c0a83573bbb576f4051975e72c6d1179c7 SHA512 084266843378d6e8830157fed1903232d9390932ecbe8c5b28db366bcebeee7ef2f35c53af96d243474c355cfd52aafa68fe4b519faae6133e6d2f4e37b75c21
 EBUILD selinux-xen-2.20180114-r1.ebuild 276 BLAKE2B 0c71217578ee45452f0455b33cdd0b9aef68860852d1d8ad56ea9bb792b7315da5cf362778b2948284f34e2efd3ef3b3dc2794aca6fed5cad9f9c5c43e6c7158 SHA512 b291372923ada54cbe44b04191daea145a1447749df3209901d33bded7c03d35f47c104e2a2e70ce50f8f60b294bfc3331966bbb3662ee416f543139c2f1be3b
 EBUILD selinux-xen-2.20180114-r2.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
+EBUILD selinux-xen-2.20180114-r3.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
 EBUILD selinux-xen-9999.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
 MISC metadata.xml 313 BLAKE2B 3d3cc15dc6bd1334114e59a81727a5bee2cd538013e7c438ba7d9df291daf38325683f8b5563cb11f644fb01c8c06915681ec8b5861c005c3550425712d24fa6 SHA512 9fcb80cf02e136d443c02877c738b8495f7ca07338d952e62e22a602ec39658117877871398b501700e31ab481a1566a04f6e30c797970191368b023e2bcb806
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170204-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170204-r1.ebuild
deleted file mode 100644
index cb4b6a78f1ba..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170204-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170204-r2.ebuild
deleted file mode 100644
index a046cb71491c..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170204-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170204-r3.ebuild
deleted file mode 100644
index a046cb71491c..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170204-r4.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170204-r4.ebuild
deleted file mode 100644
index a046cb71491c..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170805-r4.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170805-r4.ebuild
deleted file mode 100644
index cb4b6a78f1ba..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20180114-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a03e6da72146
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xen"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index aa448573611c..d7063e807190 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xfs-2.20170204-r1.ebuild 278 BLAKE2B 766a46a9106ad4f2d1892e438707713a7f32256c08401dc06dd543a18a189a83b2333fc0be304024f05471e5528ef9e07202218928dbe8d401c0007d77c90c08 SHA512 b11264b2df58f1cbd634a65c27517a96263d181ef65f0780636aef4e7e15a51d1fcca8e16870af046fe066aad529bf4ad24b901491ffbeba169098f39d12a0bf
-EBUILD selinux-xfs-2.20170204-r2.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa396f7dcaab2eaba50a3e4dca077b7b3b1a8272e4f0dc486a8d6a9845623313e0bf650e004a8d71b812ed7e1befa2d67a360ee0 SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2
-EBUILD selinux-xfs-2.20170204-r3.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa396f7dcaab2eaba50a3e4dca077b7b3b1a8272e4f0dc486a8d6a9845623313e0bf650e004a8d71b812ed7e1befa2d67a360ee0 SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2
-EBUILD selinux-xfs-2.20170204-r4.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa396f7dcaab2eaba50a3e4dca077b7b3b1a8272e4f0dc486a8d6a9845623313e0bf650e004a8d71b812ed7e1befa2d67a360ee0 SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2
 EBUILD selinux-xfs-2.20170805-r2.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa396f7dcaab2eaba50a3e4dca077b7b3b1a8272e4f0dc486a8d6a9845623313e0bf650e004a8d71b812ed7e1befa2d67a360ee0 SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2
 EBUILD selinux-xfs-2.20170805-r3.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa396f7dcaab2eaba50a3e4dca077b7b3b1a8272e4f0dc486a8d6a9845623313e0bf650e004a8d71b812ed7e1befa2d67a360ee0 SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2
-EBUILD selinux-xfs-2.20170805-r4.ebuild 278 BLAKE2B 766a46a9106ad4f2d1892e438707713a7f32256c08401dc06dd543a18a189a83b2333fc0be304024f05471e5528ef9e07202218928dbe8d401c0007d77c90c08 SHA512 b11264b2df58f1cbd634a65c27517a96263d181ef65f0780636aef4e7e15a51d1fcca8e16870af046fe066aad529bf4ad24b901491ffbeba169098f39d12a0bf
 EBUILD selinux-xfs-2.20180114-r1.ebuild 276 BLAKE2B 147f608ceedad91e7242b8e884102dddf9c53f4d8d3cc97b3f1d503fbc015f8abc6da47e5740f560c034ab35e6bcab9e178584d1efc488514e992a1f32da3db8 SHA512 3f8d552e14115d167756575b0f25cbae7bafa38bad79e320415a063f2197012776ed1fb8e686a1fcfad78c5e074ef31367d96806df49c7c235245ad6b6c2754c
 EBUILD selinux-xfs-2.20180114-r2.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
+EBUILD selinux-xfs-2.20180114-r3.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
 EBUILD selinux-xfs-9999.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
 MISC metadata.xml 313 BLAKE2B 04215c2d269e1175cde05c8e127fce9049b974992079c026d663d0415e8d76b988ee852e78291e6912453f4152a799b4b38cab4c97ac203fc6b76de00ccb78b4 SHA512 5e9759c65739b4c1392585addc79b9b430fbdc6a564d27836398d686e3e89b84b4213243b571022ee7703413b5212d212a92fbb3feb0134a14a8c31ab5e67bee
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r1.ebuild
deleted file mode 100644
index a2cc37d8b263..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r2.ebuild
deleted file mode 100644
index bd58f42cd8ff..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r3.ebuild
deleted file mode 100644
index bd58f42cd8ff..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r4.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r4.ebuild
deleted file mode 100644
index bd58f42cd8ff..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r4.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r4.ebuild
deleted file mode 100644
index a2cc37d8b263..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20180114-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..cf06c723ddfd
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xfs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xfs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index cf44009fb513..7ac0b3ed2415 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xprint-2.20170204-r1.ebuild 284 BLAKE2B 4168014d49632138e2a5684b15e4286ac5172e7a15280ba4ae72df93a0e4ce2b8e4068ce5506d6284d54af88bf4423f52aaa51216f8bf7c9083950d4819b5d6a SHA512 50c5451066788ab806200ef14bebad8b33987cd18390b49eef01262751ea766704d32cbf75d0a9f3117b95ddee6815088bad44827d309af06da848a9d61312fd
-EBUILD selinux-xprint-2.20170204-r2.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c2e05b7af951d5036cc18f3876fec47051c7994270f3cdf96a294e02b9233db97c599ee4e41dc98ae9282ff489041f2ead19ceb4 SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec
-EBUILD selinux-xprint-2.20170204-r3.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c2e05b7af951d5036cc18f3876fec47051c7994270f3cdf96a294e02b9233db97c599ee4e41dc98ae9282ff489041f2ead19ceb4 SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec
-EBUILD selinux-xprint-2.20170204-r4.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c2e05b7af951d5036cc18f3876fec47051c7994270f3cdf96a294e02b9233db97c599ee4e41dc98ae9282ff489041f2ead19ceb4 SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec
 EBUILD selinux-xprint-2.20170805-r2.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c2e05b7af951d5036cc18f3876fec47051c7994270f3cdf96a294e02b9233db97c599ee4e41dc98ae9282ff489041f2ead19ceb4 SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec
 EBUILD selinux-xprint-2.20170805-r3.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c2e05b7af951d5036cc18f3876fec47051c7994270f3cdf96a294e02b9233db97c599ee4e41dc98ae9282ff489041f2ead19ceb4 SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec
-EBUILD selinux-xprint-2.20170805-r4.ebuild 284 BLAKE2B 4168014d49632138e2a5684b15e4286ac5172e7a15280ba4ae72df93a0e4ce2b8e4068ce5506d6284d54af88bf4423f52aaa51216f8bf7c9083950d4819b5d6a SHA512 50c5451066788ab806200ef14bebad8b33987cd18390b49eef01262751ea766704d32cbf75d0a9f3117b95ddee6815088bad44827d309af06da848a9d61312fd
 EBUILD selinux-xprint-2.20180114-r1.ebuild 282 BLAKE2B 7ea7fa849abc73f5bed4a71e40e1b2def5b2268d069074495bdab88fba4b0825513328fca6fcf88c9a3a21ddee52ab4bf1d467c5c3fa0e2f099930116f3addf7 SHA512 36f1bfa35cceff1195eb5191aab8c78a2a9d8dbb98682cff87fda61167ccb0e3800d6d7e08442112b05610629837dad4be78f3e87fc17670645a8b7572da1cd1
 EBUILD selinux-xprint-2.20180114-r2.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
+EBUILD selinux-xprint-2.20180114-r3.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
 EBUILD selinux-xprint-9999.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
 MISC metadata.xml 316 BLAKE2B 3e42fb74e71432a997cb3b59f7e614b5466967486715d78d3a4d736a1c5e8e233da7da42939cb23621dc0963f76e7ddeffdc5c57ee01064575ed2eafeeba0c35 SHA512 6025b0050ab23d7f203102d346962ab4042058052e4bd2fad5b376b8d408fc266e252fee0b99f218f39adb538c22b8cf740bf628b3c6f1db586af3e9c1ef988e
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r1.ebuild
deleted file mode 100644
index 229b7c9dc101..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r2.ebuild
deleted file mode 100644
index e0a484593be8..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r3.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r3.ebuild
deleted file mode 100644
index e0a484593be8..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r4.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r4.ebuild
deleted file mode 100644
index e0a484593be8..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r4.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r4.ebuild
deleted file mode 100644
index 229b7c9dc101..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20180114-r3.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..403d7b9730b2
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xprint"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 7aaa4cc44a74..503f336e6363 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xscreensaver-2.20170204-r1.ebuild 394 BLAKE2B 66fe074afc182667198d82d0199f798b759ff19a62f1b9d50afcf44b6a6f4e14576fd19c8cbe1bee1e950c702471ceee6bc5181dcc1c166f469160e4fec8216c SHA512 950c446f9e63773bf40fddec758842d2c82415a7886fd89b046bac0188ed02e26edb5350a6570bf04bd678cb7bf2065a5d462c23161ed16d353037129fa1c118
-EBUILD selinux-xscreensaver-2.20170204-r2.ebuild 392 BLAKE2B 04e1249ee0552b0366c9ee8413a9f96458e3d41865e3c352c02fadba492629b4aa8f3e13393b6697623a8600663ba91e5d405802eff1583821e58ad3ec311752 SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2
-EBUILD selinux-xscreensaver-2.20170204-r3.ebuild 392 BLAKE2B 04e1249ee0552b0366c9ee8413a9f96458e3d41865e3c352c02fadba492629b4aa8f3e13393b6697623a8600663ba91e5d405802eff1583821e58ad3ec311752 SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2
-EBUILD selinux-xscreensaver-2.20170204-r4.ebuild 392 BLAKE2B 04e1249ee0552b0366c9ee8413a9f96458e3d41865e3c352c02fadba492629b4aa8f3e13393b6697623a8600663ba91e5d405802eff1583821e58ad3ec311752 SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2
 EBUILD selinux-xscreensaver-2.20170805-r2.ebuild 392 BLAKE2B 04e1249ee0552b0366c9ee8413a9f96458e3d41865e3c352c02fadba492629b4aa8f3e13393b6697623a8600663ba91e5d405802eff1583821e58ad3ec311752 SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2
 EBUILD selinux-xscreensaver-2.20170805-r3.ebuild 392 BLAKE2B 04e1249ee0552b0366c9ee8413a9f96458e3d41865e3c352c02fadba492629b4aa8f3e13393b6697623a8600663ba91e5d405802eff1583821e58ad3ec311752 SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2
-EBUILD selinux-xscreensaver-2.20170805-r4.ebuild 394 BLAKE2B 66fe074afc182667198d82d0199f798b759ff19a62f1b9d50afcf44b6a6f4e14576fd19c8cbe1bee1e950c702471ceee6bc5181dcc1c166f469160e4fec8216c SHA512 950c446f9e63773bf40fddec758842d2c82415a7886fd89b046bac0188ed02e26edb5350a6570bf04bd678cb7bf2065a5d462c23161ed16d353037129fa1c118
 EBUILD selinux-xscreensaver-2.20180114-r1.ebuild 392 BLAKE2B 7fadaa134d872d94b19256d1f2e284f43f32ef17ba7fbc645f54fcfd47f6bfc585d2c351fec7c6b92b246104f66a88119b65feb5d69daede2e1dafd55648abd1 SHA512 9c7e9c63bd3b001a9c1808f2b8d8d1c16478b95edeb8ffed4b08d43b96f350ca7e38f3c5620b43419f1e1aa13469d5433d2a98be286b21d60246b7ff05d22511
 EBUILD selinux-xscreensaver-2.20180114-r2.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
+EBUILD selinux-xscreensaver-2.20180114-r3.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
 EBUILD selinux-xscreensaver-9999.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
 MISC metadata.xml 322 BLAKE2B 7d5ab233185dd0f086b0950d3316a9cc8e6d69ea3d18520b1da4c068ff1a2768791c908f2bbf07f82920ce02bb2e68300025dc013e3dbdd59e801c56f87f97f7 SHA512 405222d4ec4a70637897d7122cfb105c70ecb118237a3a614faf5af8f97789ce88820cb4455ffa6c661b17c9352d8d31eb3afc46e9b02bc338d3ee23f16aca07
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r1.ebuild
deleted file mode 100644
index f333201746de..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r2.ebuild
deleted file mode 100644
index 18f231a7f287..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r3.ebuild
deleted file mode 100644
index 18f231a7f287..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r4.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r4.ebuild
deleted file mode 100644
index 18f231a7f287..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r4.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r4.ebuild
deleted file mode 100644
index f333201746de..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180114-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..2fde998e703d
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180114-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xscreensaver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xscreensaver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 740ef24e22c3..9ab06049d717 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xserver-2.20170204-r1.ebuild 286 BLAKE2B 5ef43b9963d1965d3fd8a6146ea7df8f06ad9799bbcde000ac357fb79e5c4cdf16b01783f81653722696d5ceddd2400c0c8b19899c445654311ccbe0ccf7234d SHA512 2a036e6b550e6442e0e5a245161b421e02f8eae9acab821af2fa064a6c4f55ff1e2f269a72defbc5ca399af7b0381c4e393b5b4c9248b41ca026cf0a776f8fa9
-EBUILD selinux-xserver-2.20170204-r2.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
-EBUILD selinux-xserver-2.20170204-r3.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
-EBUILD selinux-xserver-2.20170204-r4.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
 EBUILD selinux-xserver-2.20170805-r2.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
 EBUILD selinux-xserver-2.20170805-r3.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
-EBUILD selinux-xserver-2.20170805-r4.ebuild 286 BLAKE2B 5ef43b9963d1965d3fd8a6146ea7df8f06ad9799bbcde000ac357fb79e5c4cdf16b01783f81653722696d5ceddd2400c0c8b19899c445654311ccbe0ccf7234d SHA512 2a036e6b550e6442e0e5a245161b421e02f8eae9acab821af2fa064a6c4f55ff1e2f269a72defbc5ca399af7b0381c4e393b5b4c9248b41ca026cf0a776f8fa9
 EBUILD selinux-xserver-2.20180114-r1.ebuild 284 BLAKE2B 987357d4ab0e06349bbbe2d90d591959784dc4a5178cdcba9df2b51bdcb699a186810f1154b7e7ec95f396b776014dc02af11df65e5926bda6adec71a0e63385 SHA512 3bf40e47b900511ec1870b6a7832b36570c44aaa22acb39edc08e6531e748ec518bcca6a0a48c1a17647d6d20910696f6aefbed989c5b86af10f8725a4a5df3a
 EBUILD selinux-xserver-2.20180114-r2.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
+EBUILD selinux-xserver-2.20180114-r3.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
 EBUILD selinux-xserver-9999.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
 MISC metadata.xml 317 BLAKE2B 8283187fba1cffb267929f3370b79e9b3f363ce0a69cd687ef82824c577fc2dfe2b5790359f5f36b297ef290c483c850851c09d7ed8fe6aada33e085cbbe5559 SHA512 cdc8ee6cf27d1f6b67ab653cb4db301225fde367b52f0e37f31e15acb0ec0b9fc49be756b64a39188c8bf4e3e6ba417142659b98f1a5795b8cd350464b9fa359
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r1.ebuild
deleted file mode 100644
index 1238af8bff1c..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r2.ebuild
deleted file mode 100644
index 9fdf569dc086..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r3.ebuild
deleted file mode 100644
index 9fdf569dc086..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r4.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r4.ebuild
deleted file mode 100644
index 9fdf569dc086..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r4.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r4.ebuild
deleted file mode 100644
index 1238af8bff1c..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20180114-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..a32bb13fcdbb
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xserver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 196fd14beeed..b0b91b7c9c98 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-zabbix-2.20170204-r1.ebuild 284 BLAKE2B b95c626daca6b72d9240214cd1c7d20ce6adb458e0a44d743925e41b43b1af4ed751dbf245de1e286a8b7eb320e2817a7ba3a757f86f36a02d3a794c0642d506 SHA512 45cb06bc6f20cc63597926930a2e455b5fccc5cd73a23a25408687eaa590b026d59238a8731e04a73b801c131c95b9485290722f84dd3aa6b6c7ab08fe9117c8
-EBUILD selinux-zabbix-2.20170204-r2.ebuild 282 BLAKE2B 924a16811d3187732005da659a611f767048cac2fdbc8f0cc7a1d88fb19d30b36e1a1932c0eebb2dd5e08c1e78471847751a0042f6d164f700f4ca6b389db896 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05
-EBUILD selinux-zabbix-2.20170204-r3.ebuild 282 BLAKE2B 924a16811d3187732005da659a611f767048cac2fdbc8f0cc7a1d88fb19d30b36e1a1932c0eebb2dd5e08c1e78471847751a0042f6d164f700f4ca6b389db896 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05
-EBUILD selinux-zabbix-2.20170204-r4.ebuild 282 BLAKE2B 924a16811d3187732005da659a611f767048cac2fdbc8f0cc7a1d88fb19d30b36e1a1932c0eebb2dd5e08c1e78471847751a0042f6d164f700f4ca6b389db896 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05
 EBUILD selinux-zabbix-2.20170805-r2.ebuild 282 BLAKE2B 924a16811d3187732005da659a611f767048cac2fdbc8f0cc7a1d88fb19d30b36e1a1932c0eebb2dd5e08c1e78471847751a0042f6d164f700f4ca6b389db896 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05
 EBUILD selinux-zabbix-2.20170805-r3.ebuild 282 BLAKE2B 924a16811d3187732005da659a611f767048cac2fdbc8f0cc7a1d88fb19d30b36e1a1932c0eebb2dd5e08c1e78471847751a0042f6d164f700f4ca6b389db896 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05
-EBUILD selinux-zabbix-2.20170805-r4.ebuild 284 BLAKE2B b95c626daca6b72d9240214cd1c7d20ce6adb458e0a44d743925e41b43b1af4ed751dbf245de1e286a8b7eb320e2817a7ba3a757f86f36a02d3a794c0642d506 SHA512 45cb06bc6f20cc63597926930a2e455b5fccc5cd73a23a25408687eaa590b026d59238a8731e04a73b801c131c95b9485290722f84dd3aa6b6c7ab08fe9117c8
 EBUILD selinux-zabbix-2.20180114-r1.ebuild 282 BLAKE2B 853bb29c929da43388cb19be21687276d4f5a93938bba87031eab9f4fed008947c7801db3173146876666806ff3cc00799f758ddecc01cb33d56dbf8220a0a04 SHA512 b7978d976f070f2e5842b8b9a462c4b66a901826920387a57b911029a0f7fc51a8b219205cfa00f8be4cf39cbe7e9db52e7eb97f18b65fea4cdddcf0b3aca9d5
 EBUILD selinux-zabbix-2.20180114-r2.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
+EBUILD selinux-zabbix-2.20180114-r3.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
 EBUILD selinux-zabbix-9999.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
 MISC metadata.xml 316 BLAKE2B adaaa83176d90d4c8b3ec542b1d471b62f69e49e450d31ee360bc4a73dde5af47db69f01f51fa344cf82eae338f4ab1d228eb75d3b24ce9fce43929ba89b1202 SHA512 723a790e3ec5cc0449a7d62d4f3d997a52de7c66238f0d8e6b4a1036e15df38b4aa1f57a559ef98747e85ab0208897aa5733a09bcfe498475bed45edea162b12
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r1.ebuild
deleted file mode 100644
index 3f47ff20c816..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r2.ebuild
deleted file mode 100644
index 1855783c9e50..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r3.ebuild
deleted file mode 100644
index 1855783c9e50..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r4.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r4.ebuild
deleted file mode 100644
index 1855783c9e50..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r4.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r4.ebuild
deleted file mode 100644
index 3f47ff20c816..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20180114-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20180114-r3.ebuild
new file mode 100644
index 000000000000..60a2bf7d34cf
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20180114-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="zabbix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for zabbix"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 41929c200781..76462010034c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index 3bbf3c89aafd..8e3645963ce9 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1,3 +1,3 @@
 DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
-EBUILD baselayout-java-0.1.0.ebuild 700 BLAKE2B 0292185ddf43e76f114137bd39c780eda96149639dc66a350f790ca0f1569b0f78b2dcd837ea0f4b62656f7d9c3e417b8e96141a8ff4c0ea5bfd2e28cb7ced0f SHA512 5e2e23faaef23e77f7f268d8237df8bdcabc71e37ea4f2e5f0f1c481642bc10c2d37a9aacc1633c33ac7bf631539bf832ba4ce595fe2f7a6ddd5d8e76efa2759
+EBUILD baselayout-java-0.1.0.ebuild 691 BLAKE2B da8baf1bad6d786438108b754dc3c4f4d33ab89c22ad3f904859ba56a329c394a9b6fba9a16bb83d94c63e9782457dbcfc925e95bc74109e19cb161907f5ac4f SHA512 8f68171b8036217b07c85acbe591e7a4773bd57b53186712321e5ad91c71895a37a3d0b6f2936a02797bfd2075ab2ad1e2bac2631079794de452bcad2ea5e871
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
index 66a5be953e3f..cff5afff2378 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0.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=5
 
-inherit fdo-mime gnome2-utils
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="Baselayout for Java"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
@@ -17,11 +17,11 @@ IUSE=""
 RDEPEND="!<dev-java/java-config-2.2"
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 9c8cabfbfc00..96e7050e8cd2 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,7 +16,7 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
 DIST busybox-1.28.3.tar.bz2 2260586 BLAKE2B f2fec31ab1c6e6b865cea20a2819f58cb8e4c789051a8fdc8c8ca43367049fa9038e07f3fe806ba7abd90cb6a6aefdb0d095afb68119c11e94240647da6d48ce SHA512 0e87019d9d1179bc072a5ef9752d7342747e311db13c0b0dfa9f380a1e3ad1c265cca118d41f86829629ec5c8eb3e83985421c6f3ea6c8a9991b92ed301a4982
 DIST busybox-1.28.4.tar.bz2 2263342 BLAKE2B f35c81e67136d888a998f41b1418589e4bddaacde25d55eb509822a13ab93d351dcda6b147794a47e3c3c5c4141e9d8cc834ed239e0afba176f08bf3cb55b911 SHA512 92471617fcf3c1e28b468f3de2c83a1041f5ba5106580cc791e9c4cd602b7ccffabc51ce0807881ed734a89c3089113048265d6659a4d595528bd9150288d2ed
-EBUILD busybox-1.28.0.ebuild 9293 BLAKE2B 619fd35a6388d82930505fba9b7dbd9788b088ee287274676342f9e36d9f6e283cc56447a278dc0730d2b230a76445a7f4624f9d03c7bae95321fbe9f5695333 SHA512 77c30310b1716c1b7eb1246c134aecdd50cc5516f9b9f83b987c7246f82e06e4fa9e8f168cc5f70750af7125c6b562d7776b48d43d0f636b52cc895a0b0f51d0
+EBUILD busybox-1.28.0.ebuild 9290 BLAKE2B bb09b1b547fcdefed76ef91c549a4865a807707376f8d100f97585661b4d57a25b628cd62d572b509495be61b787cdc40192ec11152979318a4e78a7a93497f8 SHA512 9b59a7ae3585432c9ac89eedd0fbcfdd9782f429d171eca6c8856a6181f4976a2733b4128e02b9fb3b81cf69582483bb1eecc4184f23679236c437df3a3be8ff
 EBUILD busybox-1.28.3.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 EBUILD busybox-1.28.4.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 EBUILD busybox-9999.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
index 01ebd90c83c0..22dbcd657e39 100644
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ b/sys-apps/busybox/busybox-1.28.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	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"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/cpint/Manifest b/sys-apps/cpint/Manifest
index eaab503059fd..fa7d670915a5 100644
--- a/sys-apps/cpint/Manifest
+++ b/sys-apps/cpint/Manifest
@@ -1,8 +1,6 @@
 AUX cpint-2.5.3-build.patch 1739 BLAKE2B b512b3cbda0ed371263c8ecb5b7494f19cb5182f80774752c192e7e861a6282d08fa969a3787f4b0c6619a722b2895dac4093fda2ea9f4b2e40c9efd3a1e178c SHA512 3800e2a9b47b1258fddbe5ef0db7ab268f985cee87e1f2ddb2639610ca236a8c979ddfd5c46c2ef031338341665e601e44e9a19757656cf5dc70c558dd8fa22c
 AUX cpint-2.5.3-kernel.patch 1454 BLAKE2B 3a52586bc642fb5ef3df08eb85ab81759557d2fb43dabcb587287762d35926e64d57faec13888f471b84e830fb1cec87201c50746fcacc3196ad800542b65a66 SHA512 b48850a91c80f36844e03a95db1616c9b11a5e076c0ca948e25ac17af4d533c0b7341607cebe7aa0f8b6482bab8508087c638fd7a0515853843a89c6c94e7030
 AUX cpint-2.5.3-prototypes.patch 1008 BLAKE2B 87928ee43fe5fd650dbbf65906172e9c97769eeb1cfff339346904b949fc1dfaefc8a30b28bca54ea0c614242fb739b60b582b6c28de2e28174e7f4d8df3bbca SHA512 ab78d5f9ea13962b2037a4fd67a88968d2fd71184389dcc7824d633eef3f2e129cd99901093656b23c126636ce7692f04c9dc315c698eee259d123ce4b77db3b
-DIST cpint116.tgz 20626 BLAKE2B 95383207abfdfd1465a299160f5cd881df0d8211218f7b0080049be8abb9ef163c445d4d0739e06a84b2a733cc7e8bc70ea7592b971cd86cab019af9d31fcd50 SHA512 6c839ab2808e5c86d7e9fb502798a8cf38c80854d9f08baf4574f99e736c677217ced92772b3df18211f45d38600c1668f11d0fb4677f7dd57c00dbcdab3d7d3
 DIST cpint253.tgz 31143 BLAKE2B e1891244857f22664bc80c7520c065fa18afd1d27a44de52fbbf1914104e36129858450998aea06eaeb06307b51867606256f33809cd7093cc6bc588c238f4b2 SHA512 ecaddee3d2b0c408828b9fd4f1c8bf0026ab8f3654f8792ef504ddfaa848a3ee6b4197f93d044768f3dad49b28dcec175246fe20454cbc7baa162c463bebf221
-EBUILD cpint-1.1.6.ebuild 573 BLAKE2B 7ab020385ba1fc3c29b2a09c89bfa914dc23f9badb256ce5cd44f968931a17985eb77cc491042170093faf665b96aeb5a36ddd42f1a7b18dd73826bfd7027ea3 SHA512 b67e2bc85adb81f9219195aa0bf4efcfd161b90fc6d113e8ef3fe60ac622c613cc8271c786294206e923b253beaf126cc04a953cc80cea774e33d6ca1b3e0f35
 EBUILD cpint-2.5.3.ebuild 650 BLAKE2B dbaa947d873ffdbae168abba3801a5d4a6dd4565800822ae70f134da0354bf51b3d4614963a9940675df568a6609768a56441116ff7c964586e0c0371f4fc47d SHA512 ad7e8b9960c06413598b1cbaa607ab3bee0826747c5b99071434b865d0b8a163de9259806127f21be7c765ff39c94ea279645915ba94170d1eccba15645fe97b
 MISC metadata.xml 338 BLAKE2B 42f7c7c447b5017a4077b209c8e052020b72efc41d798e566bff085475cb901d8e7e4f6c2cbe53980fd0498c88d0d5123ce4f0740a318d1d3d67a9698981db97 SHA512 b0b29ca2593c1435924d3594cacd8576bd60b050435f732e0e804d407297684d33003d98b7ba2030cbf96c8509f77b5b0526ccd3d25eeb41161644fe633b664b
diff --git a/sys-apps/cpint/cpint-1.1.6.ebuild b/sys-apps/cpint/cpint-1.1.6.ebuild
deleted file mode 100644
index 04daacb1e3f1..000000000000
--- a/sys-apps/cpint/cpint-1.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-info
-
-MY_PV=${PV//./}
-
-DESCRIPTION="Linux/390 Interface to z/VM's Control Program"
-HOMEPAGE="http://linuxvm.org/Patches/index.html"
-SRC_URI="http://linuxvm.org/Patches/s390/${PN}${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="s390"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	emake INCLUDEDIR=-I/usr/src/linux/include || die "emake failed"
-}
-
-src_install() {
-	einstall prefix="${D}" || die
-	rm -rf "${D}"/lib/modules/misc
-	dodoc ChangeLog HOW-TO
-}
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index f2d4163653c1..d189e243ab89 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,7 +1,7 @@
 DIST ed-1.13.tar.gz 87984 BLAKE2B 296e2448457b10acf0651c76f44d21ea51aa9068f07e13d2d392ff82a825868a44ececc22a4594a1e628581d36847a79978d731ddfac22f1337c503c786b76e9 SHA512 003b4e1015b3c9eb831c805b3bb1072f2e6da02c351770ddae69b438b6e9124b06cb9e30d9a0036dd1fc6a1f7d27fbe84f7e86ac5073ef403bd5958111986f5c
 DIST ed-1.14.1a.tar.gz 91662 BLAKE2B 654eddf7328418507a3a9536da0daacd85c2ef3ea3b1a58b742fad3fc48cfc9a07f8232ecbf5e8e0da42ccf191b1da7e050b0779879e2dbe8b98a329e0f0d45c SHA512 423a30729c16355d80ed84e408034f63fe0d700d12441f82b476af1919c08e7fd4be18736c30cdecbdec5d851f9a08999242aecfe687beed17b779a7485963c9
 DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
-EBUILD ed-1.13.ebuild 911 BLAKE2B 9072480e149b2911d14861077f3c1d213cb32d8497d09f836be32b659d3774ee8f812ef757b1a2dec6139c75ab14f087494369432977e12b784a053f5a204a15 SHA512 6093f37ab651e0c6e12b74771a8e62e40096f5e2f84ea051a9875c56f66df495f71b07e01ccaac5bd8f24776a72fc917d87988949507fd6dc7371d46cecb32ef
+EBUILD ed-1.13.ebuild 910 BLAKE2B bddb91d370a5cc478d584f002cbfedc1a87ab36a341994e7a9f3a554d3d6c6439de89b50d0489dfba4637c4aba52ce55d0797470581d9c6dff07d0cedc13e2c8 SHA512 0871616d130d1ccade2ca980e01f096fc3191bfad6a506bdfcc9a4506b039852ce4f4b86c564fb8efad726f7b77930830d8358ebf607d53541e149e9474456bc
 EBUILD ed-1.14.1a.ebuild 921 BLAKE2B 249e5469c4cd8ffe6d8b10aa3efd46b4159e6632124d720bba0437ea0866e6f799342eb0a2a9ee538b4037581df0783fd054ff9e3b2aa661a7b9db9239e3ef51 SHA512 e9aa3bff70c0af368e3139168ffd8c4098b61b3f1a601d2bc387e013fedcee4747277072bcc70890244f569e0054ea54a4addfc3919f79fe001e8d1cc19642ea
 EBUILD ed-1.14.2.ebuild 933 BLAKE2B 19f9fcc693ad3b1e29d2dff7a1fa270d41e3418cc2ee9aee2be3b63f17b67e49baa3568d8b1726b982e99756a905cdb4eff979abe73b2730cc4dd6d720fdc9fc SHA512 257ac23dbe5557474be40169d01ac71d5b244d5e1177fd33c742392873683884e2b0814807d11883f6d45b18b1f15af4452f99acd900faeaba9b3bc89e4e79ea
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.13.ebuild b/sys-apps/ed/ed-1.13.ebuild
index 2004db464329..feaa1b77c26c 100644
--- a/sys-apps/ed/ed-1.13.ebuild
+++ b/sys-apps/ed/ed-1.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 7193d91aacc3..6a7218851f12 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -3,5 +3,5 @@ AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d7
 DIST fakeroot_1.20.2.orig.tar.bz2 326910 BLAKE2B 813fce6416a375de7dce0581a2a7398f023e5e5d6b981d6dd973e9e29380b5908e0bb9e1e84db3b20638933817ed85a8f7d341b369631881905aab9ca4cf2119 SHA512 1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
 EBUILD fakeroot-1.20.2-r1.ebuild 1008 BLAKE2B 75a46f53e7c9c02acff4f84cc7c1a439e3821df80d23714282e3f1ea9d106424083b705c4d96481874631059c6c4022e9d924ed0b73881f60513a93a9bd8c712 SHA512 de5fb74abfe42b1a6fe4a3aaf2c25db69c5ccb4616195f721f66bd0491e3560d50c79086f40cc12d8749632d413c75af77156010043186e99e063e726468741e
-EBUILD fakeroot-1.22.ebuild 1036 BLAKE2B 0e6ef225e2386e2c58f311e10c79d93a68d7604113cfaa64e88e76782d4d9be89eb68103d7343f2465eb80c607fe8ed50ef43f1317be2e2fdaadfacd401ea63d SHA512 4e61d9ed8cd0e86bcc221bd2bde2335ff09b1e74b8e4710a75e009c77fc31270a71487e3f8ef7b304f7aa22dfd9047c8391c007c6fc6b5cea4932fe39ce28635
+EBUILD fakeroot-1.22.ebuild 1041 BLAKE2B b64d63b8148a5f39cad405c35d57d04f561be22a1c1215228fd78450140e274c5de1ac260f82e246147f8866c8c49708abc45f9942fe44e3016ebf67aac10862 SHA512 2abe6975c02acf769651759fb2892dd681ba2985ac6391f5e85bca84d699c92979ab50011ca0ce20e8ca690ec20bae6e999cfe1fa375817045ec7a0171ac1550
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index a365f0e9cc68..4ca2e7a5a9eb 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.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://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
 
 DEPEND="
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 273b932f4563..4727518b6fd0 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,6 +1,6 @@
 DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
 DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
-EBUILD file-5.32.ebuild 2899 BLAKE2B 5ec2b6b9e369d603736a4384006fb4c07a8abf23859a9d89e76bb7a0257e852bf290a96e990ce4869ebdc3f36d5033d56a7801470cd847e09cd84aecd9bc3d67 SHA512 7a01b1f616a52d8079fdd33060263922bf1279fe20c64036b365531a1e27513af28a96acafe1dc7919ff602475ff79abfa0b860645c631ae45239bb610905a63
-EBUILD file-5.33.ebuild 2956 BLAKE2B ce60b2e91e3fd36c5f7651163b80241436dfe2a2439a32ac87477ecc743e14dea8016811283d339ef157c79bcd93de7193ab44a1dca021bdc55551e7f9db26f1 SHA512 efc413413d33ed5779a83c242401974c9ff0961fc5ee026a3ba55f8749cf198360e9aa366901ea86c20049d8c48a721512038898647735b4de6ed2010e0a5c02
-EBUILD file-9999.ebuild 3022 BLAKE2B 2b873f5f3b38b9638e4bb38d2f24ea48e88d1eafd6c7a62cf5effb74b0ba1811b9122bac135e9b5e32eec216aa660282d0ad8a198ace5828668485599e74ab96 SHA512 9bdfad511f50bae091e50fb2b228a30764a25c9c5c2d148005df9af54f2c0a415546ecfc645a72a852fc10be0ac84781914288b1bcd1a50e8f44d71713cb20bc
+EBUILD file-5.32-r1.ebuild 3011 BLAKE2B 2ee0d868685cea29a4941fe9f7f2c215b015f455f0cbf735df8926c8edf275f2de1ccc950853e4cf8021d2c03f314512da4ee254fa5abcc08a65661820666e45 SHA512 78c9afc3203a567f009cb88e823a4a644c23397178926db44148ebd82ee3337899b756a2da4bb2633f158910a73594eebfb80457f9566c723f41544a70851ff3
+EBUILD file-5.33-r1.ebuild 3068 BLAKE2B a2211f853b5a9457e4f514f996d186679532c82ba99b7b8111d9ef842fac2f6e228521976326550a743a41b108a9a712dafb08f4d509bfaf5d2aac10f8763ba9 SHA512 f6b5750df767de41bf0cbbfcc63984476816fc84f637f7f1e9bb2137b4df35f000ee4bbd61cb327aa45e151de493cc4b77a94b24a14544bee06d131d2ca13422
+EBUILD file-9999.ebuild 3141 BLAKE2B 89cee448db824b8746f088e25ae2e4e1ac6951a13b5ea925283f4395b683203a90406caa523be5e96238666b0f000288f8d46f5f867074d6e55351e703b40ff9 SHA512 733e1e18d808031be18afe662079a7f130f2cb61e6c071c00ca202d7938ea9577dbdafb99fc6d534ba84f485c1b8de645e67e1d92c1dfeb0caf645ff863857a3
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.32-r1.ebuild b/sys-apps/file/file-5.32-r1.ebuild
new file mode 100644
index 000000000000..389e0e1c2d7f
--- /dev/null
+++ b/sys-apps/file/file-5.32-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README{,.python} || die
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		tc-export_build_env BUILD_C{C,XX}
+		ECONF_SOURCE=${S} \
+		ac_cv_header_zlib_h=no \
+		ac_cv_lib_z_gzopen=no \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		econf --disable-shared
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	prune_libtool_files
+}
diff --git a/sys-apps/file/file-5.32.ebuild b/sys-apps/file/file-5.32.ebuild
deleted file mode 100644
index c431956b3788..000000000000
--- a/sys-apps/file/file-5.32.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README{,.python} || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		tc-export_build_env BUILD_C{C,XX}
-		ECONF_SOURCE=${S} \
-		ac_cv_header_zlib_h=no \
-		ac_cv_lib_z_gzopen=no \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} -static" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		econf --disable-shared
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	prune_libtool_files
-}
diff --git a/sys-apps/file/file-5.33-r1.ebuild b/sys-apps/file/file-5.33-r1.ebuild
new file mode 100644
index 000000000000..ffec3650582f
--- /dev/null
+++ b/sys-apps/file/file-5.33-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README{,.python} || die
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-libseccomp
+		--enable-fsect-man5
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		tc-export_build_env BUILD_C{C,XX}
+		ECONF_SOURCE=${S} \
+		ac_cv_header_zlib_h=no \
+		ac_cv_lib_z_gzopen=no \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		econf --disable-shared --disable-libseccomp
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	prune_libtool_files
+}
diff --git a/sys-apps/file/file-5.33.ebuild b/sys-apps/file/file-5.33.ebuild
deleted file mode 100644
index 43f99c6754cb..000000000000
--- a/sys-apps/file/file-5.33.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README{,.python} || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-libseccomp
-		--enable-fsect-man5
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		tc-export_build_env BUILD_C{C,XX}
-		ECONF_SOURCE=${S} \
-		ac_cv_header_zlib_h=no \
-		ac_cv_lib_z_gzopen=no \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} -static" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		econf --disable-shared --disable-libseccomp
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	prune_libtool_files
-}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 5f51b583c407..72de11bc5919 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 	elibtoolize
 
 	# don't let python README kill main README #60043
-	mv python/README{,.python} || die
+	mv python/README.md README.python || die
 }
 
 multilib_src_configure() {
@@ -113,6 +113,11 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc ChangeLog MAINT README
 
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
 	if use python ; then
 		cd python || die
 		distutils-r1_src_install
diff --git a/sys-apps/habitat/Manifest b/sys-apps/habitat/Manifest
index 1f3d571dec7c..138721597202 100644
--- a/sys-apps/habitat/Manifest
+++ b/sys-apps/habitat/Manifest
@@ -1,7 +1,4 @@
-DIST habitat-0.28.0.tar.gz 25147061 BLAKE2B 0412565e3816e451945b0eae73eff0039dbd881bd86d3ed1e6f0aeef90555100f9baafcf551ed48ef2188b4ddbf768735006129afe5b66fcf53e638701b93fcc SHA512 eccdced6655e46b894aa3ef29cbac7100e18b4c44c7c2c7a25d5bb31ba732f908122630a7dd35c6347fa805180b471ce7dac786113d2f9b6d35a967994913b9f
 DIST habitat-0.54.0.tar.gz 35324897 BLAKE2B 554a2097c019e61cd6f1facdd0195abbca5e94834819283ddc2d742d196b6768e1da03a8a94f462a17d3c5c751fdddc1499f59a698f73fce170387055a07cbc6 SHA512 4b34de34e6d7b20ab641222636720357c903228aeb6833462ecc3367c6844d9f377d101b3187996e3cf3c179aa7b0c71a83921b4d18d1002fe30e3b25e31a35d
-DIST habitat-cargo-0.28.0.tar.xz 84559904 BLAKE2B ed4e62e5aee3a6b336c617d7d912db8e6b58ed28f5cc747765075926659841a84d8380ef6273c0a83017f08cf8c5dcd57928de033b71e17213f7dd5f7b0ad381 SHA512 d6f798e21bfa8124820f505231423b0ef72d068a38e8a88f0d196cfcf9e5d7a2142499f809a8525ec2f5ce664e7598d5c0979efcd2511e860b8f884ac4f6fd4b
 DIST habitat-cargo-0.54.0.tar.xz 247811208 BLAKE2B 28d79018ff9f1209881908b335a1c77f60c39799fbd02e37ffde6bccc37c46aafe1cb05914c9b373150a0a917fa5b1538a94a8a75127172cf9d15cca5ba90520 SHA512 603e45b6e61b24b5420e57ef1d06bf15a67681525ae7a4210f07d14a072cf116947d28cc754e415f1e35fc6e03ede70cd47706ddf4857b76ac17aa420bf95d07
-EBUILD habitat-0.28.0.ebuild 755 BLAKE2B 7956cc74a72016dfe839cd53af4588ed17d7ed43b114bffd6c123d90dae1c337a4b82f01d6bdfe4e32262b12e966759eb4536be124edbd33baf5d9731677db51 SHA512 d63dd5b0f3576df45f9714c364123694133211ba4770fafe0c27faebd23b7c1a8f944bbee3aaa023c0c5e45f4bfaf994d31c9497bb82d6589369b038b96d00be
 EBUILD habitat-0.54.0.ebuild 754 BLAKE2B d9bcfd151b0a52503d55d158fcef886c9854c234b98c0d5b95bc068d8b3b64c4153f304a2961a61ac0ccdfe6bfd81c5010a1f161f8148d57c1b7b17a913dd791 SHA512 16cbb9a4ab24c6daae3eedfb2c2666cc93b2cbb19f1ab9c485db38e82cdafda74f74b662a26720d37beae474e7ae8500baedf2e128200cb8face4c4d8c390c85
 MISC metadata.xml 328 BLAKE2B a1f7888eef25b795b359fefb3e7d51f2909a80257b1749f1665973bb34ad655885d5a4fb67cd821c5f6420f828902556c27833f48988b62c72b195a7e25cedc5 SHA512 cdafdd1846825f625feef5635f331f12ff4490383c54e760af5dd4ece4fcbe381ae325c8c732474de7124b55dffd32e129a9647e2e2aa5e0dcaff8ccbe4b1e8f
diff --git a/sys-apps/habitat/habitat-0.28.0.ebuild b/sys-apps/habitat/habitat-0.28.0.ebuild
deleted file mode 100644
index c968a4910847..000000000000
--- a/sys-apps/habitat/habitat-0.28.0.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
-
-DESCRIPTION="Application automation framework"
-HOMEPAGE="https://github.com/habitat-sh/habitat https://habitat.sh"
-SRC_URI="https://github.com/habitat-sh/habitat/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mrueg/files/${PN}-cargo-${PV}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-util/cargo
-	>=dev-lang/rust-1.11
-	>=net-libs/zeromq-3.2
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	# move cache dir where cargo expects it
-	mv ../.cargo "${HOME}" || die
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin target/debug/hab{,-butterfly,-sup}
-}
-
-src_test() {
-	emake unit-all
-}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index ece5c6758ade..1a2f912c30d7 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
-EBUILD help2man-1.47.4.ebuild 1083 BLAKE2B 7523e2059116c743bdee30f6fc6a5698f6d899e0c35215b0029195658084ffffc92db6afd02c4b5b3275c1d8d26a899c0afeac5bd8abc16bf1810ba3ed45130b SHA512 964a18c1fae41a4c6f45cca17f8109b0497c5334cb06dc88d5aabccf7337d66c8a53142473cac9b5efbc8d9bb5a9518b665b01f663e96fa7d6a3599ff16f7a65
+EBUILD help2man-1.47.4.ebuild 1080 BLAKE2B e6842ef0532d09fa4fae0171f07cd0c4d3ecbba79e0347d909d6db9983145607befb7007b8b895e6705519a1ecbb4a6ad3db09457ddd4dc04956c921336a9f82 SHA512 e80f43c763184fcf162e947e858de65a8eea35af193e8c59a9a5a670975f625de4e03adc6cb23fa9c439f024f376648d9eb05c255fd98cd07fd8829d25af4af9
 EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 EBUILD help2man-1.47.6.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index d56029b0fc2a..f574c1e07a3c 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 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 ~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 ~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="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index de1186c75fff..da24e2087fd2 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -3,7 +3,9 @@ AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b494
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
 DIST ipmiutil-3.1.0.tar.gz 1697374 BLAKE2B 42cbe5a252fff7427f9a6eed48f110a16ecccc1e251f033ef8184b9efa7d9d184af4e83483e234fa97c1cfd964bce1c5fae756e34b5713328ed58be4d66e0fef SHA512 2089110e5c829f7bb2d97d634a543a93612503fb918d5696a17e376bf12aff160272634634652085d7f374ea39102c2bc8fc06d61ccbd50c6a76152073ea0a8c
+DIST ipmiutil-3.1.1.tar.gz 1697588 BLAKE2B 89d5f6a4b92494d5b5845a856011bf75eb6925506d7956b72efd3a258b29726f3b426185588cbf45a721c804e5e2f8203b1ba5ca132e8e907435cc2cbe5e563a SHA512 c2a7e05f85d668d6d02c990c1078d6f05c30f7ca26b5fdb4bbfe09952dcc4e9cc5eb67657ca07770fa8b0d333bc4d4a96ba845b45efe942c28342be013cf60bd
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
 EBUILD ipmiutil-3.0.9.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
 EBUILD ipmiutil-3.1.0.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
+EBUILD ipmiutil-3.1.1.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.1.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.1.ebuild
new file mode 100644
index 000000000000..ac6d2f9004f7
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.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 autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256
+}
+
+src_compile() {
+	# Ulgy workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	pushd lib/lanplus &>/dev/null || die
+	emake || die "emake lanplus failed"
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 774f20fe2934..f476bfd0fb5e 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -14,12 +14,8 @@ AUX memtest86+-5.01-no-clean.patch 603 BLAKE2B cb00ec1f702c7fd1697c48599ba7113bc
 AUX memtest86+-5.01-no-scp.patch 388 BLAKE2B a5b195d54c4a9d99c62771430822f87f20f6f97c7dfb28f8fc8db0f5e6aba79404bdce924ad303fbbb0cf04fcd5551abc81bf0fcbab9ac17884bd32f81832d33 SHA512 4b14e16fbe8e69a4d532e8327486fd2434798613a784aca24b381f1fb5ae39839344281494c32dfd0fe8a8a46b744abdaac7884be4a95a87b635e0baea63731a
 AUX memtest86+-5.01-reboot-def.patch 326 BLAKE2B a17bcde8563a3f1a8e88c50e981b3d93439a19d0b1186c511826f9836be8efb5bcc2f0031c28887bf0c67ef9e8c9942eca641f923f87c458f070507645007f0a SHA512 2309da17ae7bfd32137b02c0533a9d4f30c95d70dea309a009219457f07f36e0b9192e1ac55485513a23d6364247476886a4720ffe83d33a2c493124a82797a1
 AUX memtest86+-5.01-test-random-cflags.patch 679 BLAKE2B 62ccc56c3f127b3e3213d6bb9605094dd8ba2580d2047873583db8b7a3d48db225eb8b7013319903e92ba9c658569470fb6b3de4f4b7f6b3686efdd5f9c132eb SHA512 a000cf28d69396b0707519bb995f086457f8fa5283299164d969dbf02abea86b566016d71fac7e887c6089bc39c58be9e5c885cfb5f8e7eb815ea1741e097bb6
-DIST memtest86+-2.01.tar.gz 165984 BLAKE2B 6d339755472515734a74216d50d9b5f716439ffeb710cc11cec466b60d1ae0679e28fc10e0fb9a173e853193a998be88459f9fca8b2cac07cb108667d8a36844 SHA512 fb8fd8f7e3f597701a031189c18bd95247fe1fc936838359411a32a24fb8845a0012ebd2e02bb399fad1fab0f493dbe475a3e646c272d10e6343af4646d8347b
-DIST memtest86+-4.00.tar.gz 270327 BLAKE2B af33ecc65e2418d84a008f659c1c5fa5949c2b16963da08c1f15cfc89681c6900d46d9f3d15d9beb545eedbb641c174c37a53b1a6ebef63a7b9ff9d7034f28b8 SHA512 3d2075ec5fe18ce356f75bf473aa189ba6153269c63be263f13e7d553f468a57f147f1e62dad16ad9ec4fb57724e1c67c69eeffb33db3e1f6300357f26b586ba
 DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
-EBUILD memtest86+-2.01.ebuild 1282 BLAKE2B 0d237e23b7ff5393683e793cd40ce0b1b27cccd851579c553ad15c1fa9a2f6ae2436794f339cba2242a61c506fefabe04252e4540960108468f4547e236e4950 SHA512 f7feb596e0b4ca6c9bf3fd14a14051cb7f4f3d94570f27c9adc8fbc162313c95476111cc7995284d30d0ebada100485184df4a0a70c36e8d90da25fa0f9b9a89
-EBUILD memtest86+-4.00.ebuild 1932 BLAKE2B 847e74b095bf46b34f7a9edda230822a9a12d3666125e9170ce3b8bbb136cba33e639f0f40d53773ed8e3f08c5cd6234c8784ffe6c63a58fc3738f1bafbfb156 SHA512 e18073eabfe5e206790f7cded2834ebf28d531488af9489e10f3b332d76a0a1f1ab5e071479e22fd1bbb0700489d3c9486a9f8038a3d147b658cb02008221db9
 EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
 EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
 EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild
deleted file mode 100644
index 2051cc102de5..000000000000
--- a/sys-apps/memtest86+/memtest86+-2.01.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit mount-boot eutils
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="serial"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.01-hardcoded_cc.patch
-	epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
-	if use serial ; then
-		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	doins memtest.bin || die
-	dodoc README README.build-process
-}
-
-pkg_postinst() {
-	einfo
-	einfo "memtest.bin has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest.bin"
-
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest.bin"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}
diff --git a/sys-apps/memtest86+/memtest86+-4.00.ebuild b/sys-apps/memtest86+/memtest86+-4.00.ebuild
deleted file mode 100644
index 354fe5b3134f..000000000000
--- a/sys-apps/memtest86+/memtest86+-4.00.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-QA_PRESTRIPPED=/boot/memtest86plus/memtest
-
-inherit mount-boot eutils
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="floppy serial"
-RESTRICT="test"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-4.00-hardcoded_cc.patch
-
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
-	sed -i -e's/$(LD) -s /$(LD) /' Makefile
-	sed -i -e's,0x10000,0x100000,' memtest.lds
-
-	if use serial ; then
-		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	newins memtest.bin memtest || die
-	newins memtest memtest.netbsd || die
-	dosym memtest /boot/memtest86plus/memtest.bin
-	dodoc README README.build-process
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	einfo
-	einfo "memtest has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest"
-	einfo "   or try this if you get grub error 28:"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd"
-	einfo
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 94ca2333d42b..883f957e6f39 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -4,14 +4,8 @@ AUX nix-1.11.6-respect-LDFLAGS.patch 2332 BLAKE2B 83382d89c3ca40404460629f42dcdf
 AUX nix-1.11.6-systemd.patch 394 BLAKE2B 144b5e2c4f55077bb0c722ff71bf0a587f20858c27fe4a3bb9cd44bec159a30122382b7fff3b998478aaa4f93519247708926a6369f9ac2fa1a3d43cc5808a38 SHA512 2c5a701815e1c3091c5568b01d6709a9a227c18967a7c0eff7676f741c87f5082a49842427022991656cac079734741820bb8a895679a65cce657a29df86ddcd
 AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a9285d1dabdfe06cfa55c8ab578160f940537cc9ed7ba7ef408d167f23cc914127313bed992baac747f49a9dd054 SHA512 3eab6ae522767bd8c1f2adf6a00544f7fecb698dedff68835a880a7ac533dd4e188661a955f111769525828d761612c49669a36ccf25f16bab6d325313da3232
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
-DIST nix-1.11.15.tar.xz 632544 BLAKE2B 3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca SHA512 449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
-DIST nix-1.11.16.tar.xz 632440 BLAKE2B 0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834 SHA512 164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
-DIST nix-2.0.1.tar.xz 796520 BLAKE2B bd71d625f08b785b74a31f74e5ecdbca247bf9fc29a5a49a3e7db51c70911c5c200804783b0ee38164e909d3c287d0484fc0d617d11be6ca41531682e8f14cef SHA512 05013a2242b558a2bd3b104b9fdb570ceddf37466e420daf0c81294f9dccdf190472bd32550f00915b1cd1b738576b46c112af39c198cfe5f0121b9f6f2f4d92
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
-DIST nix-2.0.tar.xz 794084 BLAKE2B 9596788df6aaad144d408e95f34575bf985849bb57424c7aac4dc1f2f2d846302bf78fc05682ce92fbaf000db04a326f867a76f5963a80b72b63e3678754247f SHA512 4531b4648108019d44521af94f8243936d2df62701395c0c448795f1984d4b5ade2438c92d12e5414d493909811e3bcb902c85539932c7e44d98d4254a2a531d
-EBUILD nix-1.11.15.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
-EBUILD nix-1.11.16.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
-EBUILD nix-2.0.1.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
+DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
-EBUILD nix-2.0.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
+EBUILD nix-2.0.4.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/nix-1.11.15.ebuild b/sys-apps/nix/nix-1.11.15.ebuild
deleted file mode 100644
index d4e616516f72..000000000000
--- a/sys-apps/nix/nix-1.11.15.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	sodium? ( dev-libs/libsodium )
-	dev-lang/perl:=
-	dev-perl/DBD-SQLite
-	dev-perl/WWW-Curl
-	dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-	virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-per-user.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc)
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc_profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc_profile; then
-		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-1.11.16.ebuild b/sys-apps/nix/nix-1.11.16.ebuild
deleted file mode 100644
index d4e616516f72..000000000000
--- a/sys-apps/nix/nix-1.11.16.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	sodium? ( dev-libs/libsodium )
-	dev-lang/perl:=
-	dev-perl/DBD-SQLite
-	dev-perl/WWW-Curl
-	dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-	virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-per-user.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc)
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc_profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc_profile; then
-		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-2.0.1.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
index bea6bd1a4240..bea6bd1a4240 100644
--- a/sys-apps/nix/nix-2.0.1.ebuild
+++ b/sys-apps/nix/nix-2.0.4.ebuild
diff --git a/sys-apps/nix/nix-2.0.ebuild b/sys-apps/nix/nix-2.0.ebuild
deleted file mode 100644
index bea6bd1a4240..000000000000
--- a/sys-apps/nix/nix-2.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-2.0-user-path.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc)
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc_profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc_profile; then
-		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 7931fdc9bbba..a798d603e343 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,9 @@
 DIST osinfo-db-20170813.tar.xz 64424 BLAKE2B b4d46f82197bb5f1b956fe72e87ef365b139c6a1ab90906ac30dd3191fb6c3f5ef3978ceaf56d029a3766e8354558aa00554a767c637eef49b861b6a775fc614 SHA512 0ae4906b5c3eb400ca397f0c3baf5146b8197ee2dc712b1b89dd2f443f9505aee208327f008118628407b54ce52390a8b6138425f3f6f974b94f4a8d79955653
 DIST osinfo-db-20180416.tar.xz 70324 BLAKE2B 44bcc2be467f7e1ce50d1a0fd2bd2f3695f6aa68ab038fd0d548a8c46606032a9fb805152f0de08a0f56d6e096397cc17582a7451e0695dbb58760fa94363630 SHA512 e8d25dc501909803a949987239ea5a2e7a01ac4bb536f1040edff93d8ce3871499fceda882da799ada295dd5d4cc284e99c6b5f493c464dda776f6144803a1f1
 DIST osinfo-db-20180514.tar.xz 70780 BLAKE2B ccde92692b6b6a77007bd4f78f8f3f0e9db4c4d8ed3a270df2f8ba6a8073c3467a9f51e53cc7ab9138b66af7424bdb84cad0fc76edf9c5a19b8ce798bffec155 SHA512 518791269148c0e3cc6b65b4481f37284780497a5643a1c9523458aa56ecd47cb7bfe9d95c086b2155b282369214c4cd3e2926c304ab84f78ddc0568d3b30216
+DIST osinfo-db-20180531.tar.xz 70868 BLAKE2B 919a2767d24af91e9aa7b14f3a238b9239aa774bec04233c95929981531d1fabb24ebfdc5c92ab401f51cf6bbf2432b6e8486a833d06a96a51e1893f39f6f641 SHA512 48b3bd2e52c16829f70d62ad8b1f32313956fcb7085cd906965f1d7b12f61952c60123ef335fbd4a1dd86aebc9751b9bf44f71c61f4bb6ac9bcb30d514ac36a9
 EBUILD osinfo-db-20170813.ebuild 671 BLAKE2B 21131786f459a25aab816a1ea30067b7f3ed84d00063d7e2ed330c060f7e8616171e298379ac0bfad2ac54c2e847072b8a481ef85be280f19b9ded9f8f2494a7 SHA512 feecb9a6298484e19e9d78aefa7e75c376b66c0bd676aff22e5ad3fe7a745ea74fc64ddbfb6dde002f6b58a72720e5ddb571ef616c9e1af04411a910aa1b2694
 EBUILD osinfo-db-20180416.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
 EBUILD osinfo-db-20180514.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
+EBUILD osinfo-db-20180531.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
new file mode 100644
index 000000000000..9e69a433ac60
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="http://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 17f04bcab905..dc846cd37873 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -2,5 +2,5 @@ DIST pkgcore-0.9.4.tar.gz 593025 BLAKE2B f7df069a4e2f9c790eb79c7fab74cba447eb5b4
 DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
 EBUILD pkgcore-0.9.4.ebuild 1431 BLAKE2B 2d851e84a63106f9add0c0748cf2b39a4481698285b050a98ce0419e1c819b6116323936c273014f99f1916543b87cd23bdb18a2fad2ded1f6924787c1a3179f SHA512 fe0cd648df1713c8c442e880677515c9768b26afd19505168f69eb810866fe37cc970c04a6b64240646022c3bebeb09be861ecb5277569203d001f1cc8136da9
 EBUILD pkgcore-0.9.7.ebuild 1497 BLAKE2B 97b9457800e9cccef06aba9b566adbea6c7798fb1275b08646afb4bc2145f0e65375055d4430e06ee063b95b00417006a0824d6285be2cff420934561adf921f SHA512 07ad1813bc307022300766e424ae9b09a995300c802d2f89557be74dbb3783da1cdec9b56c409d6bcc647c2be49aa1524a8b63ab2f14f965d6f099a2e8deeeb5
-EBUILD pkgcore-9999.ebuild 1594 BLAKE2B 2a25e131ceebaf55e25c21a9de6fb081b8fd4db31b2bd7eca7bc3edf1f4c40d643b56d41377864d6cb96a13d06c194ab21bddec12a7e443b94cb637a7711c4a9 SHA512 21fe33032dd340ef7bf3fa65724259e3de277f38b568c29cb64f6759f9ef3029c99e589f041eff4ef9d65a905b4abdf3760a7f6e71502ad92e028562c68030c4
+EBUILD pkgcore-9999.ebuild 1378 BLAKE2B c09691826d38885886db6d58bf5bd27b1e88eaddd2aca495c389ad3a29eebefbd991a297bb932d3532468e36fc81d7be124d72f2ca8586a17b11da95a350ff87 SHA512 20e37e0e2c79b181f7f2f591468df50bf52c96041048af142ef27ae15d76c20e5448c829d104066fc54ef595261ac76fc97667e3334be5518fc8ea715fd38132
 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 53434ea7411a..28296ac77537 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -26,24 +26,18 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 fi
-RDEPEND="$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5})"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.7.5[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	${SPHINX}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
 python_compile_all() {
 	esetup.py build_man $(usex doc "build_docs" "")
 }
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d90439aea715..3483209b19e3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,12 +3,14 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec
+DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7
+DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
 EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
-EBUILD portage-2.3.40.ebuild 9595 BLAKE2B d0ac87f07bc85b82d91dfcc5ded9fb77d76fe1133b7e07a74420d5a6351c77e382760352f3ded2ff27d6cde0f2b401dfdce2cc84fd8b8994dc084cf23710defc SHA512 0008a37f2a4c5d35a3a59de1135f620bf27684ce8cd02fb429438e00bb089d5b4f0bdf5b033991649c19b3a39cf89c532cda0404f3c6a6e130f6944a018419bc
+EBUILD portage-2.3.40-r1.ebuild 9953 BLAKE2B eb060b5615c09738798ba233c5f4e180fbdf10fa409e177e1ef0ac64a047eb7e344037fbcde2fa6088aa1754496d55c68b0c3e966669cb439995904b4faac609 SHA512 23051db511f38c8a8d2093db014d9e956d54635d32d5fa0d25e51fd1708dcd739ba2a10ee47032c35b7e294c49c7d0785d3fa9cbed2a413148e4d599da63376b
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8829 BLAKE2B e28682fac496521e83599633424ae0cad64dae33849acc131c3641bfc93627f343b4b44404ac833b91c2214f4b7a23e5e58b9a631d544a93996cb9384c23ac36 SHA512 7d6b0e36d43dab7d824c420d6a7a0f1aeaa736e5e153be5c57f30c91018b89629ee4be3d05e2b3179f1cc1d841fee473683f8cf194b6de6767d576607a1702a9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.40-r1.ebuild b/sys-apps/portage/portage-2.3.40-r1.ebuild
new file mode 100644
index 000000000000..fd63d281a271
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.40-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 eutils systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
+			app-crypt/openpgp-keys-gentoo-release
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	https://github.com/gentoo/portage/compare/b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0...937d0156aa060bdba9095313dedbb62e0a993aea.patch -> ${P}-bug-656942-bug-657436-937d0156aa06.patch
+	https://github.com/gentoo/portage/compare/937d0156aa060bdba9095313dedbb62e0a993aea...1fc628eead43fa5da4b142479aa004ded8acceab.patch -> ${P}-bug-657436-937d0156aa06-1fc628eead43.patch"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	epatch "${DISTDIR}/${P}-bug-656942-bug-657436-937d0156aa06.patch" \
+		"${DISTDIR}/${P}-bug-657436-937d0156aa06-1fc628eead43.patch"
+
+	# apply 4fb5ef2ce2cb
+	sed -i "s:\\((self._poll_obj, 'close'\\)):\\1, None):" \
+		pym/portage/util/_eventloop/EventLoop.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
+	else
+		SYNC_DEPTH_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
+	fi
+	einfo ""
+	einfo "This release of portage NO LONGER contains the repoman code base."
+	einfo "Repoman has its own ebuild and release package."
+	einfo "For repoman functionality please emerge app-portage/repoman"
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/portage/portage-2.3.40.ebuild b/sys-apps/portage/portage-2.3.40.ebuild
deleted file mode 100644
index 2fef032b5260..000000000000
--- a/sys-apps/portage/portage-2.3.40.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
-			app-crypt/openpgp-keys-gentoo-release
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# apply d07a47ff3c06
-	sed -i 's:("--dynamic-deps", "y") != "n"$:\0 and "--nodeps" not in myopts:' \
-		pym/_emerge/create_depgraph_params.py || die
-
-	# apply 4fb5ef2ce2cb
-	sed -i "s:\\((self._poll_obj, 'close'\\)):\\1, None):" \
-		pym/portage/util/_eventloop/EventLoop.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index 3c844d44a48b..1471abd98ec3 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -3,5 +3,4 @@ AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789e
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
 EBUILD rename-1.3-r2.ebuild 904 BLAKE2B c622dd555b9ca55842551f472d8f58e889ea075e2bed2ed8ec98e05efaa4ff787c62e5a3eeb76d96dde06b00280d1edf0a54eb866fbaed2679686d53aa8033d6 SHA512 a219a73bae81d3edbb11aa389f621c7d371c8395124eab360ead04bae52a1e3e8cbfd19f7286cb503ea23b2d1957bd6e62cc2aebe07399c4c19cbe81c8b70bd1
-EBUILD rename-1.3.ebuild 909 BLAKE2B 0a2c9bec5c6a7c76e7fc5a8a188b60bfd65738d91c738db2abf56e478269d732c520ffc185f4a67f724286cb99274bf385b9bf6323608e8f8e4cec58a67eea41 SHA512 c7a6f92d25f30982315a46eee0804926d0c65c8f7eba250473ddcdc08935ea2b13b62b4c81fed1a8312156f637d8a1d8418f066f5595bb8e59ccfef3504a61df
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3.ebuild b/sys-apps/rename/rename-1.3.ebuild
deleted file mode 100644
index 1a881725c83f..000000000000
--- a/sys-apps/rename/rename-1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="tool for easily renaming files"
-HOMEPAGE="http://rename.sourceforge.net/"
-SRC_URI="http://${PN}/sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
-		-e '/strip /s:.*::' \
-		Makefile.in
-	epatch "${FILESDIR}"/${P}-rename.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	tc-export CC
-}
-
-src_install() {
-	newbin rename renamexm || die
-	newman rename.1 renamexm.1
-	dodoc README ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "This has been renamed to 'renamexm' to avoid"
-	ewarn "a naming conflict with sys-apps/util-linux."
-}
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index dd7a298bc46b..d99ec56d4328 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,8 +1,3 @@
-DIST rescan-scsi-bus.sh-1.29 15654 BLAKE2B 4009d515d200c2c26baece3ba94f84167cfbc2cd9d2c91a1d928bc119a5a98b63397dae90489180453d7c810700b495b230a23c6791485132e3aa34620afd786 SHA512 dc6bfc5b8c4948c193bcf2522e6f4dedaacf9a9283eaedc9c3bcef0cf3db57a3ed8f3a95b8501853a75e1c83ad28850b291a76217b4c57690e663f3dc63587d7
-DIST rescan-scsi-bus.sh-1.56 22469 BLAKE2B 132ce0990f742ad3f25bf7c30cb9ce1b8392ad67bc31d4040701969a8712b751108ca74f6d24e3e0307d421ec87906c9920c456d609421b384beb961ef04cb73 SHA512 bdd27471568b1ce8b4d9ccc6783f294d141d56c5d5fa5ad46a7ffe983efd46877e25ff67b7869edb4e22ad182d47140c2167a58b80a141f4b3dde9c7e10ae57b
 DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
-EBUILD rescan-scsi-bus-1.29.ebuild 974 BLAKE2B 57f737949b2d7ff16b8c12dcc8a6e0f54b2bbd6834c440f67b449ba3e30ff5c8e85b38adab422359e27bdb56ca03c60bd5039716b3b75d08358c9e7131733324 SHA512 1bd2d0620c3ece51fc4924e61c2775d7a4d17f23066038b95a6be35f1b19948625265954c93d61c2273d24b8c3b659c01ef207cd12865d04ea1ff98778c7f822
-EBUILD rescan-scsi-bus-1.56.ebuild 990 BLAKE2B 53b00122644cdf88cb81fe45066993ae047b3fc649a6637e8de5bde4c485d20abd2c9da54576c3dd763b7c5c8047529baa621ca6b88eb9f7992f76bf82ab2f80 SHA512 58d09b0573c2b10dd931d85fbbf17671734a73905c0f3c027f582bc49c12a6fa769e585ff8a33eb0431105c3337ec16c41a15e5b44bbdd2a90ecc8aa3d93c96b
 EBUILD rescan-scsi-bus-1.57-r1.ebuild 846 BLAKE2B 1db18aaa70ad4d3e8c1b21d2a1e39beee2467c1e8390cea17fb9e27c9b20f187b600460d88f3d770cdcdacca0160763c4744ac222a0c34584b34da5195b6ecb4 SHA512 12cdf6f4b80bb3e41ded7ef9c8ec33ce0fd11a6034ee6b47a2f929440c8d172ecc8c8bf9a70e96aac12d2ffb5ecc6eab8469af2115a135092b7deedec7f408b4
-EBUILD rescan-scsi-bus-1.57.ebuild 828 BLAKE2B 55753ce796f8bdc714a8c11cf7116ab9d5941234b0cd45d85e5d4318b3d0c5b7d3fb2feadb40e2a811a32d78a0637f62c9657540f69b23c6acfb929c59afd682 SHA512 52e3b43135892e7ec92e94b35704b99b53843c18e113ed326e8aee782ce7a44a65db58693d09983ec74498b7072cfe77d8031c91b172ef609826e93a56a7d1d9
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild
deleted file mode 100644
index 09bd538c9064..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	einfo "Unpacking into ${WORKDIR}/"
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-	#epatch "${FILESDIR}"/${P}-support-sysfs-only-systems.patch
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild
deleted file mode 100644
index 937d29e78f49..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	einfo "Unpacking into ${WORKDIR}/"
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-	#epatch "${FILESDIR}"/${P}-support-sysfs-only-systems.patch
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57.ebuild
deleted file mode 100644
index 03a8e326cc23..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=">=sys-apps/sg3_utils-1.24
-	virtual/modutils
-	app-shells/bash"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index 6e6d1be15631..c276060244a6 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -1,6 +1,4 @@
 AUX README.gentoo 858 BLAKE2B d3cdc925b286481491fdad08de6c2a61c811fecb1eb36fa1e0b2cedf98577f9f3c2deff4bb881c906bab3a799616b43601d2dae494674ae439f6bf561bd82417 SHA512 3f88197dc83d4bf7e3cb8fd71079754ffa355ddf5fcf151304ae439090da44b3bdef3ed9deab44b36ffffb4b28ded2a71b1abffe5d3e1aa87f56bfa264920a7b
-DIST roccat-tools-5.1.1.tar.bz2 3564442 BLAKE2B b3fa57ee4f5b691f75cc0047dadbf929a6c09be6caab8733445a80a4409aa0390d8a5f9e3a2fe5bbbfc614e216feda07a7d964966922558b7c33ff864dba9d6a SHA512 c98469201be55ab7b534dc2b5ae43cd55c7a013e4bf0fd93f23c646f14de78daa2df3277d5f29b72076729b5c9ee07541ee22f0d51c2e5d9bd5c9f05da94fb4d
 DIST roccat-tools-5.7.0.tar.bz2 3737735 BLAKE2B fdd86cef425f1f33309165673be52c8297380a1f0a722e827c2b3697c59dd787f4b473186ab5b8ff8fadcfc851f3bb5e76c8407d831b31f82cd360679d3c1a09 SHA512 209f9fa5302806a2d2681077e990a39a4913d47b82e73f9acd86f734affd8b3a7c0087e815e5cc1dfec1787d868d09b87211d9c2a90f2ced67c150eec1b2d290
-EBUILD roccat-tools-5.1.1.ebuild 2003 BLAKE2B 612ad28ff42d887d130f224c7b7929e1163611819433548e369147a3b43b18c5df7dbd6105675e9d96ddfc66f3861a02ba2588d34b3f439c4f7df4780e3436e9 SHA512 d0544ce6f8197fda801b3917ceb19550071c474b2eceb55844f7c802152025de9bd1aac690eb5ba3ddc17b29c95ddef7e33c4b376a75c589f2083c6b8101cad4
 EBUILD roccat-tools-5.7.0.ebuild 2444 BLAKE2B 443441bec2df550833f4aa3522b229e6bab16007ddc65549c544a527b42d64408ca4e0a280dc9468b9c355524440f06a25cfe9a1842e4d83e6c68469c65ea2f8 SHA512 e1f5502c88f00ba9b109d2f85fe985f0ff1ce849dee9f46df57a7ae74bc1dc806dd8ba86be294b8b5edf4654aeece1e82fe734f4b232949388903f33e57fe107
 MISC metadata.xml 800 BLAKE2B 40adf2bae99f28467efd13b62dbde1c7c836af2c415978415bd0f05be7c08fbe264e9db1f09c6b902597b2853178dbbbeab193aefc3843b753d771a7faa9f8cb SHA512 09fbb29df81a9934f113a59f6e9e66b3927b3714bb6dc49993e574b66f443f91f4ef14b2238a3fee3da2406b54fd45b6aacd79eb824fc18c38ab1ec69c8decdd
diff --git a/sys-apps/roccat-tools/roccat-tools-5.1.1.ebuild b/sys-apps/roccat-tools/roccat-tools-5.1.1.ebuild
deleted file mode 100644
index 1b618b09cd42..000000000000
--- a/sys-apps/roccat-tools/roccat-tools-5.1.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo cmake-utils gnome2-utils udev user
-
-DESCRIPTION="Utility for advanced configuration of Roccat devices"
-
-HOMEPAGE="http://roccat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE_INPUT_DEVICES="
-	input_devices_roccat_arvo
-	input_devices_roccat_isku
-	input_devices_roccat_iskufx
-	input_devices_roccat_kiro
-	input_devices_roccat_kone
-	input_devices_roccat_koneplus
-	input_devices_roccat_konepure
-	input_devices_roccat_konepuremilitary
-	input_devices_roccat_konepureoptical
-	input_devices_roccat_konextd
-	input_devices_roccat_konextdoptical
-	input_devices_roccat_kovaplus
-	input_devices_roccat_kova2016
-	input_devices_roccat_lua
-	input_devices_roccat_nyth
-	input_devices_roccat_pyra
-	input_devices_roccat_ryosmk
-	input_devices_roccat_ryostkl
-	input_devices_roccat_savu
-	input_devices_roccat_tyon
-"
-IUSE="${IUSE_INPUT_DEVICES}"
-
-RDEPEND="
-	=dev-libs/libgaminggear-0.13*
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	media-libs/libcanberra
-	virtual/libusb:1
-	dev-libs/dbus-glib
-	virtual/libgudev:=
-	|| ( dev-lang/lua:5.1 dev-lang/lua:0 )
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup roccat
-}
-
-src_configure() {
-	local UDEVDIR="$(get_udevdir)"/rules.d
-	local MODELS=${INPUT_DEVICES//roccat_/}
-	mycmakeargs=(
-		-DDEVICES=${MODELS// /;} \
-		-DUDEVDIR="${UDEVDIR/"//"//}"
-		-DWITH_LUA=5.1
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	local stat_dir=/var/lib/roccat
-	keepdir $stat_dir
-	fowners root:roccat $stat_dir
-	fperms 2770 $stat_dir
-	readme.gentoo_src_install
-}
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-	ewarn
-	ewarn "This version breaks stored data for some devices. Before reporting bugs please delete"
-	ewarn "affected folder(s) in /var/lib/roccat"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index 0013873cbb97..89b8e2822625 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -1,9 +1,5 @@
 DIST servicelog-1.0.1.tar.gz 159034 BLAKE2B 71ddc13087866b81b69d6a3e925e8d0bd8a70a9f4e16a4006aa86051582e309c82fe4ba19aa65254b1a8e6674616b60ac6b77f38994c874672071d2530f34008 SHA512 a3e6c2c8e828de71ee81ead3435fea562501a90b3930a27087096b648a831fd351b4075f3d46359b41f88c1353dbeaf6039961ce72b1e3876734b7ad02b9f137
-DIST servicelog-1.1.11.tar.gz 318874 BLAKE2B 933ffa91c8f1c33b5b099bdab9a548a4c0d26b0fa04cd313d1639d1acb2006c9fd39ab523930787be2bdda34ec1f41715328c1e6212bf3ab4d7dcb95a1ab3dc4 SHA512 45adabe828a2e700b0920cc89fa4f93ac923cbf0249facbd52e23e1507d3daf12a2e4f2b093539286cebf8291266b2cbdcfea1c17f83a75c537c368885fd398c
-DIST servicelog-1.1.13.tar.gz 357637 BLAKE2B 7306fef7760c0e9040761af2672e267ddc3f5fbd75ef3ff07ca59511724d98d460dea048629be16906d8b3b77f987b5e406f03e0d26fa7a2c6136d3f7f782282 SHA512 2c9b2705825a98fbae3bc1c35f8acd014e5234d316d4c00fcceeb86b9263080fe525dfe71553c935092f8787b7125a3ed39c0cf07c069c56d1e816748698aa94
 DIST servicelog-1.1.14.tar.gz 361289 BLAKE2B 297c03c7d97295567c988eb2080554dfabb3becc159be4cf21a4c431698baa9e50f2af063b274341ec9b9cfd2664defa0aadb7169a518a4cb62b059c0f051cdd SHA512 d7b5e4089f258d69a7a07a46e43f1083fad701a917c150af8b68542db26348c0160dbca6c0d94aa68eb7a4b77139a763780c1af8422b785009567489a5e587cb
 EBUILD servicelog-1.0.1.ebuild 582 BLAKE2B 6996bf6529fc0dd7a7f656dc4b59efa242ff3e5e7a66d5ec9945b3c040c0bbcb66d48aca8d41a3e89ec359d02370301503c06e0c092286154f697b54ce8759ff SHA512 236be32e77fb094cbe3702681ae51238ab9dc3ba0cc7cfab9ac20e15ab5d15071da42c292d81d34c210af9be7b3e237762271b835b2baab4ae246bc01c517eda
-EBUILD servicelog-1.1.11.ebuild 584 BLAKE2B 6b978491ad12fae746df1e742d921589929655af2065a5aa9be0ee076f4154e29dfdc66ab0a5f6fb479631a5b3075ff05e612d457eac14ad2d20b08414d76440 SHA512 e7bfbfb2d1f55b5694babbf018e845860223159698578877c9a62fadb23f0a9cc6be9b4a86d57771eb22c7b194f6e4b67657941ce429c7b334585df88ea50d6a
-EBUILD servicelog-1.1.13.ebuild 584 BLAKE2B 6b978491ad12fae746df1e742d921589929655af2065a5aa9be0ee076f4154e29dfdc66ab0a5f6fb479631a5b3075ff05e612d457eac14ad2d20b08414d76440 SHA512 e7bfbfb2d1f55b5694babbf018e845860223159698578877c9a62fadb23f0a9cc6be9b4a86d57771eb22c7b194f6e4b67657941ce429c7b334585df88ea50d6a
 EBUILD servicelog-1.1.14.ebuild 434 BLAKE2B 661b8e3016eacc100151f20afad36800280e067b45f02dca6b30ca666b4731b57b55a30e605fefd35d11af2560c91bc0ce4060f9544549a5ad19846e17d8396d SHA512 dfe858e3325b95cc6750cea5d99f7ffe6c55df4a97ff391b396ab38b758181aa4b2307e705308c9ad4b1fc5b48756d859615ecc6371b9623f33fbc7d0cb4eaf6
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-apps/servicelog/servicelog-1.1.11.ebuild b/sys-apps/servicelog/servicelog-1.1.11.ebuild
deleted file mode 100644
index aca803c06b57..000000000000
--- a/sys-apps/servicelog/servicelog-1.1.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-S=${WORKDIR}/${PN}-${PV}
-DESCRIPTION="Provides utilities for logging service-related events"
-SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
-HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE=""
-
-DEPEND="sys-libs/libservicelog"
-
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	econf
-}
-src_install () {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog
-}
diff --git a/sys-apps/servicelog/servicelog-1.1.13.ebuild b/sys-apps/servicelog/servicelog-1.1.13.ebuild
deleted file mode 100644
index aca803c06b57..000000000000
--- a/sys-apps/servicelog/servicelog-1.1.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-S=${WORKDIR}/${PN}-${PV}
-DESCRIPTION="Provides utilities for logging service-related events"
-SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
-HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE=""
-
-DEPEND="sys-libs/libservicelog"
-
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	econf
-}
-src_install () {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b92f8da86a73..54132d91f3d7 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,7 +7,7 @@ AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6
 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
-AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a
+AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19 SHA512 b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
diff --git a/sys-apps/systemd/files/nsswitch.conf b/sys-apps/systemd/files/nsswitch.conf
index 00667c0c088e..91dbe757f9f3 100644
--- a/sys-apps/systemd/files/nsswitch.conf
+++ b/sys-apps/systemd/files/nsswitch.conf
@@ -7,21 +7,21 @@
 # nss-resolve - host resolution using resolved
 # nss-systemd - dynamic user/group resolution (DynamicUser in unit files)
 
-passwd:		compat mymachines systemd
-shadow:		compat
-group:		compat mymachines systemd
-gshadow:	files
+passwd:     files mymachines systemd
+shadow:     files
+group:      files mymachines systemd
+gshadow:    files
 
-hosts:		files mymachines resolve [!UNAVAIL=return] dns myhostname
-networks:	files
+hosts:      files mymachines resolve [!UNAVAIL=return] dns myhostname
+networks:   files
 
-services:	db files
-protocols:	db files
-rpc:		db files
-ethers:		db files
-netmasks:	files
-netgroup:	files
-bootparams:	files
+services:   db files
+protocols:  db files
+rpc:        db files
+ethers:     db files
+netmasks:   files
+netgroup:   files
+bootparams: files
 
-automount:	files
-aliases:	files
+automount:  files
+aliases:    files
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 77bccda4b94a..dde5bcdeeef4 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -2,5 +2,5 @@ AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c31
 DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd SHA512 2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 EBUILD the_silver_searcher-2.0.0.ebuild 919 BLAKE2B 779ddb58c67006c8d8f70cc5d80e9061d7f22661d76e29b320d3fbe5b968865b56d3a0b61fe0ebd793823d6b6fcd80abc1aa488fd7f469c16da964e75830f85a SHA512 a8e46a1bea749feaa9f05560e89b7e88a0739a15f33391a1945f5232811703d71e1438ae68ed42e38208b92282fdb543f999edd756f2b0a7d993df8e7a7717ea
-EBUILD the_silver_searcher-2.1.0.ebuild 984 BLAKE2B a43bdc7611c19136278e71dfa833f6e75fc2e49cee685bf6e8240157b39d2387880938524a1dc08cd4888ff7c4b2e8983d0e9d38af881bf94cbae5a37f93bb16 SHA512 83c2d295235764ca60430c6e05dcc584be6af4552691a6c87da1547f05422fc68093f6d8a0abb018202dc049921156b73ac3df09d4cb500accac60b5708fdc0d
+EBUILD the_silver_searcher-2.1.0.ebuild 991 BLAKE2B 0fceebaba9461a33a8a0cdc4c75d2e83308602657c0e2ffa648b7f9d8a9fceb252c0032aaee3db5624c0d5cce4b979c2064830e06a944b2925b6f379993c0a46 SHA512 6cc37b72f06530a9fbea8aa322a3474f526ba71fc7ea34dae7800cb2ee42e6c4e0e1191f7a677ea9c26e9549a19877684032cf173e5194e2f0a7fcb25cc32e65
 MISC metadata.xml 347 BLAKE2B cec1df10eb40daa911db4a3b082a3d1e5f67a63d4326092bc337a5b2300c89b41205db84a6daf54c72d6ff775166d385717039cee458076d4b483a8c0a5112fa SHA512 56848f01fba3974410effc1dbc30118c77bf97cf09fead70be94f7360dddb80d47005ebb3b3c7d5accb97b24db3a3f7735cf0f40d7af13dde58b78a4bef768b2
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index 94366537bd77..127b25b8bdcd 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 8aa2bca2d11c..999a77df3827 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -16,6 +16,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r17.ebuild 2475 BLAKE2B a65829306f631512fa724017a5fb23c6b978057c9800b9d9744f3b336ef26597a6e57317d4b70eb551f1f25a92141736b92a0b128e38e6f85006708d6ac56607 SHA512 389039ec00726d92fc6e4fccdb0db013a6efcc2feb95f5922efee9f8bbd74f90816c4f9cabaff1553525fdf8a4ee5eb9fcd1fdba4be66cec20903a644ade1b68
 EBUILD ucspi-tcp-0.88-r18.ebuild 2110 BLAKE2B 3e6f928478d0737dc74be8cf08cd182f020b07f99ab878ca1c3aeeb5776c9a494b20a94db8536b15f67320a8f425d07c621361e7664ac40d31b4c648b5024a47 SHA512 e5b7f51fe7ce2914131a6455c7fe9c474b0530532819c81e01861edbeec654d3de08c7c35182596fe75ab1646a8979955e51c958c8ad98f9d9bc78b5d0cc9e5c
 MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
deleted file mode 100644
index 0cef65cf25f4..000000000000
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils fixheadtails flag-o-matic qmail
-
-DESCRIPTION="Collection of tools for managing UNIX services"
-HOMEPAGE="http://cr.yp.to/ucspi-tcp.html"
-SRC_URI="
-	http://cr.yp.to/${PN}/${P}.tar.gz
-	mirror://qmail/ucspi-rss.diff
-	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-	http://xs3.b92.net/tomislavr/${P}-rblspp.patch
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="qmail-spp selinux"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!app-doc/ucspi-tcp-man
-	selinux? ( sec-policy/selinux-ucspitcp )"
-
-pkg_setup() {
-	if [[ -n "${UCSPI_TCP_PATCH_DIR}" ]]; then
-		eerror
-		eerror "The UCSPI_TCP_PATCH_DIR variable for custom patches"
-		eerror "has been removed from ${PN}. If you need custom patches"
-		eerror "you should create a copy of this ebuild in an overlay."
-		eerror
-		die "UCSPI_TCP_PATCH_DIR is not supported anymore"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-errno.patch
-	epatch "${FILESDIR}"/${PV}-exit.patch
-	epatch "${DISTDIR}"/ucspi-rss.diff
-	epatch "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
-	epatch "${DISTDIR}"/${P}-rblspp.patch
-
-	ht_fix_file Makefile
-
-	# gcc-3.4.5 and other several versions contain a bug on some platforms that
-	# cause this error:
-	# tcpserver: fatal: temporarily unable to figure out IP address for 0.0.0.0: file does not exist
-	# To work around this, we use -O1 here instead.
-	replace-flags -O? -O1
-
-	qmail_set_cc
-	echo "/usr/" > conf-home
-
-	# allow larger responses
-	sed -i -e 's|if (text.len > 200) text.len = 200;|if (text.len > 500) text.len = 500;|g' \
-		rblsmtpd.c rblspp.c
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ \
-		tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd || die
-
-	if use qmail-spp; then
-		insinto "${QMAIL_HOME}"/plugins
-		insopts -m 755
-		doins rblspp
-	fi
-
-	doman "${WORKDIR}"/${P}-man/*.[1-8]
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
-	insinto /etc/tcprules.d/
-	newins "${FILESDIR}"/tcprules-Makefile Makefile
-}
-
-pkg_postinst() {
-	einfo
-	einfo "We have started a move to get all tcprules files into"
-	einfo "/etc/tcprules.d/, where we have provided a Makefile to"
-	einfo "easily update the CDB file."
-	einfo
-}
diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index c2bf16445fb9..ad4cff77f49e 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -2,7 +2,6 @@ AUX ucspi-unix-0.36-fix-parallel-build.patch 507 BLAKE2B 32ee69a9a63efb3b990f4e3
 AUX ucspi-unix-0.36-include-sys_socket.h.patch 339 BLAKE2B d00f18db06e084639a169b487ebe7458127086a31ccae759faf458aea69a6523cc9a6eb69922f161fc861cb3e463b4a73b637011dd8e8e86abd2f9b7080a660f SHA512 a8628e664ec993ab964879ff34b2bea7e70901cbc1f812262057fcea0fe34c64b2b910e4e1c77ba66df84fc8dfed94b69c6dbe7b7da09ddf379764b070a97161
 AUX ucspi-unix-gentoo-head.patch 1097 BLAKE2B 7ec8f2e5dd32224f14f254d55bdabdf70324d9e0b21e31ad525598e125331778434b600ca0b6a275d4758f83611d1abfbce810913d6ad3d7cb4cc1955639b9d6 SHA512 e1d5be425dcdf2bf09031c8a11c384b092a2bda38159db37abff111191dac1aa0b40a401cb068d86f97747dad684a0720f3b5b8f18c2d9caaf64368a71d46c3c
 DIST ucspi-unix-0.36.tar.gz 14175 BLAKE2B 609de0e75825ee458823bd34b41ad1d2072851cd006f6fd603c5082c69b48bc7018242a4b6bf7d2584bf43d79273f223352a3af4868575ee8574c9fc9ba4d819 SHA512 56fc5145315ff43629f455996874d6434ebee16e9fccf78ce3dcdd6312daafc508e2dce0984ca9ea73b9ff0da5d2171fc678c8e200641e1c0be02e7863bc5633
-EBUILD ucspi-unix-0.36-r2.ebuild 876 BLAKE2B 002132593c7471fe22d2a57fb2d51d295dd8deb2addea67f37e50842f21a2603f01611c9a297a8a014d5fc4b124f9f78684d69f2081a016f600a91d32a1e4146 SHA512 b3a9d11408b01957069657662863c3cc2dbac411aff3770ecbdc17ad91ca4d3287a81c303bf7957ea9d49b7bd8028bdbc67ad9ed5a184a702e565bd7eda3a628
 EBUILD ucspi-unix-0.36-r3.ebuild 974 BLAKE2B 2ae598af6554c6a0345baa60be163adadf12fa63c00cd8f6ff96de9ec6daaaebc7544713cff2cd5f44cb1a18df57dd2814d0747e48b9d0ced90e3ecbd1fa3976 SHA512 798901cc22beb4912e8fa1d779abed5bf9fc5711e43d059019684b88fce3438ebf228bf93ce77172f462aa3bbec784a1f61eac6c3f4af37bc6d5fb147476f9a8
 EBUILD ucspi-unix-0.36-r4.ebuild 1136 BLAKE2B 90bb709947cedc619da1ee9a9cf504ced1267a447610844a874db60b65113e1d76c359c165a1673bc3bb9fa5452bbe257b9ec07a4f975052b0ba1a376e9c4c9f SHA512 4544d8053f3c9a0c98396ae5c49114fb5b580637a3c95f90f494cb477b373e470f30b10b85fa0af9d81e40ba0c6ab9af4768028b093c45ffd5ae2e6ea577fcec
 MISC metadata.xml 433 BLAKE2B 884f889ede3653c18a3e3b4cd133e764ca8a3daa5eee474d698f3878ecca59d176cb5d039cbcc61934e0a84ccc59b9e7766e44551654e6684ee5f2e867cfa7ec SHA512 73fcad2c3cf5f25d07fe4c38376e3375021ddd0e2a2a9e51d05728d86ee2e0b63a28ed5f70d9d31e1643d210852b4b81f0ce605b0d9876dbf131cfd444d6fd6e
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
deleted file mode 100644
index adc83aac1ecb..000000000000
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A ucspi implementation for unix sockets"
-HOMEPAGE="http://untroubled.org/ucspi-unix/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/bglibs-1.019-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-gentoo-head.patch
-}
-
-src_compile() {
-	use kernel_linux && PEERCRED="-DHASPEERCRED=1"
-	echo "$(tc-getCC) ${CFLAGS} -I/usr/lib/bglibs/include ${PEERCRED}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS} -L/usr/lib/bglibs/lib" > conf-ld
-	make || die  #don't use emake b/c of jobserver
-}
-
-src_install() {
-	dobin unixserver unixclient unixcat || die
-	doman unixserver.1 unixclient.1
-	dodoc ANNOUNCEMENT NEWS PROTOCOL README TODO
-}
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index a8e2b0cc975c..26b0a1cfa88e 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -10,5 +10,5 @@ DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
 EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d
 EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85
-EBUILD xinetd-2.3.15.3.ebuild 1087 BLAKE2B 27e91f406a10f647bbd37ec8b991b566bb168c3458af1756ca5698a308a2ce1b9cb22c4c88476346a6122d32dda6f5d506df0a7587dbce82b04668d7d498a8e0 SHA512 17d9e267bc473bb9dadcc4d196232cf1c06223bbf019dd84b4cb556c663174eb7b59aa5d3ec11408204ba1909f0d8696ba27fdda91b9a7ec401c563e8e9c8d85
+EBUILD xinetd-2.3.15.3.ebuild 1086 BLAKE2B a015f743a33b424703f9bff3bd921b91d9814bb96c8477d7d9d1a55ecf2987df8b2fbf242ed6a7d10b03a1aaea7eeb69b706afaa7b039b82f94c792cc3d02963 SHA512 405118491c72572a880dd48b0ec8408827dabbc08f910eef5e79188e946afe3d77b9bb1f2281dbd82c1e877e9898bd13d2b671fa0366f7ef87d4bed51e6945a7
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index 6b4ff3e3a591..bd39ceb3f7a3 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="perl selinux tcpd"
 
 DEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index b99123fe422a..f953b05125d7 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/docker_auth/Manifest b/sys-auth/docker_auth/Manifest
index 12fc76cdec81..e6fc530834a2 100644
--- a/sys-auth/docker_auth/Manifest
+++ b/sys-auth/docker_auth/Manifest
@@ -6,9 +6,7 @@ AUX docker_auth.initd 596 BLAKE2B 42722f51138e8d32d991b37436dddfafa0e6e460fea6ee
 AUX docker_auth.logrotated 109 BLAKE2B 0ba5c48e905ee8d8987058ca68f817d4a1f3f53e5dff25cf6aa5074e587101fe02664f5b72da60400f7159699b9692ed085b924aa353f402504d3ffab27251d8 SHA512 b2b93aa327b4023481b9524649fe2be4b1ccf97f88b76969b8ab23b9a852627db92426fd0286a875c06555f51c0a61e50b789646acffdbd7916b7be3580d8751
 AUX version.go 71 BLAKE2B 1ccf8ded93aa946112fe37182688dc8ef9ce65494bd9140a5f16fd268929224bb33b5d04f93b2bcd61d89907eab304ed7f7ac300e18d7615c50a16ae63190522 SHA512 48f7727bda3a0e59f33235d8e343beca581f153ceaa227eaa65bd783d05c06f1c598c764743ef41910fd72a2309e7069bddc5f57f89700f2f88536bfe3100d79
 DIST docker_auth-1.3.1.tar.gz 49687 BLAKE2B 7c7c8235ad4eb139d1b964de3583a714040747b0823f33bd529469834c75539c583bdca56b0a6cbabeed4eb3435845f831f10a65ae2ef4a445b7b13d4a16695c SHA512 fe5a37a3975fe33c38db649be0560f87b8c179273bb3d2e044f2df3840e316f8a9f292a94ea601896cbe8c137560200be98628b873a0cd53b2d6b17c5164537d
-DIST docker_auth-1.3.tar.gz 48970 BLAKE2B 06a5aaffaa9b1dee2c371fb3dcf51ae14e4a2fc1c8d5fbf8ec9804c77abd9b2178507ed37b906886ff1ed20ac255aaf681422dfee194fa23e17b110278b5e044 SHA512 c0964a643d0269b2c7c4a1a747b421dfea8d8c42e3812a6b0dc2fa989e9e81fd6d6fd34672b19ea4472bf05be53bdd4d1c343fd241eab55d9b3496b47b3fa0c8
 DIST github.com-GoogleCloudPlatform-gcloud-golang-20d4028b8a750c2aca76bf9fefa8ed2d0109b573.tar.gz 873021 BLAKE2B f6bd3a08081b7ddd9c61884ba3157654139c70982ffa7245ed988bb1f0fd80af98ccac556168e90ea871ccc0909d03e7f1ee7bcf7cbf2160bbf764e412d123ad SHA512 e98f269d70927bb59fee31059e2d24a5ba71837adbf1f6619b1d9df0a3ec11ef58a2bdf46de6dc45f9ee0a3985c37bc05004beac34b94bc790093aa1550c939a
-DIST github.com-GoogleCloudPlatform-gcloud-golang-bbf380d59635bf267fc8a8df03d6d261c448ee3c.tar.gz 1082782 BLAKE2B 47eba3e3ad6af13a7b7710b20e970219d27e2a5aa3e3e57cdaf015d43ca6ac758104e822735841cbfc01f6598ef5b83dd85759881ec39ae55b0d485ea76ec8f9 SHA512 d4b8f145a5007668d7b67ea63ffc221d4b56b76bfabfc7ba7b8182ca579edeca707638b4d81746ea1d7ae30915358028d026e17524e1e49a14d3f70c0efb85c2
 DIST github.com-cesanta-glog-22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz 20273 BLAKE2B 982093a19a04611d3e1e9c06dd499fd7eb4730c49057e2c86042acecbf7f1920b6dd83133eb0ae07938ab995cbf809aa7d2236c67a805e3f16ff2c2535e2f66b SHA512 3c4b757fc0d0e45382b1ef0180eea2f0429e8c7ecac0089fca79bc717f6c0a04918b91a144ca78331178cc914b808b40596c6a6e214157d2f812858be31c13d6
 DIST github.com-dchest-uniuri-8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz 2471 BLAKE2B 9cc560893309347a9f012cdb32009bc7201511fa337339c8ced7c671e4b43100e36370dc71c47001e33e411b7707c30787a36e953fa5d15990a1f0edf38accc2 SHA512 70421b526e3040a49e63be6c892de2953b4f9ecdb01b148eb2bab3814f610a8c39bd98aad858cbaf9dcf621b52ee9ef952f0cdcdc6eca77da8ebf80dbbf1c04c
 DIST github.com-deckarep-golang-set-fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz 11814 BLAKE2B b97651cfdd0b1c3f8ab10acabf4e7fdebee1955b8661e006e07c612dc1fd8026aa66c9bdf6d6a955bb459eb3e8668d4990e322245daf83dbd5474a4d160ff9ee SHA512 4ac5a5a8985e7bda13d272854f68ad41feb435ab2fb835ca47a63db49211311f502273355f2d9e0c4bd264d8cd6438d077f0eae7b0c6aecadde93c766bd69513
@@ -35,6 +33,5 @@ DIST github.com-googleapis-gax-go-8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.g
 DIST github.com-grpc-grpc-go-35170916ff58e89ae03f52e778228e18207e0e02.tar.gz 315740 BLAKE2B ff727e8165582175c800653909312aa189f9f5a8eff531a07e0e1befc8428972f2c55c13a8df23859e94780a07e0c222fc8777bc0aa5a6b8569b8e0d17697201 SHA512 8c30f7641cb2cbbf274af90579b5e60370e85b1052b6206d02a395d69aa9a545d66fdb732e7636e3b326451be0f88bbf180c690835b39adb4c63d1dd67fc8c6a
 DIST github.com-schwarmco-go-cartesian-product-c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz 2433 BLAKE2B 104d5f15bfa0b6166b8269e2647b39c5889fb2ff706d5c2d2ba6328ff2292cb2896a9b1d0298c7d00d962dc18a254885e3fb3d6a2e442bea7f92044e9b1a89e3 SHA512 a1767b2c5c6340cb2649d63beac11571ec3c9b2c98011234d5a51eb337d221ea411e517660ae966fd4f582ffef18b088d7125d29ba271bece8b51254dcac940b
 DIST github.com-syndtr-goleveldb-3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz 137276 BLAKE2B 6f74b19157edb319c01fc2a8ed682904ec12a52cb3995dddf06396fcb127e2ec3e433d723fa848744b74d09161edd50973f008c3a6b1458625f709ddc9ada93e SHA512 bac364a68737f5faed9ec052d47db01dc4aa0eca4ef786a43766b844ff27d8d9f87a94159a17c58745dd4ba002a9a83cd091ab2561a61d01b0a672a82002c1d4
-EBUILD docker_auth-1.3-r2.ebuild 3788 BLAKE2B 76b0bbc4ea91a4aed60b207c2ae706786934422efb5e65f81e48ec0eabf11e20e9b4128df09eec71d184214e17d62eca654d41b7a9219f34e25db0469a329348 SHA512 e89dab1db49e5c196f9a18d971d1ff4220f5adc03777836b22e87aa99ed4f1b46275fa7071def353b21a73934dae1476dbf16476c0d7a054dec7a910150410c5
 EBUILD docker_auth-1.3.1.ebuild 3742 BLAKE2B f0234e9007e13c99b03f20984884816bdde8874f912df1b99c5f6932d3bc4cac436b023ac4bd35820db19bcb36d7aa965f0ef1129f33a2ea6d9081824b1dfaa5 SHA512 52e3d58f3e322c6a7960c37ef5b565c1c437dbb6b7d99a2e81e78c3b6ae687fbd0483c9ce95b573e758d4a21ed6b0a8121a2a180870a8d9ca119f5f91419af51
 MISC metadata.xml 329 BLAKE2B e38d2771b4a8390d7a12702b70a5e5cee8067aab659acf457b6665425b10f08459f42f8246a9e4aa299df2085c75a850eac51563d4479e4e0b3a82b9b3cfc391 SHA512 83a99677c1de5a527b72abdb632ea1ea0b0be3fedac28b6c20efb7b76999b0024e6d0a072e9b28b5458b79be14df1293b4f6a314448f5e41965ce4f2e9c65904
diff --git a/sys-auth/docker_auth/docker_auth-1.3-r2.ebuild b/sys-auth/docker_auth/docker_auth-1.3-r2.ebuild
deleted file mode 100644
index 96b57a1bb178..000000000000
--- a/sys-auth/docker_auth/docker_auth-1.3-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/cesanta/docker_auth"
-
-EGO_VENDOR=(
-	"github.com/dchest/uniuri 8902c56451e9b58ff940bbe5fec35d5f9c04584a"
-	"github.com/deckarep/golang-set fc8930a5e645572ee00bf66358ed3414f3c13b90"
-	"github.com/docker/distribution 0700fa570d7bcc1b3e46ee127c4489fd25f4daa3"
-	"github.com/docker/libtrust aabc10ec26b754e797f9028f4589c5b7bd90dc20"
-	"github.com/facebookgo/httpdown a3b1354551a26449fbe05f5d855937f6e7acbd71"
-	"github.com/facebookgo/clock 600d898af40aa09a7a93ecb9265d87b0504b6f03"
-	"github.com/facebookgo/stats 1b76add642e42c6ffba7211ad7b3939ce654526e"
-	"github.com/go-ldap/ldap 13cedcf58a1ea124045dea529a66c849d3444c8e"
-	"github.com/cesanta/glog 22eb27a0ae192b290b25537b8e876556fc25129c"
-	"github.com/schwarmco/go-cartesian-product c2c0aca869a6cbf51e017ce148b949d9dee09bc3"
-	"github.com/syndtr/goleveldb 3c5717caf1475fd25964109a0fc640bd150fce43"
-	"github.com/golang/snappy 553a641470496b2327abcac10b36396bd98e45c9"
-	"gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d github.com/go-asn1-ber/asn1-ber"
-	"gopkg.in/fsnotify.v1 629574ca2a5df945712d3079857300b5e4da0236 github.com/fsnotify/fsnotify"
-	"gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655 github.com/go-mgo/mgo"
-	"gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.com/go-yaml/yaml"
-	"golang.org/x/crypto e1a4589e7d3ea14a3352255d04b6f1a418845e5e github.com/golang/crypto"
-	"golang.org/x/sys 493114f68206f85e7e333beccfabc11e98cba8dd github.com/golang/sys"
-	"golang.org/x/net 859d1a86bb617c0c20d154590c3c5d3fcb670b07 github.com/golang/net"
-	"google.golang.org/api 39c3dd417c5a443607650f18e829ad308da08dd2 github.com/google/google-api-go-client"
-	"google.golang.org/grpc 35170916ff58e89ae03f52e778228e18207e0e02 github.com/grpc/grpc-go"
-	"github.com/golang/protobuf 11b8df160996e00fd4b55cbaafb3d84ec6d50fa8"
-	"golang.org/x/oauth2 13449ad91cb26cb47661c1b080790392170385fd github.com/golang/oauth2"
-	"cloud.google.com/go bbf380d59635bf267fc8a8df03d6d261c448ee3c github.com/GoogleCloudPlatform/gcloud-golang"
-	"golang.org/x/text ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49 github.com/golang/text"
-	"github.com/googleapis/gax-go 8c160ca1523d8eea3932fbaa494c8964b7724aa8"
-	"google.golang.org/genproto 595979c8a7bf586b2d293fb42246bf91a0b893d9 github.com/google/go-genproto"
-	)
-
-inherit user golang-build golang-vcs-snapshot
-EGIT_COMMIT="2cd3699dab4e44a239db136a52734dab25897bee"
-SHORT_COMMIT=${EGIT_COMMIT:0:7}
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Docker Registry 2 authentication server"
-HOMEPAGE="https://github.com/cesanta/docker_auth"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN}
-	eapply "${FILESDIR}/${PN}-ldap-group-support-1.patch"
-	eapply "${FILESDIR}/${PN}-ldap-cacert.patch"
-	cp "${FILESDIR}/version.go" auth_server/version.go || die
-	sed -i -e "s/{version}/${PV}/" -e "s/{build_id}/${SHORT_COMMIT}/" auth_server/version.go || die
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN}/auth_server || die
-	GOPATH="${WORKDIR}/${P}" go build -o "bin/auth_server" || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc README.md docs/Backend_MongoDB.md
-	insinto /usr/share/${PF}
-	doins -r examples
-	insinto /etc/docker_auth/
-	newins examples/reference.yml config.yml.example
-	dobin auth_server/bin/auth_server
-	popd || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/docker_auth
-	fowners ${PN}:${PN} /var/log/docker_auth
-}
diff --git a/sys-auth/pam_blue/Manifest b/sys-auth/pam_blue/Manifest
index 6ba013c493c5..15858892e90b 100644
--- a/sys-auth/pam_blue/Manifest
+++ b/sys-auth/pam_blue/Manifest
@@ -2,5 +2,4 @@ AUX pam_blue-0.9.0-bad-log.patch 357 BLAKE2B f7f6e4371642072ad5a0a9c645af5229167
 AUX pam_blue-0.9.0-char-locales.patch 666 BLAKE2B 11718b66138ca79641565f47613ef521e4bc1659b26982d2246ddb11ce744778c4d748d8a72bf714014b82f33967fea0b54d896aa2b786c0b9b7e66d9a6d9a11 SHA512 2a7bcc2f3d6b260a9b4803b0657114a194af90828bd5926ee1887f04304e30d2bfb46c000f190ab1de88f4646620e2c15ab8cf60fa35fb38a1d12f46cf138fe2
 DIST pam_blue-0.9.0.tar.bz2 251688 BLAKE2B ab8b56daab325ce837fc93a223067227679609413ef9389a1d6f91fb0695ed27925d2ce12a5a9a1f2bd5c0cf945646239a59a66d7e34230835b330d0cc59e149 SHA512 f611b6e3b509d2b917dd15a82f6fa3219ce554cdbf3bd224981c740bb3161dea67db9275b9bc13cd54644e0cb546eb2bb32dbff7e510170a0911b40d81f2d620
 EBUILD pam_blue-0.9.0-r1.ebuild 1164 BLAKE2B 881fb3df4290178755a6db7551b37f3747d56925fbb58be7d41f658aea8085ef6c275d9f67f9ae892cb20a146bb2d7f52dc15d74d3b1dcfe58306395b3657823 SHA512 40c2029d06bc8a23956b783d1546edfb7e5d8987870a79a46a23a203483bc5a20134867d2aa097c97721207c9e77aefe48e3341ba0b8905d5ad13fb5a0efdf2b
-EBUILD pam_blue-0.9.0.ebuild 1088 BLAKE2B a9effadf2041b8286f5707ee884b740bdc286b601115ab57e160a179f8467c791deb2c13af979baab385ff04884913c9b132c59b1fb568365c45b6c8d0176819 SHA512 d72118c590e16b9727cd2842c168d42445229cf87f37da19f89e012b99af1062c6efe92a12c1722daceb7d310e268f2e6da57bbdf16fdfe7d19859ce1d85b826
 MISC metadata.xml 758 BLAKE2B 2286b91ded21eb147232180de96a31e1867c46e11468fb7de7169af65fbbfe627f62eaebddf5046c3b8f5d2928acbe8cb64ea7ef98a22d9951dafd381b4a8a86 SHA512 7d33c098fb2422df99f93c068908d3e1f1639d7d5d891ae5f8e579feab19b33fcc3f184c05f27282774b01eed405676edfb3ef2c0f8f4de8e7dd519d8523afdc
diff --git a/sys-auth/pam_blue/pam_blue-0.9.0.ebuild b/sys-auth/pam_blue/pam_blue-0.9.0.ebuild
deleted file mode 100644
index 2d7ff91cde43..000000000000
--- a/sys-auth/pam_blue/pam_blue-0.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam autotools multilib
-
-DESCRIPTION="PAM module providing ability to authenticate via a bluetooth compatible device"
-HOMEPAGE="http://pam.0xdef.net/"
-SRC_URI="http://pam.0xdef.net/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	net-wireless/bluez"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	econf --libdir="$(getpam_mod_dir)"
-	emake || die "emake failed"
-}
-
-src_install() {
-	# manual install to avoid sandbox violation and installing useless .la file
-	dopammod src/.libs/pam_blue.so
-	newpamsecurity . data/sample.conf bluesscan.conf.sample
-
-	dodoc AUTHORS NEWS README ChangeLog
-	doman doc/${PN}.7
-}
-
-pkg_postinst() {
-	elog "For configuration info, see /etc/security/bluesscan.conf.sample"
-	elog "http://pam.0xdef.net/doc.html and http://pam.0xdef.net/faq.html"
-	elog "Edit the file as required and copy/rename to bluesscan.conf when done."
-}
diff --git a/sys-auth/pam_dotfile/Manifest b/sys-auth/pam_dotfile/Manifest
index 856bd5d9d63b..8d74abed17eb 100644
--- a/sys-auth/pam_dotfile/Manifest
+++ b/sys-auth/pam_dotfile/Manifest
@@ -1,6 +1,4 @@
 AUX pam_dotfile-0.7-gentoo.patch 3789 BLAKE2B 686a14c3a4bbb0f7bb4d128b1bb32deaff3d6d9500c49d29a559a2ebba34d95b0bc88fc28f217a3ccfd0d66ef4fdef4c9fdf6920b409337a530e3e93e2619723 SHA512 83501f36f044cc24c2437112444e1280866e2c78f4f2823cd2b4ec2883fd6bff81fb23c7108bc773e50d1dbf97ac307df09245984cdf4fd068f314ad4bc57771
 DIST pam_dotfile-0.7.tar.gz 229009 BLAKE2B 99cec03f963735806f89ec6d099450993277877cc25562b4eb0c98dd61dbd8a8c5fcbb2c23ab24883c0fe4f44632fdbf0c6d8eeed646e3af28744b9a5aabba11 SHA512 544160068af2c6a488271d36cfae43340d4d7801702aef629ba781dff12b99334bc76ec14396783d0a9823d0f976c847335fe8b1b07cbbb6e43d0bd658ff7500
-DIST pam_dotfile-patches-1.tar.bz2 2172 BLAKE2B 2b2ea0b690a7f441031189b2867f0e9a3886f9223e64c463e10387bda8ff37bf72cc19d7f0614d61df7e4ddd762d2421d996212cb7a639f654fe86d3b5f6270d SHA512 a6b29361e089f7223c3f915320a921b5f20603a16673d518300ea458a816360950a76a4f8e1842040f7b0e676d4c67c6de2586640c2bb4638a4e63138b78600a
-EBUILD pam_dotfile-0.7-r1.ebuild 1173 BLAKE2B e02e7083862f9230abd6c16451f857090cff2cd3ac08e73cd8fa201af52de7a535f28f8dd0d9da33222c11c4ea4bc51b3cd79a7b0b7a37b282ac41b861c6a46e SHA512 0cf55cd8ace7c7e70402ffa19d4985f61324eb0a6954713cc94dcad4650cbf907754689d8e267496fa9e1f56f9bc22ced7db63c2d1772ff820c1e4580865ed8e
 EBUILD pam_dotfile-0.7-r2.ebuild 927 BLAKE2B 57a5e2026daa1748c30d976efec060dc7be3d74368750b792f6a5e575c1c4066ce5975b32caf11e0ffcb261c308488b9a96f1f773e057be9874b33ff4b4573ff SHA512 d52071d2d969768b35b69edb25492588aec6e36841318e926be2368afc6fcae5aa723a83d8e1b7ddbcbec38d18fff8b9addd0672037cdc7779743437181e09fa
 MISC metadata.xml 303 BLAKE2B db11552d608dfa67d636b5e7d9a4adff6a4de68b95de40445364b33f55d004f9a15180f74eb510e165b530cb9d280ed0167dc27baa38e7c1883ec7497fd97471 SHA512 27b3be6acb3109806233b5881a3cd140258d7cc7e795d7a1baf4200510c09e44adeebd600220a8c39d1f538b5b85be1a8546c83b802e9170a86b0794b99a6609
diff --git a/sys-auth/pam_dotfile/pam_dotfile-0.7-r1.ebuild b/sys-auth/pam_dotfile/pam_dotfile-0.7-r1.ebuild
deleted file mode 100644
index 4b58761e3a27..000000000000
--- a/sys-auth/pam_dotfile/pam_dotfile-0.7-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils pam autotools
-
-MY_P="${P/_beta/beta}"
-S="${WORKDIR}/${MY_P}"
-
-PATCHLEVEL="1"
-DESCRIPTION="pam module to allow password-storing in \$HOME/dotfiles"
-HOMEPAGE="http://0pointer.de/lennart/projects/pam_dotfile/"
-SRC_URI="http://0pointer.de/lennart/projects/pam_dotfile/${MY_P}.tar.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-RDEPEND="virtual/pam"
-DEPEND="${RDEPEND}
-	doc? ( www-client/lynx )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
-
-	AT_M4DIR="${WORKDIR}/${PV}/m4" eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	econf \
-		$(use_enable doc lynx) \
-		"--with-pammoddir=$(getpam_mod_dir)" \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make -C src DESTDIR="${D}" install || die "make -C src install failed"
-	make -C man DESTDIR="${D}" install || die "make -C src install failed"
-
-	rm -f "${D}"/$(getpam_mod_dir)/pam_dotfile.la
-	fperms 4111 /usr/sbin/pam-dotfile-helper
-
-	dodoc README
-	dohtml doc/*
-}
diff --git a/sys-auth/pam_ldap/Manifest b/sys-auth/pam_ldap/Manifest
index bd6c66f1f788..c4762edab970 100644
--- a/sys-auth/pam_ldap/Manifest
+++ b/sys-auth/pam_ldap/Manifest
@@ -1,8 +1,3 @@
-DIST pam_ldap-183.tar.gz 127500 BLAKE2B 46f7321524a4768b3bfea546ab905e0be3bfa862195c4fd5030ec520a44e0010c60092c19d088195718da288afe25f599e70f740f53963681c7cbae52e82a53e SHA512 ad1ec398904c54f31aa71d3b59ecbdf4af14c590077f9e683d87fa3940f4e20aab7e1bd59eac7a9bfb985e30c1ea04a1569aa2dc2dfc39d8ccec8b871cc032c7
-DIST pam_ldap-184.tar.gz 128053 BLAKE2B 4555878c47b712bd78f9124d3795e45cf37199f77fea6756e27fdb7d54a3318af90c5bee78f67462f59a5f7537760fea21dc0a6b32dfab2df294c34b85c60b62 SHA512 9fd6f11b271a85b4a5646dfb1061cf82de7ca65cf24aa5309aaa8b39bf2bfad900e0e17f52a4d4e10d034188ca7a89d7764a9f1c6766aa6f11caf7779ad667df
 DIST pam_ldap-186.tar.gz 163437 BLAKE2B 4e917985b78349283c891daca94935792f2316afc08cd694edb7256c89a7ed612a62ba4b53111fc2022f6e11f754103bf58ac0a53a4298b011a5379625c51cdc SHA512 aaa6fbc48150db53bf92dcf600bcb8f0526baa2e6124f46468f59958c8a91495eb003d16a45b659c8cbb2d3481c4732a0d1f5945a2c98c09549ef8a51ed18a3d
-EBUILD pam_ldap-183.ebuild 952 BLAKE2B 6ab9091313083afa2057eb5f505e6b678d7d2eb47db859fdcadd0291da6b5992892cd5642ca95372fcc0d62c65b958c9cf0f2c0fedd7f4b4c500430ded1015cf SHA512 62af7fc3cae69d1798a552bf90a6f6bfce6a502347025913d4759103c89a3c4bb001f4ac6265bbb5c46bbc9a073f1d18f94530e8e6c26ee6e334c88bfb70998e
-EBUILD pam_ldap-184.ebuild 965 BLAKE2B fc32b5da01f224fad3c079a4bb6a3d6b21ddf1910488a9ec7922a58422c9b5f455815140a7505c8e20e8018988ab00bb3ec5b47df1b554959a9f94daf3aef898 SHA512 d2e21516626b5335fb8c4e850f210ec0142c507e945ec3a1c17c9b846f24abae4edb7e3b3f015f92f79885b7192cea45c49feb8f4cc48817182377af7ec6bbc2
 EBUILD pam_ldap-186-r1.ebuild 1161 BLAKE2B 048bf9321e9125aad5c99a1b30ab18a43589b4d46b1376935d90cb609bb61fc58d2b96eaed68d9efdcde70a218fd6ad7f4a08facc881983ae09ce6eb99368215 SHA512 9ca8188e9082eea150d7f7127b5f69c4d61e5cea6c28913b37759115a13866bf2460e93739e5aa40f0c2e5f1bdaa93f170af0ffec65b7101bf3b03af3c40035a
-EBUILD pam_ldap-186.ebuild 904 BLAKE2B c2e1597345f2ca813050b1e478f14a92ccae5cdd827afc688fa094580629d568db35e9ad9277179be5a4895fc477ca22b8b1ddb66583a99289f15a2a632524b3 SHA512 483f952f8063982149c27cf455786c102872d160121440887dbf4819c54f9fbc07166da47c8b89847c79c4379e31db237a28ab1de9d444bc0554292f768c75db
 MISC metadata.xml 216 BLAKE2B 97b30b803b06d4809dde0bbd686fe4be81edac39c42da6dd2998c8d73e0ad96b69721ee876320a0ae6935d51bfaa72dedc4c9cd98aacc335a60e5e228d9c8889 SHA512 206ec8bb38d85f19b567f88093ad55291639b5ae484be283f0fa05e2a5d69a108805c08ab3ff94278344ee20f252187309310d5a2d2d4151f2e972ed0e3fb7c5
diff --git a/sys-auth/pam_ldap/pam_ldap-183.ebuild b/sys-auth/pam_ldap/pam_ldap-183.ebuild
deleted file mode 100644
index c4231e598222..000000000000
--- a/sys-auth/pam_ldap/pam_ldap-183.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils pam autotools
-
-DESCRIPTION="PAM LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="ssl sasl"
-DEPEND=">=sys-libs/glibc-2.1.3
-		>=sys-libs/pam-0.72
-		>=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-
-src_unpack() {
-	unpack ${A}
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-176-fix-referral-tls.patch
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	econf --with-ldap-lib=openldap `use_enable ssl` || die
-	emake || die
-}
-
-src_install() {
-	dopammod pam_ldap.so
-
-	dodoc pam.conf ldap.conf ldapns.schema chsh chfn certutil
-	dodoc ChangeLog CVSVersionInfo.txt README AUTHORS ns-pwd-policy.schema
-	doman pam_ldap.5
-
-	docinto pam.d
-	dodoc pam.d/*
-}
diff --git a/sys-auth/pam_ldap/pam_ldap-184.ebuild b/sys-auth/pam_ldap/pam_ldap-184.ebuild
deleted file mode 100644
index 1a7a766b8226..000000000000
--- a/sys-auth/pam_ldap/pam_ldap-184.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils pam autotools
-
-DESCRIPTION="PAM LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl sasl"
-DEPEND=">=sys-libs/glibc-2.1.3
-		>=sys-libs/pam-0.72
-		>=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-
-src_unpack() {
-	unpack ${A}
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-176-fix-referral-tls.patch
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	econf --with-ldap-lib=openldap `use_enable ssl` || die
-	emake || die
-}
-
-src_install() {
-	dopammod pam_ldap.so
-
-	dodoc pam.conf ldap.conf ldapns.schema chsh chfn certutil
-	dodoc ChangeLog CVSVersionInfo.txt README AUTHORS ns-pwd-policy.schema
-	doman pam_ldap.5
-
-	docinto pam.d
-	dodoc pam.d/*
-}
diff --git a/sys-auth/pam_ldap/pam_ldap-186.ebuild b/sys-auth/pam_ldap/pam_ldap-186.ebuild
deleted file mode 100644
index c98ff0480705..000000000000
--- a/sys-auth/pam_ldap/pam_ldap-186.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils pam
-
-DESCRIPTION="PAM LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl sasl"
-DEPEND="|| ( >=sys-libs/glibc-2.1.3 >=sys-freebsd/freebsd-lib-9.1 )
-		virtual/pam
-		>=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-}
-
-src_compile() {
-	econf --with-ldap-lib=openldap `use_enable ssl` || die
-	emake || die
-}
-
-src_install() {
-	dopammod pam_ldap.so
-
-	dodoc pam.conf ldap.conf ldapns.schema chsh chfn certutil
-	dodoc ChangeLog CVSVersionInfo.txt README AUTHORS ns-pwd-policy.schema
-	doman pam_ldap.5
-
-	docinto pam.d
-	dodoc pam.d/*
-}
diff --git a/sys-auth/pam_passwdqc/Manifest b/sys-auth/pam_passwdqc/Manifest
index ca7116fa2b7c..2846da5a24e7 100644
--- a/sys-auth/pam_passwdqc/Manifest
+++ b/sys-auth/pam_passwdqc/Manifest
@@ -1,8 +1,6 @@
 AUX pam_passwdqc-1.0.4-makefile.patch 1505 BLAKE2B 1ab775c7017dc76330b756d0fcf2c7cdd507747e63e583551cbc022931f9a258cd8fe656335b2b42e0e0d588f5f1e230b875fd36cb3c767bf4a614b4d394916e SHA512 59139e2c9bec335cc036d7b375e691ef545ac9ee3553582b9447c931c0cd65920b6d0106e5ff37030ebe5d50ca826fe7a3995d312890ce9ba0e00714cc747e5b
 AUX pam_passwdqc-1.0.5-makefile.patch 1245 BLAKE2B b0bca31fa21a9d05093093d04a045288c33a8f75fb366a09b54f64e438dfb83599ba064a56c4aa3d0833699dc8874c3ace562476b9eb938add899da39b4364b8 SHA512 d4c5ca882f17b51ababc62a863653f70603763de99a0b8db9129d319100dbe4055b3ad7a9dbdcc6f3bca0be06521a7b5ef20856ef8e5b954097040a91b850d35
-DIST pam_passwdqc-1.0.4.tar.gz 30572 BLAKE2B e41a8253fa6b05b88181da83244b5191b0bbb406a25ecc6b0de03e0ca9d515defb1617801418b0e5b21e5931b55466fe8a4c7dafbe81776f364deb4d9452fca1 SHA512 f9ea432614b5ce68a76d2fad0d290f5c9400e1185c8a893eb716b232c03c037a5cd725403b4ff74cd432d7368788dca708fafbc1b4305dd14089405d56c540d7
 DIST pam_passwdqc-1.0.5.tar.gz 29973 BLAKE2B e2edce3fa63994afc1f1fe65709ad241662c81113b67f6d17e1c5b36d6ea48be1d7f2cde77766fe2b92da2c22546a71122b95dc70b193edacfbdfd219f56ca6c SHA512 8ae6cb4cc520b06b05fadf60ac360964721a8a1e4481aff9cd7247c203e62b58d3aed4c14ba687b303de820689e0f5cdcf070fd396b7e13b0aae4cc5d1442235
-EBUILD pam_passwdqc-1.0.4.ebuild 1062 BLAKE2B d45feea9c5218331c8b20c7a6d1c269638b702d53c5a75df402b05413700ea2ecb9dfb1053d3cbc264bcbce4965ff0e980102647e09d7b9e03bd3a40f96e7a2c SHA512 8b6bb76d62dada62dde2a9d220ac39984052d17b489f25c761cc0bf841aa7c0f61bd4e7fcf97d4b0626c9b2cbfb03774bf1a4f0ac88c8a2fcb839d9073ca4df2
 EBUILD pam_passwdqc-1.0.5.ebuild 1116 BLAKE2B 8573b6b3952427ca521cd5918ab682a06c4e934a4187f4b713464dde567540cc8e2528b31bfd7daa3789f01f0c9c56449e63d0bbe10c0a8665337c70b4ebf62f SHA512 815777da6628e6652b82c99d04c11340f51ce81fa960c9b59352e19afa67bc38e5136c4dc00ee7d186a8096534782a262127975db741fd33c9d079d6026e5dbd
 EBUILD pam_passwdqc-1.3.0.ebuild 468 BLAKE2B c027d68c3f8e10ceab33b26ddc89316176eed36339558f68a496bf049eb6cad562e2ac8b59979a46e005c588703624e9ee21e6ac2c0acfb13a566f109d6e201d SHA512 52ed3e5fc99572c43a3c50cdf12c12ecaab89d46fd4f2ad965521f172144f1cf984bc0035a5ae144c6a23d0ec892c6dd3d078fa6299af306e83341fdb582d633
 MISC metadata.xml 586 BLAKE2B 677f93d293a7ffad0551bb35ad9b281ecaf31c62f15f64f0cf483c6f63048820bab11e798d1d69bd1cc13c27cba56f47632b3ae848add5d9490b051afcf96bac SHA512 09dda48a697cb4ca6fdd114d471bc8d0045903376b231b74e70f6f561862c5c79c2c5ed002e1fa41f7d1d63faa9c66d8d3b30fa80e7338508dd3a18bb1dc1b98
diff --git a/sys-auth/pam_passwdqc/pam_passwdqc-1.0.4.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.0.4.ebuild
deleted file mode 100644
index 53338be2a820..000000000000
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam eutils toolchain-funcs
-
-DESCRIPTION="Password strength checking for PAM aware password changing programs"
-HOMEPAGE="http://www.openwall.com/passwdqc/"
-SRC_URI="http://www.openwall.com/pam/modules/pam_passwdqc/${P}.tar.gz"
-
-LICENSE="Openwall BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa m68k ~mips ppc s390 sh ~sparc x86"
-
-DEPEND="virtual/pam"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	emake \
-		OPTCFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dopammod pam_passwdqc.so
-
-	doman pam_passwdqc.8
-	dodoc README PLATFORMS INTERNALS
-}
-
-pkg_postinst() {
-	elog
-	elog "To activate pam_passwdqc use pam_passwdqc.so instead"
-	elog "of pam_cracklib.so in /etc/pam.d/system-auth."
-	elog "Also, if you want to change the parameters, read up"
-	elog "on the pam_passwdqc(8) man page."
-	elog
-}
diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index f273c36bb2e9..6ec1635c604d 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -2,6 +2,6 @@ AUX pam_ssh-2.1-dot-ssh-check.patch 701 BLAKE2B 64b7ed30c85e67125ff74f1507454510
 AUX pam_symbols.ver 35 BLAKE2B 7a18277fef3362b21eb99b602781493de6818e93d86a0553fc97e67b780644b38a5233757a0b9b728d9a1cbc26513078bf99177809b6b5f68af273352b377819 SHA512 40e2d23783153bdfefc9ec7d9caf818e1d157bfa4f3074434e034aae47e3aa7d08b04dedbe06ef60ed2a93729f0e04aa09cf8e9f6929dfb15e4ae49c75c9d0d9
 DIST pam_ssh-1.98.tar.bz2 292989 BLAKE2B 08744c6649aa58c7221e5ec07e0c6aefa8d045cf30df01b941962d29f3abdae902b0fbad37923e3ff05536e422a1062732a6998e4b58d978d369df3d866ec1aa SHA512 bf6da4ced0619549d56516c6b24e899664e0948da7a0cc04ff1b536d06cc8c26242c83eb36ed835668c824b777e270aa293162ac77e3c479311386e6e5da39ff
 DIST pam_ssh-2.1.tar.xz 361000 BLAKE2B f22836af20b41ae7254f816c33793bb3a128b604ec36a20b207610deebf61f4d5dd070fd6f5093c6f7b6eb9e14f85cd81ddbbed7e97ee581124e5335722d036b SHA512 8252b15efffa5687f740963f7a3c3479b73f99eca26a17155f915a10b9a71362a2778449adf10f01c174cc8545961ce3ea64459338a7c995c242b209529fd640
-EBUILD pam_ssh-1.98.ebuild 1150 BLAKE2B fd6f276f661f17149e58a80a13445065cc616df44f6a8be8d7e2e5ecf7cc9f45eed2a4a2412370fc343a4de34bdcfdc44870030687a9e84be32f1f117c55f3fb SHA512 8d74d642a671baad3ad0a08037cafe9b59720cfb3c9e66b1a745599868b8809ebfc17bd273e7dc3d770e71e062318b982e48dfb13770da9acec76b9660419230
+EBUILD pam_ssh-1.98.ebuild 1149 BLAKE2B 992b24c2e63a6c3ab9e253e6953f1f31c2087299a9befa13532e94ff376c2790ded71e47d35244f7acee63a02761f5a04bb68ded168246daa7d5a68583b9fcdb SHA512 c1836e72948fe0fe59f2657c9d5d7fe6f05021cc25b94ef035fd33d63d3a6bc04e3e21d7738a662eab1b3a3bc0b23e2cef47fbd3c6f675fbf3a5f6db1febae27
 EBUILD pam_ssh-2.1.ebuild 1674 BLAKE2B 4234af139462e91adcc0184e56372afff1098a666f12e03bfdcb83ee9a8caaffac7fe1814c35159f80e2be5f21e6f419386d15b96ed1d62e231589cd75f3f40d SHA512 12508a96cff523b740ee0dc8cded9ddec545124417e65290fabe7644f5cc9b96206804cf7f071b793722f41305ad4e49ba4612a97ebea6ee01036a5f37cbc62e
 MISC metadata.xml 297 BLAKE2B 98d31672b8829a698e938ce81e26fe28692f3828d224deaf4e9f6e8f0c7c6e065094b3ac504a70e306beb5c863a8776ac2d0b17919e49022c152ed4ed98fa7ad SHA512 f524068347954519bce747d0bcb8b45ef078438da36f5f3ad18b07429b731e15c3ab6f888e7f0d399a9c93ff76fb07d36087bdb55afee3eae1499ffeb8ff1d27
diff --git a/sys-auth/pam_ssh/pam_ssh-1.98.ebuild b/sys-auth/pam_ssh/pam_ssh-1.98.ebuild
index 46964376549b..3f8800d3f5c4 100644
--- a/sys-auth/pam_ssh/pam_ssh-1.98.ebuild
+++ b/sys-auth/pam_ssh/pam_ssh-1.98.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.bz2"
 
 LICENSE="BSD-2 BSD ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Doesn't work on OpenPAM; looks for OpenSSH at build time (bug
diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index a626c7dad5d5..c2fd621d2e4a 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -1,4 +1,4 @@
 DIST skey-1.1.5-patches-6.tar.xz 34108 BLAKE2B 410dbe673e0a32a4c3fd0610f898057e7b3afcc0d0fd124683033790f9c518bf89486f13e8d87825c0959ff34e91eae82df6ba3b79c1dcb99a34d5657036d5a6 SHA512 2c807675cdd6b800f03427d79d616f59ac9d4d438221913328ec92e5dd13af185f74a24e17d36af8d49a51c4ecc5b24ef198489acce416d829e8aacf5d3c208a
 DIST skey-1.1.5.tar.bz2 61911 BLAKE2B 6226a91f4018bee5796bf60339dc8554324a044eef18a69ea176d060cb4af90779cafaee58f42ad7a6e433b94da8de6e5e4d1ee9362904966fd0872d5ac3ccce SHA512 4cbddc7e31134d5e23801a9b07de0d05c8357aaa8dddfb8426fceead3f54e539f77204f78a08b2a93890ef2f4f807a2208080f58f80818afa1b8cd4884b1fb37
-EBUILD skey-1.1.5-r11.ebuild 1977 BLAKE2B e20a4071b18a5640e91c45ebff8bf7b87629c910b426eea46d3374580bf9eb52d6cb72fa0cad1e0f66675243aad0da1187c0ac672a4d45fb00bc56af362c6cda SHA512 b6268dfc3b22b3dd97781605b246b5a99a0d9abe716667dab1771c87991a87fc5d2c4dd47d51300af248fac42b87532c89799a7d769f9d021f6a5ea882e85860
+EBUILD skey-1.1.5-r11.ebuild 1976 BLAKE2B f0c0ed43d8da97e7a8b60b408be8de09cf94d6c5905f5a676fce9f6ce39a9e7536ccd3961a8e1d031241993f9fbbe3cb9dec169177dc860b5a4ba3460c32487c SHA512 ce6f7ad108acf6cc8cbc2d8207356c69fee321215b789fd3814cebe47f30b43be41c93c99808617fd20c8790c9604cb883c2deb4ed97d2fcd2ba9e2357e00fd6
 MISC metadata.xml 1432 BLAKE2B efd6ff43e309d55d511d6bf4527a8565df2da6815bafb9079d465be95f128b9f17eb8019dd58a1230c41cb75eda4eba412231ec7028e9d67a05b18e33d78827b SHA512 8fe776255ff049ae9c16ee0ff157761114ca4fcc777d103e707557ef5f18fba9d65e63a77f24219e27d267cd76839abf128210969dc4330d66920a2ee574aabf
diff --git a/sys-auth/skey/skey-1.1.5-r11.ebuild b/sys-auth/skey/skey-1.1.5-r11.ebuild
index c8c448a15df3..15a60dd5578f 100644
--- a/sys-auth/skey/skey-1.1.5-r11.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r11.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}.tar.bz2
 
 LICENSE="BSD MIT RSA BEER-WARE"
 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="static-libs"
 
 DEPEND="dev-lang/perl
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ccea1cd12118..4db01012881c 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
index 494f7fc7ee2b..54ce05bd8134 100644
--- a/sys-block/tw_cli/Manifest
+++ b/sys-block/tw_cli/Manifest
@@ -2,29 +2,6 @@ DIST 368_tw_cli_debian8_beta.tgz 1958337 BLAKE2B 5e10c253a36132c8ee74e555b7e9151
 DIST CLI_freebsd-from_the_10.2.2.1_9.5.5.1_codesets.zip 1531484 BLAKE2B 6bd1a5523a80c32f6251cf4e841f16f3a09ffe77eb452d7b40f37d9f476fec3f379454f4c05b15d4753dd12fd0d5b50acf07dbafbd4f80ca5a1ecb13605bab16 SHA512 04738e9bd644561cf33d2f687159a0bcaf1ab56f340d19d88ecd0b038b89d5dd136b462189452c0578b90e1b276f9d0edc3204e5baebfc2730f319147b636708
 DIST CLI_linux-from_the_10.2.2.1_9.5.5.1_codesets.zip 1878621 BLAKE2B 628070e5f6dc4dbc75f029067298be278b696b84afb245d19761043183bc6232fcf48dfe46954ef61e027082d974905244f6b3e73b596fbbe8d7955375859be2 SHA512 e8a7f27401e7811d5f8533d839066bdf6d93eeb2cb1242b00af7fc559b0a34316f8e6dc80f68e869d97f44290ea32c9e65d1d857c1010009ad1a540252400e31
 DIST LSI-tw_cli 35638 BLAKE2B 8267d311b7b09dd3f0e619fd7d5aadcaf5b24afa1958c99e838b9280b175b8f070dc58164622bf3ab54dc5ddfc24a4a4ea06971a919b17a3c2594541e43ea41f SHA512 1a1d35395ffccf70004b0c111d8c4a7e408cf0c57503bb4d1fdd608f9b71d6ea4d7488307dd6806eaf6557d65badd9c43aeea3e7c1ddae1c56962c85c2b868c9
-DIST cli_freebsd_10.1.zip 1500092 BLAKE2B 4e7d68a99cef9429aba1898a1b9340259e78a531a2b19140a05b1dc7fd031791fb1309a6196e746195bed9f18a7d12d890adc437ebd928b37a4b0db8e21a29ee SHA512 b5463919975c53e191540b4b7c58d8b08ef45ad06f82fe61960f65a46c82230486bf53bc8c535a9fd8ef3e0698cc6676696a319f5e30b904211d7b614dd7a49d
-DIST cli_linux_10.1.zip 1845534 BLAKE2B 41e9befd0cbc8e9cacccfa68f120eabe8959586728146863884dcf5027f1e831edf54b1a3b6ab38f176a5bea0f3b99be59525684a3545e66895879da9c594cb5 SHA512 8e424042f8892d4fb77664a444f2ee2a55406929013d19c79612e4d0347338b68ebf9e11cdcb2895544b53705ec9401f35581d27e34e6465e06c16a5cb60096e
-DIST tw_cli-freebsd-x86-9.5.2.tgz 785950 BLAKE2B dc8ab70f17446899dc7df8204a608e8809b2c33c7a6806d56181e2ea1d9f65c4ec58009917e741a47e0eb27ce7003330f9c8d8b459ef33a97c8fbe05c9c79440 SHA512 44181e6c2684637fe34cd4ad2143f713175d127bd2bc7fcf9c9a3563d939a3244da3e8b3620a123b2da173854bfc95bca91fe799261aee9913b5594a1569a8dd
-DIST tw_cli-freebsd-x86-9.5.3.tgz 793534 BLAKE2B d5dd84dab83b3d2838941989351000c64199e9ce99dd7d0e897801a15f3176973ce932636e9fbb67898339f1a01cbd8a8f28e7d7df3f2ece1692e9c3dc0f5a20 SHA512 ceeb072f2501c78ac56666ec13bcf0edaf047be399b16cdbd5a29b68574e10070d91611c41eb36251ca924c7532ed9df3fa397fd90b251ebf8d8a1e0befbd4d6
-DIST tw_cli-linux-x86-9.2.1.1.tgz 709976 BLAKE2B 9d3659bdcae50da62de0b97b1c049114a7198c8423fee6304253ded5c7027397d994ce6237cc3c053e8aed5ac3785e3b11030655d7eb7d7933ee9c6408b56c97 SHA512 c706b8c710500f700736e161b8cefc821b91a9f726d1b07e74ab1114bb7d91300ebdcd59d2c0af40d98819fa9c839a03e3f4ee991e65550b0655d395a8cbb3b7
-DIST tw_cli-linux-x86-9.3.0.4.tgz 794421 BLAKE2B b9eb07c062fecc680561d28e05e938da76085e2692ff60d79a12307e633bafc85eacbffcf95bf9b2ed9a3a84f9a29663d89f5f99c23815a6daf987504d40a661 SHA512 16539e9c486f583122a30c8dd1a7c6e5d05e7878a1ee44581f0109f8daf1a973c3549d163a4bea10b185d97b067a32f6b8c045db198e283581e949749b5588a3
-DIST tw_cli-linux-x86-9.4.1.2.tgz 798925 BLAKE2B 905d1707b20e1c5d90e6d6c6828543f61b3833ff85bfebc53470d5e038a971c8bb05f7b385b225457d18ec761a0289d0c593a44b86ebeddf43e0fa69aabada66 SHA512 5b307c79d3fe75bb99b536b4dfa77ccd2a2a4d063c5bf492e1b429c4f4894e66b895392a9504e811a8886bc615ad0d7a06e178865c8c9a102a381f2e9341ac7a
-DIST tw_cli-linux-x86-9.4.2.tgz 806428 BLAKE2B 07323b5a1ae495c587a11d67382c34781f060175fe8f37a50fca98c954adef940fee09f091d133ee05e0ea27d97f1710b45cab4eefaea9f0973bfebbc81b9bf9 SHA512 b4a30c7e79f7ce966ca08968682e20777f43c2cecd8001caf0e6e36e3efb3418b8887a90730d88b99f9854add771bbdb9c55a217551fcb2edf49792aba8b1338
-DIST tw_cli-linux-x86-9.5.2.tgz 950535 BLAKE2B 1de7f7aee53de3e51cfebf9d873025d6ca1c85ef67ef7741bb36b2e66d161c76b5f5da2e2ac657ed5c9c67b03097a0f9a66ba35625c393be028b681e89176402 SHA512 c10dbce0472afcc65e8cdabbf90b78c9de2a7f960582c17af667e6561524d1a63dbaeaf24bcd25ab5e602da8a3be9a100ca01b54c3387452a1a80458f5b5c077
-DIST tw_cli-linux-x86-9.5.3.tgz 958837 BLAKE2B a100d98b162c2f0852e8bf867002cf59cbad2e65bb6fec5e28d7542355554ff5dd96868f5142790a96905e7a00b67bcaa9bd2e87661ed76de582007664f69857 SHA512 8f773df497b273ddcba04bface949903fa25a099d4a2d94ddb11317ce092226dee9eddebfed6be6798bdb58ebe39438acb6ed56cee57ce72b7ce34d9ab2f8094
-DIST tw_cli-linux-x86_64-9.2.1.1.tgz 678634 BLAKE2B d2b720f17094b3baba65731e7b47687f02d6bdab16626203ce7f9bdd2ef1a39c86ec3a967934bf1908d7a3ebcf6c7a0645733376742e466484dc8e261fa1535a SHA512 751a537c74383efaf004805e96c3f7edf29a18dab744f5531488ccc54b643e2929308bafea9f86751567120a803e1085315befe1b414d2eff6629e6bc0c8dab6
-DIST tw_cli-linux-x86_64-9.3.0.4.tgz 846293 BLAKE2B b875b9d6456a1eccdd23ad307e273541f20bbb436861d4304cc28bcf2d2e58bf515cc335dd01d00989259e816b8c9f18a94ef1d8c1ac67f998d758109031b2d7 SHA512 fde89108f347522487a4b47fd91332bb33566e6e3feb7818339f110c71ba89088acccbda47c4a081d04aa45e58a49483d82b4f2ab1296e1d9d8ebb178db58875
-DIST tw_cli-linux-x86_64-9.4.1.2.tgz 831001 BLAKE2B 2ac2e95b4438b16f769ad1a3b1b88e7f54d53249976fcb2623f594fe50979b53547c644548e57c5c3135f329c18168d33846fefd65e2819e661c202fee8945cd SHA512 15ca392105662f9c59c643b351672e922992350b973cceb946127b0a285fc93b7d36b6e67483010043b0f945bb256d4380ef99a8c404368a4113a8e297a07e79
-DIST tw_cli-linux-x86_64-9.4.2.tgz 837638 BLAKE2B a8a50dfc03e22d60d9b6edbc8d08bb6fa12230fcf16aadceca825c396b2dfa07c54da7d528b426e1d1c00cb56bf6b03bfdf663621071511b7e6bea98c2333fd6 SHA512 bf6b571c4620618be2099df526ebf347881280bd6e60f5b38051b16cf61d88f265ac58604a6d58d4c6c37f960ec8cb370c060cdf1feabcbb0253a4b6dff54050
-DIST tw_cli-linux-x86_64-9.5.2.tgz 979071 BLAKE2B 5e875857c8155dddbc74ebfeecc29e09659b0ad656f7965b3f186a76167b395e609f7f9ce204476192a8bdd30064043b7671f9dd6ec38c8e69b86dc1f8f481f4 SHA512 de0c71769933e18a9f8e6b12875f97856051bb8c7ec1fe7a365c74b8ddf5773aba6c89628f677b6d5116d3f2933c38ad14a83c289e2fc9a6ae91391b4db36191
-DIST tw_cli-linux-x86_64-9.5.3.tgz 986751 BLAKE2B 3457db45b7f6982e8323b8bc18ff460df37dc6c76a06d15de65f4188d539d0978ebb1874ae0ddab117adfd064b98328bba04342b01a95479c1ff9023391670f2 SHA512 5042c3b3499ae67ab0001212ee4906be2a4f8eeac55d1271f7a9880af656c5cb16b526c914b07993b950943eee677d814ee8c4dd9aabac2de8c213451ace5797
-EBUILD tw_cli-10.1.ebuild 3060 BLAKE2B 6498dacd31137995bec3495861477daa762d8c829a462e567e9b0323526a35b527bddc174790c14bcd53fdb594c7fe1df7083db756ebdb814a009ee008a0e932 SHA512 2ab131631b9fcb57d169057339f3e9200ec739210e287e4f1394c8bb1896fc85633c86ed1663c73dd46c612c52ebdc701a206b36f039ef6712b6f8de86f6ee6a
 EBUILD tw_cli-10.2.2.1-r1.ebuild 4609 BLAKE2B ba957bf3051c8301fa9e4f0d4089239784d938cbe8aa5fb756b65c4af54a28babada66ee558110751698ff0669c6e9bbaf1d7b376fde997ad9062ff8861396f4 SHA512 faf9ab0f39c961c71a603e72093ae975988dfae2bdf7b37609ee245f9428e793b88a19567582cddbd867c5ebed56b973826cad011cf49aa050573bd0bb3c0095
 EBUILD tw_cli-10.2.2.1.ebuild 3983 BLAKE2B a8ac8e1366839544780e12d552fdb0ddf869933ecaa8e01027979dcf18586015ac78b2d561a1fd4098c87ce0afd9982e8ed71a2eb98787fe6aa0c433cc2ed317 SHA512 4ad422b2f4c91412bc9b18a9eaae98f86dccf90f9425113273ea008b6097d46e6ca5ef66a91b31d43c258516e1335aa97299dea2fe277f44b736e080819f52ba
-EBUILD tw_cli-9.2.1.1.ebuild 2029 BLAKE2B 1c9d16b4d56879fb3279163bb4c8533db5dfc43aa32fa4bc271aa409f224af555fd88f8b74e0ad3a8d211eb9f1117cdca956debc983cec032d75723ba477e58c SHA512 ff83bc64fc61a11490c63f0d5f9fe639c717e064709251bc7b535cc6926db0063e4f0f1e46ad5340b7d049ace7cfb006c8ec5663587ad13fbe936ad6a14fda23
-EBUILD tw_cli-9.3.0.4.ebuild 1917 BLAKE2B b0e15b9a0765c16e26ca1e6a42aecdd5f070bfeb69033eed3a4edcd96e49610e91a8f52fdd1372d401126bb90886944e403c73aa7b2355d61b115435c253afd1 SHA512 1dd4dbf87d5b3f3ce7b5d91b7430bc715cdb3b629159e3e99e9aafbf874ab26957c024946e280dcf606e4036a5be748a046e99060fd5b15cfbb770b23a2b4d8c
-EBUILD tw_cli-9.4.1.2.ebuild 2312 BLAKE2B af1ed9e63af5467e099a2748a8971a13aae71810be7008bfd8f6a1566bcac48a7defad6c5647e89cdbd3d331af7144d81498e368d2c2b10e9d71f4880157af38 SHA512 9394a0112d78b87fa5e2d0cdf7298dba0bcc1138f3776551572a1a57781f04248c71a77662c41004fca848b1d1de9ffae8c0ec084441eae15c314a4174a6874d
-EBUILD tw_cli-9.4.2.ebuild 2300 BLAKE2B 0555bac0836cc9f45a61b7c99446dd6794459ddc3b1f4916072d8b0a69b7b3002e721fb101f697bb3ce8b97a6c2b32772a8d536240019afe86403af1ffbecad6 SHA512 785b6008f511d920266b30c203b12840a5e119251a075e37183bdf5206b3a85ca19fd2f88692c1c596237599c1ab8ea74b604b78b7380ab8e4c248eda7ff5c5d
-EBUILD tw_cli-9.5.2.ebuild 3160 BLAKE2B 3b4f0ffafe7ad314202c1944cab44d9f6948296297fc836000c5354d5d65b979ea6208054f70698ce4962de4b2947bfe869b9afdfdb0de79fc92e95d643c1b2f SHA512 ee07d3b0d52395a929951afeb779c53a83284bca4d335ee46534ef5c260202bcba32f04eb687634a65088458f86e087b49f9b8491cb95bc27d493bb57ee99647
-EBUILD tw_cli-9.5.3.ebuild 3162 BLAKE2B 2ae7d766ce1bd6ebd1d54aa20dd0e48e8063fadaa4fbe1aade2f06f027c48977aa75d999bcfa8f3c0ef464f9fd8c4a644df67b3906494515acd6c1ad77999cde SHA512 684c66415704aacaed5c5b635f3d11447dae8bb914875b77c26c7f227c2349a1673386b45fb6ba4b8063cfa0ab51ce294a0773fb3546510c5e47b62e8a91effb
 MISC metadata.xml 311 BLAKE2B 56fbd3d73b4ff55b0f80481c6c22a68371cfd71e0ce195ca24e8f9e90894a89368982a699a5e39c3ed0b108750674d6b065d1b63c168cc3596a9f300cbddcaf9 SHA512 f60d7a3782e3920dfe2fe2e2986426738be4974c1589d48a1c3991a1ff4ff11fd246124ac2ed740818c6ac801ce9b31ad570cd2b968328c2902c13a97fd197f3
diff --git a/sys-block/tw_cli/tw_cli-10.1.ebuild b/sys-block/tw_cli/tw_cli-10.1.ebuild
deleted file mode 100644
index 6fffc769fe1a..000000000000
--- a/sys-block/tw_cli/tw_cli-10.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="strip fetch"
-# binary packages
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-# The naming of <=9.5.0 for freebsd was weird,
-# but 9.5.0.1 has it sanely.
-MY_P="cli_${PN_KERNEL}_${PV}"
-
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on 4 cards:
-# 7006-2 on x86.
-# 9500S-8 on amd64.
-# 9500S-4LP on amd64.
-# 9650SE-8LPML on amd64.
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-#HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-HW_VARIANT="3ware%20SAS%209750-8i%20Gentoo"
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.lsi.com/DistributionSystem/AssetDocument"
-SRC_URI_linux="${SRC_URI_BASE}/cli_linux_${PV}.zip"
-SRC_URI_fbsd="${SRC_URI_BASE}/cli_freebsd_${PV}.zip"
-SRC_URI="kernel_linux?   ( ${SRC_URI_linux} )
-		 kernel_FreeBSD? ( ${SRC_URI_fbsd} )"
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-SRC_URI_mine="${SRC_URI_BASE}/cli_${PN_KERNEL}_${PV}.zip"
-LICENSE_URL="http://www.lsi.com/lookup/License.aspx?url=${SRC_URI_mine}&prodName=${HW_VARIANT}&subType=Binary&locale="
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.zip
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA, 9750"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "3ware would like you to agree to the license:"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarballs manually into ${DISTDIR}"
-	einfo ""
-	einfo "Linux - ${SRC_URI_linux}"
-	einfo "FreeBSD - ${SRC_URI_fbsd}"
-	einfo ""
-	einfo "However, they have given permission to redistribute."
-	einfo "https://bugs.gentoo.org/show_bug.cgi?id=60690#c106"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin ${PN_ARCH}/tw_cli
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.2.1.1.ebuild b/sys-block/tw_cli/tw_cli-9.2.1.1.ebuild
deleted file mode 100644
index f84b42baa704..000000000000
--- a/sys-block/tw_cli/tw_cli-9.2.1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-#set
-DESCRIPTION="3ware Command Line Interface Tool"
-HOMEPAGE="http://www.3ware.com/"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* x86 amd64"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-#DOWNLOAD_URL_BASE="http://www.3ware.com/support/download_${PV}.asp?SNO="
-#DOWNLOAD_URL="x86? (   ${DOWNLOAD_URL_BASE}499 )
-#			  amd64? ( ${DOWNLOAD_URL_BASE}501 )"
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-SRC_URI_BASE="http://www.3ware.com/download/Escalade9000Series/${PV}/${PN}-linux-"
-SRC_URI_X86="${SRC_URI_BASE}x86-${PV}.tgz"
-SRC_URI_AMD64="${SRC_URI_BASE}x86_64-${PV}.tgz"
-SRC_URI="x86? ( ${SRC_URI_X86} )
-		 amd64? ( ${SRC_URI_AMD64} )"
-DOWNLOAD_URL_APP="http://www.3ware.com/support/dnload_agreeeng.asp?code=2&id=&softtype=CLI&os=Linux"
-
-#S="${WORKDIR}/${MY_P}"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	einfo "This binary supports all current cards, including, but not"
-	einfo "limited to:"
-	einfo "PATA: 7210, 7410, 7450, 7810, 7850, 7000-2, 7500-4, 7500-8,"
-	einfo "      7500-12, 7006-2, 7506-4, 7506-4LP, 7506-8, 7506-12"
-	einfo "SATA: 8500-4, 8500-8, 8500-12, 8006-2, 8506-4, 8506-12,"
-	einfo "      8506-8MI, 8506-12MI, 9500S-4LP, 9500S-8, 9500S-12,"
-	einfo "      9500S-8MI, 9500S-12MI"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at"
-	einfo "${DOWNLOAD_URL_APP}"
-	einfo "And then use one of the following URLs to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo "amd64: ${SRC_URI_AMD64}"
-	einfo "x86: ${SRC_URI_X86}"
-	einfo "Download the 32-bit version for x86 machines, or the"
-	einfo "64-bit version for amd64 machines."
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.3.0.4.ebuild b/sys-block/tw_cli/tw_cli-9.3.0.4.ebuild
deleted file mode 100644
index c981b3a1405a..000000000000
--- a/sys-block/tw_cli/tw_cli-9.3.0.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="http://www.3ware.com/"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~x86 ~amd64"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/Escalade7000Series/${PV}"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz )
-		 amd64? ( ${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz )"
-# x86: http://3ware.com/support/download_9.3.0.2.asp?SNO=616
-# amd64: http://3ware.com/support/download_9.3.0.2.asp?SNO=617
-DOWNLOAD_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/Escalade7000Series/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	einfo "This binary supports should support ALL cards, including, but not"
-	einfo "limited to:"
-	einfo ""
-	einfo "PATA: 6xxx, 7210, 7410, 7450, 7810, 7850, 7000-2, 7500-4, 7500-8,"
-	einfo "		7500-12, 7006-2, 7506-4, 7506-4LP, 7506-8, 7506-12"
-	einfo ""
-	einfo "SATA: 8500-4, 8500-8, 8500-12, 8006-2, 8506-4, 8506-12,"
-	einfo "      8506-8MI, 8506-12MI, 9500S-4LP, 9500S-8, 9500S-12,"
-	einfo "      9500S-8MI, 9500S-12MI"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${DOWNLOAD_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "\t${SRC_URI}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.4.1.2.ebuild b/sys-block/tw_cli/tw_cli-9.4.1.2.ebuild
deleted file mode 100644
index dd11d08b5500..000000000000
--- a/sys-block/tw_cli/tw_cli-9.4.1.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* amd64 x86"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on two cards: 6200 (amd64) and 7006-2 (x86)
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI="x86? ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )"
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME}"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.4.2.ebuild b/sys-block/tw_cli/tw_cli-9.4.2.ebuild
deleted file mode 100644
index 362e8eadd4c0..000000000000
--- a/sys-block/tw_cli/tw_cli-9.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on two cards: 6200 (amd64) and 7006-2 (x86)
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI=""
-for i in x86 amd64 ; do
-	SRC_URI="${SRC_URI} ${i}? ( ${SRC_URI_BASE}/${PN}-linux-${i/amd64/x86_64}-${PV}.tgz )"
-done
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-S="${WORKDIR}/${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME}"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.5.2.ebuild b/sys-block/tw_cli/tw_cli-9.5.2.ebuild
deleted file mode 100644
index f2fc5054bc1c..000000000000
--- a/sys-block/tw_cli/tw_cli-9.5.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="strip"
-# binary packages
-DEPEND=""
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-# The naming of <=9.5.0 for freebsd was weird,
-# but 9.5.0.1 has it sanely.
-MY_P="${PN}-${PN_KERNEL}-${PN_ARCH}-${PV}"
-
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on 4 cards:
-# 7006-2 on x86.
-# 9500S-8 on amd64.
-# 9500S-4LP on amd64.
-# 9650SE-8LPML on amd64.
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI_x86_fbsd="${SRC_URI_BASE}/${PN}-freebsd-x86-${PV}.tgz"
-#SRC_URI_amd64_fbsd="${SRC_URI_BASE}/${PN}-x86_64-freebsd-${PV}.tgz"
-SRC_URI="x86?   ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )
-		 x86-fbsd? ( ${SRC_URI_x86_fbsd} )"
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "3ware would like you to agree to the license:"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarballs manually into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo "x86-fbsd - ${SRC_URI_x86_fbsd}"
-	#einfo "amd64-fbsd - ${SRC_URI_amd64_fbsd}"
-	einfo ""
-	einfo "However, they have given permission to redistribute."
-	einfo "https://bugs.gentoo.org/show_bug.cgi?id=60690#c106"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.5.3.ebuild b/sys-block/tw_cli/tw_cli-9.5.3.ebuild
deleted file mode 100644
index 004bfa41f707..000000000000
--- a/sys-block/tw_cli/tw_cli-9.5.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="strip"
-# binary packages
-DEPEND=""
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-# The naming of <=9.5.0 for freebsd was weird,
-# but 9.5.0.1 has it sanely.
-MY_P="${PN}-${PN_KERNEL}-${PN_ARCH}-${PV}"
-
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on 4 cards:
-# 7006-2 on x86.
-# 9500S-8 on amd64.
-# 9500S-4LP on amd64.
-# 9650SE-8LPML on amd64.
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI_x86_fbsd="${SRC_URI_BASE}/${PN}-freebsd-x86-${PV}.tgz"
-#SRC_URI_amd64_fbsd="${SRC_URI_BASE}/${PN}-x86_64-freebsd-${PV}.tgz"
-SRC_URI="x86?   ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )
-		 x86-fbsd? ( ${SRC_URI_x86_fbsd} )"
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "3ware would like you to agree to the license:"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarballs manually into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo "x86-fbsd - ${SRC_URI_x86_fbsd}"
-	#einfo "amd64-fbsd - ${SRC_URI_amd64_fbsd}"
-	einfo ""
-	einfo "However, they have given permission to redistribute."
-	einfo "https://bugs.gentoo.org/show_bug.cgi?id=60690#c106"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	dohtml *.html
-}
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 04c71a5391f0..a5211c09da6d 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1,11 +1,5 @@
-DIST zram-init-2.7.tar.gz 4821 BLAKE2B d1dc1aac5537f92b868daa4b113bf5e68a990439c4aa71d9f48cf2a8637c2054d2b158d4107a608362da2f3c0daf6a957eaab75947f21fcfb93ff9201533a509 SHA512 db8dc5580b8405752d58996e5927573b687795b598c94948ccc51d038f7c7dfc47b64651d9554c1807d8f6453498c3f1efe6f2d34b82eb6b1df2d8f7e84980a5
-DIST zram-init-3.0.tar.gz 5578 BLAKE2B 980ae8a2df219d087e6a5ec0895b5b6c52b9320793a296e9f3582931b92afd226da2083b4f625423c951125d4587b86482407ed4413b1f0dea8a47ed3a02246f SHA512 f962aaa9c5d7f8f7566e9e405de4709fcfd0b659c7dcf79008ca5b7b18ab44545f363e8a695bfff07068e0889ec79ce54af578493f82be3848ca306865d6555a
-DIST zram-init-3.4.tar.gz 5825 BLAKE2B aa4ec0f311a79f69b1954f469baf546733864e31dd457b7b406408a0d6a768176d37d2f1bed93f1d87696c41681555c8bb871f5432964da29d3782122f034743 SHA512 985cbe5dd63c900ce88bf8f8989bc04f982b27104dbc40e9c4cf504310aca335efafba842d801e0b9250e8b6925d063bcd2c555122fc7c7295128687ccd4080f
-DIST zram-init-3.6.tar.gz 6207 BLAKE2B 13d97889495c19b03ec190168b71072bf6f5e1664e98708ebff0cd746d3b574c519124847dac67b81f05367b95972a08b841fd65cdd2b645ca1c4577278e5c4e SHA512 535104beca6de225aeb482ebb7a01a2498c841784a68d60e8e09f04ab193e6a8ae3ea55797308c89d54f3ce66bdac3f8c535059561ea6ccf848582c594b7f667
 DIST zram-init-3.8.tar.gz 6619 BLAKE2B c22482a619e5b0137c2d3eb45babee82ff36778a32caaed959beaf6ed3683e0010ef42328f8c4db7956696ca9c6a80c9e676c9db7d533f7283832036203beb34 SHA512 c083f34bba6031f8e247f61a1451343e14cc4bc5c4731ad3a32a5f0eea265936a83b27ad0e3cbd2ba0e05e2bec1e6ae739b6e4149d120dafbcc057437188f07f
-EBUILD zram-init-2.7-r1.ebuild 1054 BLAKE2B eb1ec31d761c33222838b18913a1616da02308fa67d4b359650fe9f7562226851737bf144910d5e5eead359b0588ca822da665da6db0304ed0b3fcb2145f8d67 SHA512 54e1eb814bdc73a6234042c24a0863528bb261a0014ac66bba711a5205454b9b9a24b6fd0f7f83ca0f1e66eec11f1b8d399d02b46f3d5b93089a3ae88b689d04
-EBUILD zram-init-3.0.ebuild 1422 BLAKE2B 0bf41187226a84f3769a8ea336c9ae91d98c741d8b288f9bd7058e51c6671f95394fa0dd7f7689393dbad5d4b7285439470c9801723c269da7c3160ba4265e27 SHA512 429b4cb7f92820bd1a599e63c9c748456e5abc41e0746bfad3095263e3ddd9844d164e0a44cdc074a48f4de675272bf675f5a5d6fb4f58fbb06613c65526883b
-EBUILD zram-init-3.4.ebuild 1465 BLAKE2B 3af374461699d75e72d0812a9d146389fadcee7fb3064c8aa25123270c778d1dbb2caac05adf78f34791ca57abbb71542e30d8464de46482e42d1e30cc3d4691 SHA512 14314350d03bec15bbede16b00088eb6eac1f2e72d5b554d17c1de29ef25f664bfcbf4ec7fe1864ff10941e0343c29f80cf3ea26279ab8bdbdabb8ce0c996c7d
-EBUILD zram-init-3.6.ebuild 1139 BLAKE2B a30675edb2af52eaf6c1bd7fa5ff444308f97e85ef48eef75efa72ab6f55b5fa7c0f2db85db7122cc57a7668711dc1c9c00cf969b08089fee9858828dcc89dad SHA512 eeb1344b6143a72b6d0752ebaf4890d9a226204246b205bcb7c1ede0e32a5962380ed86bdb48d3b7607c2ed337caad3827e16c9cdb18da559811a62d46dbea99
+DIST zram-init-7.1.tar.gz 9054 BLAKE2B 70c1aee839db3c4599fa59a0ecda7bb7a905a18cbbd90872865f266364da0602bd6ada85c35d7da5f8e6f4c6f9da122abf01abd57080a0728d4314fc2ed03c0d SHA512 6a9a6568d1c439f941401cb5638645a034a3cb29aaafa0d7595ad19fe7c50296e72c6751393eaa5cd8877b0d2bd0376339fb0f596c9517f9b17d425cc9c5ed53
 EBUILD zram-init-3.8.ebuild 1151 BLAKE2B e183bed4112e7b6808fdf1f62725d5be30d0c79a47955ee507c897142887c12897c6ccf2b4868d67fd41c823badfb30ce62c76678b3c6466ff8f45802e00eaa4 SHA512 7e7054291226d0576c56225508c60fcc0f4be6cfc96c8c01c50928d314edac1b79b5a2acfca532b3509c317ddc633fde2578d3a9afbd4050dce17d36828bf85a
+EBUILD zram-init-7.1-r1.ebuild 1213 BLAKE2B 80858d6790b463261b622bdf31d29f8f159665f1e5196a380c7b31a2782e33e2d12cea97df7e5e7928fcd3d5920035f2240a06fa76773402a7206759875b23f3 SHA512 cbd41b4bf29c8fda5b3c56bea4a81d780d06ad121db441809536b0fe7f183fa294c102710487b9982da7c5aed8a43a977d6924282b698799794259e7ed872d1f
 MISC metadata.xml 328 BLAKE2B 844b8904dd7452f6d78ba5322008aeedcb1cfbc25447320b37cc3a7e810d6725af9399150aaffa1d0b17b6c531e65d2ac5b37a90db7201c99a8d20f7fbfc2d90 SHA512 9f64f5788512ad221a6921fbf60a1cc4c1cab6e0a42e0fddb0f9642b4a1139d366bbe95a6aac5d6bc34f4a223801f3b58fb66290700700cff5b1f3e50c6b5e43
diff --git a/sys-block/zram-init/zram-init-2.7-r1.ebuild b/sys-block/zram-init/zram-init-2.7-r1.ebuild
deleted file mode 100644
index 17216d168a84..000000000000
--- a/sys-block/zram-init/zram-init-2.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils readme.gentoo systemd
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-- sbin/* || die
-	epatch_user
-}
-
-src_install() {
-	dosbin sbin/*
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
diff --git a/sys-block/zram-init/zram-init-3.0.ebuild b/sys-block/zram-init/zram-init-3.0.ebuild
deleted file mode 100644
index 8b70fde5356e..000000000000
--- a/sys-block/zram-init/zram-init-3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info readme.gentoo systemd
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-- sbin/* || die
-	epatch_user
-}
-
-src_install() {
-	dosbin sbin/*
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if kernel_is -lt 3 15 ; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "sys-block/zram-init default config starting from version 3.0"
-		ewarn "requires a kernel >= 3.15.0."
-		ewarn "Make sure you have edited it, so it uses only functions"
-		ewarn "available for your kernel version (bug 525302)."
-	fi
-}
diff --git a/sys-block/zram-init/zram-init-3.4.ebuild b/sys-block/zram-init/zram-init-3.4.ebuild
deleted file mode 100644
index 2b710a996008..000000000000
--- a/sys-block/zram-init/zram-init-3.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info readme.gentoo systemd
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/openrc-0.13"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-- sbin/* || die
-	epatch_user
-}
-
-src_install() {
-	dosbin sbin/*
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if kernel_is -lt 3 15 ; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "sys-block/zram-init default config starting from version 3.0"
-		ewarn "requires a kernel >= 3.15.0."
-		ewarn "Make sure you have edited it, so it uses only functions"
-		ewarn "available for your kernel version (bug 525302)."
-	fi
-}
diff --git a/sys-block/zram-init/zram-init-3.6.ebuild b/sys-block/zram-init/zram-init-3.6.ebuild
deleted file mode 100644
index ffe264d34b1c..000000000000
--- a/sys-block/zram-init/zram-init-3.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1 systemd
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/openrc-0.13"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-- sbin/* || die
-	eapply_user
-}
-
-src_install() {
-	dosbin sbin/*
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-block/zram-init/zram-init-7.1-r1.ebuild b/sys-block/zram-init/zram-init-7.1-r1.ebuild
new file mode 100644
index 000000000000..e3dedd90a01c
--- /dev/null
+++ b/sys-block/zram-init/zram-init-7.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
+HOMEPAGE="https://github.com/vaeth/zram-init/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-shells/push-2.0
+	!<sys-apps/openrc-0.13"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
+	rc-config add zram default
+If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
+You might need to modify /etc/modprobe.d/zram.conf"
+
+src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+		-- sbin/* || die
+	default
+}
+
+src_install() {
+	doinitd openrc/init.d/*
+	doconfd openrc/conf.d/*
+	systemd_dounit systemd/system/*
+	insinto /etc/modprobe.d
+	doins modprobe.d/*
+	insinto /usr/share/zsh/site-functions
+	doins zsh/*
+	dodoc AUTHORS ChangeLog README.md
+	readme.gentoo_create_doc
+	into /
+	dosbin sbin/*
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index d14be9e7b5ec..79151d144100 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub-static/Manifest b/sys-boot/grub-static/Manifest
index bf1ad06938dd..3d28fab93d6e 100644
--- a/sys-boot/grub-static/Manifest
+++ b/sys-boot/grub-static/Manifest
@@ -1,13 +1,7 @@
-DIST grub-static-0.96.tar.bz2 859179 BLAKE2B e41c1e0b8abc7d7f7ca1d1b08811e7987b6bd9c14366522d4ca5ee8944dcf6c6c285f1d544002e4f6af20156d18b20134c2fde8cf8c69611b3f38b356b13e818 SHA512 a623e230c3b2dd632daf65d897261a8b28a609b1adcfba67661cb42f43fe4f06bb4746f5095b41b689c2725f9d3379d03d02bca21b4acbf5faa3dccbad160a27
 DIST grub-static-0.97-r10.tar.bz2 888963 BLAKE2B 1891685b312c129efb47fd78ffd2a433655225b8dcb8a60592faabbc5300ce6d56efea70272cf9a1e8cfaa70224d1a3a313d1c2e2296bfd43593a4a12aec541e SHA512 2a18405c9f7b0712dac2246213f723c1a2be6734bff133b7906e7c18e4370faf924f35d3b834d74761cf50b3ab59e969fbff010e13292618187c65a72aa45a87
 DIST grub-static-0.97-r12.tar.bz2 1171586 BLAKE2B 066cde81f4b1849467d83ec982745dc8449e38895edc0eee979d6ea782a802c2a2c6b2a4f03eb976c03ce3f6e3213d3605e9bb6c99f8479e59fafb1716cbd0c9 SHA512 0a4c0b3b556db366df70c7c51a1a26f614f949be4002d7f9a053b7261b80c2c49410e8fd04c7e3717ea560e7cbc6a692d859d07bdfe2099a78a33bce78ac5395
-DIST grub-static-0.97-r6.tar.bz2 1005650 BLAKE2B 8f2a6fd51295cd4361d935a29f3164720d9516823b038e897d47f5429b08e119c9d269ed6728f5aceb3b2fe27320958a598d1c409d5e77bdd02848ce101a2e79 SHA512 a6edc311bcfccdb937c10ca1b4d33ecff52f3ee03ad827ecc849f6bb7d88204bcd29e8b7691bc1c0fd6386ed074ab8817667c0cf25cbb64bdd900fb01338727c
 DIST grub-static-0.97-r9.tar.bz2 937621 BLAKE2B a61fa8b41de4208cf30222fa742bb84a5f60bb924f5cf57f12ae9a382b1bf9e7feff740029ca3a08939d070275b4bb5389981c9a26f6decd18d4c7120f8d0f52 SHA512 a8b1f7cd416f2c41c88ba5c34889e7afe9615bf985e69b2d1d3ec2a20b7ceb13e53e8b3df91a5077bfa1a217f3274362033d72f9bafe3ad22be378f26728035c
-DIST grub-static-0.97.tar.bz2 954051 BLAKE2B 36e99e707a14ac73875222d4934e1f29084658f5b1937c39f8295ca3418e80cb69d8dec3d7a0fbce8426c12d0d4c7881dd7dad3e006189051aa2169686d97d64 SHA512 e60b1384e60bc1261482f3bc41b98c1595d4377da68b251d93894ae7a1b3b2ca77219ca9b7685d1cc8db950e35afb1b403cb3e9b7df15e0ab96d452341547668
-EBUILD grub-static-0.96-r1.ebuild 411 BLAKE2B 53bb5c4f085590ab9684d9c21b8df81a315af472a0e0e27ad250725e0b634f978253ef4779cc987536daa278d1cbfd5db4a2226bec87d9b7050d3ffba7cfd066 SHA512 edf492bd63e8deaf3ed29b07c1668c2371b09c823cb0f979c2fd77bcea194cdfc21d5313035ec04f9fa7a34b2fab75341208f7e6c3856d45b83ccd46a7e6a5b6
 EBUILD grub-static-0.97-r10.ebuild 5402 BLAKE2B 981e8f761083e4725de45b10d16db2b8e11b54eaaa0e4793b2e7633832c5d758f5abcbe47d846f3b3fc85eefb6d2946f354bc584358bb55034b39b7e00a8b1b0 SHA512 6523ea58548adfab70c50f136b179ce3cc03669fa78b6efac28208f8b68eb43bb5bfa2039b57f7516fc068ebc267e219df2567f1ac7750f713ff878bd15eb3bf
 EBUILD grub-static-0.97-r12.ebuild 5402 BLAKE2B 6e3fa13bd6349cd5d468a799c748fe5f64dcb2a743c10bae241b8148bde4b1ff3c2a56d920b8e9ead3de1ccd4014dce2514861b2e87ccfbba30e51ec5d317d31 SHA512 5d7be3447bf3eb2c0fade5fe31616a6ba8df5c52ecfb2a0782bb5a569ece553f98e1fbaa9caa6580160ffad4d9db135dfa491136727c43c0dbb96e3b292a4a1c
-EBUILD grub-static-0.97-r6.ebuild 4332 BLAKE2B 28819019b2ed2c8a1e72edb713ba49634be5a3b4731490da25fb4743ec3228753aea927622eea2ae0a3ad0e91b47ae2d2f5c6c7f25e8772851c34eaf32d5fa30 SHA512 a3b7d75ac9ea8cd904eefb951990e3ffa5bab29cc64c67f232ae34c7eccb080cfc9421e1a101e2418d0967ac2437bb1ded283d6dae695f4dc87705f9a2f1fd0c
 EBUILD grub-static-0.97-r9.ebuild 5297 BLAKE2B 692292ba38851671d6a7315a5deaca1f99b371cb254fd958271fa6ad490e450c0924de2b59be8a4096b1a545335923677a945d2aef34436b2b191083e07b573b SHA512 f44b2305b5d5691c0de0ae4acf75def1d1d5c52bfd2db9b44dfc268d7bb5f667d63c96fb8bea722fffeada7c8e623ee2505aefb43528ff9e225c306752f4ee8b
-EBUILD grub-static-0.97.ebuild 1925 BLAKE2B 3cfc741c96b4f07b153400ef7a21b0479e9caa556a3feeabc87a3cd9de9aad040f9da2c72cb9757ed0c0942b5b3672810de629702e82abc174004b0f33b8bed7 SHA512 1394f71ad0db33a14deaa83d4638ebed952467cbfb9a751fdff3fd037f60c290d1f4bfbcc3aba9651a6589f320e804342d42e381c84a0bf927ed912513d9a0b7
 MISC metadata.xml 242 BLAKE2B a110ca18fd86f3fcfe9a5c10ecd97d2c9727c04919ddf21976ceffcdf65dd1069c81e4ad554301b847665892de1313320836a327ca1f36381cb0f9e21219e9e8 SHA512 0891a67242a0cd36cac143b427affa9241ec8f8173b79423632349d542f9bc6e2097ffbb8e96b560c41e13b5b43ddf0f822962da98b5d2e58068d7855acb4965
diff --git a/sys-boot/grub-static/grub-static-0.96-r1.ebuild b/sys-boot/grub-static/grub-static-0.96-r1.ebuild
deleted file mode 100644
index f06b0d48685a..000000000000
--- a/sys-boot/grub-static/grub-static-0.96-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Static GNU GRUB boot loader"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/grub-static-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-IUSE=""
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/
-}
diff --git a/sys-boot/grub-static/grub-static-0.97-r6.ebuild b/sys-boot/grub-static/grub-static-0.97-r6.ebuild
deleted file mode 100644
index 308d59ede032..000000000000
--- a/sys-boot/grub-static/grub-static-0.97-r6.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
-#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
-#      we never updated any of the source code (it still all wants menu.lst),
-#      and there is no indication that upstream is making the transition.
-
-inherit eutils mount-boot
-
-PATCHVER="1.7" # Not used, just for tracking with main grub
-
-DESCRIPTION="GNU GRUB Legacy boot loader (static build)"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-IUSE=""
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/
-}
-
-#
-# Below this point, everything is also used in grub-static!
-# Please keep in sync!
-#
-
-setup_boot_dir() {
-	local boot_dir=$1
-	local dir=${boot_dir}
-
-	[[ ! -e ${dir} ]] && die "${dir} does not exist!"
-	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
-	dir="${dir}/grub"
-	if [[ ! -e ${dir} ]] ; then
-		mkdir "${dir}" || die "${dir} does not exist!"
-	fi
-
-	# change menu.lst to grub.conf
-	if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
-		mv -f "${dir}"/menu.lst "${dir}"/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e ${dir}/menu.lst ]]; then
-		einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/menu.lst
-	fi
-
-	if [[ -e ${dir}/stage2 ]] ; then
-		mv "${dir}"/stage2{,.old}
-		ewarn "*** IMPORTANT NOTE: you must run grub and install"
-		ewarn "the new version's stage1 to your MBR.  Until you do,"
-		ewarn "stage1 and stage2 will still be the old version, but"
-		ewarn "later stages will be the new version, which could"
-		ewarn "cause problems such as an unbootable system."
-		ewarn "This means you must use either grub-install or perform"
-		ewarn "root/setup manually! For more help, see the handbook:"
-		ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
-		ebeep
-	fi
-
-	einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
-	for x in \
-		"${ROOT}"/lib*/grub/*/* \
-		"${ROOT}"/usr/lib*/grub/*/* \
-		"${ROOT}"/usr/share/grub/* ; do
-		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
-	done
-
-	if [[ ! -e ${dir}/grub.conf ]] ; then
-		s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
-		[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
-		[[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
-		[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
-	fi
-
-	# Per bug 218599, we support grub.conf.install for users that want to run a
-	# specific set of Grub setup commands rather than the default ones.
-	grub_config=${dir}/grub.conf.install
-	[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
-	if [[ -e ${grub_config} ]] ; then
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${grub_config}" | \
-		/sbin/grub --batch \
-			--device-map="${dir}"/device.map \
-			> /dev/null
-	fi
-
-	# the grub default commands silently piss themselves if
-	# the default file does not exist ahead of time
-	if [[ ! -e ${dir}/default ]] ; then
-		grub-set-default --root-directory="${boot_dir}" default
-	fi
-	einfo "Grub has been installed to ${boot_dir} successfully."
-}
-
-pkg_postinst() {
-	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
-		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
-		elog "the following instructions for your /boot!"
-		elog "Neglecting to do so may cause your system to fail to boot!"
-		elog
-	else
-		setup_boot_dir "${ROOT}"/boot
-		# Trailing output because if this is run from pkg_postinst, it gets mixed into
-		# the other output.
-		einfo ""
-	fi
-	elog "To interactively install grub files to another device such as a USB"
-	elog "stick, just run the following and specify the directory as prompted:"
-	elog "   emerge --config =${PF}"
-	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
-	elog "grub where to install in a non-interactive way."
-
-}
-
-pkg_config() {
-	local dir
-	if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
-		einfo "Enter the directory where you want to setup grub:"
-		read dir
-	else
-		dir="${GRUB_ALT_INSTALLDIR}"
-	fi
-	setup_boot_dir "${dir}"
-}
diff --git a/sys-boot/grub-static/grub-static-0.97.ebuild b/sys-boot/grub-static/grub-static-0.97.ebuild
deleted file mode 100644
index f25a8ea41bf3..000000000000
--- a/sys-boot/grub-static/grub-static-0.97.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit mount-boot
-
-DESCRIPTION="Static GNU GRUB boot loader"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/grub-static-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-IUSE=""
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/
-}
-
-#
-# Everything below is directly copied from the grub ebuild
-# please try to keep it in sync
-#
-
-setup_boot_dir() {
-	local dir="${1}"
-
-	[[ ! -e "${dir}" ]] && die "${dir} does not exist!"
-	[[ ! -e "${dir}"/grub ]] && mkdir "${dir}/grub"
-
-	# change menu.lst to grub.conf
-	if [[ ! -e "${dir}"/grub/grub.conf ]] && [[ -e "${dir}"/grub/menu.lst ]] ; then
-		mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e "${dir}"/grub/menu.lst ]]; then
-	einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/grub/menu.lst
-	fi
-
-	[[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}"
-	for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
-		[[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/
-	done
-
-	if [[ -e "${dir}"/grub/grub.conf ]] ; then
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${dir}"/grub/grub.conf | \
-		/sbin/grub --batch \
-			--device-map="${dir}"/grub/device.map \
-			> /dev/null
-	fi
-}
-
-pkg_postinst() {
-	[[ "${ROOT}" != "/" ]] && return 0
-	[[ -n ${DONT_MOUNT_BOOT} ]] && return 0
-	setup_boot_dir /boot
-	einfo "To install grub files to another device (like a usb stick), just run:"
-	einfo "   emerge --config =${PF}"
-}
-
-pkg_config() {
-	local dir
-	einfo "Enter the directory where you want to setup grub:"
-	read dir
-	setup_boot_dir "${dir}"
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 775804c42c39..dc60d6898ad7 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 6a3853736431..82809d6273af 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -2,10 +2,12 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-11.1.0.tar.gz 5813863 BLAKE2B 467ebe47d92b8a9c612b6d2c30ca9a3b737b33cf999c3612079cb6d6886ee986e60f9eb15bc6cd3e2adc7ab9c4e956ca41c9324c23f8892cdea9aedd1e1e035c SHA512 193914d69144afba54bda7b3d05a8140501368c2fd44dd203dff5006228dad47602c4da244dc844781cff36581987ee236fc5238c7d78062e7cb78b8795b1f28
 DIST cinder-12.0.1.tar.gz 5333749 BLAKE2B 9a78b3a4a6212018e9bfa2ec29ee3c26dbb11a77214eeea2a421fcb898f75a15da78a6e7b6d42793b5ac833003b20bc39a56851a177fca6ec1ca96684d7e3bba SHA512 4b07a3cd579ee235446eb6eaf50698b629a6d24d5e7ada2d99635702aa3d53bab2038edf79f7b741d1039a88a752a1a093c454648c88abae8dc7070c59d16c07
+DIST cinder-12.0.2.tar.gz 5328631 BLAKE2B b0c71b0841eb432cdd1b23a17e2dee9798a9bfc95d2275a4e24d64ccd912e161a369cfb548ec0bf440f62ff60d9457d42e5c4974f89c3d9c739e3ddbd098b758 SHA512 805f315138f88efee08740c7ea7054817976e6df16c8bdf82596125bebdd9c2b931dfc19e9f7c80ab0250268a4d37b3454a5c2d41fcf3896cac281eb5966e1e0
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
 DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
 EBUILD cinder-11.1.0.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
 EBUILD cinder-12.0.1.ebuild 8060 BLAKE2B 3682c951bf990f8cae4d173e42696843390d8d31b61da81447457379edcd249e9eba247ea0d3f63af9273fd91a07656a2c44b25647821d061f94b66112038e69 SHA512 0c02a0da61808f23305762971a61842f5bc9bfd5eb8b90915f3a755602b5563dea91e93db46e7a26c1b35a008f2fb2c9f39847e2fad5626d42945d07d8a14452
+EBUILD cinder-12.0.2.ebuild 8062 BLAKE2B d7b7ee7a2d552288c8cd69598dad60d9e3b0432f59fbe330b187de7e2c46f9ac581aa3ee6a205b10d94d50454afa64291a1695cde00e8929d730578cfeb04298 SHA512 3f9a25e897baba087f8206a4348ba41fa36d60bb4bbd32e5e5292f0415a9585396a74ed095c42ed24d4086e9c0039d21a13af99f782afb71cf42c14852b7c791
 EBUILD cinder-2017.2.9999.ebuild 7772 BLAKE2B 354ea7431e2e7d3bf9f5322f5b4f313de076977b0b33ef812cdeb9133983d7cbd50b569cf7c1451fc49857023e29741708fbd6a43c5e941c6a107771563ed9dd SHA512 c8a6db8c3d8c3c4ebca2d121250a6dde400a9cfd1092b17e2510e12656c4b945f4ffa8292f9893d06a29f4b1c5eac36202eb08d2b5d28997343070678d973c91
 EBUILD cinder-2018.1.9999.ebuild 8064 BLAKE2B 7fa795367871db689ddabf456eeab9d59b67d6b76195efc7e66fe9370017f043412c1945129b74afa43d8f12e1e96b1f16dbad5f9440498539053998d8f47bc2 SHA512 62c9b7d4dc3b72edb659db5130ecde8502346b1a253e7ae3a62bc1447559fafb0f5ee74672f52307a2257c49fdef37dc1f803cf5742f353525678f906b622888
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-12.0.2.ebuild b/sys-cluster/cinder/cinder-12.0.2.ebuild
new file mode 100644
index 000000000000..7c4c55c46c39
--- /dev/null
+++ b/sys-cluster/cinder/cinder-12.0.2.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils git-r3 linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.64[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/cman-lib/Manifest b/sys-cluster/cman-lib/Manifest
index de6ac8f6abdc..ddfb94d16ed4 100644
--- a/sys-cluster/cman-lib/Manifest
+++ b/sys-cluster/cman-lib/Manifest
@@ -1,4 +1,3 @@
 DIST cluster-2.03.09.tar.gz 1784357 BLAKE2B bf024c93fd5ccd9b7410abc2a3bd792c55c3937604d750019a20190753d95d19b2232923a7a76463ccff592bde7fed942aa679af9e39158fef6041258eaf6eb7 SHA512 5dbcf978336a6b7998df0d3dfcff037e1e77e9e69b43d78eb573a65432445e572e69d7783e7874e9edf2632627f02426f428103831e10f5d1f338afa91a62c28
 EBUILD cman-lib-2.03.09-r1.ebuild 1100 BLAKE2B 8e27241a42bc9f16a2a8eca143f23dad007dfd09c2122724b6a8194a6a6dc003fef6b49ec9c4368b58b6964b564c594897a8c2cf1637825c7ecd361024f4fdfd SHA512 8f4f511d1fb59301c50c04027170cc0d1777e60ddb0733adee622a2e75d441eae250d25fcc6035d7f721746994be33fc75e9852bcf80859b96a83fa885df76fb
-EBUILD cman-lib-2.03.09.ebuild 1194 BLAKE2B b1e9db1a0019fa6845820fc9427af1cab451b6a3ee864ac6a7f35720099af0572000b484a420b9e350466019430b9f38d369c42ba3fe4baf636dccc94ef7aeda SHA512 3723e4c1132a79f0202775596d8a930c43ab11972be93dc4663aa33095ecc7dd8358c6d6325b01961d81a84f16a8906e55f4d540b235573d605ad381e1fd6fce
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild b/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild
deleted file mode 100644
index 721665969bde..000000000000
--- a/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
-
-DESCRIPTION="A library for cluster management common to the various pieces of Cluster Suite"
-HOMEPAGE="https://sourceware.org/cluster/wiki/"
-SRC_URI="ftp://sourceware.org/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="!sys-cluster/cman-headers
-	!sys-cluster/cman-kernel
-	!=sys-cluster/cman-1*
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN/-//}"
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-	) || die "configure problem"
-
-	sed -e 's:\($(CC)\):\1 $(LDFLAGS):' -i Makefile
-	sed -e 's:\($(CC)\):\1 $(LDFLAGS):' -i "${WORKDIR}/${MY_P}/make/cobj.mk"
-
-	emake clean || die "clean problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-}
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index dd9241489e3e..ea600f50eaa8 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -3,13 +3,9 @@ AUX ipvsadm-1.26-stack_smashing.patch 912 BLAKE2B 8b22cd9dff9da2691342a3f680e96f
 AUX ipvsadm-1.27-buildsystem.patch 3624 BLAKE2B d7a1f68a505d8c64fdbcdb5589a9b6b1e7afd5a4e7dfc131a741f1644433484efa795f51cee2fa6d5f6ca77e6a7312e75276d0a4e40f38f9aefc0f532dd0ce31 SHA512 e6e94a84f3a59a2ddb73c924f28e7e6799530aa5187d499c1b002ea1caa379c728dc96493e481d9e351e14209d5424de73c7deeb4f1e1d9846eb088fb160535d
 AUX ipvsadm-1.27-fix-daemon-state.patch 2001 BLAKE2B efc15ede85aae2c069399c0137c6ec5142bbcc35054b2de32e20cbbdc216e32c3628e4821d1da93f0d14580c67714cbd310147cbca776652301fbc5a275490dc SHA512 4898672423f2b53776bedde1b5d7a7dce27d8d66aeec6b749149209c6acabcfa8cc53b4f3342107f9a783c5a4afe88f4e8b10d25771c49d86b0def8777834c22
 AUX ipvsadm-init 649 BLAKE2B 9414395d1093c1bff940982f90e7416fef6d74e9972b5416d571fe8a41363c03c9a4ff819cd2be578911a7c6c021cc7f52910371030a479a58800b8eb4f3d2ff SHA512 3fb2467fc157599fbf308e27f39f0cb4164e3d36423500d89c7fbedec3ba6f5c7b3cbe52b077811011fc0faef73072a0bf3b204d728841773ef2a520c03130f7
-DIST ipvsadm-1.21-11.tar.gz 34030 BLAKE2B d00313d9cb2ef5d683b7bfd51f49158b16f916da38ff3dcd6c11f26e62a1bbd910b5d9a83637c29b3cf522337a1b4092f39efc4a6efded7ab185a56202bf13a3 SHA512 55a50b4a06798b035481b4d8080ff8b64772802a564f91e7ff9fc7179ff8ed687681615a22b4c51b99065b574108b6a2c616e9acf54877dfd46c221e67f99048
-DIST ipvsadm-1.24.tar.gz 32007 BLAKE2B d133f73f4ec58b35dc3a6d88664bd89e9b1e10e9577429775b05e230519671a8ae82f331f3834fed3d967df4687d5cb4a45aa45bca3790467cdf3c65a22e3425 SHA512 f472e55d78901de3b8f07dec0ff6e32b5aa301dc0dc62f34fe168511c8e2af26704fb66936540eb1173d7a0280428a2e6e48f9efadd3e33050dd881e666e1041
 DIST ipvsadm-1.26.tar.gz 41700 BLAKE2B ef8b089bd4d21297ae6fde01a9214cf07633cc286765e6f8110b04589c5d9b6dc4624457899c4ea48ddd08b495a9c090b26d1dc5094b5fb7cafcd5342c729caf SHA512 873e23a6bdaabc153b00f1ede3853c947e8c8cfb4e18364d55197c74f26cc883ca469e074a90f377fbfd5e73e0cd6c1fe414c9f7a5c28b0d4431af58056eced4
 DIST ipvsadm-1.27.tar.xz 38196 BLAKE2B 1b8a72b11c14a909b8b7459c459195d32bb7944ed4a01d963e2b85e8279c5d7d2fd095d9c23473c64dc15881a2b22b439b39c10b2019b3183f54e22535a258a9 SHA512 cf982b7981674c91d1b7516de7b55cf378b306ce4a53e13976b8eeb8610015c4fa4aa9d251bc4d329db8e05c1862863160af2d3c63b76263f290087cffdf1b80
 DIST ipvsadm-1.28.tar.xz 38600 BLAKE2B 2a892f858324788b425f7c5aa6ce6a1548c6cd166977d1d36a5236061d1a6ce7e31f6bc1e24a7d53a57406e468271ccebc01330de6be9784c1a955b60eb89d16 SHA512 a1e10ce30751d9439f832e221e5c41b338f87dcc94a0b21329d908a9164f8882049af9d9d918b764b36c30e353d5b8db49d7088e60c24e4748713c06cccf7035
-EBUILD ipvsadm-1.21-r1.ebuild 1094 BLAKE2B c37d436ac26a84a869859e20897f37a025ffd931f7ce1502d84892ba26de6315eb2dc84d11625f659584d87a7dc7fd96ef8d89b1b3327fb44c4f3a7c748a1475 SHA512 4c13d748eab5105ad509ace5392935e260c657c0a0b83e5a955c78bf6f5304d48bc9a371901afd40e279d7d5ebecd6b10c0614f583e0dc1915a80d3192b78203
-EBUILD ipvsadm-1.24.ebuild 1263 BLAKE2B 1f707b1716d2c789093458d8dbd8c5013affb8e3651d08d0a1e21f1eead6ca1000821155b32450e00a8b22e433739b5b8a3251a8db1b57f589e3f442dccbe3ed SHA512 810b2749f2fa995a5fcc4a436c5a1cb911c8dd45ab3c7ba445ce6abf2859ee8bbb88d66ba6df248f654dc84974802936e15e73b4f5731c3366e7147e5e981ab6
 EBUILD ipvsadm-1.26-r2.ebuild 1468 BLAKE2B e5cb34a065b1b6e56cd8db221a64cf7dec0ec25b25119f355cb3bc91100b76dacaf6256405a9032e4abee7e7efba94b5a42ac63ab74bf63c0e811eb8ba65a878 SHA512 73eba25de1121b24b2dfee8ea509f3c0c483cc22caf76bffe3742f1691346a2a13554a547ecb06cc1087373ab1866b2cd453ac99a334f62bf7618d9c423925be
 EBUILD ipvsadm-1.27-r1.ebuild 1736 BLAKE2B b1f7e71bfad7cc4aa15bb2ee9095b3220e1e2c12feefe6da89ec9c93845f0911dd9c6b7e7b8315e8db164b9e6195246cb88414311dc73b2c82b9ba357386dd69 SHA512 60860e46259f52965dbe1eb056f43b8878e9559f4eb0c40ed3ef74531ef8ff7c738aa6081720ecab06d2e9364c91da96de033c97591699d8af62580cd76a27a1
 EBUILD ipvsadm-1.28.ebuild 1647 BLAKE2B 8cd4abf89d8839d7bae690bed5ebd9cf78900700d892d93cb6e7b9b854f1d680bb622ef311ba5cad20204f6f3bd184f90c45090c599aac585a98765f7cf5a00f SHA512 0132f04eb777f8289ab98edff96a90e3d07309993bbbc892c9c5f2f0f1e1b238253a86dd8383aeff5c8446c8e0cb4f108f8159692ba0d659852568d49155b906
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
deleted file mode 100644
index ad66846c10f3..000000000000
--- a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-info
-
-PATCHLEVEL="11"
-MY_PV="${PV}-${PATCHLEVEL}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="utility to administer the IP virtual server services"
-HOMEPAGE="http://linuxvirtualserver.org"
-LICENSE="GPL-2"
-DEPEND=">=sys-libs/ncurses-5.2"
-
-SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.4/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~ppc ~ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if kernel_is -ge 2 6; then
-		eerror "${P} does not support 2.6 kernels, please try newer versions"
-		die "wrong kernel version"
-	fi
-}
-
-src_compile() {
-	emake || die "error compiling source"
-}
-
-src_install() {
-	into /
-	dosbin ipvsadm ipvsadm-save ipvsadm-restore || die
-
-	doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8
-
-	newinitd "${FILESDIR}"/ipvsadm-init ipvsadm || die
-	keepdir /var/lib/ipvsadm
-
-	dolib.a libipvs/libipvs.a || die
-
-	insinto /usr/include/ipvs
-	newins libipvs/libipvs.h ipvs.h || die
-
-	einfo "You will need a kernel that has ipvs patches to use LVS"
-}
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild
deleted file mode 100644
index 8f263601620a..000000000000
--- a/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="utility to administer the IP virtual server services offered by the Linux kernel"
-HOMEPAGE="http://linuxvirtualserver.org/"
-SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.5/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if kernel_is 2 4; then
-		eerror "${P} supports only 2.6 kernels, please try ${PN}-1.21 for 2.4 kernels"
-		die "wrong kernel version"
-	fi
-}
-
-src_compile() {
-	emake \
-		-j1 \
-		INCLUDE="-I${KV_DIR}/include -I.. -I." \
-		CFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)" \
-		 || die "error compiling source"
-}
-
-src_install() {
-	into /
-	dosbin ipvsadm ipvsadm-save ipvsadm-restore || die
-
-	doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8 || die
-
-	newinitd "${FILESDIR}"/ipvsadm-init ipvsadm
-	keepdir /var/lib/ipvsadm
-
-	dolib.a libipvs/libipvs.a || die
-
-	insinto /usr/include/ipvs
-	newins libipvs/libipvs.h ipvs.h || die
-}
-
-pkg_postinst() {
-	einfo "You will need a kernel that has ipvs patches to use LVS."
-	einfo "This version is specifically for 2.6 kernels."
-}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index b4b209ec6386..152c5403782f 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,14 +1,8 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
-DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
-DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
-DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-EBUILD kube-apiserver-1.10.2.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.10.3.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.9.6.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.9.7.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
+EBUILD kube-apiserver-1.10.4.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 EBUILD kube-apiserver-1.9.8.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.10.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.10.3.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.10.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.10.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.10.4.ebuild
index 2cef73774731..2cef73774731 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.10.2.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.10.4.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.9.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.6.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.9.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.9.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.7.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.9.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 86b6651a7117..31555ebfed37 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,14 +1,8 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
-DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
-DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
-DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-EBUILD kube-controller-manager-1.10.2.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.10.3.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.9.6.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.9.7.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.10.4.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.9.8.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.3.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.4.ebuild
index 3a0b835d0991..3a0b835d0991 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.2.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.4.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.6.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.7.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 37db6bb9d08d..3665af4b7464 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,14 +1,8 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
-DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
-DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
-DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-EBUILD kube-proxy-1.10.2.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.10.3.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.9.6.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.9.7.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.10.4.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.8.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.10.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.3.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.10.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.10.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.4.ebuild
index 882a7f40ebcc..882a7f40ebcc 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.10.2.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.10.4.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.9.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.6.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.9.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.9.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.7.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.9.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 0d3774b6de12..d2c7e7d157aa 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,14 +1,8 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
-DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
-DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
-DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-EBUILD kube-scheduler-1.10.2.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
-EBUILD kube-scheduler-1.10.3.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
-EBUILD kube-scheduler-1.9.6.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
-EBUILD kube-scheduler-1.9.7.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
+EBUILD kube-scheduler-1.10.4.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
 EBUILD kube-scheduler-1.9.8.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.10.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.10.3.ebuild
deleted file mode 100644
index 576989d30fd3..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.10.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.10.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.10.4.ebuild
index 576989d30fd3..576989d30fd3 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.10.2.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.10.4.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.9.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.6.ebuild
deleted file mode 100644
index 170c510184ff..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.9.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.9.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.7.ebuild
deleted file mode 100644
index 170c510184ff..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.9.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index bfe1953b25f4..b296619529ed 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,11 +1,5 @@
-DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
-DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
-DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
-DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-EBUILD kubectl-1.10.2.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.10.3.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.9.6.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.9.7.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
+EBUILD kubectl-1.10.4.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 EBUILD kubectl-1.9.8.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.10.3.ebuild b/sys-cluster/kubectl/kubectl-1.10.3.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.10.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.10.2.ebuild b/sys-cluster/kubectl/kubectl-1.10.4.ebuild
index 14674478c43c..14674478c43c 100644
--- a/sys-cluster/kubectl/kubectl-1.10.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.10.4.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.9.6.ebuild b/sys-cluster/kubectl/kubectl-1.9.6.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.9.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.9.7.ebuild b/sys-cluster/kubectl/kubectl-1.9.7.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.9.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index e4d607012a79..92c6b27b9a1e 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,14 +1,8 @@
 AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
-DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
-DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
-DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
-DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-EBUILD kubelet-1.10.2.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.10.3.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.9.6.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.9.7.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.10.4.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.8.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.10.3.ebuild b/sys-cluster/kubelet/kubelet-1.10.3.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.10.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.10.2.ebuild b/sys-cluster/kubelet/kubelet-1.10.4.ebuild
index e1a41e8ec6bc..e1a41e8ec6bc 100644
--- a/sys-cluster/kubelet/kubelet-1.10.2.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.10.4.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.9.6.ebuild b/sys-cluster/kubelet/kubelet-1.9.6.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.9.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.9.7.ebuild b/sys-cluster/kubelet/kubelet-1.9.7.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.9.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 72b42eacc238..ed77aadd15b1 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -6,26 +6,18 @@ AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037ee
 AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
-DIST neutron-11.0.3.tar.gz 10504129 BLAKE2B 2c72bf33d8f8d11423c868f88c63ca65af399e9f2bbda86fcabef831252bcc000658dc5e4a12da8e3defdf8fe2ce1c54799c748ee2b60625b1d7f98e32098824 SHA512 ba55f119c29b1367e5c72fcd1357dda8cc40c63207aa2408890bd6986301b4859389b489a60a0f1bd6ff7f22cf2ec68824eb503bbf33e786b5a463c8db353eed
 DIST neutron-11.0.4.tar.gz 10501915 BLAKE2B 656b2e5c852462bdf3a37ce3a5b50e2e9c5fafca192af368483ca2b12c07f4cebe69e643948f85315a54c3ae01870b5439aa0b928b07d1b049bc5e38d56c2606 SHA512 9cf433c32fb7f2a63db393ee84f7e955d0abc8aa44bfc4e0be54d1874b1136068f24850bfb3f5d17197d8e3e6fa17bdea6e090537f340c30479876dd665ee8d4
-DIST neutron-12.0.1.tar.gz 10432512 BLAKE2B a83fc312be64d729027477faa44496a501c2658f4dcfdb0fde19a202682c02b96a00e3a5141e0d3473c287a896264b7df566dddb8165c7a415a4c5604e8f9821 SHA512 81fec08a1182722d24648cd0eb9b91365d7257432ecaa108cf73947c3073b0903bf95b5d92505ed66581a41b8be09a561d0899bac7f9ff711b15d16f632e1394
 DIST neutron-12.0.2.tar.gz 10436003 BLAKE2B 5e4eae5a25fd80114700b4a8145c582c834a8f123be0943c08dc8b05bd2fd9c7c1df46c5e06c17fe122396c06caddc98970ebd1fd29521efae2afb1361b3beda SHA512 d32af882eefc00fe13cfad41e116c4e300c5c0266952e8f2dcb1a0228311521d78ab6a280bfa5be1794728d3d6f15f4bf6836ed07c878e56bd0e2e13fbcb31ec
-DIST neutron-configs-11.0.3.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
 DIST neutron-configs-11.0.4.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
-DIST neutron-configs-12.0.1.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
 DIST neutron-configs-12.0.2.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
 DIST neutron-configs-2017.2.9999.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
 DIST neutron-configs-2018.1.9999.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
-DIST neutron-ml2-plugins-11.0.3.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
 DIST neutron-ml2-plugins-11.0.4.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
-DIST neutron-ml2-plugins-12.0.1.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
 DIST neutron-ml2-plugins-12.0.2.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
 DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
 DIST neutron-ml2-plugins-2018.1.9999.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
-EBUILD neutron-11.0.3.ebuild 9554 BLAKE2B 03b6296076c3c1dccf94fab538d89c6613ff02eee300a06f02a402c88382087e4fedce5a56427fd8bbf18f92f65b9e1ba00b9bd56c25987c9e436e6cb1f489a6 SHA512 36cabcb0a50151ee6da36a09c75037c8b78be8c187572d0b88d6d61fccc9d53f3b29f1cfa7b05a0ba82aea3cf9094a13183e0676fd47bc8dc5ff986fb2623129
-EBUILD neutron-11.0.4.ebuild 9556 BLAKE2B e628161e306c32232fd59c54cc0cce5ab49c9ce641613d2c5539c413bdbc1c6168e5a79a699d1e0add66442c6a88f99d899ddbe15cbe9da6a1e79f78796e5d7f SHA512 3655b851f6e55baf96cc5a217bc38e3d2ec0adc0d355d7efdd13b225d5857e15907def35d0fcac358333f0f017688d54ce6bef0103ca596d998d1eb083b5e55a
-EBUILD neutron-12.0.1.ebuild 9618 BLAKE2B 61661d4e5cca92369117228484121034a509a3501f324ba157a15b51c2294df92a86b84da51f50947440a6e38aadf305624c0666452e93da9aa8094b5cecbe0e SHA512 970c675489590a1ede8c23321ec6d7b59382698c969ebb67b54b18b266af2806644d273e0ca7ec8d6ec3f1df0dccb0684431c69dd7bbefb8c5f9b722fa30c484
-EBUILD neutron-12.0.2.ebuild 9620 BLAKE2B 18c6def5f47aecd1f997e8fcd8993f66c0728ac46794487b0cf49e04ba876be8155f35be01325653c2c7aca13ba6bfa23265664c8f0116e2d63b1b72ce0528e0 SHA512 4e0a0eceec3e894295cd38f99d172b968032f49df9d633492e95909fb2d5cb0ffad190b77014ba84f8bc0f6a3102230969910d20ac45db43c7180de68c1b973d
+EBUILD neutron-11.0.4.ebuild 9554 BLAKE2B 03b6296076c3c1dccf94fab538d89c6613ff02eee300a06f02a402c88382087e4fedce5a56427fd8bbf18f92f65b9e1ba00b9bd56c25987c9e436e6cb1f489a6 SHA512 36cabcb0a50151ee6da36a09c75037c8b78be8c187572d0b88d6d61fccc9d53f3b29f1cfa7b05a0ba82aea3cf9094a13183e0676fd47bc8dc5ff986fb2623129
+EBUILD neutron-12.0.2.ebuild 9618 BLAKE2B 61661d4e5cca92369117228484121034a509a3501f324ba157a15b51c2294df92a86b84da51f50947440a6e38aadf305624c0666452e93da9aa8094b5cecbe0e SHA512 970c675489590a1ede8c23321ec6d7b59382698c969ebb67b54b18b266af2806644d273e0ca7ec8d6ec3f1df0dccb0684431c69dd7bbefb8c5f9b722fa30c484
 EBUILD neutron-2017.2.9999.ebuild 9578 BLAKE2B 8b9c4f2485d28faae0750908036507c9e562352332fdd13be3bfe8328ae6da2f65c40e440e08d551565b4195037d6b408af7a5fd7d64af27264c989432267001 SHA512 6799d979e5bf66e30ab5b057a1c68b159d0a4aca802a6aeafc137aa53a5bf5367cc51aac3cd0295f0b5c8b15ecc2f65ac7165306d12b0c18669c735df17cbe0d
 EBUILD neutron-2018.1.9999.ebuild 9620 BLAKE2B 18c6def5f47aecd1f997e8fcd8993f66c0728ac46794487b0cf49e04ba876be8155f35be01325653c2c7aca13ba6bfa23265664c8f0116e2d63b1b72ce0528e0 SHA512 4e0a0eceec3e894295cd38f99d172b968032f49df9d633492e95909fb2d5cb0ffad190b77014ba84f8bc0f6a3102230969910d20ac45db43c7180de68c1b973d
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-11.0.3.ebuild b/sys-cluster/neutron/neutron-11.0.3.ebuild
deleted file mode 100644
index 1ba919af1291..000000000000
--- a/sys-cluster/neutron/neutron-11.0.3.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-11.0.4.ebuild b/sys-cluster/neutron/neutron-11.0.4.ebuild
index 31873ce376e8..1ba919af1291 100644
--- a/sys-cluster/neutron/neutron-11.0.4.ebuild
+++ b/sys-cluster/neutron/neutron-11.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/conf
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
 						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
diff --git a/sys-cluster/neutron/neutron-12.0.1.ebuild b/sys-cluster/neutron/neutron-12.0.1.ebuild
deleted file mode 100644
index ca9e5bc0c418..000000000000
--- a/sys-cluster/neutron/neutron-12.0.1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-12.0.2.ebuild b/sys-cluster/neutron/neutron-12.0.2.ebuild
index efbe01b7fe33..ca9e5bc0c418 100644
--- a/sys-cluster/neutron/neutron-12.0.2.ebuild
+++ b/sys-cluster/neutron/neutron-12.0.2.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
 	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 2f783e2b69da..73323433471d 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,13 +4,19 @@ AUX nova.initd 745 BLAKE2B 3242a38313147eaffc096752b35cbed34e16f1133cb482515086a
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
 DIST nova-16.1.3.tar.gz 10978745 BLAKE2B 6eb95dd2b499dac6355f345ea6b2becb5741d78dafe402bb479a891f9a97405a3ab7fbf30df8d67e906408a34cbbbc6d08fa3861235f274927df4c146c0d24a9 SHA512 37efe67b3ab10b14dbbf3fed98859652ff15fb215616905ced58840f9ce3c8a9a78af93347164e321de7ed5e043efc5e033edbc1434f417d93b59b7de4c25c3d
+DIST nova-16.1.4.tar.gz 10975664 BLAKE2B d6f314bf145d26660b1d14f637dc2a0451a79719d081206d7867281cc828ba5cee1c5c0529109d6592b9bf8cfd1faeb6425d6be9eb8414a48cb6417e1b8d847c SHA512 64ffc73eb61fdfd39a20ec4ab034669442ce17b1e352a5674d1def7d7e65a2b7f5650a0d0621b05c0602c709506b51a88c4494bcdbd8ce10432963e6d1070430
 DIST nova-17.0.4.tar.gz 11052405 BLAKE2B fc5a02bf1dadbc2f2541e2dfcba08506b95289ac8ca3ac6504ec81b31cbf6f2f971adc301c9b90764bb324d4584a6852a777d344dd0d90941edc24cf2ecefe73 SHA512 183f86a716f029dee56e93599721fa7ada43426b01ff6f126afeb638228d3e30fdb85d6edda2f28f738894a65ef9b444dff4b2fda857e8dd61a705b04d15bcd3
+DIST nova-17.0.5.tar.gz 11064252 BLAKE2B 0a72cb0b1ed1ec8a2340572254dca1f56711bb135319ccccbacc04b0c251bc67000b7350d8a2f2477db2fd9d52e79a1254085d3718884849fffdf25227cadc1b SHA512 cb6a4b16afdb565239948dbaf1e868d4d9c7b12d771850b10abb6c04455e5c7652c04980aad0cf1f7892f62eb9eedfa7b58cea49bd9210d22b18fed7b3935851
 DIST nova.conf.sample-16.1.3 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
+DIST nova.conf.sample-16.1.4 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-17.0.4 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
+DIST nova.conf.sample-17.0.5 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
 DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-2018.1.9999 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
 EBUILD nova-16.1.3.ebuild 9545 BLAKE2B dea213885cc593f5744c12c7156b2db5a30e93bf068c783a93d8eb53c35d4ef0eaaeaee9f4271b0f1fd9b96ba0e2f33e4f7976459cc9d73dcf1fbed0fa30c206 SHA512 b7e8a4991a46b86a25d62a77609ef300f0b2107f43867c1876f50c446e4f5ff420c8bcef9958dbb20dd9f398a269277f602b37c69af555c48af2fc7cba1c2e2e
+EBUILD nova-16.1.4.ebuild 9547 BLAKE2B 740d55d2ebb11af6c8d92fc9abcf703f741ebe12d5c7e67d620edb3fd2f37ac52421994c441480277310d77510516a6bcd1c1792dc8edd806dbd08c39b0d56fb SHA512 f51d5c194236bbec87e11547d9f6cc8d6beca7388672faf46636a0aefd9364da457f4d7a28acd601ec6c2524fbd81291b3453a5ae33db8c32480e76a08c62102
 EBUILD nova-17.0.4.ebuild 9717 BLAKE2B 9b2995e91ebc2cb17b907087f1855121ef670915e0342b52d390452b6d95f8192a4a541e30f646bdf8f9f103d6d7319d18ef91750c7130f550a772e9742e2546 SHA512 9407eba358fb3b9c8268570f1d7b1ce77f1fa0678f82d485dcab258755ef0534b0ebf71058fd5c73623fd6072e0a20fd85b5ad2d8dd292b8929338a3fd4afa07
+EBUILD nova-17.0.5.ebuild 9719 BLAKE2B 8f09686f5baad6c41de69ee50d5eb5e72ffbfd274394e9ffc220bfb632a78ea614faca2f2ea208e5bfcfd70fe37f8612518d46923c1bdaa8650d87ebfc74bafb SHA512 8c0b2fa83b0bb737299f4bd85da8114ecf9c111f6c1bcfaca43f407c7513bc0f6c80080e46102ab760d4b5443d5c15c9ebb68b045afdb1e63e20a4db18778a11
 EBUILD nova-2017.2.9999.ebuild 9566 BLAKE2B 8874d34fced2011d197ce189095f43e1bc6080068d88087cb2d0b285c0ed48d0af56a2c80a906f4ce9323104943740276bd03b70f930b663c62246c38cb79d50 SHA512 5139a6196b404b02d0ccbcfb2f0a46e83985f4e6aebf3be57db830a797d79774a98984d739bce99e8fd3f08a95982b65d3ac0a800e8bee785c310c570e6fa29c
 EBUILD nova-2018.1.9999.ebuild 9719 BLAKE2B 8f09686f5baad6c41de69ee50d5eb5e72ffbfd274394e9ffc220bfb632a78ea614faca2f2ea208e5bfcfd70fe37f8612518d46923c1bdaa8650d87ebfc74bafb SHA512 8c0b2fa83b0bb737299f4bd85da8114ecf9c111f6c1bcfaca43f407c7513bc0f6c80080e46102ab760d4b5443d5c15c9ebb68b045afdb1e63e20a4db18778a11
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-16.1.4.ebuild b/sys-cluster/nova/nova-16.1.4.ebuild
new file mode 100644
index 000000000000..3db5286945f2
--- /dev/null
+++ b/sys-cluster/nova/nova-16.1.4.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.6[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	# copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/nova/nova-17.0.5.ebuild b/sys-cluster/nova/nova-17.0.5.ebuild
new file mode 100644
index 000000000000..4f9c25caad5a
--- /dev/null
+++ b/sys-cluster/nova/nova-17.0.5.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	# copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index e4c193cbb21f..db3130053d8d 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -11,7 +11,7 @@ DIST openmpi-1.8.8.tar.bz2 13231433 BLAKE2B d196fd0bb08cfb0c86a29ae39015eb15e146
 DIST openmpi-2.0.2.tar.bz2 8311215 BLAKE2B 8dd0d7b95c396e9a0f05760136bbf62defd3527b2ac4f9ec738239b91d8cf5ed0c3dc4ad5330f0ea2fafa3464164e3d514bc058dc9d019daa83382ae990f442c SHA512 87dc3c23db4b9cb92dbacc9b384b21ce8c4288fe4edc204fbf4a3bef70d8ac4329269e777ed190fa87933d78b73b9e5550ea3b925b2039599cfef3953567232a
 DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5
 DIST openmpi-2.1.3.tar.bz2 8311304 BLAKE2B a6a2d0d759a7207e4e9e9bb1526825ce5b0c9acd22c113f71712381fd7cab55228e78294533a5af6ef2b243803d789c5c71c6d59dd7a8ebbf10b2aa5d99296fd SHA512 61ecf53d840feb4cad1e792225c7fb07a8c4cb849f21693051359cde2cf1b5060de3a9d00ba3b55ded20b5b93bc5ac439951b4fe5cb1a74d4e800f26c979feba
-DIST openmpi-3.0.1.tar.bz2 9176460 BLAKE2B 65fdaeb492da3cf86a68c2d47d19568c8d65e92d0202041853ae3cbe0f057d8bdc79953538921b5b8c9eb9c9cedab8502816985e12524704992069a51e08d857 SHA512 15fad504ba743d564e7196b62a112027798d4b26e9c8d11d9c1c00ac2968f1858ebc168df30473104c5a31f71e38ab558204b598260b535a12b6094aa77182b8
+DIST openmpi-3.0.2.tar.bz2 9195169 BLAKE2B 46ab8149435797faa9ebd6ec4c69bea01096e5f57fed0f5cb92456a0bb2c3df828414901892e082935b56cb9d1da0426a1601849aefe1b36f94c6f3d666ec497 SHA512 2255d6c693243bf283d2b3af1cd8155ab0b2c904cb1ac61708f7950935bab8ff85968ca2c75a0fd091284e1c14f0c93be1423090ffdde9ac92b48980fc067b64
 DIST openmpi-3.1.0.tar.bz2 9443759 BLAKE2B 7670b2cec327bad1bf348e08def3d39ea0b971c9534ec3e462a56719c4a1ebc8ceaf4a76556d0213cc2b7610c26f849d881f84ceaaaf54645ffbcefbd0273663 SHA512 23a43a16683c4b56f96c711fe009d992f3bd4e10cf9ef55091865a5b1aed195cc1de6a87720564f70d3b60a2441966bab39cda8969293aeb118cda10aead3dee
 EBUILD openmpi-1.10.7.ebuild 6390 BLAKE2B 55977738b22a8c2cab3adbd3026269e95671c71536068e1f89088b850263e1f61a580477ac0e71e47bb2e2dd740be888b8022603e7cb0b6766b6d1e1986969c1 SHA512 952e8364c98e19dda8ec34eb789165532986d2fe10f1a9b1c5631ad0418583a5470ede9174f7e65d7b769b1a1a4cb6081ef459a0da75e424a34556b501155ea8
 EBUILD openmpi-1.4.3.ebuild 2618 BLAKE2B a030b33a0fae59cf7e75cc8252af897ba703f95e259f938872182dfa97c86f587eb2259594f75114f939c7b0961490452ff3c11c2ed3a6b60ae3f2974d926446 SHA512 5c47bdf1192a6d2b95fa35c217a27ff6f69c0ca1bf5c5be3ff43f7785b354c214a371697006275efc08fc9ec3bf27d284db45a7f5d6cb1af9937c42340f79f83
@@ -24,6 +24,6 @@ EBUILD openmpi-1.8.8.ebuild 5585 BLAKE2B c02fe06f936dee22e589d29d2cc8e04bcf3a69e
 EBUILD openmpi-2.0.2.ebuild 5997 BLAKE2B a1c50d7944b1b7b0401f059a5c9e5293719afdc6a978404370d7fa510c426b47e04a33216430266b559e43af5fc99d984f0e9c841c423e86a7f3bc648333f402 SHA512 9519f42ef32704e0241fc5f51fb57cc2ec4e05188235f74e214444b4b43bbe4819a628c3a3b92026867121ceb5262607d5c51d79fc18e34df188100a64ad65f4
 EBUILD openmpi-2.0.4.ebuild 5995 BLAKE2B f0e8b0971b2e9cdae4a46b771bee622a4c3558455df9d59ac09624a784865df79268201535bd8aff0cd782425dc95fdec4235f2fe1dbf1d2be1d55c5fc8bc20f SHA512 dd4e1c687c56ae395ff209e4f1c6e22b74b78a83373850ada084c7d6391f6442d6607125c3f3027e3b40837ffce6b7bfa3ef7ec810e614e6337bc5c383ec1a35
 EBUILD openmpi-2.1.3.ebuild 5615 BLAKE2B 9195ee57f8626e23012c89d601034b68c5fd4f333729d82d64ad48b8607ebb6b7e778fdda414d10c432428610e9de1bcbe9ead021068fa8b9b7d2c0087ffc701 SHA512 0b5ca00feb899a0ca13ea6c4a2f80c824303ea52cac4a616ddb1f807e40030b1bca509be5f5d23d96a717e346e043b3b897914a3f8a329f1d05d07c00a4bec15
-EBUILD openmpi-3.0.1.ebuild 5501 BLAKE2B 47580c29cbd6edd9f18488ca3fe91ae8e45115b1d5665161e4195c22f016ee6550339b910618322343599bc444e7d4638828a81ca9ae8d33023baac1f4129d32 SHA512 9cec89649171b6eaa491c074660ee88a74daaf95938686a508df717ae761b95412cb41606b47e95abf6c8de55906f6d4d052afc228f164d6645878883d31e945
+EBUILD openmpi-3.0.2.ebuild 5501 BLAKE2B 47580c29cbd6edd9f18488ca3fe91ae8e45115b1d5665161e4195c22f016ee6550339b910618322343599bc444e7d4638828a81ca9ae8d33023baac1f4129d32 SHA512 9cec89649171b6eaa491c074660ee88a74daaf95938686a508df717ae761b95412cb41606b47e95abf6c8de55906f6d4d052afc228f164d6645878883d31e945
 EBUILD openmpi-3.1.0.ebuild 5501 BLAKE2B 47580c29cbd6edd9f18488ca3fe91ae8e45115b1d5665161e4195c22f016ee6550339b910618322343599bc444e7d4638828a81ca9ae8d33023baac1f4129d32 SHA512 9cec89649171b6eaa491c074660ee88a74daaf95938686a508df717ae761b95412cb41606b47e95abf6c8de55906f6d4d052afc228f164d6645878883d31e945
 MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
diff --git a/sys-cluster/openmpi/openmpi-3.0.1.ebuild b/sys-cluster/openmpi/openmpi-3.0.2.ebuild
index c9ae7f37806b..c9ae7f37806b 100644
--- a/sys-cluster/openmpi/openmpi-3.0.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.2.ebuild
diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest
index ec07681082e9..ad9ed402daae 100644
--- a/sys-cluster/rgmanager/Manifest
+++ b/sys-cluster/rgmanager/Manifest
@@ -7,6 +7,5 @@ AUX rgmanager.initd 634 BLAKE2B 39708b2d045e05d1b683200d1f2bafed0362eedf7e4740e7
 DIST cluster-2.03.09.tar.gz 1784357 BLAKE2B bf024c93fd5ccd9b7410abc2a3bd792c55c3937604d750019a20190753d95d19b2232923a7a76463ccff592bde7fed942aa679af9e39158fef6041258eaf6eb7 SHA512 5dbcf978336a6b7998df0d3dfcff037e1e77e9e69b43d78eb573a65432445e572e69d7783e7874e9edf2632627f02426f428103831e10f5d1f338afa91a62c28
 DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
 EBUILD rgmanager-2.03.09-r1.ebuild 1530 BLAKE2B c4ac73b567d7c7f420421b6e20678344f7cac770cfe9c5444fcfe95ff41cc6b1e6c3f025b18efbd278a5608bef32729c4ba897ef7c925f890c3091fc024f3386 SHA512 4a8d4a655c8107f23e26844b5785fb1d44a9cb427a05e2a2c66ae5ac3b59df7b5f22e948ec2d127117c02ade4d70daaa7bd45e4d5aaa14878b9ce2a734fb4eef
-EBUILD rgmanager-2.03.09.ebuild 1534 BLAKE2B 96d9981e4685d3b2913f2157dcc0ca8f7dd5e5d27451297329a7675f7d2d33d12683b7fe27cf925f57cec97afd93f90d871c1411bb1104eaba170379f739d331 SHA512 be1a62cd1033133f8d01925e99b5ef4d48058592a7c642689b05c91ff451103a6ceec2493623990c24c4e9cc93165f9ad228058be764f33e5573abbd8f3741c5
 EBUILD rgmanager-3.1.5.ebuild 1400 BLAKE2B 92c92445fa8e13e222bcbcc460cdaf6f99b1fa5cea7cd7b1be81e02c5e0d87374f7dbdfaf0a4592cc423808b92a65d2008339305a2bb8e4e09039c67a8883cd1 SHA512 4292c6b6a31f136a963747698181b995c8e56a509f7db9a92f9c56860fdf7cad47d474a843c5060cd0388bad90c6a30cced047dfc0a497cf09e17697137669a2
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild
deleted file mode 100644
index 7bbd4a74f410..000000000000
--- a/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
-
-DESCRIPTION="Clustered resource group manager"
-HOMEPAGE="https://sourceware.org/cluster/wiki/"
-SRC_URI="ftp://sourceware.org/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*
-	"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	=sys-libs/slang-2*
-	"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--dlmlibdir=/usr/lib \
-			--dlmincdir=/usr/include \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	# fix the manual pages have executable bit
-	sed -i -e '
-		/\tinstall -d/s/install/& -m 0755/; t
-		/\tinstall/s/install/& -m 0644/' \
-		man/Makefile
-
-	# There's a problem with -O2 right now, a patch was submitted.
-	env -u CFLAGS emake -j1 clean all || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-
-	newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
-}
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index dbb5a3536cf5..57b2913b84ed 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -1,5 +1,5 @@
 AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802fd180584becde8a5b9d919ac9ab887a4ebdfe8ea64e53f30b3785bc32875ccd2e25fa99a9278081 SHA512 5ed7b2d96cb875e2db0914ec7232fe8443c05de69e07d214ffc0adfafac5123694173373f831c5acf46d11aa4fca304b88e6e4c4ee2fbe5b033d173eea5aec36
 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0
 DIST sanlock-3.4.0.tar.xz 157016 BLAKE2B 9d588214d260b88cfa3978e831bcd8086ae80aafc1a04b616274da141140a22c2765083632f29402cdae67cdbbdfcefdaff1539e5d45485c6f271e3ee7f6471a SHA512 8a10faaa5b9ce9f0506ca16620ad482804c9ca860b84a60a6f0b525a256059229a202163d366a57fb59169c0f4f822ced570b42562e412747f6f716509341f19
-EBUILD sanlock-3.4.0-r1.ebuild 2088 BLAKE2B 845fa9eae519cda98f244b1b8cb58e3ef2e47ed53bc6e75d8111656bbb87ec458b5fb3a32e5bffdd11ba34ac986dfead7d68b25e74e0d29eed9a00b6007dc571 SHA512 66a301f71b5ac7906dc517b0887558531c08dd393e32b057bd0749689f5223af0ce88af30a5764136e5bbd60695198c4f8a86531db9fc122c7407bec9d557a93
+EBUILD sanlock-3.4.0-r1.ebuild 2094 BLAKE2B 1ef2740a04cf198f2edbf4502d41f05b08b725f4d3715fe0b4a3fdbae6c76f5c4908d51680f80c814a1089c14ad6061812385a3e830a9b1113773b7b1f3c39f7 SHA512 aeb9e97edceb4e0654843ba1a3501ca17e44cc4a6e5bc11c24214b2c35c8c019fed7d366bbae9184ef07562f69edef4abd96ea06bf3a9048f49a7385609b0cc2
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild b/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
index d5eece318196..8f0c685b009a 100644
--- a/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${P}.tar.xz"
 
 LICENSE="LGPL-2+ GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 78ff319452b8..1c747c91ed91 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 75129de0b7c8..269544af485f 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -17,6 +17,6 @@ EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267
 EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
-EBUILD binutils-2.30-r2.ebuild 11863 BLAKE2B fcb470f8cfb7200246caa4cab16e18117a34197987a6de9f52c420ea6fa4ba3b617d33aeabe3981461d0ce5d3e1295694a2ee3a8666e186f9fffa289b614e965 SHA512 ed5c7dc6b0f7921cb1aa4c356015677d68235592cfbb8f59ef32b9db49af83747887874942f1e904d370680ef184f5feb8d32992d2710c1c9ba27dd23b8d0e54
+EBUILD binutils-2.30-r2.ebuild 11860 BLAKE2B cd7004b73bffcff8f86fb480060a409f72d8bf211e552779caaf3d897b842d5ec4ea653780b6bc7e5a2f14540458907af6c6b1385bcbb78c7d5d7b45a5eb8c39 SHA512 398a95f3f73b1b5c9f0397a9c3cc7d79b325ab1b62f17f3df78cd6dcebd4fbeaf437f7c07f9966c5944c2c4fd7ab797b23c279d80f5226ad4b58e7dfab7c6e38
 EBUILD binutils-9999.ebuild 11665 BLAKE2B e2db3d6e08d5ad51b485f62b08fbc43a5440299a9e92bbcbee18143c4f31e1f2035d58fd4479bff28985fa5e0c69293631a36bee475e4ee94a6c3c01149dd55d SHA512 08172266dac34ff37dfa143c13734d5a9d4a5eb0fca572b3ab47123403c728c01b75afe9f83fb4edafe6f309b45123cb5a3d44c617b824900388a7f0ab88e6b1
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.30-r2.ebuild b/sys-devel/binutils/binutils-2.30-r2.ebuild
index 31336ee7d67d..d88d5caf9dd3 100644
--- a/sys-devel/binutils/binutils-2.30-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.30-r2.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
 		;;
 esac
 SLOT="${BVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 #
 # The Gentoo patchset
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 7c48df7d8e3c..d3bf6440b341 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,14 +1,8 @@
-DIST bison-1.875d-patchset.tar.bz2 698 BLAKE2B a68e6009c24437a36c81e7fb97112f8ad721217b65a03531e5375e7310988f81d8c868485bdfc9b4ea99d4285ead91ad8f4670fb358abe92dc206cf6df4c80a1 SHA512 ac650b6f1b2b26057eda0d9ceae6f36604c88a67419b6190e423a08f863c460ded2a58040a71ce79b5e0b85ab3ede1b7a2ebd204c9bd8eb53f6551f39b160beb
-DIST bison-1.875d.tar.bz2 882745 BLAKE2B c85ce71986ae095e9dcfa24c1a9c7c484b3663994c1e394b7cc78a0ec1cc95df60369ff9878ef82edb4be144298d8648e336e861de98152bf79f6d66369c6dd4 SHA512 f84c6cf41a289ea7e0805cf9b0da6fe2d77f2e03a35c3db7d2e36e5186bba7c0853c3d518bd89f6cfa1030e346e046aa03b33974bb892dbd8f040e5ea2de1126
-DIST bison-2.4.3-patchset.tar.bz2 1102 BLAKE2B 3615841400ba984e563933d31e59a4810e17aed48b8314a3ceb66b47b2ad432e287cf9588b632594311f68d28d2bcce3c6a4f2c4be527c676fcbfd2a4480d04a SHA512 a36cf45b475e55e8baae265e43a151d3324026878d4bb4c119b9fccfc7be3c26ed183632bf210fdb587e2741d298df1e9d4ebb6c3d440f6ae33f40a29949f7a0
-DIST bison-2.4.3.tar.bz2 1652612 BLAKE2B 712444aec9898d2dc5dabd5008363f22f6beeb37e119edbdecb119965652e707d827e621c061b13be2206e29da59d661f1466c976c200ce749cf24062dbb5cf1 SHA512 b789f55d9cb95c1b4fba004691ed9f79b76da55020c9b202e1704a02aab1ba43b9fc1015e29843ed552e6df6165cef9c6ebc8a29d15a21c6e194cad8a42ab055
 DIST bison-2.7.1.tar.xz 1781068 BLAKE2B bd3161bcf4d2a9f046073280a8d751eb770147f942d48326a9ac869cf31fd8f127759167dced662b826fa54a24cd0cf87b0c096814c84e34afed8078368828a1 SHA512 ac0c7ca57142bcb84af498f606acb86091984a00359294fbf721a4ca8112f9fcf26497f7dd2e65f527e04a6e1de94142ecb76602d407e548475970e5a566d370
 DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b
 DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
 DIST bison-3.0.5-patches-01.tar.xz 5192 BLAKE2B ee5bbd59569b484e62dbd820a9795fa6d89c79fed96aa0615ec3baa067ae1f0f7ea6eadccf94d20458fc18d5977e8eac4e50a1a5f41f51519d8ff9f58dc78ab4 SHA512 f5df3896a113b6ce4a361d61b0139ee2ed4e0bda4a46e6312ae2ded0c7a1b2d2b67b37545c0bcad806f9289954022ff446c00bc2384dfff4049afb53e4657ed5
 DIST bison-3.0.5.tar.xz 1954868 BLAKE2B b6a8b426304f414c1b7601e75dcae8a63847b71361fba2538ad5cc52f3527fe464b066add670a236d5e1d2aff65bbe7a99c282ee3c72a0bfaa498d40e3a50398 SHA512 00b448db8abe91b07e32ff5273c6617bc1350d806f92073a9472f4c2f0de5d22c152795674171b74f2eb9eff8d36f8173b82dacb215601bb071ae39404d4a8a2
-EBUILD bison-1.875d.ebuild 1758 BLAKE2B 8e97849ea19b9d0ba6ed5e8d0a1012a3e8dab6f4ad553d5fafc7906272ca36b2d9658cf30711efdaadad5c5328c83493f9e503050a9e3d5e41f7cd469bdd068a SHA512 16495d16c9455581c6ef3749c93968e40bb209cc31e154e60bae733853b16868836af7a5c16c5dd3f39da73fb1a169990799f7262506ba7627fc5bdfc35bf074
-EBUILD bison-2.4.3.ebuild 1205 BLAKE2B 0bfef6eb3a5b94b8ce4c15deb81f5b9578313c1c87f884b59bf2859df90b53290eb22d8fda516fea8eb9b724ca0a59ba2a74f53c7427dc45b334d7548e1f5c1d SHA512 6c19788ee798a42b2e8e42311e0961c145306bce5abf70d3b9e044752e20a7f14f1666e8746a29cf453ddc0c4cf372d8dc51ad75cb9924df7d94395a25610e99
 EBUILD bison-2.7.1.ebuild 1641 BLAKE2B 41dbe1a40e5ffef3a9d259350cf40c66c17ac4a3f21049e858840a3571b682145d4545a7179fcf4d6c3b3c57db1212669690822ed8d5a510c290dd67bce82a0d SHA512 61b9c0ddf1ffc34bc1d1c849b242a02d9892315eaa14fc465c75349306476bcb93c65efe9223df3f503a7ba48c3e043422d626f955dbeab9f1ea59f95c012b25
 EBUILD bison-3.0.4-r1.ebuild 2469 BLAKE2B 6a0f5900ccd90f71bab9816e0e78a0bcd34f8e4f71517afb8c5d17422e1a19fdc5fe96c06827d4dcbce487b8293b34c36857a133c5ba79cc8c95876ff46057cb SHA512 5cd934e6cb839e468062f726317758e57e9d34dcdb525c9cdb0ce562eb537d25bbc52196b8249a3a6044b2d14a9112d0a1169edc71c13dc29c78c200dcfaf88b
 EBUILD bison-3.0.5.ebuild 2443 BLAKE2B abbd604bfb5b8029c8c301d10585997ed0f226c084343768947cc7c510412c830d52e09bc35496af423307f195249c7a80a8db6d33b5ab69209cdc23c68a7be2 SHA512 3eb5aaa9ba42daffaa92306d565f225dac6202f7b4599efd51f0c49539d0aaa19f4d2e72c90bbd63adedb9a76e628ea7a23b646b5e44011479af04c689ae9bb6
diff --git a/sys-devel/bison/bison-1.875d.ebuild b/sys-devel/bison/bison-1.875d.ebuild
deleted file mode 100644
index c59adc82dd9e..000000000000
--- a/sys-devel/bison/bison-1.875d.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="A yacc-compatible parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/bison.html"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/bison/${P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls static"
-
-DEPEND="sys-devel/m4
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-1.32-extfix.patch
-}
-
-src_compile() {
-	# Bug 39842 says that bison segfaults when built on amd64 with
-	# optimizations.  This will probably be fixed in a future gcc
-	# version, but for the moment just disable optimizations for that
-	# arch (04 Feb 2004 agriffis)
-	[ "$ARCH" == "amd64" ] && append-flags -O0
-
-	# Bug 29017 says that bison has compile-time issues with
-	# -march=k6* prior to 3.4CVS.  Use -march=i586 instead
-	# (04 Feb 2004 agriffis)
-	#
-	if (( $(gcc-major-version) == 3 && $(gcc-minor-version) < 4 )) ; then
-		replace-cpu-flags k6 k6-1 k6-2 i586
-	fi
-
-	econf $(use_enable nls) || die
-	use static && append-ldflags -static
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		datadir=/usr/share \
-		mandir=/usr/share/man \
-		infodir=/usr/share/info \
-		install || die
-
-	# This one is installed by dev-util/yacc
-	mv "${D}"/usr/bin/yacc "${D}"/usr/bin/yacc.bison || die
-
-	# We do not need this.
-	rm -f "${D}"/usr/lib/liby.a
-
-	dodoc AUTHORS NEWS ChangeLog README REFERENCES OChangeLog doc/FAQ
-}
-
-pkg_postinst() {
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-devel/bison/bison-2.4.3.ebuild b/sys-devel/bison/bison-2.4.3.ebuild
deleted file mode 100644
index 680885c49ff7..000000000000
--- a/sys-devel/bison/bison-2.4.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="A yacc-compatible parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/bison.html"
-SRC_URI="mirror://gnu/bison/${P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static"
-
-RDEPEND="sys-devel/m4"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-patchset/${P}-uclibc-sched_param-def.patch
-	epatch "${WORKDIR}"/${P}-patchset/${P}-no-gets.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# This one is installed by dev-util/yacc
-	mv "${D}"/usr/bin/yacc{,.bison} || die
-	mv "${D}"/usr/share/man/man1/yacc{,.bison}.1 || die
-
-	# We do not need this.
-	rm -r "${D}"/usr/lib* || die
-
-	dodoc AUTHORS NEWS ChangeLog README OChangeLog THANKS TODO
-}
-
-pkg_postinst() {
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 2509027d315f..6bad55d38460 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,5 +1,5 @@
 DIST cfe-6.0.0.src.tar.xz 11959224 BLAKE2B 257edbaedf72bd941b67b4aa2f152a96a37bbea72d21d22d4445152685efe40d75b9a7a39955545643e841ad6693ef12e52b207b9119098774f39e858b64bc09 SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6
-EBUILD clang-common-6.0.0.ebuild 773 BLAKE2B eb1d5d5c3a18c7b38535de505bddb911bce68f4c309140d4a0729af9e0db30e7c2ed5778504786a55af986c1be9ebbf5dec8bb3ac6bf0b9ed9a2bf1997997145 SHA512 cb3f0a5d923c3d67245b39a403527de37f58d9f97965309f345c336eb29abd7ef6581d45ad6c717499c03253b69c04d5f6ff9e8bcbe6fa1988411a31b038877d
+EBUILD clang-common-6.0.0.ebuild 780 BLAKE2B c507c9741ffa0703d385a0a31cdb45b4ce107bdffea3ca93e7cae460e3c39625d0da8e9886596f5e5d30b3a318fffd0a9758a1a9a0f1fc13413057895663d36b SHA512 60f4915c48ee0a995d50680f618f5f8e76bfe36a476163e2e131279deb75dd6f66bf105431f554d07b6849b91e4c2bacfc8767ff7c87126ea280e508716e0580
 EBUILD clang-common-6.0.9999.ebuild 666 BLAKE2B dc0dec1a0c708ad38f971a0b33f7751c5c2936170f968b8c43ee1fab836d6f4e485ad898305e50ab6d711733248caac0a5d8769d18dac6838b1ffc315f7e7391 SHA512 4c81e883864a9408eefd53f91ef20bc74bcb87e4f14a1a4d644e7087f15239518b210c9471f800d2ebd326d6c3c5747a87436424c0a75757d85180b26bd2013f
 EBUILD clang-common-9999.ebuild 641 BLAKE2B 81f3432382ffcf77a61d9142a0ae83df84499da1ba31cbd542d2080bde11d92676efd0a9a19f1392f55a300fd9aaf7b0268a8dec7f017cd229eec4dde1b7091a SHA512 0e8661594be1482cda90f240792ae7a9e77c0ba167d874735f89994a24ebf232a5cb10858fc9099c9f639174f2fbf79b7eb16e05ca54d17c636002c72f68d7d5
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-6.0.0.ebuild b/sys-devel/clang-common/clang-common-6.0.0.ebuild
index 05dbb18f31a4..4cc3e42ef4bd 100644
--- a/sys-devel/clang-common/clang-common-6.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-6.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 40c1866b7bc4..552a9fad9e50 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -3,8 +3,8 @@ EBUILD clang-runtime-4.0.1-r1.ebuild 757 BLAKE2B 027d495eb3a9203db1ca76f1f6c99d6
 EBUILD clang-runtime-4.0.1.ebuild 639 BLAKE2B 62665ccfdb77a3635995b6ec9a59589e3d5e5b39c3940b378acc314fc9fcb4af23f7d44fba89f61eceb4055622b9d7c35ae26724b3cc207c06ac60bd2eda5a75 SHA512 b42d5fbf0082e194f4fc4ddf987a2d1dd0f06fc673b590ec278b45cacb8854c207b26cd159fe4cccdd1a123884037fff7c9e5908d0f329b93ff4ef0238e550da
 EBUILD clang-runtime-5.0.1-r1.ebuild 815 BLAKE2B 79a99496306fa8a7c9315d5da28e68d88c0ef92fa7aac53982190a6f008e2013a6a4d60e68683ffd8fffb08b40986ddc393a2f4967a47c05cf876c8558310d88 SHA512 614cb030b1930e8f6f1837d5110b2b87865bc6444a49c34f67abba85419568dacf303720364d2ce2f021b39a1f98760a1ccfe3b65ea890172b8dd1961e199561
 EBUILD clang-runtime-5.0.1.ebuild 685 BLAKE2B 28192550762e053ba121c73c3001d7abd8f3e40cf85c609a51f878a8c5d40e66b10cc3f844a72d7dd552a5cd0d1742cdbf0fbdb8a58b163d34f2f7e6dc11a085 SHA512 5033510813fdeca2497a16556b7e27189f18aa3d04287dd62854883011c4c41257bb897a9130222ff07b8b5ba4b31f206960d35391735c5dad97243471a41027
-EBUILD clang-runtime-5.0.2.ebuild 815 BLAKE2B 79a99496306fa8a7c9315d5da28e68d88c0ef92fa7aac53982190a6f008e2013a6a4d60e68683ffd8fffb08b40986ddc393a2f4967a47c05cf876c8558310d88 SHA512 614cb030b1930e8f6f1837d5110b2b87865bc6444a49c34f67abba85419568dacf303720364d2ce2f021b39a1f98760a1ccfe3b65ea890172b8dd1961e199561
-EBUILD clang-runtime-6.0.0-r1.ebuild 815 BLAKE2B 79a99496306fa8a7c9315d5da28e68d88c0ef92fa7aac53982190a6f008e2013a6a4d60e68683ffd8fffb08b40986ddc393a2f4967a47c05cf876c8558310d88 SHA512 614cb030b1930e8f6f1837d5110b2b87865bc6444a49c34f67abba85419568dacf303720364d2ce2f021b39a1f98760a1ccfe3b65ea890172b8dd1961e199561
+EBUILD clang-runtime-5.0.2.ebuild 820 BLAKE2B 52c56a71db4514803c8ecc070e21a479bad960fdaa40e3fbd6de2229f6f71c0f5fbbfc2dfc5fee8bcb8570c5e71c73be921cd3fcaabe442551d10ccf9a4736e7 SHA512 bcde7bededdae2f422da56eb68ed862fcafb618b8ce6cd1932a5472e325f0c0231429c7914806915b2f4b579655d0f46d82e19f5f83420d204f53a81a9596e47
+EBUILD clang-runtime-6.0.0-r1.ebuild 822 BLAKE2B 1026c7a2622fbeb879699c0a111b76aa4dd50ea375040c90b4dc95d0b8b589a4665e70aa00b8857133eeabd4efcc373e6aae09f043ba12e357c3a07f584710fd SHA512 7b044862d3789d705de7c441043ec3caf820826771916d02ff9120e78185cca51d635051db24be81ac1adbc3f1ed0c632024a0c06216b71ba82335744a3841ef
 EBUILD clang-runtime-6.0.9999.ebuild 780 BLAKE2B c10fc2663938e138f6ffba72fbf4bd87fbd93ed89a40992c0960ba18ade6e162544612c921e49d2f03476b758f0269a16375dba129e19b6a3f7ca88d98d2674c SHA512 90fd1d2a1cb62efc6d877efa8a794a6d16ae6032e5af52c50ff2e8ecb8a1a4552d757ec8dda0f905c78a3e068dd848e9155494c84faec649860be4441f69322e
 EBUILD clang-runtime-9999.ebuild 780 BLAKE2B e62543ab7d24e09ee7c933283e3445103d943196b02fb4891db1af30aef4ee53c709f8f640b4478fc622fdbb243e981fcafbc42fca7cd1e2d2c56576540dab0a SHA512 ab53bd4228bca6cf4eeb52159433dcb0db57fcc920b6c2e2da4f1b43fa65c0de26d8ad6d7a1655eed44031c1deeeff0acd88f80d107f5bdbc7d776cc66f9af06
 MISC metadata.xml 708 BLAKE2B 56cc586deba4a72cc9ebf5d0ac6b9dbb3767b736a96f1c0e4f8d9a715076645be25e42f1c610f55ba69e500bc828d629e7f2253e7c9ed6fd4b01032722bec3c8 SHA512 764eefdff5358c66cad9e8fe18fc7b938c7656268208639cbb92a4b5ae76f7de0dee86a729cc1e6745ddbf7308180885ef99047502e0e040020e738e3d0d1425
diff --git a/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild b/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
index 5fdd2d6b0a90..2aec5c92acb2 100644
--- a/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang-runtime/clang-runtime-6.0.0-r1.ebuild b/sys-devel/clang-runtime/clang-runtime-6.0.0-r1.ebuild
index 5fdd2d6b0a90..9ab9f95ec042 100644
--- a/sys-devel/clang-runtime/clang-runtime-6.0.0-r1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-6.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index bdab655957c2..ed5c7bcd6dfc 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -31,8 +31,8 @@ EBUILD clang-3.7.1-r100.ebuild 972 BLAKE2B 10a79e07cdf78a7204011d44605c00eb8677a
 EBUILD clang-3.9.1-r100.ebuild 1471 BLAKE2B a3f8f43d3f07cc8598a4bdd8e0c59d1da6528a64bf3c7d3b5f54ac972ff8ec49d83bed04a6646d1f87b525db1dcb597184fd7fc0bc6bc1c5ad85052990ea7f40 SHA512 6868f0fff8faf5a10e9573e76a26000078a94dabe442398d454b3e06a4e1e678670fa57ce10c60ec607601ef72a2f328ef6483a369ecd23b1f6cc59b2755e5b6
 EBUILD clang-4.0.1.ebuild 9614 BLAKE2B ba22e432cd595ecb6a4c13fd4a6de428242b13138f0f079826b4acfd37515c69776800cda3c6533338986bb0db75fa814905a3a4649ebf8812872e97ad1d5a9a SHA512 d533ebcc2d5cfc801d71f95414aa510a4d3143b55fc0917a899a863d19ad8618ba31db6991ad3b73db4959bb2b2e37ea9410e99d2d85cbb81348db1d3af1bf2e
 EBUILD clang-5.0.1.ebuild 10440 BLAKE2B 13bc01d728e98302c8f1708c805e5528fa5f924ac892f17a3f06684fc43448e8d97159f1b9361e633eaccf0717242c4778481f10bff92063256b3307bf7197ab SHA512 57b7dc557e5144d3cc9f7c7560ffaa51ca5af184031b01acb74fd565171d80bfd973f82c7406f8dc624d59f183f12aea8e925465e1059ce1f8a8ce2c2d2fdd94
-EBUILD clang-5.0.2.ebuild 10442 BLAKE2B 5fa2646fa9965c3b843e751a5fce47b76a08fde65d55f70f2d314738dd48e8affaa9ade37d87685c5e9c546aa35c4d1d916ef33acd83484e954c91b3db8a8551 SHA512 d0554f3fc4ceea7cb9d7d33d5aba41c8589fba55e75b551bca861ba517fd77ee8abe89a97d80bedd0852b491d7472e76257eaa643086b925b5253f924545b33a
-EBUILD clang-6.0.0-r1.ebuild 10442 BLAKE2B fa6fce2064b50cedfa4fbf4584f135b605810c39a70d32323f06eef5883c82a77918c0d66fd7b13de5f0bdc55e4c16f484c7fe43c1cfde07704c17fe79629b3e SHA512 9392f1949b9f6a522840acbd54ddb187eb5680cd665790ac55eb279580f36325a747c0e4b9845b605483e7f64abddad1f1232c708c26578562bf1906f4310316
+EBUILD clang-5.0.2.ebuild 10447 BLAKE2B bd8bc12e08364171fdb3c1fb1bf98f4614a0adb6f5e5bfc590488b02b9da9412faaee773fbc331d1deab61e08f54bdd78ea2504eb1f837c07d2832b4f2d4e5ac SHA512 d6fa3371914a9da6bb2728500a5a1bd6846e310b126e5534fb634b4056851d24f88108a0ef40cca7202c4cf65416d48fd17b2caa2342e36397b308537db5b395
+EBUILD clang-6.0.0-r1.ebuild 10449 BLAKE2B c5723a9a32ff5e855f9645736323942836f3762abbb3fb063b1bcc2cb651a0613e29448d1cab6334abaf27b8b4f2432a1bef39195fa775837fd6adb15b4e7053 SHA512 fb0acd4fb403112c1097bb0dde46f30ce242a3fc0bd7c2514bd789a41f89eff73dd0cdb7f2c68bf75547dbc3126f7eceeb274d7ec2f5b6c4d386b4dcd9981325
 EBUILD clang-6.0.9999.ebuild 9415 BLAKE2B c605173c0fbe72841bb6dd63c3f7823c8aeb170c6fdab53a6a0e3470595cd537ed9ad82187d54e2bf2f4d5a19857f509fc0c4cc26824cdc06069340538d7223f SHA512 aba7391f35fb3c47b4d6f447d69bd44c44658bd95171ea74924687a0daff1a1483a94a096e57131da86cbbf6642b513c3ad39d133f2a589e4b8e5b053d3e66a6
 EBUILD clang-9999.ebuild 9487 BLAKE2B d8705c29b9a4e60608af3910a47e91d5a16cf531370b968511e96261207747cdf47981d2ab435a8c1e3ba4fda863248a299609ef2ae79c04aa2f6d68ad586daf SHA512 434bcd703b29bd9491368c0f665581cf3d2569743b311d6430031baf7943ed7d7c1dbd27b8c243c087a709bc0d4e04605648066a7d237888d78b2bd5df179e31
 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
diff --git a/sys-devel/clang/clang-5.0.2.ebuild b/sys-devel/clang/clang-5.0.2.ebuild
index 6c0b434af8a8..85f7d6b4404e 100644
--- a/sys-devel/clang/clang-5.0.2.ebuild
+++ b/sys-devel/clang/clang-5.0.2.ebuild
@@ -30,7 +30,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 
diff --git a/sys-devel/clang/clang-6.0.0-r1.ebuild b/sys-devel/clang/clang-6.0.0-r1.ebuild
index fcd7f4e18741..bbe27878acb5 100644
--- a/sys-devel/clang/clang-6.0.0-r1.ebuild
+++ b/sys-devel/clang/clang-6.0.0-r1.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 09fca14cb85d..93c0f5502752 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -6,9 +6,9 @@ DIST gdb-8.0.1.tar.xz 19583920 BLAKE2B c22e314a0fe3ccb84cef6eca66c51af60914160ac
 DIST gdb-8.0.tar.xz 19588616 BLAKE2B 148965e33a42787b5fa39650c2b6c48e28895930e36f11b44e8391366be1cc3bd4265ea7df932a7d650291fb20e3f66956c7dff1923025f889e5c035d3bf4207 SHA512 e4044bdd162cbf95044ec1eaa44d2fa62a33e051bdbbacbc97afd4dfb07bae1bea514381fc1966aede89d6796ef2377a15748a93d95e2ad494c8497db489e886
 DIST gdb-8.1-patches-1.tar.xz 8768 BLAKE2B 792ceddcb8eafd028db23d69ad5d9eb00223722520c6ff0a23a24fee1a33dceb02f05e61a1d6c3700835c480b38d66f43f71ef3c4af406d4ae1147eaaf8f311e SHA512 87a5c9d9207817245e1ffd07fdad2cb566de4fc11725aa0e49e58268c3ab1ae3b4b9f4b9faa55acc8cb4c3c7cb5a3875ea7da02abeb8f775953a8aed2e2c6403
 DIST gdb-8.1.tar.xz 20095080 BLAKE2B 9332058b8b723261ba215124f42a2d6ba916219efdfb3c23ae1f48fecf131c801bbd31b345f2c8339b23d74da690be0260ac31f8f2e79549b62f0880199bfdec SHA512 ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357
-EBUILD gdb-7.10.1.ebuild 6606 BLAKE2B f936b1f6fb0107c3b17db4833aba8cdd8f56060a62c644aafc96f05a274569856843d2f59f0415898c3bd547f9d69f6619fccf1e8743454a491ecfa6712878a7 SHA512 ac9409424ffdba44d825d16c0c9768ae0bc51c9deab4975845132f6b630ebf5cbb455344806b8a25425f9bb6a864ec06c3fc33f30abd0eb78e63e0af0f5d5665
-EBUILD gdb-7.12.1.ebuild 6618 BLAKE2B e3e8b6df08f7243df47b410259852ed2fed0607c0c69277c198e6989ce76dc0c20dac0569f75b3ab782877d31bfc61839ae8964db57e470d0cd46fa660261de3 SHA512 b1a21bb16d648fdc45715e85eba3a4dd28f3c3083250355032f1adc671e498ccbf89166350c3ce31ac156832676138053f23cc301fb45620ba7ee4e5127157d0
-EBUILD gdb-7.9.1.ebuild 5944 BLAKE2B 2065393cc5a34ff738626f997bec0a5e1e5d383d78bd774b04c85b683ff499f395fd87349917fc0bab911109ab6fa369176746b16fcfe40d3f996e85709fe6dd SHA512 7fe1fb5eba8ccb86f7b0fad0d433b7a5687421c9f8a57a4f6f393d09c840dd66e8f109873ff9772c2ea7209c5f4b95d2af6d8abe8e3e4c397bc0a96eba08871a
+EBUILD gdb-7.10.1.ebuild 6607 BLAKE2B 363765a64800c4bbb3cb8dadf31acaa1f4ec596095c9b3e032a4173a94b96f641fed500ef0b48b463307e390bf66cc9c0a52f48d01bf329a2e6b16f008cf063f SHA512 37189f8b237e1896ef96371558d3f660798aaab49e873286b9be4ee4d317098addfbfc4bfdf1e5877ee324c69e2ac2ad842c016114e6b1ea1e12a7de3546459f
+EBUILD gdb-7.12.1.ebuild 6619 BLAKE2B 852ee309b4a3938be4111b0e38e301c3cc9bcb328f55b58bcace495d2b3d1de36305fbfd77144c3dc32a06f75c70da0c4942b7ecbfb9d1304e42855c5bc02e59 SHA512 b1b0588da451a6ab00a62365f038e27ca2c1c9fc509b6fc46f96e8cdc12d6c8a5e5d254717e8af12e2b9818b06ed55b470872ad339d4ae1efc185bec9fb36d78
+EBUILD gdb-7.9.1.ebuild 5945 BLAKE2B 2f767de7261f2924808b0eeeed463fb46b6cf490ed54e51d6f49838b61d053f45410ac2dd50f71696afc71d98b89afa34158d25577ad63f07006aea0393e2edc SHA512 7154ae49de7d61bb75752ad1d8e71d0414fa8baef5fb876eead8e5df4b01b2c23555d990ef2915186ca2b098c1ebdacfd121a54aabbcf103a5478affb0b64b8c
 EBUILD gdb-8.0.1-r1.ebuild 7008 BLAKE2B ccb35ca9316b0df5e6940036c33de7bbf2f8dd86ebbe093128595f3f7b8619ea61d59481feb1e49e11a4260f3137d523989b977f01953cfc37204151e2e65704 SHA512 17253bdfb5c2e9976a1f8a6e88fa854d4fc8cbb8b73173f19283a1beec2bf3691b0dad2b4938b2e9d4755a3775945104120ce280fba5fd99b8db63d23adb140a
 EBUILD gdb-8.0.1.ebuild 7001 BLAKE2B 51ee8a28536516b731e510f295fa337d380bc70cbcbddbf6f0f6c03c96feb37f59f873d024823da267152f1a8b5f3e7bc1c9cb977e06b8e02335e66845df1f0b SHA512 ee436fa97e4d7921689115c3aef6d2380d87929b559e5654989727bd5a9c220258df6f9cf0974c02f9518458b3c791e285bbe995cd00d36044be748fc5b3c899
 EBUILD gdb-8.0.ebuild 6817 BLAKE2B 71e593bb7f4f2b9b4d3b3b0eef223c6e0084b2f71ae38ce5035e0e72e3056538087481e8448730a06a35d4f3c307244ff1e68ebd480a3afbd48e030ad352b74a SHA512 1e7cbeb9b79cb2090698fbce6e212f87061db60c25efd9ddeee5db0997607bfb65be8bb22eff5f293adde9601304b9015ab6387fef4b590b618772f317b0edb2
diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.10.1.ebuild
index c662f0cffde3..d0cc28e0e100 100644
--- a/sys-devel/gdb/gdb-7.10.1.ebuild
+++ b/sys-devel/gdb/gdb-7.10.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"
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
 	# live git tree
 	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
+	inherit git-r3
 	SRC_URI=""
 	;;
 *.*.50.2???????)
diff --git a/sys-devel/gdb/gdb-7.12.1.ebuild b/sys-devel/gdb/gdb-7.12.1.ebuild
index 6b6a04e9deff..a1863b60ff04 100644
--- a/sys-devel/gdb/gdb-7.12.1.ebuild
+++ b/sys-devel/gdb/gdb-7.12.1.ebuild
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
 	# live git tree
 	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
+	inherit git-r3
 	SRC_URI=""
 	;;
 *.*.50.2???????)
diff --git a/sys-devel/gdb/gdb-7.9.1.ebuild b/sys-devel/gdb/gdb-7.9.1.ebuild
index f2d998373a9f..0e9d8fdb970e 100644
--- a/sys-devel/gdb/gdb-7.9.1.ebuild
+++ b/sys-devel/gdb/gdb-7.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="5"
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
 	# live git tree
 	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-	inherit git-2
+	inherit git-r3
 	SRC_URI=""
 	;;
 *.*.50.2???????)
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index d38048d43b0d..10f508922cc4 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,8 +4,8 @@ DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf
 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
 EBUILD llvm-common-4.0.1.ebuild 641 BLAKE2B a8543b8d909c48caecbcc423f15742aa56412971320650a87742cf907b0d0d3d143e7caa54b947b592380b40d340bd1957c8df05053f6cc6f932332ce5e71eb7 SHA512 b497a3c7edd56bb634e307a8ad9acecb6f21f2f262ab5f50ee6c9b2bd4c40f0defd8df61ad6f0b0c74222468388cb18d3634e0a0d1662ed4c74d5c2e3db30188
 EBUILD llvm-common-5.0.1.ebuild 832 BLAKE2B b71a86abf77cf505810463c592563717c0941013183dcd42c6f3e0afc3e19b3cdf7a3d583eb1ed48cdfe80c46dba23fdce38c783f845744adb8101b655bfc5cd SHA512 f147fb0f7ead70c26458ec7a776773eb16a148952a5f36703974f3983fe411ed7f7293b88bd3353c55e0316301d10a52a587cab257b104091cc8e9733b175fad
-EBUILD llvm-common-5.0.2.ebuild 835 BLAKE2B 89dbfb278d1dffd42b066901aef2c63c1671206d2cf40246c9bf5bed2610b0c1feddf6c2e6ece9553fd2318a1f86966cdcdb2b2181f1c91bc3111ee234322418 SHA512 2c67d15602719a45d3863b79ff11a61f287ee5aaa45b859aee741a9bcaff011300e61550d37935901e00475b501e519ca39efed9a3554155b9f770a480f6e155
-EBUILD llvm-common-6.0.0.ebuild 835 BLAKE2B 89dbfb278d1dffd42b066901aef2c63c1671206d2cf40246c9bf5bed2610b0c1feddf6c2e6ece9553fd2318a1f86966cdcdb2b2181f1c91bc3111ee234322418 SHA512 2c67d15602719a45d3863b79ff11a61f287ee5aaa45b859aee741a9bcaff011300e61550d37935901e00475b501e519ca39efed9a3554155b9f770a480f6e155
+EBUILD llvm-common-5.0.2.ebuild 840 BLAKE2B 43282c63d613c473c13d22095a4ffdc3c4c1bc871d42dfd097f00215a776bfaf4dae8b7156f0c2f36ce9624bb1b91a621f69e01189dd86882194219980d9154b SHA512 ad9d36d76bbe43002a0298b8840cee7edb98985c084a314bf55c8eff401885fa9ccb1666a2e79dd36209daf398c48fd1d038d49f10265370b03f86adfa1d13d4
+EBUILD llvm-common-6.0.0.ebuild 842 BLAKE2B 5e3b7595a8c27da5fbbbb8bfa369371f29da50618c06bcd4bcbe4ddc027f24e917fad23d0a432d4e9dc1e600683bb9e5d5f20b90d106754b7e6ee40f05c8dddf SHA512 e1cb1065b6c3f66602d431edac11406bc50781ae472e5a0020215540af78fc6d4050a30af25c5aac1396e017e73c3d0066cb35562014c655ff957369ae0b7631
 EBUILD llvm-common-6.0.9999.ebuild 729 BLAKE2B 8455b714f371250a13d032a0bc9cc64fe16a670da92e3f9b46dbc05d79084083cc02db2eea0a1c477877e9c3b2c3b0bb5706539fc83a6089fb79ffd5f6d600d3 SHA512 a697745f5f07f002d3a789583bb3df163713b372147ddc41ca4e6395f9b9de51407aab376cfa8d6ef7276bc9c221f0a9ce2a763f347b3a04656fca5ecc93d258
 EBUILD llvm-common-9999.ebuild 704 BLAKE2B bfcd46a0c3754d0c5542eb1b03c8696ef355ebe34e94c98ab6a23442a88bc6b9a8aa8d2c89b18ed0ceea47bd2adcd7df67c8d201876a04ba7816257f83c53706 SHA512 4a7fd7260e93fa3b44a565c915a8be2e207085a506018b97263740851fd78dacf88e582b73d74a06aa36de2975b751c258ceb7997a5e6ee7db4d404fbed865bf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-5.0.2.ebuild b/sys-devel/llvm-common/llvm-common-5.0.2.ebuild
index b4d44abdf980..3142ca929d3c 100644
--- a/sys-devel/llvm-common/llvm-common-5.0.2.ebuild
+++ b/sys-devel/llvm-common/llvm-common-5.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-common/llvm-common-6.0.0.ebuild b/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
index b4d44abdf980..4ccff3beb373 100644
--- a/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 83c4504fc54e..19ac103d55c8 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -49,8 +49,8 @@ EBUILD llvm-3.7.1-r3.ebuild 16384 BLAKE2B 79560163f422e3b897eefae8ec2ac905a18a4c
 EBUILD llvm-3.9.1-r1.ebuild 16317 BLAKE2B a4edb45656ae073f618d899787a339b0c5e7f8f0bab9a5030c33c85ba9761e9e510021b139aebc422902da55bf5b1ff2caf5c66604f338768eed359ad8bb84d5 SHA512 ee31d4f2612a413aafc906880ea4d7f06c276aa4a0dee9635ac9ec076539ee14c82ce4cc81cd689f6812ae74eaa421ca8648d3d143d5ec238aaf602692f99434
 EBUILD llvm-4.0.1-r1.ebuild 6874 BLAKE2B 1fc78d0d42ed2bf901bdef44262f4ef68a933c89a3cdc43b1d7d2ef39b326499465d32ddd6109128635d68e03293f236cb30b5ddee78999c0e314aadc7c5ae8c SHA512 752e037d12f2906df36c1aebba064dabda343dea1e35af8e7e6cf5e7f739d4f45c9a9ac2e47d92e40d281961421b4b1c630d58f1bf76582876ec168b310d9cd7
 EBUILD llvm-5.0.1.ebuild 7662 BLAKE2B 9b45d4b535e33d0e6ce8ba6b16ee0766301c765474ba555e41136395723098ad34485329b4525c6bbdb4c581daa0507df0f715243c2d6a93ad2f9f0e8b256cae SHA512 ab0904b321fff9b8e7907869ba48e8d91e2bd5dcd4f2032043f1ac9fe18532cbffadac6307b062db307b4e20c2e38d8a360103aa78b10e6e88a72d3584801f2e
-EBUILD llvm-5.0.2.ebuild 7683 BLAKE2B 787456fba39b764033f7621958252e263326423c8d60b1cd26efc86e45458cba90222ad08b543c424598dfc70e4aba81e171be7c74f476015743a6bf1f1ad9f1 SHA512 65de543430013fcfdf14d778055483c9315a21e741749b53af3ea5b5bb4e3ab822664086984db920dd7bcf2a05d9e090427a4121093c45d7021cedf53f466346
-EBUILD llvm-6.0.0-r1.ebuild 7939 BLAKE2B 9d625c5d78a24985db63c68474195b6a7652dcd19f192efa523fd4704a15acfb4492921eb1a753da4bb2593926c073cf5ea805b701557b148ee711329f153ad0 SHA512 d5b1566a9e6a58942b591b1dc9751f1eb6df90955c4cd7d357d6bbe1225c417d2c2dafb4422d61971027da72ce12982ad5bcaf1be3bf81aefc3a10ccbd6a549d
+EBUILD llvm-5.0.2.ebuild 7688 BLAKE2B de25dd876eb21676cc27c69a1abeaf910c290bbde1ae3b4d2d41d19716dd21bdb87bc0062a60ddf8f3e7e2bdddae647bd34a1ff5af2a10204c03f8267064f048 SHA512 fc5568ac7bce60737bd6307361587a4e444b5efbad4a9cf49d186e1a0c75a14d54a1ef29fca8d970fda70c7d0c73d960343aed4162ab7f6ef1849790a126e657
+EBUILD llvm-6.0.0-r1.ebuild 7946 BLAKE2B 3f89f5a486de48c04aef07ad5744c1984a9f79c143299e40fb4e98ecf6ffa96610e30ccf4890fee28cd8cc2e5b705c67ba71df21ba27249f0aec6463f59216c6 SHA512 0d4e650401a80d52aa4de58a93893457e5445a22ffb47d8e85208487fa6f58d55dd109856d290cc12efd0891bf34181f8d791677973562f2930f8678fbf08a93
 EBUILD llvm-6.0.0.ebuild 7820 BLAKE2B a2d8451d0f94dae610fa87673781ec266160efcf93625f50121358f24d2a1df415ffba00a50ebb69ae98c438bb582840615ba0fbc4a5f92cb82f00276b54e717 SHA512 f168b3b8a69b1cd3a6d91fffd99d4413bb2a8e2f28eafdba94abf3e069c7ac024a5cc8fb5a361b16b3faad51759e51753f34a9cbec6cdcebf5e4c090c33d38e1
 EBUILD llvm-6.0.9999.ebuild 7514 BLAKE2B 506aec86e9f4de12d00953a33e2cbd71a29bcfd57ec621d41da18aaceebfcc56b67b830d2d6fb60293651072447947c5851f5a9d1dee64a14ede9249e33b866d SHA512 2b11e3dfdd2eec988f01cde34c1dbaa9cdd0ab4aadddd7592f9e7d782201fb0dae564fd5e69942d8da5b674353e552c4f51d164305676daf871502bb05d88be9
 EBUILD llvm-9999.ebuild 7668 BLAKE2B d5232b4183c9f9a12c3e460afd1144e94961b37c10b6af40cce5c34860a99071098390feb01051d61d749f4908f64da645d8c288c8947745aae8a97bb84d6b6d SHA512 481c508f19dbe6b8db619884d0a27abd8ebe48e6dff94596cf1e056d0944b688432995596e1555be77b513f962127db646a3c43c41482e54418df0e75930a24e
diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild
index cd05103a3845..768c86f3ad63 100644
--- a/sys-devel/llvm/llvm-5.0.2.ebuild
+++ b/sys-devel/llvm/llvm-5.0.2.ebuild
@@ -33,7 +33,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test
 	kernel_Darwin kernel_linux ${ALL_LLVM_TARGETS[*]}"
 
diff --git a/sys-devel/llvm/llvm-6.0.0-r1.ebuild b/sys-devel/llvm/llvm-6.0.0-r1.ebuild
index 9a8bed537ebb..9d7c3168e196 100644
--- a/sys-devel/llvm/llvm-6.0.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-6.0.0-r1.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index 591395619d76..8f39d9ca49ac 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -1,11 +1,5 @@
-DIST remake-3.81+dbg-0.2.tar.bz2 1311308 BLAKE2B 7d6f6d8339a376c3c902013b95027ace4188cdf286b70479b7d7fa1dd5bd5a241b9d50f19239d00e3f9a6716102d81027bdbcb5757dbaaf117caeb419e3cb7b9 SHA512 3f0d828c27e990d4e959fb9f73ca49921eeba76cba1ac869d1165fb4a11d257ffcfcb03ff1886e569db91e06021e4b5055aaaec4069347291d62a5f518440486
-DIST remake-3.81+dbg-0.3.tar.bz2 1078924 BLAKE2B fcabc7fff8eac208a3fe58bc4892e48589122aef3dd94a41191af0bae0c246bd2cd5e9a77184ef1c13b4ff4ea0bd975ab403366315bf2406a1039c491770f491 SHA512 a86ed989ed6c616da0a9850560b88c1a2f8ac277fa4c8abdb2a40543cf63c3180810d5c6a822d7dd6988a53cd36eef18d857e4958787fca2ed616d14186c36b1
-DIST remake-3.82+dbg-0.4.tar.bz2 1360407 BLAKE2B 4543591a3b030123942e165a93174578c8cc7866fe38a169961b22ea150619eb7931011e9711c4d3fc0df41b672920273adadee10f160f7372e838be0e6fe62b SHA512 5f75e7826e4258c33e3844d72d685f1c1d252c352b40c0d6a7a3e5155097496640ff72542786452fa40079060b4c0cb514bda7147521c7170f42003ba8c0aa77
 DIST remake-3.82+dbg0.9.tar.bz2 1152677 BLAKE2B bb4c61b2bad39be1e50c919c2c4b2f069df31a6b6d6e51863257a20ecace2395a16349f8dcafcb4c5bf020d423d91d7d9c9a3098ff2f6d2891a5d3bdbf54b126 SHA512 94682e9d0317088456dac683d67be320fe10bb06a3384969fafefe091558b215105ba3c96a7c1d4e0d970ea2dc5c4f535a704256fe7a4eaa87bec11d78d074cf
 DIST remake-4.1+dbg1.1.tar.bz2 1254246 BLAKE2B be1b18329b36d6c34aaa3270ae2c69b042d467d19bc99ac13562df387a3f0cd0bf19c7e39aebfa983614355c2d0921620609894850e1eb66f24ed08aea36ead3 SHA512 e0dfb0f7a3f05968c3597e73f2fd486929893546a8f993e99ae73c6400050d1faa5baed1b0588d399bfc6e58e8504f857c8734e39a02efd875b522b26dfaa421
-EBUILD remake-3.81.0.2.ebuild 627 BLAKE2B 12752f61d93aaac837b06e11a02690f508d26b00c3a2d3dc77c1526ef40174db2dad0587876950c54a21d894503d77998dd5148e158d19b825cb9b109045ceae SHA512 c722717a790a7af0361eb923d5fc4c4ff5bac5046af09515653180cb66a73afff5d80936e66d2d938c8ce6af1831ad1ec8606a257e9ee2a693b56935ec47e3bc
-EBUILD remake-3.81.0.3.ebuild 630 BLAKE2B 5468fcc264c6975232237682bd362c754e581376d5e99c78598a1feb21d659d3bbc434ddf575e3fb6dc960407cbcbaf9cb3a175dbfa70e41e8bd809052981c7d SHA512 0721dde414af9df567cfedf7c9acfdeccf82d38d277323d3d05e6b9d09f319dd8f15dba3bcfa734eb1a69b44ebaa623de466183f4ac0f61590759c620fc2ee59
-EBUILD remake-3.82.0.4.ebuild 679 BLAKE2B c47832e5620b34a28e25234b34063e97c7fdfd65563638c816f6560e200a07e56df22ef61b4c24ec18a8fe6f658b0f0beed420b9bda94383a177cff150e29719 SHA512 bcae20e6a8ccb77d81f95811a11b2d1129e2be8eba1da1bde12341d813bb9ecc86c4e1d7dde4775cdfc03ddb94c3201b6d5edf05e13d6b2ec895a406b78b7a51
 EBUILD remake-3.82.0.9.ebuild 620 BLAKE2B b81d8e2b9c9e3bab02b116f21ad5484d7b2e49711a9ef5f9d71660aebc1e02c515e0ac82639fe51f752042a0fac4d7e6d995b36ad0ca090418e3b3be58733153 SHA512 78bfb6261ec1bf419ad9740154aa7caba439ad973adaca5a0c7cc7e68a5ba696195f097e3171f186e44f899a7e297d21c7fb8fb2b5828b98a4e7e5327edfb496
 EBUILD remake-4.1.1.1.ebuild 834 BLAKE2B d04bb04d37c434dc64790c4b744bd46b71857c547d44ddf735ba03d211381cb7ac408c2cf84d9c1cec3db7b855c7d4d58526390fd269fd9658f3e5251c3ee1cb SHA512 703662b02b790965479822a6017a0b64407641bb9bb3c8dc50d5aa3853a2a5da80b2c86d4849095383a519c6613b51b4ec0054deeb88c43878a1c17b38cb757f
 MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c
diff --git a/sys-devel/remake/remake-3.81.0.2.ebuild b/sys-devel/remake/remake-3.81.0.2.ebuild
deleted file mode 100644
index bf21b2c77194..000000000000
--- a/sys-devel/remake/remake-3.81.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS INSTALL NEWS README
-	# fix collide with the real make's info pages
-	rm -f "${D}"/usr/share/info/make.*
-}
diff --git a/sys-devel/remake/remake-3.81.0.3.ebuild b/sys-devel/remake/remake-3.81.0.3.ebuild
deleted file mode 100644
index ef77d4f235f9..000000000000
--- a/sys-devel/remake/remake-3.81.0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS INSTALL NEWS README
-	# fix collide with the real make's info pages
-	rm -f "${D}"/usr/share/info/make.*
-}
diff --git a/sys-devel/remake/remake-3.82.0.4.ebuild b/sys-devel/remake/remake-3.82.0.4.ebuild
deleted file mode 100644
index 5a10701ab19b..000000000000
--- a/sys-devel/remake/remake-3.82.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="readline"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS INSTALL NEWS README
-	# fix collide with the real make's info pages
-	rm -f "${D}"/usr/share/info/make.*
-}
diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 948a2223143e..80ed43d582da 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,8 +1,8 @@
 AUX smatch-1.57-restrict.patch 406 BLAKE2B c22cd24b1666c73daef2b90bd9e8235c418630f153430206f5d32b224782e7d500a6524eadec6ad6c0ff4d379725b84ecc7d8dcd185e7451593e50cfd7929e04 SHA512 fa4816a24a2f0ff4aaf057ac83fc0ba4d9787f0e2daa7e6999700448068460adddce6fcac3efdb7aa69e4d60b9eb34f4ff17056e8037419ac4f5d21b5be5514d
 DIST smatch-1.57.tar.gz 491677 BLAKE2B 150ba84dc797497b2522d28b443a89fbec221a00fcade85014d434f675ec60908a473770c695dbf65a5ed273c3e665aa9dc4ec9a91bc071651388a9ec90f1bfa SHA512 031f417c97d58b617b2e375a28f509f71eb2735212a98aee0e21880a28842078ad3c24b5375a03f73d75fec582a9d187ed6a00a0512c4792e5ffce82dfd79b99
 DIST smatch-1.59.tar.gz 495530 BLAKE2B 668a050e229cd9b4e5881fe059f5a8654164f5a155c471559ce7a82e66bcb2170f89a25680be7ff867f2765b574f363ef95a15a65ca98d47dbd8aed20f588f9a SHA512 5e18f48dbbe11255a06b427205aefd1f8f5a11bb0b238f9134b89e6f5cb838fcae649a4e87a4a04473a33077c94e88aab46b06e33cc87cfe451fa83b5846ccc7
-EBUILD smatch-1.57-r1.ebuild 1258 BLAKE2B 5b6baf229c0fca1923f1695b6746277ec997359db638d278bb1d166c627a7308d5dd3a281ba41a89ab7520d4faa95fff4d6eebbcf64d27bfdd38ae6fe380b215 SHA512 27b2c45fb70953190af70913aa3bf80030b95edd45d1204063db364209df8d453a4c94a57c837fbadf3cf39f1598a5b77b5e5de28654d4ad2762388ac035fb8c
-EBUILD smatch-1.57.ebuild 1209 BLAKE2B fdf5382e44a2c9be25050715d6fb3c6e5e1fcd1195c66b62c359eeb4b2bf2a85191105495bd2016cfac61a20f9b870f48366b3315856e1a39dfba12a9b12e237 SHA512 85aa6e85b35628e53b54e617ab639267f50b12927d5c415d3cee82f19a384462c17d53a65869a9ea4a7b675b4a8b70d757705727af87ac684eb5a1a9167f6a12
-EBUILD smatch-1.59.ebuild 1217 BLAKE2B 3189864e942557f9117dedabf1a9f69e552ffa61b371dfea6ed47151af73594a04f47512a8475ca73829b98167a1c0f4a4c1be76447c086421c5e5e6cba5295d SHA512 c22981a1e5917b32c7ad113df8b7dec529a38bbbaa06ce3abe79c8d23b7b7c86eca90637db0486dcc07d05dbaa48746410f18ce5e5218957f3b831babe810ce4
-EBUILD smatch-9999.ebuild 1217 BLAKE2B 3189864e942557f9117dedabf1a9f69e552ffa61b371dfea6ed47151af73594a04f47512a8475ca73829b98167a1c0f4a4c1be76447c086421c5e5e6cba5295d SHA512 c22981a1e5917b32c7ad113df8b7dec529a38bbbaa06ce3abe79c8d23b7b7c86eca90637db0486dcc07d05dbaa48746410f18ce5e5218957f3b831babe810ce4
+EBUILD smatch-1.57-r1.ebuild 1259 BLAKE2B f7087313102dcddbf48144d7e4466d5b84d736ba6332dcc3c613dca105933cac4b88ee128d62b61e002a2fa9558d190535d83909de3b7da79a63cbf5abb32386 SHA512 d79a795083b48938abd2dcf68cd119b0db642c563e57ba8e38a3ec1031e3bb3ee29c40abc3db6f98b1c0300836871586ace56447376b203dc0ef5395342bd268
+EBUILD smatch-1.57.ebuild 1210 BLAKE2B d9a0ad71528dd7676e0dc3891413cc6bbe17ce875905b7c184a47148331d5222dfcd4e4614c3f9b510f8b49fe2e1f0372e6ae3a740a66bda4e1fe2a5b86eabb1 SHA512 310410b07f94e7ce5fb353696139e28b88af5b0bf112fd078a2c79dcbb6816d6db9dac9c5c2049a3a7215a4b311915b5b33dbecc0d34aecbd2e5cd3bd05b8c5c
+EBUILD smatch-1.59.ebuild 1218 BLAKE2B 3afa9b44109f0be9329a8a756cd30e574d26d39356f3c578f008f333c1a1ead766ba14e7e6f899d24433942e651e8061d70dec9a6336198f17994ff582978dab SHA512 9b88a6e66559e5c68109ef663000cf6b7ce496783b2643a6bb9f7d6fd5e13bd10e7b3bec53867bf93c77d3d2dddd9dec3b92836b2245eb6dc412b3eca6073855
+EBUILD smatch-9999.ebuild 1218 BLAKE2B 3afa9b44109f0be9329a8a756cd30e574d26d39356f3c578f008f333c1a1ead766ba14e7e6f899d24433942e651e8061d70dec9a6336198f17994ff582978dab SHA512 9b88a6e66559e5c68109ef663000cf6b7ce496783b2643a6bb9f7d6fd5e13bd10e7b3bec53867bf93c77d3d2dddd9dec3b92836b2245eb6dc412b3eca6073855
 MISC metadata.xml 337 BLAKE2B 3215b338ec89ebd2d1d39e33c5903a6ad571ee6ad4236968a2c250f2d7882c90c2791746df43455a7fd63ebff544177f49c9e0074a31ccd81f7ef68f1eabfa82 SHA512 8d4007163912848eb4e4b525c808e7c69fe5aa93913398db793b6ed73936cc936a25e1fe7dce4a915b4caf6b2796d6dd4d1a52ed6dfbd2e0fb0faf6c0ba1c7e0
diff --git a/sys-devel/smatch/smatch-1.57-r1.ebuild b/sys-devel/smatch/smatch-1.57-r1.ebuild
index fd7fc3e72b97..6a2ec7381faa 100644
--- a/sys-devel/smatch/smatch-1.57-r1.ebuild
+++ b/sys-devel/smatch/smatch-1.57-r1.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"
@@ -7,7 +7,7 @@ inherit multilib toolchain-funcs eutils
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -22,6 +22,7 @@ else
 	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 LICENSE="OSL-1.1"
@@ -31,8 +32,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-restrict.patch
 	sed -i \
diff --git a/sys-devel/smatch/smatch-1.57.ebuild b/sys-devel/smatch/smatch-1.57.ebuild
index e807d2044380..f232ca67e03a 100644
--- a/sys-devel/smatch/smatch-1.57.ebuild
+++ b/sys-devel/smatch/smatch-1.57.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"
@@ -7,7 +7,7 @@ inherit multilib toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -22,6 +22,7 @@ else
 	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 LICENSE="OSL-1.1"
@@ -31,8 +32,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^PREFIX=/s:=.*:=/usr:' \
diff --git a/sys-devel/smatch/smatch-1.59.ebuild b/sys-devel/smatch/smatch-1.59.ebuild
index b2a8198a82ca..b8be38b5cade 100644
--- a/sys-devel/smatch/smatch-1.59.ebuild
+++ b/sys-devel/smatch/smatch-1.59.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"
@@ -7,11 +7,12 @@ inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -24,8 +25,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index b2a8198a82ca..b8be38b5cade 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.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"
@@ -7,11 +7,12 @@ inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -24,8 +25,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 2ac8de0aacbf..15ce877dc07d 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 2385ebd78c31..87710dc8020c 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -35,5 +35,5 @@ EBUILD intel-microcode-20171117_p20171215.ebuild 1149 BLAKE2B 54add03072f87c0e10
 EBUILD intel-microcode-20180108-r1.ebuild 2589 BLAKE2B aa50ed2760d43058427b2f01a4d7464f4ed2539d5c9adcf45034cf6a52d36d00557c12e244eaae4dfc2ac0f0381a58f4e44f971edc2bf279e39ecf1f8b7396ba SHA512 24e62065e2a261591d765b1fd2b7097ff99ac44f973bf5e22f07ba4615293c90b79bab135de09312e78cc2c2a07ac1b857309923b4b560adf1fdfff88dcc3980
 EBUILD intel-microcode-20180108.ebuild 1328 BLAKE2B 27e9dfb4283a5ed844514b1fc0df0afe793776454fd9748fd00b68947834465a667b86e9b262a4161d142b42fef80651391fcf872857abaeef66de5492528f3c SHA512 d6a0b50abe64c41bac70172e0672442e46458789ee9fac3df39f91c66f16011f4bd639dcb3cbe236429223d4d51c581ed345e2048bfce205c98a3b05a580839b
 EBUILD intel-microcode-20180312.ebuild 2590 BLAKE2B cf489e4899380a5672e78fd5d8f81f5896dda301d1f82478301c1367839285631d0e1d90e67a676b59ff68b65823f7ff5354a7ac227866304457efab1ff98ccd SHA512 325b6917aa5415145ba1193d59b8a57b5667e0fea8fb3dd3d97bc0ad2e1172a5f161f94e660aebfee4057cb5f11dfcb3e3935bc4664b339b8250bc45510d47a3
-EBUILD intel-microcode-20180527-r1.ebuild 7248 BLAKE2B 63f6f6d4f6e7b3d0b25773b9163e180296c54464ac3c505b9b15fc8956ea19de4a531dbf486148fbb05355af7d0b55db080abba10769af14e823821b3e0b2d88 SHA512 c600c7ba853188d6c7a0c36ba33501d9ffeea4155fbdb31343a24f9557997939f9a4b964c536a6f3505283198bbee0d5333039c6dfb65d18a1fdbd91e8bc798e
+EBUILD intel-microcode-20180527-r1.ebuild 7246 BLAKE2B 1f69c9facd89055ee8e49ce7abd69b13278b084f1241b34240aed49fca1e2943ffb3c89a594b0042db71e2eb889b1fbda3dfd290f0b49589b13f72ff7785c43f SHA512 ad5745698925f0561f04521dbec1e18ebdb90c66139b4b86b68754fb9ba8c7f2f0c7b40cec7cc510c31b39a84d6f716cdc91222511425bb14a76ce1c2c2af2d5
 MISC metadata.xml 778 BLAKE2B cdbbf186c80a9a7c910912871336c2ee768af5cbe3939399beb94a30b141e499ce1ca4b098e5c12c6632fff57cb6de172c83ebd7a0a6637d228e10b244db0d75 SHA512 030f595dd6b5d50e7b6e5dabc47df75e08506eac59354a6e7d6e51f27c29fc3765bd9213cd7e13d65990226b0e5fe34e090dc35669bd9dfdf5ab7a1d7d581306
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180527-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180527-r1.ebuild
index 53450c16d441..27b8f2ad1686 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20180527-r1.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20180527-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}
 
 LICENSE="intel-ucode"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="hostonly initramfs +split-ucode vanilla"
 REQUIRED_USE="|| ( initramfs split-ucode )"
 
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index 2f051a6acba8..957225b18e99 100644
--- a/sys-freebsd/Manifest.gz
+++ b/sys-freebsd/Manifest.gz
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
deleted file mode 100644
index 5784c0926e85..000000000000
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-EBUILD freebsd-contrib-9.1.ebuild 1394 BLAKE2B f0eddd5f7dc14f45b3584eaeba7bc5c0a82f9a2e1f05405100ca99e80e01b121ed18b8704706e8dc49daf8df58aa45bdac974c99a84379e31e7f5c9123ffb586 SHA512 18e0ddf3c1b476c6872e8e96795f5749d1289f04d15ff72191b5e14876b28d2968d2e79b664aab5c3b3c5b00db52188dcbfee7711f3fd62662608096d9ecc674
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
deleted file mode 100644
index 43cb7cfbbf59..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bsdmk freebsd flag-o-matic multilib
-
-DESCRIPTION="Contributed sources for FreeBSD"
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-src_unpack() {
-	echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libodialog gnu/usr.bin/sort gnu/usr.bin/patch
-	echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
-
-	freebsd_do_patches
-	freebsd_rename_libraries
-}
-
-src_compile() {
-	cd "${S}/lib/libodialog"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/sort"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/patch"
-	freebsd_src_compile
-}
-
-src_install() {
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-
-	cd "${S}/lib/libodialog"
-	mkinstall LIBDIR="/usr/$(get_libdir)" || die "libodialog install failed"
-
-	cd "${S}/usr.bin/sort"
-	mkinstall BINDIR="/bin/" || die "sort install failed"
-
-	cd "${S}/usr.bin/patch"
-	mkinstall BINDIR="/usr/bin/" || die "patch install failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/metadata.xml b/sys-freebsd/freebsd-contrib/metadata.xml
deleted file mode 100644
index a00f3aeb1f81..000000000000
--- a/sys-freebsd/freebsd-contrib/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 type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 8c6d647578b4..0b7daa946b55 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,7 +1,5 @@
 AUX README.pamd 2840 BLAKE2B 06d8f86b6db63a0b401627a8e2cff0dcb7daa2b567b2d7f97f196db263956b95516495b3acc806cfaca448509638235a874845c088b898033e858e835c46fcba SHA512 7188bbb741bacbd2c826976f7f3b3150036f0855514ead679f56f0a4ab70fd6657fd38a33215cd883264ca2e801b7b2f3d7b73c40e04adc685e5fa6385c49357
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 BLAKE2B 10d9b14b96d777d8b9e6294b74a42f579a894053047391db79beab6aa9e413059c5f6ad217cc8c80573ac6bc836329aefd17bdd0a8f22b06422b78d0d3e815f4 SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0
-DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 EBUILD freebsd-pam-modules-11.1.ebuild 1023 BLAKE2B 0f3e81814eff77c96b6ffb6d6469fb3bb63ca97b5d31125ca14cbca595809bd4015213bde430be10b41d7995f91f3ff35f1218be7bc43ff87b5669444abb4d6c SHA512 f2fdb23d324125a06535dab07d753878ebbeb561e3e6a0f9d5ea0cc94664199675a7c1b2410d21adad627440920813cff68fd4c09f043fcf6b09a4798f0b3710
-EBUILD freebsd-pam-modules-9.1-r1.ebuild 1068 BLAKE2B 47819009526e13581cb038b7eaefde599a83b8902bb765e9f3cd987369f2794da12ae04c392607041b278d96fc6b167973900d531d2b2828498e656ac7789751 SHA512 021bae67c9c7b2b884e719afa3dadfec383706598cacbef742cb4998059c489afd5aa36bbabca3ecef1a924aa78b5adc4e83686c6a5c7ac000ffcc17a9cc81e3
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
deleted file mode 100644
index e23b77e00410..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} NO_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-}
-
-src_unpack() {
-	freebsd_src_unpack
-
-	for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc
-	done
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index 8d3c6ce3d5a5..f9bd74647657 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -7,11 +7,6 @@ AUX freebsd-pf-9.0-pcap_pollution.patch 450 BLAKE2B daf9a836b6c8243e8b452c0e68bc
 AUX freebsd-pf-9.0-pflogd.patch 332 BLAKE2B 99686ab51741c4b7fd0d72b56743c0306319402cc01b038f9dce8165853fce80b0e7d9c9c34e9e25656b17974a63c8a039b8aa1c98ec7cd429b2e5991e0a0f7a SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073
 AUX pf.confd 274 BLAKE2B ed3466c836e7c4958d371d7858cf15e532140c1d3afe7e3b2155275f24ec245628d2936d8ac26eba13bbb88b9d86ad13e5f662f0f37ae813a98e92428e160fae SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5
 AUX pf.initd 803 BLAKE2B 8f3d10adae448a429b2e08954b5a3d3025d9cdde90073fed0b50f900de47c8e4611fd406409047fe8ad1f25c69465fe7954e8b3c937ad507b45fdd8096a9a4de SHA512 b447683fb3abd11a6c5158b452ac9a72858c0a57bb424a1ec3a4cc8dce09336228d6e43ce0c58a63d63ee3917211227a6c5f1d4ac4bde42ce7fc5aa6d188f28d
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
 EBUILD freebsd-pf-11.1.ebuild 1491 BLAKE2B 01e49509dc7f3528e0f14a01eebb2a8b5f0c9fa927844b98f8a9f4c89bbc1b103f01b972efa4a370b9765dd1cb6620d51de0c012a1b58b108434d7e247562f57 SHA512 2ace1ad0f89365b9b707a2b9b29f04dff926ad3a3340abd156862aa0c50396ce078d4f997d1298b498df1c52745b5216f2c112424254ae12abbb554783c276a8
-EBUILD freebsd-pf-9.1.ebuild 1622 BLAKE2B 0f7d70434c2c818126809f62bff3b14d862c6e1cc37b9dac9add9f9f79d7013bc67e7ced112054d80d700c1ee88f17acdba04c0ed23a99dc844f554bf0b0db0b SHA512 3a0665cfb80a4c6b50429af568d6ed4caeee4556e1562526779eebe13dfd9b4d92ec10584101e310a0ccc41059f72138ad3f0097b18014b1b7ce457e91f716c2
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.1.ebuild
deleted file mode 100644
index 21c799fbcb84..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-9.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-libs/libevent
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy"
-
-pkg_setup() {
-	enewgroup authpf 63
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_unpack() {
-	freebsd_src_unpack
-	# pcap-int.h redefines snprintf as pcap_snprintf
-	epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
-	# Use system's libevent
-	epatch "${FILESDIR}/${PN}-9.0-libevent.patch"
-	epatch "${FILESDIR}/${PN}-9.0-pflogd.patch"
-	epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
-	epatch "${FILESDIR}/${PN}-9.0-getline.patch"
-	# Link in kernel sources
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}"
-		mkmake || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}"
-		mkinstall || die "Install ${dir} failed"
-	done
-
-	cd "${WORKDIR}"/etc
-	insinto /etc
-	doins pf.os
-	# pf.initd provided by openrc, but no pf.confd
-	newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index f0a6df2fb0be..fab3bf9c1896 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -4,16 +4,6 @@ AUX freebsd-share-10.3-gentoo-skel.patch 600 BLAKE2B b04b8653aef9add52fe180b5876
 AUX freebsd-share-5.3-doc-locations.patch 608 BLAKE2B b79fd173a1051dd6af748f45d0476ba21d8f2f72baea6965b2db22bbfc9ecd428c3e9b6e296ad8d8df6276cc61ff9f54da932d81c7ba3af5f68b0ce5cc96eb4a SHA512 2156f679683b8a02fd01fa71268f13f342d282b1885095e48611d9a94bdf99f03bad71f5c22253425c09ad5ae1ea544d1db3d0d40361f3b814f7e10f0061f2a6
 AUX freebsd-share-5.4-gentoo-skel.patch 621 BLAKE2B 96a8d7759ed001a1c04e254255c7e7cb927898391346b2dff14839fbcfb0f8d2c19e3d6ce6b3b847cbaa2322089317f64efe854ad878a51d1f9fc6496f12f7ab SHA512 608e108bcfdc1eaa1f45f4115f460e26fa89211aaefea9602d1943dfa51e34f721526ef5e71d7e44f019d31b43efbd8f9f937e71d71074b0c3b48a33329281af
 AUX freebsd-share-8.0-gnu-miscfiles.patch 858 BLAKE2B 56d6b8585cc49f5547240f28343f6114b75cd49b97bf532e11e17220f55224f8a2c1f365c858643d7879ce133ec16bf33d361e7783a65539763e7769a6297932 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853
-DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-share-9.1.tar.bz2 6733003 BLAKE2B 12bff34814fc3e893a95480a3ed1a389f426b6c7c7526c572aaf3bf710258feae78f09390dc29ccf563eb700407ab2f600c251c4a3927556e9d5ca323f37b17f SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
 EBUILD freebsd-share-11.1.ebuild 3324 BLAKE2B a4a35392bc6e32b2e7c8922e887260717b30df97d4c18b9d6b068338ed536e5cc4dafdbca59391345d1c2af93798b28417d660aa2cb86778b53d5097a904f3ce SHA512 6e91be861b588dc5e91ac6b6e71fd242c5b7d86f9aabc8077bc2084326b65d71c1da6a6c4bb1b61e71e991c501eb7ebd13bd2bb46352bdcd8b37815bd5ae1ea9
-EBUILD freebsd-share-9.1.ebuild 2570 BLAKE2B b13be518c7480379886f5fb750e0b15151b4265ba1fc07de829c3118e0560b5f75b4def82367496af372428faf8892da44b54745d23f66824c508dcd8512dfb0 SHA512 64486f4fbe20a8b466335319060c6ffb336e75009d403815dabb62b9551f25d6410677b19f47c4b564d6aa24e124ac048e14376673378e344962f7024bd096c1
 MISC metadata.xml 303 BLAKE2B 32a957edfc2dcb1fd1076d208b253fbe2408a65f44585ebd3863a9f6d95f4e25d8e3fc5ada378074e0d7e1ebd47793c4e8241656087da905100f68375c70df9e SHA512 4483a50bd02a3644bd12148d0a54ff78686d974337b5c22a267bdae228eefec85bf1a8b74a1c04a7759645e451e59c75734318d07376692d26c97261eaf2fbf3
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild
deleted file mode 100644
index 28608174a64e..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-
-IUSE="doc"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-		=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
-	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
-	"${FILESDIR}/${PN}-8.0-gnu-miscfiles.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
-	# Remove rc.conf manpage as it describes bsd's rc.conf.
-	sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
-	sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
-	# Remove mailer.conf manpage
-	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
-	# Remove pbm and moduli(ssh) manpages
-	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
-	# Remove builtins manpage
-	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
-	# Remove rc manpages
-	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf "${S}"/mk/*.mk
-
-	# Make proper symlinks by defining the full target.
-	local sdir
-	for sdir in colldef mklocale monetdef msgdef numericdef timedef
-	do
-		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
-			"${S}/${sdir}/Makefile" || \
-			die "Error fixing ${sdir}/Makefile"
-	done
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink"
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# This is a groff problem and not a -shared problem.
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
-	mkmake || die "emake failed"
-}
-
-src_install() {
-	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index f58a17a890e3..165c4f5fd4d3 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -25,14 +25,10 @@ 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
-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
 DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fce8b8e32f57ed8dc713b24db5dacca70e693ee24001f0db168d79c528e2c20c6011ac423629a807949757e9f468969c3127 SHA512 e9dc61ff10aafb9b92721c599577ce995458b8a1a93b31fc6cc39b910db2b8f965ff0354a45bf82d2d57abba7aa0bf6d2f002044d242e19121d5ee4cd7a1dc15
 DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e
 DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
 EBUILD freebsd-sources-11.1_p2.ebuild 4594 BLAKE2B b4861bdab72dcfbaaadccacd98efabada77878264140e35428acbe427e17a9d56edda10c5275bb7abcc9107badfe010fa642bcc1bf760e02241b4da6c9644887 SHA512 a700daa8edbfc20f6aa9e82288529f613bc2134ed5dab624d0aba56b4189b78a680ec3a13110d7e4aa15471c4133651ce4472096ae242c772a73faa953df10ab
-EBUILD freebsd-sources-9.1-r3.ebuild 2516 BLAKE2B 887ca3096d603d65e1535756f3891f2443e2123253d2261dc0add5e36e8a17e1962cc198db3be342b1eb33f167effcba6cdd8b67ca6863b3515203b7d6de62d1 SHA512 90437ccdacd83860e3abd86e20ff1903309bd54e7f4ce151164fd7f8ddc0d3ec9679df6b76167297fce672eb4a25fcf81285f8eb0ac7e6eb770784452a6b6c30
-EBUILD freebsd-sources-9.1-r9.ebuild 3061 BLAKE2B 9d75a09489c04dd10a78ea5d7770f42f964724a3c1b4b18dd0113a08e7e8576a373586ef369b095a1361aeca7bad1fd7e799ef258af12b27e18d32655b541414 SHA512 b1dad489f2998a6f50e679ebfe7987387c07f3e35800cec9b5cfe79fbfb1ece6390f79438428a642a68700545ec37204040ddcd4fcce71259e692ae9eee4047c
 MISC metadata.xml 444 BLAKE2B 26160b0d71ed4eb333357e7d3d5fd131038abfeb50db42107cabab63fe2123cc9d495d53a33bc8fea3622dee7994076c57163ab9904c452c1d3bbdad569481b9 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild
deleted file mode 100644
index 85d83e233686..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${RV}"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-9.1-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-ntfs.patch"
-	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-	"${FILESDIR}/${PN}-9.1-cve-2013-3266.patch"
-	"${FILESDIR}/${PN}-9.1-mmap.patch"
-	"${FILESDIR}/${PN}-9.1-nfsserver.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 9.0-RELEASE it's 900001.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${RV}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${RV}..."
-		ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${RV}..."
-		rm "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-	fi
-
-#	if use sparc-fbsd ; then
-#		ewarn "WARNING: kldload currently causes kernel panics"
-#		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-#		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-#		ewarn "Please compile all modules you need into the kernel"
-#	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild
deleted file mode 100644
index 91b31dd95864..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${RV}"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2
-	https://dev.gentoo.org/~naota/patch/${P}-en-13-03.patch"
-
-RDEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-9.1-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-ntfs.patch"
-	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-	"${FILESDIR}/${PN}-9.1-cve-2013-3266.patch"
-	"${FILESDIR}/${PN}-9.1-mmap.patch"
-	"${FILESDIR}/${PN}-9.1-nfsserver.patch"
-	"${DISTDIR}/${PN}-9.1-en-13-03.patch"
-	"${FILESDIR}/${PN}-9.1-cve-2013-3077.patch"
-	"${FILESDIR}/${PN}-9.1-cve-2013-5209.patch"
-	"${FILESDIR}/${PN}-9.1-cve-2013-5691.patch"
-	"${FILESDIR}/${PN}-9.1-cve-2013-5710.patch"
-	"${FILESDIR}/${PN}-9.1-cve-2014-1453.patch"
-	"${FILESDIR}/${PN}-9.1-random.patch"
-	"${FILESDIR}/${PN}-9.1-mmap-2014.patch"
-	"${FILESDIR}/${PN}-9.1-tcp.patch"
-	"${FILESDIR}/${PN}-9.1-ciss.patch"
-	"${FILESDIR}/${PN}-9.1-exec.patch"
-	"${FILESDIR}/${PN}-9.1-ktrace.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 9.0-RELEASE it's 900001.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${RV}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${RV}..."
-		ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${RV}..."
-		rm "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-	fi
-
-#	if use sparc-fbsd ; then
-#		ewarn "WARNING: kldload currently causes kernel panics"
-#		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-#		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-#		ewarn "Please compile all modules you need into the kernel"
-#	fi
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e95f6bee6549..b53f6e2eff15 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index 000ef0054d29..4da176d385ce 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -3,8 +3,8 @@ AUX cachefilesd-0.10.9-makefile.patch 609 BLAKE2B 0b6f518b71866b4220164ec27a8ba3
 AUX cachefilesd-3.init 1677 BLAKE2B 20406636f93b3e002ab15bb33879101813a7bcc23dfe0b5dbc35e24ec3f192023e4cfbacefff6985b39bcc205575ba3b9b6ed44be96679b7486df550641a11e4 SHA512 ca227db027c1673f9e1339f6a3952c93a2cbdf454adb690e43c8eb49860cf998b5e12f0191ec58c78055212f7a65269b77a413e7ee89c3293ac9a3af5a0ec8f8
 AUX cachefilesd-tmpfiles.d 32 BLAKE2B 26527e8c3b8e821fc05c6bb1ddd0a6cf74857f8219307a96c4a12cc25517d26bd3b377deee41eae00b0a12ef55a6a9b9820836ae57bbfdb4c2b381a2efa6bb71 SHA512 37ddd3a452cc1d639b3ea3e98fc528c4552dd7f768a05fd1e4ad1821bbd6a0092f1cc5cfa4e7e41664952e4fd06001724fe64f6a16115fff15c542732d2ffec3
 AUX cachefilesd.conf 296 BLAKE2B fce58c6af2016c45c0545b86c4dd98ffba8f58193af0b163a8ba83c297c9a9af944ba6d8997da5f1ac44c8cb331fafe94f93ed0b5fb4d4b14c5025cf6436b46e SHA512 6b82563b27b3a202afa6922bf4059836c7d363c5350d2b348ecca6ae12de2ae31d903e65b00f427712e7df22c0401b181177e168715e5e375b290f6d247fd846
-DIST cachefilesd-0.10.5.tar 112640 BLAKE2B 2dadd76c522fb4fb7cf3fdf5dc69d43e7585c21d8988ad44714a0f30b110c2eebae855c71f61259c39e7018391c24a14e894bddfe4eaaa9766a93f912bf6ff6f SHA512 996e47de40cff4d2c0d265689ef3a33aee6ef0d0432a03d7428133c091e77b0e099bd1346b5638bf2d9df6bb47bce519491b420d5916a3211c4e04e158ad92e8
+DIST cachefilesd-0.10.10.tar.bz2 26694 BLAKE2B c527a6283617ba53818e0cad1859544b1e66af1107b05d1f83904669425d31c5374f3c032b892c9d95892d02d9256bbd9b180f1d0b6b430f0cfa70440406ef9f SHA512 d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a
 DIST cachefilesd-0.10.9.tar.bz2 26555 BLAKE2B da5df1d2c6715a7cc304b32842f00e69d356359abfae865cfc1b63b89e1149bcb48762ddf84d13f5d18b727d8e0693257d424e599c3874bbe842da9aed4a0cfe SHA512 06ab444a7df8ec37c15bc03554510f4acbb453e0730277f036abc5d61f9e377d90d9387dd5237ea481b95b1bf097b5992adce90ce971fe29760cc4c0d3c9cf34
-EBUILD cachefilesd-0.10.5-r4.ebuild 1480 BLAKE2B 727ca79292b21ce313374e069b7c0dac4e3ed57cef36054344848f9df165480d1f08a9b18433a5f741d98e5145ddcd5164128232faf03a8aa7a325e0294749e8 SHA512 65cea8918efadaadca5a2eb422b1fa1082d741977ac8420eb2b7f2e7fc6c03e758cfd046c1cf1f609a1f50d046132bf029b9f490fc1e3eb458c25315f582fb92
-EBUILD cachefilesd-0.10.9.ebuild 1475 BLAKE2B 678722c38815e850e1a011eaeddd5d2f7cef56dcb6b2acf222da0173afacb3be820e4d6f7985c55038ba459fb01776cdb1b2fb14c3e3b6ecc23f57e80082ae5a SHA512 7c554794416a185738ba1fabda6395fe6443b6eb519bf2c750a414980cd66af5b218c9375a9747d0234b7566f1b583f2c4d267f66fc780dc1db0c4bb27de6c4d
+EBUILD cachefilesd-0.10.10.ebuild 1478 BLAKE2B e94563ae245a849ade78e8e89e3df399a5190cdf4cc4412b2437c99f8b1ef3c19b6afdbdcd1653e865f3062d59312813abea5ac7ead3dc7c81096f1d7a48fc31 SHA512 21c5044a4af28a5c8fa6aa36c2b579c60e8f964bd5f13aaece7315e05ddc5751fb3ee8dabe467f6dcfa7ba82f53457f58c6783ebd2c20fc5a99e1f1d845a8ef8
+EBUILD cachefilesd-0.10.9.ebuild 1474 BLAKE2B f6f6a711efb2f8a6e4da64eeef209aabc7c3fbbefe99381bff20761d9295d2717e65c983d83a588348a62f9df3c0242c1d2858d3b61a5d4714c51b668938a0a2 SHA512 ca2637b562004f977847dc0697753b2114a5ed53dca94906209f90e763bb2126e36fabe59f6ef8ddb2579387eed090d76a6f1c8726d0b4a7882af0db0ca587f3
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild
new file mode 100644
index 000000000000..629ffd58c2cf
--- /dev/null
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Provides a caching directory on an already mounted filesystem"
+HOMEPAGE="https://people.redhat.com/~dhowells/fscache/"
+SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.9-makefile.patch
+)
+
+src_prepare() {
+	default
+	if ! use selinux; then
+		sed -e '/^secctx/s:^:#:g' -i cachefilesd.conf || die
+	fi
+
+	tc-export CC
+	append-flags -fpie
+}
+
+src_install() {
+	default
+
+	if use selinux; then
+		insinto /usr/share/doc/${P}
+		doins -r selinux
+	fi
+
+	dodoc howto.txt
+
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	newinitd "${FILESDIR}"/${PN}-3.init ${PN}
+
+	systemd_dounit ${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d ${PN}.conf
+}
+
+pkg_postinst() {
+	[[ -d /var/cache/fscache ]] && return
+	elog "Before CacheFiles can be used, a directory for local storage"
+	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
+	elog "uses /var/cache/fscache.  The filesystem mounted there must support"
+	elog "extended attributes (mount -o user_xattr)."
+	echo ""
+	elog "Once that is taken care of, start the daemon, add -o ...,fsc"
+	elog "to the mount options of your network mounts, and let it fly!"
+}
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
deleted file mode 100644
index c1084bae7fcb..000000000000
--- a/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Provides a caching directory on an already mounted filesystem"
-HOMEPAGE="https://people.redhat.com/~dhowells/fscache/"
-SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2 -> ${P}.tar"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="doc selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10.4-makefile.patch
-	tc-export CC
-	if ! use selinux; then
-		sed -e '/^secctx/s:^:#:g' -i cachefilesd.conf || die
-	fi
-
-	append-flags -fpie
-}
-
-src_install() {
-	default
-
-	if use selinux; then
-		insinto /usr/share/doc/${P}
-		doins -r selinux
-	fi
-
-	dodoc howto.txt
-
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	newinitd "${FILESDIR}"/${PN}-3.init ${PN}
-
-	systemd_dounit ${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d ${PN}.conf
-}
-
-pkg_postinst() {
-	[[ -d /var/cache/fscache ]] && return
-	elog "Before CacheFiles can be used, a directory for local storage"
-	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
-	elog "uses /var/cache/fscache.  The filesystem mounted there must support"
-	elog "extended attributes (mount -o user_xattr)."
-	echo ""
-	elog "Once that is taken care of, start the daemon, add -o ...,fsc"
-	elog "to the mount options of your network mounts, and let it fly!"
-}
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
index b0bebcb564b0..2e389839aefe 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index 7aa8b60a473d..b45afe9a629d 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -1,7 +1,5 @@
 AUX diskdev_cmds-respect-cflags.patch 384 BLAKE2B c4fb56e72868554f8f90841f00a88d4b234ca18b46b9b18f34bcf4b4cf346f97a9c918c975b64753ad97c915c78d5c94329b71e83089856f7b36696fd85d3dca SHA512 db60e9cd8a87fb048f1a97605c578701319c09a370774a7f41cea6d43ded38636796461456a4e1fccac3511f700de9770fb6a4beb7c85e463f23c37f1e3e7afb
-DIST diskdev_cmds-332.14.patch.bz2 40477 BLAKE2B d628f7f8d7e4e845183d70d7455aa043cc1f1273f0a59ce75f4a61b9a44ca0b27f5db87eb4844c79425a3e06375346994727cff63b59f399f13ff4775fe8d860 SHA512 def4966fd638e5d6602ad3170347e657ff5a44d45e5075cb6d355575fad5a5c654618e658d00c98b055426d12dfac27b7ca4c1924625b58a6778f32413cb65be
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14.ebuild 1111 BLAKE2B a6bed339cdadf1457118adcd4f632a34efdeac5f9f1dddc42c9f6c022ae5997b2c7ec42cc8d9d32abf20f2df9627077da7542a4c842c0aff280fde44116504e9 SHA512 7cd3f2aca57e3dc9d771356b52486f487c03f97047c47c2f9e3a9e9c1d1b52d1b0caddc131a4a45997fc0b08297a7905e730401601260afb8e2449231c394911
 EBUILD diskdev_cmds-332.14_p1.ebuild 1654 BLAKE2B 3e646ab16b11b1f91bf538049ef2a555e2b0ad46f29f5f5f86140c74ba26538eac0182402d12d3a8924d88de89206c0eaf83159d270d7cb0475f2278114ed95e SHA512 4a460db7f3bfbfcf8e747f0df1b4f3c451fafe7abba16cc6423ca6dfc01cd5a31034cf809a3aa90f627ef32d11f22c10beb4289609f58f8a61178d884a064678
 MISC metadata.xml 390 BLAKE2B e64b93c1e1bc559fd8ee2b08df7760111f5e6a16ba5da382a8544fc30f619235b1faf36f3dc34af6db04d55a8e55b8898c5c11648d7f08a0aa2d084fe936a539 SHA512 713593a494fe0722fc1ea9984450a392585e57d2e317d99bbac73a2f713ff87950d52b11124ce2f3c7536755302c364d94ca38389b93789d3af5f5d19d8fc0fa
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild
deleted file mode 100644
index 59e2b17e28eb..000000000000
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
-HOMEPAGE="http://opendarwin.org"
-SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${PV}.tar.gz
-		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
-LICENSE="APSL-2"
-SLOT="0"
-KEYWORDS="-amd64 ~ppc ~x86"
-IUSE=""
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/diskdev_cmds-${PV}.patch
-}
-
-src_compile() {
-	emake -f Makefile.lnx || die "emake failed"
-}
-
-src_install() {
-	exeinto /sbin
-	doexe fsck_hfs.tproj/fsck_hfs
-	doexe newfs_hfs.tproj/newfs_hfs
-	dosym /sbin/newfs_hfs /sbin/mkfs.hfs
-	dosym /sbin/newfs_hfs /sbin/mkfs.hfsplus
-	dosym /sbin/fsck_hfs /sbin/fsck.hfs
-	dosym /sbin/fsck_hfs /sbin/fsck.hfsplus
-	doman newfs_hfs.tproj/newfs_hfs.8
-	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
-	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
-	doman fsck_hfs.tproj/fsck_hfs.8
-	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
-	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8
-}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 189cf009d8b0..6162007245d2 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -9,8 +9,8 @@ DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b
 DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b
 DIST e2fsprogs-1.44.1.tar.gz 7534979 BLAKE2B 1d1dcdfebca41d62bb15e0b0464bcfc848b8c1379f89987f91a59093d497536ccd5e80be67419cad05daf694be1629774f881d026ef834e3a61b00dc64f3543b SHA512 acd612a5146e4a07aa7ab3ef1b38c3ef3f27120f65c519dd02d44e48e5814c86d013315eb30c4f08edecaef6f08f0ec0b91fa133ea9dbd769ee29be3f2ae17c9
 DIST e2fsprogs-1.44.2.tar.gz 7562398 BLAKE2B a828cb9f5f3ee1579a2c5b29ef0eaf0e5696e2bf27a639cf1bf27b8d334bbbd1d142588e53e359934338f2ec95d06343a42b7c2fbd44dd6e01b348958aae3189 SHA512 d416e14a69f3e2e4ea2f4563764c422cc63400bcd514ddb12ebda6456ef04cff523da215664ede1329183acc22246111016e1abd92ff604a23e015e066dd379a
-EBUILD e2fsprogs-1.43.6.ebuild 3795 BLAKE2B e806ec2e72188d2e4c36b214ccac4ec18ae4e3f605e34de4a12e91935fce411d32e4caafbb0495e8d437b7700792a39447402b3e987b018354c0706b01db4573 SHA512 d2c1db96d10631d7bfa30daff720f712c423dc8bea2f2d869feb4c85b23fa368afbce0617632fabadc2085aeb33ea93f8973ec016826e29638c69e41f1bbecb3
-EBUILD e2fsprogs-1.43.9.ebuild 3819 BLAKE2B ee75fb0c5ebf29b3b0c5b02727aaa37871dc1e198290ff8720a9869f77b3e1eb7f73245d5010552a5453b672588db82f14d21bb36db32d6f9266afe16ce67321 SHA512 4201cf4befb19415acc970cdaabfcf6e575e1a0ee773877d5ac418f337c21b39dd253e938784535748a417aba2ace3b37e8055fa8c87581906cde721b442701c
+EBUILD e2fsprogs-1.43.6.ebuild 3792 BLAKE2B 6eed219723a8af06340afd9b2d483e663634ff96add9e073270c91ab4011b0fe531466d488b796d423f8b51d1440c7b09bdea5e33a03c6c41ad26483c4cfc2f0 SHA512 ac14f85a1926ce45994ddc07fd61ead5287341aa77826d28c6f350d9a2c0037629f3f239f0792458b9b448532850bf29bbe16059d6b7d2365a3e012433533c01
+EBUILD e2fsprogs-1.43.9.ebuild 3816 BLAKE2B 42f962c88bb1a798a0df0cc479f3ff265d28bf3a9c6122f682f8a98a89fa4c1d60e5972846ca67facd22a799f16b9d898db0b4df2d3018d564b8f8a59c2297d6 SHA512 2e2e1e21691938fb27d89369a5b05dbbcef7b0c7605e2f233cb7e664dfa71432b862890bb09acb51a65297a99efc14834bb58f625ddfd80e143f8cb9a138227b
 EBUILD e2fsprogs-1.44.1.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 EBUILD e2fsprogs-1.44.2.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
index 4b595c801d33..92facf09f870 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
index ee9eb962a0cb..061b4e228339 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 0edbb41f28ba..7b7f0b7a24bf 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -4,8 +4,10 @@ AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2
 DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d5166a2a6fd7d416477ca07a374611639283593df4b06f8d5820b8cf5a375463d4b85fa3644868b2a62611003 SHA512 f47304d9c7a1815f7a2905b7bdb7785d4c10292a80c8dc1ec45d895af96bc6ffd6d84ff2617bd976a1d0867ab8ec1a404a5a05ace85a69ecca830f371d08f8e2
 DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
 DIST fuse-3.2.2.tar.xz 1187816 BLAKE2B 4cda342ded747a92f31417c32006e202398555d2112134f403addd1f2ef896ed46e1082a13437e657795ae93b67fb2692746b759b9efb3bd8c70857623ca1af6 SHA512 234256ed8e9e277557775d34b0aa77f3b0a3c40a715e52db1437f2ffd2a7d8eda2e12ef35963a918b3310f7244bba9b3755003a25b98ea6d29b6d4b322cddec7
+DIST fuse-3.2.3.tar.xz 1238628 BLAKE2B 07b073d0af9d8db3b8799d872225f0637351b99bafb5db11b45dab1173101669731de66215a31e2141cfe5aa6d467e87d469f432194ddf7b8d5eb8e10825d679 SHA512 f91ee4b24df64e62d0c50db0bc3807229cfde06da118c87826bc3ee01b41689ec93a96b026226e948e6d7904bb506dc1d8ffa83d29aa12ea7f17009f6060263e
 EBUILD fuse-2.9.7-r1.ebuild 1967 BLAKE2B c520b94126a010188fbe36391efff49287b41216996bc51179fc33bcbcd1830fad0178d1e62cc568460963512cbd5bb0817648bca39d4934748114fd013a9612 SHA512 16beaf9cbef8060d07f26017adab1364731a75870993d87ab807bb3f6f8023e7d62a3e2ed0c8d540d2350353c0555de8590f9ac2eb1bce3078d161a558b2a1d6
 EBUILD fuse-2.9.7.ebuild 2217 BLAKE2B a132222d50317eeac24b49a92e2f381c5f6475e2b89fa5d92823363c726329a0b70de4595b07ea1abf32a3ef95d068ac58b5e18e4d8d86554f9dba407e4d879d SHA512 40735712f825b32f9db1078d78549be073db57329ffc243ef0cd46b8faf06fcb7961143d2779a8bc1ea8cdbfc0328110d9cc460f93e3eed8f51a58894d12287c
 EBUILD fuse-3.2.1.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
 EBUILD fuse-3.2.2.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
+EBUILD fuse-3.2.3.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-3.2.3.ebuild b/sys-fs/fuse/fuse-3.2.3.ebuild
new file mode 100644
index 000000000000..4012fc673b62
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.2.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit meson multilib-minimal flag-o-matic udev python-any-r1
+
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+DEPEND="virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+RDEPEND="sys-fs/fuse-common"
+
+DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
+
+python_check_deps() {
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
+	filter-flags -flto*
+
+	# passthough_ll is broken on systems with 32-bit pointers
+	cat /dev/null > example/meson.build || die
+}
+
+multilib_src_configure() {
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	${EPYTHON} -m pytest test || die
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# installed via fuse-common
+	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
+	rm "${ED%/}"/usr/sbin/mount.fuse3 || die
+
+	# handled by the device manager
+	rm -r "${ED%/}"/dev || die
+
+	# manually install man pages
+	rm -r "${ED%/}"/usr/share/man || die
+	doman doc/fusermount3.1
+}
diff --git a/sys-fs/fuse4bsd/Manifest b/sys-fs/fuse4bsd/Manifest
index b1354529e445..5556765d2684 100644
--- a/sys-fs/fuse4bsd/Manifest
+++ b/sys-fs/fuse4bsd/Manifest
@@ -3,9 +3,6 @@ AUX fuse4bsd-0.3.0-ports.patch 13090 BLAKE2B 513a9779ab4c01563820069d7d57fee9d99
 AUX fuse4bsd-0.3.9_pre1-fbsd91.patch 508 BLAKE2B c8b61e8cb6a4337657a6ae4c1d25d380d350584654e8e1d6ce8d2a2f32140640c0be2c4a971055943ce960c306f6c93da7608d213e9fd3a4c9eb99bdffafcc76 SHA512 9a02ef10ffc1134470a807c7d475c56ac7139835593e06c66a2ed182f39e7488468035ae940a6ef0551e6d888689969d5838733e0fcd398fc524e1de9fd1e8b3
 AUX fuse4bsd-0.3.9_pre1-ports.patch 12209 BLAKE2B 2a0bfd4c2028b30d82d82787b1a444302d2a89f14cf68ccc33f20694bd27ae0ff07488401bf99eae424cbbbfb291ea5f4e5e0dff2c505d9e57dc44f7738f683b SHA512 0d149e517bfa2b0260e86bda7f1d3f06c6328dd1803f72a1e823e91bb596e5f0a0bcf4fd00a70f574935eb96c515049001d8e7c42bc0893d81fb2e371fcef67c
 DIST 498acaef33b0.tar.gz 116035 BLAKE2B f5f7b3ded2e65422c9df771a62590e71803884ac8fbba5aabc67d1ddf7e2309e4b20d37ae43a64ca0ce46100963e68c57131c263291d0f747fe849ed65b05c0e SHA512 6427d888cea5b1519c4ae92ec8ec640535692c59dd8ca987a32574050239c9ff4cb92a4cf6b34f3c1363becdd9fd75c031f5db4bda34b298898466066740845a
-DIST freebsd-sbin-6.2.tar.bz2 1162548 BLAKE2B e00eaa3de0e4136ff6c95e64d1909ac0ea9543c653a3492e761ad7017512b0ad62e0f49c6808aa2f8721bd0a7f21ef221cfea12f5c863df567612a0d1104ad4f SHA512 db46b03f324713ea03d38f453426b2b8d683e64e0b8bec7de70332a62855f5d3b81169c8bad37d8f3d2a35edf191165894e9e450200d9795d2c03d7675d17329
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST fuse4bsd-0.3.0.tar.gz 168068 BLAKE2B e5beb73d1eff5cb87378cb6d3c1ed502038e55ad310716aaeb7d2f030e55b7febb09b29f978735e63a55b3dfafac7051472814455ee6a38b5a43d1eca7f5a583 SHA512 1e65150ed5aa798e92007c95b4588f1d8c19e04ce7433d28ccdbc1b1492e319e0108641b41d7d6846494da6af4473d5d76ff81f4068b3dfda9d1463d8d995d3e
-EBUILD fuse4bsd-0.3.0.ebuild 1316 BLAKE2B 18fdcc5076e8090ce6064727e39145c4d994eafdb8e51a8e75c958a2b7983c1af2f29c25cfca01674c25c1903cf48f58c8e554153fe742ec3b2550a0a7a6b251 SHA512 98468b7b26a499a72959ff6310ed915ac37307128c91eb8858c4bee1fb613377fd2953da46515381bbb22e7b69810ecddc2f939c4e7d38c6fd680087eebd45f3
 EBUILD fuse4bsd-0.3.9_pre1.ebuild 1880 BLAKE2B cb84caa4d1beec93af3e9c43dfb0ae7532bbf2743f6c525acd744e6ea0f1ae024abcf1ff51b42128454151dafc464d6d3c1add6ca335069dd6332657bd2f058e SHA512 3ef2aabe3fbdaee4dbd8fff11434101cb0759025f9e90146b3d9dae2bd37e8e239f000b3819de0f9878015963aa31e248f67539326362ea8c4a534878d2b6730
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-fs/fuse4bsd/fuse4bsd-0.3.0.ebuild b/sys-fs/fuse4bsd/fuse4bsd-0.3.0.ebuild
deleted file mode 100644
index 48be31201d91..000000000000
--- a/sys-fs/fuse4bsd/fuse4bsd-0.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit portability toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Fuse for FreeBSD"
-HOMEPAGE="http://fuse4bsd.creo.hu/"
-# -sbin is needed for getmntopts.c, hardcoding 6.2 is nasty but can't think of
-# any better solution right now
-SRC_URI="http://fuse4bsd.creo.hu/downloads/${P}.tar.gz
-	mirror://gentoo/freebsd-sbin-6.2.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-freebsd/freebsd-sources-6.2
-	virtual/pmake"
-RDEPEND="sys-fs/fuse"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp /usr/include/fuse/fuse_kernel.h fuse_module/
-	cp "${WORKDIR}/sbin/mount/getmntopts.c" mount_fusefs/
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-ports.patch
-}
-
-src_compile() {
-	tc-export CC
-	$(get_bmake) \
-		KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
-		MOUNT="${WORKDIR}/sbin/mount" LDFLAGS="$(raw-ldflags)" \
-		|| die "$(get_bmake) failed"
-}
-
-src_install() {
-	dodir /boot/modules
-	$(get_bmake) \
-		KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
-		DESTDIR="${D}" install \
-		|| die "$(get_bmake) failed"
-
-	for docdir in ./ ./plaintext_out ./html_chunked_out ./html_aux; do
-		docinto ${docdir}
-		dodoc doc/${docdir}/*
-	done
-}
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 557aed5c233c..d6d3f6227a41 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -20,6 +20,7 @@ AUX lvm2-2.02.129-static-pkgconfig-libs.patch 3299 BLAKE2B a4495bfca4892036a03bc
 AUX lvm2-2.02.130-pthread-pkgconfig.patch 915 BLAKE2B a82e3283e633fbe0e47f4ea94f3c1e975dcf1c2e6cd1f93d16e4d08516d1f0f49f63227e42cac5bcf5ccec473c679098cdb114be22fb9432c38325fa96db4c43 SHA512 1e45ccb3bf824fd2f8276b4ca103e95960e401e793944af68a16929040015b42d601b09adbb8f01e833071d501440a20381fe263fd1884d8fb2e7d7f5463da6d
 AUX lvm2-2.02.139-dynamic-static-ldflags.patch 2874 BLAKE2B 2a0000761b65f79cef0bd1537b6cf99fecd86baa2cd7443eccedbd8e546c84185e99367f1e391e33cab081d7be9153abcfd53492a48d2988aad7fddf5f9705b6 SHA512 3486c6d0500f233cbedfe28a2c20f03e4a80301e011fa0fd41b3765eed71dc5e00c8f6f09d40c3702ea87e372db3e4dae64c32e4ffe45700bbbf137804b748fa
 AUX lvm2-2.02.145-mkdev.patch 4111 BLAKE2B 478c987c900c4ccfe3bb7d099b8af580f057ba6f4746644560c55e4e1a3894c617c31357e88525f728db005e8a882b2edf18576370d73eca026ee0563c02444a SHA512 f3953eb8bf73adc8d048edd2c560fad3c5afbfcee19ca354f06de2b10ea2e947c972cd180fa26cf0d3dc30b5aae8946e79faac3f3a1cfb6f31222244d308a588
+AUX lvm2-2.02.166-HPPA-no-O_DIRECT.patch 285 BLAKE2B 0311aab5b4ac843ff36fb7c4dbb8f47538fb621848f8430118dbbbcdfbf64876098ce9732109dca00e9262551b12a0e3293f0edfbb82dadf2d442f448dd695a3 SHA512 e113c31400d9f382b89901be199dfd3dd3888e0b417fb080d381d2aab79ac522dc968fda6aa7fd7668d018fd9109be133252cce01825bf950a79da145ff8b240
 AUX lvm2-2.02.171-static-libm.patch 525 BLAKE2B 5cef02547acdfe24fb26cd96a0bd6eccb0c5cbc5ae79ed4aa0d52ad94391f5ddfede194484f2a9c00add07df7fe69e43f1d122c41c8fe05a91e86f797f4e9759 SHA512 498132b93e482739bd7bf11ee457b837843dee951b66fe268411e7aabcaad373c6c9a0d43083940c85348c506eda2d0d49a3aee205110388e18f9b58a6d6ef1a
 AUX lvm2-2.02.172-static-pkgconfig-libs.patch 3851 BLAKE2B 87789e011380ecb5336373e47266f3e4cd6d617ab68763418c488a8a7d0d5cb14bba5bbf2710d5f9c30a6f9dd947cfb929f98f7f0e54f38a6d338f8f22466e14 SHA512 15e031c22f96d3a12e985129ccfa24e91edbbf30741a8075f089ae22f482f9b0c41f39d3c92ba41dde34a7afb505e0816347d385a9eb5d7692ad63053aabe79d
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
@@ -53,9 +54,9 @@ EBUILD lvm2-2.02.139.ebuild 9605 BLAKE2B 015621056feebe04b17e5ab856ec0babd346398
 EBUILD lvm2-2.02.145-r1.ebuild 9495 BLAKE2B a03f884dfbb56268c9d6a09187ed0267cdcfd8986906ffbe2580fa035447bdb48551de4c991088ce827a91638ecd26630f3f400cabe1d490c0c2973b8cac556d SHA512 ff2473dab88dab220b394c15f6ba401b6988c23f4d0dcc864527b428ef583e603c6984dcc58574ea3a25010ca055e7cef711c618f032623ee63edd922861fdbf
 EBUILD lvm2-2.02.145-r2.ebuild 9619 BLAKE2B 4461e5fee86d087e94fa8d64bbfe73f746ebe24839323a0048d413a8b1263cd0a39c477677f4903a4643f9395c06a9db2c8801e119ec896055840398600d4159 SHA512 77df933073cba908620b4237550cd20294f8ece45aed17da7ccf4c2f2f431136db7ec820d923781ac9249da62680924c985811e0733932598244d1837474a6d0
 EBUILD lvm2-2.02.145.ebuild 9633 BLAKE2B 73d08c486afd126faded9b1b0a080843dd941b73d5bdc3e3e95025d4626fc1932abd7e8a639c7173a140981c5f7aac6819ee841c893b86c1d1f2c74ab46429ce SHA512 950229bcccf673055c61b7c84b40db9ac8220a0f5de5cb8e623596944fe521ffefa50240435a03fcaf52cb8b9dde326b68e84e1b74d31396c91655d554be914a
-EBUILD lvm2-2.02.166-r2.ebuild 9768 BLAKE2B edb77874168616ba8dd58e3ed009d327c69501f433bb54186f584b2f8ea2ee54a3f0cde958ba7a522a4a6642aaa48ad374ecfaee32a69bb2d997c1afc3b32d29 SHA512 a146b1562961b4e5d5f2763da049c38d213370ef77316c6d533c4060e5a9f3c3711a45e16d849b9e72d6c91d5bc90d45f12c0ef71d7340540f5d4f41951b64ee
-EBUILD lvm2-2.02.166.ebuild 9604 BLAKE2B 33653c1fce1b23faa9ee71bdd8d6b31eaeae834b357f41340545eb8d34aad79723c24e88da49052ee928dc911c6c610450b082721f02a30d65056110934d6e92 SHA512 5a1340aeda463ed0abf23b7b9d87e2c2c8ee42306f78e0a3b739a2523fedabcdd5b635e4ba29ff5e81ff39ca60f698ff2d17522bc0f95bf0fcce6efb4e4c7d32
-EBUILD lvm2-2.02.171.ebuild 9862 BLAKE2B 16c8b3e7a90befb9c8b61014610b2361161db44e27791b7d8f1b438fa681f9faef67ab8aba855ed33bbb2d055178ea337992b724090e303c5f817f695831f479 SHA512 cba3eb8d426d1c561b677fc7b569a9f35d948c758c66057248170d09bf8c1ffaad8232804b7951de15a368c2b1bd51a3fd533144faa93755fde580765c898bdb
-EBUILD lvm2-2.02.172.ebuild 9859 BLAKE2B b209e295b694ff28a5654bc521060abf255877aec8dae347bcb340beea1a0c74304587388265f7390672b064f8cb213de17295df24829c754b7f045ba1433c18 SHA512 477bd91a9f470443a465c8e03cd89c8e8fcb52096fbd3de76a86502f3b2e68970c09593b360a5e46a6644ab5eeb11edc5d55f8e0db9d016a5e3c2bf7e201952b
-EBUILD lvm2-2.02.173.ebuild 9859 BLAKE2B b209e295b694ff28a5654bc521060abf255877aec8dae347bcb340beea1a0c74304587388265f7390672b064f8cb213de17295df24829c754b7f045ba1433c18 SHA512 477bd91a9f470443a465c8e03cd89c8e8fcb52096fbd3de76a86502f3b2e68970c09593b360a5e46a6644ab5eeb11edc5d55f8e0db9d016a5e3c2bf7e201952b
+EBUILD lvm2-2.02.166-r2.ebuild 9835 BLAKE2B 002684c21e6c01a5abef9c5d8af3dd3ec772fd1bd52c4c1652cce32ee144100f74fe33c6a2a6a8bf43b02c465a5c9451928088980010fac36ab1e3cef3191c6f SHA512 19c4124879f5de8b179918d9b3576727a1e35dbf22cd90ce1ce0f17f35e00c540c1bb821702ead6de734093ec03445d130a3707ca9edc9caa02c13dab132909f
+EBUILD lvm2-2.02.166.ebuild 9665 BLAKE2B f6b5984ff34bc28a51426bdf38029623dc5758562b498ac0c324e9efc9ebcaffb9d952a1df328ff882ae463b9018d447c04a934cb71755ed2ae8a55d828417f4 SHA512 bd470eb2b113af3c1f8f3b09386e58db18a95bf113ad9353f68ded0dba0f17ff0ebb9b139c56ea81b2de6bc564f33935038f25f4a8dbc414323a81f26c9b8213
+EBUILD lvm2-2.02.171.ebuild 9929 BLAKE2B 2e9c753178d07723b98e37791e9fed0f10d5c965ff6fbdcbda0ad4a6e6a326cb016fae79a08af6a7af3c894e02d56e4d0c7d377246a5223ae3f3460754f22252 SHA512 adb1e074bd46692f1ea23ebd66adeebaab8cd5bacd119c08d8e4a8adc09a3d520c8f90b0267f8d564d290a8ad2d5a7f68d758e15e47a737f4c35207f3f9082f1
+EBUILD lvm2-2.02.172.ebuild 9926 BLAKE2B 5d6d1e95795def64b1f91d8ad52b091f9971802e54e4526eff16986319125ed49561598bede91f20702ece9c1db07a1cab558702b1d6369050de8168bdaa7cb6 SHA512 e25c41a2fb284ba759788538d975b2476047f64e4ad301665bfdb3c3075ccc32470085b449766e59085ef1690e9522c83b60b900a67f229b468a0c1c010b033b
+EBUILD lvm2-2.02.173.ebuild 9926 BLAKE2B 5d6d1e95795def64b1f91d8ad52b091f9971802e54e4526eff16986319125ed49561598bede91f20702ece9c1db07a1cab558702b1d6369050de8168bdaa7cb6 SHA512 e25c41a2fb284ba759788538d975b2476047f64e4ad301665bfdb3c3075ccc32470085b449766e59085ef1690e9522c83b60b900a67f229b468a0c1c010b033b
 MISC metadata.xml 1397 BLAKE2B fb780193c777b248648d09cc4c0f287f07b64df79912a4c1c37b5c456f8fc8ea98470c03501619432bddb5df1e3f877178a0c7e630b295a01a3bfc27fa63520e SHA512 1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35
diff --git a/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch b/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch
new file mode 100644
index 000000000000..0f830e428b10
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch
@@ -0,0 +1,12 @@
+--- a/lib/device/dev-io.c
++++ b/lib/device/dev-io.c
+@@ -505,7 +505,9 @@
+ 			dev->flags |= DEV_NOT_O_NOATIME;
+ 			if ((dev->fd = open(name, flags, 0777)) >= 0) {
+ 				log_debug_devs("%s: Not using O_NOATIME", name);
++#ifdef O_DIRECT_SUPPORT
+ 				goto opened;
++#endif
+ 			}
+ 		}
+ #endif
diff --git a/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild
index a3c5716ea491..52adb6bb332c 100644
--- a/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin )
 	systemd? ( udev )
@@ -68,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
 	"${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
 )
 
diff --git a/sys-fs/lvm2/lvm2-2.02.166.ebuild b/sys-fs/lvm2/lvm2-2.02.166.ebuild
index 64406fb5ae33..b8cb4920dfde 100644
--- a/sys-fs/lvm2/lvm2-2.02.166.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.166.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
@@ -67,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
 	"${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
 )
 
diff --git a/sys-fs/lvm2/lvm2-2.02.171.ebuild b/sys-fs/lvm2/lvm2-2.02.171.ebuild
index 28862e26bce6..dc1aedc9517b 100644
--- a/sys-fs/lvm2/lvm2-2.02.171.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.171.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin )
 	systemd? ( udev )
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
 )
 
diff --git a/sys-fs/lvm2/lvm2-2.02.172.ebuild b/sys-fs/lvm2/lvm2-2.02.172.ebuild
index 7d02c914775e..64a75336d322 100644
--- a/sys-fs/lvm2/lvm2-2.02.172.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.172.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin )
 	systemd? ( udev )
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
 )
 
diff --git a/sys-fs/lvm2/lvm2-2.02.173.ebuild b/sys-fs/lvm2/lvm2-2.02.173.ebuild
index 7d02c914775e..64a75336d322 100644
--- a/sys-fs/lvm2/lvm2-2.02.173.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.173.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin )
 	systemd? ( udev )
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
 )
 
diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest
index b7457169c139..c9d9655d5841 100644
--- a/sys-fs/rar2fs/Manifest
+++ b/sys-fs/rar2fs/Manifest
@@ -1,3 +1,5 @@
 DIST rar2fs-1.26.0.tar.gz 258987 BLAKE2B ff1fbac1f6792f0423fffdfac789c9f7b7e56721f231590b85896e59e712628162e5c31ee6798b8e92001fe34157bb476811efd38f965897e02596d7740634b9 SHA512 f67ba9826eb3de9f6a82088a25c20393cec32fff3c51c1e6bec6b95dd9707fdbb56388639c160a487de687cfda18d7b4985462d22722fd7cc581066a24845d1f
+DIST rar2fs-1.27.0.tar.gz 259706 BLAKE2B 45f0fb1ccde4fe301bb7b648c2c5c5912a24d7451dbf45820fa6b0552882b9be47b35e8abf96fcf358334934d6629c834ab3acc5a8398d68e026878185e78492 SHA512 4ae9705c85a0da64b2329883df53bd27be545dbbb960b7e4cb8fda628baa4130192ceb2e06ec40c87b1aa7dd004956d4b9798350cee1f5b50590f7077f7abf90
 EBUILD rar2fs-1.26.0.ebuild 639 BLAKE2B 13f95a4c16febae0c97fe42528495c2451e51245c0477e473db95386ca356ba33a78540101c249f14952ad122b3a2db4e7981cdca581508d42ed279cefdb9ab3 SHA512 f3e58c2db1b63331eaaf2f4f155e149c78a1f09941f201217da3dd69c2cdfae4c5bbc4274abd263ed8b3d3f1571311ef61ed217df98dbaf857b7a1522716a220
+EBUILD rar2fs-1.27.0.ebuild 639 BLAKE2B 3a2ad998531dffc3a5444316acce648bcb08134581a471b1381a84b4e79f1d1ede4894a1dd8d07ecba212d52705b91861c00376619379ec697a60b1526751cd3 SHA512 321cf80d4652412323fa8194ac7ed15675f62e14a3a84685e3deca6240ea270f4a8214c63812168158d79f4a79a5dc912122a9209f02ea63e633f1c78c0c1150
 MISC metadata.xml 325 BLAKE2B 64c8c579024bf3c2468fb6499f749f291d09eb3a2d408ce41520025df21e7f014e5ecc8b16a8225bd8b38f070c5d71f733292279eec426aa9c8ec2809bb2f9e6 SHA512 506c5eada02c3ecb80b891fe5c256eebd85e57d83a515eca336a82e362b0a1c9c6f96c15dc05eb88141ca3a445953ed1c2486fc924868071c50087ec3876cf26
diff --git a/sys-fs/rar2fs/rar2fs-1.27.0.ebuild b/sys-fs/rar2fs/rar2fs-1.27.0.ebuild
new file mode 100644
index 000000000000..66afd5ece467
--- /dev/null
+++ b/sys-fs/rar2fs/rar2fs-1.27.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
+HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs"
+SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=app-arch/unrar-5:=
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	export USER_CFLAGS="${CFLAGS}"
+
+	econf \
+		--with-unrar=/usr/include/libunrar \
+		--disable-static-unrar \
+		$(use_enable debug)
+}
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 8d83e2db60c4..fdfdbd7cc815 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -5,6 +5,6 @@ DIST udev-init-scripts-32.tar.gz 3661 BLAKE2B 11736f1e6c44bf032571008e907f97d5c6
 EBUILD udev-init-scripts-27.ebuild 1793 BLAKE2B cdeeca6e3dfb209017893156eb39c55ad79ab6877740e1860f73a0bd0510abb47cae094387b91bd02fe8e19acdd1ed8667d5f72d041f6950197bb5a819bcb7e6 SHA512 02d4382dda3f2358c981e810a0c45eb79ef834791a1fb72aa77af8e21797127f3fb9f7db3b56c474212d64f3e71774efb610325616501d06cfaa3c12375323b9
 EBUILD udev-init-scripts-30.ebuild 1374 BLAKE2B a6eb3f2cccbda38c0852942f7ac9397c0f66393312f7a4772fbf70aa04d2e56166f3f675f155e16be9a7e6d31eee0a2e8eddfbd9fcf90d5fdd57b044eddb209c SHA512 93094db7aad88a02bbabe1ef553cd2b05b2c7736b1ac34fa3eeaddd142cfcc33d96cb50e34a7fd7ab21b5ddecc2c5760d12857f2c041237ec74e984c7bb866e2
 EBUILD udev-init-scripts-31.ebuild 1374 BLAKE2B a6eb3f2cccbda38c0852942f7ac9397c0f66393312f7a4772fbf70aa04d2e56166f3f675f155e16be9a7e6d31eee0a2e8eddfbd9fcf90d5fdd57b044eddb209c SHA512 93094db7aad88a02bbabe1ef553cd2b05b2c7736b1ac34fa3eeaddd142cfcc33d96cb50e34a7fd7ab21b5ddecc2c5760d12857f2c041237ec74e984c7bb866e2
-EBUILD udev-init-scripts-32.ebuild 1317 BLAKE2B 6a8f10e6a1ee079ab8e5579daf2681c01d1f87c4addf3077fc124fd80ea31dc304a3ce48bf9183e69e40aca0168a97e0e9a9ba2cf9873aaea57b7c58e8560ed6 SHA512 f80100629857b7d9ac50d4c83478a99c1624d67743bec8875ec53e3d344968817a38f8b791086c466d523cc05221b076921a57ac671f421d2b206246415889e0
+EBUILD udev-init-scripts-32.ebuild 1316 BLAKE2B ae71611057fce496e6d16a487a2ca1a1644b374819fbca47a6a81286c7cabcb4923d76d95e2fa1ec4b054e16b70afcd3c0cd73c87cd64f2886fdb459dc8845c6 SHA512 3a906d78fb8ea25b8c4fe752e33a3b3b05017f9e70872ad523ebdb2ea379acb7f0306dcf228d54a02e088729a18b39544580e80be6d894e3ae70bb7e2df43945
 EBUILD udev-init-scripts-9999.ebuild 1374 BLAKE2B a6eb3f2cccbda38c0852942f7ac9397c0f66393312f7a4772fbf70aa04d2e56166f3f675f155e16be9a7e6d31eee0a2e8eddfbd9fcf90d5fdd57b044eddb209c SHA512 93094db7aad88a02bbabe1ef553cd2b05b2c7736b1ac34fa3eeaddd142cfcc33d96cb50e34a7fd7ab21b5ddecc2c5760d12857f2c041237ec74e984c7bb866e2
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
index 0999669c5129..7de09707ad50 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-32.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
@@ -8,7 +8,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	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"
 fi
 
 DESCRIPTION="udev startup scripts for openrc"
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 17852e7efb57..397f4bac7707 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -5,5 +5,5 @@ DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0
 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
 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 714 BLAKE2B 1764d0c1c91bcc5e8a09142c6c47e4e41b7e9c5a7d38d03335a92739e732d1064d91a657f70db6d1cae926329fc90b77b71d4808722205e3434e8308424a5324 SHA512 20e455c36377fe65fafa476807f175d87e5c7a46ba8348216ffd0d5555fd610a41a9164eeeedc3ae24c7882e5ad9d92c9eacec06c675a246a7592729823aef30
+EBUILD udftools-2.0-r2.ebuild 593 BLAKE2B 0bf91e67c67d1bdf88073a2f1a65820bf06e5be862b3b7e03620329e48d92c0ece330b4e5b8792c28a754b5710f44952e061dbb26e10246010d3d2ea72387928 SHA512 f7c8ab17c9e8b3bf8f9ce3d754cce7de88cb9f2e901f5750200bbe0c61108872a21fb50cdb56d09d239805dbd40d2cdef499a01d81d705a2ae6352a5c0fcc629
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/udftools-2.0-r1.ebuild b/sys-fs/udftools/udftools-2.0-r1.ebuild
deleted file mode 100644
index 65def21df1b6..000000000000
--- a/sys-fs/udftools/udftools-2.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
-HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
-SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-sysmacros.patch" )
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
-	dosym mkudffs.8 /usr/share/man/man8/mkfs.udf.8
-}
diff --git a/sys-fs/udftools/udftools-2.0-r2.ebuild b/sys-fs/udftools/udftools-2.0-r2.ebuild
new file mode 100644
index 000000000000..8f67101d3523
--- /dev/null
+++ b/sys-fs/udftools/udftools-2.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
+HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
+SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-sysmacros.patch" )
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 05d124035e6b..3869deb0b01c 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 708f6d2be4e2..12bfbc9ae93f 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,298 +1,230 @@
 AUX README.gentoo 933 BLAKE2B a3f338e7fc85ccf980178ccd2b1b4706e11269a00ee4411645286f19730dbfc78a6905c792567f735ceb057dee35e282d78ca3c1fc6d01b53a93fe08f727d431 SHA512 31bac1d8acbc50dfed3d06cdd6c89f3e9847276e18b9379989cc5a3d3696805d7b020a39fef309d1ea53fae3e42530e26016c621b24019174705173b2264db5d
 AUX README.gentoo-r1 913 BLAKE2B dbe93c8d6c289a229d158fe6e4434f139d89f4164db850639d8db9f4eae18369204582ee7515ba0e8708757ed53bed4e0f01ed268544904bb77c7bc9248fd52a SHA512 b4522a200410fc6b30b36796f60843c4065a136c19477049271d8898d6bb6fb08874071181d0e4c6f5568d271098becead30d13eb904aff64ed8e2faacf21c8d
-DIST aufs-sources-4.14_p20180312.tar.xz 181248 BLAKE2B 2f7ae6ae27749e610a3cb61415180805327137e71230d33e653524ceae5c4b27c954c287f9ae1b119e4bb98207b26b72ccd3d190ca9135d729e276cfd05aa2c7 SHA512 3df095c3a2a356ef311b925f9cfce0c646bf5bc76e507990cf6f7a366793e03110d9ded0c1a0ebca682afa635a26a2b0b3607153450410d9103298f773f7e5f9
-DIST aufs-sources-4.15_p20180219.tar.xz 181220 BLAKE2B cd54b7a42d765c01fab4be9cd2a6df8ca55973ab5ba623e8c7486d2a91e80f5ec20a47be4e67b94c715e0ad8abce218188a77fc9597b8e77632f7ec2bdd87932 SHA512 c863ae5636320f83783d03a436d48155049e73088227abeb75b4751fd4724eedb21517cea234973ec2675068058f2a3da0d8a98f3a41f186f2c0575416de5449
-DIST aufs-sources-4.15_p20180312.tar.xz 181232 BLAKE2B a19306e400a556b6a3eab4b471c07c7165d3af1143cc1efdb667e1a9016df65f7946f6592ba2394e6713eeaa0696c4a157d8fdf22b553f9ce8a40039f65ccee6 SHA512 dc1065ea23713edb6d9db0c493cbad5d4ffa58103b03e9cda2395740140c72fced455607044b24ec1df8ace88d13198718579be595a2c691cf57e34eb77a1ede
+DIST aufs-sources-4.14_p20180409.tar.xz 181264 BLAKE2B 580de640580fcc15c6d7e1de0e480b803aca878d087aee63455674f0a74156849882331805cf70c8df439c8b6ce67b7883930c0f388c8e7ed1f643028ce98140 SHA512 b7bbb239d5681479ad822c9bcc28c78bc8e713cd5577192c630bf2363e9dbc1009c05d11fe01668735651f602d111ee59fe0b1c259f56e8485f9cc25b0865b38
+DIST aufs-sources-4.15_p20180409.tar.xz 181236 BLAKE2B d4503146b8f103ce3502f6dce4f57a98e3a8697768d24e954ae27ee56d1fb3ee4a39ed0f9568d18dfaaa48f8d142de9985846e8e21623da300fabf842ea83fe5 SHA512 edd5e98d671c05f1ae0ab0190ac6640709997d83075dce8484d7d727dd71ec3bfbc6cb21e49811f4c35a33a6376e21bf6ecbce5c82bbc74dee902b52d7044bc9
+DIST aufs-sources-4.16_p20180409.tar.xz 181240 BLAKE2B 9ffa894a0db452a25d4c538a5b4dae8eb57a54262d13c29c4af499ec6949a0422fe834af24d70740ae08e363757e306d3b499f1f903f8a95667df53009c899e4 SHA512 d8422b44c21ab981485e585690bf5fdb7978b13e37ff85fc8314cf0373b1340756b63a84a0884a7d52001c2cbfd94fb6506e798b46284b8a8f6f9209df816c75
 DIST aufs-sources-4.4_p20170925.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
 DIST aufs-sources-4.4_p20171127.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.4_p20180219.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.4_p20180312.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
+DIST aufs-sources-4.4_p20180409.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
 DIST aufs-sources-4.9_p20170925.tar.xz 180584 BLAKE2B 82c7bc47df1fb843706b3110a2a778a60840bd874393fd7b0a0ddfb40399e057895ce5360e59a9c0162333661ac7c00c6cbfe8b68d4abea537e6b8bdf92c061d SHA512 06d8db9f115fbf89f5bd8f47ff5ef3b0643b7a5d925d82a113c203272d234b9261a214e4eb9ea4fd083c9cf5d6a8bb64e37a7d4b1c47e1e636f6e56eeebe863f
 DIST aufs-sources-4.9_p20171127.tar.xz 180656 BLAKE2B 35826be242a2da7c1bb47aa81e14e6020345825a52d108f2c0a6dde7637ea6c8943b3f1c6d654811b9bd18b285d1dda96a29580d4338330de45c8ea68874e8d4 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a
 DIST aufs-sources-4.9_p20180219.tar.xz 180636 BLAKE2B 836f895dd6124faaf875b029826d3b19891253e143f8a7e71ffea6584ce67cc1cdcc8d09cbb9f1e942ece86d4e95934d542d21dd4bf5dbc310cca207b8a0a8b1 SHA512 bf3b64d5e77ad96710e3c333c7e3a095bfd150e6af90d295ce5d09ababf7d64f4e9892859d21decefa59842ec68c6fb761d9bc8cca2d12f7a53e45b0b71fa1d6
-DIST aufs-sources-4.9_p20180312.tar.xz 180636 BLAKE2B 3bd4aaa34d21ce7986a244447b333a9e94bb6383382ac3bcc493e96f00623e1aa0fe2a15de6bd34ef1b60a602706fa9bee99cc2845979e196cf3bebb892c192f SHA512 8c95b5f7a1e1404c7ea191150397baf0d3ce2f9076d329f2b42f3916af26405b5535d30f11ae30a3895cbdbdb7b876e4efeb13a4f049bb677118de7ef561a23e
-DIST genpatches-4.14-31.base.tar.xz 823544 BLAKE2B 903479b10319b73fa2bfde8c7b8ec1ff5c90fbfdc2e9e3f28581499fa57c7d370c05462e7aa1402f0a35ec60687897e39c25e703a33a9ca376879ebebf239633 SHA512 660b2d7328ae2f7555d2f4869e8068cf94a56f84cd019ace3d6c6149925f867e440c4fddb37aa362e8639b9d12d09164b7046486b347e2499afe0b9adfeb88f5
-DIST genpatches-4.14-31.experimental.tar.xz 5184 BLAKE2B f67c68b74d74ba81499e36cae871656b07fc6c40ca890d2b5edb9137b5672652bc3c5bfdd46f322b64b7863776e76485370b23c8a5b03b8de16730bb9b265a53 SHA512 83b60e68991ee73488f5919d26308615361b95a4dca153d9f1d58e360a7e4370b18c34aaaf572f853fad08aab7636fde67a45c371e37f56abcd5b44c32f62b6a
-DIST genpatches-4.14-31.extras.tar.xz 17492 BLAKE2B 4a1d976f56d48c8da2c43cd306506075f226a50caa1730bc77cbbb11f11e9c7446ac471355f236535bf4878ecb9b9f4dbc9f07cb54ba9fb4089faee9d6b87ee2 SHA512 8d209e3ac993fce94ebeca0ec30f81710da0a8a9b657ca936f5d0db05061aaeb95cde4f552fe414edf51be8e28e6bb9af3cb668210a7c335b3f58cee84110470
-DIST genpatches-4.14-32.base.tar.xz 860348 BLAKE2B e73aed43c8c9128a2bba5d0ee5eebb29cd07b37befc2893d6cc87722f09f61f2b01488367e0a452ca65913d072dc7dcf6e79beebc2e490042cc56b3be4517054 SHA512 204a061dc8f155f045a8e146675656d8a5da2b6ed09fe5e98de63c448981e0eb69d4d065744a2f97d9a2bc04bb05d380f7b3ce41a82250d713d667da48c2b0ac
-DIST genpatches-4.14-32.experimental.tar.xz 5188 BLAKE2B b6904102cf9636b1ad30f69f8cf82343f08d8b3803ae8e4db95a0de93f5dc5c60c1195d401cfb7c571840c8b636a71344514122175e94bbd6a1326daa799c229 SHA512 10d5d49af865d6e87197ca004ef0f46c1422429e9ecc23a8c4c971098e1f10a292ff051e6126916035640065ec9ea2c1f3b9262ac88d72e06afbaf151b90ffbe
-DIST genpatches-4.14-32.extras.tar.xz 17492 BLAKE2B e8a5f33b2d0ad9f78078f85f572b2387a88db205a6f209f7ae3aabc7e637b4b83d086880f22282f92080b2ab9c0c8cdfbaee5094170b7fc6dd1df7d86f18cfcf SHA512 a284dee3cf3ca96b89c615b155bbf47dcca638895638312a32118f3357e72b9607aa2dc6605f3db2e3785c5e4c8a011e354e63601a7b86406ede00728f521263
-DIST genpatches-4.14-33.base.tar.xz 882952 BLAKE2B 28b9ead90b5b0f74cc808179b5531abc2b1e9948d64f6170b512cb803fe1ef98707e87200b0151e80a966385d03e8d448dae704b3a157633c5d3c89d01907fe4 SHA512 fd040fd39557063bfa0e1a097d35f693e9ff6eb320463dcbda96dfb522a6d92e59e402a2b564cc856ad6161638c1736613d93f810f892c436c41045864485cbe
-DIST genpatches-4.14-33.experimental.tar.xz 5184 BLAKE2B 1543a0da91eb42dc3c61b3670c2d5aa94a49bf30c3745b2408d43d55f009f378737d05d9c8cc2b16a43717ef96fe52758c0487f7f9ab725ced9482c92494321c SHA512 e9014e32d8d4659d4d7ac5e4902b6a4bb1fca2f3263efae09873e966a86151045c054c42f3247074ca802fd7008a7ba8ff06cdc507367cf9298579ddcd73f6da
-DIST genpatches-4.14-33.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf2c7dfc4029899cb2bad7a31fd9c2d2675d6d941584d74db8f96971a64cbc2e2a1e8dd6e9b189443a8b7d4918f3ce33cdf481 SHA512 dc05fdfa9b0a799b8767109033434d8a2be00dedb19a420c395576fc142dd41e7ed1a74530d543958865d9d8557eac2b193fea3a16fb45fb1e725b0129ab75f2
-DIST genpatches-4.14-34.base.tar.xz 893480 BLAKE2B 26a867d2f723bee9e2e3f90ae1208f447aa6c025ef520020bcff2656c6870cc25ac44c0533fc555c77a8a4f8fe22b545ac8f2e10820935e5dd88fada4a40e71f SHA512 6721ef0e5153d334c95f70c5180587ffc716882f4abaf71e830a79641499527aebf7e310ba81c9e0e69bf83656c53f19c4a22720686e20b476f032a56e30ba88
-DIST genpatches-4.14-34.experimental.tar.xz 5184 BLAKE2B 1543a0da91eb42dc3c61b3670c2d5aa94a49bf30c3745b2408d43d55f009f378737d05d9c8cc2b16a43717ef96fe52758c0487f7f9ab725ced9482c92494321c SHA512 e9014e32d8d4659d4d7ac5e4902b6a4bb1fca2f3263efae09873e966a86151045c054c42f3247074ca802fd7008a7ba8ff06cdc507367cf9298579ddcd73f6da
-DIST genpatches-4.14-34.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf2c7dfc4029899cb2bad7a31fd9c2d2675d6d941584d74db8f96971a64cbc2e2a1e8dd6e9b189443a8b7d4918f3ce33cdf481 SHA512 dc05fdfa9b0a799b8767109033434d8a2be00dedb19a420c395576fc142dd41e7ed1a74530d543958865d9d8557eac2b193fea3a16fb45fb1e725b0129ab75f2
-DIST genpatches-4.14-35.base.tar.xz 911684 BLAKE2B 28fb557cfca83b5138fb6e04d0377c9d5507049680fc86f8e073ab00b4db89689d20dd6c22ca21ade35e3d10187b26139057114ae81f1db3a24ed436557719a7 SHA512 52bc894c5483c21d9228671adbd12be36be669a70426399d0c183e4a87e102e06e1151e5b057da4e9dd46696a74d03f5404bf4c180c15c3595bb1c44ae511965
-DIST genpatches-4.14-35.experimental.tar.xz 5184 BLAKE2B b4d97f8f7d4dc4fdeb22e316ee5474f86376571eeee384385e0130d56f6228896d5de5cb74f3abd4e437b0fb2ad5f8e092c431ca3efe076af06e1d1008b70fc3 SHA512 5666450cc357545df8260e7100cfbfdc6389f7c766a93214ed5f8fb0ff7524c90fcdb232e136d3cf451be581e021b8ecc086d37782780b44772eb95e3a0f0432
-DIST genpatches-4.14-35.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d56ce3e548493b1d65e2cffe963d62abe3bab83134eb6a0feef45b94b324c577a7c5aa318bebeb2e97bf2943c8a1319e40ed3a SHA512 df8d909c8897116f42877fce9b7e62f5eb651a0ab51861ad4e3acd68adebb40657755cb7c7757b001beec7f959cf1ef8691609b11deba0aa214baacc7b4f66ae
-DIST genpatches-4.14-36.base.tar.xz 937452 BLAKE2B 6d1a76eb2d49f08980a1ed98e2ee51b4190525febda533f35c809b4c4fdc5006cd76dad93120caa1d677c6b3e65b24ae9f0639b249ae05762e0caa2855c81959 SHA512 8cf07fb978b91edde19edf8f09827a820681ecc9719e8f80803ee9d29a308e5c4f222acbcb401cb05a9e659a4e408e6e5b23f3a0f1c415f87f3374de4ad87ac7
-DIST genpatches-4.14-36.experimental.tar.xz 5184 BLAKE2B b4d97f8f7d4dc4fdeb22e316ee5474f86376571eeee384385e0130d56f6228896d5de5cb74f3abd4e437b0fb2ad5f8e092c431ca3efe076af06e1d1008b70fc3 SHA512 5666450cc357545df8260e7100cfbfdc6389f7c766a93214ed5f8fb0ff7524c90fcdb232e136d3cf451be581e021b8ecc086d37782780b44772eb95e3a0f0432
-DIST genpatches-4.14-36.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d56ce3e548493b1d65e2cffe963d62abe3bab83134eb6a0feef45b94b324c577a7c5aa318bebeb2e97bf2943c8a1319e40ed3a SHA512 df8d909c8897116f42877fce9b7e62f5eb651a0ab51861ad4e3acd68adebb40657755cb7c7757b001beec7f959cf1ef8691609b11deba0aa214baacc7b4f66ae
-DIST genpatches-4.15-1.base.tar.xz 5908 BLAKE2B 6627ff7c5bd6b799dae5e61b1638ccc538715cc253521fd07faa0c5ea7dc9aed5204c040742d37a9d172509577ae5442526d11cbe8714540ee8e1f1637d0fbbc SHA512 c7b8cb613f4a2e6570808d179be6972511ea45c849c4415509e38e1d4688014cab15486628bb282178f306ff786e83718fb2171d1391057bb817ed67a0508caf
-DIST genpatches-4.15-1.experimental.tar.xz 5184 BLAKE2B 814356256c11ea5bb67706f47ed76d6fe6f8b4232b989ca042509ed2a7f3088f55bd113d3cac25342a66e4803f90864cca803c91661af106141b78ac9cf5fe18 SHA512 e840928a463a764d59013424045f64c1fdc8e5d18cf1d20c9ea15388d5f4c4b9ec6aa86e88c33add716366d6b18be175943c22b6bb1c88d3cdbaebb606a38b10
-DIST genpatches-4.15-1.extras.tar.xz 17492 BLAKE2B 1242891d2ebe519d6c9d43eb6a0b2e9dd1c51ae76dc8aaf71f14dfbf3b9c52097cfc4ad59c5e2add1da4ded0a34a06e2d302a0366a8afb665f1536f899fa3f9d SHA512 21830b23a1b16291beba81ac122a36e8bcf9268b548aa6e9258f18283e80f610ed249ccf320f27b0a45acd35e3bd8ba5ceb0420e360ae94635121f89d74903b6
-DIST genpatches-4.15-11.base.tar.xz 246088 BLAKE2B 12a2d77897901756c4012455b6458545568f9a8886c080820e5b2197cb518db8ffc2812b52cb0bb4255b2f96df8755d4af34c9068a90a9973ea25a3d98f3c7df SHA512 73e5abaa69702e943bdf77faae7665ed8582eb4b8e32d1b644fa4e1e6b985c0fccd026f637ad1f10afd4335b1cea359154e96c6abf4ca1e746ae27cef5aa67a4
-DIST genpatches-4.15-11.experimental.tar.xz 5184 BLAKE2B 4a44f3d3fef089140e6420c26d1c4102d518ce615abc30afb8127ede4328c276e3380502c2b28d5f452d8c7881130f0d2d7b04f0f81ce44f02db7b280493a12c SHA512 ddf304f14c9c714c32423b349c8740bd0785c5893ea7cfcf89895f0b76214693dff142c7fa5c40df09f55696b845210e3be8bda4fbf7deacff1718a83f83047a
-DIST genpatches-4.15-11.extras.tar.xz 17484 BLAKE2B 919091a255d5ec058e52c151caad2afe470b401a9ab5269946a2309ddee3a2b5068df8483807ee310832c690bb561700363a2b1c0294a4e15ca03dff36061890 SHA512 3a426bf63ffe786984cc8b9c296b0393fcaa9881c65d4220cadb331fe445fc05418a629cd5494f0a1419215d4512679d9619c8a92f4a10b2ad8087fa44292ffb
-DIST genpatches-4.15-12.base.tar.xz 251412 BLAKE2B c6534458a28c9df29b7cb9e3392000f49d529b2d223c8aee353b8e5e961886c97acb80993e30671ae2359a7f1ae6fb37ca1320571cad55b7cae562a03ae49f61 SHA512 f98e32b0b84b3499227a3ddca06398a1bad277e68b721b70a3cfdbbe9449c259a9e8ebc63e5463e65b5e5accbc6b3935bcc78840e26567a4c12e29a19dc8e422
-DIST genpatches-4.15-12.experimental.tar.xz 5184 BLAKE2B 4a44f3d3fef089140e6420c26d1c4102d518ce615abc30afb8127ede4328c276e3380502c2b28d5f452d8c7881130f0d2d7b04f0f81ce44f02db7b280493a12c SHA512 ddf304f14c9c714c32423b349c8740bd0785c5893ea7cfcf89895f0b76214693dff142c7fa5c40df09f55696b845210e3be8bda4fbf7deacff1718a83f83047a
-DIST genpatches-4.15-12.extras.tar.xz 17484 BLAKE2B 919091a255d5ec058e52c151caad2afe470b401a9ab5269946a2309ddee3a2b5068df8483807ee310832c690bb561700363a2b1c0294a4e15ca03dff36061890 SHA512 3a426bf63ffe786984cc8b9c296b0393fcaa9881c65d4220cadb331fe445fc05418a629cd5494f0a1419215d4512679d9619c8a92f4a10b2ad8087fa44292ffb
-DIST genpatches-4.15-13.base.tar.xz 292580 BLAKE2B d58a40e060b7c53e08b2131a8ecaf69f4cb23ebe9f7d1abedca1198affda5d332fc44531fbe417cd7f7fb205b1c5e463bbf08be60aae6e301f182c04f9555e94 SHA512 0ea1e857d68c04093ce945beb252622808328c914f153dbbe1ec8b56c95cb29eb8fc102b32e923b03b765ea62620217ebe0ac65ea8634914d0ff386b78793a4c
-DIST genpatches-4.15-13.experimental.tar.xz 5184 BLAKE2B fad0dcdca86b37d51fc425a55e9945a00b6a8df77427290c088a5f16123b016a0f826a8e6382e0072cb6098a487c74fe4f0c9b497fc76c7fd4f2e6a831de973b SHA512 1d76fceb626ffd50b6904822b3acf771f52f9992a1fff957856c2e5e9ace7857f8977af20a753732eeec7a032b4c4bdf8f9dc5fe297cbee5371a5a5c9df35284
-DIST genpatches-4.15-13.extras.tar.xz 17480 BLAKE2B ab2b3c284fe0432fc151429d9695c4d52c202c48630871312ff2f9c84f6ff339aeb8082a69277a981508a40bea04c81edbbb29d5ed3a4b61478e10c3701013ce SHA512 d0c95c637fb9c9bc535f31a621ebc8a2cea681c93c0cde8098f40494aebb9a37da37714c57f9ff2d5320076526a6fb4f76ba34d893fe22ba04c227afd3b641b9
-DIST genpatches-4.15-14.base.tar.xz 322636 BLAKE2B 1fbf595aaa9d019f7cc40dc669ac6d5544aabd2b4ff0a2bce48258079ab6cf685785600485069257514a444f895694b64f7f4d76c2cf9e477bdac6e931ee0ce7 SHA512 67aa5bbfba02b019609e8e23cdebfd13b83eb025f36bcda614a3dcf167db0c721bba594dad42c544215005b9ab72ce3c271ecae35e76b5d26aeef81068bcca3e
-DIST genpatches-4.15-14.experimental.tar.xz 5184 BLAKE2B 1543a0da91eb42dc3c61b3670c2d5aa94a49bf30c3745b2408d43d55f009f378737d05d9c8cc2b16a43717ef96fe52758c0487f7f9ab725ced9482c92494321c SHA512 e9014e32d8d4659d4d7ac5e4902b6a4bb1fca2f3263efae09873e966a86151045c054c42f3247074ca802fd7008a7ba8ff06cdc507367cf9298579ddcd73f6da
-DIST genpatches-4.15-14.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf2c7dfc4029899cb2bad7a31fd9c2d2675d6d941584d74db8f96971a64cbc2e2a1e8dd6e9b189443a8b7d4918f3ce33cdf481 SHA512 dc05fdfa9b0a799b8767109033434d8a2be00dedb19a420c395576fc142dd41e7ed1a74530d543958865d9d8557eac2b193fea3a16fb45fb1e725b0129ab75f2
-DIST genpatches-4.15-15.base.tar.xz 336656 BLAKE2B 326410c6d2ede2393d0e4e9dc034d1adee8336fdd2ea6a9831dd9be7963d72cdfe031ac24db54a95ce1c94cd388121ee381cbac5c365d2eee79e49c4277480be SHA512 a286494dcaa8d1a063501b364354cd4fb9d342f03efa559292b9908928cce7a684bb706ec89bfd46b52c1253125894322fa4f1d0ec3a7577bf47a4cab0ceba7b
-DIST genpatches-4.15-15.experimental.tar.xz 5184 BLAKE2B 1543a0da91eb42dc3c61b3670c2d5aa94a49bf30c3745b2408d43d55f009f378737d05d9c8cc2b16a43717ef96fe52758c0487f7f9ab725ced9482c92494321c SHA512 e9014e32d8d4659d4d7ac5e4902b6a4bb1fca2f3263efae09873e966a86151045c054c42f3247074ca802fd7008a7ba8ff06cdc507367cf9298579ddcd73f6da
-DIST genpatches-4.15-15.extras.tar.xz 17492 BLAKE2B ebff9e91c92b4fb48ae355401faf2c7dfc4029899cb2bad7a31fd9c2d2675d6d941584d74db8f96971a64cbc2e2a1e8dd6e9b189443a8b7d4918f3ce33cdf481 SHA512 dc05fdfa9b0a799b8767109033434d8a2be00dedb19a420c395576fc142dd41e7ed1a74530d543958865d9d8557eac2b193fea3a16fb45fb1e725b0129ab75f2
-DIST genpatches-4.15-16.base.tar.xz 358520 BLAKE2B 46f38cf7c2994d51d5ac2180e9f08043b2cb41e49b4ee021136ffbdf68baca3f83b4e4bf5edace618b3a4f675955109393e31a16250d50b765da2f417e3588b0 SHA512 ef755f131261c9b20abf83f1b573261e9a0fda2ef7b985316a98119d2c098f7f844d5128eef9c4aa13d582dd15f93a31efe136575431ba34bd1b97153fb8d8f9
-DIST genpatches-4.15-16.experimental.tar.xz 5184 BLAKE2B b4d97f8f7d4dc4fdeb22e316ee5474f86376571eeee384385e0130d56f6228896d5de5cb74f3abd4e437b0fb2ad5f8e092c431ca3efe076af06e1d1008b70fc3 SHA512 5666450cc357545df8260e7100cfbfdc6389f7c766a93214ed5f8fb0ff7524c90fcdb232e136d3cf451be581e021b8ecc086d37782780b44772eb95e3a0f0432
-DIST genpatches-4.15-16.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d56ce3e548493b1d65e2cffe963d62abe3bab83134eb6a0feef45b94b324c577a7c5aa318bebeb2e97bf2943c8a1319e40ed3a SHA512 df8d909c8897116f42877fce9b7e62f5eb651a0ab51861ad4e3acd68adebb40657755cb7c7757b001beec7f959cf1ef8691609b11deba0aa214baacc7b4f66ae
-DIST genpatches-4.15-17.base.tar.xz 386736 BLAKE2B e8aefe3adb6e8c592f73dcf89adb99a0bfd019007f85097d4e92f08685c2d2b423b0940a794ecf15b5c167331b72e5ab6684532ce239874fd00e68d33d4a531e SHA512 1d1915f8eca7c74298d0d5d77a608f0c5ca69eb6d8ea09f9a6ad90155b3d9c4b76bf5a47a9c9b4b3b869adb812fb5d6f97191f0d1efd65455f8ef8f5ac9c11d7
-DIST genpatches-4.15-17.experimental.tar.xz 5184 BLAKE2B 6b20cf92325c64327d650e485ab28bad8c3503a014d90ebe76b91044db64f08bd40e92296e72ea7f6377a63a64844d660eed2e289042448689055cc5c34cbe48 SHA512 c6936623609b32b114af11c0cf8bc50280aff42377493783a0f97189b0257e6ed5c5dd71bbbaac298b8da8a97eb7de0fe06891341343471a245f0bf2cc8cdc3b
-DIST genpatches-4.15-17.extras.tar.xz 17496 BLAKE2B 2f13f77a9dcd5fa1a1816d71677064fe530a38fc4717f0227fe1cc990ff3e9ab21716d7343b9d61ed842e99921cc286b4649bab5955ac337d4c67acd582d9203 SHA512 0c88b8dd4c3c22a54ea3e3a18a1e9586309e7b3d070234ebc293d13a63ce97b557cfe89d35c04aea7b7e2ec74040064a27818e5cf8253d8dcf453f818934c044
-DIST genpatches-4.15-2.base.tar.xz 22348 BLAKE2B a4d4e0b6a83e46a657ced903845dc7adcdb749e6657006c58d7070a0cb906066a1241ba7c33c9431aab4af12debc0e875822c5d327dc29853420cc5699cfae2e SHA512 2d6d8a2cda9ee4c41068c03f1e90e5bec2c25debb2bfbda7d6acc83b49b4ecfe861fd0be68c133dac4c98f23d8c23fca816f817653cb283405148985f20c4e9e
-DIST genpatches-4.15-2.experimental.tar.xz 5184 BLAKE2B 4967ea59aaf9587c5f36e1cb97e0ce454f7d23c0d9e02cacf4bffef14834ca591eb4b64606fdc267d2051cab21ac49cfab16082d1a0affa2e2e555bfda27a72c SHA512 9fbf5806636b2676144dfce4d33c8ff1d97dba9a44703abe5cbc1741c3f54f082416f9628f308a186dfef1c82b42183a9a52970f96be06c1e0a60ae1a1a29257
-DIST genpatches-4.15-2.extras.tar.xz 17488 BLAKE2B 7549c1059b8aa48dedf196fbf53be363735ee2d016ce03fc22c3c72082eb5c770d5af557c8602ad01e7b98f1eeaa4c0497a6eebf344596365811f402307b3f6d SHA512 053490dac39816e14086781c4aa7a6c66544543a8851fd672b8a8cfcf49a03573e3820284de3a28c0345eec27a1c1687bc445443c5076ae3662686da3ed5e1d5
-DIST genpatches-4.15-3.base.tar.xz 52576 BLAKE2B 41c56cbb010eccd45b7bc84242ad61fa92d72f1ded28ab5e5612757632c6781c37b8f20bb2f21748dd93a1b8f474149465af255a82076cc65d9167303916fbb6 SHA512 d50f3d9f7c65158dfd88e3d9d5df5cc78ca1b1552858ca2fb9e901dafd96e136bca91b240f81a4aa71541da1bb87ae83b5848ce15351c32784b395aa5b6d6a1e
-DIST genpatches-4.15-3.experimental.tar.xz 5180 BLAKE2B 8f3b90b23382994322c92a08b91fe76a099e9cf8bd61d60af0d93b75cf3c8fcceee9dd4497e61d050ff1ee96d608bd6e72a4fab5b27386be96d5542679f3f61d SHA512 7029655d87823eddcc8c1289a171fd210e38189845739f78c27b7631279899efbd8fec19acd72bc802f1a893bbb6eae837cddcb0b483c2236b7509c74897f93d
-DIST genpatches-4.15-3.extras.tar.xz 17476 BLAKE2B eea5f14935bf87231328b7210924eae6c1c7146cac5402d1b588ef0b3b460382a199809f8afd68abbadc7a89caec53fe8aa32d48cdd0e3abd74a9f848e292744 SHA512 3c9bebf01e6ab0fcfa8aed253350946b616cba2a1547b706e7a436fcdc2490d64bf2092238a832594551f7b08bbd725230a6f12e31deb2ae43e3d78025ecd233
-DIST genpatches-4.15-4.base.tar.xz 59396 BLAKE2B 2985da777f300b879ab2171663f81d4f6d7529f13a8217a53f242d4b2925c12669aac499fe24c7845de566a1267924c89a978e4c5e16bf48e6fdf3f183061dad SHA512 e83fb9a85f9544c75ab357fdb299fac76ebf841186f13d9710315360aa3a70a2e3064fb892fe1910affba15e9739a1a73e95a05a0d017a9bcc789abbd26218df
-DIST genpatches-4.15-4.experimental.tar.xz 5180 BLAKE2B 8f3b90b23382994322c92a08b91fe76a099e9cf8bd61d60af0d93b75cf3c8fcceee9dd4497e61d050ff1ee96d608bd6e72a4fab5b27386be96d5542679f3f61d SHA512 7029655d87823eddcc8c1289a171fd210e38189845739f78c27b7631279899efbd8fec19acd72bc802f1a893bbb6eae837cddcb0b483c2236b7509c74897f93d
-DIST genpatches-4.15-4.extras.tar.xz 17476 BLAKE2B eea5f14935bf87231328b7210924eae6c1c7146cac5402d1b588ef0b3b460382a199809f8afd68abbadc7a89caec53fe8aa32d48cdd0e3abd74a9f848e292744 SHA512 3c9bebf01e6ab0fcfa8aed253350946b616cba2a1547b706e7a436fcdc2490d64bf2092238a832594551f7b08bbd725230a6f12e31deb2ae43e3d78025ecd233
-DIST genpatches-4.15-5.base.tar.xz 131324 BLAKE2B 7c234dd1b4cd2c46fd6c0e021b1057cc61cbeaa4b103058358d5dbf88c7455cf97a34f45d7b728cb5e63dd565a0af0fd25bc251102a839299c404674dffdde00 SHA512 8f948ac56881bc0a25a5bd71ed05346d9348c6baa74a21e0bd7a162dc9711e9f2349b6e3a751e7fb5113971c04f7b00aabd2da5359b2ce887901ac47f36c55e2
-DIST genpatches-4.15-5.experimental.tar.xz 5184 BLAKE2B d1b0ae6d6e27920a91f230dd6768741fcbc2f3c3f45c94dd764ca33e08edc4d6f9a52caf8c0e8cfc5431fe49dc189710208d9f1fcf4199d51cf66f0578c6430f SHA512 dcb81b7063be6b19eb64bfe72f07d51762f3693b087e6feee118993d524bc48caa4ca6843ca45de7b017e30907c58b7f383f1a5efdc67f801f06d1ea8380474f
-DIST genpatches-4.15-5.extras.tar.xz 17480 BLAKE2B efcbfd671a8d34546dec1077c6e4033b04f5babd596a1d673bc4aa98b73b98c11b75f47288f8f1f9a89bbc5f0c053ba852d170bdd513f7d8e2747371cac213f5 SHA512 a78ee7bc750f0c41b526b95c63d9124aeabde8c4544fec7b76a8145e045b1106dc619d36d73d6e8bb262447f0f232a5b364028945f7251a29cd45e46f4612fd9
-DIST genpatches-4.15-6.base.tar.xz 182288 BLAKE2B 56f0d1b035d054163b14726f871ff268d704698f4ff7245a2bd0750d9525c0b9dca198fd52f0b89453f3dc84822913beed3961c1f30c14fb28dbef13037c06ad SHA512 72b121ccf740b67eb777c40f5fbe7a00b2a350ff5cfe718520afbb84ea14cbf57e4d8751b23bd255c02cc75f077acdee7741392694d867d9398fff2661aa6fbc
-DIST genpatches-4.15-6.experimental.tar.xz 5184 BLAKE2B 410be75d35895bbdd9feafded87f1f0195995c55b87b8649da192935107d35ca65f0042325c01093d172b7aee304d4573bd532a374d614af8ff090f8bc03bd01 SHA512 360b1c20530a8ec5c678c07a8b6aa0d9aaec15c2b97995871d8bd3c567e2df21c47c7937373f7ddce5cd724be0543f9e82ae8d98e9f3aacbbbad1fa94199b764
-DIST genpatches-4.15-6.extras.tar.xz 17492 BLAKE2B 90d6b7abc65a6c5b45aa2657a3422aa4d940ec940108943f909a772dda4898be777990d1ca8ff2b8cc1f16c4634e195420f0cf2dd99459a0acc058aabbf9f512 SHA512 a685fc5e7b67e03807046572209f98371d29a5faf8ee81d115963d90d969da4e8bd40368fbc0a4adcb96591730a0a3f7ea05879f887b6ff252a34b22e152d24f
-DIST genpatches-4.15-7.base.tar.xz 193592 BLAKE2B 7568231819af388699ba317d97659cd433815aec1b1b39aa53d7cf740560149934edf214bbedf5b9d48a2e56ff6f3c58a78c301ef01de1ba08deb46a569ace32 SHA512 63c85b3f434c7a201a1488211962ea7c3cad2b22abd5455ae52fab17ecf7485a3d346a762fd0078ea786694b6481818da0f271f1ca9068242bf7b23a9977fcc9
-DIST genpatches-4.15-7.experimental.tar.xz 5184 BLAKE2B f67c68b74d74ba81499e36cae871656b07fc6c40ca890d2b5edb9137b5672652bc3c5bfdd46f322b64b7863776e76485370b23c8a5b03b8de16730bb9b265a53 SHA512 83b60e68991ee73488f5919d26308615361b95a4dca153d9f1d58e360a7e4370b18c34aaaf572f853fad08aab7636fde67a45c371e37f56abcd5b44c32f62b6a
-DIST genpatches-4.15-7.extras.tar.xz 17492 BLAKE2B 4a1d976f56d48c8da2c43cd306506075f226a50caa1730bc77cbbb11f11e9c7446ac471355f236535bf4878ecb9b9f4dbc9f07cb54ba9fb4089faee9d6b87ee2 SHA512 8d209e3ac993fce94ebeca0ec30f81710da0a8a9b657ca936f5d0db05061aaeb95cde4f552fe414edf51be8e28e6bb9af3cb668210a7c335b3f58cee84110470
-DIST genpatches-4.15-9.base.tar.xz 213364 BLAKE2B cd9d322b760f455e9030f37b2af0fc16c18aa760352a1e48e7acf249783884ac7b6f8503fcc9f7d04d9f84d46dbdb83ce30d6fd9672158cedbda413733ea2543 SHA512 06f2da48a4e219ca7af343d3607adfc533cee2d43d0e8629b0fb58390e99ac3c0c226aa89db4e37c87c1ebb247b10d27fe4b68a87325fdf6491846a3648305ba
-DIST genpatches-4.15-9.experimental.tar.xz 5180 BLAKE2B f273483f44819e3110d45ed8cb042c16e729dc15e495a3042754d0fc727225a4db2d9b00e744dd3898ffc5d31b0cbf4dfdcda3a7019d768e7b714544d9c46b02 SHA512 342819d503051177983ae9e4fb20da1d67b416db4c46c5c3a3dbe8282c75c9a9f21fda31ee9a2d8080f139c24c107b650a53e7a0212e91a54f09c012a7545920
-DIST genpatches-4.15-9.extras.tar.xz 17488 BLAKE2B a31b176bff4dcba9e3ee6fc0685a6fd7ae695c590c4f95cb495e4c0d34d6a818c11aa30a1153aed4d662837847281917dbe91237c7edc51052908b0c30ede8d0 SHA512 97dbbe066093d0c495578196409496aa4102d3f10de28f2bb975a3db4ad3917a6ef34b26e947b745419f0e80711e5dff6a41cf141b02bfaea910bc1ce0b5d3b5
-DIST genpatches-4.4-107.base.tar.xz 1587988 BLAKE2B 827d3ae42c0fc412c165568edaf1f8550bf828d7e2edb7c5abd3013a2b639dbeb68d2e3a9656e2995baee07c7619695918e654174528ce3eebc8a891715bc636 SHA512 1fffc6d7b2c186c87c8b343d4bf5fcf94086dae9f4e70b2965f5dc8c18ff4753d417074ec4ad7deca29ff597a6e5d0cfca4bf325609596678febea5ac2f5ea24
-DIST genpatches-4.4-107.experimental.tar.xz 87776 BLAKE2B b239fcc9ee1d0344a9fac8b6ae8e712bdf97df7547a2d3d1d6b39ea23f50d8836ae8fac3bfffcc401b3af52dd333b2b2b1e1626fb739da608d247be5fc67dbf3 SHA512 49e0cbc980cfafc7992d92e0bd2dd07d594ec39b9ba0bae27dd915eaffbd78c5af6d3d47847a98ee9a619447b3b220faf0c44484dc99088609ff8053f3c5d907
-DIST genpatches-4.4-107.extras.tar.xz 16468 BLAKE2B 1ece602969ead12faab3e0e5d5703a75c737a18efe873d5bdda71ff134387f5760a76105262270543b4a0e882a9b5434905b3846bd68cc3af5bc1b0383122cd2 SHA512 0843f4cc2cb2b3219f7e1343d68062a9c86f08c51c67a801f82c7685c8c0eb92ea32841a8a6d4bb8da9fc9882eeb965bc66317d7c14e7a5ffbb58214f962dc35
-DIST genpatches-4.4-108.base.tar.xz 1596748 BLAKE2B 20fca27a2b2b68f6e2b2b1254f21498805597470c4fc9a01a33c8d03baea3ae62e5b7e8af0f2f16f236f84063e7d6d24351b8b7ac07db198c1c98d5f0a7ecf51 SHA512 8fdd0a541c8c7ad1800557153d8d2caea2c04abb6ecc50eb0e789cbb790fe63192bdc4f2a3b6c9a0f7059699aff6385082491d721466d696968ba69861987a0d
-DIST genpatches-4.4-108.experimental.tar.xz 87776 BLAKE2B 16109490dc0247b221fe7cc51e53628e3f458c0387e2add18ec79ab6607189287763eb90c20685fedfbc4a8b06a36b65b16b25cb2c60aa8a33e1e8d72858a53f SHA512 97f169cc9fcb966118ced170a26cd58926a470a8b4bce5e96dcfe352f2537d0dcd2c3407d2b4df8c07d10d00e22f3a32fa82f3621567a367cbc59424203574ea
-DIST genpatches-4.4-108.extras.tar.xz 16444 BLAKE2B e5779b1707eeedc2c79f8280b995ad8e3dfdf4d15f12f6189da7b1600d72e9ffef8b94b7def795415862d70e7704170bfa5fb26573d4ba69934357e351c9ef45 SHA512 ea496a3275612cd1b56ed8be01c6c4b413b39c0e0815d52ba359dd50c2717ffe123ac92138c4f9f61065a3c2c710c54bfc63dc9e35314ec30fef03e5625bb2db
-DIST genpatches-4.4-109.base.tar.xz 1616300 BLAKE2B 26be64d724314a04694cbe78af7799df110993729b1516017c5ee40fc83a9ad782d280ecfe2237d924173da6a0bed24ad091b9d42fb9e4db0ed4f1b173af987d SHA512 2d05db5a2a37ccb73eb1541e00a0bc418aa9ed210d64c371b9b4847a31322523516ab7d2fc5b93b3dd7fb19a864dca9762a13fb6e08311780950743b89718127
-DIST genpatches-4.4-109.experimental.tar.xz 87744 BLAKE2B f22fd19a026a897e526ef205720d9bb6ca0bd569e2bdd84333b3fa729c4409ec8bfd0abb83f61dd08cd5510c5ba5a3f735fa0f14dc8b3b2a15d3bea6740985a0 SHA512 e3d0a500d2ab3502f03246e048a68e5e4082fa15d5f5227785245737d9d0e0cd27b8ae2b0904d64459d4cab071015226b0843ece6ba4e35b3c9deb61bb951e00
-DIST genpatches-4.4-109.extras.tar.xz 16444 BLAKE2B 67440d30e36e1754bfc785dfa8fe5312a3302f33ef8108d032f304498ff665f3c5b4409b55bd87013cea5f267f40e2529a9e21f2a6f8a3cf88817f8ff394440b SHA512 e27327acfd90654509650fe8e082414e95a71d23d9214cac2e57af9a7bb3f4aae686e04e1d73674b6613e58c7b5a98c9ce9f7e5dc2e5ad8b93ecd79c13488b34
-DIST genpatches-4.4-110.base.tar.xz 1638532 BLAKE2B bcf4d8cf98d465f605212542065a121b7640b7261ce66f246d8a56d4732c89bdaaf435d7be79e1fe0cbd824121fb52451ad58eb450ae6bbfe129739f3a6e1d1b SHA512 48edd84b98682569d570ba83d15e800dc86a1fe0c4369f945bfeb7b6b543dbcd7d8b85cf1e4aa507aa9a7a4b109d9a1099797821165ab1602c95d0ee8c815526
-DIST genpatches-4.4-110.experimental.tar.xz 87792 BLAKE2B 4a29936e85c4147d5196683f0cb706ad520e830163d02f1cd330c751d47bbc35b2bc62034ee7053eba8cd559eac8bdcfe2710c6d49f31cc816b977679b0916e1 SHA512 b1ef8cb2e1391b05becafb8939227e72006da3d18095ec63c58cc6915e73a136a73e7e1f3af0a7756c7ac584a4d731b417c7fab0248206efda60d1cbff2e8bd9
-DIST genpatches-4.4-110.extras.tar.xz 16460 BLAKE2B ba8a49590a0fd84e1cd3a8d8c157416d4ed0e91b37bd7b630e8c59f220a36f5c41d5cc6a61e16c2ee57e7a86c28246f43d8cffcf4bebb27e927004b814f679e2 SHA512 f27842d65aab2b0ee48bac34168e01ef416c8ef57be65b968fa79b8e537b15f629e5ba135f6ba08093cc668ba7fec810ce8150ed913b4467ac890a0f501ec6e8
-DIST genpatches-4.4-111.base.tar.xz 1654392 BLAKE2B 1522dc962aa9ef319d8f8af892d979df6e1ce3719edf201a5a1ff94028c9423ec74101e302f9be180d29e3bb8451385bbd4adacddd82b4beb164cf3e2f05cd56 SHA512 357682e3d487501ca3f8424748204f719ea1590987ab648df642e5dc28b3f14632c1da7c8082f57b2ff5b8bcf21f091840d54ef81934b20d4adf89f34678e2b9
-DIST genpatches-4.4-111.experimental.tar.xz 87768 BLAKE2B a36a628f63a65bcf7dcbe63d5426823af9baa64892d4c41433b5aa4ac7278892dd34cdaea7b4e21de70b9c8a66117d26cda53eae9b42e5dc3bebe278ff6cd1a5 SHA512 ee5939cc028d567afc8d99b22030efbf5363cdcd28c87ea992938eb3773720703a67e8c05ffcfe3f07b8531dde0238d9d7ccee96aa30270eec764131259f208c
-DIST genpatches-4.4-111.extras.tar.xz 16448 BLAKE2B 0e27191b8135012f70a223a22b5a4f8a1eaed5dcd41ecb7b372c2442d309f910631d4f373521222218f8af62771f9f410893f1276bfc011c77cb2afbcdeaa640 SHA512 1f231264bbc9fefd6dd71d363808b14a2f0d2ac57468d3c3cf0980ef77ddcc459b114394afa03fd1a5fde5a116fe5ec3f3800c3d0f4e2140acf722e0a6b7f1cf
-DIST genpatches-4.4-112.base.tar.xz 1668276 BLAKE2B c9b4a5a423a2ad7bdc731d4cb3fc4bd76b6605d99133a4f5865c2efac8eab5ecc12c2e50eaa6f84d8c9673cff2d0239cb867edb81171a2c6c44eddc0694a946e SHA512 206dd2adb48854b23b082a8fcaf074eb8762203c5495fe905073e37ea5df4b656f39d6816852f728c90fe26fa4b7cb3b7d6b80485d731bff6aa547b17a0f1394
-DIST genpatches-4.4-112.experimental.tar.xz 87792 BLAKE2B 13ad2e5a81d258ba0f84ce63318f8fa5ad2f02d5a2cc5ef47297a0e972e7a8b16546a82fc439cec1ce2308339c7be74db3b77bc1a77ec04ec6b44a3aef113009 SHA512 1255439ece64b36fd43a2e3d2539fd0d1e00ae3b409c9a8c970ae93d3d9e5783472f36ce637a122c0f2934255ad1cba2a22d0ff7ce6d5e5ca09d49762b5c0adc
-DIST genpatches-4.4-112.extras.tar.xz 16452 BLAKE2B d5afae8366b23a9c55db13e6e266184c3dd72c73c51d536e19fa317a1c613f03b371769579f7a0774bf484093c4ebf4907d6feb8404efe09919b5a6c9dae54d1 SHA512 a1c96aa2eebcba9d657de90abdce15a438d3584ddc4a55a27e39fcef1f19f89bfba59b6653ccb7d3c8607269494ffea9cbc383c7c40a7c4937a7db560b82ace5
-DIST genpatches-4.4-113.base.tar.xz 1687576 BLAKE2B 14bd6b1f64d1e7e1cdb1a6bbf90b1d7612217b08b5d9c9946a5af2979955eeef374fbbdfde256ac05a3c38f973c15178d4ceca7ee713df6ac13bd4f74f94b2c1 SHA512 fcd3e68b340ee535c1a5fff47cd68d43480fb54c72b873b197a54dffc6c285cb8867d1a1638d73085800d772662c536df56c078b74bbe1b8cc410fbb1603122c
-DIST genpatches-4.4-113.experimental.tar.xz 87744 BLAKE2B 18f956b749f71b477eba116dde801bc67edecee19baaaadf0c5f55546f18d04bb0f62e7fa6a90f9218ce70986f361b4876d13cd778dc833d6f7a04f8eba5243b SHA512 8e15026cfa956ab434f3c1fe1318bc05ae41cce7bb2331d9862838b7373025c567ae61c42f259b5469f4edef677eb36cc1ab9689582e608e34433323a98a6ab6
-DIST genpatches-4.4-113.extras.tar.xz 16452 BLAKE2B 62ece17a3e3379c9e05747bb2e8e16cb22e553f1c060ed3f2de873d9b6668f197551b285b6ca519023fe8d579a6f414f19c9098cca1e035dd6f003dffc2ae73a SHA512 f9787795089b694528566d9b0f1d5479874a1a589b20492714491b140b49769d0c04c1725e45b14e042d009861f9a10d870213bf62ee7daa0e956c0a832766da
-DIST genpatches-4.4-114.base.tar.xz 1691888 BLAKE2B e7529003017105d3cda92a43feb7b4b268a2c64b32897726301f7e4ade81a2e697aab026fc6bf6d180da275e56dbe2af892d4794fad57bc5fb97e5cba0bceb6d SHA512 1352f96e9312fbadce7f3812a7b0040971d332db3d00fcd71d779b354e912009916841dd5cf6fbf594b666d3bf91603d6bbfc7f6736d10ee8b5da4e6565b30e3
-DIST genpatches-4.4-114.experimental.tar.xz 87792 BLAKE2B 13ad2e5a81d258ba0f84ce63318f8fa5ad2f02d5a2cc5ef47297a0e972e7a8b16546a82fc439cec1ce2308339c7be74db3b77bc1a77ec04ec6b44a3aef113009 SHA512 1255439ece64b36fd43a2e3d2539fd0d1e00ae3b409c9a8c970ae93d3d9e5783472f36ce637a122c0f2934255ad1cba2a22d0ff7ce6d5e5ca09d49762b5c0adc
-DIST genpatches-4.4-114.extras.tar.xz 16452 BLAKE2B d5afae8366b23a9c55db13e6e266184c3dd72c73c51d536e19fa317a1c613f03b371769579f7a0774bf484093c4ebf4907d6feb8404efe09919b5a6c9dae54d1 SHA512 a1c96aa2eebcba9d657de90abdce15a438d3584ddc4a55a27e39fcef1f19f89bfba59b6653ccb7d3c8607269494ffea9cbc383c7c40a7c4937a7db560b82ace5
+DIST aufs-sources-4.9_p20180409.tar.xz 180656 BLAKE2B 373fcebfaed2b8ab4c831fbdd640136ac542e22db0d3b30b6d59db647459f327b7b3c6c2f130d83359107922441288da83a8632523bb94fd7d0287173a0da995 SHA512 0b11775389a22905e941c87d74fa95e7142e80ace7c734623c09fff4709f4ddaa8806a0dfe3a3eae8a01d6a4f1591ffcdacc32e5e5d3d7f7715edba342f45d10
+DIST genpatches-4.14-39.base.tar.xz 998224 BLAKE2B 5f67053742e09ccf3b962d252054d0f1f0540630c4105203ef06b2f5c01320ae5c888196aa95156be09f89809b9e2767b9c281ada7891ff5427bc19a25c3020c SHA512 138a564d677b0562bb92bab1590fd0fc8de8a8dcee3ae5f3faf8c389d46084956b3831af85592ecc65d352f3055f8e7655882ea2f10b72d8ddc9b01d3e5d9ec7
+DIST genpatches-4.14-39.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
+DIST genpatches-4.14-39.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e
+DIST genpatches-4.14-40.base.tar.xz 1011472 BLAKE2B 762faad2faa0d9db90b078ef807c71556fd367e6e72a05bcc5a9436aad79bdc9c10d552b09bf901e719e53cdf1f02d859c9b9d34e631ba01416a89530553ffcd SHA512 ac63483fca05411ceb97c9a4abd92882c8afccacdc527e30131a48295684ff41d6ef0e5e3f1f8a391e6a4f3fd049488f764a60adc5c8bd07339959e1b3ecfa49
+DIST genpatches-4.14-40.experimental.tar.xz 5184 BLAKE2B 4c1bdbd651ea3c20d44194e0bcc5ab3dce499182ce31a8436ec46875cde2d4b14a0cc5f0eb90cef0aaea167b49a25775be24b38a2b2bfa606a415627f87d96fc SHA512 05a8084dff8f08f9ba84b90230b4bf50a521ba1e0dfe792f30a3f775772f2097e43927c6c5878ba19bd97fed66036c5b29309a0b1a5e914ec895281440be8c8d
+DIST genpatches-4.14-40.extras.tar.xz 17496 BLAKE2B 2240a8879139d6ad765a9e38d0ef78c78ac9e92f54c5317912b512ab1a64fd42fd512696f1820718a1fbfa658c8775bbae358db483ded60e65d504f4a81aa4e0 SHA512 e6070bd5631bb41e1e0e73c9381993779cc6095525a6eab5d8387641e1fce534617d368bd6a02c5f5d8d2669db6f480d284a64c8f76fc218e29df5a34937e1dc
+DIST genpatches-4.14-41.base.tar.xz 1053768 BLAKE2B 023ba987e8b907afc0b8b33549560bb3478a3081964ddcce70c51641eedd56693fe43957a596f5e3e2e5da9e2cc26dd52a645781c8ab16ec2e997633da92a7f3 SHA512 507ae569e889958fb9e174efce4deee7c5b7a6e226ab09949d52e074cf945b898f813136c5f79928691ef1cd7abed08bf3d27fe50aa69823f7511c5504ab50ce
+DIST genpatches-4.14-41.experimental.tar.xz 5188 BLAKE2B 001901a60b79b70173356a86ed9b437335cb1ca5b248e08c2f431939183f07922fe3e9a944f472fb06fde2e1b4796298d99e35fb7187284b4023848be3211cd2 SHA512 1b6f7a06cd14fb011760340bcccbe942464a8110a6256af40598d8c16503f7561cb95f0aebcf6526cfeff88270cb459cb69943a190e1465a07d4a75606812aa8
+DIST genpatches-4.14-41.extras.tar.xz 17500 BLAKE2B b97100ff8ef0edab9d1860c91777393ddc81857f00c37ac6a9bbbaa4f44c53e1c6824a8437ac1059def3a7f92b976047d5de5e1e58463ed82e2aa6b8426b449b SHA512 2fe06d1ea9c593ac87b24fb912ec735ed653bfcc3b593fa13a143dea5f75f383aebcdc45d9dc2bca809fcf3f29eae156c198daf0d667a175f56f90747db935cd
+DIST genpatches-4.14-42.base.tar.xz 1110680 BLAKE2B 326aca830b9d942c0541b519bf1233b817511cd9e01eb05b6fcd12778b256b948db1fa479b6a0b4100c4abf46386cf3a6d5e11cb77395d99046ba44b421c70cb SHA512 3f416f54f952f47fe0e4a78b7d5ecb5d4db41849c70e3a8b0bd691aa711c251172b49d3c68fd65690a521951d21917a9a734d784a38961e7215f03940ea10a71
+DIST genpatches-4.14-42.experimental.tar.xz 5188 BLAKE2B 001901a60b79b70173356a86ed9b437335cb1ca5b248e08c2f431939183f07922fe3e9a944f472fb06fde2e1b4796298d99e35fb7187284b4023848be3211cd2 SHA512 1b6f7a06cd14fb011760340bcccbe942464a8110a6256af40598d8c16503f7561cb95f0aebcf6526cfeff88270cb459cb69943a190e1465a07d4a75606812aa8
+DIST genpatches-4.14-42.extras.tar.xz 17500 BLAKE2B b97100ff8ef0edab9d1860c91777393ddc81857f00c37ac6a9bbbaa4f44c53e1c6824a8437ac1059def3a7f92b976047d5de5e1e58463ed82e2aa6b8426b449b SHA512 2fe06d1ea9c593ac87b24fb912ec735ed653bfcc3b593fa13a143dea5f75f383aebcdc45d9dc2bca809fcf3f29eae156c198daf0d667a175f56f90747db935cd
+DIST genpatches-4.14-43.base.tar.xz 1138912 BLAKE2B 912119c18018a1955e422e81026db141d06ab432592b203a4ddc95f97ad333facb9dfdd7ba271fb558824d33485eb5e53b31ac16b801c8df59d2e6ed46e1eae5 SHA512 143f80e4c6a455bfc553311e1acfef7c40aadfb8190b527bc33a0012c844b4023d3a2680f2df81def23ff8fac0d1b54ff03bce90f8b8d94feacfe64fdd03e842
+DIST genpatches-4.14-43.experimental.tar.xz 5184 BLAKE2B 8221f2254cb8e6ecc165eb06fba02c3c4a691a1ab8b61d48e46f77f2d9e7dbe89862d46e3f649f588224c2cd5b8be8d9fa75c1841dca6cd718a70cb78523107b SHA512 5eefb2d7c5e2fdba5d8d87d4434615dcb9f71e54477c6c5e584f6457ed17891286ed470f72f0a553e43394c4dc1293c27afd47c54a0ac04cd4282b4b675c631e
+DIST genpatches-4.14-43.extras.tar.xz 17504 BLAKE2B b506e40f952d0cee14ef1fe6aedf231337314199816c10b908790d09dfbe86590c31d7342b7ad26c4afdb196c63d544937d117f5ef4f3edd6bac0efa0bec0285 SHA512 a524fadd7b4d8dbe6809857e2c19b106e3db76693ea1cb4badbae7c74b093cb48b398e8c46d5e227005ef5a05df0d2a6ecbfcb61ed641524f228e7a24def321d
+DIST genpatches-4.14-44.base.tar.xz 1161360 BLAKE2B e13b817a3261464583c49675546e7a748eb991ade835c4154574adf098a4e44a1758dc36f811bea8f1b9a510f5696189d60b68a22d9346ebd604fb90996168c1 SHA512 a8f973ff6079a83f51031cf9f65b66ef2645c366d1ab38d3675df8a6e5a5b0de7d6afa0a5cae1c1cea637c6db6a4405c28735226fb682dbed8b5df7c168a5312
+DIST genpatches-4.14-44.experimental.tar.xz 5180 BLAKE2B 2b0a02ac1babb43c6aa0e237b4c729f253112c0668084501bf93e793b8439621708564735ff9bc0b53ca264897c6ef7b8301856296131155aede01fb6a0f91d0 SHA512 e0c11a777d262818eca7cce2e1d060c8d21043129c2c45efb3bfad8c5a784d76c12798c6404fe5ab1e0eaa56a052681863cb635266dd90c3058e4e2fa114dc42
+DIST genpatches-4.14-44.extras.tar.xz 17488 BLAKE2B 5532729eee3487357fba7fda88e175cfdf50f58c093d4e147f56367cb08ac2ed4f3bd49c815f882816bf241d1a4dea7b490dea4d11226bafdf3d3664b1dd4ea1 SHA512 ca40fdab1333be01aab6f7a231b800f1aac55ed8a2a9c096d3a2d35e194a30db63703c094ce64b8f7006922931f170b2b079236719f310596b57c50afaf530ff
+DIST genpatches-4.14-45.base.tar.xz 1175760 BLAKE2B 6bc299d8072aa6e1f0ee3d338f20ecf9e17bc3f3c89b6458fa3c3b5616a58b69d32ff1c173202dc95a8a234a1cf3f6eee0f74028f6b386d39c1319f93dc3fcd4 SHA512 f1431f24c17bbe49e3f08d4041aba88bce22ef560c89cfe5c9abe4fead0305de7b27649e1dca8965867f115fc153839880eac5905aca74949289c8a061286932
+DIST genpatches-4.14-45.experimental.tar.xz 5184 BLAKE2B 501c9b838f5e44380043ceaa9f8a5d9097bcd97c9113874cd8c9959224d1556e64867605c803e02ba92f70e250cb8f96728dee728e52b97feaf43eeb75a95fdd SHA512 907a896f768ac555d04c7d5278c632bf9a89c556a1ba863d01ba73cfa98f20c5b12742cd057bcb6037b41d12420069ac7a2453774d1a79a4e68e1216c188192b
+DIST genpatches-4.14-45.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.14-46.base.tar.xz 1190412 BLAKE2B cf4c875da660153fdc018e10a208d0277ca7e9645aa3ced2a6331f182a9eb50ad3f459d94680f0749cff6cf2e2900930a169873b0e3076d54b4155a4718aba5b SHA512 8704a4855b85b5ae151cbf66300ba7b0f546e7283fb58cfa8db32c038b32d00481770d9152e6a616f90010709215d7c07fcebd7ddfabd2978397b669894d794d
+DIST genpatches-4.14-46.experimental.tar.xz 5184 BLAKE2B 501c9b838f5e44380043ceaa9f8a5d9097bcd97c9113874cd8c9959224d1556e64867605c803e02ba92f70e250cb8f96728dee728e52b97feaf43eeb75a95fdd SHA512 907a896f768ac555d04c7d5278c632bf9a89c556a1ba863d01ba73cfa98f20c5b12742cd057bcb6037b41d12420069ac7a2453774d1a79a4e68e1216c188192b
+DIST genpatches-4.14-46.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.14-47.base.tar.xz 1200752 BLAKE2B 4e52afb8c85a9d2f162dec0d0e6ef557a66a6b899d47fd7578a350d65ad30bab32daa514d1305cf3a7faf66ce43f74c6a4525c8b987846bc92c2ec14405ec9cf SHA512 c2a46c73d999a199b406a712e79b74d1c33c1a3d0963d43a69f8fd32b9e52beb715867cd064639c842f2395993e789de42b18973932a042061be03957ee81b1a
+DIST genpatches-4.14-47.experimental.tar.xz 5184 BLAKE2B 12a3437d97cd8f7779e158f6e376ba41cada33db4fdbad8c803baaba01e5e459738b155fec1352e3354020f5b43846bb479fe2682dee5fa296d498e41b67af58 SHA512 885fc8f8b127f792426b575dc87d4c8d5655ef514eee7d8a77e065415db674fd995f6eb91c0f23ad0f03a26b01dfa67f2d474bd5a8e7753922cb9387be2d184c
+DIST genpatches-4.14-47.extras.tar.xz 17504 BLAKE2B 5f364e68c663c7ef6d5bf5cded7fc304d806adde306d25294996063efc6c9d3134e4d8da1839cc4fccb2da4d0781b2a9ab926351ce6bf4b4c0bae9cd955233b4 SHA512 6d17fdfa3228377120147e43f7a53700c8d3f25c6f2a09c82818558bce493e09db4a7405c42f1b4697a4424ababc607128d98d88301f825a266c802fd18cd78c
+DIST genpatches-4.14-48.base.tar.xz 1222408 BLAKE2B 8870bd2081a385e3243c18e96a9a89c768c196bcc54e188f1793bfd48f29e8994beb0b787f38b14db2ed459aa53845074fb5ddaf3bed4d6e39f32b479b0651ba SHA512 e4c4a84feecf0fbd8392fa3981d7276aee2f40aad3a2568598146e935973432670a7f3c32fda09f4bfc17ee5273fd0a7e0b6fd2f4531a10336169586da085640
+DIST genpatches-4.14-48.experimental.tar.xz 5184 BLAKE2B e0fe9fcdb7c1f5e648791a3e686871f2c2951786092a8ebf97b84bb79e80521e3baabbe4a0537b72c2bf5641b2cc292da0853b46124c46bc69b106e61bed1e3b SHA512 d845805a394c93ae5d0ecf22a4c9902fd2d3b1382fd791b0431b5ebead9d3e580759c76a1c95b63f444b8246437dec300a79341049d2573ecd4af060e7fc1f4d
+DIST genpatches-4.14-48.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.14-49.base.tar.xz 1263704 BLAKE2B ee928e64ea2fc44b7d7a4e9ae91cc133b53c6976a3861f9a92fc4edfbded92737967f1f7f6c4d292b41228a67479ff4260f7366387a7e4a7892fc4b930b3ed7d SHA512 59cd1e3c873a78b088fb64baf92f84f6cfc1d3590e7b367ea881cfb41bf0264127f0056553a84bbb62fd69eca3d58ae29620ff9c52aec2ebab34ca370e371889
+DIST genpatches-4.14-49.experimental.tar.xz 5180 BLAKE2B fdcca0bdd975b24542eec8a67c3693ce8c27f889231025711d0a221a6e23a20256444f3b9320cdd58646c345e10dcb1817bb6e98528e5cc421d00b63a2b8a65d SHA512 f2ef797aec3c6c0376e7e9a1a974db7d8f439988f82ee4af07984bc71ae88eee03d49f2e450f49120255d38f8087497c7fa92da16064992692d0460629af9c72
+DIST genpatches-4.14-49.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12fc6b227ac994201f9b31872342c63d930d4280bd1f93625c148eefb126f9269fc1fea1872ac4920ba679938c6aec7d916449 SHA512 a32823c41c47b26110da59d63bd6104d8b38ae9ecac43e87ec03ecef726349475e40fe88354a1680bf816a12f6edd0dbfb1a2b2865be0a0716047b12d2cfbded
+DIST genpatches-4.14-51.base.tar.xz 1377292 BLAKE2B e438be087cc2f48fa174f568008687dc8f0352fc15352c5e9d59ab9b741fd836f5ef9adf3284b843a2dffea1d34c735e2f08bccee23ca93470dbb32bbda1750f SHA512 a421da5d03d099808202f2c032c29a55967a8053177fa60b9181ef0668d1b38182440b7d5699696560f165b380e2d007cd6d9f9b8cf1ab6e91fb44826692155f
+DIST genpatches-4.14-51.experimental.tar.xz 5184 BLAKE2B bb7b10584d230d6295bd57e50eeacffab7044061ba09806e812c18e4d5926516ec5674cfd8925fc838304987b115509aaaea07f8f3af1c4822bae0df78476363 SHA512 b79937209b305e1738c857a8bbd46a1394cc4893fd5052eb5f037edc6c29d83b3ef013eecc2ff93da08b8a90cdebc169e277be0f81231c26468091ff33e6d9dd
+DIST genpatches-4.14-51.extras.tar.xz 17496 BLAKE2B 115e99b501a0119809f2abe84c3bb8a66b2b450f53003441593654c23a4bb653c4b40da1ba31e53f7f4db69c99511b2dd41f53b4adf8bd377714b1ace8abd9e2 SHA512 a01c90e36504f17495c8691ba6fa99870fd03b65299730df57e767e2562a90b6a04da24c50983cb8ea12ac276e6805f3b5fdaa30ad175ae5ee28f147f75dc3ec
+DIST genpatches-4.14-52.base.tar.xz 1393612 BLAKE2B f408007ae60b6580104f0a2ba35af383bb294508800540d62593a4d0cf57addc518b926a7ca8c0398c89c6762b0389de553af189a100031929770a5b84d08ce0 SHA512 f114baf7273dde352905f1dff5dd72f4822f01ba906ba04d49f68ff779d9b27359564f15e57d3d091fe942c8c1d679227020e5937fe82ac5dcb59d270104b971
+DIST genpatches-4.14-52.experimental.tar.xz 5188 BLAKE2B 8212503f164cfbba9d6d59624ed29bea6ae1a5a027cf6afa484e90c931a4cc32c954216e91a442ad27834049ce90a4b262aa82b14763c72096d933d8459977ca SHA512 8475a0f915b49e003ba362f47e909ae97bf9dd2f94c8eb96fbf07899fc6884309f4f49bc17ab49de0bd8ad0066ef1e63cf1d19ba2d8a493ea1478b431e2d2034
+DIST genpatches-4.14-52.extras.tar.xz 17496 BLAKE2B 402ab3be4571457aa71ad0e4785abc5ca4ab3b245d7009bb3c89d730f57b4cf78b6e7b0127907c31e4a21e96f3de367e19a71778d3dcf02ec269345d60a02cd2 SHA512 fc3d536bfa95854ddf788de3bd603a44b4aad3cfd11e464e54b7bcdd328513a048ff3a4e882c4a90fd3d21989aa3e5c0b46f4d0f22d58b93f3bab0f95801694f
+DIST genpatches-4.15-19.base.tar.xz 418976 BLAKE2B a3308a311f69861513ea5d0f92c65f180e640353e015e0e0869cb5aa1fa5f1d00bc9b3339f1115b1c0b193f6917237e029177d011a56660d43ae30299566d547 SHA512 16955bee641b1467f7ffed95100ff2e840093638ca5ded0937e2eac8854c6c213f0f466c51df2262d8f0feb41d265410bbc04f6ef0dd62ea0ab48777aeaef5c5
+DIST genpatches-4.15-19.experimental.tar.xz 5188 BLAKE2B 7057889db0d41a03e8a2ad1c3bb81f529088938ab8dfae6c6a0850de99af8cf73d9f4ebf9e7d10adcf4a34abdc516853570ad1f8d1d019bc256d2823efe47743 SHA512 74d6c91eaf4e6eea292aa1a268fec104f4d0b1baf6cf412fed32a6eebfb8c778d1f27d5d140f5addf4fc25fccb5b21b374760e3c648bb38517e316adcae2602b
+DIST genpatches-4.15-19.extras.tar.xz 17484 BLAKE2B 4f0dd93555cbdf9d64b94714e34430a0f55f1a36e509aaf0f6a367fb9a2875680f5a97205f08b8307f7e66d7e6479bb3e40823c763512387d0c6af3618a75158 SHA512 9779f34f4077b1dd662dccfec156682f1015163b75b084c2888b58372fc42e50f2de8f8f9011e5deea8850fe5e819ef3a6756255ef6171b6f42ee23d3eff4209
+DIST genpatches-4.15-20.base.tar.xz 464468 BLAKE2B b3c30e02819663b31b4ed83794d57c4521fe13015a4419088664f017f4753117bbc88a5600e310092d8eaf8b132b0757d59fb7b503abef046db0249ed7ae96e6 SHA512 cf79c85b65f3a68d3d721d2425fb6e498df808097bd8b1c610023d0c36c0378ec0f92d33ee0dc39592730d87f4a1df52931ea9608be2d56d5543a201f9d1d658
+DIST genpatches-4.15-20.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
+DIST genpatches-4.15-20.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e
+DIST genpatches-4.15-21.base.tar.xz 479732 BLAKE2B 3d2b40d4ed60e68712a498b184ff58cb72a7902b75ecd35efc98f2a6455dc902b1c02d459837e7ca17465ceeae380e20ed12cfe50f1bcc4a884eef0d80e05360 SHA512 e92ad5ee6cfc8d7a57eba044ae6bd86344a0e8eca11c89d0de9fbe3410b0d7582c38d48281ae8d0c17992b151cb35a9916835a6963402732449e150ff5e471d6
+DIST genpatches-4.15-21.experimental.tar.xz 5184 BLAKE2B 4c1bdbd651ea3c20d44194e0bcc5ab3dce499182ce31a8436ec46875cde2d4b14a0cc5f0eb90cef0aaea167b49a25775be24b38a2b2bfa606a415627f87d96fc SHA512 05a8084dff8f08f9ba84b90230b4bf50a521ba1e0dfe792f30a3f775772f2097e43927c6c5878ba19bd97fed66036c5b29309a0b1a5e914ec895281440be8c8d
+DIST genpatches-4.15-21.extras.tar.xz 17496 BLAKE2B 2240a8879139d6ad765a9e38d0ef78c78ac9e92f54c5317912b512ab1a64fd42fd512696f1820718a1fbfa658c8775bbae358db483ded60e65d504f4a81aa4e0 SHA512 e6070bd5631bb41e1e0e73c9381993779cc6095525a6eab5d8387641e1fce534617d368bd6a02c5f5d8d2669db6f480d284a64c8f76fc218e29df5a34937e1dc
+DIST genpatches-4.16-10.base.tar.xz 215644 BLAKE2B b2706d34e5778c3453aac5e63c006a94a1f35ebf164cff8af692b754721205303a3d22a1cf7715a1809359d166191dbe29503ae0632af421c34ac59210876ee0 SHA512 0d290d1853481052b74d7777ea62c16f1c9d25d3b27b9fffa5f444d48e23a4dcf79cd12008940c2ab8cd6af3733003a287620148a4535431081a7d37e7b9d5c1
+DIST genpatches-4.16-10.experimental.tar.xz 5164 BLAKE2B f99e68621a2e5b17e4f6bef55a24ec2c52c442abfa35230e869ae008e4fca3721375e4a93a4f6cd7c49f09e5412ba4cd753bedab2fb4ae85fad57dfb8761f04f SHA512 4288ddbd0123242c5e22b69645f9da7d706c08c7dd313c7c59481ffd42c395076e7aac8bc26736729d04cebe5b1da579cadeca1ecd4644bcf1d786e402e87642
+DIST genpatches-4.16-10.extras.tar.xz 17488 BLAKE2B 75169c7816271f85df521749f6da4a706217797b10a4b3bd8ff7cdb37e380c3427f442428707449afa361956bb0197cc4c30f794491bb9ba1f5056abc586d2ad SHA512 dc8253041478cfb0ce1f6d5d1ec5a4e006320822e14b79f40fea752575e47444948987c17b8ad90d1bf5febece034393f49ab8a049e5e33078831e8e640c27e2
+DIST genpatches-4.16-11.base.tar.xz 229832 BLAKE2B ad7e4b657825802cd3049893140621a26a20f78f5327c43d36cdbbc3ba87938a80276757f1952fb532933d691428ce0bb8dc23d8c8c1c6533d939adaf7a65b5b SHA512 589eb66c4908d6c4964b50e62b22ccbcf6e9b5959cc0ce0bac6d07dbf483c0a0ded6c640649819efcee07f71ed0f930a0f6059be77d8df65e11a3f5031f8555d
+DIST genpatches-4.16-11.experimental.tar.xz 5168 BLAKE2B 9d8fb3e66bce93a3e8e2925d3b0b3627d37af82fc3b31faa4a676e2b8c355f36ffc998e1cb0b7a7ae75153712ffb3cbe289a351a1a5511b65251734b9b977e57 SHA512 eff2802e2d950357dcd368a9b358bbb2a5892b886be8991da0b808ecf61f199fd079a1d4e3a60bfe0c70bb4c97b582142a1f3341731d50aafc6fad06e462c634
+DIST genpatches-4.16-11.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.16-12.base.tar.xz 262212 BLAKE2B 95d70087d1e17fa59498be09fb5f73b26843627e0f858979914123d5ed38c48c3d0b6cc8fdcddb0d0a145342f5664032784793a9076692fe0c260b40299c0fc6 SHA512 3d029c80a1b00dc90f4781c778815bbacae1713f0b5e2af3c9351ee6d56996efc1e048ef2509c8e002fc8c633158886c5abc24a8663eb7daa97bbe2cf0f9363c
+DIST genpatches-4.16-12.experimental.tar.xz 5168 BLAKE2B a65e3d51f96010dc20c5937bdc2d1984c519af9633a2e460a161b2640293ddbec38f2581e0ba6278397d06d9cd9154c8880eb6f31a02ce2f25123ad6b1ff12bd SHA512 1691f82a02d153d5d6f98c53e03db5692693f6e01487b17d025193f973904f488bbe48a73a8e7c9e35ef5f9dfe37e4f3c1087713b891791fad714f18a6a82c49
+DIST genpatches-4.16-12.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.16-13.base.tar.xz 310996 BLAKE2B 6d87d807dbb17b2c132279849798c16ffe844e7f9f46e5adfcb5ecf1356ae60ed95d94469db8016d91d1a396aa4ae806fa8ae30a7cf17a9a8229c9546fdd5022 SHA512 450ec9c39cd88e995324b70cd58092f8f588f359cbada6d3c097cfc98c05d15a705c41ed4d9b48d9c2b4b15c79188c172a68a094c2e76b4aa44d83631fe8a486
+DIST genpatches-4.16-13.experimental.tar.xz 5168 BLAKE2B 3c137d43673f5a2eb0169d521c029c160f8f85bbcca212b2b7a0cfdcec48a93ed31c4c0fc0393581d106565db1b65d4e656c3a0b315c98ad7cddd06ac83a64be SHA512 bb5dd9dcee179c3384002f2b6abb3ffb937f8ea19dfe804acc9e248dd056535b03e2fc2655a11d1b0bbd1e3cfcc6d154ad1bb73a73dfd7ca4e517b476d0b1346
+DIST genpatches-4.16-13.extras.tar.xz 17476 BLAKE2B 72ebf7259d9157612350f0e7565cf15c9ca20d993413a81891ad09e4eaad4f8d2cf94cd35ba1439717820cb812a30b964bcb7b6346dbefd138ddcfb568f378c5 SHA512 aab9b7ccc1cde0374ae5c6f364ef89ab2ceb15484307db8cf8157da3066147835d0a0cff06392b4440c59762527065f933586b43b1fe53fe5510ed9514436987
+DIST genpatches-4.16-14.base.tar.xz 387692 BLAKE2B 4dad10e5bdacc39015381129508e15b1c30b6f191b3b3d5e7d66e89f8e7e3f9c40c81fb8596d38ca846c3747cc1ed722ac59a2bfa7984540c6466fe96a419f67 SHA512 70514f91e7575a87121dd7b5c8b2cf545d60253174eb8eef520e57beefc0d5c516fb1d48d963cebd60c85994744c5bb62576844feb9d1fc05aec9a21830aee9e
+DIST genpatches-4.16-14.experimental.tar.xz 5168 BLAKE2B 08bac33d41aeff4e675590484c5bc682cb420b38b3041e055b6c9b12d466b16dfafc5f8186e05b7797eecefaee7357a2a2b5729757a6880cfeb038d62624cbb8 SHA512 74da59061bdcafe29f8fa7142c132896f55597d992ee2ca365998af3f23c0ae48828664c1e435f7ea2d7e8b93682411f8c00cda3aaf79cd6535f5e8bf6ce62d5
+DIST genpatches-4.16-14.extras.tar.xz 17488 BLAKE2B ef216bc2349f04ff2b9f6a0fff48c9b92d18c0a3c6fa343b8b5800131d18f0adb5b59320b478faed7eaae59c760800ca9e324bc82079a017f707771f82c247d2 SHA512 a0e4d0c7dcb4a4d19a37edae9fa4b79913fded0df8c9282e196dceeede283ac15ba59e9a0e4cd92d567fe12f1c5e3394ba1625168bf8d4207ccf4a99a65e894c
+DIST genpatches-4.16-15.base.tar.xz 402268 BLAKE2B 1ce1a4da6e6ed219554adbf9acd0816747298c375a17794831ca9ecacd5bcf8c23c6eb49ab83d04d15b732f5ce6611be98f1d5acf151f3af172cfc6e48dab23d SHA512 2a5d0a8f83597bed7ee6000786d336729d53a2d76b674c14f4f92230cfb4cae6aca688ad70f0aa922e4826eddb0eb5d6d3b8d63ac207c54c52781759dd90c4ce
+DIST genpatches-4.16-15.experimental.tar.xz 5164 BLAKE2B c059c922b3f371ba3fbea51e714ee056d59a7326ddcc122f0c1e94055793d654e8a57faee263fd7b70a088a092e3b1d828befcf406d3d647291ce17782dadcde SHA512 ef3f4590aa9e4801c648b520a49eace811051422c4d849d80dd3d0ada07b71fd955cf520c8f1ce3d1c41d1bcc9f11f0fe05f329ca67f9098e924da3deb65d51b
+DIST genpatches-4.16-15.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12fc6b227ac994201f9b31872342c63d930d4280bd1f93625c148eefb126f9269fc1fea1872ac4920ba679938c6aec7d916449 SHA512 a32823c41c47b26110da59d63bd6104d8b38ae9ecac43e87ec03ecef726349475e40fe88354a1680bf816a12f6edd0dbfb1a2b2865be0a0716047b12d2cfbded
+DIST genpatches-4.16-4.base.tar.xz 46368 BLAKE2B 30a98545ab83f25ca726d3b2fddd4abf2a5b325be187ff16836aecfa699526efde2d8c56dbfc7af068b2e281527525edc0d18a14244513636e42f31fd726dca7 SHA512 dd723b619926eaf4fe13db53197e2142d8ff6b2e18eacf829635ce84d442a795e3ec392ac70ddcf0ce55af48470a3ba594beaf27783b473cb169e3aa4f608223
+DIST genpatches-4.16-4.experimental.tar.xz 5164 BLAKE2B d64e5d3c47c7b98fe56b7d1fcfa331c8fb114e56829b602321ef52181934a5548f6a6a5bca578faf64637b277430e8378ed85285d2e422e0589d3292d96c2479 SHA512 b08c4fc95160ec60dce4e4dc15d885e3d7559a2b133dce76e134982139e1b9a6ae2034a60812e2b2c263e10be0e6422ee2e0ceea2b9bc00c2152bc19239856b4
+DIST genpatches-4.16-4.extras.tar.xz 17496 BLAKE2B 04b98295a1a852516aefd1f99e806b1d471b98164948368e64179eb6c0131079b7743639eacb2b5852417e9dba0b34d7b2c92031c3f36bfc8845f230c6dc9f5d SHA512 5941bf6ffbe7e79233b4d722404c76790ab0c7c2a5090e1fa52a41a9dd8b5597013676f9e877f7440f6ffbef3d3ef91da6da9241f5bc94e7337bc0f8a2001508
+DIST genpatches-4.16-5.base.tar.xz 108324 BLAKE2B 7c8016a0989577106e4c4355ce67e5d655f0efe1eda3f3f151e5cd5635d5169860d505093dc1c486420b442cbd0482e3ddfcd9316602592cf0b94bf750184c3d SHA512 c9f2133122e4f269185b1644c1c90c502f62131a11fedf9b3d25d07890af854b0cbfea7b2cc624046762c74251b65bb398c0c4bfc983abbecdf7a4eddbc0a8ec
+DIST genpatches-4.16-5.experimental.tar.xz 5164 BLAKE2B be9f313fc48c61cc1b06453f289f4ba8a51bbeb1bea7c67f358cffa89b5b1ecb10ae5df237d136cdcd0e511fe51593abb2044168cb3418de471307a3b22b790c SHA512 9e724103960cd58c086929dac3335423cb878d39b49bc1f439344923b6c3963099ea5ffb28c3c7a5491e56e733521003c87b71ae02802ad7a4536ca918e94ead
+DIST genpatches-4.16-5.extras.tar.xz 17484 BLAKE2B b8b75bfc69a7b989742f53a84de9283f2a9a429a5000cc85385685171bddf4c837666a0e0d7ce9bed59c3659b9addf1140085fa2a97ceda86a9c06527f312cad SHA512 66710e4732b59edf284497bd37c02ecec5e46297f78c52f028927274884469c9f58fac721f138db3d9f7a6185e11f94ec9c8b28e7664a6f3099bcb0dbc2c4957
+DIST genpatches-4.16-6.base.tar.xz 115928 BLAKE2B fb3af87b39b0b8cbf9707ddd142fd4caf503ee6801fd1712010afe3607a9061d272604712cc1a111aa79caa8056def5cfdb385f4d08cdfeb6545b78edc1183cd SHA512 16f860c4782cbaeec70b08844fcf3c191dd621133acc38592f6611ec82eeeedd2678c0d75da5ff606d55bbd09bfa4c32268fa226f5d55902632827143a3c5f1d
+DIST genpatches-4.16-6.experimental.tar.xz 5164 BLAKE2B 12e6f30a467306ad5a155a5727b018b4aaace4817341b0d94b0cc5311987a1e341a4664069e834fa3c9633edc43b2c353070f732c7c06d040576df081b4b1dc0 SHA512 14527b27ce29df37c1648b787b933f30b58141a41dd37341d50454d8512190526c3dbdb4bd2a745c0b32cec0589953f9e72d42c98d5de3bee315b9c2a5fa8474
+DIST genpatches-4.16-6.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.16-7.base.tar.xz 142616 BLAKE2B b7c45d6b2a70c64f251ac2c7cb142c26b27273f671ccfadc80ec8e325dc51949b0ec8a0b57523fbfc562a6fbd7eee99df89e8cc5a4f3ed648d1c6d28d1fb0d73 SHA512 54eff302fb1d52d80fedd8f1ebc01e53a45f8a54162c87b22d9a4dc76047bc0d882a5428991b03faeaa04f01d776d1aae0b98f5977755a1fb6cf8fba80e0983b
+DIST genpatches-4.16-7.experimental.tar.xz 5164 BLAKE2B 12e6f30a467306ad5a155a5727b018b4aaace4817341b0d94b0cc5311987a1e341a4664069e834fa3c9633edc43b2c353070f732c7c06d040576df081b4b1dc0 SHA512 14527b27ce29df37c1648b787b933f30b58141a41dd37341d50454d8512190526c3dbdb4bd2a745c0b32cec0589953f9e72d42c98d5de3bee315b9c2a5fa8474
+DIST genpatches-4.16-7.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.16-8.base.tar.xz 177400 BLAKE2B 0488746b78299bf811cfa9b514a32ffcef304a71d866eeb3abd29da7049887bfe9006a60c96e0fc7b3852f96ae37000e1b9f6d0d43a363072096fba67d0c254d SHA512 6197e7f2698a912666028391e911166ebf92e7e8aa781a4a9e48ce82b927cc7a654817a4d24af99b64a6caecd650b22ed501e969cdf1a63a685d91410687fce8
+DIST genpatches-4.16-8.experimental.tar.xz 5164 BLAKE2B 12e6f30a467306ad5a155a5727b018b4aaace4817341b0d94b0cc5311987a1e341a4664069e834fa3c9633edc43b2c353070f732c7c06d040576df081b4b1dc0 SHA512 14527b27ce29df37c1648b787b933f30b58141a41dd37341d50454d8512190526c3dbdb4bd2a745c0b32cec0589953f9e72d42c98d5de3bee315b9c2a5fa8474
+DIST genpatches-4.16-8.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.16-9.base.tar.xz 196768 BLAKE2B 25c4b6a22a9a07af643ddc73fea2cf6e997f5cca89f86cf8386286d1b63e0c0dd393f138f66f87773d9eba382bcaec3a2562d2a4c22140a61358cd2612e11d4f SHA512 aab3c760270e8d72c892d58a88fac3db792150a8f7157a2fb656d52ecfb29c9f6a049783ec9583b98b9cfd09ae6f77f672ef375d6a260cb2cb4df8157e5398a7
+DIST genpatches-4.16-9.experimental.tar.xz 5164 BLAKE2B 0e8c1ce1a65404faafe4c0c7163cf87ce4ba4195edec6caab0dcbffff5351c6b211b233b6b659a7521e48e11e0fcf726e23341728591e9dbf305a4cac4500175 SHA512 9b4003d7902152183e4a76c54e0d4d09da33c9956aadafef4b11cdde81f7539a0d7931f4ae7d4d7e02928bbd7c128eba5fda00319723c1f7c2a7abb34ecddc9c
+DIST genpatches-4.16-9.extras.tar.xz 17492 BLAKE2B 2e9bb4e33e33f0b5ba923bc0036a3697abefcf7c439dfba68beb0c4d0a558dffde1c9224f56da6bbea560bec3664cb1025c0ce1c961037598523d1af0d0513fb SHA512 e1ed8a1532488aa849969a90bf299eaf39233695eb9bda7b070a87906b8891e2332a06234d4b2c98338b04380020387b8fb212dc95072ae79cc58274e8118656
 DIST genpatches-4.4-115.base.tar.xz 1692684 BLAKE2B 8595bbb40d0f0172e5b6f5266d89b3aa67fad3889375c3925a39e01ccccf9dd03e86f934d8d3c0bd93bab58ceee274277aaac4051d09f2edf665c106f2c0e29d SHA512 43dac11a37c6cbef7a4070336bda44beb2d5a9a649188d188e37c4654ce94a71244a7e87652368da5a0f88dc53ad5c8d6194ad614c4033d08295debab0c90eca
 DIST genpatches-4.4-115.experimental.tar.xz 87744 BLAKE2B dc8a9f9ae6e6789e7c072e5c6dfa0e875765d77ffb746060f65cd708124f81f8a269a54ec6bd6f9bd159d0cd5d0d9dabd6ad9489ff5453e01c264b0f34153300 SHA512 e82343f1d4220ecab61503c7cefae9d5d9cd605187f4861eac21f330c39af77e90950badf1896a8fefee57133496f706e2b1905eee1d8c6cf945e77ed3b36094
 DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787564019769884c28cf8bd3191686e3fc8f5c764ebc3a3c99d3ea7290aab316b8a0a0728a4f679196b80b524943c503fef6705 SHA512 84d76421f1e3d3041ab18a2a6a019b571c1a6f27d2fc880da64ae11398c43e5eab79c538940df82aa02d697983a97145197b127613bb7f4765a26813cc36eacf
-DIST genpatches-4.4-116.base.tar.xz 1719772 BLAKE2B 163d9b1341012e443264a43a9030e70e4aebdcc871f44c8eae0b2e956712c302ca0c00682d3299f55d7c34148d62323bb6919cc3bd72a130798f984bcedcf94f SHA512 077f7c50b7e01e3f5e4b0fda0d377547f27b000ee84f8d66cc92e990441ecce603bded93e1d40c7cead49f4fd0325d6a055d017898fe8b07dff608c5dbeb6924
-DIST genpatches-4.4-116.experimental.tar.xz 87796 BLAKE2B 119464d5722a2173d694b4f502a086778e44aad495121b4e7e68c113ba0603fd28a5d6e90b0c311c1d35ea668aabeae8828c3093fac3899e122a206815b8c6e7 SHA512 3643dc9b48d4ed2dbc6ed6ae9c56b830a66a5c22e7e9676e7b807e297e78c5ee92c726342e004b1a140518c897cdc7d430bfea40c7d789317666dada3fff2582
-DIST genpatches-4.4-116.extras.tar.xz 16452 BLAKE2B 6a7b47b5d1f1b281c8b2bee1b9c4ba8b58c23d460613c0585157903aa502322210fc206abb003c3cdc2b17dc2c5b8c24dc8e0fb257df67fa7403c0499fd34910 SHA512 c1a4b08388c907faf7a49112095d5420991750bb725d459fe3d77074806a93bbfa2ab668e4f5ff661c469e5b63ee755fd2912c4af3514a9e39e1002a4763bb7b
-DIST genpatches-4.4-117.base.tar.xz 1734428 BLAKE2B f7d891e1d0e5d9273d495ad42b1cdb72730d56ee1a572e44abd35a62f38b71aa8b78adfaa1537636bf0ce73e634f56d419856805498168b85c0fa40ac97a7b00 SHA512 a351549239b85ccf432832d1fabd2be2403096b41eb8ed1dd21d92246c24ae7d0ec6f70570348ec61e01533105664d0f9d85b9e74d317bc368e72c4ef73ed412
-DIST genpatches-4.4-117.experimental.tar.xz 87768 BLAKE2B ddcc6fdcfd688f957ac8e144739910fcb2c27c1d81ad2c7266878f559166baf5bdea28ee39a9d4e89907e3384028cee7b29cc5d72ab996574a18a9c8c6695f69 SHA512 0daee9a3eb93beefcd86d5c5140a18c1f9101dd12946e60be61e53f8eee17b2d30262df5c9e2a6615ab7574092741f3833351a865f842e4d2d2a88d32b7450e6
-DIST genpatches-4.4-117.extras.tar.xz 16452 BLAKE2B 9e482d457abb019663d022a8c2971883a1b90b0c155e6bd54ad99f85909d3f19d7476b7dd69543cb820290e59c72780f33b51b863a32987713fb70feaf03b2d8 SHA512 d27658290e685637a6afc2c6bd85fe872c10a75bc9fcf34ea288b66d9c7dee14d7b997b75530f292c799ebefd168c5e54a2447f60ab9c46c39b59c83a79abdf6
-DIST genpatches-4.4-118.base.tar.xz 1754144 BLAKE2B f64fffae61f17195d5b8402e6ea7d6212c555fb25d71953627f16bdeeaeb3b64b9c67234b0cdd83b7c81b0cda8ac4a0868f3eb158d87376350371a792640fb92 SHA512 93a63ac4c76a8dec29db45e8ac640af65dce3852685b329237448b69904b83b9fd193a9fcd83cdd6517f4fa11cef75d83af02a8e9662754676d9319a8088aec2
-DIST genpatches-4.4-118.experimental.tar.xz 87788 BLAKE2B c729f9c8c14d64c68987953e848f1e615cf034253eb85536a12fa7d542902bd6d3c0c6946d7cf83af99425711bc3b02108e9f1a0be329f48340d2a388a924443 SHA512 723ebb901488d7559bc79b7aa3fd108609acfcb51ba0738dbf5b5e6853dacaaa8853b59a6e073b15969017f868c9b6ebd94d2f4f5f022c9ab60959393ca05bdc
-DIST genpatches-4.4-118.extras.tar.xz 16456 BLAKE2B ddb6559900ab60daddd8f0f3e24bfcc486263bcdd1cade2b84564400c0c7c6635c3979c9adb86129621ca320d9c0fdbf5d03de2beb513bb1e41b4b6c96cd5ea1 SHA512 99b486c95be1e89e26f9d3a06f2afd2bbd96a935f55a4c3fdccdb670401b52042d1d0a025ec5ca7907be9dc557139107ebd6ec97311f9d7aad5b0d3d008c68d3
-DIST genpatches-4.4-119.base.tar.xz 1768028 BLAKE2B 2772ca3166de6ce5833134f3e1a58295912c760364a7634591ad86edac60672b5bea9eebb2e9285d6a644ccc2091c040516776d575190dbaa9094d3f6315aa7b SHA512 a0dc9eb02d5cd002ce0e00e59c5e8a3b226a89ab03dc5de25b26bdc98f6cf58b5b25962c49893b70fe6938da60f08d627f9fcf42d92df9d499da4c44aa8477bd
-DIST genpatches-4.4-119.experimental.tar.xz 87760 BLAKE2B d152ca04d2b064605cf65bcd0d57bd990504fc83653ee407332d74f36bb26477f96c2cd1524137e1a6fbf82bdbc8ea026ae679fb490ac719314b2cfd9db65051 SHA512 dd7c7c63ef1457051381a1ad84c25c4b9291b1c4ffc999da3eeb1c53adc343fd4881a715b169258284eb6fe814b077ce9fc46edb1ab2e54a4d4f05735c902420
-DIST genpatches-4.4-119.extras.tar.xz 16472 BLAKE2B 575206fd6f1d59205d88ff8177a0497675d4f99349bdb5884800288c5bdd4f578cbb031f23b3bf5b261515f4f8fe3c65bc658311449bdb32d1e09c06aa0fc750 SHA512 d7dda67d16ad0ae77ee378efbc1c17dda234273951ec20b6f7f1865e86b00a42bedd1e57f46d229f7ede2a39be8e56f2986636d2cd3ba9b29ef77dd8cefccbb8
-DIST genpatches-4.4-120.base.tar.xz 1797380 BLAKE2B 2f6081c1b6f37d332375f804b5321bd227506095a93d494b4ca01d02c3979ecbabfc078753fd6bdc1ea6f6adace1e0949adc358120c85ea7f315eab786f2b088 SHA512 131aa415f10062304d95674b4cb533df248e2f3527a90f46c40019cf8116ed64cc4ab74b7828741700d0dc0f2eed1826d64000d025d73a9a377287450b0c0010
-DIST genpatches-4.4-120.experimental.tar.xz 87784 BLAKE2B 1e65f82ad595c364224fb598affd9b12da633325b09bb6ac93e243b78245b6031c5f832d943bba80cdf7ef7bb887adeb912e0b6c9e89e3d73d3c69aa716dbdef SHA512 5529e1d25a2a5270453a5c37b4b71c6c6958542a3f411d86eb58c4706afbcfcb974846f9685965edb96e97f43e723522e340dc61a2f65ddd2bb9e295cbbcfa7f
-DIST genpatches-4.4-120.extras.tar.xz 16456 BLAKE2B 84744b78d96c13a00b8b1f11de321d51cf9c8badb53ed604117403250eaa76de7fab29d87cc05423392776b0f570b1c391d7a4f32f7468e6cd3d2166a97e0d8a SHA512 bc62d83309f250e7eb47fd1702e1353e5ff1d647624a04bf246c491209f88fd5da719b4cc6d653481aa7a1acfb6dec5780fd1ba7bfbce0f44feeccf1f8a3f76c
-DIST genpatches-4.4-121.base.tar.xz 1803064 BLAKE2B 37637cdb9bf3352504dce1b7d5753807c5df70cbddc66dfe98e958d056ea14b426f7df53110f6605fced78a3c7b295d4008596302fb577c344a507b2de420af7 SHA512 42b2f6f8b15cde76d61dbd9cd572b3bc5c2db9fe7fd59da4af1cefa70a0a2b0290ce7165d79cfd7424c0d7417ebe81b47745fbba1140a822d0be3b3436710e8c
-DIST genpatches-4.4-121.experimental.tar.xz 87736 BLAKE2B 994823edde58122ed8faef71901dd75b58867d936d3ce11334eb2fa0dc50fae49733eb6e0ca4a126077eeab57cced0aee398cd2350ec5f569a9182f806ae5f41 SHA512 58c9ed41d99a5f79b339e3db31b2fd9ece2c75b64c8634e56b63496a1290af82cb468af306303215f3fa9287f1c0700ca75cd8d994a137e5ccf685b4badf6cbf
-DIST genpatches-4.4-121.extras.tar.xz 16456 BLAKE2B 091545773f55d38e323afc8f21bf7e832c6de1ca6f6654c691316f2267471545cecf057d32d36daa17ee673482ba0066bc0b9b3b4c2a93118445259497eeac07 SHA512 bc8fde031de036806a2cae34a89e5a8f788a65ee6b320ea72490c9d66e02b65b4d58916aaf31121037b6fa28782995bbd5056c25d65d24eb9d605097c087eb7f
-DIST genpatches-4.4-122.base.tar.xz 1861104 BLAKE2B a9e18ea1478ca323c4a5ad6270b07e8e74cfc3220da7a94ace156135002918325b110f26be24b0c901aae213d88054a122a31aa2e1ea115a2a1c71f8c24759f8 SHA512 e7a7fd4d24439eec895312993e53ca3e87894e826c0e16726d76951282889eba3782379bcae5595a754c33cc330eb84b6f3c6a0a4af7acb5bd853f7d8b17b0de
-DIST genpatches-4.4-122.experimental.tar.xz 87740 BLAKE2B 8a76a145a3b2f98983358c80c1e488a564fc424079382828340a21d37c746b98d47bbe28e35f924dbd8ef7cf14131b3580366b4856f7a58b0779d0af7341a9cc SHA512 85e447c25b5ff24fa94576e0eb4e2ae6db16780703b73f5255a8f2ebc6bc1496a77dac7c691926155474cf16c64123a570c103d0e0a2f088c53eb06d5ad690d6
-DIST genpatches-4.4-122.extras.tar.xz 16452 BLAKE2B 1d3b14cee46406a1dbe50002f281ff1fdc060241692c6d4729e7e7fc0eb7101f1c63817fadb788a9914bfc3a4605d9f9005ff5fadf32c7e97f87cee814fdb99f SHA512 d50d01b58b63efcb2ec399308896935db2cf8be223fb6763b50cc974a1a360a5b9bbd626be3624c64ebb081df330464978386d1855638b5af1a29678f4b75049
-DIST genpatches-4.4-123.base.tar.xz 1865224 BLAKE2B 0bd2ec4723c62c6261ab2068518b9b3ad540575793fc996d72856d3f21d153c11854b7d0bb443445159c2f3910a856bfb46dd08dc1bc95e137fc87bc558be412 SHA512 12d82b9f91cae17f9dec018bf58b0f99bac1ab82692441b05d84c6d9df8a060d838a0e430269f36851ed777373ef9e5619ead2e5a078d5ceb324dad80282ed4e
-DIST genpatches-4.4-123.experimental.tar.xz 87776 BLAKE2B 965353a62c59ae643d16b9a60481e47df694b183de5eed7a07f402d0d39d2868147d69eacaf677e1191ef143ed7ecc0b7ffc811ff10f7f87f22bd8b92739c10c SHA512 e5b39958d3c17776f3663313bf125263298dacc46f54630ba26b6d37923b77ecf09d895a9699ef0add402328793950ad2e607ad96770ec6447d3ab60a9f28e75
-DIST genpatches-4.4-123.extras.tar.xz 16456 BLAKE2B 0d632f2f45a8b5a9b14182e160a825fe930ecf0302d31abe0525dbad347727f347b4537517d1f594ccdfef35562d54b29b513e3c93f2aa34c2491c5bb1bbf8ab SHA512 7a41da008eb8119e25ba1bbd41c077c17bdd888e7be9175cc7f7af22d0d45598abd87dfcf985130c2677a9544fab7456095e0b15ebd384b3d186692cd0cba5ae
-DIST genpatches-4.4-124.base.tar.xz 1872564 BLAKE2B d756fd483da71da0f0a032e8aacd06b789d7ba6fd9f20e87e3c1106f71b02d3ebea2dbd7d2bdf657806a2b3a9b1e638dd61f19854bc2a0a5fe7e5d9a7dbb0fe7 SHA512 fb6ecadb7ed520cb5f35af035311142a370a9d30c9df6a4b25cd51b48ea33c0727f58567c19927a0b3df09083fe816702fd394d531100c56f5e75a9d1e535e35
-DIST genpatches-4.4-124.experimental.tar.xz 87764 BLAKE2B 1949627cb676c0f92f91536c7325a8d38b8f3659cfefb55f8902de9d0d1e15f0b3c0628b9be1bbbe335d4ef373c62fa945f426674fcee76b3648e9898aa13f3b SHA512 16b58c86b5fe8fdfb3ffba969c19ec5fda52c54369d7c5a700b5f14ce5eca6f866772f9f2346bbebe98039baf1dde11ac42ef665bfe53b42cbcd984ebafa6e25
-DIST genpatches-4.4-124.extras.tar.xz 16460 BLAKE2B 2455cb186ced99e1b262940c040d80235f87247641a61be4f6e7707089ee22b85e18cdbbecb637d73275081658d83cd057be5e7b4dd68b2b481e4d2be79535fb SHA512 1978d8f290b537fab536033394cfcca264135367523bc0abc6d7307fa43322a37b260dd8d2bbb091795d071d62b1dbd59af5dd1c7880e06b74e1d96a9f0c6119
-DIST genpatches-4.4-125.base.tar.xz 1879352 BLAKE2B 7f4c8d179da7d9e5683b93e13567fc7031db2210224e7428e4d30f4b5f9ed7effe9ad5667f83d8bf382b779b01ee72128e9b94822f878a386339b12f00283ab6 SHA512 4f6a38efb93dcd72bf3bb03d57f25738578cf7f62bb5601411921674272d450735cde02d882f745bba673cbe12a41507ae0e4ecbce3b5508b4d79ef5161fc0c6
-DIST genpatches-4.4-125.experimental.tar.xz 87776 BLAKE2B 39a03c7d473597e9023be1eac1a1f03a942057dadaea249e145aabc33e0a7775aeaccf9447ac797d95d70ccb52660eb45eacdde49d33fa6abf84fc0afeecb7b2 SHA512 408959068c465033f9a1246a6d1ffdd60c919ef964c8c92b7f7de6b0f5c465310e194781f068a840410d948a6f3ad6420b44f47cd2081566becd88a57ef7b1c8
-DIST genpatches-4.4-125.extras.tar.xz 16464 BLAKE2B 17b725189a9c68d87b9500e50b3b050d241ad7a5f8176b55e47064a408db1d826ddbce116f2b2d2c3ad084756c02f27ae1413cea3843b38f2ef08b2f49398c0b SHA512 6ba26936f053c687a69d5ebd27bf1b73c44103874f3c6bf9266deae23db6f602adbf4db0eb127e0e4247889e14270c48d9fc71edfbce19b9e6060085a8f88b8e
-DIST genpatches-4.4-126.base.tar.xz 1916044 BLAKE2B 041e99faa4b789c7578faf9f304a33e53d913f6ee1b68fa4c367a7b376bd72573ccad5db47f9f59cbdb30a5b061eab059c0520aab0f5049e097a9f551de6b979 SHA512 78fbbdecef6398858e44c78f4af33b2ca08c764670be11d2bc643365c081df2ea456d784e8d1d31f9d75f948764c72db7d21df704d63f072d7f918421df916ca
-DIST genpatches-4.4-126.experimental.tar.xz 87792 BLAKE2B fed0cbc54f215d1572bbf6a81ecfb472646635d06c175b6d28b9b1a09d3592178c92ad8a6b306dcfb2ab1bfe50dc75863b2d50803a68788cada9e77c8b5f0dfe SHA512 14ca02669d2940d09d6a86761b8c56eacdf677f0ed3b464fdc6df7f6e91a9eaf00ca44c4fa69dfdcd3aba7ca51dd63a2be77cace707bfc052573d85e133159cc
-DIST genpatches-4.4-126.extras.tar.xz 16460 BLAKE2B e4c01bc55ba62f675b983a3e38e10256ea4a7ebe24e1a9baa540fc7721f03d430524d7ee324adcdb01b437a229a6922e47db3b19f0c20536187fec60b7237b31 SHA512 726ebd4e034ec5871cc4d95dc206ae09feaf8e24eb1eb6348ce10c6a5d69fd3f09aba3b57ad8fd15e2106d1f1baf8ba4502ce7b27022a62cea836f67b07229fb
-DIST genpatches-4.4-127.base.tar.xz 1936904 BLAKE2B 1a78de18d5484142684c070c47ad18d0a5141065e72daa4970d063e70e5189145b720fcca9b4144a9c3e1daa0be186dfcc1240f8f1b46b82ea2ab8564514e138 SHA512 dc117ddf1263709150c95c0a4aba2e85ee0fac133c094d783de3e109215c5e48c483145d45348d5535ee3c4bdaaae37632cb7ecbba7d8ff5904216079d7f00af
-DIST genpatches-4.4-127.experimental.tar.xz 87800 BLAKE2B cb8bc2cf7ae5658a49aa0f47a3083a7af930b30631f659fdb7621475c3842a43b3749466faa5202d65e3a9157a351c92ab62f44131487a0af95eaea52aa7af8a SHA512 3414de31cf89f186c3acee6b4d788f65b5338b3df21f1d702d7c987cceb6e861b60f95ad629c8a23baefc01581116ceb6a6fc5be167eb8cc4c4a0e344de6f82e
-DIST genpatches-4.4-127.extras.tar.xz 16460 BLAKE2B f793e17ad055a8ada8b8a32f7465c14eca965a737834eafbd6317bfb574ea12f1e8c1f7c01fd612e2267dfebe09618eb5e22af63710149e248cc2fb6a1cc3c00 SHA512 481f96cdd557ef4129790b2f0c0ed4844c54b3004b280a9520de868edc67509644fc03f29f4d8a1123bf094738b0a7f629c16f92ee2e9c918f8a97ca16f7d225
+DIST genpatches-4.4-130.base.tar.xz 1999668 BLAKE2B 836af798adf3fc1e67543096595655b633c9f7d3736b00527bab7423b488e6c4ba7bfbd63d9443a06d32de3726ef64bc963134e97a1eeba5aad8d23022b352d6 SHA512 fd514523b3f54ca67f665f5feb9340713f6af00e73e7b9948f5909bab21c8c5b3f90a044ff04d59d4032c34c8e4c1a0805657bfd549156d2ed0e9f646d57dd27
+DIST genpatches-4.4-130.experimental.tar.xz 87772 BLAKE2B 23cb4e28fa407f4eae82987f02c4fbecd8239dcc12e8259e21d3738db8950b05d1c602461cd0be0e64eb777dfb7edee3950baf56e9069f5b1db5df01d53fb4ac SHA512 0fb0c082e25459a0168aaa49c99bf3373f337b0f993d73d8c40d0c8d1c6d2c0d281a3231113204eef5c7535dd231d0765227c96bd3d07609dca2274e93e4a690
+DIST genpatches-4.4-130.extras.tar.xz 16456 BLAKE2B 4b2fdd50e47225cbcccc6a8776bbf47a1007cdf442ea6df2dc854241bef5ff75377a9e79a9bd43d2d2a2c511482f69ea09fc9340ba4af8adb1c027e64bd6dd33 SHA512 89beb61226a4495a4880f1900eb43e61514f20fcc9db34522b89bc0f6ae1c978ca631f8b7b19a65cc5e7209d28273f4b67abd1734330567056b4da76c76db25d
+DIST genpatches-4.4-131.base.tar.xz 2022996 BLAKE2B d0fdee53f870e6c176361f99bcc3a7e26a0ac65cefd09b4c868bf80b2f5c9dbe91a40b22e022f54e594fa3ceb292dc952217bbfa1cc6d0fbdb1b681f1e460a0a SHA512 f8bee00eb74dc06c0fe4c81ae82a6c5df8a65e920ce00ccef4a35efac3d86ef548879d98e0dc64c7d4747de1d6ce044fe56d14eef66443ff83c5d584258284f2
+DIST genpatches-4.4-131.experimental.tar.xz 87768 BLAKE2B ba6a0539823fec832768d43974b8934dd8a219135cce9b631487beeb8ec702af07c1d773058eb8442dcd29c2b1d49b3cdb76a59d5cc9974ce98f73ba3fec6865 SHA512 208cd5583869f7ed3774fa73fbeeaf3a62192133b06ca4a7e7bebbffd6ae969e74f025de5bab74b7aaee096e5393e178ec09889ee29127ec506c91afc2377af3
+DIST genpatches-4.4-131.extras.tar.xz 16456 BLAKE2B bfda9403392a0f8046eb73614ff953f3435337a08663099a1ff3bfb5a5311472630f59e142cd5c357ff308ffd048b68b185d3f01de00635ca0008f9ccea13f7f SHA512 ce0c2a0d1010b497a6ef7abc472d9050f3350d1204a546757353073163397533f1b8b4c4baf6d11b4d66f2f917bcfab3449552826a5e2eb79c6b3480547cfa10
+DIST genpatches-4.4-132.base.tar.xz 2040408 BLAKE2B 5f6396714f8863775cb8f26e76d258f8734ca351a325a1144f7be866809b43da638203a5633c6d59fb967086d59a948101b5d0066e33775e7a419c16beb9af45 SHA512 5fb3b22b76c772e812d223647c1f66194ec20f815587720a0005787a27a6fe5fa67e3f055131b57ed279fb016d12f561262717fd894cb360389ee34b1f10c57e
+DIST genpatches-4.4-132.experimental.tar.xz 87756 BLAKE2B 9c9cc82f9ece041d55683bf4c05a75b4cd611cb5b388d9115f8dca584edc4c2b8c5ffa20041ddd82f2f63c657b6e50f305fc5af1f9918cfc6411dd78e2d33815 SHA512 aff6fda22612fe8d3714598478e62112fb6c0b11ce7112203e4facee38e85d00ee5284c74f1fab0e336ec461259b43823c72d71d34952271eed3cacb5266c0b0
+DIST genpatches-4.4-132.extras.tar.xz 16464 BLAKE2B 506a959acdb5413f0fcd21f356ab0bbc0e39e35a915ce7b27d355c1abed64559795311abb36b0bb4daf75db4566534b81ca87ed4ed9fa837bbf2ae612b6c2751 SHA512 1063e7f75054621f38409ad2f1edeb2dd84b099f47782abbad8078469d51dcaeeff6b0fee96c7b08a7f7d4bd2cf76c522e1a955ff8ff24af347dd85d7e450541
+DIST genpatches-4.4-133.base.tar.xz 2049972 BLAKE2B d5ffceeabd2de25afe9b8c74d247a68d1ee90dcba046d420e5726b8e25ce56f7dd093d82cd9d1a169a19afb96d63122a389aa949839ffabeb67f076682a618e0 SHA512 ec7d475d82b336b6ce6e02f2c0507ae95415074d1f4acca1aba824216c4b30574c4fb0215155573536d8e117585f88af19b362221658350052f304c3e08f93cf
+DIST genpatches-4.4-133.experimental.tar.xz 87740 BLAKE2B 94fc4d78834ad54dac670451d98ed0508fb360e8eb0786ccfdab4dc418b4544318380d776750b9a7abbbbd0b4be424d9cd268cb7a14d70f6ed4ad7dc5179fb3d SHA512 7c1638d88d949a48688db0807064281fc1ce9ca193a311f7b4d2b3d10efed56fa43becaf2c66fe3c60e70dafa837ba9236ef34232c5afcf58504f705ff14364b
+DIST genpatches-4.4-133.extras.tar.xz 16464 BLAKE2B c7c36656d9c19f191812f62c549fde7efbb9ed21d5fb39ad4c897740870b93716dc623f1a7903e972bc107588eac740ef94411ade10c79db3cb17d3f5eafeb76 SHA512 304856f44023aba834aef29bd864d01514b795ace1175166bdb46d5f12b7f4a9d4b978fe0d42c4431bd2b9438d3c84d0988c2386a0e16e8d57aaac1ebe073845
+DIST genpatches-4.4-134.base.tar.xz 2065336 BLAKE2B 22e763c5f81effa0e43fb2e4211a975d92c6f3497e92642871352d549ab8fc3e27c1d0a3a5e0b519e8440e8f687a67f7af60bb31eb41c82cb9b3606be5a3ac50 SHA512 406545ae572b331a9cccac4e2d76a3da3308f0464817e98669da91fb8e1b994fdeef3fc9bb5ddc9416f4c93bf4d27a7d113313ff782d486669ab1106a175c813
+DIST genpatches-4.4-134.experimental.tar.xz 87800 BLAKE2B ca88296fd731b4a4bb154d20eb9bdf9083932d550d6dfeb3c51bdf8ca4b13236c5c7c18730560a61f06f35828a15374d1de3d11558092b7078c7dfa567087544 SHA512 a313b0bed1e4421041e6e08becd90e7e195085e9cbc9bd39fca009d5fd9df5d4defe1212d76b375ec9b47a716c7693519ec521c9412b7ccc30503d0c013f505d
+DIST genpatches-4.4-134.extras.tar.xz 16472 BLAKE2B e825cd43b179185674785520817d648afa602c6024f2d601278b3e66ae833cdd59176b28396b93c0d5e7f20159e81c630914ac1a6c1f85ff85be8fe198e50b8b SHA512 2a3f3117de7e7dca7dcf7c07462fc90aeef1e214c293796c975d80e2efd29988df6c1b381c10ee3b2629dc90bd004a720a8c8ee88ea7e52635abdc86fed77781
+DIST genpatches-4.4-135.base.tar.xz 2094356 BLAKE2B 528de67cb099ec3b83ef3d9c2609b854534f70ec895c26f62544341a3c70e10fdc54b20306270ebb85ab1ab798ee92a33c4bee77264a07b9ed646e2668364721 SHA512 215619a6baef35a2aabeb0397b2c93d773016801a6d0d68e75a4bdea6724889d6d45b06a4b9f5b5e726bb843db616cf60302b2989ade3a11823c5f9adab0e311
+DIST genpatches-4.4-135.experimental.tar.xz 87764 BLAKE2B 9a9c0a5045da385463ed33efe2a612530f221a4ea6ac409917ba62823eaec7152da46885415189abb7bc845013f908d63cfcb673f93458d699d139a35947aa2d SHA512 0463b1df03d0a5634b2fdfe5b3c63f882998f79c4023469c0f7809512c2d43c2db9679577708b84c1021e9c1963f3ddfb85a57a716df0fe076b8b273c90ef1b8
+DIST genpatches-4.4-135.extras.tar.xz 16452 BLAKE2B 8a94a1480dbebbec3f1cc5b2c0137a4147c838ab0b8c34a864ee78e263b06b97bbb9fc1bbb910bb7bd062a25fa230db9f34e8ae79d6f504f2f0a580ccdc80df5 SHA512 cb93dcdfcce909abef42e0f37207ec604d55666dd77b08180eaea74defb75381b9f2f0a245b343b583eb9c100e8c22f335d1f8e8db69cb5f3283b940a38a9537
+DIST genpatches-4.4-137.base.tar.xz 2148112 BLAKE2B 9f6cd4723ffc4b7e2a78987f240696c7667ba1337280531618263191c91425c447448512aadda79a75d0da980b848adec4679ed77ef67ef509737c65afe5b68a SHA512 e193591131a2616f437889e2724040a7f8576b6c89539f93cb7053ad69929297a72b3b18a2a1693bcd26ae8ad6b48ffe1e727a13778a6b210f1c9adcfb4cb58e
+DIST genpatches-4.4-137.experimental.tar.xz 87760 BLAKE2B 190eca3dfc66b44b5896c7821e4a639e2b849b86d3c553290f09806140ddff2fcdf1ad537a7693eff595bd7798186f3705dc232d8791fea47e6d0df97af924f9 SHA512 e64a8fe4c8c3cdbfbd18561456a70dd6625691a95d012e43851cedcd6c71646565c4e5fd66b5ef7737bfaea25dfacac77cd8de3ba6434aa0bdce9b3c9728580f
+DIST genpatches-4.4-137.extras.tar.xz 16472 BLAKE2B b09b7fb4e380cc78436510ac89c3be366c6909c722ecec457b5a7bfe879ea6b5ad88f0a321d697d8a9bb8e6fb994e167f67387a7982354cd10a1ce9e3210482d SHA512 7078e6124a5f7ab315e4ede82ef154f5deba8d2f85353e9ca7413e044d971b745a04aeb9f91b34c9060f89fe166bbe3113b4e260a278b7c576faa9554cf6f980
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
+DIST genpatches-4.9-100.base.tar.xz 1947152 BLAKE2B 47deb2845a2c19954a02dd31b9882b815ca2a57ed19e3325abb2f514b7be65e4768808dff888bea7617acff5c922e75f71dceaaea3f6447ea7900100ca4d41bd SHA512 dcd34d3746fd72703da8f431fd607a0b83b506c53b7f477e54edb3d84df8d83ad55b3a04f8ced6837d13fde6729a1dc683706b4807840920b683384304caa134
+DIST genpatches-4.9-100.experimental.tar.xz 106400 BLAKE2B 51c7f74f0315335addd6e30e71a74dbe8544cb72af01c201839d049fe0eee12db15a969f685fc1e80273b6bfb2ae4a02b4656f7c3591fe07baafcfa5e6f48b4a SHA512 84448901491703679cc1729669b9cd64926e6c267604a8e454cee4b12a135d8dc5015650322d3420cd6265c72b7ebec92cae5a804695982260d9afa84629c261
+DIST genpatches-4.9-100.extras.tar.xz 17360 BLAKE2B 25046ec8f1813ec5d49c88b6a446fdcf35b9abd0beb0f6469416ba786a1d1459dc5dd126cfc152269e92c8d7512c159413c3f1c50b7832623b32fe8cc9fad455 SHA512 47ae50a491af3f502e261562f924bd95941a993926b86255f9ff5c3f1a9c52af85bf2774dcc6e4a755a0a8e135a802c32de2fe67d7f5ded40ceec6c1876c861d
+DIST genpatches-4.9-101.base.tar.xz 1960904 BLAKE2B 7a3e3d70bc30ea044abf3a3d4dfa88f652b31cdfe1833e0f828a75812d97aba21458a0eb91f39ba62df82596549042822aa31f985f355a84662ba4ff34957d99 SHA512 6f425a4dc0647d0dc5baaa15dc373147f57a2963eefd7a82ea369637b7cf656a39cc52f4bf10e620061fdf9267ae97fdcd67dc3ddd9d6f9846ff998dc1532246
+DIST genpatches-4.9-101.experimental.tar.xz 106412 BLAKE2B ad251024b68eba7cad834a0d7fd269329efb304ea880f32260bb3c3b8b0777f6ef71d490f42006cd10359f810236eb59458f1d77ab2bf1398eacb724ef7b9318 SHA512 69aae2dacf373d598c3f20799368a32d2f47b34784ce1bf6dda88dca9d52e8b7ad93a89694f406ad99d516a16fda6dafe5aaaae518082998b1d8468065f206f0
+DIST genpatches-4.9-101.extras.tar.xz 17348 BLAKE2B c426dc0510474fd2f90ebc0a26b834968f38bba8c8d8a1adfde705106b08f541c24fd49f52713e60428f7ae056bda1382a650ef0792b81a0d4cebf2eed8e8f73 SHA512 2a370e32cd380d069cf4621387dacfb4214fb491237ff096e7ad2cc1f960a7268f0009c2bbd0c29b5b1101b51795a3f895eb39b4420c1b85d742269124f80f48
+DIST genpatches-4.9-102.base.tar.xz 1971300 BLAKE2B 1d0a9bdbabb19e482249668052f06578c791a90b15fd771969e58049f8fd7c029901d78ff4424915f1a7d245a02757f19b3796500b508d8cc7c7ff93fec6fc5c SHA512 002cb87ba93db70f6de6bc0fba42c49b2d3ab69ce9f28f783a161b0c0b60d7235f583b535ec7f9735974decb98206f73a36b8ffbf2521ec524cbf5ccb0793c89
+DIST genpatches-4.9-102.experimental.tar.xz 106380 BLAKE2B 59e2fda5661bcb77a1e60fc6fe9dc8a78476891ea203e2b4ec02389c01e702200bf5dbe8fe1d9bfecdd6ad59fa43d1e20c9738f929949c3442ec301b0a4a27d5 SHA512 0cfe440902f209e9e74bbb424780b19538d05d43388ca6d067633be479c0ba6b459d766617a42282ff53ed25374da469226825f31969ef7c128d2620b69af43e
+DIST genpatches-4.9-102.extras.tar.xz 17356 BLAKE2B d9a05e5b95c7a4c2477f01c7cef7b58697d6dc4d519bec5494fdc946a1a2b6e5a2fd9a0b6155dac84539a0aa6b2dd4583aa9180b19702062567189a460859387 SHA512 3b97bdb3f49676a43f378a95773b38c3650aba89f2d74e55f14762868983254250654ca56368cab41a150b04a32a190d8238a7bb0209196b80202cb2e9ca5040
+DIST genpatches-4.9-103.base.tar.xz 1979040 BLAKE2B 767d35109446a55c229bd3cd7a66beece88557f810b1ed1548d556e21205e2ed50eb5ee3d3aeb21255f5a1f7878ecaa722b3cc2dd0a45f116cb9288f04ae2d2c SHA512 8ccfe558b0ff3fea8765664a5304b67c7e244fbe88990cdb50f82b6e9b88c2abfd865663329458c5455cafc29f62bcfa5e3a6d6557a989af99ea0899a4ebbb92
+DIST genpatches-4.9-103.experimental.tar.xz 106388 BLAKE2B c8a171fda6fd70e17662b779805cc7353303159443fc4031f153bb8acda5c3632aaf331d1720c389b030fbc837d25522c4abbf6cb1858e7023ba292c5373b633 SHA512 db1c60f4c5356cc67e26244af373678fa7b51155c620cb8d62ae966e63e5b2c8320167bae699137135fd2e522337e197d6e2d8c1bf9f736ba5fc0657243218a3
+DIST genpatches-4.9-103.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d24dfd2e866f625deab07f7b72404c351237ac28f8907cb4ef30e5bb88947ef303e1c8c4123acf4c6f899aa66f2ccfab5de41 SHA512 49025fe6fd388ddf72cdb3cbb68f24ae8225d4356459bbb2f8677b90488eb49f27e62591f98f87038f2d17d0355c55bf0c38b8fb94e3929a0619ebf2bccd06e6
+DIST genpatches-4.9-104.base.tar.xz 1988596 BLAKE2B 00e31664c8da68ded4e831c872296319b341690c2640c47e0940b1dad6ac1cf9c78a1a773ea5120605af3f09ccf4a62f544b6e6a5d42562d3a803ccae6617dfd SHA512 13fab296b38eae012ec9e58bb3e29fb5bf3b4afced6156d87e275836d04c9afc1a5c748b45e495d770c665e3e61020893f3ae912d7c014b2891fc56b87f640ab
+DIST genpatches-4.9-104.experimental.tar.xz 106388 BLAKE2B c8a171fda6fd70e17662b779805cc7353303159443fc4031f153bb8acda5c3632aaf331d1720c389b030fbc837d25522c4abbf6cb1858e7023ba292c5373b633 SHA512 db1c60f4c5356cc67e26244af373678fa7b51155c620cb8d62ae966e63e5b2c8320167bae699137135fd2e522337e197d6e2d8c1bf9f736ba5fc0657243218a3
+DIST genpatches-4.9-104.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d24dfd2e866f625deab07f7b72404c351237ac28f8907cb4ef30e5bb88947ef303e1c8c4123acf4c6f899aa66f2ccfab5de41 SHA512 49025fe6fd388ddf72cdb3cbb68f24ae8225d4356459bbb2f8677b90488eb49f27e62591f98f87038f2d17d0355c55bf0c38b8fb94e3929a0619ebf2bccd06e6
+DIST genpatches-4.9-105.base.tar.xz 2008496 BLAKE2B 228c1495c583ca33adee5c13476363b516b6705d1818458ee03d600b00e3e4e57952f8f55a7ffc5c6ced2b2bd9951a3ba2bc34be12981e147e64f8354b5fe3e9 SHA512 86b70fa9f98e6e4e855a5949ebe11d9a9ab15a7f84529173487538e59227f3a75b834aa419397a835b510e99d7b6f91b4c462ec3dfd0cac8e50b1f161a422728
+DIST genpatches-4.9-105.experimental.tar.xz 106388 BLAKE2B 8458f5d7cea973d2085a67d6b715ba20d745ec9bcb7b66c27a8f955a4df1d2badac5fba93b35f0d79eaa0042950e77972ecd9a8396460f0c8dabdb5967f3da0a SHA512 56d1cd213f4084d3976ceb150f2f38baf14794fb4ba3bf2faa730db5a15278e7f2274ebaa0cf6f5d770448bbd683e82981bc9924990e18ad6bb1068b5d523363
+DIST genpatches-4.9-105.extras.tar.xz 17356 BLAKE2B ee7a0b4ac672a9cadaf17899a102859f1df6e91a5974dd993cf157cc4929a5bee4424b0d264b8a0ca760cab30f43c072117a3d043c9bbb0770b762c4c87b4bb8 SHA512 96f5fa4fa4617f291ef59160f575a54ecd9f1134c8f6b5162ee1fb8335ba4cc2b60467e6cd389f8b0df43cef0e10b7b12db1418b315301f8f044a1459017c895
+DIST genpatches-4.9-106.base.tar.xz 2030108 BLAKE2B 05d2d255aaf66c38c5784dca14f290ec00dae931be0842ed68b0cac08e120fcc527d73ae16ab477d73ef0ea5500429db9faf5492d1d9760bdc0e56b932672155 SHA512 ed04925b252878d5c5b5ad91b2cdca3271be6977e9c4de88246848d4ee487bc6ee131c15bf13657f721968f29b9198a579e4b303a8cb0240ea833a85aa77aea5
+DIST genpatches-4.9-106.experimental.tar.xz 106404 BLAKE2B 898ccdfb8fc8aedbc7633cb3239ab449e9467ab42c5a539e51853800eb11d11cc2d0a0ea5c80f1336f468e2fca4906f9eb0e36faf790f6e1aba9ce6fb907894a SHA512 61e3b6d58ab3cbccaec586db1d7f5490214ad4ab4e85bcf48a732a4329bad182cae8bac69e873f03bc309646ebd575fec729aa87da0f7655e817b89099cc1570
+DIST genpatches-4.9-106.extras.tar.xz 17348 BLAKE2B 9375cb4cc0ccd3a31ef41b7a5d9e4298459f8904fb440f6ab72fbed0339ea6127671a389e089d322ee1b296517631d884ee5102cde4b5ea393a5210f3c7eb144 SHA512 2b85991d0a949e5cab489851d836805f363f9a3ed6fa354592a307e97ab6f43a75860787c1be9fec22e4c31b82aebeeea19e6d803319dddb0e9a6d3ed0805a18
+DIST genpatches-4.9-108.base.tar.xz 2109320 BLAKE2B 0b6090a5f84a6aea248f6e1ab784cde6e361deb38332486870625ad73d35e7bbb677d6dba2e423e0d946f0f896c6aca8833d9aa51dad6fcd2a18586ff267aecb SHA512 831ca65141984839bee54a16e66b2f45f7f91197d7413b3c54167cab8e14aa52eb3199e2a39f4000d83ed22b601eebe05acc3503dff35e375e3467207cb04ae7
+DIST genpatches-4.9-108.experimental.tar.xz 106392 BLAKE2B 9372c6e3674c0821afdad18b02ec96433e3d05f966a3258949ab15cce4bcb9318880a2c003a8e2b11e230051dfc4614c14c42a7195d492241f398a0ebf51d32f SHA512 c04f80593307cf95f5042b31cd664bfd67dbdc20bc33357c6ec2da749183e34381c218ca9206beb4e962ac9c1aa3033c22c724717016c82be913d208968890c7
+DIST genpatches-4.9-108.extras.tar.xz 17348 BLAKE2B 2c1b5ebbe4075a645b2f19bc516f41634e270c27294f71d6f44cba8009c8f29b39cff16c1ea59368c03c5e17f737bf2bf5e0917ae2c3fe4a53530f89d52dbe80 SHA512 7b55d30a37b234e9de1fd3d34ea0177d7913fbde1451d5b9232a72c096f5fe218aaefa73169fe3473d2e802e0f8c7785d0e9fa9a501a99b52e6e2fcfc95445c8
+DIST genpatches-4.9-109.base.tar.xz 2163312 BLAKE2B f1c8c90ca875064c1750e749aa1d4fa769f709221a805bbc386e3cd455074a2b71a82b15dfa1ed4ca1752869fbbab64d5064d8d4031dd4fb97efb52472d65bae SHA512 69d4c91b69d4d2c6850efa929411d565ca568ebe722adae62d70aa132a6cb8fbe9a3e1e117c6a5e4c5d43262be5f717bb6b2ee975899375065a5415dd5ffb598
+DIST genpatches-4.9-109.experimental.tar.xz 106388 BLAKE2B af09dd2031127f4dfc4b37a5eddc4e8a095b992f5f393ad25a1f9dbc5c6f594daf3da77c985363df452ded27a66b455292b454792f9704390f2d0fb8b1e4adc6 SHA512 c9e3d8285bc7730156b9529edd0269791e406d2cdf2d4056fe03fd43eedcd391392444160c3e1796ae465fa1f6b90a6ccaab80335f8fc681589f455dc85a05f9
+DIST genpatches-4.9-109.extras.tar.xz 17364 BLAKE2B ef6582471bb173341c240e57ac534913818121b96a0af3f86c4a2d47b675ff45bf3751cd45c9058e8bd4b262f7a21e5c9c42c994a7ceb7c86c10fc87232c1f34 SHA512 7af25cd2d50bdb0c8b838776701b0f9238df877efb728ae8f79855948cdef9dd92f705665afd99f92a0c80f20c7f42c7e8ef2285656c19f8ff853fcff46abdd9
+DIST genpatches-4.9-110.base.tar.xz 2180268 BLAKE2B fe0f707079302189ac484fcb67151216cbfc9c84627db81aaf5db32a5dd371ee1a356379a9592ea86d51a7a7534c117dea4be71706ed8b591bfd60e30ebe0c93 SHA512 0b957de2d1f2d09e69a4850dcb31fe0c12d7ab701479d7b952523c9c2c6c4ea1b8ae1521fd02c18c312cc4399dfc81989f2cb7fac0b3468f1bb9e92cb554a6b4
+DIST genpatches-4.9-110.experimental.tar.xz 106392 BLAKE2B 831759d456c12bcfb433f0eb8e4b90b8f2337741415b3272ff77af8d7bc510cc548287318b6672794ae66f645efedfb37c9dd65333fcf2cdd804bda29bbae4bd SHA512 fae0aad5cee94b79bf7f2b70c4d95704408ac5615056aa590a7eb5586234eb46da2b2eb90c762df84b1d0713b84e6aade1505b8ac24e7cb7a08e158782d2fbed
+DIST genpatches-4.9-110.extras.tar.xz 17352 BLAKE2B c4d6d32fd0e61bfb439a543694bf266bb83e886f69b28d03bd1af12e10dbfb4d822517c15688b0acc4473329035a3b87028b3ba39c52429fa385a2125c27db5f SHA512 5adb32f3970030b7cb9e237070ff38d055e2143237c9198e9c651d80102efa1be48e7ce5de5d9515ae7d1363523c4e6c2774d933812b68f4be72824f31daba45
 DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5
 DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3
 DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e
-DIST genpatches-4.9-69.base.tar.xz 1274148 BLAKE2B 732076c76dc8c5077ea804065c86e3c384004b484d661c60a5534964fe94a07ea86e6cec9e47d1484ace04a22123f88ac9a511e90998da948869c266f3b2c3be SHA512 5db83495c9b9757822df7a3733a29cb897163ce51bbb143fdfd31d42f9e5fab73dcd5c4ef18fa0c502838359ad3d9b9c9de625041042119df46f68d847eb26e6
-DIST genpatches-4.9-69.experimental.tar.xz 106392 BLAKE2B a8025d5b3c4a86240beaca7237f8876d9690a6029dfbed72ad86b4e64ae69103717b034d3071a13d70e966ded9bd5847f40c9a81003380b0e0c6530dc0f404a6 SHA512 b91c383adb79de67fca53d4c729cd449973544d5d0c9c03cbd4fb2eeab37db4c018d460e15c985a8bd63ce6294dad160ad44dd9cfaf860a35e911b4a31594291
-DIST genpatches-4.9-69.extras.tar.xz 17352 BLAKE2B e9a8c063812acf2155ebd6241e6061ab40328194c3a158feb8e53d4dc464b011184892ad8a0f240ef8cd8e5e1569981999fc46fda9d23b8e8ce9e1a05d8a7109 SHA512 5d48f1dc65bd352fe77793f3e8f5b3f689582aaa649a423b62ffc4d4e84113d6cb305d60bc09d37c191c46daf85e5021b27b4c7097b10a7df0aa5335d5e8116c
-DIST genpatches-4.9-70.base.tar.xz 1296720 BLAKE2B 77d1f7205ecf185b1ba438737d5601b178c2bf7a7abb495eba32b96cc0431827ae7a4c3a8b2a5a694c72e266fbb9a403b1be910c161c0f07c575ddc010edcda6 SHA512 5359503b833430531a75e6a67d841031d1275034db9cc885180eea6569bd5ac52325fde6a650902f988850b87ee2e184b9449020ad197278814cad75e38a490e
-DIST genpatches-4.9-70.experimental.tar.xz 106392 BLAKE2B 8fa9653f9bdec9a2104730fad3e2d7133da1ff08d8469c79386fd133e3de46a5562d4efa9087f4e7202143357d8f0fe777a1ed04e8267939f9eecdb333298f27 SHA512 fe319fb330fdde6c172df864b9ffcfe3b7449d31b66af7a739dbd6f1f721a64e94c450af077594e208d5c52cd0fe9bd60f320b73898c2e5c21ae2b0ab97cf1bc
-DIST genpatches-4.9-70.extras.tar.xz 17352 BLAKE2B e466ca37103e8ed9eef13095b939a2adb0827da183bfdb866e3fd6b99f8821dbe77fdf0e64f597d1c09c9e916825a1563211c5620af2ce9aa383c64ac4e1bd4c SHA512 9bfbc48de9c0b460429fe51de7122b7961907bcb66d7acd7a1e93a2bc29960e824737bac3fed8193758f50a0f6f5b540ef58a8364bb7948e0103f64bb950c8a4
-DIST genpatches-4.9-71.base.tar.xz 1324744 BLAKE2B 7a47aa8381c09f3f0a6898576c7338db56056c564f63e62e5c0e5d2dead50df94d3735b388913b68fef04365d459488621db18eaac3f5fe3d3ad02624644486f SHA512 fa80e013125dfbea5fb5d3a6fd907110001c08d8e521b0491a17c9f0496f1e37b7c7d0272115648212e530b639807845d52212bf64dc8db38b1d74381066ba8a
-DIST genpatches-4.9-71.experimental.tar.xz 106376 BLAKE2B 12c185207671d701640a1850ca77c851404ff71028a37af6da30c04dbe3b12553626ed04518f83b97545afd144bc0808b3de9f34eac29fb108720e3e27e1b4ca SHA512 d7036273e39b14bdcb843332630ec6ff3360bd3f402ed724fafd1ec424b846ca30ff6e7c2e99bcbf5c53c65f19de92641d4acf0d1553e04eef8a8c39fc25209f
-DIST genpatches-4.9-71.extras.tar.xz 17356 BLAKE2B 7459d34097707897e114b58b3402d4ba7603156deb7fd3444e1ae777a38a821a743b9267405b738b2af9421702e2a46a5927ce39c700950e9940e69f0dcef010 SHA512 572cbf8b83b2a43e8a49b7316495dbb027a14bdc74febba9629026e31ebaf0496b48104212f694be3cd1a37a28290da6564dfcac711db1d4ba84b7ab78d3123a
-DIST genpatches-4.9-72.base.tar.xz 1331880 BLAKE2B 95633d5edfbb0d0a4a540baf57d65903dec6ea59bd65b3b79f5421954d1c771ad7e6ca83c6bd753f5f6bb2d89f964c1e67e1dd118336e6a39e25d35ed26e75d7 SHA512 38ebf8069d2a519f477e2f91a3fdef24379684b82235a4002547b4958cb267442a669638a71bbd6c6fdfc70198cfd7922319be310cb5978d566a4b653643575a
-DIST genpatches-4.9-72.experimental.tar.xz 106384 BLAKE2B a4e4b637d9441ba3dfa32716453579dec282c959ff895cfd94cb541bf4d2f70755e4da4e0e453c367fed6388d5ecd71371702fdccdde9c198ad758aaed2ab0e8 SHA512 5aef8acd3de7054afec6efd4ee13fcc048a9b5efeaf70b377b07fb728bb4c09e274cf74ed3eae131ecab3c0c22b6b4539a3ff2df97d18c29468313aa9e6f0910
-DIST genpatches-4.9-72.extras.tar.xz 17344 BLAKE2B da29beb376baef01ffe18c4e0ce88bab6dba8b977f0c04dddfa6dc8e94831fcf72be9e09019b6687da1a7aeaf2c2e010412c9131f2a4d169e6c6cb06c8bcc3c3 SHA512 46bc8c28c18fd5dd1b8a4a609cc091532e17630088e763803c2a8a9e7241762a83f02cc8e2b044acc744403a4d9cf99a5d6f727a27aad41cad469b2f2cfc2a32
-DIST genpatches-4.9-73.base.tar.xz 1369316 BLAKE2B 560d5dfad44d2bf041d0e20c2861347f47143f745c2c8fbf0cf0db2bce2993f0a3492908d0a336b7e65b3cb7084dea3364b8829a5f45b99137dd480f8ad23c2b SHA512 24fd027c502a0a19dc33b17e4f4a6e1f0709fbb1ebd29996d4387d145b5781d39bc70fa9afa1b5d26ff100c68ce8582d3ecdcd3f7e7c173db7ec0dcd93dc38ac
-DIST genpatches-4.9-73.experimental.tar.xz 106400 BLAKE2B 6ea352ae9e15d68bfd9c6c63434a66ffc8fcf25d79d9425f199eb03725f5b7ece0f16be4f92290d84430d177ee12e6569dc4d6ca67e61d7516a68ae5f0962682 SHA512 44245727c6dfc6515787f079b0c7270249ae306aea6db4a238f3d78392366bb38798f39c24f070b1658272a3d32a5c0573b36142c4cc167ff461b551b05b3f30
-DIST genpatches-4.9-73.extras.tar.xz 17356 BLAKE2B a16dbd34ef4d3d50c37056177689603c2200447438c1a6a29582e70ec280f35f0e1e001e0aec991450a044bafd75e905a3cc07e3a003a7316903c0f04cf67c24 SHA512 1bf27b21a2fed42bfb11618b753b4fca15e38986343ea62db4511d9ebfe6d3fb0bc0bdc1a45ae385141b7a040dfac585f9b82aa0da4b1f4c5a828ae3d241c81d
 DIST genpatches-4.9-74.base.tar.xz 1393624 BLAKE2B 988c985f1c0e6f70d0b4307e42ee0f153a6a287066bd52e8238cffea2b73ab34e2dd65bb2fd923211fd09566b62020a71cb62be1320a6c9a04d5f4e425931725 SHA512 d128939df8670a5140f497521813d5b220ef618d342d94576d2f287df08fca0cae0a4104884202b993e747c5085742f0d7d5ecff39b5f502911efb2d580ce8fd
 DIST genpatches-4.9-74.experimental.tar.xz 106368 BLAKE2B 790d7e4b6f3fbded41a486c623a4b18d47a6598b19e12eaa170c68607a258363485f236009d4032d4d2c17ced519c78ee2d246fd357e4d692aceddd936e3e232 SHA512 68a17e9457b4ec6e089e86db8f1ac129d9394bc07a54e63d230e709dc7c542c99cd3190206b3e2b921799ea64d2fd1076b2178515cd2532b8be9f04e93abb237
 DIST genpatches-4.9-74.extras.tar.xz 17356 BLAKE2B b0c02db68443f53360e0b0cd611af39386c87054b3668c5e3231df6595d1d82b4a767fac65ffaef6f7d29b29447411a2dd70e0dd1f8666a69b9360ea93e3a3cf SHA512 19cef8790311e3b54258df25f9accffec42db2654b82a39f1dde9a154cc0e0789783ea11bb9bb4e4b1b7a3f902bce65ff7898c516993aa9de8e0efc5f3e07b1d
-DIST genpatches-4.9-75.base.tar.xz 1398252 BLAKE2B 045e19c482aad1b7d840feb7e851509ec90f53be9152b31fe4e37cc2ea36d6253435dc394d9313fa832c2676a24ec856ebe3307c7de0134f07f9e60564081798 SHA512 ea1fd01d66de7c2712dfe80e3e5bfb796aa8765c20345b19ccb9d366aa254425cee0547565613b419d3f3f50234a3a8b67b2b8e6a3b875028b8521ac896f5639
-DIST genpatches-4.9-75.experimental.tar.xz 106412 BLAKE2B bf566e48086dd834d2b2ccbbf026072cc422f27b2d157c31c53708b725601a4a4b826aed5c61d4f038d200c31707f83f865905d7e692fc76837c49dfe7c9fa90 SHA512 b84fbca86d3ded460aaa24ee9c7aa71d09a1a2c4d6f90bbfab83a9b9f71e670ca61cc710a67497a731bada2a75b864f2b95c76670f82f29591d0e399fa06b0ab
-DIST genpatches-4.9-75.extras.tar.xz 17344 BLAKE2B 747276412345bffd763a88d9c77de3fafeab320e0474595213daf71dcdb88da2d78cdfa50469eed149f3d181496b07bf87b0981961cf12cd8aba24cb1e998163 SHA512 d2829fb8643e16e7a9a021e9430f19195e0a60f088351738f39140c7a685557ab99647f31f5106e841e1310de24c4ee4b534e476f862684822a005500e172242
-DIST genpatches-4.9-76.base.tar.xz 1416656 BLAKE2B ff07be80dfac7f2c8a51e525bdda14f95afcdd93dde5a455f771c9a664a8023577e5f52343401420afc963e0d26c97dfe23cefd53517865e542f9d78d2e70471 SHA512 fea0bc6766c95d97bc4d1360d9eb3afbd6ead6c8bb6e6fb8c937117587b87b7a82c983273d026e8ecf99aa816b1ab9af742d551cc12fca055b0f032b3ee3ea8a
-DIST genpatches-4.9-76.experimental.tar.xz 106408 BLAKE2B 63dddb61ccb331b0cb7496815bc2e22eb98141092a61a4a37eb560477579e4336f621cfa7f6c3bf82ab240736328722ec9c5d6e3a4c336943652a3d2e0f6cd4a SHA512 fcf6ed5797a607bfd9b90fb442f8cd10d335ecdc024a151a3eb33b235a3864a15b589aa143e2bc7a54d8c0983bdf8e6ce1051badc1a7bb74de15b203380d774f
-DIST genpatches-4.9-76.extras.tar.xz 17364 BLAKE2B d77fda48564a1993a34ba6f833b88aeb3c8f7becf68bf6445bb52f0897c97a52e265067ef1fe38b993013420ad3c36833ef44e4fa842653a7473b4e9db499e36 SHA512 7acb497609ae96e9f87d14789037b15165210983d674d1b2306573c268ec67d72f066e19df48047c3b390cd84f69ea4e0c66bad78295f37a147cf7cb0059ba42
-DIST genpatches-4.9-77.base.tar.xz 1434412 BLAKE2B e12fa3e83ba930cc969f37ca74d078e8e34e1da777ac749d31e690b8f949cc854f1dd46d347c929717f22f95f517e84ac67fd682fcca29d47722ecdbc4ec37d4 SHA512 5a6b5b8d16c49a1f3068581e1bfb31ce926ae21d34182da7d8bb50fc5d1bad82aa921bb69eac86c3932cf7b4db195181a4e1a29d5c3b347ba49d171c550e30c1
-DIST genpatches-4.9-77.experimental.tar.xz 106384 BLAKE2B d549d7c735f6b509a199388017e4354257e27e1f65c3fed7d1aed0144abd2d81c726e5539af4a48d3cfd55bba0bfa0c93e5c630e244bfd713ca76bcf56944bf1 SHA512 0a6319be130c2122df871a0af43424f9640998099fe184562d58fb940849658f5b5eab1221be99d8d788b5950f1e0e2c19200b90778c5989814ca63dd5ffbf85
-DIST genpatches-4.9-77.extras.tar.xz 17364 BLAKE2B c666be38c1f3dc02cc87324a603598e62ceebb3feffe2e7a9b8e368ac933b982eedf385a87618ba4cdaff8eec85ddc8a4d1c76f984d3bcc6233ed88d3a141723 SHA512 c8df8e4c563a0add6ffa241978dd866102684055ee2b5bd9ba37f5f41f04b687e9b0fbd7cec9c6b365de84fb2c083b5c2ec210bd9b7348e972735cd071be652a
-DIST genpatches-4.9-78.base.tar.xz 1439100 BLAKE2B 83246625ab36915073ebfadc2f65fc8342c26a6cc63e4bb747d89d7effec7ffbdf732b306164365416c19d199e46d1f46d40325ece781150cfa71b3b1afa9d9a SHA512 51e9a9bab5ee92ebc5d3cd3028e2110b6e7a74b337d82c12dd8e0da06775cc0f986f1e6d49738dae5e1d9add374017b19c040ddd8298d281714a6544782001d6
-DIST genpatches-4.9-78.experimental.tar.xz 106396 BLAKE2B 64171f3f73be138e3e3270d90cfec2b59312868ff67f81db06d45456307d5efa72aa0e81d0908fe66f32ccc53de8f09b330fdba1f8790a4cdc7132f3ceeba40a SHA512 6f2d60ef1055036ccfdf2caff3eff3c0abd5d6481ef44ee6ff369748546b88cd849ad46ec8b33503e756ff2782829221dfb3abe7ac1dc56f44742cc0c0a90489
-DIST genpatches-4.9-78.extras.tar.xz 17344 BLAKE2B 846c60bc299c4617ce28b4e6b122d42f55d1ac0b73a692902453c0fb6149cda70fd5d62516a2c422cf6415f6c82ff2bb47e1abbb18bcf933132f37657498bdf8 SHA512 ad46777bee10b787100cfa5a66beff302832828db2e8cc144d9d544485e0f4e3ff66827d8ee7541d96b8b7499a508f14e62824c868033b986a641e3f414bfd3b
 DIST genpatches-4.9-79.base.tar.xz 1439664 BLAKE2B 2b4b32c798e2080e0e730c408cbae7fde31a89e59ae9291ade87d797da28173ca563fbf9306b3d4b575db11bc5eef26ab8590275802f6c925141c92a377f331b SHA512 359f6bb0e079d3ac905b682ebef7991e446c6fa0b6a88ef8422d950525a791c4055b529d154c16409cae484209a4d71283c93810f1afd01d2ac06fc20199067f
 DIST genpatches-4.9-79.experimental.tar.xz 106344 BLAKE2B e7e874e9a738f4cc1ad68c81a201e77fd8658db65788037bfbb8bb097f2f96434fc6d49b694ba607173457d3c865a212118eeb16c5188c26e31ef9c10043b20b SHA512 0d0b5da7c66a0bbf997940f91c87b7d033b8a88621d3448dfe39c7c2cf6c8483d6178b1cff499463f803e53391eb53e8dd3ee3f3008b9509e3d8f3643ab400b4
 DIST genpatches-4.9-79.extras.tar.xz 17352 BLAKE2B c194973419a011d035ccd6c5d98a90d04c2c2242f18dc950536a7dc9f505de7416047fb0893787f17023951aea59f21062d3f5a3a0d2ad3eab5127dbfb46df9c SHA512 27ff88dae9a66784d842410b0e3f02c66d748dab63fe391701624d4ca398c824819c7a9fa2dd474e62fd29bf7d8576ae4162c53b3127bccbe30a1657a2760ad2
-DIST genpatches-4.9-80.base.tar.xz 1472296 BLAKE2B 3d5a961e2b84d71df250078e223ebe7a7c3cd05093d22219813454664d3c7bd85fb332d26c0d212144a6d50607256ce4e739f35faf935b323d533de452e46ca5 SHA512 9e7b5418ffbe7515573381d054accb89fd5bef83748b21ac1cd5f2352dbbeb1f55c606eec45174ed093289098420d9c1f780b182be1650f4963499cce310e3e7
-DIST genpatches-4.9-80.experimental.tar.xz 106456 BLAKE2B 4399562800f6224722105166d24075fb53237b6eab5728b20ff368fa6080ee1d8f6845b5835adec64d5a3583bdf063e8970ff1c9f61b989de474ece88fa9d318 SHA512 03fca9e1bfbf504bc3b42cac4626701aefb36f1f8f0a10d5b7f428aa1244030f50ffc6e24101afc1a6c16d741eb56f44d33c6a2293910a13c97a97f7fb061650
-DIST genpatches-4.9-80.extras.tar.xz 17352 BLAKE2B 8e3043af0e0ccddb209bcce022cd5ddb4ca681b4c0dbdd6a3fb8767b6154ba716fadc137059a845f93a20dcfdb35b3520e6fe67a6fbf5d9018ff1d72368a2358 SHA512 5049f111e3a5ed50f150ab9e257df362f91758424f151ef4ca86c69d6382231b4b2d31262bb331dbe99e4f7c8fe8eede134f0e6dec7e13fbdedfe504f9f73488
-DIST genpatches-4.9-81.base.tar.xz 1485156 BLAKE2B 552c163be8839e6d8cf086a11b8ec8e4ea7fa89ac420c51df02fd52dcfd91008698389282b7d4f4a631ed66c30428d1c37f7ce63d0906734ee04f9a9817c4d97 SHA512 45890146343db03df4fbb51d2121a86be4c7904999d037e4852346f5db7ce5f9daa4e3fda405f21dc6df3dea8a4d3d295416162afd27344454d2022f9804872b
-DIST genpatches-4.9-81.experimental.tar.xz 106400 BLAKE2B 5b542d87b2e47c6ec666756295472aa03c8ef3a1adb28a6433c0b74ee24c32321a0980736390dbe264b2046cfaf4b04499ef940714e3ddc1fd82add51ae6fccc SHA512 e19b574b87de3735bcc03aa89e83b285913e701788ba9baed27a3a86bac119b554a65995b46f78a445767daabc269bc61b3f76880071adb3a36630f2295b795c
-DIST genpatches-4.9-81.extras.tar.xz 17356 BLAKE2B 3e26281722b92a9720a04bdc35910e558adfdb2094f908174a209d04b50fd4859bc60a6fc19b808ae85f103d7961183e74f2cc9419140a9683e78692dc040962 SHA512 37fe1b24e66825c1b63e5f78ec798dfd3350690250ba356a4c0abd3f395bdeb97604c94f90ba3934a9303adf6e983ce0739ee58dece40f1db9790ab900755ff0
-DIST genpatches-4.9-82.base.tar.xz 1500228 BLAKE2B a00811475170bf38c5d7b47d333bcda666d292e9ce9ea98331def2b34da2cdaa996e83742eae48beb59d358ea728b839cbfd0e2c44bfae95c45a960d6070a84b SHA512 529345d0d47b0965768f1575174a4666739f5ded0f5387eebcb414e263e3a4c296e6ba2d3b9323ff71a7e269973b525d1fd9bfc29d413c470bbe6e45b7c83beb
-DIST genpatches-4.9-82.experimental.tar.xz 106392 BLAKE2B e732422fa294c6c4f2c41b4e75a3b4242bfc1ae2a5d3163de3b67120d09deb8d5a517f1fc02f3b77e79434e6e53fc1dd4261aac3183b0e786eff66408157c835 SHA512 ac3d6cbcfb08b839cb1333d144df4e34478ae60443e00a7bb6a34efbf1464f366f2c6ac271fdf82268234c2272e0454421a1c3a360f9160695a724ff6b0b9166
-DIST genpatches-4.9-82.extras.tar.xz 17356 BLAKE2B ed2439bfe88bce646e5b70ea03cb340910f70b9a17dcfe15921dcd53018de7358c9acd304ff83bf2894abf7a57bbb91a6c9f474f3b4e44d1094dd5e0bad2d6b6 SHA512 5d315412d6cb9e4f0c5fcf3025900002294a52da40c6c773f632d2cf581bc2af7dec487f5e883b142b46a6ecdd6171777b787f511bbaf33047d4b512fa376585
-DIST genpatches-4.9-83.base.tar.xz 1517252 BLAKE2B 880a6c5c38583e027bf8ce6efd5d24c16f411d675e8d269406bdbf7196b540baafe7ea4e17d9c0fb3ab75605103059265fc6ae02d9bf7871468cd5bef7856c38 SHA512 010c2a7969207abd4c7b462fa2f9e7796e0c5f261f41064b03fd82593d00cb33db3e6b9bc2eda1dc6bab37ef4d979513545ca434c3725d71b2156c4ad5faa50e
-DIST genpatches-4.9-83.experimental.tar.xz 106424 BLAKE2B 1255fe2d88222acd77366fe580bca9e80fc30ce4bf10de846172efdb011d7f4391eafd32a23b550e95afc14a3fb222192f0112459a1acb148c4c82bf7449f2ec SHA512 1d84ab93028e0150698c8986890c0d1e06ddbbc0cb84b31a5a03130f5580e4253c78600caf20cf8c3d2bd28aa928e7c67d3c0329403ddc5b62388f3932bdeda2
-DIST genpatches-4.9-83.extras.tar.xz 17364 BLAKE2B 127ce0405586999eb9c7013931389704067302da2b2544a95993cb4ece57324878f6037b9a7f87622a4ec5a9b14dc7133511ec9a66298482cfe9fe27850fdfd2 SHA512 578e6ffd62d76451b72c1443410dbb805f57056b970943d7c055b4c7beedc7007f835cace28b6b54101649eca7fff135a62dd01ffc65f738f781e52a6a579989
-DIST genpatches-4.9-84.base.tar.xz 1548496 BLAKE2B 60668544f3cadcc6b51dc42107c66b4971b215a8ce4c5017b3c660a23b38a1db8b6dec4914346f57b7bd44dfda4571e1578ba8a1a503b91a6d76b739b593ec44 SHA512 0c341a567f178b1bf09151a50d0e90c96644cf157ea167decd22508ab2f6a0f1cc044e045913088ed4fe728fef0b14c32c88df65e32cce81b5f669a38e1bde10
-DIST genpatches-4.9-84.experimental.tar.xz 106424 BLAKE2B 3914158d90da1bc285cf3cee219358d69a128fd7a277b565f81e81e65cef5f4593cbbce5aeeebe11870687d825aedccae489e5f7905f754a746c5e9804b4193d SHA512 c0c3ba0b3894d45ceebfde64f67ff5c7455c83ff72bce1421521fdecf4282ca16e2a159c8ce1d3f930c405e093b519f0ace9a61c15b71818576006a88a6d0218
-DIST genpatches-4.9-84.extras.tar.xz 17356 BLAKE2B 91a7c0e374e9ff9b18a1f290e4d017c642d9150681aa55ca1938e47f0ad0fdb09f1ccb2833e26ab3f71a04417b2bb5342aa082a5fa1cebbb5d3d30d208492b94 SHA512 9e49213b1fe3fc9e07c744178be9b92de2db9eef7b3c41b1a32d6d5a111aa4111f59c448f02573a004f81de1b538c5a688424e6d0ec118f6fac94787c9d2ab2d
-DIST genpatches-4.9-85.base.tar.xz 1570340 BLAKE2B fc4b5b181943a4492bcd47bead04b648d64465b6085f8785a72bcce937325428abebac6dc9329e3ca59c91fc4722cc856cb6fae29c4320a9b6eb86965c2dc2b2 SHA512 f5ee1f8f067558ac9ddf576b98103f1201a32a17ca48767dee66815ae0fadd5079d5fd33970e9d887f80c5349569cd6f96a18e666da361d69c59ccc3d53fb37d
-DIST genpatches-4.9-85.experimental.tar.xz 106388 BLAKE2B 826ba297b6c37887ec5223209a4567793678b1fdf6d2e433a6b350f27fe64710a3640185fcb8353a5f3adcbd2839f5553edd54a2d16427dc137be3f3c691e039 SHA512 b9eef13a61a249552fdac9a3a78493d0357536c4ba0f1e021f250633f335478a732702f3718224288ba957763b7d89482b86005ee33ae53732dc5d2a4515695f
-DIST genpatches-4.9-85.extras.tar.xz 17356 BLAKE2B a4b6b8b342f2695d0014e212141171bd58fb41721dac450ff2ad8cbef4ef4e9a322d50bd3da87fab7b277b96cdbcf6b592d548cbb948ead3bde041e465b957c9 SHA512 5907330084d47fbea3df39e60463efba8995757a5ce3b952e9606fac82d93c3aedf9806277e6f5b9ff8dd1c21ba1ad5e4de53bed786bc05e6616daddba1c66e2
-DIST genpatches-4.9-86.base.tar.xz 1591564 BLAKE2B 9e65632f62a5cf875109f9c0e83c590c471656c86eb518965e31cab37f00a7093a4b1da89a87eb69048dfdf1732e2832438db75136961f9a2c6331440f113ded SHA512 da3468ee91757fb2104b12713dcecb80d3149fd28cedeb20d999ec43d103c367a7d1d8bc5f25fc384dcb7088d7ca8b68196b66edc90b89f960907333bb74ef83
-DIST genpatches-4.9-86.experimental.tar.xz 106388 BLAKE2B b1c9e761a5b135b4960720a08ca0c12b8c79e9f36794e6cf848a0336a41e1d20d1c80302a62e92e2b99181414ce1a792e73d24ac1e71b76bdfd7aab2b520492a SHA512 240a08452c7f1fd355b2ee216468c32eacca278f6e465b615165f206f777c5fa54c33eb41524e545c39c58f31367015391b7a4f1200895649bc12e728d80b121
-DIST genpatches-4.9-86.extras.tar.xz 17356 BLAKE2B 7067424ac4973ef8f366dd3db673f819b129c5153cffce4a729157fb0a89f6f9c0820444ebf68a1496b7d76558a9e25a80712d37edfd8bf50e06bd15a665200f SHA512 9df11f5a48174df1d08ff719ccd979a0367ee744d0df06dcfdb5d9674f97a12a7e3125349dd1ad79d7c9114f83005090c3678248b18049a47bb3a4b019d48857
-DIST genpatches-4.9-87.base.tar.xz 1625392 BLAKE2B fde376e07c13041e750e8a735c1ef53c037e24754f6d9ee51dcd03c6d6933f2cc42fd884be374d457ba6b1a4ff23208ae7f7c47e63df6528f473c0096ecc5808 SHA512 81f3151b7c34b49a0ce706f67006a68fd1b072592b684adcf79c612c8f3733109bf551e048024c0ada5400b143f99b8f65ec46a0299cdad34337f29b2038e511
-DIST genpatches-4.9-87.experimental.tar.xz 106440 BLAKE2B 287fbe6a213f9685769ebf6468b932c0cf2532acb17cd71abd5a89e0692e717adb58852bd5fe1123db839702a3329647e995b4adfd453843cda8f5f2ee761442 SHA512 944ef5dc4b13340935a0ec7e0e10ed4bf5fb5b399e7ba23b15a5dd552376750020dfec16cad05f38c4af66ae27d67212773a4220deecd883133fd68a5e55d772
-DIST genpatches-4.9-87.extras.tar.xz 17352 BLAKE2B 671b4dd2905585f9a05120520db4aafb71bc5f05ce4baf9714f444236efd7206af0bebfa70e59d5f4fdf11846b315d7184e2c1ae4e8aec9d4fa569ab720ced52 SHA512 96547f3df68212058559b1c59ba17a2ff0f51a0c7792c23d0b18e85bc1724024e1cb5bda3f5d6933da825d1fe7cad5371c6bb356ad53a587aa6cc66572576b8e
 DIST genpatches-4.9-88.base.tar.xz 1635784 BLAKE2B 984b572eda6e5e529b572e184b4f0a37b6d9f919c4711f5f73a89a8214ab2671bd4ab495e16dfd77e802692e769901865075779cf404f359be14921b0f5e65af SHA512 9041d8fffb4e4242aba90472c2469ced6c71b2ab51c135ae2dfc8bb48e5f56cf7dae9405445282db40dd0ddeb4d8c5ac615d00972ce16550084443964c33260a
 DIST genpatches-4.9-88.experimental.tar.xz 106372 BLAKE2B bece20f11e36c6aa3d40e82a411515aaa71ad00910dc73bbc303b3875d18de664e1b9daca434359f1ad0efdb4500b362d208f5161df4e5846955c671f2dc2d7b SHA512 85210e31c24cb1380ca9c55c63838857808ed57f35982231d0d584e1dc8827008087a51b8ce23c3f947f94085d85a00e822a6cd42e3fee70ad4630e264d7b4b5
 DIST genpatches-4.9-88.extras.tar.xz 17360 BLAKE2B 00e0aeb808a94997964f266f4518b97163f5f25948940ac15a0f77c3a53e8b8ea60361071b332ae095c96957736c1640034ae51a07fdecddbd73d6678ad61897 SHA512 758ca092dc266278b68dedeafe98831961a0eb0beb89f8ffd9dd398b38808cd0d26d0f7c527dcaa4d6fd3bdd33838d37d057fc2a88a3a77723158bcfcbda57cb
-DIST genpatches-4.9-89.base.tar.xz 1646644 BLAKE2B fe6f25fa225bdf40147cad94805cbaa816f3e6d18cac674716c5b47f42e8125b00c421ada6876ede3cabe598903d70b70d7cd966ea08fecddf3f05812d52edd6 SHA512 ea6d1d81cdf91a94660cad88606970429dbcd1635a6f77b17fe2033edba4827c22212461f9e681b3a88e0f32020bfdd94c72d43aa04b31d81fc70e2d91c5ead9
-DIST genpatches-4.9-89.experimental.tar.xz 106376 BLAKE2B 46bc3138012006fa09724def4a4d64ac74c782a9eb101a741f9b8c429f35ada95b3c9bd704cc48f7a839e22d40dc8b0293ed497421754f5cd900951741745403 SHA512 44b107ea8f8f58444bfff322adabcff2526c8e4455193b00357e43ee3d4b4a88e7df9c40bede32b3742672617919f98098b2603d3a60f69fb484558283fb02b6
-DIST genpatches-4.9-89.extras.tar.xz 17352 BLAKE2B 492b2c9d3b5865b15e6be00e419d7c656be507ca65cf7943da3fc0f6076d4f70d062a9e2a31403d5e6486c9fa73326dc8de522887d581ba017b6284e5dbc1981 SHA512 cec57e60b99d80066a1c9a120f680b6edd33736417491bf3181b824725df50c1a1252ae1a339d32a38f18d38bcd04264ff9f70bea9093c814e3f5809e7c8eafd
-DIST genpatches-4.9-90.base.tar.xz 1660088 BLAKE2B f8149c631938301b133ec97ac2ce6342c4eec8214b362a775fc6adb4f5d7baf67ff07bb94a6de4089deecdd57dbedc47a7ba94be2d02d2ef943f6ce44fa46a6c SHA512 720b45fed5d5f8374947789495086115bca9d0459ea3af7455555da567000a3de02562b9566f571b0251baab3cadda36372dad1357d7d8a198cd5bd95a304f56
-DIST genpatches-4.9-90.experimental.tar.xz 106404 BLAKE2B cdb2003891ad215d84c770638ab21f1ab343ec594744f3b69a129318b7766e88452dd98bdfc9d9d716f4b1301c861354da6b4fcb9ce70f22a72cdd0769fc5281 SHA512 ab83178e9fac2ad3118ce7d08c37024f7452a113bcc98b783d038e4b31cc1773e93ff3e9d730a62ffd22db5a6c3ce9708d63acf55ea4fbc61ddccb5e70731248
-DIST genpatches-4.9-90.extras.tar.xz 17356 BLAKE2B f55389b1a34c0cc5e90d534130dfd502117edcc43e1d00e2a359f173fa7be613dd8bafe6d9922ea22652fe43e40803d86e9f103df6453a32a0e2862d3c546792 SHA512 04b6ef6224bf37e908efbc6ac2a6b12f20306b69ea87380da6a5858752c4409e49ae07cb334ebe18ecbc2ad46a9e1f7b480b2ca07f7ba5fdae5f4a99b7562996
-DIST genpatches-4.9-91.base.tar.xz 1680432 BLAKE2B b064368d0950708ba7e0ce80b272e1084c86e4699518affd02c95ed32ec1edbb60f79bd8f312f2c6c29f946a4febe7191b800f25a6bfb81a1bdd43829bbdf93e SHA512 84c0e5bce96d1c1579c93f2113b0e70fab7a288d547c52cbce828c17be2a6dc6cf0e8153e1d1a1ea1cbed12d71d965ed4a25387c48ff74db58e493cbc1b44575
-DIST genpatches-4.9-91.experimental.tar.xz 106388 BLAKE2B 8cbe9c141a9b83b51e22ec6554be31130ae8cc24e21ffaf4ba90ed7a961df547dd6c7108c06330cbf7bd5b43fb03b5af02bbe7ad15cbe8b2d248f4b8c6bc2247 SHA512 c83a8605d1907970ef24458e9269ca616535470db3933de5a1c2d33658be199e78a7dd94abe44e36236761065b037ddfcce66a2943a429f2ed941916144f7a75
-DIST genpatches-4.9-91.extras.tar.xz 17352 BLAKE2B cebd73ce2ff0719364f33fdc2a57a7c0cd852a6d0c69fa167db1c91e4e3026e9b54c6e5174facc26defd3dc790cb2dfda1a10ca3cf4fe9d352eb57e9d62f23cb SHA512 a9383a591c30ad47ab4515a5756650f05786d791f6cdf45fd266b6bedd4a66a2e2bba3e85c49a7b56c0d8537fd464aabe5218ec7f9419d2a6fff8ef13a6c1459
-DIST genpatches-4.9-92.base.tar.xz 1730124 BLAKE2B 5780324beff88240c8b40594dfb9acd8e922d3985f4242eec60c7111e3e23b36016a47990867e98b2fabfa8f698bd29749e9ca8a9062875edce50638d99fec92 SHA512 97a4b956d0d6e561ebdfcd665fb61ecd73c9958d0128a0696cbe8e0a4f89def8cacfd6fe1a799bf24a6a0aa5181c7456813d82410904c649b876bba9ba1180b2
-DIST genpatches-4.9-92.experimental.tar.xz 106364 BLAKE2B 5339624160c3d7f7dc32c39dcce00a575f24a1ade8140462f8cf7b369f5c584e1845741b483d79a2fe25c405b4b5d486059fdeb39df2ec8c13e1d0e47d37732e SHA512 f872f13319637634cc25d4d68697dcf865ff10ae284413238545a9ceadcd5868750d34ae32d3bb850d3d0547430edd8d6f01efcea5756420d148db6daa1523f1
-DIST genpatches-4.9-92.extras.tar.xz 17356 BLAKE2B b423959ebbe6193dc78214df91ab821f74cc258421891c3bf7d5ddb1fc1e125e5c185ac12d70ea2b0199115d554ed851ffe59c1f799346803446aedb79801a3b SHA512 666b5f9a473bb197e9782ea20b1de79f810a0440f5fe6bda674fdd78601f33e3f97947d5201b7d3c6028728c30810fb849ff7cd2df9133796031fddc021f08cc
-DIST genpatches-4.9-93.base.tar.xz 1770748 BLAKE2B b592968d1f9261d759c802ec3afb0b4158320b375d439163f5b3b1253e26736b30e5cfbfb76cf7b7fce4b5adf0f635c302045cdcfe6e10a9400118b2ba2c6199 SHA512 1c33c7013cc6b395bfbfec351cfd8a6da393c356e2e286c814b97ee7777dc338555fa7e94d5644c999cd685be49df66d828af2aab0e2aef45dfa689939494e33
-DIST genpatches-4.9-93.experimental.tar.xz 106380 BLAKE2B 79a35166fc44d99f6540e17644afb54e68efc673897770d028baf6249c60e53f8655d118caf143f3c09a95aed4dbb776d1ebd1486d54541a17f738c47f552a25 SHA512 3e479f9b9586dd6802441689365190a7dc5309c21f30a22f4611aeeb9f45e93dfa1fa208a9cc6eeebbdd3d9977d6e5aac9c19458d683bb69b4f964b1ee8db92f
-DIST genpatches-4.9-93.extras.tar.xz 17356 BLAKE2B af835d4ecc744045630c6915658f8ae0dcb1aafe2fd42566b190180a0e7bc14e242718466a95a263910595d29faa7a3b94ff1f10409a6db4900700d80b92a9af SHA512 61b4434c5797f43f9ce35d54457f80a629daffbdf9d8e92660acd883d808b4cb0069205bb1e6be78009135c958e11760425bd12c5d7c183871013d79d66c40ef
-DIST genpatches-4.9-94.base.tar.xz 1785504 BLAKE2B 8d6caddb3b3119f14c85d45f4270a666a36b1d36deb0e462765cef8941c2ea1aa2c7a9df2101d349e1831a3b16ff53aa8b13049dcb250d3d398884021420df86 SHA512 56e5a40025c9773bff4a051ca35b3f1a1c24dfd57f5164888adf01feb9ab6115aa89fda4c38c8fccebd74826264d5289711689848bbf358390d9080f6fc6feb7
-DIST genpatches-4.9-94.experimental.tar.xz 106392 BLAKE2B b00950bbabf69b13e4a79cc631827b8633b4f446940c5987c39bebf4d534ce3f28e9d3c225503eaa95ff4cce9d2ffcfbda549840c9c09886e5e03c23b76f7a29 SHA512 3f3e9e5a8c165f1e939f5a6312646a7603afc6598fd91bf3973048a474ed72e016a516ab10d3d7f684ce067cb89a262df735b9365d5110a3e0eb69ae360e0d69
-DIST genpatches-4.9-94.extras.tar.xz 17360 BLAKE2B 5b344383357997baa3a0fc315fdcd1376b523977d33cec40188ff5587d863980b7d52f7ca8e64a2cf72595992016f28df1bc00e3dfcb78d28777dbe1fc07e40f SHA512 a19fd32c86acd9e0c26628027454d9fb9c1b962ae2f748786129cfc0d6d7eaca16d081307b3cabfad2663e044940e689fadc2dac15d1aa51d381b57fbfb6b50f
+DIST genpatches-4.9-98.base.tar.xz 1905108 BLAKE2B ce390d21113a94d44489155fd554cc83a2496b6a035492993c8fc144a3fc77633649de58bf98d10c03c02d3d4ebec3f9e7a7329f56c89e34b842d61824196490 SHA512 ed71478b4c44fda51349e09f9ca805f519a1873d2fb1de88cbc7ee806ad2117a5809f0eae3a2ccb71ec51652422a8a1754298edf0dabd0064aa87b1a833f518d
+DIST genpatches-4.9-98.experimental.tar.xz 106408 BLAKE2B 27dea027500bf5c2230db2d693875748c1bd021cd3898aebefe041eedfe8a7e39339939810e6a5f48e872403ed3aa4857693545d15f79ff52afde20faa48b2d7 SHA512 e3f76f33094b2bbf0f8cdfa90560a45d20d8341bfa426e18d777ec02ba0e959d99f683f63172588f0dfbb7034d70d70d5d123ecc3cfe50255ef9f4550015550d
+DIST genpatches-4.9-98.extras.tar.xz 17348 BLAKE2B 03b455ea225eb4c99f1c263ed694de45674e2242c00776462a412e8a49fc826cf26630564857207b7944d5b5ff3f8955a3bd0a7ae3a33bc59bc06bd3f0c064f6 SHA512 6bba9882f346577fd685de2172e12708fc757f86efdba63d33d805710e00bf4eacb537968a548528a20d50f5a726516050e0e4e0170d3db652bddbaac9d3f23a
+DIST genpatches-4.9-99.base.tar.xz 1924452 BLAKE2B 935f792264eb7907e721acf49e5330bd707d181aa0846abef1f937b7cba5f54202fb51355d91c1541e2f59a204e83bc03c43625768e4aa2b7184c58f32b50827 SHA512 2379df936355c9c3d50a06b3ad94208111202e2dcf70f58771312f588fda70d9309a0fbb30e42d744fd2186cb6ffb9df2f8f596d6cef56e0cbd13cda7e139f6f
+DIST genpatches-4.9-99.experimental.tar.xz 106364 BLAKE2B a5c0e8500f6566d69b680298ea3b3aa09cc49bb609eed67b0cb9379a6b7f3a1e793657d91d049989359d582eca535d3b336a9bb090711344bc2387e2bf4ee254 SHA512 9185cfed5f2f8d1044fac38713618f409c7c7133cb22b88815899d81d3978119af5c736282c55493c7a7d9166cc3b3167d1a246f5b3c1cbd7538b944faf114d2
+DIST genpatches-4.9-99.extras.tar.xz 17352 BLAKE2B 3089bd2df8504020a95c5cfadc4346c6b3bcf00c733570fd7be179c5c7f814fbdc932c03170bd9abce6a5330db290c5a496121d756418cda245c5b6c2cfacac0 SHA512 50e8bb37cd800ec21ff602a17f8cdb4c8c2791e587e22e690c080ee03a3260050ca69cda3338c5a42f70f84950851ac206f70825cdf597fe88ba69cc3624c20c
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
+DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f99571099d471b2dde5f7a746d9b9fab5112fffe3b7978c40f15ecaa33203eeeeea98c2158fab2d5857ece5d74f9f SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-EBUILD aufs-sources-4.14.26.ebuild 2230 BLAKE2B 3a2fd10689e9dd7da25548a5c887d86521631a8256fbc9984e2b230f7721352a0436d8581e9b1349462c28d9e1ef887141fad6eb2439ea583d271bf412d0f97a SHA512 64e9f64e455b72401d5a069b9a490c83d881ed798657380cc4dbfb28be170175be79a771ab1ba0d83fe3b9cba2c55b43e565db462598a5c6f8248b6a39a48802
-EBUILD aufs-sources-4.14.27.ebuild 2230 BLAKE2B 53054e3f215ee3858ca9a3c5b3e4c9c42debb34a4b6d4caf52567d3e79aa255a64874c42f33a2d696d8a155016931ecad9cdf0d2fb12f2dd9382f2602dd30535 SHA512 ce53900fcf3db62b6722ad47d2894d38e038cb549dd572a70e0b5b16a69a811a7e40def613a0b57ba9462470d15c458d764ca7f1f6d1fe6a3d54b1d85be97923
-EBUILD aufs-sources-4.14.28.ebuild 2230 BLAKE2B 5314a9f2f1b6b00105b9ea25920ffe677bd33802b2c7c07a0402b1d50167f9266f91b02eaf3fc360abd82206cdbae80cc0c5182dab4c8c84b65389156dbee582 SHA512 f511f73e02f8011d929dbb5d9e2631391d8d63fb7afa9e59a68e6f403a10bac7b8f32bcaf0c539b0ebd71d21ab2d256ec323820ee034873a03b26a2e5bd8dd85
-EBUILD aufs-sources-4.14.29.ebuild 2230 BLAKE2B 5e1a5ab3027d96f9fd1d66d51125e5bd84a09a63ef626f88b82788b8e61b34d8ecddb1d353191a7f52d10eb31183c5343efbba8fd5b289475295cbe6d0715577 SHA512 c6edc3e72c97b89918ae086e3e997a37c698d071a356750a66c2b32e9790a9b565300ff0cfd3cb1f44a04366dd6f50e8b604aae855c78c806fda55b769dcd21c
-EBUILD aufs-sources-4.14.30.ebuild 2230 BLAKE2B 86cd9c29413359d06f70489445af9f85feb5680c124bfab0ca091f8c7f6b3509d57cfce8a81531ff04af4ef575fabc40e45cec574004f3ff28056a1ac411304a SHA512 ca1d3ad0ea5936a6527b4b42580ae163bfc541cc1dadf995d62a1abb0080702ed2f7f72d76d9cba52bfc05b9c8bb935863d8b597a62499fb13c4a8c065f9a126
-EBUILD aufs-sources-4.14.31.ebuild 2230 BLAKE2B d08ee61aa89c2fdc6a7f537805381f53cd05716a730e2a9e133ed11afb593d409910ab618ea9f76249981060d9370520df5e78b796edc76a334e4f6b68ae9c00 SHA512 3b04483102f7759c861f65f0b43d6e6cc0caf25ef127ccc4ee881609cad6a79199010d1e60574a09d2cda318f11dc518030a29abd55da30883abbae12287af84
-EBUILD aufs-sources-4.15.0.ebuild 2229 BLAKE2B e6f5f7957208ee85690272b10e38580c8fe23c7a3288294d598eddf8bc2e479246439a3033fd38fb9b0b6384ddd557a5b3e3c44701948089fc1f20eba471448f SHA512 a5647ce633bbe9793eea78700f9f0923467fcc476db03d4b90dddbbc04898b4d9b1ca16433eae2abced936a6d94e1572e71f21802986728224ce64d2751ab775
-EBUILD aufs-sources-4.15.1.ebuild 2229 BLAKE2B b119a220f609c2e05939275c7fa98b1145aa2b8c62d8d5c06c786b62025cd3c93e40c2b76e82c5bf754409eb51bd97b52838640d66094b6fef6b6e8b94ae1ca4 SHA512 afa23f4510c6852153e6ef013766bae7705bf1f916c74b6e3092546c4c9b976f71d35708fb869bef274ebf64026c0ed1248c135d30e7e5fa2bfe2c49da97e86b
-EBUILD aufs-sources-4.15.10.ebuild 2230 BLAKE2B 186e334bebf691bda6932e7e6b8af23d0be8f8c8463a772cd1caa7017807bc5b435301cf000dc60fcc498734317479bcb43c56a531060d58aca800df9947b871 SHA512 c920f10962a24b1f7c5bc66f51e0b99544a43d10ebab19cd4c7f2a468aad6274f414afd0a107c0d07504c4f1efa196cdf0e01a3e59644fbbaddf4a8932dd67e4
-EBUILD aufs-sources-4.15.11.ebuild 2230 BLAKE2B c7e78829b8bb231b024ed46a6f58d742d5a865c8389e07a07c9748dcfd1be44e12b7e8d77399c84cfb29a5f5db655543e8a1d539ecc19296c5d73d0598431985 SHA512 7f71cd2fed3e635f46e7e1bb5e339f6ccd25ba22d0d1d0e352d5b6b04662deccab005a72adaa5025937302c9103d0f27c8d08b37dffcf3a95522ec9d53d47f70
-EBUILD aufs-sources-4.15.12.ebuild 2230 BLAKE2B c6b519e52cb688a81233b7374e631a3572551f53d86377bec06f8db1c5a8bd2fc08ac1efdde820f4c36e54910782371eaa0727492852d5ab86b49a252759222a SHA512 79d8b54f752dc300bfb7c575c944f34e001fcd6f8d7a0a4b084a510ccb0f55587e8c2b6d486d4c779ed4b376ef9301f3d5baca50daf65eddf051803970db19eb
-EBUILD aufs-sources-4.15.13.ebuild 2230 BLAKE2B 11bbb94c1bbe27a9b6090450d24e65dce40ba5bc425bba487c668d712e93d02be78a413f4076a8def5604eab210f51ef0e2003f85ae681846a0817e6f30e36e2 SHA512 001cfc49c6977537a26dd3f211323f84e3ff422a593b2d0238d140011c9154bee720469861685ce7d863fdf2e9436fffc400e2996f315a718468fd26e377b867
-EBUILD aufs-sources-4.15.14.ebuild 2230 BLAKE2B 049b837afd49f4dd816825a17c4af8a2ed36e57b4ec2b4dcf020003c6fe7db4f36d9a71924df873bf0e24be5eb91ec426cc25be5e21d78eefd1f8a0376d3d6fb SHA512 fdbb309ebbd19160b5593f743e8c08080be417c1c38d6c0db56c023b509435721339b828ecc34e4d39a887d1ae38d94b233202219621a0d3f26db00bef8dffac
-EBUILD aufs-sources-4.15.2.ebuild 2229 BLAKE2B 986b440ad1f7664202cece20449b26723ef2e093670a5c86e1629f56dda2c512912f6d19de915141e8a36489fd99b20e24ca0dafbba651b6ee498ab02ccf9c0d SHA512 1bbd47bdfb0da8b39f868c81897cb799ad4cdae19b49460a310fc6c3d82681758b014593c27bad3cd6e624380814f5eafbdf3e8869abcba2d2fe2a718ba5dc9a
-EBUILD aufs-sources-4.15.3.ebuild 2229 BLAKE2B 8282ad162039e6bccc775e608b0f0fa3724613036b5615d5ec3d490ab526ee6eebda5dbac6fc0c0350fb819759a22798d30f5ab394c6b0bf1fde0a63a19074f1 SHA512 33fbeacbabf6c6a080eab0e72b7c07b7c161e5d4401dcfa56e7c264548dffb10dc21b1bcd7690ab87f35e6534e91d6f01d6f21952e7716bbdf6d489654aba74a
-EBUILD aufs-sources-4.15.4.ebuild 2229 BLAKE2B 2c6f0625142ebfc1f54149853b08355f1af03d1323844a9b3e306b553bb5f8c6d1b171a4dcbb36b89ad71cdde6c8cfc4cbec80d4a4e3b80d9a337ebbeb278b1b SHA512 602dcea29c6bd680045b6b5bad03105c28dab31a0c19dbac6f0f2f3f5b2bbcca8cefc778e29e168611e14a90a9916869ea3649bcecfd97525a5c7867b006778e
-EBUILD aufs-sources-4.15.5.ebuild 2229 BLAKE2B fd2cef25b67c8e629c64163faf6dc83ee13dfce1a3978377e2fd038d73234c52b20364f1e59f15da88918532b2d1a3163dc18b3c507c8c8c7c0c75295a40e3d1 SHA512 602b783643934b04c5ab1eaa5d52853a1274d38240d6496698ea2776987240e95895330e2f0379b4f7aabf55096d011158f56c73862d177aaba025fc727462a9
-EBUILD aufs-sources-4.15.6.ebuild 2229 BLAKE2B 15cb385e9652f5505d33cbe6d98b86fb75f53047d7e832e6e70ada04d65247ea40679f91291f3884e6f4509fdab7d7ea46be61d70af66d25ffd35629dd7d8fba SHA512 3ff81481b2bcece3d6060f50549303db1b40b1f0fda5d008797ee4a32ff8edcaac70aa1faf2daa67f6c048fc530f15117362426b9e89a8e81210e52e7f0a55f8
-EBUILD aufs-sources-4.15.7-r1.ebuild 2229 BLAKE2B bd6e3cd0c02e3cf77d9e39ae16bed6e216624a34e737bb66f2de7e2f64482994297c2a68266d4fcd73a3f298cd5a81a1aa835db44fc8fc25d0959276487f46dc SHA512 839fb86c61a7d0db512bcf5bd344e79b524fb5b44913547dd61d3126d69497af05c96248c545fd948a2cf72f4ddb084f7a1ff5f116b92194330217a28980e8e7
-EBUILD aufs-sources-4.15.8.ebuild 2230 BLAKE2B e5963646675dc571b0f1ef7a518460054f0f9e7a129dbef5ab7806ca913f1ae9a137ae7d286d81082da48bfa524b2a6fe9ebf56b3d78e9c3770488b65fa595b1 SHA512 20131e6db8e9ba04da3d5dab8ff207f0087075c273003aa33ad05debdcb4ccc78ed27ede2597afb035d0913a140cc5746947be7efb7ebbe55a062fd464507957
-EBUILD aufs-sources-4.15.9.ebuild 2230 BLAKE2B 38f898ace530b42970c12528062b945fd5cfd7c31d249452db699eda585b853a2e1b200e363faf1508bbda6c095ad7d1496ac3100593960f96fdd378e7755453 SHA512 68894135d039cb097e5094c8b87c4e3a0c304077726b31bdd2bce542ca5d516de27baf81127532a5234258fc6a022f110cc6934a45c8423c53642c398b2b5682
-EBUILD aufs-sources-4.4.104.ebuild 2230 BLAKE2B 7a9ca3e6cd72247427066785157924eca0cfb71a5100222bc88b36b43f9b0be69ed30df459210af4788de65c0612f4bb8d8fd9cf1f810c6b72972e8de91c5189 SHA512 e797e62f2b379585bab5c79c151819f56dab9b41a6af608615757f7731b5de8ce75dc2c0945ec797c62f1a287ed0ba50956e7adf252634c4f9e8ccf09f1c3549
-EBUILD aufs-sources-4.4.105.ebuild 2230 BLAKE2B 1af796992d6b7e1b45888c3dbd9d35e839c5711b2a33c3f09c7e25e7cde11aeeefa5f3184398702c23e663baca2e76b855fa562af4c89597710ddcd85c3e1a6b SHA512 a85dd5e50cf37873f5309f1827d2093747d051738c7247fb66f52a23de3387ba23940f6ea06533ab5fb9174f60bc2adf01ddee89d62325a2039c7df9fa156c73
-EBUILD aufs-sources-4.4.106.ebuild 2230 BLAKE2B ad0645144376521b1d2ce745a0f1afaad63e8a57d0ff9b37d393ac284a91da504ef817fc8f43c5567aac1c2166046dcda46f2872281c128a83a0627804e01a09 SHA512 b3c507339b0d09faf1c9b8b3b1cf1d5f0b7559329bad4702ce04c28124aa5b114a711560c762e130f8e236fef0e35905eac8442ce92965752b4a7ea5e10db781
-EBUILD aufs-sources-4.4.107.ebuild 2230 BLAKE2B 4034cf7a029faf6fd94cb1eeb39ad99bab02a7f40106fe59d1b30d3cb58a7b2302ae6adbf04b9c99474c12db37d74b4d68433e2db8c1be8ce675d6dec8b70c97 SHA512 b45ab2f1397a867b8494298d8dedcd6995f939e6a119d76e6a8d07cc184b83f8f6e84ee6efbf6f2ffe99f15cef1fd4d6761bd786bbfb9df66f505db7cac9193e
-EBUILD aufs-sources-4.4.108.ebuild 2230 BLAKE2B 4a756d25e750f44d724c3000efd430ed2a0fa310819b5b8bf124ad905c95df80c1f8d342f3d4df3b9b588717581cac707d047992ff48d2c0428d1b538a4ee1ff SHA512 2edaca6f44e09a0aea3692e07bd6795fadf0ae529b3fdee87f3c19fd3f38bf600fc86e42e9a4a9e69a982558e906603459149c33a8df458c9f35d836058799b6
-EBUILD aufs-sources-4.4.109.ebuild 2230 BLAKE2B d641fb38655c2f82cb846ea07a4ec908ad130f754323c312ef021680435c0c30491c143340846f77ebf29b2960faab74d4f14122b0a6ee0480f4a14e7a0fc7fd SHA512 fcd3ef7a3607e9d46f9b09f1bbe32c4e2092d6598bb10972fdd24e31cad84227b6c120c6a596593224409a5de142189e0dcc71525346afec0bd27d0e3fd914b3
-EBUILD aufs-sources-4.4.110.ebuild 2230 BLAKE2B 95fcc5389cb20696b4af97eade02c57e4fe813c9cab3d6ba72b36d9d7d61cf304cdd3e48eb954b009cc1f61ada35ec0abb150f2af08c6785e080976ddfa51e85 SHA512 f8f4a0ae3015d184db001dfef14a2c5cf8ac0ff7520b73f17bf3c41a0a558f6eff1d4b02446c8223365bcc20151c1d5efa663c2ae7437ee33bb8d63d0227dce3
+EBUILD aufs-sources-4.14.34.ebuild 2230 BLAKE2B f4e4264f14b184a33845597121b446e1d1391ad568f33b5083d7bb14e40337575db71b568deaa0fe0cb0cadab964b098523736f6662554dbd85d66c48605c95b SHA512 da44fae437a4a30d488756362669d8a7d9901880c49e0d3cba8cfe8cf27d27a449b87bd82d6455f1aeed7712dfe512ee67e4030e0af6687230460c9b03ae32c8
+EBUILD aufs-sources-4.14.35.ebuild 2230 BLAKE2B 22a7177cf8c2c1bd0ae83f0ea83496ec2e5f16b96120ecab34220ab73836cb0636ff190aec9322d580e8d1b04f5511d14edbef34786f266dc58d8984559fe58f SHA512 00e32b18d081419e1e1e150f6ecc275318deb16af3a489b2788ba8c0fdf371c23eb894fe909b1d997a20d6184559490a75c2570078f39307949d06437a6032f3
+EBUILD aufs-sources-4.14.36.ebuild 2230 BLAKE2B 6676b8dcbb3021204999a129589c0af0588bc493715093580d9d5ebcd15e7b7a602072614b7677e465faece5a1417388dba9348e1259e4bdc51998ce1641dba5 SHA512 6e4702b4fe3cf99f4b4fc03bbb7a951c6a9c54616b90c61fc2cfc71112109ddaad6e015d62c55bd3a606110481445bcdfe748b26c12aef8397f523c568191a8a
+EBUILD aufs-sources-4.14.37.ebuild 2230 BLAKE2B 4b096d42e80dbb930b42729a2cf72e7c3d07233ba5d769669061c5ff7cfef1bc7a80c630f71e434434ee3b579133a3ef75a78c5df025e6dab19faa5ed483072f SHA512 a7f25dfc95302557207117a4f10cab12353926050d94a1bf9d342af0c97efc77bed6a67fe99d5b92ac65617bf6d98b35f82e315012ef70efd254488a527efb37
+EBUILD aufs-sources-4.14.38.ebuild 2230 BLAKE2B ea514d93d0905fe6e06999a21d1074c61a89e0e1ab9fb7ac4f27703afc83ef1394b44353f627b7e29cbd9ba9c7a426ad6bee08b5b98b6c94e0a678e20ba062a0 SHA512 95cff8760597af106d8272ea5cb64fc2c3f97b6c4b4fe3d066eda1b6e68f86fb401af9f426f1aa5c6d60f5e02614dbfed5784b93e9a022b8bbcb3c5644c48abc
+EBUILD aufs-sources-4.14.39.ebuild 2230 BLAKE2B 65ea05c7a4c9553126f5b1b4b6912e3dc8f1e651b30ef3788f96e5f403095083f03970b982f3d33ca20e7395ab6d8af33597b27b9607083526b3b22cd7689960 SHA512 daba6b72071b99b8813c0db9c6fd37ff410120283b6374bd6297e74e87569dc3ec2f3e3063853a11e32e630886e7e51a67a28509f2b530082daeef7ef0e58582
+EBUILD aufs-sources-4.14.40.ebuild 2230 BLAKE2B 3ddfbe3a416e5f374381910093174ba7cb37c71af0110dcdbb56456e028e50dbd2c3dbaa8257861d3d11279577f2f3c1e782fccbaffd134f3704cd13e9ecec59 SHA512 6e9bb9ca6850ad68d9fc139dd327ca6b29dd3f4f3b52edb0aabc8073244159972e3da46054443e1303e60802835ba203f5b7d8085d3cba0e5bd4dea0eac4d7d8
+EBUILD aufs-sources-4.14.41.ebuild 2230 BLAKE2B b95278ffd7be0180ba7e333076f1d2fb67cc60e35b6774594e32f269418cdfd21f9253a50465d55c79e85cd404e1f1631c0c9a8600b8a87760f3fd1f9d005c43 SHA512 3d6dc474cecebde0dffe55f780e329d71d73850f36412d875e1f5d1f8e19e699a65ca2d9a0169677f7fd5cb56f9e7711def03b82627d5c8c5f520479c1b10e31
+EBUILD aufs-sources-4.14.42.ebuild 2230 BLAKE2B 7bba681a7baa56a7723546206e2ff5a9c0c6d0a0d1f803b85b84a7e5c112423637aa75b247336d46ce3f890e38cca75c660a8acbc600b9a9854dfb3d7f34c2e6 SHA512 ae7b43b7d4cbba389c5344893f7411f6ef18e80c07b1d60900c5f9ae78bd5d0aa3fc3a7a4fb385304f9936d2af67a0807b261907753ce7affa144ccbb1a28e6b
+EBUILD aufs-sources-4.14.43.ebuild 2230 BLAKE2B 2682472b48ac0e6a20113c2d2ddcc303374fe46dfdc7d6d698db553ef7589b572f5b35d34e9ef9c852cac9e3388cf959c0cd47b395c2308dc027f2afaa94938d SHA512 aa3c4fee9b8d092603fef4da0a81df5dfa38d420e12ab553d9ba71cd13e5fee5738b6d79482b00d4f85cbe3eb33931dc520c15b9045d874a1e2b19c8af7351b6
+EBUILD aufs-sources-4.14.44.ebuild 2230 BLAKE2B e5a06f9e819599658526607116c660f5d5305dc3f39413beea6eed4886940078b9bef7f71785f853ff3ada209b4c770e09689a49ce5f5937eb77ad37da037867 SHA512 2196f6d6bd22b18613955450aba2c7608e6b2745136d155a19fc950d7ae059ec325015c921fb1117ed94ada4892bb862d8a143161eee0b375cfce18d9533997e
+EBUILD aufs-sources-4.14.47.ebuild 2230 BLAKE2B bc6e55fa702b32487a545ff8857e1d8a45096ee5984e2269ed18051ee893be73b309d46183109f7657b7e9a5207e08f99b51046ae0e506035f4e5c862774a8bf SHA512 b7635de258e1c90d05309958854bf50f8f896f504b745ac2c6e3464c1dcd186f2ce028baa2c061f0dfd92aa3c0a3568089849a27790067702e498cf0863cac73
+EBUILD aufs-sources-4.14.48.ebuild 2230 BLAKE2B 59dc21131797dc34e7c5a6393c757c4095b9e0a12fdf09c886d7094534ff85853eb3fa1aae6ae0b134cc9c7cd4a9177799399cf4d8a32148f399fe828fc1c82e SHA512 18e3164f84a42e650622c6713303d850fc0d3974269bd3fda4e5a3343d3f0244f2949ae541a87d683b9da1d85a83cc636e721bf7b3411d68a834a613067d1892
+EBUILD aufs-sources-4.15.16.ebuild 2230 BLAKE2B 5872b56d765b175b26adf3032cda3f15c5db748cd5bdbf5bf562d2b008f8eff6ee4522337ed7125a319a3946dd7b40172fc898f43cb03bf2c640df970da38c72 SHA512 65bfde39c4861a0165eded22ee339a39203a4bcaa7ea167460f2339fd9bc9877f9d62a268bc7477de68c528536737695a517bf33b5ba9e59084eb9bfe9383542
+EBUILD aufs-sources-4.15.17.ebuild 2230 BLAKE2B 996951e7614a7aa2ce6c5814db80d82ffb344d6d7b63c410bf6035c285180ebc427041579cadbe31e37ffc8f36cc22be28ff7d88e8c0a312ef137bf0e2554c4c SHA512 177908df56a60b32e2740a930eb9a05aa5508c0d20068c9b29d09566f4098cb3d10eb35ab45a9af578bf22d6f942f9ff65d635088343b87a91c36411074ece13
+EBUILD aufs-sources-4.15.18.ebuild 2230 BLAKE2B ae97ccd9d952b69cd9dc6aaae15d8bcb8b10536fc183708d2dc7c875d940a393baee46a52956fbed9b90f1c97ca0f9f4b50aacba9e60d26df1cdf1f48edde790 SHA512 5df2bfff350e2400f0868be4de13ee0193b9abe7dc412e773ac4416c4d6006e92969ed43780d1e3778135959a7e063b81c86605f11cdaa66aad437c77649a565
+EBUILD aufs-sources-4.16.10.ebuild 2230 BLAKE2B 142a91dfc862f1e2361574855ec75976bd50c5b2070887cafc0ef556290fdeb878ca048a157791670e663f9ae616995963ecaadb6f926a6955c877a6b6b9de79 SHA512 1cc0b381ef31b49e5b8650d628e359054072c2234595f76aabfa52a6b6fe84bf6a0b1ef298fe941e45dad590ae0869ffae407d5c243371d666e279dcbeb425b6
+EBUILD aufs-sources-4.16.11.ebuild 2230 BLAKE2B 58c909e2d81ef8a0de67f337405fbb0aa5efe00d5ab938e7883b907f058f700ef14b94a5bd908a53bf490f70c481baf43ec71bcfbf310433d27b6dd43fd19aca SHA512 b6324a98137302c1910f6348a85a241896972b042bed8a66494169bab427b9965822e4c04363c50c078830b8b319d1aebea43c9d23b18dd4678f8cd1c2db4c37
+EBUILD aufs-sources-4.16.12.ebuild 2230 BLAKE2B 4ce7e65f224ed1e30a002f8f97661d11cd1407d0e2c83c17700f187d22f63d3b4594c5352a47152c92a81a5c49c8c67ac3073012b44b3ba871d933d11879c8ec SHA512 230f531aab37730cb7bf49ceaf5468bd3cd8967436902db53a5cb6fb22c35e3e1d7ffdfd97e41fa1e0c5338ae1d4484f1957ee5a4e19cfb969df3f25aacace82
+EBUILD aufs-sources-4.16.13.ebuild 2230 BLAKE2B e453e6d606995e72094b922897cbeec40caaa422a73f7e7275ac272d4202e2d86291a5251fa5c1219058205446890a35fa109fa62ea396156776921906ec20e1 SHA512 337e1b04488cc2f282d4936df6219f6c39ad0da5249932d6cff1a3a57e1e2768775633e22b6d1c672efb553441f6c713cb2b1f8065e71f2fb5f4b80eb8d9ebd5
+EBUILD aufs-sources-4.16.14.ebuild 2230 BLAKE2B e31b0daf261345fb6429c19dc43d3d74322fb1533da076d2d4e368a0637eca195e786f7a813bd66cb2eb469a272619c0185d2216a0f8fb75ae91266517133801 SHA512 aa6ff6db18d72d48699180670c6beb52ab61ca94befae9a3a9ef52810199f87fb2a34b6f010dad6f252489d98df3d91e81772708b562cdf2fe8ad7594b0e0079
+EBUILD aufs-sources-4.16.3.ebuild 2229 BLAKE2B 27c1c753398f933e4490b260997f10ae2f89dc231a7354dc4379d33667a6db7b67c5af85643051a1f3c4e74ab5a44f8d19142607d1b0da9314edcceed627e66f SHA512 dd20c9c3d35e5940441d54a5879e3e60a977b749ac0e4141500da62aad0a95c1a7eb4fb31ff7f8eb0628b06ee5e8175808346a69459c46ad3c8ca9bf01f6922d
+EBUILD aufs-sources-4.16.4.ebuild 2229 BLAKE2B 3383b7f51d1452b1d0ad29316a86e7fbfc54b38d0812269aee2dca11cf86297d0616d6e8f482ef168181790d2a598f783d22f245ffce9f65d18268c50b71577d SHA512 9de01b74060a5b20d13d9bcd6d693be3f20512e3c849d39b44e32112be7b7472bbb74d8b2d45156e3a957b859c6d200c680f293bd80f0d7b60d3870318d34e67
+EBUILD aufs-sources-4.16.5.ebuild 2229 BLAKE2B 2811385720317ec8394dc2239d6bf066fe2de495b7387aaeae10bf7904a4df7bd335ebaf81f6946e6ef6e991355dce6184a82fa60d8fe1dd8811d016628aa92b SHA512 b38bf102a1f48f69b1467c3d2798bf33fd52b5c6c21e03c639a9787381d81b223d00a6e6d6ad5791a4508ddb50b24c73645b9bf8c0efd3ce1025fef802c3c3ba
+EBUILD aufs-sources-4.16.6.ebuild 2229 BLAKE2B dce6249958784b9c40f9eda0ff290e0c12326945236d9cc6d76e3fe7d9df6a7cceee930b375402c0ca52d8a733b213633ac9f012349d7b35d1b21f124e95373d SHA512 bae8924e2d38eda599c129b3248e2431f3a06432359f0cfe9b1eae1bcbce0f9fc00aac5a6439f58421532ce932b84f31a554538a8ac8ba5f91fe7adc9f0b7fa5
+EBUILD aufs-sources-4.16.7.ebuild 2229 BLAKE2B 632affde8018c58989f3159ea57c8cb75e8cb67bb344c8e76f0a77002c66679956adc827b1e09ec9b272b5803fa488b3cc6a5d3482807a88718cc47cb22804eb SHA512 56a8b73d635ca473d97675b6a3271b6ca019f17905607710d79d22e7211f3e283724d0d8990fe8c26baf545d78d5daceb2b7fa392f0dd2c1b20e197626c96efa
+EBUILD aufs-sources-4.16.8.ebuild 2229 BLAKE2B 1b63a44ce024de897af5c5571fec0ed158831c3d1ff4d35a33a3cdfb1df81114fb3f066435bd7be5a2be7acc5744f33620810e5f47b612e524127a39e40bd8a9 SHA512 772cdf778af2625949049414043d8419b77457b066b2585002ed286c7698b011e58096926d15995ebc011ca3bc56b611ed88490bb9435c99728e2639bc062ad0
+EBUILD aufs-sources-4.16.9.ebuild 2230 BLAKE2B f8096d615bec1c451b162a2cff69b18131c19a0b1918f40b5b73029eeaaaadf52c28731647c9ca300baa143c2a1d50d4f2094b0307898a75749c8553ddcaaaad SHA512 0aab2d4992a39c72608acdb4213f165b3478e6e9a4a6cedf125f8f79c515197e7052c00223f1a9d7dd70820dbe9164e11ac84114d35a343f829668a07c771280
 EBUILD aufs-sources-4.4.111-r1.ebuild 2230 BLAKE2B 88826920ce4a394b5c46c94e93688ee402942adedb38bc83a89289e6e06e2a67e2e3340e1dcbc9e57e105d42d7446d3a8babafeef460e04727db00af6b272bac SHA512 e41732c3c3f822c6aad493a2a727e9ad9b06ba07734b62214b953388db85f378adce14ec75de9fc0540a3c95de75fd90ffccddbfbeee9dd980eb293e513bafdc
-EBUILD aufs-sources-4.4.111.ebuild 2230 BLAKE2B 8968bf11085242aec2817ead4c7064d7b6ff04c1a433c03efe7caace53b0de19bb994996d82cfa715d66f52e8ad61e2f65e05e4d0f2233a53489d9200bdd2b82 SHA512 ff5f6e398f66a6d0f951352170285eb6d95058a98e3ab7b84c4bcc270687a69c29b035fd30093773313c9d1eafdfdf3874e7bbf2963fe93b59d2465411d85ebe
-EBUILD aufs-sources-4.4.112.ebuild 2230 BLAKE2B b8d70de99853f83b9116719162c207bd9dfe09fe3ca6c5e70021ba9adc1589acabca0c61b13a3e84b33e5db36481a4a04f1a91056b3a54691dda29888adccc6e SHA512 7a6855f063362c61216080fc72e2b2a727bf88917983e69f32f422002198a09bacf21b46b264a81f2a891e8f180443204f73299c49efee54f3b66ba04042fc29
-EBUILD aufs-sources-4.4.113.ebuild 2230 BLAKE2B f28c7d059dd81b188840ef6a67613a8cd2fdbc48183c27fa4422eb21a29b46131a839f67523ef452ecbe2a0d30645ceb93b75bf7df965f8c34a76412f80a1053 SHA512 89d69e43eb719f9650d124a492d9c38bcf5daa79f597f6183a04f7cec035449f32e59797c838c8c4336c41b7e09959b862465a35f379cc586aa1679d3b8fb051
-EBUILD aufs-sources-4.4.114.ebuild 2230 BLAKE2B 3a84ff89f8b281083d353e8477f5b748ec9492ea9709acb2e518b26016deadb2afc1c710d562c8cb51c699821f0ee23939e5a90fb8438b4b863f6baf1b257831 SHA512 1ca4f387cb67c17942ecbd7b429f15331c98e6fd4643513b20cf14d2f9a1e8fd1bf29ac1d198cfa1dd1f46f0a6ed8547703d63efcb6c6908c51eb5cc56edc491
-EBUILD aufs-sources-4.4.115.ebuild 2230 BLAKE2B 295f5b0f86bd90cfdfa5e5fd3f893a4b4f3a54f47e0e601e893c472a0cc6eeed544694e0e2f479f8fb6376d9b219d8bd7237627cede12eb8d7816ce9743203e9 SHA512 52cc46c20ec70a29d25dbd3fc31485cb38078d9a6779f8f3559aaeb1edba354c6237f416f7c576874b2e706ba5d4bcc7daefd6a41d5db82d2a915b67d0aaadd2
-EBUILD aufs-sources-4.4.116.ebuild 2230 BLAKE2B 72274656f9bf71086064f93e20376c7120267f10683b031a81f54720d4dcbe3f5e46a1ed4dfe6f6aa80a11db28306dd044816826ecebfd7083c86af6d19f6e80 SHA512 7a7a8d5d221c85ae76cf9f0b24f8d05dbf32eb90b0fbf349aef2edba8027b4e4d99bc62c4851a1be1e2854c9b5e8cc35a57fe29150a4250f4e6fe1b442ccace9
-EBUILD aufs-sources-4.4.117.ebuild 2230 BLAKE2B fa08b6468583a68cd16b8746bed4e1b4fdcf1dee39a69ddf44045759a206c9e5647b19fcd05157509765b5bd61a30d49912e475c9852aaa3231461f54652b0f3 SHA512 d710d075b2c49acaf2edee047bf9fa47759c803964ecd1b24252140a3c12d5ddf04a09fa394a6de42cea486b2e205823ef588e41d733e6c1ed59911d82361345
-EBUILD aufs-sources-4.4.118.ebuild 2230 BLAKE2B eede464fd9309a0267c69b9d3dccf2e5ef3a28a35d5b33caa1953c0e83025260b54fdf258a61c9a46952962e7f907a03232240c4a0f0e224dac36a6117f71849 SHA512 fb8c6959e5e097330bc6fe973140f53e837ad9f9aa055b48605a91681f65af74867d0c169a592dfb47a73dccfeea6d0a50e4afd1b565564a6aa62bfc0f809cba
-EBUILD aufs-sources-4.4.119.ebuild 2230 BLAKE2B ff1a79722d8db9f2c13cb17c1cb8a02865b269557801a8a2182a0a8bf0ec79039acb6c4d1ccfcd5a4c55d8d6c4519201c1f158a28f16454af322983713403c69 SHA512 e9b34b5e3ff2d88535808402710f59dd62eea624368193bcd57e1d7234311996a34b613f26ef8f461a3fbe8c12452474dc53304dfb0c4920efe886bdbace5cab
-EBUILD aufs-sources-4.4.120.ebuild 2230 BLAKE2B 8f8bf2db45288db6684127985dd441689b76f0fb007756b99936ea2dee8699f2c293cf4a7f85d7e5f3f8fd695e9fc5c2a73644fb3b880de3bffc75ab31f34bb1 SHA512 ecedf468731698b28c88e882abfac904dcbccec81eefa3d7c8cf225d3858b201823b03818dc9e02b846f05eaf649c7e99201525773a79353c5a041bf3058fecb
-EBUILD aufs-sources-4.4.121.ebuild 2230 BLAKE2B 22c59ef039dc2f8b8aa2cd8bfdee03c04eacfa3981ddfa405fc99e62709c7acd2e347dc2f197ddb0dc3e3b317fea6675fb61b30b64373c5457346197ab58b8c1 SHA512 167bcd1974cf54a49abf74462c393fc69c98a973654c9ca4d794c0b7088da557b8edcb10cc6530b7aa9368a57c94adaea173e60c43516888406dc2eec08a50ca
-EBUILD aufs-sources-4.4.123.ebuild 2230 BLAKE2B 1f00f3d9a05afb348dafc1586158f58d34231598b50d6e497fa253145c48cdcd0d15a975b9443c4ad88fd12d19172c6fe66ae4cdd39315de0b21f5947c5b57f0 SHA512 d436f82824f4b00185a6d2a886a71d77f55e685987b0047b9647274dc8ef33b2068300caf41713c613543092ebdb9c36bd11e29da988bf37b616c87c65239ceb
-EBUILD aufs-sources-4.4.124.ebuild 2230 BLAKE2B b707f4c41c5c28e7c19b0a84f52244743ecd5a0edf36446e534e37ca140c30cc9091de775eca1b10f734e64ae833f38f8262c8b5f1763af9e04345089b857f2d SHA512 16ef6dcd56c9c644f449f4366c9244214bc4872441d7823ee69f77b7bc61fb44d18cae7333adaf652ff261d5b95a703854f6e823b11691848b3ea0e6b480e817
+EBUILD aufs-sources-4.4.128.ebuild 2230 BLAKE2B 9c8b376a76e71d4383c4f45abd1e4f1656c40bce6c73cf4df4f6a7ce1a5cbb4fc7ef5eb351c70f76548ab579811c7529adf6fb9e8ad7ca1d2feb9974aee8f0f3 SHA512 d7aa57ecbcd5564e373af977f81b01cdf723f1ddaeb30676ca448827d2088c96e0e7d711df4c64c16552f415ae9c412652a8bca1b249e93402e505a6eaf7b57f
+EBUILD aufs-sources-4.4.129.ebuild 2230 BLAKE2B 3b2f5dd8d74bb940bafca13260a6ac9eff3ba389150e2cf3ddacf7bbcd6ecdc6ff7067fe66aeed8a218a0a3438e7e71ebc9ee8a04c11dfbdfcecc9feb8aa4fe8 SHA512 7ab320c0467656ab6061d53e5b151a88d163762aa7f2a56700cebc053298c138f68cb8f5af5e51b2ce3a669274d16d51c5427f96425039c3a04a685014618396
+EBUILD aufs-sources-4.4.130.ebuild 2230 BLAKE2B 69db6f69f15da9aeba5a85c898d426e88aaa59e535226733333e042a19f2942488dd6daf6ee7688f5cecdb51ce66df46de5793ec9093e944e549598081581abf SHA512 3a624640c189007c9d1781ffbcd1768cac8e8c45e1620fdfd0dfee1347e9a2a4cf5ba4f6cb7f1cc4a1388ea6e62c0ded9731268426edcd7c8b07d1246ac85775
+EBUILD aufs-sources-4.4.131.ebuild 2230 BLAKE2B 74041ed9b3b6e96c2f979157dbb71e12039a3cb9338248fb4f0e43577312aafea08f82155d88ac6a1cdfe4d3ff34a229bae94bd5f1c86bbd99650d3e5ba48fa5 SHA512 b909767cd538622dd15c0f4e4c049e659c32170d1b2dadeffa1cbd96e9986cd8d0188121a05c9c203ac5e4a2c4af0ce7bda8530ab58b96b9e2d5366f93fb66fa
+EBUILD aufs-sources-4.4.132.ebuild 2230 BLAKE2B 07640e4f3a186093582fb42621bc2d1695323af7d4289bb1286b5bbf61d37ddc37ecce351c01b7528a31f9ee72db38482205f0bb786a4cdad8e23490f4ef39bf SHA512 3bdae825a4e0f64f7b058d69013dc33f15f7ef5ea9a294b57421bbaf3112f1b072809c7794a4cd465d4fa1e32ae9a58adf97d91080be709ce73f67f819a5b47b
+EBUILD aufs-sources-4.4.133.ebuild 2230 BLAKE2B 85945d0a8115e1be379ee425a986f3d30de1a86bae098ca7dc616f0a7df80da93637471a4a7dd424dbd5df15e7def2f9addc63f936c0ac6ba98f8d14bc78ce0e SHA512 34bc24d804e802876bfd1ec38aa6beb85938a208ece8368859c36a6858d97aaceefa82c82ae3d051970f44458d37654bb55d8e629ff741a9a354bffe48c39cc8
+EBUILD aufs-sources-4.4.135.ebuild 2230 BLAKE2B bb6a91fc54c71e0905b351efaf03f8f1838246be1343e8f030311c0a3dd78126ab2b25c5464e89971bec3f7df3db44c194c8177800a4acec06fee5eeca7ac9f9 SHA512 397a5b2a18c4624de4d02fb08df7b4c4048818bfc48395834d67a94c1b1fad1ff8362412d4bdd17b0ac5bea09f5c97fe77519e231007b385fcd88f7d5942b3ee
 EBUILD aufs-sources-4.4.87-r1.ebuild 2229 BLAKE2B c833f0bdf1e89ee3f3a3258de89a4e53c1d35cd7774fd2e93e1ce0cc532f6995f4ff99d1df83de37acd82fac150fd7f305b08588e4b48727ac865b5758889381 SHA512 f6caec63aba14857d6992cc9d2edd2b6bc345c93a2ab36efe6b87e5d6412c295d64d4777bf9174a71d3fdecaa90d5af7596c66343a2b875d5be1b6d1e64971a1
+EBUILD aufs-sources-4.9.100.ebuild 2230 BLAKE2B 9d236af55189236f8a541d0142159b6a476bc78e91a3333fe2bf7fbeb2a2e773d6f0fafc1145fa4dc5ac6b8c2beb38e9ee306fa2793d0954f64ebf4d0ce82d8e SHA512 9234f0851480c00df10e10b46f11ba8edeb4e7b3700ce01866aad47f4855b40be5c3b122382271323c53b95ef1c6fd5eb664a215eab8d3382702ded1e58bbab1
+EBUILD aufs-sources-4.9.101.ebuild 2230 BLAKE2B 7959fa1bc1a8e93b37a9e0ed21bb79e72100774b9c1e9baa26d1e7a2ea96c809819a8a073ce02707ab815f3bf1a449614dd740a08005a4501bbd6153ff87f944 SHA512 dbbc9d6b17299fdcae1dbe73cfd04dafaf9b77b08ef9dd3ffa717ccd9a0d5c2ff8262763152848292dfa743cbb559b588f0213727ee8ee023ce29e486f324674
+EBUILD aufs-sources-4.9.102.ebuild 2230 BLAKE2B 9b61874340c06f323734ace76629b606107326b91a8241abe811737385d11ebb61d9dbfe54f1576a512b8c9fa555a60dfc46816b8ad6c04b91ca1053e2061dc3 SHA512 e6f70a5ce898806d4eb51732d6748ae3fae95e86ac5c4f8f5c85cce050d937657fac1e9def785293b3808d350391459687db3c5c580daed4f6602aa26da7f81b
+EBUILD aufs-sources-4.9.103.ebuild 2230 BLAKE2B 2c8bca578cd04b70552f47de1cc4c9c4ed7bbd55d49191e3f2c138a912fbf4a7bda2da27c6d1cf7efe1f941da94f067fd3ca71c702167bbfd7118f6d5b2bea1f SHA512 c6bdb6d6c2427400c32268fa976a2316c74682655515d82263e415d67f9df105a1cb4216fda115a41d483d74a5476ec1243d63e8eb0cc9835a88dc28b09bde2a
+EBUILD aufs-sources-4.9.105.ebuild 2230 BLAKE2B 517507d37998f58ef2786b85e2ccd8cd3bf6de4033e5212e33e5af05f6473f29794bb23dab4e565128403b0610861ffc224a9da9a89aeeffa58ff1e947963959 SHA512 274c76ddf415af6d72334ac2927f750401ee3278516f70ff11d68993d3e8f184785a977195992b6e52f98bc54f9dfcf96dcaa1f28e6280073a244460a9bee8b3
+EBUILD aufs-sources-4.9.106.ebuild 2230 BLAKE2B 7f4875ae063d462c2402eb64088d6ebb979829f86205ef032b4b956dee191e1a952abac4c3946a7de541d0e4497322a7ddd15dd526d229b8456c4b05c778982c SHA512 9d58e207d31078992775dffa30c6809b39f560e58567176f19429e8b4e90172871ed0fbe2e0da0c1ed5b28e51db97e6048a486a5a173ea983d2e5562bdb5545b
+EBUILD aufs-sources-4.9.107.ebuild 2230 BLAKE2B a5f574ea8e1df86601ed417a7b311e1ada6b36ae686ed10b0cd6ed0c0881c8b1458ff74e0afb8d98231d998b22db137ff32b135a948304992cfd6174163a0a7f SHA512 e405a5d3b6a7f5ee32e7cb27e207aa98f65d6f761112f0dfa1f01e109c81e0e5aafeffaeaf46fa785d49a7a3aaba37f1d471889d673ce7a028561bf0192ea673
 EBUILD aufs-sources-4.9.49-r1.ebuild 2229 BLAKE2B 2b551c3767df65c6008704f6e4c0beee15b26fc255e5f11f126b8f82950dee9c6797d7cf216898c3e4b50b3638fc7ffa2b77721611db325138e08cbb9cdabc70 SHA512 5c0a4dd8fce85cf8db60366e3bb8bf851310e00f02b368890e7f2cdda8ec8adc40791e77160081ac664ab86a8350d1508783f8a738a11bbe12e0c31e95d2ed9d
-EBUILD aufs-sources-4.9.67.ebuild 2229 BLAKE2B f153cc37109461ad6b3a9cf77276b89caf45cfdf72ea3206c559594aac73268706a9d01e92e7333c42a3b8602b31fe8c6c76762cf6b13581dd0ee5dd65ea8a0a SHA512 7fa142870ea13dd4c24f5afa0f60a874b9416c005ba00e4a755b10e5708dc9f348eea56097d4a44df11c52099cd0238dcfd906f90b9edd1bed3f3c2dc6fe68f9
-EBUILD aufs-sources-4.9.68.ebuild 2229 BLAKE2B 49917bd63d699ca1b9dcb1695577ea26f98a3b8ed6ad15cc398c30d498b4e3cca74457cba8c407bd1156500aeba649b6660704e7cf42447b5dcf8540fd7ce746 SHA512 b2abf30e79f8f6ccc33a1c0a7497ccda75ec966ce5623f4bc103c8fba7324fd2d82346657119d45ee80a86570c5b7858c37c2f78461119c66d50533ade4e830b
-EBUILD aufs-sources-4.9.69.ebuild 2229 BLAKE2B 2d3fbd87a6998f061a36541ace48835552befddf9550c1517d0bc657a07fdbd95dffe074d5e24dc25e460c65e62160f98dcccb95cedf743ae570ba6d1f4d2a1e SHA512 431374545f2a6d5e740d28d12cc020483563daa4954cca569f983dc42ed2c067f355d267a36797998abd30af5aa20dc97acdec3fb38c47b65d6c0680c7234009
-EBUILD aufs-sources-4.9.70.ebuild 2229 BLAKE2B e18ad1556fbc825949d180375fe2027c9e7ab9d612df49918f25f7aa1fb51eb0afd897e8b0fd594705abcf9033ecd0e024dc369467337d057aafc8a46d76c0ab SHA512 9a62a312fda315ec63fd8263e7b04b49fa142f1776bf980aea8411c3aa126ad78236d0714ebf5147f1e1dbd6c26e32f57d7fa62d8f054ca2f2b63524025d6cfc
-EBUILD aufs-sources-4.9.71.ebuild 2229 BLAKE2B 861d37c725ae689106876471e00fbe4e1703bef97692d3526ffa5c00f162e87f57cab9f1d26313f70b21d6594d47c231aaf98d8c46d72ddcd6b79d387c74a26c SHA512 5ac4742eeb774f1117cc9f08cc93ab7713d45c36e6171c045c9699559029df96957ee0c12440b2f453012ebb5df1af43a61305e68f52fa69c7bb59ed7d6a3c38
 EBUILD aufs-sources-4.9.72.ebuild 2229 BLAKE2B 3d61a3886f2714e24576fa4dea00002f54ec815c6a4523789aacfcfcb3e7a0bf0cc3c6a374c0bb1fed643b413a3f1b116fd21721ae8b4787034aa48cf156f5bd SHA512 55520bcfa08ed8932d2d40c3c10824e1bdcc9bcd97cdfdc248a3baedfd342d5fb327604afc48c0c9d83f1f5ede109103b836e0f4ba5203b7c35ab7df6066d657
-EBUILD aufs-sources-4.9.73.ebuild 2229 BLAKE2B 16f502f67d0c46392f526ca5b8b82dfde2546f15ae155c5b05ba954795e4378dffef6d532a29bf7d7f9a618d944836b1a99e7d5179a4e242bded1eb2a9d2bea1 SHA512 9e92aa62a7d73e478d3c0b06691b94677653b40a940a529d3e6c236c149133ad92f7946f55eb900841a4fe609b002160da7791e365b659f6053e2d08a7c0534e
-EBUILD aufs-sources-4.9.74.ebuild 2229 BLAKE2B 17a7b6d1e198b67b760a00aef12555b3cbe7b43722a4ed28e8562293f0a718681e022c32191fe089b47e757cea87ed0ae661da46e5f25cfa8c125165a3839cc8 SHA512 3a605c5e8cddb72edb3900cd450976ea19413184a0839239614e7a12fddf6d30d2d2de82e6833938b4075e45e551accbb2f78421c0848d91406aa50ff4097e63
-EBUILD aufs-sources-4.9.75.ebuild 2229 BLAKE2B 9ff408aefe8e05d2b0518fcf7545f9d76c243cabb42764e2795f1331ea61a75dcdac7cb0d5af49d42ef1a8cdd5a70ae16afb14b2b4f733920d98ca3a6a5481dc SHA512 e123d7c0db26c0c8f8d5b349fa286098bcdc395a4493094bdfa32b0652e57a30ee4b910904489018f85fb94fa3c8a09993c0a27cedf1b0fb8471686b8d0dc1e4
 EBUILD aufs-sources-4.9.76-r1.ebuild 2229 BLAKE2B 85b1d667b2d821a5af3d620f1c521a648a712b3f478af806363a395fd49b875e07cffed452016b829ae07285668d90ee3c5815f95f92891669ed27f96ee0782f SHA512 4d3cd4a437b4ff07f5702fd49a849e8a0366e3adc5e216de1b04e360900c85d268d4745ed1ae8ad6a54c7a2eaecad7e37ff606f2182a1d3ea1ee0b1d7d6ab0d6
-EBUILD aufs-sources-4.9.76.ebuild 2229 BLAKE2B 9d94d40fc813e29f986e517b247f0cf7158f4dcb1d2261e44bd972bd47e9c6405a332ac0928b66dda85d2cc0edc3ce1ea487e68b5f2cc3cd2a66940f7fa78722 SHA512 a3f09b0f91d4422255f00a4c8b3a378db79e6e9176dbb9b16259086c39e709f39403208765efbab0e3153d017eae18b2968504c4ec22a32b3642694c1b2affc8
-EBUILD aufs-sources-4.9.77.ebuild 2229 BLAKE2B f8c8f5366b34c73fac36fa260564cca9e594a384bbdeeb69b7a890cfce43b9c4d467f81c67486660d13be91b15835ac8859211a82d613ef76a777922f67433e1 SHA512 7e8e4d6d72e5cb178c18dc363998ceb32e0689344db4fb2630f29d3438b7dffd25207789d2d2f71724896e43b3aa5e5330c38bbd4df7103b5d0cbf344d19b341
-EBUILD aufs-sources-4.9.78.ebuild 2229 BLAKE2B 008093633065466d15fd74bc4bebbfb102638bf1c011d8ed05fd75cdcb0bf54a3bc6645b30112edb2cef8a7163ca6b4242a0b77c431e7f9d400ecf21f2f741fd SHA512 0ae9e17f0c2981c9223e04145328b445488175ceae1212f258b23644e5de935092f23777bdbf1ae2b9e5ffdb5fab9591552fb3b280f9262cefb9c351dbabdd7d
-EBUILD aufs-sources-4.9.79.ebuild 2229 BLAKE2B 36f2a38f5399f93dd19cda204528365ed8316ced72cdb70e914119351910bd130c5f6133e36fc58cf12f3165b7267429b1cc46a4e7d0b367188cf47bb94e15c9 SHA512 c51b40d119a0f7e031a3ca3c31b28e8c486087e6bfd22c6216a3796e657f8df0188c2a5719c3060c5902243f19051d4de5c5cf148e65ed830b98c678f2857a73
-EBUILD aufs-sources-4.9.80.ebuild 2229 BLAKE2B 41bcf2d0af8282cc76819b692a1808f9e6e49f4adf443376a1f7adaa0ee91d3b846210aead25958a14c62b12e099ecfedbc72efb6e620bb4e70eeb85b72ce177 SHA512 156d6fb24446b4661b9310714b34a6505bb0046e5123af56f134b5dcf99065986a1de6bff6811f0e22f765f4099531d8c25c3d452d7f50bb487350a36e1c4b0b
-EBUILD aufs-sources-4.9.81.ebuild 2229 BLAKE2B ab6d5b2d73c2cd065859ac1aaa98b94be116b30f5b3a6d9fc3ad37c057e4c3c6caead99c5645b08140e5b344ebe4af8aa8c665f9bc6e30189270f7ff86f430f5 SHA512 6fbca75700356acfe1a7586474d4c2198595ddf5d5a44fff61ace2c838d67dcc5472b7d55dcd521aa6266b7a7dd9eff7499762344b25248f2b7769ed91b4ee6c
-EBUILD aufs-sources-4.9.82.ebuild 2229 BLAKE2B e580f5cff44c3351b9c949fb25284ed37483f473c7bf365b1b55b77edd8f8215997b5a32ea43dbbe1b5653930d60017513774c0e69ba7998fd8d2c361ce769ae SHA512 8ff4dbd47861c828df210caad4bf13f3cd3632525c0e0f79b32ca00928b0be8db687b87b6a388e4effe0bab1d7bdaa23929f43663430b754fcd32180e221d9bb
-EBUILD aufs-sources-4.9.83.ebuild 2229 BLAKE2B b9a8d78e786be55ad40ce253cc7fb4788fc8b5a5fef0b6fd603b81fff795731ed1a6ddfa269812095ad4e64ed307324d9655a280a0d4e45ecce882e0349ab734 SHA512 e6f28c5eeaf050c4bf9e05f608bb51ecf356fc84c4d138b65f23ca270ab16611e3870df11d262e54363f35823fb9ef2a291ac1fc6580434a6b915efffbe51c49
-EBUILD aufs-sources-4.9.84.ebuild 2229 BLAKE2B 942e67a5f19770bf62c957b25ab86470097bc3044fbce14893261d20eb342b2dc4b624a9dddc325d0897cd5ca67b91065c090dcd8c7ff34fa0436d781c71e2cb SHA512 a678d57531f7ecc5828cc3002d5e4983bde668b5bc68c56771287560d277a97b3c01494dd05feb891ebbf9717e6dab30df60c12d42506d44d17b265474357899
 EBUILD aufs-sources-4.9.85.ebuild 2229 BLAKE2B b39af5fd11c8a064f891586b63a7edcd02d0a81fa435d3ff1ed890485ed8ea5e250fcfebb8d8f61d2010e5887feb3135d9bac0382596e2eeded9aa3e75be33ef SHA512 24f3258edb29ca79afb25a84896f408bf0f55e37b1720b6cedabe015ad2f2bf98c84dc0cbd06df71db1b4939891d86a1489d5b15c43c2eb0c4f0da1759fb7018
-EBUILD aufs-sources-4.9.86.ebuild 2229 BLAKE2B 6850f76d314927b8317f38bb764fd2073317b100fb49c35b5d88b1c82b95f8d9c3a36c958f7a800665d64607285b6dc96c7c8518f8bbd87cb9cf5260bed691b9 SHA512 eda588ee282b81de222a73be9de81c46a0b92e30b3fef80512fadcf827d9fb479a9043033da5ed4cba41df43bc52e5ce5f31fca31d8214b472eef1cec3a1f8a4
-EBUILD aufs-sources-4.9.87.ebuild 2229 BLAKE2B 041b651906086d4ae0a4c292dfc85a8611362b1fe1a540e804d3333e97f29cf639583562f20d3800d746e35fb49e5a0cb4ad1b2e80e58cddcc60e91141e404e7 SHA512 a9c3fec1b324d51c09b0dd13cb17981c99ccb510578b9879306acbeb1c98cecb96b57d0d9dfb34d689836632b124f7ab0b6c470a4dcec19282386ed563f7f6c0
-EBUILD aufs-sources-4.9.88.ebuild 2229 BLAKE2B 0313e6e00be6bcf6ee27df037a15e3fa8e2aa64ba9c0c76c72586ca9c640713246c1c787ad404f077fbcda847ccef11a41d55eecfc5cdbc494999fa94090ebc6 SHA512 b788dab3515a861defa2b11783d52cf2327f9abb175e483ffb731882f4ad6b3bb92b2f2735c52377ecbe1724de935bda589adf11b2fd53f4819f6747fe45d891
-EBUILD aufs-sources-4.9.89.ebuild 2229 BLAKE2B a2360bfe3fcddc4c91da619bed7a42556d0fc567fb02b7941cf561ef84ab117a4547de93345e4ca2dd88afd18c845f6a7943a49819e3f5b0de4a479c3a2496fb SHA512 eba62f22a87537fee32c8604d36b7836a4c474b091469f6df3843277ec2d868e3d3c1bac239fb7be0b4aedfd96fea1ce872f634afb22ab1bb7365b0f2f678898
-EBUILD aufs-sources-4.9.90.ebuild 2229 BLAKE2B bd471c1af06ad052c237f75e8e595e5110c8a25a3aed8cf20bd24e120938c8d3a580df75edeb98d5a45436f193772cdf82ad56dd66c7409d2d9e642b57ceb6d9 SHA512 981bfd1cae288785bf4a24a2ede15127235e01ca2323c52caf2594b66667ea9274f053538462407ba7f6bc136b5038fe4377825755db7357a70dca7a597389bd
-EBUILD aufs-sources-4.9.91.ebuild 2229 BLAKE2B 7308250f4ed1697200e0c063a0b2bca46d494527fcb6ba8a6cc6176a4dd39adc3eb2e7d00284600209760fcb4555db6fa2d35b4cc500f212c39e5a69ecc0a7d5 SHA512 61a3ec37aaa20dda4361397be9e42385b0ac37a891e79473c7d9730d8716a8c9df8f10d23ca2faa38d1d9672f23d54b082ae9af8a905d2ba07d8193363d4ac6b
+EBUILD aufs-sources-4.9.95.ebuild 2229 BLAKE2B 856ec9dbc8d8b92950cff9b458a59389339904301cd8813b3740aaa17283985300c6eb6a277911c30d28a426aa0f7a2b8efabb6cfb242266f6d3004179bb513c SHA512 77b91d55f91d5e76363bde930a2b5b14ba7c4157ce06c96f4f286bcbb584624ffc1d5fce73fff4fa788e40f001f0ffeffcccf7287bc2d9e1d0667e8e1ad41e68
+EBUILD aufs-sources-4.9.96.ebuild 2229 BLAKE2B 04a7df205f98471f942173aaaa40dd5baf6bebde024c1a61e7efa3a647d979e29d8cf85baf9d30f13af16d33495249ff12e49ee3b3828132c09c276e7a1a5576 SHA512 68368dbe186517d8e44773804e3d831ace170f5551b41d8fb6b6e4f43af931002f1f0399bfe8caafc7d5f09fe40af4f5f06350ee1d0a1b8d2ce934b9bc4934cc
+EBUILD aufs-sources-4.9.97.ebuild 2230 BLAKE2B 371cf767da0ee64c6e932975e584c914a79672d2565c1d49c04b49168f7acf0da5140d536ead8a5f3a23b846a9675209d6e09d8b2bda656298e803a983bb3b1e SHA512 a564c68f23b7f68217016505becb58b596af0eb5af47c7ae21b5df71433bef782184a3c6bb75fa673849eef2d79344ebf1f3d7de673e0c0df9a88ec6e0cffa57
+EBUILD aufs-sources-4.9.98.ebuild 2230 BLAKE2B bd749462d3a91b54a22422e29a1453237ab7d8f74afe5a34f9190ab15af69239aad51555f433b59d83ac6b205637a3affb8268aa187fb93490d1a0ebb49bb12a SHA512 3a0758ba9bb8e36569cc943c466aeab457c5ec4e2775431ce72382cd5a14f2ffedb4bd825260cd010be6576e92cb7e2702f8b586d51a6f41548476ccb4b945b8
+EBUILD aufs-sources-4.9.99.ebuild 2230 BLAKE2B 5967a905c3c86e72700f777e10c72f019e6950d8ef58a6abcc9f67e941af42567db7713d64cf3db26f33e3d65d32b1caefb58f08dcc91f82907d050e55e4a7a2 SHA512 119f97f79d208dc9b771d4f9d8b163bbd87d2cff3eecd37d7a2d6ea912ebc294fbcb6e60b692312f414875e7bb1e8a71370f680994396be2c83811c1f12d818f
 MISC metadata.xml 786 BLAKE2B 4a7ec566e14be79c65ccf8f9b04db4c66ef27e0940af8d3d870a3f08d96bbc8987836100aff699d90a5564a1986c929af02b9cb00553ed3f400378ca20f41fda SHA512 95853521c2369a4bfa752be73e2e7e8e5665e790a5763c7d347da1762ac142fd6caec3e20f7d31f58c16f3a38df6dfcca63b296569b7131dcbd72eeb23e9d3ff
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.26.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.26.ebuild
deleted file mode 100644
index 510816093128..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.26.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=31
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.27.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.27.ebuild
deleted file mode 100644
index ee6680d20451..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.27.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=32
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.28.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.28.ebuild
deleted file mode 100644
index 215b0504d81c..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.28.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=33
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.29.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.29.ebuild
deleted file mode 100644
index d19219e7af85..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.29.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=34
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.30.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.30.ebuild
deleted file mode 100644
index aa7ac3c2c04c..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.30.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=35
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.31.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.31.ebuild
deleted file mode 100644
index 88751b85dbaf..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.31.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=36
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.14_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.34.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.34.ebuild
new file mode 100644
index 000000000000..b2a1f7cee30e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.34.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=39
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.35.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.35.ebuild
new file mode 100644
index 000000000000..396347248873
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.35.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=40
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.36.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.36.ebuild
new file mode 100644
index 000000000000..fb5955431895
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.36.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=41
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.37.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.37.ebuild
new file mode 100644
index 000000000000..ea69d7f5429c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.37.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=42
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.38.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.38.ebuild
new file mode 100644
index 000000000000..5dab7135a42e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.38.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=43
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.39.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.39.ebuild
new file mode 100644
index 000000000000..42e87de512a0
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.39.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=44
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.40.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.40.ebuild
new file mode 100644
index 000000000000..f6adb3ded5b7
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.40.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=45
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.41.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.41.ebuild
new file mode 100644
index 000000000000..9e4d95f1e118
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.41.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=46
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.42.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.42.ebuild
new file mode 100644
index 000000000000..b178020cbb32
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.42.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=47
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.43.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.43.ebuild
new file mode 100644
index 000000000000..1395dad1ff6f
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.43.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=48
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.44.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.44.ebuild
new file mode 100644
index 000000000000..2b41afa2393e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.44.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=49
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.47.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.47.ebuild
new file mode 100644
index 000000000000..380fe9f6c872
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.47.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=51
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.48.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.48.ebuild
new file mode 100644
index 000000000000..15263fbf9036
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.48.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=52
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.0.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.0.ebuild
deleted file mode 100644
index cf31ea34944d..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=1
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.1.ebuild
deleted file mode 100644
index fdaafdc5b9b7..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=2
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.10.ebuild
deleted file mode 100644
index 20c6e2427b3f..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=13
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.11.ebuild
deleted file mode 100644
index af799f90b12f..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.11.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=14
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.12.ebuild
deleted file mode 100644
index 6a24365d7894..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=15
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.13.ebuild
deleted file mode 100644
index 96d6f7770e5c..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.13.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=16
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.14.ebuild
deleted file mode 100644
index 2c10930620b0..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.14.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=17
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.16.ebuild
new file mode 100644
index 000000000000..5bed7204d93c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.15.16.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=19
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.15_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.17.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.17.ebuild
new file mode 100644
index 000000000000..a306f09990f6
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.15.17.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=20
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.15_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.18.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.18.ebuild
new file mode 100644
index 000000000000..5730a5d10b9e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.15.18.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=21
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.15_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.2.ebuild
deleted file mode 100644
index 9ea83777c0ea..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=3
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.3.ebuild
deleted file mode 100644
index fbce381736c0..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=4
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.4.ebuild
deleted file mode 100644
index 5467799a2742..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=5
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.5.ebuild
deleted file mode 100644
index 87ea14d8ad54..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=6
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.6.ebuild
deleted file mode 100644
index 332c84430505..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=7
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.7-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.7-r1.ebuild
deleted file mode 100644
index cc261075b466..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.7-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=9
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.8.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.8.ebuild
deleted file mode 100644
index f3cf5dea284b..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=11
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.15.9.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.15.9.ebuild
deleted file mode 100644
index e0e38f6a9dee..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.15.9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=12
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.15_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.10.ebuild
new file mode 100644
index 000000000000..f1001a5bae7f
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.10.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=11
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.11.ebuild
new file mode 100644
index 000000000000..ae0c62022aa3
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.11.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=12
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.12.ebuild
new file mode 100644
index 000000000000..878b5710eef1
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.12.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=13
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.13.ebuild
new file mode 100644
index 000000000000..85c5fa2affb6
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.13.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=14
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.14.ebuild
new file mode 100644
index 000000000000..d8b5b7fd44cd
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.14.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=15
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.3.ebuild
new file mode 100644
index 000000000000..03afea18b0cc
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=4
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.4.ebuild
new file mode 100644
index 000000000000..ed0df61eb059
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=5
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.5.ebuild
new file mode 100644
index 000000000000..dcf0f21e11e2
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=6
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.6.ebuild
new file mode 100644
index 000000000000..1afa2db986e8
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=7
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.7.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.7.ebuild
new file mode 100644
index 000000000000..9194e4a721a7
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=8
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.8.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.8.ebuild
new file mode 100644
index 000000000000..7043d38fcf00
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.8.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=9
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.9.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.9.ebuild
new file mode 100644
index 000000000000..a60fbad6c98b
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=10
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.16_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.104.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.104.ebuild
deleted file mode 100644
index f40f8ac7cc1b..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.104.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=107
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.105.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.105.ebuild
deleted file mode 100644
index 8f2ad18b26f9..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.105.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=108
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.106.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.106.ebuild
deleted file mode 100644
index 4ed196d2d2ae..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.106.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=109
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.107.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.107.ebuild
deleted file mode 100644
index 087a53f29f2d..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.107.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=110
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.108.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.108.ebuild
deleted file mode 100644
index fe22d7c234a6..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.108.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=111
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.109.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.109.ebuild
deleted file mode 100644
index 60df19f52e1e..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.109.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=112
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.110.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.110.ebuild
deleted file mode 100644
index c156c4b249f5..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.110.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=113
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.111.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.111.ebuild
deleted file mode 100644
index 4d89a7e5aa3c..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.111.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=114
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.112.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.112.ebuild
deleted file mode 100644
index 8d4bd66b5933..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.112.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=116
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.113.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.113.ebuild
deleted file mode 100644
index 19914acca573..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.113.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=117
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.114.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.114.ebuild
deleted file mode 100644
index 19d856eddf3a..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.114.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=118
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.115.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.115.ebuild
deleted file mode 100644
index 57616d4dcc58..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.115.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=119
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.116.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.116.ebuild
deleted file mode 100644
index 07afb8c732d2..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.116.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=120
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.117.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.117.ebuild
deleted file mode 100644
index a92d898d9334..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.117.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=121
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.118.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.118.ebuild
deleted file mode 100644
index 66a725f1dfef..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.118.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=122
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.119.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.119.ebuild
deleted file mode 100644
index d4ad828a42ac..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.119.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=123
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.120.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.120.ebuild
deleted file mode 100644
index 8163371a60d3..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.120.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=124
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.121.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.121.ebuild
deleted file mode 100644
index 16b67e23f7b6..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.121.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=125
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.123.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.123.ebuild
deleted file mode 100644
index ed21cd8b3523..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.123.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=126
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.124.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.124.ebuild
deleted file mode 100644
index 59cceb3f4777..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.124.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=127
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.128.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.128.ebuild
new file mode 100644
index 000000000000..84551e23b668
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.128.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=130
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.129.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.129.ebuild
new file mode 100644
index 000000000000..f70970090386
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.129.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=131
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.130.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.130.ebuild
new file mode 100644
index 000000000000..c607bcdf93e0
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.130.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=132
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.131.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.131.ebuild
new file mode 100644
index 000000000000..c6d8f785326a
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.131.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=133
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.132.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.132.ebuild
new file mode 100644
index 000000000000..baa4c8f3494c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.132.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=134
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.133.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.133.ebuild
new file mode 100644
index 000000000000..aae706aa4e7a
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.133.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=135
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.135.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.135.ebuild
new file mode 100644
index 000000000000..dfe32bca5e24
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.135.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=137
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.100.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.100.ebuild
new file mode 100644
index 000000000000..d85c2d2e1eed
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.100.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=103
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.101.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.101.ebuild
new file mode 100644
index 000000000000..fb6c789652e3
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.101.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=104
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.102.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.102.ebuild
new file mode 100644
index 000000000000..f9d4f5b1f4b6
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.102.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=105
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.103.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.103.ebuild
new file mode 100644
index 000000000000..abdc157b5a7a
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.103.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=106
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.105.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.105.ebuild
new file mode 100644
index 000000000000..43c5740ca785
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.105.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=108
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.106.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.106.ebuild
new file mode 100644
index 000000000000..ff7a0dfa826a
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.106.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=109
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.107.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.107.ebuild
new file mode 100644
index 000000000000..745f886136f8
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.107.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=110
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.67.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.67.ebuild
deleted file mode 100644
index abe25bad71c6..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.67.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=69
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.68.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.68.ebuild
deleted file mode 100644
index b58f402b41b6..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.68.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=70
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.69.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.69.ebuild
deleted file mode 100644
index 7fe87fae3807..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.69.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=71
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.70.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.70.ebuild
deleted file mode 100644
index 81d63353ada4..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.70.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=72
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.71.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.71.ebuild
deleted file mode 100644
index d4360be94dc9..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.71.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=73
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.73.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.73.ebuild
deleted file mode 100644
index f13f77f24e21..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.73.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=75
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.74.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.74.ebuild
deleted file mode 100644
index 6985093e8bce..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.74.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=76
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.75.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.75.ebuild
deleted file mode 100644
index 8e3ab5960856..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.75.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=77
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.76.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.76.ebuild
deleted file mode 100644
index c34d0a77513c..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.76.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=78
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.77.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.77.ebuild
deleted file mode 100644
index 243aeffe311a..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.77.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=80
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.78.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.78.ebuild
deleted file mode 100644
index 00d7ee1f83b0..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.78.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=81
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171127
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.79.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.79.ebuild
deleted file mode 100644
index 59efdd7460fb..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.79.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=82
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.80.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.80.ebuild
deleted file mode 100644
index 659bb3c6db37..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.80.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=83
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.81.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.81.ebuild
deleted file mode 100644
index d9880e972b38..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.81.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=84
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.82.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.82.ebuild
deleted file mode 100644
index 10b3c631ae48..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.82.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=85
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.83.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.83.ebuild
deleted file mode 100644
index 9b92dcec5db4..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.83.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=86
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.84.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.84.ebuild
deleted file mode 100644
index e0576c5c7de0..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.84.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=87
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.86.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.86.ebuild
deleted file mode 100644
index 215dd091026f..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.86.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=89
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180219
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.87.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.87.ebuild
deleted file mode 100644
index 2b4907023a50..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.87.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=90
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.88.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.88.ebuild
deleted file mode 100644
index fa5f7fb156d3..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.88.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=91
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.89.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.89.ebuild
deleted file mode 100644
index 647d006f528a..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.89.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=92
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.90.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.90.ebuild
deleted file mode 100644
index 1d6ebd0b4c72..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.90.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=93
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.91.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.91.ebuild
deleted file mode 100644
index 843964c185ea..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.91.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=94
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20180312
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.95.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.95.ebuild
new file mode 100644
index 000000000000..7f2578ea5203
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.95.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=98
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.96.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.96.ebuild
new file mode 100644
index 000000000000..94fdacfc77d6
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.96.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=99
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.97.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.97.ebuild
new file mode 100644
index 000000000000..012b6591b26b
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.97.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=100
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.98.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.98.ebuild
new file mode 100644
index 000000000000..efb628eb233e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.98.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=101
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.99.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.99.ebuild
new file mode 100644
index 000000000000..2cffacbea565
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.99.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=102
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180409
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 4d8bef80a4c8..5b2a02d15602 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -32,6 +32,9 @@ DIST genpatches-4.14-49.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12
 DIST genpatches-4.14-51.base.tar.xz 1377292 BLAKE2B e438be087cc2f48fa174f568008687dc8f0352fc15352c5e9d59ab9b741fd836f5ef9adf3284b843a2dffea1d34c735e2f08bccee23ca93470dbb32bbda1750f SHA512 a421da5d03d099808202f2c032c29a55967a8053177fa60b9181ef0668d1b38182440b7d5699696560f165b380e2d007cd6d9f9b8cf1ab6e91fb44826692155f
 DIST genpatches-4.14-51.experimental.tar.xz 5184 BLAKE2B bb7b10584d230d6295bd57e50eeacffab7044061ba09806e812c18e4d5926516ec5674cfd8925fc838304987b115509aaaea07f8f3af1c4822bae0df78476363 SHA512 b79937209b305e1738c857a8bbd46a1394cc4893fd5052eb5f037edc6c29d83b3ef013eecc2ff93da08b8a90cdebc169e277be0f81231c26468091ff33e6d9dd
 DIST genpatches-4.14-51.extras.tar.xz 17496 BLAKE2B 115e99b501a0119809f2abe84c3bb8a66b2b450f53003441593654c23a4bb653c4b40da1ba31e53f7f4db69c99511b2dd41f53b4adf8bd377714b1ace8abd9e2 SHA512 a01c90e36504f17495c8691ba6fa99870fd03b65299730df57e767e2562a90b6a04da24c50983cb8ea12ac276e6805f3b5fdaa30ad175ae5ee28f147f75dc3ec
+DIST genpatches-4.14-52.base.tar.xz 1393612 BLAKE2B f408007ae60b6580104f0a2ba35af383bb294508800540d62593a4d0cf57addc518b926a7ca8c0398c89c6762b0389de553af189a100031929770a5b84d08ce0 SHA512 f114baf7273dde352905f1dff5dd72f4822f01ba906ba04d49f68ff779d9b27359564f15e57d3d091fe942c8c1d679227020e5937fe82ac5dcb59d270104b971
+DIST genpatches-4.14-52.experimental.tar.xz 5188 BLAKE2B 8212503f164cfbba9d6d59624ed29bea6ae1a5a027cf6afa484e90c931a4cc32c954216e91a442ad27834049ce90a4b262aa82b14763c72096d933d8459977ca SHA512 8475a0f915b49e003ba362f47e909ae97bf9dd2f94c8eb96fbf07899fc6884309f4f49bc17ab49de0bd8ad0066ef1e63cf1d19ba2d8a493ea1478b431e2d2034
+DIST genpatches-4.14-52.extras.tar.xz 17496 BLAKE2B 402ab3be4571457aa71ad0e4785abc5ca4ab3b245d7009bb3c89d730f57b4cf78b6e7b0127907c31e4a21e96f3de367e19a71778d3dcf02ec269345d60a02cd2 SHA512 fc3d536bfa95854ddf788de3bd603a44b4aad3cfd11e464e54b7bcdd328513a048ff3a4e882c4a90fd3d21989aa3e5c0b46f4d0f22d58b93f3bab0f95801694f
 DIST genpatches-4.15-20.base.tar.xz 464468 BLAKE2B b3c30e02819663b31b4ed83794d57c4521fe13015a4419088664f017f4753117bbc88a5600e310092d8eaf8b132b0757d59fb7b503abef046db0249ed7ae96e6 SHA512 cf79c85b65f3a68d3d721d2425fb6e498df808097bd8b1c610023d0c36c0378ec0f92d33ee0dc39592730d87f4a1df52931ea9608be2d56d5543a201f9d1d658
 DIST genpatches-4.15-20.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
 DIST genpatches-4.15-20.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e
@@ -53,6 +56,9 @@ DIST genpatches-4.16-13.extras.tar.xz 17476 BLAKE2B 72ebf7259d9157612350f0e7565c
 DIST genpatches-4.16-14.base.tar.xz 387692 BLAKE2B 4dad10e5bdacc39015381129508e15b1c30b6f191b3b3d5e7d66e89f8e7e3f9c40c81fb8596d38ca846c3747cc1ed722ac59a2bfa7984540c6466fe96a419f67 SHA512 70514f91e7575a87121dd7b5c8b2cf545d60253174eb8eef520e57beefc0d5c516fb1d48d963cebd60c85994744c5bb62576844feb9d1fc05aec9a21830aee9e
 DIST genpatches-4.16-14.experimental.tar.xz 5168 BLAKE2B 08bac33d41aeff4e675590484c5bc682cb420b38b3041e055b6c9b12d466b16dfafc5f8186e05b7797eecefaee7357a2a2b5729757a6880cfeb038d62624cbb8 SHA512 74da59061bdcafe29f8fa7142c132896f55597d992ee2ca365998af3f23c0ae48828664c1e435f7ea2d7e8b93682411f8c00cda3aaf79cd6535f5e8bf6ce62d5
 DIST genpatches-4.16-14.extras.tar.xz 17488 BLAKE2B ef216bc2349f04ff2b9f6a0fff48c9b92d18c0a3c6fa343b8b5800131d18f0adb5b59320b478faed7eaae59c760800ca9e324bc82079a017f707771f82c247d2 SHA512 a0e4d0c7dcb4a4d19a37edae9fa4b79913fded0df8c9282e196dceeede283ac15ba59e9a0e4cd92d567fe12f1c5e3394ba1625168bf8d4207ccf4a99a65e894c
+DIST genpatches-4.16-15.base.tar.xz 402268 BLAKE2B 1ce1a4da6e6ed219554adbf9acd0816747298c375a17794831ca9ecacd5bcf8c23c6eb49ab83d04d15b732f5ce6611be98f1d5acf151f3af172cfc6e48dab23d SHA512 2a5d0a8f83597bed7ee6000786d336729d53a2d76b674c14f4f92230cfb4cae6aca688ad70f0aa922e4826eddb0eb5d6d3b8d63ac207c54c52781759dd90c4ce
+DIST genpatches-4.16-15.experimental.tar.xz 5164 BLAKE2B c059c922b3f371ba3fbea51e714ee056d59a7326ddcc122f0c1e94055793d654e8a57faee263fd7b70a088a092e3b1d828befcf406d3d647291ce17782dadcde SHA512 ef3f4590aa9e4801c648b520a49eace811051422c4d849d80dd3d0ada07b71fd955cf520c8f1ce3d1c41d1bcc9f11f0fe05f329ca67f9098e924da3deb65d51b
+DIST genpatches-4.16-15.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12fc6b227ac994201f9b31872342c63d930d4280bd1f93625c148eefb126f9269fc1fea1872ac4920ba679938c6aec7d916449 SHA512 a32823c41c47b26110da59d63bd6104d8b38ae9ecac43e87ec03ecef726349475e40fe88354a1680bf816a12f6edd0dbfb1a2b2865be0a0716047b12d2cfbded
 DIST genpatches-4.16-9.base.tar.xz 196768 BLAKE2B 25c4b6a22a9a07af643ddc73fea2cf6e997f5cca89f86cf8386286d1b63e0c0dd393f138f66f87773d9eba382bcaec3a2562d2a4c22140a61358cd2612e11d4f SHA512 aab3c760270e8d72c892d58a88fac3db792150a8f7157a2fb656d52ecfb29c9f6a049783ec9583b98b9cfd09ae6f77f672ef375d6a260cb2cb4df8157e5398a7
 DIST genpatches-4.16-9.experimental.tar.xz 5164 BLAKE2B 0e8c1ce1a65404faafe4c0c7163cf87ce4ba4195edec6caab0dcbffff5351c6b211b233b6b659a7521e48e11e0fcf726e23341728591e9dbf305a4cac4500175 SHA512 9b4003d7902152183e4a76c54e0d4d09da33c9956aadafef4b11cdde81f7539a0d7931f4ae7d4d7e02928bbd7c128eba5fda00319723c1f7c2a7abb34ecddc9c
 DIST genpatches-4.16-9.extras.tar.xz 17492 BLAKE2B 2e9bb4e33e33f0b5ba923bc0036a3697abefcf7c439dfba68beb0c4d0a558dffde1c9224f56da6bbea560bec3664cb1025c0ce1c961037598523d1af0d0513fb SHA512 e1ed8a1532488aa849969a90bf299eaf39233695eb9bda7b070a87906b8891e2332a06234d4b2c98338b04380020387b8fb212dc95072ae79cc58274e8118656
@@ -74,6 +80,9 @@ DIST genpatches-4.9-106.extras.tar.xz 17348 BLAKE2B 9375cb4cc0ccd3a31ef41b7a5d9e
 DIST genpatches-4.9-108.base.tar.xz 2109320 BLAKE2B 0b6090a5f84a6aea248f6e1ab784cde6e361deb38332486870625ad73d35e7bbb677d6dba2e423e0d946f0f896c6aca8833d9aa51dad6fcd2a18586ff267aecb SHA512 831ca65141984839bee54a16e66b2f45f7f91197d7413b3c54167cab8e14aa52eb3199e2a39f4000d83ed22b601eebe05acc3503dff35e375e3467207cb04ae7
 DIST genpatches-4.9-108.experimental.tar.xz 106392 BLAKE2B 9372c6e3674c0821afdad18b02ec96433e3d05f966a3258949ab15cce4bcb9318880a2c003a8e2b11e230051dfc4614c14c42a7195d492241f398a0ebf51d32f SHA512 c04f80593307cf95f5042b31cd664bfd67dbdc20bc33357c6ec2da749183e34381c218ca9206beb4e962ac9c1aa3033c22c724717016c82be913d208968890c7
 DIST genpatches-4.9-108.extras.tar.xz 17348 BLAKE2B 2c1b5ebbe4075a645b2f19bc516f41634e270c27294f71d6f44cba8009c8f29b39cff16c1ea59368c03c5e17f737bf2bf5e0917ae2c3fe4a53530f89d52dbe80 SHA512 7b55d30a37b234e9de1fd3d34ea0177d7913fbde1451d5b9232a72c096f5fe218aaefa73169fe3473d2e802e0f8c7785d0e9fa9a501a99b52e6e2fcfc95445c8
+DIST genpatches-4.9-110.base.tar.xz 2180268 BLAKE2B fe0f707079302189ac484fcb67151216cbfc9c84627db81aaf5db32a5dd371ee1a356379a9592ea86d51a7a7534c117dea4be71706ed8b591bfd60e30ebe0c93 SHA512 0b957de2d1f2d09e69a4850dcb31fe0c12d7ab701479d7b952523c9c2c6c4ea1b8ae1521fd02c18c312cc4399dfc81989f2cb7fac0b3468f1bb9e92cb554a6b4
+DIST genpatches-4.9-110.experimental.tar.xz 106392 BLAKE2B 831759d456c12bcfb433f0eb8e4b90b8f2337741415b3272ff77af8d7bc510cc548287318b6672794ae66f645efedfb37c9dd65333fcf2cdd804bda29bbae4bd SHA512 fae0aad5cee94b79bf7f2b70c4d95704408ac5615056aa590a7eb5586234eb46da2b2eb90c762df84b1d0713b84e6aade1505b8ac24e7cb7a08e158782d2fbed
+DIST genpatches-4.9-110.extras.tar.xz 17352 BLAKE2B c4d6d32fd0e61bfb439a543694bf266bb83e886f69b28d03bd1af12e10dbfb4d822517c15688b0acc4473329035a3b87028b3ba39c52429fa385a2125c27db5f SHA512 5adb32f3970030b7cb9e237070ff38d055e2143237c9198e9c651d80102efa1be48e7ce5de5d9515ae7d1363523c4e6c2774d933812b68f4be72824f31daba45
 DIST genpatches-4.9-96.base.tar.xz 1813704 BLAKE2B 43236fbdf22137a2f98c617919e3a21208cf7269a5d5e51d705734610e348f443b57677e3c00aa1d75a73c68314de537252eb24bd23cf83e8d7de05c2f111526 SHA512 c8275aad26fce06c6f8286d4341964031aaa5308ee4e0396fde48f3abbc97fc47db6bcc67764ba424dbed6d93fcc935f07831c20c5dada21acdd9e2d9575a5d8
 DIST genpatches-4.9-96.experimental.tar.xz 106408 BLAKE2B a959d2df5d348d1dac693e9e99169f7f87a0234cd45e4a7b8f77e5d446cb844ed210ae64e7d5f50239e5d4e1d55da67ab740cf803d428a683d23ac481731ce80 SHA512 aa23d0364460a82382f6554416019ae1bec6fb61e3dc18ed2c9366b25f47fac447c30ba5316b5b627e041710cfd33d8411c998bba1e5e9ace722aca304ce9816
 DIST genpatches-4.9-96.extras.tar.xz 17352 BLAKE2B ab1643d3b767b33a4f0cf1d5de5fd373d7de89f2eec1d0c626cab8155b057d18667f614bc1cf29926e5c55538ed4570ef9c25aef171f13d8c86fb3aa130174d7 SHA512 7a56e5b5108ed398696e220c25859ac1a5a9e02afac6659977f1c38b8d0731ee9b8455654d3e5d03e50f188ea0eaf2e8714435eb241a4bb7fdc6f2b273859661
@@ -96,12 +105,14 @@ EBUILD ck-sources-4.14.42.ebuild 1890 BLAKE2B c5c2ee07b80189e0c0a144660ed141c5d9
 EBUILD ck-sources-4.14.43.ebuild 1890 BLAKE2B 8c2b2fca9a7b1b8c3a3ff4696e2f8dd06e4bd3d08ad34e1452c2b8ea573404c7501526da4d6d02fafe295623da3f1c84d3723e338f6128d442e368934a5c241e SHA512 a6593eb68f18bedcdf51a8c27d7c84fd61a61bb5a62dfeaf68103e8d4be6afb9de7156578a0d33730df39a4d4b1ecea4673fdff6cbace5abfac0c36921c7e1ad
 EBUILD ck-sources-4.14.44.ebuild 1890 BLAKE2B c20e3ff4e72c17c28a92e770a3f03043d57252f40ddb9c101c230ce1aafddbef7a0fab38d3a0aa3d9a354865dbee5842712a3b87bfbd1e6d97770daac941ff8e SHA512 03e4b09da7271498d1e304037d7b2146bc5256e29b53d83dad291963a9e9e2831b9f65708286ba0d9980a386dba6e18fb5aa7fa2584b3d449076707e2570235a
 EBUILD ck-sources-4.14.47.ebuild 1890 BLAKE2B ae8671410fe1f45039fec558fff60794001d29d0eff076005293356b77ba60a1e98ac6d3d5fb841378c1140f3fb72d594f0ed25b85f4dbda2bfb0416fa40b5af SHA512 5d185feae293e006cb33f5d963d4d3366f455055bc7f87e63bd803b82171b12702547b263e813dca8f4254255f172c4cd6e8479d512276e10f80e21fb5c4f93e
+EBUILD ck-sources-4.14.48.ebuild 1890 BLAKE2B c03e71d3d012c8df493fad93bbfae8c1d776edfabcda5da0ebc95b5be185119f3f2d9a6e89f6b1ae065b97cc57b9446ea9ed95b21a5c05b68e251a5fdccec924 SHA512 c53c44f587a7a026ebf620c396a29548676039e4038f64c20b462104d4ed689535e0b95e8450e96911493c7074f0550126ec58b388605893cc2b50aa31d72b5c
 EBUILD ck-sources-4.15.17.ebuild 1613 BLAKE2B c686bdc39cf2bcdfb39fc6bb1d022abe7c89c6bf56d6768dca114ef37a75028958760b0248cd998fca8e38b0eee1a91fe60f377855bbced0962ebdb2e6fc1d3b SHA512 c89b106684d799d5cc02f57b2c963ceacd67ec9319aa2ed4d56a377699972d817463fd5dc1449bbde5b000f67944430bc6de04275ed8aa8fc261ca63636caec3
 EBUILD ck-sources-4.15.18.ebuild 1613 BLAKE2B d44234f86f13cdddd3e9e4aef9ba9416fa99f43dfd9de249fc38e7c51f733bd1ca21ae07fc2f862e304139ec5bff459022054978931996d8c6c033f89331760f SHA512 ed30d4061718fd052ec346697a2d5f6d737d4bfbcb16ea9164d0d45f6cb9312845d1301ebb1f51e759a1748bf44f2a6080132cce3ed8e34bcc1e2c9caa8c9109
 EBUILD ck-sources-4.16.10.ebuild 1613 BLAKE2B 68dfdcfe26016215211970aea4ea14e95042e9db0dab3ebc090017ac964bce69f3b721edf7ebfe1dff80876b496689601e982dd2524ed82c3722a51be8b6d96b SHA512 c0b101634574032eb2cdfb489dbd1615a8cda82602db99dfb04f3b4f8bb696c2faacdb0a1dd19c53d2481056cb544a2ec651e42a229e3bb0ae35f92c460c862c
 EBUILD ck-sources-4.16.11.ebuild 1613 BLAKE2B 4b214a840fbc800fe35a2250ffd45620b592aa1697a5f939b09ccfa15e10b7a270bc0f4ac39a3457f7f63da1a628305c724d2c71c82bdffa4ffbbffc06faff32 SHA512 2d38fbe9f0768c0d640868a06fcc2bfbc330316a774b664ddab249433a207ecdf11f8a784157fcce7df7cda57065b821d43d3ce923398ec5a67dc88468c03987
 EBUILD ck-sources-4.16.12.ebuild 1613 BLAKE2B 5c3afc28d66d182416a426be265724c5a7fbe7fbaafc4e8fbd891709ead63e618a8a14cfb66166f187086f79850b71d15eb1cdbe2be642e5738f1dc69055c530 SHA512 6ccec69b1db84a251c331e287f2eec41acfe11c8732a21be8e4010a09cb98f171559cd165914b07c9b1fdc383e722a7512b28ba7be16fcf67bea1444b47c9eff
 EBUILD ck-sources-4.16.13.ebuild 1613 BLAKE2B 4cc6c6374f02056f187771cd3a31b034d5695718ad40a4a53c27d19f666ce49b38249ba51cb9df961738fd39ac9a6feccf5773a20c31e994467a9fd2a5e0f4e1 SHA512 ef1ff2620c9043eb1c31b91cbdb27494d39832fdcc6f5af54ad9192b44652855cc2fa7b3e6c00ea1a28e621b55f9591a6049442c25d31693fe9ac99451d3ec24
+EBUILD ck-sources-4.16.14.ebuild 1613 BLAKE2B 5f84b0524878bb19ec8f66c8fdce61f131e4370bf2ea6c23953ea151bc63b6051af1a54432c254ffb6a1243cf3dd99510a00e750eeb1a6529d594b8c8d46fab6 SHA512 5983195dd52b280fc58f08e01202f574b462e7aedd7192122f3ec55cb7f7a11e25d392f3cbda91519d8653a1edbec16648f6a6bd0b0cad026e999e6d6591c5da
 EBUILD ck-sources-4.16.8.ebuild 1612 BLAKE2B b4065b5b7b954efe9f1dd0c947ba8254c5720e29be9b310bf5a4309016a4413233da74737d65e9c6f1a36fa923323eeb2920093e34f6df538c8e07fc3a4147a8 SHA512 c2739523c055f939b14ac149fd76788100d0fcd5d750056cbecd1935b80effabc11de5caf9ab96df946d45f4c354b780e456990a0a4037d49e49c4b5045a59dc
 EBUILD ck-sources-4.16.9.ebuild 1613 BLAKE2B d48cd4eef9a3de8313a0d400ddd0ed46d5bb5f71ad5d07373673234308394af43d0f5058766b5b09b3b7355674f4acab59755057e7e6ef677d1fecebeb6b7c0f SHA512 3426bb5264b67d482fbfd20cc4ffb664c2f60ed31fd169c078ccf06370c5beddff376ecefa6fb37d587be1c2673312cfde2e3f79f4c139f393e248c900c833ba
 EBUILD ck-sources-4.9.100.ebuild 1892 BLAKE2B fc000087dca221160f4e403aa79158fa72552ae807233543a619b7afca0931f3d7b22386b9b170e0a384514dcbb5bb46133814c5d7b35a1c6b9747f99880e2df SHA512 5fbbb633cd61982643079f1562070fa6426c7541ed3b31d4134b120ba5151042a12175b8ae2e63232335217bea6fdb0120113bea920715cb932abba50f506e9e
@@ -109,6 +120,7 @@ EBUILD ck-sources-4.9.101.ebuild 1892 BLAKE2B ff6f002af8e3ff6dec87ca42cd5128d442
 EBUILD ck-sources-4.9.102.ebuild 1892 BLAKE2B e934ed5df1eb6d1fbaf5a620a7bff1482ac8dd7355558fa1437edadf645940ea15c6c901c33d31bf1b5b594797de2262c0d93be15f0f4f91a27d81ee92434f19 SHA512 4d4c68926789799e37a9726e4886dcc0506e07bd50eb4742cccb90eb4fda458e635f43930511f9a20d22d740367317c585d7d8d2a890e76c780336e10d57d10f
 EBUILD ck-sources-4.9.103.ebuild 1892 BLAKE2B f6084b7c6e409364635f1c152f71982ead024d59d590d764c8de6a20937f9eab70339aa70e75f2f72ff0142489b61df3651f07730e97dc851a1a3f5d8ede328b SHA512 edc39f9ae514d96a29f69b3062f60ff7466a9ac8f7325bf51a3bd5dc02c0683af6ceacaff6f881aea9ef1645dd4542bae027281c20f125d9b8066437348057e4
 EBUILD ck-sources-4.9.105.ebuild 1892 BLAKE2B e83a10c3282938f8c3ba2f328bb91c8ec5eb6863aea3b049df544d465d66a0d59c180d3309fd114ef04856a9d620ecd5eb04af22daf09999278576a2d50dbe5f SHA512 6ab2b786cacf1eee52520914c37fcd83f2f8924d2ad79af6710603a5ecb109969031cdefff13475244cee8b62764a20e2c81d94b7b785e9353ab14802c114d48
+EBUILD ck-sources-4.9.107.ebuild 1892 BLAKE2B ab41a2a3c38270447a80fb4d0952d93502f41ce11181f6de1c17d457110a339a9a2aad8ac0e34a4d57e60d2ab242fd791ae1708e0f69e4d69f16320a2ccc4287 SHA512 ab2a88a88e406e08adeefc09555d4a7db948e4d6ad5df235900fd91e14630574672a81b60f9154197646ba32d21304daa4d45e1a652e0f1038339f1f664ed011
 EBUILD ck-sources-4.9.93.ebuild 1891 BLAKE2B 6b6fbd4a9ada3a7f348012e1d5dd541a8d8c930c9bb51737f2e12faadb57fe9c2fdd54cf88361557b3cd69c8891815b3f0ee38875d631745bb4f4ac3915ab6bd SHA512 bc67bb18bf2d98ee26f575feae16696e695c93f3591d2cfefef7c6439fdc8b7d5f69ec06953d20c56dad0c251acb1148ab8dedabd28d84c79c0a02c4b40f69b1
 EBUILD ck-sources-4.9.95.ebuild 1891 BLAKE2B 69e55844a6b354cc046acc196ce3c966c05e8c1fb27e06f7bf7cca68b8ef0fd98ad1057195a11de52810d0b6d64e97c76421d67f76107a87389daa9218be9d8d SHA512 e60b5414bd80181ba16a00841a2ab51923996bae6401121ddead1ed199bda77525651e3e754f980186ab64e20fee18dc45c46547ae3d35d4ced73caebf8a7237
 EBUILD ck-sources-4.9.99.ebuild 1892 BLAKE2B 0112b97794c6f18328ba0e2063bbd238cb515091c8c530fcf6170d62ead611ffb26fc9ca1b9ee314a8db009e2475f609ae81d7bc055c9be97f40f53c4616b03a SHA512 7c4feace1bfe13cf8d4e576fd72e3e066c0eac1d0a2fae5e238c334fd719f3fcf631f907f7a47dac495f97cec6eafd44d64f80c7b76b04ba49ce580313f8b55b
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.48.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.48.ebuild
new file mode 100644
index 000000000000..f4c62f9d70fb
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.48.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="52"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# Fix for: https://github.com/gentoo/gentoo/pull/6942
+BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
+BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
+BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	elog "ck-sources previously enabled CPU optimizations by default."
+	elog "USE=\"experimental\" is now required to enable this patch."
+	elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.16.14.ebuild b/sys-kernel/ck-sources/ck-sources-4.16.14.ebuild
new file mode 100644
index 000000000000..4abf3a4f1b03
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.16.14.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="15"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	elog "ck-sources previously enabled CPU optimizations by default."
+	elog "USE=\"experimental\" is now required to enable this patch."
+	elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.107.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.107.ebuild
new file mode 100644
index 000000000000..76457375c96b
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.107.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="110"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 435bbf19d09c..8e9bd7934d03 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -40,15 +40,9 @@ DIST genpatches-4.14-49.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12
 DIST genpatches-4.14-51.base.tar.xz 1377292 BLAKE2B e438be087cc2f48fa174f568008687dc8f0352fc15352c5e9d59ab9b741fd836f5ef9adf3284b843a2dffea1d34c735e2f08bccee23ca93470dbb32bbda1750f SHA512 a421da5d03d099808202f2c032c29a55967a8053177fa60b9181ef0668d1b38182440b7d5699696560f165b380e2d007cd6d9f9b8cf1ab6e91fb44826692155f
 DIST genpatches-4.14-51.experimental.tar.xz 5184 BLAKE2B bb7b10584d230d6295bd57e50eeacffab7044061ba09806e812c18e4d5926516ec5674cfd8925fc838304987b115509aaaea07f8f3af1c4822bae0df78476363 SHA512 b79937209b305e1738c857a8bbd46a1394cc4893fd5052eb5f037edc6c29d83b3ef013eecc2ff93da08b8a90cdebc169e277be0f81231c26468091ff33e6d9dd
 DIST genpatches-4.14-51.extras.tar.xz 17496 BLAKE2B 115e99b501a0119809f2abe84c3bb8a66b2b450f53003441593654c23a4bb653c4b40da1ba31e53f7f4db69c99511b2dd41f53b4adf8bd377714b1ace8abd9e2 SHA512 a01c90e36504f17495c8691ba6fa99870fd03b65299730df57e767e2562a90b6a04da24c50983cb8ea12ac276e6805f3b5fdaa30ad175ae5ee28f147f75dc3ec
-DIST genpatches-4.15-19.base.tar.xz 418976 BLAKE2B a3308a311f69861513ea5d0f92c65f180e640353e015e0e0869cb5aa1fa5f1d00bc9b3339f1115b1c0b193f6917237e029177d011a56660d43ae30299566d547 SHA512 16955bee641b1467f7ffed95100ff2e840093638ca5ded0937e2eac8854c6c213f0f466c51df2262d8f0feb41d265410bbc04f6ef0dd62ea0ab48777aeaef5c5
-DIST genpatches-4.15-19.experimental.tar.xz 5188 BLAKE2B 7057889db0d41a03e8a2ad1c3bb81f529088938ab8dfae6c6a0850de99af8cf73d9f4ebf9e7d10adcf4a34abdc516853570ad1f8d1d019bc256d2823efe47743 SHA512 74d6c91eaf4e6eea292aa1a268fec104f4d0b1baf6cf412fed32a6eebfb8c778d1f27d5d140f5addf4fc25fccb5b21b374760e3c648bb38517e316adcae2602b
-DIST genpatches-4.15-19.extras.tar.xz 17484 BLAKE2B 4f0dd93555cbdf9d64b94714e34430a0f55f1a36e509aaf0f6a367fb9a2875680f5a97205f08b8307f7e66d7e6479bb3e40823c763512387d0c6af3618a75158 SHA512 9779f34f4077b1dd662dccfec156682f1015163b75b084c2888b58372fc42e50f2de8f8f9011e5deea8850fe5e819ef3a6756255ef6171b6f42ee23d3eff4209
-DIST genpatches-4.15-20.base.tar.xz 464468 BLAKE2B b3c30e02819663b31b4ed83794d57c4521fe13015a4419088664f017f4753117bbc88a5600e310092d8eaf8b132b0757d59fb7b503abef046db0249ed7ae96e6 SHA512 cf79c85b65f3a68d3d721d2425fb6e498df808097bd8b1c610023d0c36c0378ec0f92d33ee0dc39592730d87f4a1df52931ea9608be2d56d5543a201f9d1d658
-DIST genpatches-4.15-20.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
-DIST genpatches-4.15-20.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e
-DIST genpatches-4.15-21.base.tar.xz 479732 BLAKE2B 3d2b40d4ed60e68712a498b184ff58cb72a7902b75ecd35efc98f2a6455dc902b1c02d459837e7ca17465ceeae380e20ed12cfe50f1bcc4a884eef0d80e05360 SHA512 e92ad5ee6cfc8d7a57eba044ae6bd86344a0e8eca11c89d0de9fbe3410b0d7582c38d48281ae8d0c17992b151cb35a9916835a6963402732449e150ff5e471d6
-DIST genpatches-4.15-21.experimental.tar.xz 5184 BLAKE2B 4c1bdbd651ea3c20d44194e0bcc5ab3dce499182ce31a8436ec46875cde2d4b14a0cc5f0eb90cef0aaea167b49a25775be24b38a2b2bfa606a415627f87d96fc SHA512 05a8084dff8f08f9ba84b90230b4bf50a521ba1e0dfe792f30a3f775772f2097e43927c6c5878ba19bd97fed66036c5b29309a0b1a5e914ec895281440be8c8d
-DIST genpatches-4.15-21.extras.tar.xz 17496 BLAKE2B 2240a8879139d6ad765a9e38d0ef78c78ac9e92f54c5317912b512ab1a64fd42fd512696f1820718a1fbfa658c8775bbae358db483ded60e65d504f4a81aa4e0 SHA512 e6070bd5631bb41e1e0e73c9381993779cc6095525a6eab5d8387641e1fce534617d368bd6a02c5f5d8d2669db6f480d284a64c8f76fc218e29df5a34937e1dc
+DIST genpatches-4.14-52.base.tar.xz 1393612 BLAKE2B f408007ae60b6580104f0a2ba35af383bb294508800540d62593a4d0cf57addc518b926a7ca8c0398c89c6762b0389de553af189a100031929770a5b84d08ce0 SHA512 f114baf7273dde352905f1dff5dd72f4822f01ba906ba04d49f68ff779d9b27359564f15e57d3d091fe942c8c1d679227020e5937fe82ac5dcb59d270104b971
+DIST genpatches-4.14-52.experimental.tar.xz 5188 BLAKE2B 8212503f164cfbba9d6d59624ed29bea6ae1a5a027cf6afa484e90c931a4cc32c954216e91a442ad27834049ce90a4b262aa82b14763c72096d933d8459977ca SHA512 8475a0f915b49e003ba362f47e909ae97bf9dd2f94c8eb96fbf07899fc6884309f4f49bc17ab49de0bd8ad0066ef1e63cf1d19ba2d8a493ea1478b431e2d2034
+DIST genpatches-4.14-52.extras.tar.xz 17496 BLAKE2B 402ab3be4571457aa71ad0e4785abc5ca4ab3b245d7009bb3c89d730f57b4cf78b6e7b0127907c31e4a21e96f3de367e19a71778d3dcf02ec269345d60a02cd2 SHA512 fc3d536bfa95854ddf788de3bd603a44b4aad3cfd11e464e54b7bcdd328513a048ff3a4e882c4a90fd3d21989aa3e5c0b46f4d0f22d58b93f3bab0f95801694f
 DIST genpatches-4.16-10.base.tar.xz 215644 BLAKE2B b2706d34e5778c3453aac5e63c006a94a1f35ebf164cff8af692b754721205303a3d22a1cf7715a1809359d166191dbe29503ae0632af421c34ac59210876ee0 SHA512 0d290d1853481052b74d7777ea62c16f1c9d25d3b27b9fffa5f444d48e23a4dcf79cd12008940c2ab8cd6af3733003a287620148a4535431081a7d37e7b9d5c1
 DIST genpatches-4.16-10.experimental.tar.xz 5164 BLAKE2B f99e68621a2e5b17e4f6bef55a24ec2c52c442abfa35230e869ae008e4fca3721375e4a93a4f6cd7c49f09e5412ba4cd753bedab2fb4ae85fad57dfb8761f04f SHA512 4288ddbd0123242c5e22b69645f9da7d706c08c7dd313c7c59481ffd42c395076e7aac8bc26736729d04cebe5b1da579cadeca1ecd4644bcf1d786e402e87642
 DIST genpatches-4.16-10.extras.tar.xz 17488 BLAKE2B 75169c7816271f85df521749f6da4a706217797b10a4b3bd8ff7cdb37e380c3427f442428707449afa361956bb0197cc4c30f794491bb9ba1f5056abc586d2ad SHA512 dc8253041478cfb0ce1f6d5d1ec5a4e006320822e14b79f40fea752575e47444948987c17b8ad90d1bf5febece034393f49ab8a049e5e33078831e8e640c27e2
@@ -64,6 +58,9 @@ DIST genpatches-4.16-13.extras.tar.xz 17476 BLAKE2B 72ebf7259d9157612350f0e7565c
 DIST genpatches-4.16-14.base.tar.xz 387692 BLAKE2B 4dad10e5bdacc39015381129508e15b1c30b6f191b3b3d5e7d66e89f8e7e3f9c40c81fb8596d38ca846c3747cc1ed722ac59a2bfa7984540c6466fe96a419f67 SHA512 70514f91e7575a87121dd7b5c8b2cf545d60253174eb8eef520e57beefc0d5c516fb1d48d963cebd60c85994744c5bb62576844feb9d1fc05aec9a21830aee9e
 DIST genpatches-4.16-14.experimental.tar.xz 5168 BLAKE2B 08bac33d41aeff4e675590484c5bc682cb420b38b3041e055b6c9b12d466b16dfafc5f8186e05b7797eecefaee7357a2a2b5729757a6880cfeb038d62624cbb8 SHA512 74da59061bdcafe29f8fa7142c132896f55597d992ee2ca365998af3f23c0ae48828664c1e435f7ea2d7e8b93682411f8c00cda3aaf79cd6535f5e8bf6ce62d5
 DIST genpatches-4.16-14.extras.tar.xz 17488 BLAKE2B ef216bc2349f04ff2b9f6a0fff48c9b92d18c0a3c6fa343b8b5800131d18f0adb5b59320b478faed7eaae59c760800ca9e324bc82079a017f707771f82c247d2 SHA512 a0e4d0c7dcb4a4d19a37edae9fa4b79913fded0df8c9282e196dceeede283ac15ba59e9a0e4cd92d567fe12f1c5e3394ba1625168bf8d4207ccf4a99a65e894c
+DIST genpatches-4.16-15.base.tar.xz 402268 BLAKE2B 1ce1a4da6e6ed219554adbf9acd0816747298c375a17794831ca9ecacd5bcf8c23c6eb49ab83d04d15b732f5ce6611be98f1d5acf151f3af172cfc6e48dab23d SHA512 2a5d0a8f83597bed7ee6000786d336729d53a2d76b674c14f4f92230cfb4cae6aca688ad70f0aa922e4826eddb0eb5d6d3b8d63ac207c54c52781759dd90c4ce
+DIST genpatches-4.16-15.experimental.tar.xz 5164 BLAKE2B c059c922b3f371ba3fbea51e714ee056d59a7326ddcc122f0c1e94055793d654e8a57faee263fd7b70a088a092e3b1d828befcf406d3d647291ce17782dadcde SHA512 ef3f4590aa9e4801c648b520a49eace811051422c4d849d80dd3d0ada07b71fd955cf520c8f1ce3d1c41d1bcc9f11f0fe05f329ca67f9098e924da3deb65d51b
+DIST genpatches-4.16-15.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12fc6b227ac994201f9b31872342c63d930d4280bd1f93625c148eefb126f9269fc1fea1872ac4920ba679938c6aec7d916449 SHA512 a32823c41c47b26110da59d63bd6104d8b38ae9ecac43e87ec03ecef726349475e40fe88354a1680bf816a12f6edd0dbfb1a2b2865be0a0716047b12d2cfbded
 DIST genpatches-4.16-4.base.tar.xz 46368 BLAKE2B 30a98545ab83f25ca726d3b2fddd4abf2a5b325be187ff16836aecfa699526efde2d8c56dbfc7af068b2e281527525edc0d18a14244513636e42f31fd726dca7 SHA512 dd723b619926eaf4fe13db53197e2142d8ff6b2e18eacf829635ce84d442a795e3ec392ac70ddcf0ce55af48470a3ba594beaf27783b473cb169e3aa4f608223
 DIST genpatches-4.16-4.experimental.tar.xz 5164 BLAKE2B d64e5d3c47c7b98fe56b7d1fcfa331c8fb114e56829b602321ef52181934a5548f6a6a5bca578faf64637b277430e8378ed85285d2e422e0589d3292d96c2479 SHA512 b08c4fc95160ec60dce4e4dc15d885e3d7559a2b133dce76e134982139e1b9a6ae2034a60812e2b2c263e10be0e6422ee2e0ceea2b9bc00c2152bc19239856b4
 DIST genpatches-4.16-4.extras.tar.xz 17496 BLAKE2B 04b98295a1a852516aefd1f99e806b1d471b98164948368e64179eb6c0131079b7743639eacb2b5852417e9dba0b34d7b2c92031c3f36bfc8845f230c6dc9f5d SHA512 5941bf6ffbe7e79233b4d722404c76790ab0c7c2a5090e1fa52a41a9dd8b5597013676f9e877f7440f6ffbef3d3ef91da6da9241f5bc94e7337bc0f8a2001508
@@ -82,6 +79,9 @@ DIST genpatches-4.16-8.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daa
 DIST genpatches-4.16-9.base.tar.xz 196768 BLAKE2B 25c4b6a22a9a07af643ddc73fea2cf6e997f5cca89f86cf8386286d1b63e0c0dd393f138f66f87773d9eba382bcaec3a2562d2a4c22140a61358cd2612e11d4f SHA512 aab3c760270e8d72c892d58a88fac3db792150a8f7157a2fb656d52ecfb29c9f6a049783ec9583b98b9cfd09ae6f77f672ef375d6a260cb2cb4df8157e5398a7
 DIST genpatches-4.16-9.experimental.tar.xz 5164 BLAKE2B 0e8c1ce1a65404faafe4c0c7163cf87ce4ba4195edec6caab0dcbffff5351c6b211b233b6b659a7521e48e11e0fcf726e23341728591e9dbf305a4cac4500175 SHA512 9b4003d7902152183e4a76c54e0d4d09da33c9956aadafef4b11cdde81f7539a0d7931f4ae7d4d7e02928bbd7c128eba5fda00319723c1f7c2a7abb34ecddc9c
 DIST genpatches-4.16-9.extras.tar.xz 17492 BLAKE2B 2e9bb4e33e33f0b5ba923bc0036a3697abefcf7c439dfba68beb0c4d0a558dffde1c9224f56da6bbea560bec3664cb1025c0ce1c961037598523d1af0d0513fb SHA512 e1ed8a1532488aa849969a90bf299eaf39233695eb9bda7b070a87906b8891e2332a06234d4b2c98338b04380020387b8fb212dc95072ae79cc58274e8118656
+DIST genpatches-4.17-1.base.tar.xz 5392 BLAKE2B c0a5d1795ab5ab5dfa064986b53f5f9bdb5ac543795af4a33ce8f3e0e21d0240d7b741caf3971121738963c769f861fbab5744456b350727b29074c6f0f0d090 SHA512 06696fa4ee7a6a5e42a10b83401e25b0c6920ae43ca7f2106dcc208e094c74a82ee769f0d97b5ae04b6a997f7d6bc48a36674477112c74a297d6580b225a6080
+DIST genpatches-4.17-1.experimental.tar.xz 5168 BLAKE2B 679183da1924b81b24e55fad23d57976bd33804f8d2e61bffbb9adf70d2c9d80ea83c2f6db0228baca1adb2ba5c57b8fe528e4e938a45ef9114bbb51a40106c7 SHA512 e7f68bf642616a1604f2d76a2e6310bd3f4147d85c29ddef829d0f59a785fd89f2532d854d32e3f4d132812f84ebb081936d2e5c68941ee5131b3004ed5b411b
+DIST genpatches-4.17-1.extras.tar.xz 17496 BLAKE2B 115e99b501a0119809f2abe84c3bb8a66b2b450f53003441593654c23a4bb653c4b40da1ba31e53f7f4db69c99511b2dd41f53b4adf8bd377714b1ace8abd9e2 SHA512 a01c90e36504f17495c8691ba6fa99870fd03b65299730df57e767e2562a90b6a04da24c50983cb8ea12ac276e6805f3b5fdaa30ad175ae5ee28f147f75dc3ec
 DIST genpatches-4.4-115.base.tar.xz 1692684 BLAKE2B 8595bbb40d0f0172e5b6f5266d89b3aa67fad3889375c3925a39e01ccccf9dd03e86f934d8d3c0bd93bab58ceee274277aaac4051d09f2edf665c106f2c0e29d SHA512 43dac11a37c6cbef7a4070336bda44beb2d5a9a649188d188e37c4654ce94a71244a7e87652368da5a0f88dc53ad5c8d6194ad614c4033d08295debab0c90eca
 DIST genpatches-4.4-115.experimental.tar.xz 87744 BLAKE2B dc8a9f9ae6e6789e7c072e5c6dfa0e875765d77ffb746060f65cd708124f81f8a269a54ec6bd6f9bd159d0cd5d0d9dabd6ad9489ff5453e01c264b0f34153300 SHA512 e82343f1d4220ecab61503c7cefae9d5d9cd605187f4861eac21f330c39af77e90950badf1896a8fefee57133496f706e2b1905eee1d8c6cf945e77ed3b36094
 DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787564019769884c28cf8bd3191686e3fc8f5c764ebc3a3c99d3ea7290aab316b8a0a0728a4f679196b80b524943c503fef6705 SHA512 84d76421f1e3d3041ab18a2a6a019b571c1a6f27d2fc880da64ae11398c43e5eab79c538940df82aa02d697983a97145197b127613bb7f4765a26813cc36eacf
@@ -106,6 +106,9 @@ DIST genpatches-4.4-135.extras.tar.xz 16452 BLAKE2B 8a94a1480dbebbec3f1cc5b2c013
 DIST genpatches-4.4-137.base.tar.xz 2148112 BLAKE2B 9f6cd4723ffc4b7e2a78987f240696c7667ba1337280531618263191c91425c447448512aadda79a75d0da980b848adec4679ed77ef67ef509737c65afe5b68a SHA512 e193591131a2616f437889e2724040a7f8576b6c89539f93cb7053ad69929297a72b3b18a2a1693bcd26ae8ad6b48ffe1e727a13778a6b210f1c9adcfb4cb58e
 DIST genpatches-4.4-137.experimental.tar.xz 87760 BLAKE2B 190eca3dfc66b44b5896c7821e4a639e2b849b86d3c553290f09806140ddff2fcdf1ad537a7693eff595bd7798186f3705dc232d8791fea47e6d0df97af924f9 SHA512 e64a8fe4c8c3cdbfbd18561456a70dd6625691a95d012e43851cedcd6c71646565c4e5fd66b5ef7737bfaea25dfacac77cd8de3ba6434aa0bdce9b3c9728580f
 DIST genpatches-4.4-137.extras.tar.xz 16472 BLAKE2B b09b7fb4e380cc78436510ac89c3be366c6909c722ecec457b5a7bfe879ea6b5ad88f0a321d697d8a9bb8e6fb994e167f67387a7982354cd10a1ce9e3210482d SHA512 7078e6124a5f7ab315e4ede82ef154f5deba8d2f85353e9ca7413e044d971b745a04aeb9f91b34c9060f89fe166bbe3113b4e260a278b7c576faa9554cf6f980
+DIST genpatches-4.4-138.base.tar.xz 2156432 BLAKE2B b0de2f52bde393f8d3bbbce95c1c60098c15bc3b980c3de98cb6b77165341687051e8ffb981d12746b7dac1695f8bb41f7e4352720daaf74f6326bd07735c5c2 SHA512 06470ff4da718da9df72afd188b16e38810bf5861b7a682770f9462b8b2a5ad0b548c2c446aba628ecce694052a8045b202c03965b9c5706b246991a6ff9cb6a
+DIST genpatches-4.4-138.experimental.tar.xz 87772 BLAKE2B 850d12d3c31c2d47f3eede09a9b6149a8eea97d20147912b7712e0546f3bd43157f6425c51edcadfe8c487fb3d82cbd488fca73ef8f0d07bca22e3f0c1133e4b SHA512 27a895137302f00810cf8808b4bb705959edbb1e377874d0e0277d24844d48b53ed1db208a5be746013ae2605be56dc7a6ba89ab527315da92309d0ce26ce1d9
+DIST genpatches-4.4-138.extras.tar.xz 16468 BLAKE2B e5ca7895b711e54c81425a963d91a3d4fa7fe6c9f8177ea96e8d971a956995c1942a079c71edbc16662e3ceec8a116efef6fd3410292c7c14a9088dc6e154142 SHA512 4134053d7813f0cb938f975eb73212c6cdc9a089b9638d1fada37488b2c6c729dd8e7152c98abdfb2fdf24c3db432adec9d04588c4f1e8f38b3640a2feb37cc1
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -133,6 +136,12 @@ DIST genpatches-4.9-106.extras.tar.xz 17348 BLAKE2B 9375cb4cc0ccd3a31ef41b7a5d9e
 DIST genpatches-4.9-108.base.tar.xz 2109320 BLAKE2B 0b6090a5f84a6aea248f6e1ab784cde6e361deb38332486870625ad73d35e7bbb677d6dba2e423e0d946f0f896c6aca8833d9aa51dad6fcd2a18586ff267aecb SHA512 831ca65141984839bee54a16e66b2f45f7f91197d7413b3c54167cab8e14aa52eb3199e2a39f4000d83ed22b601eebe05acc3503dff35e375e3467207cb04ae7
 DIST genpatches-4.9-108.experimental.tar.xz 106392 BLAKE2B 9372c6e3674c0821afdad18b02ec96433e3d05f966a3258949ab15cce4bcb9318880a2c003a8e2b11e230051dfc4614c14c42a7195d492241f398a0ebf51d32f SHA512 c04f80593307cf95f5042b31cd664bfd67dbdc20bc33357c6ec2da749183e34381c218ca9206beb4e962ac9c1aa3033c22c724717016c82be913d208968890c7
 DIST genpatches-4.9-108.extras.tar.xz 17348 BLAKE2B 2c1b5ebbe4075a645b2f19bc516f41634e270c27294f71d6f44cba8009c8f29b39cff16c1ea59368c03c5e17f737bf2bf5e0917ae2c3fe4a53530f89d52dbe80 SHA512 7b55d30a37b234e9de1fd3d34ea0177d7913fbde1451d5b9232a72c096f5fe218aaefa73169fe3473d2e802e0f8c7785d0e9fa9a501a99b52e6e2fcfc95445c8
+DIST genpatches-4.9-109.base.tar.xz 2163312 BLAKE2B f1c8c90ca875064c1750e749aa1d4fa769f709221a805bbc386e3cd455074a2b71a82b15dfa1ed4ca1752869fbbab64d5064d8d4031dd4fb97efb52472d65bae SHA512 69d4c91b69d4d2c6850efa929411d565ca568ebe722adae62d70aa132a6cb8fbe9a3e1e117c6a5e4c5d43262be5f717bb6b2ee975899375065a5415dd5ffb598
+DIST genpatches-4.9-109.experimental.tar.xz 106388 BLAKE2B af09dd2031127f4dfc4b37a5eddc4e8a095b992f5f393ad25a1f9dbc5c6f594daf3da77c985363df452ded27a66b455292b454792f9704390f2d0fb8b1e4adc6 SHA512 c9e3d8285bc7730156b9529edd0269791e406d2cdf2d4056fe03fd43eedcd391392444160c3e1796ae465fa1f6b90a6ccaab80335f8fc681589f455dc85a05f9
+DIST genpatches-4.9-109.extras.tar.xz 17364 BLAKE2B ef6582471bb173341c240e57ac534913818121b96a0af3f86c4a2d47b675ff45bf3751cd45c9058e8bd4b262f7a21e5c9c42c994a7ceb7c86c10fc87232c1f34 SHA512 7af25cd2d50bdb0c8b838776701b0f9238df877efb728ae8f79855948cdef9dd92f705665afd99f92a0c80f20c7f42c7e8ef2285656c19f8ff853fcff46abdd9
+DIST genpatches-4.9-110.base.tar.xz 2180268 BLAKE2B fe0f707079302189ac484fcb67151216cbfc9c84627db81aaf5db32a5dd371ee1a356379a9592ea86d51a7a7534c117dea4be71706ed8b591bfd60e30ebe0c93 SHA512 0b957de2d1f2d09e69a4850dcb31fe0c12d7ab701479d7b952523c9c2c6c4ea1b8ae1521fd02c18c312cc4399dfc81989f2cb7fac0b3468f1bb9e92cb554a6b4
+DIST genpatches-4.9-110.experimental.tar.xz 106392 BLAKE2B 831759d456c12bcfb433f0eb8e4b90b8f2337741415b3272ff77af8d7bc510cc548287318b6672794ae66f645efedfb37c9dd65333fcf2cdd804bda29bbae4bd SHA512 fae0aad5cee94b79bf7f2b70c4d95704408ac5615056aa590a7eb5586234eb46da2b2eb90c762df84b1d0713b84e6aade1505b8ac24e7cb7a08e158782d2fbed
+DIST genpatches-4.9-110.extras.tar.xz 17352 BLAKE2B c4d6d32fd0e61bfb439a543694bf266bb83e886f69b28d03bd1af12e10dbfb4d822517c15688b0acc4473329035a3b87028b3ba39c52429fa385a2125c27db5f SHA512 5adb32f3970030b7cb9e237070ff38d055e2143237c9198e9c651d80102efa1be48e7ce5de5d9515ae7d1363523c4e6c2774d933812b68f4be72824f31daba45
 DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5
 DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3
 DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e
@@ -153,8 +162,8 @@ DIST genpatches-4.9-99.experimental.tar.xz 106364 BLAKE2B a5c0e8500f6566d69b6802
 DIST genpatches-4.9-99.extras.tar.xz 17352 BLAKE2B 3089bd2df8504020a95c5cfadc4346c6b3bcf00c733570fd7be179c5c7f814fbdc932c03170bd9abce6a5330db290c5a496121d756418cda245c5b6c2cfacac0 SHA512 50e8bb37cd800ec21ff602a17f8cdb4c8c2791e587e22e690c080ee03a3260050ca69cda3338c5a42f70f84950851ac206f70825cdf597fe88ba69cc3624c20c
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f99571099d471b2dde5f7a746d9b9fab5112fffe3b7978c40f15ecaa33203eeeeea98c2158fab2d5857ece5d74f9f SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
+DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 EBUILD gentoo-sources-4.1.43-r1.ebuild 668 BLAKE2B e5cad3e07e2e1d078ad5844e06e72bd8f10ed18633618289f3620f9ef6ac9283ab84c1a97df809db6999f257486c5fca24d9eb8ae1c9cb5a0eab89305844efa8 SHA512 13f4aebe4f429f3fa2f1c83ad69206743061c455d9b83afc440b28b9baa9917900f3ee851eb4f514279191558fbfdcae837de03d9804d7c76b6e73af0042eb2c
@@ -171,13 +180,12 @@ EBUILD gentoo-sources-4.14.42.ebuild 742 BLAKE2B 0784e34075ae9b9eaa71b78ced91108
 EBUILD gentoo-sources-4.14.43.ebuild 742 BLAKE2B 8fbb78228753c2c50e8db94dcf8c622bf6497382aef8ef38bf765eac3f101ef499ecfffd495817f67d9ffa5bbdab9d0ad1b2491615018ae62bba88c5dee7bf9a SHA512 bbcd31b38e6df6d41b6082c3b24a3db5b821f0cff3631b8e66d47486509ad4f6ba59f7b702b2e8ebffa3f56cbfd02baece363d81acd03ce298921afba96e9b2f
 EBUILD gentoo-sources-4.14.44.ebuild 742 BLAKE2B be47ad6835d350d248056ad256fc7733aea553899c5f63b5a644428734309adc7250f61424403d8f25bba13bfd3cd85c36fcfe6caee9f714fcefeb5dfedb9b10 SHA512 c328c0f7fe21bf7b95cab2cb7e4611be80bb1445d0fbf6e154d215a8e23130a64c3bcfccaa53675eba8eecaa6fd98cdecb8347d07d27ab9099a19b3d5e9641cb
 EBUILD gentoo-sources-4.14.47.ebuild 742 BLAKE2B a56eedd1e2bb101523773a3865350973e3ab523c6645183e423101c309d749d017dc9ce000a5802300f1a4552f393ee6749e13cf64bd352110f10cd3d950fa5f SHA512 a3d416c85e3194f2c04587e405e093eaddc210ede6a08376f84645dc00adc0f49f18108d93cef9c06d348f87ee632b393287c9b0c6f2a2edced4b4d0981f1be8
-EBUILD gentoo-sources-4.15.16.ebuild 742 BLAKE2B 8cf138fd93fa76e2280baf29a973fd8d26a495d41cda3cbf0b9ac1b81718209a14ba87ac2623ce768bb9bf2f23813dc3a9e35ec942c3b031c1e9cb264cb93d7b SHA512 042e8df152e227429809a4e994d86668641b5632ae50f21780636aa22138b2e7fb48b25db6533875617c9e578c3c3f0f852188dad4137bf6c25c55ae75b86eed
-EBUILD gentoo-sources-4.15.17.ebuild 742 BLAKE2B d3121b065e2470df22b82884c4786e16b886b2d665555596f08f2193d8b37cfa624e84a241382651e38811e9bb24f41a608795620ae3df5166d2b5830bdf8014 SHA512 adc5a779711a415a5e614c26e60fac4b301e0b7f101fbb8c0e06308005f355b7e0f61ca613d5135c70b6b266b33b408a6962ab20b816b68826ac1e81451af5e9
-EBUILD gentoo-sources-4.15.18.ebuild 742 BLAKE2B 863f9406c40f4646d01f4b023b393cce2df9d8570840c9d3b59b8269deaf646f4f94cff234c7284df02599dba189edbb741edbd6d68c9514299aba6093964d46 SHA512 c8114271cbf01aaae62118c40c15e178ff87854d1a3d27df49fae729bbf472626e4e30458e687db36174a6735a9ac3fdc3b5d04421cb71493e5ab3b412a910d1
+EBUILD gentoo-sources-4.14.48.ebuild 742 BLAKE2B f98cd4f7f1a56c455a26cecabc6504e0db792ada7084989e4af54c9501458d4bedc7a492bc87afcb5fe8ed24ab133c4e44114755fcf92db329f3c38ab8bde074 SHA512 53c4a0bf9684db8aee5f1ec6548a250f5980dc2a416b8a01dcb6c3d5e6fed850436e401a6761c73f6bf5dd4773ea0a032eb91a6cc6a5b1afec4d1252ac61b480
 EBUILD gentoo-sources-4.16.10.ebuild 742 BLAKE2B 236aa15d94c986e007093b39cb21e36851191a907a7003f4cbffcbfa8075a69119926cdde47e8da9e88b31dac43a5e92ecaac1d20bd8534588f662b9b08feecf SHA512 fab04b4e34ccd0cf93560d2a27eefdb8029f6cd6f8c93590b1bd091b085a96faab788b25b764bba9917cc33385b4900fada87594aac17e79ad1d76e6f7ef0ce8
 EBUILD gentoo-sources-4.16.11.ebuild 742 BLAKE2B 9b4b7701175fa852367e1dd0087d34a2b8439cdc800501cc95d5139664172ba3a42c84d7c8ababce19a50c7e025b7107e4d286a1cb17e8402ff61d85910dd605 SHA512 fe6760cad937d2e862172c7e4e0a6a2a03efeea2dea4a141261f357f8759afc80387ed1d13378c40de09e612ae3f88c9fd11c4c900e949dea373ae5da8024770
 EBUILD gentoo-sources-4.16.12.ebuild 742 BLAKE2B 818a7736a0eadd81c931bf616cf58ce7011ca1bc2095e765c40faf3d77f5197b695b5bb4ab3b5d0670ef6227180b480e761d64550e4621671231992570b7fc80 SHA512 5bd1d2ead0d2519803c6ba7d09a431d1d0ecb32f92238b60bbbcee3f687ff0aae3f271886ff62281276bb972c29117cc6ea2c1d011735d6025862da0e552f8cc
 EBUILD gentoo-sources-4.16.13.ebuild 742 BLAKE2B 758990368d1b70dc99338f90b7773a5d43db3c05247ed8301014975ad9f9e764aa45f336bfa827c0607f579d397f1dd0eeb3f602181c39b4e1afc0cb02ec5a6d SHA512 b42bc2e3146536e00b240b83120960e13adb9b7409cfb4210be65f24b7e64829807f4ac4235811f7e07e61676da86929f75db6aa24e382cd0f6084366a4be411
+EBUILD gentoo-sources-4.16.14.ebuild 742 BLAKE2B c2a813ca6dc44d5c9aa406b764023fcfc0d2937cc6becad1db47b6b845086d6850acb733cb09519d5a1bd10c21d5444d27228d3c8fb88cedcb634bd60b47ddd9 SHA512 29a60c02f676af5dafee0c7f0035e3a829d56b81662c3fc596b214fc528ea0612b2b9e0d3c600a8cf25919c11b95199e6227a6845c6c1bb6679e067c2b00bb9a
 EBUILD gentoo-sources-4.16.3.ebuild 741 BLAKE2B 64ad4fafa2243d25c4798c2020c8a16ce32c4212812023073b55a977021e150b52bb2fcd13133831233be438760178c71c03423643b3729e11814ad55aa71c95 SHA512 2a26da6cc8938e404fde1ae53aba5531521d87cdfb1ccda14cb64584df2595e9293d303ebcb09c384c2134b4a5e0e6176c0d5d77de6a55f463113e4b94a06d70
 EBUILD gentoo-sources-4.16.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f94033bc417bc64b6af21df7016d4f20b10b5498c49eedfe042bb2a5c020d30baeab532d3296c5284cd8de1e95bd342b80c60 SHA512 2491e573773f078689ec07fd1c836b55032fca2773f5ec8195a4c3fd2e23c8356bfbf0a51976621c074491881352c3fc4ce35723f2ae2c1c55773b5dd799b463
 EBUILD gentoo-sources-4.16.5.ebuild 741 BLAKE2B e0a48fdf626979d01025952d1004c9c8b59cb5891d7bc966ad1f4dc38f636da59b4237f9d1ca078bb4e787d06e61a83886425a558495f0aa1b43285a7cbccb95 SHA512 19bb33b52273b61e22a9cbe31cf5cfc09a671fae876131fd37bd0c28d2bf75403aa80f81b6b52cfdbe37de383dc4d10d76029a17f37c10255006001305d7b767
@@ -185,6 +193,7 @@ EBUILD gentoo-sources-4.16.6.ebuild 741 BLAKE2B df58106245c600e0bf9dd35a7eb2f4d2
 EBUILD gentoo-sources-4.16.7.ebuild 741 BLAKE2B 3d0593031462ff30611e20d66f3b9b5b4da8b8763754f0af7fca209c8b9d7659e910ed401e44006c78469c2f5f19c01767c29a5497b8d32fe8894a5493707463 SHA512 f024a492df3732d1c5253bf32ede8119f0f3c89da099875c14c9511b676b40b934918134ed85f098236505080a781eb0d096158e799bc905e6659208b96649d7
 EBUILD gentoo-sources-4.16.8.ebuild 741 BLAKE2B c600b8af8fb7af879c95edeb1f4c1d7412991bd42450e8659c13f60fd8ccd19a41da0cef5ffaf97e62faac994928d03a778adf104a3a368b530b00bbf5e49d22 SHA512 913997637d2bef7ea097e0a060674c1932bde149d6f32baa32f355420dab9fbe4e91af7c1d8e41992bca36b0b53eefea3a08c1a1c2b10300e0893544f844098c
 EBUILD gentoo-sources-4.16.9.ebuild 742 BLAKE2B 52d67137214e025479975cb32b5edc26ae208bc0a4ac216bba9ceaa8f4d1062ece103131950c1a8eb0a3bf387fbfe5efa9f47ec75b1d4d1c936530ea305c9447 SHA512 7f2148b0a0b88b7350f069a7b8bea5381bbf56ce25c36b459a82a31c28d20964a19204c17325efd5ff877defcd7c6bf7288947852e118b4762fbb866ecb750c7
+EBUILD gentoo-sources-4.17.0.ebuild 741 BLAKE2B 6cccd19877bc0d5bc677ea794fd4669268c654d01c156b62f24cc1a7cf89c54db8685b78fc2ba941c9b48602847f3b9c9d5c05a358015e1cabead653c0f4476d SHA512 8daf880f336464e106ea015594b1ee8f476e8391dac6f698327b2c48faacaf0f4c864b6b2bbeb2b723d0cd0ea1e88041e3b23010748baaa313962028453c7164
 EBUILD gentoo-sources-4.4.111-r1.ebuild 738 BLAKE2B 2052014422e63b1e20f01d48f63a8eff2ae594e15ff9c873cc9d062db10c238c61084ff3c4e61bd3576af1b2744776a137972f6766e2752283b05835e40f50a8 SHA512 589b508bafdfa91c3b1f9faf390dc56795cfd5d43e8e55cde64b75ff7595f13e614d06f59a83ae1a30c2be816cabca08cdd5578c19bb459e8beab6cbc2945a07
 EBUILD gentoo-sources-4.4.128.ebuild 739 BLAKE2B addd997d6cd91e4b777dcdb847bd5c3444b4c995025a8fd1202597082bfe87ba9e46817d5db2902737d7f73ab733db4b14c6688108da061fb229f234b5c19358 SHA512 8ec27f6b753c3d839a7741da8aab3e0fe4b3095a1535ca018605b31fb9dca8ebcbcf2fee47c2da99be42e8036fce6733e0b7bfda5c2d7a5d20a50b94b42ebcc7
 EBUILD gentoo-sources-4.4.129.ebuild 743 BLAKE2B 5181c103237c688bd70f9399ed891e47765b418563b4706455328add0eb5084a65b8f1a026c2ecfce312216068f059fd92f2ef0ff9bb945e903f2cea1823db26 SHA512 111764772d1bf2a32d39770622eb559330354c60a35a2513685cad4256fac7df85aeee2ca67b27d86e300fa5c2a9831e0440359667b66aad0e26c596fbb0c975
@@ -193,12 +202,15 @@ EBUILD gentoo-sources-4.4.131.ebuild 743 BLAKE2B cdd429f650da7e9bfdfba79f33f6024
 EBUILD gentoo-sources-4.4.132.ebuild 743 BLAKE2B 96d6a21bc5179eaa4c8cd07615d4db6c1c85e71e2e6be6d102fa30a59cd6935df67325d6518d1f892c3425274df267ded9969b9211d505dab9873f719e7dc711 SHA512 27a3cbe5b476f3040d92e702d0814b8ec660c0c19ef680fbfb37cc0c051d7d5df239bad2d263efd3229822a20e50ef5dfaa454d3cee951e64489a0bea94c275d
 EBUILD gentoo-sources-4.4.133.ebuild 743 BLAKE2B 8bad19c23748487e815e2e0d76a63b3f52b55d8510b96c5aff6be34e18c6365ae062bbb93853052ef3210c6d8ff57f2df6b1166113fcca611d07a758b06709ef SHA512 622eecb8292f4579548fa34ee0c06c95aee587475a85f10456db7d5da3fd36fe712649e16a4169ab35ac19680bcc08638c2543e1dc3576ab5b972b8de6e87dc8
 EBUILD gentoo-sources-4.4.135.ebuild 743 BLAKE2B 115bf67c2c7d6f4c7d4cef606c518f60376f8ea7be30eff711fe13f91091d6f4666e0d7e0a2b20afe5d9a47dc258229c011ee390bb5bf84bb8b3b39d9072bc15 SHA512 8278c3032c17ff8e777f3f1702d78e5fd5454b002c0e86870260070b34635ae48058091a76f3cbd4428543032f9c950ac9222d2c4335cc63d48ddb141b40ce60
+EBUILD gentoo-sources-4.4.136.ebuild 743 BLAKE2B b0fd4a8b5501581a53820c0276119222184abe01bbd0c831f56b97015c4f1b39a8e5dbe47e6e647e82f322d9012c280e5fd91e04c1b464a111bb54362cc4079c SHA512 0139337d5e991cc8d318be840ee9fd2a927d058bbc869bfc1bd6d3d8b6e18a3f4e78a376a4b662c5e56afc4e90e44d2596af94dcb290dc0a744a2afb35924dbc
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.100.ebuild 743 BLAKE2B 1e901227a2e45994ad3658fff49d125e23183ad9ebb1e1729cf9832329a1ac8e2d9e01b5a638097aa9775a3706bc2ef29f1bfd8a7c22a59de370a199818f7bdb SHA512 d95fa4ba848c9e3748b911bbd07619ff0a53de10732dab6678bea00e5847756f254a1b9e88822d4356f304de3924ed23169fc5a5601301b042263937886ac9ec
 EBUILD gentoo-sources-4.9.101.ebuild 743 BLAKE2B ffc4c00e086076225db245e5778bbf4be967fe5fd706959bb5c76d8b83b910fed6972b7807279cbeb94246533d0112cf51b1263193f332e80d041e5c8e6166c9 SHA512 e8006ef4f7db559cb2d571744762cfa2c05367e434ed89556a96ba8c6bc32395ac4c1551caa9a5294742d23e8303f35308a52a88b590d1ff8f2baf1a9cff4d59
 EBUILD gentoo-sources-4.9.102.ebuild 743 BLAKE2B a61846027590fd34539fcdbdfa16bea6d1f33aff774fa6df67f2de7436854adb3c16daad0e76479e074df6600d4defc4cf0ec6c7490cece9cd6ccd134a90c4f3 SHA512 245e1a63fde4c275dc1fa67a12727e29a5aa89d60384eed9d8ed789fa726808daba7751240cd448fd716588fe4f38091697c3a18062d61cc654705baa6c19c83
 EBUILD gentoo-sources-4.9.103.ebuild 743 BLAKE2B c04e179e35c21afd97341fed691693bdc4870c855ae798ef69571a82896d943ba24ef317d30f84a4a467c0c0c99d263dfeff8aece2c05866000c03a74429c327 SHA512 baa222da287cec2fe6f906111d063dfab31e64d46824ae3843f8f5c71a13e31ad56f30e38fc841eb150355bef22145fb0ec46fab749faf934da8f3153e5529e4
 EBUILD gentoo-sources-4.9.105.ebuild 743 BLAKE2B 05acabc46d977b7413be20fcdd250902f53d123f9cdfc66ae7f4d001b640afacf2f06092bd29b93d784a80fd1fb8ace5826a8ced01bcae4d299fe2b823f18550 SHA512 55d0ddf436ffb22424361f5c9dece9feffdb261faacdb9952ee21b3a7e3a94831da464fe445e4b4a0d4599ac13561b71f7a135ed63841a78e46eaa2b8429d204
+EBUILD gentoo-sources-4.9.106.ebuild 743 BLAKE2B 17213846eec1bbab283ea3865c91479bb5867b6959a23cb9ed5d20b4b470bd88ffe42f55c0ff66c699603dfd44fd33fe483ba23419d5024d8fe56c76f40bc59d SHA512 ef339a1ec15a04c17748e36bbe8a408ff1278d42de5acc41332dd45ccdf23cd11b7915a92e317d8b90afb96bb2cd5fd185a57ee263566a7e98a7422e93d2dba2
+EBUILD gentoo-sources-4.9.107.ebuild 743 BLAKE2B aab267f9a9a56e41e80fca7437e9dd569725d394d8f636ee35422c23bef1703355f574a452acb456ba8acd5b311bbab9a82ce77ba25f1373cf0ef8f29d35d8ac SHA512 313b02bebb2d04f7355961a165fcbee03cfb01e9ca10ba23f00bb5b93014d598f845aa433d9d672b5e73dc533acc3cb834b7a61f0cd93e96a97a8aeb74825025
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.72.ebuild 738 BLAKE2B 1c88296bca01b95ece33afc5dbc5fe7ebc29ec545fdbff53dae3113b028392c41fc5557e949c4c07503fdc88b5c5f925b79316e48bc8ba8978a316554a2aa191 SHA512 d1c3b5fbcb59ac3ab703b8dd62a8f4f213dbc14526be00a34c3bb480dc4eb068297d02ab0fff33bd0d6fcf8973e862df74ca31e774cbdb0a437edcf892c233e9
 EBUILD gentoo-sources-4.9.76-r1.ebuild 737 BLAKE2B fac5a16968488d560fa550e85e6f73c7f356d23f287abfcf1a2fe1aad048832f46bb152db6afcf2cab4daea535f7c51dff3672062d8379620cf2451d5d3e65a1 SHA512 6e3af1a01abcadaef0846cb4fb861d583561fb54937d60d22803eac7a7d62f1d4d1e3e05202fad77c9699a8d4a34d09ff915cf2af948a4e64224c4d1a1818d2b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.48.ebuild
new file mode 100644
index 000000000000..2df729b4e63b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.48.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="52"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.15.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.15.16.ebuild
deleted file mode 100644
index 13d01a991c44..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.15.16.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="19"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.15.17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.15.17.ebuild
deleted file mode 100644
index 6e68168d8f5e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.15.17.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="20"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.15.18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.15.18.ebuild
deleted file mode 100644
index ee801f360b57..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.15.18.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="21"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.16.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.16.14.ebuild
new file mode 100644
index 000000000000..e61f1e6deeff
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.16.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="15"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.17.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.0.ebuild
new file mode 100644
index 000000000000..a5f75de7ba4b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.17.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.136.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.136.ebuild
new file mode 100644
index 000000000000..a95699aaaf98
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.136.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="138"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.106.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.106.ebuild
new file mode 100644
index 000000000000..1c92024f62fe
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.106.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="109"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.107.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.107.ebuild
new file mode 100644
index 000000000000..2ef85975e959
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.107.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="110"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 784eadec0600..48ae0cae8226 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,9 +1,11 @@
 DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
 DIST linux-firmware-20180518.tar.gz 150672075 BLAKE2B ef0c5a5d6ea2e978a5638fd509bde5fe4b50ebc682b685e6e8728667617b2d1460c562331e89b748c86d815341e5bede8fc4a2d5a3088c14b3bcc01bd783f01a SHA512 c2b1cce708f6bb21cc5d48408f335cadcf4318ef98c31c182cfe0630500b1074c90c0b0da1391c64bfcc921ebb500f0f46e8d8cdd6888c60458cce8faab6d12c
 DIST linux-firmware-20180525.tar.gz 151301971 BLAKE2B a2da25004f5458c2383b8f0c0d28dab56f40d24045723d9bf169d0cf256ff819e34899b487dc73cc6135ca83207cbccfa9fb5a5888e1a7764b2e464e95f6db49 SHA512 ef2e29a24ee4f52ad91eb35b79e2a8717ee0e0cd1b94877779c839bc0f64aa6de91b6828e069f0e4b1cdb8a97bbf140802c008582f7a4dfd61327c7059c99c96
+DIST linux-firmware-20180606.tar.gz 152670671 BLAKE2B 7c4fb07451c1c459bd0bf8bec15e3bff41bdb64166decfd7776650c85f0b373c97dfa23330ebb7ddd4bc144bffb57751f3a94bb4a352e5f8ef1dd0b8a3679c81 SHA512 4eb02e11beffde5bf8daff45af78304881e01eb51004ff0758bfff3a4a4cb59f6a2e081b7a3c3e07734a29954f09fa6277f920c2bdab6aeb608065936861c650
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
 EBUILD linux-firmware-20180103-r1.ebuild 3514 BLAKE2B 84d2faeb85a91d1c6e7b1b5b1ee5ccb0a314f191ec6bde04fbe2ba77330a94e58410f4def76459d18e5cc5d2ab566dc4583dafd34b1a3b8a92b0e1ad4cac334c SHA512 d58978d6008035a2d6b59d5a1dd4d04a9684ec9117e1d6d4e1366a7b27a91df4e897a0ccf53f8172d5c540dcae1c45ddf10e764d1e60246e76cc23cd128244ef
 EBUILD linux-firmware-20180518.ebuild 3328 BLAKE2B da57e8f60e4133aad29390cb1d6f561432f95437931058bdf9f6b2593f93f59bae3a738ffb93517b4432c26db14c2e913bacbbf5ba5cdc02368f187c625c3d8b SHA512 2507de0063c35243920dcd2ec231fc04b7d4e7ec37a950ec98c21ca49d5ed9f94f09e1cc492a6b6404e0f5bc1cfe4518355c32059cf129cb0bedc55d4550c5c0
 EBUILD linux-firmware-20180525.ebuild 3328 BLAKE2B 6245b25f0cde974411bd44d2f693d95cc90058fbf119f6a4971c366a176be60d730c1b5f5bc49fb4ed128671778a693be182f5cb3b9623ded74a5d35763acfef SHA512 8b167c9888f1409acf958abde777a8c39f2e1a7b46127e7e7cb3dfcfca50f303b8decea40ab42e49e748bdd53d9705551f56e0d203ec095dd119e524c8d01064
+EBUILD linux-firmware-20180606.ebuild 3328 BLAKE2B 190da840614d8828c9fbb9267a263288fa9a7d87d04fc9d594090c4c02cb6b4418c5a8dc5b7267189ae14801f0fe723f39eb5ce6f7d849b59851b2dc0e282abd SHA512 f64d0b9a7d3671c2c228c6bb8803a122553613607ce3b60a3f865c809e455a3827bb3d1b8a2bc2227bb5153b0c4f7f2aa07b88a44e5f951f9bde2666fe983741
 EBUILD linux-firmware-99999999.ebuild 3252 BLAKE2B e676dc8c270f045b62137a1874b3c1560b07961b0b77a17693f28faa154db8b681706ee4d813311001b66b5bc46b166b245166bb5361d6b1e7c7f652350de84e SHA512 fa883958bd1ea0c24641b6ed48895306e5352a4e9baa5932b82d74f54aed7577ceeb7441488123c85a048a37b60ef7e6744f078be2f329cd6e94a2c404269154
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180606.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180606.ebuild
new file mode 100644
index 000000000000..4543d3cd0ed3
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20180606.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+else
+	GIT_COMMIT="d1147327232ec4616a66ab898df84f9700c816c1"
+	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
+SLOT="0"
+IUSE="savedconfig"
+
+DEPEND=""
+RDEPEND="!savedconfig? (
+		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+		!sys-firmware/alsa-firmware[alsa_cards_sb16]
+		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		!media-tv/cx18-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
+		!net-dialup/ueagle-atm
+		!net-dialup/ueagle4-atm
+		!net-wireless/ar9271-firmware
+		!net-wireless/i2400m-fw
+		!net-wireless/libertas-firmware
+		!sys-firmware/rt61-firmware
+		!net-wireless/rt73-firmware
+		!net-wireless/rt2860-firmware
+		!net-wireless/rt2870-firmware
+		!sys-block/qla-fc-firmware
+		!sys-firmware/amd-ucode
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl3160-ucode
+		!sys-firmware/iwl7260-ucode
+		!sys-firmware/iwl7265-ucode
+		!sys-firmware/iwl3160-7260-bt-ucode
+		!sys-firmware/radeon-ucode
+	)"
+#add anything else that collides to this
+
+QA_PREBUILT="lib/firmware/*"
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		mv ${PN}-*/ ${P} || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
+
+	if use savedconfig; then
+		restore_config ${PN}.conf
+		ebegin "Removing all files not listed in config"
+		find * \( \! -type d -and \! -name ${PN}.conf \) \
+			| sort ${PN}.conf ${PN}.conf - \
+			| uniq -u | xargs -r rm
+		eend $? || die
+		# remove empty directories, bug #396073
+		find -type d -empty -delete || die
+	fi
+}
+
+src_install() {
+	if use !savedconfig; then
+		save_config ${PN}.conf
+	fi
+	rm ${PN}.conf || die
+	insinto /lib/firmware/
+	doins -r *
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 779c5816c9f7..76668ce3cdc7 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -19,24 +19,20 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-3.18.104-rt101.patch.xz 175128 BLAKE2B 62f113e88d0bbd54a9676f6404839e82a7f5facdd91d12ccc2ec82742e718efd0c43baae242c6c093d93944c5ffdb47cafc05e2df01e0eb4258215fa8e222e94 SHA512 a6a98f8b6ff56446d815f4dc775284e913cb4c2d3f477fb2eca9444b55cbc6247d8278bcb3786c97b9bba7456fb7ede572e4538ddb2c90163338374743eaf994
 DIST patch-3.18.104.xz 1502324 BLAKE2B 6404c3abb990667669f773fd86808397dc55636e61b501e4c4e25c13f4ce2584460dde7153f4864170e12e314dcf262ee42dc8ea17c80c33374b9dadc16b38b1 SHA512 d2c37043f1a4cf94b383ad48df3340783f1ea5ea59479028c8ec75328a46bf37ce2992c8e7568ecdba3f83d96a18b2fc32d5318094cfdb0d686ded9398535ec4
-DIST patch-3.18.91-rt98.patch.xz 175116 BLAKE2B 3045e7e370e28830a6eee3816ddb96e75850cc8c54fe2b626286f81bd2203c2464dd329fc136efbd73926191af61794566c3694a568a992fa51420ec24054552 SHA512 db73da1e92c42694a97d15b45be4b77d3f3991434f7cc9d63e2896684f0cf8a09f4cd6d8b288af48f959d2791bb30e9aa5430bcf714c76a489ac6f3cc3f6c9cf
-DIST patch-3.18.91.xz 1407536 BLAKE2B 45797565f03f53d22dad76051517719f5aa25c924b9b800f94f20789514ed34f4c06182a51cdac4b87d7dc4e32e239f3a347160cfb43b70871cec19c71454a10 SHA512 7fc3276ab236e2b88fc59b239e541c028b20e2b8105fd5082b1b9a1e4015c313c314aa2eb770f2059e3c6f92d68793888549cf8943d0f41a9214ffefd0d51655
+DIST patch-3.18.109-rt102.patch.xz 175080 BLAKE2B c9d5914c5a9e8cb4ce5d8a90d732f05649ea2f55d83c0ba1a2a0a3502667e1c354dae4455ea955a4e38619e479dd0ffc8e7efb99648581765a9e0d576caae39e SHA512 39f9a241dd9b113df6125c48744b7a061f7ff41a53c2cf3046558a144fe6456993ee229cf939d410ca655f95ec92689633cbdd5d641686b6b46533ee84a7075e
+DIST patch-3.18.109.xz 1543076 BLAKE2B 92c0226ce5a701d3c814008c6686351694d724ad3fc4df20b492c4e408f47011d8e6a1c73617556d1dca5223f7b5d96f553fbd2f63e825aacc793796e7dd4036 SHA512 053ad85e88910ae4830061c5c33b6d82d02b459b83a3084cf4b136f90153ee2ddce6555ebb84ee7d11fe8c2b412eb4a59eaf1970a753bc9835851ff276f2b966
 DIST patch-4.1.46-rt52.patch.xz 190088 BLAKE2B 2468002852ead5b171d043486b912bb710f4689b5b549f90890de572069f430f4de709cb54c4cde723bd8e888c0027cf13ecb7708f116575fc6801ab1a97cecc SHA512 2c6813cc0f0efe990e9599f3e38048142fafb6fbfd7d3f9670d118cec0ada6fc69fb897509759cbb0c54798316ac30d137cd2721fb9a88a98024ddcd7ee90e7b
 DIST patch-4.1.46.xz 1236640 BLAKE2B 0c4305e3a3d2da4dfb8f23e0837d27d7916830170a0f10e9108d7517c69fca89bfccf35455a12f6e944f4c0527041172b072ea93978b19410daa2e9ec0b9f43d SHA512 c6b50ddd848c949119dfe1ebe45542a53c8116718e09345e8b47b300f057d4396f0991de51a6ce0ae1ea88502e53339573c8873126bfe202c742a09455b00519
-DIST patch-4.14.29-rt25.patch.xz 226432 BLAKE2B a3022401b464eb89a4bbbfb96071e1ef90c1bc55d054d7f11cc9e043eab3d10de94ba933d2043112552313b988f48a21c28b1fca7cfd96335aea1dc3512bc806 SHA512 bd2fb72ad0da50a2590c47eff7f6087014b0f068488975bdecae7e5b0f99523beffe1dd16b8d0a7f877cd03b1bc86516ea00153679e2e913daa10f742d02608d
-DIST patch-4.14.29.xz 842604 BLAKE2B 368ac0197568441621a54a212544d0bfd40e23bcc71a9ce3feda8ea9669c5487f4e5661f0678bb3c9436bc8f98e3a42523d061a0ca7ab916a09593f5bb55eee2 SHA512 f2e87f9205924097b5aaa39ca6967449fa78a9a13d27fd4edac829cbb411f28881b2dc4fc5f8c270ec8673118bf260f7411646f0900c00f8511283fe0eb3c7e7
-DIST patch-4.14.34-rt27.patch.xz 229500 BLAKE2B 15ecc312787314bd72caeb03aaedf1dc3ad161ef8a1062bb166e324eb33d71ad7881984c5b9d4f382bd49827747397eceeec688a99a2bf03f08ecddadacaf307 SHA512 4ed0ca1ddb90401afff3c5b09c2c657046f6c1ce0c102bfbed4f467e8adc7817f36508aaaeba170c964be00e1ca82aff612042b931597c24b0fbb8bb7c3ae47e
-DIST patch-4.14.34.xz 939276 BLAKE2B 69bb29dba7b4dc463310325c1fa1b7497c353cc0534eecdf084f01d5fe9b01a8e0b3f02714e6759806d8c2f90424800c59cc197907bb66d441f1178bb6a10606 SHA512 1aff1ad1294e0d22ae1de0bbcb1d05269a9cc7bfeb6bc885bd9ee445198b30951d7d7918bf33152579415db2a4afe018d4b21c1fea5dd4d5e5014662fd870acf
 DIST patch-4.14.39-rt29.patch.xz 229716 BLAKE2B f89a355f677d10268e6928a86f83bd8cfaec7a421f899c862f0e8c265f1101fe6a6b836588b1bad6b4c7b7f22ddc79fbd852cf419cf0d72d069d9356338e31df SHA512 b50f62eb6310151da88c73caef4749dbfc1aaea2529cbc33946211524aaf8c08d5e102e81d60d449f5e969f97b2d2adf9596ab967452ba8efa18315a87c55326
 DIST patch-4.14.39.xz 1091116 BLAKE2B 5b3b9d1f2a02eb0eb4713f571acd0ae78a4b66dea671ef06519f980c373a5c9632047bd74078ce7366c7a0d49d3f98363b0f5cd7aae3e179c74b205380015ff9 SHA512 28568e50fc70016426b65706f3de12cd723d7e5d5d88a23bbb02915b221db904744108328c3a63bb3f620e059f116930bb0b2d16271b53ed70dc320f6f3daf69
 DIST patch-4.14.40-rt30.patch.xz 230352 BLAKE2B b788d4034b4398c2c499d5010c6e20bc455d35925f66acaeb02f4bf11efa43ddb793bcb92590008cfc0aaafa385148efd124ca2881247381bc85f0461375dcc3 SHA512 acd6e26bae67d7961abf9d3cac0a2ddf124b83b5087bfe533446a135dff42bc59bd415b88dfb56500239a0e726bd6b7f894a89f74e6cd1a6370c5e944dfae0d5
 DIST patch-4.14.40.xz 1103932 BLAKE2B a06e9f1208a0396e3bf28ddad9fefb7bcd669271731fc3a3745e61eb62f4186138c00b03a5f7afb7a0c236a278d164043f07f01ee6faf0aca29ca1cd11e02d52 SHA512 4961a454836b8583cf3b0a743f08951c7084745039593f2cfb2630f836f33c471b7456d162556359255e6952e3652e9bb30e2b363985467787d4d0d73ad24738
+DIST patch-4.16.12-rt5.patch.xz 227940 BLAKE2B f7b6eef1a729f29cccc0587d235aea921623fdd5e1ab0f9e738651719fac66ab49084a416334886e128385a50132572ff04ababc827cdf1521df6841b32f4210 SHA512 5b981b5758933c61526d50a47e0f454fdf6ee91d45c191dd97339972ea27f3bb27ebfa23460cf8dbbfb593e013f40ba53e3f164053ef28e4fa0aadcf4c21da03
+DIST patch-4.16.12.xz 301028 BLAKE2B 8700a03dda8a741311d0b09e7a6aa96476978dad03451582a9fe772dc4abe410a9f542edc65742bb7a214b3a6a9e5e2aba0e9113b42a48864763c11c60669b7d SHA512 7bd2b4fa54b69df5558a4a151936fb1787f2faa0f4e73c03db04ef84ac088f764425faf5d6b5a023d4863e190775dcbb251eba1efc3b10eb133330bb6b210b72
 DIST patch-4.16.7-rt1.patch.xz 225980 BLAKE2B 0da775b0950453178c79f13e9c3cc10ceb41ba23ea6fb866b8c0928bc8f52059129355cd7d89bb43f0ec47c138904bde29f699bb742eda5fa46362551c9861ac SHA512 5b3625ebb4eccce4e45a3925640a0b0cb91af07ae3d1fe879709c107aa1633bc89bfe7895f650a83cc75c109f11cfa3ee986f6ecfdb3af0b718509154a5ec027
 DIST patch-4.16.7.xz 170468 BLAKE2B 899c2268face620ee9ccf7f713b8db9a321e0cdec09abd42a8bad891acaa9d1807e35d15880641a9afbe1cda60cd4d5dab3c76f6ee98694f52d2e449c8c1b7b8 SHA512 576c2b520d444e11a9ca45ed3ed03822007ab6ff778a1759aa0f65c96946fe3e169e71d48d11e6d3b8627a99cdc20abfb0c84d7b6c9b0d2afa4d5fee9ed3aa41
 DIST patch-4.16.8-rt2.patch.xz 225952 BLAKE2B 767a9c4a51a886a544203d8a4863e72000eb5d347edf66f1a7b60085628f96ec0a336582bbee7e956211cb312b0eb3f03987ad319c42ad1e88599c2717ea6dfe SHA512 609541e14f89d771ddf8c5cc5b7f4724f886f992511883aad021dca56ce905c34fe7f0215788928052e40d21f938f822fadd7cd4073890e809789263ef725aca
 DIST patch-4.16.8.xz 189408 BLAKE2B ba3586ae91ef7a43a81da76c812dca3bd6bcd0e00c508d04d1f81b28d6304eb4aa3177efe0acdcd231a0d829a0dc231f4c5463a97c9999d0cf1ab16f007d2a58 SHA512 8bd521f5a14280c6893f6d85f46d12f97ba71abf3e149f1900aa5e1efa3a03a97df674c4b2b46553b8e9df55164894b6fcb510dbba8cab8ce47ee4b0186e27d0
-DIST patch-4.4.126-rt141.patch.xz 194488 BLAKE2B 8af6171724d92813c6edaa6be86ae460469964d395e9bc83360d423132a14394950d579b7e3eeacb4fecb284e3550c84297d4cbe4c44389baa8bccdf7fbb2615 SHA512 ca473fff80bfd1f9c10ac6d3d92c661418b4b01ac2def910ac454b14dd2deb3bc9f341f7b9a2ad4f66f31331423686d7f28349ff46845d6f55de454853fecc80
-DIST patch-4.4.126.xz 1784496 BLAKE2B e2a72fdb84d8c88bdcd3d47719712df7eaa9ab37e1f4a4feef8ebb3dd9b14b67c447a5bd260e4fb4c40a72c4b1527922175caa5648250f8486f8a2a74783e87a SHA512 7f53db4c7d34ec19732d0b9f1b994ee5817096a59daf8116efa64fe3776edba74060915af2765e641edce6a40acda7cc6b7cce131aa8ac6a7f643f0f4e0a177e
 DIST patch-4.4.131-rt147.patch.xz 196092 BLAKE2B 537b64e39785b6a992d901b921e3847bd17266a98f3c64d9af68e9828fa99c3d29293c9ddca8682b70e1e6df5b66cb27bdc9de0c39673a6ba389ac69dedc4ed6 SHA512 5cfdc1202eb85cb6ff677fd750932d696d1e9f1d938bc97990bd9876787c815fc0934f056ef049812662c061dea08b7ac25bfd0410d2bb8dd3c13b11dd8143d7
 DIST patch-4.4.131-rt148.patch.xz 196408 BLAKE2B d58fc0441b7282ffbe01644304f6630b079aff1af200e7fac98e3ee95d1664f3186f5f26e6377a56376a8ac7324774d159d232577101988cb773facf86360c64 SHA512 44ae0b66cca897d850486b1be2f97a2d0d697ebc31e46326673ccd5ed373f7f0deb7777a5f538d3932e41669fd86f3f496da7d32c79081383668ebb7144867b4
 DIST patch-4.4.131.xz 1871404 BLAKE2B 3d7729d4e3ce75888670d57368b651f2750f46e4c94826525095b791f6717badefede520a144b098fffb9ac08b3a08d0c567f0e391b94cff8869cdb6afe9592d SHA512 856ef10be19b07a2e1fbc777dd0052a145f5ca49c59b29ec4e5205babd478d623bfef40ed06c2fa113292e512701b4dbc67723cf1a946f27ce38b601d003bff2
@@ -45,15 +41,13 @@ DIST patch-4.9.84.xz 1512620 BLAKE2B 8f3ff14ed541bebbc841af845fcd6182d67a347363c
 DIST patch-4.9.98-rt76.patch.xz 173232 BLAKE2B 77f8e3a17bdcf126b9854d54f6a15fee483e422ffc60e7f656ca6298bbbcedc7c9a1d907ec151e1305bb1c8673644473de4410088892007bd1c8c80c3b1b4d53 SHA512 1adcb149f5991300aebdb88595bd93d941325cca5880e9f0e195c2771468ee018cbca5af21401b78064695785e6bc16252767d7399df4002b5add03cedce9988
 DIST patch-4.9.98.xz 1811528 BLAKE2B f6244076779eeef08399128daf07d4a9ceb42065bff4f89b5f40ef3dd9dbdcf36daa5cb064ad13635c91e73b3d9bbdb57dd64dc4d5adf07042b1f96c7e8733f4 SHA512 e1aa814fac33ae6dbfbf2e0cda40a1bebbf420d33c6448de718726f94d2ba0c9538b18c3251fb46202d90da6aa56add466d4328696faa1a05c50478aa3f99a5e
 EBUILD rt-sources-3.18.104_p101.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
-EBUILD rt-sources-3.18.91_p98.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
+EBUILD rt-sources-3.18.109_p102.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 EBUILD rt-sources-4.1.46_p52.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
-EBUILD rt-sources-4.14.29_p25.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
-EBUILD rt-sources-4.14.34_p27.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
 EBUILD rt-sources-4.14.39_p29.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
 EBUILD rt-sources-4.14.40_p30.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
+EBUILD rt-sources-4.16.12_p5.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
 EBUILD rt-sources-4.16.7_p1.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
 EBUILD rt-sources-4.16.8_p2.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
-EBUILD rt-sources-4.4.126_p141.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 EBUILD rt-sources-4.4.131_p147.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 EBUILD rt-sources-4.4.131_p148.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 EBUILD rt-sources-4.9.84_p62.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
diff --git a/sys-kernel/rt-sources/rt-sources-3.18.91_p98.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.109_p102.ebuild
index 1ca2170247ac..1ca2170247ac 100644
--- a/sys-kernel/rt-sources/rt-sources-3.18.91_p98.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-3.18.109_p102.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.34_p27.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.34_p27.ebuild
deleted file mode 100644
index ad4f19f2289a..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.14.34_p27.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.29_p25.ebuild b/sys-kernel/rt-sources/rt-sources-4.16.12_p5.ebuild
index ad4f19f2289a..ad4f19f2289a 100644
--- a/sys-kernel/rt-sources/rt-sources-4.14.29_p25.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.16.12_p5.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.126_p141.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.126_p141.ebuild
deleted file mode 100644
index 1ca2170247ac..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.4.126_p141.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-PATCHES=(
-	"${FILESDIR}"/rt-sources-posix-printf.patch # 627068
-)
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index fed3a7fadac9..b360a894ba5c 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -3,20 +3,22 @@ DIST linux-3.2.tar.xz 65065516 BLAKE2B ca7a8e7f7de9ac8ec811db330bc5dc830849c6745
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f99571099d471b2dde5f7a746d9b9fab5112fffe3b7978c40f15ecaa33203eeeeea98c2158fab2d5857ece5d74f9f SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
+DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-3.16.56.xz 1956224 BLAKE2B 27db858a51be5d57ff1f3d5409d511df5002f542584d80b64d2303f1569c0502d0d15783a3e36facc2ee9481ada4b8f08359a79972b4a3ca07ac180c2e607c01 SHA512 e1c1c004c2ac52fb6944718c82b6c70a9ee4175943fc8477b298dbbde42d16f1e1c9387f9d5ca05958b3efa0e851eb0105daf4a0d59ad836b31ec3919ee857b6
-DIST patch-3.2.101.xz 1942280 BLAKE2B 9000a0e0d23a6e9e8651c6f2f936e0aa14e6660ad27fa8d29c35fc71e4cb0590337460a80aecd5725804546a20a610f367ee9da5864d53ffd1fea45c0e43b2a1 SHA512 00a8d179a60bf628ea12595d866c25ce5848e9c68ae44d7a10388e5ab2e99fb7f3ae77d57689a9ae161c9084d5de84c595f0f96e4d8eaf60230bd28f3435acf2
+DIST patch-3.2.102.xz 1964152 BLAKE2B 92a9ddef295250db735f7212af956e47385818b1863b27f7852afc6c0a36b3cc1d1099fd3fa37f3de9a8668f4aa7250fbae467451eae67fa4371078dd0de2009 SHA512 15e17a1eb39cb73d0efb606d78a44c811fe83b24004ac45504b32531af1db29f1d333382fd5270c8ccc56d714cedb124a07f5e31b1eda93f45715154a721df4a
 DIST patch-4.1.52.xz 753264 BLAKE2B 57e0d116ead0a994bffbe019f229c607c71201452d6a8bb57c9855b637b011471bcf383d51fd8f2222e725498210d3ddaba7a3a3f6af491effc909a15f902275 SHA512 0d18cb892b62edb42e48038125b74edcf13093cefe30616403f0e75d44974d57e569ad28a8c98d9d80b3fbc360f092b7c045778e17e28bbb9748528ed87df43c
-DIST patch-4.14.47.xz 1287036 BLAKE2B 962453bf1665f71b052592928770e2fe1d7de2b3b314439f7c17e32f8dceb0e2704ca4985dd2fef31d4173785178888788d2e17269bb0d65f2f1f40634f91c93 SHA512 8617397002936b43c598350c562cb0dac1d93577b1b1e13478835f554d08289facf2051276db7a3eacfe1bd5aa2e5ffdbe3ba86d05454c6b4e27f42ea8f05945
-DIST patch-4.16.13.xz 375944 BLAKE2B 75f2aeb0af973e5dcafaa12a9bc5358bf493e1b56bd4bf480264a06c2914b9a31f91bbdc1f898980fa565405cce8572528e346038cd2221aaed2399f470ebcc5 SHA512 f136eadbaff335b5c9cd45a9265b4ce4409c141372bc7af378c5a6bbb50330bf16d75ef29294f2b876961292c4c2606980e3d169b98e5b413d6c1b13f5eed37e
+DIST patch-4.14.48.xz 1301644 BLAKE2B e87cb5cce778f119dbd5c59f4edccdc03d0901a184eaa162d2c329826dd4e00e1b576071a6fe7b8f81231782ec9eb29eeb1a3a7da236244e81118c72bb4e542d SHA512 f87144768ba221c073f7e1fbdda340c65a7d5de28bdea492c61d8f05eedc54a3f190daa48611ead331755d2a12f8cb704399cd5a762e2227299980fecb372595
+DIST patch-4.16.14.xz 389868 BLAKE2B 2ac0ee94ca9e7c86b406001b042102af650972edaceaef5cfd40db54d7565daad9081e4decd90fa83108241183f15acbdfd3b75733d167be2f3dc068344dc68c SHA512 5141b66352e6560058ab857e00ba72c84796e135d30cae6398de8e7cf9dfcf266fb581008d2209b0dc20d7dbbcd4e65296557acd3c806fb057dfb55850cd3975
 DIST patch-4.4.135.xz 1955016 BLAKE2B 5a9732eacff14e903190adc479c1b535919d2a31d33d20ea18621604774341315b3c4bf6a7ec4908dd82f7ea1713cfe44a6d37f0c9f70eee4686ef2b5e50cbc5 SHA512 4aab130aaa2245147ae1b6a8a7748adf9688ad19771952dba3d2cfb5d3e56b1f9a9c687587f52aeefbc7042a8a07b69426081c5d5a0ea98cc8b9b7636ac3afd3
-DIST patch-4.9.105.xz 1941308 BLAKE2B f05c405e1266d176a7462b7237d25741dfa9d8b2af74522b47adfb0b5efb0d387e88a0fde8a647e2b24bc463dc4cd90d7b2bef01618f10e69958fbe9595ab334 SHA512 2b5f69af99187bcfbb5e90cd65ef23ade12d365bc0b175785a4831772e54c64e95a6af0d35a42c0b228bb16737fe4989ff595d837155695ac57a2757d52c22f2
+DIST patch-4.9.106.xz 1993624 BLAKE2B 537f656e8b6ff7d85b9ab8a43bf1537893a4cbaa06eeea765b58d0eb064d15a7db4eaa35aac7e78ace241aa09204a7256514c5d126e1a1071b3c620c1e47f986 SHA512 fad1d728f3e0068fe24c69804691d4a922dcd874bc3efd3489362cae5cea0dd3ba43bf0af4739709f6999de05f24ee85b167175f71f2d3322e6279c2d9ad181e
 EBUILD vanilla-sources-3.16.56.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-3.2.101.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-3.2.102.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.1.52.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.14.47.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.16.13.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.14.48.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.16.14.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.17.0.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.4.135.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.9.105.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.9.106.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.101.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.101.ebuild
deleted file mode 100644
index 9f9c2bf5ccf7..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.2.101.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.47.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.102.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.47.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.2.102.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.16.13.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.48.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.16.13.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.48.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.105.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.16.14.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.105.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.16.14.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.17.0.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.17.0.ebuild
new file mode 100644
index 000000000000..2e4a132369ff
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.17.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.106.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.106.ebuild
new file mode 100644
index 000000000000..2e4a132369ff
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.106.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 3c5954b78603..c37ad01a0111 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index d9dc88b08b58..2448d80b1b16 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -12,5 +12,5 @@ EBUILD binutils-libs-2.25.1-r2.ebuild 2725 BLAKE2B a4fe58fe79272a65c7703b3be801b
 EBUILD binutils-libs-2.27.ebuild 2847 BLAKE2B 3d02dfccc46d3398646d338e01f096de36a74fdf6d224a8ae221120fe8105cc674ed09840b01d84994ff11c4f73c88b39737b3ff484d32dbfb1183f20eb3a1a4 SHA512 629aeca9ec392f957fbbe7f2a3d5564016d096b7cbe63ef9337351e599722bced4c3eb190d8dd0f091eb3ff816e839b03f7a7662f22f9e22b36ef3e8e5bb93ae
 EBUILD binutils-libs-2.28.1.ebuild 2872 BLAKE2B f0ef199dfc0025b06dbdab74f76f0a1775ca47030bd26cf2cf4ce4f6b7f3c5325d1629b3713aa40a1f85b9b0151555cf0a978c0390bef48846b3b1eb0c89b05d SHA512 b00d0080957824bf447035172b4941fecfd358f2cbbdeb82a578e11e0a8b4c712091344b904d8f74840164032d210834b30ed8a90ac3dddb47dc9632d66f8a9b
 EBUILD binutils-libs-2.29.1-r1.ebuild 2921 BLAKE2B f38060716462c9c51bc84b98348b82952b6bb47cd33136d7eaaca822ba6e40504fad2b0c778a4a02989ca9e20f812d928d718295376141dd02e519e541a605a3 SHA512 8fc849244e3cdb9b1a35e9bed1f2e57e8bba210e6ab9aa7408904b5a04cc532dfff52a9840e866df5985f6b1d05c96ce7549c7514389a8dae9a4d5d798d48c8e
-EBUILD binutils-libs-2.30-r2.ebuild 3210 BLAKE2B 07544699c3e4fcc12653fc6d872d10edd467767f96ad9213e36d04e1cca208dae119f07632c24703b7aa007c775f34dfc8595b8ea6937a4122d085ef5b7eee4f SHA512 8ee6d5cb63c25a30e496d1642c377a5abc75a58d0ca76de71d38caab2d8ea1b04be8b4073769e62efc366df951f4e4f51e7308ad184c1274495067384e2d1843
+EBUILD binutils-libs-2.30-r2.ebuild 3207 BLAKE2B 99ff0feac55ae0b30338651337b749ef2b4f1e0b39b183260f18ccd47728fb811b202572583487d8817475f783b690e7171c481187160a2fc6dc4141b832da38 SHA512 8f43b50249c972a2e7e6aca1becb10ce21d577c02801868bcfb09abd23e386fb48a3c5ec15bed7efe2832ef51da0d1dec327f6875c8b9834a28a60811e687c96
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild
index 16d645ee02bb..31f6e054bf7e 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~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="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index d82a39ad07ee..2acf72e8a6f4 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -9,8 +9,8 @@ DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf
 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
 EBUILD compiler-rt-sanitizers-4.0.1.ebuild 4778 BLAKE2B 5689080c9783d288206a9a7f4d8cee487ef73a951d95baf7083719c89239b299a7cb71361e060876a7564701c353a857e9a640ff5e8f5054d76c6ede66523b5e SHA512 937fab2e9791bd122005469704e5cbbc8907d0f52cb277d779bd93451178e49c8f369be0dec5bff22338a7ed3920f0e125337e9ede02c957c123f968b69ec442
 EBUILD compiler-rt-sanitizers-5.0.1.ebuild 5088 BLAKE2B 987b66738deed02d6b80f277e3c35db84290fe6c5dfc69c8b7cfaed7cdd5d9741a07c4d049825cd4c18ce1c1494042599ba84d1198064105d2d21e31bff3922d SHA512 6f04614e69ce636c69a80709aacdb0977b2dd670d6895fabef573ea1446bbf1764b9e437d811561a9e4a39f365f80c5a3417528f2f3dba19e55a3b5768de1d44
-EBUILD compiler-rt-sanitizers-5.0.2.ebuild 5090 BLAKE2B 8df55161104d4c26c378b1b429ab2f92132674235997f93a45c2627eda2cf01f9cbf6c20379ad7ed60728dc28ed4e17f7929248d21121255b8001da8d5ad2c78 SHA512 018f03bae139b7e88152f8f48cc85dd452cb0c9a9a858165709112c72791b6966f00a4d160c5b26a633ec1a8a69b68973c05f4d2d1c0e1513143c242d49d476a
-EBUILD compiler-rt-sanitizers-6.0.0.ebuild 5010 BLAKE2B ed42f30c2bb225f949ae4fbb5e1cf17feace321101ea52d46eace6ce77e3d33daf59bef5c7e65e6b0a4aba5c51254a6673b8df909b792a4b25dc1b13c616c1b6 SHA512 2831e0d85ec4c9861da756c5816de481a978efb704fb2223dba078033eae0f65fec2f912d1557481b3449cabc7c62e4e88e2031500136d32cf4bba93b445b7a2
+EBUILD compiler-rt-sanitizers-5.0.2.ebuild 5095 BLAKE2B 0f3348e8800d24d01231b2460025eb83a3211c44fd2987a0b0d4361372fe4af5695a131886d55029459121e8952e394c526120f12212d20a8a5c995847a04cb0 SHA512 cf13df0bad1be887c621c16f12639e385fff395985007b17a1bf14b00f0dd9dfd609e83287fc890f105d2bd586b3457b1efe3b6f687096a205b1a96f3fd1139e
+EBUILD compiler-rt-sanitizers-6.0.0.ebuild 5017 BLAKE2B e1f06c36679aefd1420470645ffde6ae9afe98165d2fe81eedbb9bcd2728c50d2a6ade3e48f4a8e794dc6abc960fdfd2bd36eff61431e7e56b04b8884f6b1e62 SHA512 aae8a4e0420192d5287caad76c3dd9acfd317d49b2b5300fb40e179a0c988df62a7ed12d341b3a6f7663e9d5ec5098a3cb6cbb5bf1826445ff0c3c579c58fae1
 EBUILD compiler-rt-sanitizers-6.0.9999.ebuild 4960 BLAKE2B 583c1e1ea7a2b59a41f57e0b70be4d443f3d91a22a437ef34258428abb39f82e5161eb57b491599c9acb5b138a568e2b4c212f0a2d3a61bba4134694cb3b58e3 SHA512 2428b3aaecc8fae1c512216c1cbfb23f59d03f06e2e33e7053029fb2355b7f132aa06a34bd991f8e21e401f1d44cfa3f4e5aa0548c93b15469f8b19d20c18283
 EBUILD compiler-rt-sanitizers-9999.ebuild 4935 BLAKE2B 92426b7c2e68887ad859fdf773f0ac601cb7e15df506ab590e106f26ea729721d0425fab4326d14936ef8a21bfd0d8889fa5b6706e1f44f60ce0107f565c826a SHA512 942b386808a78e1f5bb701daff9e590a0b16cd477fa014456f0f6b41cc45a682e71d2f2c15e05cc282c6fec011a260e22ba642cd8ffc9f86ebed1332432c5f8e
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild
index 299ce44377b4..d8168a231aa7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test elibc_glibc"
 
 CLANG_SLOT=${SLOT%%.*}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
index cb0a84d01c62..0fd9abb2e99d 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test elibc_glibc"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 8ce0864feccd..fc4d99912033 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -4,8 +4,8 @@ DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3
 DIST compiler-rt-6.0.0.src.tar.xz 1633096 BLAKE2B d5df9b16ad474f687507013fb6eda8c7c3bbe479c85aab6ce428b93bbef2467538c0ba59c54dd9266b978da53c8c312a59e3b7abac843702048900f5cdbc1011 SHA512 717bed116ef43ebb2e18daf6fb737472edf57564947f53fe6368d3bbb080f63e986c0d1b94dbd087be998196ad7be54f4361854f8eb5214600b82449ba02c9c1
 EBUILD compiler-rt-4.0.1.ebuild 4144 BLAKE2B a89fa2681b1254b285aeab803103860efddb6990b33bbe725fe52f7ebba5652f4ba9ecebbced1f63adc84dac4dc7dd26b10a6e7863169bc08f8e95cc2ba868fa SHA512 f14a4a61cc42a37d62e6662aeb95c8d2c3534b0ffbee57cf788ce1df62ab1387af76e90a2d79708c50b8b70d073b00298b0d31c71e8d69e11f2e9204dcbaca4e
 EBUILD compiler-rt-5.0.1.ebuild 2833 BLAKE2B aa0ee1db389ffdf8465ea15a00276c15cd5ef16eb31918f69b55b7a8bbaafc11c0da95c34e9c40597b46430f8288b6c6c96c022d7a5b53b5b7110a908ca4d847 SHA512 53b0dedceacd860a35f3fa00186816473cb5f2c87b390909d3dfb9699c6990a7df482252bdd3fcdfb4d7e3891b02000a90c22a09515775187f854adc956d8d8f
-EBUILD compiler-rt-5.0.2.ebuild 2835 BLAKE2B 02a2629eb49aa61bf89e2aa191c8e0171bba122afad4f904d6927341b7b0e7262a1f63af34f00e156a027ea4d30b6cf711051819ec036192fb21f50e1f976fd6 SHA512 faa4776110c24a3dfa9c31cf1469e8a632da0d79ca065bf1b407bac2c78b2baa3189937f7e560cac22ddbf74533b88df326076495d7a476b4a30ae211c5c53da
-EBUILD compiler-rt-6.0.0.ebuild 2907 BLAKE2B 53a1f886d5df143d35c754521eef1112eda7a7ec0ca9492b6b42276190f6451da2d27bb2866942dae75277abe689d3a8a4666304bc881b679978d32510105854 SHA512 83851e748f9d7e8102143844aa6714d5ed18fff6fe6448c68b8994107982f112d70681df6c4d82ee750fdb48ff68743caf6ac3b2938ec913ae9ff97896b5fe04
+EBUILD compiler-rt-5.0.2.ebuild 2840 BLAKE2B 4c6e6ca121bad66f69f272a1ddc8a5153196c8f2608da08b5326e264842fe60ae8a4cb1aa98e2907b141068e5af997fe81ae13708dfd148f8676bebf18b894d2 SHA512 3fcea6a7045c1dc666ad6cd9c575b1ba931719bf31457f7493bb7b9c7950bca8e1c5eb8ce4342c1098250d0c126e85ba86b56724b17a3f6bb43c2846fb765a1f
+EBUILD compiler-rt-6.0.0.ebuild 2914 BLAKE2B 5610113448d3135f3bdd72931c370e87998339f2e229df526b4f98278183ebbf6859a2af869289cfd50bb656d019eddf8004d9e289221765a726553a7885d011 SHA512 68ef30aec92877161e80cb9552c7bb3dca97d8f859d9429ca984a7fe48de6f720c21b9f118e7098d0b8becd63f289f2ff481bbf5a3930423e7a394e9a25d347c
 EBUILD compiler-rt-6.0.9999.ebuild 2949 BLAKE2B c6b212a50f84609b173fbc652de5bccca996951568b9dc16bf122696bb1fc6ea1fa3f414b9934a1181c2462d0305694e8356dbbfb5c0155575b9a490d976a164 SHA512 f82c6ca479507995a7a15551568517067eaee38d06aee85d05736fe28ce1dbd4cfc105d32fe595d147b5241ae7528bfd82d0506cf86ad525a05ac67dfb031334
 EBUILD compiler-rt-9999.ebuild 2924 BLAKE2B f5f2739f3c8d70d0464334862f21c50ab1266cbd5b96c0f9a10cc0d1014e87b6246f8d3f3fe139d6dbca9e22c87f72ec6c93f56656fde6977d7a7704c0f81acb SHA512 c14a2dd7c4a5ed8605403fd404de33d45b51432f54d7f9a3a54a3826cff36840ff3d64447c2b0617b24047f7d6c56c4263874a1606e64555cf21d32ad01e0b12
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild
index cdb43e43bb4b..8d53cbd955ee 100644
--- a/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 
 CLANG_SLOT=${SLOT%%.*}
diff --git a/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
index 5292e752c063..31d4c6152204 100644
--- a/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index e52d10f96edf..cbc9ccb79ab6 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -3,8 +3,8 @@ DIST e2fsprogs-libs-1.43.6.tar.gz 595409 BLAKE2B a5edf65b637b7f3fab16174a695baa2
 DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a38dca2d69765d7e9edef184c5b478fb0aa860fb0338a41e9d2d47c55780b0e44450efbe2528110403a77696af9e0c9d7c SHA512 c4b78000ace629a7e6f12d7c63f5ff36885bc7ba69a22654f95fd384bb347f0f28ba544644b40cdcbf14ec211e724901fbe44cc2b730f2dafba77632b3e2d0b1
 DIST e2fsprogs-libs-1.44.1.tar.gz 714486 BLAKE2B d2794e5b3a28b2b3ef811396ffb3ac139c294f8a4407cd74ae0f8c6b39d5ebcdc464cfd2e99e1f8fd3e2be7bcb2016c019f586810ccbfef15696fd2a21cb49cd SHA512 2b81454230def3f499a634e38342f323d3708be460ec0d69a7de7d9c9fea657a84759f7dd09b81e7dc6fbe07510c06c5e55317374a25f4ed3b6dfc58881132a3
 DIST e2fsprogs-libs-1.44.2.tar.gz 715214 BLAKE2B 696702563e30f877f1ced23c116240b6f5314987858492908396a5190019df095165e3e2995bc00330a1a3c19052773c483928db93bb2f9f01dc73de69858edd SHA512 c133c779b7ad4f51977d5c5627810f3808b0e40559726e99eadaa7beaecf08d09c6da6041c376148e71f94c60c2be185c9ed0b1c3fbdeda5e113a32f10b1b6c3
-EBUILD e2fsprogs-libs-1.43.6.ebuild 1854 BLAKE2B 6751907b5bd67f9b1aae0133eae4c9df1a29fa06ac359c3af904ac490b32837cdae4f2c196ba1a7cc3e689cb0d34b35fff09adb493ea4c091dd3e53de6074c96 SHA512 565b03d3728d9044166e7e61a0ade32cb31b47697e21a0230f2fe5ad6f2ba096b9c0e58db9993ab359ed348623e05b8a29a25010212396f1191eeb7f4ab083e7
-EBUILD e2fsprogs-libs-1.43.9.ebuild 1870 BLAKE2B 12c6ab507a80ac818ac54375b227011a26578bcaf72d037e681b54f2da59cc4c4a72d1d785b146b07b039a951dbdadf8db9e6bd05b9139491cad23b8a0b4f447 SHA512 5f208078d15d25507804ce5d140b0c125fd01fb51ba4bc8556e8dc381688e508a3b91006dda9eb88496de392fc974cf9596a22d19e9e5987d6948d6ea0ff65b1
+EBUILD e2fsprogs-libs-1.43.6.ebuild 1851 BLAKE2B 0681dd618ced1e9bff041865c4a6363c11f68b98aa9b9b816333d77d11478228ef6587e318c1760da8723c2488b41ca0267ba205fdd2147146c8bb638a392dca SHA512 74bee96a90b10ee3b3e5bc8f68e1756e8d1b87eaa6a0a111b03d36b6eaed06eadb6232f69799f8cbaa47fb1a6d763f87e500663035ea0a673da7799e88e71274
+EBUILD e2fsprogs-libs-1.43.9.ebuild 1867 BLAKE2B 575b9315d9bc163ff7c519e9d41664b3da71801eb20745b07254513588e44988567e0a43e471a2b8f43c4194a342596adeb3487a91aa322fec998a3cc459a2a9 SHA512 341a54fe723e5c3a7f64e0d1f134f9cccc75ddd4b2273bbdcc6f04790e426ec927bdc4920c74d7dc72787eb9adfbf86c5b62aee33b936a86892fa439d78bc536
 EBUILD e2fsprogs-libs-1.44.1.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 EBUILD e2fsprogs-libs-1.44.2.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
index d97994571452..1c65847a6265 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
index 8ba0cbeaafc1..9781d1d255f6 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index f9c34985051b..814995ecd0ae 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,8 +15,6 @@ AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621
 AUX nscd.tmpfilesd 111 BLAKE2B 4abb7220564e248fc7eeeced41077f186f42594facbfac9a4c0ff36209baac529c219ad6ead8d8aa53ab2b092002f1006a4479459b9e9a7c5a0294cb7d822100 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340
 DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 BLAKE2B 3cc5c82cd57d0fbd26d9a376ee8ca02f119fe9d653311cbe4d2b7b93aec2290adac3be271be19a7fdedae2e11e4b6e32360184e557204e100ad64357f5575d4b SHA512 40b93e194ad41a75d649d84d1c49070680f253a13f0617803243bc61c44fed1ca2d0a7572a97ebb79353f312b58b5f6360be916dd7435928cc53935082e15269
 DIST gcc-multilib-bootstrap-20180511.tar.xz 2392908 BLAKE2B f3cf614399368acd8908f60d894c6344a2fa09383b30c1633a0682bc668367c8a2f8c6fec2d41b6e2178d709a2bd8db57e8b2ab56ba263c7d56f819c15acd061 SHA512 98c766e913693ab42ff790557acde2a36a8001e2648046a685b21964200df8d4d52d8452d499c0068c6648284d086ce062c2d36e2c6c2fd8aacd232d193f2853
-DIST glibc-2.18-patches-4.tar.bz2 95165 BLAKE2B 70280e0f5fd0b1ee13cd0464aafaa9c9324528d0bee8024e6529d67d908991012066db6d8257b66983a1f52e32b3aad7718612fdab9ea199fef845db93347168 SHA512 d881c9c5fe32b967694d4ca5185ff5ffc964449f2ed49fd062e5d57a3c6d9f16eef2f591d2d8e98a1a95a6487f3436ef031839ed8766fd085404b288340b7933
-DIST glibc-2.18.tar.xz 11150148 BLAKE2B 7848a5a50abedbd17085e05b6f6835959adb5e55a424d95fa8a49eeec999a6dd81a9382db85ef7e852ef1d7743c5d312dccbf42024e95edf0e802eb32928dfe5 SHA512 27218d2e7dd3bf3908d7af171c490933680e958c579ebd27b43b661e223fd5de2219cc1cf699170405280808c84de476d0ad86dbba35a488ef404e9438552327
 DIST glibc-2.19-patches-3.tar.bz2 80664 BLAKE2B fb348c711941c1bd4dadd905e172dc4f239d8b63af1a1d14dcf4ec45c504bd47e10e9b24b38f9e01796016f2e97caeeb693213ae08147274ed0a4d9501293be0 SHA512 d281d6a2757920124cf8a3f02b97e75192598b08d96ae48840df34c7ffdcb212952d171f233e6f12a429b19437d0a296212fe1f2eae164d6a1c6793cb3cb69f0
 DIST glibc-2.19-patches-9.tar.bz2 24584 BLAKE2B a96e930a5bd20fa75d9f259cc2117fa5ce98072274a24a5823bf877e3739fa4c001a94d7865e065ee0527f3974430d27da8038e042340a451ad2052c62724f26 SHA512 a95b3063ade974a3556480b798b317d33c7423a8cb9e69f67249ffb8b3d3c671d70d2d5f782c1efadc0bec4cc49a96d4fe89911f3dfcd85b459f69f3b4f38f0e
 DIST glibc-2.19.tar.xz 12083312 BLAKE2B 9dc03346e0f0df4bf009a92d894b0a9f964ff92b7f4c9663cedf1cb6cf90435f28a15539d33791ecf43ee578fa4e26f916af0367651312ef8f9c1c38ce0dafa2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d
@@ -34,21 +32,18 @@ DIST glibc-2.25-patches-15.tar.bz2 78320 BLAKE2B 70c62cc10db13e2844de4d8a18972e0
 DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1b93e557b6c58129bfb50f863c06f8b49425d75fd2df537dd9c4a68bad790cff770c50a6889732d66f507d349 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e
 DIST glibc-2.26-patches-7.tar.bz2 413976 BLAKE2B 18263201cf33abf911eb7b802ed539b217391156f897a8db50f65a69627d8f8cceded78414168986ee98eba038364a6b2f3599b23f95e7b0ad2643481c399718 SHA512 0c812a343fcc68c10d92117cb2a0cf1c255470e81f0a7a04d6db2fe35445e410ef37f15162f145c2eb772b08ab55af246f5b52f5e57c2e91038181f6f027abc3
 DIST glibc-2.26.tar.xz 14682748 BLAKE2B c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebfe3c958107032beaa879710252be3bc4122bb62166408725d43785f233544df6159d29cce0fc5b2c08f45adbe SHA512 6ed368523bc55f00976f96c5177f114e3f714b27273d7bffc252812c8b98fb81970403c1f5b5f0a61da678811532fb446530745492d2b49bfefc0d5bd71ce8c0
-DIST glibc-2.27-patches-1.tar.bz2 15950 BLAKE2B ef2d2ede447b98c5e20f1bf1328f1379fd781b603a888f0fd7f1dbb6172e42222c9198d61dd75d9aafbed5c395a277a3c0d00ef4b70932fafb500b111e013963 SHA512 9e3ed7e271313c104eefcd383e6259c235b4e2f7a41be2ba8a1bfb469f8f54835ffde63ae89fa40af47b444911addb0db002a05d033bcc2832710b51650c91e3
 DIST glibc-2.27-patches-2.tar.bz2 129983 BLAKE2B fad8d14f5330bc301804913f92f48051583f122cc83ab44813dc13498f59e97b38d1b276353eed9df3fde427b669cf9168632bbed8d006a3d4995c1df79575a4 SHA512 b05e34dbb45aaadfdcc079888ef2b2f70b181ba31edf2e2bbd18fa666375f5c6c48993830a305de0706b4a562db6403b6287bcab4789c1c37bc535216ee9f4cd
 DIST glibc-2.27.tar.xz 15395316 BLAKE2B ea206d304c8c9aa86d69db981a14bea008602cea06a6c151c4971a8df059949ffe5632b42a67ab0ffcd7c4d7ce1ec02ac48815dac4dade1c4dd41eaee8a6ed33 SHA512 7c5581154487d38d173ce1feb944e60207139cca148bccf066eaae322c0c2d219423bdcfa15c7f9be1b5e45dfc43c641cc5d80d3c3c65837d08a83cdb4e2a147
 DIST glibc-9999-patches-5.tar.bz2 15979 BLAKE2B f59b4d7096fd876c9176f6ebdd9a4a510f3c6c90dd69a1fbb092a18f296767759d8d73dc7a81e29e3f6152043a4179056d5e224896c7bb96cc09ede2e2dd16e1 SHA512 c29ad59977b2c4dfd58ee16d0898a1c16e6cde974d5c29c3a7a55e0dee4ade7f1a3d45c9481c1d35df7fcedbdb67267f5d61759cacab677b6288b5ece3871a4b
-EBUILD glibc-2.18-r1.ebuild 5522 BLAKE2B c087f7ac58924d29211b8227796eede63074c7a3e87821ee21c676b4831ae5fa213693d9476af30d1a50e132b5e53e31b722ea1ebcd1801fed319930839d36e8 SHA512 adf20c016104ecaa137c8123a7731daeeec8bbdad4220d379ab5ce2e89f4b548820097936b1f51bb03d617956fe7b36d3630665754999273363f12ec39e085d5
-EBUILD glibc-2.19-r1.ebuild 5479 BLAKE2B 68bb9535b64e564879ecb66f4e8a2df99d5edef8d7591cb239c75766dc038cf3fa18f4b5d9b49662fabcec4157ba00590f9678076db4c2966fd75614ec833fec SHA512 336bfdcb0c6d6ac4ebad7389e84fefee9e3930cbd6af1d094ac4e37efec335d5cb14f781bf8ac8c1f6a7fcccf00c2c836b3f08fd09e03af767fea62c462e3095
+EBUILD glibc-2.19-r1.ebuild 5456 BLAKE2B 8d446e7b7d9c521925a2a37f1373f354991b89cc59a8e2e163cafb5d76284897cc7573b0e520f50aeda2da28d9477ae6cc3e9d42c6174c517cff7bc10a89bbda SHA512 250b5c69f0b9a3b1cf140223b1acb17d05d840c01a959c4cbc3859f2f87c86566d0d8a4a686c403058cc29c4fefdc11fec696f24de9816b35617fcb3f4666d70
 EBUILD glibc-2.19-r2.ebuild 40613 BLAKE2B 3cb96b82da71e6019d1e2721de6287366ae19d207d931f8d5b6455f81a440728bf63d1136543f82618230a85420e494f81e4a90dc9379ab1d8d9d052872d97b9 SHA512 c3e018b24caf7fcbc15ee11e444f74246eca8d0bf16eaafb93add19d1501dcb827f5f4f1dd7d82fec0fe1643ad5df4b71bcdf48dafae486d0614ab9632155329
-EBUILD glibc-2.20-r2.ebuild 4947 BLAKE2B 24062f002678df912ced724a3d919bc2f07476c98000092cb3fa3f2be1836db57348c88b6fc1da7a9364103136eecbe687fe365d131f10c82de3cb0edd3eb8c5 SHA512 ff76e9173ab6bfccb1c659f79cefb93f6fa6266adab40a3816f56acddb7866cee67ba6bfa8d1b9988eff755e9d1a879e62973fc332566c185f019af5e17a9f1d
-EBUILD glibc-2.21-r2.ebuild 4922 BLAKE2B 99bd1be39a3643f845c0daff4f7b19a0abb37de95a8494b4dc9d29aaee74281d4a252792010ff4935e5d661a7240cf4d5944907267e9059ce208b59891528085 SHA512 ff896f5bb20502db03f00d1438a06a026e0940106e368b4bb27abb72bb927fb235371a5a6b01130e35906f17c478e79e44bec6dda02bd5fedb30552bf4a6cc86
-EBUILD glibc-2.22-r4.ebuild 4973 BLAKE2B 6f4f632413cacf34a2a011d8cc83d0a92deaa0980aa9b6fe0d11cf45850a7bec482b77c8a0aa00b66a2103d4ff03ca16b0b7d38cd089b8f010039faaaf26d76b SHA512 1a056e465dc38dc4956b4707ff9fc9da8df4046d95edeb3dd6ae36fc229545acefdd317c50961a153ec83f21cba3d645d1e45b526157f8209a932242c2b08c33
-EBUILD glibc-2.23-r4.ebuild 4972 BLAKE2B 4822ca6b994dbfcf13b361628f43f70139b758b9eb97c096db4c4613080360f1062d5101b724278d51c6a6f2709fa2f61397a90014aa356d075506582cf6dbcd SHA512 040ff4940943c75f0735fd4220e6d1abfbd03b75d81acdb35b86a61905a4c9f5711e08907fb262544729a884b8447db4cf5f4405597a31114a05217506e0d1ee
-EBUILD glibc-2.24-r4.ebuild 5011 BLAKE2B 71050f0449074652d4fabc709326025b4de2e6642fdde87898acfde6f99cce95f4d7b9e1e7f9eedcdf6d2fd70ebf3c2860599ec36ccf68e0e633ec794f8ce0e8 SHA512 1cb3bcbd7d9d7f7c095bdff7c81d0acc3b4700c0b8a9d4fd0499cbf53abb55c67ca3bc3cce125916d238eb8cf6f6d69989af27defd6f194aaa5ac27cdda94eb9
-EBUILD glibc-2.25-r11.ebuild 4998 BLAKE2B 87086150ecd3d0f729e10fbcb302da77c30ee4138abd87df29bccb6b4dc2dec3a647bcc8f00481668cba666c24f2eb7c69985f7ee0457aa04860ef7573fbb727 SHA512 3ca07ffd57bb30e0f9b8d8ad075aea275e89364f8fc59dd55d9c58b4f3881cb895555814c04ec259c7dc1162c549c66d8cad0ba2afcacfcef8517711a3376831
-EBUILD glibc-2.26-r7.ebuild 25629 BLAKE2B 1ad33ffd21b8ddf1dc8a8a6b3a308a108ed27edbe3d7acb89bee70cd29d88628cb6cdb98e09029c705d4476f7fdb488e4ea7e266719844be5b28b2c5a809c30d SHA512 02e8091061e205f9a5339afd3c3b4d0246058a2f9605f01491c05e0b528ea6741d832b0fa3d76433136bb17fe664ca7f11c4a2f152bcca1dc0f9564a2155b907
-EBUILD glibc-2.27-r2.ebuild 41869 BLAKE2B ce05b276283a1b5128b440f830ebbd9d7508e5f06b9bfbf97d5a1fcdd08fa85761c8183459cd7cc4c400e4b047a953d6a0ade75ef7aa57515f400b4dc5b4dfc7 SHA512 ace14c3697f3dfd4101e01ff1d4f71354e96096530a9996811b7cecc97d03e2047620d8fe30596b083e47327100b58ab39fe3f28284710efa66de2f34e95b007
-EBUILD glibc-2.27-r3.ebuild 41101 BLAKE2B 93981d157cad9b235812a6de7b121bcbb66e62756477a68259c24fcc154241a0e89a62a591f1d0d561f0334cb0e5703d6154823cecc7d966ef4a5ee4c1d2a759 SHA512 09a4a31beb76527e4cbe6dc5f5d401bb7d9241d724a502caa1dd2dafafe41c1389e5e0046b602e399554563155fab54518e7bf563d60e4346661ed494bec989a
+EBUILD glibc-2.20-r2.ebuild 4924 BLAKE2B 8f2b71dd56f535915564e2517769844b234b5b02cbd4edaeb9ffd0a323e8cc7be663e6e57bad0c28df453ea332bfbb5891b07a569a0885a76c9427d680959ecd SHA512 00af5f249a1fcb0eb3ecc460ccd288daf752575df6ef3887bbffbaf3999360a24ae4058ad7e770206d8c2a86828238981d1820e28780be38481361f2f55518a8
+EBUILD glibc-2.21-r2.ebuild 4899 BLAKE2B 4097f29160b437edb96e6f731c797cba43bfb65fe164c1ffc3af0025d52c18a286b9a75d56d3e371e33e87f99a71a2115ba2eba7cb174dd2787a9b6a6d84b674 SHA512 68cc49c310ff816b2433b4f9e389e992d64f623809d4a4c3391dcce7ee4c385365ef4278de79bf4b6b9a4ed969e10b94bebabe86e560295bd1c0a9652aec12ec
+EBUILD glibc-2.22-r4.ebuild 4950 BLAKE2B 8d048dafaf8eec034d2ed2f3a8f400b3f4aedab39d7fe11795376a135ed9a42843f9cc6888e721ef242f78bc4230188d53cdccaf7686186d43201101519cc60b SHA512 64387259f921dc26d91d5d4e86bbbbfd740bb4b2e1337c121f799370abc9c6298745f9686e6aa501b10c05150ac1129ef8bd37d140e9c83c41ac3c0f54ee052f
+EBUILD glibc-2.23-r4.ebuild 4949 BLAKE2B 99db0ec4a452f04a2aef9b347a5ddec03cc88fbb1460c4f3f14b37efe5651b5db374e93a26b32b7918eb05f702d5355c5abcfcdf1228c24c4529218ecdd4017b SHA512 4384f936e1b88edc6639e4d7f31cc4641d287afda7e16f9cbd6a9fef68f04501213d9f2a84314cfb18d9da9b404a1452eba44fb49db8cf2cd1cd6012a659eb38
+EBUILD glibc-2.24-r4.ebuild 4988 BLAKE2B 8e08345c96e176984b73a073efca21f771d41af1af75106ec88a22bd55d7f69f28d9c01989026a3e58f3df4fac2a59db68d5ac8a8bbb0f411c75da8792f3402a SHA512 dd1d996eaf35197f7b7b6c111957eb98ef776d0a76a949b95f9bb17075dca43b2a354f8d15be133b9f3ff6c40a5b1f4ec28bd8d41c5cfc51da006eda8b005a05
+EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff8fca6b64c083c3e05d07533e445a6139939710b9284f7587bbf3977ca556caeb964e73ac21a382d942423d886a SHA512 f26645acc02f16209ec068641a800ef0a4ad2a422c9473e14a273fdece9b53074b837907d635a8585cf9dbb1acea14178166a4a3410aa4c70a745b89a764b6f1
+EBUILD glibc-2.26-r7.ebuild 25622 BLAKE2B b912a2a2d9cbad70190e53bf85443bb24ec360c248f88825fc39b90bbc795d1b9999b4a3ebf8f21e6d87d122dd764805ffb50c3d1e318bfbb90fb4a815226acf SHA512 1e88a2ddecb2f93ab81afe2a3aadc1d9c9be778896182076d66e305518324eadfadabd3dc3255f4cb00f5842c57eea4e20022168d5dac7cb16e4590822969287
+EBUILD glibc-2.27-r3.ebuild 41086 BLAKE2B b07976ab3bc79dad3d578c02210d98ec1454ef0adb5de2917c08b6dc927b4d915c70b0159c602e57048c579ddfc7381d16b1c0de093c1485b4038c8a1c087ce9 SHA512 321f0582569214ff63c6a1c730b7d94d24a881c59cb118578e73c3336c4dc4127b53ff62ae5cc31bf0b4947fddcda3f43e084e1d4d67062cb6a4a138592bceda
 EBUILD glibc-9999.ebuild 41101 BLAKE2B 704e55c2d6cb5688e555a20ef69d3a3565d5fe1d1e1d7620855a1b8c7e084c2e841077d8b00040cd03892c5e7a87d9f7246755305578191be1e279e22618ca00 SHA512 75be4fff3d555237378a9982320b9bac34ec94c8a4c92ba291ec8d54e3cdd796eecf16f901f25914fcf96eba7f839d0c07bc163db94a460f6dae579c579c9ea5
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.18-r1.ebuild b/sys-libs/glibc/glibc-2.18-r1.ebuild
deleted file mode 100644
index d699096c66fa..000000000000
--- a/sys-libs/glibc/glibc-2.18-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-glibc
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="4"                                  # Gentoo patchset
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !headers-only? (
-		>=${CATEGORY}/binutils-2.20
-		>=${CATEGORY}/gcc-4.3
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.20
-		>=sys-devel/gcc-4.3
-		virtual/os-headers
-		!vanilla? ( >=sys-libs/timezone-data-2012c )"
-	RDEPEND+="
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
-	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
-	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-	devspace=${devspace//HTTP/https://dev.gentoo.org/}
-	echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
-	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
-	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-src_unpack() {
-	GLIBC_PATCH_EXCLUDE+=" 00_all_0012-mips-add-clock_-g-s-ettime-symbol-compat-hacks.patch" #456912 #481438
-	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-
-	toolchain-glibc_src_unpack
-
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		tc-enables-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.18/glibc-2.18-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
-
-pkg_preinst() {
-	toolchain-glibc_pkg_preinst
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild
index 17506c5708a4..d036a728e447 100644
--- a/sys-libs/glibc/glibc-2.19-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r1.ebuild
@@ -18,8 +18,7 @@ RELEASE_VER=""
 case ${PV} in
 9999*)
 	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
+	inherit git-r3
 	;;
 *)
 	RELEASE_VER=${PV}
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild
index 2c35723c25b2..c4a84ff60f66 100644
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r2.ebuild
@@ -18,8 +18,7 @@ RELEASE_VER=""
 case ${PV} in
 9999*)
 	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
+	inherit git-r3
 	;;
 *)
 	RELEASE_VER=${PV}
diff --git a/sys-libs/glibc/glibc-2.21-r2.ebuild b/sys-libs/glibc/glibc-2.21-r2.ebuild
index 6db7c6a78833..accbd33c95a3 100644
--- a/sys-libs/glibc/glibc-2.21-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.21-r2.ebuild
@@ -18,8 +18,7 @@ RELEASE_VER=""
 case ${PV} in
 9999*)
 	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
+	inherit git-r3
 	;;
 *)
 	RELEASE_VER=${PV}
diff --git a/sys-libs/glibc/glibc-2.22-r4.ebuild b/sys-libs/glibc/glibc-2.22-r4.ebuild
index 416fec87178b..d6b644dd7543 100644
--- a/sys-libs/glibc/glibc-2.22-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.22-r4.ebuild
@@ -18,8 +18,7 @@ RELEASE_VER=""
 case ${PV} in
 9999*)
 	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
+	inherit git-r3
 	;;
 *)
 	RELEASE_VER=${PV}
diff --git a/sys-libs/glibc/glibc-2.23-r4.ebuild b/sys-libs/glibc/glibc-2.23-r4.ebuild
index 83000a9d6622..19d2ee3adaf7 100644
--- a/sys-libs/glibc/glibc-2.23-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.23-r4.ebuild
@@ -18,8 +18,7 @@ RELEASE_VER=""
 case ${PV} in
 9999*)
 	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
+	inherit git-r3
 	;;
 *)
 	RELEASE_VER=${PV}
diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild
index eb338ca1447b..40f30a0b8ebe 100644
--- a/sys-libs/glibc/glibc-2.24-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.24-r4.ebuild
@@ -18,8 +18,7 @@ RELEASE_VER=""
 case ${PV} in
 9999*)
 	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
+	inherit git-r3
 	;;
 *)
 	RELEASE_VER=${PV}
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index db95b9d9ab61..67c8f98ebb74 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -18,8 +18,7 @@ RELEASE_VER=""
 case ${PV} in
 9999*)
 	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
+	inherit git-r3
 	;;
 *)
 	RELEASE_VER=${PV}
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index 142e681f5b9a..ac4106459e4a 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	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"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/glibc/glibc-2.27-r2.ebuild b/sys-libs/glibc/glibc-2.27-r2.ebuild
deleted file mode 100644
index f21bc24c5d9b..000000000000
--- a/sys-libs/glibc/glibc-2.27-r2.ebuild
+++ /dev/null
@@ -1,1428 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \
-	multilib systemd multiprocessing
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/"
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
-SLOT="2.2"
-
-EMULTILIB_PKG="true"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
-	inherit git-r3
-else
-	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	KEYWORDS=""
-	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
-fi
-
-RELEASE_VER=${PV}
-
-GCC_BOOTSTRAP_VER=20180511
-
-# Gentoo patchset
-PATCH_VER=1
-
-SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
-SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-
-IUSE="audit caps compile-locales debug doc gd hardened headers-only multilib nscd profile selinux suid systemtap vanilla"
-
-# Minimum kernel version that glibc requires
-MIN_KERN_VER="3.2.0"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-#
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-# We need a new-enough binutils/gcc to match upstream baseline.
-# Also we need to make sure our binutils/gcc supports TLS.
-COMMON_DEPEND="
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-	systemtap? ( dev-util/systemtap )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	!<sys-devel/bison-2.7
-	doc? ( sys-apps/texinfo )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/gentoo-functions
-	!sys-kernel/ps3-sources
-	!sys-libs/nss-db
-"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.9
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.9
-		virtual/os-headers
-	"
-	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-#
-# Small helper functions
-#
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	is_crosscompile && use headers-only
-}
-
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-
-# We need to be able to set alternative headers for compiling for non-native
-# platform. Will also become useful for testing kernel-headers without screwing
-# up the whole system.
-alt_headers() {
-	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
-}
-
-alt_build_headers() {
-	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
-		ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)"
-		if tc-is-cross-compiler ; then
-			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
-			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
-				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
-				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
-			fi
-		fi
-	fi
-	echo "${ALT_BUILD_HEADERS}"
-}
-
-alt_libdir() {
-	echo $(alt_prefix)/$(get_libdir)
-}
-alt_usrlibdir() {
-	echo $(alt_prefix)/usr/$(get_libdir)
-}
-
-builddir() {
-	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
-}
-
-do_compile_test() {
-	local ret save_cflags=${CFLAGS}
-	CFLAGS+=" $1"
-	shift
-
-	pushd "${T}" >/dev/null
-
-	rm -f glibc-test*
-	printf '%b' "$*" > glibc-test.c
-
-	nonfatal emake -s glibc-test
-	ret=$?
-
-	popd >/dev/null
-
-	CFLAGS=${save_cflags}
-	return ${ret}
-}
-
-do_run_test() {
-	local ret
-
-	if [[ ${MERGE_TYPE} == "binary" ]] ; then
-		# ignore build failures when installing a binary package #324685
-		do_compile_test "" "$@" 2>/dev/null || return 0
-	else
-		if ! do_compile_test "" "$@" ; then
-			ewarn "Simple build failed ... assuming this is desired #324685"
-			return 0
-		fi
-	fi
-
-	pushd "${T}" >/dev/null
-
-	./glibc-test
-	ret=$?
-	rm -f glibc-test*
-
-	popd >/dev/null
-
-	return ${ret}
-}
-
-setup_target_flags() {
-	# This largely mucks with compiler flags.  None of which should matter
-	# when building up just the headers.
-	just_headers && return 0
-
-	case $(tc-arch) in
-		x86)
-			# -march needed for #185404 #199334
-			# TODO: When creating the first glibc cross-compile, this test will
-			# always fail as it does a full link which in turn requires glibc.
-			# Probably also applies when changing multilib profile settings (e.g.
-			# enabling x86 when the profile was amd64-only previously).
-			# We could change main to _start and pass -nostdlib here so that we
-			# only test the gcc code compilation.  Or we could do a compile and
-			# then look for the symbol via scanelf.
-			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				filter-flags '-march=*'
-				export CFLAGS="-march=${t} ${CFLAGS}"
-				einfo "Auto adding -march=${t} to CFLAGS #185404"
-			fi
-		;;
-		amd64)
-			# -march needed for #185404 #199334
-			# Note: This test only matters when the x86 ABI is enabled, so we could
-			# optimize a bit and elide it.
-			# TODO: See cross-compile issues listed above for x86.
-			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				# Normally the target is x86_64-xxx, so turn that into the -march that
-				# gcc actually accepts. #528708
-				[[ ${t} == "x86_64" ]] && t="x86-64"
-				filter-flags '-march=*'
-				# ugly, ugly, ugly.  ugly.
-				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
-				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
-				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
-			fi
-		;;
-		mips)
-			# The mips abi cannot support the GNU style hashes. #233233
-			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-
-			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
-			# try to pick a better one so glibc can use cpu-specific .S files.
-			# We key off the CFLAGS to get a good value.  Also need to handle
-			# version skew.
-			# We can't force users to set their CHOST to their exact machine
-			# as many of these are not recognized by config.sub/gcc and such :(.
-			# Note: If the mcpu values don't scale, we might try probing CPP defines.
-			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
-
-			local cpu
-			case ${CTARGET} in
-			sparc64-*)
-				case $(get-flag mcpu) in
-				niagara[234])
-					if version_is_at_least 2.8 ; then
-						cpu="sparc64v2"
-					elif version_is_at_least 2.4 ; then
-						cpu="sparc64v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparc64b"
-					fi
-					;;
-				niagara)
-					if version_is_at_least 2.4 ; then
-						cpu="sparc64v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparc64b"
-					fi
-					;;
-				ultrasparc3)
-					cpu="sparc64b"
-					;;
-				*)
-					# We need to force at least v9a because the base build doesn't
-					# work with just v9.
-					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
-					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
-					;;
-				esac
-				;;
-			sparc-*)
-				case $(get-flag mcpu) in
-				niagara[234])
-					if version_is_at_least 2.8 ; then
-						cpu="sparcv9v2"
-					elif version_is_at_least 2.4 ; then
-						cpu="sparcv9v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparcv9b"
-					else
-						cpu="sparcv9"
-					fi
-					;;
-				niagara)
-					if version_is_at_least 2.4 ; then
-						cpu="sparcv9v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparcv9b"
-					else
-						cpu="sparcv9"
-					fi
-					;;
-				ultrasparc3)
-					cpu="sparcv9b"
-					;;
-				v9|ultrasparc)
-					cpu="sparcv9"
-					;;
-				v8|supersparc|hypersparc|leon|leon3)
-					cpu="sparcv8"
-					;;
-				esac
-			;;
-			esac
-			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
-		;;
-	esac
-}
-
-setup_flags() {
-	# Make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
-	CXXFLAGS=${CXXFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# Over-zealous CFLAGS can often cause problems.  What may work for one
-	# person may not work for another.  To avoid a large influx of bugs
-	# relating to failed builds, we strip most CFLAGS out to ensure as few
-	# problems as possible.
-	strip-flags
-	strip-unsupported-flags
-	filter-flags -m32 -m64 '-mabi=*'
-
-	# glibc aborts if rpath is set by LDFLAGS
-	filter-ldflags '-Wl,-rpath=*'
-
-	# #492892
-	filter-flags -frecord-gcc-switches
-
-	unset CBUILD_OPT CTARGET_OPT
-	if use multilib ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
-
-	setup_target_flags
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	fi
-
-	# Lock glibc at -O2; we want to be conservative here.
-	# -fno-strict-aliasing is to work around #155906.
-	filter-flags '-O?'
-	append-flags -O2 -fno-strict-aliasing
-
-	filter-flags '-fstack-protector*'
-
-	# Starting with gcc-6 (and fully upstreamed pie patches) we control
-	# default enabled/disabled pie via use flags. So nothing to do
-	# here then. #618160
-	if [[ $(gcc-major-version) -lt 6 ]]; then
-		if use hardened && tc-enables-pie ; then
-			# Force PIC macro definition for all compilations since they're all
-			# either -fPIC or -fPIE with the default-PIE compiler.
-			append-cppflags -DPIC
-		else
-			# Don't build -fPIE without the default-PIE compiler and the
-			# hardened-pie patch
-			filter-flags -fPIE
-		fi
-	fi
-}
-
-want_tls() {
-	# Archs that can use TLS (Thread Local Storage)
-	case $(tc-arch) in
-		x86)
-			# requires i486 or better #106556
-			[[ ${CTARGET} == i[4567]86* ]] && return 0
-			return 1
-		;;
-	esac
-	return 0
-}
-
-want__thread() {
-	want_tls || return 1
-
-	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
-	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
-
-	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
-
-	# only test gcc -- can't test linking yet
-	tc-has-tls -c ${CTARGET}
-	WANT__THREAD=$?
-
-	return ${WANT__THREAD}
-}
-
-use_multiarch() {
-	# Make sure binutils is new enough to support indirect functions,
-	# #336792. This funky sed supports gold and bfd linkers.
-	local bver nver
-	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
-	case $(tc-arch ${CTARGET}) in
-	amd64|x86) nver="2.20" ;;
-	arm)       nver="2.22" ;;
-	hppa)      nver="2.23" ;;
-	ppc|ppc64) nver="2.20" ;;
-	# ifunc support was added in 2.23, but glibc also needs
-	# machinemode which is in 2.24.
-	s390)      nver="2.24" ;;
-	sparc)     nver="2.21" ;;
-	*)         return 1 ;;
-	esac
-	version_is_at_least ${nver} ${bver}
-}
-
-# Setup toolchain variables that had historically been defined in the
-# profiles for these archs.
-setup_env() {
-	# silly users
-	unset LD_RUN_PATH
-	unset LD_ASSUME_KERNEL
-
-	if is_crosscompile || tc-is-cross-compiler ; then
-		multilib_env ${CTARGET_OPT:-${CTARGET}}
-
-		if ! use multilib ; then
-			MULTILIB_ABIS=${DEFAULT_ABI}
-		else
-			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
-		fi
-
-		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
-		# and fall back on CFLAGS.
-		local VAR=CFLAGS_${CTARGET//[-.]/_}
-		CFLAGS=${!VAR-${CFLAGS}}
-		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
-	fi
-
-	setup_flags
-
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
-	if use headers-only ; then
-		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
-		# At this bootstrap stage we have only binutils for
-		# target but not compiler yet.
-		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
-		return 0
-	fi
-	local VAR=CFLAGS_${ABI}
-	# We need to export CFLAGS with abi information in them because glibc's
-	# configure script checks CFLAGS for some targets (like mips).  Keep
-	# around the original clean value to avoid appending multiple ABIs on
-	# top of each other.
-	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
-	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
-	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
-}
-
-foreach_abi() {
-	setup_env
-
-	local ret=0
-	local abilist=""
-	if use multilib ; then
-		abilist=$(get_install_abis)
-	else
-		abilist=${DEFAULT_ABI}
-	fi
-	local -x ABI
-	for ABI in ${abilist:-default} ; do
-		setup_env
-		einfo "Running $1 for ABI ${ABI}"
-		$1
-		: $(( ret |= $? ))
-	done
-	return ${ret}
-}
-
-glibc_banner() {
-	local b="Gentoo ${PVR}"
-	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
-	echo "${b}"
-}
-
-check_devpts() {
-	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
-
-	# If merely building the binary package, then there's nothing to verify.
-	[[ ${MERGE_TYPE} == "buildonly" ]] && return
-
-	# Only sanity check when installing the native glibc.
-	[[ ${ROOT} != "/" ]] && return
-
-	# If they're opting in to the old suid code, then no need to check.
-	use suid && return
-
-	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
-		eerror "In order to use glibc with USE=-suid, you must make sure that"
-		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
-		eerror "Openrc should do this for you, so you should check /etc/fstab"
-		eerror "and make sure you do not have any invalid settings there."
-		die "mount & fix your /dev/pts settings"
-	fi
-}
-
-# The following Kernel version handling functions are mostly copied from portage
-# source. It's better not to use linux-info.eclass here since a) it adds too
-# much magic, see bug 326693 for some of the arguments, and b) some of the
-# functions are just not provided.
-
-g_get_running_KV() {
-	uname -r
-	return $?
-}
-
-g_KV_major() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	echo "${KV%%.*}"
-}
-
-g_KV_minor() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.}
-	echo "${KV%%.*}"
-}
-
-g_KV_micro() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.*.}
-	echo "${KV%%[^[:digit:]]*}"
-}
-
-g_KV_to_int() {
-	[[ -z $1 ]] && return 1
-	local KV_MAJOR=$(g_KV_major "$1")
-	local KV_MINOR=$(g_KV_minor "$1")
-	local KV_MICRO=$(g_KV_micro "$1")
-	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
-
-	# We make version 2.2.0 the minimum version we will handle as
-	# a sanity check ... if its less, we fail ...
-	if [[ ${KV_int} -ge 131584 ]] ; then
-		echo "${KV_int}"
-		return 0
-	fi
-	return 1
-}
-
-g_int_to_KV() {
-	local version=$1 major minor micro
-	major=$((version / 65536))
-	minor=$(((version % 65536) / 256))
-	micro=$((version % 256))
-	echo ${major}.${minor}.${micro}
-}
-
-eend_KV() {
-	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
-	eend $?
-}
-
-get_kheader_version() {
-	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
-	$(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" - | \
-	tail -n 1
-}
-
-# We collect all sanity checks here. Consistency is not guranteed between
-# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
-# src_unpack.
-sanity_prechecks() {
-	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
-	check_devpts
-
-	# Prevent native builds from downgrading
-	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ ${ROOT} == "/" ]] && \
-	   [[ ${CBUILD} == ${CHOST} ]] && \
-	   [[ ${CHOST} == ${CTARGET} ]] ; then
-
-		# The high rev # is to allow people to downgrade between -r#
-		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
-		# should be fine. Hopefully we never actually use a r# this
-		# high.
-		if has_version ">${CATEGORY}/${P}-r10000" ; then
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror " Downgrading glibc is not supported and a sure way to destruction."
-			die "Aborting to save your system."
-		fi
-
-		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
-			eerror "Your old kernel is broken. You need to update it to a newer"
-			eerror "version as syscall(<bignum>) will break. See bug 279260."
-			die "Old and broken kernel."
-		fi
-	fi
-
-	# Users have had a chance to phase themselves, time to give em the boot
-	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
-		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
-		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
-		die "Lazy upgrader detected"
-	fi
-
-	if [[ ${CTARGET} == i386-* ]] ; then
-		eerror "i386 CHOSTs are no longer supported."
-		eerror "Chances are you don't actually want/need i386."
-		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
-		die "Please fix your CHOST"
-	fi
-
-	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
-		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
-		ewarn "This will result in a 50% performance penalty when running with a 32bit"
-		ewarn "hypervisor, which is probably not what you want."
-	fi
-
-	use hardened && ! tc-enables-pie && \
-		ewarn "PIE hardening not applied, as your compiler doesn't default to PIE"
-
-	# Check for sanity of /etc/nsswitch.conf
-	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
-		local entry
-		for entry in passwd group shadow; do
-			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
-				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
-				eerror "Please make sure you have 'files' entries for"
-				eerror "'passwd:', 'group:' and 'shadow:' databases."
-				eerror "For more details see:"
-				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
-				die "nsswitch.conf has no 'files' provider in '${entry}'."
-			fi
-		done
-	fi
-
-	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
-	# we test for...
-	if ! is_crosscompile ; then
-		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
-			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
-			local STAT
-			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
-				"${T}/check-ia32-emulation.elf32"
-				STAT=$?
-			else
-				# Don't fail here to allow single->multi ABI switch
-				# or recover from breakage like bug #646424
-				ewarn "Failed to compile the ABI test. Broken host glibc?"
-				STAT=0
-			fi
-			rm -f "${T}/check-ia32-emulation.elf32"
-			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
-		fi
-
-	fi
-
-	# When we actually have to compile something...
-	if ! just_headers ; then
-		local run_kv build_kv want_kv
-
-		run_kv=$(g_get_running_KV)
-		build_kv=$(g_int_to_KV $(get_kheader_version))
-		want_kv=${MIN_KERN_VER}
-
-		ebegin "Checking gcc for __thread support"
-		if ! eend $(want__thread ; echo $?) ; then
-			echo
-			eerror "Could not find a gcc that supports the __thread directive!"
-			eerror "Please update your binutils/gcc and try again."
-			die "No __thread support in gcc!"
-		fi
-
-		if ! is_crosscompile && ! tc-is-cross-compiler ; then
-			# Building fails on an non-supporting kernel
-			ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
-			if ! eend_KV ${run_kv} ${want_kv} ; then
-				echo
-				eerror "You need a kernel of at least ${want_kv}!"
-				die "Kernel version too low!"
-			fi
-		fi
-
-		ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
-		if ! eend_KV ${build_kv} ${want_kv} ; then
-			echo
-			eerror "You need linux-headers of at least ${want_kv}!"
-			die "linux-headers version too low!"
-		fi
-	fi
-}
-
-#
-# the phases
-#
-
-# pkg_pretend
-
-pkg_pretend() {
-	# All the checks...
-	einfo "Checking general environment sanity."
-	sanity_prechecks
-}
-
-# src_unpack
-
-src_unpack() {
-	# Consistency is not guaranteed between pkg_ and src_ ...
-	sanity_prechecks
-
-	use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
-
-	setup_env
-
-	if [[ -n ${EGIT_REPO_URI} ]] ; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-
-	cd "${S}" || die
-	touch locale/C-translit.h || die #185476 #218003
-
-	cd "${WORKDIR}" || die
-	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-}
-
-src_prepare() {
-	if ! use vanilla ; then
-		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
-		eapply "${WORKDIR}"/patches
-		einfo "Done."
-	fi
-
-	default
-
-	gnuconfig_update
-
-	cd "${WORKDIR}"
-	find . -name configure -exec touch {} +
-
-	eprefixify extra/locale/locale-gen
-
-	# Fix permissions on some of the scripts.
-	chmod u+x "${S}"/scripts/*.sh
-
-	cd "${S}"
-
-	if use hardened ; then
-		# We don't enable these for non-hardened as the output is very terse --
-		# it only states that a crash happened.  The default upstream behavior
-		# includes backtraces and symbols.
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
-		cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c debug/chk_fail.c || die
-
-		if use debug ; then
-			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile || die
-		fi
-	fi
-}
-
-glibc_do_configure() {
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
-
-	# CXX isnt handled by the multilib system, so if we dont unset here
-	# we accumulate crap across abis
-	unset CXX
-
-	einfo "Configuring glibc for nptl"
-
-	if use doc ; then
-		export MAKEINFO=makeinfo
-	else
-		export MAKEINFO=/dev/null
-	fi
-
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-
-	# The glibc configure script doesn't properly use LDFLAGS all the time.
-	export CC="$(tc-getCC ${CTARGET}) ${LDFLAGS}"
-	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
-
-	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
-	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS)"
-	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
-
-	echo
-
-	local myconf=()
-
-	case ${CTARGET} in
-		powerpc-*)
-			# Currently gcc on powerpc32 generates invalid code for
-			# __builtin_return_address(0) calls. Normally programs
-			# don't do that but malloc hooks in glibc do:
-			# https://gcc.gnu.org/PR81996
-			# https://bugs.gentoo.org/629054
-			myconf+=( --enable-stack-protector=no )
-			;;
-		*)
-			myconf+=( --enable-stack-protector=all )
-			;;
-	esac
-	myconf+=( --enable-stackguard-randomization )
-
-	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
-	# is not robust enough to detect proper support:
-	#    https://bugs.gentoo.org/641216
-	#    https://sourceware.org/PR22634#c0
-	case $(tc-arch ${CTARGET}) in
-		# Keep whitelist of targets where autodetection mostly works.
-		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
-		# Blacklist everywhere else
-		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
-	esac
-
-	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
-
-	myconf+=( --enable-kernel=${MIN_KERN_VER} )
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib ; then
-			if is_final_abi ; then
-				myconf+=( --with-selinux )
-			else
-				myconf+=( --without-selinux )
-			fi
-		else
-			myconf+=( --with-selinux )
-		fi
-	else
-		myconf+=( --without-selinux )
-	fi
-
-	# Force a few tests where we always know the answer but
-	# configure is incapable of finding it.
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	myconf+=(
-		--without-cvs
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers=$(alt_build_headers)
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--libdir='$(prefix)'/$(get_libdir)
-		--mandir='$(prefix)'/share/man
-		--infodir='$(prefix)'/share/info
-		--libexecdir='$(libdir)'/misc/glibc
-		--with-bugurl=https://bugs.gentoo.org/
-		--with-pkgversion="$(glibc_banner)"
-		$(use_multiarch || echo --disable-multi-arch)
-		$(use_enable systemtap)
-		$(use_enable nscd)
-		${EXTRA_ECONF}
-	)
-
-	# We rely on sys-libs/timezone-data for timezone tools normally.
-	myconf+=( $(use_enable vanilla timezone-tools) )
-
-	# These libs don't have configure flags.
-	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
-	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_rootsbindir="${EPREFIX}/sbin"
-	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
-
-	# We take care of patching our binutils to use both hash styles,
-	# and many people like to force gnu hash style only, so disable
-	# this overriding check.  #347761
-	export libc_cv_hashstyle=no
-
-	local builddir=$(builddir nptl)
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-	set -- "${S}"/configure "${myconf[@]}"
-	echo "$@"
-	"$@" || die "failed to configure glibc"
-
-	# ia64 static cross-compilers are a pita in so much that they
-	# can't produce static ELFs (as the libgcc.a is broken).  so
-	# disable building of the programs for those targets if it
-	# doesn't work.
-	# XXX: We could turn this into a compiler test, but ia64 is
-	# the only one that matters, so this should be fine for now.
-	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
-		sed -i '1i+link-static = touch $@' config.make
-	fi
-
-	# If we're trying to migrate between ABI sets, we need
-	# to lie and use a local copy of gcc.  Like if the system
-	# is built with MULTILIB_ABIS="amd64 x86" but we want to
-	# add x32 to it, gcc/glibc don't yet support x32.
-	#
-	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
-		echo 'main(){}' > "${T}"/test.c
-		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
-			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
-		fi
-	fi
-}
-
-glibc_headers_configure() {
-	export ABI=default
-
-	local builddir=$(builddir "headers")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-
-	# if we don't have a compiler yet, we can't really test it now ...
-	# hopefully they don't affect header generation, so let's hope for
-	# the best here ...
-	local v vars=(
-		ac_cv_header_cpuid_h=yes
-		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
-		libc_cv_asm_cfi_directives=yes
-		libc_cv_broken_visibility_attribute=no
-		libc_cv_c_cleanup=yes
-		libc_cv_compiler_powerpc64le_binary128_ok=yes
-		libc_cv_forced_unwind=yes
-		libc_cv_gcc___thread=yes
-		libc_cv_mlong_double_128=yes
-		libc_cv_mlong_double_128ibm=yes
-		libc_cv_ppc_machine=yes
-		libc_cv_ppc_rel16=yes
-		libc_cv_predef_fortify_source=no
-		libc_cv_target_power8_ok=yes
-		libc_cv_visibility_attribute=yes
-		libc_cv_z_combreloc=yes
-		libc_cv_z_execstack=yes
-		libc_cv_z_initfirst=yes
-		libc_cv_z_nodelete=yes
-		libc_cv_z_nodlopen=yes
-		libc_cv_z_relro=yes
-		libc_mips_abi=${ABI}
-		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
-		# These libs don't have configure flags.
-		ac_cv_lib_audit_audit_log_user_avc_message=no
-		ac_cv_lib_cap_cap_init=no
-	)
-
-	einfo "Forcing cached settings:"
-	for v in "${vars[@]}" ; do
-		einfo " ${v}"
-		export ${v}
-	done
-
-	local headers_only_arch_CPPFLAGS=()
-
-	# Blow away some random CC settings that screw things up. #550192
-	if [[ -d ${S}/sysdeps/mips ]]; then
-		pushd "${S}"/sysdeps/mips >/dev/null
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
-
-		# Force the mips ABI to the default.  This is OK because the set of
-		# installed headers in this phase is the same between the 3 ABIs.
-		# If this ever changes, this hack will break, but that's unlikely
-		# as glibc discourages that behavior.
-		# https://crbug.com/647033
-		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
-
-		popd >/dev/null
-	fi
-
-	case ${CTARGET} in
-	riscv*)
-		# RISC-V interrogates the compiler to determine which target to
-		# build.  If building the headers then we don't strictly need a
-		# RISC-V compiler, so the built-in definitions that are provided
-		# along with all RISC-V compiler might not exist.  This causes
-		# glibc's RISC-V preconfigure script to blow up.  Since we're just
-		# building the headers any value will actually work here, so just
-		# pick the standard one (rv64g/lp64d) to make the build scripts
-		# happy for now -- the headers are all the same anyway so it
-		# doesn't matter.
-		headers_only_arch_CPPFLAGS+=(
-			-D__riscv_xlen=64
-			-D__riscv_flen=64
-			-D__riscv_float_abi_double=1
-			-D__riscv_atomic=1
-		) ;;
-	esac
-
-	local myconf=()
-	myconf+=(
-		--disable-sanity-checks
-		--enable-hacker-mode
-		--without-cvs
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(alt_build_headers)
-		--prefix="${EPREFIX}/usr"
-		${EXTRA_ECONF}
-	)
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# So forcing CC/CFLAGS is sane.
-	local headers_only_CC=$(tc-getBUILD_CC)
-	local headers_only_CFLAGS="-O1 -pipe"
-	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
-	local headers_only_LDFLAGS=""
-	set -- "${S}"/configure "${myconf[@]}"
-	echo \
-		"CC=${headers_only_CC}" \
-		"CFLAGS=${headers_only_CFLAGS}" \
-		"CPPFLAGS=${headers_only_CPPFLAGS}" \
-		"LDFLAGS=${headers_only_LDFLAGS}" \
-		"$@"
-	CC=${headers_only_CC} \
-	CFLAGS=${headers_only_CFLAGS} \
-	CPPFLAGS=${headers_only_CPPFLAGS} \
-	LDFLAGS="" \
-	"$@" || die "failed to configure glibc"
-}
-
-do_src_configure() {
-	if just_headers ; then
-		glibc_headers_configure
-	else
-		glibc_do_configure nptl
-	fi
-}
-
-src_configure() {
-	foreach_abi do_src_configure
-}
-
-do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
-}
-
-src_compile() {
-	if just_headers ; then
-		return
-	fi
-
-	foreach_abi do_src_compile
-}
-
-glibc_src_test() {
-	cd "$(builddir nptl)"
-	emake check
-}
-
-do_src_test() {
-	local ret=0
-
-	glibc_src_test
-	: $(( ret |= $? ))
-
-	return ${ret}
-}
-
-src_test() {
-	if just_headers ; then
-		return
-	fi
-
-	# Give tests more time to complete.
-	export TIMEOUTFACTOR=5
-
-	foreach_abi do_src_test || die "tests failed"
-}
-
-run_locale_gen() {
-	# if the host locales.gen contains no entries, we'll install everything
-	local root="$1"
-	local locale_list="${root}/etc/locale.gen"
-	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-		ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-		locale_list="${root}/usr/share/i18n/SUPPORTED"
-	fi
-
-	locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
-		--destdir "${root}"
-}
-
-glibc_do_src_install() {
-	local builddir=$(builddir nptl)
-	cd "${builddir}"
-
-	emake install_root="${D}$(alt_prefix)" install || die
-
-	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
-	# which come without headers etc. Only needed for binary packages since the
-	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
-	find "${D}" -name "libnsl.a" -delete
-	find "${D}" -name "libnsl.so" -delete
-
-	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
-	# to infer upstream version:
-	# '#define VERSION "2.26.90"' -> '2.26.90'
-	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
-
-	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
-		# Move versioned .a file out of libdir to evade portage QA checks
-		# instead of using gen_usr_ldscript(). We fix ldscript as:
-		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
-		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
-		dodir $(alt_usrlibdir)/${P}
-		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${ED}"/etc/ld.so.cache
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems even
-	# if the main library set isn't installed into the right place.  Maybe
-	# we should query the active gcc for info instead of hardcoding it ?
-	local i ldso_abi ldso_name
-	local ldso_abi_list=(
-		# x86
-		amd64   /lib64/ld-linux-x86-64.so.2
-		x32     /libx32/ld-linux-x32.so.2
-		x86     /lib/ld-linux.so.2
-		# mips
-		o32     /lib/ld.so.1
-		n32     /lib32/ld.so.1
-		n64     /lib64/ld.so.1
-		# powerpc
-		ppc     /lib/ld.so.1
-		ppc64   /lib64/ld64.so.1
-		# s390
-		s390    /lib/ld.so.1
-		s390x   /lib/ld64.so.1
-		# sparc
-		sparc32 /lib/ld-linux.so.2
-		sparc64 /lib64/ld-linux.so.2
-	)
-	case $(tc-endian) in
-	little)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64.so.1
-		)
-		;;
-	big)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64_be.so.1
-		)
-		;;
-	esac
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
-	fi
-	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
-		ldso_abi=${ldso_abi_list[i]}
-		has ${ldso_abi} $(get_install_abis) || continue
-
-		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
-			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
-		fi
-	done
-
-	# With devpts under Linux mounted properly, we do not need the pt_chown
-	# binary to be setuid.  This is because the default owners/perms will be
-	# exactly what we want.
-	if ! use suid ; then
-		find "${ED}" -name pt_chown -exec chmod -s {} +
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		# We need to make sure that /lib and /usr/lib always exists.
-		# gcc likes to use relative paths to get to its multilibs like
-		# /usr/lib/../lib64/.  So while we don't install any files into
-		# /usr/lib/, we do need it to exist.
-		cd "${ED}"$(alt_libdir)/..
-		[[ -e lib ]] || mkdir lib
-		cd "${ED}"$(alt_usrlibdir)/..
-		[[ -e lib ]] || mkdir lib
-
-		dosym usr/include $(alt_prefix)/sys-include
-		return 0
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen
-
-	# Make sure all the ABI's can find the locales and so we only
-	# have to generate one set
-	local a
-	keepdir /usr/$(get_libdir)/locale
-	for a in $(get_install_abis) ; do
-		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
-			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
-		fi
-	done
-
-	cd "${S}"
-
-	# Install misc network config files
-	insinto /etc
-	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
-	doins "${WORKDIR}"/extra/etc/*.conf
-
-	if use nscd ; then
-		doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
-
-		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
-		)
-
-		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-
-		systemd_dounit nscd/nscd.service
-		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
-	else
-		# Do this since extra/etc/*.conf above might have nscd.conf.
-		rm -f "${ED}"/etc/nscd.conf
-	fi
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc
-
-	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
-		[[ -s ${d} ]] && dodoc ${d}
-	done
-	dodoc -r ChangeLog.old
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${ED}"/etc/localtime
-
-	# Generate all locales if this is a native build as locale generation
-	if use compile-locales && ! is_crosscompile ; then
-		run_locale_gen "${ED}"
-	fi
-}
-
-glibc_headers_install() {
-	local builddir=$(builddir "headers")
-	cd "${builddir}"
-	emake install_root="${D}$(alt_prefix)" install-headers
-
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include $(alt_prefix)/sys-include
-}
-
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
-	fi
-}
-
-src_install() {
-	if just_headers ; then
-		export ABI=default
-		glibc_headers_install
-		return
-	fi
-
-	foreach_abi glibc_do_src_install
-	src_strip
-}
-
-# Simple test to make sure our new glibc isn't completely broken.
-# Make sure we don't test with statically built binaries since
-# they will fail.  Also, skip if this glibc is a cross compiler.
-#
-# If coreutils is built with USE=multicall, some of these files
-# will just be wrapper scripts, not actual ELFs we can test.
-glibc_sanity_check() {
-	cd / #228809
-
-	# We enter ${ED} so to avoid trouble if the path contains
-	# special characters; for instance if the path contains the
-	# colon character (:), then the linker will try to split it
-	# and look for the libraries in an unexpected place. This can
-	# lead to unsafe code execution if the generated prefix is
-	# within a world-writable directory.
-	# (e.g. /var/tmp/portage:${HOSTNAME})
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	local x striptest
-	for x in cal date env free ls true uname uptime ; do
-		x=$(type -p ${x})
-		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
-		case ${striptest} in
-		*"statically linked"*) continue;;
-		*"ASCII text"*) continue;;
-		esac
-		# We need to clear the locale settings as the upgrade might want
-		# incompatible locale data.  This test is not for verifying that.
-		LC_ALL=C \
-		./ld-*.so --library-path . ${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
-
-	popd >/dev/null
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-
-	# Default /etc/hosts.conf:multi to on for systems with small dbs.
-	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
-		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
-		einfo "Defaulting /etc/host.conf:multi to on"
-	fi
-
-	[[ ${ROOT} != "/" ]] && return 0
-	[[ -d ${ED}/$(get_libdir) ]] || return 0
-	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
-}
-
-pkg_postinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
-		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
-	fi
-
-	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
-		use compile-locales || run_locale_gen "${EROOT}"
-	fi
-
-	# Check for sanity of /etc/nsswitch.conf, take 2
-	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
-		local entry
-		for entry in passwd group shadow; do
-			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
-				ewarn ""
-				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
-				ewarn "removed from glibc and is now provided by the package"
-				ewarn "  sys-auth/libnss-nis"
-				ewarn "Install it now to keep your NIS setup working."
-				ewarn ""
-			fi
-		done
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.27-r3.ebuild b/sys-libs/glibc/glibc-2.27-r3.ebuild
index 8d6226b6119f..f8a12e89714c 100644
--- a/sys-libs/glibc/glibc-2.27-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r3.ebuild
@@ -18,8 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/libavc1394/Manifest b/sys-libs/libavc1394/Manifest
index e9e32760feb6..bdb5ce6e94e3 100644
--- a/sys-libs/libavc1394/Manifest
+++ b/sys-libs/libavc1394/Manifest
@@ -1,6 +1,3 @@
-DIST libavc1394-0.5.3.tar.gz 355976 BLAKE2B 03f9055de6f4dd08f1ffd28fbfae61ed6cb73067d66cc02ab822788cc020ebad4959066107ee5eb9109fedd7ab4e8403081d703dc02f454097409f15c36b23cc SHA512 36761830082c0040708074eea8124c2eb027e3bb80fdbb8978af5eabe655afd2e6c9d7fc2aa9d4aba4d4d218cba9fa41fa6079119a9e460900b1e17effb4c145
 DIST libavc1394-0.5.4.tar.gz 341679 BLAKE2B c27cf10b8769c1602488fa1a9a2536dee169e0e07185090e719946ca1da4b210aa61b37d816fb5b019d8b199b1c9285e2b212545f4332c8aad48af39c2dadf20 SHA512 ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a
-EBUILD libavc1394-0.5.3.ebuild 577 BLAKE2B 1529af35db94da40e0fb37aaad2c78a0b6bce9ec5b9309f10737a14ac20b2fb5617e82adfc716360c782da86557cb36122b34766bf1b750f4294af44efcb0a11 SHA512 cc410851f1025f4ac2d9555428a96c3c137c24510b71122debc16307d40d540f7fbc1f7f87a2e9457b25f8e6229366d66725299b5e0e759f0f2eebc06ffe534f
 EBUILD libavc1394-0.5.4-r1.ebuild 556 BLAKE2B 4a49c61e3900825acf13b2ce3e3397400e9350e8dd200e78601fe65ed33837a4b58f5ba29b8505238ad9435014be66621f319dd8ae3f8bee68decfb717f436b5 SHA512 7c74d92eff9e62ac74ca3a089050145f8c3f98d79828f699787f6251e5e8939f2ab2de5b22af6fbd8a6b0c9196faaea0ef34bd7e47dbb38396ca2bf47980676d
-EBUILD libavc1394-0.5.4.ebuild 521 BLAKE2B 0c5744eca4495eb36276fb3d6fe11dfaa23e8d71c858ba56af90cb1c266c9bfce85357d3bae3fcaac94e2283ae8dcbaa7ed4a18ecf62cb85492a76e1b65f2158 SHA512 e26d7552acab1a7c8c3552071dcd3e7f7426f1d2de6c40054c3e984e857c629108a3f67e78aa13c73f2ea9998dabc885902910fcf344581b447b9895d4da2533
 MISC metadata.xml 330 BLAKE2B a1bbe65ce97eb3a0c038333183e4fde5b7f0f0384d2fcacb78c569f6df4afd74cfe8ab34c9404daf7bd0870b983372bc35d3e3dd3ac50793fb47fe25b509a9b7 SHA512 3b2a188bb90d59ac6acb66b90e0231db783a6364f4e91a955df28346422061b99837ecf4038f6d42eb570630029623797c0e874737151065343b63352bd082f2
diff --git a/sys-libs/libavc1394/libavc1394-0.5.3.ebuild b/sys-libs/libavc1394/libavc1394-0.5.3.ebuild
deleted file mode 100644
index 4362f593bcef..000000000000
--- a/sys-libs/libavc1394/libavc1394-0.5.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set"
-HOMEPAGE="https://sourceforge.net/projects/libavc1394/"
-SRC_URI="mirror://sourceforge/libavc1394/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/libraw1394-0.8"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/sys-libs/libavc1394/libavc1394-0.5.4.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4.ebuild
deleted file mode 100644
index 28d1a6bb81c7..000000000000
--- a/sys-libs/libavc1394/libavc1394-0.5.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools-utils
-
-DESCRIPTION="library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set"
-HOMEPAGE="https://sourceforge.net/projects/libavc1394/"
-SRC_URI="mirror://sourceforge/libavc1394/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/libraw1394-0.8"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index ee45c57bc06e..640413dae076 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -12,7 +12,7 @@ EBUILD libcxx-3.7.1.ebuild 5335 BLAKE2B 6f4dbbb8dbc7f6e8b97f05ff3e638bb037bad416
 EBUILD libcxx-3.9.1.ebuild 6815 BLAKE2B d15c83602e244f8a50e0a9d15869dbd4c7be226d8b1f93249cb6658149ad2408f0feada97403a0dfa3dcd8ac25b98ae084d1d17c879f67ae24d33f8497aba569 SHA512 9c9632590b49cd01ad324641ee296f08442940ab1dda1f0c7cdc77abe6b653f70d0baa9b796ef7d77e1f4728e96fe27fcd42d79a389cfcf2b2427b087b9985af
 EBUILD libcxx-4.0.1.ebuild 6453 BLAKE2B 2cab9946b4b79c4fc5310aae7ad32ae21f28a87e3e43c87731fe0542478342c4c7f5587472c39198b43f2a1f61329fc55a9e5c24804a34f70c70236e017eb964 SHA512 b656520a6bf00a73763fdf6f052869c76adb76ae9650d763c6b78a02393202c9bfeadd807ebafd6a071395aa64a0ede464fad0e4c127dfe39720e13342f82fc0
 EBUILD libcxx-5.0.1.ebuild 6453 BLAKE2B 4d79da76e3c2904a443180c37b63d3486b568d1253ba716c5073df76dd72186d9700e16f49f7d4de0bde61e86538f711a77e42e3df9fcce4baf2903eaead5b5c SHA512 af3c95d85528b54f65f814c107ea5ccd5db293d22bac2856af2b11a7ce75fa41bb7169a23434b0138f5e62fe605bbbbcb050dc05c4b4c4bfa9d576a868552dde
-EBUILD libcxx-5.0.2.ebuild 6455 BLAKE2B b1f36da497529deadf2c8b8157915490b82b29da70dc5cd4f3723480913ad4702d9764d80b4aeef17694e699eb194a0adfca6cf61d5295161be806c7414c9402 SHA512 5d9e50e8013ec860a0223f53aa678f954465139bc6afb46b5a9b4258247e41f32cfb901fd598803babfde47ea3d719b83f7ae10e0731001fc7ccab1476f0892a
+EBUILD libcxx-5.0.2.ebuild 6453 BLAKE2B 4d79da76e3c2904a443180c37b63d3486b568d1253ba716c5073df76dd72186d9700e16f49f7d4de0bde61e86538f711a77e42e3df9fcce4baf2903eaead5b5c SHA512 af3c95d85528b54f65f814c107ea5ccd5db293d22bac2856af2b11a7ce75fa41bb7169a23434b0138f5e62fe605bbbbcb050dc05c4b4c4bfa9d576a868552dde
 EBUILD libcxx-6.0.0.ebuild 6699 BLAKE2B 83e6112e8bdc5fc1f86404c2be72b0acb89d251a2f29d098ac1296ff2073a91cdbacc212dc9bbcbaef7c961b15c080cf975f33cb599aebf2e57bcd036d3101be SHA512 7c0eedefdce34ec28e8eed1cf60dd11f510ea3994efe8f01687a46692953f655da8cbc6b2b5b69a3e33e3f895a779ca8d6fadd9ec899e7afd62173549bae34c3
 EBUILD libcxx-6.0.9999.ebuild 6998 BLAKE2B 643fc6c64242e24038fc2fdca37f916d475539372d9beec9692e0f9afdc0078c4221d0cb6fe35939cb94d3c83c298f56626396d5067cf8fc7157718ab0e0a98c SHA512 85ac1785d3495c7df6e080912ddedabf10c6d7ff3323d1b100172d320f081a94bef0f47502b9914f5428e6391c124c5dfb33e52319204a8084a0a1b8432acf33
 EBUILD libcxx-9999.ebuild 6970 BLAKE2B 25154a733062646b8e19da4f38a2ade388140c16b36e4310cdca613d9299a655bbae07a1a476da564c1ef3d32a26f2816533bcd0683051ea104c5711f36e4818 SHA512 91565a2e05a5e48320cc7b7e49ea7722f74a0b80af145a53d9838d84603e51c666fb2a57eceae3231f86e9dde3c051c918286d291a4343c9bd728a7ab429e3f8
diff --git a/sys-libs/libcxx/libcxx-5.0.2.ebuild b/sys-libs/libcxx/libcxx-5.0.2.ebuild
index 40c9547f3351..885f8b131826 100644
--- a/sys-libs/libcxx/libcxx-5.0.2.ebuild
+++ b/sys-libs/libcxx/libcxx-5.0.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 4c960a5fc67b..7ec7a587955c 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -13,7 +13,7 @@ DIST libcxxabi-6.0.0.src.tar.xz 529212 BLAKE2B ae020e8831a6ae71d59d71e294bbb0aa6
 EBUILD libcxxabi-3.9.1.ebuild 2646 BLAKE2B a1f66067e57f09aca9d2f44735f3c7b01af38b381ecab526f9bae8ffbc5c96856c5a6d8c829b2d95f0a0afffefd319670c8484c826ce81b94a63c51bb53ed114 SHA512 4849fbfe11876cb403d78852abd6df27a0dbeada69c15fd1af6e7a20d742fcca064b227592e3ac69e32546cef94c790f28d63d40c8522213a9910f0b625ea379
 EBUILD libcxxabi-4.0.1.ebuild 3328 BLAKE2B 2cc64e780a60b79a5eed18840b3048256a9cd5374abaa61594085587ee120c2ac134287ece9fbc5c58ed947657cd280c32520719e6c4996c2593be20ab19894c SHA512 822b5056c1e62d1dd116349f6cb47fa023a20899a7ef18f91b80e7440ff857d55500bdf8adb9286c1f3f3ba2a45a7a95ba78430b58267e3e70296201951c66d3
 EBUILD libcxxabi-5.0.1.ebuild 3193 BLAKE2B b1157a436e40da0b67d012c903b9a137f3544a404e91a414a3d451be7f1b6c5e0a79c3e424f8c0cbf58b33166332988ecc13ee84a3c5840ad54de7c033770a97 SHA512 1330ec5b22bb11f5e142eea5acf03cbe6f1282a58206de9039453100a5fb72a30d46fe3ac3be6c52ddc07eb4b71486fd1be3e83a15a7ae76fa999fb2660cd908
-EBUILD libcxxabi-5.0.2.ebuild 3195 BLAKE2B edb47e2d51e590ad9b71fa039fbea71a71231399d5b359d477d9f8a720c44811d0a28058a65889cca90a624dafbb97d33736a35a6670d9a31af6ded674343fbb SHA512 e665d6acf058a7a0dab380070ad80753c0de4207f8b3e927edcb68cf0ca535f6b17dce0116e727ed2b5e14a0ec7ab3f2a9728bc3fef7e453f970f615ed35bab1
+EBUILD libcxxabi-5.0.2.ebuild 3193 BLAKE2B b1157a436e40da0b67d012c903b9a137f3544a404e91a414a3d451be7f1b6c5e0a79c3e424f8c0cbf58b33166332988ecc13ee84a3c5840ad54de7c033770a97 SHA512 1330ec5b22bb11f5e142eea5acf03cbe6f1282a58206de9039453100a5fb72a30d46fe3ac3be6c52ddc07eb4b71486fd1be3e83a15a7ae76fa999fb2660cd908
 EBUILD libcxxabi-6.0.0.ebuild 3174 BLAKE2B 15e674f92e5388b16ee1e68f4ec99ad2c05fd1e0f80652f0fa1706c8e8303ff501203197e543644223cfd003c97ca99ccc1f7ea96e58be7d8aab8bd000dfb376 SHA512 44e004150486f6d270fec0dfa7f03e2c3a14ecf21d883250044f45ee6b2ea8828c51bda3b1f23dd867cb88acdf3c529a295d7882cde04184527f6fd8531aa1a9
 EBUILD libcxxabi-6.0.9999.ebuild 3288 BLAKE2B d43aa5dc53732dbc943b67625d54a4e97c2dc782722922e05f5906056c09345f5dbbeadc50af993e9b04c52218d9da9efb535aeba5e511ae8553549d2c867e1c SHA512 a75f53ab525c011fb834f24cfbe3ba5911e302cb080514146ea0f05fcb06b1cb0b3fa2342ccb3c1ca70873cc6e9fb0e1032479546f99ac85efbb6fa07aa5e3f2
 EBUILD libcxxabi-9999.ebuild 3263 BLAKE2B 26e1877ef423b0f869b6033601c584599c00f6f46b7296ba213ff080bb060c81995a2be2693b16b73e94c979c46fa5632b0fcf110ba2bc86c1b8f30bb548f74d SHA512 28ee56c5c823aa82e02e7fa680455e425d2ec5c4ae4c98c82a18f7afa1d0a663d22f4a85299fb44c3c10d5367bf33637f68a70516b02c6c206293038a65e22ef
diff --git a/sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild b/sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild
index 1e159ea9cfd5..758b743df7e5 100644
--- a/sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 
 RDEPEND="
diff --git a/sys-libs/libfaketime/Manifest b/sys-libs/libfaketime/Manifest
index 37e74ab43de9..7dabcb4b6f75 100644
--- a/sys-libs/libfaketime/Manifest
+++ b/sys-libs/libfaketime/Manifest
@@ -1,6 +1,6 @@
 DIST libfaketime-0.9.6.tar.gz 51333 BLAKE2B b9aab3da744e250f43eca4f837322932c3260d35550171d34da851740a415bf3d2c3bfe02cdf37782058d8524008743838757ed8326384ecb36d0d9839cadd1a SHA512 ab2e9c53f4ca2b9dcd2bbcd8de3ab9e27be57547ed9b52a17f07a6fe880fd3a283a6f10018736be2a6ba4e150f54e92161959ccb887be1f78ddfc96058729860
 DIST libfaketime-0.9.7.tar.gz 56277 BLAKE2B 62e10c4b3c33c203cde023cbc4e114c2ee1ad87298b1840bb2f7ea3610fdfd81c12a60c1c00a44409ca322e96408427fcad32f202737b75d28c5d69b85b579d6 SHA512 593e14e96dc0a49f65e93d25b7aace6e78fd2b4251f692c14bd6c6a2ac6360d997573aeac9005388bc49276078075c23a39fdaee912c2469acb8014127625537
 EBUILD libfaketime-0.9.6-r1.ebuild 776 BLAKE2B a0cc1cd2cf56b38077a667e9fe04f523207906f3e8d878f6e6b7bdd02a1a78428cc3da28809dcb329ccda1af1a8d92276224b69b1532e54a8cea977878fb7f94 SHA512 d15ae0475d7da5e11fd8da5c43a5eee289bae97ed33f2278f8d44699c167df79b30336abc014f6c79af103b79d86ef736e7faa2bb86c70d1749ac56daf0d99aa
-EBUILD libfaketime-0.9.6-r2.ebuild 1291 BLAKE2B d35708ed2f438e18490e0ef1d551869ad243c0b4c1a6321757d929006a4be851ec50bca9de65f661a2d55ca30280137307c7292f523e57e550b4a80de2a63077 SHA512 1d1e02d07e09d50ee91669892d5541a0fcd09d909516b641369d985ecc6210efb40e4c522aee058704e67d2a1fa9e832ae8dbd9a26104f4abd671410200d7d9e
+EBUILD libfaketime-0.9.6-r2.ebuild 1290 BLAKE2B 748bff57db9d51c1b618dcf9dae30a74e6095324fcdda90f40ec2ec9d1f75f9011672135847523a0198439e39b43e0334d8fd4c19139f4667fb2ea0cbc13a1e0 SHA512 4f37893874a197b01c2ee23ae6160eaccbe1446d0bed956e1147cf556e6fd6c8c9ca06c4514a7799681919a685deb83ff8ed1194bf92c399074cfc6f440b8584
 EBUILD libfaketime-0.9.7.ebuild 1310 BLAKE2B 14e846b26ce86d7ec95dc8c87376e1959dca136c139f064f147fbeeb01b9471ca3201ef8d7b2a7829b1563ef62f6542c7a6218a4be361e3156f227de0928e113 SHA512 76f4541b5e31d6f09cf45f518f4bb72bf85a344d2d9ad62a127e45be33fb6b442109d6d4899a11e046dc86194ffa78de61e9d18c5e0b2c7c046077d759fb56fe
 MISC metadata.xml 844 BLAKE2B 55b522c415ccd092c6f940fafffe6d3ef871259265d125844b179f00c3fce55fd4b359c1b535a0ace47722938d2d2b744cf9062e1ff3e32bbea89b9b7a200691 SHA512 77924230fc18b29ee6c5891a73acde9158dabdec2d3f892ceeb84bc6e1b6f2b977dba05382a1da67fa8db6e57ca3be2161f6218e2f52feaefef690a0e1989893
diff --git a/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
index eddc1a8e4796..da55fc5ae41c 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.code-wizards.com/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
+KEYWORDS="amd64 arm arm64 hppa sparc x86"
 
 src_prepare() {
 	sed -i 's/-Werror //' "${S}/src/Makefile" || die
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 1cd7273fd794..9c2ee8cd79de 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -5,8 +5,8 @@ DIST openmp-5.0.2.src.tar.xz 2081560 BLAKE2B fbe41c6aaf4c8e961253609a598bec531ab
 DIST openmp-6.0.0.src.tar.xz 2272360 BLAKE2B 2fbbdbbd0262ac3161446a4e7a3079131254f962a5397a94913abff024ba3f66affe419c58fb0f6ab602e338a277ab2befbc4386eaf6d4c11aa4a9713315d562 SHA512 9dfb070a3fae883985e3c8cd357c21a2144b433824139e288d4d3c774dd9cf3f7949978976012b08c644cd4a04be8c65a810c2f33d66eee05d3d980e61413a06
 EBUILD libomp-4.0.1.ebuild 2527 BLAKE2B be262aa449e8d3c2392793b8af597c7d9a02e624f0d57ad8b24ef822bd57f6d243200ccee1022c18dcc52fc2d198d6aa2cfe83a1224f614ce0b2305f3f6bff69 SHA512 ca34a666e1aa6e767cd979866bcdcaf55da75dc8faa80d062e718ceda56576c3ebec88972787ae5dc4532bfdeb2d7f34f233b8c4983bfb1bc89bbd443ac54ac7
 EBUILD libomp-5.0.1.ebuild 2385 BLAKE2B e887b48183a5e2d8f4f5476579ec88f99d0b709ea4136914978014e51b8d63451d62c5216690b908d7e853141266831a560a1802945d88fe5940d30100b6cbdd SHA512 a36ce91d70d506f9baa07f2aca394325e382b794e0797ecdb308eb98fab38079ec8b5ca10d1c7368ec06275b76c1487f581a4196f0499645edab4b34e974a594
-EBUILD libomp-5.0.2.ebuild 2387 BLAKE2B a739a4974cc3d286322ec1a22d5cfd8410a5f3f4d35aef21101ded1f3f828df07c6952228568997851078fdadbc415fb36f1ddfd85bb0fc0104f0f16963781f2 SHA512 65d47f3965a1457b98e83b074afe4185e949c2e5d9efa5150bbe18970896b9ac31441956f3a082612a2c4e36c8b4589944685e4353cab194f311d47cdf2fc79c
-EBUILD libomp-6.0.0.ebuild 3253 BLAKE2B f7af36085e4b0fec9d3efe29fce1f7374b239c8265883488601d227cc1ec120f47a7634f7caad025148755775e41b48af062ad7a45ee693f7bbea4ce65a3ac05 SHA512 b059a151907c2ceef9452446fe9aa18655ba4d160995ea6f867b08c70abaea557096df808cec8a9e0d9ec3be3d3fcbcaea210488b630391b86b75ca8790d36a4
+EBUILD libomp-5.0.2.ebuild 2392 BLAKE2B 18b10357f48653d53a6a2ff6a8af75721a0fe774646365d730eae0afef6cb277218e79e26a6316ca2d5ff7a604941b46e3f1dd51c1924d69d3eb899356000749 SHA512 254569aaa7d2cd3952b9d9ace4303608a7fd73d174cccc4b69b8be80563b37792cc93273543fb4ca4732fa8f89772c4ce432e0769f42961bdb28f9d51d301481
+EBUILD libomp-6.0.0.ebuild 3260 BLAKE2B 26713e991df85eca976a7c70e3284f0c5eea29335960469bf47d35930cdde475870bd132f699a2626df8dffd98dffac6ed372048b65647be43b827b51879fd2a SHA512 9b98ddaee2715189564386cc005dce152c9fc42bfa4873ccbf6ec5c48d61e4e25aae7d82ff85c960d04e6bf3cf6b67f09c5194298246f1002e9ae36da9b51ac8
 EBUILD libomp-6.0.9999.ebuild 3230 BLAKE2B 41ec1fbba984772804d57665c6a13cfb075045acb8d5d0880d165cfe6dc59a82df8c2ec1e5fe6da02c2ebc861b48b726879bf40e593ea0af046aa281021a7f7a SHA512 71ce8131d2a1108d81282bab1aa08bbe1cc2af4be751110c4e76c65d8eef06befa1070ae3876b48f4285a6c6c2ba8d041dcf9b618987ec6ac21c86353ece92b8
 EBUILD libomp-9999.ebuild 3205 BLAKE2B a8bca945602ba1b5045f473a2caed666242ec3ba75440ec6ef98ebdcf1fbf146c775baf142dfc47f676946b90c0a3cea797d7fdade4565d3467ef7b5b5481001 SHA512 4021e79b4057c3a86ce3f330f8532a3cc566ee64c9894c9f3c2bb402bf37431717105a5601b11c7413e71d965657dbdd6be2d215d4bafaba916fb0b371270cac
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-5.0.2.ebuild b/sys-libs/libomp/libomp-5.0.2.ebuild
index 2a0817f288fd..38e97e4bf437 100644
--- a/sys-libs/libomp/libomp-5.0.2.ebuild
+++ b/sys-libs/libomp/libomp-5.0.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="hwloc kernel_linux ompt test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libomp/libomp-6.0.0.ebuild b/sys-libs/libomp/libomp-6.0.0.ebuild
index dc670c92964c..1c6bd76b19eb 100644
--- a/sys-libs/libomp/libomp-6.0.0.ebuild
+++ b/sys-libs/libomp/libomp-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 122b62c7b434..65ebec61233a 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,9 +1,5 @@
-DIST libseccomp-2.3.0.tar.gz 546948 BLAKE2B 084ad3b0dd9833a5439ab4cfcf3ecf3bfa4f4943a20c249f02229fcfbc60024de18b1593235dd14fa5701d5ab53f29518b5d2fcb39b2b0054b1172238e8a2536 SHA512 398643af0920ff446b37a74e48f7a96ad2bec4f514e92fc6f8242b7515dcb8f5d06c2894790b22f62387c2d9b75efd54a4d5944f973239a05f06ec840f2a5a0b
-DIST libseccomp-2.3.1.tar.gz 552299 BLAKE2B 24460f29dff3bbbef809fb82c2ee58deb1b659ae236d369c554212dbfb8a27497bc44dc27fc76ad0eed6d1f9c50c52f05e52ce7f4996aa6dbbe3c0d960edae17 SHA512 246b30e1c513d5e1fa35a47905d99036e276c1e6483a96f3e79ddca536a8c6f641c11bf324ed10c9c8d18fa27d73667c9c72fc7459f827d2883926769ac1cb45
 DIST libseccomp-2.3.2.tar.gz 559238 BLAKE2B 0040ad977431ae9731dadcae11b0099d3ec788462f89cdf80c77b71405ce02c122c3859836aaa9469ec7112b0bf32cc87c9b102bb3e8b2e669ded54677db64d1 SHA512 0864a53ba2be61d0207f7361af94bcda4acff84a1814f915e6ccb19ab24f6ccc978da0eedc5cee047fa655dc1a583e2eeb7ab985ebfc77491c6a2606727b79ec
 DIST libseccomp-2.3.3.tar.gz 564546 BLAKE2B b5249379baf07ab2fef8a8659a30c9e87cbf05f99c38a07c1516948d2ede27d505f6670426f46422d2a927d7bfe97a33d8f871899ae9c30a26fbd10fba609df8 SHA512 845c7e0e916b5f5ad74da446ceff3250148b745c909185f6d5059e807d1b42fa6b74f356cce2a396bff0d4c7a3120e7cdad98d490a97d549327c7693fe1918be
-EBUILD libseccomp-2.3.0.ebuild 955 BLAKE2B 4f8809c66da37cb71217ed72bf36e8bbc8813065f1b812eeef1b309fca18b0a8a4a39b613a6a79d41914655778a2ed031f5948f496027e98fda62a84b190dde4 SHA512 cef9191e4a27650afb955eeef4ae61ac7bf5ed8e08fd39e4645d0fb7658c4fa6f3896b5f6105054da97eaf63158ef778f58f2cb735e46ea774537533c9726dd8
-EBUILD libseccomp-2.3.1.ebuild 962 BLAKE2B 0f260d292b8dfd9541f94ad860425805f615a08d0f6de9e7e39faee0ab46b48bb1d7bc820bb99dfe1fe6ffffe3c8b083f2fdadbdede05d3611ed7d9f9e177194 SHA512 58e7fd61a982923ced093c7a861b15838f38fb0fcf64fa87e3a6669985ba28e4b30896e76c0373b9be42a9bcbc6e71393dd31a50ed090441fde2cc707481a208
 EBUILD libseccomp-2.3.2.ebuild 955 BLAKE2B 76fff8e11b0113a29570b803c7cdc41fc63b5da7b393d8f6471df7b0098a6f6cb0d7a6901407597d261466fd0e9fa77eef25d4ad318085566d202eb7a1c2254d SHA512 e9c95226208a53e73e57dce5bea09c74b0e66fd373d8ea5b3fabfb21af078add0c3e6577525c9b17d25699243ba157593f069e2067001be21e22a2347f5c9b35
-EBUILD libseccomp-2.3.3.ebuild 982 BLAKE2B f5a1f4462fbe1e13ef6ee163321f07a9bcf95c2e036cae566a9c8d0b58ab0c0ae94ef7afa15306e186422ef3e6aeb89b06904b6f1b02e1b8ddef1efe50018a4f SHA512 9408bfa714e3b81ffbf0b9e76b87dcce1d003c5068e649f67833bbbe4671786f1bf66b50e7317ca2bb333eb906a08f8c8d43e509c0851a68ef63176aed82873a
+EBUILD libseccomp-2.3.3.ebuild 979 BLAKE2B b3935778c40d639b3d1bdb0f253965587791c157b4d74236da6810f00ee26f5f7e00446094bfcf8da0118797d726420fa14c9cc84f32a0bc3b7d0c1871395723 SHA512 75adb4d610acc82a22ec39b346e5f45c070eedf08d87f7a92fad08d21265e743c5b0b8f6e9351bc851ea71b2d84580122dd31c45d9891730fdc14f1606a6e19f
 MISC metadata.xml 305 BLAKE2B d660c00d553100c2dc8deb364d56acdef4771051f3d876a63e7264a501653ba539840ccab398e834428990f3c22accca16a34a9d64f433f5258656c5085a3dae SHA512 5b35970c91056a844e76bfd8e3040f58d38784390fd7fcbd881bfd3eb11e7c4c01c16cf4e320f19aaca494c715037b142e3ceddf6a28b1f272b7b01b95cf3ff0
diff --git a/sys-libs/libseccomp/libseccomp-2.3.0.ebuild b/sys-libs/libseccomp/libseccomp-2.3.0.ebuild
deleted file mode 100644
index d7f9b58e8f50..000000000000
--- a/sys-libs/libseccomp/libseccomp-2.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="high level interface to Linux seccomp filter"
-HOMEPAGE="https://github.com/seccomp/libseccomp"
-SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 s390 x86"
-IUSE="static-libs"
-
-# We need newer kernel headers; we don't keep strict control of the exact
-# version here, just be safe and pull in the latest stable ones. #551248
-DEPEND=">=sys-kernel/linux-headers-4.3"
-
-src_prepare() {
-	sed -i \
-		-e '/_LDFLAGS/s:-static::' \
-		tools/Makefile.in || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--disable-python
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name libseccomp.la -delete
-	einstalldocs
-}
diff --git a/sys-libs/libseccomp/libseccomp-2.3.1.ebuild b/sys-libs/libseccomp/libseccomp-2.3.1.ebuild
deleted file mode 100644
index 520288136b09..000000000000
--- a/sys-libs/libseccomp/libseccomp-2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="high level interface to Linux seccomp filter"
-HOMEPAGE="https://github.com/seccomp/libseccomp"
-SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86"
-IUSE="static-libs"
-
-# We need newer kernel headers; we don't keep strict control of the exact
-# version here, just be safe and pull in the latest stable ones. #551248
-DEPEND=">=sys-kernel/linux-headers-4.3"
-
-src_prepare() {
-	sed -i \
-		-e '/_LDFLAGS/s:-static::' \
-		tools/Makefile.in || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--disable-python
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name libseccomp.la -delete
-	einstalldocs
-}
diff --git a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
index 753da391f6e6..64821467e36f 100644
--- a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 # We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/libservicelog/Manifest b/sys-libs/libservicelog/Manifest
index 12dd336cd28f..e4ef23d86257 100644
--- a/sys-libs/libservicelog/Manifest
+++ b/sys-libs/libservicelog/Manifest
@@ -1,11 +1,9 @@
 AUX libservicelog-1.0.1.patch 479 BLAKE2B 1bdebaed553372f76e4d42c8299d42ecd23d88eea7165c6d36d67b156c92a59e4ba8477448d6e00ed452f82e2b67061282bc5cf81104d83a065d92d80a623bb6 SHA512 9c19ae05608a2fb2116a569ef50cb0b4831c3f3c346068ca7f1d9fb572b2fcc4af3a57e91c5848ae8a1a60e73d6c31c5963daddcfe3115338377a4fcdd36a0ae
 AUX libservicelog-1.1.11.patch 286 BLAKE2B 2e9068156c9de35b3fe0178f48696413e22fc1f54b7bd72f83f2da64ee3979d88d31b948309a327b9972b823c6a56bb56bef21324327691a901d1d237fe0dca5 SHA512 0d0786e33db00a7b3009609f63a00f8409f89f25827ae7dcda74e2520dd96b9945ee2873d933ec74bcd5a4c7b6641bc3dfada192f092ca6a399046a8177ddf85
 DIST libservicelog-1.0.1.tar.gz 673264 BLAKE2B 4ea60f194513dd2aeeb0f8f6c991d85d0b00438beec58515866e93c85f28e148d3bb9b6dae69a8c156f9209b1ec26da3ca8fc72b18d10e2d6078bf3bd3e1a356 SHA512 a4b2eaad7d382440767f33aded804732acc2828466e83a4596cc66a98ccfd53d048e9af5984b71a45b937bebf3526062d96f5c10be27d44dbbc808b980c1d7db
-DIST libservicelog-1.1.11.tar.gz 905377 BLAKE2B fa4d8e5420caf0c569d703a330a4430a6d0f69ec00f3b907db7e013684c18732abe8d615470d5cc9f3ff7d53a9c15a4b47ca73ef2b1030b65fc29a4b9e69d17f SHA512 7706e108573d79e7973bb6004fb987833b04a2896c088fc259a84f17192a6e5fc0e760f59031f1b0b28306a9043534a9fa5690dde099060f9546e046fa8d0f5b
 DIST libservicelog-1.1.15.tar.gz 392259 BLAKE2B 886bbf4aa6d41b35fb978f2155a1025069dbffa98dc31add58687260ec503ebdd8b2d6802b473634a65dd9c429a4a307159a918361be057226b7ae9dc14422da SHA512 70cdf8340a8b0df39bc5669976feab022917b5884256370281ed3356633100cc9c7e69c6cc1bd0784bfedc65d388d9ecc50f6dd37e6ed19f796bb7f55bb436f7
 DIST libservicelog-1.1.16.tar.gz 396055 BLAKE2B 2874acc4c6b405d5a16150de0d66f95e55d8ae375d2f8d3bda4daf4a9d7d34e7b2d52bc9c270880daf747664c740ee72d81d47978e73f2d7640efcb6b92a1e78 SHA512 7008a26c8b143b2e498b05cfb5da0c7b76b0ee56106e1d261e202b8ebc0c93abce719230b037fd6bcade078daa5c464428ea2adb466269f30951e909211ae307
 EBUILD libservicelog-1.0.1.ebuild 621 BLAKE2B 7089305141ea969aaced701af3e184ff4c42ee86aa889a1248592ca0b143361274cecbf49785f70508cfcd74ed26fdff0df1477c26b90a87d04a3d3c0a5439b5 SHA512 d2f801036ec9643dab72f32eb2f430280a58960c3e17d2a624ea6c36b30634ebfaf00127c8b11e276fc245b2af91cb6fc4e43f3670b4b51dac600c0f83788b84
-EBUILD libservicelog-1.1.11.ebuild 608 BLAKE2B 5342a85e19d23f338af4279d3ee1becf15504259e96d17be72b0d0ec1bce035cc84ca4946602da25704bb71cd784612f2eb81d9c3f7d93db74a9d81cc7942d84 SHA512 45cc9751382b920c11b936c305c6c510770ef1dc610bf7f399899840fa7fc4b5c99d84279172488cbaa262d01ec29fdad7ac535151dc21dd71c353b1c9a30589
 EBUILD libservicelog-1.1.15.ebuild 592 BLAKE2B ce044cdb0486083667e1573cfc8cc05a9f108e39c82919516509145b679aa03900497425a1a69a393944f568e8d6411691ac0350662abb1bdb6aa7e47fb669b8 SHA512 f55d9b77c760b770522a123b12ff0288eb0d4a9fa41366ebc56dd30325d4199f2cc033fa953217d2a7662e9857abd1c24dbdfa7ab5859c013365f0c7b6bbe8f1
 EBUILD libservicelog-1.1.16.ebuild 592 BLAKE2B ce044cdb0486083667e1573cfc8cc05a9f108e39c82919516509145b679aa03900497425a1a69a393944f568e8d6411691ac0350662abb1bdb6aa7e47fb669b8 SHA512 f55d9b77c760b770522a123b12ff0288eb0d4a9fa41366ebc56dd30325d4199f2cc033fa953217d2a7662e9857abd1c24dbdfa7ab5859c013365f0c7b6bbe8f1
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-libs/libservicelog/libservicelog-1.1.11.ebuild b/sys-libs/libservicelog/libservicelog-1.1.11.ebuild
deleted file mode 100644
index f616f6fba458..000000000000
--- a/sys-libs/libservicelog/libservicelog-1.1.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Provides a library for logging service-related events"
-SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
-HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE=""
-
-DEPEND="dev-db/sqlite"
-
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}.patch
-
-	eautoreconf
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog || die
-}
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index 74260c365bf0..ee76574ba3c9 100644
--- a/sys-libs/libtermcap-compat/Manifest
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -1,8 +1,6 @@
-DIST termcap-2.0.8-patches-1.tar.bz2 10573 BLAKE2B f0fb9738a009fd443e9079f9b30db9607e289c50f5c41225a8d6b2ebf2f79ebdb86eca41f8e8a7633314e13bb625fbc22396c5113504b6c7ed467f55ac8def05 SHA512 74ccfa95338574cb234faf4bda6ec3d4aa5bb45b2a59d6ef03a0b33fecc8d2da07e8df80d441de90e26f0eac06346dd697fbdcd9c0ec3068f179e12cd82405f2
 DIST termcap-2.0.8-patches-2.tar.bz2 11589 BLAKE2B 8fec4befa009a8dd53fd949435eba30a06523cf731ec35a7565608dd0fbcddcbb01b56c94815a79851e0e7afd75d31475cde682c0d419b86cb4750ec9a543bed SHA512 24d871007191a051dca604635f6d4e2dec67b675c2c9a0c728a0458a6a501ac268f5d4c4203356a6f64e718edba5c8ec970276c244435a25bef11c6fba0e837d
 DIST termcap-2.0.8.tar.bz2 211523 BLAKE2B 4ea7c4cdc26be4e1262a8e75e125b4349c75976c297c2389e034635d2d5324275486525fe93fd8628e8a5cd0980c7e97eba55f5a05d6b3b537337b2fb55cf2cd SHA512 1aca52f5bcda60933229143085416296fed1aa981bae4440f30424f1e2bd9d90e9836f05c5a5a53af77d20dbb1d2425bf2b7c5fa2952258e2b4a2a5babaddaad
 DIST termtypes.tc.gz 228329 BLAKE2B 988b91c6c3c624963e078b424f24b26eb37fe32ca34b0ece0ca4ddf734ee1513f399a4f584f41a92c6ef2edb64144c13820677b419e58b4bfaf0e0fa2c5686a7 SHA512 13a2ee2cd0bc349d69af7efb8e8122f655b67f4bcbe0dc5cbf8a9ba22649548086a097de8bc148fb71ceba1640434a6b94763410beb3b915e03c3a6b46e8a678
-EBUILD libtermcap-compat-2.0.8-r2.ebuild 1390 BLAKE2B 350dfcbca3c1bd882139b01cfeb457e2819b22d7a86f42c71a39f7b375afe16f0ffb0f38f5dd17943c7ad33751afe556bf2c0062b8f84f0974f186a4894c4788 SHA512 5a72c9e110e8c2543592c7c86749cf335386db448452808aeaa9b9211ec82ef7436ed9f716658108d5cfb19c3b263295ddffdef763709ca74fad088a8c0e2482
 EBUILD libtermcap-compat-2.0.8-r3.ebuild 1113 BLAKE2B 4354475bb93b8720d7c2400620634a30ae46c900eb55af78f7266b41b7c459fff1455022f99452993765d53c300952d322f556804b30d7dc78f9324959a32ddb SHA512 11983377a273f8435c2941ac86a196b54583510b807428cabb3897dab53c1d987a228b423143d4f4c3e9a53dc98e2f0d1cfa087f5657f071a9cb47b9c6233fb7
 EBUILD libtermcap-compat-2.0.8-r4.ebuild 1200 BLAKE2B 7d7cdfa1f7f14c63042e01d6200e129f3e6e0a3c9961a5fd8225938ae17d5b2bfe5ce8c84a301bd1010f3ad59760adc894dc0aebe91e73559c41a8328e3323cf SHA512 ee86770f5a49c2f0697900c0763c460cae87d97ec464a1aea45cb0345d06650e09c11a798aa4e996ae4f46fe6e7725fa772818368ea3363467d4dd4ae5cee938
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r2.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r2.ebuild
deleted file mode 100644
index 942a606021db..000000000000
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# we only want this for binary-only packages, so we will only be installing
-# the lib used at runtime; no headers and no files to link against
-
-inherit eutils multilib
-
-PATCHVER=1
-
-MY_P="termcap-${PV}"
-DESCRIPTION="Compatibility package for old termcap-based programs"
-HOMEPAGE="http://www.catb.org/~esr/terminfo/"
-SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
-	mirror://gentoo/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	EPATCH_SOURCE="${WORKDIR}/patch"
-	EPATCH_SUFFIX="patch"
-
-	cd "${WORKDIR}"
-	mv termtypes.tc termcap || die
-	epatch "${EPATCH_SOURCE}"/tc.file
-
-	cd "${S}"
-	epatch "${EPATCH_SOURCE}"
-}
-
-src_compile() {
-	emake prefix="/" CFLAGS="${CFLAGS} -I." || die
-}
-
-src_install() {
-	dodir /lib /include
-	emake prefix="${D}" OWNER="root:root" install || die
-	dodoc ChangeLog README
-
-	insinto /etc
-	doins "${WORKDIR}"/termcap
-
-	# now punt everything used for compiling
-	cd "${D}"
-	rm -r include || die
-
-	if [[ $(get_libdir) != "lib" ]] ; then
-		mv lib $(get_libdir) || die
-	fi
-	dosym libtermcap.so.${PV} /$(get_libdir)/libtermcap.so.2
-	cd $(get_libdir)
-	rm -f libtermcap.{a,so}
-}
diff --git a/sys-libs/libuuid/Manifest b/sys-libs/libuuid/Manifest
index ba52282f82be..db7795e81fa0 100644
--- a/sys-libs/libuuid/Manifest
+++ b/sys-libs/libuuid/Manifest
@@ -1,3 +1,3 @@
 DIST libuuid-1.0.3.tar.gz 318256 BLAKE2B 31318e5de019d73b87221f3fff3e3cc8598d02adbdcfd2065fbae6fd2373ab0e3e01241476124e0c80210aa45b4796927dcbb7d5ba0804315eb0e0610d995ec4 SHA512 77488caccc66503f6f2ded7bdfc4d3bc2c20b24a8dc95b2051633c695e99ec27876ffbafe38269b939826e1fdb06eea328f07b796c9e0aaca12331a787175507
-EBUILD libuuid-1.0.3.ebuild 549 BLAKE2B 4ba8ec193f7d2bc7fc7f750d2c59d88bf3f9ccc9a55ebc227b26286da4cfd791b925d996cb7b038a42ffcca3c91f9993ec5efd8e5798fe3dbc4dd7875d63e2df SHA512 eb5a7da86c097d119a079100be7f65d13703144ef7d492979e231044e5a770b685ff682402f3eceb396e78902bfd71317ffbb9a555e0f26ceb61934debda3e32
+EBUILD libuuid-1.0.3.ebuild 516 BLAKE2B 1e7b55bedd828dfec0c45b6e2aed87727e0ea049ccdaff9dd1e0b2778565ed0d081c936da4ccae30e1f7967d16a11a7278eb5415fe0cc2f252ab848d6e994962 SHA512 e3b334b57e8c010072a410b36e5f1ac52e3c6392728d0399b62601f5671c936b57bce8f112543c0a1c823f24a5193df22caa644b600fab44231b71aecb4d5c4f
 MISC metadata.xml 508 BLAKE2B a6cc8fa72e9bb381f4fcc8edb89932f7832d289588760d667c28e7b18f4a7b2e4a4fef08c4b3e38b8d7984ad29fd6019c806991d7fb470f59ee9ddb9390d3ea3 SHA512 228b4fdea521eebd03e869547ffde1156aabee76fdf08f034308109e9b4ea030d953fc8c8fccdc4121863a5660a5b24e0aa40b30fdef01477280cc8b7bec3361
diff --git a/sys-libs/libuuid/libuuid-1.0.3.ebuild b/sys-libs/libuuid/libuuid-1.0.3.ebuild
index e554577d8b58..328fe354954f 100644
--- a/sys-libs/libuuid/libuuid-1.0.3.ebuild
+++ b/sys-libs/libuuid/libuuid-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index efc53916f571..b633f1468169 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,6 +1,4 @@
 AUX libxcrypt-2.4-glibc-2.16.patch 1024 BLAKE2B 8dd6aa90feef9b056de81e8d499ad4699c8050bd243cd581db691cfd8b4457b997f245f76eaa1abce2c5a93a1155c75455925ff148632f9fd86f09f73def1664 SHA512 72dc3944ea6ad600887d99ba0a9b3c0acb9d107f6591a139f863032a45a5efa516ec8b08a06e564552694d14febed0a1e065b96dc4aef06cd274aebf98baedcd
-DIST libxcrypt-2.0.tar.bz2 255228 BLAKE2B c24624e6a32e5227c0b5c8b7430631cfdfa35581c3a3ebde2ac4b3d95d125f05468d19ca4c5d7bac923053a1241a0fc8e7b968c255ac88529a68a73976c468bf SHA512 670042994180186f0f2ae765ac29750790b693e6aa29622f994b90bc59a493287568c2ca0d94d2bc5ed964126de1c2a9a74d206d43ec1d4b77e6d7fb283c9b4b
 DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c37f645b2dbb383f4c4a6bbcc95a12897068ab7354fa015bbb65f6dc331b95ce24b48aa4bdd7a57433d8f5bc245392d SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf
-EBUILD libxcrypt-2.0.ebuild 444 BLAKE2B 9ab2ec5e142ee02031ddbd74666580f78b807a23c51af609e8d0250cf5397f921fe592668e03b2c46bde0b8b1ef5816ed52c18b9917e299398dfbe77cf671fd8 SHA512 353e7dac1d9c52bfc18510d1ce4b69ef61a7e39c329053d32ddc0668d0b4fd28fac698f9a576d7fe727b7d93feaad1484395bffe07c1cbc48f0258c14664459e
 EBUILD libxcrypt-2.4.ebuild 644 BLAKE2B b0198af2c9a0a96d5a821b18ad4aa79f6cfd7d5b45a967adf1f5be9f1ad3964989a540dbdaa60e4239618e0b8a9abacae655b42e2b2adda04037a7b463c82cbc SHA512 b619989540baabbe0a88c8536b2c2fd0c1ba5d60e701228e5d34d1c276bb67c27c9ae4ef8eff8cdf18ffbd87d331ecbc1d5846196b089425fb9d4dbed3888388
 MISC metadata.xml 483 BLAKE2B 0c5c38a1a1986c380dde118b909e6808825e103970ed0554f8dfa5add4bc8bb29c451e390617040e2d9cdb468683308c8a7a063c071b38691817412a9f382b7a SHA512 4caf2b033aa710f33a3570d9c7148d603f228ffc1926b8ca14d418f2fc54bd5a51401b555316e4f5d7a1fb8e131d1445caf3f9c64a03bcff4a16c0f60fbe7050
diff --git a/sys-libs/libxcrypt/libxcrypt-2.0.ebuild b/sys-libs/libxcrypt/libxcrypt-2.0.ebuild
deleted file mode 100644
index 92b8cab9bfec..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A replacement for libcrypt with DES, MD5 and blowfish support"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://www.suse.de/us/private/products/suse_linux/i386/packages_personal/libxcrypt.html"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index e82f5f2b86b1..002fce7ea5ed 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -6,7 +6,7 @@ DIST libunwind-5.0.2.src.tar.xz 72340 BLAKE2B 8a62bd91f6decae1a9a51df19f708fcdf7
 DIST libunwind-6.0.0.src.tar.xz 76600 BLAKE2B 7767f3564ef72b6049c5247881e09e6c56ccd24acc1b7a1742476c4d01b2be792afdc73c8138ca5b1549be9b83267e6a7860aa085514d86eac90545219dae835 SHA512 a35e992223f094bdac5f1565806fe485a878f9baf4502e7f3777276f5c11aeff4beee155512b1c687f4471f34acbd50c834e98120093cf2582007422cec7fb2e
 EBUILD llvm-libunwind-4.0.1.ebuild 1094 BLAKE2B dec5d0847983833e461635ac5711b5d253963650aed87678277bec86d1334ae9348d26605e20acf2a8d2405e891dd10c9303abf7d243ed86e36c8f3e3f12b83b SHA512 3fb7283eea0b4282c549d7cf2cee1aea0f9d28b7689f5b83a32893c32ebfabc703eb0328593109db96a86351b639bc3e60572c7de93fbed18dd359a14b352386
 EBUILD llvm-libunwind-5.0.1.ebuild 1094 BLAKE2B 3378498096da36b9cbd6e70c9f2646cf6215f6d964e0a991e389c33af1a1614bc0c0dd404b58141d64513a22709e1755c79f4466b3cf7b43515f623927f766f0 SHA512 cd9740fad0a59488d543fa2af2a2908457180840999d463071bb557d45214e0cf04069f922e90e0a3b3f8144b8966d2f3564c098561a2ae0511264d1eb2b104a
-EBUILD llvm-libunwind-5.0.2.ebuild 1096 BLAKE2B ca9e96b99ba9c89ba4670226cd1c2875551b9fc75dd912eff73104868ff09f7a0a30d74de2fb2eb03a7ec595d475c6140ea3bbbadfc6151b967ff061c82985d4 SHA512 c9973f9e6a5ec1ff94aed642d6bb8faa977e04e9c1adfd4cc94003dd10bccdef1c6dc364fabdcc2f7b338def620a3e8598b8f125330b6d9129ce32061570f01f
+EBUILD llvm-libunwind-5.0.2.ebuild 1094 BLAKE2B 3378498096da36b9cbd6e70c9f2646cf6215f6d964e0a991e389c33af1a1614bc0c0dd404b58141d64513a22709e1755c79f4466b3cf7b43515f623927f766f0 SHA512 cd9740fad0a59488d543fa2af2a2908457180840999d463071bb557d45214e0cf04069f922e90e0a3b3f8144b8966d2f3564c098561a2ae0511264d1eb2b104a
 EBUILD llvm-libunwind-6.0.0.ebuild 3744 BLAKE2B bd6b480a65c15c7d38043a4267bf1e02435a403a87b3280716e2de1e5dcf3bde6318bf7e361e309c3382b47a690b2a6fc42fd73c5c428ab0c70bbed62ad46ac6 SHA512 3095db45a2689d0a9fa6cc5550f5a897d2de00e3cbd07417e71e52dec301850d90a8e1f9dfd202c9f6485a9941d194704cf69825ff3e6252ebd73d32635c9a17
 EBUILD llvm-libunwind-6.0.9999.ebuild 3885 BLAKE2B 0a6078aeaf1af824ec3924fe5935f3710db2cc3d17bc338feb7c66ad7f478ffa9939e3c2e7c4095bb81923d6253c4806eb886f2309967e0c9f768a4777f87c37 SHA512 9424218fb904b44e796780db42471a52d3f2de7e08077054d5d8d6075ea041bf906a0ac6bc8fc0b6fffb0fcf6de3a543fb3567f4ef33f69f3b77e24ec4991004
 EBUILD llvm-libunwind-9999.ebuild 3860 BLAKE2B 177f9e223b61e3bd3a6fec78ff0b3d2efa1220228d55f78eb41a200518441d8b617998f13642338e91ff3f56dd224c1e1382df5031060c1783440ad20223d069 SHA512 b0cdcbe531188ffa9f7e294136a9238a79441b0768144116784fbf3e647b3fef11eb6a4e5569f08e7e7092d4aec46843c15a1c2b3b96ec63ee64028a0fb29c83
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-5.0.2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-5.0.2.ebuild
index ddf5037d45b5..22e26e7dbe57 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-5.0.2.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-5.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/libunwind-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug +static-libs"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/native-uuid/Manifest b/sys-libs/native-uuid/Manifest
new file mode 100644
index 000000000000..726b96a12342
--- /dev/null
+++ b/sys-libs/native-uuid/Manifest
@@ -0,0 +1,2 @@
+EBUILD native-uuid-1.0.ebuild 701 BLAKE2B 40d9e50877a40b9f784f3526a60ad845c259109b8da245bf5ae8c04eeb483e3957b1573fbfc41681706b31eaf650699c6cedf92d05f6f839fda33766c4266387 SHA512 0064541825531d80f12e4e3ef9409d3b2e4049d56bf2830d50ab1085a1451ab8dd4935681098685e5944b56f54a696242649d82f19128a5793da86307b3c6be3
+MISC metadata.xml 464 BLAKE2B ed7b8ddc489f3b55ff96f06a49d270881423481b2e99ab8e1470e30b8535f7258cf07cdb7128a99cc65b095d8628f26bfda8c51c9dfa1793da91c160ff26faa8 SHA512 dcd353281c0d18ad7414071fe46861733cc928be817c283b2f4ab9aeb7ef0d35551db62f29380e613f78cdd4dd1718fe404335f0210e1dabe364c2eb0abfbcec
diff --git a/sys-libs/native-uuid/metadata.xml b/sys-libs/native-uuid/metadata.xml
new file mode 100644
index 000000000000..06454c38b1ef
--- /dev/null
+++ b/sys-libs/native-uuid/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
+	<longdescription lang="en">
+		pkgconfig file for host-provided uuid for Prefix systems
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-libs/native-uuid/native-uuid-1.0.ebuild b/sys-libs/native-uuid/native-uuid-1.0.ebuild
new file mode 100644
index 000000000000..2f7e48e9fc4a
--- /dev/null
+++ b/sys-libs/native-uuid/native-uuid-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION=".pc file for uuid"
+HOMEPAGE="https://prefix.gentoo.org/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="!!sys-libs/libuuid
+	!!sys-apps/util-linux"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	mkdir -p "${S}" || die
+}
+
+src_install() {
+	mkdir -p "${ED}"/usr/lib/pkgconfig || die
+	cat > "${ED}"/usr/lib/pkgconfig/uuid.pc <<- EOPC
+		prefix=${EPREFIX}/usr
+		exec_prefix=\${prefix}
+		libdir=${EPREFIX}/usr/lib
+		includedir=\${prefix}/include
+
+		Name: uuid
+		Description: Universally unique id library
+		Version: ${PV}
+		Requires:
+		Cflags:
+		Libs:
+	EOPC
+}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index f7e99d595367..533391721638 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -39,9 +39,12 @@ DIST readline63-008 1452 BLAKE2B 4e41c45be1479fba9f74bf9cedb8d1f6237e650962d5b45
 DIST readline70-001 1777 BLAKE2B ab217bd9d27f30351397db2b745cb33ac7e0ce18bbc00112bb87570da0f62ee0e8d182395c97e4ecc21af51e7e1e580ba48076de1095c556f0744475e4019821 SHA512 4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec
 DIST readline70-002 2953 BLAKE2B 47d729b1babe904855fe5d4f780a5b2153a743def527479c3cb82759cdee5bb4260be722e1050be680f5c0dd6dec8ca25c4c1ff557415abae6b3fac2bd481f0b SHA512 13d1489578508d4d2c3a1618024198a709dbce74a6bbf0f6d7ec67d2419c55bfec9f0ca9de0ed93f129d21d5c3a94307ccdc49408455bbb301c5e3a772b03185
 DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b0544325439307d2b4053cbeca8d2f008104bee181ae5d9405d702e6d3bcf26379c4d46e269906474c8544367b780 SHA512 eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385
+DIST readline70-004 1501 BLAKE2B cebce69a21bee3a4d6a908de09f371d65eab6af51a8dc0f58fc915b916957db420252ce07b06703c05d984f62e1e849b6975f5444b2af6ba35ff7c939acf9d99 SHA512 7be41558eab3b88a3657f8589ecfaff0b8ee7f59083d385f50e8704fe830e05a50652a5feda19ff1f3cfd98bff4bb8e25e1637ec4dac8a618db9c8220a3d954e
+DIST readline70-005 1641 BLAKE2B f720508f698b113c6328018f7e6e8775c7c79afc464047405a5c3dae017d611535017dfc2759c11483bb536fab1e9bf72c7a9d3c769b7aea3bd2cee9686bd522 SHA512 eeb27f4f9195cb905d5891f26480d58f59c885dde3457f7a30ff57760ac772e2333ee8aeae979214949f3b52030285b10db013e307ee7311abab677a4427e878
 EBUILD readline-4.3_p5.ebuild 1541 BLAKE2B 15f7b523780d1b2b48ffec6ce2a9b18152c67efa28557f67b17f23dfd55a5a0712333f47b0348183a345a947aef53f184170b8c6470669bf7da58cedc05241b8 SHA512 3675fb0346094bf360035c5a9e3ffe1577b284024b0d5287a121999db7f81b5c40caddd9f71ec76c76d63216df6b094c98aeac0eb5ccbf9bde6d265506d0df03
 EBUILD readline-5.2_p14.ebuild 1598 BLAKE2B c3ecb5f6130c10718b55db1a3e1d092cfce68d9b0f3cea3ccdf5fe673ebb5ed8efd043d0bf6d6800f432bb03d2c820debcadb6f7df1a0aa3580529bde04b5073 SHA512 bfcfdba85b3d11a3e977007e20ca5d023723aaaf62b03b216db86d8484ffaeeb268bf247f6fc3cb6222c67a9ad1591ef03e020dde08366c8c043e83b337af887
 EBUILD readline-6.3_p8-r3.ebuild 4394 BLAKE2B 3723db01faea6c082014782ae2b1d09abff472c8af115c1d7d6f4c6b8b0dbc1f19339271f31c42c6649b4f51376b334cbdaab9bc32572d38082c5c828736055d SHA512 b41661ce6cd9d7109ff78b025eccfee1f071a456ec1c8debf42a5393699785d82b3259ef0050ab5678e05e0abf0c815cbdb34239d7db32b2dd6308670243c54e
 EBUILD readline-7.0_p3-r1.ebuild 4853 BLAKE2B afc37cd6a51635a00add5b5b93e8df8dede30297fb9e4bd8a8ca27dc8ec447900c4437c0a5cea194c7ca064ee4d3a97871512ee514b2630db2d9551f14a69f52 SHA512 0d7d193777b82239531082564ca0d24012cdcd2f71e374a30a4230a809ba7dea8ddba0e2a4ec7fcee0b4600de2ae862180229d353795ecc6415d70b15d5e31ea
 EBUILD readline-7.0_p3.ebuild 4608 BLAKE2B 1ed5d3f18bccf2cb7a31b1bda207857b25b97120aa45acbf811dc2a4d145de6721e034fa328bf997b66ffd31a8c50d2b014bcde7f46497371818dd725b95cde9 SHA512 d39f238dde1be98a58a6271b75605cc08993d4488f202d4e4733c64a02ad0dcfdeadffaef459e6cc400abd986ab9e68236643d76985dc1c4d7014b7f4b4db377
+EBUILD readline-7.0_p5.ebuild 4853 BLAKE2B afc37cd6a51635a00add5b5b93e8df8dede30297fb9e4bd8a8ca27dc8ec447900c4437c0a5cea194c7ca064ee4d3a97871512ee514b2630db2d9551f14a69f52 SHA512 0d7d193777b82239531082564ca0d24012cdcd2f71e374a30a4230a809ba7dea8ddba0e2a4ec7fcee0b4600de2ae862180229d353795ecc6415d70b15d5e31ea
 MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784
diff --git a/sys-libs/readline/readline-7.0_p5.ebuild b/sys-libs/readline/readline-7.0_p5.ebuild
new file mode 100644
index 000000000000..ceeb39505bdc
--- /dev/null
+++ b/sys-libs/readline/readline-7.0_p5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+
+case ${PV} in
+	*_alpha*|*_beta*|*_rc*)
+		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	;;
+	*)
+		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/7"  # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static-libs utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-7.0-headers.patch
+	"${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch
+	"${FILESDIR}"/${PN}-7.0-mingw.patch
+)
+
+# Needed because we don't want the patches being unpacked
+# (which emits annoying and useless error messages)
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	default
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline || die # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--with-curses
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE="${S}"/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
+			ln -s ../../lib${l}.a lib${l}.a || die
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+	dodoc USAGE
+	docinto ps
+	dodoc doc/*.ps
+}
+pkg_preinst() {
+	# bug #29865
+	# Reappeared in #595324 with paludis so keeping this for now...
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6}
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6}
+}
diff --git a/sys-libs/rvm/Manifest b/sys-libs/rvm/Manifest
index ef5617563192..90d777cfcc98 100644
--- a/sys-libs/rvm/Manifest
+++ b/sys-libs/rvm/Manifest
@@ -1,5 +1,3 @@
-DIST rvm-1.12.tar.gz 532869 BLAKE2B 5f46c9802f1d07631d4ea15acda379adf5c70a660a9c2901de28bdff10e68189a94254cceee8f8759f6b0817ac1c37fb9d2613e22b8bc7d89b128320e35f7e22 SHA512 34fedf1b6f87b2285417dc9f0ba2f203bd75f9a0fa2e8be280a36e27ab4aba4302b4a19cf7c373b93b22822a32f2104b956777f10b9a341107f66ac34fbab205
 DIST rvm-1.17.tar.gz 558574 BLAKE2B f4fbb7fd71c1c275c43689afa9b58624d8cf7e6f283b296602bd56cb8a1645e32d725561d5cc8934429d29fa20587af4620ca471378a7693936ab731986df372 SHA512 31956541e1e254fe9ecf3310e43f7395c847bab87e57bffe6e4f678a0077a21d0fb6af90e9bd79c599fc7f66255cd25dc99f85439c9e827319ff2c8bff4feb5d
-EBUILD rvm-1.12.ebuild 542 BLAKE2B 56e7daec7569dd881487ce3730c356ef131975f6be365cac299b872fef27100c6c3c347dfaf27c301e95af728fd290f01e59700d19841d0ddfdfc4d90223208e SHA512 ecc7d3eecd53cdc2dbd68f8d1559189d3a3ea9ec81e867fea1bb8559dbf68d266d9326f12c224a9d4e02f3b3e7b5dca39a3ab4ae8553bd98d63fe879aa456582
 EBUILD rvm-1.17-r1.ebuild 451 BLAKE2B 09ad979f9f5b7049f36c171ea75bf1e874b6a77c9edd6943da482526e3f3db765eea0f2655a0eaa7ef33a83280f69301363b3089647159c65ca1ae54a2097b87 SHA512 b983f2b45dab2e653b1190708c8336e2e36a0984a240074516aa3bcf1f07ad818d1b95da1a22aeab8857e0eabc8c7b2ebd6f2f29a4f0068efbf21d7bb757f428
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/rvm/rvm-1.12.ebuild b/sys-libs/rvm/rvm-1.12.ebuild
deleted file mode 100644
index 726ff997d5fc..000000000000
--- a/sys-libs/rvm/rvm-1.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Recoverable Virtual Memory (used by Coda)"
-HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="http://www.coda.cs.cmu.edu/pub/rvm/src/${P}.tar.gz"
-IUSE=""
-SLOT="1"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
-
-DEPEND=">=sys-libs/lwp-2.0
-	sys-apps/grep
-	sys-devel/libtool
-	sys-devel/gcc"
-
-RDEPEND=">=sys-libs/lwp-2.0"
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc NEWS
-}
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 71e88cef89f5..b68f89995e4a 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,4 +1,4 @@
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
 DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
-EBUILD slang-2.3.2.ebuild 2286 BLAKE2B 2253df190ddb4f5d8c3eb502d9b78c3632fe18379f5efa0e41c62b899f5a777b70d3f30f58e63dc9389ea21524c71e8a9cf1448b1e71d85162f74879707b7507 SHA512 d2349f40fe6498e0bc9a8f0d3ad592abf2b0edc9b16b9649be51b140c4a6208d130c9a4fc2fdeafb183ca05e6680b53c522f19da2cead85d31e8f09e30094a27
+EBUILD slang-2.3.2.ebuild 2285 BLAKE2B 15b3327e801b226e2b783a0a2db467557931be00d2dc6bc7c186e8a6d0ccbd2f39b7ed4e6f0baa6fe89e8daceb6929cf0e6bedfa3d22bd08d3e5ba050af30fe6 SHA512 e7c739ccf31f1936ff6e42e4420ac45eb88b86a812998a703446746951743dc7e39d897b3f3c4e289cfac093ffafaed43f62d82106c8a5eb7141e291b3192f49
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/slang-2.3.2.ebuild b/sys-libs/slang/slang-2.3.2.ebuild
index c04f235155b0..47202fea1ca7 100644
--- a/sys-libs/slang/slang-2.3.2.ebuild
+++ b/sys-libs/slang/slang-2.3.2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_pre* ]] ; then
 else
 	SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 		http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
-	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 ~x86-solaris"
+	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 ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 1dc8558e1ccf..974b375b002a 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi/Manifest b/sys-power/acpi/Manifest
index cf5ec100219a..dcc6492caea6 100644
--- a/sys-power/acpi/Manifest
+++ b/sys-power/acpi/Manifest
@@ -1,6 +1,6 @@
 DIST acpi-1.6.tar.gz 92448 BLAKE2B 04f03ba2bdef7bdee09e2e9b35edd53a413b857d7c0f2593553cb93662424d1164820c3bdf46879b65f611b52b9c232f786c8a2f011899bf838a824d0cd6c545 SHA512 29d9a59beaed119a48cb426807e6fc6c90597ced2b8b9be3356b1d763478174fc5a2824c64c66b742c0bc4ff54a9cc94224225b7978f00496f977422ec5f6ede
 DIST acpi-1.7.tar.gz 100501 BLAKE2B 0e98ceef0cd51fe5616f8209e4967010fed6e4d198549196b8321dfada499fa3bc220cf0c64b9c9c6dbbcdf80d2fb1428ee3b98f9bd56ef59b508cb8c06039f0 SHA512 e6c96707d651eb20aa4a4c76f78891154d576ccdfaef08b5eff6094b90b62a0e97f6e35a4a996dcc3b5f0b57ee2c60542f41832039c6cbdf853ff3d022c1b609
 EBUILD acpi-1.6.ebuild 368 BLAKE2B aa0a372331a98120c5683550e17f301114c45849703fde1cd3bd318399bc55b5d6257ea225e4972ab9bcf03c1be5dcf45167cd078a01c8b323087eeb27836345 SHA512 69786bc78cd8129231e8af181856a5665cdce7cea04bc7b762ddc26d84aa2c3e3657d557137661129fe6d0ea64bab8cd4098d35d20e261ec33cd3e4045e0d7d2
-EBUILD acpi-1.7-r1.ebuild 371 BLAKE2B 07a2f97a8fb6d67bd9f42698aedfbdc04125009749cb60380a64b7d30ddcfb8bbf4ef77f4f9791418f85b3aa4259076bc49a5384a397a94e6d10b8684570ad71 SHA512 c11e2301e198289d7c3a65bbe65ae040c77d04a1e19aa02a1ceed3199c5a60d2133e42aa71d5f533f4dadbefc03ab055de0fca8541e48f8bc8d9110711fe7910
+EBUILD acpi-1.7-r1.ebuild 378 BLAKE2B 3dfd089a3ed829db6cd0025e603d745bc0c2b30386c5b2d4d4b3ddbf0b91db47c231c8b7c24a3c6e4e77fc9faba31bcafeb2a8d0a59a2396fc9b5bfa773fbf69 SHA512 a13818fcebf581dad71b734511bbb8f35e4b06e5a39a1938c04257837706ae47a1ca61fca3420812344bd4a06e4df387c4c9f6ac2bbe28bc60ebed81deeb72e9
 EBUILD acpi-1.7.ebuild 370 BLAKE2B 84fe31a8bfd256fbca55ea51cbe0fcdec17b246eb7e1fc7132ab7755368397c20086b7414d2c73f6adc3fa3eee684d04c3deed032fa28ad25d9d13bc57220caf SHA512 204bb916f93d7a751d78431db75bd6a7828115b0a1e50ecfef08118928b584acb1ef55c01324f37940e973dfd73e7c21ce8a18f6d6f46f7876eb131fedf3c5de
 MISC metadata.xml 710 BLAKE2B ce2b5500453df4a99039d386939c7de1ebb6aefc767d8a7d82f155415188504b84e01a583870d32be045b0b069a8b95a9c05c4787ab49479229074fa53c9542d SHA512 f49f0729886c4fdeea94c7bd7dfb584bad8c6ecae243bd43c89aa583593f16dd682820b787349987c44fbec11e86f8ccd835621e935b0dca9495c93e54ff71e0
diff --git a/sys-power/acpi/acpi-1.7-r1.ebuild b/sys-power/acpi/acpi-1.7-r1.ebuild
index cb6a3bcb269a..5f0686826f47 100644
--- a/sys-power/acpi/acpi-1.7-r1.ebuild
+++ b/sys-power/acpi/acpi-1.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/acpiclient/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 src_install() {
 	default
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 3a04f31e74e1..ff48c12e6cbc 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -2,6 +2,6 @@ AUX powertop-2.9-libc++.patch 1182 BLAKE2B cad53198b44a1b402995207c33e33d06cec5f
 DIST powertop-2.8.tar.gz 670000 BLAKE2B 4259f462d36fe0cbb157859d6e1d3e1face67f7232fe8d4112d77f844b545f49e9cf486e21bcbc34f64ffb0c891c1864141784dde14e3a96647d6535641a840a SHA512 253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80
 DIST powertop-v2.9.tar.gz 718763 BLAKE2B bb6ce789614397b02f0e9f1cb71585cb456c1428cc43e9fe1c4b3bc9f96171fede4c587410e78e58ad8d0b0f772549a93f454bcd1b521e6dd3c809a85dc3cf30 SHA512 783af538c44e3fae7215a5b4247eb32a72e02150b3f297e6b9777a450823dd30aca014601892c0e80937a366eed95b42b622c68161d53e905ad4fbcb574b26f5
 EBUILD powertop-2.8.ebuild 3356 BLAKE2B ab7b2846e8752558a56545e94fb036d7c4f5322cf02d29b3f9c30e76c3f3b9690e2cb962c8180991b169363bc22d1109fd4139a287f87cf6c53edb251d659cdd SHA512 e243fd2facd6195480a121d665d80ce049561713d81a1165ced9a18756d2ac9728620b83c0c6acbe9433c5a87e568003f70980b77d1866b302a55d22e75c2e90
-EBUILD powertop-2.9.ebuild 3704 BLAKE2B 5aaa7db1f8b83391ab5a414daca8c619cff5e9f25f1c825db889fff30cdd00831161299c71af994504fa86d7c10fc472dde7873cab65a66c1ddc6d3367951d89 SHA512 19f3e5da7e3c4fe2e1a6787a852c30fc931ac32410b51690ae3c135215148f63a5da9050dfa3955e5d31a05e3fe0431b29fed82291359505ec06c543533e6105
+EBUILD powertop-2.9.ebuild 3711 BLAKE2B 867ac2c796452430f1964571d1191b5bb17a6fa8b1bb636231c938ccd1be91ad3f34480f822818fb4dff012394512b34434ed73478bd5e6d6d3524911be46cc2 SHA512 271aa601d71ed156a619d382f27a9271f92e2a519db34be7f9c254b0c5e8175f26806f48fb4fa3abbfa5ee4cbdd7d3554c0c6b387665426012cd6512caa3febf
 EBUILD powertop-9999.ebuild 3663 BLAKE2B b020232c48201403e5467004745f82dad3f25231107b8bd6b227b257f20611a305545195a3ff89a7990a05f4cca3d73c761966af4d0b61b663118043fbf0e522 SHA512 9020b3bb5e59d05150cc8e3bc22f18d959c18c08db02256f1b06754a1a4293a04e400fe3d37b1a6910ff4f167221e2b37abf67a52d13d76a9c4941d7d6cbf8d7
 MISC metadata.xml 253 BLAKE2B 48f33288fc58b41b96f50af29bb4ce8989e714fa989ed445afc8933d1483e1026a019783805ad1b42399227819f461ed5c874df1c78c4bf144bccd07306ee995 SHA512 fad4a58e4c2a6eaa8bbbdc75e3995b5da53c9291f82480e35a9badfc1374bcc484663f2577790a46218be90d3b42bb45620297316c5493bc4a46af0dbd29189e
diff --git a/sys-power/powertop/powertop-2.9.ebuild b/sys-power/powertop/powertop-2.9.ebuild
index a6209f4b9502..cf837648689f 100644
--- a/sys-power/powertop/powertop-2.9.ebuild
+++ b/sys-power/powertop/powertop-2.9.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 06cd3ed195cc..e3854a547b53 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 7a4ea212cfc2..898f09f875fe 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -4,5 +4,5 @@ AUX acct.initd-r2 1080 BLAKE2B c1d2a49530df32adf143b4b3b50059602494df57efe0ef414
 AUX acct.logrotate-r1 304 BLAKE2B 60ddfe6b5a8fdf75c82bdf43308ad6f2e1da0c533e532277eabff670c46bb874b5dee90f1bd0d98cba9218cc47e82fd4a91e66170ffd1d367d2d8a01c1e3e00d SHA512 54fcb419f433df2a64eb51ecfc8122c4945960ca7d745d7a8816fec441586e15321cdfacb2db1feeec23c66b1b02b4191d3fc53355379a75c2956a00bc743332
 AUX acct.service 382 BLAKE2B 7a777c0d9195676d897bf95087a3af2175587e365969956de0d458e842144b6fa97c3e7e1bac402467c8611ef19915c55b562466104b6cbc75279225870c25dc SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3
 DIST acct-6.6.4.tar.gz 853273 BLAKE2B 2ee42ae849f8e7c5c6dbe33d45e944f945cef87a5fef0074ac31848547ab9b7068509bce3c4b47b35bfde49b02daf43ae812cc58284c50185e4bdc660dccae52 SHA512 413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2
-EBUILD acct-6.6.4-r1.ebuild 1065 BLAKE2B f5ffa36955d4ac1c1631183c1622929e799e2364241227906366e233a899f71cc10fbce8aaccb0d9855756a8807887aedd44d5c98423fc1d0d088e0fc8ae2a06 SHA512 33eb3779d43ea49c52f44cebbc3a677bee2318194056fd31269acd23c2876e270f23b03717b279b8d388cfccf46b559f66acbbd855ae468bac0102d29585c13b
+EBUILD acct-6.6.4-r1.ebuild 1072 BLAKE2B 791b3bcab9874f364266effa467052d3952cd985e2410a8b8108db5b8e315182f8be8aecf3d6a21e5157b9b08b899b4c3355b7060e4db64ef8bd904d1f07e4e0 SHA512 bee9dc00fa36bc67c9acee03c0c12232d60b1cc92e00de809a6414911506ded1e0f05a9592c7224a992051b34d10324be299ccbcc9e62bbcc51bbfa45608cee3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/acct/acct-6.6.4-r1.ebuild b/sys-process/acct/acct-6.6.4-r1.ebuild
index b24a5088384d..cedd5614c1f7 100644
--- a/sys-process/acct/acct-6.6.4-r1.ebuild
+++ b/sys-process/acct/acct-6.6.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index ec7949ca8943..eb3226db5b0f 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -8,5 +8,5 @@ DIST atop-2.3.0-netatop_h.patch 3279 BLAKE2B ac663d50c4474d28bbc1c6b70a2f439ccf7
 DIST atop-2.3.0-version_c.patch 1537 BLAKE2B eda9f0aa427e39ef12aa1584e6277de00577dff81a85085b8b12478a7631cb1739196a91feb684c2b9bdc0bd879493d1bb3a5dca8062da650cda78ae7744e934 SHA512 48589cb29cc969c25d0dbc5c5237200b28af6f1b5daf478abdd52079360938887f9de0fa4a379479c5bf8f3ba31946eba5aae19fe3246f36e82a132708840373
 DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a70395f077d8f0625b52469d3f4a1f5793afc061aa1f7105fbea6223bb19bbcb999be4231b761523eb28cb5243542 SHA512 79ea49421e9bd82322cae26148d608560910a3d2e089228d2218d93744dcba8398058dd75255b64d15301c8bc4bde1dd6e15b6c6949a01534557b24b3d79089d
 DIST atop-2.3.0.tar.gz 190560 BLAKE2B 4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
-EBUILD atop-2.3.0-r1.ebuild 1828 BLAKE2B f8842470b2eb6ac512ccbb73c376dab6b882d119ee0d010bf09878dfb099cf50b81685771552c0c5c7df93cbd5faf2dfef7e50265c1d8b968d713bd521798900 SHA512 7df239077f9656e145c701082ae82c0cd2664cd5772139704a1fbfe046a5d471af6e00a966c60507ebe33f55dd789ca3223a21a7a95a57835a1e18f00a55ad1f
+EBUILD atop-2.3.0-r1.ebuild 1835 BLAKE2B 8508bba0c31f2fc5f73a708b464d45e0603178a23966cd8e9bd0fc1968f02f036664d5ec2f3f917a51b2ed303bd845bc370258ac9e6fb569e97a57306c78eb7e SHA512 a83ace4dcab3d628151cd5f976f4d10baf4c23ff48b0b814e75f1cab90a9553575bb71b4744d5ed4cecc6fac0a3708d0c316fc66d94bf65cf7818ae0393e8838
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/atop/atop-2.3.0-r1.ebuild b/sys-process/atop/atop-2.3.0-r1.ebuild
index 5bf2b3134865..c2b7fbd1fb79 100644
--- a/sys-process/atop/atop-2.3.0-r1.ebuild
+++ b/sys-process/atop/atop-2.3.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
@@ -16,7 +16,7 @@ SRC_URI+=" https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd67263
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 1ff9c3d594d8..6c78683d2597 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -9,7 +9,9 @@ AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbb
 DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 056d9f269926d9b0d74f7187f833f1e94d4e03a5137750fe4ff87b71fa0ce0e0a8569b97ecbd671f951061cfb088dff17b46e37cc14122864c37615356646fc5 SHA512 69b5d3987d2b8b189d1242fde639af3d7d366e901733133e47ee71223caf73aa7da40b7811298f0af861969b0ab482c5ef9830b711bdd15bd5f4d0ebc88a1224
 DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96 SHA512 37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
 DIST audit-2.8.2.tar.gz 1121970 BLAKE2B bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549 SHA512 888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
+DIST audit-2.8.3.tar.gz 1107583 BLAKE2B 21c2b8543a31c0ca4319af40b844f4400615108a59195a95ea79499ff2923d7dbbc840716d60dfba311bfc451983cd4cd0f7cb27c2444825df2c0dfb50f9614f SHA512 aa939b81a66111f4e466208d7a38414bd186d00ccd374b420439764905b4707bbfcdc2331a6179a080fca981d19171696ecabd26674205b2f9339c44954db933
 EBUILD audit-2.6.4.ebuild 6194 BLAKE2B 5e159665e671092224196d91478246d2f9f56092dac4be65d86d6094bc535c276d90f2635be17214bc9fbae94aa9d4e58d1b538766eda940260c00ce9be66591 SHA512 5769b0f13bd033b5b465ca36d707c4324338fb2ce43948a2d656ebdb76d5004030e5a10057aa8d9f532d13484fdc1819f5633ce52a12c20dd301d0b4b7eaffe5
-EBUILD audit-2.7.1.ebuild 6193 BLAKE2B 34dff4853db72278c5b95b9c33a7e0a4e2d2815a89d016dd4d7c72c8f531729fe8808fc2ae74b66239e344d1bedc43fcf6cb7e1bf7d0358887cb8c85a32a4102 SHA512 c671d3381f8b53db2a5b69df4ed8265b88332874251fa3d4971982c821331cfe489eeb5bed44ae681d999f5bad385e93e625d8890d6ef0b68afd40eb9f135b8c
+EBUILD audit-2.7.1.ebuild 6192 BLAKE2B b338e66d4e936218fa802cee329e094514b54585a9c075573fe149ff923747c26397a27d9fd60686d6ae3258843651467fbcf2dc4891a656873de05062dd520e SHA512 623452b62318fe7060c08fac9b9ad1556aa3c85bf46ffb60aa55375c24318ff40391f37754cbd5e62065e376ae05aa8fab99fdb873215c59283a16bd07d24e1e
 EBUILD audit-2.8.2.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
-MISC metadata.xml 284 BLAKE2B c99c67d5591687a10bb380f1264dd1cde6370ff3a96864093cb41c7c17617bed826652b7651490b6a4634a7429589bbd137402afd7cf8e79cfd5f636c86baa52 SHA512 84f04c94a976c0e2c7db9a7c8c392b6c714e37650efefe2db9807688c28a8cdb64722064be23b89d0263c82c5de7b7dc412ae13f95b42c97ae928c00bb584fac
+EBUILD audit-2.8.3.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
+MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index 8f1b35143887..471749e78e5f 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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="gssapi ldap python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/sys-process/audit/audit-2.8.3.ebuild b/sys-process/audit/audit-2.8.3.ebuild
new file mode 100644
index 000000000000..c03f103ef2f8
--- /dev/null
+++ b/sys-process/audit/audit-2.8.3.ebuild
@@ -0,0 +1,230 @@
+# 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 autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	sys-libs/libcap-ng
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.34
+	python? ( dev-lang/swig:0 )"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+
+	# Do not build GUI tools
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+		"${S}"/configure.ac || die
+	sed -i \
+		-e 's,system-config-audit,,g' \
+		"${S}"/Makefile.am || die
+	rm -rf "${S}"/system-config-audit
+
+	if ! use ldap; then
+		sed -i \
+			-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+			"${S}"/configure.ac || die
+		sed -i \
+			-e '/^SUBDIRS/s,zos-remote,,g' \
+			"${S}"/audisp/plugins/Makefile.am || die
+	fi
+
+	# Don't build static version of Python module.
+	eapply "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+	# glibc/kernel upstreams suck with both defining ia64_fpreg
+	# This patch is a horribly workaround that is only valid as long as you
+	# don't need the OTHER definitions in fpu.h.
+	eapply "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+	# there is no --without-golang conf option
+	sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+	# Regenerate autotooling
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE=${S}
+	econf \
+		--sbindir="${EPREFIX}/sbin" \
+		$(use_enable gssapi gssapi-krb5) \
+		$(use_enable static-libs static) \
+		--enable-systemd \
+		--without-python \
+		--without-python3
+
+	if multilib_is_native_abi; then
+		python_configure() {
+			mkdir -p "${BUILD_DIR}" || die
+			cd "${BUILD_DIR}" || die
+
+			if python_is_python3; then
+				econf --without-python --with-python3
+			else
+				econf --with-python --without-python3
+			fi
+		}
+
+		use python && python_foreach_impl python_configure
+	fi
+}
+
+src_configure() {
+	tc-export_build_env BUILD_{CC,CPP}
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CPP_FOR_BUILD="${BUILD_CPP}"
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		python_compile() {
+			local pysuffix pydef
+			if python_is_python3; then
+				pysuffix=3
+				pydef='USE_PYTHON3=true'
+			else
+				pysuffix=2
+				pydef='HAVE_PYTHON=true'
+			fi
+
+			emake -C "${BUILD_DIR}"/bindings/swig \
+				VPATH="${native_build}/lib" \
+				LIBS="${native_build}/lib/libaudit.la" \
+				_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+				_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \
+				${pydef}
+			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
+				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
+				${pydef}
+		}
+
+		local native_build="${BUILD_DIR}"
+		use python && python_foreach_impl python_compile
+	else
+		emake -C lib
+		emake -C auparse
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install
+
+		python_install() {
+			local pysuffix pydef
+			if python_is_python3; then
+				pysuffix=3
+				pydef='USE_PYTHON3=true'
+			else
+				pysuffix=2
+				pydef='HAVE_PYTHON=true'
+			fi
+
+			emake -C "${BUILD_DIR}"/bindings/swig \
+				VPATH="${native_build}/lib" \
+				LIBS="${native_build}/lib/libaudit.la" \
+				_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+				_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \
+				${pydef} \
+				DESTDIR="${D}" install
+			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
+				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
+				${pydef} \
+				DESTDIR="${D}" install
+		}
+
+		local native_build=${BUILD_DIR}
+		use python && python_foreach_impl python_install
+
+		# things like shadow use this so we need to be in /
+		gen_usr_ldscript -a audit auparse
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C auparse DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog README* THANKS TODO
+	docinto contrib
+	dodoc contrib/{avc_snap,skeleton.c}
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+	docinto rules
+	dodoc rules/*
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436
+
+	[ -f "${ED}"/sbin/audisp-remote ] && \
+	dodir /usr/sbin && \
+	mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+
+	# Gentoo rules
+	insinto /etc/audit/
+	newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+	doins "${FILESDIR}"/audit.rules.stop*
+
+	# audit logs go here
+	keepdir /var/log/audit/
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Security
+	lockdown_perms "${ED}"
+}
+
+pkg_preinst() {
+	# Preserve from the audit-1 series
+	preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
+pkg_postinst() {
+	lockdown_perms "${EROOT}"
+	# Preserve from the audit-1 series
+	preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
+}
+
+lockdown_perms() {
+	# Upstream wants these to have restrictive perms.
+	# Should not || die as not all paths may exist.
+	local basedir="$1"
+	chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
+	chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
+	chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
+}
diff --git a/sys-process/audit/metadata.xml b/sys-process/audit/metadata.xml
index 4d7881556dac..411e621a64ef 100644
--- a/sys-process/audit/metadata.xml
+++ b/sys-process/audit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>selinux@gentoo.org</email>
+	</maintainer>
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
diff --git a/sys-process/ctop/Manifest b/sys-process/ctop/Manifest
index 4b984ebdaec2..6f0b2cab6bd3 100644
--- a/sys-process/ctop/Manifest
+++ b/sys-process/ctop/Manifest
@@ -13,4 +13,4 @@ DIST github.com-nsf-termbox-go-7994c181db7761ca3c67a217068cf31826113f5f.tar.gz 3
 DIST github.com-nu7hatch-gouuid-179d4d0c4d8d407a32af483c2354df1d2c91e6c3.tar.gz 3735 BLAKE2B 8b9b946faeb43bed2904e9b13f2a21552f13f9460a1e0730812d244314a709a1646b6a4da5bdc2d1b27779a4dbe30755ef2b31770ea09b9efedd4eed47cd1f85 SHA512 418e6d4bf49f715148f584fe936d6f76209cef2cd70696babf3e52778a13ee7524ab43ce071b951d006b7dc77182611282fae9e4e37045b73fc9ffd7f0cfd778
 DIST github.com-op-go-logging-970db520ece77730c7e4724c61121037378659d9.tar.gz 37182 BLAKE2B 80761978e7650222d733694d0abb647710d5102f731fe7b9c86f3d82be71941f77ddeefcce06b62859ba74d6a6ceac923794f2b1a8db0f5cc287b72b078ac8a1 SHA512 2f3ca6a8fcd596db1165453c6f235697504eeb1e6ec75311cb392a040ee394939ab92aa6e6726c47b1c0c07fc98ceef265df6db90c6a536a5d3719aae5bcf590
 EBUILD ctop-0.5.1.ebuild 1904 BLAKE2B 64908fddb7f0604ae9a239d512a4b9b86e0f854d2ca250b2e9f310d1b1a495b5f5410b96584b71af674fd7d56c4fef652a3a39e9683b0f20e0a93cbcfadf4885 SHA512 55b4cadc0e1b9bb70d40ead51fdd318ff13ec1fe3684b805c61223accc2f4a9c6d0acd47e57c9921372cfe57acfabd858992bd2edd9f841448fb2512127f5463
-MISC metadata.xml 331 BLAKE2B ab412f134abf46f57fbff14d5107c73f9b89795d926f9c4dad7a238efc7fd725ebab9d9ffe12b09e91c3270ba3e2268f7279916b8cab4ea5390297f848b9b25b SHA512 c1a175dccb82abd3ceab538883b3ef101ef2fe3b5bb579e68d8e20eec7e783adffba1bca314c0c4170009264ceafc5fb455e17fb14d78dd99f24e41461bb3832
+MISC metadata.xml 248 BLAKE2B b5441b270b247a88ffc1cadfe3d4e19e34f7c3358992ac6fefb9b72e922c4719e31552f176214d28a7d085f103e377223860030b33e640386888299dec175284 SHA512 51dbeeb69e8bc7545264821619fcdcc32e2643e14b43339f33e7b315a6f9c4671b71e01eee0e62d1c96d67763a823b6a46fb4501300c0dfa68bb87de79e3ff7e
diff --git a/sys-process/ctop/metadata.xml b/sys-process/ctop/metadata.xml
index 3f3a995b35ac..6da1f3541b21 100644
--- a/sys-process/ctop/metadata.xml
+++ b/sys-process/ctop/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <name>Manuel Rüger</name>
-    <email>mrueg@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">bcicen/ctop</remote-id>
   </upstream>
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 49d395188aa0..49e889c77964 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,3 +1,3 @@
 DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
-EBUILD glances-2.11.1.ebuild 2488 BLAKE2B 590c24ebab7ce2e795c8740cf0a373eae3da1a93422c86aa97c69fafd4722007464df17b4a992e0039d136ba8139abc434a243f39d4ed33075527eff11e9f5bb SHA512 d685b530c311b46d8982dae6245cc417ab71406996ba1ef1d64e582d9dc894a4e7a2a1b7790f3689dcf00f394149b1e6a47ae454dc606d422769754daf66da40
+EBUILD glances-2.11.1.ebuild 2490 BLAKE2B f20d45c62f86148c17298ae669003157993695f4c0cd43ad92693d649417b176849a1280d928a9c0446219db684ceabf24459c3f584bc97279da27b2ca2045b3 SHA512 7ac32b4dbc9f1040e5ebae5f330e0d4a8fe2c90ea7bcd9cf2abeb9b50e650a435219a6358767703f4df0e69f31c878fb3fa093d6498cf08eee539b39c0e8eaf2
 MISC metadata.xml 599 BLAKE2B df65b96c953ac8e717f9c5f4cc5703c36c515fc1cb2e639e11f3f9d3da4a3041ea633d4af86082494a7f54e8208bab634e2c06d435c76cbd878b58b2f7f0d36c SHA512 a847b6f7e3db008c2875f1fcf352058ac41f516c2548ac8a7256833a7b08331da6c7a70cfaf212bc070fdea7978c82359cf13b7f32343dd813f76595238519e8
diff --git a/sys-process/glances/glances-2.11.1.ebuild b/sys-process/glances/glances-2.11.1.ebuild
index 8a69a9264c75..51d1b0476c64 100644
--- a/sys-process/glances/glances-2.11.1.ebuild
+++ b/sys-process/glances/glances-2.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1 eutils linux-info
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index bf80269f692f..e42fbb1a7184 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -11,8 +11,8 @@ DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b
 DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.0_beta4.tar.gz 179849 BLAKE2B 2990090a3b898673fd3bf985077721aed79d00ee07c8a6808b25eb84e320a9c494bd8ad7440ea142ae01bd634ab8863e2cca01c5a52bd19a7e2f4746334acce8 SHA512 4a9c8765ddbd366b06f23e14dc2176cd2da5346e32867c6fa9f11e57018acb6cc37f9ada044febb1b9d414e4dc5958c3c84455649e9c05f64ddf1b37c59fc05e
-EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7
-EBUILD htop-2.1.0-r1.ebuild 1990 BLAKE2B 9e2842b82870620628f502cfb81e53436c78eca5ece566cd393751e6da1878a792d56632c294b52ff4c4aee02bfa1ffc81cbd22da8e7f52136bb6073a9de98ae SHA512 34441c4ea5ea25169d6bf84c89008b1b0d1d54eaaf1fbc6e46b5f3afabe561578ec8823bd02d6da2f563ae87213284fba66436657cb74bb1b18a6502ada5cd53
-EBUILD htop-2.2.0.ebuild 1504 BLAKE2B eab36c8ce2218b6aad12a6db3eb13643b0da2f6a5e57153fc0635f95cc693d60d3898b70f8e1fb58deaca1f0b13c0f7a7315135dcd960a9b217733735654b145 SHA512 63313f981af313b63dc06803ebf75fc8fa264eac4e9bed29821b15959e67ff508e8cab97ce93f26aa57a50d7de6dea673453941cf24f885197f1ed26b0252e02
-EBUILD htop-3.0.0_beta4.ebuild 1849 BLAKE2B 219ddc0369c745dfcd08821a05dbb8115dcc3ec89dc3c5b8bdbaed91da1b408f3258dca8676052a5915d78735f881d253eb017e2707bbc83e0ec9183c67b33ba SHA512 4f42160dc348cb5be44b86ab3e82a6f03043631d64f9d0602c729a3cf8774c54daa70a1c1fd96d166c9efab880412003845ccdadbdef37174711e33e89b45c7f
+EBUILD htop-2.0.2.ebuild 1392 BLAKE2B 951213ba4c64dd0aafed491cfc608075015b22c8bfc5cb7af0436b46bb5a624d5584fe07a6e10b68d336a9a9c1aebf6a361feb0eaa18818082d404b4c14e455d SHA512 034da8860aae7b9f4587acb420cd51367eec49a062488f4ac97d0caa4093209448efc7357dbd8ff1376673259211f31a09f82172442d09578bcf40c1e8e4caf0
+EBUILD htop-2.1.0-r1.ebuild 1992 BLAKE2B 1eb22bcc2d7d5a78ab7f5db4aff0c5e2908f58b42dffeaa10ef7730b7a5dd2c5dc403c048c09ca959cea68edd3ddd6c2ad8da5e7860a6ae0e663e5a631e6ca85 SHA512 96f1d32dc7f3f5decf550af430d81e16f0368deb0ab4142e2960d79e753cb486238f746d8eb6e6790fd5f874acde158ddf5e6638aa8bffd80edc89dbea1734e3
+EBUILD htop-2.2.0.ebuild 1506 BLAKE2B 40768733346a26d5f05f0490f4afb751b82bdf0c0cdee7573d90bd5fbe13153a16cb2c19549239c253eb70b308c7f5efabb06602db94303ac95d468b0429a559 SHA512 058725dda9fe0868570a51958f4f15db7be4bfe1c73a1938ef011b2071ed33653a94dc67ff4f65207a68790162852c4ac51060ce07d797a30bbc03eb780dfa65
+EBUILD htop-3.0.0_beta4.ebuild 1851 BLAKE2B 5d2e0e05ba8d2e4367f6be6fe865dfee6478a7111449ae54037b5e01383bc8ff87112fedad96a6c9378d50ab293520fa4ae11dbc40580a560ba2702ccccd336c SHA512 689993ec609120040ec0d9cb1483dd2d3f5b9b6dc5c144e28f1e1d6ddedc4dc2e59f83121203dc95276caba1a064abe6382b6ba40fa1898b06e40b6964207c25
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/htop-2.0.2.ebuild b/sys-process/htop/htop-2.0.2.ebuild
index 864882f610bf..68515359d77f 100644
--- a/sys-process/htop/htop-2.0.2.ebuild
+++ b/sys-process/htop/htop-2.0.2.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,8 +6,8 @@ EAPI=6
 inherit autotools linux-info
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
-SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+HOMEPAGE="https://hisham.hm/htop/"
+SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild
index 8eac59d43915..c0f863a1c769 100644
--- a/sys-process/htop/htop-2.1.0-r1.ebuild
+++ b/sys-process/htop/htop-2.1.0-r1.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit autotools linux-info python-single-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
-SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+HOMEPAGE="https://hisham.hm/htop/"
+SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index 980d490717ab..5647433903d2 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit linux-info python-single-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
-SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+HOMEPAGE="https://hisham.hm/htop/"
+SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/htop/htop-3.0.0_beta4.ebuild b/sys-process/htop/htop-3.0.0_beta4.ebuild
index d0ff7771a218..26c184d21dd0 100644
--- a/sys-process/htop/htop-3.0.0_beta4.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta4.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit autotools linux-info python-single-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://hisham.hm/htop/"
+HOMEPAGE="https://hisham.hm/htop/"
 if [[ "${PV}" = *_beta* ]] ; then
 	SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_}"
 else
-	SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+	SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 LICENSE="BSD GPL-2"
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index 5e4d5a1a1ae9..149ef74eaa4e 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -3,5 +3,5 @@ DIST tini-0.17.0.tar.gz 30881 BLAKE2B 8212bfa56b6ade3b79e1d4d3144b10b98e4daf19e9
 DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1
 EBUILD tini-0.16.1.ebuild 910 BLAKE2B 44bd74197ebd18fddb00f4f9b285da19dcdbcdce97548317ca4e786e7e3ce5724e3a2c85c5741b6ceff57e46c87c632cd27e2c629a7b18ecb7d98eb91b0f4e63 SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334
 EBUILD tini-0.17.0.ebuild 911 BLAKE2B db44d845dd47b42e0a707d5bb342cfdcc7f6d79ba2f5e114fc03788be003854e7f7b2b53f86b80a1bae961b85d0ae98a8dce34187027aa2e088cd7b33feb4e46 SHA512 1b3d1aa8f75d7ac3fbbae3dbdee31e370e1c2c44c1763ade560e5940153fa0f45c63e7e3ffba97b18fa5c0f41b50efec3bd519964893af77467c2e2c8126709d
-EBUILD tini-0.18.0.ebuild 1098 BLAKE2B 0f3a4cc57085e6e88bc70afca7a02aa5febc6f8b97223bd10587f82b232f824e0126baf98befd0a076c8b51113feb4c627309077f0a921e43c01988fd7b4216e SHA512 0235d848202700878ea820f76a4a17d1d05f2346fb609db66d8a62298f365c26bf718fa2a82569a52a0e82c8a825e04d6a0271fdeea12ea0a28548f0981c6a8f
+EBUILD tini-0.18.0.ebuild 1105 BLAKE2B 356280a58fe5c1f146c83531021e131c9162da1e1075820d1aae4c130b3c71ff214f3270375be83efbbff705a9e5d90a8224ead03c2828e9bc6853789f69a747 SHA512 7cf39465ae7a3a3ea332c9277380d62e813097ef12f5dd50ea1002de87e4925ffddeca550138f7469fdfc19e7701c35ce13fb5f46172df54edb1c698e803d861
 MISC metadata.xml 603 BLAKE2B 5e702a958ad14189e4be030441833428283784695d116c8404be905b6aece027ec8acbe05394c6108d13ad04eae0284dc88cbab77364aeb73dfc21001457f7f7 SHA512 9e6651c7f9ae7a2b3d856af9e74e8656f89de4496fcacf5d97bcbe4d2b20be01c306cb3e116a0ad7eabe213e2476245894ffa53e5c63ef9b4e73ca989584af9c
diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild
index e10889c529fb..6055c7e98a14 100644
--- a/sys-process/tini/tini-0.18.0.ebuild
+++ b/sys-process/tini/tini-0.18.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+args +static"
 
 src_prepare() {
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index aabceddc5de8..e3b21692c613 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/os-headers/Manifest b/virtual/os-headers/Manifest
index bdf39f797169..5fc102a279d5 100644
--- a/virtual/os-headers/Manifest
+++ b/virtual/os-headers/Manifest
@@ -1,3 +1,3 @@
-EBUILD os-headers-0-r1.ebuild 729 BLAKE2B 8137887b197dde0ab61002b2bf2327178f1e47a420bb5b7c2a5db634ffc1a6944eada3db4df11a7160a641721557772d242d3833696d93dbb0cb82de87aeb4b8 SHA512 6ea5b897a99fb18385bf28efe0eb0a8e3411b060b50790b66acce1f1217eacf8cac92923a7cec0f72ff0a40ea03a810678696dbc141d8066d2c0b903da28b89f
+EBUILD os-headers-0-r1.ebuild 757 BLAKE2B 0a2c922a58926a2ba12c9ccd0e35b1659fdab77b9bf1270041888276638db4b20b5954fb64a88d4eacf736d2e05acc860e9169e13900f3e37ab42d26a5b40e83 SHA512 a5862e3d1469d1aa28046a743305ce666b06c68449d06d5f9b7a856f41fcb6d8ab5ca58de23ca1bd1e17a31dd723f3c699ee9b5788e9400139f6123b7217ffa8
 EBUILD os-headers-0.ebuild 649 BLAKE2B 5f28d3539549e8ae66ea967280175eccbcd62765a9dc58fd4824a752eb2f94fe0fc0060846b1c729d82e0e026e0061d3e5a5295b9c00bbaaad34590330843d7b SHA512 0d8a2399d57757013ad5b0c29156844712fd6bab5f69b0cc2e0d32e59b5ca8266f921ca1a5d8b9178d27cab207e604eb85e88c6251738aab6b04d9bb362b5c14
 MISC metadata.xml 356 BLAKE2B dfdbe957c17aa00de768e659f3406001e0ea7a2e20dcfdc3b737f591fa489737224ac04444060e2993e64981b039ebceff9c1083ed3ed1b9597c253cd2b3a872 SHA512 8771efbd53a5bce7d929691b5e0954eddbf9cdc0aa51922efef0ea7fdedb7aa1197def3a65c8603906b36ed7664f55ea05f99e874a37cd522d1ebf4753db2ed0
diff --git a/virtual/os-headers/os-headers-0-r1.ebuild b/virtual/os-headers/os-headers-0-r1.ebuild
index 2275804ebdbd..1c5db1ee456a 100644
--- a/virtual/os-headers/os-headers-0-r1.ebuild
+++ b/virtual/os-headers/os-headers-0-r1.ebuild
@@ -10,10 +10,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 # depend on SLOT 0 of linux-headers, because kernel-2.eclass
 # sets a different SLOT for cross-building
 RDEPEND="
-	|| (
-		kernel_linux? ( sys-kernel/linux-headers:0 )
-		kernel_Winnt? (
-			elibc_mingw? ( dev-util/mingw64-runtime )
+	!prefix-guest? (
+		|| (
+			kernel_linux? ( sys-kernel/linux-headers:0 )
+			kernel_Winnt? (
+				elibc_mingw? ( dev-util/mingw64-runtime )
+			)
+			!prefix? ( sys-freebsd/freebsd-lib )
 		)
-		!prefix? ( sys-freebsd/freebsd-lib )
 	)"
diff --git a/virtual/perl-Carp/Manifest b/virtual/perl-Carp/Manifest
index d766af64d3d6..98b15c7368b3 100644
--- a/virtual/perl-Carp/Manifest
+++ b/virtual/perl-Carp/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Carp-1.400.0-r1.ebuild 572 BLAKE2B d34d421057e152f49b68d0bf4d5f2bfe175bd7748805744014cf9b9e2751f54f6f10dcd4485a2c7c05712919eaa058cf0c00d4afae85e5a59cd4bef153c3f0f7 SHA512 634cfaf2b90d4303e3eb6b09c0ee873332e612e2d4d076ed367e267fed9d2adbcccaf8268c14de0964ff489091b446b47fa931b7e70f6a9e26b36d68d13257fc
+EBUILD perl-Carp-1.400.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
 EBUILD perl-Carp-1.420.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
 MISC metadata.xml 356 BLAKE2B 9e80c3a70b4d2ef550bd705d02d24477dbade20545ad50d21ce19d16afc9d7b167b693eceee72373eee0d77c07e972238f3b4d8357b1c5b9942e7a116ced8141 SHA512 cf5fbb85cd1f54aed3f0df484085dbd6dce8afa8377b9964741f3c224c9979354964da769fcc1c6c5b9017c2f6551062751ed5aac370be300f3854c49ada0d50
diff --git a/virtual/perl-Carp/perl-Carp-1.400.0-r1.ebuild b/virtual/perl-Carp/perl-Carp-1.400.0-r1.ebuild
index c27e26d52914..3e8fe6f7b420 100644
--- a/virtual/perl-Carp/perl-Carp-1.400.0-r1.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.400.0-r1.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="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index 552745facf9e..5d259cb2a818 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Compress-Raw-Zlib-2.69.0-r1.ebuild 583 BLAKE2B b4576b739d84a190225e6d2d8aa0849fb17171dafb3d05f74e182e67072b857c60aeb753c8ed28138046a2dd674fb8e5e8ea864204f80d5a8c477cf224eb6be3 SHA512 98e4460fe1c4918389cd708d867023ad560bb3ff8531b2c080393c2a3d7f6d8ee30f167499dae7f320cfae7164480b6024433047d1122980aae55afe828cc425
+EBUILD perl-Compress-Raw-Zlib-2.69.0-r1.ebuild 580 BLAKE2B 91a330ac1d256ae7ea1622c98c1c4432c56b7d4337897517b6b9fc4a179cc17f2b4e84a0714f8448c1a7cf57a15414fa8b79b5e6ddb0d5469f4e2887bcd9761d SHA512 449b4d1af5663b349004926645cb1fb559417d9aa9aa2c3e65f00efed2100982454360424e3155806bfd5a74fecae7f99d1b450cc287190115085c0ff9b5cece
 EBUILD perl-Compress-Raw-Zlib-2.74.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.69.0-r1.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.69.0-r1.ebuild
index 75fc3ce60510..265c69a04ff1 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.69.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.69.0-r1.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="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index b0706f6fd73b..deb054565be9 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Encode-2.800.100_rc-r4.ebuild 608 BLAKE2B fb5fe1e4b89fc99dfcf99a96b78d7395f217f196ee0e1dd200609085804e462f7ed9734e42d713601f265c1e1042e3f64b5e72542ea37083e4fd76d889c51f2a SHA512 aebc2f7e2d47aee0229f9123ee058ad3da61cd4710a905862113940b4876df7aff6522897b3a613eb29dd2eb582b6faae02bc8f6b4bc64dbd8e7bdd5f2d13a88
+EBUILD perl-Encode-2.800.100_rc-r4.ebuild 605 BLAKE2B ff572aa02c526374c96fa719104cc1a04a7f7378d6d6b0ff7aecfcd41f221afcbbaf83cf9d3d829f09a1dfe1c4a72f9225db891c06643e2435155e2fa4846c64 SHA512 6d9ff7a1c64bb88d7c02273f350a625931d109383299d685c0096a7a5fc9eb9fa45bc8ce86607a94d8e57d80482948004abf276c0a53fdf7c113068131d585c6
 EBUILD perl-Encode-2.880.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Encode/perl-Encode-2.800.100_rc-r4.ebuild b/virtual/perl-Encode/perl-Encode-2.800.100_rc-r4.ebuild
index b7f2defee4c6..d9ed8da6451f 100644
--- a/virtual/perl-Encode/perl-Encode-2.800.100_rc-r4.ebuild
+++ b/virtual/perl-Encode/perl-Encode-2.800.100_rc-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Exporter/Manifest b/virtual/perl-Exporter/Manifest
index 34cd496911bf..4a1f316579b2 100644
--- a/virtual/perl-Exporter/Manifest
+++ b/virtual/perl-Exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Exporter-5.720.0-r3.ebuild 593 BLAKE2B 977b74abfc55e055d86ed09f0ab06d9f562e5a2e78eeaaacc38c4c00648727818cceeca4814bc3b898898fe2f0709df366a1f9f5fe37476534c0d6fd850a8728 SHA512 14ef5c96ebe8730446a7fcb45a82e97989238359adba11f11e58c6be4cdc3227a49fc6f5774be3262240afc2eee669d6e2b55534696375ed9250028532c45230
+EBUILD perl-Exporter-5.720.0-r3.ebuild 590 BLAKE2B 435f74078015551bbbf3719854aff354c9323735541263e18b0b7dd7dba914506b2846e150e90d0548f40e8d35dc124c4bef1440f8038cb61ff17687f53c5247 SHA512 55948821d22a941f0a737d321ab1e86d42a8092248e6a42e9b63ea0c2555db06962f7b1ebbb93870a409adef8ae24d6f6c408c2b1a6a697c7af8d635356f435f
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Exporter/perl-Exporter-5.720.0-r3.ebuild b/virtual/perl-Exporter/perl-Exporter-5.720.0-r3.ebuild
index e88b4141fc95..1472af07f79c 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.720.0-r3.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.720.0-r3.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="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Compress/Manifest b/virtual/perl-IO-Compress/Manifest
index 1ff5cec89bc6..d09a15b32c36 100644
--- a/virtual/perl-IO-Compress/Manifest
+++ b/virtual/perl-IO-Compress/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-IO-Compress-2.69.1_rc-r4.ebuild 807 BLAKE2B a94e12a7d968d33da833f66383cad717862975278819ee357df22a5267b68775ac86f37aaf991699282536f87ea61fb201ddf0fd17e6bd7b925694ce93cfedb7 SHA512 441dcf1bdae79ca16b199a6f5e960bb6f3b746508f15b5a59488bd84ae3ffaf1b9514b7ecd52d4ad7eb517addbb562e06c4fe4ad26c892ae5e267fbe0e1ac9cb
+EBUILD perl-IO-Compress-2.69.1_rc-r4.ebuild 804 BLAKE2B 5699c45992850a09cae6ad9d61ce79538150e64a50863401c7e4ebba0bb614273dc91cc691c53a81b6303d0aeb1d7d194aad4fed696d1ccfe986f251dfdb3712 SHA512 1748f37ba6c9a565abfabcf7ac9763b62e0e0e9ea78d987552d3b3c38d425d63f4370b80231d1742aed727c7943da49c67539f3753357a0ef24a80c2b33a6f8a
 EBUILD perl-IO-Compress-2.74.0.ebuild 776 BLAKE2B 13424a651c49e66674a4ba31c128a069e9f34bd3624f814689987ef55f3f7bb55da7bbea7331d1f644e249001fddc9a09ee47483673b70299fc4b767eb5e21b0 SHA512 24770c56b42f78e34af0844de8879b783f518ee9e96560f56780d452a6b2f91be17be0b06e248de52dd80922cee79f3f399bfdc2b814d4d3b9d9927cc7c63e2b
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r4.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r4.ebuild
index c9e50e900db6..7c89f8d5de44 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r4.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/Manifest b/virtual/perl-IO/Manifest
index 72d74ad5f590..cea407c741f2 100644
--- a/virtual/perl-IO/Manifest
+++ b/virtual/perl-IO/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-IO-1.360.100_rc-r4.ebuild 597 BLAKE2B bc52f214e7f43712fc3b18b205ee2fd7eb9bf5a167f4d9acb1b0eff5e4171097066c414c06bf139e1f397207a176138e41d5a15ed946b7872ba2c06dc0d42f8c SHA512 f773447ae231b2724604fef7102cca16d26d822e7bdc81beee289521f4e36b04f8d17f2944372effada8b00b01ce87cc7f1aa36cd04e363edaf97a4e0ea17750
+EBUILD perl-IO-1.360.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-IO-1.380.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-IO/perl-IO-1.360.100_rc-r4.ebuild b/virtual/perl-IO/perl-IO-1.360.100_rc-r4.ebuild
index 5fa162adc06d..ba82ce8055da 100644
--- a/virtual/perl-IO/perl-IO-1.360.100_rc-r4.ebuild
+++ b/virtual/perl-IO/perl-IO-1.360.100_rc-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Scalar-List-Utils/Manifest b/virtual/perl-Scalar-List-Utils/Manifest
index cb059e937a08..e89c9b617753 100644
--- a/virtual/perl-Scalar-List-Utils/Manifest
+++ b/virtual/perl-Scalar-List-Utils/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild 640 BLAKE2B f94d8a781716414edf9424435b015f9ab728e1797ef6673e8ce2cfffb015df3c471a9196b78b9b9f261b8b36cdee979f1a733659184b7386f46b86d275262120 SHA512 788e88bfa797bb87d8512cc80f532e834d52a0c06a78e702bdcd90dc63dd400a290bdff37dd963f9252839afacfb8deaf182e49af8d5bbe65bca1c215cd2ddd6
+EBUILD perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild 637 BLAKE2B d07f440ba3e824868b1eb61d2a42ee6f390b777d42e083b9c7804aebcf67dc20e1d6ea3596e66d8f1fa63c528e86abe367ea4e8b79f6967ef995fce149067589 SHA512 ccd2b91b469dc894b4a2ac227d0e4af923ab6fb4f06e0d55da5f5a8baef214fb34ca763570b6f52a94f7eaad721ff08da3c71f02bbd13a188f7c7baa2da169db
 EBUILD perl-Scalar-List-Utils-1.460.0-r1.ebuild 555 BLAKE2B e94ac878438bd8ceb2bca419411ffc630ab63f8405a2db44b6065d0a3b0d67c38b26413cb4a1142a7d2680f1f57b43863cfc106bd43fbbaf79126397c17158d1 SHA512 aad90f4af06ef9710b83831491574bfa5107f660340c09d3a0cb1aff6427dd8446eb20e8bbd64b30d79ded7713f754e3709509e4544b92bfe04b95a8096d18e4
 EBUILD perl-Scalar-List-Utils-1.460.200_rc.ebuild 650 BLAKE2B a401c82a98e70961920a1a5d90bc5d332759453defe4dfaf640d620a5c5de22a62058cde28f91269e4cf2594c1fa25f246a3020f50aad7c18164ef45c11b497c SHA512 9e80de757958d97940f111399aee4d8d390cfc9ff491f2d878a3e20930478017bd631191d4b1288149e5bd68c14e2cd2c80aba02be5558b03cc2f6ced5fa0d89
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild
index 5efa75b78446..d09bbaf6bdf1 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/Manifest b/virtual/perl-Storable/Manifest
index d819706d4faf..f658b15e72f0 100644
--- a/virtual/perl-Storable/Manifest
+++ b/virtual/perl-Storable/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Storable-2.560.100_rc-r4.ebuild 608 BLAKE2B fb5fe1e4b89fc99dfcf99a96b78d7395f217f196ee0e1dd200609085804e462f7ed9734e42d713601f265c1e1042e3f64b5e72542ea37083e4fd76d889c51f2a SHA512 aebc2f7e2d47aee0229f9123ee058ad3da61cd4710a905862113940b4876df7aff6522897b3a613eb29dd2eb582b6faae02bc8f6b4bc64dbd8e7bdd5f2d13a88
+EBUILD perl-Storable-2.560.100_rc-r4.ebuild 605 BLAKE2B ff572aa02c526374c96fa719104cc1a04a7f7378d6d6b0ff7aecfcd41f221afcbbaf83cf9d3d829f09a1dfe1c4a72f9225db891c06643e2435155e2fa4846c64 SHA512 6d9ff7a1c64bb88d7c02273f350a625931d109383299d685c0096a7a5fc9eb9fa45bc8ce86607a94d8e57d80482948004abf276c0a53fdf7c113068131d585c6
 EBUILD perl-Storable-2.620.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Storable/perl-Storable-2.560.100_rc-r4.ebuild b/virtual/perl-Storable/perl-Storable-2.560.100_rc-r4.ebuild
index b7f2defee4c6..d9ed8da6451f 100644
--- a/virtual/perl-Storable/perl-Storable-2.560.100_rc-r4.ebuild
+++ b/virtual/perl-Storable/perl-Storable-2.560.100_rc-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test/Manifest b/virtual/perl-Test/Manifest
index d41a8e0d5102..ef8227f70b55 100644
--- a/virtual/perl-Test/Manifest
+++ b/virtual/perl-Test/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Test-1.280.100_rc-r4.ebuild 597 BLAKE2B bc52f214e7f43712fc3b18b205ee2fd7eb9bf5a167f4d9acb1b0eff5e4171097066c414c06bf139e1f397207a176138e41d5a15ed946b7872ba2c06dc0d42f8c SHA512 f773447ae231b2724604fef7102cca16d26d822e7bdc81beee289521f4e36b04f8d17f2944372effada8b00b01ce87cc7f1aa36cd04e363edaf97a4e0ea17750
+EBUILD perl-Test-1.280.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Test-1.300.0.ebuild 582 BLAKE2B 8445a44426c5eae78618b0a0ebe00eaf16a2a706f52771a40fe8b0fd753e9a9273f3d4381b6b9a5f83fc76b14db7086ba227c202c0cd3314045d70f71ded8ac5 SHA512 d9195e55cfd5c15787160ea027394a9a6256023c3c6dcc91abe7460a2675e47a4ec047124b96ef3f5000732b76fd6e9a2495562738268bb3ca6a3af1198f731b
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Test/perl-Test-1.280.100_rc-r4.ebuild b/virtual/perl-Test/perl-Test-1.280.100_rc-r4.ebuild
index 5fa162adc06d..ba82ce8055da 100644
--- a/virtual/perl-Test/perl-Test-1.280.100_rc-r4.ebuild
+++ b/virtual/perl-Test/perl-Test-1.280.100_rc-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-XSLoader/Manifest b/virtual/perl-XSLoader/Manifest
index a8006b54f18c..f87fbab2972c 100644
--- a/virtual/perl-XSLoader/Manifest
+++ b/virtual/perl-XSLoader/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-XSLoader-0.220.0-r4.ebuild 597 BLAKE2B bc52f214e7f43712fc3b18b205ee2fd7eb9bf5a167f4d9acb1b0eff5e4171097066c414c06bf139e1f397207a176138e41d5a15ed946b7872ba2c06dc0d42f8c SHA512 f773447ae231b2724604fef7102cca16d26d822e7bdc81beee289521f4e36b04f8d17f2944372effada8b00b01ce87cc7f1aa36cd04e363edaf97a4e0ea17750
+EBUILD perl-XSLoader-0.220.0-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-XSLoader-0.270.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.220.0-r4.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.220.0-r4.ebuild
index 5fa162adc06d..ba82ce8055da 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.220.0-r4.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.220.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-if/Manifest b/virtual/perl-if/Manifest
index ab54b0b46296..01ed0a8822e8 100644
--- a/virtual/perl-if/Manifest
+++ b/virtual/perl-if/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-if-0.60.600-r2.ebuild 593 BLAKE2B 216c108794bf85a51b59603433f48ca9cced7ffbade33a283ec219125c76a1cef5feafe6de96a6cf5f650cfb9478a053b98703af524dd5d5551d2d72726d1671 SHA512 87e4386be4e467ee3dd64f4a679a30e06eeef70b279df445897c8602d54ddfb3bc2dca8ac0ccc38e9b8bf289c790c7abd48feb7eec68dea4fff3bc7fa35689fd
+EBUILD perl-if-0.60.600-r2.ebuild 590 BLAKE2B 435f74078015551bbbf3719854aff354c9323735541263e18b0b7dd7dba914506b2846e150e90d0548f40e8d35dc124c4bef1440f8038cb61ff17687f53c5247 SHA512 55948821d22a941f0a737d321ab1e86d42a8092248e6a42e9b63ea0c2555db06962f7b1ebbb93870a409adef8ae24d6f6c408c2b1a6a697c7af8d635356f435f
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-if/perl-if-0.60.600-r2.ebuild b/virtual/perl-if/perl-if-0.60.600-r2.ebuild
index 24e1624c70b9..1472af07f79c 100644
--- a/virtual/perl-if/perl-if-0.60.600-r2.ebuild
+++ b/virtual/perl-if/perl-if-0.60.600-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-libnet/Manifest b/virtual/perl-libnet/Manifest
index c6023bed125e..af37cc2e6a89 100644
--- a/virtual/perl-libnet/Manifest
+++ b/virtual/perl-libnet/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-libnet-3.100.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
-EBUILD perl-libnet-3.80.100_rc-r4.ebuild 608 BLAKE2B fb5fe1e4b89fc99dfcf99a96b78d7395f217f196ee0e1dd200609085804e462f7ed9734e42d713601f265c1e1042e3f64b5e72542ea37083e4fd76d889c51f2a SHA512 aebc2f7e2d47aee0229f9123ee058ad3da61cd4710a905862113940b4876df7aff6522897b3a613eb29dd2eb582b6faae02bc8f6b4bc64dbd8e7bdd5f2d13a88
+EBUILD perl-libnet-3.80.100_rc-r4.ebuild 605 BLAKE2B ff572aa02c526374c96fa719104cc1a04a7f7378d6d6b0ff7aecfcd41f221afcbbaf83cf9d3d829f09a1dfe1c4a72f9225db891c06643e2435155e2fa4846c64 SHA512 6d9ff7a1c64bb88d7c02273f350a625931d109383299d685c0096a7a5fc9eb9fa45bc8ce86607a94d8e57d80482948004abf276c0a53fdf7c113068131d585c6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-libnet/perl-libnet-3.80.100_rc-r4.ebuild b/virtual/perl-libnet/perl-libnet-3.80.100_rc-r4.ebuild
index b7f2defee4c6..d9ed8da6451f 100644
--- a/virtual/perl-libnet/perl-libnet-3.80.100_rc-r4.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.80.100_rc-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-parent/Manifest b/virtual/perl-parent/Manifest
index 6487156b0471..0cacb422895f 100644
--- a/virtual/perl-parent/Manifest
+++ b/virtual/perl-parent/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-parent-0.234.0-r1.ebuild 572 BLAKE2B d34d421057e152f49b68d0bf4d5f2bfe175bd7748805744014cf9b9e2751f54f6f10dcd4485a2c7c05712919eaa058cf0c00d4afae85e5a59cd4bef153c3f0f7 SHA512 634cfaf2b90d4303e3eb6b09c0ee873332e612e2d4d076ed367e267fed9d2adbcccaf8268c14de0964ff489091b446b47fa931b7e70f6a9e26b36d68d13257fc
+EBUILD perl-parent-0.234.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
 EBUILD perl-parent-0.236.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-parent/perl-parent-0.234.0-r1.ebuild b/virtual/perl-parent/perl-parent-0.234.0-r1.ebuild
index c27e26d52914..3e8fe6f7b420 100644
--- a/virtual/perl-parent/perl-parent-0.234.0-r1.ebuild
+++ b/virtual/perl-parent/perl-parent-0.234.0-r1.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="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 2298aef4c3b4..5c28db7d3b6d 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,5 @@
 EBUILD rust-1.25.0.ebuild 315 BLAKE2B 9b8dc0635a5f3616c6aae90b9d9deebfda2e410f5bdf14560305d5e8f732e40e4f19dca8fb9ddd024403aba02269ea572f9534a66a79b01a63cdd8ae73711e7a SHA512 e1788d6d3877f1b04ce08ad35668673e3e52f2d1243fe167e1fb38c7dbb816f1c70cb778d839a96aea2130bc672e8026bf6f0f8608bb0ca328c14fce4157d96a
 EBUILD rust-1.26.0.ebuild 317 BLAKE2B b724b229130ca619bdcd4777df139b4dbb26ddf5678d5a385cefd3f9fdac0fc8bd7781bd9e83bc9e53f54d2f5e825ff0e3b453d60742008967cdbe747f092370 SHA512 b3a5d397453562e72a9ba6ed097b6e4470f80c8e2abcf9399ae6b712ac6a6a5c0e0d8568b68383797b9ff224d6f45bf9fa07482ebe8a0a1df34a2be1593941ec
 EBUILD rust-1.26.1.ebuild 317 BLAKE2B b724b229130ca619bdcd4777df139b4dbb26ddf5678d5a385cefd3f9fdac0fc8bd7781bd9e83bc9e53f54d2f5e825ff0e3b453d60742008967cdbe747f092370 SHA512 b3a5d397453562e72a9ba6ed097b6e4470f80c8e2abcf9399ae6b712ac6a6a5c0e0d8568b68383797b9ff224d6f45bf9fa07482ebe8a0a1df34a2be1593941ec
+EBUILD rust-1.26.2.ebuild 317 BLAKE2B b724b229130ca619bdcd4777df139b4dbb26ddf5678d5a385cefd3f9fdac0fc8bd7781bd9e83bc9e53f54d2f5e825ff0e3b453d60742008967cdbe747f092370 SHA512 b3a5d397453562e72a9ba6ed097b6e4470f80c8e2abcf9399ae6b712ac6a6a5c0e0d8568b68383797b9ff224d6f45bf9fa07482ebe8a0a1df34a2be1593941ec
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.26.2.ebuild b/virtual/rust/rust-1.26.2.ebuild
new file mode 100644
index 000000000000..26f2a40c5934
--- /dev/null
+++ b/virtual/rust/rust-1.26.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/w3m/Manifest b/virtual/w3m/Manifest
index 236160040522..6ab5684b2666 100644
--- a/virtual/w3m/Manifest
+++ b/virtual/w3m/Manifest
@@ -1,2 +1,2 @@
-EBUILD w3m-0.ebuild 374 BLAKE2B d56b622453136cfdd51232e73c4ab99221df4bd2c92a105bd797075e7fe3e73ef20e30576d65fecafaea5b69fd1b05de3100199af74212e20cf403e22aa87d14 SHA512 8ca1056355a4f00a9bee8b85b7961eec49b2acafabe8d53a019df789660826f42009e38cb4e66bea69e37689dfaa85d31310a2f3545284b78a93dcc1625ea888
+EBUILD w3m-0.ebuild 379 BLAKE2B 4b76a48fc6f2e3dd39950bfd8c0a8649ec9e6a17072194c0d9dd4540c05bb3e897a9fba7afada843acad764c88ed878775506e2d1755c7497439cd2c06407aba SHA512 edf865584bdc0cacd15f937bbd8850692ec41659e3b83f2f415ab7d04840f413befef31d56a17f48c602640650b134cfafaeecee84dc05f2084274df276d678f
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/virtual/w3m/w3m-0.ebuild b/virtual/w3m/w3m-0.ebuild
index 00837ac67a44..a2fb9e6329e3 100644
--- a/virtual/w3m/w3m-0.ebuild
+++ b/virtual/w3m/w3m-0.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual for the w3m web browser"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND="|| (
 		www-client/w3m
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0b3e85380e55..75f4f2c30888 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cvsweb/Manifest b/www-apps/cvsweb/Manifest
index e421920e6159..23d11ba0f4d7 100644
--- a/www-apps/cvsweb/Manifest
+++ b/www-apps/cvsweb/Manifest
@@ -1,11 +1,6 @@
 AUX cvsweb-3.0.6-perl518.patch 791 BLAKE2B 01d515a4cca28acf9b07b062677106e8bf6774b84b31ff7324c61e1af00243963280a551b901932b158b1f512c40735fa752116f0b8a8e4811c3f10b3309b56c SHA512 9cdd1f92974dd35c70280913301050b6d2f0a6d37e19bd87834aefd78985469f508262f7e63d282d0ab98446dc4687626fd8b166a1c59a20e2098d23c45cf145
 AUX postinstall-en.txt 35 BLAKE2B 82790471a9a0422424b6fce32d8faad7d99355ff99b55d74df8e114dfa67a4d4196b411e2dfca912297554cbc0783480096def2e2c6ab07176c6d4dd625bbf80 SHA512 ba2ac529a8b20dfbe9110559a33d80dbe2b846af99b49bb8602520084e24474ef89ea2dd309287455ca94f9d9332ac8f36b2b7a2082dfb063e46456f1d11ca74
 AUX reconfig 381 BLAKE2B 68ef63345f95c1b3a803d7aad5bbc2b3ea7bbc41c2babd68f2bba82003cf9fdd4fe811a43844ce72199041d77af0dc1a05f67bd45cdf23e20df364d5b07e0c0f SHA512 73883f035c7d82de255a9aad5cc58d20b614e70eec86d5b524783e28e34e60888a0215923fd956aa851a42be31a3eb27634ad5d693148722160b569ea73b749b
-DIST cvsweb-1.112.tar.gz 37239 BLAKE2B 4050c91e65ffc5c516da6962aad88c50357cebd29f2f3b6c766222f0c12a3ab04035cdb6bea31e632fd0855362de495b4e218068e9accddc6c3959a86c75a6a5 SHA512 f0e427d4225498a4a7342335f902d7f37ca546135e2ec90e4e1fa14923c301ba5479061fae27a2728f94e45b833242c86d73dbad797681e24eb54c30b796c59d
-DIST cvsweb-3.0.5.tar.gz 72199 BLAKE2B 8573a4952fba31379c64201c4f03687411e3de28824970787188805d0e7c768312a7ae3219425642fe97cdf072fe5c02396c5d0e1aac0bbfae31da37efa01d42 SHA512 68b6d0a1ef3ec17c1cdd71f90e1cfa27aa8a4591f1bb0cf342a168e7fb2c79ff0d5d0fe56916aa1255f43524c8ed281c228eea18183a0410a69789fefea5f8d3
 DIST cvsweb-3.0.6.tar.gz 72484 BLAKE2B ae2a53fcc3618bb1375543a68d2a5866161a1d68b2b55f688f4d3357e7c7db4a37ca0f3d6f58c0955824a112006193108a227f7eaabe3851780c1f0450ae45f4 SHA512 32ac58bcb025746e4cc20bdc12d1bd915e2286a4093afebf8d60cb94a70ac614301f9b7f0a175458b14262a03d3d2eb8c29eabaf9127bef1aa6847905f331cc6
-EBUILD cvsweb-1.112.ebuild 724 BLAKE2B d04e09696c1f9ccf71d818ae5fb288acd45afa62a0c7b7e723c565ac1f986ae9d2b58333d253a06698d40b48d2339ed27c4079a4bd89fc433f3bcd291e3362cc SHA512 1c4d47dd4bc0ead0b8562d6c15ef70849d097ba11b6e4fc7fb107c01d5022195aa981c97313c4fd6933f1622649cd38489c14fd62ea7810c4706bb738a48d5af
-EBUILD cvsweb-3.0.5.ebuild 935 BLAKE2B ac835109ff37f31d411f20675dcd49a671a885e575309dc4f737fcc05ed42dcc9f1a5427f64a0ffe8ebad2f891f927bcedde51963e372ebc45cc83fa88405ad4 SHA512 d4f195cd3f804c6121c116edbe1bf188346986aadf8afa05787f54540aefbd16de7f00bced04d830a525e98ca8a5610c5d725788e49aa458e9f898ef7da5d7d9
 EBUILD cvsweb-3.0.6-r1.ebuild 1007 BLAKE2B 3b4dc68dc6e23402e37eef34888f5c6b0817395bae424bbf529f59f92a1a708ecc7f19b9a7feacf2fe95a4cef5f14cde501e2734f32410b31b44cb4aa65990f2 SHA512 75e8a1b8561f89bdf7f8525b08374850e43867e5f7b6d6140924ea5b41446fc42fcd6ce2188ac5f6756934471265ae637407643b56108d170672751de273bf34
-EBUILD cvsweb-3.0.6.ebuild 940 BLAKE2B 093ec47245e9536f6c639e4b86ddcd7a4623bff02dc7c5301794c8eeb44570ebae75775a86d7e1e89e10c37f5346ef2fe69754e35d4577e6be5185051f09aa43 SHA512 684244f64580c53b5df1bbf0c3bd8e370b2fa2a0d6545289054cc61a8d45632028675985fff0f5c874a3fa8ad3559df09df1be42bf972881d08c68f9b28d09f8
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/cvsweb/cvsweb-1.112.ebuild b/www-apps/cvsweb/cvsweb-1.112.ebuild
deleted file mode 100644
index 5fa2971adefa..000000000000
--- a/www-apps/cvsweb/cvsweb-1.112.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="WWW interface to a CVS tree"
-HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5
-	>=dev-vcs/rcs-5.7"
-
-S="${WORKDIR}/cvsweb"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	local x
-	for x in cvsweb.cgi cvsweb.conf
-	do
-		cp ${x} ${x}.orig
-		sed -e "s:/usr/local/web/apache/conf/:/etc/apache/conf/:g" ${x}.orig > ${x}
-	done
-}
-
-src_install() {
-	insinto /etc/apache/conf
-	doins cvsweb.conf
-	insinto /home/httpd/cgi-bin
-	insopts -m755
-	doins cvsweb.cgi
-	dodoc README TODO
-}
diff --git a/www-apps/cvsweb/cvsweb-3.0.5.ebuild b/www-apps/cvsweb/cvsweb-3.0.5.ebuild
deleted file mode 100644
index 419ac221f853..000000000000
--- a/www-apps/cvsweb/cvsweb-3.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit webapp
-
-DESCRIPTION="WWW interface to a CVS tree"
-HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
-SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~ppc"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8
-	>=dev-vcs/cvs-1.11
-	>=dev-vcs/rcs-5.7
-	>=dev-perl/URI-1.28
-	dev-perl/IPC-Run
-	dev-perl/MIME-Types
-	dev-perl/String-Ediff
-	>=dev-vcs/cvsgraph-1.4.0
-	>=app-text/enscript-1.6.3"
-
-src_install() {
-	webapp_src_preinst
-
-	cp cvsweb.conf "${D}"/${MY_HOSTROOTDIR}
-	cp css/cvsweb.css "${D}"/${MY_HTDOCSDIR}
-	exeinto ${MY_CGIBINDIR}
-	doexe cvsweb.cgi
-	chmod +x "${D}"/${MY_CGIBINDIR}/cvsweb.cgi
-
-	dodoc README TODO NEWS ChangeLog
-
-	webapp_hook_script "${FILESDIR}"/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/cvsweb/cvsweb-3.0.6.ebuild b/www-apps/cvsweb/cvsweb-3.0.6.ebuild
deleted file mode 100644
index 822b6502b897..000000000000
--- a/www-apps/cvsweb/cvsweb-3.0.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit webapp
-
-DESCRIPTION="WWW interface to a CVS tree"
-HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
-SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8
-	>=dev-vcs/cvs-1.11
-	>=dev-vcs/rcs-5.7
-	>=dev-perl/URI-1.28
-	dev-perl/IPC-Run
-	dev-perl/MIME-Types
-	dev-perl/String-Ediff
-	>=dev-vcs/cvsgraph-1.4.0
-	>=app-text/enscript-1.6.3"
-
-src_install() {
-	webapp_src_preinst
-
-	cp cvsweb.conf "${D}"/${MY_HOSTROOTDIR}
-	cp css/cvsweb.css "${D}"/${MY_HTDOCSDIR}
-	exeinto ${MY_CGIBINDIR}
-	doexe cvsweb.cgi
-	chmod +x "${D}"/${MY_CGIBINDIR}/cvsweb.cgi
-
-	dodoc README TODO NEWS ChangeLog
-
-	webapp_hook_script "${FILESDIR}"/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index 84d7068a8177..e5e94aee0952 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 507 BLAKE2B 998b017b45e9588d8638cdcbb28e31603b77a2946df0c667fbdbe339d5a4ccb7a76a293f161fdb3850d0d0ef4914838f12291708f90c659b7db2f9224f5a9a32 SHA512 dc54de4de270eacd4ef765ad1537333229a6acbf6495f88f6c6a7f555fcf643177f03f690c426f08eea63a4988d113b39fb519162b26c6200b14ee387f1ebed0
 DIST phpBB-3.1.10.tar.bz2 2150999 BLAKE2B c0dce8b554f9bfd19f0e470fa0b96637f26969339f4ef6f87d04d5e492f0028d24e0adc76c8600b7a7d95c6531aa6971b646a02f22f731195c5a9491ea465bd0 SHA512 077a529075ea4e0691f9125be521b3fa8d4a078f9234b40bc5495faf00e1389808da40176ab8c8d9c66db259ebbf252d7292919d5c8e96e93c0bbda8d19695e2
-EBUILD phpBB-3.1.10-r1.ebuild 1197 BLAKE2B 2ff02139a8ce705ced72183964fd1a32ca10cecc65c46e9417a9d1be3e92ebc41475a4256cbb5ac73b3626348573278ac335db37313ef58dc9026a1852b7b22b SHA512 038a9b1cd4118b9b3892e8abaddeb157a801236e315a7ed971960d97f7e82c04bee1f4ac193d45354c4145eb3b2ace0e12b6649472e5924bc12499819a08907c
+EBUILD phpBB-3.1.10-r1.ebuild 1199 BLAKE2B 28bebab93f72387a354c58e1e38760e64b9829f39d9087bdbb411016a9b3bbc745aad6f14d9aacbba3ef1fe451a0e62b79faf5387deb9ef9cd14c24ce6744f21 SHA512 b53966dbb23b4bbcc16f379df5cc787b74d3043db1db23755829139e48d0cf028dac6d67e111cb3fde7391fec89a43e3c40e37562a2b53be49d03267f5f41c59
 MISC metadata.xml 358 BLAKE2B a5b1c946e0c10bbe23eddc905a4d6fdff1495c606e4d3aca1237fa3bde6bc741bafe7268c1f9bcda87ca08032ddccd967760e83c43c717146db36b963b5835d7 SHA512 3cd787058b5689c07b47499aed4f85871c6a97ef58b097da1bcc743cff4852de56d62e9758dc1707b8cdf147aaad1d0daf1858d8c44e61de1594eea954779760
diff --git a/www-apps/phpBB/phpBB-3.1.10-r1.ebuild b/www-apps/phpBB/phpBB-3.1.10-r1.ebuild
index f3dc1e75af3a..ebc5ae0c5507 100644
--- a/www-apps/phpBB/phpBB-3.1.10-r1.ebuild
+++ b/www-apps/phpBB/phpBB-3.1.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=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit webapp
 
 DESCRIPTION="An open-source bulletin board package"
-HOMEPAGE="http://www.phpbb.com/"
-SRC_URI="http://download.phpbb.com/pub/release/${PV:0:3}/${PV}/${P}.tar.bz2"
+HOMEPAGE="https://www.phpbb.com/"
+SRC_URI="https://download.phpbb.com/pub/release/${PV:0:3}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~sparc ~x86"
 IUSE="ftp gd imagemagick mssql mysqli postgres sqlite xml zlib"
diff --git a/www-apps/phpwebsite/Manifest b/www-apps/phpwebsite/Manifest
index 9721be0cca12..d5dbd6a25d11 100644
--- a/www-apps/phpwebsite/Manifest
+++ b/www-apps/phpwebsite/Manifest
@@ -1,7 +1,4 @@
 AUX postinstall-en.txt 4642 BLAKE2B d00a3c06c548ab1b424a988b064d23023ce10c5ba62058bfee5c5d81f4edcc5cf2871365672ea048c8f4a2d73cb0073867db8ed2274589bf233927caf6f8b5c6 SHA512 18698195eabc6f0b032c679f6f8bb4e6f5c09c1063155feb98ea366ac204e3577b7fbc5a0b49a1f6d5b00f0354c0e5b2bab52f99e4996f81e1511657e7529aa0
-DIST phpwebsite-0.10.2-full.tar.gz 3338377 BLAKE2B df6d2a87f9c6f77c664f1df5a542bd2f9da670367dfa4b281c3acd1a664c9550a03f12e752dbae7380bcd4d660b46ee5829849c91ea5a15e0ec7b08a924304c3 SHA512 b767ddf2f211c5bf9ccee22f88dae0a66a26a7a294d8eb95a94a9384d358f18ecf3ce888423c98a8a84091f7bad6399c370220ae31fbf5006f1416a44ec4d4c6
 DIST phpwebsite_1_7_2.tar.gz 14531036 BLAKE2B 4681cad72ebc9ae3e1838b0db15022a8681560dae27bd9cc4be9e1b4b1d479e218e43781e2c5024924c762cbc85eacfa31ab975ab81587e42356bbb0b7936c9f SHA512 cf3f503794bb12d24ea003b0caf3e98148be43e0acd38e4d15be559cdf643266270800450309337d6540eaa069022730cef64bf315bd0fb3853a344a63c78ae5
-DIST phpws_patch_20060419.2.tgz 1560 BLAKE2B cee7e4752d06394b1806d7baa8f25128ffeaab696a03b24c149358f4e7ad118875386ff022f67a50aeeb541fc00da1dc8c1dcbe66e7ca164d2c486fe451fa262 SHA512 12354f8012dbb5540f681b3df54108153745264f9703242edfb31122bfe5e59df86ad51fbb4faced52afad1f69eae137f0da428fac2f32af582e5e91800539c2
-EBUILD phpwebsite-0.10.2.ebuild 1340 BLAKE2B a9c7792e6aeefe53671b066109fa69b2b99a63b4d33ff0f2838ea9eec6d4ddb0ef77d1ebec0b394f76c1b641d39bbfeb6a18b491e64050d20a9b0b2419224cbc SHA512 a84f1124dcf2c96bda5e39f33c40d6294d53d668cca995f50afca3e118cffc53f8a0dd7fbc9a1188cedcd808cc65548efe36d53160388de11eb3c5534cd2172e
 EBUILD phpwebsite-1.7.2.ebuild 1076 BLAKE2B 6178ce16315beb0d3d8ed0346c90734c12f973e6b59b55b4a331857ada2484a5d84bb6d0d6291032a978c34f937a60a6010df8894fb37ac2610a0644ef09c209 SHA512 f71f17722a93f01f61db60b703ed382a433bfecfde4cc3e238b01b4859d68641559ee73b82c24ae6b888475f4db5f7e007149e367fd83ca6793ef4175580f213
 MISC metadata.xml 530 BLAKE2B 7da060cdaf07251ff2d82470470c761f08d2d9c4ce8bbc3be8bd12cf31431f7404ec0dee4860bc63ece36e10cb4025b7c18381d57035dc747efb7453d619422b SHA512 ae99108e95329aacd90e09478fa476ddde8c30de43db1c2f09b7083d034d0190114922ae70715414ad32456884b9be9e99fadc6ace9374336dc8eb35aa089c90
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild
deleted file mode 100644
index 9b2035df2cc8..000000000000
--- a/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit webapp
-
-DESCRIPTION="phpWebSite Content Management System"
-HOMEPAGE="http://phpwebsite.appstate.edu"
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz
-http://phpwebsite.appstate.edu/downloads/security/phpws_patch_20060419.2.tgz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="ppc x86"
-IUSE=""
-
-RDEPEND="virtual/httpd-php"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-	cp -f index.php ${P}-full
-}
-
-src_install() {
-	webapp_src_preinst
-
-	cd ${S}/${P}-full
-
-	local docs="docs/CHANGELOG.txt docs/CONVERSION.txt docs/CREDITS.txt docs/INSTALL.txt docs/KNOWNISSUES.txt docs/PEARERRORS.txt docs/README.txt docs/REQUIREMENTS.txt docs/THEMES.txt docs/UNINSTALL.txt docs/UPGRADE.txt docs/sample.config.php"
-	dodoc ${docs}
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-
-	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
-
-	# Files that need to be owned by webserver
-	webapp_serverowned ${MY_HTDOCSDIR}/conf
-	webapp_serverowned ${MY_HTDOCSDIR}/files
-	webapp_serverowned ${MY_HTDOCSDIR}/images
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
-	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
-	webapp_serverowned ${MY_HTDOCSDIR}/mod
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/sitebar/Manifest b/www-apps/sitebar/Manifest
index 06f63d08ac7e..8034aaa761f1 100644
--- a/www-apps/sitebar/Manifest
+++ b/www-apps/sitebar/Manifest
@@ -6,6 +6,5 @@ DIST SiteBarPluginLDAP_3.3.7_1.1.zip 10036 BLAKE2B d4c93d9070c642a3ef042f5c48538
 DIST SiteBarPluginMailGate_3.3.7_1.0.4.zip 15685 BLAKE2B b0b0ab6697382742435b0f9b613d2ed447dc3489ae466a7720ae264b74d5331f7d1810cdc7d466fa0b6ae517edb3bd832b416b62e585c4e9edbc5bf0d5adc264 SHA512 3e27d31c62bd7cadd734740247a8e94066d3787f7a19208f1630bc85720ddf9bcada5392aa654103c756780c92178d3df0d2ea0d3dd8ba63ccb77410a507e5c7
 DIST SiteBarPluginMessenger_3.3.7_1.2.zip 19406 BLAKE2B 465718b08d653d8a96d5564bfbfc8a44d1211eb7e5c75abbbe678a1e2e72e9334a1b5bfd29f1cec68bc82d367787fa77f2816ecc01474fa919f22cb872579d70 SHA512 eee9c2be52472972e454de49210f884a6436ccdaaf1ecedc59b25aa83a40ffa695ece645db65a5bcf246621de54d2f510a8e6a5e9f3b059ee0aa0c677a9b739c
 DIST SiteBarPluginXBELSync_3.3.7_1.1.zip 16487 BLAKE2B c818f6783573f2ead2715e3f7d0b8dca2abe2e88fde44710233bed70a79d2d55a301d4067ce05c9e6d74776da9192a546aa2e3d4aeae4c48b8a984b32e988c33 SHA512 9ad4924912befec47851aba3ad3f9c13ef94db6de09b56c6c75c10e76ac44e54b7d07303936aef70bd720a15e8a3569af49bec92aa68eedf05d49389c4c0cbf5
-EBUILD sitebar-3.3.9-r1.ebuild 771 BLAKE2B 4e1005fe1c305be8e88a3cc671d8bf1979fed85eabc8ea26bdd9a5271a3edcf7d2acf425bbd721c2368eb53f7418f430d27eb46a73a9c4492d8060f841b2a6a8 SHA512 746786e0e20d984aee7d3249d2c679ab01f22f11a5c3b05bacf921a44bd6e379f03947f53c915f76978fcaf9a29dec14db1c489a4173de3498d13f93fe6a591c
 EBUILD sitebar-3.3.9-r2.ebuild 1284 BLAKE2B 173b5552f6e1319e9d81b04707a2ddf88c81cb3700d16bff360e911dc0a9fe985de18795dc9c6f3d904a4b752d14b791c85b39d8dd1073333e19f304812425e7 SHA512 59e83208fb66244ae580934dde47a98e0821325b7b0ab547223dba019b1534720d74e6eb9481b1901f4cfe211fcfcc0d301b30e5a81e0f8928320a428fb690f5
 MISC metadata.xml 397 BLAKE2B 3d3c552dc80d9f027cd4a86270d164cd40512a1632d17b9b0b1deb0e862e06f117574a98ff111281ff8e05dd54c7bdc81314b17f7c6aa94feea16a7faab86f19 SHA512 e7eaac481d5b669270adda58bff95be6428c3b7eb6c8a2d6da48d60c1b2a59f0dda5ad51a82367c148b5cb8470ef4e4dae378826228d46dc365582e6d834f06f
diff --git a/www-apps/sitebar/sitebar-3.3.9-r1.ebuild b/www-apps/sitebar/sitebar-3.3.9-r1.ebuild
deleted file mode 100644
index 7c27ae26c110..000000000000
--- a/www-apps/sitebar/sitebar-3.3.9-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit webapp eutils
-
-MY_P=SiteBar-${PV}
-
-DESCRIPTION="The Bookmark Server for Personal and Team Use"
-HOMEPAGE="http://sitebar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/httpd-php"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	webapp_src_preinst
-	dodoc readme.txt doc/history.txt doc/install.txt doc/troubleshooting.txt
-	cp -R . "${D}/${MY_HTDOCSDIR}"
-	rm -rf "${D}/${MY_HTDOCSDIR}/doc" "${D}/${MY_HTDOCSDIR}/readme.txt"
-
-	webapp_serverowned "${MY_HTDOCSDIR}/inc"
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-
-	webapp_src_install
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 4e16494e64e9..d70dd61eec2b 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2884b3adbcd7..6049948a64f5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -27,7 +27,7 @@ DIST chromium-68.0.3438.3.tar.xz 624448788 BLAKE2B 25e8f6bfc9171f17a634caa8974a0
 EBUILD chromium-66.0.3359.170.ebuild 21079 BLAKE2B ad63d299090512b44fe6d1deccb754a9c3471abeb4cdb013c5e2b4743d500cfb3a3434ee842310c5b5e1a3145028b98a112ecbf0f31004cf1966aeb92a1a16a8 SHA512 17d7f7856cfbe4b9006e153d312b43c43ffccb9c1c5f2e9f4f920eefccc83000f29177028319597bae453148a6c8c255695694345b289ef5b6da2842abe4e4c6
 EBUILD chromium-66.0.3359.181.ebuild 21080 BLAKE2B 886abfd8535cf3069938bd5c7e048b0bf27b08c451e9225e514ba63b7d4181a7febbacdcaf8540f8db683aff6903027ca09644de1fba6a4ffc9e0dd70d27d998 SHA512 d054f5fc67cc2e538c7d9136e07214f203d76e88afe23b9defbe269cb17173f6eee5336f7552818221f4c57bf21545c359611156da07df4aa71307db41a4c025
 EBUILD chromium-67.0.3396.56.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd
-EBUILD chromium-67.0.3396.62.ebuild 20537 BLAKE2B 6809ea94380318ef07058c7d390f8962f8471e9cb98ad3d203fc2cd828bd0ce45abb7daab0a35318ee3436633c07c6a347050685eb5a85c186815d7a04c9d256 SHA512 e030897bc36c313c6c999d67e1a9958e5223b04399fcfa1762d1253d710c613fe2bd4223a67c3ab8848b26748dd187718c304cf1299d9af43c134e142bbc0d4b
+EBUILD chromium-67.0.3396.62.ebuild 20536 BLAKE2B 1f9dfece27663b1f77d043ddd9d73888b367715a6b003930af7556b12634966a0ebf22605576c9449a3f35e676917f69d96dc7b6702ffd593df8cb7ee24c2ca7 SHA512 6d625016a4130502a985659d22577bb3a9411ec8961a5c04b28fc63a77443287fd9af452b802d25653170f43f30246634ad2680d46dae60e07e0b5b79ab61eba
 EBUILD chromium-68.0.3409.2.ebuild 21128 BLAKE2B c0b3f816629ad411e9a1173d8613b56b265ac2d64c314d0ffcc146e6692ab3a997cc4390658ed8f8926bad36be480a907ad7c0f455d90be445277c56a28622bf SHA512 619db1868802d4857193c91531539084a40177dabc3b622bdedf35f1b3e5a48c751c8a106d19035dc3d6da86e003a2d9a74d936c30cb5c3225b827c39784018a
 EBUILD chromium-68.0.3438.3.ebuild 20521 BLAKE2B 394bd409a05510ab68f7d6fd959d873c9b5c0270f7fa1cd60a5cef4486d5609a5a44eb787806dbefd150d78c358d51c72025d2703094bb84ef7673ab0e9443fe SHA512 d63e83a360ed95917f0f6f5c4c39c25698eaea5c9d832b0bb187e6aaacc5cdd492ad0bc990a29f846f21f3eb93b414417e680ff4e3822bf563249a3e6053da93
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-67.0.3396.62.ebuild b/www-client/chromium/chromium-67.0.3396.62.ebuild
index 537d5b482647..edd4f56ad44a 100644
--- a/www-client/chromium/chromium-67.0.3396.62.ebuild
+++ b/www-client/chromium/chromium-67.0.3396.62.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 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 ) )"
 
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index d63f6e0e9b9f..7d89e5e3b6f0 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,5 +1,3 @@
-DIST falkon-3.0.0.tar.xz 1985800 BLAKE2B 8505e2c91600d265c28f70c37bf9e8f669ecd907dd9263371a4a4c10b854d32415ec1a3fd6ac163b297d0a9f42c542d4691a6cd417ed81864585f0c66b769e34 SHA512 1d99ecd47022986570dd6bb9b57484abe30838bf52daf669c977e1d2a9381efdd60912fd72b97e0b43b6102159f4343c4d1589d4f6442d0ed62c24f1482a8d97
 DIST falkon-3.0.1.tar.xz 2219444 BLAKE2B 013d29925f9a1c7e77d5f194eb4a1371dadda05de01a0c103902acfbb16941c6fa9c7256a98ef1965c622222ccfcee8b44c48076cb00bd892378157502f73916 SHA512 e2384cb49d4e1ec52ff7804cf798688be2d80fa5957c72accb09376aa0c41ee491c45234fd53c79871bc474a8d0677e40ddb48241a70d77102c67406b0719191
-EBUILD falkon-3.0.0.ebuild 1605 BLAKE2B 5af00f3e964cc1d7703ed335ad2502c2d9dc4556e242cd98a8721f1dfbd43b485e011cd8a9baafb180d39fbcf09ece10cbc69a1fb90c11eb8fecb797b37cec3f SHA512 9e95e10ef76a536e966736f0b57f3770d3f58a4170d6fa9a4f4bf68aa94cbcd93cba94013b7b80c80725d39a6e7cba301a9ecadd00cace3df82dbdbf9a35bd01
-EBUILD falkon-3.0.1.ebuild 1703 BLAKE2B f90856c653da3d9cdf812cfb6a347da6bbfc5b6675b1cb539e068cd3e1fdb44f69f1724aea14dd1d14a341792c9bdd39c4078010dc74f24d0e01fcb764da1930 SHA512 c7a7b56a79d1fd8a60642501ba3ef6eb2a504fa7b229debd8de32c52d3a17ecdbd36b421c1314888d16c5611e538272902f33e2e716b6e06dc251688cc7d2255
+EBUILD falkon-3.0.1.ebuild 1702 BLAKE2B 073a5b29b63bcfc04b00a26328f14f9d634af8fc6987dcbf154fdd408ef580b1cb6e561ef1272071263420fe623281f45b5046ab3e72a7085c9b130f1398449f SHA512 e417cc0d67821e64d0e160ca10cf041cb34027d21c550738882a361500b275b6db17a0f116f04fdebe154dffb1b72e78109d72cd2a8af0ec5c166e2cf3db6a5e
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/www-client/falkon/falkon-3.0.0.ebuild b/www-client/falkon/falkon-3.0.0.ebuild
deleted file mode 100644
index efdb7d0926ec..000000000000
--- a/www-client/falkon/falkon-3.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-QT_MINIMAL="5.9.2"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="dbus gnome-keyring kwallet libressl +X"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwebchannel)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dbus? ( $(add_qt_dep qtdbus) )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kwallet? ( $(add_frameworks_dep kwallet) )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-	$(add_qt_dep qtconcurrent)
-	gnome-keyring? ( virtual/pkgconfig )
-"
-RDEPEND="${COMMON_DEPEND}
-	!www-client/qupzilla
-	$(add_qt_dep qtsvg)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_DBUS=$(usex !dbus)
-		-DBUILD_KEYRING=$(usex gnome-keyring)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		-DNO_X11=$(usex !X)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "If you were previously using QupZilla, you can manually migrate your profiles"
-	elog "by moving the config directory from ~/.config/qupzilla to ~/.config/falkon"
-}
diff --git a/www-client/falkon/falkon-3.0.1.ebuild b/www-client/falkon/falkon-3.0.1.ebuild
index 8db691656aae..89bfcfe00996 100644
--- a/www-client/falkon/falkon-3.0.1.ebuild
+++ b/www-client/falkon/falkon-3.0.1.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="dbus gnome-keyring kwallet libressl +X"
 
 COMMON_DEPEND="
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 34a9ada15bf8..e21598e2ce58 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_67.0.3396.62-1_amd64.deb 53717682 BLAKE2B 4b9e81029a1941625e4b8d1201d4fdc01c73c2b5cffb9c78faba8a0d3e70985a1c4571153ee291dc8c9f3743d78fa0f12d8342482cca6440712dfa72bf4b7619 SHA512 040694582940e776f74fc8644eeb04f3cb3016be246b385c20870f10dc6bef2278469f135eb83f9329a9a14fbdcba8ef99430c98b83e6af9326fed397f30a519
-EBUILD google-chrome-beta-67.0.3396.62.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
+DIST google-chrome-beta_68.0.3440.17-1_amd64.deb 55432196 BLAKE2B 436c6ac74d48463353f9a7822fd33363326945c0bc7d6dbcf7b87d44563ced7ebc68c5d523f51fac3d2f9c77c3b2692b74516bd8884ac1260a2abb93a614210f SHA512 c51f0e774039c6e6a9b853195749807534ad8d602fa1537fcf8b4e7dafe21cb6cac668f697fb7aece6a7a02929c453e03e60b628139129a276a93ab655f3fe49
+EBUILD google-chrome-beta-68.0.3440.17.ebuild 3618 BLAKE2B 388e439777d19e67a1c45c7cfc3a6b0c10d61a88619dd857aeccea6bff32a6702bbc760dc45568c60a7584c80097a63325a6a811cc329290a70a69520402cb9c SHA512 4316b0e80e4ecd731fed2936379333996a3fe752f129e916fae03634567ef3897061d691ce83334067b4f60457c4c10bd10523a9de3aa31561d25792c450e668
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.62.ebuild b/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.62.ebuild
deleted file mode 100644
index 500479b752d3..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.62.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/adwaita-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_beta.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.17.ebuild b/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.17.ebuild
new file mode 100644
index 000000000000..338f440cd709
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.17.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/adwaita-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_beta.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 4bfbb22db2f7..cf1b56fa9d20 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_68.0.3440.7-1_amd64.deb 55550866 BLAKE2B 27bac60cb261aaadca187e35857f39be13a89dfaab5889a4af8c63139e02c6740c5c36621fc68ffd60de69e5e7db18ff8fdbef5aac62b911b6cc5c1d383b9feb SHA512 31ac59aa77546cc80e49f0f18a8e37ad43316b2192df1225459ebef855c27755c4323656911909b153e71538754967ea0437c1d580957788a483c82db2d2c52a
-EBUILD google-chrome-unstable-68.0.3440.7.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
+DIST google-chrome-unstable_68.0.3440.15-1_amd64.deb 55268120 BLAKE2B be6fd557cd764693ce1259280bb207a0d6290c809c47ad4f57b0f8af2c2f08164e0ee60169de8a09d2694362207e9bd2494e8ec618d48f247ee1b7bb25c6809e SHA512 6cb5b349ace24a59ded0d1b7af97b921191e8a6b070447b49345d819e1990868a201fddc778a30c3f93ec80a158075eb84efe9e244131d43103bbbf26eec60c6
+EBUILD google-chrome-unstable-68.0.3440.15.ebuild 3597 BLAKE2B 59aaf7430ea9e46fc3dfaa087bf33b5600e7648caf7aeb679a68a204c4f5bb90b5144f2cd5757674c1695f6dcbb3736b8715bfe4a08d26fef026cf93fac618ba SHA512 46c696d5b1d1fcc0c9ee6431b77911960d8a8143140949d08d4209e93652f68433783aa926a648a9abd28dbaa2e1ea983f09d8fba3c885d54bf841f7c1b0a231
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3440.15.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3440.15.ebuild
new file mode 100644
index 000000000000..4a04a9ba7e78
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3440.15.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/adwaita-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3440.7.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3440.7.ebuild
deleted file mode 100644
index 43d5352b4dd5..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-68.0.3440.7.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/adwaita-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 2b1bb4af6d8c..9eec9caf4202 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_67.0.3396.62-1_amd64.deb 52532020 BLAKE2B 6b0a9aae756dbc7dafcd1e1479a0ac9f630c7c888549c54bef6f295d9649812bab4471e4c3e4716aec729d2d83d75e501f01b2ca7fb63399f7c113af761ac1f2 SHA512 78e27742d9f9568b3c3aae2e46052466a2386b772fb04f8a55bb38cf030cc8c24561b5c3d7670d8bbdc56d7f9e43986122dc4035a0607836ebfcdcd454597c86
-EBUILD google-chrome-67.0.3396.62.ebuild 3609 BLAKE2B af5bc703e53acabf3360003c1b4e71e1e3f5e1d5fe57d9c63ea3a2ab7e87344e0146b369666c678c5bc6011dd407d14175757e84540bb608b0046fe89801a1b3 SHA512 d484e3674f6f72fe23a20b4e4734cfcdfb3a8630616e412cc299575df2e9ccb9397c3e0a919ccd5ae3290c3d460ae65047bd013847d436f2521f0a2630965b74
+DIST google-chrome-stable_67.0.3396.79-1_amd64.deb 52529522 BLAKE2B 2d8b7e5613b6130571e7f2fd6f54d20645553e448b7ba37efc9758da1ba93c6eba23d805a922ac283c1da5dc1b97f4f525bd85197668a0d90c69365b1a5a5eae SHA512 692f16d7b5a6d9a1f6e84dc21059d1b30a69be48cc3c057345ad9d475c3563a91fc19339c3cf93731ed4991eb78c0d9462ec94835ecac6a22a9cac51b7a95a12
+EBUILD google-chrome-67.0.3396.79.ebuild 3612 BLAKE2B 2750c1acb658f0ffa641fd30ace02c127bba5d5e7ccd67eb8b14b64b04e05199c675423ef345aab91e68d58f1969d62f157d8dbd797337d902f263866e6e8871 SHA512 ece3f6b49ed18368f183dae48be54a773724199f4751879abec20ffa6e9f386e3d8d834794a156f27b7b65617308628dc7bda59f487aef17355dd468eeef020a
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-67.0.3396.62.ebuild b/www-client/google-chrome/google-chrome-67.0.3396.62.ebuild
deleted file mode 100644
index 38dbe68c340a..000000000000
--- a/www-client/google-chrome/google-chrome-67.0.3396.62.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/adwaita-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome/google-chrome-67.0.3396.79.ebuild b/www-client/google-chrome/google-chrome-67.0.3396.79.ebuild
new file mode 100644
index 000000000000..a9c0a7367a18
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-67.0.3396.79.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/adwaita-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 923c89d6021d..844b9a7b0cbb 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -2,6 +2,6 @@ DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac2
 DIST links-2.16.tar.bz2 6697222 BLAKE2B dba0f00acf14e7994d3eeea7f77df897941690d959c2aa90924bb1256f310a6ddc969e2dc7ca8ca775f2ec06acebbabb30b35088a9cc6100b01f7fa6dfaeaaa8 SHA512 3ce169e214eae0f997c1f8647d354dc0803c9118a97dcd2594d62af23336890272f4b027d3ab0a0e151672d1506e50da0f0e561999c5841f0f183f32a279b14a
 DIST links2_2.10-2.debian.tar.xz 13964 BLAKE2B 2de4e49281a53d37d3d9bc53b5e49c3bac534f3ba5d7a57748f3ef998e6ff7f5309b5d6c7a00f72d623525fc1413fc15d1585ffa84c186d684467539cb807cef SHA512 01101edef00ede0b95857ea28d305e98198306c428b79bb9c05da16285d8b4052b7f800f7def67a945d498db440745d81b7e3b6a03c9b077d5bcf5da1cb2691e
 DIST links2_2.14-5.debian.tar.xz 15332 BLAKE2B 20c1d0f5a9eeac2f56bfc8d2e00f343ada5ac28e741fdb9635810f7e39563f0f052f7be0492923c3caf6f000246639bf3ae19ebd5dfb3d8fdfe4e4655dd0bac8 SHA512 d8038515c29998be9510723cdaa2b961d65141fd0b0f863e2fac80f41009a100f0bd824acd97735d089c932c1b5a979f0ed523d773721485b4418ec44df38872
-EBUILD links-2.14-r1.ebuild 3263 BLAKE2B 56181a50978854ccc5971cea6d5bf14679190670b9dd38b5ebfc3740bdc7255fd356c7cc39206156e6aa6a547815da2de8cc6bc75aff4971f3291707bd71c396 SHA512 d8275e5f3acd8020dc8c633dc0821b76c4ca5323f64c12c905ed690de7683d1e1f9b8457290776922baca3a7f6f0ba033204ad54d1189d4756592122e56864d0
+EBUILD links-2.14-r1.ebuild 3262 BLAKE2B b36cb0efef6a64cbdda852843f94b1c628e5fbf834682f827703c78428350a2b2e43797d62a2e266cda5995a333951ba1324e206a4e7f8459bbc2791b595d3fb SHA512 fdedb189b11a0583e9f3fb492764b34397677b826da1963c39ff714449e53bc2741f9d942534089af0e52de5c8214833506f9693c754854b325970e491574f15
 EBUILD links-2.16.ebuild 3274 BLAKE2B 9f581eb2186c4ed5a0807b7620af67cde5362548cd2c887abd3d99fbf77a932a36fe3a48844185943f807d5892ce70237e3e8751ef4dadaa89c31fb5ac1c8772 SHA512 4aee5abcd8d78fecdbe64842d9010858640c2feefe644d7eeb7a9037aedb6f92dca6066d2606b0c140f505d2343971758f70d4052d27dc350010dd80d8aaa1b4
 MISC metadata.xml 345 BLAKE2B 5d91a968b8b9185cc9c61d02a1980369e5cf8c87bef6a5de4e05d3b375473548d3cbec311920d52cd7aad4517fbc2ddb2d900d520e5b1d2b3445e1424ac16662 SHA512 40528fd846439acf44ddf1e49a65d7195aecb6d78e9d20d3d734fbb48b4cef842975cbe8383a8feba6e6894ebe0fa6b7cbc27c1ac663cc563aa1e8884e09c7d9
diff --git a/www-client/links/links-2.14-r1.ebuild b/www-client/links/links-2.14-r1.ebuild
index 3dc37e4b23c4..c7f507092747 100644
--- a/www-client/links/links-2.14-r1.ebuild
+++ b/www-client/links/links-2.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-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 ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index f954d3df86c6..816a603a8f82 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
 DIST opera-beta_54.0.2952.12_amd64.deb 55783182 BLAKE2B c40b16092e998be48a40989f25235d297439ae9feada62ff7881c90b2081c6d8486ff852cccd73c758ff890abe3e501840d7da0ecee9adba0a55731e5edc4230 SHA512 2425ee4e860d3fd2461d2c4115c69f1345d0fc655f51cd59e81250d648a81d2f18f81683960249d9170a58eb24fa125d7165d89dcd5bd91c64314d69db074f3f
-DIST opera-beta_54.0.2952.8_amd64.deb 55215750 BLAKE2B 395ac802d228dcdc3b0b66681bb58e474a91625d9ce9e0c3b0f46b39981093cce3af4f67ec306fd8eb125b71b5861aadc6a364e6b4fb96a0eeb75886e75610ce SHA512 f795902c1606281b2ed8a00bb21515b79a388896d6c1b949e99f2f17eaea926d19aa8b7ce0328ce859293100e81ee0b0377635eca672f51309ef10e400142349
+DIST opera-beta_54.0.2952.17_amd64.deb 55356188 BLAKE2B f55cec90b0e8267819b94c4bc283042491f26f70040c485592187d7c57d8c935f0827928e28e1773273a9c26ea2772a2b15c88e735b0347150f9fbb8f692de5b SHA512 b02ae74d45ca71fa2f2bb92f342a6cb10f4be7b3786529aa132d1e24f174e9b6c01c60ffe94182ecb65c0c6d7fb6ed6e76b05dfb0707b3887578558847c332b6
 EBUILD opera-beta-54.0.2952.12.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
-EBUILD opera-beta-54.0.2952.8.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+EBUILD opera-beta-54.0.2952.17.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-54.0.2952.8.ebuild b/www-client/opera-beta/opera-beta-54.0.2952.17.ebuild
index 308b38bc8be3..308b38bc8be3 100644
--- a/www-client/opera-beta/opera-beta-54.0.2952.8.ebuild
+++ b/www-client/opera-beta/opera-beta-54.0.2952.17.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 961868dc7640..6d6a8f63349d 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_55.0.2955.0_amd64.deb 55216094 BLAKE2B 0682d750e6425f963364078d0f3198927d336b0b0089456755729a8edd88380feb9c2ae6319e49ae47c4b57d8128d7dd0a6ce4c24e39e550bec3ef3905322f72 SHA512 b410ae6f578e38e90785790b37f364dbe8843a4d40b700696195c87fe7e8098afc44a10aed362f8f2981b455107ec415b08d377a3e3f12f33fce46be8a547ee1
 DIST opera-developer_55.0.2962.0_amd64.deb 55673058 BLAKE2B 724b7e70578a02cc52279c284a4cce940e642d2ec4ea91e8ea211eebfe82c78df9b459f62cbea166ed3fa4e3ab501dbee3abc27b1757ac100edf5056bf1e5280 SHA512 e1dfe39e692db1a40e4007298ed78359fd1079a0034b7eb58e7a71a1f4b2512bd69994e1ad3c95ee2232db835b54bdbbd23c9047ea4210ed226ade6dbb3ccbee
-EBUILD opera-developer-55.0.2955.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_55.0.2976.0_amd64.deb 55946188 BLAKE2B 3846703fbc74a91fe59996f3274cd6456f820e2d9b159832013385b16508d6a34039c72d43557aadbb8e239a2366cebf84de909e217cc02fc50fd87e7d348804 SHA512 6ea835e99fa6afb6e134c5606aa1abd3cfd1d83ef770d8a64549e44d58038f06019e368b4255ab8d5c374d6c05487fd4452b3cdfc4130bdd55d127297871ba98
 EBUILD opera-developer-55.0.2962.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-55.0.2976.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-55.0.2955.0.ebuild b/www-client/opera-developer/opera-developer-55.0.2976.0.ebuild
index 12a41bce61c8..12a41bce61c8 100644
--- a/www-client/opera-developer/opera-developer-55.0.2955.0.ebuild
+++ b/www-client/opera-developer/opera-developer-55.0.2976.0.ebuild
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 95f0eda3a21c..06cb0272e6fc 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index ba27bb1bedbb..32a76c669692 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -4,7 +4,5 @@ AUX htdig-3.2.0_beta6-gcc6.patch 3673 BLAKE2B 819647e4b323f795645e7375b301559ac7
 AUX htdig-3.2.0_beta6-musl.patch 1188 BLAKE2B f481706f23d60ff5c72086c4ff9539a280f1b0cde19e834edacfbc2bec080819ecb4d087147b182aaa60cbafa639de9194ce35473f5b4ccc33516f51346894f7 SHA512 2c766f4d49e941de8c56b3858ed32d9e90efff9f43ec699cd30c0a87c19bab786e113412087a5bec698de26b4454f5df4306a95f9e16c6cd829f5ef8572ea0a3
 AUX htdig-3.2.0_beta6-quoting.patch 1130 BLAKE2B 0257d3f79e544c13f4d17caa71bf4265aa7668c91e15f5c38b502fbc50415feb6a378430af6a147f6a2e3f087ad79fc2ab426b97b6191166a1c930e7a416e2e6 SHA512 7edadb8cecb378eac8352e43ce12d5fa6af711f847f1e1ca0a49303daedffb1cef9795b74eb8cd64120e981c57c947f082f60d857985ee5ac0d54537fd6b4181
 DIST htdig-3.2.0b6.tar.gz 3104936 BLAKE2B aa70026ce6fb10910c42b4091900980c78f81fc9d07b1dec4071811aee21c6d6a67a7fbb2ca59b785c457b13b508773f8ca8f96042f23def82b071fc40b00870 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064
-EBUILD htdig-3.2.0_beta6-r3.ebuild 1788 BLAKE2B 63ec1684dd3debd62411cd2301a246de02d53fc0a15b39a16c849a13a60ee8acf58290be2690928d755ff547a3d8927919601e8aa58cbcc950ea05c12f05b5cb SHA512 1f2926dd50e2a39805bf3403937b1a39f289afd7a7c023b0dabf3aa20e49085c2bce70894219a95a5fef30ab31d0f557e8c7bc8a9d77826f8e8622be8428873d
-EBUILD htdig-3.2.0_beta6-r4.ebuild 1796 BLAKE2B abe4df41e6cbbdaf41901934e00b3693d74ef5cbfbae91caa82249ce90eb88a1f577c5eee2bbdf2b0224b2532960ab691e1fe9b20ebd5505e816ed4c4f337ae3 SHA512 ebe4ec3a20208249e1cd45952a30617f8af49b1bc575f492962d55b2e97864dcdc519363f0e225beb21c208c0c498cca4642ff25b1f32d887519b787c3e7e256
 EBUILD htdig-3.2.0_beta6-r5.ebuild 1652 BLAKE2B 37ddab0812951c781f85f0b62d95f327f2bfbad2abeae9b1fbdf7d748a71d8f2033e7900f9e6250a72a362777ce5b76aff7c6bb5b44e15667927814f0ac8960f SHA512 286a5059de57d7ba2e1d5774f871eddf701486073e31cc39943b489de24c135bf8d461fd57099caaa80180c7561c9f9d5f8203ede801327eba6a0a7958505273
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
deleted file mode 100644
index 554832d3049d..000000000000
--- a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-MY_PV=${PV/_beta/b}
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DESCRIPTION="HTTP/HTML indexing and searching system"
-HOMEPAGE="http://www.htdig.org"
-SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
-
-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"
-IUSE="ssl"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	app-arch/unzip
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-quoting.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die
-	eautoreconf
-}
-
-src_compile() {
-	use prefix || EPREFIX=
-
-	econf \
-		--with-config-dir="${EPREFIX}"/etc/${PN} \
-		--with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--with-database-dir="${EPREFIX}"/var/lib/${PN}/db \
-		--with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \
-		--with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
-		--with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
-		$(use_with ssl)
-
-#		--with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	use prefix || ED="${D}"
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ChangeLog README
-	dohtml -r htdoc
-
-	sed -i "s:${D}::g" \
-		"${ED}"/etc/${PN}/${PN}.conf \
-		"${ED}"/usr/bin/rundig \
-		|| die "sed failed (removing \${D} from installed files)"
-
-	# symlink htsearch so it can be easily found. see bug #62087
-	dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch
-}
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r4.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r4.ebuild
deleted file mode 100644
index 3a45503a87a8..000000000000
--- a/www-misc/htdig/htdig-3.2.0_beta6-r4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools
-
-MY_PV=${PV/_beta/b}
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DESCRIPTION="HTTP/HTML indexing and searching system"
-HOMEPAGE="http://www.htdig.org"
-SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
-
-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"
-IUSE="libressl ssl"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	app-arch/unzip
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-quoting.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-config-dir="${EPREFIX}"/etc/${PN} \
-		--with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--with-database-dir="${EPREFIX}"/var/lib/${PN}/db \
-		--with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \
-		--with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
-		--with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
-		$(use_with ssl)
-
-#		--with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ChangeLog README
-	dohtml -r htdoc
-
-	sed -i "s:${D}::g" \
-		"${ED}"/etc/${PN}/${PN}.conf \
-		"${ED}"/usr/bin/rundig \
-		|| die "sed failed (removing \${D} from installed files)"
-
-	# symlink htsearch so it can be easily found. see bug #62087
-	dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch
-}
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 24a6ab5602d5..9e8d06a3c278 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,7 @@
-DIST urlwatch-2.11.tar.gz 36092 BLAKE2B fc8b99d9edb9dc7f860b66e1bb72ccae9cf6aeb27ea2401009b26dca26c3c1fbcd8fedc5ae66ebeb8fcf50cd317c4ea3c1de6e667af158578d8bb2bb9373a021 SHA512 fc7a9cce7de946ddce6a83cdab7f785399806704ab440d29436d8ceff14cb4dab6e85a0284eaba1b71e5d27a88f5434d4d8d447a6d0de7bfd025d090c6f12cec
+DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
 DIST urlwatch-2.5.tar.gz 25322 BLAKE2B 637fa254fe565d9a3909fc80879a7b40a72a92e01cdca3a2e95f905c768238e4a2ef7559e32ae4295357d3391109f08149e721564e4c14b6c8be281a416cc45a SHA512 993d2596288d014a3b84ae22c29ce89282c4320dd95b339c9892db07997059fc80a96198cb89ba04d935f68d2d051da96dc981f8e8b3657492443b060d2126a1
 DIST urlwatch-2.6.tar.gz 30412 BLAKE2B 3d9495a418f8180a788db27bec13f9c20d92476851404d0f78dc6fec664a90c4bf9749cbe26323741a31175abf5b6ca01c066da8a8db6e63da73b46bb524e293 SHA512 52d71984972c6888ade01fcc635d33a60c024424b82ac9319554f548438f8a4e2f32a8b7d3047ed86654c8ef67e3b6eac99728f9409b60cdffe7e842fd8fe16c
-EBUILD urlwatch-2.11.ebuild 1425 BLAKE2B f40c2f3cd5796b59b0ce3c2b91a3f0d53557400087a6561ff72754cbd6bcaf0075c89499e977637f5ee30164ab0c6f4e31350766d2c6243e55b789148229baba SHA512 431ef36ab1b48f164c5e63393d4d72d36dc6fc519b2c6e29c1c60a197b7066ed4a051cbf13fd69f424290b58ea293f02d0a51d216037b7a15ee766ada149361a
+EBUILD urlwatch-2.13.ebuild 1458 BLAKE2B b9c5403048f8cb150b49cd88494179819cdc34abe2175eb551a0208f9355dd49670fb182015dc2280f1cea8ae4fc3181149c65d2453671e44156442858515a31 SHA512 7e109c4fcec4bb3c2de046329c0968d36b1eed80c3838be533eb9a36583a4c0168472e06a7f9abe3d2fcfd9c135ba04c8e4bb62083318c9b8df009a460921a68
 EBUILD urlwatch-2.5.ebuild 963 BLAKE2B 6e774d31e763b0d12e8d2c3024892a95e7d1fd5bd22878751ba2f54c774dae9bfb5d12cb6d90ec14c015ba095676b3abb36e4155f2ddce2a651d6f9a1be97559 SHA512 95f43f1ab3f8cac44c123af9281bb81b2af0f249aa51168903a2460d468b7003b06a9f9944bca416998d4bc4db00b18c25325707e1ec8924769c33cc6785d23a
 EBUILD urlwatch-2.6.ebuild 1184 BLAKE2B f92a6c0a5ed70b2e4d931c72854588843be12db4607cb435b6c13968f9151e5867a80685526fc79bfc8613b497611cb631f794aa90768d155c047ce8d4e34247 SHA512 ec414c8118640182470b86594d7e459bc4fbb339ac9b30b05d53df6e4da923a7f955e71c374e8bc76b1317ae74bd2b7782d01121ecfbd894a979e4049c4d73df
 MISC metadata.xml 434 BLAKE2B b2c560e4555c172065797654d97842cd2caf1b0f5943c6f29d478f1a972c36594c2fa516558417957c816308c99123e41e1aa640db983dc409c99c9c3873c1b3 SHA512 e9364ac1375b0f6a86f2be3cc1bb5ace69397ec1e1fe4d737db572d56cea20d6df1abdeeea12d9c8dc2b532cbc14736d51ec35686b370098cc9ea8677506667f
diff --git a/www-misc/urlwatch/urlwatch-2.11.ebuild b/www-misc/urlwatch/urlwatch-2.11.ebuild
deleted file mode 100644
index 88437f6feb0e..000000000000
--- a/www-misc/urlwatch/urlwatch-2.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://thp.io/2008/urlwatch/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/minidb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests test || die "tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version dev-python/chump; then
-			elog "Install 'dev-python/chump' to enable Pushover" \
-				"notifications support"
-		fi
-		if ! has_version dev-python/pushbullet-py; then
-			elog "Install 'dev-python/pushbullet-py' to enable" \
-				"Pushbullet notifications support"
-		fi
-		elog "HTML parsing can be improved by installing one of the following packages"
-		elog "and changing the html2text subfilter parameter:"
-		elog "dev-python/beautifulsoup:4"
-		elog "app-text/html2text"
-		elog "dev-python/html2text"
-		elog "www-client/lynx"
-	fi
-}
diff --git a/www-misc/urlwatch/urlwatch-2.13.ebuild b/www-misc/urlwatch/urlwatch-2.13.ebuild
new file mode 100644
index 000000000000..3b6ef8f5e92e
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.13.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="https://thp.io/2008/urlwatch/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/minidb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+python_test() {
+	nosetests test || die "tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version dev-python/chump; then
+			elog "Install 'dev-python/chump' to enable Pushover" \
+				"notifications support"
+		fi
+		if ! has_version dev-python/pushbullet-py; then
+			elog "Install 'dev-python/pushbullet-py' to enable" \
+				"Pushbullet notifications support"
+		fi
+		elog "HTML parsing can be improved by installing one of the following packages"
+		elog "and changing the html2text subfilter parameter:"
+		elog "dev-python/beautifulsoup:4"
+		elog "app-text/html2text"
+		elog "dev-python/html2text"
+		elog "www-client/lynx"
+	fi
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 45b4e2fd97b1..44995d72c2cb 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 02012ac4c45e..2dffe57c5d24 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_67.0.3396.62-1_amd64.deb 53717682 BLAKE2B 4b9e81029a1941625e4b8d1201d4fdc01c73c2b5cffb9c78faba8a0d3e70985a1c4571153ee291dc8c9f3743d78fa0f12d8342482cca6440712dfa72bf4b7619 SHA512 040694582940e776f74fc8644eeb04f3cb3016be246b385c20870f10dc6bef2278469f135eb83f9329a9a14fbdcba8ef99430c98b83e6af9326fed397f30a519
-DIST google-chrome-stable_67.0.3396.62-1_amd64.deb 52532020 BLAKE2B 6b0a9aae756dbc7dafcd1e1479a0ac9f630c7c888549c54bef6f295d9649812bab4471e4c3e4716aec729d2d83d75e501f01b2ca7fb63399f7c113af761ac1f2 SHA512 78e27742d9f9568b3c3aae2e46052466a2386b772fb04f8a55bb38cf030cc8c24561b5c3d7670d8bbdc56d7f9e43986122dc4035a0607836ebfcdcd454597c86
-DIST google-chrome-unstable_68.0.3440.7-1_amd64.deb 55550866 BLAKE2B 27bac60cb261aaadca187e35857f39be13a89dfaab5889a4af8c63139e02c6740c5c36621fc68ffd60de69e5e7db18ff8fdbef5aac62b911b6cc5c1d383b9feb SHA512 31ac59aa77546cc80e49f0f18a8e37ad43316b2192df1225459ebef855c27755c4323656911909b153e71538754967ea0437c1d580957788a483c82db2d2c52a
-EBUILD chrome-binary-plugins-67.0.3396.62.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
-EBUILD chrome-binary-plugins-67.0.3396.62_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
-EBUILD chrome-binary-plugins-68.0.3440.7_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+DIST google-chrome-beta_68.0.3440.17-1_amd64.deb 55432196 BLAKE2B 436c6ac74d48463353f9a7822fd33363326945c0bc7d6dbcf7b87d44563ced7ebc68c5d523f51fac3d2f9c77c3b2692b74516bd8884ac1260a2abb93a614210f SHA512 c51f0e774039c6e6a9b853195749807534ad8d602fa1537fcf8b4e7dafe21cb6cac668f697fb7aece6a7a02929c453e03e60b628139129a276a93ab655f3fe49
+DIST google-chrome-stable_67.0.3396.79-1_amd64.deb 52529522 BLAKE2B 2d8b7e5613b6130571e7f2fd6f54d20645553e448b7ba37efc9758da1ba93c6eba23d805a922ac283c1da5dc1b97f4f525bd85197668a0d90c69365b1a5a5eae SHA512 692f16d7b5a6d9a1f6e84dc21059d1b30a69be48cc3c057345ad9d475c3563a91fc19339c3cf93731ed4991eb78c0d9462ec94835ecac6a22a9cac51b7a95a12
+DIST google-chrome-unstable_68.0.3440.15-1_amd64.deb 55268120 BLAKE2B be6fd557cd764693ce1259280bb207a0d6290c809c47ad4f57b0f8af2c2f08164e0ee60169de8a09d2694362207e9bd2494e8ec618d48f247ee1b7bb25c6809e SHA512 6cb5b349ace24a59ded0d1b7af97b921191e8a6b070447b49345d819e1990868a201fddc778a30c3f93ec80a158075eb84efe9e244131d43103bbbf26eec60c6
+EBUILD chrome-binary-plugins-67.0.3396.79.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
+EBUILD chrome-binary-plugins-68.0.3440.15_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-68.0.3440.17_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.62.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.79.ebuild
index 8dcc557fdf85..8dcc557fdf85 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.62.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.79.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.62_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.15_alpha.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.62_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.15_alpha.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.7_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.17_beta.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.7_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.17_beta.ebuild
diff --git a/www-plugins/passff-host/Manifest b/www-plugins/passff-host/Manifest
new file mode 100644
index 000000000000..d708e992b72c
--- /dev/null
+++ b/www-plugins/passff-host/Manifest
@@ -0,0 +1,4 @@
+DIST passff-host-1.0.1.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
+DIST passff-host-1.0.1.py 3432 BLAKE2B f45054bf9323608b515de559c36ad28705fb9c75de00824b0ed8e05d21545b861ba61194cf25a4db84b55d64f7d08abec27d56bb8d098961e94fbbcb9d7f3707 SHA512 168b4d3cdc9f463a7969adc851c878b5b7ddad7d05415770273510c99d8fa7c80015611df1554f24c8b8cd0f256d3a8f687a325e34105e029487eb4fc5ea7290
+EBUILD passff-host-1.0.1.ebuild 1488 BLAKE2B ba55903bbe95db37e78179f18062253858de30ea879f8f02e0981257c331f73aa85a54d630bb7577e7ec3919cb2ad969593328cdaf97852582ffa670c3be72c4 SHA512 c47d8cf091ddab940cb4e595cc195e65e40a4d03cc426d608b3e5eafd295e7afd98a084a8469fbc5633b02ee01cb2435a17fb16225845be12077fee92221cd5d
+MISC metadata.xml 675 BLAKE2B 1db912c207b9b70e56ac1256af5d600ba8f3aa97ce22d2de3c56e752442a757c2cb32dd871c62cd96bca2f2c4016f8efd6853eb2c173b7123012ad26a9f32b6b SHA512 6da18aa19b6c64a80e7197e9a2cd22fc2f72c178890ac413237422b73df5360754cbe00da559c121f4482c53b2b6aa6decd6cbbcf7ff3f868d2b6cf314d964df
diff --git a/www-plugins/passff-host/metadata.xml b/www-plugins/passff-host/metadata.xml
new file mode 100644
index 000000000000..1e9cea82ee0e
--- /dev/null
+++ b/www-plugins/passff-host/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>contact@hacktivis.me</email>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<use>
+	<flag name="chrome">Install plugin for chrome (which also includes opera)</flag>
+	<flag name="chromium">Install plugin for chromium</flag>
+	<flag name="firefox">Install plugin for firefox</flag>
+	<flag name="vivaldi">Install plugin for vivaldi</flag>
+</use>
+<upstream>
+	<remote-id type="github">passff/passff-host</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/www-plugins/passff-host/passff-host-1.0.1.ebuild b/www-plugins/passff-host/passff-host-1.0.1.ebuild
new file mode 100644
index 000000000000..9b984afdc45a
--- /dev/null
+++ b/www-plugins/passff-host/passff-host-1.0.1.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=( python3_4 python3_5 python3_6 )
+
+inherit python-single-r1
+
+DESCRIPTION="Host app for the PassFF WebExtension"
+HOMEPAGE="https://github.com/passff/passff-host"
+
+# Using raw because of difference between git and release
+# See https://github.com/passff/passff-host/issues/18
+SRC_URI="
+	https://github.com/passff/passff-host/raw/${PV}/src/passff.py -> ${P}.py
+	https://github.com/passff/passff-host/raw/${PV}/src/passff.json -> ${P}.json
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chrome chromium firefox vivaldi"
+REQUIRED_USE="|| ( chrome chromium firefox vivaldi )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${P}.json" . || die
+	cp "${DISTDIR}/${P}.py" . || die
+}
+
+src_prepare() {
+	default
+
+	sed -i "s/_VERSIONHOLDER_/${PV}/" "${P}.py" || die
+	python_fix_shebang "${P}.py"
+}
+
+src_install() {
+	local target_dirs=()
+
+	use chrome   && target_dirs+=( "/etc/opt/chrome/native-messaging-hosts" )
+	use chromium && target_dirs+=( "/etc/chromium/native-messaging-hosts" )
+	use firefox  && target_dirs+=( "/usr/lib/mozilla/native-messaging-hosts" )
+	use vivaldi  && target_dirs+=( "/etc/vivaldi/native-messaging-hosts" )
+
+	for target_dir in "${target_dirs[@]}"; do
+		sed "s;PLACEHOLDER;${target_dir};g" "${P}.json" > "passff.json" || die
+
+		insinto "${target_dir}"
+		doins passff.json
+		exeinto "${target_dir}"
+		newexe "${P}.py" passff.py
+	done
+}
diff --git a/www-plugins/passff/Manifest b/www-plugins/passff/Manifest
index cdc9ac78e6b8..968618a85eff 100644
--- a/www-plugins/passff/Manifest
+++ b/www-plugins/passff/Manifest
@@ -1,4 +1,3 @@
-DIST passff-1.1.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
-DIST passff-1.1.py 2256 BLAKE2B fcde1a8d1fe4e8793df46c182a8d717931e7b5ee98ae39a6a03bf32c51528dd7036beefc47dd5839bede47a78bcb7904a745fa38522183057dd7b29e20eae726 SHA512 b5d4aa3d3a9455adece3d291a6e1e05178296e72828ec708cd33541f30e4fbef2385978f24ba27eaefc739e4792f4cbac1830e8dcd15380c7243e11ddbcafe9d
-EBUILD passff-1.1.ebuild 914 BLAKE2B 6ed1b603a4a39926e81e0efc2243c5fdd6feacd35b3a5ae874bd6cc74787791c959e015837a9e2baccd438bfc89970926ab27851a8f5127825d758ccf4cc7b17 SHA512 9d926c76b7232322ead013112b78cab6bac3179c5036c61deaf2bcf6d65fa226b9841fe935b63c69e9ce5bc9fd351c0ded12c78117ad4a03a1d207b129c420ae
-MISC metadata.xml 330 BLAKE2B 87fadecd45f680ccf29dbc736eac6c8d5c5da5dc6f15749b42abf6d4d6a5b1d466818b32d996198a0a7534365bf31a5773b8ae358330ee36e365a26e90789ba1 SHA512 c33841e96737f16de6ee6a4f7e2dba04df4dddb26d502d55df8be637ed668a5c8593fef76a2b24a00da335a59cac5f534f89e8cf917d8b1d4ffa9d3d9c0c6d57
+DIST passff-1.3-an+fx-linux.xpi 59512 BLAKE2B 48eb41e8be2e090aa32137fe93eb6cb7a22218f865f1ade4e6f4516ea3fedc34333f43438fd7c96817ec695ca1d0ced9cff0dd53157e06442e000c12a4bff33c SHA512 d5e5c29fda852c08908ce27e55bb2cd3daaacedf4f1375eb626cf4228d9b8c5113d2210578d80420c1df3846cbb948c184702274ece851c9e8279000e38989a6
+EBUILD passff-1.3.ebuild 831 BLAKE2B cf8093b9af8109f91a27b92f9bd200db63829caa7f45c2e4d056add9b2717e1b00dfa63291899f1eda0e65d36a404b73feb95c4e4e2ced40d71226ef1d642999 SHA512 d98c4bc17703894cecc9f6a09df8de055d4bd2524b6b0fa5fff187f665732b8f0fa57d09f405428c9d23c2cbff491c48276952ca0fe85f2e0b05737d8605566e
+MISC metadata.xml 582 BLAKE2B 44a227f047995fcfb3ffba141ed22c632c5be62d9c3526874cfc6bfb66a3dc001f2a0820b877c7f6a582c05f4f03a548e2cee98b7160e433a4c722217414dbe0 SHA512 3ae829aacd4a82e81b25f4b58f7a142d4d43e26bec35143f642f3a069591eb6546389b7e7758641ecf3a360ddbf0129611b669b20a290ea5b72c2462d3b517ca
diff --git a/www-plugins/passff/metadata.xml b/www-plugins/passff/metadata.xml
index 764e78624bc3..234e183d237e 100644
--- a/www-plugins/passff/metadata.xml
+++ b/www-plugins/passff/metadata.xml
@@ -8,4 +8,11 @@
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
+<use>
+	<flag name="firefox">Install plugin for <pkg>www-client/firefox</pkg></flag>
+	<flag name="firefox-bin">Install plugin for <pkg>www-client/firefox-bin</pkg></flag>
+</use>
+<upstream>
+	<remote-id type="github">passff/passff</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/www-plugins/passff/passff-1.1.ebuild b/www-plugins/passff/passff-1.1.ebuild
deleted file mode 100644
index 3c07171aa77c..000000000000
--- a/www-plugins/passff/passff-1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit python-single-r1
-
-DESCRIPTION="zx2c4 pass manager extension for Firefox (Host Binary)"
-HOMEPAGE="https://github.com/passff/passff"
-SRC_URI="
-	https://github.com/passff/passff/releases/download/${PV}/passff.json -> ${P}.json
-	https://github.com/passff/passff/releases/download/${PV}/passff.py -> ${P}.py
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-TARGET_DIR="/usr/lib/mozilla/native-messaging-hosts"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}.json" passff.json || die
-	cp "${DISTDIR}/${P}.py" passff.py || die
-}
-
-src_compile() {
-	sed -i "s|PLACEHOLDER|${EPREFIX}${TARGET_DIR}/${PN}.py|" passff.json || die
-	python_fix_shebang passff.py
-}
-
-src_install() {
-	insinto "${TARGET_DIR}"
-	doins passff.json
-	exeinto "${TARGET_DIR}"
-	doexe passff.py
-}
diff --git a/www-plugins/passff/passff-1.3.ebuild b/www-plugins/passff/passff-1.3.ebuild
new file mode 100644
index 000000000000..2cc136021db6
--- /dev/null
+++ b/www-plugins/passff/passff-1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mozextension
+
+DESCRIPTION="zx2c4 pass manager extension for Firefox"
+HOMEPAGE="https://github.com/passff/passff"
+SRC_URI="https://addons.mozilla.org/firefox/downloads/file/914592/passff-1.3-an+fx-linux.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="firefox firefox-bin"
+
+RDEPEND="www-plugins/passff-host[firefox]"
+REQUIRED_USE="|| ( firefox firefox-bin )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	xpi_unpack "passff-1.3-an+fx-linux.xpi"
+}
+
+src_install() {
+	local MOZILLA_FIVE_HOME
+	if use firefox; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+		xpi_install "passff-1.3-an+fx-linux"
+	fi
+
+	if use firefox-bin; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+		xpi_install "passff-1.3-an+fx-linux"
+	fi
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ab830007ab50..8c5129632ed1 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index e9b69d1c089e..bff5c1d75f93 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -2,6 +2,7 @@ AUX http_brotli-detect-brotli-r1.patch 4646 BLAKE2B a00376f57800e21ad3e231ba4653
 AUX http_cache_purge-1.11.6+.patch 615 BLAKE2B 520a437290dbed718f392bedecdb66c9eae3440c2e5977bede5829f8420905e60c74fac3dad7b22c12d2070ce47430795482d270222ba8d4640af415e4974210 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60
 AUX http_uploadprogress-issue_50-r1.patch 1098 BLAKE2B f8191fdfa85c7aa016555a636b5c291d6d0ed54fea0714b361ce500deb7431f16c77a2f5675c5dc2f6e8ed278f7c24efd45eba3ddab27a2fa7d4e6d1391cfe8d SHA512 bdc3a129059b1af9c317d1e8b74ec98a14bf1e55b59ae867b963304541457e1676acb775ac2cec730ee2036feedf75d636eeb36700b0913e417045a52a00eec9
 AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84353066039728b0935e2a243367e4e883afead2d4c728c9b7e7b5b5e8714b80a3af72059a36f8207af3641c22a43324c0e7f2b2f9b SHA512 9b377defaa9ddb78fee3f37e054c7b16258fd380b4093d6d61bc45fdc42cb45ee5246901cddd230dc1765838fabbd71d558b5b1d12d9829615b3501da4f3824a
+AUX http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch 1694 BLAKE2B 3f71c61c87abb47a5ccb63a7814e62d1d32da7335913794dcd4216886784c7194d7d696b737f8aed17dfdae67f1525d765bb942879560ce7461435b8071ff6e6 SHA512 1f12a8328a206fb6291d792ebf1fb530eadec503907d1557ddeb7572667dfdea71934affe1929fc85ae629e790854c4d2ef0b5dabb2f62104cbdaaf2ec525ebb
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f
 AUX nginx-httpoxy-mitigation-r1.patch 2023 BLAKE2B 82e6cb6c1d38b9e4cd619abfe60eeaa968ded8975277e60afb94456b59e311817eef04db2b207e85308ef480c442e8acd68cba8f455b4cfc872829e522cb1ea4 SHA512 bfc480c34cea525b0eb3753622eb371198e2252aba3299fca4f1c7b29848da162b93757b05eb11a3839618ed895f7b73534dcd7861f4b924997ec422939222a3
 AUX nginx.conf-r2 1292 BLAKE2B ad941577401ee99e7904871a20cdf94e946f608747c14e7ceb589ea0a6254cf16fe27f712d2db252db027bc72742d1818c3874b762fcc38054a69e4363cd5e39 SHA512 de9ffb84d7de468fa7aebfb205529edb1c372f3ff6990b0cac9d1f3012be9ced65db4d260fd852c91cc033805c023a02790770cca43c6ad6335fb58a9c694c95
@@ -13,6 +14,7 @@ DIST modsecurity-2.9.2.tar.gz 4298993 BLAKE2B 32a92148f0e1a1166cf888b8172fc55340
 DIST nginx-1.12.2.tar.gz 981687 BLAKE2B cca2d2b2267fee6feac7e91a5aaec229251e829203b02c207a6a89644fd6b1f2003d75225fadde9fdfc8dda444dc53c7ff0033a1e15a0f25019c878fc716d83f SHA512 3faa2043e237a7e1d15cc5661ac9d002a965220a78c25a863be9f19e01007347e53f776b61c229f6bd3d916cc1ccf92de260811f7b8092ec1b747fba7c0061f7
 DIST nginx-1.13.12.tar.gz 1016311 BLAKE2B 8b56e1e13c2598181153b9fe5f5a9ac6349ba1d6c98cfca708cb7ae1d3b6eec92df0132091107bc20c0ae1bec15020957c820f9414890151b4b1830f00af2d40 SHA512 c61668d4999d43ccd5ed8e99bd2f6992190503bb3c4103a22871e346feb8cbd049b04416ca7eb982c122a9a29bb21c6bb9f934411dd80bc02d946105f7917873
 DIST nginx-1.14.0.tar.gz 1016272 BLAKE2B 37d292955dc5f03f6b3b05fd434807ba1033fab73494866e8bacb99df1d595a7665b3722e9bb7227a119cabfea79be08a14e589565cedb78693fc3990cee4466 SHA512 40f086c9f741727e6f55802b6c3a66f081f7c49c38646dc1491aa3e3c35bae12b65ea6594386609fc849bcd99a60d7cd8ecb3f8d519e0e9ab8db01d653e930e9
+DIST nginx-1.15.0.tar.gz 1020675 BLAKE2B b8151877d06f96276fc8186dc8c32b8f1479e27c7f6bdba9158b1d945661891e14c39d2ab3ff8991b3906c5fffe721ab4014d709895a6e3f5bc22b687ea3c536 SHA512 7dbdf437d8d546059a8a03aa9c8d2be98dba7306e2daa49611c16f1e56413a25d4c622da13a815e8075a10f4a0cd744167deaeb971c0a69189940a7a05fa32df
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 BLAKE2B f2209c8b5eb5616a362f2b532245167a5940faad6d66d98a94b3bf2d1e33a73492d42c60a9ddad347a592362a002ff38273a5d1f61f663984a09e14a3fe35e0f SHA512 323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
@@ -27,6 +29,7 @@ DIST ngx_http_headers_more-0.32.tar.gz 28033 BLAKE2B 51cff34f9a690a3c9a2a05b0408
 DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a SHA512 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
 DIST ngx_http_lua-0.10.10.tar.gz 611973 BLAKE2B c84d039087973cc6f718fd5cfcb043fd96893d790d2d65b448faf63ad7e3b8713d529c7804a436cc972bcabb9d4d3a8a605fe70a4ccf0a696dfc493656ac513c SHA512 3440e3fe714407f0ff61e0da207669655b443f7b70ef8a91693ea05ed96d8fde349d9c8ea30d5ff53ea3f8e4a5c7d0a2834e136c340b1b1365d62006339a1e4d
 DIST ngx_http_lua-0.10.11.tar.gz 616653 BLAKE2B 6985823752755b78b626f597600adf45592ce4c8dc3a513dd43b9f5152c9746a795faa3714124d74814ad88739dd8889de50e764ad2ea808c48570d1e297aeec SHA512 35e1510c9da71c8bdf028f4ac253404550a83bd904f6c5639697d78c76708625bb6deaa858a7d086b5582f71bb46578e8f804887a46ccfbaf5f4de8510cb1511
+DIST ngx_http_lua-0.10.13.tar.gz 624102 BLAKE2B 009506e4cd505a2e383e2c6344b62b541b3bbb28410d4ae2e88139227e22e19dd14372a902f172fadaf82a76c5875936caff4a8c98ff740456488e5ac6ff8c53 SHA512 8c316b9d12dc35779fcddc6bb90942c096f19fd8c2e090b8397e1e1ca6f0ebd7a4edddc03fddb31310147ba4e9db9fc4b3749cfd2323046d88045b3b3333f07d
 DIST ngx_http_naxsi-0.55.3.tar.gz 187416 BLAKE2B de4b00bcfa3e81b7f339bde9f2517e228d2f914c1ac76babd7db1419168814d30f44623a67c0f79475c232ca456792cbdc8f2b6ef3ebd1524eff3f2acfa87685 SHA512 9e8f41a5cd1342cc9b8aa334a603842d14a256aab1f4a21205bb1278aecbb0c49e39c889d8113a5b41aad2efeaa2ed9f11cba6929173f50add91f54c4c59c8a0
 DIST ngx_http_push_stream-0.5.2.tar.gz 182008 BLAKE2B b53c1269a5b96b35054011879dc2288ec7c9dd3965a1d4cea73fb7804626797b3cf7929ffa00fb0fc7479f5d6a7f8d006dbdde1ffa435f878c7cc9278e6cca00 SHA512 ee8bf9ece652da6aa5a39879298bba70d1842696545259f3f5e302cc61397b35f016364805805f9ab1914fc39ed2f07c015e042155789073e3d1fdc02a0783de
 DIST ngx_http_push_stream-0.5.4.tar.gz 183493 BLAKE2B ccae3113071cee38fa6a7accd580922dc2fc9fa22af737f400c2c5f59352d93ca6cceb47f2aee70dfc111afdf98d27aeb64ddc5a4dbf617359ea4da09486ac7f SHA512 467ae49409adb675979ff591f98df8c96d71ab5ebc2ef9b3c9430e38e7e84d311b4a98c2b1cb1886d895735223dd2a43370aab61b57b34adb1427c184e6b8c86
@@ -35,13 +38,17 @@ DIST ngx_http_upload_progress-0.9.2-r1.tar.gz 17268 BLAKE2B 7bbbf52e326c64a00833
 DIST ngx_http_upstream_check-31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz 130052 BLAKE2B 0ff95fc9780193b514fc7b28f6c5c1a58942cd54472a495a1812a48ef4039390241c20c8a3e8dfd6168e87df3a9e3b37e9c33f11d13bdf5fb0d1f37041fe4ee8 SHA512 e7ea6712c27fd2610e8681b7f687e24c94cd7558d6f19f87568d4c2169115678a61c58b1cd3686a927173b566ff1e10cb1fb767fe63db61f860a77bac9792f9b
 DIST ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz 130073 BLAKE2B 3c93cef79425a46e22ae39adf13d5ebb0e5d36f5d6be8555ec068dd0017918f5355d82fbbe90ba934e58c52e89c2096e24012f75390c7159d1ebacfaaa112308 SHA512 fad2a0d3ac332b6e67c52e3525f6df8a432df3e92bc173190b8107fba7f24476ab9dae4824630299af68c15e856409bd47a3a79fb5b65e03a5133eb90142b8fc
 DIST ngx_http_vhost_traffic_status-0.1.15-gentoo.tar.gz 371234 BLAKE2B 6c164d8c5ee4f3a6729989d9ab2ba874dd5dc285f5c52baf50b05880f184d1ef779f320efa36db8228ab15a8885e972664aee2b1d367279edbf840e41a4c8108 SHA512 63bb0d576fb896526e13fd624eb61b0562756d9aef9124be3d4e845312885838b96d93a4233b15e1b0449714c9689ef1e88b680f23f5d9c909b31026d8c13d08
+DIST ngx_http_vhost_traffic_status-0.1.16.tar.gz 371717 BLAKE2B 0f29f721ca38788343de52c7462efcfe846161ed8dc8433979a1189ad2d11f6917c552a58113de1306ad657d8cb62a22d0a94c053801c2e4becdbcd2f16f1552 SHA512 a85f17bff4e47d6e4e45b9493d759d493a3b4564c76ce7c526ff9afe99d4bd7191cecf17c3bad2bd19cdf5dfa4c4eba21baff8bdbf08550485ee4956963f9e73
 DIST ngx_memc_module-0.18.tar.gz 37113 BLAKE2B e5b89c7c7a3e6f8ee7c1b2623fbec78851a9d7c1c37c1924e8c010b45a4e034afe504a5e228361ad88cf57e83ce06f5f6d635301f8201f1ebd7e99f30447d524 SHA512 8087bd361fb4e522493e66f93d59c9b13245d6eef0fe4a53f619d1826feb02af60769c0a04f87f2faf5308a44b794ef146a445bdbe7cbc7f21c0edaaba08c706
+DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1d9b11885fbce46fbe9fa4df3dce365320b5963c56aecde3b0039d4f9954943d95f25c5f4fada6256861257f82ebbb12 SHA512 a64ec8dffcd011db2cd12b501271bf5c408f2f31fd2bf477b8db4e88adc5bb5732c4c2181ed8378cab6a937869d8f747ef52b22fe256c90df8440b91890edbe7
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.0.tar.gz 519895 BLAKE2B a5a888473dd2ba2320ff74017e8445d96fa3e361acc559edb270ad075c937ab5630e537a67ad8ed134a7ec5809ae63e38791ac25ceab3e26160469be8cc2e82c SHA512 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.2.0.tar.gz 251246 BLAKE2B 76c0be4a98d5782df8d9ecb4b5a6a463a77fd59078f5d25a3763ea5e8633906966fc0a34c98dd9dca2dcc1f54994b0f47d8e80a5903faabbe43865930c2bc267 SHA512 8b1975594f47e49f6d245a99e64e59a3eebf916b9e7e8626e5b1487275688e3dd84691e99ed2207698724dc82d75c54176eb88b9104e847d1cd7db7ead89a391
+DIST njs-0.2.1.tar.gz 252791 BLAKE2B a8507c016cef8481c456e675bd4972a018a049933e5ba2d03027f0c871c264d6848d25a9a715fa4e7920b63bfe86470b4f835790296dba6227aad16b80e5a849 SHA512 b924be63b3d8a996dfd5dd120a3103619c52a9193ca442a21f85f2d5e0a30690fa67401125e775cdf2127f659a61e34b8defe63f7fd33e318cca2a7f99c44154
 EBUILD nginx-1.12.2-r1.ebuild 37150 BLAKE2B 65fed3395350ccd46c82c77e42ca5b0407127832fae1b3a3b660fd5d6f13adc6aef65cd340d41c5a0212241881f23843f1cf849dfc46c972f3741e0facc2d5a8 SHA512 59897652e9dfd97468de4b447cbd080917f65d12507ffd2ec0037227c69b029242c8710aa20c041a6f3abe93d8ffd1e8678c131059b612697e1af1d6b702b31c
 EBUILD nginx-1.13.12-r1.ebuild 39584 BLAKE2B 4405a34618f6e37aaee999a36d7fe5de63962126333120f9f978d9ddcf52eddea7bafab211ac5e058107ffef0fe6c5abfd8618770fa26de6dc837978cdd049bf SHA512 be7e0643022a423890f982bb5c8f4be96fd5138e832a123d505117948bf7563487dc10095b9143dca56795ffc471547a88a41aceb2c4e4e486c19a9d1fc11e29
 EBUILD nginx-1.14.0.ebuild 39584 BLAKE2B 735e06dcaa77a15e10e2b11c144f54a32b926e701eb0045e1fc97b919436af0f9106267ad2bdd5fc192ee923b63801a3fae0972f945753c866fe8543711821df SHA512 657277795fe7df48e386d69e049a26fedd1ee27bffe1558dc1a0a3917a7e0b5318ed89714c7d35b857ef9bac165e6c176b25bb5bb7fde0c43319ea2622e38923
+EBUILD nginx-1.15.0.ebuild 39806 BLAKE2B 513ebdd7f6f73eeba2d0091ece0fab232da65a6d5a78666f79ec04a8448c8e77f1514e90cade6bb29cca2da22bf82cbe63dd7bf8e76042b90d1b5b32e00928ea SHA512 7361563816ef7e51b6e46c2cec9da9289084740df1f0a8d81b9af9566806dc6ecaae2597cd2db1cd236c48b592851f45f2353433184c0c08adcd286d17dc3180
 MISC metadata.xml 1309 BLAKE2B 9da8c2589e775e0ed57a344ba2d6c5e9d29908c253fd77306b2ea2f7392d9bda64ec18ee9120640e5d22e3624b79131377b3020e7e35a9603916ee8c6e8d663e SHA512 ea27337d56750dfa1c7a478eb0bdb4318cb03e181e16cee304e6beeb3261abde75cddb68a4249ceb97089d3e6740bcae10ff3441ac9f5e8a074409080313ca73
diff --git a/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch b/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch
new file mode 100644
index 000000000000..e3ac786a62e6
--- /dev/null
+++ b/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch
@@ -0,0 +1,42 @@
+From 75118e8998d876b5cd0f285a1fa184c3b6ba7fd6 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@whissi.de>
+Date: Fri, 16 Feb 2018 20:59:07 +0100
+Subject: [PATCH] Fix compilation without HTTP cache.
+
+---
+ src/ngx_http_vhost_traffic_status_control.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/ngx_http_vhost_traffic_status_control.c b/src/ngx_http_vhost_traffic_status_control.c
+index ade1475..ee5fd3c 100644
+--- a/src/ngx_http_vhost_traffic_status_control.c
++++ b/src/ngx_http_vhost_traffic_status_control.c
+@@ -196,6 +196,7 @@ ngx_http_vhost_traffic_status_node_status_group(
+                             control->r, *control->buf);
+         break;
+ 
++#if (NGX_HTTP_CACHE)
+     case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_CC:
+         *control->buf = ngx_sprintf(*control->buf,
+                                     NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_CACHE_S);
+@@ -203,6 +204,7 @@ ngx_http_vhost_traffic_status_node_status_group(
+         *control->buf = ngx_http_vhost_traffic_status_display_set_cache(
+                             control->r, *control->buf, node);
+         break;
++#endif
+ 
+     case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_FG:
+         *control->buf = ngx_sprintf(*control->buf,
+@@ -317,10 +319,12 @@ ngx_http_vhost_traffic_status_node_status_zone(
+         }
+         break;
+ 
++#if (NGX_HTTP_CACHE)
+     case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_CC:
+         *control->buf = ngx_http_vhost_traffic_status_display_set_cache_node(control->r,
+                             *control->buf, vtsn);
+         break;
++#endif
+ 
+     case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_FG:
+         (void) ngx_http_vhost_traffic_status_node_position_key(&dst, 2);
diff --git a/www-servers/nginx/nginx-1.15.0.ebuild b/www-servers/nginx/nginx-1.15.0.ebuild
new file mode 100644
index 000000000000..7d5c01213da5
--- /dev/null
+++ b/www-servers/nginx/nginx-1.15.0.ebuild
@@ -0,0 +1,1070 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.0"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="37ab9b2933a0b756ba3447000b7f31d432ed8228"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.33"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.2"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.13"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.1.16"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.55.3"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.1"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="0.1.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.61"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.2"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.2.1"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/expat )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r1.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		cd "${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		if use luajit; then
+			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		else
+			export LUA_LIB=$(pkg-config --variable libdir lua)
+			export LUA_INC=$(pkg-config --variable includedir lua)
+		fi
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX%/}"/var/log/nginx \
+				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 7a8668017125..bc45af5246b6 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index c28bf9f456b8..6934ebae1674 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
-EBUILD bdftopcf-1.1.ebuild 434 BLAKE2B f3b89af618068e987b4ba920d11064f52f16a84903e64311f6d2929cf020977b4ee0623fcdf9de1402d53d69015ef5dbfdd2fb806f208748894258116e6971c2 SHA512 4981d9142b98cfdc6de2babc4eeef8c7f581168b8cb04617c17ce70fa90b5f257d0ddfad7c66d896225e7d3b7dd8b58efc7cbec5f3b3a2d58c22a58e80045f16
+EBUILD bdftopcf-1.1.ebuild 433 BLAKE2B 0def2b164f16515c7066b7a4a144bdca2ab79829de1a9fb81278c8f71206e4edc4e6d069ad5ed88d5160a1984b8a2aae7580c9f5d72026a950395096cd797716 SHA512 a6b88922c8ed25656674762f7b9cb60064f95f4562321ed95903aecef44a424215348cece78fa991a306999de3947c949233b63dbdf5bad73dd638316f3527ce
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index 357ddc564117..81f2a362150c 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="
 	x11-base/xorg-proto"
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index fe0e020d9c28..c19ea609c231 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,3 +1,5 @@
 DIST xkbcomp-1.4.1.tar.bz2 251069 BLAKE2B dd485d2a5c985bace74fb5cc8da64d6b33dc9450c2e98f42e7e82f989faaa724da068799c40d2703da7172d758e67ece633ca47d2fc97342ec7a9aaedd71d201 SHA512 443397e112f67e2ebc5150ec0dbf0f4a072ea39585d964d2c7cbd0569b7e0ce7d8bed0bc2c2d886343fdb060c941e65b42aac16adf189c66e90849029e278f23
+DIST xkbcomp-1.4.2.tar.bz2 248399 BLAKE2B dcc09823fdf8a62451a1daf8dc56adbd1713b56ac7343b9edb8b3aef8b527ab8443a056ae6b4f8c21051ce5aa4764c9b198c9a5cd0e929f52e9a3e191b950334 SHA512 b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e
 EBUILD xkbcomp-1.4.1.ebuild 458 BLAKE2B 494541c3f941fedd25b488a4094bc0f92598948b454eb1bf32c5abac18dbdae01af939d4e259928b450cc7976d9f93fb49cd207e239e99c6bb6999f37152586e SHA512 899bc4a357b2a9feca67fe97e9b3a2b7bdfef6d180331493cfe3b4dec67e1b669f5f956a7f244973acf8bb8c0d96d961d399644487279d07b55be63f4341de33
+EBUILD xkbcomp-1.4.2.ebuild 467 BLAKE2B fc6d49d4634e6df995e77f1977beb6ba041e42ed42cdf9a7d43052ae5e4fb49970489661a6034875acaa7d513809ae503f093479e8b20d399c6bf91cbcabf069 SHA512 e027043637b117df23b3d7d1551a10fbf5693cad3130ce010e280edde5a9724571ed5ef803283acfc31bcc229f1e1b3d35d1e082d904357ba93b45fab12e92cb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
new file mode 100644
index 000000000000..c3f0fc686a56
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="compile XKB keyboard description"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 845f4dedc409..0ad0dc3af97e 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 9ac2237246aa..849051485fa5 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,4 +1,4 @@
 EBUILD xorg-drivers-1.19.ebuild 5115 BLAKE2B 6dcb2ee9b7c786ab24cf8fc8e6d342096a0401de2dffd7a5cf5590ba431f409600c10d1cd00cfadb53c9e125dccc627a03a87360d7eb6a5318bfc623f11866c2 SHA512 9cdf04cd5358e865cd92f6f68cda3da795d83c1c213a91e54f04ea0cd340af123bd0f3ffc0ca6b0083ec38b1706fa0ef5ec810178d28f56d5985f72fb5ab5bce
-EBUILD xorg-drivers-1.20.ebuild 5455 BLAKE2B 26a01338ae55a59e3a4163c69ff193f240abb4c48c8805b2c02e5404263d4003b3e78fec04863d306efd649a77546ef74fac5f5712dd5a081c85418709646dc6 SHA512 4b76211fb3d6f9647ccbf18207b693ff341949d6bd0fcec6675f0dc6a38cd920dbe703f344cd29d2ff67162fd40d860fff6f95951046eddec93cde194409e41d
-EBUILD xorg-drivers-9999.ebuild 5321 BLAKE2B b49c487edc5b037bd284c3b2a66a77dcc96273ef7fa0f3107c17f898a3371f41ede555a449bee6aecf093f49b33bf5dcd30d801ca4b58d759d157698d4a12f47 SHA512 1004e24ec5e80a1cc6fbbdd57218ecea2198bcd78b092863c5f5f53d9b4c352cc7519705436b9c3a8e34b286388d9878cd7ce6304dbed638d64c863143b8a437
+EBUILD xorg-drivers-1.20.ebuild 4964 BLAKE2B 45050c2fd2f11b01a872fa39cba4346edba32925827ec63b77803ab32d65144df7c9549dd8131179c57581b427020c7fe5f2d4d43f60be513f13bb3eb96832e4 SHA512 003363bb418a99c81b84ff71cc224d56fca2ae60bf0eb81e27ae10b26510c419daeb7d4b3f9057656b21392522ebbb7903720cbe62e574eeb8252549eb654d0b
+EBUILD xorg-drivers-9999.ebuild 4830 BLAKE2B bc325390dd177785e1a453bdaa7b8cb7dd92cc7c115636061a7a2a01d507f54039c5f14c8ced9f0afa633b66f1b18d7ec9012a1fddadc116efdde34b610e0152 SHA512 254564cea1a17f896150ad754025d6bbacbf0143890fb2219e8bc3d300f549cf6bce16ed45cbbc1223888ef1bcbb9525b6e79e4ee1de71265b862d3db3f39612
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
index 5f7f3bdc3259..33b133553847 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Meta package containing deps on all xorg drivers"
 HOMEPAGE="https://www.gentoo.org/"
@@ -59,47 +59,47 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
 	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
-	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
+	input_devices_evdev?       ( >=x11-drivers/xf86-input-evdev-2.10.6 )
+	input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
 	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-	input_devices_libinput?    ( x11-drivers/xf86-input-libinput )
+	input_devices_libinput?    ( >=x11-drivers/xf86-input-libinput-0.27.1 )
 	input_devices_mouse?       ( x11-drivers/xf86-input-mouse )
 	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )
 	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
-	input_devices_wacom?       ( x11-drivers/xf86-input-wacom )
+	input_devices_wacom?       ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 )
 
-	video_cards_amdgpu?        ( x11-drivers/xf86-video-amdgpu )
+	video_cards_amdgpu?        ( >=x11-drivers/xf86-video-amdgpu-18.0.1 )
 	video_cards_ast?           ( x11-drivers/xf86-video-ast )
 	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
-	video_cards_fbdev?         ( x11-drivers/xf86-video-fbdev )
+	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
 	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
-	video_cards_glint?         ( x11-drivers/xf86-video-glint )
+	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
 	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
-	video_cards_intel?         ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) )
-	video_cards_mga?           ( x11-drivers/xf86-video-mga )
-	video_cards_nouveau?       ( x11-drivers/xf86-video-nouveau )
-	video_cards_nv?            ( x11-drivers/xf86-video-nv )
-	video_cards_omap?          ( x11-drivers/xf86-video-omap )
+	video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
+	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
+	video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
+	video_cards_nv?            ( >=x11-drivers/xf86-video-nv-2.1.21 )
+	video_cards_omap?          ( >=x11-drivers/xf86-video-omap-0.4.5 )
 	video_cards_qxl?           ( x11-drivers/xf86-video-qxl )
 	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
-	video_cards_r128?          ( x11-drivers/xf86-video-r128 )
-	video_cards_radeon?        ( x11-drivers/xf86-video-ati )
-	video_cards_radeonsi?      ( x11-drivers/xf86-video-ati[glamor] )
-	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
-	video_cards_tdfx?          ( x11-drivers/xf86-video-tdfx )
+	video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
+	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
+	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
+	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
+	video_cards_tdfx?          ( >=x11-drivers/xf86-video-tdfx-1.4.7 )
 	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( || (
 					x11-drivers/xf86-video-vboxvideo
-					x11-drivers/xf86-video-virtualbox
+					>=x11-drivers/xf86-video-virtualbox-5.1.14
 					) )
-	video_cards_vmware?        ( x11-drivers/xf86-video-vmware )
+	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
 	!x11-drivers/xf86-input-citron
@@ -133,21 +133,4 @@ PDEPEND="
 	!x11-drivers/xf86-video-tseng
 
 	!<x11-drivers/xf86-input-evdev-2.10.4
-	!<x11-drivers/xf86-input-joystick-1.6.3
-	!<x11-drivers/xf86-input-libinput-0.20.0
-	!<x11-drivers/xf86-input-wacom-0.34.0
-	!<x11-drivers/xf86-video-amdgpu-1.2.0
-	!<x11-drivers/xf86-video-ati-7.8.0
-	!<x11-drivers/xf86-video-fbdev-0.5.0
-	!<x11-drivers/xf86-video-glint-1.2.9
-	!<x11-drivers/xf86-video-intel-2.99.917_p20160122
-	!<x11-drivers/xf86-video-mga-1.6.5
-	!<x11-drivers/xf86-video-nouveau-1.0.13
-	!<x11-drivers/xf86-video-nv-2.1.21
-	!<x11-drivers/xf86-video-omap-0.4.5
-	!<x11-drivers/xf86-video-r128-6.10.2
-	!<x11-drivers/xf86-video-siliconmotion-1.7.9
-	!<x11-drivers/xf86-video-tdfx-1.4.7
-	!<x11-drivers/xf86-video-virtualbox-5.1.14
-	!<x11-drivers/xf86-video-vmware-13.3.0
 "
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index c5588e0206b9..a64c5928679d 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Meta package containing deps on all xorg drivers"
 HOMEPAGE="https://www.gentoo.org/"
@@ -59,47 +59,47 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
 	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
-	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
+	input_devices_evdev?       ( >=x11-drivers/xf86-input-evdev-2.10.6 )
+	input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
 	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-	input_devices_libinput?    ( x11-drivers/xf86-input-libinput )
+	input_devices_libinput?    ( >=x11-drivers/xf86-input-libinput-0.27.1 )
 	input_devices_mouse?       ( x11-drivers/xf86-input-mouse )
 	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )
 	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
-	input_devices_wacom?       ( x11-drivers/xf86-input-wacom )
+	input_devices_wacom?       ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 )
 
-	video_cards_amdgpu?        ( x11-drivers/xf86-video-amdgpu )
+	video_cards_amdgpu?        ( >=x11-drivers/xf86-video-amdgpu-18.0.1 )
 	video_cards_ast?           ( x11-drivers/xf86-video-ast )
 	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
-	video_cards_fbdev?         ( x11-drivers/xf86-video-fbdev )
+	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
 	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
-	video_cards_glint?         ( x11-drivers/xf86-video-glint )
+	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
 	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
-	video_cards_intel?         ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) )
-	video_cards_mga?           ( x11-drivers/xf86-video-mga )
-	video_cards_nouveau?       ( x11-drivers/xf86-video-nouveau )
-	video_cards_nv?            ( x11-drivers/xf86-video-nv )
-	video_cards_omap?          ( x11-drivers/xf86-video-omap )
+	video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
+	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
+	video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
+	video_cards_nv?            ( >=x11-drivers/xf86-video-nv-2.1.21 )
+	video_cards_omap?          ( >=x11-drivers/xf86-video-omap-0.4.5 )
 	video_cards_qxl?           ( x11-drivers/xf86-video-qxl )
 	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
-	video_cards_r128?          ( x11-drivers/xf86-video-r128 )
-	video_cards_radeon?        ( x11-drivers/xf86-video-ati )
-	video_cards_radeonsi?      ( x11-drivers/xf86-video-ati[glamor] )
-	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
-	video_cards_tdfx?          ( x11-drivers/xf86-video-tdfx )
+	video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
+	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
+	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
+	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
+	video_cards_tdfx?          ( >=x11-drivers/xf86-video-tdfx-1.4.7 )
 	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( || (
 					x11-drivers/xf86-video-vboxvideo
-					x11-drivers/xf86-video-virtualbox
+					>=x11-drivers/xf86-video-virtualbox-5.1.14
 					) )
-	video_cards_vmware?        ( x11-drivers/xf86-video-vmware )
+	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
 	!x11-drivers/xf86-input-citron
@@ -133,21 +133,4 @@ PDEPEND="
 	!x11-drivers/xf86-video-tseng
 
 	!<x11-drivers/xf86-input-evdev-2.10.4
-	!<x11-drivers/xf86-input-joystick-1.6.3
-	!<x11-drivers/xf86-input-libinput-0.20.0
-	!<x11-drivers/xf86-input-wacom-0.34.0
-	!<x11-drivers/xf86-video-amdgpu-1.2.0
-	!<x11-drivers/xf86-video-ati-7.8.0
-	!<x11-drivers/xf86-video-fbdev-0.5.0
-	!<x11-drivers/xf86-video-glint-1.2.9
-	!<x11-drivers/xf86-video-intel-2.99.917_p20160122
-	!<x11-drivers/xf86-video-mga-1.6.5
-	!<x11-drivers/xf86-video-nouveau-1.0.13
-	!<x11-drivers/xf86-video-nv-2.1.21
-	!<x11-drivers/xf86-video-omap-0.4.5
-	!<x11-drivers/xf86-video-r128-6.10.2
-	!<x11-drivers/xf86-video-siliconmotion-1.7.9
-	!<x11-drivers/xf86-video-tdfx-1.4.7
-	!<x11-drivers/xf86-video-virtualbox-5.1.14
-	!<x11-drivers/xf86-video-vmware-13.3.0
 "
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 292d52956c5f..7626c8c230f7 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362
-EBUILD xorg-proto-2018.4.ebuild 1805 BLAKE2B 6be19f7568fd3d799675a3e2005f5d066b7cd29363260b0dd1f24f91a5d9365e75c63aa3908cb9b2c69652de7e90a9fdfa6436b8b93a38d790f1ffe1e74f761d SHA512 5f9d9da12464acc6fc03affccfd95901b7c8e56d84f098060527fc4f8fd359438ee66b56178814290b6da5b5efda86c97fd6eacc145cc5e73cde4bf8d6473d6f
+EBUILD xorg-proto-2018.4.ebuild 1810 BLAKE2B 3e7eae7cd90d3eed29eb03b91dd92867c6b7aaa7ae33b2d255e22a37d1a1b18d4be492ac6d2887d5ef4e7d2742d3457641253751df361e4043b01ef0f8a0cabd SHA512 8acc24eb3159f70abd5554367d2749a55fbe0c9f13f251011427878a14b3c83fd8763c9d50e1ab9129ac917c76ed9a766ac88b507a478eda8fb3a2e975998565
 EBUILD xorg-proto-9999.ebuild 1779 BLAKE2B 80ae4a59428a02d2cd6d282b46eabfb9d5722a4e131303ec99c648f03d24431ba430468d570fc9099fbf012d83236f4211f9b88238ba50e0fa77e7dd0b016491 SHA512 f5cbce5ea638fb9c0520c5572e0fc39c47ed3b2c3cfd6fe105d2641136f240acd377bfaf9efc336decaf3670ef31b0bfd0d67e1305966a0a0279450d3383f685
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
index aa7bb8a5c063..b841b04a2b60 100644
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c9c931338719..25d6b79f9a2d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,7 +8,7 @@ AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD xorg-server-1.19.5-r2.ebuild 5778 BLAKE2B b69bb4fa8dfb9bb52803785fab791a9c976c56cd8a7536b7480017bbefc9f297392d07575af68e5922f6c53dc98105935a0554739d3daf9a638c122f3231a902 SHA512 7dbe59ed9002bb1553ce699dfa4bc14cfddc8d7893d58a59ddf69707cc8ca2b134b48fe07608df7ffd01d7307a3c55275a0ae3564fc9baf1d89d60b3e26727df
+EBUILD xorg-server-1.19.5-r2.ebuild 5777 BLAKE2B 474ad648bed1effaac54a894d2c40639ff64b446a2ec5690bc34aeb67b2b66df54d4200f9b89d03ad855edacaf523464b4ce1e2c13f628e6d24fe62e12f9911e SHA512 63672025c57fb3f9d8d55dba7399d9a16dc558c4f927e66f70b5c0f5483ecebe33a501615d6e099456a6c9534ffe46f568dd3d5da57e3de5203d0c1a73848e11
 EBUILD xorg-server-1.20.0.ebuild 5527 BLAKE2B 9ecf7e16160da27f61917a9333ee27522bbe23123dfb1ab4aa0ea362006d20bd5990431e2568cee623e8baf6ce247feb8f7256a2374b7db36cc0572e3b91384e SHA512 476b7aee6d2fe130f95cfef76fef0639126a596790a75d1ee6248e880f88a57d99a67318c6eef9a8990e669cd8c52cb69de2aad0071414ff4c451a3020a5eae2
 EBUILD xorg-server-9999.ebuild 5553 BLAKE2B 2b29cb7d785839c40f1357671c07bf8ea2685862ac8375f36ba9888fabd27258745e54b6ef1b126098eda8e155415a816f73b9331881ff975b327216948489b6 SHA512 9d8f5af8959c2635d40b8c9bc75947a1c5765032751a2169fac84af529e82168d111856586b00447704bd46835e1a817527788460e4e8dee6d2d8c9fc0804b1e
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
index a1744645895f..5e59d2a205ca 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index ce49956341d2..73bb76ffc5a8 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 6d7b27851aa6..b439036499de 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -25,8 +25,8 @@ DIST NVIDIA-FreeBSD-x86-378.13.tar.gz 59610253 BLAKE2B 723b392b869dd5cc9244cfe9d
 DIST NVIDIA-FreeBSD-x86-381.22.tar.gz 60112159 BLAKE2B 4a61e9a09218eb7d259f82d0a43fee313754004c8716e921b9a83a3e87fff9a291450bef5d7304b2a7ddf5750a830fb7c5cc9dab890dac4a714354265ca25034 SHA512 ffe5882051fad081854e7b7fefe86a4da55b263b2ca217664991a7e0d84ff2f22d62a37c89afd578f3c99c12be897e5db7a3d1c71c747df655af8e220eb983fa
 DIST NVIDIA-FreeBSD-x86-384.130.tar.gz 63719036 BLAKE2B 971006aec05f5bb8f815420f5e1a62103119ae0192a275cc4df3034c20908ebcb8d5a886e030ec06a854102a79e2b31d53c2fcbf3450cb7fa0d9e1f64eeb835f SHA512 54d6d0776190d12f2562fe0ffdf82661fb8a0a4d3d575386a19f5dd5890a7ae4d2ad6704253e7cded62a9a0e1880f1bee9e6bf3aeeb8ce7a265a3d077b0c8018
 DIST NVIDIA-FreeBSD-x86-387.34.tar.gz 64228643 BLAKE2B 80011df5d037cd0a2a6faccf6c990e6019cb85c906c1410d4dde033a8a945ecd46e80a1315e46dc05fa47003eb328c6b8e8e41e18dce60942e645c0e6b813717 SHA512 875648459a149d506b20eb7105e73086e1fb51dddfbd8b484b8cc4793682c088ba16b3d374b0e807738f7aa7489dd9eab2449f70bc9feefeec0bf3a88025b9ef
-DIST NVIDIA-FreeBSD-x86-390.42.tar.gz 64258071 BLAKE2B 765b55676127ff64d90ee65bb3d4a400b1f15f741338a09b09a926fb465b47b6d7036c6c761d64b9dee76ad4cfacb97888a3053bbe62c769cfb3155e7c13d879 SHA512 1271e3bdf55b2c03e63083b3b867fa03d4d2e71ab2a8a0100bd137acedb1fef2416045079bbccd0fc48255496128c37ab619fa5a3e7b992b9d96cf288bc6e4b0
 DIST NVIDIA-FreeBSD-x86-390.48.tar.gz 64254145 BLAKE2B ce668715fbec4f54eb9946fc2f5be56c132da8a2a65678b8aac0e3c0a55f60298212be4a5f6eca90a75d50ce3b9831521d02e7bd004d5c3c61fb5a460c7dc00a SHA512 7255d628be927f17f1108dae458d2d3844b46c42f460bdeac3dbb1dec6b5bf76d2790752e8bfaae35e11d49adb2a43ed1d8fc6a9325152490a21dac8e5c1734c
+DIST NVIDIA-FreeBSD-x86-390.59.tar.gz 64274727 BLAKE2B b032578a38544103e92a19f433d5a86a615605f3a78902df38de2ac3c6179f322c9fb507618a548f4c11f51c9fbb8e07a9519acde86be7123c07a403a76b40c7 SHA512 bd44d5a772a3f52984617742f686567adc0e9b143b2014f1d95f59f8461c30ae650429aac3e92d24540881bc9093cb8a522c4d06a2b71e1309848a7dc7f7d5c7
 DIST NVIDIA-FreeBSD-x86_64-304.137.tar.gz 36474676 BLAKE2B bd75e2916d34f76566d838406419991a860118830366f0297fa63baade3a99f637dae601d6bc6a051596222f2715297dffbf9b81ff5478b030741e6c8a09bc13 SHA512 f0ae7ccea417aceedf34bfb9c96fd79b31cbf74a8fa59d5199b0ad7b81b8a4aeb66cd4801a45cc37f836979cb4267aa69e08517beaa9b8cb9c66a477d02ef8de
 DIST NVIDIA-FreeBSD-x86_64-340.106.tar.gz 61169129 BLAKE2B 0a8e0deb883025d20df5165f39042bcee5d75ea78b19733cff014448c8d62022dbb98af2adebd13485e281a52c9a1c4986ae020b4eb6a821a411836e7333d4f1 SHA512 c2d0a0b1856522b28243697db22ad99d8521b00d9dfa2da724f2ee243b545b7dbf24319d9a0939855bab29251f001063391a760bd3db750bf9950ce1f9376847
 DIST NVIDIA-FreeBSD-x86_64-375.82.tar.gz 58748290 BLAKE2B 629d65b71270d1c0d94c71e4215a72f0e49bb82e68ebb93fd4b14cd56a2031674458764f4c3e2e3dec7379ec0d5ed9212c8d09a64e4361f40352e52aa9b57de5 SHA512 5e2b42ff63e06219764db8187203ce1a2c3c8b478be31fc713ef396e8f8d46def9b2631d7989866740bd0c6a81bbf5d2ed083c14cfa7171c0d993553ca6f431c
@@ -34,16 +34,16 @@ DIST NVIDIA-FreeBSD-x86_64-378.13.tar.gz 58779963 BLAKE2B d0a165dab740b25e1d9705
 DIST NVIDIA-FreeBSD-x86_64-381.22.tar.gz 59284579 BLAKE2B 45703b5658c586fe2fbfaf84a54a591a7d25e836195c47c43375b74a730c1a7aa4dd7bd17d13e7194b37d51da0f11540da1bee564e1c27351ecc6915e65012d5 SHA512 51c5a87fabe87ec7f2589ed97d97447b127ecb5fe501c60bc7c9fce74141c127f4f9bb820d2a9b34fb56db436476d0cb18a73845ab4e7ec2315d4975c8ce4e32
 DIST NVIDIA-FreeBSD-x86_64-384.130.tar.gz 62901704 BLAKE2B 50be9af398f88caa012a7af702ed3d150bd4d0e5aca862dab09f30038906d79254999079983fe242dfe8158549e25f3a49ea8ad07114d8d3bcd01c8a076e8c8f SHA512 ad1a32f8268003d165570137947f517c82074b0851b86a1928f016de95f3dacef4d48f4873f00d603d49b44fe2b99d65295ed4e655d4b16f71c284994a1ea148
 DIST NVIDIA-FreeBSD-x86_64-387.34.tar.gz 63387097 BLAKE2B 53689ba098b4a4de08dca056618ea533c92d17137ec954dea0ae71e1b2c825c021979871e4ff82c820be0a78d3c365f282b760940ebe2caa1ca5bfd2453e178e SHA512 0a905ee72ee6f4e9c941e5dd1f7cddf96bfb20c6da32fd05599258e1bb154f68463d775ba8ff4f67f0d4b8e637e9ed9624fc9a4873a1f2621dc86732f0d6d70d
-DIST NVIDIA-FreeBSD-x86_64-390.42.tar.gz 63578748 BLAKE2B ebae1724c8a8125c15dff5466677b4217586a2851bd8f8e831b55e236b00bd68ba421b21da87bf8389b17f59069482276c0ef923f85d47dfb701cd6e5fda8a6b SHA512 0fde34e642fb92d099166530cdf3eb6301f11068a4780decab33c68e046aea58904f1e8fd2189900a2b140e536933de418b27a2d40e1d7e486d3df1143370007
 DIST NVIDIA-FreeBSD-x86_64-390.48.tar.gz 63583858 BLAKE2B bce8b6b7c739b5aec98ff919f3b6171d73f70179d6af6d7883b574d815e69de7bad9f0d774e4176385bee31181ff9e6ea510115aebe912909ea86bd9cc825aef SHA512 7de36ad359a0640982467fe1178f33a4694cf5f8ec8385cc01ecd6947c5e83e4d603b7b3c90cb6ad96c4e78c1af1bab99e74f70690540dab3a22f4b77cf14434
+DIST NVIDIA-FreeBSD-x86_64-390.59.tar.gz 63602262 BLAKE2B c06a5b4b9b27ff74c2a4b09aa3a7c9a987415126600addcd203f6edac2470a3d7aa33964507aa5a309290372bdd27663225aff0801f009d6bdcddfcdf44bdf8a SHA512 8820350aab2b26c98fccfc2e6e41db99a4ee3f0c54610d14b084d07ac4f9ab4c5bd5b0132e3d06dbdd3cd112c425e65620a310e5a0db114f6c115d4cc09a5bf6
 DIST NVIDIA-FreeBSD-x86_64-396.24.tar.gz 60839222 BLAKE2B 4baa266d945525a8f43d69e14df1b045d5a2e7212eb3a92208f8efb454642e657ea3cf00a9e625ef5efa9f54c8a9e2f87ef4847696368de13b88a0721364d9af SHA512 28c456cfc9f779bed84d671e104f2ea68940053aed2dc7964390e84ec553a9062be6b5108a78f123c129c25548a7b3027060da67417c64f857b23c95ae9f908b
 DIST NVIDIA-Linux-armv7l-gnueabihf-375.82.run 26650801 BLAKE2B 31446667065c56b48f6a3e737afe29a4517459d3462138136bffe383bc6fe514d6e80b49c391c27edc96b8abc3da3dd4d6ee3f3dca17f3c9a0f1cdf0e72cf099 SHA512 28554f1c24fe63c9257c0de3e84e4e739a45bf1c20ec7a53bc2c1b69b4e2355675061491ef5b03f3ae489cf623e553cfa68442f5536f137837327036d1c53d63
 DIST NVIDIA-Linux-armv7l-gnueabihf-378.13.run 26514235 BLAKE2B 2b3c540704496a290be7ae3f1ff378487c75af2298c12488da8b3a1814446e5df02a1ed99afd8ee7fc459d950aab472155359eae0bf56ac83389711d70638152 SHA512 253786a821df85fa926ae842114321b3c70502f887ea7c2b6790dfe3836039ee5d390e6722ca8785904ec6487e465916923d3042dc6191b3b4522c3161b80cb0
 DIST NVIDIA-Linux-armv7l-gnueabihf-381.22.run 26815484 BLAKE2B e5f0241b07d1e54edea2025dd30061d1018c68cc2c7136c507eb894bbad5be3d0724494e2b9f33d1f8f60da4904999bbb964e6f2e78d045d7cd86bcd46b7f6d0 SHA512 934cda37c7aed26243b5b661122e1c060de5b4df890aaf2295b6650dddea37cb4f0e3f0bebddb00b5d687b66ab5e028a203195c4d4ad3379593babda42febe77
 DIST NVIDIA-Linux-armv7l-gnueabihf-384.130.run 28899034 BLAKE2B 4f104243e87d0688d5f234bcadeb501914394ca5ae29c0f7ca7ae8038982c7df14652a1b85fb62a3466a6d4f7cda95c9726367bfd8ab1bf0b73f3fa617418276 SHA512 bd7be99881295f4ddf92b8c6791c4315c7b8699cdd346247dd54dfeb48ee61a40597483379922f5e3d0b28c9b9b9e75dca91c535e4695ebe57734c26f1484f61
 DIST NVIDIA-Linux-armv7l-gnueabihf-387.34.run 29406773 BLAKE2B af27fb1bfa8e432c83220f88c57219d572dfab2d3624c8702759a747f25ff962dba7c39028af5746e04c913c9a53dfbec8a46801bfa7e38df65a8823c4858cca SHA512 cb631dc3b851d84881dfcabee776c68a935853d03f21595acfea84a3efbc85276070f9d0958c0bcced1e66f42f25ecf3fd7d615c715274130ca24426da678c2e
-DIST NVIDIA-Linux-armv7l-gnueabihf-390.42.run 28680665 BLAKE2B 41ddd2870a6ac128b4988e724481fc43d1df902a6f87438170b39f299ab190e0facf61a53c9322f1f1ea3b9386b0df88c59beb600e44056c1c1217668f9bc9e1 SHA512 7c5ca46cce345d53f0991b6076ee62a2e777e5cb2b5b2612eaec88fb0d4f53e66d88b4978dfb15f23a80af57f1834dd9016daeb1d3b329cee1f4e0777afb5979
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.48.run 28693609 BLAKE2B 7d26448fc72ddb6919582557ac6e7ee6b23acfd441b62cea2bcafa79a75e15ea2c583d6462abd3f18b08ca150dcaae6e881ebe4b7ede84a1e32bc6da4675c380 SHA512 36a8857a586edee40e6b5c5c19fef3464a00b1f13b0e06fbde83bd1e17ac40ee3d6fda1c8c5cb52f8987b35c79226bebbee07bf05c5bf11c42388dcee76999a2
+DIST NVIDIA-Linux-armv7l-gnueabihf-390.59.run 28693336 BLAKE2B faf5ee3885838ae27606a5ddb24232e625c156d487fc91786c4b1f2f606e3e2c10ef6b3a286214ba1977773536bf6cc327a12012ef53555be5759e325b3004b7 SHA512 afa990f24928c70927c997c2a0a699f4cd536e7e5685a02d9911d720ea36b27a61eb5707a07c54b56d93f4b984eb6a3a5d3ada49c3bc0e6ad401a7b7524628b6
 DIST NVIDIA-Linux-x86-304.137.run 41504115 BLAKE2B 5938d4df818947e5576172c0ee9bfa42a2fc49a7a7a2b14128cf3b967dfea6d4523901b33283284d450cfadc2c6d72a82a1533b27ebb4b542b6b1454fe8ae960 SHA512 021c5a88d50489aa0a1c7eac14259e23542b93578ae339995a2e38b786d06d239968c07933cab3fb78a922cffc7e213d6fa3fe07e34065a9c7f03e24f8729370
 DIST NVIDIA-Linux-x86-340.106.run 38816967 BLAKE2B b3ab5613359b43eaace36de9a8ab753df954bdf60e5acfe168e270474e0dc400acd46b5dcec809fad3d59babdf52988b3b5a8c20e8a0253b6388b7eb60ff4ba1 SHA512 923da7d61ef89a7bd83e0223c72fcdc556ef31cb97015a129a3adbdc3aad29dbf49f6fd23dc5188a53722e22cf4ba35c6a98e6ca9fdc6c24bb72ab87153d8bc4
 DIST NVIDIA-Linux-x86-375.82.run 44633335 BLAKE2B 55392ba748108b47994bf272829a6476dfc23f7756e0c18d56c8e4d827968196ee70e521c2e6307c134ca0c85d59715db777583fb07c8e06ae7325d586a8117b SHA512 cbd6edd7490e0e5ef9dd2020c18eb5f75412993e06b9c4f1919f49a8ffdc36131a96d868ab51691fb5c4a661e826b000ec93363c9b168304f6498014e300bf24
@@ -51,8 +51,8 @@ DIST NVIDIA-Linux-x86-378.13.run 44397547 BLAKE2B 5b45bdceba75e214028b9f59a36554
 DIST NVIDIA-Linux-x86-381.22.run 42931990 BLAKE2B cf1ae154854860557bf3e4a50216f1373ff66a45535e7beec67392b1cd1d40a02d758fa3e1cfa0462145b912430b0d1a3b6de3e6d6ede8aa1f484ea0ab46f816 SHA512 15723bfa25b0f39224ad5098c784a292abe4bf1daafaeb2f1df910bbab466e666b848b12e50b0bdd45f83e2d81957425a63501550b3dc5eb8fe3e576a8a10d22
 DIST NVIDIA-Linux-x86-384.130.run 47539521 BLAKE2B d0b84aa6e0a41d7202cce247a419adad5c94d0d98feb83594644d8e0a9426d0c07a5b5889297bc830c7456a4e8cc165a3b23c004e83cabad1000bf5a6e1a147a SHA512 0ed01818606eb7309811a3cb0ae71e9906e318d579dfd85bafcbae498a27f801836c1f1eefee6791ec5d9c6a4c41d244c43b8329583ae4991b45171cac99638d
 DIST NVIDIA-Linux-x86-387.34.run 47797853 BLAKE2B 4ae211ee00e09fe385f24e05cfac3af28447ec18e7a7f53e7f310c210ec22f60094be087aae45d0ea99c90214a07d3c46ce6867984ac0ff6e56559693fcdf148 SHA512 ba9362123a75f85a0a5a9dcc95c06bcb350a8dff2db864db30a73172db44006fa39eee8e23cf959ab2012b61b922d1f0d7ab225329815737819f27d1be300b95
-DIST NVIDIA-Linux-x86-390.42.run 47248228 BLAKE2B 1a9ca86c8e449627d68e474f0c4226d55839b27d06c630a059f1a36007b37328b7be2ecf12a94b82722e088b387ef943c4e117fd1a35743b053959160950e7a7 SHA512 079cfae9ce318e30d8699c7a1e9b8fc528382be68605ceea16b5cb671d11588098af001b6cb4c66c904a248193742efc450e18101f9dda73c1ca101ab8aca2ce
 DIST NVIDIA-Linux-x86-390.48.run 47374800 BLAKE2B a17c85d141a5442cb9f5df7cd58d4f377f9deb74e214009af9d3e9a845c6d13910f33206e1d546eb9f8287f4ddcee7ba139acb86d02703c7bca33946d5b015c4 SHA512 9d80616abbf1f95c89bb3e6bda864708adc887a62ccdf8865e956c305bb013b0e54ffb3f495805363ee60a9115ab5fb38adf1534750a6afb69a457a4d034daeb
+DIST NVIDIA-Linux-x86-390.59.run 47889407 BLAKE2B cb849703e3b2d50b1169708b6037a1243dc16ea5e86ecd15ce1ca2a9754c09d59ca3f43500902261bcd7e468e3ca21d5f3f2d95905d716a7df838a92862f1094 SHA512 14ba06303c28715032a9efe30010b39a5b0a8f40e3e0abc86ddfc6cb4d686ce4bc2db8bfc2bb3d7a5f4de9648178d2fd54b966277900d95bd20dab8dec487385
 DIST NVIDIA-Linux-x86_64-304.137.run 70087133 BLAKE2B 8db0ade7cf64231ae11e6fc55a16a68a2f7b11a8bb7debb49799fee96eba06a3062b97fe539b093727623a1ed1067282813de047c2aeb89d93bf35a97c71aac5 SHA512 d7fae1e486005ffa2f2bf7f14f901bf5156fc784407a9acfea584f49bdab92ff5f4d0fb66c4c5b2800a461fc06aebb7d760bcb59f69ce4f2cb4e03e11816b3e9
 DIST NVIDIA-Linux-x86_64-340.106.run 69987642 BLAKE2B 9b5644a58169557bda2ca6b367909bbbbe9c94ab869a91a4df8f8446a1e66f051f8b9c67e10d809d7e7a319fb318be3c5d0f35862cb315fdaf5623ce8794efb5 SHA512 64474a2dc664142868125df3562ccb676cef02659c5e45d570a2f00f2ab172ba3e61ea6ca42faade1747516c9a0c8b2c4e7cd3037ee90fb072b0c5cae45431bc
 DIST NVIDIA-Linux-x86_64-375.82.run 77461911 BLAKE2B e7f32bdf1672d98a1fe98c82d80a08dd6f63b3c859df4c60124977dae19520a21e4239ff7be6c272243d4af9416320b5e166d8f100979daa0d005ea2a44fc16d SHA512 6da63b807d6dd7cc8ac2b794d5c9ab8383e3c0ce6a47adc600941545509fb40b5f06344781afc895bd83f2780b2bce187994df5684db2890f50b41adfee8f910
@@ -60,8 +60,8 @@ DIST NVIDIA-Linux-x86_64-378.13.run 76239469 BLAKE2B 0f2be330645f8d9d2828fa6d159
 DIST NVIDIA-Linux-x86_64-381.22.run 76581130 BLAKE2B fdb5912a775b56edf7dd784b640997fe683d0a32d57db6079dc5466a1a8dc1354cd31ff86aa1e993e0a33163e4c18f6a7aa990e334448ad069db3a5ffc4f1ffa SHA512 669a3dd0896d68ba8eef4689b01971b92ec1c54e6cf2a9ff8d3f281ae9f2fe402f079e76109b65e698d76798bcc7a9bb43da9d128fec59ac1fafafd1c4a1e42c
 DIST NVIDIA-Linux-x86_64-384.130.run 82260837 BLAKE2B 55b6f3627680c881821f5d20f05cb6c7941b1deebf28f22f6712cac73d07e6202507c9f3b98eb8fc59ca8ed0c6aaa4819db5fc5a331f4505887dac6f31774335 SHA512 301fa7d9d73a0654e0090bf4bae98896388c1f52453f1b886e320e36765dc529f802c509a2d518714f2b348df59f9c9048e01b3874819bde4f53cf98aaa2cfff
 DIST NVIDIA-Linux-x86_64-387.34.run 82784271 BLAKE2B b7140d5d6a693892df50b3ad2e20387673dec6b5ac609cc0300bdc4b4a93ca94849255699126e4d55e67f10e488bfe6008e987197ea239b1a1b643b4ae5c7808 SHA512 6742768f1258a028c9ba56ad1d72f27d7eea4b6bfd324ba29c7f057ab5819816bd728aeaf2a8058031dadcd4c51bc6d08f0e0e0e26c68ed57955e90d68ac5a4b
-DIST NVIDIA-Linux-x86_64-390.42.run 81836210 BLAKE2B a72c581b3aadb234d8e5230fb8d1a4cdbb03aa43434320e6cb3ef7b409dcc299d64b21b7c822736760fc12193da2d603009b8353312573b2b2a16311a88fc96b SHA512 6cbf02630ac79a5cbb37f442f4def2a196b4a9d2a3600b0f5cdc3c148dd59d07994a2cee2efe0ac4139b6543698331c07f015c37b391d4f00acab7b2f033ad18
 DIST NVIDIA-Linux-x86_64-390.48.run 81341723 BLAKE2B 0b787e7f667bf1edb6e5c4c1bfc7c6bea2546208148f84f044c405a857bdbee5c8fbeb4ce325375acf32b4d27d8a10c7f18fbcd880afe1e1e06f31997642c092 SHA512 47f4bcc0d88d1e80ed0c03cacde96301b1c657bec88935ee2edf9b96726620f70c747a174f1a8725b56f4812961878c01df02c249ac4810dc4aedf62d1152a7f
+DIST NVIDIA-Linux-x86_64-390.59.run 82725283 BLAKE2B dd7670d5b3919b0e092491967af0784ff29f4779131d89f12faf15dc2b16c329473dfadc228f4c7a1edf9b7f440a053aee8b2cb9c1f0a125ba74c314fd2208c8 SHA512 083bc6ee0b1b3ca9f48ad87a0fab24f55317451a63e50ff93a45ba39e3bf893a8c063b0d5e796c1b10652306328479422a361495682f0b5af63608bf9a6fa4d3
 DIST NVIDIA-Linux-x86_64-396.24.run 86545234 BLAKE2B be297b4585275362608cb5119c9f7f77bcf7895bd1320603cb5f8034ee5f1dfa6d0150e58d4a11dd4656b50476d6cb6a372c18db54d33fdd685250ceb0793d3f SHA512 dfe837804d01e903cdf980353add0227362771cd252e4a7d8aff99fc489e5535edfda51ed1a20b9d60e23f1a9e7312f23309c59c67ff0a09a9b9214e52f09077
 DIST nvidia-settings-304.137.tar.bz2 1481361 BLAKE2B cf52a55a34eeb03a685a683487af6a198ba467dd8ba9983cc75624a37a226373cd931d98e8448b7b8ed430c54be2118c7b240ed2a9100b19bec5e832e2f6cdad SHA512 676d1f70c9a78ee234f5f1a283412430a386fa604de211afba02806a45906c5e246a002989b724d74752178d28c92a268de1c98d4c87876797d991253f16b0cc
 DIST nvidia-settings-340.106.tar.bz2 1549841 BLAKE2B 3419467424bc05a4a36f588e326eac4214250686f54c6c440c9a46bab80b15dee77e65d5880ed4338c0fc421306844d20a4dda0d5151a8d49441ef5048ab9bf6 SHA512 670f8469d5127f0966794ed822492f16f7a84656530d0b96f1ccdc915e6c588e9f1417b7ce1cc741df256383292820affaa10784ab748575f4adf2f98f961a27
@@ -70,8 +70,8 @@ DIST nvidia-settings-378.13.tar.gz 2112676 BLAKE2B 7e3e7c20986c184ddb08808706902
 DIST nvidia-settings-381.22.tar.gz 2127491 BLAKE2B 7721ed9df7c01671a56a720e75768c80debe8520aed5a838e1e1d365651db2ae42b0cd21801c60aa18944f8d4751fadac206a388f1cf107a03a25ccb8aeb5c5f SHA512 79cd41b9c0e63b69574caddb62437132810ecb4cd07b90899976ae8535948f28d72021fc9a6969559909cf0f7a5d411b0202782970d64a82c636e7738c9d5681
 DIST nvidia-settings-384.130.tar.bz2 1633217 BLAKE2B ffc1381e680e94aee95752074c39163e48082615f92c6184c01fc7d21e20bf18308d30960db0db602baf89b34fdd295a715692446d21fb2491056ec707e8b844 SHA512 3d878552a78234347f4e51920e8358e56b42d595375e8fd2b0520c3495b02d6fc3877d4346354145c420acd79ff1e9607c312330b2a2e27781a3a576f8860939
 DIST nvidia-settings-387.34.tar.gz 1267616 BLAKE2B 62d2fd329417f54bf384918889603921065e0ef6d4fb691e914534a75ab0062a17d8f886c593cf772d29bb6b56ce30aaf7b1548191b2f9ad5fbee71770ed5308 SHA512 559c859c0740575ab93edce013587250b98d7d2cd55198b5103fe97423d31ed9f113d83c240c402404de88074c285a07e46342538610d3d5dade7bed59d60090
-DIST nvidia-settings-390.42.tar.bz2 1109291 BLAKE2B 34eb3712286c5dccf268cc478a90f37d0fe41a32d39226973c913bb50f1f9d4943f7c49c5b3d3a5f4726209f1b6ec0a6b0a8df25a33155c4fce1b71f563b06be SHA512 5907aa76cbcd136593c0b517c0a6c08764d9b14a90fa0951278fdbaa6c44c8d3149a902bace1f8203ba621af376030bcf7c51f3579edb1cb3152a97eb443134a
 DIST nvidia-settings-390.48.tar.bz2 1109673 BLAKE2B 5aae2556185cc3a1fdb0f0bf051108661c53868a41d38b46223e4e63447c57971bc565059f107e8a4474356bffecce359966621f463d529c6fc59b5d6706cf26 SHA512 8252f5258e0a3533645d78b8be6c08c5362421423bf4c8e648a4c11ecc1ea2ab56eca07e51e5064dcfa1e4d61b64f837728091bf3ce244526baef58eaf20f1b9
+DIST nvidia-settings-390.59.tar.bz2 1109110 BLAKE2B 5e8fe1da1c8866af1e54bf19875788fa9dffc574bbf34726aab5a8a701ce5335e006f924767ae3f65dcb217f94f00cbf0a1a7bd58c0522041b0b7aac7c9bc7e1 SHA512 67fae068eba7c2d34dcd3fcb8b3c57ebd26664a27a239e52bbdcd1a59d4285a93f022fe72a8dc8694bf604345219b77c70c3ba1303e2bc59d0acd6ff5f5f677d
 DIST nvidia-settings-396.24.tar.bz2 1115673 BLAKE2B 5b0bd156505e99a5b788fc61458c902cc1760d999b18c8c6309986d8c315eabc65cb2fea9ef6a823acbe57c4a11bf67938575afffb36fea91320416fe40a7507 SHA512 841470a324bb09683fcd863474f987a525a38213432be3bf4288a48671c674692f44642d260f3d2d0710e485e323153f867d0bda4cfa9b11d0e3c61a36370353
 EBUILD nvidia-drivers-304.137.ebuild 13647 BLAKE2B ff0bc9bc9d98a5f38ebd791c696291d6c88d0e10ab68509c73ae7b9e1f8b3188027627dd02b99329b551c77819a4bf2d77625762d6ff2bbe25c3bbe14afdd0e5 SHA512 617d92a8eca878b7a69b7bedead069b672d827c48e7531da49d985a913d4295039d8f5d9e2566c9ee9192cc5191bd3c70400310ea682b71c479df6082692e70c
 EBUILD nvidia-drivers-340.106.ebuild 14791 BLAKE2B 37ce91e71bb1f9514490830d4b7665e1f71b6873db1bf1ddc28199eb31ed74f8769a6c466692c6f4a8027a9a8b298a162ccd977955e5b966012fdbb2ad1401f5 SHA512 49e16155f009b68bb11926316c5c83d7dc87890c1210357ceaf97e0c99142b52a74783f4aef79e3488d1c036d977e82fdb049807a04c3123bba8dd4d32354804
@@ -80,7 +80,7 @@ EBUILD nvidia-drivers-378.13-r1.ebuild 15877 BLAKE2B 91ea0f5d3bf4c9a21ebd082456f
 EBUILD nvidia-drivers-381.22-r1.ebuild 15903 BLAKE2B 5801973844001f824db6e85d379a8567b879d6ff82ade650142049ee993952d17750ce4ff473ded81695e4ffa59b6ac71c9cabe7cd8c20b1e5e4976eeaa3981d SHA512 8c08570ac6487367948ff166e26a2ce9f1ff8d8f808fff6c0cba2780886f69de538e09699ec05974e98b99137dd3eb68ba47b6a875a356d09453ad61a25c9d3d
 EBUILD nvidia-drivers-384.130.ebuild 16122 BLAKE2B 24a59ab053d40caa6bace34cf34c4db8917a84b0e87efb463a9651d2d152dc497e8170421574a6be9b482a4af622c2e876c342921350ddf860d4c739fb87e15e SHA512 0820948df0d87a780bf9b281f89ac6413b259239ca1d476908e77aac60552171417a0a83d4233ba162dd72b7bb0ebe584a0e534308023eedb0855bba72606992
 EBUILD nvidia-drivers-387.34.ebuild 16295 BLAKE2B 0e6e77ed5654425bf03e358d5d8c539dd302d8ea1566f2ccd0604818dae31825127779a1bc735b28ab994db0e947afa32985f145c793bfc5a4f00b4bfafeb484 SHA512 15e1fc883e77bebf8e4642dbb3575f2a5f016083624491bd3b4b047d6fd02d5cc4c6987529819f19dbfc3dd741bcf73dc1a6143c7ea5fd64aa8429aefc97b8cb
-EBUILD nvidia-drivers-390.42.ebuild 16294 BLAKE2B f382b9931bd1713c2ccdb8b13cf3c29d0141c56963b4e77be149dc756805f5fa48add582b0046a4fa0d1518aca9da7dfe1fa43c1c59df73280c40feaacf00d07 SHA512 b2eb4c69a145747b196eae24bb7666284ac2117d0a2dcfe875ac90e4eb677c57be1e573089f00e3defe266d13be3e74a2d7a2c7a7fae4aa24355f654b7fc43da
-EBUILD nvidia-drivers-390.48.ebuild 16295 BLAKE2B dd1034da5571b9394ac1aae26d232ac16023558c01537924c58ba230456c472e41e7c3408cf2f65cefe7f0391bcfeaaf4995b78cf8df728c6f18830eb2c1ce90 SHA512 3d9811373b44054e8404450c1117279dd07b6176d988704d40fe869ff55fdedb478a140035a6b4527a7b1835df784ce35ad0b014ba59b9ba337f65adf5991e3a
-EBUILD nvidia-drivers-396.24.ebuild 16128 BLAKE2B d19595c6d96d4aaa8d1e376ec92c2a36712e8ffcd1ae9a4801757eb954b01aa019959dcd4370405a6fb0fa9138dd05cf602cda0588ecc827905d82174cd66a44 SHA512 522de4505c21dd43205db9eddf25ebee5e5198e42bcbb3a481876b78c7e954826f5673f8a746657b1009f6feb923b6e1181e7a437549f5d9a710ef29a26ab58b
+EBUILD nvidia-drivers-390.48.ebuild 16293 BLAKE2B e670a14833df9bbf55d62f65eed77fcf2c5dac7ae9223223e0fdf82d8c6a6781dc448ceb50aa5b2dbd03be397da0cea63af194b57e35c5fffd4958684f443aef SHA512 44f4bd8dcc17dc4163c5d21f92a447a66a53f3a465ac9f360f161266da263e381b14821f0f1923c9ece8a3abe19589600fdd44cbec9864f88605a28dd546bfc5
+EBUILD nvidia-drivers-390.59.ebuild 16293 BLAKE2B 6c9d5443af9ecc52a3ea24fdabc0e2966ca361e1fe99639e29900bdee3f7393d6994c6ee8f7b5586c92d97df633c73abf03532f189b58af6c832fcaf693972c6 SHA512 8741f85450d7119e74a43bd98b7b1764dba149822b56a58df1a4d1cc995c86bb73dbe64c7716333790196e20b5cb41ac420137cfab4a3eedcf8c9b02d0b354f9
+EBUILD nvidia-drivers-396.24-r1.ebuild 15944 BLAKE2B d3eb4e5a723d1fa41b21bd72b5572650aabc2c8a2506a0a60d242dc08074b63d4d14f47bc3eae39debf9652833b5e175a3fdb559960a11235ea69ed7b83323ef SHA512 bd1cd2345ee399b5d81c22b55da34bb39a8cc57e351aaa0194c8ee438b8c5ba1e5e9de9a5bea4aa05fe599195f7307fa47f8048f349bd6233626bffa62444a63
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.42.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.42.ebuild
deleted file mode 100644
index ed24dab5aa77..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.42.ebuild
+++ /dev/null
@@ -1,586 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://http.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	arm? ( ${NV_URI}Linux-32bit-ARM/${PV}/${ARM_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? ( !media-video/nvidia-settings )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.19.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 16; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.16"
-		ewarn "<sys-kernel/vanilla-sources-4.16"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-		ewarn ""
-	fi
-
-	# Since Nvidia ships many different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_pretend() {
-	nvidia_drivers_versions_check
-}
-
-pkg_setup() {
-	nvidia_drivers_versions_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
-	fi
-
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-linker.patch || die
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		MAKEOPTS=-j1 linux-mod_src_compile
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			PREFIX=/usr \
-			DO_STRIP= \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2.1.0 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.0.2"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-wfb.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"tls/libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.48.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.48.ebuild
index fab8a7c22cd2..3a6d52c598ec 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.48.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.48.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.59.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.59.ebuild
new file mode 100644
index 000000000000..c88bd1af6e03
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.59.ebuild
@@ -0,0 +1,587 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	arm? ( ${NV_URI}Linux-x86-ARM/${PV}/${ARM_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? ( !media-video/nvidia-settings )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+
+nvidia_drivers_versions_check() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 16; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.16"
+		ewarn "<sys-kernel/vanilla-sources-4.16"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_pretend() {
+	nvidia_drivers_versions_check
+}
+
+pkg_setup() {
+	nvidia_drivers_versions_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
+	fi
+
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch || die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		MAKEOPTS=-j1 linux-mod_src_compile
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			AR="$(tc-getAR)" \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			build-xnvctrl
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		doins "${FILESDIR}"/nvidia-rmmod.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			DO_STRIP= \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.0.2"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"tls/libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.24-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.24-r1.ebuild
new file mode 100644
index 000000000000..5a9a0a18482f
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-396.24-r1.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* amd64 ~amd64-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? ( !media-video/nvidia-settings )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+
+nvidia_drivers_versions_check() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 17; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.17"
+		ewarn "<sys-kernel/vanilla-sources-4.17"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_pretend() {
+	nvidia_drivers_versions_check
+}
+
+pkg_setup() {
+	nvidia_drivers_versions_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
+	fi
+
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch || die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		MAKEOPTS=-j1 linux-mod_src_compile
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			AR="$(tc-getAR)" \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			build-xnvctrl
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		doins "${FILESDIR}"/nvidia-rmmod.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			DO_STRIP= \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.0.3"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"tls/libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild
deleted file mode 100644
index 3b6fe230de41..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild
+++ /dev/null
@@ -1,585 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~amd64-fbsd"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? ( !media-video/nvidia-settings )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 17; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.17"
-		ewarn "<sys-kernel/vanilla-sources-4.17"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-		ewarn ""
-	fi
-
-	# Since Nvidia ships many different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_pretend() {
-	nvidia_drivers_versions_check
-}
-
-pkg_setup() {
-	nvidia_drivers_versions_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
-	fi
-
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-linker.patch || die
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		MAKEOPTS=-j1 linux-mod_src_compile
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			PREFIX=/usr \
-			DO_STRIP= \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2.1.0 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.0.3"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-wfb.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"tls/libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 7aee5fb0db75..c597701dba97 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -4,6 +4,6 @@ DIST xf86-input-wacom-0.35.0.tar.bz2 601314 BLAKE2B 59c2b03b79d141b71583ce3ea6ac
 DIST xf86-input-wacom-0.36.0.tar.bz2 611678 BLAKE2B b3fc8310514e6e07c3c25fceeb982d66e9e10730028af769cd331578a48720666a0872b625beb15c7f68bbb291293dfe4c4e305411310c67bb2bd148e7d570d8 SHA512 48e4cf945eb0f5c7c65d46153756372bbfd6d1f101cd90f609c71cc21b36fa671d98c7be0b52d519775c7e7b875ec441d4308cf70d7897198600553e7a93ccc5
 EBUILD xf86-input-wacom-0.34.0.ebuild 1852 BLAKE2B 3556b5b14f5775211639e77d9dedd7aea4243b98e82fe1913a2e50346132a18f562ccf5909d99501ed2933c5a1cb42005ed6b5e94b3123ba9340da9c4213c92a SHA512 e190da2d8eedb07fd74b6cbde5e56709be235aff114c0ca2f90de00221ad72dd2785d2b1eab3e321b688735fbf160c47d3719f5f5d690bd52c580f845363e0d7
 EBUILD xf86-input-wacom-0.35.0.ebuild 1796 BLAKE2B 31162072ec86bc739f196393d7d97d5fd07e45cc7f9fba20b8be587c383e76a4683c66b93eeb717422c49ea94b4677248958510c61ff97fc5c725d5be8bb295a SHA512 e361c2f8e2c102e19f24e638ff4aca3eb2a831b5244b098d59ce12ef722058114875ec5351f3b18a19311e090cf2bef38a0bd559ea808a53a9ce56e2125f31cb
-EBUILD xf86-input-wacom-0.36.0-r1.ebuild 1740 BLAKE2B 1b0226a589dd3d0896b488e517738c176051b36a8fdaeedcb7f46607c80aa63c6e650c3e85be08255b60550d8d07e47014d436950237574fbedf14bd0137e3e9 SHA512 25e75b18cb4eeaa65c12bf90264a2894b97e7f33ef8c4a4ce27f17898143e86afb093d7c071c33618552c5bbe772973c41fea36210cb02893ce7e4edfc1747ff
+EBUILD xf86-input-wacom-0.36.0-r2.ebuild 1859 BLAKE2B d6be9dc610c8f404fcca26cfb16c4c8e934d2150184f9d387dd1bcd013d5738bc13e46e56e86d053ace3d2d17b825ae23e96eb5f561be5bb2c11eeac92135569 SHA512 48c99a0900a4f7a815eaf90775929b639ad69fbade7672b9122c62bcff295e4441eeb28e5ab219d86329f325979975c166a6fc2e5a59b9bbe4f39873e067e733
 EBUILD xf86-input-wacom-0.36.0.ebuild 1788 BLAKE2B aacfafed4bfb275c658862bb7c47ddd3068a7ed9076d9b0e5267547a8df5c4f70fd7b434dc723cd193eda835972334bddafd9664904dbdfe4b47f343a808843f SHA512 11856ffc1d0b8336002ce9802115f62586f4675383bc7616cded1152d131feea42c74460ec3419aeeafa37efb4f807cf9d70e90401c74af1f7f13ccce64f08c6
 MISC metadata.xml 436 BLAKE2B 255853d810de0bc1d6fdefd359d613163d1277f2eb423e81fe29c3a699f4cee22731b52286d68c64aa3a1b579b3f723a5b86a8d45d18962d234f4f0cb316c7f5 SHA512 2aa103f44b3d36ff6466ac1fb010b25c649f1cc19d2db1d5c9b1ad54d954184eb7c55496feb58174bd466a9296f6c3eb269819b9036486a071a8100b1a3a6cb2
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r1.ebuild
deleted file mode 100644
index 4bcff4b9fed2..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="Driver for Wacom tablets and drawing devices"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-LICENSE="GPL-2"
-EGIT_REPO_URI="git://git.code.sf.net/p/linuxwacom/${PN}"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libwacom
-	virtual/libudev:=
-	>=x11-base/xorg-server-1.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-	)
-}
-
-src_install() {
-	xorg-2_src_install
-
-	rm -rf "${ED}"/usr/share/hal
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 3 17; then
-		if ! linux_config_exists \
-				|| ! linux_chkconfig_present TABLET_USB_WACOM \
-				|| ! linux_chkconfig_present INPUT_EVDEV; then
-			echo
-			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
-			ewarn "  Device Drivers --->"
-			ewarn "    Input device support --->"
-			ewarn "      <*>   Event interface"
-			ewarn "      [*]   Tablets  --->"
-			ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
-			echo
-		fi
-	else
-		if ! linux_config_exists \
-				|| ! linux_chkconfig_present HID_WACOM; then
-			echo
-			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
-			ewarn "  Device Drivers --->"
-			ewarn "    HID support  --->"
-			ewarn "      Special HID drivers  --->"
-			ewarn "        <*> Wacom Intuos/Graphire tablet support (USB)"
-			echo
-		fi
-	fi
-
-}
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r2.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r2.ebuild
new file mode 100644
index 000000000000..a941f30d9cc1
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info systemd udev xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://git.code.sf.net/p/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libwacom
+	virtual/libudev:=
+	>=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="$(get_udevdir)/rules.d"
+		$(use_enable debug)
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 3 17; then
+		if ! linux_config_exists \
+				|| ! linux_chkconfig_present TABLET_USB_WACOM \
+				|| ! linux_chkconfig_present INPUT_EVDEV; then
+			echo
+			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+			ewarn "  Device Drivers --->"
+			ewarn "    Input device support --->"
+			ewarn "      <*>   Event interface"
+			ewarn "      [*]   Tablets  --->"
+			ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+			echo
+		fi
+	else
+		if ! linux_config_exists \
+				|| ! linux_chkconfig_present HID_WACOM; then
+			echo
+			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+			ewarn "  Device Drivers --->"
+			ewarn "    HID support  --->"
+			ewarn "      Special HID drivers  --->"
+			ewarn "        <*> Wacom Intuos/Graphire tablet support (USB)"
+			echo
+		fi
+	fi
+
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 65d967aa9e5a..ea8512333280 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 097f8c61b274..6136509911d4 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -2,5 +2,5 @@ AUX libX11-1.1.4-aix-pthread.patch 300 BLAKE2B fbf3b97b3c7e70875b28a6813525435d3
 AUX libX11-1.1.5-solaris.patch 246 BLAKE2B 38bdf941f63ff7ca3adb13af2bc26e1248e41bc84ad47b58db88d63a0994ac4a30841c85a1d9471686fae517f95edbf5f514c7af7b90d79203e1ba72d4c8f1ac SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878
 AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf3fcb49f0e3a3acd43e4d0c1b5dcc3fe2e9a6556171f7d55712e37dfa6dc54d1c2463b872f310629ea24a131f945a55bdd SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251
 DIST libX11-1.6.5.tar.bz2 2361556 BLAKE2B 6001d745cd989dad2586690da69b8d67c68a4f148a4b3f595a7b58d5ed3a054928b302307b73d776a2a707f62c2d6d97453dd1484790ed8f4e9cf36ca4758148 SHA512 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0
-EBUILD libX11-1.6.5-r1.ebuild 1290 BLAKE2B 1b1e456d69ed35faf3bb7a7df7f6edcfc7bce477d0f05f80d7a2d6a51368de7a9ea24d5568c3b739786232ed092402a9d7022adfdae4e3aa3a375afe19db5193 SHA512 5ae01e03319613935d6dbb2d4d103c76f3a17e4b03185713d4c2e9b459142d2295d08feb5870ab72e37389b901cc3b7c3d6acf324fc7e97f43d250ea2fc803fe
+EBUILD libX11-1.6.5-r1.ebuild 1289 BLAKE2B d168c2a47f8f24bbf0379d2c1e9456a654d0876197c2dd5982619c6630ebfe4c18dc693165836563147dbd2eff58722fdfc03134bb4a26eac64598b36a048014 SHA512 9828c6c67426674be851e0e06bcb331db26ae2bf47f376c874792a4cddc44338e71014065955348e49b68e1b1eaa92191c13626ecba13a25e88b5c52f29e7a77
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.5-r1.ebuild b/x11-libs/libX11/libX11-1.6.5-r1.ebuild
index b05a688843a2..0d9033a57f09 100644
--- a/x11-libs/libX11/libX11-1.6.5-r1.ebuild
+++ b/x11-libs/libX11/libX11-1.6.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 7813169061ee..d2beb44d26ef 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,3 @@
 DIST libXau-1.0.8.tar.bz2 295297 BLAKE2B 46c0cdf3382a75e197e48d556d44494dc8a91483fa27c86ae1b4264deb63320637232fe94d1286b38ba8f4efa5405f4b5c476266963ee3ee43b934af2e0a0e53 SHA512 9f933d22f8f2411ae770094589cbe170c631a1437d572664e0fa6b9608e6ec39deef752f2dd6408ab45acdf01bf1827ef3ced640a33da787d9cfb546f12397b5
-EBUILD libXau-1.0.8-r1.ebuild 501 BLAKE2B cd2d0a2a10a250886657db760012a381934a3cc6ef855d221a11cc5a8072dd4fe85f448053049e8b3a371d4beb4e2c7f0bc2d3fc270482b61b7c5bd1531f31cb SHA512 bdad25545aa19757abc1b46c77dd2bb702bcf4187a963e68c596bd99acee737546ea4b2946d9e9f1f9677fdc180c054f8d3b2716a041915d640e27baf01ec3cd
+EBUILD libXau-1.0.8-r1.ebuild 500 BLAKE2B f75307e9b2255ee7c0b90b19b780f65be63500cec11b8d68563c25560d23c06f781a880586a530fa4965a8327a14089da7281695e949330115da4a6a3081d312 SHA512 73fa7b32e216a17997702d384cf5faa41d3383742680c5856cfed77bf9ed9a1917455829674b312bcd007531a7469249f7893f0455e60a144cfac9d476a3978e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.8-r1.ebuild b/x11-libs/libXau/libXau-1.0.8-r1.ebuild
index 43562b465718..9426c2577a1f 100644
--- a/x11-libs/libXau/libXau-1.0.8-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.8-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 1774c46ecedb..2a8aa19101b4 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f
-EBUILD libXaw-1.0.13-r1.ebuild 903 BLAKE2B fcc9cb3a5cbe6764eef04cae8dbb5706fa6c0f787928ae903f73b392c7b3d6204c6d19f1f2e43cf715f47cc70f4983060668d12c785c96f312998cf4877b8e7c SHA512 a515ed52ae88aea203ba4710eb533221c5439226320990a57e7f680a163d58dd527abecfe6b024b4cfceb6b3700441a3dca3a117c6ebb0499251726b046b48ba
+EBUILD libXaw-1.0.13-r1.ebuild 902 BLAKE2B c0f6125660dcf12ac2b5a0b6dc9631496f90fdeb552a809632bf07cbfa60f326be90407051cdff1f69232644d4912c213de6006b9d7b0dc8c7b6211d1ae9b165 SHA512 c6759f7b4e114418e8964d2abab7bb7c34c9ae8d59ab3774c7968f5a6fd9aef099978cbb08484ee2dae2229c5d8d60abc1fa988ed2f4a76e21e7f3937647ff74
 MISC metadata.xml 308 BLAKE2B c8b1bdf11408b82ade3364323648bf367d76ddec0711a46f3662f4fe34aec46918c7acc617a782312725ab0169e82c25d480194a2ff22bc3429f5f3c1d4e434d SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
index 30049f1229fa..28e032558011 100644
--- a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index fdbebafc9b69..c15786e682e7 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
 DIST libXdmcp-1.1.2.tar.bz2 331518 BLAKE2B 1a6f98d03a2bce62cdf34be641096e0628ea133a1d2ce33d4cf35550c6cabddbe3519265644d44bec491bc246d7e1d361c86595b56d1d59fb72baaf6d1919316 SHA512 f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb
-EBUILD libXdmcp-1.1.2-r2.ebuild 697 BLAKE2B fb7be0b128bc3b20934dff1df348e805c2d8c63de6b31ea574c553d5f2b35246aed3c07e65461fc3b82a62f9f90590d945e5a844d63a2ff674f7c406e07928ad SHA512 01d9e35b2683a8aba563990fbe4ce07fadfe54456be40707b518a5aaabf14348b3facd53ecb28d00038c2a486e0a6cbb4b21905ebaba7b7d8d5e073337f176a3
+EBUILD libXdmcp-1.1.2-r2.ebuild 696 BLAKE2B 44ac849e41111f18e9ce01ab49e9953354e9a59fc509170eb3796a907bb39dedacde904fa5260ef32608365a340322c716a1a62e82e00d4548051ab446c0ca88 SHA512 58a887d0c101c7dcb89051a1a1898e066b0ea4251f5f8bcd1aa87e6a8a2efe346f85e3eb7ac66c4cf807a4fcec52d64081687671e91e81606e2dca7c53b9ee25
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
index 0022986da202..b8f338fe220a 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index be8a83c7f71e..384bfbf74c2e 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,3 +1,3 @@
 DIST libXt-1.1.5.tar.bz2 771567 BLAKE2B c3624f1ab81fdace1b2eef8749807e9a2157ec6f60e2f5f8b463aae088057d4eb82f9c6de547e286798b98f68be8f8097ff291b490baf49a4204e62566c1a9c4 SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b
-EBUILD libXt-1.1.5-r1.ebuild 755 BLAKE2B 645244cc1e3322d6e0a6bb395eba90d386e6cbb6f2ce5eb8e0b47c918b9996b0a1b87e050b7c041a5fa7ac233dcf5672e64ac5a23d3bc27f67e658a4f515a7d4 SHA512 698e78df059ef87e0fe19d97bb8397e436f3d93425d45068929e04c55956625edf1f436092b00c825ae8cfd58788dc167247eeeec343e9da2275f78f844a0733
+EBUILD libXt-1.1.5-r1.ebuild 754 BLAKE2B f31bf4bf4c9130b09351f0d2082d47b7a3fb875365623275f2ff1ed0eeb7ac2e9161b254cb3792db17bcf693b958b8aa67dea1fe379ae75a8a76161b0a312801 SHA512 539cd108f5ef7eb63ac7f4c2827ee4c527b3c5e4e928d312ffe851976cc3d4176086d1b4b6e9588db0a349b67818f6a65e32f44185e5751ec07715cd6bfd62fe
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.1.5-r1.ebuild b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
index a431f50bb83e..01e3155a1e8d 100644
--- a/x11-libs/libXt/libXt-1.1.5-r1.ebuild
+++ b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 33dd17c10802..d5a6e456ad56 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.34.0.tar.bz2 739656 BLAKE2B 8e235ec6332125046ac952c32bb3d6d2adabae01f121a952f62aed66470c367f31268f7fc5d4387db5e3a6145cde4f013871f2d82d2d8765e5a41cb8247d4761 SHA512 755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418
 EBUILD pixman-0.34.0.ebuild 985 BLAKE2B 5e4b5039ca4a7677091565c4d16df6b2c16ed99a47c677396f9afd92ca902e536232eceda36e2befc5fa105cd259c88d57dd03fb2a6ec49c60baa4684bafab63 SHA512 447485399d2818149526993c184b2c3d9272c4dd5f03b19d2e33345394d7715477e92fbce620a3b443c37c342ccbf59b41e12964f57b42726eb83bda0033a5dc
-EBUILD pixman-9999.ebuild 995 BLAKE2B 5c598139563f9cd2046b952c38c3ef02c3ebfe79cda2229ff21092ade8756b0702699c625e8ccb7be8804cdfa0c97c770d292132ccf8883f5228e39df1953d49 SHA512 802f11a5e00590e76fc2c09ffb136a3b14af92898903b90dbe398518213461a692652cef10cfc6acccef41424e7c64499175be67105ca920e146459cf9e8c358
+EBUILD pixman-9999.ebuild 997 BLAKE2B f52078ba688d6ca303ebe78c4cc0b3bacd597f52ca16274e26d8a5272a2cdc40dd8e3a0d69f228b46b8c200b42bc4c63287222eda3f47568b40e2439b8adce0d SHA512 bd1b90d98fe6567b632cb27915351981b820666bbb284f84a19960cfda57602b097e289c8bbf4b662154bbe236bb72a0e11dc62b14c511f8554f4873b078b9da
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 983516d40153..1ddfad8bc90e 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 XORG_MULTILIB=yes
 inherit xorg-2
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/pixman.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 if [[ $PV != 9999* ]]; then
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index e6f0722bee55..602015012a05 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -5,5 +5,5 @@ DIST qwt-5.2.3.tar.bz2 1983725 BLAKE2B 24c9d5c9b660ec082266a02da59b89ec0f8f4eea0
 DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
 EBUILD qwt-5.2.3-r2.ebuild 2613 BLAKE2B fda982614ccab5f7b36cb731aaf3fe7788d5355407c91dec6d87e213f24b4d652cc03936af928f3d670a988c95f16f1b31e0d2a5bfd4f27f418428b6b90d1d8c SHA512 d1cde98eaebe87e74f0b40f4743d3ba0dd4a446c9998694083bd8514d125dc16cabef377c8a83a24301f51fe7013e3bd1171320a6aaeb6338eed5d0472f4356f
 EBUILD qwt-6.1.3-r1.ebuild 5225 BLAKE2B 051ef65837e20d1b1a6c648c9594929d066472815bbb94ec899f08ee587bc8a86b18eae80fc72187cca46f11838911f9bd48211418f5a869d2e0870ddfcce88b SHA512 7403be5bc87671de3f4cd4da98b4e099d392cbdf65e35d8806ac17ed04a2f40da7af332fc0192215320947155734092833be2b8d138bb2c1d8a9cf27dde060f8
-EBUILD qwt-6.1.3-r2.ebuild 3832 BLAKE2B cae78c7d35232ccbf0ab27114e1125dd8a26d546153f0681b2f00760d9104395fa48383d8b1c9266a44c857856289c4cf62555646e0d94e3b5865df15ec90d2e SHA512 297ecf27893b693a770ab77a15977d4c0e74eafffd31de339d51e221245f3f30fdfa07457363c8e8de2bfa9f1494e6e1fbb23dee60940e654438874cf261296c
+EBUILD qwt-6.1.3-r2.ebuild 3830 BLAKE2B 34d1fe20e36c4d992de66dcfe7622871f7d57b5baca0e772ffc6ab636b8a79ffca6a73188390b45a963b5546721722439284dbff7222c1a29d95aadf9ed404c8 SHA512 34a8c9681c93bf4c4207a6ecd18db1eed4a96d2b03e88f56e7d1b81f5e7060af518189093f8234c6f9b3fffee56e2720ad89d2284979ec069d3b8b11574d3888
 MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
index 2159276a453a..67e6b47a6949 100644
--- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://qwt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
 
 LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 SLOT="6/1.3"
 IUSE="designer doc examples mathml opengl static-libs svg"
 
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 39bb7a91eee9..fc322ed39e4c 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,3 +1,3 @@
 DIST xtrans-1.3.5.tar.bz2 186833 BLAKE2B 890506df749d9a1e873ff626614bfd0989115916a896baaf811d0e1568fc939073f8226b096dfda86f5c917b7af72478560fcfaa7d8fb160107f9adddd0091d7 SHA512 049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b
-EBUILD xtrans-1.3.5.ebuild 707 BLAKE2B 6fcfb41133913a75e21f00b103ebc3d6a085be8ba0bbb1dd04f98d42046dd93497ba98f0bce1d6d19deb4ae9cd514102be6f1dc8cd5f84404366d86c24f632fd SHA512 1b870bcfa57605e332c6f41b0d366addb26aae82481de8f406c68fe0fde24878b6a4165c38a4d83d3905401ab90ac804971edda002e61c985b1091ba7e6b5bbb
+EBUILD xtrans-1.3.5.ebuild 706 BLAKE2B d349ff4c2b2099c839c1e17a84173bf2d779806965e85df032f2aa25d349fd7c076750eaf0341688336dae6ee24b0d1d9552d27f3be75fd4952c5995a62677c0 SHA512 5fa4f3769640718c43165f0079237a0388d978228f90d50444fe15dc345f2a0a0b2257993561bac7f46581111481dc2e671787170d8f448486af47c797f8a4af
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xtrans/xtrans-1.3.5.ebuild b/x11-libs/xtrans/xtrans-1.3.5.ebuild
index 5dad3bccc2d6..e14fffdb7424 100644
--- a/x11-libs/xtrans/xtrans-1.3.5.ebuild
+++ b/x11-libs/xtrans/xtrans-1.3.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
@@ -10,7 +10,7 @@ XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a14a740f0d08..0abaea3c4825 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 2029e97d3e17..bd512f9cdf5f 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,3 +1,3 @@
 DIST gigolo-0.4.2.tar.bz2 243877 BLAKE2B 7536d8fc1a10abb465b2150785f593c88b4d0a40fc76e1f88388a1631f874ccf0169dec9328b1051c39d6334257c765b409aefeb008a4dfd30bdd9e61d43d269 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532
-EBUILD gigolo-0.4.2-r1.ebuild 695 BLAKE2B 4907c4eb22c5532089bc86e8694a31ac7a5128eadfe9a914b8215abf54298a21e1fe58bcc31f07c53523e31751e7867598c62f9f683f76fdd621088eb29cd91a SHA512 2b5e4b5fc4c7d60d01e327022aa13e57537138b41d643237b424321582aaaa5089dea202e87a5396f5664b45f3ef51775a728428060dce7a5b337e832ebf8653
+EBUILD gigolo-0.4.2-r1.ebuild 696 BLAKE2B 63254c84c821bb92b0ae7144bf1a9d821e1b938b5adc913506042eea649ce0aaa388be9d6ac75effbd80ce960c1e3d8f81b16e9753b8928e9f043ab730a387f9 SHA512 9f89293852bf9ebfbdd8a62047a5a6b0fec965cffffc522283dcb3313debb24326d289e6a9e0683d7ed4eaec18c948f38416f866bb87ed71dac87d69b35b472e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
index 1de0cadb8c63..0f8a1215a551 100644
--- a/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
+++ b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit xdg-utils
 
 DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
-HOMEPAGE="http://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
+HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index 6d453e465c9e..03973465d30e 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
-EBUILD i3blocks-1.4-r1.ebuild 765 BLAKE2B 02caadce1f62ed54ee08e5dec2e2d43dd0e0b6ef5d315b9802ab659314c6d997d39f0774f36f07ae61dd0eb45b898395dd5c47a5dc4a371181636025cfc526fa SHA512 f9ba4dbab272cfe526ebee27f9280d33a3bfc930ef1cdd63fed7d340d9aba3cc7c44e2d4b96e9bfc66faade5c37c8cf6dd1f3f1edb926990d9f22ba8cf16e020
+EBUILD i3blocks-1.4-r1.ebuild 772 BLAKE2B 95b265f0688bfe391f387915d9c97a03e24108c43962927f7673ce517290b01217d96db7bf54d400956343cb552d188385b36e8116ed9d99d1288b3d3f4c3203 SHA512 b062e292ad61e9060bcf5255344ced864190f0c355580467e633baa47681766fedc967959ec68ddda8f83b8b111cd13543184c483d8ead2a558082752f220fe1
 MISC metadata.xml 331 BLAKE2B 4e906b5d485968ff9cc55dca82cbd704cc57a5ecf77c230bb7fd6e2a910c236bc0afa1d457f4b90b758ca5ecba0b2505512fc21f7dd12179d2b275d425430a14 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index 426e5ac2b8e4..e481e6cfda3b 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vivien/${PN}"
 else
 	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 SLOT="0"
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 4506c7dda4ef..f1f4e823600a 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,7 +1,7 @@
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
 DIST i3lock-2.8.tar.bz2 19884 BLAKE2B 67d04d91cae22f14210cbdbcce1a2aecd3eae0d649c8182f044c1c6bec5c8e63ab4cca647fcd3c2ab61c600a83157ce0818b566b59a632b509390f9b4d069a80 SHA512 b0f2f2837e275ffb2874aec75cd5d7c69864f8861de5e3e6090a2bf9254a14f8bc141256b0faac3e30111f9612e97cc087efde0da939854fac975a87deb06e3f
 DIST i3lock-2.9.1.tar.bz2 20959 BLAKE2B 05f35e3cd8fa45dfcb7021d3df19eda85ec3ebc4be9fc5b0900d88569d078bc4a773e6de155f76c13a45c9c914e47171c5ba000e6ed3cbb3b50cd4e847b78aaf SHA512 9b1bfac67a97880e61f8655a9256662ceec51850005298f13247ab570c03715718db84b1afefa979fb9a53a011fa20958f38d05f5378becf7803ece3e804faaf
-EBUILD i3lock-2.10.ebuild 665 BLAKE2B 0876f897088c71ccb70e84a4154ad495e5bbebbdfaac24f10943db67de32662ddd787d82ac408585e813ffe98af4c1a5225c8c29dcdd554e1e818909115cb6db SHA512 7921de2d45369d490400c655f901b16f900961a491edc2e0fd887ea9bab84f7e99a14cf32487def1201134e72b0414ebbd48cdad766136d4053502cbe9288bd1
+EBUILD i3lock-2.10.ebuild 672 BLAKE2B dc61ec5b79951a8b3d3002be93b8d13aaacc3ea8684cf73cb92282d96a3cac03ccc72197760568d0e4b1c7b7c1d1d09ac6c9c54ab85947979b168b4279ada227 SHA512 c3470da5fc1adf898b78fec80836d2c1dc2607525101e00ddf23beb60e435cf6ca742fa8b121c982be89b7fe534feb583f313cd16544050d0c11e292106bc57f
 EBUILD i3lock-2.8.ebuild 678 BLAKE2B a5c8ebe54d6dbedc67ed3ef7a670b54da8ec83a9b9f6873ccf1804e15232f5fd96fd1ccc9f4112a47d72941f5ddbaf2f310b496b84b27c3d58f22cc706bff941 SHA512 6e563e5decd47299172fe2918da28810ec167ebe856795218fdeac850015f7562d2ccedaf29943bb5f74131ef1d459e2b344791f6b06af6daaa320a2ab40f65a
 EBUILD i3lock-2.9.1.ebuild 660 BLAKE2B 4968be77ba5f5ecda76bfe3674b40a3fb19ecf2d8a1abd9e3ee7050ff380f9017c1822054be71dd40ebc4a2420b1527a418ae22c0b02b051ca8ecfa640f52abb SHA512 6b4e95f87132276d0750dc75e8947b8a32ffdcc06c6a0d88805a6f066c72dd511d25b7ff79da422771a18e50839d9c40160d772ecb4e58f6fda45fb14bfb292e
 MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
diff --git a/x11-misc/i3lock/i3lock-2.10.ebuild b/x11-misc/i3lock/i3lock-2.10.ebuild
index 0b51ebc8e525..7cc7504d5245 100644
--- a/x11-misc/i3lock/i3lock-2.10.ebuild
+++ b/x11-misc/i3lock/i3lock-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index e2f6a47b5c8a..ee42775021ec 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,5 +1,5 @@
-DIST kapow-1.5.4-src.tar.bz2 722095 BLAKE2B be90609a3dd6a6b521c39ef0fb4a6a20ec193f816a994f944f5083888d4e883829b2249c3ff0e0df6f232f87e33f5abfbbd0b4b624a1165a75c3fe8ceb9cb21f SHA512 03683e7a4f904c4b6efdf47401d8a15ba979484d52d58e4dea52a890351ba9342ef5fe383876c5cb8138c6d578122936ca7e9ffda0fc5eb090e719eb751764eb
 DIST kapow-1.5.5-src.tar.bz2 722262 BLAKE2B 5f1c66b38edded3f2ad1d76d97dab036264169176647a25dc618a6e4149b40f4d4ed368edbac7786440ef49fe77e896db084edd9c210cd278b92ba175d49c63d SHA512 d22f8c1de74333b31b49ec752118ce36624895f99073b4b3f57a78f32e331ed33365b5664a316604e573820d38f268f0ceb6531bbf60eca05aa4a09fe5436a20
-EBUILD kapow-1.5.4.ebuild 652 BLAKE2B 0b33b48374071d3d97320a7888b565a7c36fddc284d6b15d407c75b3fc7b6ee45e2b4eec9bbebce753cae4242ccc957d324e80fbd6f923745d6d5922830a3690 SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e
+DIST kapow-1.5.6-src.tar.bz2 855057 BLAKE2B c0d5afefa4caf0f1be243e8e2e5dad80e52bab4dc856791d198d009a90c864aaafbe2eb624e114f6331c685b2bbc1664add045de9ed46699f865481461968423 SHA512 b0d1e1ed3cbe9a4a4e253399de4ec645f832a10633275b122729dd7653bbb40c7cd473251459fe1e0c35be314a02c704cac3fd25cb7ee498e282a58df6cf06a0
 EBUILD kapow-1.5.5.ebuild 1279 BLAKE2B 989422cebbf4529834e808b86ff4bd411a354a21fe50de1243943dd7cf54a02eed31af4cc269918f8ac839857ec162901174848a6dc15e80fdd83e10741deea3 SHA512 8f254fc7fd102555bb3a3143c4f1a60d965d5455764638b5010004c9b7d5819ace6e485b8973c051f437963ecd84a9f759487367d0b18acbaa6ab4459ea40b43
+EBUILD kapow-1.5.6.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/kapow/kapow-1.5.4.ebuild b/x11-misc/kapow/kapow-1.5.4.ebuild
deleted file mode 100644
index 4d8914e38d21..000000000000
--- a/x11-misc/kapow/kapow-1.5.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="A punch clock program designed to easily keep track of your hours"
-HOMEPAGE="https://gottcode.org/kapow/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-	eqmake5 kapow.pro PREFIX=/usr
-}
-
-src_install() {
-	export INSTALL_ROOT="${D}"
-	default
-}
diff --git a/x11-misc/kapow/kapow-1.5.6.ebuild b/x11-misc/kapow/kapow-1.5.6.ebuild
new file mode 100644
index 000000000000..2dd79d2b2ec0
--- /dev/null
+++ b/x11-misc/kapow/kapow-1.5.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="A punch clock program designed to easily keep track of your hours"
+HOMEPAGE="https://gottcode.org/kapow/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+K_LANGS="
+	ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk
+"
+for K_LANG in ${K_LANGS}; do
+	IUSE+=" l10n_${K_LANG/_/-}"
+done
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	default
+
+	count() { echo ${#}; }
+	local lang_count=$(count ${K_LANGS})
+	local locale_count=$(count translations/${PN}_*.ts)
+	[[ ${lang_count} = ${locale_count} ]] \
+		|| die "Number of LANGS does not match number of locales"
+	unset count
+
+	local lang
+	for lang in ${K_LANGS}; do
+		if ! use l10n_${lang/_/-}; then
+			rm translations/${PN}_${lang}.* || die
+		fi
+	done
+}
+
+src_configure() {
+	eqmake5 kapow.pro PREFIX=/usr
+}
+
+src_install() {
+	export INSTALL_ROOT="${D}"
+	default
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index ff545db718b5..d8e92c99bd76 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -5,5 +5,5 @@ DIST rofi-1.5.0.tar.xz 354232 BLAKE2B 2478902542b994ba06c4d436fa9436659366e2416e
 DIST rofi-1.5.1.tar.xz 355912 BLAKE2B 710a35ab82bf960b331431be3cc3acfb5cc27b42d7fa8b02e8c070918679b90612d89f600a6e58215bc0a08dcb60087ea37a5498fa8c4ac39d246d5967f0b314 SHA512 32074e931199ff1529ebab8fef53d339eab09843888f862953b7d661323484ebe66d820feecc42604a16bd683a5af1ec4d1a2e7f097f408efed6cfe91c4eb5ff
 EBUILD rofi-1.3.1.ebuild 956 BLAKE2B 5d895c9370bf82c6e5470ffcfd15909a79a67e55a20ab33bb39407312832658e604a823e90e3922a9bf7a25dd3d73dc7f31cb1b8d8993f7797303fdfe52f3807 SHA512 d78be7b3ee5cf1b19e2761a746b0286185bc9f1b7c19526d2234cc33b0f6d1dcbec269be43eef672c77fd6a1a3b11d9b049fdf2ff38b2bddfe8c805c19d5b3bd
 EBUILD rofi-1.5.0.ebuild 1143 BLAKE2B 0c2bf36ffb4cfbcbfa4e815558ab64452f642e12fff1307559b3b7d13cc82f5c332db11de061709d066e8d06379a0a9d2fa11db28143c67d5ec808c211ac2d90 SHA512 c6b8ab4ea5ac3c6dd0db8f182e49e55a1660fb7b5b79ddf1bb2e04161d4415afb0a5f21b90de5a3627cd4ad5fa1797fca8dc9fcf36a5b800574a46646df6d319
-EBUILD rofi-1.5.1.ebuild 1143 BLAKE2B 0c2bf36ffb4cfbcbfa4e815558ab64452f642e12fff1307559b3b7d13cc82f5c332db11de061709d066e8d06379a0a9d2fa11db28143c67d5ec808c211ac2d90 SHA512 c6b8ab4ea5ac3c6dd0db8f182e49e55a1660fb7b5b79ddf1bb2e04161d4415afb0a5f21b90de5a3627cd4ad5fa1797fca8dc9fcf36a5b800574a46646df6d319
+EBUILD rofi-1.5.1.ebuild 1150 BLAKE2B 332daac7b4cce8741bdc2b00080a04df283d13d9d5b986a0a5459b2febce3e3a521791376a920b895e7717f8ff61fc0ed5f0cf5398fa4e24f0b36e2445a1f7fb SHA512 121484af2d9c19d5601b2199343aa88c639fd3fc0522829d904b5bd5a2bb6ec247c570dfb404dfd674a5ea5ece17eeddbafd786c3249f460a194992a86f94960
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild
index dc85085b3148..d9dffef044ca 100644
--- a/x11-misc/rofi/rofi-1.5.1.ebuild
+++ b/x11-misc/rofi/rofi-1.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test windowmode"
 
 RDEPEND="
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 07f618d7c99b..48b3e132911b 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -2,11 +2,13 @@ AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f
 AUX sddm-0.14.0-consolekit.patch 322 BLAKE2B ace6c045ab0282eca8bf8a11aa8aa2690fac3ce7f712cd71e48bc9ec8f04dc18b9afd997d04550ade8a37a24a66e430f6b5ae8e752345c7c132cb95ae61b2e73 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a
 AUX sddm-0.16.0-Xsession.patch 606 BLAKE2B 8d437038be2b5fd3934174320aa14484ddd5de5b3d8529100af2679b4cb8ac2ef846ca2812ac8136b7482cf8010d724e37555636304fbe1e72b3a53c0d6b5b1e SHA512 ce01832d8af011c4e244c9357f540182cdf3b7af8d00616132f94c95a95b32df41beb1760ac8cad7a0a5a34165b8b289df0308656268d67f9bc420b5d3fb40f1
 AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60
+AUX sddm-0.17.0-consolekit.patch 1192 BLAKE2B 1ab5dfb6995fffa033990380c2a82baaab77de8f95c9b28b301b7e6e4db0de0dcbf84e0767fc404d75361d6171c566c9c44cc52c741f884fe7cfc93f53d42b9b SHA512 f05b88d8faf63dc492e0177cc1f7296074738470172fbf9b97929a035fecc4116388d839a8ec504a02008a3f14be1a4780f8796e3dec2269ef8d59d96282a7f6
 AUX sddm-0.17.0-logind-race.patch 944 BLAKE2B b92897b1d1de88de5f6edf9862221bfa56c1d5294177651431099dd09c25435037e03095ec2fb3f776cb190ca16808a9caea35282045ca9e353176dee75883b8 SHA512 4e4c388529dc898da2b8983f46e809bc2939cef02d4aa605761cc9978b4946121cd2d949353bed3d19a14cafd1628fdae3eb928dd56f81ddc976005cafb4a939
+AUX sddm-0.17.0-switchtogreeter-r1.patch 1891 BLAKE2B 1d06c1fbca6d7c0af8bfd4cc0f4cdd1bd1f60fff32626fe74763bd6c3a3cff30d13588471ae3377db8b272233592250079dfec2150e62f30f2ba385451044701 SHA512 c8c1f11b82521343422e1d792c53ad2a9f101210df5e2bbd4767c1c5d7ef637d750fcc8e9e00544f8260c522d7a8463e2b1f4996c611accd0b66a73fae4b5232
 AUX sddm-0.17.0-switchtogreeter.patch 1873 BLAKE2B b54ec315ceff3f6f2541a1a6436187fc684e347b00fe6141e0b30e580d04e722f96b320677f7b8f7dd5f5bf91492b05f04a81e4ef564c831d9bd84de2ea68988 SHA512 f50b3c23baaaae6bb605cb7b4eb6ff24bbfd3e5771e44a24d54f1843b727f9f02cdd2cb0aacd832e110e4350870e76bd4727492d0b0f58145d739181a1815963
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.17.0-r2.ebuild 2260 BLAKE2B 3534b7fed704f024f923da35bb1768c55a53a375a46d7a45bad31b7fae0ce8d210ee12e4e0d1fc49fa27901b39a056e295f5e876b769fc2f0e139de926ea936b SHA512 dc610ec03262b560f973f59f0a0bd312c992332244620ee7e289286113a6380ccd67b39eb041c8d5b6f7bca72559ab2ca2471d3eb5d85ee12fa51cb58a7edeac
 EBUILD sddm-0.17.0-r3.ebuild 2311 BLAKE2B 39aca6a331d7b3946362cdc236681db3bc157a9383b5567927a5126ac2c4823e85a1b4cd590c33ffcb661f83915711e4dc395da9b8e817503248f3a89b320bcb SHA512 089e9d907cfec936b4f24f51c555b1b0811da2b83a79567b5a39b476e8dd2ef3a51c94f48a5e11fa34f6f56cd2de361a1ebdab7aacf23df990869571704c4dfc
+EBUILD sddm-0.17.0-r4.ebuild 2374 BLAKE2B 1c7f4137d94de2ded2f0137fc20384f0733bf1ae722b562bbfcca47a6472c60d616f833a6165979ab47b12e75812b10086755e8cf1dbd95b11b58c67c1ec7661 SHA512 b4ca829a4de85d7398b27a5090f7ba6e5b360ec05738ce7713063ea540c6cf05dfb269b97d35e8260886f17b440495c70de81259df4db59eb41f4311bc975709
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
new file mode 100644
index 000000000000..ca265d131454
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
@@ -0,0 +1,22 @@
+From 7bd9f322182d840f3cfaee9a49f5cbd5f426aa1b Mon Sep 17 00:00:00 2001
+From: Erik Ridderby <tech@rby.nu>
+Date: Sat, 12 May 2018 08:04:26 +0200
+Subject: [PATCH] Fixed typo that prevents ConsoleKit to be detected (#1027)
+
+---
+ src/daemon/LogindDBusTypes.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
+index 79c70312..011bb7f5 100644
+--- a/src/daemon/LogindDBusTypes.cpp
++++ b/src/daemon/LogindDBusTypes.cpp
+@@ -63,7 +63,7 @@ LogindPathInternal::LogindPathInternal()
+         available = true;
+         serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+         managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+-        managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
++        managerIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
+         seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat");
+         sessionIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Session");
+         userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User");
diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch
new file mode 100644
index 000000000000..35982bceda21
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch
@@ -0,0 +1,54 @@
+Subject: [PATCH] Fix switchToGreeter not available without logind
+From: Alexander Miller <alex.miller@gmx.de>
+
+Seats can't be created until SeatManager's signals are
+connected to the DisplayManager, or the latter won't see
+them and switchToGreeter doesn't work. So split SeatManager
+initialization from its constructor and call initialize it
+only after all connections have been set up in DaemonApp's
+constructor.
+
+With logind there may have been enough delay before seats
+got actually added so things would work, but it's still
+cleaner to fix the order.
+
+Fixes: https://bugs.gentoo.org/644718
+Fixes: https://github.com/sddm/sddm/issues/824
+
+--- a/src/daemon/SeatManager.h
++++ b/src/daemon/SeatManager.h
+@@ -31,8 +31,9 @@ namespace SDDM {
+     class SeatManager : public QObject {
+         Q_OBJECT
+     public:
+-        explicit SeatManager(QObject *parent = 0);
++        explicit SeatManager(QObject *parent = 0) : QObject(parent) {}
+ 
++        void initialize();
+         void createSeat(const QString &name);
+         void removeSeat(const QString &name);
+         void switchToGreeter(const QString &seat);
+--- a/src/daemon/SeatManager.cpp
++++ b/src/daemon/SeatManager.cpp
+@@ -93,8 +93,7 @@ namespace SDDM {
+         }
+     }
+ 
+-    SeatManager::SeatManager(QObject *parent) : QObject(parent) {
+-
++    void SeatManager::initialize() {
+         if (DaemonApp::instance()->testing() || !Logind::isAvailable()) {
+             //if we don't have logind/CK2, just create a single seat immediately and don't do any other connections
+             createSeat(QStringLiteral("seat0"));
+--- a/src/daemon/DaemonApp.cpp
++++ b/src/daemon/DaemonApp.cpp
+@@ -75,6 +75,9 @@ namespace SDDM {
+ 
+         // log message
+         qDebug() << "Starting...";
++
++        // initialize seats only after signals are connected
++        m_seatManager->initialize();
+     }
+ 
+     bool DaemonApp::testing() const {
diff --git a/x11-misc/sddm/sddm-0.17.0-r2.ebuild b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
deleted file mode 100644
index 6e91b0dcb037..000000000000
--- a/x11-misc/sddm/sddm-0.17.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtdeclarative-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	elogind? ( sys-auth/elogind )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	>=dev-qt/linguist-tools-5.6:5
-	kde-frameworks/extra-cmake-modules
-	virtual/pkgconfig
-	test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
-	"${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
-	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-	# TODO: not yet upstream
-	"${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	disable_locale() {
-		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-	}
-	l10n_find_plocales_changes "data/translations" "" ".ts"
-	l10n_for_each_disabled_locale_do disable_locale
-
-	use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-	systemd_reenable sddm.service
-}
diff --git a/x11-misc/sddm/sddm-0.17.0-r4.ebuild b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
new file mode 100644
index 000000000000..090a03ea4de0
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdbus-5.6:5
+	>=dev-qt/qtdeclarative-5.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtnetwork-5.6:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	elogind? ( sys-auth/elogind )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.6:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig
+	test? ( >=dev-qt/qttest-5.6:5 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+	"${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
+	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+	"${FILESDIR}/${P}-consolekit.patch" # bug 647254
+	"${FILESDIR}/${P}-logind-race.patch" # bug 656286
+	# TODO: pending upstream
+	"${FILESDIR}/${P}-switchtogreeter-r1.patch" # bugs 644718, 649888, 655912
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	disable_locale() {
+		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+	}
+	l10n_find_plocales_changes "data/translations" "" ".ts"
+	l10n_for_each_disabled_locale_do disable_locale
+
+	use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
+		-DUSE_ELOGIND=$(usex 'elogind')
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 35eb7d246693..2aa5f7d21fde 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,10 +2,6 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
-DIST VirtualGL-2.4.1.tar.gz 1116018 BLAKE2B b80977d530af8e60c6a0409d7240a1bfc0f218268db11e530a2f6c933ea23d23cfc4430e4f0dc801a9fe213a0d4767870f581704172a1402443c0541ea5c22d5 SHA512 b8901eccb29ea21ca1cb0743b6b3a7316ee02422a94be04133daa1c8a24b109e27504a63c901359c7dec22a8af2f0e26d909f9b74c834b97dc19f7491232db0a
-DIST VirtualGL-2.5.1.tar.gz 1165255 BLAKE2B 3b719d23e925baa5e94f8e20dd86e9c50337f3e9b514e34a7b956b7fffa2e8e64b2883e789137b3daf6819cb85294bbc912189c9267b6d170045222d80d1b4fb SHA512 a60a55bae58c80bcea418702f4d3b41356a9e599f007fd539043228c4fe75c28582bab376caf121a5eeee4a21cddb80f1edc2f89abfe88a584321c46383d3654
 DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
-EBUILD virtualgl-2.4.1-r3.ebuild 2352 BLAKE2B 7a919e521c6dac1a57e3bf13ca1ee0289ac580a944f372cbd102ec26be5dc4cf2bfd13dc856717193584d7482bedf1d64f2e73c26deb95c1b983d74d58b74825 SHA512 93d2e74d07c2298946d75098b04b9688cf996fd82e9d6d38ef1291515bcdf7a79257b39a9bae293ac0b215cc016451408e812750e41ac9296c7776af405faf7c
-EBUILD virtualgl-2.5.1.ebuild 2311 BLAKE2B 5ca79093b85293ecf7dc3c4d08e5f56c525c92673231f1d180d441390b689fe9fbfe43f969e936581ab6cf1df23f8d203b46abe99c27ae8e7b253c714fca538d SHA512 71aa964664ef87e51d8b6cb0904aeab5401d7615625a247dc4ed2a86e101de2f4c8e7cb564b12098a0170b14a2928ff86a4f8a0845b042c0c07362ef7c6e7ea3
 EBUILD virtualgl-2.5.2.ebuild 2500 BLAKE2B ba0f29fdaa60aef649e1e2db4acdab97ffc1dec3e94daa3624161313fe98d98c16630630974dec9b128773ff74bf8409aa00be2eb9d645383369da68f93e8df6 SHA512 1cd347416c201c238720c911cb006be783286a50dc7ab49f008e1f435c8955ca65aebae2d89284195f9e94ff3ae80dcb29133a31d2a3b5032f43f668215f7a18
 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
deleted file mode 100644
index 8cc8c1f711e6..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	abi_configure() {
-		local mycmakeargs=(
-			$(cmake-utils_use ssl VGL_USESSL)
-			-DVGL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DVGL_LIBDIR=/usr/$(get_libdir)
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-			-DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
-		)
-		cmake-utils_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
deleted file mode 100644
index 39757c09b612..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DVGL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DVGL_LIBDIR=/usr/$(get_libdir)
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake-utils_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 816811cd6b27..1273659bcc0e 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd
 DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
+DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
 EBUILD xkeyboard-config-2.23.1-r1.ebuild 1143 BLAKE2B aa3ff040bb72dc32bf836bc6b9411ecf5584de9bf3b7a2e25648a774fee753ad0a8773410219519ba41bab934852afc9b430829c2a664281c9038fec515c3cd0 SHA512 178632a8720598205c048a08d7936fd45bc3c3151c9563ba74df8453c0316f873615f3c97ec52592db091c154f4e3d331badd092602671f14a1706fa0a46155e
+EBUILD xkeyboard-config-2.24.ebuild 1095 BLAKE2B 5ff0f206560806df10edf855cf7d81bb94bca1e13d779219f3564d315aa557772054de31ed1f661c89b8793ec44bce2d02304f9ff2f270b7ca1274688a16d5a5 SHA512 f7bdf5f231a033420eac29903ae03936fcc11568bbfd92fd01c803ca5bcf7d4c9cd947a371b6634e78c437108200d7bce8ef7b953a82d8b3ec20f7551683da70
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
new file mode 100644
index 000000000000..40b72722a506
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3"
+DEPEND="
+	sys-devel/gettext
+	dev-util/intltool"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+	--enable-compat-rules
+	# do not check for runtime deps
+	--disable-runtime-deps
+	--with-xkb-rules-symlink=xorg
+)
+
+src_prepare() {
+	xorg-2_src_prepare
+	if [[ ${XORG_EAUTORECONF} != no ]]; then
+		intltoolize --copy --automake || die
+	fi
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 798b525091d2..06bd3c469ed7 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 89b4a4d568db..801b268b6cda 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,9 +1,11 @@
 AUX enigmail-2.0.5-fix-missing-missingMdcError.patch 1059 BLAKE2B 70b247f23be20df0dc9b5edb77eb48f56a2538f53af50f29b11ef0ca5c0b196e80b7adb3f1687d6ee3a1246935cc0d299f4c2f74f5a6fab89be5620ade66da1d SHA512 fa7ec8a1390636af1380a9a25f4b8b8cf23c13f82fe5bd1ad555d4a88b5cbef28d89e8dc706d738a5ec54d1d4fc439f630aa660e91509efb7709e6b2ce3013ff
 DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
 DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
+DIST enigmail-2.0.6.1.tar.gz 2535278 BLAKE2B be841b2f1f9ceeb4e339509599971389f1d518a833a8ab3f61e57a609803c1a7ba6bc47cb0e460e5f1b2b74117e6a40b7dfb023e68ad9e2186e6fa21afea59ee SHA512 231e17f207d021d4a73b00abd1697003d7fc644df73c7e5ea8e83340ef011a3a627a9ac48ce3acb60e4cb415ee2038d294258173f9def01dd48d52ab6fc3669a
 DIST enigmail-2.0.6.tar.gz 2535125 BLAKE2B 1fd0d220f7f1020bac9487a7b6ed234e2b3b9b5929a7997954e735e2aee08ab6276c58790b57d7f7cb29e284e9a1e50ca50a373ed4e75524fbd85349a31f8667 SHA512 d2d5b1a5d2ca99735ad40532a04a935235bb62b5eb2494ec5c5f2e17b271b40d43552895bb977e892d0a226cd3514c4314f541ac8eb1d610c3b20b183b18f229
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
 EBUILD enigmail-2.0.5-r1.ebuild 2240 BLAKE2B 7a9cba65cf9cc571d6052e0bcdb474915614f2bfbc0a24c85df56979290fe7d51d96d9baa7d3faead6d20b21877021a93eac0b05971f02b97ee468632f6541b6 SHA512 72e9eccc842581b7b3c6827f57059919624535a804b265704f37b074dfcd853049a0384b91fa94f9fe3a1494defc8fabc3d64ef357e9c44ebe829e42d43bb40a
+EBUILD enigmail-2.0.6.1.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
 EBUILD enigmail-2.0.6.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
 EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.6.1.ebuild b/x11-plugins/enigmail/enigmail-2.0.6.1.ebuild
new file mode 100644
index 000000000000..9e8d0cbb3958
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0.6.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="http://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="|| (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk(-)]
+				app-crypt/pinentry[qt4(-)]
+				app-crypt/pinentry[qt5(-)]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)
+	!<mail-client/thunderbird-52.5.0
+	!<www-client/seamonkey-2.49.5.0_p0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+src_compile() {
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3d6e00179924..0aa9d673e5d8 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index f1fc0e92a295..bfc37440d01f 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,13 +1,8 @@
-AUX kitty-0.7.1-flags.patch 1514 BLAKE2B 1df4313bd4436200e114f9d9abadd6e160c34f20f6acbfcf77976fe9d8cb34b7340faf399c3aed2878f725336cb23bfad8789932804a76ec01bd1b6976450785 SHA512 e6611277df94ee51981b8b111281683c58f06271fc1252f1bcb50a3441d531aaee52e54b09cecb781a8173af83d9c6a63f68526b0deb4d1818e5f8e6b349b4f5
 AUX kitty-0.7.1-svg-icon.patch 710 BLAKE2B 6377fe8ed9e344ba61881041d9eea72304f605ad633ac2d4ee68aebe363368c9a2b93c48297aca2e4edca14b7535c1a40c81f2dce4189bbeee563d7e6c23d6b7 SHA512 9f449cbc26cc8446425be0f5945e69cef49b4602f7578559d8ddc7456e4adb3afe1edf2c580eb009d1f2e3daa3f3b087c49b3e35a35e8a0a8fb7be584d5256af
 AUX kitty-0.9.1-flags.patch 1583 BLAKE2B 0981fe541241e2265104cc8bf531abe0fb01ecc7959d11178eeeb71c39f9b88489dc8c5d721748c7af330136c276791907f38341cc0a914c662d30d5618c05c0 SHA512 90751db5b8a5ab36d02af76bc9361e73b6409804626c4a8090f9ca620600dc79c3043ac192dd2c0578552825d4fd3e73aa87716f3cd4ec67128eefff1a6c6452
-DIST kitty-0.8.2.tar.gz 3281308 BLAKE2B 6219dddc02e8b98b913356708fd2e398ad17aea97b0c539132b2333a736324d76136a6b6599b925424a8e7c578e9ef92b38ef5aa8ea5b42788731ecf19ad5e27 SHA512 4dabbce40a5fe0e54ac64b429baf3491ab492846f0f31b4b763c06c7aeba80a482bfd083419d3ddcd1bc267553458b719df82a2a179d90a88be3ce41a47d9897
-DIST kitty-0.8.3.tar.gz 3285120 BLAKE2B dcf47345f26beaaae5a63f122a3592c29a8ef2243406377ebb46fd44b9d8036f2f5493d7b1048195e12a7fb9874fce920ac52a0bb18e071e5e3db869691174d9 SHA512 b758a178b976d7dc133dd48bfafff5db8a373419a67206a8724695392c0654a9d5ba07867cbd6824afe1a5c013724d8472ab4087eae52c8bdb27843688b18968
-DIST kitty-0.8.4.tar.gz 3285125 BLAKE2B ad0e1b94caab2b572baabf8340dad703cf6e572494b938fd6941d053deaee9d628d652af9c542efee6ecc2fe71fd7c534595449cb25e50438276d4d0361a61d9 SHA512 1ed5b909f66abd113d643420fadf4034fe0af5b649c957590f0698c541e26d0d061a5d703b8e6220f4be826b2b9914ecb3559fc644eb41cb7cd4b9465030cd93
+DIST kitty-0.10.1.tar.gz 3844251 BLAKE2B f2b1e523ae48415c410080ae0b419c96e394bfc145da4c3f73fe865e2b1fbd6f7c8ffd18d4e14ea09c0397b8fceb35ebfce72a49d731886588acea5135d4615a SHA512 5341ebdec5356665db5ed0b9f910dac66860b0b39334c0878a3af637bd3da983c11ab8425794e8ea7b3c90f6d64855d8acda4531f25726c01ab355293f033a08
 DIST kitty-0.9.1.tar.gz 3698447 BLAKE2B f7e5c4d365f4fa3f74a348b219ea2433fc1ad05cca68a5ba920b692a4dd5de63fb27cd28159de3af3f11e9a87911bc8600c342ee2bc733317f91e9a7b6226e15 SHA512 3690dd7308f37de3282148c80e2afffde08e4dc2c459f78668d461461ff5dad2b39127635cf22f0f160f40823d2fa1a43a7e83d4bcc0b64e4cbc6e5be1988329
-EBUILD kitty-0.8.2-r1.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
-EBUILD kitty-0.8.3.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
-EBUILD kitty-0.8.4.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
+EBUILD kitty-0.10.1.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
 EBUILD kitty-0.9.1.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
 EBUILD kitty-9999.ebuild 1816 BLAKE2B 1c74b62c6fd71587d1bb9fe681615a64595e5ce109e54d2c8a11274dfa0847b6a959ba9f8271e9e9f33fe7d84c41d2012ef52aeecec21a9d9d14dc1f0d846453 SHA512 2391a2bd786bdb9bb719c3ce911261b6fd3e49380a79ae0d808c98d6b99b10824d38235d247e3b1e534a7d37e651cf3b7226b1cff711775479e7b77cfa3de1df
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/files/kitty-0.7.1-flags.patch b/x11-terms/kitty/files/kitty-0.7.1-flags.patch
deleted file mode 100644
index 6352ae93f63c..000000000000
--- a/x11-terms/kitty/files/kitty-0.7.1-flags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- kitty-0.7.1/setup.py
-+++ kitty-0.7.1/setup.py
-@@ -163,12 +163,12 @@
-     df = '-g3'
-     if ccver >= (5, 0):
-         df += ' -Og'
--    optimize = df if debug or sanitize else '-O3'
-+    optimize = ''
-     sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
-     cflags = os.environ.get(
-         'OVERRIDE_CFLAGS', (
-             '-Wextra -Wno-missing-field-initializers -Wall -std=c99 -D_XOPEN_SOURCE=700'
--            ' -pedantic-errors -Werror {} {} -D{}DEBUG -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+            ' -pedantic {} {} -D{}DEBUG -fwrapv {} {} {} -fvisibility=hidden'
-         ).format(
-             optimize,
-             ' '.join(sanitize_args),
-@@ -183,7 +183,7 @@
-     )
-     ldflags = os.environ.get(
-         'OVERRIDE_LDFLAGS',
--        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+        '-Wall ' + ' '.join(sanitize_args)
-     )
-     ldflags = shlex.split(ldflags)
-     ldflags.append('-shared')
-@@ -455,13 +455,13 @@
- 
- 
- def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False):
--    cflags = '-Wall -Werror -fpie'.split()
-+    cflags = '-Wall -fpie'.split()
-     libs = []
-     if args.profile:
-         cflags.append('-DWITH_PROFILER'), cflags.append('-g')
-         libs.append('-lprofiler')
--    else:
--        cflags.append('-O3')
-+    #else:
-+    #    cflags.append('-O3')
-     if for_bundle:
-         cflags.append('-DFOR_BUNDLE')
-         cflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/kitty-0.10.1.ebuild b/x11-terms/kitty/kitty-0.10.1.ebuild
new file mode 100644
index 000000000000..a458d0c67387
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.10.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit python-single-r1 toolchain-funcs gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+	${PYTHON_DEPS}
+	>=media-libs/harfbuzz-1.5.0:=
+	sys-libs/zlib
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+	)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-flags.patch
+	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+	fi
+
+	tc-export CC
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	mkdir -p "${ED}"usr || die
+	cp -r linux-package/* "${ED}usr" || die
+	python_fix_shebang "${ED}"
+
+	dodoc CHANGELOG.rst *.asciidoc
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/kitty/kitty-0.8.2-r1.ebuild b/x11-terms/kitty/kitty-0.8.2-r1.ebuild
deleted file mode 100644
index b51c9110b0ed..000000000000
--- a/x11-terms/kitty/kitty-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.1-flags.patch
-	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-
-	dodoc CHANGELOG.rst *.asciidoc
-}
diff --git a/x11-terms/kitty/kitty-0.8.3.ebuild b/x11-terms/kitty/kitty-0.8.3.ebuild
deleted file mode 100644
index b51c9110b0ed..000000000000
--- a/x11-terms/kitty/kitty-0.8.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.1-flags.patch
-	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-
-	dodoc CHANGELOG.rst *.asciidoc
-}
diff --git a/x11-terms/kitty/kitty-0.8.4.ebuild b/x11-terms/kitty/kitty-0.8.4.ebuild
deleted file mode 100644
index b51c9110b0ed..000000000000
--- a/x11-terms/kitty/kitty-0.8.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.1-flags.patch
-	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-
-	dodoc CHANGELOG.rst *.asciidoc
-}
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 40916695941d..aae1c5b93d04 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,8 +1,4 @@
 AUX sakura-3.1.3-flags.patch 626 BLAKE2B 5d0d19c134e0dca10d564049e8b988616e5d84d8bf88c8ab6469bdf3e504b9d528a7754cb02d171fd71497eac2363bfd41f1b26551a9e2dc5a39f262ff3e92d6 SHA512 007a2f2ab722bd991cee0da708efba301b3c69bb86eff25a14519008ad485e8e6ed1c8e2ded6fcd88ff7066528ff539eced4d105a84d6774aa952150beddc57f
-DIST sakura-3.3.4.tar.bz2 52839 BLAKE2B 8fbab050b6983625dd77a6ef52a56cbcd854d40c1f22a10e845171bab78b49263d5dc6a7e2e2a00d0ffc0140995b453755009fdc85e1f6d950336201873bc155 SHA512 a84849e2fa7b45da513ff05a1e1636eb8d331b7c632f18605d6aa01463e44d877c057f2f628bfdc27e9f6ff29b0441ba248885d92341ed3a9b5eb281d02e34d7
-DIST sakura-3.4.0.tar.bz2 54907 BLAKE2B c31d757e9467240d8455cbc7189f2104b0620f208ffbf7815fd834da08beeb59218931621656e4c920cadadca41bf682f321fe935151887cf99c1afe0800c980 SHA512 5d8f62638bd826a294b240960f2bd696583f8cad4799ab5862796b6210320f94ee11e64847c36ca6765f9281fb8fabb7a699db6fcf1de41c5e7f82bb281e9512
 DIST sakura-3.5.0.tar.bz2 55432 BLAKE2B 9accd09eac359b64637ff5c318e50e32f5bfa27cf7fb5d4a99c91391e14f145020bd19077e20585b78149e5ac5f281abaf1098dbbaf111e54fd5ad5fbb2f4887 SHA512 20c691342c68a2a6f7397da754c83b19c7622e25984ae9fe9fef47492e19cd7589dd9d1bd2ccb82bd9c6ab82f92c97c1b742795434a101a0e169c6f901f40d9e
-EBUILD sakura-3.3.4.ebuild 906 BLAKE2B 86511b6ae84ca633739ceaccdb7c2e623c15f2e6f60d5975578c67400cb9a791b3acf2cf41af84ba6b33ae78bc9355a3d38dbdce19981ed0c417f240c56fb5c0 SHA512 5461559e63d9eaf5ae4d3bd9da90228fb96cc1dea8a588f9297ed071222de6d799e6712671c41f15420b1b5851448bbbe22dd39457d77c236d8bea8a3964f2d1
-EBUILD sakura-3.4.0.ebuild 1216 BLAKE2B 34a478cb128992ec67e938f60360144a0c6693fc9f9190ff13db90f8aa95034de0ccf30df4026cd73d507082382813b0cee0565975339bcbb8b639e9e9b6d324 SHA512 0bcedeb6b85b5499bcbc1ea73508af9ad12cdcb87f6807076368873f2880f6b945e8300327c7aa25d9808ce753438a269267dd6c1d81c40f8d4ac797dad6d5f2
-EBUILD sakura-3.5.0.ebuild 1387 BLAKE2B 39f1c4ea60cb52052388a2b6701a552796912b2098de398fa9bd2d1f8af2ebed6e473776406664e819ece3072b0216a1716269737d5b2538def617ad54e07eed SHA512 c9842e1c0e4103071573cb8541609ab9ee9646e8847ae38decc980cdff44e7823d897ab4e63ee17e0dcf2d5b48014997c65902e8d67befe1806e03a083b85209
+EBUILD sakura-3.5.0.ebuild 1385 BLAKE2B c1e944d9d370676d704b61746af06132f537fed3b3a05ea9235d1b736e830b26df75c0dc03f46809faf367779c50c9cf2b176dae2d59291383012c7792f70450 SHA512 9365ba8e924643daa84b8769fbb2f20eee6ec470fbae656d4655dd48aee6dc325209155c3011de155fb2057ac6de50516e6002bbe53a7cecddd304d735e3b6c2
 MISC metadata.xml 928 BLAKE2B 91926b81400896fef6be017fe1d0dacc25bb2331e84b7604223464c2f0862b0935aadf944dcd272a989ae9de5b180f3576725f30fa2a161ba24f27c5ba1884e0 SHA512 95be972f218e92365f8084f3a796199c3f7a182bc42c098761096f2146323afcdb2fc45e6c4ec975f03decdac05b9c01083c768162bf97c88c61dab892419ffb
diff --git a/x11-terms/sakura/sakura-3.3.4.ebuild b/x11-terms/sakura/sakura-3.3.4.ebuild
deleted file mode 100644
index f55472bc7960..000000000000
--- a/x11-terms/sakura/sakura-3.3.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
-HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	x11-libs/gtk+:3[X]
-	x11-libs/vte:2.91
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-lang/perl-5.10.1
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.3-flags.patch )
-
-DOCS=( AUTHORS )
-
-src_prepare() {
-	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
-
-	strip-linguas -i po/
-	local lingua
-	for lingua in po/*.po; do
-		lingua="${lingua/po\/}"
-		lingua="${lingua/.po}"
-		if ! has ${lingua} ${LINGUAS}; then
-			rm po/${lingua}.po || die
-		fi
-	done
-
-	cmake-utils_src_prepare
-}
diff --git a/x11-terms/sakura/sakura-3.4.0.ebuild b/x11-terms/sakura/sakura-3.4.0.ebuild
deleted file mode 100644
index 315f2a8ec16e..000000000000
--- a/x11-terms/sakura/sakura-3.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic
-
-DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
-HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/vte:2.91
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-lang/perl-5.10.1
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.3-flags.patch
-)
-
-DOCS=(
-	AUTHORS
-)
-
-src_prepare() {
-	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
-
-	strip-linguas -i po/
-	local lingua
-	for lingua in po/*.po; do
-		lingua="${lingua/po\/}"
-		lingua="${lingua/.po}"
-		if ! has ${lingua} ${LINGUAS}; then
-			rm po/${lingua}.po || die
-		fi
-	done
-
-	cmake-utils_src_prepare
-	# sakura.c:1740:3: warning: implicit declaration of function ‘readlink’
-	# [-Wimplicit-function-declaration]
-	append-cppflags -D_DEFAULT_SOURCE
-
-	# sakura.c:1348:9: error: ‘for’ loop initial declarations are only allowed
-	# in C99 or C11 mode
-	append-cflags -std=c99
-}
diff --git a/x11-terms/sakura/sakura-3.5.0.ebuild b/x11-terms/sakura/sakura-3.5.0.ebuild
index ea31dcb86d1b..00b1ee1846b3 100644
--- a/x11-terms/sakura/sakura-3.5.0.ebuild
+++ b/x11-terms/sakura/sakura-3.5.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
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.20:2
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 829925893b68..f6883362fd24 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -2,7 +2,7 @@ DIST st-0.7.tar.gz 42418 BLAKE2B 2f0eccaec964106b03c3daa75486d8f373582b2275c00a8
 DIST st-0.8.1.tar.gz 45423 BLAKE2B e7f5d731ba86f37db4cda1f612a8f191f955d7ea8fd57c3fb142c695c41fda4d3b82a483bb3c1fff2d4ff66d9277ed22339c026bca4f4af740fc80cbbc7f3620 SHA512 787d35b0cc8b1435dad7809e9995bed3c7f781e012a4a43dd5ae3d670ebc0e4bc03a56ba3872ff8a3bdba316a41ba771c626adc8de0559296457a59170756c6b
 DIST st-0.8.tar.gz 45401 BLAKE2B 83a8ca385b6e94ded925b274983830664d84f3d746b4173fae9918f00464679f9e3b695a5a96554ca545c1f132a846a77d0627961ee1149b673133fd461e67a1 SHA512 47af80560f3bd803719b83e95affcb5425fed419fa4703dbd66ee2080f6671597aaba8110f3f7959190e8c3e2b02c62edf062fab950b2649f1d8c532c183de84
 EBUILD st-0.7.ebuild 1111 BLAKE2B e24b1a3fbd6f4bd397769643331a10bfa4e647f3848e93da210ab2251c9f2f92f9ac9be2a5a8d079114e4c7dfb20e10b5236a218591d8c41bfae22152040d93a SHA512 24b5c1ff578db7b32d12037eff589b6e5e34e28e17ae384a27ddd5e47558e814b330058bc482adc63beb6b7b413ba01650ba0451824e52e46f2b8255c05f20c1
-EBUILD st-0.8.1.ebuild 1386 BLAKE2B 242bbb98b01ce09c633afb600ac0a36b21afeb822ba35a9af57dfd12ae9e8791267697316530285e3692917473bc153cf961c95a4159430909333c2af228e8b6 SHA512 c2b3d27213c0fb8270e5fb3689bd07d3ef8493bb2799a16c713216286d25c616726e0047ae78d7b8c6e23793e69c8ce563a4d3289f1db06bae3005058ac9a2ea
+EBUILD st-0.8.1.ebuild 1393 BLAKE2B b6282c5ea60d600935c3f428941da6c2d89944e6d8e0ee2d24040f08fe9450e156f2ac6fac71a10092a3cd26e598c5e345a621ccaa86a0478dfea6cb08da22c6 SHA512 7849fea6b5407c7220ad2973d66df8b6faed5e63fab5873b2e9b1687da96b21d916b9dc5e843c8b0f3c1b8a889e8e3e0d245f9c686c75ce4a5e436a10c11ea03
 EBUILD st-0.8.ebuild 1386 BLAKE2B 242bbb98b01ce09c633afb600ac0a36b21afeb822ba35a9af57dfd12ae9e8791267697316530285e3692917473bc153cf961c95a4159430909333c2af228e8b6 SHA512 c2b3d27213c0fb8270e5fb3689bd07d3ef8493bb2799a16c713216286d25c616726e0047ae78d7b8c6e23793e69c8ce563a4d3289f1db06bae3005058ac9a2ea
 EBUILD st-9999.ebuild 1354 BLAKE2B 34d87affb824b194f43186063a2a9666c011e5c513f14ffc71b973357abfc7b317c47e6360ca6d251a24caf33f3540e21462739859250fa88db5ca70e45d799f SHA512 70f645d48ded672f8231ccf7cea587a350122f80b3bec5f0f7707ebb8f9cb2cc650b55418383512665beafd842f2cca01b3c6d4517efb658123d2c22db50d0ae
 MISC metadata.xml 308 BLAKE2B 0b5b8fb79473744926b25e2bffcc047e5bc3a41cf4a8708e64bdcefcbd61bd6a3414e79d1c8a07498eda8b5203d5c786f36aa70a9530f82b88c540dcd4808556 SHA512 18e3f4a2e5cd9c0fc70a8069cb948383ff4ee7ebd4e02e6e5bb26d2b0650d42562602284d985484842a870c33693439614ba40b47d2d567a2fe1bc09e62d9fcb
diff --git a/x11-terms/st/st-0.8.1.ebuild b/x11-terms/st/st-0.8.1.ebuild
index 46e232587d9a..aaa8318a7aa6 100644
--- a/x11-terms/st/st-0.8.1.ebuild
+++ b/x11-terms/st/st-0.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 IUSE="savedconfig"
 
 RDEPEND="
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 2999b122ec51..71f480af62a8 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/vanilla-dmz-aa-xcursors/Manifest b/x11-themes/vanilla-dmz-aa-xcursors/Manifest
index 560925e9302b..9247f1357acf 100644
--- a/x11-themes/vanilla-dmz-aa-xcursors/Manifest
+++ b/x11-themes/vanilla-dmz-aa-xcursors/Manifest
@@ -1,5 +1,3 @@
 DIST dmz-cursor-theme_0.4.5.tar.xz 947544 BLAKE2B 6c945575f57c3db87a95545ef023a4a7d8cc6a329c5a083d0501452e34c9603568cfe41e495bae4d2982d01641dbcd4deef39e0291d6aa12e4d7a35c47e4797c SHA512 627fff9e4f690e30c6acbedb06035abc3ca7f6c6656a7e1290d752e115dbd8a41c37a2fe0d7cd7ece697c54dd7a343dd78d3c4604d124158961d95125f899f73
-DIST vanilla-dmz-aa-0.4.tar.bz2 159309 BLAKE2B 20ad256d31d101954ba7b41c52624da02e11a52072815a4c13e92787bf930e9fdd17eb8c96af371ee69f254204f225698f571f8459aa85701ff29bc053a7c6b6 SHA512 08a4a0d7e685d77c79b3f917b60cf7e6572bd9828b8314a335727baf8e51d7cf175c6a800ffa2761c5ccea275411e8552c56b39c7ed092effde8ecec784cf446
-EBUILD vanilla-dmz-aa-xcursors-0.4.5.ebuild 696 BLAKE2B 8af291a11bd72f3d73ac90eabc64ec8e36a8e4e466c3a860f7271424fca112496d9f8919c79147337f38bcfaf7763f1e0543adbbc7ba66d5fe4a0e06d472ad2f SHA512 64f4856b1d5522697015801743f436f4424291798feac7db7bb3977312731fc5687e0852a7eedce108a515f35f67d546d1d02cffa5bdd7f1d33cb286adb7d5df
-EBUILD vanilla-dmz-aa-xcursors-0.4.ebuild 1260 BLAKE2B dd43fe5e737aa53fb58f67bc9db4c21dfaabe2bf4b00452e55990b902ea333b0af4f7768af56783d942afe5e36c1581de9dd1ab919e8aeed3a6d93afdb23d5da SHA512 7a142328835f5ea10d73d5bf28d05e3de669971cb2d1f29101f26e1cbdeed0d7db25b61bc359b0e65ea8e81ba5e3b7ba1459c501946ce8d250471e5eab32a1a7
+EBUILD vanilla-dmz-aa-xcursors-0.4.5.ebuild 695 BLAKE2B 5f2c31e51caca4369c0a5fc56303d8f7d64493fc6f027fe857058201ad3faa5e6e7c6ee6a9d345ec9aef528a52e681e671d9c44d1ad87e9f764ff93d32dd4199 SHA512 de9f52deef384749a018a5d7b9809cfa18099b3f014a55e27a159fa2028201f20ebe1913161cbc1718a1ba23246bcc86d4c1c3ecae5e266b587b95e44f6f0838
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild b/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild
index bf8b702fe0e9..34c28e8f6a0f 100644
--- a/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild
+++ b/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${PV}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/xcursorgen"
diff --git a/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.ebuild b/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.ebuild
deleted file mode 100644
index ca7a6687d4e4..000000000000
--- a/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PN="Vanilla-DMZ-AA"
-DESCRIPTION="Style neutral scalable cursor theme"
-HOMEPAGE="http://jimmac.musichall.cz/themes.php?skin=7"
-SRC_URI="http://jimmac.musichall.cz/zip/${P/-xcursors}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}
-
-src_install() {
-	insinto /usr/share/cursors/xorg-x11/${MY_PN}
-	doins -r cursors || die "doins failed"
-}
-
-pkg_postinst() {
-	elog "To use this set of cursors, edit or create the file ~/.Xdefaults"
-	elog "and add the following line:"
-	elog "Xcursor.theme: ${MY_PN}"
-	elog
-	elog "You can change the size by adding a line like:"
-	elog "Xcursor.size: 48"
-	elog
-	elog "Also, to globally use this set of mouse cursors edit the file:"
-	elog "    /usr/share/cursors/xorg-x11/default/index.theme"
-	elog "and change the line:"
-	elog "    Inherits=[current setting]"
-	elog "to"
-	elog "    Inherits=${MY_PN}"
-	elog
-	elog "Note this will be overruled by a user's ~/.Xdefaults file."
-	elog
-	ewarn "If you experience flickering, try setting the following line in"
-	ewarn "the Device section of your xorg.conf file:"
-	ewarn "    Option  \"HWCursor\"  \"false\""
-}
diff --git a/x11-themes/vanilla-dmz-xcursors/Manifest b/x11-themes/vanilla-dmz-xcursors/Manifest
index 61c21f0f113e..51549d66765d 100644
--- a/x11-themes/vanilla-dmz-xcursors/Manifest
+++ b/x11-themes/vanilla-dmz-xcursors/Manifest
@@ -1,5 +1,3 @@
 DIST dmz-cursor-theme_0.4.5.tar.xz 947544 BLAKE2B 6c945575f57c3db87a95545ef023a4a7d8cc6a329c5a083d0501452e34c9603568cfe41e495bae4d2982d01641dbcd4deef39e0291d6aa12e4d7a35c47e4797c SHA512 627fff9e4f690e30c6acbedb06035abc3ca7f6c6656a7e1290d752e115dbd8a41c37a2fe0d7cd7ece697c54dd7a343dd78d3c4604d124158961d95125f899f73
-DIST vanilla-dmz-0.4.tar.bz2 135099 BLAKE2B 85d52af28493e801dbcd0d7480461a4075796322d6c48986c9dc3dd99e364f4961e3f3737bd0bbf8e4bc499a19c76e8d954992872fff522b6174d53d96e66661 SHA512 1e234033b683c1c13cc53a7a48f4ed41a53e22a622b4dd6e2a8c1b2f026f974ad608f91400ea4c43906b96e3d4f1ad4b13dabf3f9f156b27a7137aa561620bce
-EBUILD vanilla-dmz-xcursors-0.4.5.ebuild 688 BLAKE2B 69b8467793afbf486f6c80e8ac3383118829a83b2ee02abd49165f0a4361e5526556c95bd5dac14fdfa352c7f82a3a4920766331fb09932cb2b7eed8d0537981 SHA512 17081b41c95cb1fb05e98ec3076006d11c5872766218ee2876dea307371e570c8172a95adac42e37cc39ec58f30f7dce185d08acda52433d3ebdba39936495fd
-EBUILD vanilla-dmz-xcursors-0.4.ebuild 1255 BLAKE2B afc62a525494ac39d0df54f4ce2ae482b7528fa15a6d81d837c53e019331652cdf0c7e288d99bd40298e473d60fb3c88cb95837ed1265240b1c90734bff99569 SHA512 32cba5c0e8e2f532713603a3cee52a94e12c3b10849bc541c9fe2cd58e6c69bdb2e5f215744e336ad62a1eb42c31b2e4c8e16c276b3ff43ac05d41a0ce78e3f1
+EBUILD vanilla-dmz-xcursors-0.4.5.ebuild 687 BLAKE2B a78997b82db9970e6f3311a7fd73de1e1911a5bfae44e6eb7ef975deeadcf0916a772c99088e2e8fe241c98ad9c5412cb0e58277be4305cac61362c9a27bbd49 SHA512 be1b159720f43c111aacde9df468f00d8920933749eab09285b7d1caf29b1beb87546e86995b6c0789e7dd94fd2a80343b519a19c5d27955840224e6514f4211
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild b/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild
index d5e0fd6f5c2a..dc46ef679386 100644
--- a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild
+++ b/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${PV}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/xcursorgen"
diff --git a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.ebuild b/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.ebuild
deleted file mode 100644
index b44fc69ede98..000000000000
--- a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PN="Vanilla-DMZ"
-DESCRIPTION="Style neutral scalable cursor theme"
-HOMEPAGE="http://jimmac.musichall.cz/themes.php?skin=7"
-SRC_URI="http://jimmac.musichall.cz/zip/${P/-xcursors}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}
-
-src_install() {
-	insinto /usr/share/cursors/xorg-x11/${MY_PN}
-	doins -r cursors || die "doins failed"
-}
-
-pkg_postinst() {
-	elog "To use this set of cursors, edit or create the file ~/.Xdefaults"
-	elog "and add the following line:"
-	elog "Xcursor.theme: ${MY_PN}"
-	elog
-	elog "You can change the size by adding a line like:"
-	elog "Xcursor.size: 48"
-	elog
-	elog "Also, to globally use this set of mouse cursors edit the file:"
-	elog "    /usr/share/cursors/xorg-x11/default/index.theme"
-	elog "and change the line:"
-	elog "    Inherits=[current setting]"
-	elog "to"
-	elog "    Inherits=${MY_PN}"
-	elog
-	elog "Note this will be overruled by a user's ~/.Xdefaults file."
-	elog
-	ewarn "If you experience flickering, try setting the following line in"
-	ewarn "the Device section of your xorg.conf file:"
-	ewarn "    Option  \"HWCursor\"  \"false\""
-}
diff --git a/x11-themes/xfce-gant-icon-theme/Manifest b/x11-themes/xfce-gant-icon-theme/Manifest
index a6961d748179..3c39b89c7c20 100644
--- a/x11-themes/xfce-gant-icon-theme/Manifest
+++ b/x11-themes/xfce-gant-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST icons-xfce-gant-3.9-6.tar.bz2 31992579 BLAKE2B abcdbd61fa6e5cdb2bbf1c94f668a197812d74ca9443f50e79472bf625d00288871a8376adc7cf2b1db4dd14a23218ef107a71c968a3644d972cc573e1e85927 SHA512 3bced73028c3796bb8bcf53f7cf02936243b7643bbd76191e01cd5f29165f16a5d7e386ef0c81b15b05f6d9fc4957f189b200c03af6b2255d0409e00a6fdad2d
-EBUILD xfce-gant-icon-theme-3.9_p6-r1.ebuild 702 BLAKE2B 13e4beb1b529aa88a6b54fc4e9f391865f6d1cf2894f679c81f33faf31de39a0f91e7a6b0d0124bf2072c8c6ecb00323e42f984ce6e64b5e3384edcb525fbcc1 SHA512 bdc788eb956579d53cdf02f5620199aec17ffd1c72cefaeb2dfa9c51d41f4dbcab189f7f00100df82f333cc66fd2c2e6656cfcad89ddec59984c31296d5f8e5d
+EBUILD xfce-gant-icon-theme-3.9_p6-r1.ebuild 703 BLAKE2B a8f5c22cb5a3f18f6f935f454db71ca29a250d68b19fdeca50d7381cd389df9239679c8d1a4161eca883f6c22e87758b4132b47852b13c35c1d2f47496e2dda0 SHA512 9b4f10eff4815ff66af919132cdc34a8c6005a99f078a8694d22f165b8811c158260256662b153c183a30a3d1dd3ea0db96307116f3a598cfbc634063611190b
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/xfce-gant-icon-theme/xfce-gant-icon-theme-3.9_p6-r1.ebuild b/x11-themes/xfce-gant-icon-theme/xfce-gant-icon-theme-3.9_p6-r1.ebuild
index d23e96967063..04d5af129fde 100644
--- a/x11-themes/xfce-gant-icon-theme/xfce-gant-icon-theme-3.9_p6-r1.ebuild
+++ b/x11-themes/xfce-gant-icon-theme/xfce-gant-icon-theme-3.9_p6-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit gnome2-utils
 
 DESCRIPTION="Xfce Gant Icon Theme"
-HOMEPAGE="http://www.xfce-look.org/content/show.php/GANT?content=23297"
+HOMEPAGE="https://www.xfce-look.org/content/show.php/GANT?content=23297"
 SRC_URI="http://overlay.uberpenguin.net/icons-xfce-gant-${PV/_p/-}.tar.bz2"
 
 LICENSE="public-domain"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 76f3f1ec6852..830c89d6332a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index c984f3e18f8e..de1d71fb13a3 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -10,8 +10,8 @@ DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0
 EBUILD enlightenment-0.16.9999.ebuild 1714 BLAKE2B 18aec7836c982ebf03213d6b8080da238e1581022c9b9b828fe5e28dc82d114762aeb33bda8a9528e245d679c923c46c82c0259f77045ed9b7f5c4951d62271c SHA512 f996d2ee9efcb4abd71f38f2ac54bfcf9da5e5f782bb8f44730aa65024d2eaad725b247b94467b49a4e06ca9049a6a1f5da948e4829e0123947215963d8559d5
 EBUILD enlightenment-0.20.5.ebuild 3582 BLAKE2B d8ca7622c40b90e7eb1326ea5ae6a4a78e71bc7f4de1473403521bedad35e303a8aee37a6e78e498e571b35eca208dca993ef781e018ce862887f6b151fb26be SHA512 af054b708d87e08123888867041eccef68921220650ead5003fa097fecc252a25aa5c26959fb7a1d7af7e257b84291cb44f9183d523569c4548b32a5998df5f7
 EBUILD enlightenment-0.20.6.ebuild 3585 BLAKE2B cebdabb24670587ebb5c5ae96d41c6ba3bf50e9b1737336cfd9f5c397571eb41ae9f63f8c8c96bf85d429230561f3db8167c03b231bcf357a679db960e9c0fef SHA512 4e794929e1792decd901e0ce8f14d51aaca4ee045be3e34df108314e3b48ee620bc3c9efc45729e5a9d4af20c34a8c6ccc51aca424e0627e8f587b61e1744f81
-EBUILD enlightenment-0.21.11.ebuild 2867 BLAKE2B 673e3bacef30dae7037612357e30fc4bb871e60ac90fce4d90e7d70fac2075be0100fe7cd92f111f692ec0d32c791c683254bcf0b6aeed12ad09161e29b12d52 SHA512 fc0457cd0eddcb328d9ffce938b6ea8c41ae87201613988144bb31af2f1d5d46d6b0c86a70d11dba0ce14be8788718eda968d6a4677107a9240194e9b8d8a4b4
+EBUILD enlightenment-0.21.11.ebuild 2902 BLAKE2B f95763398ccdfa0da8b37287a48afd9dabd704d9acac7397260250a360118c485b5ef874f84263f6ed2295e2298fb08190d346f48b00ad70679a06d98010ba0e SHA512 306acfe71445a50c66356f20eaad5942cef86115cd226f053bade749bd2dc4102b6542f0ee5266d637925206b601bdb707a7b9cab7599bb4aea0e06be761691d
 EBUILD enlightenment-0.21.7.ebuild 3551 BLAKE2B 2888568499c2906ca84924c0d78444e3d9c47370f36eb85355a4b4370fe5abc4bf2f720057489a9973e93c296c5ebe632b104a5db0d69e0355b6c838abd726f7 SHA512 5b5a52d62b9bd68520818e6f225a92cb133ee3ff068a07618e73e01c0f2d25c2bf7af443d1df47d4dc0ef82e614dc26cd5d7e72056a590ad89eb6ca8c553b549
-EBUILD enlightenment-0.22.3.ebuild 2761 BLAKE2B bc511dc8d7456a4d12a1b0b71cd09e6c84b6b5a790671d7f260a84ff94c88b9d0459a432edafd0b6264361f029e0e8bfe963f75e81cca1a8cf5f5a9b0b2b5955 SHA512 c50eab81b567a6800d9ea45b84a30a95b91a34ce4c6a55f6dfed072c0aa1680a975f463121bf23349894c7dafacaaf9e5c05745980f0149ddbfa4389e7868277
+EBUILD enlightenment-0.22.3.ebuild 2796 BLAKE2B a21e2239da1ad1b9d76c499d52784d514aee4429188fb052c063b6437e847980fcc55d80d254be57e814923c34feb8fe08382c9e6f36cdd4e4d2809b935a09ee SHA512 227ec9eb86fffb045cdafeddeed67d21aa1c9a0803cfbf252d0c60d0e51e11229f2fb95e0fb3c81da4286c796b2b9c82fae78df7db3087ff8fee415eb485cfd0
 EBUILD enlightenment-1.0.17.ebuild 1704 BLAKE2B ebc96726bb26d5a4b8f9eff7b36931424117e2e084c4dc584e5c82418d7d64792b3164eafe5a1bdd5f2790eaca2fd866f48221e775854ca1504568aeb06bf446 SHA512 c9373ff015e3ef2c316e84b827c7dad00daf458571fe3537f7d55f34676c9fedc260d9329ead2ce167a3b31570ea1a80580376373c8dc5ea446da364c9c82e74
 MISC metadata.xml 6804 BLAKE2B b71090abce4143b9900ab68af0daec44abbdbfcf812c03572dc9359f42a024ff3646a7e1316f6e7c8387c3d837895e8ccce95ed64a70d6a5ee5c4960f8aa78c2 SHA512 afac4d81982042885b76fb11fbc6dd660522e39a5709cd5c00342787e682bf3dfd3f8b0006ac95e61354fcd29e3074b337abfb62b328db2be14318f12409c3bf
diff --git a/x11-wm/enlightenment/enlightenment-0.21.11.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
index b87b62d2c320..2abc80fad22e 100644
--- a/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 E_CONF_MODS=(
 	applications bindings dialogs display
diff --git a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
index b637ae9ab613..042b54c3f254 100644
--- a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 E_CONF_MODS=(
 	applications bindings dialogs display
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 0b99fe0df8ec..7f937d5abd89 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -7,6 +7,6 @@ DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726
 EBUILD i3-4.13-r1.ebuild 1898 BLAKE2B ee0a771f9735272a28285c38b30d9693d6eea70c4238142a271c2a31f3a54f874fb88b22acde07895577aeccf98f0ab124ae14cbc81249316c4a2f00cc88c1a1 SHA512 fa0fc10c2989175051e86ff329a560ad07ba0aac2c16e19f9e7426d7a74b96be4dda9146a899f4498858fdc9558ba27b3281c7df9ad936988310a441002aee0d
 EBUILD i3-4.14.1.ebuild 2281 BLAKE2B 3caa4d75153e68ad87137c223af7c349a5e52b9a05bd4e76c94607083571c6c05102c6b7596e4ac1b7815a798657fa816de03c172e613289cf8f1b6bed7e364b SHA512 eadf625bb151263d864476a15665acea1d98b0e1d8dcda54f60ebd25d58c42cc4a476c59730ea6f6fbdcff773625ae758f9bd06c5070a4dafb5a725963816333
 EBUILD i3-4.14.ebuild 2018 BLAKE2B 1623ddaf5351872074ec15137bbe61ee855d65ea31915c8090346164e574af4b9d9180f0f8665d931a0cf6464c9ee40b2702f38919559a0851a5f560d1c94fac SHA512 1f6e635f080952aa55416e367f9bbbca4929a73cde2080e121fd76dd1396f01d43199871d09fed71f5b6680f0d94cef5d07c2b8f86675d63763464b6e3d95c2d
-EBUILD i3-4.15.ebuild 2281 BLAKE2B 3caa4d75153e68ad87137c223af7c349a5e52b9a05bd4e76c94607083571c6c05102c6b7596e4ac1b7815a798657fa816de03c172e613289cf8f1b6bed7e364b SHA512 eadf625bb151263d864476a15665acea1d98b0e1d8dcda54f60ebd25d58c42cc4a476c59730ea6f6fbdcff773625ae758f9bd06c5070a4dafb5a725963816333
+EBUILD i3-4.15.ebuild 2288 BLAKE2B 8b61896ae179c7130cfe4e220347af27d68401a18703017036032c7100976541a240f65e10465bdb359cca6c1dc86717dab041b80507825f84e89ee6bfc84c0e SHA512 3a66ade6582d9c4a5c45b76eb0dc4d1c1278c51f4e55ddda5d80da65ae1154b13b7e02fecc663ae2605191366eb82affd10a885bf33240a9598f5e27effe915c
 EBUILD i3-9999.ebuild 1716 BLAKE2B 46975a8704867cb17347dc1a2abc133e1d12a1ad2db0f6e27d2e6cbd68fbcf1e52b6c7dc9da4a5da1f99958fedbe1eb6fe5329bf46778b868b656fe9f19a8558 SHA512 da9b92fdc17543284b129956fbb517f49d670121f2e3d0cd5fcec2239612810030a4d45f6d2178c22d6c939d3528bc97ca38c35c2073d45f8b208b56c6dcd505
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15.ebuild
index 3c204ad407fc..df485534f2f4 100644
--- a/x11-wm/i3/i3-4.15.ebuild
+++ b/x11-wm/i3/i3-4.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 978b9a668384..0ea5eb522801 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,3 +1,3 @@
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
-EBUILD page-1.9.9-r2.ebuild 1270 BLAKE2B 03b885dfd99c6a2d4a870d833734d233713f6e769171faa571b80cb6cece9f4c50f3babc6da8e5af3268ff048d79a56c06bfff628fb19e34d94616b4756f0244 SHA512 1019cd373e5066dea32e6f8d42fc6096236eb1813826ac3093a424d9049fc5bb4859774a9e47d59f9679671c28d275f1da8b4d64fa9ebb2e4c1a7a2617de6b66
+EBUILD page-1.9.9-r2.ebuild 1271 BLAKE2B 17b1eeff88bea97179c7a0a298b0f72ed12442b52cb43fdb90adaae93749d7da83df0c8ed21f4704554eac2c351a7020f77b746415b640457c8ce8e4754163b0 SHA512 63afd2f34af240e142635902d76cd0e9eb4f8d4c5194dce914928f7f7bfa23317a0bf9f6fe333625d60f4ea9fa311b5131b1057982545adbb95870d9dffd2640
 MISC metadata.xml 498 BLAKE2B 5b05ebd39950f440c83dc9c2893f52e7d39d9515427aa29d04e6c7b9069787117aff644e795f6ce3e125b84f179d6c073294292f75b77f1af14828659f8bec4b SHA512 145a1353db0d958c3a2198f57c2d3e7e163b723ca794c96ca76a76e385e22233683a55bc62528193ca87444889423f38d4ab4fda833ecc8a51c1c87bc6400fca
diff --git a/x11-wm/page/page-1.9.9-r2.ebuild b/x11-wm/page/page-1.9.9-r2.ebuild
index a99b66b74284..99ef8410fffa 100644
--- a/x11-wm/page/page-1.9.9-r2.ebuild
+++ b/x11-wm/page/page-1.9.9-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
+HOMEPAGE="https://www.hzog.net/index.php/Main_Page"
 SRC_URI="http://www.hzog.net/pub/${PN}-1.9.9-r1.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest
index 92078c754edb..1cde9354ac84 100644
--- a/x11-wm/windowlab/Manifest
+++ b/x11-wm/windowlab/Manifest
@@ -1,7 +1,5 @@
 AUX windowlab-1.34-fixed-font.patch 385 BLAKE2B e137d399ed40bda9776316f0b2fd5be9dd8520f0b0f88e754ea3c559975a3f42763b802f78a835230fc7fc27c7b544c9838a672f98fb1b008bdecdfddefef408 SHA512 c0e860c92dce68a921880fbe042163a50ad2f1e31572acb2a93bc557405ba7323a8a5e0e5608365be0585dac1bf648958c74aa9e017b9da6c0a15ac4caaae6e4
 AUX windowlab-1.40-gentoo.diff 1621 BLAKE2B eee189cfc54178f850225c4226a1cb70d131ad9417e9f8e000a1a56aaa3ddcf35dc65f4958937a0f40e020be966776a2f61f4797fc4217e128189b3bda4eb771 SHA512 d0d06e2396f1a2f26d7c76b5ed513df2fa4d7496a898664b1fec51b33d6e3f63dd131207cd68243f9c8895d7bfa00e399b3a38ac81101e8321532f454f193ccd
-DIST windowlab-1.34.tar 163840 BLAKE2B 5a4a310f3a9ef4047d6374119c3b9d6239ab450bb11139dc1686e57848d9f5125bab603f7b28a0b33e21403049176e14473d783e503604b7b83a229fd1e410eb SHA512 1d24065fdc2e66d9906d7a1c383d547f677db3c1343176501251637588c7683c08c2803473a505097cafda38486efbdc055bf9597c9ce00456c5ae0d1781e930
 DIST windowlab-1.40.tar 174080 BLAKE2B 9091565b40e886f921f33251c293b39ad4ec544a98d91046e52fa4e1aae66141934645e724ee224750dd7c50fba5a45fe2b4482c46e860c752a10c2b00dd05a5 SHA512 abea16f4f85f846d426fecce548cef2bf867fc6545a720ec2d3a8d93eb5a4abd6942e44534bb7faef6cffe0551181764effa99d835b8f067a1510f7d50af6d3d
-EBUILD windowlab-1.34.ebuild 1239 BLAKE2B a44f150cda630a9548f1b30256b31328ce9d27292e9dc027d9c4cb4736d4f7a27de992964fce4982c443a43bf6585dd592c5819887f11fb4df22c49c34c8ea33 SHA512 ada14f0b7eba965ceb464cb7c4fb86c96d31915848af6391eab3de323ba9a0a19e2c226468ae65ace31f0dee5bc4c0867f03bb174a117f5351dfa0a25d8ab697
-EBUILD windowlab-1.40-r1.ebuild 1094 BLAKE2B 2880ce0ce7bf58f981d4a8704756a448b9a2ce2d27fe6efec7daf04464982c6109693296093f4d27cd97db920543f0621b67ee464d19b48d0c512ecdc5e634af SHA512 a93b123d5d407a357208523a4d58f5643cbfcbe049466ba95dad8c9b2c4fe613ccbae9a22034ac7aeb1d8af85973d3359cb2efff9db7b6c0ad67d40d5e6df932
+EBUILD windowlab-1.40-r1.ebuild 1041 BLAKE2B 3f16c903b12d09c09486cf88ec7c24b21db7a067d56687c5fe834779b9d36a14ee04da9878d5a0eda2644ccaa611d37d8deab2420ff2949bd578ae6779fd308c SHA512 6b19bd349436325f5c51d5df20f8c707853cf412fe57f9b5bff3a2864f55c93515ea3ee69e9f03da7963dcbb837f1429e68160b1c9a5be2f38afbfbaa9536172
 MISC metadata.xml 745 BLAKE2B 13d53f322a8928c1d1b9bbdab5454a351fe29d744127939e2f34de40be078c9a0fb2c04e9dd1f59a6482b4ad45a6216f62733fe87be852846f3ec6760f941ea7 SHA512 ce0e891248ce741753ca470dab5e537d46a361836814608a6253bcd81f56c2b7a7627bda7236e006bea279d28ade0aa6980f71678ad8ca1751769e7b61e46729
diff --git a/x11-wm/windowlab/windowlab-1.34.ebuild b/x11-wm/windowlab/windowlab-1.34.ebuild
deleted file mode 100644
index 56ce2b4b3c07..000000000000
--- a/x11-wm/windowlab/windowlab-1.34.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="small and simple window manager of novel design"
-HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
-SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="truetype"
-
-RDEPEND="truetype? ( x11-libs/libXft )
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch"
-}
-
-src_compile() {
-	if use truetype ; then
-		export DEFINES=-DXFT
-		export EXTRA_INC=$(pkg-config --cflags xft)
-		export EXTRA_LIBS=$(pkg-config --libs xft)
-	fi
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN} || die
-
-	newman ${PN}.1x ${PN}.1 || die
-	dodoc CHANGELOG README TODO || die
-
-	dodir /etc/X11/${PN} || die
-	insinto /etc/X11/${PN}
-	doins ${PN}.menurc || die
-
-	dodir /etc/X11/Sessions || die
-	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
-	fperms a+x /etc/X11/Sessions/${PN}
-}
-
-pkg_postinst() {
-	elog "${PN}'s menu config file has been changed from"
-	elog "/etc/X11/${PN}/menurc to /etc/X11/${PN}/${PN}.menurc"
-}
diff --git a/x11-wm/windowlab/windowlab-1.40-r1.ebuild b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
index 45087d82b6c4..9d51612cab05 100644
--- a/x11-wm/windowlab/windowlab-1.40-r1.ebuild
+++ b/x11-wm/windowlab/windowlab-1.40-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 IUSE="truetype"
 
 RDEPEND="truetype? ( x11-libs/libXft )
@@ -33,8 +33,7 @@ pkg_setup() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGELOG README TODO
+	default
 
 	exeinto /etc/X11/Sessions
 	cat <<- EOF > "${T}"/${PN}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index f822e05e2634..a099e9931263 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 72e101a62baf..ba619a54ed86 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -4,9 +4,11 @@ DIST Thunar-1.6.14.tar.bz2 1964822 BLAKE2B f080f3d0634b4b4a8e11cdb902d5f300b1829
 DIST Thunar-1.6.15.tar.bz2 1964447 BLAKE2B 07dd4241f5aad975ae8f3c4cffb1b40338fd31f5434fb436a2772a9671673b4b124ac4363dd7c1267b0b51d42550735bbb733ada16f77a5b89176a353c84edbc SHA512 836d2d10347915b2e03be5501806e358af1c60786284c5e5afa11a6a79bc6a790966ea43bd9add6783fab91b08f06ae7852c21152f3aa0f29814325a16d65a7f
 DIST Thunar-1.7.1.tar.bz2 2264496 BLAKE2B 84fc0ae18ec4d4bd414bbce30b6ba7f1f0c90de6202d8b830335fb49561c85428ee13753bdc1cb810713e628b977aacf78c93d7bd88c9ac90e3a78f8d74f5737 SHA512 200d2f7a30529fa9a93340a24d019a883193952157f3b37e67d4618ccff95823dfa06f6b04845d185fcb5ead780ea5c69ba9b846c82ea22bc433321b2b160ffb
 DIST Thunar-1.7.2.tar.bz2 2236176 BLAKE2B e7ebcd8b74295539edfeed710cc25204691af3eaa1c84dcd9b56399f5af2220aabc9ce2736f03c7c1bfe9a61600c6acc4f659ba8d56e575f0e4679a644f1c459 SHA512 b98b72558c9a8872f89632820be816f2c2e7f7e07750cc62eace741794cde4aa4daf2f4ed7fd52a5b1e3c4e9965925a038a948124d32ed6d392db65b8780ccdb
+DIST Thunar-1.8.0.tar.bz2 2240878 BLAKE2B 03b77fe7f7695eec3430c7c6350825b9fcda76ffab408461bbf6e7f21f76bd8cbab05caf144222471ab7225086a2a7e541bc4777593abfb6bdcd9bb0c22db287 SHA512 4f0cc00904e9e7f02d2cf79fe36bda4857c1354917f656a2376c73bb755c3dc359e277f3a050fa60754f9adfadb75cefa9287334f6a97c1b4ebdf1f63545da4b
 EBUILD thunar-1.6.13.ebuild 2023 BLAKE2B 44188d0301976e69b8889e67498199a66c7d5088165be529790b05811a54928442067a4c4b778415a8443a9a4c9945d4a9fa356f06484af35f412183c049964c SHA512 55c8db9c7651b7a72f3a58ce02fef6a91f3ffdd4266e1f4b84e3849c77f2d9bd8d1e421493926d3206d621f82285c56355bc423fb130eb4d049491ad2a74541a
 EBUILD thunar-1.6.14.ebuild 1959 BLAKE2B 0efb287771c2dd2b78562b29e5e8767104837f2840b08e08fe9a533c1604346e2f723dd8e955bddec165762fe93e84ef620c2e42087ebad7d8de871e43f80c6e SHA512 4dfdf6ba9f10d23e5104a7a7c1f0ea4d81a85756605c4f925a9d6e471fe5bf96cc1b3b47a7374031228ba57e4d281e6d4ce972af9963a24e5c6d2d893b5ad7db
 EBUILD thunar-1.6.15.ebuild 1966 BLAKE2B 26b9fc6171eed41563721f89aa5255b9b7aa8802a9d95270ab35bdeabb8baf12ba524e91816d363d94f1ac2b4fdd39ebb80c45bd9cac97aaff6e30d92518430f SHA512 0f858769d7f8f05cd8cf2d1c92aa3f9d52bea3e600cd5da764383a98d05ced3b33a5eac868bc37ad5b70400a3160555973f0c4981a7d000f2c88591f576acde1
 EBUILD thunar-1.7.1.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
 EBUILD thunar-1.7.2.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
+EBUILD thunar-1.8.0.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.8.0.ebuild b/xfce-base/thunar/thunar-1.8.0.ebuild
new file mode 100644
index 000000000000..fb1e05deebaf
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils virtualx xdg-utils
+
+MY_P=${P^}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
+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"
+IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.30:=
+	>=x11-libs/gdk-pixbuf-2.14:=
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfconf-4.12:=
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index dcb87bbceb13..9f064408b41b 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 755f86cd4e10..469fa184ab51 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-taskmanager-1.2.0.tar.bz2 435276 BLAKE2B 857494cedf5f6a43280379f1468ce55acaddac51e8e73a02a59bf96148fffa18a20da8a55099b404eb073fb971d7bb72bb597fc7089d0927d9219a76cadfd460 SHA512 45a496dc406eb825b9829a9cd0b76250566df0bf57dd39413112512209936b52cd3271fd1933dd972582178d897ef40ab8e106b2980db6963d29373940fdcc2d
+DIST xfce4-taskmanager-1.2.1.tar.bz2 394704 BLAKE2B 0fc1d43aafec3301687faca4ba6f6a3bef4d3cdf682c9220522557bf9c999b0979b658b0153108308fa38abcf933b9d3e6a82a55aec19bb1e3b81c60def1c116 SHA512 72a1ea75403ef5b96d461f0e4846374f7aa3eebbdd09a1a25c49278e4909904ed6305fe6a06f3a2fc370e191421726b96924e35427253428e968665155808d4e
 EBUILD xfce4-taskmanager-1.2.0.ebuild 957 BLAKE2B 8cc67da954bc7c1664b985e5a27df3682036a48845e54e2b827179d6929a8274aa873c9ff452ba026ef02c146deb0b8c40942e0a6ed9ad43762f0169ab720390 SHA512 113f96f2be85c0ca4fdbff11666351b1e0e3a4545896aafdb51444f0b0fe4ff6d84c1459f3aa8a648948776a603236c67a18dddd98e35d15c24607898b1b55d3
+EBUILD xfce4-taskmanager-1.2.1.ebuild 1077 BLAKE2B 3d4b86e71c6374a0eab3e256c2799fc6315f95fabaeb664f5a71f12d19242afdee41ea111efc53217266e5153e7d4bbf52d1809e6bc623708f9aa0f5279a2217 SHA512 86d4e98a971ce0bd15f65d22c758d34c3411a6988ead823c355c617154ab6662979eb1bedde7824a7969a8fc5911b29637e2b86a0c5cb90404180c1afcbf6ff2
 MISC metadata.xml 310 BLAKE2B 72a1b36cc0a16c67ca5492863c4be9e014b5507b5ae54753adb63bc2e73720555fdb1c427ea346124541a8df64a4cda01cd1f5c492367c733ec4f33874fa4b1c SHA512 758e1edfe2d12b46877c27c2d7c52aaadce97e9fc6106a43be179ff53316ec0edab226ec1a69860081ad9491e52d5eee558bbdb5de078f0bcecdcf32b56168f0
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
new file mode 100644
index 000000000000..65defddf3e13
--- /dev/null
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Easy to use task manager"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
+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"
+IUSE="+gtk3"
+
+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=
+	)"
+# GTK+2 is required unconditionally
+# https://bugzilla.xfce.org/show_bug.cgi?id=11819
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	>=x11-libs/gtk+-2.12:2
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_configure() {
+	local myconf=(
+		--enable-wnck
+		$(use_enable gtk3)
+		--disable-gksu
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}